diff --git a/Makefile.am b/Makefile.am index 14e91a36ec..5fd12dcbab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,8 @@ SUBDIRS = \ $(GIMP_PLUGINS) \ etc \ devel-docs \ - docs + docs \ + build bin_SCRIPTS = @GIMPINSTALL@ diff --git a/app/Makefile.am b/app/Makefile.am index 3b08df3339..7bf48a81c2 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -85,11 +85,7 @@ gimp_2_7_SOURCES = $(libapp_sources) main.c EXTRA_DIST = \ - fileicon.ico \ - gimp.manifest \ - gimp.rc.in \ - makefile.msc \ - wilber.ico + makefile.msc if OS_WIN32 win32_ldflags = -mwindows $(WIN32_LARGE_ADDRESS_AWARE) @@ -100,8 +96,9 @@ munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib' endif if HAVE_WINDRES -GIMPRC = gimp.rc.o -GIMPCONSOLERC = gimp-console.rc.o +include $(top_srcdir)/build/windows/gimprc.rule +GIMPRC = gimp-$(GIMP_APP_VERSION).rc.o +GIMPCONSOLERC = gimp-console-$(GIMP_APP_VERSION).rc.o endif AM_CPPFLAGS = \ @@ -272,16 +269,6 @@ dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT) dist-hook: dist-check-gimp-console dist-dump-gimprc -gimp.rc.o: gimp.rc - $(WINDRES) --define ORIGINALFILENAME_STR="gimp-2.7$(EXEEXT)" \ - --define INTERNALNAME_STR="gimp-2.7" \ - gimp.rc gimp.rc.o - -gimp-console.rc.o: gimp.rc - $(WINDRES) --define ORIGINALFILENAME_STR="gimp-console-2.7$(EXEEXT)" \ - --define INTERNALNAME_STR="gimp-console-2.7" \ - gimp.rc gimp-console.rc.o - # If git is available, always check if git-version.h should be # updated. If git is not available, don't do anything if git-version.h # already exists because then we are probably working with a tarball diff --git a/app/core/gimpimage-convert.c b/app/core/gimpimage-convert.c index 3a3181c4f0..f1f28eaf20 100644 --- a/app/core/gimpimage-convert.c +++ b/app/core/gimpimage-convert.c @@ -2531,7 +2531,7 @@ find_best_colors (QuantizeObj *quantobj, int inR, inG, inB; /* initial values for increments */ /* This array holds the distance to the nearest-so-far color for each cell */ - int bestdist[BOX_R_ELEMS * BOX_G_ELEMS * BOX_B_ELEMS]; + int bestdist[BOX_R_ELEMS * BOX_G_ELEMS * BOX_B_ELEMS] = { 0, }; /* Initialize best-distance for each cell of the update box */ bptr = bestdist; diff --git a/app/display/gimpcanvas.c b/app/display/gimpcanvas.c index 0043ebfaef..91fe17b7f4 100644 --- a/app/display/gimpcanvas.c +++ b/app/display/gimpcanvas.c @@ -19,7 +19,6 @@ #include -#include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" @@ -27,7 +26,6 @@ #include "config/gimpdisplayconfig.h" -#include "widgets/gimpcairo-wilber.h" #include "widgets/gimpwidgets-utils.h" #include "gimpcanvas.h" @@ -56,7 +54,6 @@ static void gimp_canvas_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gimp_canvas_realize (GtkWidget *widget); static void gimp_canvas_unrealize (GtkWidget *widget); static void gimp_canvas_style_set (GtkWidget *widget, GtkStyle *prev_style); @@ -76,91 +73,6 @@ G_DEFINE_TYPE (GimpCanvas, gimp_canvas, GIMP_TYPE_OVERLAY_BOX) #define parent_class gimp_canvas_parent_class -static const guchar stipples[GIMP_CANVAS_NUM_STIPPLES][8] = -{ - { - 0xF0, /* ####---- */ - 0xE1, /* ###----# */ - 0xC3, /* ##----## */ - 0x87, /* #----### */ - 0x0F, /* ----#### */ - 0x1E, /* ---####- */ - 0x3C, /* --####-- */ - 0x78, /* -####--- */ - }, - { - 0xE1, /* ###----# */ - 0xC3, /* ##----## */ - 0x87, /* #----### */ - 0x0F, /* ----#### */ - 0x1E, /* ---####- */ - 0x3C, /* --####-- */ - 0x78, /* -####--- */ - 0xF0, /* ####---- */ - }, - { - 0xC3, /* ##----## */ - 0x87, /* #----### */ - 0x0F, /* ----#### */ - 0x1E, /* ---####- */ - 0x3C, /* --####-- */ - 0x78, /* -####--- */ - 0xF0, /* ####---- */ - 0xE1, /* ###----# */ - }, - { - 0x87, /* #----### */ - 0x0F, /* ----#### */ - 0x1E, /* ---####- */ - 0x3C, /* --####-- */ - 0x78, /* -####--- */ - 0xF0, /* ####---- */ - 0xE1, /* ###----# */ - 0xC3, /* ##----## */ - }, - { - 0x0F, /* ----#### */ - 0x1E, /* ---####- */ - 0x3C, /* --####-- */ - 0x78, /* -####--- */ - 0xF0, /* ####---- */ - 0xE1, /* ###----# */ - 0xC3, /* ##----## */ - 0x87, /* #----### */ - }, - { - 0x1E, /* ---####- */ - 0x3C, /* --####-- */ - 0x78, /* -####--- */ - 0xF0, /* ####---- */ - 0xE1, /* ###----# */ - 0xC3, /* ##----## */ - 0x87, /* #----### */ - 0x0F, /* ----#### */ - }, - { - 0x3C, /* --####-- */ - 0x78, /* -####--- */ - 0xF0, /* ####---- */ - 0xE1, /* ###----# */ - 0xC3, /* ##----## */ - 0x87, /* #----### */ - 0x0F, /* ----#### */ - 0x1E, /* ---####- */ - }, - { - 0x78, /* -####--- */ - 0xF0, /* ####---- */ - 0xE1, /* ###----# */ - 0xC3, /* ##----## */ - 0x87, /* #----### */ - 0x0F, /* ----#### */ - 0x1E, /* ---####- */ - 0x3C, /* --####-- */ - }, -}; - - static void gimp_canvas_class_init (GimpCanvasClass *klass) { @@ -170,7 +82,6 @@ gimp_canvas_class_init (GimpCanvasClass *klass) object_class->set_property = gimp_canvas_set_property; object_class->get_property = gimp_canvas_get_property; - widget_class->realize = gimp_canvas_realize; widget_class->unrealize = gimp_canvas_unrealize; widget_class->style_set = gimp_canvas_style_set; widget_class->focus_in_event = gimp_canvas_focus_in_event; @@ -197,9 +108,6 @@ gimp_canvas_init (GimpCanvas *canvas) for (i = 0; i < GIMP_CANVAS_NUM_STYLES; i++) canvas->gc[i] = NULL; - - for (i = 0; i < GIMP_CANVAS_NUM_STIPPLES; i++) - canvas->stipple[i] = NULL; } static void @@ -240,18 +148,6 @@ gimp_canvas_get_property (GObject *object, } } -static void -gimp_canvas_realize (GtkWidget *widget) -{ - GimpCanvas *canvas = GIMP_CANVAS (widget); - - GTK_WIDGET_CLASS (parent_class)->realize (widget); - - canvas->stipple[0] = - gdk_bitmap_create_from_data (gtk_widget_get_window (widget), - (const gchar *) stipples[0], 8, 8); -} - static void gimp_canvas_unrealize (GtkWidget *widget) { @@ -267,15 +163,6 @@ gimp_canvas_unrealize (GtkWidget *widget) } } - for (i = 0; i < GIMP_CANVAS_NUM_STIPPLES; i++) - { - if (canvas->stipple[i]) - { - g_object_unref (canvas->stipple[i]); - canvas->stipple[i] = NULL; - } - } - if (canvas->layout) { g_object_unref (canvas->layout); @@ -369,15 +256,6 @@ gimp_canvas_gc_new (GimpCanvas *canvas, switch (style) { - case GIMP_CANVAS_STYLE_BLACK: - case GIMP_CANVAS_STYLE_WHITE: - break; - - case GIMP_CANVAS_STYLE_RENDER: - mask |= GDK_GC_EXPOSURES; - values.graphics_exposures = TRUE; - break; - case GIMP_CANVAS_STYLE_XOR_DOTTED: case GIMP_CANVAS_STYLE_XOR_DASHED: mask |= GDK_GC_LINE_STYLE; @@ -396,14 +274,6 @@ gimp_canvas_gc_new (GimpCanvas *canvas, values.join_style = GDK_JOIN_MITER; break; - case GIMP_CANVAS_STYLE_SELECTION_IN: - case GIMP_CANVAS_STYLE_SELECTION_OUT: - mask |= GDK_GC_CAP_STYLE | GDK_GC_FILL | GDK_GC_STIPPLE; - values.cap_style = GDK_CAP_NOT_LAST; - values.fill = GDK_OPAQUE_STIPPLED; - values.stipple = canvas->stipple[0]; - break; - default: return NULL; } @@ -426,33 +296,6 @@ gimp_canvas_gc_new (GimpCanvas *canvas, case GIMP_CANVAS_STYLE_XOR_DASHED: case GIMP_CANVAS_STYLE_XOR: break; - - case GIMP_CANVAS_STYLE_WHITE: - fg.red = 0xffff; - fg.green = 0xffff; - fg.blue = 0xffff; - break; - - case GIMP_CANVAS_STYLE_BLACK: - case GIMP_CANVAS_STYLE_SELECTION_IN: - fg.red = 0x0; - fg.green = 0x0; - fg.blue = 0x0; - - bg.red = 0xffff; - bg.green = 0xffff; - bg.blue = 0xffff; - break; - - case GIMP_CANVAS_STYLE_SELECTION_OUT: - fg.red = 0xffff; - fg.green = 0xffff; - fg.blue = 0xffff; - - bg.red = 0x7f7f; - bg.green = 0x7f7f; - bg.blue = 0x7f7f; - break; } gdk_gc_set_rgb_fg_color (gc, &fg); @@ -499,54 +342,6 @@ gimp_canvas_new (GimpDisplayConfig *config) NULL); } -/** - * gimp_canvas_draw_point: - * @canvas: a #GimpCanvas widget - * @style: one of the enumerated #GimpCanvasStyle's. - * @x: x coordinate - * @y: y coordinate - * - * Draw a single pixel at the specified location in the specified - * style. - **/ -void -gimp_canvas_draw_point (GimpCanvas *canvas, - GimpCanvasStyle style, - gint x, - gint y) -{ - if (! gimp_canvas_ensure_style (canvas, style)) - return; - - gdk_draw_point (gtk_widget_get_window (GTK_WIDGET (canvas)), - canvas->gc[style], - x, y); -} - -/** - * gimp_canvas_draw_points: - * @canvas: a #GimpCanvas widget - * @style: one of the enumerated #GimpCanvasStyle's. - * @points: an array of GdkPoint x-y pairs. - * @num_points: the number of points in the array - * - * Draws a set of one-pixel points at the locations given in the - * @points argument, in the specified style. - **/ -void -gimp_canvas_draw_points (GimpCanvas *canvas, - GimpCanvasStyle style, - GdkPoint *points, - gint num_points) -{ - if (! gimp_canvas_ensure_style (canvas, style)) - return; - - gdk_draw_points (gtk_widget_get_window (GTK_WIDGET (canvas)), - canvas->gc[style], - points, num_points); -} - /** * gimp_canvas_draw_line: * @canvas: a #GimpCanvas widget @@ -754,89 +549,6 @@ gimp_canvas_get_layout (GimpCanvas *canvas, return canvas->layout; } -/** - * gimp_canvas_draw_rgb: - * @canvas: a #GimpCanvas widget - * @style: one of the enumerated #GimpCanvasStyle's. - * @x: X coordinate of the upper left corner. - * @y: Y coordinate of the upper left corner. - * @width: width of the rectangle to be drawn. - * @height: height of the rectangle to be drawn. - * @rgb_buf: pixel data for the image to be drawn. - * @rowstride: the rowstride in @rgb_buf. - * @xdith: x offset for dither alignment. - * @ydith: y offset for dither alignment. - * - * Draws an RGB image on the canvas in the specified style. - **/ -void -gimp_canvas_draw_rgb (GimpCanvas *canvas, - GimpCanvasStyle style, - gint x, - gint y, - gint width, - gint height, - guchar *rgb_buf, - gint rowstride, - gint xdith, - gint ydith) -{ - if (! gimp_canvas_ensure_style (canvas, style)) - return; - - gdk_draw_rgb_image_dithalign (gtk_widget_get_window (GTK_WIDGET (canvas)), - canvas->gc[style], - x, y, width, height, - GDK_RGB_DITHER_MAX, - rgb_buf, rowstride, xdith, ydith); -} - -void -gimp_canvas_draw_drop_zone (GimpCanvas *canvas, - cairo_t *cr) -{ - GtkWidget *widget = GTK_WIDGET (canvas); - GtkStyle *style = gtk_widget_get_style (widget); - GtkStateType state = gtk_widget_get_state (widget); - GtkAllocation allocation; - gdouble wilber_width; - gdouble wilber_height; - gdouble width; - gdouble height; - gdouble side; - gdouble factor; - - gtk_widget_get_allocation (widget, &allocation); - - gimp_cairo_wilber_get_size (cr, &wilber_width, &wilber_height); - - wilber_width /= 2; - wilber_height /= 2; - - side = MIN (MIN (allocation.width, allocation.height), - MAX (allocation.width, allocation.height) / 2); - - width = MAX (wilber_width, side); - height = MAX (wilber_height, side); - - factor = MIN (width / wilber_width, height / wilber_height); - - cairo_scale (cr, factor, factor); - - /* 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); - - cairo_set_source_rgba (cr, - style->fg[state].red / 65535.0, - style->fg[state].green / 65535.0, - style->fg[state].blue / 65535.0, - 0.15); - cairo_fill (cr); -} - /** * gimp_canvas_set_clip_rect: * @canvas: a #GimpCanvas widget @@ -885,40 +597,6 @@ gimp_canvas_set_clip_region (GimpCanvas *canvas, gdk_gc_set_clip_region (canvas->gc[style], region); } -/** - * gimp_canvas_set_stipple_index: - * @canvas: a #GimpCanvas widget - * @style: the #GimpCanvasStyle to alter - * @index: the new stipple index - * - * Some styles of the #GimpCanvas do a stipple fill. #GimpCanvas has a - * set of %GIMP_CANVAS_NUM_STIPPLES stipple bitmaps. This function - * allows you to change the bitmap being used. This can be used to - * implement a marching ants effect. An older implementation used to - * use this feature and so it is included since it might be useful in - * the future. All stipple bitmaps but the default one are created on - * the fly. - */ -void -gimp_canvas_set_stipple_index (GimpCanvas *canvas, - GimpCanvasStyle style, - guint index) -{ - if (! gimp_canvas_ensure_style (canvas, style)) - return; - - index = index % GIMP_CANVAS_NUM_STIPPLES; - - if (! canvas->stipple[index]) - { - canvas->stipple[index] = - gdk_bitmap_create_from_data (gtk_widget_get_window (GTK_WIDGET (canvas)), - (const gchar *) stipples[index], 8, 8); - } - - gdk_gc_set_stipple (canvas->gc[style], canvas->stipple[index]); -} - /** * gimp_canvas_set_bg_color: * @canvas: a #GimpCanvas widget diff --git a/app/display/gimpcanvas.h b/app/display/gimpcanvas.h index 52eb9db4b1..060424b758 100644 --- a/app/display/gimpcanvas.h +++ b/app/display/gimpcanvas.h @@ -24,14 +24,9 @@ typedef enum { - GIMP_CANVAS_STYLE_BLACK, - GIMP_CANVAS_STYLE_WHITE, - GIMP_CANVAS_STYLE_RENDER, GIMP_CANVAS_STYLE_XOR, GIMP_CANVAS_STYLE_XOR_DASHED, GIMP_CANVAS_STYLE_XOR_DOTTED, - GIMP_CANVAS_STYLE_SELECTION_IN, - GIMP_CANVAS_STYLE_SELECTION_OUT, GIMP_CANVAS_NUM_STYLES } GimpCanvasStyle; @@ -82,14 +77,6 @@ GType gimp_canvas_get_type (void) G_GNUC_CONST; GtkWidget * gimp_canvas_new (GimpDisplayConfig *config); -void gimp_canvas_draw_point (GimpCanvas *canvas, - GimpCanvasStyle style, - gint x, - gint y); -void gimp_canvas_draw_points (GimpCanvas *canvas, - GimpCanvasStyle style, - GdkPoint *points, - gint num_points); void gimp_canvas_draw_line (GimpCanvas *canvas, GimpCanvasStyle style, gint x1, @@ -128,18 +115,6 @@ void gimp_canvas_draw_segments (GimpCanvas *canvas, PangoLayout *gimp_canvas_get_layout (GimpCanvas *canvas, const gchar *format, ...) G_GNUC_PRINTF (2, 3); -void gimp_canvas_draw_rgb (GimpCanvas *canvas, - GimpCanvasStyle style, - gint x, - gint y, - gint width, - gint height, - guchar *rgb_buf, - gint rowstride, - gint xdith, - gint ydith); -void gimp_canvas_draw_drop_zone (GimpCanvas *canvas, - cairo_t *cr); void gimp_canvas_set_clip_rect (GimpCanvas *canvas, GimpCanvasStyle style, @@ -147,9 +122,6 @@ void gimp_canvas_set_clip_rect (GimpCanvas *canvas, void gimp_canvas_set_clip_region (GimpCanvas *canvas, GimpCanvasStyle style, const GdkRegion *region); -void gimp_canvas_set_stipple_index (GimpCanvas *canvas, - GimpCanvasStyle style, - guint index); void gimp_canvas_set_bg_color (GimpCanvas *canvas, GimpRGB *color); diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 49e5e75690..5243e10f65 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -48,6 +48,7 @@ #include "tools/tool_manager.h" #include "tools/tools-enums.h" +#include "widgets/gimpcairo.h" #include "widgets/gimpcontrollers.h" #include "widgets/gimpcontrollerkeyboard.h" #include "widgets/gimpcontrollerwheel.h" @@ -56,7 +57,6 @@ #include "widgets/gimpdevices.h" #include "widgets/gimpdialogfactory.h" #include "widgets/gimpuimanager.h" -#include "widgets/gimpwidgets-utils.h" #include "gimpcanvas.h" #include "gimpdisplay.h" @@ -103,9 +103,11 @@ static GdkModifierType static GdkEvent * gimp_display_shell_compress_motion (GimpDisplayShell *shell); static void gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell, - GdkEventExpose *eevent); + GdkEventExpose *eevent, + cairo_t *cr); static void gimp_display_shell_canvas_expose_drop_zone (GimpDisplayShell *shell, - GdkEventExpose *eevent); + GdkEventExpose *eevent, + cairo_t *cr); static void gimp_display_shell_process_tool_event_queue (GimpDisplayShell *shell, GdkModifierType state, guint32 time); @@ -392,19 +394,33 @@ gimp_display_shell_canvas_expose (GtkWidget *widget, /* ignore events on overlays */ if (eevent->window == gtk_widget_get_window (widget)) { + cairo_t *cr; + if (gimp_display_get_image (shell->display)) { gimp_display_shell_pause (shell); if (gimp_display_shell_is_double_buffered (shell)) gdk_window_begin_paint_region (eevent->window, eevent->region); + } - gimp_display_shell_canvas_expose_image (shell, eevent); + /* create the cairo_t after enabling double buffering, or we + * will get the wrong window destination surface + */ + cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas)); + gdk_cairo_region (cr, eevent->region); + cairo_clip (cr); + + if (gimp_display_get_image (shell->display)) + { + gimp_display_shell_canvas_expose_image (shell, eevent, cr); } else { - gimp_display_shell_canvas_expose_drop_zone (shell, eevent); + gimp_display_shell_canvas_expose_drop_zone (shell, eevent, cr); } + + cairo_destroy (cr); } return FALSE; @@ -2078,7 +2094,7 @@ gimp_display_shell_hscrollbar_update (GtkAdjustment *adjustment, GimpDisplayShell *shell) { /* If we are panning with mouse, scrollbars are to be ignored - * or they will cause jitter in motion + * or they will cause jitter in motion */ if (! shell->scrolling) gimp_display_shell_scroll (shell, @@ -2214,9 +2230,9 @@ gimp_display_shell_compress_motion (GimpDisplayShell *shell) static void gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell, - GdkEventExpose *eevent) + GdkEventExpose *eevent, + cairo_t *cr) { - cairo_t *cr; GdkRegion *clear_region; GdkRegion *image_region; GdkRectangle image_rect; @@ -2224,11 +2240,6 @@ gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell, gint n_rects; gint i; - cr = gdk_cairo_create (eevent->window); - - gdk_cairo_region (cr, eevent->region); - cairo_clip (cr); - /* first, clear the exposed part of the region that is outside the * image, which is the exposed region minus the image rectangle */ @@ -2273,13 +2284,17 @@ gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell, { gdk_region_get_rectangles (image_region, &rects, &n_rects); + cairo_save (cr); + for (i = 0; i < n_rects; i++) - gimp_display_shell_draw_area (shell, + gimp_display_shell_draw_area (shell, cr, rects[i].x, rects[i].y, rects[i].width, rects[i].height); + cairo_restore (cr); + g_free (rects); } @@ -2313,15 +2328,13 @@ gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell, /* restart (and recalculate) the selection boundaries */ gimp_display_shell_selection_control (shell, GIMP_SELECTION_ON); - - cairo_destroy (cr); } static void gimp_display_shell_canvas_expose_drop_zone (GimpDisplayShell *shell, - GdkEventExpose *eevent) + GdkEventExpose *eevent, + cairo_t *cr) { - cairo_t *cr; GdkRectangle *rects; gint n_rects; gint i; @@ -2339,11 +2352,5 @@ gimp_display_shell_canvas_expose_drop_zone (GimpDisplayShell *shell, g_free (rects); - cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas)); - gdk_cairo_region (cr, eevent->region); - cairo_clip (cr); - - gimp_canvas_draw_drop_zone (GIMP_CANVAS (shell->canvas), cr); - - cairo_destroy (cr); + gimp_cairo_draw_drop_wilber (shell->canvas, cr); } diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 5a08c2a90d..d900412d0d 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -43,6 +43,7 @@ #include "vectors/gimpstroke.h" #include "vectors/gimpvectors.h" +#include "widgets/gimpcairo.h" #include "widgets/gimpwidgets-utils.h" #include "gimpcanvas.h" @@ -540,8 +541,6 @@ gimp_display_shell_draw_layer_boundary (GimpDisplayShell *shell, GdkSegment *segs, gint n_segs) { - gint i; - g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); g_return_if_fail (GIMP_IS_DRAWABLE (drawable)); @@ -549,20 +548,7 @@ gimp_display_shell_draw_layer_boundary (GimpDisplayShell *shell, gimp_display_shell_set_layer_style (shell, cr, drawable); - for (i = 0; i < n_segs; i++) - { - if (segs[i].x1 == segs[i].x2) - { - cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1); - cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2); - } - else - { - cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5); - cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5); - } - } - + gimp_cairo_add_segments (cr, segs, n_segs); cairo_stroke (cr); } @@ -572,61 +558,29 @@ gimp_display_shell_draw_selection_out (GimpDisplayShell *shell, GdkSegment *segs, gint n_segs) { - gint i; - g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); g_return_if_fail (segs != NULL && n_segs > 0); gimp_display_shell_set_selection_out_style (shell, cr); - for (i = 0; i < n_segs; i++) - { - if (segs[i].x1 == segs[i].x2) - { - cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1); - cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2); - } - else - { - cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5); - cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5); - } - } - + gimp_cairo_add_segments (cr, segs, n_segs); cairo_stroke (cr); } void -gimp_display_shell_draw_selection_in (GimpDisplayShell *shell, - cairo_t *cr, - GdkSegment *segs, - gint n_segs, - gint index) +gimp_display_shell_draw_selection_in (GimpDisplayShell *shell, + cairo_t *cr, + cairo_pattern_t *mask, + gint index) { - gint i; - g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); - g_return_if_fail (segs != NULL && n_segs > 0); + g_return_if_fail (mask != NULL); gimp_display_shell_set_selection_in_style (shell, cr, index); - for (i = 0; i < n_segs; i++) - { - if (segs[i].x1 == segs[i].x2) - { - cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1); - cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2); - } - else - { - cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5); - cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5); - } - } - - cairo_stroke (cr); + cairo_mask (cr, mask); } void @@ -738,6 +692,7 @@ gimp_display_shell_draw_cursor (GimpDisplayShell *shell, void gimp_display_shell_draw_area (GimpDisplayShell *shell, + cairo_t *cr, gint x, gint y, gint w, @@ -749,6 +704,7 @@ gimp_display_shell_draw_area (GimpDisplayShell *shell, g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (gimp_display_get_image (shell->display)); + g_return_if_fail (cr != NULL); x2 = x + w; y2 = y + h; @@ -778,7 +734,7 @@ gimp_display_shell_draw_area (GimpDisplayShell *shell, &disp_xoffset, &disp_yoffset); - gimp_display_shell_render (shell, + gimp_display_shell_render (shell, cr, j - disp_xoffset, i - disp_yoffset, dx, dy, diff --git a/app/display/gimpdisplayshell-draw.h b/app/display/gimpdisplayshell-draw.h index 8fed4979b7..5f51ba2b6e 100644 --- a/app/display/gimpdisplayshell-draw.h +++ b/app/display/gimpdisplayshell-draw.h @@ -59,8 +59,7 @@ void gimp_display_shell_draw_selection_out (GimpDisplayShell *shell, gint n_segs); void gimp_display_shell_draw_selection_in (GimpDisplayShell *shell, cairo_t *cr, - GdkSegment *segs, - gint n_segs, + cairo_pattern_t *mask, gint index); void gimp_display_shell_draw_vector (GimpDisplayShell *shell, GimpVectors *vectors); @@ -68,6 +67,7 @@ void gimp_display_shell_draw_vectors (GimpDisplayShell *shell) void gimp_display_shell_draw_cursor (GimpDisplayShell *shell, cairo_t *cr); void gimp_display_shell_draw_area (GimpDisplayShell *shell, + cairo_t *cr, gint x, gint y, gint w, diff --git a/app/display/gimpdisplayshell-render.c b/app/display/gimpdisplayshell-render.c index 956c4243a8..b229ed0c58 100644 --- a/app/display/gimpdisplayshell-render.c +++ b/app/display/gimpdisplayshell-render.c @@ -76,7 +76,6 @@ struct _RenderInfo gint src_y; gint dest_bpp; gint dest_bpl; - gint dest_width; gint zoom_quality; @@ -195,6 +194,7 @@ static const guchar * render_image_tile_fault (RenderInfo *info); static void gimp_display_shell_render_highlight (GimpDisplayShell *shell, + RenderInfo *info, gint x, gint y, gint w, @@ -213,6 +213,7 @@ static void gimp_display_shell_render_mask (GimpDisplayShell *shell, void gimp_display_shell_render (GimpDisplayShell *shell, + cairo_t *cr, gint x, gint y, gint w, @@ -227,6 +228,7 @@ gimp_display_shell_render (GimpDisplayShell *shell, gint offset_y; g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); + g_return_if_fail (cr != NULL); g_return_if_fail (w > 0 && h > 0); image = gimp_display_get_image (shell->display); @@ -239,16 +241,15 @@ gimp_display_shell_render (GimpDisplayShell *shell, /* Initialize RenderInfo with values that don't change during the * call of this function. */ - info.shell = shell; + info.shell = shell; - info.x = x + offset_x; - info.y = y + offset_y; - info.w = w; - info.h = h; + info.x = x + offset_x; + info.y = y + offset_y; + info.w = w; + info.h = h; - info.dest_bpp = 3; - info.dest_bpl = info.dest_bpp * GIMP_DISPLAY_RENDER_BUF_WIDTH; - info.dest_width = info.dest_bpp * info.w; + info.dest_bpp = 4; + info.dest_bpl = cairo_image_surface_get_stride (shell->render_surface); switch (shell->display->config->zoom_quality) { @@ -293,17 +294,19 @@ gimp_display_shell_render (GimpDisplayShell *shell, } /* apply filters to the rendered projection */ +#if 0 if (shell->filter_stack) gimp_color_display_stack_convert (shell->filter_stack, shell->render_buf, w, h, 3, 3 * GIMP_DISPLAY_RENDER_BUF_WIDTH); +#endif /* dim pixels outside the highlighted rectangle */ if (highlight) { - gimp_display_shell_render_highlight (shell, x, y, w, h, highlight); + gimp_display_shell_render_highlight (shell, &info, x, y, w, h, highlight); } else if (shell->mask) { @@ -315,6 +318,8 @@ gimp_display_shell_render (GimpDisplayShell *shell, gimp_display_shell_render_mask (shell, &info); } + cairo_surface_mark_dirty (shell->render_surface); + /* put it to the screen */ { gint disp_xoffset, disp_yoffset; @@ -322,35 +327,43 @@ gimp_display_shell_render (GimpDisplayShell *shell, gimp_display_shell_scroll_get_disp_offset (shell, &disp_xoffset, &disp_yoffset); - gimp_canvas_draw_rgb (GIMP_CANVAS (shell->canvas), - GIMP_CANVAS_STYLE_RENDER, - x + disp_xoffset, y + disp_yoffset, - w, h, - shell->render_buf, - 3 * GIMP_DISPLAY_RENDER_BUF_WIDTH, - offset_x, offset_y); + cairo_set_source_surface (cr, shell->render_surface, + x + disp_xoffset, y + disp_yoffset); + cairo_rectangle (cr, x + disp_xoffset, y + disp_yoffset, w, h); + cairo_fill (cr); } } +#if G_BYTE_ORDER == G_LITTLE_ENDIAN +#define CAIRO_RGB24_RED_PIXEL 2 +#define CAIRO_RGB24_GREEN_PIXEL 1 +#define CAIRO_RGB24_BLUE_PIXEL 0 +#else +#define CAIRO_RGB24_RED_PIXEL 1 +#define CAIRO_RGB24_GREEN_PIXEL 2 +#define CAIRO_RGB24_BLUE_PIXEL 3 +#endif + #define GIMP_DISPLAY_SHELL_DIM_PIXEL(buf,x) \ { \ - buf[3 * (x) + 0] >>= 1; \ - buf[3 * (x) + 1] >>= 1; \ - buf[3 * (x) + 2] >>= 1; \ + buf[4 * (x) + CAIRO_RGB24_RED_PIXEL] >>= 1; \ + buf[4 * (x) + CAIRO_RGB24_GREEN_PIXEL] >>= 1; \ + buf[4 * (x) + CAIRO_RGB24_BLUE_PIXEL] >>= 1; \ } /* This function highlights the given area by dimming all pixels outside. */ static void gimp_display_shell_render_highlight (GimpDisplayShell *shell, + RenderInfo *info, gint x, gint y, gint w, gint h, const GdkRectangle *highlight) { - guchar *buf = shell->render_buf; + guchar *buf = cairo_image_surface_get_data (shell->render_surface); GdkRectangle rect; gint offset_x; gint offset_y; @@ -373,7 +386,7 @@ gimp_display_shell_render_highlight (GimpDisplayShell *shell, for (x = 0; x < w; x++) GIMP_DISPLAY_SHELL_DIM_PIXEL (buf, x) - buf += 3 * GIMP_DISPLAY_RENDER_BUF_WIDTH; + buf += info->dest_bpl; } for ( ; y < rect.y + rect.height; y++) @@ -384,7 +397,7 @@ gimp_display_shell_render_highlight (GimpDisplayShell *shell, for (x += rect.width; x < w; x++) GIMP_DISPLAY_SHELL_DIM_PIXEL (buf, x) - buf += 3 * GIMP_DISPLAY_RENDER_BUF_WIDTH; + buf += info->dest_bpl; } for ( ; y < h; y++) @@ -392,7 +405,7 @@ gimp_display_shell_render_highlight (GimpDisplayShell *shell, for (x = 0; x < w; x++) GIMP_DISPLAY_SHELL_DIM_PIXEL (buf, x) - buf += 3 * GIMP_DISPLAY_RENDER_BUF_WIDTH; + buf += info->dest_bpl; } } else @@ -402,7 +415,7 @@ gimp_display_shell_render_highlight (GimpDisplayShell *shell, for (x = 0; x < w; x++) GIMP_DISPLAY_SHELL_DIM_PIXEL (buf, x) - buf += 3 * GIMP_DISPLAY_RENDER_BUF_WIDTH; + buf += info->dest_bpl; } } } @@ -429,35 +442,35 @@ gimp_display_shell_render_mask (GimpDisplayShell *shell, switch (shell->mask_color) { case GIMP_RED_CHANNEL: - for (x = info->x; x < xe; x++, src++, dest += 3) + for (x = info->x; x < xe; x++, src++, dest += info->dest_bpp) { if (*src & 0x80) continue; - dest[1] = dest[1] >> 2; - dest[2] = dest[2] >> 2; + dest[CAIRO_RGB24_GREEN_PIXEL] >>= 2; + dest[CAIRO_RGB24_BLUE_PIXEL] >>= 2; } break; case GIMP_GREEN_CHANNEL: - for (x = info->x; x < xe; x++, src++, dest += 3) + for (x = info->x; x < xe; x++, src++, dest += info->dest_bpp) { if (*src & 0x80) continue; - dest[0] = dest[0] >> 2; - dest[2] = dest[2] >> 2; + dest[CAIRO_RGB24_RED_PIXEL] >>= 2; + dest[CAIRO_RGB24_BLUE_PIXEL] >>= 2; } break; case GIMP_BLUE_CHANNEL: - for (x = info->x; x < xe; x++, src++, dest += 3) + for (x = info->x; x < xe; x++, src++, dest += info->dest_bpp) { if (*src & 0x80) continue; - dest[0] = dest[0] >> 2; - dest[1] = dest[1] >> 2; + dest[CAIRO_RGB24_RED_PIXEL] >>= 2; + dest[CAIRO_RGB24_GREEN_PIXEL] >>= 2; } break; @@ -504,7 +517,7 @@ render_image_gray_a (RenderInfo *info) dark_light = (y >> check_shift) + (info->x >> check_shift); - for (x = info->x; x < xe; x++, src += 2, dest += 3) + for (x = info->x; x < xe; x++, src += 2, dest += info->dest_bpp) { guint v; @@ -513,7 +526,7 @@ render_image_gray_a (RenderInfo *info) else v = ((src[0] << 8) + check_light * (256 - src[1])) >> 8; - dest[0] = dest[1] = dest[2] = v; + GIMP_CAIRO_RGB24_SET_PIXEL (dest, v, v, v); if (((x + 1) & check_mod) == 0) dark_light += 1; @@ -553,7 +566,7 @@ render_image_rgb_a (RenderInfo *info) dark_light = (y >> check_shift) + (info->x >> check_shift); - for (x = info->x; x < xe; x++, src += 4, dest += 3) + for (x = info->x; x < xe; x++, src += 4, dest += info->dest_bpp) { guint r, g, b; @@ -570,9 +583,7 @@ render_image_rgb_a (RenderInfo *info) b = ((src[2] << 8) + check_light * (256 - src[3])) >> 8; } - dest[0] = r; - dest[1] = g; - dest[2] = b; + GIMP_CAIRO_RGB24_SET_PIXEL (dest, r, g, b); if (((x + 1) & check_mod) == 0) dark_light += 1; @@ -605,7 +616,7 @@ gimp_display_shell_render_info_scale (RenderInfo *info, /* We must reset info->dest because this member is modified in render * functions. */ - info->dest = shell->render_buf; + info->dest = cairo_image_surface_get_data (shell->render_surface); info->scalex = shell->scale_x * (1 << level); info->scaley = shell->scale_y * (1 << level); diff --git a/app/display/gimpdisplayshell-render.h b/app/display/gimpdisplayshell-render.h index f5e14face3..f60ff65683 100644 --- a/app/display/gimpdisplayshell-render.h +++ b/app/display/gimpdisplayshell-render.h @@ -27,6 +27,7 @@ void gimp_display_shell_render_init (Gimp *gimp); void gimp_display_shell_render_exit (Gimp *gimp); void gimp_display_shell_render (GimpDisplayShell *shell, + cairo_t *cr, gint x, gint y, gint w, diff --git a/app/display/gimpdisplayshell-selection.c b/app/display/gimpdisplayshell-selection.c index 28b8cfd091..b5b23120f3 100644 --- a/app/display/gimpdisplayshell-selection.c +++ b/app/display/gimpdisplayshell-selection.c @@ -31,7 +31,8 @@ #include "core/gimplayermask.h" #include "core/gimpimage.h" -#include "gimpcanvas.h" +#include "widgets/gimpcairo.h" + #include "gimpdisplay.h" #include "gimpdisplayshell.h" #include "gimpdisplayshell-appearance.h" @@ -41,18 +42,10 @@ #include "gimpdisplayshell-transform.h" -#undef VERBOSE - -#define MAX_POINTS_INC 2048 -#define USE_DRAWPOINTS TRUE - - struct _Selection { GimpDisplayShell *shell; /* shell that owns the selection */ - gboolean use_cairo; /* temp hack */ - GdkSegment *segs_in; /* gdk segments of area boundary */ gint n_segs_in; /* number of segments in segs_in */ @@ -68,8 +61,7 @@ struct _Selection gboolean hidden; /* is the selection hidden? */ gboolean layer_hidden; /* is the layer boundary hidden? */ guint timeout; /* timer for successive draws */ - GdkPoint *points_in[8]; /* points of segs_in for fast ants */ - gint num_points_in[8]; /* number of points in points_in */ + cairo_pattern_t *segs_in_mask; /* cache for rendered segments */ }; @@ -86,12 +78,7 @@ static void selection_undraw (Selection *selection); static void selection_layer_undraw (Selection *selection); static void selection_layer_draw (Selection *selection); -static void selection_add_point (GdkPoint *points[8], - gint max_npoints[8], - gint npoints[8], - gint x, - gint y); -static void selection_render_points (Selection *selection); +static void selection_render_mask (Selection *selection); static void selection_transform_segs (Selection *selection, const BoundSeg *src_segs, @@ -124,7 +111,6 @@ gimp_display_shell_selection_init (GimpDisplayShell *shell) selection = g_slice_new0 (Selection); selection->shell = shell; - selection->use_cairo = g_getenv ("CAIRO_SELECTION") != NULL; selection->visible = TRUE; selection->hidden = ! gimp_display_shell_get_show_selection (shell); selection->layer_hidden = ! gimp_display_shell_get_show_layer (shell); @@ -298,105 +284,21 @@ selection_resume (Selection *selection) selection_start (selection); } -/* #define BENCHMARK 1 */ - static void selection_draw (Selection *selection) { - GimpCanvas *canvas = GIMP_CANVAS (selection->shell->canvas); -#ifdef BENCHMARK - GTimer *timer = g_timer_new (); - gint test; - - for (test = 0; test < 20; test++) + if (selection->segs_in) { -#endif /* BENCHMARK */ - if (selection->use_cairo) - { - if (selection->segs_in) - { - cairo_t *cr; + cairo_t *cr; - cr = gdk_cairo_create (gtk_widget_get_window (selection->shell->canvas)); + cr = gdk_cairo_create (gtk_widget_get_window (selection->shell->canvas)); - gimp_display_shell_draw_selection_in (selection->shell, cr, - selection->segs_in, - selection->n_segs_in, - selection->index % 8); + gimp_display_shell_draw_selection_in (selection->shell, cr, + selection->segs_in_mask, + selection->index % 8); - cairo_destroy (cr); - } + cairo_destroy (cr); } - else - { -#ifdef USE_DRAWPOINTS - -#ifdef VERBOSE - { - gint j, sum; - - sum = 0; - for (j = 0; j < 8; j++) - sum += selection->num_points_in[j]; - - g_print ("%d segments, %d points\n", selection->n_segs_in, sum); - } -#endif - - if (selection->segs_in) - { - gint i; - - if (selection->index == 0) - { - for (i = 0; i < 4; i++) - if (selection->num_points_in[i]) - gimp_canvas_draw_points (canvas, GIMP_CANVAS_STYLE_WHITE, - selection->points_in[i], - selection->num_points_in[i]); - - for (i = 4; i < 8; i++) - if (selection->num_points_in[i]) - gimp_canvas_draw_points (canvas, GIMP_CANVAS_STYLE_BLACK, - selection->points_in[i], - selection->num_points_in[i]); - } - else - { - i = ((selection->index + 3) & 7); - if (selection->num_points_in[i]) - gimp_canvas_draw_points (canvas, GIMP_CANVAS_STYLE_WHITE, - selection->points_in[i], - selection->num_points_in[i]); - - i = ((selection->index + 7) & 7); - if (selection->num_points_in[i]) - gimp_canvas_draw_points (canvas, GIMP_CANVAS_STYLE_BLACK, - selection->points_in[i], - selection->num_points_in[i]); - } - } - -#else /* ! USE_DRAWPOINTS */ - - gimp_canvas_set_stipple_index (canvas, - GIMP_CANVAS_STYLE_SELECTION_IN, - selection->index); - if (selection->segs_in) - gimp_canvas_draw_segments (canvas, GIMP_CANVAS_STYLE_SELECTION_IN, - selection->segs_in, - selection->n_segs_in); - -#endif /* USE_DRAWPOINTS */ - } -#ifdef BENCHMARK - } - - g_printerr ("drawing 20 selections took %f seconds\n", - g_timer_elapsed (timer, NULL)); - - g_timer_destroy (timer); -#endif /* BENCHMARK */ } static void @@ -432,7 +334,8 @@ selection_layer_draw (Selection *selection) cr = gdk_cairo_create (gtk_widget_get_window (selection->shell->canvas)); - gimp_display_shell_draw_layer_boundary (selection->shell, cr, drawable, + gimp_display_shell_draw_layer_boundary (selection->shell, cr, + drawable, selection->segs_layer, selection->n_segs_layer); @@ -447,15 +350,15 @@ selection_layer_undraw (Selection *selection) if (selection->segs_layer && selection->n_segs_layer == 4) { - gint x1 = selection->segs_layer[0].x1 - 1; - gint y1 = selection->segs_layer[0].y1 - 1; - gint x2 = selection->segs_layer[3].x2 + 1; - gint y2 = selection->segs_layer[3].y2 + 1; + const gint x1 = selection->segs_layer[0].x1 - 1; + const gint y1 = selection->segs_layer[0].y1 - 1; + const gint x2 = selection->segs_layer[3].x2 + 1; + const gint y2 = selection->segs_layer[3].y2 + 1; - gint x3 = selection->segs_layer[0].x1 + 1; - gint y3 = selection->segs_layer[0].y1 + 1; - gint x4 = selection->segs_layer[3].x2 - 1; - gint y4 = selection->segs_layer[3].y2 - 1; + const gint x3 = selection->segs_layer[0].x1 + 1; + const gint y3 = selection->segs_layer[0].y1 + 1; + const gint x4 = selection->segs_layer[3].x2 - 1; + const gint y4 = selection->segs_layer[3].y2 - 1; /* expose the region, this will restart the selection */ gimp_display_shell_expose_area (selection->shell, @@ -474,137 +377,24 @@ selection_layer_undraw (Selection *selection) } static void -selection_add_point (GdkPoint *points[8], - gint max_npoints[8], - gint npoints[8], - gint x, - gint y) +selection_render_mask (Selection *selection) { - gint i, j; + cairo_t *cr; - j = (x - y) & 7; + cr = gdk_cairo_create (gtk_widget_get_window (selection->shell->canvas)); - i = npoints[j]++; - if (i == max_npoints[j]) - { - max_npoints[j] += 2048; - points[j] = g_realloc (points[j], sizeof (GdkPoint) * max_npoints[j]); - } + cairo_push_group_with_content (cr, CAIRO_CONTENT_ALPHA); - points[j][i].x = x; - points[j][i].y = y; -} + cairo_set_line_width (cr, 1.0); + gimp_cairo_add_segments (cr, + selection->segs_in, + selection->n_segs_in); + cairo_stroke (cr); -/* Render the segs_in array into points_in */ + selection->segs_in_mask = cairo_pop_group (cr); -static void -selection_render_points (Selection *selection) -{ - gint max_npoints[8]; - gint i; - - if (selection->segs_in == NULL) - return; - - for (i = 0; i < 8; i++) - { - max_npoints[i] = MAX_POINTS_INC; - selection->points_in[i] = g_new (GdkPoint, max_npoints[i]); - selection->num_points_in[i] = 0; - } - - for (i = 0; i < selection->n_segs_in; i++) - { - gint x, y; - gint dx, dy; - gint dxa, dya; - gint r; - -#ifdef VERBOSE - g_print ("%2d: (%d, %d) - (%d, %d)\n", i, - selection->segs_in[i].x1, - selection->segs_in[i].y1, - selection->segs_in[i].x2, - selection->segs_in[i].y2); -#endif - - x = selection->segs_in[i].x1; - dxa = selection->segs_in[i].x2 - x; - - if (dxa > 0) - { - dx = 1; - } - else - { - dxa = -dxa; - dx = -1; - } - - y = selection->segs_in[i].y1; - dya = selection->segs_in[i].y2 - y; - - if (dya > 0) - { - dy = 1; - } - else - { - dya = -dya; - dy = -1; - } - - if (dxa > dya) - { - r = dya; - - do - { - selection_add_point (selection->points_in, - max_npoints, - selection->num_points_in, - x, y); - x += dx; - r += dya; - - if (r >= (dxa << 1)) - { - y += dy; - r -= (dxa << 1); - } - } - while (x != selection->segs_in[i].x2); - } - else if (dxa < dya) - { - r = dxa; - - do - { - selection_add_point (selection->points_in, - max_npoints, - selection->num_points_in, - x, y); - y += dy; - r += dxa; - - if (r >= (dya << 1)) - { - x += dx; - r -= (dya << 1); - } - } - while (y != selection->segs_in[i].y2); - } - else - { - selection_add_point (selection->points_in, - max_npoints, - selection->num_points_in, - x, y); - } - } + cairo_destroy (cr); } static void @@ -613,9 +403,9 @@ selection_transform_segs (Selection *selection, GdkSegment *dest_segs, gint n_segs) { - gint xclamp = selection->shell->disp_width + 1; - gint yclamp = selection->shell->disp_height + 1; - gint i; + const gint xclamp = selection->shell->disp_width + 1; + const gint yclamp = selection->shell->disp_height + 1; + gint i; gimp_display_shell_transform_segments (selection->shell, src_segs, dest_segs, n_segs, FALSE); @@ -633,7 +423,7 @@ selection_transform_segs (Selection *selection, * lie outside the region... * we need to transform it by one display pixel */ - if (!src_segs[i].open) + if (! src_segs[i].open) { /* If it is vertical */ if (dest_segs[i].x1 == dest_segs[i].x2) @@ -672,9 +462,7 @@ selection_generate_segs (Selection *selection) selection_transform_segs (selection, segs_in, selection->segs_in, selection->n_segs_in); -#ifdef USE_DRAWPOINTS - selection_render_points (selection); -#endif + selection_render_mask (selection); } else { @@ -718,8 +506,6 @@ selection_generate_segs (Selection *selection) static void selection_free_segs (Selection *selection) { - gint j; - if (selection->segs_in) { g_free (selection->segs_in); @@ -741,14 +527,10 @@ selection_free_segs (Selection *selection) selection->n_segs_layer = 0; } - for (j = 0; j < 8; j++) + if (selection->segs_in_mask) { - if (selection->points_in[j]) - { - g_free (selection->points_in[j]); - selection->points_in[j] = NULL; - selection->num_points_in[j] = 0; - } + cairo_pattern_destroy (selection->segs_in_mask); + selection->segs_in_mask = NULL; } } @@ -771,31 +553,21 @@ selection_start_timeout (Selection *selection) /* Draw the ants */ if (! selection->hidden) { - GimpCanvas *canvas = GIMP_CANVAS (selection->shell->canvas); GimpDisplayConfig *config = selection->shell->display->config; selection_draw (selection); if (selection->segs_out) { - if (selection->use_cairo) - { - cairo_t *cr; + cairo_t *cr; - cr = gdk_cairo_create (gtk_widget_get_window (selection->shell->canvas)); + cr = gdk_cairo_create (gtk_widget_get_window (selection->shell->canvas)); - gimp_display_shell_draw_selection_out (selection->shell, cr, - selection->segs_out, - selection->n_segs_out); + gimp_display_shell_draw_selection_out (selection->shell, cr, + selection->segs_out, + selection->n_segs_out); - cairo_destroy (cr); - } - else - { - gimp_canvas_draw_segments (canvas, GIMP_CANVAS_STYLE_SELECTION_OUT, - selection->segs_out, - selection->n_segs_out); - } + cairo_destroy (cr); } if (selection->segs_in && selection->visible) diff --git a/app/display/gimpdisplayshell-style.c b/app/display/gimpdisplayshell-style.c index bf1b67b43d..bed3678569 100644 --- a/app/display/gimpdisplayshell-style.c +++ b/app/display/gimpdisplayshell-style.c @@ -34,6 +34,8 @@ #include "core/gimpgrid.h" #include "core/gimplayermask.h" +#include "widgets/gimpcairo.h" + #include "gimpdisplayshell.h" #include "gimpdisplayshell-style.h" @@ -62,14 +64,6 @@ static const GimpRGB selection_in_fg = { 0.0, 0.0, 0.0, 1.0 }; static const GimpRGB selection_in_bg = { 1.0, 1.0, 1.0, 1.0 }; -/* local function prototypes */ - -static void gimp_display_shell_set_stipple_style (cairo_t *cr, - const GimpRGB *fg, - const GimpRGB *bg, - gint index); - - /* public functions */ void @@ -77,21 +71,24 @@ gimp_display_shell_set_guide_style (GimpDisplayShell *shell, cairo_t *cr, gboolean active) { + cairo_pattern_t *pattern; + g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); cairo_set_line_width (cr, 1.0); if (active) - gimp_display_shell_set_stipple_style (cr, - &guide_active_fg, - &guide_active_bg, - 0); + pattern = gimp_cairo_stipple_pattern_create (&guide_active_fg, + &guide_active_bg, + 0); else - gimp_display_shell_set_stipple_style (cr, - &guide_normal_fg, - &guide_normal_bg, - 0); + pattern = gimp_cairo_stipple_pattern_create (&guide_normal_fg, + &guide_normal_bg, + 0); + + cairo_set_source (cr, pattern); + cairo_pattern_destroy (pattern); } void @@ -129,24 +126,27 @@ gimp_display_shell_set_grid_style (GimpDisplayShell *shell, switch (grid->style) { + cairo_pattern_t *pattern; + case GIMP_GRID_ON_OFF_DASH: case GIMP_GRID_DOUBLE_DASH: if (grid->style == GIMP_GRID_DOUBLE_DASH) { - gimp_display_shell_set_stipple_style (cr, - &grid->fgcolor, - &grid->bgcolor, - 0); + pattern = gimp_cairo_stipple_pattern_create (&grid->fgcolor, + &grid->bgcolor, + 0); } else { GimpRGB bg = { 0.0, 0.0, 0.0, 0.0 }; - gimp_display_shell_set_stipple_style (cr, - &grid->fgcolor, - &bg, - 0); + pattern = gimp_cairo_stipple_pattern_create (&grid->fgcolor, + &bg, + 0); } + + cairo_set_source (cr, pattern); + cairo_pattern_destroy (pattern); break; case GIMP_GRID_DOTS: @@ -208,6 +208,8 @@ gimp_display_shell_set_layer_style (GimpDisplayShell *shell, cairo_t *cr, GimpDrawable *drawable) { + cairo_pattern_t *pattern; + g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); g_return_if_fail (GIMP_IS_DRAWABLE (drawable)); @@ -216,40 +218,43 @@ gimp_display_shell_set_layer_style (GimpDisplayShell *shell, if (GIMP_IS_LAYER_MASK (drawable)) { - gimp_display_shell_set_stipple_style (cr, - &layer_mask_fg, - &layer_mask_bg, - 0); + pattern = gimp_cairo_stipple_pattern_create (&layer_mask_fg, + &layer_mask_bg, + 0); } else if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable))) { - gimp_display_shell_set_stipple_style (cr, - &layer_group_fg, - &layer_group_bg, - 0); + pattern = gimp_cairo_stipple_pattern_create (&layer_group_fg, + &layer_group_bg, + 0); } else { - gimp_display_shell_set_stipple_style (cr, - &layer_fg, - &layer_bg, - 0); + pattern = gimp_cairo_stipple_pattern_create (&layer_fg, + &layer_bg, + 0); } + + cairo_set_source (cr, pattern); + cairo_pattern_destroy (pattern); } void gimp_display_shell_set_selection_out_style (GimpDisplayShell *shell, cairo_t *cr) { + cairo_pattern_t *pattern; + g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); cairo_set_line_width (cr, 1.0); - gimp_display_shell_set_stipple_style (cr, - &selection_out_fg, - &selection_out_bg, - 0); + pattern = gimp_cairo_stipple_pattern_create (&selection_out_fg, + &selection_out_bg, + 0); + cairo_set_source (cr, pattern); + cairo_pattern_destroy (pattern); } void @@ -257,61 +262,16 @@ gimp_display_shell_set_selection_in_style (GimpDisplayShell *shell, cairo_t *cr, gint index) { + cairo_pattern_t *pattern; + g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); cairo_set_line_width (cr, 1.0); - gimp_display_shell_set_stipple_style (cr, - &selection_in_fg, - &selection_in_bg, - index); -} - - -/* private functions */ - -static cairo_user_data_key_t surface_data_key = { 0, }; - -static void -gimp_display_shell_set_stipple_style (cairo_t *cr, - const GimpRGB *fg, - const GimpRGB *bg, - gint index) -{ - cairo_surface_t *surface; - guchar *data = g_malloc0 (8 * 8 * 4); - guchar fg_r, fg_g, fg_b, fg_a; - guchar bg_r, bg_g, bg_b, bg_a; - gint x, y; - guchar *d; - - gimp_rgba_get_uchar (fg, &fg_r, &fg_g, &fg_b, &fg_a); - gimp_rgba_get_uchar (bg, &bg_r, &bg_g, &bg_b, &bg_a); - - d = data; - - for (y = 0; y < 8; y++) - { - for (x = 0; x < 8; x++) - { - if ((x + y + index) % 8 >= 4) - GIMP_CAIRO_ARGB32_SET_PIXEL (d, fg_r, fg_g, fg_b, fg_a); - else - GIMP_CAIRO_ARGB32_SET_PIXEL (d, bg_r, bg_g, bg_b, bg_a); - - d += 4; - } - } - - surface = cairo_image_surface_create_for_data (data, - CAIRO_FORMAT_ARGB32, - 8, 8, 8 * 4); - cairo_surface_set_user_data (surface, &surface_data_key, - data, (cairo_destroy_func_t) g_free); - - cairo_set_source_surface (cr, surface, 0, 0); - cairo_surface_destroy (surface); - - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + pattern = gimp_cairo_stipple_pattern_create (&selection_in_fg, + &selection_in_bg, + index); + cairo_set_source (cr, pattern); + cairo_pattern_destroy (pattern); } diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index c72310aa1e..d8a38703b4 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -289,9 +289,9 @@ gimp_display_shell_init (GimpDisplayShell *shell) shell->x_src_dec = 1; shell->y_src_dec = 1; - shell->render_buf = g_new (guchar, - GIMP_DISPLAY_RENDER_BUF_WIDTH * - GIMP_DISPLAY_RENDER_BUF_HEIGHT * 3); + shell->render_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, + GIMP_DISPLAY_RENDER_BUF_WIDTH, + GIMP_DISPLAY_RENDER_BUF_HEIGHT); shell->icon_size = 32; @@ -868,10 +868,10 @@ gimp_display_shell_destroy (GtkObject *object) shell->filter_idle_id = 0; } - if (shell->render_buf) + if (shell->render_surface) { - g_free (shell->render_buf); - shell->render_buf = NULL; + cairo_surface_destroy (shell->render_surface); + shell->render_surface = NULL; } if (shell->highlight) diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h index bfd4d9816c..63a6e240a9 100644 --- a/app/display/gimpdisplayshell.h +++ b/app/display/gimpdisplayshell.h @@ -131,7 +131,7 @@ struct _GimpDisplayShell GtkWidget *statusbar; /* statusbar */ - guchar *render_buf; /* buffer for rendering the image */ + cairo_surface_t *render_surface; /* buffer for rendering the image */ guint title_idle_id; /* title update idle ID */ gchar *title; /* current title */ diff --git a/app/pdb/gimppdb-utils.c b/app/pdb/gimppdb-utils.c index 76b298dbd9..cb450702c2 100644 --- a/app/pdb/gimppdb-utils.c +++ b/app/pdb/gimppdb-utils.c @@ -315,7 +315,7 @@ gimp_pdb_item_is_attached (GimpItem *item, if (! gimp_item_is_attached (item)) { g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT, - _("Item '%s' (%d) can not be used because it has not " + _("Item '%s' (%d) cannot be used because it has not " "been added to an image"), gimp_object_get_name (item), gimp_item_get_ID (item)); @@ -325,7 +325,7 @@ gimp_pdb_item_is_attached (GimpItem *item, if (image && image != gimp_item_get_image (item)) { g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT, - _("Item '%s' (%d) can not be used because it is " + _("Item '%s' (%d) cannot be used because it is " "attached to another image"), gimp_object_get_name (item), gimp_item_get_ID (item)); @@ -354,7 +354,7 @@ gimp_pdb_item_is_in_tree (GimpItem *item, if (! gimp_item_get_tree (item)) { g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT, - _("Item '%s' (%d) can not be used because it is not " + _("Item '%s' (%d) cannot be used because it is not " "a direct child of an item tree"), gimp_object_get_name (item), gimp_item_get_ID (item)); @@ -364,6 +364,61 @@ gimp_pdb_item_is_in_tree (GimpItem *item, return TRUE; } +gboolean +gimp_pdb_item_is_in_same_tree (GimpItem *item, + GimpItem *item2, + GimpImage *image, + GError **error) +{ + g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE); + g_return_val_if_fail (GIMP_IS_ITEM (item2), FALSE); + g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (! gimp_pdb_item_is_in_tree (item, image, FALSE, error) || + ! gimp_pdb_item_is_in_tree (item2, image, FALSE, error)) + return FALSE; + + if (gimp_item_get_tree (item) != gimp_item_get_tree (item2)) + { + g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT, + _("Items '%s' (%d) and '%s' (%d) cannot be used " + "because they are not part of the same item tree"), + gimp_object_get_name (item), + gimp_item_get_ID (item), + gimp_object_get_name (item2), + gimp_item_get_ID (item2)); + return FALSE; + } + + return TRUE; +} + +gboolean +gimp_pdb_item_is_not_ancestor (GimpItem *item, + GimpItem *not_descendant, + GError **error) +{ + g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE); + g_return_val_if_fail (GIMP_IS_ITEM (not_descendant), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (gimp_viewable_is_ancestor (GIMP_VIEWABLE (item), + GIMP_VIEWABLE (not_descendant))) + { + g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT, + _("Item '%s' (%d) must not be an ancestor of " + "'%s' (%d)"), + gimp_object_get_name (item), + gimp_item_get_ID (item), + gimp_object_get_name (not_descendant), + gimp_item_get_ID (not_descendant)); + return FALSE; + } + + return TRUE; +} + gboolean gimp_pdb_item_is_floating (GimpItem *item, GimpImage *dest_image, @@ -413,6 +468,26 @@ gimp_pdb_item_is_writable (GimpItem *item, return TRUE; } +gboolean +gimp_pdb_item_is_group (GimpItem *item, + GError **error) +{ + g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (! gimp_viewable_get_children (GIMP_VIEWABLE (item))) + { + g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT, + _("Item '%s' (%d) cannot be used because it is " + "not a group item"), + gimp_object_get_name (item), + gimp_item_get_ID (item)); + return FALSE; + } + + return TRUE; +} + gboolean gimp_pdb_item_is_not_group (GimpItem *item, GError **error) @@ -444,7 +519,7 @@ gimp_pdb_layer_is_text_layer (GimpLayer *layer, if (! gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer))) { g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT, - _("Layer '%s' (%d) can not be used because it is not " + _("Layer '%s' (%d) cannot be used because it is not " "a text layer"), gimp_object_get_name (layer), gimp_item_get_ID (GIMP_ITEM (layer))); diff --git a/app/pdb/gimppdb-utils.h b/app/pdb/gimppdb-utils.h index f5a8a5989f..d25a23a82f 100644 --- a/app/pdb/gimppdb-utils.h +++ b/app/pdb/gimppdb-utils.h @@ -56,11 +56,20 @@ gboolean gimp_pdb_item_is_in_tree (GimpItem *item, GimpImage *image, gboolean writable, GError **error); +gboolean gimp_pdb_item_is_in_same_tree (GimpItem *item, + GimpItem *item2, + GimpImage *image, + GError **error); +gboolean gimp_pdb_item_is_not_ancestor (GimpItem *item, + GimpItem *not_descendant, + GError **error); gboolean gimp_pdb_item_is_floating (GimpItem *item, GimpImage *dest_image, GError **error); gboolean gimp_pdb_item_is_writable (GimpItem *item, GError **error); +gboolean gimp_pdb_item_is_group (GimpItem *item, + GError **error); gboolean gimp_pdb_item_is_not_group (GimpItem *item, GError **error); diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c index 254062d613..df4c6cb349 100644 --- a/app/pdb/image-cmds.c +++ b/app/pdb/image-cmds.c @@ -44,6 +44,7 @@ #include "core/gimpimage-rotate.h" #include "core/gimpimage-scale.h" #include "core/gimpimage.h" +#include "core/gimpitem.h" #include "core/gimplayer.h" #include "core/gimplayermask.h" #include "core/gimpparamspecs.h" @@ -956,6 +957,310 @@ image_remove_layer_invoker (GimpProcedure *procedure, error ? *error : NULL); } +static GValueArray * +image_add_channel_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpChannel *channel; + gint32 position; + + image = gimp_value_get_image (&args->values[0], gimp); + channel = gimp_value_get_channel (&args->values[1], gimp); + position = g_value_get_int (&args->values[2]); + + if (success) + { + if (gimp_pdb_item_is_floating (GIMP_ITEM (channel), image, error)) + { + /* FIXME tree */ + success = gimp_image_add_channel (image, channel, + NULL, MAX (position, -1), TRUE); + } + else + { + success = FALSE; + } + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_remove_channel_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpChannel *channel; + + image = gimp_value_get_image (&args->values[0], gimp); + channel = gimp_value_get_channel (&args->values[1], gimp); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), image, FALSE, error)) + gimp_image_remove_channel (image, channel, TRUE, NULL); + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_add_vectors_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpVectors *vectors; + gint32 position; + + image = gimp_value_get_image (&args->values[0], gimp); + vectors = gimp_value_get_vectors (&args->values[1], gimp); + position = g_value_get_int (&args->values[2]); + + if (success) + { + if (gimp_pdb_item_is_floating (GIMP_ITEM (vectors), image, error)) + { + /* FIXME tree */ + success = gimp_image_add_vectors (image, vectors, + NULL, MAX (position, -1), TRUE); + } + else + { + success = FALSE; + } + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_remove_vectors_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpVectors *vectors; + + image = gimp_value_get_image (&args->values[0], gimp); + vectors = gimp_value_get_vectors (&args->values[1], gimp); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) + gimp_image_remove_vectors (image, vectors, TRUE, NULL); + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_get_item_position_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GValueArray *return_vals; + GimpImage *image; + GimpItem *item; + gint32 position = 0; + + image = gimp_value_get_image (&args->values[0], gimp); + item = gimp_value_get_item (&args->values[1], gimp); + + if (success) + { + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + position = gimp_item_get_index (item); + else + success = FALSE; + } + + return_vals = gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); + + if (success) + g_value_set_int (&return_vals->values[1], position); + + return return_vals; +} + +static GValueArray * +image_raise_item_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpItem *item; + + image = gimp_value_get_image (&args->values[0], gimp); + item = gimp_value_get_item (&args->values[1], gimp); + + if (success) + { + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_raise_item (image, item, error); + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_lower_item_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpItem *item; + + image = gimp_value_get_image (&args->values[0], gimp); + item = gimp_value_get_item (&args->values[1], gimp); + + if (success) + { + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_lower_item (image, item, error); + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_raise_item_to_top_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpItem *item; + + image = gimp_value_get_image (&args->values[0], gimp); + item = gimp_value_get_item (&args->values[1], gimp); + + if (success) + { + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_raise_item_to_top (image, item); + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_lower_item_to_bottom_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpItem *item; + + image = gimp_value_get_image (&args->values[0], gimp); + item = gimp_value_get_item (&args->values[1], gimp); + + if (success) + { + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_lower_item_to_bottom (image, item); + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GValueArray * +image_reorder_item_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpImage *image; + GimpItem *item; + GimpItem *parent; + gint32 position; + + image = gimp_value_get_image (&args->values[0], gimp); + item = gimp_value_get_item (&args->values[1], gimp); + parent = gimp_value_get_item (&args->values[2], gimp); + position = g_value_get_int (&args->values[3]); + + if (success) + { + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error) && + (parent == NULL || + (gimp_pdb_item_is_in_same_tree (item, parent, image, error) && + gimp_pdb_item_is_group (parent, error) && + gimp_pdb_item_is_not_ancestor (item, parent, error)))) + { + success = gimp_image_reorder_item (image, item, parent, position, + TRUE, NULL); + } + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + static GValueArray * image_get_layer_position_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -1100,68 +1405,6 @@ image_lower_layer_to_bottom_invoker (GimpProcedure *procedure, error ? *error : NULL); } -static GValueArray * -image_add_channel_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpChannel *channel; - gint32 position; - - image = gimp_value_get_image (&args->values[0], gimp); - channel = gimp_value_get_channel (&args->values[1], gimp); - position = g_value_get_int (&args->values[2]); - - if (success) - { - if (gimp_pdb_item_is_floating (GIMP_ITEM (channel), image, error)) - { - /* FIXME tree */ - success = gimp_image_add_channel (image, channel, - NULL, MAX (position, -1), TRUE); - } - else - { - success = FALSE; - } - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_remove_channel_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpChannel *channel; - - image = gimp_value_get_image (&args->values[0], gimp); - channel = gimp_value_get_channel (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), image, FALSE, error)) - gimp_image_remove_channel (image, channel, TRUE, NULL); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - static GValueArray * image_get_channel_position_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -1252,68 +1495,6 @@ image_lower_channel_invoker (GimpProcedure *procedure, error ? *error : NULL); } -static GValueArray * -image_add_vectors_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpVectors *vectors; - gint32 position; - - image = gimp_value_get_image (&args->values[0], gimp); - vectors = gimp_value_get_vectors (&args->values[1], gimp); - position = g_value_get_int (&args->values[2]); - - if (success) - { - if (gimp_pdb_item_is_floating (GIMP_ITEM (vectors), image, error)) - { - /* FIXME tree */ - success = gimp_image_add_vectors (image, vectors, - NULL, MAX (position, -1), TRUE); - } - else - { - success = FALSE; - } - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_remove_vectors_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpVectors *vectors; - - image = gimp_value_get_image (&args->values[0], gimp); - vectors = gimp_value_get_vectors (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - gimp_image_remove_vectors (image, vectors, TRUE, NULL); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - static GValueArray * image_get_vectors_position_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -3457,157 +3638,6 @@ register_image_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); - /* - * gimp-image-get-layer-position - */ - procedure = gimp_procedure_new (image_get_layer_position_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-get-layer-position"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-get-layer-position", - "Returns the position of the layer in the layer stack.", - "This procedure determines the position of the specified layer in the images layer stack. If the layer doesn't exist in the image, an error is returned.", - "Simon Budig", - "Simon Budig", - "2006", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_return_value (procedure, - gimp_param_spec_int32 ("position", - "position", - "The position of the layer in the layer stack", - G_MININT32, G_MAXINT32, 0, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-layer - */ - procedure = gimp_procedure_new (image_raise_layer_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-layer"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-layer", - "Raise the specified layer in the image's layer stack", - "This procedure raises the specified layer one step in the existing layer stack. The procecure call will fail if there is no layer above it.", - "Spencer Kimball & Peter Mattis", - "Spencer Kimball & Peter Mattis", - "1995-1996", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to raise", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-layer - */ - procedure = gimp_procedure_new (image_lower_layer_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-layer"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-layer", - "Lower the specified layer in the image's layer stack", - "This procedure lowers the specified layer one step in the existing layer stack. The procecure call will fail if there is no layer below it.", - "Spencer Kimball & Peter Mattis", - "Spencer Kimball & Peter Mattis", - "1995-1996", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to lower", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-layer-to-top - */ - procedure = gimp_procedure_new (image_raise_layer_to_top_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-layer-to-top"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-layer-to-top", - "Raise the specified layer in the image's layer stack to top of stack", - "This procedure raises the specified layer to top of the existing layer stack. It will not move the layer if there is no layer above it.", - "Wolfgang Hofer, Sven Neumann", - "Wolfgang Hofer", - "1998", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to raise to top", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-layer-to-bottom - */ - procedure = gimp_procedure_new (image_lower_layer_to_bottom_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-layer-to-bottom"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-layer-to-bottom", - "Lower the specified layer in the image's layer stack to bottom of stack", - "This procedure lowers the specified layer to bottom of the existing layer stack. It will not move the layer if there is no layer below it.", - "Wolfgang Hofer, Sven Neumann", - "Wolfgang Hofer", - "1998", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to lower to bottom", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - /* * gimp-image-add-channel */ @@ -3672,99 +3702,6 @@ register_image_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); - /* - * gimp-image-get-channel-position - */ - procedure = gimp_procedure_new (image_get_channel_position_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-get-channel-position"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-get-channel-position", - "Returns the position of the channel in the channel stack.", - "This procedure determines the position of the specified channel in the images channel stack. If the channel doesn't exist in the image, an error is returned.", - "Simon Budig", - "Simon Budig", - "2006", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_channel_id ("channel", - "channel", - "The channel", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_return_value (procedure, - gimp_param_spec_int32 ("position", - "position", - "The position of the channel in the channel stack", - G_MININT32, G_MAXINT32, 0, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-channel - */ - procedure = gimp_procedure_new (image_raise_channel_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-channel"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-channel", - "Raise the specified channel in the image's channel stack", - "This procedure raises the specified channel one step in the existing channel stack. The procecure call will fail if there is no channel above it.", - "Spencer Kimball & Peter Mattis", - "Spencer Kimball & Peter Mattis", - "1995-1996", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_channel_id ("channel", - "channel", - "The channel to raise", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-channel - */ - procedure = gimp_procedure_new (image_lower_channel_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-channel"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-channel", - "Lower the specified channel in the image's channel stack", - "This procedure lowers the specified channel one step in the existing channel stack. The procecure call will fail if there is no channel below it.", - "Spencer Kimball & Peter Mattis", - "Spencer Kimball & Peter Mattis", - "1995-1996", - NULL); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_channel_id ("channel", - "channel", - "The channel to lower", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - /* * gimp-image-add-vectors */ @@ -3829,6 +3766,442 @@ register_image_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); + /* + * gimp-image-get-item-position + */ + procedure = gimp_procedure_new (image_get_item_position_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-get-item-position"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-get-item-position", + "Returns the position of the item in its level of its item tree.", + "This procedure determines the position of the specified item in its level in its item tree in the image. If the item doesn't exist in the image, or the item is not part of an item tree, an error is returned.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_return_value (procedure, + gimp_param_spec_int32 ("position", + "position", + "The position of the item in its level in the item tree", + G_MININT32, G_MAXINT32, 0, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-raise-item + */ + procedure = gimp_procedure_new (image_raise_item_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-raise-item"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-raise-item", + "Raise the specified item in its level in its item tree", + "This procedure raises the specified item one step in the item tree. The procecure call will fail if there is no item above it.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item to raise", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-lower-item + */ + procedure = gimp_procedure_new (image_lower_item_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-lower-item"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-lower-item", + "Lower the specified item in its level in its item tree", + "This procedure lowers the specified item one step in the item tree. The procecure call will fail if there is no item below it.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item to lower", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-raise-item-to-top + */ + procedure = gimp_procedure_new (image_raise_item_to_top_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-raise-item-to-top"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-raise-item-to-top", + "Raise the specified item to the top of its level in its item tree", + "This procedure raises the specified item to top of its level in the item tree. It will not move the item if there is no item above it.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item to raise to top", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-lower-item-to-bottom + */ + procedure = gimp_procedure_new (image_lower_item_to_bottom_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-lower-item-to-bottom"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-lower-item-to-bottom", + "Lower the specified item to the bottom of its level in its item tree", + "This procedure lowers the specified item to bottom of its level in the item tree. It will not move the layer if there is no layer below it.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item to lower to bottom", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-reorder-item + */ + procedure = gimp_procedure_new (image_reorder_item_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-reorder-item"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-reorder-item", + "Reorder the specified item within its item tree", + "This procedure reorders the specified item within its item tree.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item to reorder", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("parent", + "parent", + "The new parent item", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_int32 ("position", + "position", + "The new position of the item", + G_MININT32, G_MAXINT32, 0, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-get-layer-position + */ + procedure = gimp_procedure_new (image_get_layer_position_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-get-layer-position"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-get-layer-position", + "Deprecated: Use 'gimp-image-get-item-position' instead.", + "Deprecated: Use 'gimp-image-get-item-position' instead.", + "Simon Budig", + "Simon Budig", + "2006", + "gimp-image-get-item-position"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_layer_id ("layer", + "layer", + "The layer", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_return_value (procedure, + gimp_param_spec_int32 ("position", + "position", + "The position of the layer in the layer stack", + G_MININT32, G_MAXINT32, 0, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-raise-layer + */ + procedure = gimp_procedure_new (image_raise_layer_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-raise-layer"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-raise-layer", + "Deprecated: Use 'gimp-image-raise-item' instead.", + "Deprecated: Use 'gimp-image-raise-item' instead.", + "", + "", + "", + "gimp-image-raise-item"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_layer_id ("layer", + "layer", + "The layer to raise", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-lower-layer + */ + procedure = gimp_procedure_new (image_lower_layer_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-lower-layer"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-lower-layer", + "Deprecated: Use 'gimp-image-lower-item' instead.", + "Deprecated: Use 'gimp-image-lower-item' instead.", + "", + "", + "", + "gimp-image-lower-item"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_layer_id ("layer", + "layer", + "The layer to lower", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-raise-layer-to-top + */ + procedure = gimp_procedure_new (image_raise_layer_to_top_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-raise-layer-to-top"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-raise-layer-to-top", + "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", + "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", + "", + "", + "", + "gimp-image-raise-item-to-top"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_layer_id ("layer", + "layer", + "The layer to raise to top", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-lower-layer-to-bottom + */ + procedure = gimp_procedure_new (image_lower_layer_to_bottom_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-lower-layer-to-bottom"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-lower-layer-to-bottom", + "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", + "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", + "", + "", + "", + "gimp-image-lower-item-to-bottom"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_layer_id ("layer", + "layer", + "The layer to lower to bottom", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-get-channel-position + */ + procedure = gimp_procedure_new (image_get_channel_position_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-get-channel-position"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-get-channel-position", + "Deprecated: Use 'gimp-image-get-item-position' instead.", + "Deprecated: Use 'gimp-image-get-item-position' instead.", + "Simon Budig", + "Simon Budig", + "2006", + "gimp-image-get-item-position"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_channel_id ("channel", + "channel", + "The channel", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_return_value (procedure, + gimp_param_spec_int32 ("position", + "position", + "The position of the channel in the channel stack", + G_MININT32, G_MAXINT32, 0, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-raise-channel + */ + procedure = gimp_procedure_new (image_raise_channel_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-raise-channel"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-raise-channel", + "Deprecated: Use 'gimp-image-raise-item' instead.", + "Deprecated: Use 'gimp-image-raise-item' instead.", + "", + "", + "", + "gimp-image-raise-item"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_channel_id ("channel", + "channel", + "The channel to raise", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-image-lower-channel + */ + procedure = gimp_procedure_new (image_lower_channel_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-image-lower-channel"); + gimp_procedure_set_static_strings (procedure, + "gimp-image-lower-channel", + "Deprecated: Use 'gimp-image-lower-item' instead.", + "Deprecated: Use 'gimp-image-lower-item' instead.", + "", + "", + "", + "gimp-image-lower-item"); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "The image", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_channel_id ("channel", + "channel", + "The channel to lower", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + /* * gimp-image-get-vectors-position */ @@ -3837,12 +4210,12 @@ register_image_procs (GimpPDB *pdb) "gimp-image-get-vectors-position"); gimp_procedure_set_static_strings (procedure, "gimp-image-get-vectors-position", - "Returns the position of the vectors object in the vectors objects stack.", - "This procedure determines the position of the specified vectors object in the images vectors object stack. If the vectors object doesn't exist in the image, an error is returned.", + "Deprecated: Use 'gimp-image-get-item-position' instead.", + "Deprecated: Use 'gimp-image-get-item-position' instead.", "Simon Budig", "Simon Budig", "2006", - NULL); + "gimp-image-get-item-position"); gimp_procedure_add_argument (procedure, gimp_param_spec_image_id ("image", "image", @@ -3872,12 +4245,12 @@ register_image_procs (GimpPDB *pdb) "gimp-image-raise-vectors"); gimp_procedure_set_static_strings (procedure, "gimp-image-raise-vectors", - "Raise the specified vectors in the image's vectors stack", - "This procedure raises the specified vectors one step in the existing vectors stack. The procecure call will fail if there is no vectors above it.", + "Deprecated: Use 'gimp-image-raise-item' instead.", + "Deprecated: Use 'gimp-image-raise-item' instead.", "Simon Budig", "Simon Budig", "2005", - NULL); + "gimp-image-raise-item"); gimp_procedure_add_argument (procedure, gimp_param_spec_image_id ("image", "image", @@ -3901,12 +4274,12 @@ register_image_procs (GimpPDB *pdb) "gimp-image-lower-vectors"); gimp_procedure_set_static_strings (procedure, "gimp-image-lower-vectors", - "Lower the specified vectors in the image's vectors stack", - "This procedure lowers the specified vectors one step in the existing vectors stack. The procecure call will fail if there is no vectors below it.", + "Deprecated: Use 'gimp-image-lower-item' instead.", + "Deprecated: Use 'gimp-image-lower-item' instead.", "Simon Budig", "Simon Budig", "2005", - NULL); + "gimp-image-lower-item"); gimp_procedure_add_argument (procedure, gimp_param_spec_image_id ("image", "image", @@ -3930,12 +4303,12 @@ register_image_procs (GimpPDB *pdb) "gimp-image-raise-vectors-to-top"); gimp_procedure_set_static_strings (procedure, "gimp-image-raise-vectors-to-top", - "Raise the specified vectors in the image's vectors stack to top of stack", - "This procedure raises the specified vectors to top of the existing vectors stack. It will not move the vectors if there is no vectors above it.", + "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", + "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", "Simon Budig", "Simon Budig", "2005", - NULL); + "gimp-image-raise-item-to-top"); gimp_procedure_add_argument (procedure, gimp_param_spec_image_id ("image", "image", @@ -3959,12 +4332,12 @@ register_image_procs (GimpPDB *pdb) "gimp-image-lower-vectors-to-bottom"); gimp_procedure_set_static_strings (procedure, "gimp-image-lower-vectors-to-bottom", - "Lower the specified vectors in the image's vectors stack to bottom of stack", - "This procedure lowers the specified vectors to bottom of the existing vectors stack. It will not move the vectors if there is no vectors below it.", + "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", + "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", "Simon Budig", "Simon Budig", "2005", - NULL); + "gimp-image-lower-item-to-bottom"); gimp_procedure_add_argument (procedure, gimp_param_spec_image_id ("image", "image", diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c index 6b91b8505d..593cfacacf 100644 --- a/app/pdb/internal-procs.c +++ b/app/pdb/internal-procs.c @@ -28,7 +28,7 @@ #include "internal-procs.h" -/* 621 procedures registered total */ +/* 630 procedures registered total */ void internal_procs_init (GimpPDB *pdb) diff --git a/app/pdb/item-cmds.c b/app/pdb/item-cmds.c index 1a08df5695..81999d9bd7 100644 --- a/app/pdb/item-cmds.c +++ b/app/pdb/item-cmds.c @@ -26,6 +26,7 @@ #include "core/gimpimage.h" #include "core/gimpitem.h" #include "core/gimplayermask.h" +#include "core/gimplist.h" #include "core/gimpparamspecs.h" #include "core/gimpselection.h" #include "text/gimptextlayer.h" @@ -293,6 +294,120 @@ item_is_vectors_invoker (GimpProcedure *procedure, return return_vals; } +static GValueArray * +item_is_group_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GValueArray *return_vals; + GimpItem *item; + gboolean group = FALSE; + + item = gimp_value_get_item (&args->values[0], gimp); + + if (success) + { + group = (gimp_viewable_get_children (GIMP_VIEWABLE (item)) != NULL); + } + + return_vals = gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); + + if (success) + g_value_set_boolean (&return_vals->values[1], group); + + return return_vals; +} + +static GValueArray * +item_get_parent_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GValueArray *return_vals; + GimpItem *item; + GimpItem *parent = NULL; + + item = gimp_value_get_item (&args->values[0], gimp); + + if (success) + { + parent = gimp_item_get_parent (item); + } + + return_vals = gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); + + if (success) + gimp_value_set_item (&return_vals->values[1], parent); + + return return_vals; +} + +static GValueArray * +item_get_children_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GValueArray *return_vals; + GimpItem *item; + gint32 num_children = 0; + gint32 *child_ids = NULL; + + item = gimp_value_get_item (&args->values[0], gimp); + + if (success) + { + GimpContainer *children = gimp_viewable_get_children (GIMP_VIEWABLE (item)); + + if (children) + { + num_children = gimp_container_get_n_children (children); + + if (num_children) + { + GList *list; + gint i; + + child_ids = g_new (gint32, num_children); + + for (list = GIMP_LIST (children)->list, i = 0; + list; + list = g_list_next (list), i++) + { + child_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data)); + } + } + } + else + success = FALSE; + + } + + return_vals = gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); + + if (success) + { + g_value_set_int (&return_vals->values[1], num_children); + gimp_value_take_int32array (&return_vals->values[2], child_ids, num_children); + } + + return return_vals; +} + static GValueArray * item_get_name_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -821,6 +936,98 @@ register_item_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); + /* + * gimp-item-is-group + */ + procedure = gimp_procedure_new (item_is_group_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-item-is-group"); + gimp_procedure_set_static_strings (procedure, + "gimp-item-is-group", + "Returns whether the item is a group item.", + "This procedure returns TRUE if the specified item is a group item which can have children.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_return_value (procedure, + g_param_spec_boolean ("group", + "group", + "TRUE if the item is a group, FALSE otherwise", + FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-item-get-parent + */ + procedure = gimp_procedure_new (item_get_parent_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-item-get-parent"); + gimp_procedure_set_static_strings (procedure, + "gimp-item-get-parent", + "Returns the item's parent item.", + "This procedure returns the item's parent item, if any.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_return_value (procedure, + gimp_param_spec_item_id ("parent", + "parent", + "The item's parent item", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-item-get-children + */ + procedure = gimp_procedure_new (item_get_children_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-item-get-children"); + gimp_procedure_set_static_strings (procedure, + "gimp-item-get-children", + "Returns the item's list of children.", + "This procedure returns the list of items which are children of the specified item. The order is topmost to bottommost.", + "Michael Natterer ", + "Michael Natterer", + "2010", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_return_value (procedure, + gimp_param_spec_int32 ("num-children", + "num children", + "The item's number of children", + 0, G_MAXINT32, 0, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_return_value (procedure, + gimp_param_spec_int32_array ("child-ids", + "child ids", + "The item's list of children", + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + /* * gimp-item-get-name */ diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am index 8975ce8951..f90a501a48 100644 --- a/app/widgets/Makefile.am +++ b/app/widgets/Makefile.am @@ -39,6 +39,8 @@ libappwidgets_a_sources = \ gimpbrushselect.h \ gimpbufferview.c \ gimpbufferview.h \ + gimpcairo.c \ + gimpcairo.h \ gimpcairo-wilber.c \ gimpcairo-wilber.h \ gimpcellrendererdashes.c \ diff --git a/app/widgets/gimpcairo.c b/app/widgets/gimpcairo.c new file mode 100644 index 0000000000..c115f74548 --- /dev/null +++ b/app/widgets/gimpcairo.c @@ -0,0 +1,201 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimpcairo.c + * Copyright (C) 2010 Michael Natterer + * + * Some code here is based on code from librsvg that was originally + * written by Raph Levien for Gill. + * + * 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 "libgimpcolor/gimpcolor.h" +#include "libgimpwidgets/gimpwidgets.h" + +#include "widgets-types.h" + +#include "gimpcairo.h" +#include "gimpcairo-wilber.h" + + +static cairo_user_data_key_t surface_data_key = { 0, }; + + +cairo_pattern_t * +gimp_cairo_stipple_pattern_create (const GimpRGB *fg, + const GimpRGB *bg, + gint index) +{ + cairo_surface_t *surface; + cairo_pattern_t *pattern; + guchar *data; + guchar *d; + guchar fg_r, fg_g, fg_b, fg_a; + guchar bg_r, bg_g, bg_b, bg_a; + gint x, y; + + g_return_val_if_fail (fg != NULL, NULL); + g_return_val_if_fail (bg != NULL, NULL); + + data = g_malloc (8 * 8 * 4); + + gimp_rgba_get_uchar (fg, &fg_r, &fg_g, &fg_b, &fg_a); + gimp_rgba_get_uchar (bg, &bg_r, &bg_g, &bg_b, &bg_a); + + d = data; + + for (y = 0; y < 8; y++) + { + for (x = 0; x < 8; x++) + { + if ((x + y + index) % 8 >= 4) + GIMP_CAIRO_ARGB32_SET_PIXEL (d, fg_r, fg_g, fg_b, fg_a); + else + GIMP_CAIRO_ARGB32_SET_PIXEL (d, bg_r, bg_g, bg_b, bg_a); + + d += 4; + } + } + + surface = cairo_image_surface_create_for_data (data, + CAIRO_FORMAT_ARGB32, + 8, 8, 8 * 4); + cairo_surface_set_user_data (surface, &surface_data_key, + data, (cairo_destroy_func_t) g_free); + + pattern = cairo_pattern_create_for_surface (surface); + cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); + + cairo_surface_destroy (surface); + + return pattern; +} + +void +gimp_cairo_add_segments (cairo_t *cr, + GdkSegment *segs, + gint n_segs) +{ + gint i; + + g_return_if_fail (cr != NULL); + g_return_if_fail (segs != NULL && n_segs > 0); + + for (i = 0; i < n_segs; i++) + { + if (segs[i].x1 == segs[i].x2) + { + cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1); + cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2); + } + else + { + cairo_move_to (cr, segs[i].x1, segs[i].y1 + 0.5); + cairo_line_to (cr, segs[i].x2, segs[i].y2 + 0.5); + } + } +} + +void +gimp_cairo_draw_toolbox_wilber (GtkWidget *widget, + cairo_t *cr) +{ + GtkStyle *style; + GtkStateType state; + GtkAllocation allocation; + gdouble wilber_width; + gdouble wilber_height; + gdouble factor; + + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (cr != NULL); + + style = gtk_widget_get_style (widget); + state = gtk_widget_get_state (widget); + + gtk_widget_get_allocation (widget, &allocation); + + gimp_cairo_wilber_get_size (cr, &wilber_width, &wilber_height); + + factor = allocation.width / wilber_width * 0.9; + + cairo_scale (cr, factor, factor); + + gimp_cairo_wilber (cr, + (allocation.width / factor - wilber_width) / 2.0, + (allocation.height / factor - wilber_height) / 2.0); + + cairo_set_source_rgba (cr, + style->fg[state].red / 65535.0, + style->fg[state].green / 65535.0, + style->fg[state].blue / 65535.0, + 0.10); + cairo_fill (cr); +} + +void +gimp_cairo_draw_drop_wilber (GtkWidget *widget, + cairo_t *cr) +{ + GtkStyle *style; + GtkStateType state; + GtkAllocation allocation; + gdouble wilber_width; + gdouble wilber_height; + gdouble width; + gdouble height; + gdouble side; + gdouble factor; + + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (cr != NULL); + + style = gtk_widget_get_style (widget); + state = gtk_widget_get_state (widget); + + gtk_widget_get_allocation (widget, &allocation); + + gimp_cairo_wilber_get_size (cr, &wilber_width, &wilber_height); + + wilber_width /= 2; + wilber_height /= 2; + + side = MIN (MIN (allocation.width, allocation.height), + MAX (allocation.width, allocation.height) / 2); + + width = MAX (wilber_width, side); + height = MAX (wilber_height, side); + + factor = MIN (width / wilber_width, height / wilber_height); + + cairo_scale (cr, factor, factor); + + /* 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); + + cairo_set_source_rgba (cr, + style->fg[state].red / 65535.0, + style->fg[state].green / 65535.0, + style->fg[state].blue / 65535.0, + 0.15); + cairo_fill (cr); +} diff --git a/app/widgets/gimpcairo.h b/app/widgets/gimpcairo.h new file mode 100644 index 0000000000..52cb07184e --- /dev/null +++ b/app/widgets/gimpcairo.h @@ -0,0 +1,42 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimpcairo.h + * Copyright (C) 2010 Michael Natterer + * + * Some code here is based on code from librsvg that was originally + * written by Raph Levien for Gill. + * + * 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_CAIRO_H__ +#define __GIMP_CAIRO_H__ + + +cairo_pattern_t * gimp_cairo_stipple_pattern_create (const GimpRGB *fg, + const GimpRGB *bg, + gint index); + +void gimp_cairo_add_segments (cairo_t *cr, + GdkSegment *segs, + gint n_segs); + +void gimp_cairo_draw_toolbox_wilber (GtkWidget *widget, + cairo_t *cr); +void gimp_cairo_draw_drop_wilber (GtkWidget *widget, + cairo_t *cr); + + +#endif /* __GIMP_CAIRO_H__ */ diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index c212157a35..02d3183e64 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -54,6 +54,7 @@ * all changes need to flush colormap lookup cache */ +#define BORDER 6 enum { @@ -90,14 +91,10 @@ static void gimp_colormap_editor_clear (GimpColormapEditor *editor, gint start_row); static void gimp_colormap_editor_update_entries (GimpColormapEditor *editor); -static void gimp_colormap_preview_size_allocate (GtkWidget *widget, - GtkAllocation *allocation, - GimpColormapEditor *editor); -static void gimp_colormap_preview_expose (GtkWidget *widget, +static gboolean gimp_colormap_preview_expose (GtkWidget *widget, GdkEventExpose *event, GimpColormapEditor *editor); -static gboolean - gimp_colormap_preview_button_press (GtkWidget *widget, +static gboolean gimp_colormap_preview_button_press (GtkWidget *widget, GdkEventButton *bevent, GimpColormapEditor *editor); static void gimp_colormap_preview_drag_color (GtkWidget *widget, @@ -162,11 +159,9 @@ gimp_colormap_editor_class_init (GimpColormapEditorClass* klass) static void gimp_colormap_editor_init (GimpColormapEditor *editor) { - GtkWidget *frame; - GtkWidget *table; - GtkObject *adj; - gint width; - gint height; + GtkWidget *frame; + GtkWidget *table; + GtkObject *adj; editor->col_index = 0; editor->dnd_col_index = 0; @@ -188,17 +183,9 @@ gimp_colormap_editor_init (GimpColormapEditor *editor) editor->layout = gimp_colormap_editor_create_layout (editor->preview); - pango_layout_set_width (editor->layout, 180 * PANGO_SCALE); - pango_layout_get_pixel_size (editor->layout, &width, &height); - gtk_widget_set_size_request (editor->preview, width, height); - - g_signal_connect_after (editor->preview, "size-allocate", - G_CALLBACK (gimp_colormap_preview_size_allocate), - editor); - - g_signal_connect_after (editor->preview, "expose-event", - G_CALLBACK (gimp_colormap_preview_expose), - editor); + g_signal_connect (editor->preview, "expose-event", + G_CALLBACK (gimp_colormap_preview_expose), + editor); g_signal_connect (editor->preview, "button-press-event", G_CALLBACK (gimp_colormap_preview_button_press), @@ -486,6 +473,7 @@ gimp_colormap_editor_create_layout (GtkWidget *widget) layout = gtk_widget_create_pango_layout (widget, _("Only indexed images have " "a colormap.")); + pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); attrs = pango_attr_list_new (); @@ -526,7 +514,8 @@ gimp_colormap_editor_draw (GimpColormapEditor *editor) cellsize = sqrt (allocation.width * allocation.height / ncol); while (cellsize >= MIN_CELL_SIZE - && (xn = allocation.width / cellsize) * (yn = allocation.height / cellsize) < ncol) + && ((xn = allocation.width / cellsize) * + (yn = allocation.height / cellsize) < ncol)) cellsize--; if (cellsize < MIN_CELL_SIZE) @@ -560,7 +549,9 @@ gimp_colormap_editor_draw (GimpColormapEditor *editor) } if (j * cellsize < allocation.width) - memset (row + j * cellsize * 3, 255, 3 * (allocation.width - j * cellsize)); + memset (row + j * cellsize * 3, + 255, + 3 * (allocation.width - j * cellsize)); for (k = 0; k < cellsize; k++) { @@ -647,31 +638,45 @@ gimp_colormap_editor_draw_cell (GimpColormapEditor *editor, cellsize, cellsize); } -static void +static gboolean gimp_colormap_preview_expose (GtkWidget *widget, GdkEventExpose *event, GimpColormapEditor *editor) { GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor); + GtkStyle *style; + cairo_t *cr; GtkAllocation allocation; - gint x, y; gint width, height; + gint y; if (image_editor->image == NULL || gimp_image_base_type (image_editor->image) == GIMP_INDEXED) - return; + return FALSE; + + cr = gdk_cairo_create (event->window); + + gdk_cairo_region (cr, event->region); + cairo_clip (cr); + + style = gtk_widget_get_style (widget); + gdk_cairo_set_source_color (cr, &style->fg[gtk_widget_get_state (widget)]); gtk_widget_get_allocation (widget, &allocation); + pango_layout_set_width (editor->layout, + PANGO_SCALE * (allocation.width - 2 * BORDER)); pango_layout_get_pixel_size (editor->layout, &width, &height); - x = (allocation.width - width) / 2; y = (allocation.height - height) / 2; - gdk_draw_layout (gtk_widget_get_window (editor->preview), - gtk_widget_get_style (editor->preview)->fg_gc[gtk_widget_get_state (widget)], - MAX (x, 0), MAX (y, 0), - editor->layout); + cairo_move_to (cr, BORDER, MAX (y, 0)); + pango_cairo_show_layout (cr, editor->layout); + cairo_fill (cr); + + cairo_destroy (cr); + + return TRUE; } static void @@ -734,20 +739,6 @@ gimp_colormap_editor_update_entries (GimpColormapEditor *editor) } } -static void -gimp_colormap_preview_size_allocate (GtkWidget *widget, - GtkAllocation *alloc, - GimpColormapEditor *editor) -{ - GimpImage *image = GIMP_IMAGE_EDITOR (editor)->image; - - if (HAVE_COLORMAP (image)) - gimp_colormap_editor_draw (editor); - else - gimp_colormap_editor_clear (editor, -1); -} - - static gboolean gimp_colormap_preview_button_press (GtkWidget *widget, GdkEventButton *bevent, diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c index 2130af8031..f107d54410 100644 --- a/app/widgets/gimptoolbox.c +++ b/app/widgets/gimptoolbox.c @@ -37,7 +37,7 @@ #include "file/file-open.h" #include "file/file-utils.h" -#include "gimpcairo-wilber.h" +#include "gimpcairo.h" #include "gimpdevices.h" #include "gimpdialogfactory.h" #include "gimpdockwindow.h" @@ -674,38 +674,13 @@ gimp_toolbox_expose_event (GtkWidget *widget, &header_allocation, &clip_rect)) { - GtkStyle *style = gtk_widget_get_style (widget); - GtkStateType state = gtk_widget_get_state (widget); - cairo_t *cr; - gint header_height; - gint header_width; - gdouble wilber_width; - gdouble wilber_height; - gdouble factor; + cairo_t *cr; cr = gdk_cairo_create (gtk_widget_get_window (widget)); gdk_cairo_rectangle (cr, &clip_rect); cairo_clip (cr); - header_width = header_allocation.width; - header_height = header_allocation.height; - - gimp_cairo_wilber_get_size (cr, &wilber_width, &wilber_height); - - factor = header_width / wilber_width * 0.9; - - cairo_scale (cr, factor, factor); - - gimp_cairo_wilber (cr, - (header_width / factor - wilber_width) / 2.0, - (header_height / factor - wilber_height) / 2.0); - - cairo_set_source_rgba (cr, - style->fg[state].red / 65535.0, - style->fg[state].green / 65535.0, - style->fg[state].blue / 65535.0, - 0.10); - cairo_fill (cr); + gimp_cairo_draw_toolbox_wilber (toolbox->p->header, cr); cairo_destroy (cr); } diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000000..725942114c --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in \ No newline at end of file diff --git a/build/Makefile.am b/build/Makefile.am new file mode 100644 index 0000000000..097833ffa1 --- /dev/null +++ b/build/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = \ + windows \ No newline at end of file diff --git a/build/buildbot/suppressed_warnings.txt b/build/buildbot/suppressed_warnings.txt new file mode 100644 index 0000000000..b28e751194 --- /dev/null +++ b/build/buildbot/suppressed_warnings.txt @@ -0,0 +1,21 @@ +# This is a 'suppressionFile' for buildbot +# We use isn.*t because UTF-8 ' might be interpreted as ASCII... + +# Ignore warning from gtk-doc during make +: .*warning: Value descriptions for .* are missing in source code comment block.* +: .*warning: Property .* has no documentation.* +: .*html:.*: warning: no link for: .* +: .*warning: Field descriptions for .* are missing in source code comment block.* +: .*warning: Section .* is not defined in the .* file.* +: .*warning: .* unused declarations.*They should be added to .* in the appropriate place.* + +# This will die in GIMP 3.0, don't bother fixing... +: ^gimp-composite-.* warning: function declaration isn.*t a prototype.* +: .*gimpcpuaccel.c:182: warning: dereferencing type-punned pointer will break strict-aliasing rules.* + +# Well-known harmless warnings +: .*gtkitemfactory.h:47: warning: function declaration isn.*t a prototype.* +: .*app/core/gimpimagemap.c:.*: warning: implicit declaration of function .*gegl_node_get_pad.* + +# who cares +: .*gimp.desktop: warning: value .* contains .* more than once.* diff --git a/build/windows/.gitignore b/build/windows/.gitignore new file mode 100644 index 0000000000..2656b54932 --- /dev/null +++ b/build/windows/.gitignore @@ -0,0 +1,4 @@ +/Makefile +/Makefile.in +/gimp.rc +/gimp-plug-ins.rc diff --git a/build/windows/Makefile.am b/build/windows/Makefile.am new file mode 100644 index 0000000000..678f09f5f3 --- /dev/null +++ b/build/windows/Makefile.am @@ -0,0 +1,8 @@ +EXTRA_DIST = \ + gimprc.rule \ + gimprc-plug-ins.rule \ + gimp.rc \ + gimp-plug-ins.rc \ + gimp.manifest \ + fileicon.ico \ + wilber.ico diff --git a/app/fileicon.ico b/build/windows/fileicon.ico similarity index 100% rename from app/fileicon.ico rename to build/windows/fileicon.ico diff --git a/build/windows/gimp-plug-ins.rc.in b/build/windows/gimp-plug-ins.rc.in new file mode 100644 index 0000000000..9232e1345c --- /dev/null +++ b/build/windows/gimp-plug-ins.rc.in @@ -0,0 +1,66 @@ +#include + +#define _QUOTE(x) #x +#define QUOTE(x) _QUOTE(x) + +#define VER_COMPANYNAME_STR "Spencer Kimball, Peter Mattis and the GIMP Development Team" + +#define VER_PRODUCTVERSION @GIMP_MAJOR_VERSION@,@GIMP_MINOR_VERSION@,@GIMP_MICRO_VERSION@,0 +#define VER_PRODUCTVERSION_STR "@GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@\0" +#define VER_PRODUCTNAME_STR "@GIMP_FULL_NAME@" + +#define VER_FILEVERSION @GIMP_MAJOR_VERSION@,@GIMP_MINOR_VERSION@,@GIMP_MICRO_VERSION@,0 +#define VER_FILEVERSION_STR "@GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@.@GIMP_MICRO_VERSION@.0\0" + +#define VER_FILEDESCRIPTION_STR "@GIMP_FULL_NAME@ Plug-In" +#define VER_INTERNALNAME_STR QUOTE(INTERNALNAME_STR) +#define VER_ORIGINALFILENAME_STR QUOTE(ORIGINALFILENAME_STR) + +#define VER_LEGALCOPYRIGHT_STR "Copyright 1995-2010" + +#ifndef DEBUG +#define VER_DEBUG 0 +#else +#define VER_DEBUG VS_FF_DEBUG +#endif + +#ifndef GIMP_UNSTABLE +#define VER_PRERELEASE 0 +#else +#define VER_PRERELEASE VS_FF_PRERELEASE +#endif + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS (VER_PRERELEASE|VER_DEBUG) +FILEOS VOS__WINDOWS32 +FILETYPE VFT_APP +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", VER_COMPANYNAME_STR + VALUE "FileDescription", VER_FILEDESCRIPTION_STR + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", VER_INTERNALNAME_STR + VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR + VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + + END +END + +#include "winuser.h" +1 ICON QUOTE(TOP_SRCDIR) "/build/windows/plug-ins.ico" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST QUOTE(TOP_SRCDIR) "/build/windows/gimp.manifest" diff --git a/app/gimp.manifest b/build/windows/gimp.manifest similarity index 100% rename from app/gimp.manifest rename to build/windows/gimp.manifest diff --git a/app/gimp.rc.in b/build/windows/gimp.rc.in similarity index 88% rename from app/gimp.rc.in rename to build/windows/gimp.rc.in index 63643868bc..49917d8679 100644 --- a/app/gimp.rc.in +++ b/build/windows/gimp.rc.in @@ -16,7 +16,7 @@ #define VER_INTERNALNAME_STR QUOTE(INTERNALNAME_STR) #define VER_ORIGINALFILENAME_STR QUOTE(ORIGINALFILENAME_STR) -#define VER_LEGALCOPYRIGHT_STR "Copyright 1995-2009" +#define VER_LEGALCOPYRIGHT_STR "Copyright 1995-2010" #ifndef DEBUG #define VER_DEBUG 0 @@ -62,6 +62,6 @@ BEGIN END #include "winuser.h" -1 ICON "wilber.ico" -2 ICON "fileicon.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gimp.manifest" +1 ICON QUOTE(TOP_SRCDIR) "/build/windows/wilber.ico" +2 ICON QUOTE(TOP_SRCDIR) "/build/windows/fileicon.ico" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST QUOTE(TOP_SRCDIR) "/build/windows/gimp.manifest" diff --git a/build/windows/gimprc-plug-ins.rule b/build/windows/gimprc-plug-ins.rule new file mode 100644 index 0000000000..9f45450bd7 --- /dev/null +++ b/build/windows/gimprc-plug-ins.rule @@ -0,0 +1,6 @@ +# Version resources for Microsoft Windows +%.rc.o: $(top_srcdir)/build/windows/gimp-plug-ins.rc + $(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \ + --define INTERNALNAME_STR="$*" \ + --define TOP_SRCDIR="$(top_srcdir)" \ + $< $@ diff --git a/build/windows/gimprc.rule b/build/windows/gimprc.rule new file mode 100644 index 0000000000..6377d72023 --- /dev/null +++ b/build/windows/gimprc.rule @@ -0,0 +1,6 @@ +# Version resources for Microsoft Windows +%.rc.o: $(top_srcdir)/build/windows/gimp.rc + $(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \ + --define INTERNALNAME_STR="$*" \ + --define TOP_SRCDIR="$(top_srcdir)" \ + $< $@ diff --git a/build/windows/plug-ins.ico b/build/windows/plug-ins.ico new file mode 100644 index 0000000000..17c6022030 Binary files /dev/null and b/build/windows/plug-ins.ico differ diff --git a/app/wilber.ico b/build/windows/wilber.ico similarity index 100% rename from app/wilber.ico rename to build/windows/wilber.ico diff --git a/configure.ac b/configure.ac index 05b36e201a..833e1955aa 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,7 @@ m4_define([glib_required_version], [2.24.0]) m4_define([gtk_required_version], [2.20.0]) m4_define([gdk_pixbuf_required_version], [gtk_required_version]) m4_define([cairo_required_version], [1.8.0]) +m4_define([cairo_pdf_required_version], [1.8.0]) m4_define([pangocairo_required_version], [1.20.1]) m4_define([fontconfig_required_version], [2.2.0]) m4_define([gtkdoc_required_version], [1.0]) @@ -1317,7 +1318,7 @@ have_poppler=no if test "x$with_poppler" != xno; then PKG_CHECK_MODULES(POPPLER, poppler-glib >= poppler_required_version gthread-2.0, - FILE_PDF='file-pdf$(EXEEXT)' + FILE_PDF_LOAD='file-pdf-load$(EXEEXT)' AC_DEFINE(HAVE_POPPLER, 1, [Define to 1 if libpoppler is available]) have_poppler=yes, have_poppler="Using PostScript plug-in (libpoppler not found)") @@ -1325,7 +1326,30 @@ else have_poppler="Using PostScript plug-in (libpoppler support disabled)" fi -AC_SUBST(FILE_PDF) +AC_SUBST(FILE_PDF_LOAD) + + +##################### +# Check for cairo-pdf +##################### + +AC_ARG_WITH(cairo_pdf,[ --without-cairo-pdf build without cairo-pdf support]) +have_cairo_pdf=no +if test "x$with_cairo_pdf" != xno; then + have_cairo_pdf=yes + PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf >= cairo_pdf_required_version, + FILE_PDF_SAVE='file-pdf-save$(EXEEXT)', + have_cairo_pdf="no (cairo-pdf not found)") +else + have_cairo_pdf="no (cairo-pdf support disabled)" +fi + +AC_SUBST(FILE_PDF_SAVE) + +## If both poppler and cairo-pdf are enabled then we have complete PDF support +if test "x$have_cairo_pdf" = xyes && test "x$have_poppler" = xyes; then + MIME_TYPES="$MIME_TYPES;application/pdf" +fi ################################ @@ -2017,7 +2041,6 @@ libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile -app/gimp.rc app/Makefile app/actions/Makefile app/base/Makefile @@ -2049,6 +2072,10 @@ app/tests/gimpdir/Makefile app/tests/gimpdir/brushes/Makefile app/tests/gimpdir/gradients/Makefile app/tests/gimpdir/patterns/Makefile +build/Makefile +build/windows/Makefile +build/windows/gimp.rc +build/windows/gimp-plug-ins.rc plug-ins/Makefile plug-ins/color-rotate/Makefile plug-ins/color-rotate/images/Makefile @@ -2192,7 +2219,8 @@ Optional Plug-Ins: JPEG: $jpeg_ok JPEG 2000: $have_jp2 MNG: $have_libmng - PDF: $have_poppler + PDF (import): $have_poppler + PDF (export): $have_cairo_pdf PNG: $have_libpng Print: $enable_print PSP: $have_zlib diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 02e5c1cd00..b658939263 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -330,6 +330,7 @@ EXPORTS gimp_image_get_floating_sel gimp_image_get_guide_orientation gimp_image_get_guide_position + gimp_image_get_item_position gimp_image_get_layer_by_tattoo gimp_image_get_layer_position gimp_image_get_layers @@ -358,6 +359,8 @@ EXPORTS gimp_image_is_valid gimp_image_list gimp_image_lower_channel + gimp_image_lower_item + gimp_image_lower_item_to_bottom gimp_image_lower_layer gimp_image_lower_layer_to_bottom gimp_image_lower_vectors @@ -372,6 +375,8 @@ EXPORTS gimp_image_pick_color gimp_image_pick_correlate_layer gimp_image_raise_channel + gimp_image_raise_item + gimp_image_raise_item_to_top gimp_image_raise_layer gimp_image_raise_layer_to_top gimp_image_raise_vectors @@ -379,6 +384,7 @@ EXPORTS gimp_image_remove_channel gimp_image_remove_layer gimp_image_remove_vectors + gimp_image_reorder_item gimp_image_resize gimp_image_resize_to_layers gimp_image_rotate @@ -409,14 +415,17 @@ EXPORTS gimp_install_temp_proc gimp_invert gimp_item_delete + gimp_item_get_children gimp_item_get_image gimp_item_get_linked gimp_item_get_lock_content gimp_item_get_name + gimp_item_get_parent gimp_item_get_tattoo gimp_item_get_visible gimp_item_is_channel gimp_item_is_drawable + gimp_item_is_group gimp_item_is_layer gimp_item_is_layer_mask gimp_item_is_selection diff --git a/libgimp/gimpimage_pdb.c b/libgimp/gimpimage_pdb.c index 9c37631902..6f13e69404 100644 --- a/libgimp/gimpimage_pdb.c +++ b/libgimp/gimpimage_pdb.c @@ -1042,180 +1042,6 @@ gimp_image_remove_layer (gint32 image_ID, return success; } -/** - * gimp_image_get_layer_position: - * @image_ID: The image. - * @layer_ID: The layer. - * - * Returns the position of the layer in the layer stack. - * - * This procedure determines the position of the specified layer in the - * images layer stack. If the layer doesn't exist in the image, an - * error is returned. - * - * Returns: The position of the layer in the layer stack. - * - * Since: GIMP 2.4 - */ -gint -gimp_image_get_layer_position (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gint position = 0; - - return_vals = gimp_run_procedure ("gimp-image-get-layer-position", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) - position = return_vals[1].data.d_int32; - - gimp_destroy_params (return_vals, nreturn_vals); - - return position; -} - -/** - * gimp_image_raise_layer: - * @image_ID: The image. - * @layer_ID: The layer to raise. - * - * Raise the specified layer in the image's layer stack - * - * This procedure raises the specified layer one step in the existing - * layer stack. The procecure call will fail if there is no layer above - * it. - * - * Returns: TRUE on success. - */ -gboolean -gimp_image_raise_layer (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-layer", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_layer: - * @image_ID: The image. - * @layer_ID: The layer to lower. - * - * Lower the specified layer in the image's layer stack - * - * This procedure lowers the specified layer one step in the existing - * layer stack. The procecure call will fail if there is no layer below - * it. - * - * Returns: TRUE on success. - */ -gboolean -gimp_image_lower_layer (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-layer", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_raise_layer_to_top: - * @image_ID: The image. - * @layer_ID: The layer to raise to top. - * - * Raise the specified layer in the image's layer stack to top of stack - * - * This procedure raises the specified layer to top of the existing - * layer stack. It will not move the layer if there is no layer above - * it. - * - * Returns: TRUE on success. - */ -gboolean -gimp_image_raise_layer_to_top (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-layer-to-top", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_layer_to_bottom: - * @image_ID: The image. - * @layer_ID: The layer to lower to bottom. - * - * Lower the specified layer in the image's layer stack to bottom of - * stack - * - * This procedure lowers the specified layer to bottom of the existing - * layer stack. It will not move the layer if there is no layer below - * it. - * - * Returns: TRUE on success. - */ -gboolean -gimp_image_lower_layer_to_bottom (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-layer-to-bottom", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - /** * gimp_image_add_channel: * @image_ID: The image. @@ -1287,111 +1113,6 @@ gimp_image_remove_channel (gint32 image_ID, return success; } -/** - * gimp_image_get_channel_position: - * @image_ID: The image. - * @channel_ID: The channel. - * - * Returns the position of the channel in the channel stack. - * - * This procedure determines the position of the specified channel in - * the images channel stack. If the channel doesn't exist in the image, - * an error is returned. - * - * Returns: The position of the channel in the channel stack. - * - * Since: GIMP 2.4 - */ -gint -gimp_image_get_channel_position (gint32 image_ID, - gint32 channel_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gint position = 0; - - return_vals = gimp_run_procedure ("gimp-image-get-channel-position", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_CHANNEL, channel_ID, - GIMP_PDB_END); - - if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) - position = return_vals[1].data.d_int32; - - gimp_destroy_params (return_vals, nreturn_vals); - - return position; -} - -/** - * gimp_image_raise_channel: - * @image_ID: The image. - * @channel_ID: The channel to raise. - * - * Raise the specified channel in the image's channel stack - * - * This procedure raises the specified channel one step in the existing - * channel stack. The procecure call will fail if there is no channel - * above it. - * - * Returns: TRUE on success. - */ -gboolean -gimp_image_raise_channel (gint32 image_ID, - gint32 channel_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-channel", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_CHANNEL, channel_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_channel: - * @image_ID: The image. - * @channel_ID: The channel to lower. - * - * Lower the specified channel in the image's channel stack - * - * This procedure lowers the specified channel one step in the existing - * channel stack. The procecure call will fail if there is no channel - * below it. - * - * Returns: TRUE on success. - */ -gboolean -gimp_image_lower_channel (gint32 image_ID, - gint32 channel_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-channel", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_CHANNEL, channel_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - /** * gimp_image_add_vectors: * @image_ID: The image. @@ -1464,17 +1185,477 @@ gimp_image_remove_vectors (gint32 image_ID, return success; } +/** + * gimp_image_get_item_position: + * @image_ID: The image. + * @item_ID: The item. + * + * Returns the position of the item in its level of its item tree. + * + * This procedure determines the position of the specified item in its + * level in its item tree in the image. If the item doesn't exist in + * the image, or the item is not part of an item tree, an error is + * returned. + * + * Returns: The position of the item in its level in the item tree. + * + * Since: GIMP 2.8 + */ +gint +gimp_image_get_item_position (gint32 image_ID, + gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gint position = 0; + + return_vals = gimp_run_procedure ("gimp-image-get-item-position", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_ITEM, item_ID, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + position = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return position; +} + +/** + * gimp_image_raise_item: + * @image_ID: The image. + * @item_ID: The item to raise. + * + * Raise the specified item in its level in its item tree + * + * This procedure raises the specified item one step in the item tree. + * The procecure call will fail if there is no item above it. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.8 + */ +gboolean +gimp_image_raise_item (gint32 image_ID, + gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-raise-item", + &nreturn_vals, + GIMP_PDB_IMAGE, image_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; +} + +/** + * gimp_image_lower_item: + * @image_ID: The image. + * @item_ID: The item to lower. + * + * Lower the specified item in its level in its item tree + * + * This procedure lowers the specified item one step in the item tree. + * The procecure call will fail if there is no item below it. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.8 + */ +gboolean +gimp_image_lower_item (gint32 image_ID, + gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-lower-item", + &nreturn_vals, + GIMP_PDB_IMAGE, image_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; +} + +/** + * gimp_image_raise_item_to_top: + * @image_ID: The image. + * @item_ID: The item to raise to top. + * + * Raise the specified item to the top of its level in its item tree + * + * This procedure raises the specified item to top of its level in the + * item tree. It will not move the item if there is no item above it. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.8 + */ +gboolean +gimp_image_raise_item_to_top (gint32 image_ID, + gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-raise-item-to-top", + &nreturn_vals, + GIMP_PDB_IMAGE, image_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; +} + +/** + * gimp_image_lower_item_to_bottom: + * @image_ID: The image. + * @item_ID: The item to lower to bottom. + * + * Lower the specified item to the bottom of its level in its item tree + * + * This procedure lowers the specified item to bottom of its level in + * the item tree. It will not move the layer if there is no layer below + * it. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.8 + */ +gboolean +gimp_image_lower_item_to_bottom (gint32 image_ID, + gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-lower-item-to-bottom", + &nreturn_vals, + GIMP_PDB_IMAGE, image_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; +} + +/** + * gimp_image_reorder_item: + * @image_ID: The image. + * @item_ID: The item to reorder. + * @parent_ID: The new parent item. + * @position: The new position of the item. + * + * Reorder the specified item within its item tree + * + * This procedure reorders the specified item within its item tree. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.8 + */ +gboolean +gimp_image_reorder_item (gint32 image_ID, + gint32 item_ID, + gint32 parent_ID, + gint position) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-reorder-item", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_ITEM, item_ID, + GIMP_PDB_ITEM, parent_ID, + GIMP_PDB_INT32, position, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_image_get_layer_position: + * @image_ID: The image. + * @layer_ID: The layer. + * + * Deprecated: Use gimp_image_get_item_position() instead. + * + * Returns: The position of the layer in the layer stack. + * + * Since: GIMP 2.4 + */ +gint +gimp_image_get_layer_position (gint32 image_ID, + gint32 layer_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gint position = 0; + + return_vals = gimp_run_procedure ("gimp-image-get-layer-position", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_LAYER, layer_ID, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + position = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return position; +} + +/** + * gimp_image_raise_layer: + * @image_ID: The image. + * @layer_ID: The layer to raise. + * + * Deprecated: Use gimp_image_raise_item() instead. + * + * Returns: TRUE on success. + */ +gboolean +gimp_image_raise_layer (gint32 image_ID, + gint32 layer_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-raise-layer", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_LAYER, layer_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_image_lower_layer: + * @image_ID: The image. + * @layer_ID: The layer to lower. + * + * Deprecated: Use gimp_image_lower_item() instead. + * + * Returns: TRUE on success. + */ +gboolean +gimp_image_lower_layer (gint32 image_ID, + gint32 layer_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-lower-layer", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_LAYER, layer_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_image_raise_layer_to_top: + * @image_ID: The image. + * @layer_ID: The layer to raise to top. + * + * Deprecated: Use gimp_image_raise_item_to_top() instead. + * + * Returns: TRUE on success. + */ +gboolean +gimp_image_raise_layer_to_top (gint32 image_ID, + gint32 layer_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-raise-layer-to-top", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_LAYER, layer_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_image_lower_layer_to_bottom: + * @image_ID: The image. + * @layer_ID: The layer to lower to bottom. + * + * Deprecated: Use gimp_image_lower_item_to_bottom() instead. + * + * Returns: TRUE on success. + */ +gboolean +gimp_image_lower_layer_to_bottom (gint32 image_ID, + gint32 layer_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-lower-layer-to-bottom", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_LAYER, layer_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_image_get_channel_position: + * @image_ID: The image. + * @channel_ID: The channel. + * + * Deprecated: Use gimp_image_get_item_position() instead. + * + * Returns: The position of the channel in the channel stack. + * + * Since: GIMP 2.4 + */ +gint +gimp_image_get_channel_position (gint32 image_ID, + gint32 channel_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gint position = 0; + + return_vals = gimp_run_procedure ("gimp-image-get-channel-position", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_CHANNEL, channel_ID, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + position = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return position; +} + +/** + * gimp_image_raise_channel: + * @image_ID: The image. + * @channel_ID: The channel to raise. + * + * Deprecated: Use gimp_image_raise_item() instead. + * + * Returns: TRUE on success. + */ +gboolean +gimp_image_raise_channel (gint32 image_ID, + gint32 channel_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-raise-channel", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_CHANNEL, channel_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_image_lower_channel: + * @image_ID: The image. + * @channel_ID: The channel to lower. + * + * Deprecated: Use gimp_image_lower_item() instead. + * + * Returns: TRUE on success. + */ +gboolean +gimp_image_lower_channel (gint32 image_ID, + gint32 channel_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-image-lower-channel", + &nreturn_vals, + GIMP_PDB_IMAGE, image_ID, + GIMP_PDB_CHANNEL, channel_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + /** * gimp_image_get_vectors_position: * @image_ID: The image. * @vectors_ID: The vectors object. * - * Returns the position of the vectors object in the vectors objects - * stack. - * - * This procedure determines the position of the specified vectors - * object in the images vectors object stack. If the vectors object - * doesn't exist in the image, an error is returned. + * Deprecated: Use gimp_image_get_item_position() instead. * * Returns: The position of the vectors object in the vectors stack. * @@ -1507,11 +1688,7 @@ gimp_image_get_vectors_position (gint32 image_ID, * @image_ID: The image. * @vectors_ID: The vectors object to raise. * - * Raise the specified vectors in the image's vectors stack - * - * This procedure raises the specified vectors one step in the existing - * vectors stack. The procecure call will fail if there is no vectors - * above it. + * Deprecated: Use gimp_image_raise_item() instead. * * Returns: TRUE on success. * @@ -1543,11 +1720,7 @@ gimp_image_raise_vectors (gint32 image_ID, * @image_ID: The image. * @vectors_ID: The vectors object to lower. * - * Lower the specified vectors in the image's vectors stack - * - * This procedure lowers the specified vectors one step in the existing - * vectors stack. The procecure call will fail if there is no vectors - * below it. + * Deprecated: Use gimp_image_lower_item() instead. * * Returns: TRUE on success. * @@ -1579,12 +1752,7 @@ gimp_image_lower_vectors (gint32 image_ID, * @image_ID: The image. * @vectors_ID: The vectors object to raise to top. * - * Raise the specified vectors in the image's vectors stack to top of - * stack - * - * This procedure raises the specified vectors to top of the existing - * vectors stack. It will not move the vectors if there is no vectors - * above it. + * Deprecated: Use gimp_image_raise_item_to_top() instead. * * Returns: TRUE on success. * @@ -1616,12 +1784,7 @@ gimp_image_raise_vectors_to_top (gint32 image_ID, * @image_ID: The image. * @vectors_ID: The vectors object to lower to bottom. * - * Lower the specified vectors in the image's vectors stack to bottom - * of stack - * - * This procedure lowers the specified vectors to bottom of the - * existing vectors stack. It will not move the vectors if there is no - * vectors below it. + * Deprecated: Use gimp_image_lower_item_to_bottom() instead. * * Returns: TRUE on success. * diff --git a/libgimp/gimpimage_pdb.h b/libgimp/gimpimage_pdb.h index 9e5c67deed..e903f19ac4 100644 --- a/libgimp/gimpimage_pdb.h +++ b/libgimp/gimpimage_pdb.h @@ -89,6 +89,31 @@ gboolean gimp_image_add_layer (gint32 gint position); gboolean gimp_image_remove_layer (gint32 image_ID, gint32 layer_ID); +gboolean gimp_image_add_channel (gint32 image_ID, + gint32 channel_ID, + gint position); +gboolean gimp_image_remove_channel (gint32 image_ID, + gint32 channel_ID); +gboolean gimp_image_add_vectors (gint32 image_ID, + gint32 vectors_ID, + gint position); +gboolean gimp_image_remove_vectors (gint32 image_ID, + gint32 vectors_ID); +gint gimp_image_get_item_position (gint32 image_ID, + gint32 item_ID); +gboolean gimp_image_raise_item (gint32 image_ID, + gint32 item_ID); +gboolean gimp_image_lower_item (gint32 image_ID, + gint32 item_ID); +gboolean gimp_image_raise_item_to_top (gint32 image_ID, + gint32 item_ID); +gboolean gimp_image_lower_item_to_bottom (gint32 image_ID, + gint32 item_ID); +gboolean gimp_image_reorder_item (gint32 image_ID, + gint32 item_ID, + gint32 parent_ID, + gint position); +#ifndef GIMP_DISABLE_DEPRECATED gint gimp_image_get_layer_position (gint32 image_ID, gint32 layer_ID); gboolean gimp_image_raise_layer (gint32 image_ID, @@ -99,22 +124,12 @@ gboolean gimp_image_raise_layer_to_top (gint32 gint32 layer_ID); gboolean gimp_image_lower_layer_to_bottom (gint32 image_ID, gint32 layer_ID); -gboolean gimp_image_add_channel (gint32 image_ID, - gint32 channel_ID, - gint position); -gboolean gimp_image_remove_channel (gint32 image_ID, - gint32 channel_ID); gint gimp_image_get_channel_position (gint32 image_ID, gint32 channel_ID); gboolean gimp_image_raise_channel (gint32 image_ID, gint32 channel_ID); gboolean gimp_image_lower_channel (gint32 image_ID, gint32 channel_ID); -gboolean gimp_image_add_vectors (gint32 image_ID, - gint32 vectors_ID, - gint position); -gboolean gimp_image_remove_vectors (gint32 image_ID, - gint32 vectors_ID); gint gimp_image_get_vectors_position (gint32 image_ID, gint32 vectors_ID); gboolean gimp_image_raise_vectors (gint32 image_ID, @@ -125,6 +140,7 @@ gboolean gimp_image_raise_vectors_to_top (gint32 gint32 vectors_ID); gboolean gimp_image_lower_vectors_to_bottom (gint32 image_ID, gint32 vectors_ID); +#endif /* GIMP_DISABLE_DEPRECATED */ gint32 gimp_image_flatten (gint32 image_ID); gint32 gimp_image_merge_visible_layers (gint32 image_ID, GimpMergeType merge_type); diff --git a/libgimp/gimpitem_pdb.c b/libgimp/gimpitem_pdb.c index ed9d56d514..228a9b81be 100644 --- a/libgimp/gimpitem_pdb.c +++ b/libgimp/gimpitem_pdb.c @@ -22,6 +22,8 @@ #include "config.h" +#include + #include "gimp.h" @@ -326,6 +328,114 @@ gimp_item_is_vectors (gint32 item_ID) return vectors; } +/** + * gimp_item_is_group: + * @item_ID: The item. + * + * Returns whether the item is a group item. + * + * This procedure returns TRUE if the specified item is a group item + * which can have children. + * + * Returns: TRUE if the item is a group, FALSE otherwise. + * + * Since: GIMP 2.8 + */ +gboolean +gimp_item_is_group (gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean group = FALSE; + + return_vals = gimp_run_procedure ("gimp-item-is-group", + &nreturn_vals, + GIMP_PDB_ITEM, item_ID, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + group = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return group; +} + +/** + * gimp_item_get_parent: + * @item_ID: The item. + * + * Returns the item's parent item. + * + * This procedure returns the item's parent item, if any. + * + * Returns: The item's parent item. + * + * Since: GIMP 2.8 + */ +gint32 +gimp_item_get_parent (gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gint32 parent_ID = -1; + + return_vals = gimp_run_procedure ("gimp-item-get-parent", + &nreturn_vals, + GIMP_PDB_ITEM, item_ID, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + parent_ID = return_vals[1].data.d_item; + + gimp_destroy_params (return_vals, nreturn_vals); + + return parent_ID; +} + +/** + * gimp_item_get_children: + * @item_ID: The item. + * @num_children: The item's number of children. + * + * Returns the item's list of children. + * + * This procedure returns the list of items which are children of the + * specified item. The order is topmost to bottommost. + * + * Returns: The item's list of children. + * + * Since: GIMP 2.8 + */ +gint * +gimp_item_get_children (gint32 item_ID, + gint *num_children) +{ + GimpParam *return_vals; + gint nreturn_vals; + gint *child_ids = NULL; + + return_vals = gimp_run_procedure ("gimp-item-get-children", + &nreturn_vals, + GIMP_PDB_ITEM, item_ID, + GIMP_PDB_END); + + *num_children = 0; + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + { + *num_children = return_vals[1].data.d_int32; + child_ids = g_new (gint32, *num_children); + memcpy (child_ids, + return_vals[2].data.d_int32array, + *num_children * sizeof (gint32)); + } + + gimp_destroy_params (return_vals, nreturn_vals); + + return child_ids; +} + /** * gimp_item_get_name: * @item_ID: The item. diff --git a/libgimp/gimpitem_pdb.h b/libgimp/gimpitem_pdb.h index 1cbe246fcd..8396306fe9 100644 --- a/libgimp/gimpitem_pdb.h +++ b/libgimp/gimpitem_pdb.h @@ -37,6 +37,10 @@ gboolean gimp_item_is_channel (gint32 item_ID); gboolean gimp_item_is_layer_mask (gint32 item_ID); gboolean gimp_item_is_selection (gint32 item_ID); gboolean gimp_item_is_vectors (gint32 item_ID); +gboolean gimp_item_is_group (gint32 item_ID); +gint32 gimp_item_get_parent (gint32 item_ID); +gint* gimp_item_get_children (gint32 item_ID, + gint *num_children); gchar* gimp_item_get_name (gint32 item_ID); gboolean gimp_item_set_name (gint32 item_ID, const gchar *name); diff --git a/libgimpcolor/test-color-parser.c b/libgimpcolor/test-color-parser.c index 4bd1896f28..bc2bf0b632 100644 --- a/libgimpcolor/test-color-parser.c +++ b/libgimpcolor/test-color-parser.c @@ -102,12 +102,12 @@ main (void) if (failures) { g_print ("%d out of %d samples failed!\n\n", - failures, G_N_ELEMENTS (samples)); + failures, (int)G_N_ELEMENTS (samples)); return EXIT_FAILURE; } else { - g_print ("All %d samples passed.\n\n", G_N_ELEMENTS (samples)); + g_print ("All %d samples passed.\n\n", (int)G_N_ELEMENTS (samples)); return EXIT_SUCCESS; } } diff --git a/menus/Makefile.am b/menus/Makefile.am index cbb2f5aa0d..68c77159a2 100644 --- a/menus/Makefile.am +++ b/menus/Makefile.am @@ -55,7 +55,9 @@ if GIMP_UNSTABLE DEBUG_MENU_PARAMS = --stringparam debug-menu yes endif -%.xml: %.xml.in $(top_srcdir)/configure.ac $(srcdir)/menus.xsl dialogs-menuitems.xml +SUFFIXES = .xml.in .xml + +.xml.in.xml: $(top_srcdir)/configure.ac $(srcdir)/menus.xsl dialogs-menuitems.xml if HAVE_XSLTPROC $(XSLTPROC) --xinclude $(DEBUG_MENU_PARAMS) $(srcdir)/menus.xsl $< > $(@) || rm -f $(@) else diff --git a/plug-ins/color-rotate/Makefile.am b/plug-ins/color-rotate/Makefile.am index c713c8c6b0..588bb07338 100644 --- a/plug-ins/color-rotate/Makefile.am +++ b/plug-ins/color-rotate/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +color_rotate_RC = color-rotate.rc.o +endif + AM_LDFLAGS = $(mwindows) SUBDIRS = images @@ -49,4 +54,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(color_rotate_RC) diff --git a/plug-ins/common/.gitignore b/plug-ins/common/.gitignore index 5589319294..11db5efa80 100644 --- a/plug-ins/common/.gitignore +++ b/plug-ins/common/.gitignore @@ -130,8 +130,10 @@ /file-pat.exe /file-pcx /file-pcx.exe -/file-pdf -/file-pdf.exe +/file-pdf-load +/file-pdf-load.exe +/file-pdf-save +/file-pdf-save.exe /file-pix /file-pix.exe /file-png diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index 9e94f1a73f..610a30295b 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -13,6 +13,11 @@ else libm = -lm endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +include gimprc.common +endif + libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la @@ -29,7 +34,8 @@ libexecdir = $(gimpplugindir)/plug-ins EXTRA_DIST = \ mkgen.pl \ - plugin-defs.pl + plugin-defs.pl \ + gimprc.common INCLUDES = \ -I$(top_srcdir) \ @@ -101,7 +107,8 @@ libexec_PROGRAMS = \ $(FILE_MNG) \ file-pat \ file-pcx \ - $(FILE_PDF) \ + $(FILE_PDF_LOAD) \ + $(FILE_PDF_SAVE) \ file-pix \ $(FILE_PNG) \ file-pnm \ @@ -186,7 +193,8 @@ EXTRA_PROGRAMS = \ file-aa \ file-jp2-load \ file-mng \ - file-pdf \ + file-pdf-load \ + file-pdf-save \ file-png \ file-psp \ file-svg \ @@ -225,7 +233,8 @@ alien_map_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(alien_map_RC) align_layers_SOURCES = \ align-layers.c @@ -241,7 +250,8 @@ align_layers_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(align_layers_RC) animation_optimize_SOURCES = \ animation-optimize.c @@ -254,7 +264,8 @@ animation_optimize_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(animation_optimize_RC) animation_play_SOURCES = \ animation-play.c @@ -270,7 +281,8 @@ animation_play_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(animation_play_RC) antialias_SOURCES = \ antialias.c @@ -283,7 +295,8 @@ antialias_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(antialias_RC) apply_canvas_SOURCES = \ apply-canvas.c @@ -299,7 +312,8 @@ apply_canvas_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(apply_canvas_RC) blinds_SOURCES = \ blinds.c @@ -315,7 +329,8 @@ blinds_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(blinds_RC) blur_SOURCES = \ blur.c @@ -328,7 +343,8 @@ blur_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(blur_RC) blur_gauss_SOURCES = \ blur-gauss.c @@ -344,7 +360,8 @@ blur_gauss_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(blur_gauss_RC) blur_gauss_selective_CFLAGS = $(MMX_EXTRA_CFLAGS) @@ -362,7 +379,8 @@ blur_gauss_selective_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(blur_gauss_selective_RC) blur_motion_SOURCES = \ blur-motion.c @@ -378,7 +396,8 @@ blur_motion_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(blur_motion_RC) border_average_SOURCES = \ border-average.c @@ -394,7 +413,8 @@ border_average_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(border_average_RC) bump_map_SOURCES = \ bump-map.c @@ -410,7 +430,8 @@ bump_map_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(bump_map_RC) cartoon_SOURCES = \ cartoon.c @@ -426,7 +447,8 @@ cartoon_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(cartoon_RC) channel_mixer_SOURCES = \ channel-mixer.c @@ -442,7 +464,8 @@ channel_mixer_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(channel_mixer_RC) checkerboard_SOURCES = \ checkerboard.c @@ -458,7 +481,8 @@ checkerboard_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(checkerboard_RC) cml_explorer_SOURCES = \ cml-explorer.c @@ -474,7 +498,8 @@ cml_explorer_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(cml_explorer_RC) color_cube_analyze_SOURCES = \ color-cube-analyze.c @@ -490,7 +515,8 @@ color_cube_analyze_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(color_cube_analyze_RC) color_enhance_SOURCES = \ color-enhance.c @@ -506,7 +532,8 @@ color_enhance_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(color_enhance_RC) color_exchange_SOURCES = \ color-exchange.c @@ -522,7 +549,8 @@ color_exchange_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(color_exchange_RC) color_to_alpha_SOURCES = \ color-to-alpha.c @@ -538,7 +566,8 @@ color_to_alpha_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(color_to_alpha_RC) colorify_SOURCES = \ colorify.c @@ -554,7 +583,8 @@ colorify_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(colorify_RC) colormap_remap_SOURCES = \ colormap-remap.c @@ -570,7 +600,8 @@ colormap_remap_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(colormap_remap_RC) compose_SOURCES = \ compose.c @@ -586,7 +617,8 @@ compose_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(compose_RC) contrast_normalize_SOURCES = \ contrast-normalize.c @@ -599,7 +631,8 @@ contrast_normalize_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(contrast_normalize_RC) contrast_retinex_SOURCES = \ contrast-retinex.c @@ -615,7 +648,8 @@ contrast_retinex_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(contrast_retinex_RC) contrast_stretch_SOURCES = \ contrast-stretch.c @@ -628,7 +662,8 @@ contrast_stretch_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(contrast_stretch_RC) contrast_stretch_hsv_SOURCES = \ contrast-stretch-hsv.c @@ -641,7 +676,8 @@ contrast_stretch_hsv_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(contrast_stretch_hsv_RC) convolution_matrix_SOURCES = \ convolution-matrix.c @@ -657,7 +693,8 @@ convolution_matrix_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(convolution_matrix_RC) crop_auto_SOURCES = \ crop-auto.c @@ -670,7 +707,8 @@ crop_auto_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(crop_auto_RC) crop_zealous_SOURCES = \ crop-zealous.c @@ -683,7 +721,8 @@ crop_zealous_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(crop_zealous_RC) cubism_SOURCES = \ cubism.c @@ -699,7 +738,8 @@ cubism_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(cubism_RC) curve_bend_SOURCES = \ curve-bend.c @@ -715,7 +755,8 @@ curve_bend_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(curve_bend_RC) decompose_SOURCES = \ decompose.c @@ -731,7 +772,8 @@ decompose_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(decompose_RC) deinterlace_SOURCES = \ deinterlace.c @@ -747,7 +789,8 @@ deinterlace_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(deinterlace_RC) depth_merge_SOURCES = \ depth-merge.c @@ -763,7 +806,8 @@ depth_merge_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(depth_merge_RC) despeckle_SOURCES = \ despeckle.c @@ -779,7 +823,8 @@ despeckle_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(despeckle_RC) destripe_SOURCES = \ destripe.c @@ -795,7 +840,8 @@ destripe_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(destripe_RC) diffraction_SOURCES = \ diffraction.c @@ -811,7 +857,8 @@ diffraction_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(diffraction_RC) displace_SOURCES = \ displace.c @@ -827,7 +874,8 @@ displace_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(displace_RC) edge_SOURCES = \ edge.c @@ -843,7 +891,8 @@ edge_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(edge_RC) edge_dog_SOURCES = \ edge-dog.c @@ -859,7 +908,8 @@ edge_dog_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(edge_dog_RC) edge_laplace_SOURCES = \ edge-laplace.c @@ -872,7 +922,8 @@ edge_laplace_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(edge_laplace_RC) edge_neon_SOURCES = \ edge-neon.c @@ -888,7 +939,8 @@ edge_neon_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(edge_neon_RC) edge_sobel_SOURCES = \ edge-sobel.c @@ -904,7 +956,8 @@ edge_sobel_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(edge_sobel_RC) emboss_SOURCES = \ emboss.c @@ -920,7 +973,8 @@ emboss_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(emboss_RC) engrave_SOURCES = \ engrave.c @@ -936,7 +990,8 @@ engrave_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(engrave_RC) file_aa_SOURCES = \ file-aa.c @@ -953,7 +1008,8 @@ file_aa_LDADD = \ $(GTK_LIBS) \ $(AA_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_aa_RC) file_cel_SOURCES = \ file-cel.c @@ -969,7 +1025,8 @@ file_cel_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_cel_RC) file_compressor_SOURCES = \ file-compressor.c @@ -982,7 +1039,8 @@ file_compressor_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_compressor_RC) file_csource_SOURCES = \ file-csource.c @@ -998,7 +1056,8 @@ file_csource_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_csource_RC) file_desktop_link_SOURCES = \ file-desktop-link.c @@ -1011,7 +1070,8 @@ file_desktop_link_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_desktop_link_RC) file_dicom_SOURCES = \ file-dicom.c @@ -1027,7 +1087,8 @@ file_dicom_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_dicom_RC) file_gbr_SOURCES = \ file-gbr.c @@ -1043,7 +1104,8 @@ file_gbr_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_gbr_RC) file_gif_load_SOURCES = \ file-gif-load.c @@ -1056,7 +1118,8 @@ file_gif_load_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_gif_load_RC) file_gif_save_SOURCES = \ file-gif-save.c @@ -1072,7 +1135,8 @@ file_gif_save_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_gif_save_RC) file_gih_SOURCES = \ file-gih.c @@ -1088,7 +1152,8 @@ file_gih_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_gih_RC) file_glob_SOURCES = \ file-glob.c @@ -1101,7 +1166,8 @@ file_glob_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_glob_RC) file_header_SOURCES = \ file-header.c @@ -1117,7 +1183,8 @@ file_header_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_header_RC) file_html_table_SOURCES = \ file-html-table.c @@ -1133,7 +1200,8 @@ file_html_table_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_html_table_RC) file_jp2_load_SOURCES = \ file-jp2-load.c @@ -1147,7 +1215,8 @@ file_jp2_load_LDADD = \ $(GLIB_LIBS) \ $(JP2_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_jp2_load_RC) file_mng_SOURCES = \ file-mng.c @@ -1164,7 +1233,8 @@ file_mng_LDADD = \ $(GTK_LIBS) \ $(MNG_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_mng_RC) file_pat_SOURCES = \ file-pat.c @@ -1180,7 +1250,8 @@ file_pat_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_pat_RC) file_pcx_SOURCES = \ file-pcx.c @@ -1196,14 +1267,15 @@ file_pcx_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_pcx_RC) -file_pdf_CFLAGS = $(POPPLER_CFLAGS) +file_pdf_load_CFLAGS = $(POPPLER_CFLAGS) -file_pdf_SOURCES = \ - file-pdf.c +file_pdf_load_SOURCES = \ + file-pdf-load.c -file_pdf_LDADD = \ +file_pdf_load_LDADD = \ $(libgimpui) \ $(libgimpwidgets) \ $(libgimpmodule) \ @@ -1215,7 +1287,28 @@ file_pdf_LDADD = \ $(GTK_LIBS) \ $(POPPLER_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_pdf_load_RC) + +file_pdf_save_CFLAGS = $(CAIRO_PDF_CFLAGS) + +file_pdf_save_SOURCES = \ + file-pdf-save.c + +file_pdf_save_LDADD = \ + $(libgimpui) \ + $(libgimpwidgets) \ + $(libgimpmodule) \ + $(libgimp) \ + $(libgimpmath) \ + $(libgimpconfig) \ + $(libgimpcolor) \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(CAIRO_PDF_LIBS) \ + $(RT_LIBS) \ + $(INTLLIBS) \ + $(file_pdf_save_RC) file_pix_SOURCES = \ file-pix.c @@ -1231,7 +1324,8 @@ file_pix_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_pix_RC) file_png_CFLAGS = $(PNG_CFLAGS) @@ -1250,7 +1344,8 @@ file_png_LDADD = \ $(GTK_LIBS) \ $(PNG_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_png_RC) file_pnm_SOURCES = \ file-pnm.c @@ -1266,7 +1361,8 @@ file_pnm_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_pnm_RC) file_ps_SOURCES = \ file-ps.c @@ -1282,7 +1378,8 @@ file_ps_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_ps_RC) file_psp_SOURCES = \ file-psp.c @@ -1299,7 +1396,8 @@ file_psp_LDADD = \ $(GTK_LIBS) \ $(Z_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_psp_RC) file_raw_SOURCES = \ file-raw.c @@ -1315,7 +1413,8 @@ file_raw_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_raw_RC) file_sunras_SOURCES = \ file-sunras.c @@ -1331,7 +1430,8 @@ file_sunras_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_sunras_RC) file_svg_CFLAGS = $(SVG_CFLAGS) @@ -1350,7 +1450,8 @@ file_svg_LDADD = \ $(GTK_LIBS) \ $(SVG_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_svg_RC) file_tga_SOURCES = \ file-tga.c @@ -1366,7 +1467,8 @@ file_tga_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_tga_RC) file_tiff_load_SOURCES = \ file-tiff-load.c @@ -1383,7 +1485,8 @@ file_tiff_load_LDADD = \ $(GTK_LIBS) \ $(TIFF_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_tiff_load_RC) file_tiff_save_SOURCES = \ file-tiff-save.c @@ -1400,7 +1503,8 @@ file_tiff_save_LDADD = \ $(GTK_LIBS) \ $(TIFF_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_tiff_save_RC) file_wmf_CFLAGS = $(WMF_CFLAGS) @@ -1419,7 +1523,8 @@ file_wmf_LDADD = \ $(GTK_LIBS) \ $(WMF_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_wmf_RC) file_xbm_SOURCES = \ file-xbm.c @@ -1435,7 +1540,8 @@ file_xbm_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_xbm_RC) file_xmc_SOURCES = \ file-xmc.c @@ -1452,7 +1558,8 @@ file_xmc_LDADD = \ $(GTK_LIBS) \ $(XMC_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_xmc_RC) file_xpm_SOURCES = \ file-xpm.c @@ -1469,7 +1576,8 @@ file_xpm_LDADD = \ $(GTK_LIBS) \ $(XPM_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_xpm_RC) file_xwd_SOURCES = \ file-xwd.c @@ -1485,7 +1593,8 @@ file_xwd_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_xwd_RC) film_SOURCES = \ film.c @@ -1501,7 +1610,8 @@ film_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(film_RC) filter_pack_SOURCES = \ filter-pack.c @@ -1517,7 +1627,8 @@ filter_pack_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(filter_pack_RC) fractal_trace_SOURCES = \ fractal-trace.c @@ -1533,7 +1644,8 @@ fractal_trace_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(fractal_trace_RC) gradient_map_SOURCES = \ gradient-map.c @@ -1546,7 +1658,8 @@ gradient_map_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(gradient_map_RC) grid_SOURCES = \ grid.c @@ -1562,7 +1675,8 @@ grid_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(grid_RC) guillotine_SOURCES = \ guillotine.c @@ -1575,7 +1689,8 @@ guillotine_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(guillotine_RC) hot_SOURCES = \ hot.c @@ -1591,7 +1706,8 @@ hot_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(hot_RC) illusion_SOURCES = \ illusion.c @@ -1607,7 +1723,8 @@ illusion_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(illusion_RC) iwarp_SOURCES = \ iwarp.c @@ -1623,7 +1740,8 @@ iwarp_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(iwarp_RC) jigsaw_SOURCES = \ jigsaw.c @@ -1639,7 +1757,8 @@ jigsaw_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(jigsaw_RC) lcms_CFLAGS = $(LCMS_CFLAGS) @@ -1658,7 +1777,8 @@ lcms_LDADD = \ $(GTK_LIBS) \ $(LCMS_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(lcms_RC) lens_apply_SOURCES = \ lens-apply.c @@ -1674,7 +1794,8 @@ lens_apply_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(lens_apply_RC) lens_distortion_SOURCES = \ lens-distortion.c @@ -1690,7 +1811,8 @@ lens_distortion_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(lens_distortion_RC) lens_flare_SOURCES = \ lens-flare.c @@ -1706,7 +1828,8 @@ lens_flare_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(lens_flare_RC) mail_SOURCES = \ mail.c @@ -1722,7 +1845,8 @@ mail_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(mail_RC) max_rgb_SOURCES = \ max-rgb.c @@ -1738,7 +1862,8 @@ max_rgb_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(max_rgb_RC) mosaic_SOURCES = \ mosaic.c @@ -1754,7 +1879,8 @@ mosaic_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(mosaic_RC) newsprint_SOURCES = \ newsprint.c @@ -1770,7 +1896,8 @@ newsprint_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(newsprint_RC) nl_filter_SOURCES = \ nl-filter.c @@ -1786,7 +1913,8 @@ nl_filter_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(nl_filter_RC) noise_hsv_SOURCES = \ noise-hsv.c @@ -1802,7 +1930,8 @@ noise_hsv_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(noise_hsv_RC) noise_randomize_SOURCES = \ noise-randomize.c @@ -1818,7 +1947,8 @@ noise_randomize_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(noise_randomize_RC) noise_rgb_SOURCES = \ noise-rgb.c @@ -1834,7 +1964,8 @@ noise_rgb_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(noise_rgb_RC) noise_solid_SOURCES = \ noise-solid.c @@ -1850,7 +1981,8 @@ noise_solid_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(noise_solid_RC) noise_spread_SOURCES = \ noise-spread.c @@ -1866,7 +1998,8 @@ noise_spread_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(noise_spread_RC) nova_SOURCES = \ nova.c @@ -1882,7 +2015,8 @@ nova_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(nova_RC) oilify_SOURCES = \ oilify.c @@ -1898,7 +2032,8 @@ oilify_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(oilify_RC) photocopy_SOURCES = \ photocopy.c @@ -1914,7 +2049,8 @@ photocopy_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(photocopy_RC) pixelize_SOURCES = \ pixelize.c @@ -1930,7 +2066,8 @@ pixelize_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(pixelize_RC) plasma_SOURCES = \ plasma.c @@ -1946,7 +2083,8 @@ plasma_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(plasma_RC) plugin_browser_SOURCES = \ plugin-browser.c @@ -1962,7 +2100,8 @@ plugin_browser_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(plugin_browser_RC) polar_coords_SOURCES = \ polar-coords.c @@ -1978,7 +2117,8 @@ polar_coords_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(polar_coords_RC) procedure_browser_SOURCES = \ procedure-browser.c @@ -1994,7 +2134,8 @@ procedure_browser_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(procedure_browser_RC) qbist_SOURCES = \ qbist.c @@ -2010,7 +2151,8 @@ qbist_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(qbist_RC) red_eye_removal_SOURCES = \ red-eye-removal.c @@ -2026,7 +2168,8 @@ red_eye_removal_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(red_eye_removal_RC) ripple_SOURCES = \ ripple.c @@ -2042,7 +2185,8 @@ ripple_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(ripple_RC) rotate_SOURCES = \ rotate.c @@ -2055,7 +2199,8 @@ rotate_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(rotate_RC) sample_colorize_SOURCES = \ sample-colorize.c @@ -2071,7 +2216,8 @@ sample_colorize_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(sample_colorize_RC) screenshot_CFLAGS = $(XFIXES_CFLAGS) @@ -2090,7 +2236,8 @@ screenshot_LDADD = \ $(GTK_LIBS) \ $(SCREENSHOT_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(screenshot_RC) semi_flatten_SOURCES = \ semi-flatten.c @@ -2103,7 +2250,8 @@ semi_flatten_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(semi_flatten_RC) sharpen_SOURCES = \ sharpen.c @@ -2119,7 +2267,8 @@ sharpen_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(sharpen_RC) shift_SOURCES = \ shift.c @@ -2135,7 +2284,8 @@ shift_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(shift_RC) sinus_SOURCES = \ sinus.c @@ -2151,7 +2301,8 @@ sinus_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(sinus_RC) smooth_palette_SOURCES = \ smooth-palette.c @@ -2167,7 +2318,8 @@ smooth_palette_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(smooth_palette_RC) softglow_SOURCES = \ softglow.c @@ -2183,7 +2335,8 @@ softglow_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(softglow_RC) sparkle_SOURCES = \ sparkle.c @@ -2199,7 +2352,8 @@ sparkle_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(sparkle_RC) sphere_designer_SOURCES = \ sphere-designer.c @@ -2215,7 +2369,8 @@ sphere_designer_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(sphere_designer_RC) threshold_alpha_SOURCES = \ threshold-alpha.c @@ -2231,7 +2386,8 @@ threshold_alpha_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(threshold_alpha_RC) tile_SOURCES = \ tile.c @@ -2247,7 +2403,8 @@ tile_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(tile_RC) tile_glass_SOURCES = \ tile-glass.c @@ -2263,7 +2420,8 @@ tile_glass_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(tile_glass_RC) tile_paper_SOURCES = \ tile-paper.c @@ -2279,7 +2437,8 @@ tile_paper_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(tile_paper_RC) tile_seamless_SOURCES = \ tile-seamless.c @@ -2292,7 +2451,8 @@ tile_seamless_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(tile_seamless_RC) tile_small_SOURCES = \ tile-small.c @@ -2308,7 +2468,8 @@ tile_small_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(tile_small_RC) unit_editor_SOURCES = \ unit-editor.c @@ -2324,7 +2485,8 @@ unit_editor_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(unit_editor_RC) unsharp_mask_SOURCES = \ unsharp-mask.c @@ -2340,7 +2502,8 @@ unsharp_mask_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(unsharp_mask_RC) value_invert_SOURCES = \ value-invert.c @@ -2353,7 +2516,8 @@ value_invert_LDADD = \ $(libgimpbase) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(value_invert_RC) value_propagate_SOURCES = \ value-propagate.c @@ -2369,7 +2533,8 @@ value_propagate_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(value_propagate_RC) van_gogh_lic_SOURCES = \ van-gogh-lic.c @@ -2385,7 +2550,8 @@ van_gogh_lic_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(van_gogh_lic_RC) video_SOURCES = \ video.c @@ -2401,7 +2567,8 @@ video_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(video_RC) warp_SOURCES = \ warp.c @@ -2417,7 +2584,8 @@ warp_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(warp_RC) waves_SOURCES = \ waves.c @@ -2433,7 +2601,8 @@ waves_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(waves_RC) web_browser_SOURCES = \ web-browser.c @@ -2449,7 +2618,8 @@ web_browser_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(web_browser_RC) whirl_pinch_SOURCES = \ whirl-pinch.c @@ -2465,7 +2635,8 @@ whirl_pinch_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(whirl_pinch_RC) wind_SOURCES = \ wind.c @@ -2481,4 +2652,5 @@ wind_LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(wind_RC) diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf-load.c similarity index 99% rename from plug-ins/common/file-pdf.c rename to plug-ins/common/file-pdf-load.c index 43c9c8a8c2..35718f313d 100644 --- a/plug-ins/common/file-pdf.c +++ b/plug-ins/common/file-pdf-load.c @@ -1,6 +1,6 @@ /* GIMP - The GNU Image Manipulation Program * - * file-pdf.c - PDF file loader + * file-pdf-load.c - PDF file loader * * Copyright (C) 2005 Nathan Summers * @@ -34,7 +34,7 @@ #define LOAD_PROC "file-pdf-load" #define LOAD_THUMB_PROC "file-pdf-load-thumb" -#define PLUG_IN_BINARY "file-pdf" +#define PLUG_IN_BINARY "file-pdf-load" #define THUMBNAIL_SIZE 128 diff --git a/plug-ins/common/file-pdf-save.c b/plug-ins/common/file-pdf-save.c new file mode 100755 index 0000000000..59cbf4dd7f --- /dev/null +++ b/plug-ins/common/file-pdf-save.c @@ -0,0 +1,1477 @@ +/* GIMP - The GNU Image Manipulation Program + * + * file-pdf-save.c - PDF file exporter, based on the cairo PDF surface + * + * Copyright (C) 2010 Barak Itkin + * + * 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 . + */ + +/* The PDF export plugin has 3 main procedures: + * 1. file-pdf-save + * This is the main procedure. It has 3 options for optimizations of + * the pdf file, and it can show a gui. This procedure works on a single + * image. + * 2. file-pdf-save-defaults + * This procedures is the one that will be invoked by gimp's file-save, + * when the pdf extension is chosen. If it's in RUN_INTERACTIVE, it will + * pop a user interface with more options, like file-pdf-save. If it's in + * RUN_NONINTERACTIVE, it will simply use the default values. Note that on + * RUN_WITH_LAST_VALS there will be no gui, however the values will be the + * ones that were used in the last interactive run (or the defaults if none + * are available. + * 3. file-pdf-save-multi + * This procedures is more advanced, and it allows the creation of multiple + * paged pdf files. It will be located in File/Create/Multiple page PDF... + * + * It was suggested that file-pdf-save-multi will be removed from the UI as it + * does not match the product vision (GIMP isn't a program for editing multiple + * paged documents). + */ + +/* Known Issues (except for the coding style issues): + * 0. Need to add support for i18n. + * 1. Grayscale layers are inverted (although layer masks which are not grayscale, + * are not inverted) + * 2. Exporting some fonts doesn't work since gimp_text_layer_get_font Returns a + * font which is sometimes incompatiable with pango_font_description_from_string + * (gimp_text_layer_get_font sometimes returns suffixes such as "semi-expanded" to + * the font's name although the GIMP's font selection dialog shows the don'ts name + * normally - This should be checked again in GIMP 2.7) + * 3. Indexed layers can't be optimized yet (Since gimp_histogram won't work on + * indexed layers) + * 4. Rendering the pango layout requires multiplying the size in PANGO_SCALE. This + * means I'll need to do some hacking on the markup returned from GIMP. + * 5. When accessing the contents of layer groups is supported, we should do use it + * (since this plugin should preserve layers). + * + * Also, there are 2 things which we should warn the user about: + * 1. Cairo does not support bitmap masks for text. + * 2. Currently layer modes are ignored. We do support layers, including + * transparency and opacity, but layer modes are not supported. + */ + +/* Changelog + * + * April 29, 2009 | Barak Itkin + * First version of the plugin. This is only a proof of concept and not a full + * working plugin. + * + * May 6, 2009 Barak | Itkin + * Added new features and several bugfixes: + * - Added handling for image resolutions + * - fixed the behaviour of getting font sizes + * - Added various optimizations (solid rectangles instead of bitmaps, ignoring + * invisible layers, etc.) as a macro flag. + * - Added handling for layer masks, use CAIRO_FORMAT_A8 for grayscale drawables. + * - Indexed layers are now supported + * + * August 17, 2009 | Barak Itkin + * Most of the plugin was rewritten from scratch and it now has several new + * features: + * - Got rid of the optimization macros in the code. The gui now allows to + * select which optimizations to apply. + * - Added a procedure to allow the creation of multiple paged PDF's + * - Registered the plugin on "/File/Create/PDF" + * + * August 21, 2009 | Barak Itkin + * Fixed a typo that prevented the plugin from compiling... + * A migration to the new GIMP 2.8 api, which includes: + * - Now using gimp_export_dialog_new + * - Using gimp_text_layer_get_hint_style (2.8) instead of the depreceated + * gimp_text_layer_get_hinting (2.6). + * + * August 24, 2010 | Barak Itkin + * More migrations to the new GIMP 2.8 api: + * - Now using the GimpItem api + * - Using gimp_text_layer_get_markup where possible + * - Fixed some compiler warnings + * Also merged the header and c file into one file, Updated some of the comments + * and documentation, and moved this into the main source repository. + */ + +#include "config.h" + +#include +#include + +#include +#include + + +#define SAVE_PROC "file-pdf-save" +#define SAVE_DEFAULTS_PROC "file-pdf-save-defaults" +#define SAVE_MULTI_PROC "file-pdf-save-multi" +#define PLUG_IN_BINARY "file-pdf-save" + +#define DATA_OPTIMIZE "file-pdf-data-optimize" +#define DATA_IMAGE_LIST "file-pdf-data-multi-page" + +/* Gimp will crash before you reach this limitation :D */ +#define MAX_PAGE_COUNT 350 +#define MAX_FILE_NAME_LENGTH 350 + +#define THUMB_WIDTH 90 +#define THUMB_HEIGHT 120 + +#define PDF_DEBUG FALSE + + +typedef struct { + gboolean convert; + gboolean ignore; + gboolean apply_masks; +} PdfOptimize; + +typedef struct { + gint32 images[MAX_PAGE_COUNT]; + guint32 image_count; + gchar file_name[MAX_FILE_NAME_LENGTH]; +} PdfMultiPage; + +typedef struct { + PdfOptimize optimize; + GArray *images; +} PdfMultiVals; + +enum { + THUMB, + PAGE_NUMBER, + IMAGE_NAME, + IMAGE_ID +}; + +typedef struct { + GdkPixbuf *thumb; + gint32 page_number; + gchar* image_name; +} Page; + + +static void init_vals (const gchar *name, + gint nparams, + const GimpParam *param, + gboolean *single, + gboolean *defaults, + GimpRunMode *run_mode); + +static void init_image_list_defaults (gint32 image); + +static void validate_image_list (void); + +static gboolean gui_single (void); +static gboolean gui_multi (void); + +static void choose_file_call (GtkWidget* browse_button, + gpointer file_entry); + +static gboolean get_image_list (void); +static GtkTreeModel* create_model (void); + +static void add_image_call (GtkWidget *widget, + gpointer img_combo); +static void del_image_call (GtkWidget *widget, + gpointer icon_view); +static void remove_call (GtkTreeModel *tree_model, + GtkTreePath *path, + gpointer user_data); +static void recount_pages (void); + +static cairo_surface_t *get_drawable_image (GimpDrawable *drawable); +static GimpRGB get_layer_color (GimpDrawable *layer, + gboolean *single); +static void drawText (GimpDrawable* text_layer, + gdouble opacity, + cairo_t *cr, + gdouble x_res, + gdouble y_res); + +static void query (void); +static void run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); + +static gboolean dnd_remove = TRUE; +static PdfMultiPage multi_page; + +static PdfOptimize optimize = { + TRUE, /* convert */ + TRUE, /* ignore */ + TRUE /* apply_masks */ +}; + +static GtkTreeModel *model; +static GtkWidget *file_choose; +static gchar* file_name; + +GimpPlugInInfo PLUG_IN_INFO = + { + NULL, + NULL, + query, + run + }; + +MAIN() + + static void +query (void) +{ + static GimpParamDef save_defaults_args[] = + { + {GIMP_PDB_INT32, "run-mode", "Run mode"}, + {GIMP_PDB_IMAGE, "image", "Input image"}, + {GIMP_PDB_DRAWABLE, "drawable", "Input drawable"}, + {GIMP_PDB_STRING, "filename", "The name of the file to save the image in"}, + {GIMP_PDB_STRING, "raw-filename", "The name of the file to save the image in"} + }; + + static GimpParamDef save_args[] = + { + {GIMP_PDB_INT32, "run-mode", "Run mode"}, + {GIMP_PDB_IMAGE, "image", "Input image"}, + {GIMP_PDB_DRAWABLE, "drawable", "Input drawable"}, + {GIMP_PDB_INT32, "convert", "Convert bitmaps to vector where possible? TRUE or FALSE"}, + {GIMP_PDB_INT32, "ignore", "Don't Save layers which are hidden or have their opacity set to zero? TRUE or FALSE"}, + {GIMP_PDB_INT32, "apply-masks", "Apply layer masks before saving? TRUE or FALSE (Keeping the masks will not change the final result)"}, + {GIMP_PDB_STRING, "filename", "The name of the file to save the image in"}, + {GIMP_PDB_STRING, "raw-filename", "The name of the file to save the image in"} + }; + + static GimpParamDef save_multi_args[] = + { + {GIMP_PDB_INT32, "run-mode", "Run mode"}, + {GIMP_PDB_INT32ARRAY, "images", "Input image for each page (An image can appear more than once)"}, + {GIMP_PDB_INT32, "count", "The amount of images entered (This will be the amount of pages). 1 <= count <= MAX_PAGE_COUNT"}, + {GIMP_PDB_INT32, "convert", "Convert bitmaps to vector where possible? TRUE or FALSE"}, + {GIMP_PDB_INT32, "ignore", "Don't Save layers which are hidden or have their opacity set to zero? TRUE or FALSE"}, + {GIMP_PDB_INT32, "apply-masks", "Apply layer masks before saving? TRUE or FALSE (Keeping the masks will not change the final result)"}, + {GIMP_PDB_STRING, "filename", "The name of the file to save the image in"}, + {GIMP_PDB_STRING, "raw-filename", "The name of the file to save the image in"} + }; + + gimp_install_procedure (SAVE_DEFAULTS_PROC, + "Save files as PDF", + "Save files in the Portable Document Format (PDF)", + "Barak Itkin", + "Copyright Barak Itkin", + "August 2009", + "_Save as PDF...", + "RGB*, GRAY*, INDEXED*", + GIMP_PLUGIN, + G_N_ELEMENTS (save_defaults_args), 0, + save_defaults_args, NULL); + + gimp_install_procedure (SAVE_PROC, + "Save files as PDF", + "Save files in the Portable Document Format (PDF)", + "Barak Itkin", + "Copyright Barak Itkin", + "August 2009", + "_Save as PDF...", + "RGB*, GRAY*, INDEXED*", + GIMP_PLUGIN, + G_N_ELEMENTS (save_args), 0, + save_args, NULL); + + gimp_install_procedure (SAVE_MULTI_PROC, + "Save files as PDF", + "Save files in the Portable Document Format (PDF)", + "Barak Itkin", + "Copyright Barak Itkin", + "August 2009", + "_Create multiple paged PDF...", + "RGB*, GRAY*, INDEXED*", + GIMP_PLUGIN, + G_N_ELEMENTS (save_multi_args), 0, + save_multi_args, NULL); + + gimp_plugin_menu_register (SAVE_MULTI_PROC, + "/File/Create/PDF"); + + gimp_register_file_handler_mime (SAVE_DEFAULTS_PROC, "application/pdf"); + gimp_register_save_handler (SAVE_DEFAULTS_PROC, "pdf", ""); +} + +static void +run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals) +{ + static GimpParam values[1]; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; + GimpRunMode run_mode; + + /* Plug-in variables */ + gboolean single_image; + gboolean defaults_proc; + + /* Plug-In variables */ + cairo_surface_t *pdf_file; + cairo_t *cr; + GimpExportCapabilities capabilities; + + guint32 i = 0; + gint32 j = 0; + + gdouble x_res, y_res; + gdouble x_scale, y_scale; + + gint32 image_id; + gboolean exported; + GimpImageBaseType type; + + gint32 temp; + +#if PDF_DEBUG + const gchar *cairo_status; +#endif + + gint *layers; + gint32 num_of_layers; + GimpDrawable *layer; + cairo_surface_t *layer_image; + gdouble opacity; + gint x, y; + GimpRGB layer_color; + gboolean single_color; + + gint32 mask_id = -1; + GimpDrawable *mask = NULL; + cairo_surface_t *mask_image = NULL; + + /* Setting mandatory output values */ + *nreturn_vals = 1; + *return_vals = values; + + values[0].type = GIMP_PDB_STATUS; + values[0].data.d_status = status; + + /* Initializing all the settings */ + multi_page.image_count = 0; + + init_vals (name, nparams, param, &single_image, + &defaults_proc, &run_mode); + + /* Starting the executions */ + if (run_mode == GIMP_RUN_INTERACTIVE) + { + if (single_image) + { + if (! gui_single ()) + { + values[0].data.d_status = GIMP_PDB_CANCEL; + return; + } + } + else if (! gui_multi ()) + { + values[0].data.d_status = GIMP_PDB_CANCEL; + return; + } + + if (file_name == NULL) + { + values[0].data.d_status = GIMP_PDB_CALLING_ERROR; + gimp_message ("You must select a file to save!"); + return; + } + } + + pdf_file = cairo_pdf_surface_create (file_name, 1, 1); + if (cairo_surface_status (pdf_file) != CAIRO_STATUS_SUCCESS) + { +#if PDF_DEBUG + cairo_status = cairo_status_to_string (cairo_surface_status (pdf_file)); +#endif + gimp_message ("An error occured while creating the PDF file!\n" +#if PDF_DEBUG + cairo_status "\n" +#endif + "Make sure you entered a valid filename and that the selected location isn't read only!"); + values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; + return; + } + cr = cairo_create (pdf_file); + + capabilities = GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_ALPHA | + GIMP_EXPORT_CAN_HANDLE_GRAY | GIMP_EXPORT_CAN_HANDLE_LAYERS | + GIMP_EXPORT_CAN_HANDLE_INDEXED; + if (optimize.apply_masks) + capabilities |= GIMP_EXPORT_CAN_HANDLE_LAYER_MASKS; + + for (i = 0; i < multi_page.image_count; i++) + { + /* Save the state of the surface before any changes, so that settings + * from one page won't affect all the others */ + cairo_save (cr); + + image_id = multi_page.images[i]; + + /* We need the active layer in order to use gimp_image_export */ + temp = gimp_image_get_active_drawable (image_id); + if (temp == -1) + exported = gimp_export_image (&image_id, &temp, NULL, capabilities) == GIMP_EXPORT_EXPORT; + else + exported = FALSE; + type = gimp_image_base_type (image_id); + + gimp_image_get_resolution (image_id, &x_res, &y_res); + x_scale = 72.0 / x_res; + y_scale = 72.0 / y_res; + + cairo_pdf_surface_set_size (pdf_file, + gimp_image_width (image_id) * x_scale, + gimp_image_height (image_id) * y_scale); + + /* This way we set how many pixels are there in every inch. + * It's very important for PangoCairo */ + cairo_surface_set_fallback_resolution (pdf_file, x_res, y_res); + + /* PDF is usually 72 points per inch. If we have a different resolution, + * we will need this to fit our drawings */ + cairo_scale (cr, x_scale, y_scale); + + /* Now, we should loop over the layers of each image */ + layers = gimp_image_get_layers (image_id, &num_of_layers); + + for (j = 0; j < num_of_layers; j++) + { + layer = gimp_drawable_get (layers [num_of_layers-j-1]); + opacity = gimp_layer_get_opacity (layer->drawable_id)/100.0; + + /* Gimp doesn't display indexed layers with opacity below 50% + * And if it's above 50%, it will be rounded to 100% */ + if (type == GIMP_INDEXED) + { + if (opacity <= 0.5) + opacity = 0.0; + else + opacity = 1.0; + } + + if (gimp_item_get_visible (layer->drawable_id) + && (! optimize.ignore || (optimize.ignore && opacity > 0.0))) + { + mask_id = gimp_layer_get_mask (layer->drawable_id); + if (mask_id != -1) + { + mask = gimp_drawable_get (mask_id); + mask_image = get_drawable_image (mask); + } + + gimp_drawable_offsets (layer->drawable_id, &x, &y); + + /* For raster layers */ + if (!gimp_drawable_is_text_layer (layer->drawable_id)) + { + layer_color = get_layer_color (layer, &single_color); + cairo_rectangle (cr, x, y, layer->width, layer->height); + + if (optimize.convert && single_color) + { + cairo_set_source_rgba (cr, layer_color.r, layer_color.g, layer_color.b, layer_color.a * opacity); + if (mask_id != -1) + cairo_mask_surface (cr, mask_image, x, y); + else + cairo_fill (cr); + } + else + { + cairo_clip (cr); + layer_image = get_drawable_image (layer); + cairo_set_source_surface (cr, layer_image, x, y); + cairo_push_group (cr); + cairo_paint_with_alpha (cr, opacity); + cairo_pop_group_to_source (cr); + if (mask_id != -1) + cairo_mask_surface (cr, mask_image, x, y); + else + cairo_paint (cr); + cairo_reset_clip (cr); + + cairo_surface_destroy (layer_image); + } + } + /* For text layers */ + else + { + drawText (layer, opacity, cr, x_res, y_res); + } + } + + /* We are done with the layer - time to free some resources */ + gimp_drawable_detach (layer); + if (mask_id != -1) + { + gimp_drawable_detach (mask); + cairo_surface_destroy (mask_image); + } + } + /* We are done with this image - Show it! */ + cairo_show_page (cr); + cairo_restore (cr); + + if (exported) + gimp_image_delete (image_id); + } + + /* We are done with all the images - time to free the resources */ + cairo_surface_destroy (pdf_file); + cairo_destroy (cr); + + /* Finally done, let's save the parameters */ + gimp_set_data (DATA_OPTIMIZE, &optimize, sizeof (optimize)); + if (!single_image) + { + g_strlcpy (multi_page.file_name, file_name, MAX_FILE_NAME_LENGTH); + gimp_set_data (DATA_IMAGE_LIST, &multi_page, sizeof (multi_page)); + } + +} + +/******************************************************/ +/* Begining of parameter handling functions */ +/******************************************************/ + +/* A function that takes care of loading the basic + * parameters */ +static void +init_vals (const gchar *name, + gint nparams, + const GimpParam *param, + gboolean *single_image, + gboolean *defaults_proc, + GimpRunMode *run_mode) +{ + gboolean had_saved_list = FALSE; + gboolean single = TRUE; + gboolean defaults = FALSE; + gint32 i; + gint32 image; + + *run_mode = param[0].data.d_int32; + + if (g_str_equal (name, SAVE_DEFAULTS_PROC)) + defaults = TRUE; + else if (g_str_equal (name, SAVE_MULTI_PROC)) + single = FALSE; + + if (single) + { + image = param[1].data.d_int32; + file_name = param[3].data.d_string; + } + else { + image = -1; + file_name = param[6].data.d_string; + } + + switch (*run_mode) + { + + case GIMP_RUN_NONINTERACTIVE: + if (single) + { + if (!defaults) + { + optimize.apply_masks = param[3].data.d_int32; + optimize.convert = param[4].data.d_int32; + optimize.ignore = param[5].data.d_int32; + } + init_image_list_defaults (image); + } + else + { + multi_page.image_count = param[2].data.d_int32; + if (param[1].data.d_int32array != NULL) + for (i = 0; i < param[2].data.d_int32; i++) + multi_page.images[i] = param[1].data.d_int32array[i]; + + optimize.apply_masks = param[3].data.d_int32; + optimize.convert = param[4].data.d_int32; + optimize.ignore = param[5].data.d_int32; + } + + break; + + case GIMP_RUN_INTERACTIVE: + /* Possibly retrieve data */ + gimp_get_data (DATA_OPTIMIZE, &optimize); + had_saved_list = gimp_get_data (DATA_IMAGE_LIST, &multi_page); + if (had_saved_list) + { + file_name = multi_page.file_name; + } + + if (single || !had_saved_list ) + init_image_list_defaults (image); + + break; + + case GIMP_RUN_WITH_LAST_VALS: + /* Possibly retrieve data */ + if (!single) + { + had_saved_list = gimp_get_data (DATA_IMAGE_LIST, &multi_page); + if (had_saved_list) + { + file_name = multi_page.file_name; + } + } + else + init_image_list_defaults (image); + gimp_get_data (DATA_OPTIMIZE, &optimize); + + break; + } + + *defaults_proc = defaults; + *single_image = single; + + validate_image_list (); +} + +/* A function that initializes the image list to default values */ +static void +init_image_list_defaults (gint32 image) +{ + if (image != -1) + { + multi_page.images[0] = image; + multi_page.image_count = 1; + } + else { + multi_page.image_count = 0; + } +} + +/* A function that removes images that are no longer valid from + * the image list */ +static void +validate_image_list (void) +{ + gint32 valid = 0; + guint32 i = 0; + + for (i = 0 ; i < MAX_PAGE_COUNT && i < multi_page.image_count ; i++) + { + if (gimp_image_is_valid (multi_page.images[i])) + { + multi_page.images[valid] = multi_page.images[i]; + valid++; + } + } + multi_page.image_count = valid; +} + +/******************************************************/ +/* Begining of GUI functions */ +/******************************************************/ +/* The main GUI function for saving single-paged PDFs */ +static gboolean +gui_single (void) +{ + GtkWidget *window; + GtkWidget *vbox; + + GtkWidget *convert_c; + GtkWidget *ignore_c; + GtkWidget *apply_c; + + gboolean run; + + gimp_ui_init (PLUG_IN_BINARY, FALSE); + + window = gimp_export_dialog_new ("PDF", PLUG_IN_BINARY, SAVE_PROC); + + vbox = gtk_vbox_new (FALSE, 12); + gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (window)), + vbox, TRUE, TRUE, 0); + + gtk_container_set_border_width (GTK_CONTAINER (window), 12); + + ignore_c = gtk_check_button_new_with_label ("Don't Save layers which are hidden or have their opacity set to zero?"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ignore_c), optimize.ignore); + gtk_box_pack_end (GTK_BOX (vbox), ignore_c, TRUE, TRUE, 0); + + convert_c = gtk_check_button_new_with_label ("Convert bitmaps to vector where possible?"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (convert_c), optimize.convert); + gtk_box_pack_end (GTK_BOX (vbox), convert_c, TRUE, TRUE, 0); + + apply_c = gtk_check_button_new_with_label ("Apply layer masks before saving? (Keeping the masks will not change the final result)"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (apply_c), optimize.apply_masks); + gtk_box_pack_end (GTK_BOX (vbox), apply_c, TRUE, TRUE, 0); + + gtk_widget_show_all (window); + + run = gtk_dialog_run (GTK_DIALOG (window)) == GTK_RESPONSE_OK; + + optimize.ignore = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ignore_c)); + optimize.convert = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (convert_c)); + optimize.apply_masks = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (apply_c)); + + gtk_widget_destroy (window); + return run; +} +/* The main GUI function for saving multi-paged PDFs */ +static gboolean +gui_multi (void) +{ + GtkWidget *window; + GtkWidget *vbox; + + GtkWidget *file_label; + GtkWidget *file_entry; + GtkWidget *file_browse; + GtkWidget *file_hbox; + + GtkWidget *convert_c; + GtkWidget *ignore_c; + GtkWidget *apply_c; + + GtkWidget *scroll; + GtkWidget *page_view; + + GtkWidget *h_but_box; + GtkWidget *del; + + GtkWidget *h_box; + GtkWidget *img_combo; + GtkWidget *add_image; + + gboolean run; + const gchar *temp; + + gimp_ui_init (PLUG_IN_BINARY, FALSE); + + window = gimp_export_dialog_new ("PDF", PLUG_IN_BINARY, SAVE_MULTI_PROC); + + vbox = gtk_vbox_new (FALSE, 10); + gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (window)), + vbox, TRUE, TRUE, 0); + + gtk_container_set_border_width (GTK_CONTAINER (window), 12); + + file_hbox = gtk_hbox_new (FALSE, 5); + file_label = gtk_label_new ("Choose the place to save the file in:"); + file_entry = gtk_entry_new (); + if (file_name != NULL) + gtk_entry_set_text (GTK_ENTRY (file_entry), file_name); + file_browse = gtk_button_new_with_label ("Browse..."); + file_choose = gtk_file_chooser_dialog_new ("Multipage PDF export", + GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE, + "gtk-save", GTK_RESPONSE_OK, + "gtk-cancel", GTK_RESPONSE_CANCEL, + NULL); + + gtk_box_pack_start (GTK_BOX (file_hbox), file_label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (file_hbox), file_entry, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (file_hbox), file_browse, FALSE, FALSE, 0); + + gtk_box_pack_start (GTK_BOX (vbox), file_hbox, TRUE, TRUE, 0); + + page_view = gtk_icon_view_new (); + model = create_model (); + gtk_icon_view_set_model (GTK_ICON_VIEW (page_view), model); + gtk_icon_view_set_reorderable (GTK_ICON_VIEW (page_view), TRUE); + gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (page_view), GTK_SELECTION_MULTIPLE); + + gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (page_view), THUMB); + gtk_icon_view_set_text_column (GTK_ICON_VIEW (page_view), PAGE_NUMBER); + gtk_icon_view_set_tooltip_column (GTK_ICON_VIEW (page_view), IMAGE_NAME); + + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_size_request (scroll, -1, 300); + + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + gtk_container_add (GTK_CONTAINER (scroll), page_view); + + gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0); + + h_but_box = gtk_hbutton_box_new (); + gtk_button_box_set_layout (GTK_BUTTON_BOX (h_but_box), GTK_BUTTONBOX_START); + + del = gtk_button_new_with_label ("Remove the selected pages"); + gtk_box_pack_start (GTK_BOX (h_but_box), del, TRUE, TRUE, 0); + + gtk_box_pack_start (GTK_BOX (vbox), h_but_box, FALSE, FALSE, 0); + + h_box = gtk_hbox_new (FALSE, 5); + + img_combo = gimp_image_combo_box_new (NULL, NULL); + gtk_box_pack_start (GTK_BOX (h_box), img_combo, FALSE, FALSE, 0); + + add_image = gtk_button_new_with_label ("Add this image"); + gtk_box_pack_start (GTK_BOX (h_box), add_image, FALSE, FALSE, 0); + + gtk_box_pack_start (GTK_BOX (vbox), h_box, FALSE, FALSE, 0); + + ignore_c = gtk_check_button_new_with_label ("Don't Save layers which are hidden or have their opacity set to zero?"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ignore_c), optimize.ignore); + gtk_box_pack_end (GTK_BOX (vbox), ignore_c, FALSE, FALSE, 0); + + convert_c = gtk_check_button_new_with_label ("Convert bitmaps to vector where possible?"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (convert_c), optimize.convert); + gtk_box_pack_end (GTK_BOX (vbox), convert_c, FALSE, FALSE, 0); + + apply_c = gtk_check_button_new_with_label ("Apply layer masks before saving? (Keeping the masks will not change the final result)"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (apply_c), optimize.apply_masks); + gtk_box_pack_end (GTK_BOX (vbox), apply_c, FALSE, FALSE, 0); + + gtk_widget_show_all (window); + + g_signal_connect (G_OBJECT (file_browse), "clicked", + G_CALLBACK (choose_file_call), G_OBJECT (file_entry)); + + g_signal_connect (G_OBJECT (add_image), "clicked", + G_CALLBACK (add_image_call), G_OBJECT (img_combo)); + + g_signal_connect (G_OBJECT (del), "clicked", + G_CALLBACK (del_image_call), G_OBJECT (page_view)); + + g_signal_connect (G_OBJECT (model), "row-deleted", + G_CALLBACK (remove_call), NULL); + + run = gtk_dialog_run (GTK_DIALOG (window)) == GTK_RESPONSE_OK; + + run &= get_image_list (); + + temp = gtk_entry_get_text (GTK_ENTRY (file_entry)); + g_stpcpy (file_name, temp); + + optimize.ignore = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ignore_c)); + optimize.convert = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (convert_c)); + optimize.apply_masks = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (apply_c)); + + gtk_widget_destroy (window); + return run; +} + +/* A function that is called when the button for browsing for file + * locations was clicked */ +static void +choose_file_call (GtkWidget *browse_button, + gpointer file_entry) +{ + GFile *file = g_file_new_for_path (gtk_entry_get_text (GTK_ENTRY (file_entry))); + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_choose), g_file_get_uri (file)); + + if (gtk_dialog_run (GTK_DIALOG (file_choose)) == GTK_RESPONSE_OK) + { + file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (file_choose)); + gtk_entry_set_text (GTK_ENTRY (file_entry), g_file_get_path (file)); + }; + + file_name = g_file_get_path (file); + gtk_widget_hide (file_choose); +} + +/* A function to create the basic GtkTreeModel for the icon view */ +static GtkTreeModel* +create_model (void) +{ + GtkListStore *model; + GtkTreeIter iter; + guint32 i; + gint32 image = multi_page.images[0]; + + /* validate_image_list was called earlier, so all the images + * up to multi_page.image_count are valid */ + model = gtk_list_store_new (4, + GDK_TYPE_PIXBUF, /* THUMB */ + G_TYPE_STRING, /* PAGE_NUMBER */ + G_TYPE_STRING, /* IMAGE_NAME */ + G_TYPE_INT); /* IMAGE_ID */ + + for (i = 0 ; i < multi_page.image_count && i < MAX_PAGE_COUNT ; i++) + { + image = multi_page.images[i]; + + gtk_list_store_append (model, &iter); + gtk_list_store_set (model, &iter, + THUMB, gimp_image_get_thumbnail (image, THUMB_WIDTH, THUMB_HEIGHT, GIMP_PIXBUF_SMALL_CHECKS), + PAGE_NUMBER, g_strdup_printf ("Page %d", i+1), + IMAGE_NAME, gimp_image_get_name (image), + IMAGE_ID, image, + -1); + + } + + return GTK_TREE_MODEL (model); +} + +/* A function that puts the images from the model inside the + * images (pages) array */ +static gboolean +get_image_list (void) +{ + GtkTreeIter iter; + gboolean valid = gtk_tree_model_get_iter_first (model, &iter); + gint32 image; + + multi_page.image_count = 0; + + if (!valid) + { + gimp_message ("Error! In order to save the file, at least one image should be added!"); + return FALSE; + } + + while (valid) + { + gtk_tree_model_get (model, &iter, + IMAGE_ID, &image, + -1); + multi_page.images[multi_page.image_count] = image; + + valid = gtk_tree_model_iter_next (model, &iter); + multi_page.image_count++; + } + + return TRUE; +} + +/* A function that is called when the button for adding an image + * was clicked */ +static void +add_image_call (GtkWidget *widget, + gpointer img_combo) +{ + GtkListStore *store; + GtkTreeIter iter; + gint32 image; + + dnd_remove = FALSE; + + gimp_int_combo_box_get_active (img_combo, &image); + + store = GTK_LIST_STORE (model); + + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + PAGE_NUMBER, g_strdup_printf ("Page %d", multi_page.image_count+1), + THUMB, gimp_image_get_thumbnail (image, THUMB_WIDTH, THUMB_HEIGHT, GIMP_PIXBUF_SMALL_CHECKS), + IMAGE_NAME, gimp_image_get_name (image), + IMAGE_ID, image, + -1 + ); + + multi_page.image_count++; + + dnd_remove = TRUE; +} + +/* A function that is called when the button for deleting the + * selected images was clicked */ +static void +del_image_call (GtkWidget *widget, + gpointer icon_view) +{ + GList *list; + GtkTreeRowReference **items; + GtkTreePath *item_path; + GtkTreeIter item; + guint32 i; + gpointer temp; + + guint32 len; + + GdkPixbuf *thumb; + gchar* name; + + dnd_remove = FALSE; + + list = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (icon_view)); + + len = g_list_length (list); + if (len > 0) + { + items = g_newa (GtkTreeRowReference*, len); + + for (i = 0; i < len; i++) + { + temp = g_list_nth_data (list, i); + items[i] = gtk_tree_row_reference_new (model, temp); + gtk_tree_path_free (temp); + } + g_list_free (list); + + for (i = 0; i < len; i++) + { + item_path = gtk_tree_row_reference_get_path (items[i]); + gtk_tree_model_get_iter (model, &item, item_path); + + /* Get the data that should be freed */ + gtk_tree_model_get (model, &item, + THUMB, &thumb, IMAGE_NAME, &name, -1); + + /* Only after you have the pointers, remove them from the tree */ + gtk_list_store_remove (GTK_LIST_STORE (model), &item); + + /* Now you can free the data */ + g_object_unref(thumb); + g_free (name); + + gtk_tree_path_free (item_path); + gtk_tree_row_reference_free (items[i]); + multi_page.image_count--; + } + + g_free (items); + } + + dnd_remove = TRUE; + + recount_pages (); +} + +/* A function that is called on rows-deleted signal. It will + * call the function to relabel the pages */ +static void +remove_call (GtkTreeModel *tree_model, + GtkTreePath *path, + gpointer user_data) +{ + + if (dnd_remove) + /* The gtk documentation says that we should not free the indices array */ + recount_pages (); +} + +/* A function to relabel the pages in the icon view, when + * their order was changed */ +static void +recount_pages (void) +{ + GtkListStore *store; + GtkTreeIter iter; + gboolean valid; + gint32 i = 0; + + store = GTK_LIST_STORE (model); + + valid = gtk_tree_model_get_iter_first (model, &iter); + while (valid) + { + gtk_list_store_set (store, &iter, + PAGE_NUMBER, g_strdup_printf ("Page %d", i + 1), + -1); + valid = gtk_tree_model_iter_next (model, &iter); + i++; + } +} + +/******************************************************/ +/* Begining of the actual PDF functions */ +/******************************************************/ + +/* A function to get a cairo image surface from a drawable. + * Some of the code was taken from the gimp-print plugin */ +static cairo_surface_t * +get_drawable_image (GimpDrawable *drawable) +{ + cairo_surface_t *surface; + cairo_format_t format; + guchar *data; + guchar *dest; + const guchar *src; + gint dest_stride; + gint y; + gint bpp; + + gint32 drawable_id; + GimpPixelRgn region; + gint width; + gint height; + + guchar* colors = NULL; + gint num_colors; + gboolean indexed; + + drawable_id = drawable->drawable_id; + width = drawable->width; + height = drawable->height; + gimp_pixel_rgn_init (®ion, drawable, 0, 0, width, height, FALSE, FALSE); + bpp = region.bpp; + data = g_new (guchar, width*height*bpp); + gimp_pixel_rgn_get_rect (®ion, data, 0, 0, width, height); + + indexed = gimp_drawable_is_indexed (drawable->drawable_id); + if (indexed) + colors = gimp_image_get_colormap (gimp_item_get_image (drawable->drawable_id), &num_colors); + + switch (bpp) + { + case 1: /* GRAY or INDEXED */ + if (!indexed) + format = CAIRO_FORMAT_A8; + else + format = CAIRO_FORMAT_RGB24; + break; + case 3: /* RGB */ + format = CAIRO_FORMAT_RGB24; + break; + + case 2: /* GRAYA or INDEXEDA */ + case 4: /* RGBA */ + format = CAIRO_FORMAT_ARGB32; + break; + + default: + g_assert_not_reached (); + break; + } + + surface = cairo_image_surface_create (format, width, height); + + src = data; + + dest = cairo_image_surface_get_data (surface); + dest_stride = cairo_image_surface_get_stride (surface); + + for (y = 0; y < height; y++) + { + const guchar *s = src; + guchar *d = dest; + gint w = width; + + switch (bpp) + { + case 1: + if (!indexed) + { + while (w--) + { + d[0] = s[0]; + s += 1; + d += 1; + + } + } + else { + while (w--) + { + GIMP_CAIRO_RGB24_SET_PIXEL (d, colors[s[0]*3], colors[s[0]*3+1], colors[s[0]*3+2]); + s += 1; + d += 4; + + } + } + break; + + case 2: + if (!indexed) + { + while (w--) + { + GIMP_CAIRO_ARGB32_SET_PIXEL (d, s[0], s[0], s[0], s[1]); + s += 2; + d += 4; + } + } + else { + while (w--) + { + GIMP_CAIRO_ARGB32_SET_PIXEL (d, colors[s[0]*3], colors[s[0]*3+1], colors[s[0]*3+2], s[1]); + s += 2; + d += 4; + } + } + break; + + case 3: + while (w--) + { + GIMP_CAIRO_RGB24_SET_PIXEL (d, s[0], s[1], s[2]); + s += 3; + d += 4; + } + break; + + case 4: + while (w--) + { + GIMP_CAIRO_ARGB32_SET_PIXEL (d, s[0], s[1], s[2], s[3]); + s += 4; + d += 4; + } + break; + } + src += width*bpp; + dest += dest_stride; + } + if (indexed) + g_free (colors); + g_free (data); + + return surface; +} + +/* A function to check if a drawable is single colored + * This allows to convert bitmaps to vector where possible */ +static GimpRGB +get_layer_color (GimpDrawable *layer, + gboolean *single) +{ + GimpRGB col; + gdouble red, green, blue, alpha; + gdouble dev, devSum; + gdouble median, pixels, count, precentile; + gint32 id; + + id = layer->drawable_id; + devSum = 0; + red = 0; + green = 0; + blue = 0; + alpha = 0; + dev = 0; + + if (gimp_drawable_is_indexed (id)) + { + /* FIXME: We can't do a propper histogram on indexed layers! */ + *single = FALSE; + col. r = col.g = col.b = col.a = 0; + return col; + } + + /* Are we in RGB mode? */ + if (layer->bpp >= 3) + { + gimp_histogram (id, GIMP_HISTOGRAM_RED, 0, 255, &red, &dev, &median, &pixels, &count, &precentile); + devSum += dev; + gimp_histogram (id, GIMP_HISTOGRAM_GREEN, 0, 255, &green, &dev, &median, &pixels, &count, &precentile); + devSum += dev; + gimp_histogram (id, GIMP_HISTOGRAM_BLUE, 0, 255, &blue, &dev, &median, &pixels, &count, &precentile); + devSum += dev; + } + /* We are in Grayscale mode (or Indexed) */ + else + { + gimp_histogram (id, GIMP_HISTOGRAM_VALUE, 0, 255, &red, &dev, &median, &pixels, &count, &precentile); + devSum += dev; + green = red; + blue = red; + } + if (gimp_drawable_has_alpha (id)) + gimp_histogram (id, GIMP_HISTOGRAM_ALPHA, 0, 255, &alpha, &dev, &median, &pixels, &count, &precentile); + else + alpha = 255; + + devSum += dev; + *single = devSum == 0; + + col.r = red/255; + col.g = green/255; + col.b = blue/255; + col.a = alpha/255; + + return col; +} + +/* A function that uses Pango to render the text to our cairo surface, + * in the same way it was the user saw it inside gimp. + * Needs some work on choosing the font name better, and on hinting + * (freetype and pango differences) + */ +static void +drawText (GimpDrawable *text_layer, + gdouble opacity, + cairo_t *cr, + gdouble x_res, + gdouble y_res) +{ + gint32 text_id = text_layer->drawable_id; + GimpImageBaseType type = gimp_drawable_type (text_id); + + gchar *text = gimp_text_layer_get_text (text_id); + gchar *markup = gimp_text_layer_get_markup (text_id); + gchar *font_family; + + cairo_font_options_t *options; + + gint x; + gint y; + + GimpRGB color; + + GimpUnit unit; + gdouble size; + + GimpTextHintStyle hinting; + + GimpTextJustification j; + gboolean justify; + PangoAlignment align; + GimpTextDirection dir; + PangoDirection pango_dir; + + PangoLayout *layout; + PangoContext *context; + PangoFontDescription *font_description; + + gdouble indent; + gdouble line_spacing; + gdouble letter_spacing; + PangoAttribute *letter_spacing_at; + PangoAttrList *attr_list = pango_attr_list_new (); + + cairo_save (cr); + + options = cairo_font_options_create (); + attr_list = pango_attr_list_new (); + cairo_get_font_options (cr, options); + + /* Position */ + gimp_drawable_offsets (text_id, &x, &y); + cairo_move_to (cr, x, y); + + /* Color */ + /* When dealing with a gray/indexed image, the viewed color of the text layer + * can be different than the one kept in the memory */ + if (type == GIMP_RGB) + gimp_text_layer_get_color (text_id, &color); + else + gimp_image_pick_color (gimp_item_get_image (text_id), text_id, x, y, FALSE, FALSE, 0, &color); + + cairo_set_source_rgba (cr, color.r, color.g, color.b, opacity); + + /* Hinting */ + hinting = gimp_text_layer_get_hint_style (text_id); + switch (hinting) + { + case GIMP_TEXT_HINT_STYLE_NONE: + cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE); + break; + + case GIMP_TEXT_HINT_STYLE_SLIGHT: + cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_SLIGHT); + break; + + case GIMP_TEXT_HINT_STYLE_MEDIUM: + cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_MEDIUM); + break; + + case GIMP_TEXT_HINT_STYLE_FULL: + cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_FULL); + break; + } + + /* Antialiasing */ + if (gimp_text_layer_get_antialias (text_id)) + cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_DEFAULT); + else + cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_NONE); + + /* We are done with cairo's settings. + * It's time to create the context */ + cairo_set_font_options (cr, options); + context = pango_cairo_create_context (cr); + pango_cairo_context_set_font_options (context, options); + + /* Text Direction */ + dir = gimp_text_layer_get_base_direction (text_id); + + if (dir == GIMP_TEXT_DIRECTION_RTL) + pango_dir = PANGO_DIRECTION_RTL; + else + pango_dir = PANGO_DIRECTION_LTR; + + pango_context_set_base_dir (context, pango_dir); + + /* We are done with the context's settings. + * It's time to create the layout */ + layout = pango_layout_new (context); + + /* Font */ + font_family = gimp_text_layer_get_font (text_id); + /* We need to find a way to convert GIMP's returned font name to + * a normal Pango name... Hopefully GIMP 2.8 with Pango will fix it. */ + font_description = pango_font_description_from_string (font_family); + + /* Font Size */ + size = gimp_text_layer_get_font_size (text_id, &unit); + if (! g_strcmp0 (gimp_unit_get_abbreviation (unit), "px") == 0) + size *= 1.0 / gimp_unit_get_factor (unit) * x_res / y_res; + pango_font_description_set_absolute_size (font_description, size * PANGO_SCALE); + + pango_layout_set_font_description (layout, font_description); + + /* Width and height */ + pango_layout_set_width (layout, text_layer->width * PANGO_SCALE); + pango_layout_set_height (layout, text_layer->height * PANGO_SCALE); + + /* Justification, and Alignment */ + justify = FALSE; + j = gimp_text_layer_get_justification (text_id); + + if (j == GIMP_TEXT_JUSTIFY_CENTER) + align = PANGO_ALIGN_CENTER; + else if (j == GIMP_TEXT_JUSTIFY_LEFT) + align = PANGO_ALIGN_LEFT; + else if (j == GIMP_TEXT_JUSTIFY_RIGHT) + align = PANGO_ALIGN_RIGHT; + else /* We have GIMP_TEXT_JUSTIFY_FILL */ + { + if (dir == GIMP_TEXT_DIRECTION_LTR) + align = PANGO_ALIGN_LEFT; + else + align = PANGO_ALIGN_RIGHT; + justify = TRUE; + } + + /* Indentation */ + indent = gimp_text_layer_get_indent (text_id); + pango_layout_set_indent (layout, (int)(PANGO_SCALE * indent)); + + /* Line Spacing */ + line_spacing = gimp_text_layer_get_line_spacing (text_id); + pango_layout_set_spacing (layout, (int)(PANGO_SCALE * line_spacing)); + + /* Letter Spacing */ + letter_spacing = gimp_text_layer_get_letter_spacing (text_id); + letter_spacing_at = pango_attr_letter_spacing_new ((int)(PANGO_SCALE * letter_spacing)); + pango_attr_list_insert (attr_list, letter_spacing_at); + + pango_layout_set_justify (layout, justify); + pango_layout_set_alignment (layout, align); + + pango_layout_set_attributes (layout, attr_list); + + /* Use the pango markup of the text layer */ + + if (markup != NULL && markup[0] != '\0') + pango_layout_set_markup (layout, markup, -1); + else /* If we can't find a markup, then it has just text */ + pango_layout_set_text (layout, text, -1); + + pango_cairo_show_layout (cr, layout); + + g_free (text); + g_free (font_family); + + g_object_unref (layout); + pango_font_description_free (font_description); + g_object_unref (context); + pango_attr_list_unref (attr_list); + + cairo_font_options_destroy (options); + + cairo_restore (cr); +} diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common new file mode 100644 index 0000000000..b90d25bbd5 --- /dev/null +++ b/plug-ins/common/gimprc.common @@ -0,0 +1,145 @@ +alien_map_RC = alien-map.rc.o +align_layers_RC = align-layers.rc.o +animation_optimize_RC = animation-optimize.rc.o +animation_play_RC = animation-play.rc.o +antialias_RC = antialias.rc.o +apply_canvas_RC = apply-canvas.rc.o +blinds_RC = blinds.rc.o +blur_RC = blur.rc.o +blur_gauss_RC = blur-gauss.rc.o +blur_gauss_selective_RC = blur-gauss-selective.rc.o +blur_motion_RC = blur-motion.rc.o +border_average_RC = border-average.rc.o +bump_map_RC = bump-map.rc.o +cartoon_RC = cartoon.rc.o +channel_mixer_RC = channel-mixer.rc.o +checkerboard_RC = checkerboard.rc.o +cml_explorer_RC = cml-explorer.rc.o +color_cube_analyze_RC = color-cube-analyze.rc.o +color_enhance_RC = color-enhance.rc.o +color_exchange_RC = color-exchange.rc.o +color_to_alpha_RC = color-to-alpha.rc.o +colorify_RC = colorify.rc.o +colormap_remap_RC = colormap-remap.rc.o +compose_RC = compose.rc.o +contrast_normalize_RC = contrast-normalize.rc.o +contrast_retinex_RC = contrast-retinex.rc.o +contrast_stretch_RC = contrast-stretch.rc.o +contrast_stretch_hsv_RC = contrast-stretch-hsv.rc.o +convolution_matrix_RC = convolution-matrix.rc.o +crop_auto_RC = crop-auto.rc.o +crop_zealous_RC = crop-zealous.rc.o +cubism_RC = cubism.rc.o +curve_bend_RC = curve-bend.rc.o +decompose_RC = decompose.rc.o +deinterlace_RC = deinterlace.rc.o +depth_merge_RC = depth-merge.rc.o +despeckle_RC = despeckle.rc.o +destripe_RC = destripe.rc.o +diffraction_RC = diffraction.rc.o +displace_RC = displace.rc.o +edge_RC = edge.rc.o +edge_dog_RC = edge-dog.rc.o +edge_laplace_RC = edge-laplace.rc.o +edge_neon_RC = edge-neon.rc.o +edge_sobel_RC = edge-sobel.rc.o +emboss_RC = emboss.rc.o +engrave_RC = engrave.rc.o +file_aa_RC = file-aa.rc.o +file_cel_RC = file-cel.rc.o +file_compressor_RC = file-compressor.rc.o +file_csource_RC = file-csource.rc.o +file_desktop_link_RC = file-desktop-link.rc.o +file_dicom_RC = file-dicom.rc.o +file_gbr_RC = file-gbr.rc.o +file_gif_load_RC = file-gif-load.rc.o +file_gif_save_RC = file-gif-save.rc.o +file_gih_RC = file-gih.rc.o +file_glob_RC = file-glob.rc.o +file_header_RC = file-header.rc.o +file_html_table_RC = file-html-table.rc.o +file_jp2_load_RC = file-jp2-load.rc.o +file_mng_RC = file-mng.rc.o +file_pat_RC = file-pat.rc.o +file_pcx_RC = file-pcx.rc.o +file_pdf_load_RC = file-pdf-load.rc.o +file_pdf_save_RC = file-pdf-save.rc.o +file_pix_RC = file-pix.rc.o +file_png_RC = file-png.rc.o +file_pnm_RC = file-pnm.rc.o +file_ps_RC = file-ps.rc.o +file_psp_RC = file-psp.rc.o +file_raw_RC = file-raw.rc.o +file_sunras_RC = file-sunras.rc.o +file_svg_RC = file-svg.rc.o +file_tga_RC = file-tga.rc.o +file_tiff_load_RC = file-tiff-load.rc.o +file_tiff_save_RC = file-tiff-save.rc.o +file_wmf_RC = file-wmf.rc.o +file_xbm_RC = file-xbm.rc.o +file_xmc_RC = file-xmc.rc.o +file_xpm_RC = file-xpm.rc.o +file_xwd_RC = file-xwd.rc.o +film_RC = film.rc.o +filter_pack_RC = filter-pack.rc.o +fractal_trace_RC = fractal-trace.rc.o +gradient_map_RC = gradient-map.rc.o +grid_RC = grid.rc.o +guillotine_RC = guillotine.rc.o +hot_RC = hot.rc.o +illusion_RC = illusion.rc.o +iwarp_RC = iwarp.rc.o +jigsaw_RC = jigsaw.rc.o +lcms_RC = lcms.rc.o +lens_apply_RC = lens-apply.rc.o +lens_distortion_RC = lens-distortion.rc.o +lens_flare_RC = lens-flare.rc.o +mail_RC = mail.rc.o +max_rgb_RC = max-rgb.rc.o +mosaic_RC = mosaic.rc.o +newsprint_RC = newsprint.rc.o +nl_filter_RC = nl-filter.rc.o +noise_hsv_RC = noise-hsv.rc.o +noise_randomize_RC = noise-randomize.rc.o +noise_rgb_RC = noise-rgb.rc.o +noise_solid_RC = noise-solid.rc.o +noise_spread_RC = noise-spread.rc.o +nova_RC = nova.rc.o +oilify_RC = oilify.rc.o +photocopy_RC = photocopy.rc.o +pixelize_RC = pixelize.rc.o +plasma_RC = plasma.rc.o +plugin_browser_RC = plugin-browser.rc.o +polar_coords_RC = polar-coords.rc.o +procedure_browser_RC = procedure-browser.rc.o +qbist_RC = qbist.rc.o +red_eye_removal_RC = red-eye-removal.rc.o +ripple_RC = ripple.rc.o +rotate_RC = rotate.rc.o +sample_colorize_RC = sample-colorize.rc.o +screenshot_RC = screenshot.rc.o +semi_flatten_RC = semi-flatten.rc.o +sharpen_RC = sharpen.rc.o +shift_RC = shift.rc.o +sinus_RC = sinus.rc.o +smooth_palette_RC = smooth-palette.rc.o +softglow_RC = softglow.rc.o +sparkle_RC = sparkle.rc.o +sphere_designer_RC = sphere-designer.rc.o +threshold_alpha_RC = threshold-alpha.rc.o +tile_RC = tile.rc.o +tile_glass_RC = tile-glass.rc.o +tile_paper_RC = tile-paper.rc.o +tile_seamless_RC = tile-seamless.rc.o +tile_small_RC = tile-small.rc.o +unit_editor_RC = unit-editor.rc.o +unsharp_mask_RC = unsharp-mask.rc.o +value_invert_RC = value-invert.rc.o +value_propagate_RC = value-propagate.rc.o +van_gogh_lic_RC = van-gogh-lic.rc.o +video_RC = video.rc.o +warp_RC = warp.rc.o +waves_RC = waves.rc.o +web_browser_RC = web-browser.rc.o +whirl_pinch_RC = whirl-pinch.rc.o +wind_RC = wind.rc.o diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index fc1e834518..edbec9a7ab 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -8,11 +8,15 @@ require 'util.pl'; *FILE_EXT = \$Gimp::CodeGen::util::FILE_EXT; $ignorefile = ".gitignore"; +$rcfile = "gimprc.common"; $outmk = "Makefile.am$FILE_EXT"; $outignore = "$ignorefile$FILE_EXT"; +$outrc = "$rcfile$FILE_EXT"; + open MK, "> $outmk"; open IGNORE, "> $outignore"; +open RC, "> $outrc"; require 'plugin-defs.pl'; @@ -57,6 +61,11 @@ else libm = -lm endif +if HAVE_WINDRES +include \$(top_srcdir)/build/windows/gimprc-plug-ins.rule +include $rcfile +endif + libgimp = \$(top_builddir)/libgimp/libgimp-\$(GIMP_API_VERSION).la libgimpbase = \$(top_builddir)/libgimpbase/libgimpbase-\$(GIMP_API_VERSION).la libgimpcolor = \$(top_builddir)/libgimpcolor/libgimpcolor-\$(GIMP_API_VERSION).la @@ -73,7 +82,8 @@ libexecdir = \$(gimpplugindir)/plug-ins EXTRA_DIST = \\ mkgen.pl \\ - plugin-defs.pl$extra + plugin-defs.pl$extra \\ + $rcfile INCLUDES = \\ -I\$(top_srcdir) \\ @@ -160,6 +170,8 @@ EOT } } + my $rclib = "\$(${makename}_RC)"; + print MK < { ui => 1 }, 'file-png' => { ui => 1, optional => 1, libs => 'PNG_LIBS', cflags => 'PNG_CFLAGS' }, 'file-pnm' => { ui => 1 }, - 'file-pdf' => { ui => 1, optional => 1, libs => 'POPPLER_LIBS', cflags => 'POPPLER_CFLAGS' }, + 'file-pdf-load' => { ui => 1, optional => 1, libs => 'POPPLER_LIBS', cflags => 'POPPLER_CFLAGS' }, + 'file-pdf-save' => { ui => 1, optional => 1, libs => 'CAIRO_PDF_LIBS', cflags => 'CAIRO_PDF_CFLAGS' }, 'file-ps' => { ui => 1 }, 'file-psp' => { ui => 1, optional => 1, libs => 'Z_LIBS' }, 'file-raw' => { ui => 1 }, diff --git a/plug-ins/file-bmp/Makefile.am b/plug-ins/file-bmp/Makefile.am index 2737c52d20..b23eaf5496 100644 --- a/plug-ins/file-bmp/Makefile.am +++ b/plug-ins/file-bmp/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_bmp_RC = file-bmp.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -39,4 +44,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_bmp_RC) diff --git a/plug-ins/file-faxg3/Makefile.am b/plug-ins/file-faxg3/Makefile.am index ac61d86edb..528c0f5b89 100644 --- a/plug-ins/file-faxg3/Makefile.am +++ b/plug-ins/file-faxg3/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_faxg3_RC = file-faxg3.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -36,4 +41,5 @@ LDADD = \ $(libgimpmath) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_faxg3_RC) diff --git a/plug-ins/file-fits/Makefile.am b/plug-ins/file-fits/Makefile.am index 08a07801e9..f85bd14a8c 100644 --- a/plug-ins/file-fits/Makefile.am +++ b/plug-ins/file-fits/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_fits_RC = file-fits.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -38,4 +43,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_fits_RC) diff --git a/plug-ins/file-fli/Makefile.am b/plug-ins/file-fli/Makefile.am index c93fb40a23..09589f30a1 100644 --- a/plug-ins/file-fli/Makefile.am +++ b/plug-ins/file-fli/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_fli_RC = file-fli.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -38,4 +43,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_fli_RC) diff --git a/plug-ins/file-ico/Makefile.am b/plug-ins/file-ico/Makefile.am index efa528cc8f..9301c5387f 100644 --- a/plug-ins/file-ico/Makefile.am +++ b/plug-ins/file-ico/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_ico_RC = file-ico.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -46,4 +51,5 @@ LDADD = \ $(PNG_LIBS) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_ico_RC) diff --git a/plug-ins/file-jpeg/Makefile.am b/plug-ins/file-jpeg/Makefile.am index ae78a00592..7c8769c187 100644 --- a/plug-ins/file-jpeg/Makefile.am +++ b/plug-ins/file-jpeg/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_jpeg_RC = file-jpeg.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -55,7 +60,8 @@ file_jpeg_LDADD = \ $(GTK_LIBS) \ $(EXIF_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_jpeg_RC) noinst_PROGRAMS = jpegqual diff --git a/plug-ins/file-psd/Makefile.am b/plug-ins/file-psd/Makefile.am index 25ea28bd06..bd59401bb0 100644 --- a/plug-ins/file-psd/Makefile.am +++ b/plug-ins/file-psd/Makefile.am @@ -12,6 +12,12 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_psd_load_RC = file-psd-load.rc.o +file_psd_save_RC = file-psd-save.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -60,3 +66,11 @@ LDADD = \ $(IPTCDATA_LIBS) \ $(RT_LIBS) \ $(INTLLIBS) + +file_psd_load_LDADD = \ + $(LDADD) \ + $(file_psd_load_RC) + +file_psd_save_LDADD = \ + $(LDADD) \ + $(file_psd_save_RC) diff --git a/plug-ins/file-sgi/Makefile.am b/plug-ins/file-sgi/Makefile.am index 6443949644..5c55a4a085 100644 --- a/plug-ins/file-sgi/Makefile.am +++ b/plug-ins/file-sgi/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_sgi_RC = file-sgi.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -38,4 +43,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_sgi_RC) diff --git a/plug-ins/file-uri/Makefile.am b/plug-ins/file-uri/Makefile.am index ef13eda1c1..e1140d11b7 100644 --- a/plug-ins/file-uri/Makefile.am +++ b/plug-ins/file-uri/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_uri_RC = file-uri.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -56,4 +61,5 @@ LDADD = \ $(backend_libs) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_uri_RC) diff --git a/plug-ins/file-xjt/Makefile.am b/plug-ins/file-xjt/Makefile.am index 657891209c..fd221703c5 100644 --- a/plug-ins/file-xjt/Makefile.am +++ b/plug-ins/file-xjt/Makefile.am @@ -8,6 +8,11 @@ libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +file_xjt_RC = file-xjt.rc.o +endif + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = file-xjt @@ -37,4 +42,5 @@ LDADD = \ $(GTK_LIBS) \ $(RT_LIBS) \ $(JPEG_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(file_xjt_RC) diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am index 262a9aab58..405117b9e1 100644 --- a/plug-ins/flame/Makefile.am +++ b/plug-ins/flame/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +flame_RC = flame.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -45,4 +50,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(flame_RC) diff --git a/plug-ins/fractal-explorer/Makefile.am b/plug-ins/fractal-explorer/Makefile.am index 16ae83a38c..e59a571498 100644 --- a/plug-ins/fractal-explorer/Makefile.am +++ b/plug-ins/fractal-explorer/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +fractal_explorer_RC = fractal-explorer.rc.o +endif + AM_LDFLAGS = $(mwindows) SUBDIRS = examples @@ -41,4 +46,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(fractal_explorer_RC) diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am index b0a3ae7e60..0c499eed78 100644 --- a/plug-ins/gfig/Makefile.am +++ b/plug-ins/gfig/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +gfig_RC = gfig.rc.o +endif + AM_LDFLAGS = $(mwindows) SUBDIRS = gfig-examples images @@ -72,4 +77,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(gfig_RC) diff --git a/plug-ins/gimpressionist/Makefile.am b/plug-ins/gimpressionist/Makefile.am index bdca57329d..62308e5255 100644 --- a/plug-ins/gimpressionist/Makefile.am +++ b/plug-ins/gimpressionist/Makefile.am @@ -14,6 +14,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +gimpressionist_RC = gimpressionist.rc.o +endif + AM_CPPFLAGS = \ -DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\" @@ -72,6 +77,7 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(gimpressionist_RC) EXTRA_DIST = README diff --git a/plug-ins/gradient-flare/Makefile.am b/plug-ins/gradient-flare/Makefile.am index 85976659ac..df0471f685 100644 --- a/plug-ins/gradient-flare/Makefile.am +++ b/plug-ins/gradient-flare/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +gradient_flare_RC = gradient-flare.rc.o +endif + AM_LDFLAGS = $(mwindows) SUBDIRS = flares @@ -37,4 +42,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(gradient_flare_RC) diff --git a/plug-ins/help-browser/Makefile.am b/plug-ins/help-browser/Makefile.am index 7360433a97..2ea3c4bf32 100644 --- a/plug-ins/help-browser/Makefile.am +++ b/plug-ins/help-browser/Makefile.am @@ -14,6 +14,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +help_browser_RC = help-browser.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -38,7 +43,8 @@ LDADD = \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(help_browser_RC) help_browser_SOURCES = \ gimpthrobber.c \ diff --git a/plug-ins/help/Makefile.am b/plug-ins/help/Makefile.am index c5f49ae2ff..6585e22f64 100644 --- a/plug-ins/help/Makefile.am +++ b/plug-ins/help/Makefile.am @@ -11,6 +11,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +help_RC = help.rc.o +endif + AM_CPPFLAGS = -DDATADIR=\""$(gimpdatadir)"\" AM_LDFLAGS = $(mwindows) @@ -51,7 +56,8 @@ LDADD = \ $(libgimpmath) \ $(GIO_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(help_RC) noinst_PROGRAMS = gimp-help-lookup diff --git a/plug-ins/ifs-compose/Makefile.am b/plug-ins/ifs-compose/Makefile.am index 6e2de0247d..066c6eccf6 100644 --- a/plug-ins/ifs-compose/Makefile.am +++ b/plug-ins/ifs-compose/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +ifs_compose_RC = ifs-compose.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -41,4 +46,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(ifs_compose_RC) diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am index ac63dceec7..c4cc5c2166 100644 --- a/plug-ins/imagemap/Makefile.am +++ b/plug-ins/imagemap/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +imagemap_RC = imagemap.rc.o +endif + AM_LDFLAGS = $(mwindows) SUBDIRS = images @@ -139,7 +144,8 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(imagemap) CLEANFILES = y.tab.c y.tab.h diff --git a/plug-ins/lighting/Makefile.am b/plug-ins/lighting/Makefile.am index 1bf79fc50e..fd52e57055 100644 --- a/plug-ins/lighting/Makefile.am +++ b/plug-ins/lighting/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +lighting_RC = lighting.rc.o +endif + AM_LDFLAGS = $(mwindows) SUBDIRS = images @@ -51,4 +56,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(lighting_RC) diff --git a/plug-ins/map-object/Makefile.am b/plug-ins/map-object/Makefile.am index 2f7b7bc09f..b9c52f1354 100644 --- a/plug-ins/map-object/Makefile.am +++ b/plug-ins/map-object/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +map_object_RC = map-object.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -51,4 +56,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(map_object_RC) diff --git a/plug-ins/maze/Makefile.am b/plug-ins/maze/Makefile.am index 762c0080a4..b381096203 100644 --- a/plug-ins/maze/Makefile.am +++ b/plug-ins/maze/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +maze_RC = maze.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -43,4 +48,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(maze_RC) diff --git a/plug-ins/metadata/Makefile.am b/plug-ins/metadata/Makefile.am index 5c3d8ecce7..60e1642a78 100644 --- a/plug-ins/metadata/Makefile.am +++ b/plug-ins/metadata/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +metadata_RC = metadata.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -77,7 +82,8 @@ LDADD = \ $(EXIF_LIBS) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(metadata_RC) # test program, not built by default diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am index 2a6eafb38f..72f91ca084 100644 --- a/plug-ins/pagecurl/Makefile.am +++ b/plug-ins/pagecurl/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +pagecurl_RC = pagecurl.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -42,7 +47,8 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(pagecurl_RC) PAGECURL_IMAGES = \ diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am index 4af964ec93..32abdc5580 100644 --- a/plug-ins/print/Makefile.am +++ b/plug-ins/print/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +print_RC = print.rc.o +endif + AM_LDFLAGS = $(mwindows) INCLUDES = \ @@ -29,7 +34,8 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(print_RC) libexecdir = $(gimpplugindir)/plug-ins diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am index 3075b838d3..fc77b778e8 100644 --- a/plug-ins/script-fu/Makefile.am +++ b/plug-ins/script-fu/Makefile.am @@ -16,6 +16,11 @@ mwindows = -mwindows WINSOCK_LIBS = -lws2_32 endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +script_fu_RC = script-fu.rc.o +endif + AM_CFLAGS = \ -DSTANDALONE=0 \ -DUSE_INTERFACE=1 \ @@ -74,4 +79,5 @@ LDADD = \ $(SOCKET_LIBS) \ $(WINSOCK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(script_fu_RC) diff --git a/plug-ins/selection-to-path/Makefile.am b/plug-ins/selection-to-path/Makefile.am index 7e3ac657fb..c6b9f63d45 100644 --- a/plug-ins/selection-to-path/Makefile.am +++ b/plug-ins/selection-to-path/Makefile.am @@ -12,6 +12,11 @@ if OS_WIN32 mwindows = -mwindows endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +selection_to_path_RC = selection-to-path.rc.o +endif + AM_LDFLAGS = $(mwindows) libexecdir = $(gimpplugindir)/plug-ins @@ -59,4 +64,5 @@ LDADD = \ $(libgimpbase) \ $(GTK_LIBS) \ $(RT_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) \ + $(selection_to_path_RC) diff --git a/plug-ins/twain/Makefile.am b/plug-ins/twain/Makefile.am index 5d67b4d5bf..10a377a9e3 100644 --- a/plug-ins/twain/Makefile.am +++ b/plug-ins/twain/Makefile.am @@ -19,6 +19,10 @@ twain_LDFLAGS = -mwindows -luser32 twainplatform = tw_win.c endif +if HAVE_WINDRES +include $(top_srcdir)/build/windows/gimprc-plug-ins.rule +twain_RC = twain.rc.o +endif if HAVE_MAC_TWAIN twain_LDFLAGS = -framework Carbon -framework TWAIN @@ -61,4 +65,5 @@ LDADD = \ $(GLIB_LIBS) \ $(RT_LIBS) \ $(INTLLIBS) \ - $(twain_LIBS) + $(twain_LIBS) \ + $(twain_RC) diff --git a/po-libgimp/br.po b/po-libgimp/br.po index 9d7353c219..3e3f0e1aa7 100644 --- a/po-libgimp/br.po +++ b/po-libgimp/br.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n" -"POT-Creation-Date: 2009-08-03 20:31+0000\n" -"PO-Revision-Date: 2009-08-04 11:13+0100\n" +"POT-Creation-Date: 2010-08-18 05:18+0000\n" +"PO-Revision-Date: 2010-08-25 16:44+0100\n" "Last-Translator: Alan Monfort \n" "Language-Team: An Drouizig \n" "MIME-Version: 1.0\n" @@ -17,113 +17,113 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1044 +#: ../libgimp/gimp.c:1057 msgid "success" msgstr "taol berzh" #. procedure execution failed -#: ../libgimp/gimp.c:1048 +#: ../libgimp/gimp.c:1061 msgid "execution error" msgstr "fazi gant an erounit" #. procedure called incorrectly -#: ../libgimp/gimp.c:1052 +#: ../libgimp/gimp.c:1065 msgid "calling error" msgstr "fazi gervel" #. procedure execution cancelled -#: ../libgimp/gimp.c:1056 +#: ../libgimp/gimp.c:1069 msgid "cancelled" msgstr "dilezet" -#: ../libgimp/gimpbrushselectbutton.c:169 +#: ../libgimp/gimpbrushselectbutton.c:178 msgid "Brush Selection" msgstr "Diuzad ar broustoù" -#: ../libgimp/gimpbrushselectbutton.c:915 -#: ../libgimp/gimppatternselectbutton.c:716 +#: ../libgimp/gimpbrushselectbutton.c:927 +#: ../libgimp/gimppatternselectbutton.c:725 msgid "_Browse..." msgstr "_Kantreal..." -#: ../libgimp/gimpexport.c:223 -#: ../libgimp/gimpexport.c:259 +#: ../libgimp/gimpexport.c:243 +#: ../libgimp/gimpexport.c:279 #, c-format msgid "%s plug-in can't handle layers" msgstr "An enlugellad %s n'eo ket evit dornata treuzfollennoù" -#: ../libgimp/gimpexport.c:224 -#: ../libgimp/gimpexport.c:233 -#: ../libgimp/gimpexport.c:242 -#: ../libgimp/gimpexport.c:260 +#: ../libgimp/gimpexport.c:244 +#: ../libgimp/gimpexport.c:253 +#: ../libgimp/gimpexport.c:262 +#: ../libgimp/gimpexport.c:280 msgid "Merge Visible Layers" msgstr "Toueziañ an treuzfollennoù hewel" -#: ../libgimp/gimpexport.c:232 +#: ../libgimp/gimpexport.c:252 #, c-format msgid "%s plug-in can't handle layer offsets, size or opacity" msgstr "An enlugellad %s n'hall ket dornata linkadurioù, ment pe demerez an treuzfollenn" -#: ../libgimp/gimpexport.c:241 -#: ../libgimp/gimpexport.c:250 +#: ../libgimp/gimpexport.c:261 +#: ../libgimp/gimpexport.c:270 #, c-format msgid "%s plug-in can only handle layers as animation frames" msgstr "An enlugellad %s a c'hall dornata an treuzfollennoù evel skeudennoù ur bliverezh nemetken" -#: ../libgimp/gimpexport.c:242 -#: ../libgimp/gimpexport.c:251 +#: ../libgimp/gimpexport.c:262 +#: ../libgimp/gimpexport.c:271 msgid "Save as Animation" msgstr "Enrollañ evel bliverezh" -#: ../libgimp/gimpexport.c:251 -#: ../libgimp/gimpexport.c:260 -#: ../libgimp/gimpexport.c:269 +#: ../libgimp/gimpexport.c:271 +#: ../libgimp/gimpexport.c:280 +#: ../libgimp/gimpexport.c:289 msgid "Flatten Image" msgstr "Pladañ ar skeudenn" -#: ../libgimp/gimpexport.c:268 +#: ../libgimp/gimpexport.c:288 #, c-format msgid "%s plug-in can't handle transparency" msgstr "An enlugellad %s n'hall ket dornata an treuzweluster" -#: ../libgimp/gimpexport.c:277 +#: ../libgimp/gimpexport.c:297 #, c-format msgid "%s plug-in can't handle layer masks" msgstr "An enlugellad %s n'hall ket dornata ar maskloù treuzfollenn" -#: ../libgimp/gimpexport.c:278 +#: ../libgimp/gimpexport.c:298 msgid "Apply Layer Masks" msgstr "Arloañ ar maskloù treuzfollennoù" -#: ../libgimp/gimpexport.c:286 +#: ../libgimp/gimpexport.c:306 #, c-format msgid "%s plug-in can only handle RGB images" msgstr "Dornataet e vez ar skeudennoù RGG hepken gant %s" -#: ../libgimp/gimpexport.c:287 -#: ../libgimp/gimpexport.c:325 -#: ../libgimp/gimpexport.c:334 +#: ../libgimp/gimpexport.c:307 +#: ../libgimp/gimpexport.c:345 +#: ../libgimp/gimpexport.c:354 msgid "Convert to RGB" msgstr "Amdreiñ da RGG" -#: ../libgimp/gimpexport.c:295 +#: ../libgimp/gimpexport.c:315 #, c-format msgid "%s plug-in can only handle grayscale images" msgstr "Dornataet e vez ar skeudennoù dre liveoù louedoù hepken gant %s" -#: ../libgimp/gimpexport.c:296 -#: ../libgimp/gimpexport.c:325 -#: ../libgimp/gimpexport.c:346 +#: ../libgimp/gimpexport.c:316 +#: ../libgimp/gimpexport.c:345 +#: ../libgimp/gimpexport.c:366 msgid "Convert to Grayscale" msgstr "Amdreiñ da liveoù louedoù" -#: ../libgimp/gimpexport.c:304 +#: ../libgimp/gimpexport.c:324 #, c-format msgid "%s plug-in can only handle indexed images" msgstr "Dornataet e vez ar skeudennoù ibiliet hepken gant %s" -#: ../libgimp/gimpexport.c:305 -#: ../libgimp/gimpexport.c:334 -#: ../libgimp/gimpexport.c:344 +#: ../libgimp/gimpexport.c:325 +#: ../libgimp/gimpexport.c:354 +#: ../libgimp/gimpexport.c:364 msgid "" "Convert to Indexed using default settings\n" "(Do it manually to tune the result)" @@ -133,12 +133,12 @@ msgstr "" "(Da ober gant an dorn\n" "evit gwellaat an disoc'h)" -#: ../libgimp/gimpexport.c:314 +#: ../libgimp/gimpexport.c:334 #, c-format msgid "%s plug-in can only handle bitmap (two color) indexed images" msgstr "Dornataet e vez ar bitmapoù (2 liv) ibiliet hepken gant %s" -#: ../libgimp/gimpexport.c:315 +#: ../libgimp/gimpexport.c:335 msgid "" "Convert to Indexed using bitmap default settings\n" "(Do it manually to tune the result)" @@ -148,63 +148,63 @@ msgstr "" "(Da ober gant an dorn\n" "evit gwellaat an disoc'h)" -#: ../libgimp/gimpexport.c:324 +#: ../libgimp/gimpexport.c:344 #, c-format msgid "%s plug-in can only handle RGB or grayscale images" msgstr "Dornataet e vez ar skeudennoù RGG pe dre liveoù louedoù hepken gant %s" -#: ../libgimp/gimpexport.c:333 +#: ../libgimp/gimpexport.c:353 #, c-format msgid "%s plug-in can only handle RGB or indexed images" msgstr "Dornataet e vez ar skeudennoù RGG pe skeudennoù ibliet gant %s" -#: ../libgimp/gimpexport.c:343 +#: ../libgimp/gimpexport.c:363 #, c-format msgid "%s plug-in can only handle grayscale or indexed images" msgstr "Dornataet e vez al liveoù louedoù pe skeudennoù ibiliet hepken gant %s" -#: ../libgimp/gimpexport.c:354 +#: ../libgimp/gimpexport.c:374 #, c-format msgid "%s plug-in needs an alpha channel" msgstr "An enlugellad %s en deus ezhomm eus ur sanell alfa" -#: ../libgimp/gimpexport.c:355 +#: ../libgimp/gimpexport.c:375 msgid "Add Alpha Channel" msgstr "Ouzhpennañ ur sanell alfa" -#: ../libgimp/gimpexport.c:410 +#: ../libgimp/gimpexport.c:430 msgid "Confirm Save" msgstr "Kadarnaat an enrolladur" -#: ../libgimp/gimpexport.c:416 +#: ../libgimp/gimpexport.c:436 msgid "Confirm" msgstr "Kadarnaat" -#: ../libgimp/gimpexport.c:492 +#: ../libgimp/gimpexport.c:512 msgid "Export File" msgstr "Ezporzhiañ ar restr" -#: ../libgimp/gimpexport.c:496 +#: ../libgimp/gimpexport.c:516 msgid "_Ignore" msgstr "_Leuskel a-gostez" -#: ../libgimp/gimpexport.c:498 -#: ../libgimp/gimpexport.c:969 +#: ../libgimp/gimpexport.c:518 +#: ../libgimp/gimpexport.c:989 msgid "_Export" msgstr "_Ezporzhiañ" #. the headline -#: ../libgimp/gimpexport.c:528 +#: ../libgimp/gimpexport.c:548 #, c-format msgid "Your image should be exported before it can be saved as %s for the following reasons:" msgstr "Gwell e vefe d'ho skeudenn bezañ ezporzhiet kent bezañ enrollet dindan %s en abeg da :" #. the footline -#: ../libgimp/gimpexport.c:602 +#: ../libgimp/gimpexport.c:622 msgid "The export conversion won't modify your original image." msgstr "An emdroadur ezporzhiañ ne gemmo ket ho skeudenn orin." -#: ../libgimp/gimpexport.c:705 +#: ../libgimp/gimpexport.c:725 #, c-format msgid "" "You are about to save a layer mask as %s.\n" @@ -213,7 +213,7 @@ msgstr "" "Emaoc'h oc'h enrollañ ur maskl treuzfollenn evel %s.\n" "Ne vo ket enrollet an treuzfollennoù hewel ganti." -#: ../libgimp/gimpexport.c:711 +#: ../libgimp/gimpexport.c:731 #, c-format msgid "" "You are about to save a channel (saved selection) as %s.\n" @@ -222,145 +222,145 @@ msgstr "" "Emaoc'h oc'h enrollañ ur sanell (diuzad enrollet) evel %s.\n" "Ne vo ket enrollet an treuzfollennoù hewel ganti." -#: ../libgimp/gimpexport.c:960 +#: ../libgimp/gimpexport.c:980 msgid "Export Image as " msgstr "Ezporzhiañ ar skeudenn evel " -#: ../libgimp/gimpfontselectbutton.c:129 +#: ../libgimp/gimpfontselectbutton.c:138 msgid "Font Selection" msgstr "Diuzad nodrezhoù" -#: ../libgimp/gimpfontselectbutton.c:144 +#: ../libgimp/gimpfontselectbutton.c:153 msgid "Sans" msgstr "Hep" -#: ../libgimp/gimpgradientselectbutton.c:147 +#: ../libgimp/gimpgradientselectbutton.c:156 msgid "Gradient Selection" msgstr "Diuzad ilrezennoù" -#: ../libgimp/gimpmenu.c:449 -#: ../libgimpwidgets/gimpintstore.c:238 +#: ../libgimp/gimpmenu.c:459 +#: ../libgimpwidgets/gimpintstore.c:248 msgid "(Empty)" msgstr "(Goullo)" -#: ../libgimp/gimppaletteselectbutton.c:129 +#: ../libgimp/gimppaletteselectbutton.c:138 msgid "Palette Selection" msgstr "Diuzad livaouegoù" -#: ../libgimp/gimppatternselectbutton.c:155 +#: ../libgimp/gimppatternselectbutton.c:164 msgid "Pattern Selection" msgstr "Diuzad gousturioù" -#: ../libgimp/gimpprocbrowserdialog.c:140 +#: ../libgimp/gimpprocbrowserdialog.c:149 msgid "by name" msgstr "dre anv" -#: ../libgimp/gimpprocbrowserdialog.c:141 +#: ../libgimp/gimpprocbrowserdialog.c:150 msgid "by description" msgstr "dre an deskrivadur" -#: ../libgimp/gimpprocbrowserdialog.c:142 +#: ../libgimp/gimpprocbrowserdialog.c:151 msgid "by help" msgstr "dre skoazell" -#: ../libgimp/gimpprocbrowserdialog.c:143 +#: ../libgimp/gimpprocbrowserdialog.c:152 msgid "by author" msgstr "dre an aozer" -#: ../libgimp/gimpprocbrowserdialog.c:144 +#: ../libgimp/gimpprocbrowserdialog.c:153 msgid "by copyright" msgstr "dre copyright" -#: ../libgimp/gimpprocbrowserdialog.c:145 +#: ../libgimp/gimpprocbrowserdialog.c:154 msgid "by date" msgstr "dre an deiziad" -#: ../libgimp/gimpprocbrowserdialog.c:146 +#: ../libgimp/gimpprocbrowserdialog.c:155 msgid "by type" msgstr "dre ar rizh" #. count label -#: ../libgimp/gimpprocbrowserdialog.c:385 -#: ../libgimp/gimpprocbrowserdialog.c:536 -#: ../libgimpwidgets/gimpbrowser.c:130 +#: ../libgimp/gimpprocbrowserdialog.c:394 +#: ../libgimp/gimpprocbrowserdialog.c:545 +#: ../libgimpwidgets/gimpbrowser.c:139 msgid "No matches" msgstr "Kenglotadenn ebet" -#: ../libgimp/gimpprocbrowserdialog.c:388 +#: ../libgimp/gimpprocbrowserdialog.c:397 msgid "Search term invalid or incomplete" msgstr "Termen da glask didalvoudek pe diglok" -#: ../libgimp/gimpprocbrowserdialog.c:397 +#: ../libgimp/gimpprocbrowserdialog.c:406 msgid "Searching" msgstr "O klask" -#: ../libgimp/gimpprocbrowserdialog.c:408 +#: ../libgimp/gimpprocbrowserdialog.c:417 msgid "Searching by name" msgstr "O klask dre an anv" -#: ../libgimp/gimpprocbrowserdialog.c:429 +#: ../libgimp/gimpprocbrowserdialog.c:438 msgid "Searching by description" msgstr "O klask dre an deskrivadur" -#: ../libgimp/gimpprocbrowserdialog.c:436 +#: ../libgimp/gimpprocbrowserdialog.c:445 msgid "Searching by help" msgstr "O klask dre ar skoazell" -#: ../libgimp/gimpprocbrowserdialog.c:443 +#: ../libgimp/gimpprocbrowserdialog.c:452 msgid "Searching by author" msgstr "O klask dre an aozer" -#: ../libgimp/gimpprocbrowserdialog.c:450 +#: ../libgimp/gimpprocbrowserdialog.c:459 msgid "Searching by copyright" msgstr "O klask dre ar c'hopyright" -#: ../libgimp/gimpprocbrowserdialog.c:457 +#: ../libgimp/gimpprocbrowserdialog.c:466 msgid "Searching by date" msgstr "O klask dre an deiziad" -#: ../libgimp/gimpprocbrowserdialog.c:464 +#: ../libgimp/gimpprocbrowserdialog.c:473 msgid "Searching by type" msgstr "O klask dre ar rizh" -#: ../libgimp/gimpprocbrowserdialog.c:474 +#: ../libgimp/gimpprocbrowserdialog.c:483 #, c-format msgid "%d procedure" msgid_plural "%d procedures" msgstr[0] "%d treugennad" msgstr[1] "%d a dreugennadoù" -#: ../libgimp/gimpprocbrowserdialog.c:483 +#: ../libgimp/gimpprocbrowserdialog.c:492 msgid "No matches for your query" msgstr "Kenglotadenn ebet evit ho koulenn" -#: ../libgimp/gimpprocbrowserdialog.c:487 +#: ../libgimp/gimpprocbrowserdialog.c:496 #, c-format msgid "%d procedure matches your query" msgid_plural "%d procedures match your query" msgstr[0] "%d treugennad a glot gant ho koulenn" msgstr[1] "%d a dreugennadoù a glot gant ho koulenn" -#: ../libgimp/gimpprocview.c:162 +#: ../libgimp/gimpprocview.c:172 msgid "Parameters" msgstr "Arventennoù" -#: ../libgimp/gimpprocview.c:175 +#: ../libgimp/gimpprocview.c:185 msgid "Return Values" msgstr "Gwerzhioù distreiñ" -#: ../libgimp/gimpprocview.c:188 +#: ../libgimp/gimpprocview.c:198 msgid "Additional Information" msgstr "Stlennoù ouzhpenn" -#: ../libgimp/gimpprocview.c:228 +#: ../libgimp/gimpprocview.c:238 msgid "Author:" msgstr "Aozer :" -#: ../libgimp/gimpprocview.c:240 +#: ../libgimp/gimpprocview.c:250 msgid "Date:" msgstr "Deiziad :" -#: ../libgimp/gimpprocview.c:252 +#: ../libgimp/gimpprocview.c:262 msgid "Copyright:" msgstr "Copyright :" @@ -893,51 +893,58 @@ msgctxt "text-justification" msgid "Filled" msgstr "Leuniet" -#: ../libgimpbase/gimputils.c:169 -#: ../libgimpbase/gimputils.c:174 -#: ../modules/color-selector-cmyk-lcms.c:406 -#: ../modules/color-selector-cmyk-lcms.c:412 +#: ../libgimpbase/gimputils.c:178 +#: ../libgimpbase/gimputils.c:183 +#: ../modules/color-selector-cmyk-lcms.c:424 +#: ../modules/color-selector-cmyk-lcms.c:430 #: ../modules/display-filter-lcms.c:182 msgid "(invalid UTF-8 string)" msgstr "(hedad nodoù UTF-8 didalvoudek)" -#: ../libgimpconfig/gimpcolorconfig.c:41 +#. * +#. * SECTION: gimpcolorconfig +#. * @title: GimpColorConfig +#. * @short_description: Color management settings. +#. * +#. * Color management settings. +#. * +#: ../libgimpconfig/gimpcolorconfig.c:50 msgid "Mode of operation for color management." msgstr "Mod gwezhiañ evit an ardeiñ liv." -#: ../libgimpconfig/gimpcolorconfig.c:43 +#: ../libgimpconfig/gimpcolorconfig.c:52 msgid "The color profile of your (primary) monitor." msgstr "Aelad liv ho skramm (pennañ)." -#: ../libgimpconfig/gimpcolorconfig.c:45 +#: ../libgimpconfig/gimpcolorconfig.c:54 msgid "When enabled, GIMP will try to use the display color profile from the windowing system. The configured monitor profile is then only used as a fallback." msgstr "Mar gweredekaet e vo klasket gant GIMP arverañ aelad ar skrammañ liv diouzh ar reizhiad prenestrañ. Arveret e vo neuze aelad ar skramm kefluniet evel un adaelad." -#: ../libgimpconfig/gimpcolorconfig.c:49 +#: ../libgimpconfig/gimpcolorconfig.c:58 msgid "The default RGB working space color profile." msgstr "Aelad liv an egor labourat RGG dre ziouer." -#: ../libgimpconfig/gimpcolorconfig.c:51 +#: ../libgimpconfig/gimpcolorconfig.c:60 msgid "The CMYK color profile used to convert between RGB and CMYK." msgstr "An aelad liv SMMD averet evit amdreiñ an RGG da SMMD." -#: ../libgimpconfig/gimpcolorconfig.c:53 +#: ../libgimpconfig/gimpcolorconfig.c:62 msgid "The color profile used for simulating a printed version (softproof)." msgstr "An aelad liv arveret evit darvanañ un handelv moullet (softproof)." -#: ../libgimpconfig/gimpcolorconfig.c:55 +#: ../libgimpconfig/gimpcolorconfig.c:64 msgid "Sets how colors are mapped for your display." msgstr "Arventennañ a ra penaos e vo glennet al livioù evit ar skrammañ." -#: ../libgimpconfig/gimpcolorconfig.c:57 +#: ../libgimpconfig/gimpcolorconfig.c:66 msgid "Sets how colors are converted from RGB working space to the print simulation device." msgstr "Arventennañ a ra penaos e vez amdroet al livioù diouzh an egor livventerezhel war arver en trevnad da zarvanañ ar moullañ." -#: ../libgimpconfig/gimpcolorconfig.c:60 +#: ../libgimpconfig/gimpcolorconfig.c:69 msgid "When enabled, the print simulation will mark colors which can not be represented in the target color space." msgstr "Mar gweredekaet e vo merket al livioù na vint ket evit bezañ krouet en egor livventerezhel gant an darvanad moullañ." -#: ../libgimpconfig/gimpcolorconfig.c:63 +#: ../libgimpconfig/gimpcolorconfig.c:72 msgid "The color to use for marking colors which are out of gamut." msgstr "Al liv da arverañ evit ober livioù er-maez eus an dirïad livioù." @@ -978,63 +985,63 @@ msgctxt "color-rendering-intent" msgid "Absolute colorimetric" msgstr "Livverk dizave" -#: ../libgimpconfig/gimpconfig-deserialize.c:96 +#: ../libgimpconfig/gimpconfig-deserialize.c:105 #, c-format msgid "value for token %s is not a valid UTF-8 string" msgstr "ar werzh evit ar reveziadenn %s n'eo ket un hedad UTF-8 talvoudek" #. please don't translate 'yes' and 'no' -#: ../libgimpconfig/gimpconfig-deserialize.c:435 +#: ../libgimpconfig/gimpconfig-deserialize.c:444 #, c-format msgid "expected 'yes' or 'no' for boolean token %s, got '%s'" msgstr "'yes' pe 'no' gortozet evit ar reveziadenn volean %s, bet '%s'" -#: ../libgimpconfig/gimpconfig-deserialize.c:509 +#: ../libgimpconfig/gimpconfig-deserialize.c:518 #, c-format msgid "invalid value '%s' for token %s" msgstr "gwerzh didalvoudek '%s' evit ar reveziadenn %s" -#: ../libgimpconfig/gimpconfig-deserialize.c:524 +#: ../libgimpconfig/gimpconfig-deserialize.c:533 #, c-format msgid "invalid value '%ld' for token %s" msgstr "gwerzh didalvoudek '%ld' evit ar reveziadenn %s" -#: ../libgimpconfig/gimpconfig-deserialize.c:593 +#: ../libgimpconfig/gimpconfig-deserialize.c:602 #, c-format msgid "while parsing token '%s': %s" msgstr "e-pad ma oa o tezrannañ ar reveziadenn '%s' : %s" -#: ../libgimpconfig/gimpconfig-iface.c:473 -#: ../libgimpconfig/gimpconfig-iface.c:486 -#: ../libgimpconfig/gimpscanner.c:501 -#: ../libgimpconfig/gimpscanner.c:582 -#: ../libgimpwidgets/gimpcolorprofilestore.c:655 +#: ../libgimpconfig/gimpconfig-iface.c:482 +#: ../libgimpconfig/gimpconfig-iface.c:495 +#: ../libgimpconfig/gimpscanner.c:506 +#: ../libgimpconfig/gimpscanner.c:587 +#: ../libgimpwidgets/gimpcolorprofilestore.c:664 msgid "fatal parse error" msgstr "fazi dezrannañ lazhus" -#: ../libgimpconfig/gimpconfig-path.c:378 +#: ../libgimpconfig/gimpconfig-path.c:387 #, c-format msgid "Cannot expand ${%s}" msgstr "N'haller ket astenn ${%s}" -#: ../libgimpconfig/gimpconfigwriter.c:77 -#: ../libgimpconfig/gimpconfigwriter.c:718 +#: ../libgimpconfig/gimpconfigwriter.c:87 +#: ../libgimpconfig/gimpconfigwriter.c:728 #, c-format msgid "Error writing to '%s': %s" msgstr "Fazi e-pad ma oa o skrivañ '%s' : %s" -#: ../libgimpconfig/gimpconfigwriter.c:135 +#: ../libgimpconfig/gimpconfigwriter.c:145 #, c-format msgid "Could not create temporary file for '%s': %s" msgstr "N'haller ket krouiñ ur restr padennek evit '%s' : %s" -#: ../libgimpconfig/gimpconfigwriter.c:148 +#: ../libgimpconfig/gimpconfigwriter.c:158 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "N'haller ket digeriñ '%s' evit skrivañ : %s" -#: ../libgimpconfig/gimpconfigwriter.c:679 -#: ../libgimpconfig/gimpconfigwriter.c:699 +#: ../libgimpconfig/gimpconfigwriter.c:689 +#: ../libgimpconfig/gimpconfigwriter.c:709 #, c-format msgid "" "Error writing to temporary file for '%s': %s\n" @@ -1043,7 +1050,7 @@ msgstr "" "Ur fazi zo bet e-pad ma oa o skrivañ ar restr padennek evit '%s' : %s\n" "N'eo ket bet daskemmet ar restr orin." -#: ../libgimpconfig/gimpconfigwriter.c:707 +#: ../libgimpconfig/gimpconfigwriter.c:717 #, c-format msgid "" "Error writing to temporary file for '%s': %s\n" @@ -1052,47 +1059,47 @@ msgstr "" "Ur fazi zo bet e-pad ma oa o skrivañ ar restr padennek evit '%s' : %s\n" "Restr ebet zo bet krouet." -#: ../libgimpconfig/gimpconfigwriter.c:731 +#: ../libgimpconfig/gimpconfigwriter.c:741 #, c-format msgid "Could not create '%s': %s" msgstr "N'haller ket krouiñ '%s' : %s" -#: ../libgimpconfig/gimpscanner.c:258 +#: ../libgimpconfig/gimpscanner.c:263 #, c-format msgid "invalid UTF-8 string" msgstr "Hedad UTF-8 didalvoudek." -#: ../libgimpconfig/gimpscanner.c:609 +#: ../libgimpconfig/gimpscanner.c:614 #, c-format msgid "Error while parsing '%s' in line %d: %s" msgstr "Fazi e-pad dezrannadur '%s' war an arroudenn %d : %s" -#: ../libgimpmodule/gimpmodule.c:152 -#: ../libgimpmodule/gimpmodule.c:170 -#: ../libgimpmodule/gimpmodule.c:279 -#: ../libgimpmodule/gimpmodule.c:306 -#: ../libgimpmodule/gimpmodule.c:432 +#: ../libgimpmodule/gimpmodule.c:163 +#: ../libgimpmodule/gimpmodule.c:181 +#: ../libgimpmodule/gimpmodule.c:290 +#: ../libgimpmodule/gimpmodule.c:317 +#: ../libgimpmodule/gimpmodule.c:443 #, c-format msgid "Module '%s' load error: %s" msgstr "Fazi e-pad kargadur ar mollad '%s' : %s" -#: ../libgimpmodule/gimpmodule.c:374 +#: ../libgimpmodule/gimpmodule.c:385 msgid "Module error" msgstr "Fazi mollad" -#: ../libgimpmodule/gimpmodule.c:375 +#: ../libgimpmodule/gimpmodule.c:386 msgid "Loaded" msgstr "Karget" -#: ../libgimpmodule/gimpmodule.c:376 +#: ../libgimpmodule/gimpmodule.c:387 msgid "Load failed" msgstr "C'hwitadenn war ar c'hargañ" -#: ../libgimpmodule/gimpmodule.c:377 +#: ../libgimpmodule/gimpmodule.c:388 msgid "Not loaded" msgstr "Ket karget" -#: ../libgimpthumb/gimpthumb-utils.c:122 +#: ../libgimpthumb/gimpthumb-utils.c:131 #, c-format msgid "" "Cannot determine a valid home directory.\n" @@ -1101,281 +1108,298 @@ msgstr "" "N'haller ket despizañ ur c'havlec'hiad personel talvoudek.\n" "Kadavet e vo ar melvennoù e teuliad ar restroù padennek (%s) neuze." -#: ../libgimpthumb/gimpthumb-utils.c:246 -#: ../libgimpthumb/gimpthumb-utils.c:314 +#: ../libgimpthumb/gimpthumb-utils.c:255 +#: ../libgimpthumb/gimpthumb-utils.c:323 #, c-format msgid "Failed to create thumbnail folder '%s'." msgstr "C'hwitadenn war krouadur teuliad '%s' ar melvennoù." -#: ../libgimpthumb/gimpthumbnail.c:497 +#: ../libgimpthumb/gimpthumbnail.c:508 #, c-format msgid "Thumbnail contains no Thumb::URI tag" msgstr "N'eus skeudennig ebet er valvenn :: ivinell URI" -#: ../libgimpthumb/gimpthumbnail.c:893 +#: ../libgimpthumb/gimpthumbnail.c:904 #, c-format msgid "Could not create thumbnail for %s: %s" msgstr "N'haller ket krouiñ ar malvennoù evit %s : %s" -#: ../libgimpwidgets/gimpbrowser.c:103 +#: ../libgimpwidgets/gimpbrowser.c:112 msgid "_Search:" msgstr "_Klask :" -#: ../libgimpwidgets/gimpcolorbutton.c:117 +#: ../libgimpwidgets/gimpcolorbutton.c:133 msgid "_Foreground Color" msgstr "Liv ar _rakva" -#: ../libgimpwidgets/gimpcolorbutton.c:121 +#: ../libgimpwidgets/gimpcolorbutton.c:137 msgid "_Background Color" msgstr "Liv an _drekva" -#: ../libgimpwidgets/gimpcolorbutton.c:125 +#: ../libgimpwidgets/gimpcolorbutton.c:141 msgid "Blac_k" msgstr "_Du" -#: ../libgimpwidgets/gimpcolorbutton.c:129 +#: ../libgimpwidgets/gimpcolorbutton.c:145 msgid "_White" msgstr "_Gwenn" -#: ../libgimpwidgets/gimpcolorprofilestore.c:143 +#: ../libgimpwidgets/gimpcolorprofilestore.c:152 msgid "Select color profile from disk..." msgstr "Diuzañ un aelad liv diwar ar gantenn..." -#: ../libgimpwidgets/gimpcolorprofilestore.c:279 +#: ../libgimpwidgets/gimpcolorprofilestore.c:288 msgctxt "profile" msgid "None" msgstr "Tra ebet" -#: ../libgimpwidgets/gimpcolorscales.c:97 +#: ../libgimpwidgets/gimpcolorscales.c:108 msgid "Scales" msgstr "Skeulioù" -#: ../libgimpwidgets/gimpcolorselection.c:209 +#: ../libgimpwidgets/gimpcolorselection.c:217 msgid "Current:" msgstr "Bremanel :" -#: ../libgimpwidgets/gimpcolorselection.c:231 +#: ../libgimpwidgets/gimpcolorselection.c:226 msgid "Old:" msgstr "Kozh :" -#: ../libgimpwidgets/gimpcolorselection.c:285 +#: ../libgimpwidgets/gimpcolorselection.c:311 msgid "Hexadecimal color notation as used in HTML and CSS. This entry also accepts CSS color names." msgstr "Notennadur liv c'hwezekredel evel ma 'z eo arveret e HTML ha CSS. Degemeret e vez an anvioù liv CSS gant an enmoned-mañ." -#: ../libgimpwidgets/gimpcolorselection.c:291 +#: ../libgimpwidgets/gimpcolorselection.c:317 msgid "HTML _notation:" msgstr "_Notennadur HTML :" -#: ../libgimpwidgets/gimpfileentry.c:173 +#: ../libgimpwidgets/gimpfileentry.c:197 msgid "Open a file selector to browse your folders" msgstr "Digeriñ un diuzer restroù evit furchal e-touez ho teuliadoù" -#: ../libgimpwidgets/gimpfileentry.c:174 +#: ../libgimpwidgets/gimpfileentry.c:198 msgid "Open a file selector to browse your files" msgstr "Digeriñ un diuzer restroù evit furchal e-touez ho restroù" -#: ../libgimpwidgets/gimpfileentry.c:334 +#: ../libgimpwidgets/gimpfileentry.c:358 msgid "Select Folder" msgstr "Diuzañ un teuliad" -#: ../libgimpwidgets/gimpfileentry.c:336 +#: ../libgimpwidgets/gimpfileentry.c:360 msgid "Select File" msgstr "Diuzañ ur restr" -#: ../libgimpwidgets/gimphelpui.c:419 +#: ../libgimpwidgets/gimphelpui.c:430 msgid "Press F1 for more help" msgstr "Pouezañ war F1 evit bezañ skoazellet muioc'h" -#: ../libgimpwidgets/gimpmemsizeentry.c:205 +#: ../libgimpwidgets/gimpmemsizeentry.c:217 msgid "Kilobytes" msgstr "Kiloeizhbitoù" -#: ../libgimpwidgets/gimpmemsizeentry.c:206 +#: ../libgimpwidgets/gimpmemsizeentry.c:218 msgid "Megabytes" msgstr "a vegaeizhbitoù" -#: ../libgimpwidgets/gimpmemsizeentry.c:207 +#: ../libgimpwidgets/gimpmemsizeentry.c:219 msgid "Gigabytes" msgstr "Gigaeizhbitoù" #. Count label -#: ../libgimpwidgets/gimppageselector.c:268 -#: ../libgimpwidgets/gimppageselector.c:1165 +#: ../libgimpwidgets/gimppageselector.c:278 +#: ../libgimpwidgets/gimppageselector.c:1176 msgid "Nothing selected" msgstr "Netra bet diuzet" -#: ../libgimpwidgets/gimppageselector.c:286 +#: ../libgimpwidgets/gimppageselector.c:296 msgid "Select _All" msgstr "Diuz_añ pep tra" -#: ../libgimpwidgets/gimppageselector.c:306 +#: ../libgimpwidgets/gimppageselector.c:316 msgid "Select _range:" msgstr "Diuzañ al l_edad :" -#: ../libgimpwidgets/gimppageselector.c:318 +#: ../libgimpwidgets/gimppageselector.c:328 msgid "Open _pages as" msgstr "Digeriñ ar _bajenn evel" -#: ../libgimpwidgets/gimppageselector.c:419 +#: ../libgimpwidgets/gimppageselector.c:429 msgid "Page 000" msgstr "Pajenn 000" -#: ../libgimpwidgets/gimppageselector.c:507 -#: ../libgimpwidgets/gimppageselector.c:743 +#: ../libgimpwidgets/gimppageselector.c:517 +#: ../libgimpwidgets/gimppageselector.c:754 #, c-format msgid "Page %d" msgstr "Pajenn %d" -#: ../libgimpwidgets/gimppageselector.c:1170 +#: ../libgimpwidgets/gimppageselector.c:1181 msgid "One page selected" msgstr "Ur bajenn diuzet" -#: ../libgimpwidgets/gimppageselector.c:1177 -#: ../libgimpwidgets/gimppageselector.c:1181 +#: ../libgimpwidgets/gimppageselector.c:1188 +#: ../libgimpwidgets/gimppageselector.c:1192 #, c-format msgid "%d page selected" msgid_plural "All %d pages selected" msgstr[0] "%d bajenn diuzet" msgstr[1] "An holl e-touez %d a bajennoù diuzet" -#: ../libgimpwidgets/gimppatheditor.c:213 +#: ../libgimpwidgets/gimppatheditor.c:234 msgid "Writable" msgstr "Daskemmus" -#: ../libgimpwidgets/gimppatheditor.c:222 +#: ../libgimpwidgets/gimppatheditor.c:243 msgid "Folder" msgstr "Renkell" -#: ../libgimpwidgets/gimppickbutton.c:106 +#: ../libgimpwidgets/gimppickbutton.c:125 msgid "Click the eyedropper, then click a color anywhere on your screen to select that color." msgstr "Klikañ war ar gorzennig, ha klikañ war ul liv n'eus forzh pelec'h war ar skramm evit diuzañ al liv-mañ." #. toggle button to (de)activate the instant preview -#: ../libgimpwidgets/gimppreview.c:276 +#: ../libgimpwidgets/gimppreview.c:287 msgid "_Preview" msgstr "_Alberz" -#: ../libgimpwidgets/gimppreviewarea.c:93 +#: ../libgimpwidgets/gimppreviewarea.c:103 msgid "Check Size" msgstr "Ment an damer" -#: ../libgimpwidgets/gimppreviewarea.c:100 +#: ../libgimpwidgets/gimppreviewarea.c:110 msgid "Check Style" msgstr "Stil an damer" -#: ../libgimpwidgets/gimppropwidgets.c:1859 +#: ../libgimpwidgets/gimppropwidgets.c:1868 #, 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] "Bevennet eo ar maez da enankañ testenn betek %d arouezenn." msgstr[1] "Bevennet eo ar maez da enankañ testenn betek %d a arouezennoù." -#: ../libgimpwidgets/gimpstock.c:111 +#: ../libgimpwidgets/gimpstock.c:127 msgid "Anchor" msgstr "Eor" -#: ../libgimpwidgets/gimpstock.c:112 +#: ../libgimpwidgets/gimpstock.c:128 msgid "C_enter" msgstr "Kr_eizañ" -#: ../libgimpwidgets/gimpstock.c:113 +#: ../libgimpwidgets/gimpstock.c:129 msgid "_Duplicate" msgstr "Arre_daoliñ" -#: ../libgimpwidgets/gimpstock.c:114 +#: ../libgimpwidgets/gimpstock.c:130 msgid "_Edit" msgstr "_Embann" -#: ../libgimpwidgets/gimpstock.c:115 +#: ../libgimpwidgets/gimpstock.c:131 msgid "Linked" msgstr "Ereet" -#: ../libgimpwidgets/gimpstock.c:116 +#: ../libgimpwidgets/gimpstock.c:132 msgid "Paste as New" msgstr "Pegañ evel un hini nevez" -#: ../libgimpwidgets/gimpstock.c:117 +#: ../libgimpwidgets/gimpstock.c:133 msgid "Paste Into" msgstr "Pegañ e" -#: ../libgimpwidgets/gimpstock.c:118 +#: ../libgimpwidgets/gimpstock.c:134 msgid "_Reset" msgstr "Adde_raouekaat" -#: ../libgimpwidgets/gimpstock.c:119 +#: ../libgimpwidgets/gimpstock.c:135 msgid "Visible" msgstr "Hewel" -#: ../libgimpwidgets/gimpstock.c:155 -#: ../libgimpwidgets/gimpstock.c:159 +#: ../libgimpwidgets/gimpstock.c:171 +#: ../libgimpwidgets/gimpstock.c:175 msgid "_Stroke" msgstr "_Tresañ" -#: ../libgimpwidgets/gimpstock.c:171 +#: ../libgimpwidgets/gimpstock.c:187 msgid "L_etter Spacing" msgstr "_Esaouiñ al lizherennoù" -#: ../libgimpwidgets/gimpstock.c:172 +#: ../libgimpwidgets/gimpstock.c:188 msgid "L_ine Spacing" msgstr "Esaouiñ al l_inennoù" -#: ../libgimpwidgets/gimpstock.c:188 +#: ../libgimpwidgets/gimpstock.c:204 msgid "_Resize" msgstr "Ad_mentañ" -#: ../libgimpwidgets/gimpstock.c:189 -#: ../libgimpwidgets/gimpstock.c:319 +#: ../libgimpwidgets/gimpstock.c:205 +#: ../libgimpwidgets/gimpstock.c:339 msgid "_Scale" msgstr "_Skeulaat" -#: ../libgimpwidgets/gimpstock.c:295 +#: ../libgimpwidgets/gimpstock.c:314 msgid "Cr_op" msgstr "Didr_oc'hañ" -#: ../libgimpwidgets/gimpstock.c:314 +#: ../libgimpwidgets/gimpstock.c:334 msgid "_Transform" msgstr "_Treuzfurmiñ" -#: ../libgimpwidgets/gimpstock.c:318 +#: ../libgimpwidgets/gimpstock.c:338 msgid "_Rotate" msgstr "_C'hwelañ" -#: ../libgimpwidgets/gimpstock.c:320 +#: ../libgimpwidgets/gimpstock.c:340 msgid "_Shear" msgstr "_Sizailhañ" -#: ../libgimpwidgets/gimpunitmenu.c:265 +#: ../libgimpwidgets/gimpunitmenu.c:288 msgid "More..." msgstr "Muioc'h..." -#: ../libgimpwidgets/gimpunitmenu.c:580 +#: ../libgimpwidgets/gimpunitmenu.c:603 msgid "Unit Selection" msgstr "Diuzad an unanennoù" -#: ../libgimpwidgets/gimpunitmenu.c:629 +#: ../libgimpwidgets/gimpunitmenu.c:652 msgid "Unit" msgstr "Unanenn" -#: ../libgimpwidgets/gimpunitmenu.c:633 +#: ../libgimpwidgets/gimpunitmenu.c:656 msgid "Factor" msgstr "Parenn" -#: ../libgimpwidgets/gimpwidgets.c:510 +#: ../libgimpwidgets/gimpwidgets.c:521 msgid "Use this value for random number generator seed - this allows you to repeat a given \"random\" operation" msgstr "Arverañ ar werzh-mañ evel hadenn ar grouerez niveroù dargouezhek - reiñ a ra tu deoc'h da adober ur riñvadenn \"dargouezhek\" lavaret" -#: ../libgimpwidgets/gimpwidgets.c:514 +#: ../libgimpwidgets/gimpwidgets.c:525 msgid "_New Seed" msgstr "Hadenn _nevez" -#: ../libgimpwidgets/gimpwidgets.c:527 +#: ../libgimpwidgets/gimpwidgets.c:538 msgid "Seed random number generator with a generated random number" msgstr "Hadennañ ar grouerez niveroù dargouezhek gant un niver dargouezek bet krouet" -#: ../libgimpwidgets/gimpwidgets.c:531 +#: ../libgimpwidgets/gimpwidgets.c:542 msgid "_Randomize" msgstr "Da_rgouezhezkaat" +#: ../libgimpwidgets/gimpwidgets-private.c:49 +#| msgid "Visible" +msgctxt "input-mode" +msgid "Disabled" +msgstr "Diweredekaet" + +#: ../libgimpwidgets/gimpwidgets-private.c:50 +#| msgid "Green" +msgctxt "input-mode" +msgid "Screen" +msgstr "Skramm" + +#: ../libgimpwidgets/gimpwidgets-private.c:51 +msgctxt "input-mode" +msgid "Window" +msgstr "Prenestr" + #: ../libgimpwidgets/gimpwidgetsenums.c:24 msgctxt "aspect-type" msgid "Square" @@ -1527,11 +1551,11 @@ msgstr "Melen" msgid "Black" msgstr "Du" -#: ../modules/color-selector-cmyk-lcms.c:394 +#: ../modules/color-selector-cmyk-lcms.c:412 msgid "Profile: (none)" msgstr "Aelad : (tra ebet)" -#: ../modules/color-selector-cmyk-lcms.c:415 +#: ../modules/color-selector-cmyk-lcms.c:433 #, c-format msgid "Profile: %s" msgstr "Aelad : %s" @@ -1682,17 +1706,17 @@ msgstr "Gwel POV %d Y" msgid "POV %d Return" msgstr "Distro POV %d" -#: ../modules/controller-dx-dinput.c:1083 +#: ../modules/controller-dx-dinput.c:1082 msgid "DirectInput Events" msgstr "Dargouezhioù DirectInput" -#: ../modules/controller-dx-dinput.c:1094 +#: ../modules/controller-dx-dinput.c:1093 #: ../modules/controller-linux-input.c:524 #: ../modules/controller-midi.c:504 msgid "No device configured" msgstr "Trevnad ebet bet kefluniet" -#: ../modules/controller-dx-dinput.c:1119 +#: ../modules/controller-dx-dinput.c:1118 #: ../modules/controller-linux-input.c:587 msgid "Device not available" msgstr "N'eo ket hegerz an trevnad" diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in index c6fb286455..2c6f3c2763 100644 --- a/po-plug-ins/POTFILES.in +++ b/po-plug-ins/POTFILES.in @@ -70,7 +70,7 @@ plug-ins/common/file-jp2-load.c plug-ins/common/file-mng.c plug-ins/common/file-pat.c plug-ins/common/file-pcx.c -plug-ins/common/file-pdf.c +plug-ins/common/file-pdf-load.c plug-ins/common/file-pix.c plug-ins/common/file-png.c plug-ins/common/file-pnm.c diff --git a/po-plug-ins/br.po b/po-plug-ins/br.po index 5092ec5533..b88d568d1b 100644 --- a/po-plug-ins/br.po +++ b/po-plug-ins/br.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n" -"POT-Creation-Date: 2010-04-14 16:45+0000\n" -"PO-Revision-Date: 2010-04-18 23:24+0100\n" +"POT-Creation-Date: 2010-08-18 05:18+0000\n" +"PO-Revision-Date: 2010-08-25 16:57+0100\n" "Last-Translator: Alan Monfort \n" "Language-Team: An Drouizig \n" "MIME-Version: 1.0\n" @@ -50,8 +50,6 @@ msgstr "Kendestenn" #. spinbutton 1 #: ../plug-ins/color-rotate/color-rotate-dialog.c:298 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:376 -#: ../plug-ins/common/color-to-alpha.c:410 #: ../plug-ins/file-fli/fli-gimp.c:874 #: ../plug-ins/file-fli/fli-gimp.c:930 msgid "From:" @@ -59,14 +57,25 @@ msgstr "Diouzh :" #. spinbutton 2 #: ../plug-ins/color-rotate/color-rotate-dialog.c:324 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:377 #: ../plug-ins/file-fli/fli-gimp.c:883 #: ../plug-ins/file-fli/fli-gimp.c:939 msgid "To:" msgstr "Da :" +#: ../plug-ins/color-rotate/color-rotate-dialog.c:376 +#| msgid "From:" +msgctxt "color-rotate" +msgid "From:" +msgstr "Diouzh :" + +#: ../plug-ins/color-rotate/color-rotate-dialog.c:377 +#| msgid "To:" +msgctxt "color-rotate" +msgid "To:" +msgstr "Da :" + #: ../plug-ins/color-rotate/color-rotate-dialog.c:418 -#: ../plug-ins/common/file-ps.c:3226 +#: ../plug-ins/common/file-ps.c:3228 #: ../plug-ins/imagemap/imap_menu.c:213 msgid "Gray" msgstr "Loued" @@ -298,8 +307,8 @@ msgstr "Desteudañ an treuzfollennoù hewel" #: ../plug-ins/common/align-layers.c:423 #: ../plug-ins/common/align-layers.c:454 #: ../plug-ins/common/cml-explorer.c:165 -#: ../plug-ins/common/file-ps.c:3242 -#: ../plug-ins/common/file-ps.c:3254 +#: ../plug-ins/common/file-ps.c:3244 +#: ../plug-ins/common/file-ps.c:3256 #: ../plug-ins/common/file-psp.c:646 #: ../plug-ins/file-fits/fits.c:1044 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:998 @@ -434,92 +443,92 @@ msgstr "O kavout drekva ar bliverezh" msgid "Optimizing animation" msgstr "O wellekaat ar bliverezh" -#: ../plug-ins/common/animation-play.c:170 +#: ../plug-ins/common/animation-play.c:167 msgid "Preview a GIMP layer-based animation" msgstr "Alberz ur bliverezh GIMP diazezet war treuzfollennoù" -#: ../plug-ins/common/animation-play.c:175 +#: ../plug-ins/common/animation-play.c:172 msgid "_Playback..." msgstr "_Lenn..." -#: ../plug-ins/common/animation-play.c:454 +#: ../plug-ins/common/animation-play.c:451 msgid "_Step" msgstr "_Paz" -#: ../plug-ins/common/animation-play.c:454 +#: ../plug-ins/common/animation-play.c:451 msgid "Step to next frame" msgstr "Ur paz davit ar skeudenn da zont" -#: ../plug-ins/common/animation-play.c:458 +#: ../plug-ins/common/animation-play.c:455 msgid "Rewind the animation" msgstr "Adenbeniañ ar bliverezh" -#: ../plug-ins/common/animation-play.c:476 +#: ../plug-ins/common/animation-play.c:473 msgid "Faster" msgstr "Buanoc'h" -#: ../plug-ins/common/animation-play.c:476 +#: ../plug-ins/common/animation-play.c:473 msgid "Increase the speed of the animation" msgstr "Kreskiñ tizh ar bliverezh" -#: ../plug-ins/common/animation-play.c:481 +#: ../plug-ins/common/animation-play.c:478 msgid "Slower" msgstr "Gorrekoc'h" -#: ../plug-ins/common/animation-play.c:481 +#: ../plug-ins/common/animation-play.c:478 msgid "Decrease the speed of the animation" msgstr "Digreskiñ tizh ar bliverezh" -#: ../plug-ins/common/animation-play.c:486 +#: ../plug-ins/common/animation-play.c:483 msgid "Reset speed" msgstr "Adderaouekaat an tizh" -#: ../plug-ins/common/animation-play.c:486 +#: ../plug-ins/common/animation-play.c:483 msgid "Reset the speed of the animation" msgstr "Adderaouekaat tizh ar bliverezh" -#: ../plug-ins/common/animation-play.c:494 -#: ../plug-ins/common/animation-play.c:1475 +#: ../plug-ins/common/animation-play.c:491 +#: ../plug-ins/common/animation-play.c:1472 msgid "Start playback" msgstr "Loc'hañ al lenn" -#: ../plug-ins/common/animation-play.c:498 +#: ../plug-ins/common/animation-play.c:495 msgid "Detach" msgstr "Distagañ" -#: ../plug-ins/common/animation-play.c:499 +#: ../plug-ins/common/animation-play.c:496 msgid "Detach the animation from the dialog window" msgstr "Distagañ ar bliverezh diouzh prenestr ar voestad emziviz" -#: ../plug-ins/common/animation-play.c:591 +#: ../plug-ins/common/animation-play.c:588 msgid "Animation Playback:" msgstr "Lenn ur bliverezh :" # sdm : skeudenn dre eilenn #. list is given in "fps" - frames per second -#: ../plug-ins/common/animation-play.c:664 +#: ../plug-ins/common/animation-play.c:661 #, c-format msgid "%d fps" msgstr "%d sde" -#: ../plug-ins/common/animation-play.c:675 +#: ../plug-ins/common/animation-play.c:672 msgid "Default framerate" msgstr "Feur skeudennoù dre ziouer" -#: ../plug-ins/common/animation-play.c:696 +#: ../plug-ins/common/animation-play.c:693 msgid "Playback speed" msgstr "Tizh al lenn" -#: ../plug-ins/common/animation-play.c:832 +#: ../plug-ins/common/animation-play.c:829 msgid "Tried to display an invalid layer." msgstr "Klasket ez eus bet skrammañ un dreuzfollenn didalvoudek." -#: ../plug-ins/common/animation-play.c:1352 +#: ../plug-ins/common/animation-play.c:1349 #, c-format msgid "Frame %d of %d" msgstr "Skeudenn %d diwar %d" -#: ../plug-ins/common/animation-play.c:1475 +#: ../plug-ins/common/animation-play.c:1472 msgid "Stop playback" msgstr "Arsav al lenn" @@ -625,10 +634,10 @@ msgstr "A-_serzh" #. #: ../plug-ins/common/blinds.c:278 #: ../plug-ins/common/compose.c:934 -#: ../plug-ins/common/decompose.c:722 +#: ../plug-ins/common/decompose.c:725 #: ../plug-ins/common/file-cel.c:361 #: ../plug-ins/common/file-cel.c:364 -#: ../plug-ins/common/file-dicom.c:556 +#: ../plug-ins/common/file-dicom.c:609 #: ../plug-ins/common/file-gif-load.c:927 #: ../plug-ins/common/file-jp2-load.c:351 #: ../plug-ins/common/file-pcx.c:418 @@ -955,7 +964,7 @@ msgid "_Elevation:" msgstr "_Savidigezh :" #: ../plug-ins/common/bump-map.c:930 -#: ../plug-ins/common/file-ps.c:3379 +#: ../plug-ins/common/file-ps.c:3381 msgid "_X offset:" msgstr "Linkañ _X :" @@ -965,7 +974,7 @@ msgid "The offset can be adjusted by dragging the preview using the middle mouse msgstr "Kengeidet e vez al linkadur dre riklañ an alberz gant rodig kreiz al logodenn." #: ../plug-ins/common/bump-map.c:944 -#: ../plug-ins/common/file-ps.c:3388 +#: ../plug-ins/common/file-ps.c:3390 msgid "_Y offset:" msgstr "Linkañ _Y :" @@ -1040,7 +1049,7 @@ msgid "Blue" msgstr "Glas" #: ../plug-ins/common/channel-mixer.c:583 -#: ../plug-ins/common/color-exchange.c:398 +#: ../plug-ins/common/color-exchange.c:412 #: ../plug-ins/common/compose.c:189 #: ../plug-ins/common/compose.c:200 #: ../plug-ins/common/diffraction.c:500 @@ -1052,7 +1061,7 @@ msgid "_Red:" msgstr "_Ruz :" #: ../plug-ins/common/channel-mixer.c:601 -#: ../plug-ins/common/color-exchange.c:458 +#: ../plug-ins/common/color-exchange.c:472 #: ../plug-ins/common/compose.c:190 #: ../plug-ins/common/compose.c:201 #: ../plug-ins/common/diffraction.c:509 @@ -1064,7 +1073,7 @@ msgid "_Green:" msgstr "_Gwer :" #: ../plug-ins/common/channel-mixer.c:620 -#: ../plug-ins/common/color-exchange.c:519 +#: ../plug-ins/common/color-exchange.c:533 #: ../plug-ins/common/compose.c:191 #: ../plug-ins/common/compose.c:202 #: ../plug-ins/common/diffraction.c:518 @@ -1094,21 +1103,20 @@ msgstr "Kargañ an arventennoù evit ar mesker sanelloù" #: ../plug-ins/common/file-cel.c:311 #: ../plug-ins/common/file-compressor.c:497 #: ../plug-ins/common/file-compressor.c:665 -#: ../plug-ins/common/file-dicom.c:324 -#: ../plug-ins/common/file-gbr.c:360 +#: ../plug-ins/common/file-dicom.c:339 +#: ../plug-ins/common/file-gbr.c:367 #: ../plug-ins/common/file-gif-load.c:355 #: ../plug-ins/common/file-gih.c:643 #: ../plug-ins/common/file-jp2-load.c:197 #: ../plug-ins/common/file-jp2-load.c:206 #: ../plug-ins/common/file-mng.c:1107 -#: ../plug-ins/common/file-pat.c:329 +#: ../plug-ins/common/file-pat.c:336 #: ../plug-ins/common/file-pcx.c:360 -#: ../plug-ins/common/file-pdf.c:550 #: ../plug-ins/common/file-pix.c:342 #: ../plug-ins/common/file-png.c:720 #: ../plug-ins/common/file-pnm.c:493 #: ../plug-ins/common/file-ps.c:1036 -#: ../plug-ins/common/file-ps.c:3043 +#: ../plug-ins/common/file-ps.c:3045 #: ../plug-ins/common/file-psp.c:1703 #: ../plug-ins/common/file-raw.c:255 #: ../plug-ins/common/file-raw.c:709 @@ -1159,18 +1167,18 @@ msgstr "Enrollañ an arventennoù evit ar mesker sanelloù" #: ../plug-ins/common/file-compressor.c:507 #: ../plug-ins/common/file-compressor.c:589 #: ../plug-ins/common/file-compressor.c:676 -#: ../plug-ins/common/file-csource.c:405 -#: ../plug-ins/common/file-dicom.c:800 -#: ../plug-ins/common/file-gbr.c:652 -#: ../plug-ins/common/file-gif-save.c:779 +#: ../plug-ins/common/file-csource.c:406 +#: ../plug-ins/common/file-dicom.c:1352 +#: ../plug-ins/common/file-gbr.c:661 +#: ../plug-ins/common/file-gif-save.c:781 #: ../plug-ins/common/file-gih.c:1261 #: ../plug-ins/common/file-html-table.c:235 #: ../plug-ins/common/file-mng.c:609 #: ../plug-ins/common/file-mng.c:943 -#: ../plug-ins/common/file-pat.c:475 +#: ../plug-ins/common/file-pat.c:484 #: ../plug-ins/common/file-pcx.c:672 #: ../plug-ins/common/file-pix.c:523 -#: ../plug-ins/common/file-png.c:1269 +#: ../plug-ins/common/file-png.c:1270 #: ../plug-ins/common/file-pnm.c:976 #: ../plug-ins/common/file-ps.c:1213 #: ../plug-ins/common/file-raw.c:589 @@ -1194,7 +1202,7 @@ msgstr "Enrollañ an arventennoù evit ar mesker sanelloù" #: ../plug-ins/flame/flame.c:440 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1545 #: ../plug-ins/gfig/gfig.c:793 -#: ../plug-ins/ifs-compose/ifs-compose.c:2398 +#: ../plug-ins/ifs-compose/ifs-compose.c:2395 #: ../plug-ins/lighting/lighting-ui.c:1210 #, c-format msgid "Could not open '%s' for writing: %s" @@ -1716,43 +1724,43 @@ msgid "_Color Exchange..." msgstr "Es_kemm al livioù..." #: ../plug-ins/common/color-exchange.c:212 -#: ../plug-ins/common/color-exchange.c:286 +#: ../plug-ins/common/color-exchange.c:287 msgid "Color Exchange" msgstr "Eskemm al livioù" -#: ../plug-ins/common/color-exchange.c:309 +#: ../plug-ins/common/color-exchange.c:310 msgid "Middle-Click Inside Preview to Pick \"From Color\"" msgstr "Klikañ war an afell greiz war an alberz evit tapout \"diouzh al liv\"" -#: ../plug-ins/common/color-exchange.c:347 +#: ../plug-ins/common/color-exchange.c:355 msgid "To Color" msgstr "Liv disoc'h" -#: ../plug-ins/common/color-exchange.c:347 +#: ../plug-ins/common/color-exchange.c:355 msgid "From Color" msgstr "Liv orin" -#: ../plug-ins/common/color-exchange.c:365 +#: ../plug-ins/common/color-exchange.c:379 msgid "Color Exchange: To Color" msgstr "Eskemm livioù : liv an disoc'h" -#: ../plug-ins/common/color-exchange.c:366 +#: ../plug-ins/common/color-exchange.c:380 msgid "Color Exchange: From Color" msgstr "Eskemm livioù : liv orin" -#: ../plug-ins/common/color-exchange.c:424 +#: ../plug-ins/common/color-exchange.c:438 msgid "R_ed threshold:" msgstr "Gw_ehin ruz :" -#: ../plug-ins/common/color-exchange.c:484 +#: ../plug-ins/common/color-exchange.c:498 msgid "G_reen threshold:" msgstr "Gwehin gwe_r :" -#: ../plug-ins/common/color-exchange.c:545 +#: ../plug-ins/common/color-exchange.c:559 msgid "B_lue threshold:" msgstr "Gwehin g_las :" -#: ../plug-ins/common/color-exchange.c:573 +#: ../plug-ins/common/color-exchange.c:587 msgid "Lock _thresholds" msgstr "Prennañ ar _gwehinoù" @@ -1772,6 +1780,12 @@ msgstr "O tilemel al liv" msgid "Color to Alpha" msgstr "Liv da alfa" +#: ../plug-ins/common/color-to-alpha.c:410 +#| msgid "From:" +msgctxt "color-to-alpha" +msgid "From:" +msgstr "Diouzh :" + #: ../plug-ins/common/color-to-alpha.c:414 msgid "Color to Alpha Color Picker" msgstr "Liv da alfa : diuzad liv" @@ -2021,7 +2035,7 @@ msgid "Composing" msgstr "O kenaozañ" #: ../plug-ins/common/compose.c:696 -#: ../plug-ins/common/compose.c:1735 +#: ../plug-ins/common/compose.c:1729 msgid "At least one image is needed to compose" msgstr "Da vihanañ ez eus ezhomm ur skeudenn evit kenaozañ" @@ -2052,26 +2066,26 @@ msgstr "Ar skeudenn n'eo ket dre donennoù louedoù (bpp=%d)" msgid "Unable to recompose, source layer not found" msgstr "N'eo ket barrek da adsevel, n'eo ket bet kavet tarzh an dreuzfollenn" -#: ../plug-ins/common/compose.c:1487 +#: ../plug-ins/common/compose.c:1481 msgid "Compose" msgstr "Kenaozañ" #. Compose type combo -#: ../plug-ins/common/compose.c:1515 +#: ../plug-ins/common/compose.c:1509 msgid "Compose Channels" msgstr "Kenaozañ ar sanelloù" -#: ../plug-ins/common/compose.c:1525 -#: ../plug-ins/common/decompose.c:1514 +#: ../plug-ins/common/compose.c:1519 +#: ../plug-ins/common/decompose.c:1524 msgid "Color _model:" msgstr "_Skouer liv :" #. Channel representation table -#: ../plug-ins/common/compose.c:1557 +#: ../plug-ins/common/compose.c:1551 msgid "Channel Representations" msgstr "Derc'hennadur ar sanelloù" -#: ../plug-ins/common/compose.c:1620 +#: ../plug-ins/common/compose.c:1614 msgid "Mask value" msgstr "Gwerzh ar maskl" @@ -2668,23 +2682,23 @@ msgstr "_Digenaozañ..." msgid "Decomposing" msgstr "O tigenaozañ" -#: ../plug-ins/common/decompose.c:1479 +#: ../plug-ins/common/decompose.c:1489 msgid "Decompose" msgstr "Digenaozañ" -#: ../plug-ins/common/decompose.c:1502 +#: ../plug-ins/common/decompose.c:1512 msgid "Extract Channels" msgstr "Eztennañ ar sanelloù" -#: ../plug-ins/common/decompose.c:1549 +#: ../plug-ins/common/decompose.c:1559 msgid "_Decompose to layers" msgstr "_Digenaozañ e treuzfollennoù" -#: ../plug-ins/common/decompose.c:1560 +#: ../plug-ins/common/decompose.c:1570 msgid "_Foreground as registration color" msgstr "Livioù ar rakva evel livioù marilhañ" -#: ../plug-ins/common/decompose.c:1561 +#: ../plug-ins/common/decompose.c:1571 msgid "Pixels in the foreground color will appear black in all output images. This can be used for things like crop marks that have to show up on all channels." msgstr "Du e vo diskouezet ar pikselioù e liv ar rakva gant an holl skeudennoù ec'hankañ. Talvoudus eo evit traoù evel merkoù didroc'hañ hag a rank bezañ diskouezet sklaer war an holl sanelloù." @@ -2812,8 +2826,8 @@ msgstr "Diroudennañ" #: ../plug-ins/common/destripe.c:473 #: ../plug-ins/common/file-html-table.c:580 -#: ../plug-ins/common/file-ps.c:3166 -#: ../plug-ins/common/file-ps.c:3361 +#: ../plug-ins/common/file-ps.c:3168 +#: ../plug-ins/common/file-ps.c:3363 #: ../plug-ins/common/file-raw.c:1132 #: ../plug-ins/common/smooth-palette.c:435 #: ../plug-ins/common/tile-paper.c:302 @@ -3141,8 +3155,8 @@ msgstr "Engravañ" #: ../plug-ins/common/engrave.c:244 #: ../plug-ins/common/file-html-table.c:596 -#: ../plug-ins/common/file-ps.c:3176 -#: ../plug-ins/common/file-ps.c:3370 +#: ../plug-ins/common/file-ps.c:3178 +#: ../plug-ins/common/file-ps.c:3372 #: ../plug-ins/common/file-raw.c:1145 #: ../plug-ins/common/film.c:1002 #: ../plug-ins/common/smooth-palette.c:440 @@ -3185,14 +3199,14 @@ msgstr "Kargañ ul livaoueg KISS" #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection #: ../plug-ins/common/file-cel.c:316 -#: ../plug-ins/common/file-dicom.c:329 -#: ../plug-ins/common/file-gbr.c:365 +#: ../plug-ins/common/file-dicom.c:344 +#: ../plug-ins/common/file-gbr.c:372 #: ../plug-ins/common/file-gif-load.c:360 #: ../plug-ins/common/file-gih.c:648 #: ../plug-ins/common/file-jp2-load.c:190 -#: ../plug-ins/common/file-pat.c:334 +#: ../plug-ins/common/file-pat.c:341 #: ../plug-ins/common/file-pcx.c:365 -#: ../plug-ins/common/file-pdf.c:595 +#: ../plug-ins/common/file-pdf.c:601 #: ../plug-ins/common/file-pix.c:347 #: ../plug-ins/common/file-png.c:727 #: ../plug-ins/common/file-pnm.c:498 @@ -3213,7 +3227,7 @@ msgstr "Kargañ ul livaoueg KISS" #: ../plug-ins/file-jpeg/jpeg-load.c:114 #: ../plug-ins/file-psd/psd-load.c:135 #: ../plug-ins/file-sgi/sgi.c:329 -#: ../plug-ins/file-xjt/xjt.c:3328 +#: ../plug-ins/file-xjt/xjt.c:3329 #, c-format msgid "Opening '%s'" msgstr "O tigeriñ '%s'" @@ -3230,14 +3244,14 @@ msgstr "Donder bit anskor (%d) !" #. init the progress meter #. And let's begin the progress #: ../plug-ins/common/file-cel.c:587 -#: ../plug-ins/common/file-gbr.c:657 -#: ../plug-ins/common/file-gif-save.c:786 +#: ../plug-ins/common/file-gbr.c:666 +#: ../plug-ins/common/file-gif-save.c:788 #: ../plug-ins/common/file-gih.c:1266 #: ../plug-ins/common/file-html-table.c:255 -#: ../plug-ins/common/file-pat.c:480 +#: ../plug-ins/common/file-pat.c:489 #: ../plug-ins/common/file-pcx.c:633 #: ../plug-ins/common/file-pix.c:528 -#: ../plug-ins/common/file-png.c:1276 +#: ../plug-ins/common/file-png.c:1277 #: ../plug-ins/common/file-pnm.c:981 #: ../plug-ins/common/file-ps.c:1218 #: ../plug-ins/common/file-sunras.c:567 @@ -3275,53 +3289,53 @@ msgstr "Askouezhadenn restr kizidik ebet, oc'h enrollañ e XCF koazhet." msgid "No sensible file extension, attempting to load with file magic." msgstr "Askouezhadenn restr kizidik ebet, o klask kargañ gant ar restr hudus." -#: ../plug-ins/common/file-csource.c:111 +#: ../plug-ins/common/file-csource.c:112 msgid "C source code" msgstr "Boneg tarzh C" -#: ../plug-ins/common/file-csource.c:659 +#: ../plug-ins/common/file-csource.c:703 msgid "C-Source" msgstr "C-source" -#: ../plug-ins/common/file-csource.c:677 +#: ../plug-ins/common/file-csource.c:721 msgid "_Prefixed name:" msgstr "Anv rakrannet :" -#: ../plug-ins/common/file-csource.c:686 +#: ../plug-ins/common/file-csource.c:730 msgid "Co_mment:" msgstr "Askele_nn :" #. Use Comment #. -#: ../plug-ins/common/file-csource.c:693 +#: ../plug-ins/common/file-csource.c:737 msgid "_Save comment to file" msgstr "En_rollañ an askelenn er restr" #. GLib types #. -#: ../plug-ins/common/file-csource.c:705 +#: ../plug-ins/common/file-csource.c:749 msgid "_Use GLib types (guint8*)" msgstr "_Arverañ ar rizhioù GLib (guint8*)" -#. Use Macros -#. -#: ../plug-ins/common/file-csource.c:717 +#: ../plug-ins/common/file-csource.c:762 msgid "Us_e macros instead of struct" msgstr "Arv_erañ makroioù e-lec'h frammad" -#. Use RLE -#. -#: ../plug-ins/common/file-csource.c:729 +#: ../plug-ins/common/file-csource.c:775 msgid "Use _1 byte Run-Length-Encoding" msgstr "Arverañ an envonegañ Run-Length _1 eizhbit" -#. Alpha -#. -#: ../plug-ins/common/file-csource.c:741 +#: ../plug-ins/common/file-csource.c:788 msgid "Sa_ve alpha channel (RGBA/RGB)" msgstr "Enrollañ ar _sanell alfa (RGGA/RGG)" -#: ../plug-ins/common/file-csource.c:759 +#. RGB-565 +#. +#: ../plug-ins/common/file-csource.c:800 +msgid "Save as _RGB565 (16-bit)" +msgstr "Enrollañ gant ar mod _RGG565 (16-eizhbit)" + +#: ../plug-ins/common/file-csource.c:823 msgid "Op_acity:" msgstr "Deme_rez :" @@ -3334,26 +3348,26 @@ msgstr "Ere ar burev" msgid "Error loading desktop file '%s': %s" msgstr "Fazi e-pad ma oa o kargañ restr ar burev '%s' : '%s'" -#: ../plug-ins/common/file-dicom.c:145 +#: ../plug-ins/common/file-dicom.c:138 msgid "DICOM image" msgstr "Skeudenn DICOM" -#: ../plug-ins/common/file-dicom.c:170 +#: ../plug-ins/common/file-dicom.c:163 msgid "Digital Imaging and Communications in Medicine image" msgstr "Skeudenn DICOM (Digital Imaging and Communications in Medicine)" -#: ../plug-ins/common/file-dicom.c:351 +#: ../plug-ins/common/file-dicom.c:366 #, c-format msgid "'%s' is not a DICOM file." msgstr "'%s' n'eo ket ur restr DICOM." -#: ../plug-ins/common/file-dicom.c:768 +#: ../plug-ins/common/file-dicom.c:1320 #: ../plug-ins/common/file-pcx.c:665 #: ../plug-ins/common/file-pnm.c:966 msgid "Cannot save images with alpha channel." msgstr "N'haller ket enrollañ skeudennoù gant sanelloù alfa." -#: ../plug-ins/common/file-dicom.c:783 +#: ../plug-ins/common/file-dicom.c:1335 #: ../plug-ins/common/file-ps.c:1203 #: ../plug-ins/common/file-xwd.c:603 #: ../plug-ins/file-fits/fits.c:465 @@ -3366,51 +3380,51 @@ msgstr "N'haller ket gwerediñ war rizhioù skeudennoù dianav." msgid "GIMP brush" msgstr "Broust GIMP" -#: ../plug-ins/common/file-gbr.c:391 -#: ../plug-ins/common/file-pat.c:410 +#: ../plug-ins/common/file-gbr.c:398 +#: ../plug-ins/common/file-pat.c:417 #, c-format msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" msgstr "Roadennoù talbenn didalvoudek e '%s': led=%lu, sav=%lu, eizhbitoù=%lu" -#: ../plug-ins/common/file-gbr.c:415 -#: ../plug-ins/common/file-gbr.c:427 +#: ../plug-ins/common/file-gbr.c:422 +#: ../plug-ins/common/file-gbr.c:434 msgid "Unsupported brush format" msgstr "Mentrezh broust anskor" -#: ../plug-ins/common/file-gbr.c:439 +#: ../plug-ins/common/file-gbr.c:446 #, c-format msgid "Error in GIMP brush file '%s'" msgstr "Fazi e restr broust GIMP '%s'" -#: ../plug-ins/common/file-gbr.c:447 +#: ../plug-ins/common/file-gbr.c:454 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Hedad nodoù UTF-8 didalvoudek er restr broust '%s'." -#: ../plug-ins/common/file-gbr.c:453 +#: ../plug-ins/common/file-gbr.c:460 #: ../plug-ins/common/file-gih.c:491 #: ../plug-ins/common/file-gih.c:1140 #: ../plug-ins/gradient-flare/gradient-flare.c:3062 msgid "Unnamed" msgstr "Dizanv" -#: ../plug-ins/common/file-gbr.c:642 +#: ../plug-ins/common/file-gbr.c:651 msgid "GIMP brushes are either GRAYSCALE or RGBA" msgstr "Pe LIVEOÙ LOUEDOÙ pe RGGA ez eo broustoù GIMP" -#: ../plug-ins/common/file-gbr.c:759 +#: ../plug-ins/common/file-gbr.c:768 msgid "Brush" msgstr "Broust" #. attach labels -#: ../plug-ins/common/file-gbr.c:773 +#: ../plug-ins/common/file-gbr.c:782 #: ../plug-ins/common/grid.c:790 msgid "Spacing:" msgstr "Esaouiñ :" -#: ../plug-ins/common/file-gbr.c:784 +#: ../plug-ins/common/file-gbr.c:793 #: ../plug-ins/common/file-gih.c:891 -#: ../plug-ins/common/file-pat.c:557 +#: ../plug-ins/common/file-pat.c:566 #: ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Deskrivadur :" @@ -3455,42 +3469,41 @@ msgstr "Skeudenn %d (%d%s)" msgid "GIF: Undocumented GIF composite type %d is not handled. Animation might not play or re-save perfectly." msgstr "GIF : rizh ar GIF liesparzh anteuliet %d n'eo ket skoret. Ar bliverezh ne vo ket c'hoariet mat pe adenrollañ peurvat." -#: ../plug-ins/common/file-gif-save.c:465 +#: ../plug-ins/common/file-gif-save.c:467 msgid "Couldn't simply reduce colors further. Saving as opaque." msgstr "N'haller ket bihanaat al livioù muioc'h. Oc'h enrollañ evel skeudenn demer." -#: ../plug-ins/common/file-gif-save.c:580 +#: ../plug-ins/common/file-gif-save.c:582 #, c-format msgid "Unable to save '%s'. The GIF file format does not support images that are more than %d pixels wide or tall." msgstr "N'haller ket enrollañ '%s'. Ne vez ket skoret ar skeudennoù brasoc'h o led pe o sav eget %d a bikselioù gant ar mentrezh restr GIF." -#: ../plug-ins/common/file-gif-save.c:691 +#: ../plug-ins/common/file-gif-save.c:693 msgid "The GIF format only supports comments in 7bit ASCII encoding. No comment is saved." msgstr "An askellennoù enboneget e ASCII 7 bit hepken a vez skoret gant ar mentrezh GIF. Askelenn ebet bet enrollet." -#: ../plug-ins/common/file-gif-save.c:750 +#: ../plug-ins/common/file-gif-save.c:752 msgid "Cannot save RGB color images. Convert to indexed color or grayscale first." msgstr "N'haller ket enrollañ skeudennoù RGG. Amdreiñ da gentañ da livioù ibiliet pe da liveoù louedoù." -#: ../plug-ins/common/file-gif-save.c:928 +#: ../plug-ins/common/file-gif-save.c:930 msgid "Delay inserted to prevent evil CPU-sucking animation." msgstr "Dale zo bet enlakaet evit mirout ouzh bliverezhioù o lipat re ar c'horrgewerier." -#: ../plug-ins/common/file-gif-save.c:968 +#: ../plug-ins/common/file-gif-save.c:970 msgid "The image you are trying to save as a GIF contains layers which extend beyond the actual borders of the image." msgstr "Ar skeudennoù emaoc'h o klask enrollañ evel GIF zo treuzfollennoù enno o vont dreist bevennoù ar skeudenn." -#: ../plug-ins/common/file-gif-save.c:985 +#: ../plug-ins/common/file-gif-save.c:987 msgid "The GIF file format does not allow this. You may choose whether to crop all of the layers to the image borders, or cancel this save." msgstr "Ne vez ket aotreet an dra-se gant ar mentrezh GIF. Dibabet e vez da zidroc'hañ an holl dreuzfollennoù betek riblenn ar skeudenn pe zilezel an enrolladur-mañ." -#: ../plug-ins/common/file-gif-save.c:1121 +#: ../plug-ins/common/file-gif-save.c:1123 msgid "GIF" msgstr "GIF" -#: ../plug-ins/common/file-gif-save.c:1129 +#: ../plug-ins/common/file-gif-save.c:1131 #, c-format -#| msgid "Error loading desktop file '%s': %s" msgid "" "Error loading UI file '%s':\n" "%s" @@ -3498,27 +3511,27 @@ msgstr "" "Fazi e-pad ma oa o kargañ restr ar c'heta '%s':\n" "%s" -#: ../plug-ins/common/file-gif-save.c:1182 +#: ../plug-ins/common/file-gif-save.c:1184 msgid "I don't care" msgstr "Ne vern" -#: ../plug-ins/common/file-gif-save.c:1184 +#: ../plug-ins/common/file-gif-save.c:1186 msgid "Cumulative layers (combine)" msgstr "Treuzfollennoù dassammek (kedaozañ)" -#: ../plug-ins/common/file-gif-save.c:1186 +#: ../plug-ins/common/file-gif-save.c:1188 msgid "One frame per layer (replace)" msgstr "Ur skeudenn dre dreuzfollenn (amsaviñ)" -#: ../plug-ins/common/file-gif-save.c:1203 +#: ../plug-ins/common/file-gif-save.c:1205 msgid "You can only export as animation when the image has more than one layer. The image you are trying to export only has one layer." msgstr "Tro zo deoc'h da ezporzhiañ evel bliverezh mard ez eus muioc'h eget un dreuzfollenn gant ar skeudenn. Un dreuzfollenn hepken ez eus gant ar skeudenn emaoc'h o klask ezporzhiañ." -#: ../plug-ins/common/file-gif-save.c:2347 +#: ../plug-ins/common/file-gif-save.c:2349 msgid "Error writing output file." msgstr "Fazi e-pad skrivadur ar restr ec'hankañ." -#: ../plug-ins/common/file-gif-save.c:2417 +#: ../plug-ins/common/file-gif-save.c:2419 #, c-format msgid "The default comment is limited to %d characters." msgstr "Bevennet eo an askellenn dre ziouer ouzh %d arouezennoù." @@ -3744,8 +3757,11 @@ msgstr "Ul livventerezh dianav ez eus gant ar skeudenn '%s'." #: ../plug-ins/common/file-jp2-load.c:320 #, c-format -msgid "Image component %d of image '%s' did not have the same size as the image which is currently not supported." -msgstr "Disheñvel eo ment parzh skeudenn %d ar skeudenn '%s' diouzh ar skeudenn, pezh n'eo ket skoret evit poent." +#| msgid "" +#| "Image component %d of image '%s' did not have the same size as the image " +#| "which is currently not supported." +msgid "Image component %d of image '%s' does not have the same size as the image. This is currently not supported." +msgstr "Disheñvel eo ment ar parzh skeudenn %d evit ar skeudenn '%s' diouzh ar skeudenn. N'eo ket skoret evit poent." #: ../plug-ins/common/file-jp2-load.c:331 #, c-format @@ -3754,13 +3770,16 @@ msgstr "Mankout a ra hstep ha vstep da barzh skeudenn %d ar skeudenn '%s'." #: ../plug-ins/common/file-jp2-load.c:340 #, c-format -msgid "Image component %d of image '%s' is signed which is currently not supported by GIMP." -msgstr "Sinet eo parzh skeudenn %d ar skeudenn '%s' pezh n'eo ket skoret gant GIMP." +#| msgid "" +#| "Image component %d of image '%s' is signed which is currently not " +#| "supported by GIMP." +msgid "Image component %d of image '%s' is signed. This is currently not supported." +msgstr "Sinet eo parzh skeudenn %d ar skeudenn '%s' . N'eo ket skoret gant GIMP." #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette #: ../plug-ins/common/file-mng.c:497 -#: ../plug-ins/common/file-png.c:1759 +#: ../plug-ins/common/file-png.c:1760 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "N'haller ket enrollañ ar boullder hep koll, oc'h enrollañ an demerez en e lec'h." @@ -3794,7 +3813,7 @@ msgstr "Enrollañ deiziad ar c'hrouiñ" #. Dialog init #: ../plug-ins/common/file-mng.c:1362 -#: ../plug-ins/common/file-png.c:1800 +#: ../plug-ins/common/file-png.c:1801 msgid "PNG" msgstr "PNG" @@ -3879,12 +3898,12 @@ msgstr "Bliverezh MNG" msgid "GIMP pattern" msgstr "Goustur GIMP" -#: ../plug-ins/common/file-pat.c:370 +#: ../plug-ins/common/file-pat.c:377 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "Hedad nodoù UTF-8 didalvoudek er restr goustur '%s'." -#: ../plug-ins/common/file-pat.c:542 +#: ../plug-ins/common/file-pat.c:551 msgid "Pattern" msgstr "Goustur" @@ -3959,40 +3978,46 @@ msgstr "C'hwitadenn war skrivañ war ar restr '%s' : %s" msgid "Portable Document Format" msgstr "Portable Document Format" -#: ../plug-ins/common/file-pdf.c:629 +#: ../plug-ins/common/file-pdf.c:556 +#, c-format +#| msgid "Could not write '%s': %s" +msgid "Could not load '%s': %s" +msgstr "N'haller ket kargañ '%s' : %s" + +#: ../plug-ins/common/file-pdf.c:635 #, c-format msgid "%s-%s" msgstr "%s-%s" -#: ../plug-ins/common/file-pdf.c:631 +#: ../plug-ins/common/file-pdf.c:637 #: ../plug-ins/common/file-ps.c:1125 #, c-format msgid "%s-pages" msgstr "pajennoù-%s" -#: ../plug-ins/common/file-pdf.c:817 +#: ../plug-ins/common/file-pdf.c:823 msgid "Import from PDF" msgstr "Enporzhiañ diouzh ur PDF" -#: ../plug-ins/common/file-pdf.c:822 -#: ../plug-ins/common/file-ps.c:3095 +#: ../plug-ins/common/file-pdf.c:828 +#: ../plug-ins/common/file-ps.c:3097 #: ../plug-ins/common/file-tiff-load.c:483 msgid "_Import" msgstr "Enporzh_iañ" -#: ../plug-ins/common/file-pdf.c:890 +#: ../plug-ins/common/file-pdf.c:896 msgid "_Width (pixels):" msgstr "_Led (pikselioù) :" -#: ../plug-ins/common/file-pdf.c:891 +#: ../plug-ins/common/file-pdf.c:897 msgid "_Height (pixels):" msgstr "_Sav (pikselioù) :" -#: ../plug-ins/common/file-pdf.c:893 +#: ../plug-ins/common/file-pdf.c:899 msgid "_Resolution:" msgstr "Dia_runusted :" -#: ../plug-ins/common/file-pdf.c:1167 +#: ../plug-ins/common/file-pdf.c:1173 #, c-format msgid "pixels/%s" msgstr "a bikselioù/%s" @@ -4028,14 +4053,13 @@ msgstr "Skouer liv dianav er restr PNG '%s'." msgid "The PNG file specifies an offset that caused the layer to be positioned outside the image." msgstr "Erspizañ a ra ar restr PNG ul linkadur o kas un dreuzfollenn er-maez eus ar skeudenn." -#: ../plug-ins/common/file-png.c:1253 +#: ../plug-ins/common/file-png.c:1254 #, c-format msgid "Error while saving '%s'. Could not save image." msgstr "Fazi e-pad ma oa oc'h enrollañ '%s'. N'haller ket enrollañ ar skeudenn." -#: ../plug-ins/common/file-png.c:1817 +#: ../plug-ins/common/file-png.c:1818 #, c-format -#| msgid "Error loading desktop file '%s': %s" msgid "Error loading UI file '%s': %s" msgstr "Fazi e-pad ma oa o kargañ restr ar c'hetal '%s' : %s" @@ -4142,7 +4166,7 @@ msgid "PostScript save cannot handle images with alpha channels" msgstr "PostScript n'hall ket labourat war ar skeudennoù gant sanelloù alfa" #: ../plug-ins/common/file-ps.c:1730 -#: ../plug-ins/common/file-ps.c:1763 +#: ../plug-ins/common/file-ps.c:1765 #, c-format msgid "" "Error starting Ghostscript. Make sure that Ghostscript is installed and - if necessary - use the environment variable GS_PROG to tell GIMP about its location.\n" @@ -4151,16 +4175,16 @@ msgstr "" "Fazi e-pad loc'hadur Ghostscript. Bezit sur emañ Ghostscript staliet ha - mar bez ret - arverañ an argemmenn endro GS_PROG evit lavarout da GIMP a-zivout e lec'hiadur.\n" "(%s)" -#: ../plug-ins/common/file-ps.c:1930 +#: ../plug-ins/common/file-ps.c:1932 #: ../plug-ins/common/file-tiff-load.c:1000 #, c-format msgid "Page %d" msgstr "Pajenn %d" -#: ../plug-ins/common/file-ps.c:2599 -#: ../plug-ins/common/file-ps.c:2731 -#: ../plug-ins/common/file-ps.c:2881 -#: ../plug-ins/common/file-ps.c:3006 +#: ../plug-ins/common/file-ps.c:2601 +#: ../plug-ins/common/file-ps.c:2733 +#: ../plug-ins/common/file-ps.c:2883 +#: ../plug-ins/common/file-ps.c:3008 #: ../plug-ins/common/file-sunras.c:1503 #: ../plug-ins/common/file-sunras.c:1611 #: ../plug-ins/file-fits/fits.c:849 @@ -4168,57 +4192,57 @@ msgstr "Pajenn %d" msgid "Write error occurred" msgstr "Degouezhet ez eus bet ur fazi skrivañ" -#: ../plug-ins/common/file-ps.c:3090 +#: ../plug-ins/common/file-ps.c:3092 msgid "Import from PostScript" msgstr "Enporzhiañ diouzh PostScript" #. Rendering -#: ../plug-ins/common/file-ps.c:3133 +#: ../plug-ins/common/file-ps.c:3135 msgid "Rendering" msgstr "Deouez war erounit" #. Resolution -#: ../plug-ins/common/file-ps.c:3149 +#: ../plug-ins/common/file-ps.c:3151 #: ../plug-ins/common/file-svg.c:928 #: ../plug-ins/common/file-wmf.c:691 msgid "Resolution:" msgstr "Diarunusted :" -#: ../plug-ins/common/file-ps.c:3188 +#: ../plug-ins/common/file-ps.c:3190 msgid "Pages:" msgstr "Pajennoù :" -#: ../plug-ins/common/file-ps.c:3195 +#: ../plug-ins/common/file-ps.c:3197 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)" msgstr "Pajennadoù da gargañ (sk. : 1-4 pe 1,3,5-7)" -#: ../plug-ins/common/file-ps.c:3199 +#: ../plug-ins/common/file-ps.c:3201 #: ../plug-ins/common/sphere-designer.c:2643 msgid "Layers" msgstr "Treuzfollennoù" -#: ../plug-ins/common/file-ps.c:3201 +#: ../plug-ins/common/file-ps.c:3203 msgid "Images" msgstr "Skeudennoù" -#: ../plug-ins/common/file-ps.c:3204 +#: ../plug-ins/common/file-ps.c:3206 msgid "Open as" msgstr "Digeriñ evel" -#: ../plug-ins/common/file-ps.c:3208 +#: ../plug-ins/common/file-ps.c:3210 msgid "Try Bounding Box" msgstr "Teurel arnod gant BoundingBox" #. Colouring -#: ../plug-ins/common/file-ps.c:3221 +#: ../plug-ins/common/file-ps.c:3223 msgid "Coloring" msgstr "O tianlivañ" -#: ../plug-ins/common/file-ps.c:3225 +#: ../plug-ins/common/file-ps.c:3227 msgid "B/W" msgstr "G/D" -#: ../plug-ins/common/file-ps.c:3227 +#: ../plug-ins/common/file-ps.c:3229 #: ../plug-ins/common/file-xpm.c:478 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 @@ -4226,83 +4250,83 @@ msgstr "G/D" msgid "Color" msgstr "Liv" -#: ../plug-ins/common/file-ps.c:3228 +#: ../plug-ins/common/file-ps.c:3230 #: ../plug-ins/file-fits/fits.c:1032 msgid "Automatic" msgstr "Emgefreek" -#: ../plug-ins/common/file-ps.c:3238 +#: ../plug-ins/common/file-ps.c:3240 msgid "Text antialiasing" msgstr "Lufradur an destenn" -#: ../plug-ins/common/file-ps.c:3243 -#: ../plug-ins/common/file-ps.c:3255 +#: ../plug-ins/common/file-ps.c:3245 +#: ../plug-ins/common/file-ps.c:3257 msgid "Weak" msgstr "Gwan" -#: ../plug-ins/common/file-ps.c:3244 -#: ../plug-ins/common/file-ps.c:3256 +#: ../plug-ins/common/file-ps.c:3246 +#: ../plug-ins/common/file-ps.c:3258 msgid "Strong" msgstr "Kreñv" -#: ../plug-ins/common/file-ps.c:3250 +#: ../plug-ins/common/file-ps.c:3252 msgid "Graphic antialiasing" msgstr "Lufradur ar c'hevregad" -#: ../plug-ins/common/file-ps.c:3328 +#: ../plug-ins/common/file-ps.c:3330 msgid "PostScript" msgstr "PostScript" #. Image Size -#: ../plug-ins/common/file-ps.c:3345 +#: ../plug-ins/common/file-ps.c:3347 msgid "Image Size" msgstr "Ment ar skeudenn" -#: ../plug-ins/common/file-ps.c:3394 +#: ../plug-ins/common/file-ps.c:3396 msgid "_Keep aspect ratio" msgstr "Mirout _ar c'henfeurioù" -#: ../plug-ins/common/file-ps.c:3400 +#: ../plug-ins/common/file-ps.c:3402 msgid "When toggled, the resulting image will be scaled to fit into the given size without changing the aspect ratio." msgstr "Mar gweredekaet e vo skeulaet ar skeudenn o tisoc'hañ diouti a-benn ma kloto gant ar vent lavaret hep kemm kenfeurioù he neuz." #. Unit -#: ../plug-ins/common/file-ps.c:3410 +#: ../plug-ins/common/file-ps.c:3412 msgid "Unit" msgstr "Unanenn" -#: ../plug-ins/common/file-ps.c:3414 +#: ../plug-ins/common/file-ps.c:3416 msgid "_Inch" msgstr "_Meutad" -#: ../plug-ins/common/file-ps.c:3415 +#: ../plug-ins/common/file-ps.c:3417 msgid "_Millimeter" msgstr "_Milimetr" #. Rotation -#: ../plug-ins/common/file-ps.c:3426 +#: ../plug-ins/common/file-ps.c:3428 #: ../plug-ins/map-object/map-object-ui.c:1035 msgid "Rotation" msgstr "C'hwelañ" #. Format -#: ../plug-ins/common/file-ps.c:3441 +#: ../plug-ins/common/file-ps.c:3443 msgid "Output" msgstr "Ec'hankad" -#: ../plug-ins/common/file-ps.c:3447 +#: ../plug-ins/common/file-ps.c:3449 msgid "_PostScript level 2" msgstr "_PostScript live 2" -#: ../plug-ins/common/file-ps.c:3456 +#: ../plug-ins/common/file-ps.c:3458 msgid "_Encapsulated PostScript" msgstr "PostScript _bloc'hennet" -#: ../plug-ins/common/file-ps.c:3465 +#: ../plug-ins/common/file-ps.c:3467 msgid "P_review" msgstr "_Alberz" -#: ../plug-ins/common/file-ps.c:3486 +#: ../plug-ins/common/file-ps.c:3488 msgid "Preview _size:" msgstr "_Ment an alberz :" @@ -4624,24 +4648,24 @@ msgstr "N'haller ket lenn an askouezhadenn diouzh '%s'" msgid "Cannot read header from '%s'" msgstr "N'haller ket lenn an talbenn diouzh '%s'" -#: ../plug-ins/common/file-tga.c:1367 +#: ../plug-ins/common/file-tga.c:1369 msgid "TGA" msgstr "TGA" #. rle -#: ../plug-ins/common/file-tga.c:1376 +#: ../plug-ins/common/file-tga.c:1378 msgid "_RLE compression" msgstr "Koazhañ _RLE" -#: ../plug-ins/common/file-tga.c:1390 +#: ../plug-ins/common/file-tga.c:1392 msgid "Or_igin:" msgstr "Or_in :" -#: ../plug-ins/common/file-tga.c:1394 +#: ../plug-ins/common/file-tga.c:1396 msgid "Bottom left" msgstr "En traoñ a-gleiz" -#: ../plug-ins/common/file-tga.c:1395 +#: ../plug-ins/common/file-tga.c:1397 msgid "Top left" msgstr "E-krec'h a-gleiz" @@ -4823,6 +4847,7 @@ msgid "_Write hot spot values" msgstr "Skrivañ gwerzh ar pikennoù tomm" #: ../plug-ins/common/file-xbm.c:1262 +#: ../plug-ins/common/file-xmc.c:1094 msgid "Hot spot _X:" msgstr "Pikenn domm _X :" @@ -4851,8 +4876,11 @@ msgstr "Biz al logodenn X11" #: ../plug-ins/common/file-xmc.c:480 #, c-format +#| msgid "" +#| "Cannot set the hotspot!\n" +#| "You must arrange layers so that all of them have an intersection." msgid "" -"Cannot set the hotspot!\n" +"Cannot set the hot spot!\n" "You must arrange layers so that all of them have an intersection." msgstr "" "N'hall ket arventenniñ ar pik tomm !\n" @@ -4901,16 +4929,14 @@ msgid "XMC Options" msgstr "Dibarzhioù XMC" #: ../plug-ins/common/file-xmc.c:1090 -msgid "Enter the X coordinate of the hotspot.The origin is top left corner." -msgstr "Enankañ daveenn X ar bikenn domm. E korn kleiz e lein emañ an orin." - -#: ../plug-ins/common/file-xmc.c:1094 -msgid "Hotspot _X:" -msgstr "Pikenn domm _X :" +#| msgid "Enter the X coordinate of the hotspot.The origin is top left corner." +msgid "Enter the X coordinate of the hot spot.The origin is top left corner." +msgstr "Enankañ daveenn X ar pik tomm. E korn kleiz e lein emañ an orin." #: ../plug-ins/common/file-xmc.c:1108 -msgid "Enter the Y coordinate of the hotspot.The origin is top left corner." -msgstr "Enankañ daveenn Y ar bikenn domm. E korn kleiz e lein emañ an orin." +#| msgid "Enter the Y coordinate of the hotspot.The origin is top left corner." +msgid "Enter the Y coordinate of the hot spot.The origin is top left corner." +msgstr "Enankañ daveenn Y ar pik tomm. E korn kleiz e lein emañ an orin." #: ../plug-ins/common/file-xmc.c:1119 msgid "_Auto-Crop all frames." @@ -5011,13 +5037,15 @@ msgstr "Gant an enlugellad e vez dornataet mentrezh skeudennoù mod RGGA hepken #: ../plug-ins/common/file-xmc.c:1512 #, c-format -msgid "Width of '%s' is too large. Please reduce more than %dpx)" -msgstr "Re vras eo led '%s'. Mar plij, bihanait muioc'h eget %dpx)" +#| msgid "Width of '%s' is too large. Please reduce more than %dpx)" +msgid "Width of '%s' is too large. Please reduce more than %dpx." +msgstr "Re vras eo led '%s'. Mar plij, bihanait muioc'h eget %dpx." #: ../plug-ins/common/file-xmc.c:1519 #, c-format -msgid "Height of '%s' is too large. Please reduce more than %dpx)" -msgstr "Re vras eo sav '%s'. Mar plij, bihanait muioc'h eget %dpx)" +#| msgid "Height of '%s' is too large. Please reduce more than %dpx)" +msgid "Height of '%s' is too large. Please reduce more than %dpx." +msgstr "Re vras eo sav '%s'. Mar plij, bihanait muioc'h eget %dpx." #: ../plug-ins/common/file-xmc.c:1526 #, c-format @@ -5026,12 +5054,16 @@ msgstr "Ment '%s' a dalv da vann !" #: ../plug-ins/common/file-xmc.c:1566 #, c-format +#| msgid "" +#| "Cannot save the cursor because the hotspot is not on '%s'.\n" +#| "Try to change the hotspot position, layer geometry or save without auto-" +#| "crop." msgid "" -"Cannot save the cursor because the hotspot is not on '%s'.\n" -"Try to change the hotspot position, layer geometry or save without auto-crop." +"Cannot save the cursor because the hot spot is not on '%s'.\n" +"Try to change the hot spot position, layer geometry or save without auto-crop." msgstr "" -"N'hall ket enrollañ ar biz rak ar bikenn domm n'emañ ket war '%s'.\n" -"Klaskit kem lec'hiadur ar bikenn domm, mentoniezh an dreuzfollenn pe enrollañ hep an emzidroc'hañ." +"N'hall ket enrollañ ar biz rak ar pik tomm n'emañ ket war '%s'.\n" +"Klaskit kemmañ lec'hiadur ar pik tomm, mentoniezh an dreuzfollenn pe enrollañ hep an emzidroc'hañ." #: ../plug-ins/common/file-xmc.c:1721 #, c-format @@ -6668,60 +6700,60 @@ msgstr "Skrammañ titouroù diwar-benn an enlugelladoù" msgid "_Plug-In Browser" msgstr "Merdeer enlugelladoù" -#: ../plug-ins/common/plugin-browser.c:371 +#: ../plug-ins/common/plugin-browser.c:376 msgid "Searching by name" msgstr "O klask dre an anv" -#: ../plug-ins/common/plugin-browser.c:385 +#: ../plug-ins/common/plugin-browser.c:390 #, c-format msgid "%d plug-in" msgid_plural "%d plug-ins" msgstr[0] "%d enlugellad" msgstr[1] "%d a enlugelladoù" -#: ../plug-ins/common/plugin-browser.c:394 +#: ../plug-ins/common/plugin-browser.c:399 msgid "No matches for your query" msgstr "Kenglotadenn ebet evit ho koulenn" -#: ../plug-ins/common/plugin-browser.c:397 +#: ../plug-ins/common/plugin-browser.c:402 #, c-format msgid "%d plug-in matches your query" msgid_plural "%d plug-ins match your query" msgstr[0] "%d enlugellad a glot gant ho koulenn" msgstr[1] "%d a enlugelladoù a glot gant ho koulenn" -#: ../plug-ins/common/plugin-browser.c:528 +#: ../plug-ins/common/plugin-browser.c:533 msgid "No matches" msgstr "Kenglotadenn ebet" -#: ../plug-ins/common/plugin-browser.c:554 +#: ../plug-ins/common/plugin-browser.c:559 msgid "Plug-In Browser" msgstr "Merdeer an enlugelladoù" -#: ../plug-ins/common/plugin-browser.c:597 +#: ../plug-ins/common/plugin-browser.c:602 msgid "Name" msgstr "Anv" -#: ../plug-ins/common/plugin-browser.c:605 -#: ../plug-ins/common/plugin-browser.c:668 +#: ../plug-ins/common/plugin-browser.c:610 +#: ../plug-ins/common/plugin-browser.c:673 msgid "Menu Path" msgstr "Treug el lañser" -#: ../plug-ins/common/plugin-browser.c:613 -#: ../plug-ins/common/plugin-browser.c:677 +#: ../plug-ins/common/plugin-browser.c:618 +#: ../plug-ins/common/plugin-browser.c:682 msgid "Image Types" msgstr "Rizhioù skeudennoù" -#: ../plug-ins/common/plugin-browser.c:623 -#: ../plug-ins/common/plugin-browser.c:686 +#: ../plug-ins/common/plugin-browser.c:628 +#: ../plug-ins/common/plugin-browser.c:691 msgid "Installation Date" msgstr "Deiziad ar staliañ" -#: ../plug-ins/common/plugin-browser.c:647 +#: ../plug-ins/common/plugin-browser.c:652 msgid "List View" msgstr "Gwel dre roll" -#: ../plug-ins/common/plugin-browser.c:709 +#: ../plug-ins/common/plugin-browser.c:714 msgid "Tree View" msgstr "Gwel dre wezennad" @@ -7543,7 +7575,7 @@ msgstr "Boestad emziviz Diuzañ ul liv" #. Scale #: ../plug-ins/common/sphere-designer.c:2748 #: ../plug-ins/gimpressionist/paper.c:193 -#: ../plug-ins/ifs-compose/ifs-compose.c:556 +#: ../plug-ins/ifs-compose/ifs-compose.c:553 msgid "Scale:" msgstr "Skeul :" @@ -7780,7 +7812,7 @@ msgstr "Marelloù bihan..." #. Area for buttons etc #. Flip #: ../plug-ins/common/tile-small.c:413 -#: ../plug-ins/ifs-compose/ifs-compose.c:612 +#: ../plug-ins/ifs-compose/ifs-compose.c:609 msgid "Flip" msgstr "Gwintañ" @@ -8240,7 +8272,7 @@ msgstr "Ment ar paz :" #: ../plug-ins/common/warp.c:433 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:769 -#: ../plug-ins/ifs-compose/ifs-compose.c:1214 +#: ../plug-ins/ifs-compose/ifs-compose.c:1211 msgid "Iterations:" msgstr "Arredoadurioù" @@ -8321,7 +8353,7 @@ msgstr "Meurez ar sturiadell :" #. Angle #: ../plug-ins/common/warp.c:683 -#: ../plug-ins/ifs-compose/ifs-compose.c:570 +#: ../plug-ins/ifs-compose/ifs-compose.c:567 msgid "Angle:" msgstr "Korn :" @@ -8434,8 +8466,9 @@ msgid "A sharing violation occurred." msgstr "Degouezhet ez eus bet ur forzhadur rannañ." #: ../plug-ins/common/web-browser.c:175 -msgid "Unknown Windows error." -msgstr "Fazi dianav gant Windows." +#| msgid "Unknown Windows error." +msgid "Unknown Microsoft Windows error." +msgstr "Fazi dianav gant Microsoft Windows." #: ../plug-ins/common/web-browser.c:178 #, c-format @@ -8593,28 +8626,28 @@ msgstr "N'haller ket enrollañ ur skeudenn ibiliet gant an treuzweluster e mentr msgid "Alpha channel will be ignored." msgstr "Laosket a-gostez e vo ar sanell Alfa." -#: ../plug-ins/file-bmp/bmp-write.c:792 +#: ../plug-ins/file-bmp/bmp-write.c:793 msgid "BMP" msgstr "BMP" -#: ../plug-ins/file-bmp/bmp-write.c:802 +#: ../plug-ins/file-bmp/bmp-write.c:803 msgid "_Run-Length Encoded" msgstr "_RunLength enboneget" -#: ../plug-ins/file-bmp/bmp-write.c:814 +#: ../plug-ins/file-bmp/bmp-write.c:815 #: ../plug-ins/file-jpeg/jpeg-save.c:892 msgid "_Advanced Options" msgstr "Dib_arzhioù kempleshoc'h" -#: ../plug-ins/file-bmp/bmp-write.c:829 +#: ../plug-ins/file-bmp/bmp-write.c:830 msgid "16 bits" msgstr "16 eizhbit" -#: ../plug-ins/file-bmp/bmp-write.c:865 +#: ../plug-ins/file-bmp/bmp-write.c:866 msgid "24 bits" msgstr "24 eizhbit" -#: ../plug-ins/file-bmp/bmp-write.c:882 +#: ../plug-ins/file-bmp/bmp-write.c:883 msgid "32 bits" msgstr "32 eizhbit" @@ -9213,17 +9246,17 @@ msgid "Smoothing:" msgstr "O kuñvaat :" #: ../plug-ins/file-xjt/xjt.c:1701 -#: ../plug-ins/file-xjt/xjt.c:3338 +#: ../plug-ins/file-xjt/xjt.c:3339 #, c-format msgid "Could not create working folder '%s': %s" msgstr "N'haller ket krouiñ an teuliad labour '%s' : %s" -#: ../plug-ins/file-xjt/xjt.c:3204 +#: ../plug-ins/file-xjt/xjt.c:3205 #, c-format msgid "Error: Could not read XJT property file '%s'." msgstr "Fazi : N'haller ket lenn restr ar perzhioù XJT '%s'." -#: ../plug-ins/file-xjt/xjt.c:3211 +#: ../plug-ins/file-xjt/xjt.c:3212 #, c-format msgid "Error: XJT property file '%s' is empty." msgstr "Fazi : goullo eo restr ar perzhioù XJT '%s'." @@ -9442,7 +9475,6 @@ msgstr "" "d'ho restr %s." #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:562 -#| msgid "_Fractal Explorer..." msgid "Fractal Explorer" msgstr "Ergerzher brevennoù" @@ -10561,7 +10593,7 @@ msgstr "Douester daveel tresadurioù ar broust" #. * gimp_filename_to_utf8 () and g_strerror () return temporary strings #. * that need not and should not be freed. So this call is OK. #. * -#: ../plug-ins/gimpressionist/ppmtool.c:649 +#: ../plug-ins/gimpressionist/ppmtool.c:651 #, c-format msgid "Failed to save PPM file '%s': %s" msgstr "C'hwitadenn war enrollañ ar restr PPM '%s' : %s" @@ -10618,8 +10650,9 @@ msgid "_Size" msgstr "_Ment" #: ../plug-ins/gimpressionist/size.c:108 -msgid "Sizes:" -msgstr "Mentoù :" +#| msgid "Sp_ike points:" +msgid "Size variants:" +msgstr "Adstumoù ar vent :" #: ../plug-ins/gimpressionist/size.c:112 msgid "The number of sizes of brushes to use" @@ -10642,8 +10675,8 @@ msgid "The largest brush to create" msgstr "Ar broust brasañ da grouiñ" #: ../plug-ins/gimpressionist/size.c:150 -msgid "Size:" -msgstr "Ment :" +msgid "Size depends on:" +msgstr "Ar vent zo e dalc'h eus :" #: ../plug-ins/gimpressionist/size.c:159 msgid "Let the value (brightness) of the region determine the size of the stroke" @@ -11118,16 +11151,16 @@ msgstr "" "Fazi dezrannañ e '%s' :\n" "%s" -#: ../plug-ins/ifs-compose/ifs-compose.c:336 +#: ../plug-ins/ifs-compose/ifs-compose.c:333 msgid "Create an Iterated Function System (IFS) fractal" msgstr "Krouiñ ur vrevenn dre ar reizhiad arc'hwelioù arredous (IFS)" -#: ../plug-ins/ifs-compose/ifs-compose.c:348 +#: ../plug-ins/ifs-compose/ifs-compose.c:345 msgid "_IFS Fractal..." msgstr "_Aozad brevennek..." #. X -#: ../plug-ins/ifs-compose/ifs-compose.c:528 +#: ../plug-ins/ifs-compose/ifs-compose.c:525 #: ../plug-ins/lighting/lighting-ui.c:526 #: ../plug-ins/map-object/map-object-ui.c:675 #: ../plug-ins/map-object/map-object-ui.c:729 @@ -11137,7 +11170,7 @@ msgid "X:" msgstr "X :" #. Y -#: ../plug-ins/ifs-compose/ifs-compose.c:542 +#: ../plug-ins/ifs-compose/ifs-compose.c:539 #: ../plug-ins/lighting/lighting-ui.c:540 #: ../plug-ins/map-object/map-object-ui.c:689 #: ../plug-ins/map-object/map-object-ui.c:742 @@ -11148,149 +11181,149 @@ msgid "Y:" msgstr "Y :" #. Asym -#: ../plug-ins/ifs-compose/ifs-compose.c:584 +#: ../plug-ins/ifs-compose/ifs-compose.c:581 msgid "Asymmetry:" msgstr "Ankemparzhder :" #. Shear -#: ../plug-ins/ifs-compose/ifs-compose.c:598 +#: ../plug-ins/ifs-compose/ifs-compose.c:595 msgid "Shear:" msgstr "Faoutañ :" #. Simple color control section -#: ../plug-ins/ifs-compose/ifs-compose.c:643 +#: ../plug-ins/ifs-compose/ifs-compose.c:640 msgid "Simple" msgstr "Eeun" -#: ../plug-ins/ifs-compose/ifs-compose.c:652 +#: ../plug-ins/ifs-compose/ifs-compose.c:649 msgid "IFS Fractal: Target" msgstr "Aozad brevennek : bukenn" -#: ../plug-ins/ifs-compose/ifs-compose.c:658 +#: ../plug-ins/ifs-compose/ifs-compose.c:655 msgid "Scale hue by:" msgstr "Skeulaat an arliv dre :" -#: ../plug-ins/ifs-compose/ifs-compose.c:673 +#: ../plug-ins/ifs-compose/ifs-compose.c:670 msgid "Scale value by:" msgstr "Skeulaat al lintr dre :" #. Full color control section -#: ../plug-ins/ifs-compose/ifs-compose.c:690 +#: ../plug-ins/ifs-compose/ifs-compose.c:687 msgid "Full" msgstr "Klok" -#: ../plug-ins/ifs-compose/ifs-compose.c:698 +#: ../plug-ins/ifs-compose/ifs-compose.c:695 msgid "IFS Fractal: Red" msgstr "Aozad brevennek : Ruz" -#: ../plug-ins/ifs-compose/ifs-compose.c:706 +#: ../plug-ins/ifs-compose/ifs-compose.c:703 msgid "IFS Fractal: Green" msgstr "Aozad brevennek : Gwer" -#: ../plug-ins/ifs-compose/ifs-compose.c:714 +#: ../plug-ins/ifs-compose/ifs-compose.c:711 msgid "IFS Fractal: Blue" msgstr "Aozad brevennek : Glas" -#: ../plug-ins/ifs-compose/ifs-compose.c:722 +#: ../plug-ins/ifs-compose/ifs-compose.c:719 msgid "IFS Fractal: Black" msgstr "Aozad brevennek : Du" -#: ../plug-ins/ifs-compose/ifs-compose.c:772 +#: ../plug-ins/ifs-compose/ifs-compose.c:769 msgid "IFS Fractal" msgstr "Aozad brevennek" -#: ../plug-ins/ifs-compose/ifs-compose.c:870 +#: ../plug-ins/ifs-compose/ifs-compose.c:867 msgid "Spatial Transformation" msgstr "Treuzfurmadur an egor" -#: ../plug-ins/ifs-compose/ifs-compose.c:876 +#: ../plug-ins/ifs-compose/ifs-compose.c:873 msgid "Color Transformation" msgstr "Treuzfurmadur al liv" -#: ../plug-ins/ifs-compose/ifs-compose.c:886 +#: ../plug-ins/ifs-compose/ifs-compose.c:883 msgid "Relative probability:" msgstr "Tebegezh daveel :" -#: ../plug-ins/ifs-compose/ifs-compose.c:1061 +#: ../plug-ins/ifs-compose/ifs-compose.c:1058 #: ../plug-ins/imagemap/imap_menu.c:162 msgid "Select _All" msgstr "Diuz_añ pep tra" -#: ../plug-ins/ifs-compose/ifs-compose.c:1065 +#: ../plug-ins/ifs-compose/ifs-compose.c:1062 msgid "Re_center" msgstr "Ad_kreizañ" -#: ../plug-ins/ifs-compose/ifs-compose.c:1065 +#: ../plug-ins/ifs-compose/ifs-compose.c:1062 msgid "Recompute Center" msgstr "Adriñvañ ar c'hreiz" -#: ../plug-ins/ifs-compose/ifs-compose.c:1069 +#: ../plug-ins/ifs-compose/ifs-compose.c:1066 msgid "Render Options" msgstr "Dibarzhioù an deouez" -#: ../plug-ins/ifs-compose/ifs-compose.c:1075 +#: ../plug-ins/ifs-compose/ifs-compose.c:1072 #: ../plug-ins/imagemap/imap_cmd_move.c:85 #: ../plug-ins/imagemap/imap_cmd_object_move.c:56 msgid "Move" msgstr "Dilec'hiañ" -#: ../plug-ins/ifs-compose/ifs-compose.c:1078 +#: ../plug-ins/ifs-compose/ifs-compose.c:1075 msgid "Rotate" msgstr "C'hwelañ" -#: ../plug-ins/ifs-compose/ifs-compose.c:1078 +#: ../plug-ins/ifs-compose/ifs-compose.c:1075 msgid "Rotate / Scale" msgstr "C'hwelañ / skeulaat" -#: ../plug-ins/ifs-compose/ifs-compose.c:1081 +#: ../plug-ins/ifs-compose/ifs-compose.c:1078 msgid "Stretch" msgstr "Ledanaat" -#: ../plug-ins/ifs-compose/ifs-compose.c:1179 +#: ../plug-ins/ifs-compose/ifs-compose.c:1176 msgid "IFS Fractal Render Options" msgstr "Dibarzhioù deouez ar vrevenn" -#: ../plug-ins/ifs-compose/ifs-compose.c:1201 +#: ../plug-ins/ifs-compose/ifs-compose.c:1198 msgid "Max. memory:" msgstr "Memor uc'hek :" -#: ../plug-ins/ifs-compose/ifs-compose.c:1228 +#: ../plug-ins/ifs-compose/ifs-compose.c:1225 msgid "Subdivide:" msgstr "Isrannañ :" -#: ../plug-ins/ifs-compose/ifs-compose.c:1241 +#: ../plug-ins/ifs-compose/ifs-compose.c:1238 msgid "Spot radius:" msgstr "Skin ar bikenn" -#: ../plug-ins/ifs-compose/ifs-compose.c:1306 +#: ../plug-ins/ifs-compose/ifs-compose.c:1303 #, c-format msgid "Rendering IFS (%d/%d)" msgstr "O lakaat deouez IFS (%d/%d)" -#: ../plug-ins/ifs-compose/ifs-compose.c:1472 +#: ../plug-ins/ifs-compose/ifs-compose.c:1469 #, c-format msgid "Transformation %s" msgstr "Treuzfurmadur %s" -#: ../plug-ins/ifs-compose/ifs-compose.c:2403 +#: ../plug-ins/ifs-compose/ifs-compose.c:2400 msgid "Save failed" msgstr "C'hwitadenn war an enrollañ" -#: ../plug-ins/ifs-compose/ifs-compose.c:2486 -#: ../plug-ins/ifs-compose/ifs-compose.c:2499 +#: ../plug-ins/ifs-compose/ifs-compose.c:2483 +#: ../plug-ins/ifs-compose/ifs-compose.c:2496 msgid "Open failed" msgstr "C'hwitadenn war an digeriñ" -#: ../plug-ins/ifs-compose/ifs-compose.c:2494 +#: ../plug-ins/ifs-compose/ifs-compose.c:2491 #, c-format msgid "File '%s' doesn't seem to be an IFS Fractal file." msgstr "Ar restr '%s' n'hañval ket bezañ restr un aozad vrevennek." -#: ../plug-ins/ifs-compose/ifs-compose.c:2534 +#: ../plug-ins/ifs-compose/ifs-compose.c:2531 msgid "Save as IFS Fractal file" msgstr "Enrollañ evel restr vrevennek IFS" -#: ../plug-ins/ifs-compose/ifs-compose.c:2571 +#: ../plug-ins/ifs-compose/ifs-compose.c:2568 msgid "Open IFS Fractal file" msgstr "Digeriñ restr vrevennek IFS" @@ -12897,6 +12930,12 @@ msgstr "Pakañ skrammad..." msgid "No data captured" msgstr "Roadenn ebet bet paket" +#~ msgid "Hotspot _X:" +#~ msgstr "Pikenn domm _X :" +#~ msgid "Sizes:" +#~ msgstr "Mentoù :" +#~ msgid "Size:" +#~ msgstr "Ment :" #~ msgid "GIF Options" #~ msgstr "Dibarzhioù GIF" #~ msgid "I_nterlace" diff --git a/po-python/LINGUAS b/po-python/LINGUAS index 9a79ba3c19..5f2f69ad3a 100644 --- a/po-python/LINGUAS +++ b/po-python/LINGUAS @@ -4,6 +4,7 @@ ar az be bg +br ca ca@valencia cs diff --git a/po-python/br.po b/po-python/br.po new file mode 100644 index 0000000000..546fc45c8f --- /dev/null +++ b/po-python/br.po @@ -0,0 +1,337 @@ +# Breton translation for Gimp Python +# Copyright (c) 2010 The Gnome Project +# This file is distributed under the same license as the Gimp Python package. +# Alan Monfort , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Gimp Python\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n" +"POT-Creation-Date: 2010-08-25 11:03+0000\n" +"PO-Revision-Date: 2010-08-27 12:14+0100\n" +"Last-Translator: Denis \n" +"Language-Team: Drouizig \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Breton\n" +"X-Poedit-Country: FRANCE\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../plug-ins/pygimp/gimpfu.py:394 +msgid "Missing exception information" +msgstr "Stlennoù an nemedenn o vankout" + +#: ../plug-ins/pygimp/gimpfu.py:403 +#, python-format +msgid "An error occurred running %s" +msgstr "Degouezhet ez eus bet ur fazi e-pad ma oa oc'h erounit %s" + +#: ../plug-ins/pygimp/gimpfu.py:414 +msgid "_More Information" +msgstr "_Muioc'h a stlennoù" + +#: ../plug-ins/pygimp/gimpfu.py:526 +#: ../plug-ins/pygimp/gimpfu.py:538 +#: ../plug-ins/pygimp/gimpfu.py:544 +msgid "No" +msgstr "Ket" + +#: ../plug-ins/pygimp/gimpfu.py:536 +#: ../plug-ins/pygimp/gimpfu.py:544 +msgid "Yes" +msgstr "Ya" + +#: ../plug-ins/pygimp/gimpfu.py:596 +#: ../plug-ins/pygimp/gimpui.py:223 +msgid "Python-Fu File Selection" +msgstr "Diuzad restr Python-Fu" + +#: ../plug-ins/pygimp/gimpfu.py:607 +msgid "Python-Fu Folder Selection" +msgstr "Diuzad teuliad Python-Fu" + +#: ../plug-ins/pygimp/gimpfu.py:696 +#, python-format +msgid "Invalid input for '%s'" +msgstr "Enankad didalvoudek evit '%s'" + +#: ../plug-ins/pygimp/gimpui.py:176 +msgid "Python-Fu Color Selection" +msgstr "Diuzad liv Python-Fu" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:106 +msgid "Saving as colored XHTML" +msgstr "Oc'h enrollañ evel XHTML livet" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:183 +msgid "Save as colored XHTML" +msgstr "Enrollañ evel XHTML livet" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:188 +msgid "Colored XHTML" +msgstr "XHTML livet" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:195 +msgid "Character _source" +msgstr "_Tarzh an arouezennoù" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:196 +msgid "Source code" +msgstr "Tarzh ar voneg" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:197 +msgid "Text file" +msgstr "Restr testenn" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:198 +msgid "Entry box" +msgstr "Boestad enankañ" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:199 +msgid "_File to read or characters to use" +msgstr "_Restr da lenn pe arouezenn da arverañ" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:201 +msgid "Fo_nt size in pixels" +msgstr "Ment an _nodrezh e pikselioù" + +#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:202 +msgid "_Write a separate CSS file" +msgstr "Skrivañ ur restr CSS disrannet" + +#: ../plug-ins/pygimp/plug-ins/foggify.py:56 +msgid "Add a layer of fog" +msgstr "Ouzhpennañ un dreuzfollennad latar" + +#: ../plug-ins/pygimp/plug-ins/foggify.py:61 +msgid "_Fog..." +msgstr "_Latar..." + +#: ../plug-ins/pygimp/plug-ins/foggify.py:66 +msgid "_Layer name" +msgstr "Anv an _dreuzfollenn" + +#: ../plug-ins/pygimp/plug-ins/foggify.py:66 +msgid "Clouds" +msgstr "Koumoul" + +#: ../plug-ins/pygimp/plug-ins/foggify.py:67 +msgid "_Fog color" +msgstr "_Liv al latar" + +#: ../plug-ins/pygimp/plug-ins/foggify.py:68 +msgid "_Turbulence" +msgstr "S_trafuilh" + +#: ../plug-ins/pygimp/plug-ins/foggify.py:69 +msgid "Op_acity" +msgstr "_Demerez" + +#: ../plug-ins/pygimp/plug-ins/palette-offset.py:44 +msgid "Offset the colors in a palette" +msgstr "Linkañ al livioù wwar ul livaoueg" + +#: ../plug-ins/pygimp/plug-ins/palette-offset.py:49 +msgid "_Offset Palette..." +msgstr "Linkañ al liva_oueg..." + +#: ../plug-ins/pygimp/plug-ins/palette-offset.py:52 +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:56 +#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:56 +#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:78 +msgid "Palette" +msgstr "Livaoueg" + +#: ../plug-ins/pygimp/plug-ins/palette-offset.py:53 +msgid "Off_set" +msgstr "Lin_kañ" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:48 +msgid "Sort the colors in a palette" +msgstr "Rummañ al livioù war ul livaoueg" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:53 +msgid "_Sort Palette..." +msgstr "_Rummañ al livaoueg..." + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:57 +msgid "Color _model" +msgstr "Skouer li_v" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:58 +msgid "RGB" +msgstr "RGG" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:59 +msgid "HSV" +msgstr "APL" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:60 +msgid "Channel to _sort" +msgstr "_Sanell da rummañ" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:61 +msgid "Red or Hue" +msgstr "Rue pe arliv" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:62 +msgid "Green or Saturation" +msgstr "Gwer pe peurvec'hiañ" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:63 +msgid "Blue or Value" +msgstr "Glas pe lintr" + +#: ../plug-ins/pygimp/plug-ins/palette-sort.py:64 +msgid "_Ascending" +msgstr "W_ar gresk" + +#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:49 +msgid "Create a repeating gradient using colors from the palette" +msgstr "Krouiñ un ilrezenn arrenek oc'h arverañ al livioù diwar al livaoueg" + +#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:54 +msgid "Palette to _Repeating Gradient" +msgstr "Livaoueg war an ilrezenn ar_rennek" + +#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:71 +msgid "Create a gradient using colors from the palette" +msgstr "Krouiñ un ilrezenn oc'h arverañ al livioù diwar al livaoueg" + +#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:76 +msgid "Palette to _Gradient" +msgstr "Livaoueg d'an _ilrezenn" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:56 +msgid "Slice" +msgstr "Darn" + +#. table snippet means a small piece of HTML code here +#: ../plug-ins/pygimp/plug-ins/py-slice.py:417 +msgid "Cuts an image along its guides, creates images and a HTML table snippet" +msgstr "Troc'hañ ur skeudenn a-hed he dealfoù, krouiñ a ra skeudennoù ha brizhenn un daolenn HTML " + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:428 +msgid "_Slice..." +msgstr "_Darnañ..." + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:433 +msgid "Path for HTML export" +msgstr "TReug evit an ezporzhiañ HTML" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:434 +msgid "Filename for export" +msgstr "Anv restr evit an ezporzhiañ" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:435 +msgid "Image name prefix" +msgstr "Rakger anv ar skeudenn" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:436 +msgid "Image format" +msgstr "Mentrezh ar skeudenn" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:437 +msgid "Separate image folder" +msgstr "Dispartiañ an teuliad skeudennoù" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:439 +msgid "Folder for image export" +msgstr "Teuliad evit ezporzhiañ ar skeudenn" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:440 +msgid "Space between table elements" +msgstr "Egor etre elfennoù an daolenn" + +#: ../plug-ins/pygimp/plug-ins/py-slice.py:442 +msgid "Javascript for onmouseover and clicked" +msgstr "Javascript evit onmouseover ha kliket" + +#. table caps are table cells on the edge of the table +#: ../plug-ins/pygimp/plug-ins/py-slice.py:445 +msgid "Skip animation for table caps" +msgstr "Dilemel ar bliverezh evit pennlizherennoù an daolenn" + +#: ../plug-ins/pygimp/plug-ins/python-console.py:56 +msgid "Python Console" +msgstr "Penel Python" + +#: ../plug-ins/pygimp/plug-ins/python-console.py:60 +msgid "_Browse..." +msgstr "_Kantreal..." + +#: ../plug-ins/pygimp/plug-ins/python-console.py:138 +msgid "Python Procedure Browser" +msgstr "Kantreer argerzhadur Python" + +#: ../plug-ins/pygimp/plug-ins/python-console.py:167 +#, python-format +msgid "Could not open '%s' for writing: %s" +msgstr "N'haller ket digeriñ '%s' evit skrivañ : %s" + +#: ../plug-ins/pygimp/plug-ins/python-console.py:182 +#, python-format +msgid "Could not write to '%s': %s" +msgstr "N'haller ket skrivañ war '%s' : %s" + +#: ../plug-ins/pygimp/plug-ins/python-console.py:190 +msgid "Save Python-Fu Console Output" +msgstr "Enrollañ ec'hankad penel Python-Fu" + +#: ../plug-ins/pygimp/plug-ins/python-console.py:216 +msgid "Interactive GIMP Python interpreter" +msgstr "Jubenner etrewezhiat Python evit GIMP" + +#: ../plug-ins/pygimp/plug-ins/python-console.py:221 +msgid "_Console" +msgstr "_Penel" + +#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:60 +msgid "Add a drop shadow to a layer, and optionally bevel it" +msgstr "Ouzhpennañ un disheol o kouezhañ dindan an dreuzfollenn, ha dre zibarzh lakaat beskell warni" + +#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:65 +msgid "_Drop Shadow and Bevel..." +msgstr "_Disheol o kouezhañ ha beskell..." + +#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:70 +msgid "_Shadow blur" +msgstr "_Ruzed an disheol" + +#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:71 +msgid "_Bevel" +msgstr "_Beskell" + +#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:72 +msgid "_Drop shadow" +msgstr "_Disheol o kouezhañ" + +#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:73 +msgid "Drop shadow _X displacement" +msgstr "Dilec'hiadur _X an disheol o kouezhañ" + +#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:74 +msgid "Drop shadow _Y displacement" +msgstr "Dilec'hiadur _Y an disheol o kouezhañ" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:75 +msgid "Create a new brush with characters from a text sequence" +msgstr "Krouiñ ur broust nevez gant arouezennoù un destenn" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:81 +msgid "New Brush from _Text..." +msgstr "Broust nevez diouzh an des_tenn..." + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:84 +msgid "Font" +msgstr "Nodrezh" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:85 +msgid "Pixel Size" +msgstr "Ment ar piksel" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:86 +msgid "Text" +msgstr "Testenn" + diff --git a/po-script-fu/br.po b/po-script-fu/br.po index 0f5beda1dd..7a82947a16 100644 --- a/po-script-fu/br.po +++ b/po-script-fu/br.po @@ -1,64 +1,71 @@ -# Breton translation for gimp -# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 +# French translation of gimp-script-fu. +# Copyright (C) 2000-2006 Free Software Foundation, Inc. # This file is distributed under the same license as the gimp package. -# Alan Monfort , 2007. +# +# David Monniaux , 2000. +# Christophe Merlet (RedFox) , 2000-2006. +# maintainer: Raymond Ostertag , 2002-2006. +# Jean-Louis Berliet , 2004. +# # msgid "" msgstr "" -"Project-Id-Version: gimp\n" -"Report-Msgid-Bugs-To: An Drouizig \n" -"POT-Creation-Date: 2009-03-10 06:21+0000\n" -"PO-Revision-Date: 2009-07-28 04:47+0100\n" +"Project-Id-Version: gimp-script-fu 2.4\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n" +"POT-Creation-Date: 2010-08-25 11:03+0000\n" +"PO-Revision-Date: 2010-08-25 20:09+0100\n" "Last-Translator: Alan Monfort \n" -"Language-Team: An Drouizig \n" +"Language-Team: Alan Monfort \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: breton\n" +"X-Poedit-Country: france\n" -#: ../plug-ins/script-fu/script-fu-console.c:131 -#: ../plug-ins/script-fu/script-fu-console.c:198 +#: ../plug-ins/script-fu/script-fu-console.c:130 +#: ../plug-ins/script-fu/script-fu-console.c:197 msgid "Script-Fu Console" -msgstr "Penel Skript-Fu" +msgstr "Penel Script-Fu" -#: ../plug-ins/script-fu/script-fu-console.c:194 +#: ../plug-ins/script-fu/script-fu-console.c:193 msgid "Welcome to TinyScheme" msgstr "Degemer mat e TinyScheme" -#: ../plug-ins/script-fu/script-fu-console.c:200 +#: ../plug-ins/script-fu/script-fu-console.c:199 msgid "Interactive Scheme Development" msgstr "Steuñv diorrenn etrewezhiat" -#: ../plug-ins/script-fu/script-fu-console.c:236 +#: ../plug-ins/script-fu/script-fu-console.c:235 msgid "_Browse..." -msgstr "_Furchal..." +msgstr "_Kantreal..." -#: ../plug-ins/script-fu/script-fu-console.c:294 +#: ../plug-ins/script-fu/script-fu-console.c:293 msgid "Save Script-Fu Console Output" msgstr "Enrollañ ec'hankad penel Skript-Fu" -#: ../plug-ins/script-fu/script-fu-console.c:341 +#: ../plug-ins/script-fu/script-fu-console.c:340 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "N'haller ket digeriñ '%s' evit skrivañ : %s" -#: ../plug-ins/script-fu/script-fu-console.c:370 +#: ../plug-ins/script-fu/script-fu-console.c:369 msgid "Script-Fu Procedure Browser" msgstr "Merdeer an treugennadoù Skript-Fu" -#: ../plug-ins/script-fu/script-fu-eval.c:63 +#: ../plug-ins/script-fu/script-fu-eval.c:60 msgid "Script-Fu evaluation mode only allows non-interactive invocation" msgstr "Aotreet e vez galvadennoù anetrewezhiat hepken gant mod priziañ Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:196 +#: ../plug-ins/script-fu/script-fu-interface.c:195 msgid "Script-Fu cannot process two scripts at the same time." msgstr "Skript-Fu n'eo ket gouest da erounit daou skript war un dro." -#: ../plug-ins/script-fu/script-fu-interface.c:198 +#: ../plug-ins/script-fu/script-fu-interface.c:197 #, c-format msgid "You are already running the \"%s\" script." msgstr "Emaoc'h oc'h erounit ar skript \"%s\" ." -#: ../plug-ins/script-fu/script-fu-interface.c:224 +#: ../plug-ins/script-fu/script-fu-interface.c:223 #, c-format msgid "Script-Fu: %s" msgstr "Skript-Fu : %s" @@ -66,148 +73,148 @@ msgstr "Skript-Fu : %s" #. we add a colon after the label; #. * some languages want an extra space here #. -#: ../plug-ins/script-fu/script-fu-interface.c:288 +#: ../plug-ins/script-fu/script-fu-interface.c:287 #, c-format msgid "%s:" msgstr "%s :" -#: ../plug-ins/script-fu/script-fu-interface.c:336 +#: ../plug-ins/script-fu/script-fu-interface.c:335 msgid "Script-Fu Color Selection" msgstr "Diuzad al liv evit Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:445 +#: ../plug-ins/script-fu/script-fu-interface.c:444 msgid "Script-Fu File Selection" msgstr "Diuzad ar restr evit Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:448 +#: ../plug-ins/script-fu/script-fu-interface.c:447 msgid "Script-Fu Folder Selection" msgstr "Diuzad an teuliad evit Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:461 +#: ../plug-ins/script-fu/script-fu-interface.c:460 msgid "Script-Fu Font Selection" msgstr "Diuzad an nodrezh evit Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:469 +#: ../plug-ins/script-fu/script-fu-interface.c:468 msgid "Script-Fu Palette Selection" msgstr "Diuzad al livaoueg evit Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:478 +#: ../plug-ins/script-fu/script-fu-interface.c:477 msgid "Script-Fu Pattern Selection" msgstr "Diuzad ar goustur evit Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:487 +#: ../plug-ins/script-fu/script-fu-interface.c:486 msgid "Script-Fu Gradient Selection" msgstr "Diuzad an ilrezenn evit Skript-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:496 +#: ../plug-ins/script-fu/script-fu-interface.c:495 msgid "Script-Fu Brush Selection" -msgstr "Diuzad ar broust evit Skript-Fu" +msgstr "Diuzad ar broust evit Skript-Fu " -#: ../plug-ins/script-fu/script-fu-interface.c:824 +#: ../plug-ins/script-fu/script-fu-interface.c:826 #, c-format msgid "Error while executing %s:" msgstr "Fazi e-pad ma oa oc'h erounit %s :" -#: ../plug-ins/script-fu/script-fu-scripts.c:150 +#: ../plug-ins/script-fu/script-fu-scripts.c:149 msgid "Too few arguments to 'script-fu-register' call" -msgstr "Re nebeut a arguzennoù evit galvadenn 'script-fu-register'" +msgstr "N'eus ket arguzennoù a-walc'h evit galv 'script-fu-register'" -#: ../plug-ins/script-fu/script-fu-scripts.c:609 +#: ../plug-ins/script-fu/script-fu-scripts.c:608 #, c-format msgid "Error while loading %s:" msgstr "Fazi e-pad ma oa o kargañ %s :" -#: ../plug-ins/script-fu/script-fu-server.c:713 +#: ../plug-ins/script-fu/script-fu-server.c:804 msgid "Script-Fu Server Options" -msgstr "Dibarzhioù an dafariad Skript-Fu" +msgstr "Dibarzhioù an dafariad Skript-Fu " -#: ../plug-ins/script-fu/script-fu-server.c:718 +#: ../plug-ins/script-fu/script-fu-server.c:809 msgid "_Start Server" msgstr "_Loc'hañ an dafariad" -#: ../plug-ins/script-fu/script-fu-server.c:746 +#: ../plug-ins/script-fu/script-fu-server.c:837 msgid "Server port:" msgstr "Porzh an dafariad :" -#: ../plug-ins/script-fu/script-fu-server.c:752 +#: ../plug-ins/script-fu/script-fu-server.c:843 msgid "Server logfile:" -msgstr "Kerzhlevr an dafariad :" +msgstr "Restr kerzhlevr an dafariad :" -#: ../plug-ins/script-fu/script-fu.c:111 +#: ../plug-ins/script-fu/script-fu.c:110 msgid "Interactive console for Script-Fu development" msgstr "Penel etrewezhiat evit diorren Skript-Fu" -#: ../plug-ins/script-fu/script-fu.c:117 +#: ../plug-ins/script-fu/script-fu.c:116 msgid "_Console" msgstr "_Penel" -#: ../plug-ins/script-fu/script-fu.c:141 +#: ../plug-ins/script-fu/script-fu.c:140 msgid "Server for remote Script-Fu operation" msgstr "Dafariad evit gwezhiadurioù Skript-Fu a-bell" -#: ../plug-ins/script-fu/script-fu.c:146 +#: ../plug-ins/script-fu/script-fu.c:145 msgid "_Start Server..." msgstr "_Loc'hañ an dafariad..." -#: ../plug-ins/script-fu/script-fu.c:302 +#: ../plug-ins/script-fu/script-fu.c:301 msgid "_GIMP Online" msgstr "_GIMP enlinenn" -#: ../plug-ins/script-fu/script-fu.c:303 +#: ../plug-ins/script-fu/script-fu.c:302 msgid "_User Manual" -msgstr "Dornlevr an arveriad" +msgstr "D_ornlevr an arveriad" -#: ../plug-ins/script-fu/script-fu.c:306 +#: ../plug-ins/script-fu/script-fu.c:305 msgid "_Script-Fu" -msgstr "_Script-Fu" +msgstr "_Skript-Fu" -#: ../plug-ins/script-fu/script-fu.c:308 +#: ../plug-ins/script-fu/script-fu.c:307 msgid "_Test" msgstr "_Taol arnod" -#: ../plug-ins/script-fu/script-fu.c:311 +#: ../plug-ins/script-fu/script-fu.c:310 msgid "_Buttons" msgstr "A_fell" -#: ../plug-ins/script-fu/script-fu.c:313 +#: ../plug-ins/script-fu/script-fu.c:312 msgid "_Logos" -msgstr "Sie_lloù" +msgstr "_Sielloù" -#: ../plug-ins/script-fu/script-fu.c:315 +#: ../plug-ins/script-fu/script-fu.c:314 msgid "_Patterns" msgstr "_Gousturioù" -#: ../plug-ins/script-fu/script-fu.c:318 +#: ../plug-ins/script-fu/script-fu.c:317 msgid "_Web Page Themes" -msgstr "Neuzioù ar bajennad _web" +msgstr "Neuzioù pajennad _web" -#: ../plug-ins/script-fu/script-fu.c:320 +#: ../plug-ins/script-fu/script-fu.c:319 msgid "_Alien Glow" msgstr "S_kleur Alien" -#: ../plug-ins/script-fu/script-fu.c:322 +#: ../plug-ins/script-fu/script-fu.c:321 msgid "_Beveled Pattern" msgstr "Goustur _beskellet" -#: ../plug-ins/script-fu/script-fu.c:324 +#: ../plug-ins/script-fu/script-fu.c:323 msgid "_Classic.Gimp.Org" msgstr "_Gimp.Org Klasel" -#: ../plug-ins/script-fu/script-fu.c:327 +#: ../plug-ins/script-fu/script-fu.c:326 msgid "Alpha to _Logo" msgstr "Alfa war ar _siell" -#: ../plug-ins/script-fu/script-fu.c:330 +#: ../plug-ins/script-fu/script-fu.c:329 msgid "Re-read all available Script-Fu scripts" msgstr "Lenn en-dro an holl skriptoù Script-Fu hegerz" -#: ../plug-ins/script-fu/script-fu.c:335 +#: ../plug-ins/script-fu/script-fu.c:334 msgid "_Refresh Scripts" msgstr "_Azbevaat ar skriptoù" -#: ../plug-ins/script-fu/script-fu.c:358 +#: ../plug-ins/script-fu/script-fu.c:357 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 "N'hallit ket arverañ \"Azbevaat ar skriptoù\" mard eo digor ur voestad emziviz Script-Fu. Serrit prenestroù Script-Fu ha klaskit en-dro." +msgstr "N'hallit ket arverañ \"Azbevaat ar skriptoù\" mard eo digor ur voestad emziviz Script-Fu. Serrit ar prenestroù Script-Fu ha klaskit en-dro." #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:1 msgid "3D _Outline..." @@ -245,8 +252,6 @@ msgstr "Arventennoù ar bosoù dre ziouer" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:6 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:6 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:5 -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:5 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:6 #: ../plug-ins/script-fu/scripts/glossy.scm.h:7 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:5 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:7 @@ -284,8 +289,6 @@ msgstr "Nodrezh" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:7 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:7 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:6 -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:6 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:7 #: ../plug-ins/script-fu/scripts/glossy.scm.h:8 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:6 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:8 @@ -357,8 +360,6 @@ msgstr "Skin ruzed an disheol" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:10 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:8 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:7 -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:13 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:17 #: ../plug-ins/script-fu/scripts/glossy.scm.h:18 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:8 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:10 @@ -396,7 +397,6 @@ msgstr "Truched 3_M..." #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:2 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:2 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:2 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:1 #: ../plug-ins/script-fu/scripts/glossy.scm.h:2 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:2 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:2 @@ -417,7 +417,7 @@ msgstr "Ment ar bloc'had" #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:4 msgid "Create an image filled with a 3D Truchet pattern" -msgstr "Krouiñ ur skeudenn leuniet gant ur goustur 3M mod Truchet" +msgstr "Krouiñ ur skeudenn leuniet gant ur goustur 3M Truchet" #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:5 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:7 @@ -595,7 +595,7 @@ msgstr "A_fell..." #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:3 msgid "Create a button graphic with an eerie glow for web pages" -msgstr "Krouiñ un afell gevregat gant ur skleur iskis evit pajennadoù web" +msgstr "Krouiñ un afell gevregat gant ur skleur iskis evit ajennadoù web" #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:8 msgid "Glow radius" @@ -612,8 +612,6 @@ msgstr "Leuniadur" #: ../plug-ins/script-fu/scripts/beveled-button.scm.h:10 #: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:8 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:18 -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:14 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:18 #: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:8 #: ../plug-ins/script-fu/scripts/news-text.scm.h:11 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:14 @@ -752,7 +750,6 @@ msgid "Create a beveled pattern hrule for webpages" msgstr "Krouiñ ur goustur reolennH beskellet evit ar pajennadoù web" #: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:2 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:8 #: ../plug-ins/script-fu/scripts/gradient-example.scm.h:4 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:7 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:7 @@ -971,7 +968,7 @@ msgstr "Engravet..." #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:4 msgid "Create a logo with text raised above or carved in to the specified background image" -msgstr "Krouiñ ur siell gant an destenn savet dirak pe zelwennet e-barzh drekva erspizet ar skeudenn" +msgstr "Krouiñ ur siell gant an destenn savet dirak pe zelwennet e-barzh drekva erspizet ar skeudenn " #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7 msgid "Padding around text" @@ -983,7 +980,7 @@ msgstr "Liv ar c'hleiz" #: ../plug-ins/script-fu/scripts/chalk.scm.h:3 msgid "Create a chalk drawing effect for the selected region (or alpha)" -msgstr "Krouiñ un efed tresañ dre gleiz evit ar maez diuzet (pe an alfa)" +msgstr "Krouiñ un efed tresañ dre gleiz evit ar maez diuzet (pe d'an alfa)" #: ../plug-ins/script-fu/scripts/chalk.scm.h:4 msgid "Create a logo resembling chalk scribbled on a blackboard" @@ -1062,7 +1059,7 @@ msgstr "Maezioù gwenn ar c'hrom" #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:5 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:6 msgid "Environment map" -msgstr "Kartenn an amva" +msgstr "Kartennad an amva" #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:8 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:9 @@ -1282,12 +1279,10 @@ msgid "Color" msgstr "Liv" #: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:5 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:11 msgid "Offset X" msgstr "Linkañ X" #: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:6 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:12 msgid "Offset Y" msgstr "Linkañ Y" @@ -1392,7 +1387,7 @@ msgstr "Du war wenn" #: ../plug-ins/script-fu/scripts/font-map.scm.h:3 msgid "Create an image filled with previews of fonts matching a fontname filter" -msgstr "Krouiñ ur skeudenn leuniet gant alberzioù nodrezhoù o klotañ gant sil un anv nodrezh" +msgstr "Krouiñ ur skeudenn leuniet gant alberzioù nodrezhioù o klotañ gant sil un anv nodrezh" #: ../plug-ins/script-fu/scripts/font-map.scm.h:4 msgid "Font _size (pixels)" @@ -1468,91 +1463,61 @@ msgstr "Tevder an disheol (%)" msgid "_Fuzzy Border..." msgstr "Riblenn _dispis..." -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:1 -msgid "Autocrop" -msgstr "Didroc'hañ emgefreek" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:1 +msgid "Bookmark to the GIMP web site" +msgstr "Merker war lec'hienn web GIMP" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:2 -msgid "Create an image of a large header using the gimp.org webpage theme" -msgstr "Krouiñ ur skeudenn eus un talbenn bras en ur arverañ neuz pajennad web gimp.org" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:2 +msgid "Bookmark to the user manual" +msgstr "Merker war dornlevr an arveriad" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:3 -msgid "Create an image of a small header using the gimp.org webpage theme" -msgstr "Krouiñ ur skeudenn eus un talbenn bihan en ur arverañ neuz pajenn web gimp.org" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:3 +msgid "Create and Use _Selections" +msgstr "Krouiñ hag arverañ diu_zadoù" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:4 -msgid "Dark color" -msgstr "Liv teñval" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:4 +msgid "Create, Open and Save _Files" +msgstr "Krouiñ, digeriñ hag enrollañ _restroù" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:7 -#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:9 -msgid "Highlight color" -msgstr "Liv flamm" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:5 +msgid "Drawing _Simple Objects" +msgstr "Tresañ er_gorennoù eeun" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:8 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:9 -msgid "Index image" -msgstr "Skeudenn ibil" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:6 +msgid "How to Use _Dialogs" +msgstr "Penaos arverañ ar _boestadoù emziviz" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:9 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:10 -msgid "Number of colors" -msgstr "Niver a livioù" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:7 +msgid "Plug-in _Registry" +msgstr "Marilh an enlugelladoù" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:10 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:13 -msgid "Remove background" -msgstr "Dilemel an drekva" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:8 +msgid "Using _Paths" +msgstr "Arverañ _treugoù" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:11 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:14 -msgid "Select-by-color threshold" -msgstr "Gwehin diuzañ dre liv" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:9 +msgid "_Basic Concepts" +msgstr "Ergrafoù dia_zez" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:12 -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:15 -msgid "Shadow color" -msgstr "Liv an disheol" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:10 +msgid "_Developer Web Site" +msgstr "Lec'hienn internet an diorrenourion" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:15 -msgid "_Big Header..." -msgstr "Tal_benn bras..." +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:11 +msgid "_Main Web Site" +msgstr "L_oad internet pennañ" -#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:16 -msgid "_Small Header..." -msgstr "Talbenn bi_han..." +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:12 +msgid "_Preparing your Images for the Web" +msgstr "_Prientiñ ho skeudenn evit ar web" -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:2 -msgid "Create an image of a Tube Button Label Header using the gimp.org webpage theme" -msgstr "Krouiñ ur skeudenn eus un talbenn afell e stumm un duellenn en ur arverañ neuz pajenn web gimp.org" +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:13 +msgid "_User Manual Web Site" +msgstr "L_ec'hienn internet dornlevr an arveriad" -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:3 -msgid "Create an image of a Tube Button Label using the gimp.org webpage theme" -msgstr "Krouiñ ur skeudenn eus ur skritell afell he stumm un duellenn en ur arverañ neuz pajenn web gimp.org" - -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:4 -msgid "Create an image of a second level Tube Button Label using the gimp.org webpage theme" -msgstr "Krouiñ ur skeudenn eus un eil skritell afell he stumm un duellenn en ur arverañ neuz pajenn web gimp.org" - -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:5 -msgid "Create an image of a third level Tube Button Label using the gimp.org webpage theme" -msgstr "Krouiñ ur skeudenn eus un teirvet skritell afell he stumm un duellenn en ur arverañ neuz pajenn web gimp.org" - -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:16 -msgid "T_ube Sub-Button Label..." -msgstr "Skritell isafell mod 'Korzenn'..." - -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:19 -msgid "Tub_e Sub-Sub-Button Label..." -msgstr "Skritell is-isafell mod 'Korzenn'..." - -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:20 -msgid "_General Tube Labels..." -msgstr "Skritell hollek mod 'Korzenn'..." - -#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:21 -msgid "_Tube Button Label..." -msgstr "Skritell afell mod 'Korzenn'..." +#: ../plug-ins/script-fu/scripts/gimp-online.scm.h:14 +msgid "_Working with Digital Camera Photos" +msgstr "_Labourat gant ur benveg luc'hskeudennoù niverel" #: ../plug-ins/script-fu/scripts/glossy.scm.h:1 msgid "Add gradients, patterns, shadows, and bump maps to the selected region (or alpha)" @@ -1898,6 +1863,42 @@ msgstr "Sepia" msgid "_Old Photo..." msgstr "Luc'hsk. k_ozh..." +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:1 +msgid "All characters in the name are either white-spaces or characters which can not appear in filenames." +msgstr "An holl arouezennoù en anv zo pe egoroù gwenn pe arouezennoù n'hallont ket bezañ en anvioù restr." + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:2 +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 "Ezporzhiañ al livaoueg oberiant evel ur follennad stil gant anv enankañ al liv evel o anv rummad, hag al liv e-unan evel doareenn al liv" + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:3 +msgid "Export the active palette as a PHP dictionary (name => color)" +msgstr "Ezporzhiañ al livaoueg oberiant evel ur geriadur PHP (anv => liv)" + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:4 +msgid "Export the active palette as a Python dictionary (name: color)" +msgstr "Ezporzhiañ al livaoueg oberiant evel ur geriadur Python (anv: liv)" + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:5 +msgid "Export the active palette as a java.util.Hashtable" +msgstr "Ezporzhiañ al livaoueg oberiant evel ur java.util.Hashtable" + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:6 +msgid "Folder for the output file" +msgstr "Teuliad evit ar restr ec'hankañ" + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:7 +msgid "The filename you entered is not a suitable name for a file." +msgstr "An anv restr enanket ganeoc'h n'eo ket un anv dereat evit ur restr." + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:8 +msgid "The name of the file to create (if a file with this name already exist, it will be replaced)" +msgstr "An anv evit ar restr da grouiñ (mar bez ur restr gant an anv-mañ endeo e vo amsavet)" + +#: ../plug-ins/script-fu/scripts/palette-export.scm.h:9 +msgid "Write all the colors in a palette to a text file, one hexadecimal value per line (no names)" +msgstr "Skrivañ an holl livioù war al livaoueg en ur restr mod testenn, ur werzh c'hwezekredel gant pep linenn (anv ebet)" + #: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:1 #: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:1 msgid "Brush name" @@ -1921,7 +1922,7 @@ msgstr "Pegañ ar golverad e-barzh ur broust nevez" #: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:6 #: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:5 msgid "There is no image data in the clipboard to paste." -msgstr "N'eus tamm roadenn skeudenn ebet er golver da begañ." +msgstr "N'eus roadenn skeudenn ebet er golver da begañ." #: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:2 msgid "New _Pattern..." @@ -1962,7 +1963,7 @@ msgstr "_Diarsell.." #: ../plug-ins/script-fu/scripts/predator.scm.h:1 msgid "Add a 'Predator' effect to the selected region (or alpha)" -msgstr "Ouzhpennañ un efed mod 'Predator' d'ar maez diuzet (pe d'an alfa)" +msgstr "Ouzhpennañ un efed 'Predator' d'ar maez diuzet (pe d'an alfa)" #: ../plug-ins/script-fu/scripts/predator.scm.h:2 msgid "Edge amount" @@ -2042,7 +2043,7 @@ msgstr "Munut e kreiz" #: ../plug-ins/script-fu/scripts/rendermap.scm.h:8 msgid "Render _Map..." -msgstr "Deo_uez..." +msgstr "Glennad an deo_uez..." #: ../plug-ins/script-fu/scripts/rendermap.scm.h:9 msgid "Tile" @@ -2156,7 +2157,7 @@ msgstr "Skin (%)" #: ../plug-ins/script-fu/scripts/selection-round.scm.h:4 msgid "Round the corners of the current selection" -msgstr "Rontaat kornioù an diuzad bremanel" +msgstr "Rontaat kornioù an diuzad bremanel." #: ../plug-ins/script-fu/scripts/selection-round.scm.h:5 msgid "Rounded R_ectangle..." @@ -2164,7 +2165,7 @@ msgstr "R_eizhkorn rontaet..." #: ../plug-ins/script-fu/scripts/slide.scm.h:1 msgid "Add a slide-film like frame, sprocket holes, and labels to an image" -msgstr "Ouzhpennañ ur frammad heñvel ouzh ur film, toulloù dibunañ ha skritelloù, d'ar skeudenn" +msgstr "Ouzhpennañ ur frammad heñvel ouzh ur film, toulloù dibunañ ha skritelloù d'ar skeudenn" #: ../plug-ins/script-fu/scripts/slide.scm.h:3 msgid "Font color" @@ -2216,7 +2217,7 @@ msgstr "_Boull o treiñ..." #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:1 msgid "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" -msgstr "Ouzhpennañ krommennoù epitrokoidel, Lissajous ha mod spirograf d'an dreuzfollennad vremanel" +msgstr "Ouzhpennañ krommennoù epitrokoidel, Lissajous ha mod spirograf d'an dreuzfollenn vremanel" #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:2 msgid "Airbrush" @@ -2575,62 +2576,6 @@ msgstr "Hed an neudenn" msgid "_Weave..." msgstr "_Plezhañ..." -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:1 -msgid "Bookmark to the GIMP web site" -msgstr "Merker war lec'hienn web GIMP" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:2 -msgid "Bookmark to the user manual" -msgstr "Merker war dornlevr an arveriad" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:3 -msgid "Create and Use _Selections" -msgstr "Krouiñ hag arverañ diu_zadoù" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:4 -msgid "Create, Open and Save _Files" -msgstr "Krouiñ, digeriñ hag enrollañ _restroù" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:5 -msgid "Drawing _Simple Objects" -msgstr "Tresañ er_gorennoù eeun" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:6 -msgid "How to Use _Dialogs" -msgstr "Penaos arverañ ar _boestadoù emziviz" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:7 -msgid "Plug-in _Registry" -msgstr "Marilh an enlugelladoù" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:8 -msgid "Using _Paths" -msgstr "Arverañ _treugoù" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:9 -msgid "_Basic Concepts" -msgstr "Ergrafoù dia_zez" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:10 -msgid "_Developer Web Site" -msgstr "Load internet an diorrenourion" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:11 -msgid "_Main Web Site" -msgstr "L_oad internet pennañ" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:12 -msgid "_Preparing your Images for the Web" -msgstr "_Prientiñ ho skeudenn evit ar web" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:13 -msgid "_User Manual Web Site" -msgstr "L_ec'hienn internet dornlevr an arveriad" - -#: ../plug-ins/script-fu/scripts/web-browser.scm.h:14 -msgid "_Working with Digital Camera Photos" -msgstr "_Labourat gant ur benveg luc'hskeudennoù niverel" - #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:1 msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" msgstr "Ouzhpennañ un efed 3M treuzwelus soutil war ar maez bet diuzet (pe d'an alfa)" @@ -2663,6 +2608,10 @@ msgstr "Linkañ X al lintr" msgid "Highlight Y offset" msgstr "Linkañ Y al lintr" +#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:9 +msgid "Highlight color" +msgstr "Liv flamm" + #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:10 msgid "Highlight opacity" msgstr "Demerez al lintr" @@ -2671,3 +2620,145 @@ msgstr "Demerez al lintr" msgid "_Xach-Effect..." msgstr "Efed _Xach..." +#~ msgid "_Misc" +#~ msgstr "_Liesseurt" +#~ msgid "_Utilities" +#~ msgstr "_Goulevioù mavek" +#~ msgid "An_imation" +#~ msgstr "Bl_iverezh" +#~ msgid "_Animators" +#~ msgstr "Bli_vourion" +#~ msgid "_Artistic" +#~ msgstr "_Arzel" +#~ msgid "_Blur" +#~ msgstr "_Ruzed" +#~ msgid "_Decor" +#~ msgstr "_Kinkladur" +#~ msgid "_Effects" +#~ msgstr "_Efedoù" +#~ msgid "En_hance" +#~ msgstr "Gw_ellekaat" +#~ msgid "_Light and Shadow" +#~ msgstr "Skêrijenn ha _disheol" +#~ msgid "S_hadow" +#~ msgstr "Dis_heol" +#~ msgid "_Render" +#~ msgstr "_Deouez" +#~ msgid "_Alchemy" +#~ msgstr "_Alkimiezh" +#~ msgid "Autocrop" +#~ msgstr "Didroc'hañ emgefreek" +#~ msgid "Create an image of a large header using the gimp.org webpage theme" +#~ msgstr "" +#~ "Krouiñ ur skeudenn eus un talbenn bras en ur arverañ neuz pajenn web gimp." +#~ "org" +#~ msgid "Create an image of a small header using the gimp.org webpage theme" +#~ msgstr "" +#~ "Krouiñ ur skeudenn eus un talbenn bihan en ur arverañ neuz pajenn web " +#~ "gimp.org" +#~ msgid "Dark color" +#~ msgstr "Liv teñval" +#~ msgid "Index image" +#~ msgstr "Skeudenn ibil" +#~ msgid "Number of colors" +#~ msgstr "Niver a livioù" +#~ msgid "Remove background" +#~ msgstr "Dilemel an drekva" +#~ msgid "Select-by-color threshold" +#~ msgstr "Gwehin diuzañ dre liv" +#~ msgid "Shadow color" +#~ msgstr "Liv an disheol" +#~ msgid "_Big Header..." +#~ msgstr "Tal_benn bras..." +#~ msgid "_Small Header..." +#~ msgstr "Talbenn bi_han..." +#~ msgid "" +#~ "Create an image of a Tube Button Label Header using the gimp.org webpage " +#~ "theme" +#~ msgstr "" +#~ "Krouiñ ur skeudenn eus un talbenn afell e stumm un duellenn en ur arverañ " +#~ "neuz pajenn web gimp.org" +#~ msgid "" +#~ "Create an image of a Tube Button Label using the gimp.org webpage theme" +#~ msgstr "" +#~ "Krouiñ ur skeudenn eus ur skritell afell he stumm un duellenn en ur " +#~ "arverañ neuz pajenn web gimp.org" +#~ msgid "" +#~ "Create an image of a second level Tube Button Label using the gimp.org " +#~ "webpage theme" +#~ msgstr "" +#~ "Krouiñ ur skeudenn eus un eil skritell afell he stumm un duellenn en ur " +#~ "arverañ neuz pajenn web gimp.org" +#~ msgid "" +#~ "Create an image of a third level Tube Button Label using the gimp.org " +#~ "webpage theme" +#~ msgstr "" +#~ "Krouiñ ur skeudenn eus un teirvet skritell afell he stumm un duellenn en " +#~ "ur arverañ neuz pajenn web gimp.org" +#~ msgid "T_ube Sub-Button Label..." +#~ msgstr "Skritell isafell mod 'Korzenn'..." +#~ msgid "Tub_e Sub-Sub-Button Label..." +#~ msgstr "Skritell is-isafell mod 'Korzenn'..." +#~ msgid "_General Tube Labels..." +#~ msgstr "Skritell hollek mod 'Korzenn'..." +#~ msgid "_Tube Button Label..." +#~ msgstr "Skritell afell mod 'Korzenn'..." +#~ msgid "Effect size (pixels * 3)" +#~ msgstr "Ment an efed (pikselioù * 3)" +#~ msgid "BG opacity" +#~ msgstr "Demerez an DV" +#~ msgid "Create a graph of the Hue, Saturation, and Value distributions" +#~ msgstr "" +#~ "Krouiñ ur c'hevregad eus dasparzhadurioù an arliv, ar peurvec'hiañ hag al " +#~ "lintr" +#~ msgid "Draw _HSV Graph..." +#~ msgstr "Tresañ kevregad _APL..." +#~ msgid "End X" +#~ msgstr "Dibenn X" +#~ msgid "End Y" +#~ msgstr "Dibenn Y" +#~ msgid "From top-left to bottom-right" +#~ msgstr "Eus an tu kleiz e lein d'an tu dehou en traoñ" +#~ msgid "Graph scale" +#~ msgstr "Skeul ar c'hevregad" +#~ msgid "Start X" +#~ msgstr "Derou X" +#~ msgid "Start Y" +#~ msgstr "Derou Y" +#~ msgid "Use selection bounds instead of values below" +#~ msgstr "Arverañ bevennoù an diuzad e-lec'h re amañ dindan" +#~ msgid "Effect size (pixels * 5)" +#~ msgstr "Ment an efed (pikselioù * 5)" +#~ msgid "Create a simple sphere with a drop shadow" +#~ msgstr "Krouiñ ur pelenn eeun gant un disheol bannet" +#~ msgid "Lighting (degrees)" +#~ msgstr "Lintr (derezioù)" +#~ msgid "Radius (pixels)" +#~ msgstr "Skin (pikselioù)" +#~ msgid "Sphere color" +#~ msgstr "Liv ar bellenn" +#~ msgid "_Sphere..." +#~ msgstr "_Pellenn..." +#~ msgid "Burst color" +#~ msgstr "Liv tarzhañ" +#~ msgid "Create a logo using a starburst gradient" +#~ msgstr "Krouiñ ur siell oc'h arverañ ilrezenn ur steredenn o tarzhañ" +#~ msgid "Effect size (pixels * 30)" +#~ msgstr "Ment an efed (pikselioù * 30)" +#~ msgid "" +#~ "Fill the selected region (or alpha) with a starburst gradient and add a " +#~ "shadow" +#~ msgstr "" +#~ "Leuniañ ar maez diuzet (pa an alfa) gant ilrezenn ur steredenn o tarzhañ " +#~ "hag ouzhpennañ un disheol" +#~ msgid "Starb_urst..." +#~ msgstr "Tarzh St_ered..." +#~ msgid "Effect size (pixels * 4)" +#~ msgstr "Ment an efed (pikselioù * 4)" +#~ msgid "" +#~ "Fill the selected region (or alpha) with a rock-like texture, a nova " +#~ "glow, and shadow" +#~ msgstr "" +#~ "Leuniañ ar maez diuzet (pe an alfa) gant ur wiadezh heñvel ouzh maen, ur " +#~ "skleur nova ha disheol" + diff --git a/po-script-fu/it.po b/po-script-fu/it.po index 323398a6c7..38609e8cc3 100644 --- a/po-script-fu/it.po +++ b/po-script-fu/it.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gimp 2.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-08-03 17:48+0200\n" -"PO-Revision-Date: 2010-08-03 17:47+0200\n" +"PO-Revision-Date: 2010-08-27 11:26+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: gimp.linux.it\n" "MIME-Version: 1.0\n" @@ -1674,7 +1674,7 @@ msgstr "" #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:3 msgid "Bevel height (sharpness)" -msgstr "Altezza rilievo (definizione)" +msgstr "Altezza rilievo (nitidezza)" #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:5 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:4 @@ -1851,7 +1851,7 @@ msgstr "Casualità" #: ../plug-ins/script-fu/scripts/line-nova.scm.h:6 msgid "Sharpness (degrees)" -msgstr "Affilatura (gradi)" +msgstr "Nitidezza (gradi)" #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:1 msgid "Create a rectangular brush" diff --git a/po-tags/POTFILES.skip b/po-tags/POTFILES.skip new file mode 100644 index 0000000000..bed2f0ceed --- /dev/null +++ b/po-tags/POTFILES.skip @@ -0,0 +1,13 @@ +app +data/tips +desktop +desktop/gimp.desktop.in +libgimp +libgimpbase +libgimpconfig +libgimpmodule +libgimpthumb +libgimpwidgets +modules +plug-ins +tools diff --git a/po/br.po b/po/br.po index 0d14328363..d9d52c5cfb 100644 --- a/po/br.po +++ b/po/br.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n" -"POT-Creation-Date: 2010-04-14 16:40+0000\n" -"PO-Revision-Date: 2010-04-19 11:46+0100\n" +"POT-Creation-Date: 2010-08-25 11:03+0000\n" +"PO-Revision-Date: 2010-08-25 16:43+0100\n" "Last-Translator: Alan Monfort \n" "Language-Team: An Drouizig \n" "MIME-Version: 1.0\n" @@ -27,10 +27,10 @@ msgstr "Goulev da zornata skeudennoù GNU" #: ../app/about.h:29 msgid "" -"Copyright © 1995-2009\n" +"Copyright © 1995-2010\n" "Spencer Kimball, Peter Mattis and the GIMP Development Team" msgstr "" -"Copyright © 1995-2009\n" +"Copyright © 1995-2010\n" "Spencer Kimball, Peter Mattis ha pare diorren GIMP" #: ../app/about.h:33 @@ -47,7 +47,7 @@ msgstr "" "\n" "Degemeret hoc'h eus un eilad eus al Lañvaz Foran Hollek GNU gant GIMP ; ma n'hoc'h eus ket, skrivit da : Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." -#: ../app/app.c:219 +#: ../app/app.c:220 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -102,10 +102,10 @@ msgstr "Na gargañ ar broustoù, ilrezennoù, livaouegoù, gousturioù..." #: ../app/main.c:170 msgid "Do not load any fonts" -msgstr "Ne gargit nodrezh ebet" +msgstr "Na gargañ nodrezh ebet" #: ../app/main.c:175 -msgid "Do not show a startup window" +msgid "Do not show a splash screen" msgstr "Na ziskouez ar skrammad loc'hañ" #: ../app/main.c:180 @@ -191,7 +191,7 @@ msgstr "(Biziata ne vern pe arouezenn evit serriñ ar prenestr-mañ)\n" msgid "GIMP output. You can minimize this window, but don't close it." msgstr "Ec'hankad GIMP. Bihanaet e vez ar prenestr-mañ, na serrit ket eñ avat." -#: ../app/sanity.c:363 +#: ../app/sanity.c:398 #, c-format msgid "" "The configured filename encoding cannot be converted to UTF-8: %s\n" @@ -202,7 +202,7 @@ msgstr "" "\n" "Gwiriit gwerzh an argemmenn amva G_FILENAME_ENCODING." -#: ../app/sanity.c:382 +#: ../app/sanity.c:417 #, c-format msgid "" "The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n" @@ -214,12 +214,12 @@ msgstr "" "Morvat e vez kadavet ar restroù gant ho reizhiad restroù dre un enrinegañ disheñvel diouzh UTF-8 ha n'eo ket bet disklêriet ganeoc'h da GLib. Mar plij, grit war-dro ar werzh amva G_FILENAME_ENCODING." #. show versions of libraries used by GIMP -#: ../app/version.c:63 +#: ../app/version.c:64 #, c-format msgid "using %s version %s (compiled against version %s)" msgstr "oc'h arverañ %s handelv %s (kempunet dreist an handelv %s)" -#: ../app/version.c:126 +#: ../app/version.c:127 #: ../tools/gimp-remote.c:94 #, c-format msgid "%s version %s" @@ -233,7 +233,7 @@ msgstr "Embanner broustoù" #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 -#: ../app/core/gimp.c:951 +#: ../app/core/gimp.c:953 #: ../app/dialogs/dialogs.c:282 #: ../app/dialogs/preferences-dialog.c:2720 msgid "Brushes" @@ -334,7 +334,7 @@ msgstr "Embanner an ilrezennoù" #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 -#: ../app/core/gimp.c:971 +#: ../app/core/gimp.c:973 #: ../app/dialogs/dialogs.c:286 #: ../app/dialogs/preferences-dialog.c:2736 msgid "Gradients" @@ -342,15 +342,14 @@ msgstr "Ilrezennoù" #. initialize the list of gimp tool presets #: ../app/actions/actions.c:175 -#: ../app/core/gimp.c:981 +#: ../app/core/gimp.c:983 #: ../app/dialogs/dialogs.c:302 -#| msgid "Pre_sets:" msgid "Tool Presets" msgstr "Ragarventennoù ar benveg" #: ../app/actions/actions.c:178 #: ../app/dialogs/dialogs.c:369 -#| msgid "Text Editor" +#: ../app/widgets/gimptoolpreseteditor.c:75 msgid "Tool Preset Editor" msgstr "Embanner ragarventennoù ar benveg" @@ -382,7 +381,7 @@ msgstr "Embanner al livaouegoù" #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 -#: ../app/core/gimp.c:966 +#: ../app/core/gimp.c:968 #: ../app/dialogs/dialogs.c:288 #: ../app/dialogs/preferences-dialog.c:2732 msgid "Palettes" @@ -390,7 +389,7 @@ msgstr "Livaouegoù" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 -#: ../app/core/gimp.c:961 +#: ../app/core/gimp.c:963 #: ../app/dialogs/dialogs.c:284 #: ../app/dialogs/preferences-dialog.c:2728 msgid "Patterns" @@ -402,7 +401,7 @@ msgid "Plug-Ins" msgstr "Enlugelladoù" #: ../app/actions/actions.c:205 -#: ../app/core/gimpchannel.c:369 +#: ../app/core/gimpchannel.c:385 msgid "Quick Mask" msgstr "Maskl herrek" @@ -417,7 +416,7 @@ msgstr "Diuzad" #. initialize the template list #: ../app/actions/actions.c:214 -#: ../app/core/gimp.c:986 +#: ../app/core/gimp.c:988 #: ../app/dialogs/dialogs.c:296 msgid "Templates" msgstr "Patromoù" @@ -438,12 +437,13 @@ msgid "Tool Options" msgstr "Dibarzhioù ar binvioù" #: ../app/actions/actions.c:226 +#: ../app/widgets/gimptoolbox.c:952 msgid "Tools" msgstr "Binvioù" #: ../app/actions/actions.c:229 #: ../app/dialogs/dialogs.c:315 -#: ../app/tools/gimpvectortool.c:162 +#: ../app/tools/gimpvectortool.c:161 msgid "Paths" msgstr "Treugoù" @@ -456,13 +456,13 @@ msgid "Windows" msgstr "Prenestroù" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:583 +#: ../app/actions/actions.c:584 #, c-format msgid "%s: %.2f" msgstr "%s: %.2f" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:609 +#: ../app/actions/actions.c:610 #, c-format msgid "%s: %d" msgstr "%s: %d" @@ -733,7 +733,7 @@ msgid "Intersect this channel with the current selection" msgstr "Kenskejañ ar sanell-mañ gant an diuzad bremanel" #: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:404 +#: ../app/actions/channels-commands.c:402 msgid "Channel Attributes" msgstr "Doareennoù ar sanell" @@ -751,14 +751,14 @@ msgid "_Fill opacity:" msgstr "_Demerez al leuniadur :" #: ../app/actions/channels-commands.c:116 -#: ../app/core/gimpchannel.c:263 -#: ../app/widgets/gimpchanneltreeview.c:345 +#: ../app/core/gimpchannel.c:271 +#: ../app/widgets/gimpchanneltreeview.c:334 msgid "Channel" msgstr "Sanell" #: ../app/actions/channels-commands.c:117 #: ../app/actions/channels-commands.c:159 -#: ../app/widgets/gimpchanneltreeview.c:340 +#: ../app/widgets/gimpchanneltreeview.c:329 msgid "New Channel" msgstr "Sanell nevez" @@ -771,21 +771,14 @@ msgid "New Channel Color" msgstr "Sanell liv nevez" #: ../app/actions/channels-commands.c:244 -#: ../app/core/gimpimage-new.c:180 +#: ../app/core/gimpimage-new.c:252 #: ../app/display/gimpdisplayshell-dnd.c:599 -#: ../app/widgets/gimpchanneltreeview.c:272 -#: ../app/widgets/gimplayertreeview.c:808 +#: ../app/widgets/gimpchanneltreeview.c:261 +#: ../app/widgets/gimplayertreeview.c:785 #, c-format msgid "%s Channel Copy" msgstr "Eilañ ar sanell %s" -#: ../app/actions/channels-commands.c:315 -#: ../app/core/gimpselection.c:583 -#: ../app/pdb/selection-cmds.c:454 -#: ../app/pdb/selection-cmds.c:521 -msgid "Channel to Selection" -msgstr "Sanell etrezek an diuzad" - #: ../app/actions/colormap-actions.c:44 msgctxt "colormap-action" msgid "Colormap Menu" @@ -977,15 +970,15 @@ msgstr "Arverañ al liv kedaozet eus an holl dreuzfollennoù hewel" #: ../app/actions/data-commands.c:104 #: ../app/actions/documents-commands.c:343 -#: ../app/actions/file-commands.c:193 -#: ../app/dialogs/file-open-dialog.c:221 -#: ../app/dialogs/file-open-dialog.c:266 +#: ../app/actions/file-commands.c:194 +#: ../app/dialogs/file-open-dialog.c:233 +#: ../app/dialogs/file-open-dialog.c:278 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 #: ../app/display/gimpdisplayshell-dnd.c:552 -#: ../app/widgets/gimplayertreeview.c:768 +#: ../app/widgets/gimplayertreeview.c:745 #: ../app/widgets/gimptoolbox-dnd.c:178 -#: ../app/widgets/gimptoolbox.c:1220 +#: ../app/widgets/gimptoolbox.c:1247 #, c-format msgid "" "Opening '%s' failed:\n" @@ -1001,9 +994,9 @@ msgstr "" #: ../app/core/gimpimage.c:1522 #: ../app/core/gimppalette-import.c:210 #: ../app/core/gimppalette-load.c:223 -#: ../app/core/gimppalette.c:378 +#: ../app/core/gimppalette.c:379 #: ../app/dialogs/palette-import-dialog.c:771 -#: ../app/widgets/gimpdnd-xds.c:92 +#: ../app/widgets/gimpdnd-xds.c:94 msgid "Untitled" msgstr "Hep titl" @@ -1247,14 +1240,11 @@ msgid "Open the palette editor" msgstr "Digeriñ embanner al livaoueg" #: ../app/actions/dialogs-actions.c:182 -#| msgid "Tool Options" msgctxt "dialogs-action" msgid "Tool presets" msgstr "Ragarventennoù ar benveg" #: ../app/actions/dialogs-actions.c:183 -#| msgctxt "dialogs-action" -#| msgid "Open the tool options dialog" msgctxt "dialogs-action" msgid "Open tool presets dialog" msgstr "Digeriñ boestad emziviz ragarventennoù ar benveg" @@ -1330,14 +1320,11 @@ msgid "Open the preferences dialog" msgstr "Digeriñ boestad emziviz ar gwellvezioù" #: ../app/actions/dialogs-actions.c:235 -#| msgid "Input Devices" msgctxt "dialogs-action" msgid "_Input Devices" msgstr "Trobarzhelloù _enankañ" #: ../app/actions/dialogs-actions.c:236 -#| msgctxt "dialogs-action" -#| msgid "Open the paint dynamics editor" msgctxt "dialogs-action" msgid "Open the input devices editor" msgstr "Digeriñ embanner an trobarzhelloù enankañ" @@ -1384,24 +1371,19 @@ msgstr "A-zivout GIMP" #: ../app/actions/dialogs-actions.c:304 #: ../app/dialogs/preferences-dialog.c:1943 -#: ../app/widgets/gimptoolbox.c:774 +#: ../app/widgets/gimptoolbox.c:795 msgid "Toolbox" msgstr "Boestad binvioù" #: ../app/actions/dialogs-actions.c:305 -#| msgctxt "windows-action" -#| msgid "Raise the toolbox" msgid "Raise the toolbox" msgstr "Sevel ar voestad binvioù" #: ../app/actions/dialogs-actions.c:309 -#| msgid "Toolbox" msgid "New Toolbox" msgstr "Boestad binvioù nevez" #: ../app/actions/dialogs-actions.c:310 -#| msgctxt "brushes-action" -#| msgid "Create a new brush" msgid "Create a new toolbox" msgstr "Krouiñ ur voestad binvioù nevez" @@ -1535,27 +1517,33 @@ msgctxt "tab-style" msgid "St_atus & Text" msgstr "St_ad & testenn" -#: ../app/actions/dockable-actions.c:124 +#: ../app/actions/dockable-actions.c:116 +#: ../app/widgets/widgets-enums.c:224 +msgctxt "tab-style" +msgid "Automatic" +msgstr "Emgefreek" + +#: ../app/actions/dockable-actions.c:126 msgctxt "dockable-action" msgid "Loc_k Tab to Dock" msgstr "Prennañ an ivinell er voestad stagadus" -#: ../app/actions/dockable-actions.c:126 +#: ../app/actions/dockable-actions.c:128 msgctxt "dockable-action" msgid "Protect this tab from being dragged with the mouse pointer" msgstr "Mirout ouzh an ivinell-mañ da vezañ riklet gant biz al logodenn" -#: ../app/actions/dockable-actions.c:132 +#: ../app/actions/dockable-actions.c:134 msgctxt "dockable-action" msgid "Show _Button Bar" msgstr "Diskouez _barrenn an afelloù" -#: ../app/actions/dockable-actions.c:141 +#: ../app/actions/dockable-actions.c:143 msgctxt "dockable-action" msgid "View as _List" msgstr "Gwe_llout evel ur roll" -#: ../app/actions/dockable-actions.c:146 +#: ../app/actions/dockable-actions.c:148 msgctxt "dockable-action" msgid "View as _Grid" msgstr "Gwellout evel ur _gael" @@ -2275,8 +2263,6 @@ msgid "_File" msgstr "_Restr" #: ../app/actions/file-actions.c:72 -#| msgctxt "file-action" -#| msgid "Create" msgctxt "file-action" msgid "Crea_te" msgstr "Kr_ouiñ" @@ -2317,8 +2303,6 @@ msgid "Open an image file from a specified location" msgstr "Digeriñ ur restr skeudenn diouzh ul lec'hiadur erspizet" #: ../app/actions/file-actions.c:94 -#| msgctxt "file-action" -#| msgid "Create _Template..." msgctxt "file-action" msgid "Create Template..." msgstr "Krouiñ ur patrom..." @@ -2385,8 +2369,8 @@ msgstr "Enrollañ un e_ilad..." #: ../app/actions/file-actions.c:135 msgctxt "file-action" -msgid "Save this image with a different name, but keep its current name" -msgstr "Enrollañ ar skeudenn-mañ gant un anv disheñvel, mirout hec'h anv bremanel avat" +msgid "Save a copy of this image, without affecting the source file (if any) or the current state of the image" +msgstr "Enrollañ un eilad eus ar skeudenn, hep daskemmañ ar restr tarzh (mar bez unan) pe stad vremanel ar skeudenn" #: ../app/actions/file-actions.c:140 msgctxt "file-action" @@ -2443,7 +2427,7 @@ msgid "Export to" msgstr "Ezporzhiañ betek" #: ../app/actions/file-commands.c:112 -#: ../app/actions/file-commands.c:474 +#: ../app/actions/file-commands.c:475 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Digeriñ ur skeudenn" @@ -2452,49 +2436,49 @@ msgstr "Digeriñ ur skeudenn" msgid "Open Image as Layers" msgstr "Digeriñ ur skeudenn evel treuzfollennoù" -#: ../app/actions/file-commands.c:264 +#: ../app/actions/file-commands.c:265 msgid "No changes need to be saved" msgstr "Kemm ebet da enrollañ" -#: ../app/actions/file-commands.c:271 +#: ../app/actions/file-commands.c:272 #: ../app/dialogs/file-save-dialog.c:95 msgid "Save Image" msgstr "Enrollañ ar skeudenn" -#: ../app/actions/file-commands.c:277 +#: ../app/actions/file-commands.c:278 msgid "Save a Copy of the Image" msgstr "Enrollañ un eilad eus ar skeudenn" -#: ../app/actions/file-commands.c:337 +#: ../app/actions/file-commands.c:338 msgid "Create New Template" msgstr "Krouiñ ur patrom nevez" -#: ../app/actions/file-commands.c:341 +#: ../app/actions/file-commands.c:342 msgid "Enter a name for this template" msgstr "Enankit un anv evit ar patrom-mañ" -#: ../app/actions/file-commands.c:376 +#: ../app/actions/file-commands.c:377 msgid "Revert failed. No file name associated with this image." msgstr "C'hwitadenn war an distreiñ. N'eus anv restr ebet kevreet ouzh ar skeudenn-mañ." -#: ../app/actions/file-commands.c:389 +#: ../app/actions/file-commands.c:390 msgid "Revert Image" msgstr "Distreiñ d'ar skeudenn" -#: ../app/actions/file-commands.c:420 +#: ../app/actions/file-commands.c:421 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Lakaat '%s' da zistreiñ da '%s' ?" -#: ../app/actions/file-commands.c:426 +#: ../app/actions/file-commands.c:427 msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information." msgstr "Mar bez distroet betek stad ar skeudenn enrollet war ar gantenn e vo kollet an holl gemmoù, en o zouez holl stlennoù an dizoberioù." -#: ../app/actions/file-commands.c:634 +#: ../app/actions/file-commands.c:638 msgid "(Unnamed Template)" msgstr "(Patrom disanv)" -#: ../app/actions/file-commands.c:686 +#: ../app/actions/file-commands.c:690 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3129,7 +3113,7 @@ msgstr "_Pladañ ar skeudenn" #: ../app/actions/image-actions.c:122 msgctxt "image-action" msgid "Merge all layers into one and remove transparency" -msgstr "Toueziañ an holl dreuzfollennoù e unan ha dilemel an dreuzwelusted" +msgstr "Toueziañ an holl dreuzfollennoù e unan ha dilemel an treuzweluster" #: ../app/actions/image-actions.c:127 msgctxt "image-action" @@ -3231,27 +3215,27 @@ msgctxt "image-action" msgid "Rotate the image 90 degrees to the left" msgstr "C'hwelañ ar skeudenn dre 90 derez war an tu kleiz" -#: ../app/actions/image-commands.c:235 +#: ../app/actions/image-commands.c:236 msgid "Set Image Canvas Size" msgstr "Arventennañ ment ar steuenn" -#: ../app/actions/image-commands.c:264 -#: ../app/actions/image-commands.c:288 -#: ../app/actions/image-commands.c:580 +#: ../app/actions/image-commands.c:265 +#: ../app/actions/image-commands.c:289 +#: ../app/actions/image-commands.c:581 msgid "Resizing" msgstr "Oc'h admentañ" -#: ../app/actions/image-commands.c:315 +#: ../app/actions/image-commands.c:316 msgid "Set Image Print Resolution" msgstr "Arventennañ diarunusted voullañ ar skeudenn" -#: ../app/actions/image-commands.c:377 +#: ../app/actions/image-commands.c:378 #: ../app/pdb/drawable-transform-cmds.c:147 #: ../app/pdb/drawable-transform-cmds.c:222 msgid "Flipping" msgstr "O wintañ" -#: ../app/actions/image-commands.c:401 +#: ../app/actions/image-commands.c:402 #: ../app/pdb/drawable-transform-cmds.c:524 #: ../app/pdb/drawable-transform-cmds.c:603 #: ../app/pdb/image-cmds.c:533 @@ -3260,23 +3244,22 @@ msgstr "O wintañ" msgid "Rotating" msgstr "O c'hwelañ" -#: ../app/actions/image-commands.c:427 -#: ../app/actions/layers-commands.c:683 +#: ../app/actions/image-commands.c:428 +#: ../app/actions/layers-commands.c:691 msgid "Cannot crop because the current selection is empty." msgstr "N'haller ket didroc'hañ rak goullo eo an diuzad bremanel." -#: ../app/actions/image-commands.c:627 +#: ../app/actions/image-commands.c:628 msgid "Change Print Size" msgstr "Kemm ar vent voullañ" -#: ../app/actions/image-commands.c:668 -#: ../app/core/gimpimage-scale.c:87 +#: ../app/actions/image-commands.c:669 msgid "Scale Image" msgstr "Skeulaat ar skeudenn" #. Scaling -#: ../app/actions/image-commands.c:679 -#: ../app/actions/layers-commands.c:1149 +#: ../app/actions/image-commands.c:680 +#: ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:681 #: ../app/pdb/drawable-transform-cmds.c:757 @@ -3324,527 +3307,506 @@ msgctxt "images-action" msgid "Delete this image" msgstr "Dilemel ar skeudenn-mañ" -#: ../app/actions/layers-actions.c:48 +#: ../app/actions/layers-actions.c:49 msgctxt "layers-action" msgid "Layers Menu" msgstr "Lañser Treuzfollennoù" -#: ../app/actions/layers-actions.c:52 +#: ../app/actions/layers-actions.c:53 msgctxt "layers-action" msgid "_Layer" msgstr "_Treuzfollenn" -#: ../app/actions/layers-actions.c:54 +#: ../app/actions/layers-actions.c:55 msgctxt "layers-action" msgid "Stac_k" msgstr "Be_rn" -#: ../app/actions/layers-actions.c:56 -msgctxt "layers-action" -msgid "Te_xt to Selection" -msgstr "Te_stenn da ziuzad" - -#: ../app/actions/layers-actions.c:58 +#: ../app/actions/layers-actions.c:57 msgctxt "layers-action" msgid "_Mask" msgstr "_Maskl" -#: ../app/actions/layers-actions.c:60 +#: ../app/actions/layers-actions.c:59 msgctxt "layers-action" msgid "Tr_ansparency" msgstr "_Boullder" -#: ../app/actions/layers-actions.c:62 +#: ../app/actions/layers-actions.c:61 msgctxt "layers-action" msgid "_Transform" msgstr "_Treuzfurmiñ" -#: ../app/actions/layers-actions.c:64 +#: ../app/actions/layers-actions.c:63 msgctxt "layers-action" msgid "_Properties" msgstr "_Perzhioù" -#: ../app/actions/layers-actions.c:66 +#: ../app/actions/layers-actions.c:65 msgctxt "layers-action" msgid "_Opacity" msgstr "_Demerez" -#: ../app/actions/layers-actions.c:68 +#: ../app/actions/layers-actions.c:67 msgctxt "layers-action" msgid "Layer _Mode" msgstr "_Mod an dreuzfollenn" -#: ../app/actions/layers-actions.c:71 +#: ../app/actions/layers-actions.c:70 msgctxt "layers-action" msgid "Te_xt Tool" msgstr "Benveg Te_stenn" -#: ../app/actions/layers-actions.c:72 +#: ../app/actions/layers-actions.c:71 msgctxt "layers-action" msgid "Activate the text tool on this text layer" msgstr "Gweredekaat ar benveg testenn war an dreuzfollenn destenn-mañ" -#: ../app/actions/layers-actions.c:77 +#: ../app/actions/layers-actions.c:76 msgctxt "layers-action" msgid "_Edit Layer Attributes..." msgstr "_Embann doareennoù an dreuzfollenn..." -#: ../app/actions/layers-actions.c:78 +#: ../app/actions/layers-actions.c:77 msgctxt "layers-action" msgid "Edit the layer's name" msgstr "Embann anv an dreuzfollenn" -#: ../app/actions/layers-actions.c:83 -#: ../app/actions/layers-actions.c:591 +#: ../app/actions/layers-actions.c:82 +#: ../app/actions/layers-actions.c:598 msgctxt "layers-action" msgid "_New Layer..." msgstr "Treuzfollenn _nevez..." -#: ../app/actions/layers-actions.c:84 +#: ../app/actions/layers-actions.c:83 msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "Krouiñ un dreuzfollenn nevez hag ouzhpennañ hi er skeudenn-mañ" -#: ../app/actions/layers-actions.c:89 -#: ../app/actions/layers-actions.c:592 +#: ../app/actions/layers-actions.c:88 +#: ../app/actions/layers-actions.c:599 msgctxt "layers-action" msgid "_New Layer" msgstr "Treuzfollenn _nevez" -#: ../app/actions/layers-actions.c:90 +#: ../app/actions/layers-actions.c:89 msgctxt "layers-action" msgid "Create a new layer with last used values" msgstr "Krouiñ un dreuzfollenn nevez gant ar gwerzhioù diwezhañ arveret" -#: ../app/actions/layers-actions.c:95 +#: ../app/actions/layers-actions.c:94 msgctxt "layers-action" msgid "New from _Visible" msgstr "Unan nevez diouzh an hini he_wel" -#: ../app/actions/layers-actions.c:97 +#: ../app/actions/layers-actions.c:96 msgctxt "layers-action" msgid "Create a new layer from what is visible in this image" msgstr "Krouiñ un dreuzfollenn nevez diouzh pezh a zo hewel war ar skeudenn" -#: ../app/actions/layers-actions.c:102 +#: ../app/actions/layers-actions.c:101 msgctxt "layers-action" msgid "New Layer _Group..." msgstr "Strollad treuzfollennoù _nevez..." -#: ../app/actions/layers-actions.c:103 +#: ../app/actions/layers-actions.c:102 msgctxt "layers-action" msgid "Create a new layer group and add it to the image" msgstr "Krouiñ ur strollad treuzfollennoù nevez hag ouzhpennañ eñ er skeudenn-mañ" -#: ../app/actions/layers-actions.c:108 +#: ../app/actions/layers-actions.c:107 msgctxt "layers-action" msgid "D_uplicate Layer" msgstr "Arre_daoliñ an dreuzfollenn" -#: ../app/actions/layers-actions.c:110 +#: ../app/actions/layers-actions.c:109 msgctxt "layers-action" msgid "Create a duplicate of the layer and add it to the image" msgstr "Krouiñ un eilad eus an dreuzfollenn hag ouzhpennañ eñ war ar skeudenn" -#: ../app/actions/layers-actions.c:115 +#: ../app/actions/layers-actions.c:114 msgctxt "layers-action" msgid "_Delete Layer" msgstr "_Dilemel an dreuzfollenn" -#: ../app/actions/layers-actions.c:116 +#: ../app/actions/layers-actions.c:115 msgctxt "layers-action" msgid "Delete this layer" msgstr "Dilemel an dreuzfollenn-mañ" -#: ../app/actions/layers-actions.c:121 +#: ../app/actions/layers-actions.c:120 msgctxt "layers-action" msgid "_Raise Layer" msgstr "_Sevel an dreuzfollenn" -#: ../app/actions/layers-actions.c:122 +#: ../app/actions/layers-actions.c:121 msgctxt "layers-action" msgid "Raise this layer one step in the layer stack" msgstr "Sevel an dreuzfollenn-mañ dre ur paz e bern an treuzfollennoù" -#: ../app/actions/layers-actions.c:127 +#: ../app/actions/layers-actions.c:126 msgctxt "layers-action" msgid "Layer to _Top" msgstr "Treuzfollenn d'an _uhelañ" -#: ../app/actions/layers-actions.c:128 +#: ../app/actions/layers-actions.c:127 msgctxt "layers-action" msgid "Move this layer to the top of the layer stack" msgstr "Sevel an dreuzfollenn-mañ betek lein bern an treuzfollennoù" -#: ../app/actions/layers-actions.c:133 +#: ../app/actions/layers-actions.c:132 msgctxt "layers-action" msgid "_Lower Layer" msgstr "_Diskenn an dreuzfollenn" -#: ../app/actions/layers-actions.c:134 +#: ../app/actions/layers-actions.c:133 msgctxt "layers-action" msgid "Lower this layer one step in the layer stack" msgstr "Diskenn an dreuzfollenn-mañ dre ur paz e bern an treuzfollennoù" -#: ../app/actions/layers-actions.c:139 +#: ../app/actions/layers-actions.c:138 msgctxt "layers-action" msgid "Layer to _Bottom" msgstr "Treuzfollenn d'an _izelañ" -#: ../app/actions/layers-actions.c:140 +#: ../app/actions/layers-actions.c:139 msgctxt "layers-action" msgid "Move this layer to the bottom of the layer stack" msgstr "Diskenn an dreuzfollenn-mañ betek traoñ bern an treuzfollennoù" -#: ../app/actions/layers-actions.c:145 +#: ../app/actions/layers-actions.c:144 msgctxt "layers-action" msgid "_Anchor Layer" msgstr "_Eoriañ an dreuzfollenn" -#: ../app/actions/layers-actions.c:146 +#: ../app/actions/layers-actions.c:145 msgctxt "layers-action" msgid "Anchor the floating layer" msgstr "Eoriañ an dreuzfollenn war neuñv" -#: ../app/actions/layers-actions.c:151 +#: ../app/actions/layers-actions.c:150 msgctxt "layers-action" msgid "Merge Do_wn" msgstr "_Toueziañ etrezek an traoñ" -#: ../app/actions/layers-actions.c:152 +#: ../app/actions/layers-actions.c:151 msgctxt "layers-action" -msgid "Merge this layer with the one below it" -msgstr "Toueziañ an dreuzfollenn-mañ gant an hini a zo dindan" +msgid "Merge this layer with the first visible layer below it" +msgstr "Toueziañ an dreuzfollenn-mañ gant an hini gentañ hewel a zo dindan" -#: ../app/actions/layers-actions.c:157 +#: ../app/actions/layers-actions.c:156 msgctxt "layers-action" msgid "Merge Layer Group" msgstr "Toueziañ ar strollad treuzfollennoù" -#: ../app/actions/layers-actions.c:158 +#: ../app/actions/layers-actions.c:157 msgctxt "layers-action" msgid "Merge the layer group's layers into one normal layer" msgstr "Toueziañ ar strollad treuzfollennoù en un dreuzfollenn reizh" -#: ../app/actions/layers-actions.c:163 +#: ../app/actions/layers-actions.c:162 msgctxt "layers-action" msgid "Merge _Visible Layers..." msgstr "Toueziañ an treuzfollennoù _hewel..." -#: ../app/actions/layers-actions.c:164 +#: ../app/actions/layers-actions.c:163 msgctxt "layers-action" msgid "Merge all visible layers into one layer" msgstr "Toueziañ an holl dreuzfollennoù hewel en un dreuzfollenn" -#: ../app/actions/layers-actions.c:169 +#: ../app/actions/layers-actions.c:168 msgctxt "layers-action" msgid "_Flatten Image" msgstr "_Pladañ ar skeudenn" -#: ../app/actions/layers-actions.c:170 +#: ../app/actions/layers-actions.c:169 msgctxt "layers-action" msgid "Merge all layers into one and remove transparency" -msgstr "Toueziañ an holl dreuzfollennoù e unan ha dilemel an dreuzwelusted" +msgstr "Toueziañ an holl dreuzfollennoù e unan ha dilemel an treuzweluster" -#: ../app/actions/layers-actions.c:175 +#: ../app/actions/layers-actions.c:174 msgctxt "layers-action" msgid "_Discard Text Information" msgstr "_Diskar an destenn gelaouiñ" -#: ../app/actions/layers-actions.c:176 +#: ../app/actions/layers-actions.c:175 msgctxt "layers-action" msgid "Turn this text layer into a normal layer" msgstr "Treiñ an dreuzfollenn destenn-mañ d'un dreuzfollenn skoueriek" -#: ../app/actions/layers-actions.c:181 +#: ../app/actions/layers-actions.c:180 msgctxt "layers-action" msgid "Text to _Path" msgstr "Testenn da _dreug" -#: ../app/actions/layers-actions.c:182 +#: ../app/actions/layers-actions.c:181 msgctxt "layers-action" msgid "Create a path from this text layer" msgstr "Krouiñ un treug diouzh an dreuzfollenn destenn" -#: ../app/actions/layers-actions.c:187 +#: ../app/actions/layers-actions.c:186 msgctxt "layers-action" msgid "Text alon_g Path" msgstr "Testenn a-hed an treu_g" -#: ../app/actions/layers-actions.c:188 +#: ../app/actions/layers-actions.c:187 msgctxt "layers-action" msgid "Warp this layer's text along the current path" msgstr "Distummañ an dreuzfollenn destenn-mañ a-hed an treug bremanel" -#: ../app/actions/layers-actions.c:193 +#: ../app/actions/layers-actions.c:192 msgctxt "layers-action" msgid "Layer B_oundary Size..." msgstr "Ment bevenn_où an dreuzfollenn..." -#: ../app/actions/layers-actions.c:194 +#: ../app/actions/layers-actions.c:193 msgctxt "layers-action" msgid "Adjust the layer dimensions" msgstr "Kengeidañ mentoù an dreuzfollenn" -#: ../app/actions/layers-actions.c:199 +#: ../app/actions/layers-actions.c:198 msgctxt "layers-action" msgid "Layer to _Image Size" msgstr "Treuzfollenn ouzh ment ar _skeudenn" -#: ../app/actions/layers-actions.c:200 +#: ../app/actions/layers-actions.c:199 msgctxt "layers-action" msgid "Resize the layer to the size of the image" msgstr "Admentañ an dreuzfollenn betek ment ar skeudenn" -#: ../app/actions/layers-actions.c:205 +#: ../app/actions/layers-actions.c:204 msgctxt "layers-action" msgid "_Scale Layer..." msgstr "_Skeulaat an dreuzfollenn..." -#: ../app/actions/layers-actions.c:206 +#: ../app/actions/layers-actions.c:205 msgctxt "layers-action" msgid "Change the size of the layer content" msgstr "Kemmañ ment an dreuzfollennad" -#: ../app/actions/layers-actions.c:211 +#: ../app/actions/layers-actions.c:210 msgctxt "layers-action" msgid "_Crop to Selection" msgstr "Didro_c'hañ an diuzad" -#: ../app/actions/layers-actions.c:212 +#: ../app/actions/layers-actions.c:211 msgctxt "layers-action" msgid "Crop the layer to the extents of the selection" msgstr "Admentañ an dreuzfollenn betek astennadoù an diuzad" -#: ../app/actions/layers-actions.c:217 +#: ../app/actions/layers-actions.c:216 msgctxt "layers-action" msgid "Add La_yer Mask..." msgstr "Ouzhpennañ ur _maskl treuzfollenn..." -#: ../app/actions/layers-actions.c:219 +#: ../app/actions/layers-actions.c:218 msgctxt "layers-action" msgid "Add a mask that allows non-destructive editing of transparency" -msgstr "Ouzhpennañ ur maskl oc'h aotren un embann dizistrujus eus an dreuzwelusted" +msgstr "Ouzhpennañ ur maskl oc'h aotren un embann dizistrujus eus an treuzweluster" -#: ../app/actions/layers-actions.c:224 +#: ../app/actions/layers-actions.c:223 msgctxt "layers-action" msgid "Add Alpha C_hannel" msgstr "Ouz_hpennañ ur sanell alfa" -#: ../app/actions/layers-actions.c:225 +#: ../app/actions/layers-actions.c:224 msgctxt "layers-action" msgid "Add transparency information to the layer" -msgstr "Ouzhpennañ ar stlennoù a-fet treuzwelusted d'an dreuzfollenn" +msgstr "Ouzhpennañ ar stlennoù a-fet treuzweluster d'an dreuzfollenn" -#: ../app/actions/layers-actions.c:230 +#: ../app/actions/layers-actions.c:229 msgctxt "layers-action" msgid "_Remove Alpha Channel" msgstr "_Dilemel ar sanell Alfa" -#: ../app/actions/layers-actions.c:231 +#: ../app/actions/layers-actions.c:230 msgctxt "layers-action" msgid "Remove transparency information from the layer" -msgstr "Dilemel ar stlennoù a-fet treuzwelusted diouzh an dreuzfollenn" +msgstr "Dilemel ar stlennoù a-fet treuzweluster diouzh an dreuzfollenn" -#: ../app/actions/layers-actions.c:239 +#: ../app/actions/layers-actions.c:238 msgctxt "layers-action" msgid "Lock Alph_a Channel" msgstr "Prennañ ar sanell _alfa" -#: ../app/actions/layers-actions.c:241 +#: ../app/actions/layers-actions.c:240 msgctxt "layers-action" msgid "Keep transparency information on this layer from being modified" -msgstr "Mirout ar stlennoù treuzwelusted war an dreuzfollenn-mañ ouzh bezañ daskemmet" +msgstr "Mirout ar stlennoù a-fet treuzweluster war an dreuzfollenn-mañ ouzh bezañ daskemmet" -#: ../app/actions/layers-actions.c:247 +#: ../app/actions/layers-actions.c:246 msgctxt "layers-action" msgid "_Edit Layer Mask" msgstr "Embann ar maskl treuzfollenn" -#: ../app/actions/layers-actions.c:248 +#: ../app/actions/layers-actions.c:247 msgctxt "layers-action" msgid "Work on the layer mask" msgstr "Labourat war ar maskl treuzfollenn" -#: ../app/actions/layers-actions.c:254 +#: ../app/actions/layers-actions.c:253 msgctxt "layers-action" msgid "S_how Layer Mask" msgstr "Diskouez ar _maskl treuzfollenn" -#: ../app/actions/layers-actions.c:260 +#: ../app/actions/layers-actions.c:259 msgctxt "layers-action" msgid "_Disable Layer Mask" msgstr "_Diweredekaat ar maskl treuzfollenn" -#: ../app/actions/layers-actions.c:261 +#: ../app/actions/layers-actions.c:260 msgctxt "layers-action" msgid "Dismiss the effect of the layer mask" msgstr "Argas efed ar maskl treuzfollenn" -#: ../app/actions/layers-actions.c:270 +#: ../app/actions/layers-actions.c:269 msgctxt "layers-action" msgid "Apply Layer _Mask" msgstr "Arloañ ar _maskl treuzfollenn" -#: ../app/actions/layers-actions.c:271 +#: ../app/actions/layers-actions.c:270 msgctxt "layers-action" msgid "Apply the effect of the layer mask and remove it" msgstr "Arloañ efed maskl an dreuzfollenn ha dilemel eñ" -#: ../app/actions/layers-actions.c:276 +#: ../app/actions/layers-actions.c:275 msgctxt "layers-action" msgid "Delete Layer Mas_k" msgstr "Dilemel ar mas_kl treuzfollenn" -#: ../app/actions/layers-actions.c:277 +#: ../app/actions/layers-actions.c:276 msgctxt "layers-action" msgid "Remove the layer mask and its effect" msgstr "Arloañ efed maskl an dreuzfollenn ha dilemel eñ" -#: ../app/actions/layers-actions.c:285 +#: ../app/actions/layers-actions.c:284 msgctxt "layers-action" msgid "_Mask to Selection" msgstr "_Maskl ouzh an diuzad" -#: ../app/actions/layers-actions.c:286 +#: ../app/actions/layers-actions.c:285 msgctxt "layers-action" msgid "Replace the selection with the layer mask" msgstr "Amsaviñ an diuzad ouzh ar maskl treuzfollenn" -#: ../app/actions/layers-actions.c:291 +#: ../app/actions/layers-actions.c:290 msgctxt "layers-action" msgid "_Add to Selection" msgstr "Ouzhpenn_añ d'an diuzad" -#: ../app/actions/layers-actions.c:292 +#: ../app/actions/layers-actions.c:291 msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "Ouzhpennañ ar maskl treuzfollenn d'an diuzad bremanel" -#: ../app/actions/layers-actions.c:297 -#: ../app/actions/layers-actions.c:326 -#: ../app/actions/layers-actions.c:356 +#: ../app/actions/layers-actions.c:296 +#: ../app/actions/layers-actions.c:325 msgctxt "layers-action" msgid "_Subtract from Selection" msgstr "Tennañ kuit diouzh an diuzad" -#: ../app/actions/layers-actions.c:298 +#: ../app/actions/layers-actions.c:297 msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "Dilemel ar maskl treuzfollenn diouzh an diuzad bremanel" -#: ../app/actions/layers-actions.c:303 -#: ../app/actions/layers-actions.c:333 -#: ../app/actions/layers-actions.c:363 +#: ../app/actions/layers-actions.c:302 +#: ../app/actions/layers-actions.c:332 msgctxt "layers-action" msgid "_Intersect with Selection" msgstr "_Kenskejadur gant an diuzad" -#: ../app/actions/layers-actions.c:304 +#: ../app/actions/layers-actions.c:303 msgctxt "layers-action" msgid "Intersect the layer mask with the current selection" msgstr "Kenskejañ ar maskl treuzfollenn gant an diuzad bremanel" -#: ../app/actions/layers-actions.c:312 +#: ../app/actions/layers-actions.c:311 msgctxt "layers-action" msgid "Al_pha to Selection" msgstr "Al_fa ouzh an diuzad" -#: ../app/actions/layers-actions.c:314 +#: ../app/actions/layers-actions.c:313 msgctxt "layers-action" msgid "Replace the selection with the layer's alpha channel" msgstr "Amsaviñ an diuzad ouzh sanell alfa an dreuzfollenn" -#: ../app/actions/layers-actions.c:319 -#: ../app/actions/layers-actions.c:349 +#: ../app/actions/layers-actions.c:318 msgctxt "layers-action" msgid "A_dd to Selection" msgstr "Ouzhpennañ d'an _diuzad" -#: ../app/actions/layers-actions.c:321 +#: ../app/actions/layers-actions.c:320 msgctxt "layers-action" msgid "Add the layer's alpha channel to the current selection" msgstr "Ouzhpennañ sanell alfa an dreuzfollenn d'an diuzad bremanel" -#: ../app/actions/layers-actions.c:328 +#: ../app/actions/layers-actions.c:327 msgctxt "layers-action" msgid "Subtract the layer's alpha channel from the current selection" msgstr "Lemel sanell alfa an dreuzfollenn diouzh an diuzad bremanel" -#: ../app/actions/layers-actions.c:335 +#: ../app/actions/layers-actions.c:334 msgctxt "layers-action" msgid "Intersect the layer's alpha channel with the current selection" msgstr "Kenskejañ sanell alfa an dreuzfollenn gant an diuzad bremanel" -#: ../app/actions/layers-actions.c:343 -msgctxt "layers-action" -msgid "_Text to Selection" -msgstr "_Testenn da ziuzad" - -#: ../app/actions/layers-actions.c:344 -msgctxt "layers-action" -msgid "Replace the selection with the text layer's outline" -msgstr "Amsaviñ an diuzad gant trolinenn an dreuzfollenn destenn" - -#: ../app/actions/layers-actions.c:351 -msgctxt "layers-action" -msgid "Add the text layer's outline to the current selection" -msgstr "Ouzhpennañ trolinenn testenn an dreuzfollenn d'an diuzad bremanel" - -#: ../app/actions/layers-actions.c:358 -msgctxt "layers-action" -msgid "Subtract the text layer's outline from the current selection" -msgstr "Lemel trolinenn testenn an dreuzfollenn diouzh an diuzad bremanel" - -#: ../app/actions/layers-actions.c:365 -msgctxt "layers-action" -msgid "Intersect the text layer's outline with the current selection" -msgstr "Kenskejañ trolinenn testenn an dreuzfollenn gant an diuzad bremanel" - -#: ../app/actions/layers-actions.c:373 +#: ../app/actions/layers-actions.c:342 msgctxt "layers-action" msgid "Select _Top Layer" msgstr "Diuzañ an dreuzfollenn e _lein" -#: ../app/actions/layers-actions.c:374 +#: ../app/actions/layers-actions.c:343 msgctxt "layers-action" msgid "Select the topmost layer" msgstr "Diuzañ an dreuzfollenn el lein" -#: ../app/actions/layers-actions.c:379 +#: ../app/actions/layers-actions.c:348 msgctxt "layers-action" msgid "Select _Bottom Layer" msgstr "Diuzañ an dreuzfollenn en _traoñ" -#: ../app/actions/layers-actions.c:380 +#: ../app/actions/layers-actions.c:349 msgctxt "layers-action" msgid "Select the bottommost layer" msgstr "Diuzañ an dreuzfollenn en traoñ" -#: ../app/actions/layers-actions.c:385 +#: ../app/actions/layers-actions.c:354 msgctxt "layers-action" msgid "Select _Previous Layer" msgstr "Diuzañ an dreuzfollenn gent" -#: ../app/actions/layers-actions.c:386 +#: ../app/actions/layers-actions.c:355 msgctxt "layers-action" msgid "Select the layer above the current layer" msgstr "Diuzañ an dreuzfollenn a-us d'an dreuzfollenn oberiant" -#: ../app/actions/layers-actions.c:391 +#: ../app/actions/layers-actions.c:360 msgctxt "layers-action" msgid "Select _Next Layer" msgstr "Diuzañ an dreuzfollenn war-lerc'h" -#: ../app/actions/layers-actions.c:392 +#: ../app/actions/layers-actions.c:361 msgctxt "layers-action" msgid "Select the layer below the current layer" msgstr "Diuzañ an dreuzfollenn dindan an dreuzfollenn oberiant" -#: ../app/actions/layers-actions.c:586 -#: ../app/actions/layers-actions.c:587 -#| msgctxt "layers-action" -#| msgid "_New Layer" +#. Will be followed with e.g. "Shift-Click +#. on thumbnail" +#. +#: ../app/actions/layers-actions.c:442 +msgid "Shortcut: " +msgstr "Berradenn glavier :" + +#. Will be prepended with a modifier key +#. string, e.g. "Shift" +#. +#: ../app/actions/layers-actions.c:447 +msgid "-Click on thumbnail in Layers dockable" +msgstr "- Klikañ war ar velvenn a zo war an treuzfollennoù stagus" + +#: ../app/actions/layers-actions.c:593 +#: ../app/actions/layers-actions.c:594 msgctxt "layers-action" msgid "To _New Layer" msgstr "D'un dreuzfollenn _nevez" @@ -3858,14 +3820,14 @@ msgid "Edit Layer Attributes" msgstr "Embann doareennoù an dreuzfollenn" #: ../app/actions/layers-commands.c:250 -#: ../app/core/gimplayer.c:257 +#: ../app/core/gimplayer.c:265 msgid "Layer" msgstr "Treuzfollenn" #: ../app/actions/layers-commands.c:252 #: ../app/actions/layers-commands.c:320 #: ../app/widgets/gimpdrawabletreeview.c:337 -#: ../app/widgets/gimplayertreeview.c:869 +#: ../app/widgets/gimplayertreeview.c:846 msgid "New Layer" msgstr "Treuzfollenn nevez" @@ -3877,29 +3839,23 @@ msgstr "Krouiñ un dreuzfollenn nevez" msgid "Visible" msgstr "Hewelus" -#: ../app/actions/layers-commands.c:614 +#: ../app/actions/layers-commands.c:618 msgid "Set Layer Boundary Size" msgstr "Arventennañ ment an dreuzfollenn" -#: ../app/actions/layers-commands.c:655 -#: ../app/core/gimplayer.c:260 +#: ../app/actions/layers-commands.c:663 msgid "Scale Layer" msgstr "Skeulaat an dreuzfollenn" -#: ../app/actions/layers-commands.c:693 +#: ../app/actions/layers-commands.c:701 msgid "Crop Layer" msgstr "Didroc'hañ riblennoù an dreuzfollenn" -#: ../app/actions/layers-commands.c:832 -msgid "Layer Mask to Selection" -msgstr "Maskl treuzfollenn ouzh an diuzad" - -#: ../app/actions/layers-commands.c:1084 +#: ../app/actions/layers-commands.c:1080 msgid "Please select a channel first" msgstr "Diuzañ ur sanell da gentañ" -#: ../app/actions/layers-commands.c:1092 -#: ../app/core/gimplayer.c:1399 +#: ../app/actions/layers-commands.c:1088 #: ../app/dialogs/layer-add-mask-dialog.c:82 msgid "Add Layer Mask" msgstr "Ouzhpennañ ur maskl treuzfollenn" @@ -4059,11 +4015,11 @@ msgctxt "palettes-action" msgid "Edit palette" msgstr "Embann al livaoueg" -#: ../app/actions/palettes-commands.c:71 +#: ../app/actions/palettes-commands.c:72 msgid "Merge Palette" msgstr "Toueziañ al livaoueg" -#: ../app/actions/palettes-commands.c:75 +#: ../app/actions/palettes-commands.c:76 msgid "Enter a name for the merged palette" msgstr "Enankit un anv evit al livaoueg toueziet" @@ -4484,66 +4440,61 @@ msgctxt "select-action" msgid "Stroke the selection with last used values" msgstr "Tresañ an diuzad gant ar gwerzhioù diwezhañ" -#: ../app/actions/select-commands.c:156 -#: ../app/core/gimpselection.c:171 +#: ../app/actions/select-commands.c:155 msgid "Feather Selection" msgstr "Kuñvsaat an diuzad" -#: ../app/actions/select-commands.c:160 +#: ../app/actions/select-commands.c:159 msgid "Feather selection by" msgstr "Kuñvsaat an diuzad dre" -#: ../app/actions/select-commands.c:197 -#: ../app/core/gimpselection.c:178 +#: ../app/actions/select-commands.c:196 msgid "Shrink Selection" msgstr "Bihanaat an diuzad" -#: ../app/actions/select-commands.c:201 +#: ../app/actions/select-commands.c:200 msgid "Shrink selection by" msgstr "Bihanaat an diuzad dre" -#: ../app/actions/select-commands.c:209 +#: ../app/actions/select-commands.c:208 msgid "_Shrink from image border" msgstr "Bihanaat diouzh riblenn ar _skeudenn" -#: ../app/actions/select-commands.c:237 -#: ../app/core/gimpselection.c:177 +#: ../app/actions/select-commands.c:236 msgid "Grow Selection" msgstr "Kreskaat an diuzad" -#: ../app/actions/select-commands.c:241 +#: ../app/actions/select-commands.c:240 msgid "Grow selection by" msgstr "Kreskaat an diuzad dre" -#: ../app/actions/select-commands.c:267 -#: ../app/core/gimpselection.c:176 +#: ../app/actions/select-commands.c:266 msgid "Border Selection" msgstr "Riblenniñ an diuzad" -#: ../app/actions/select-commands.c:271 +#: ../app/actions/select-commands.c:270 msgid "Border selection by" msgstr "Riblenniñ an diuzad dre" #. Feather button -#: ../app/actions/select-commands.c:280 +#: ../app/actions/select-commands.c:279 msgid "_Feather border" msgstr "K_uñvaat ar riblennoù" #. Edge lock button -#: ../app/actions/select-commands.c:293 +#: ../app/actions/select-commands.c:292 msgid "_Lock selection to image edges" msgstr "_Prennañ an diuzad ouzh riblennoù ar skeudenn" -#: ../app/actions/select-commands.c:343 -#: ../app/actions/select-commands.c:376 -#: ../app/actions/vectors-commands.c:391 -#: ../app/actions/vectors-commands.c:425 +#: ../app/actions/select-commands.c:342 +#: ../app/actions/select-commands.c:375 +#: ../app/actions/vectors-commands.c:386 +#: ../app/actions/vectors-commands.c:420 #: ../app/dialogs/stroke-dialog.c:289 msgid "There is no active layer or channel to stroke to." msgstr "N'eus treuzfollenn pe sanell oberiant ebet a vefe treset warno." -#: ../app/actions/select-commands.c:349 -#: ../app/core/gimpselection.c:155 +#: ../app/actions/select-commands.c:348 msgid "Stroke Selection" msgstr "Tresañ an diuzad" @@ -4687,7 +4638,7 @@ msgstr "Digeriñ ur restr testenn (UTF-8)" #: ../app/core/gimppattern-load.c:76 #: ../app/tools/gimpcurvestool.c:637 #: ../app/tools/gimplevelstool.c:747 -#: ../app/xcf/xcf.c:328 +#: ../app/xcf/xcf.c:329 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "N'haller ket digeriñ '%s' evit he lenn : %s" @@ -4840,15 +4791,14 @@ msgid "Enter a new name for the saved options" msgstr "Enankit un anv nevez evit an dibarzhioù enrollet" #: ../app/actions/tool-options-commands.c:185 -msgid "Reset Tool Options" -msgstr "Adderaouekaat dibarzhioù ar binvioù" +msgid "Reset All Tool Options" +msgstr "Adder_aouekaat holl zibarzhioù ar binvioù" #: ../app/actions/tool-options-commands.c:208 msgid "Do you really want to reset all tool options to default values?" msgstr "Ha fellout a ra deoc'h adderaouekaat holl zibarzhioù ar binvioù betek o gwerzh dre ziouer ?" #: ../app/actions/tool-preset-actions.c:44 -#| msgid "Tools Menu" msgctxt "tool-preset-action" msgid "Tool Preset Menu" msgstr "Lañser ragarventenn ar benveg" @@ -4859,82 +4809,70 @@ msgid "_New Tool Preset" msgstr "Ragarventenn ar benveg _nevez" #: ../app/actions/tool-preset-actions.c:49 -#| msgctxt "palettes-action" -#| msgid "Create a new palette" msgctxt "tool-preset-action" msgid "Create a new tool preset" msgstr "Krouiñ ur ragarventenn nevez evit ar benveg" #: ../app/actions/tool-preset-actions.c:54 -#| msgctxt "vectors-action" -#| msgid "D_uplicate Path" msgctxt "tool-preset-action" msgid "D_uplicate Tool Preset" msgstr "Arre_daoliñ ragarventenn ar benveg" #: ../app/actions/tool-preset-actions.c:55 -#| msgctxt "vectors-action" -#| msgid "Duplicate this path" msgctxt "tool-preset-action" msgid "Duplicate this tool preset" msgstr "Arredaoliñ ragarventenn ar benveg-mañ" #: ../app/actions/tool-preset-actions.c:60 -#| msgctxt "palettes-action" -#| msgid "Copy Palette _Location" msgctxt "tool-preset-action" msgid "Copy Tool Preset _Location" msgstr "Eilañ _lec'hiadur ragarventenn ar benveg-mañ" #: ../app/actions/tool-preset-actions.c:61 -#| msgctxt "palettes-action" -#| msgid "Copy palette file location to clipboard" msgctxt "tool-preset-action" msgid "Copy tool preset file location to clipboard" msgstr "Eilañ lec'hiadur ar restr evit ragarventennoù ar benveg er golver" #: ../app/actions/tool-preset-actions.c:66 -#| msgctxt "palette-editor-action" -#| msgid "_Delete Color" msgctxt "tool-preset-action" msgid "_Delete Tool Preset" msgstr "_Dilemel ragarventenn ar benveg" #: ../app/actions/tool-preset-actions.c:67 -#| msgctxt "vectors-action" -#| msgid "Delete this path" msgctxt "tool-preset-action" msgid "Delete this tool preset" msgstr "Dilemel ragarventenn ar benveg-mañ" #: ../app/actions/tool-preset-actions.c:72 -#| msgctxt "brushes-action" -#| msgid "_Refresh Brushes" msgctxt "tool-preset-action" msgid "_Refresh Tool Presets" msgstr "Azg_renaat ragarventenn ar benveg-mañ" #: ../app/actions/tool-preset-actions.c:73 -#| msgctxt "brushes-action" -#| msgid "Refresh brushes" msgctxt "tool-preset-action" msgid "Refresh tool presets" msgstr "Azgrenaat ragarventenn ar benveg-mañ" #: ../app/actions/tool-preset-actions.c:81 -#| msgctxt "colormap-action" -#| msgid "_Edit Color..." msgctxt "tool-preset-action" msgid "_Edit Tool Preset..." msgstr "_Embann ragarventenn ar benveg..." #: ../app/actions/tool-preset-actions.c:82 -#| msgctxt "colormap-action" -#| msgid "Edit this color" msgctxt "tool-preset-action" msgid "Edit this tool preset" msgstr "Embann ragarventenn ar benveg-mañ" +#: ../app/actions/tool-preset-editor-actions.c:42 +msgctxt "tool-preset-editor-action" +msgid "Tool Preset Editor Menu" +msgstr "Lañser embanner ragarventennoù ar benveg" + +#: ../app/actions/tool-preset-editor-actions.c:50 +msgctxt "tool-preset-editor-action" +msgid "Edit Active Tool Preset" +msgstr "Embann ragarventenn ar benveg oberiant-mañ" + #: ../app/actions/tools-actions.c:45 msgctxt "tools-action" msgid "_Tools" @@ -5217,38 +5155,31 @@ msgctxt "vectors-action" msgid "Advanced options" msgstr "Dibarzhioù kempleshoc'h" -#: ../app/actions/vectors-commands.c:138 +#: ../app/actions/vectors-commands.c:137 msgid "Path Attributes" msgstr "Doareennoù an treug" -#: ../app/actions/vectors-commands.c:141 +#: ../app/actions/vectors-commands.c:140 msgid "Edit Path Attributes" msgstr "Embann doareennoù an treug" -#: ../app/actions/vectors-commands.c:165 -#: ../app/vectors/gimpvectors.c:194 -#: ../app/widgets/gimpvectorstreeview.c:262 +#: ../app/actions/vectors-commands.c:164 +#: ../app/vectors/gimpvectors.c:202 +#: ../app/widgets/gimpvectorstreeview.c:252 msgid "Path" msgstr "Treug" -#: ../app/actions/vectors-commands.c:166 +#: ../app/actions/vectors-commands.c:165 msgid "New Path" msgstr "Treug nevez" -#: ../app/actions/vectors-commands.c:169 +#: ../app/actions/vectors-commands.c:168 msgid "New Path Options" msgstr "Dibarzhioù an treug nevez" -#: ../app/actions/vectors-commands.c:314 -#: ../app/pdb/paths-cmds.c:645 -#: ../app/pdb/vectors-cmds.c:1405 -msgid "Path to Selection" -msgstr "Treug etrezek an diuzad" - -#: ../app/actions/vectors-commands.c:397 +#: ../app/actions/vectors-commands.c:392 #: ../app/tools/gimpvectoroptions.c:198 -#: ../app/tools/gimpvectortool.c:1990 -#: ../app/vectors/gimpvectors.c:202 +#: ../app/tools/gimpvectortool.c:1987 msgid "Stroke Path" msgstr "Tresañ an treug" @@ -5757,8 +5688,6 @@ msgid "When enabled docks and other dialogs are hidden, leaving only image windo msgstr "Mar gweredekaet ez eo kuzhet ar boestadoù stagadus hag ar boestadoù emziviz o leuskel ar skeudenn nemetken." #: ../app/actions/windows-actions.c:109 -#| msgctxt "windows-action" -#| msgid "Single-window mode" msgctxt "windows-action" msgid "Single-Window Mode" msgstr "Mod dre brenestr eeun" @@ -6052,7 +5981,7 @@ msgstr "Faltazi" #: ../app/tools/gimpcurvestool.c:690 #: ../app/tools/gimplevelstool.c:800 #: ../app/vectors/gimpvectors-export.c:81 -#: ../app/xcf/xcf.c:421 +#: ../app/xcf/xcf.c:422 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "N'haller ket digeriñ '%s' evit skrivañ : %s" @@ -6171,7 +6100,6 @@ msgid "Sets the level of interpolation used for scaling and other transformation msgstr "Despizañ a ra al live etreletodiñ arveret evit ar skeulaat hag an treuzfurmadurioù all." #: ../app/config/gimprc-blurbs.h:211 -#| msgid "Sets the pixel format to use for mouse pointers." msgid "Specifies the language to use for the user interface." msgstr "Erspizañ ar ra ar yezh da arverañ evit ketal an arveriaded." @@ -6365,11 +6293,11 @@ msgstr "Diskouez ar skeudenn oberiant bremanel war ar voestad vinvioù." #: ../app/config/gimprc-blurbs.h:439 msgid "Sets the manner in which transparency is displayed in images." -msgstr "Arventennañ a ra an doare ma vo skrammet ar boullder er skeudennoù." +msgstr "Arventennañ a ra an doare ma vo skrammet an treuzweluster er skeudennoù." #: ../app/config/gimprc-blurbs.h:442 msgid "Sets the size of the checkerboard used to display transparency." -msgstr "Arventennañ a ra ment an damer arveret evit skrammañ ar boullder." +msgstr "Arventennañ a ra ment an damer arveret evit skrammañ an treuzweluster." #: ../app/config/gimprc-blurbs.h:445 msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened." @@ -6492,7 +6420,7 @@ msgstr "Gwenn" #: ../app/core/core-enums.c:256 msgctxt "fill-type" msgid "Transparency" -msgstr "Demerez" +msgstr "Treuzweluster" #: ../app/core/core-enums.c:257 msgctxt "fill-type" @@ -6791,6 +6719,7 @@ msgstr "Maskl herrek" #: ../app/core/core-enums.c:881 #: ../app/core/core-enums.c:911 +#: ../app/core/gimpimage-grid.c:62 msgctxt "undo-type" msgid "Grid" msgstr "Kael" @@ -6892,11 +6821,13 @@ msgid "Anchor floating selection" msgstr "Eoriañ an diuzad war neuñv" #: ../app/core/core-enums.c:899 +#: ../app/core/gimp-edit.c:261 msgctxt "undo-type" msgid "Paste" msgstr "Pegañ" #: ../app/core/core-enums.c:900 +#: ../app/core/gimp-edit.c:500 msgctxt "undo-type" msgid "Cut" msgstr "Troc'hañ" @@ -6908,6 +6839,7 @@ msgstr "Testenn" #: ../app/core/core-enums.c:902 #: ../app/core/core-enums.c:944 +#: ../app/core/gimpdrawable-transform.c:566 msgctxt "undo-type" msgid "Transform" msgstr "Treuzfurmiñ" @@ -6961,8 +6893,6 @@ msgid "Change indexed palette" msgstr "Kemm al livaoueg ibiliet" #: ../app/core/core-enums.c:918 -#| msgctxt "undo-type" -#| msgid "Remove item" msgctxt "undo-type" msgid "Reorder item" msgstr "Adurzhiañ an ergorenn" @@ -7143,117 +7073,104 @@ msgid "Convert to RGB workspace" msgstr "Amdreiñ ar skeudenn da livioù RGG" #: ../app/core/core-enums.c:1327 -#| msgid "Opacity" msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Demerez" #: ../app/core/core-enums.c:1328 -#| msgid "Size" msgctxt "dynamics-output-type" msgid "Size" msgstr "Ment" #: ../app/core/core-enums.c:1329 -#| msgid "Angle" msgctxt "dynamics-output-type" msgid "Angle" msgstr "Korn" #: ../app/core/core-enums.c:1330 -#| msgid "Color" msgctxt "dynamics-output-type" msgid "Color" msgstr "Liv" #: ../app/core/core-enums.c:1331 -#| msgid "Hardness" msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Kaleted" #: ../app/core/core-enums.c:1332 -#| msgid "Source" msgctxt "dynamics-output-type" msgid "Force" msgstr "Nerzh" #: ../app/core/core-enums.c:1333 -#| msgid "Aspect ratio" msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Feur an neuz" #: ../app/core/core-enums.c:1334 -#| msgid "Spacing" msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Esaouadur" #: ../app/core/core-enums.c:1335 -#| msgid "Rate" msgctxt "dynamics-output-type" msgid "Rate" msgstr "Feur" #: ../app/core/core-enums.c:1336 -#| msgid "Yellow" msgctxt "dynamics-output-type" msgid "Flow" msgstr "Lanv" #: ../app/core/core-enums.c:1337 -#| msgid "Jitter" msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Distabilder" #: ../app/core/gimp-contexts.c:154 -#: ../app/core/gimptooloptions.c:232 +#: ../app/core/gimptooloptions.c:344 #: ../app/gui/session.c:349 #: ../app/menus/menus.c:464 -#: ../app/widgets/gimpdevices.c:267 +#: ../app/widgets/gimpdevices.c:269 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "C'hwitadenn war ziverkadur eus \"%s\" : %s" #: ../app/core/gimp-edit.c:190 -#: ../app/core/gimpimage-new.c:232 +#: ../app/core/gimpimage-new.c:304 msgid "Pasted Layer" msgstr "Treuzfollenn bet peget" -#: ../app/core/gimp-edit.c:261 -msgid "Paste" -msgstr "Pegañ" - #: ../app/core/gimp-edit.c:388 +msgctxt "undo-type" msgid "Clear" msgstr "Skarzhañ" #: ../app/core/gimp-edit.c:407 +msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "Leuniañ gant liv ar rakva" #: ../app/core/gimp-edit.c:411 +msgctxt "undo-type" msgid "Fill with Background Color" msgstr "Leuniañ gant liv an drekleur" #: ../app/core/gimp-edit.c:415 +msgctxt "undo-type" msgid "Fill with White" msgstr "Leuniañ gant gwenn" #: ../app/core/gimp-edit.c:419 +msgctxt "undo-type" msgid "Fill with Transparency" -msgstr "Leuniañ gant boullder" +msgstr "Leuniañ gant treuzweluster" #: ../app/core/gimp-edit.c:423 +msgctxt "undo-type" msgid "Fill with Pattern" msgstr "Leuniañ gant ur goustur" -#: ../app/core/gimp-edit.c:500 -msgid "Cut" -msgstr "Troc'hañ" - #: ../app/core/gimp-edit.c:512 msgid "Global Buffer" msgstr "Skurzer hollek" @@ -7276,7 +7193,7 @@ msgstr "RV etrezek DV (APG e tu an nadozioù)" #: ../app/core/gimp-gradients.c:103 msgid "FG to Transparent" -msgstr "RV da voullder" +msgstr "RV da dreuzweluster" #. This is a special string to specify the language identifier to #. * look for in the gimp-tags-default.xml file. Please translate the @@ -7315,43 +7232,43 @@ msgstr "O krouiñ ar renkell '%s'..." msgid "Cannot create folder '%s': %s" msgstr "N'haller ket krouiñ ar renkell '%s' : %s" -#: ../app/core/gimp.c:595 +#: ../app/core/gimp.c:597 msgid "Initialization" msgstr "Deraouekaat" #. register all internal procedures -#: ../app/core/gimp.c:696 +#: ../app/core/gimp.c:698 msgid "Internal Procedures" msgstr "Treugennadoù diabarzh" #. initialize the global parasite table -#: ../app/core/gimp.c:947 +#: ../app/core/gimp.c:949 msgid "Looking for data files" msgstr "O klask restroù roadennoù" -#: ../app/core/gimp.c:947 +#: ../app/core/gimp.c:949 msgid "Parasites" msgstr "Arvedadoù" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 +#: ../app/core/gimp.c:958 #: ../app/dialogs/preferences-dialog.c:2724 msgid "Dynamics" msgstr "Dialuskoù" #. initialize the list of fonts -#: ../app/core/gimp.c:976 +#: ../app/core/gimp.c:978 msgid "Fonts (this may take a while)" msgstr "Nodrezhoù (padout a ray ur mareig moarvat)" #. initialize the module list -#: ../app/core/gimp.c:990 +#: ../app/core/gimp.c:992 #: ../app/dialogs/preferences-dialog.c:2752 msgid "Modules" msgstr "Molladoù" #. update tag cache -#: ../app/core/gimp.c:994 +#: ../app/core/gimp.c:996 msgid "Updating tag cache" msgstr "Hizivadur krubuilh ar c'hlav" @@ -7402,7 +7319,7 @@ msgstr "Hedad nodoù UTF-8 didalvoudek e restr ar broust '%s'." #: ../app/core/gimpbrush-load.c:284 #: ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:82 -#: ../app/tools/gimpvectortool.c:319 +#: ../app/tools/gimpvectortool.c:318 msgid "Unnamed" msgstr "Hep anv" @@ -7476,12 +7393,12 @@ msgid "Brush Hardness" msgstr "Kaleted ar broust" #: ../app/core/gimpbrushgenerated.c:159 -#: ../app/paint/gimppaintoptions.c:141 +#: ../app/paint/gimppaintoptions.c:143 msgid "Brush Aspect Ratio" msgstr "Parenn neuz ar broust" #: ../app/core/gimpbrushgenerated.c:166 -#: ../app/paint/gimppaintoptions.c:145 +#: ../app/paint/gimppaintoptions.c:147 msgid "Brush Angle" msgstr "Korn ar broust" @@ -7493,128 +7410,186 @@ msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "Fazi dezrannañ lazhus e restr ar broust '%s' : kontronet eo bet ar restr." #: ../app/core/gimpchannel-select.c:59 -msgctxt "command" +msgctxt "undo-type" msgid "Rectangle Select" msgstr "Diuzad reizhkornek" #: ../app/core/gimpchannel-select.c:110 -msgctxt "command" +msgctxt "undo-type" msgid "Ellipse Select" msgstr "Diuzad elipsennek" #: ../app/core/gimpchannel-select.c:164 -msgctxt "command" +msgctxt "undo-type" msgid "Rounded Rectangle Select" -msgstr "Diuzañ ar reizhkorn rontaet" +msgstr "Diuzañ dre ur reizhkorn rontaet" #: ../app/core/gimpchannel-select.c:433 +#: ../app/core/gimplayer.c:273 +msgctxt "undo-type" msgid "Alpha to Selection" -msgstr "Alfa etrezek an diuzad" +msgstr "Alfa d'an diuzad" #: ../app/core/gimpchannel-select.c:471 #, c-format +msgctxt "undo-type" msgid "%s Channel to Selection" msgstr "Sanell %s etrezek an diuzad" #: ../app/core/gimpchannel-select.c:519 -#: ../app/tools/gimpfuzzyselecttool.c:80 -msgctxt "command" +msgctxt "undo-type" msgid "Fuzzy Select" msgstr "Diuzad dispis" #: ../app/core/gimpchannel-select.c:566 -#: ../app/tools/gimpbycolorselecttool.c:82 -msgctxt "command" +msgctxt "undo-type" msgid "Select by Color" msgstr "Diuzañ dre liv" -#: ../app/core/gimpchannel.c:264 +#: ../app/core/gimpchannel.c:272 +msgctxt "undo-type" msgid "Rename Channel" msgstr "Adenvel ar sanell" -#: ../app/core/gimpchannel.c:265 +#: ../app/core/gimpchannel.c:273 +msgctxt "undo-type" msgid "Move Channel" msgstr "Dilec'hiañ ar sanell" -#: ../app/core/gimpchannel.c:266 +#: ../app/core/gimpchannel.c:274 +msgctxt "undo-type" msgid "Scale Channel" -msgstr "Skeul ar sanell" +msgstr "Skeulaat ar sanell" -#: ../app/core/gimpchannel.c:267 +#: ../app/core/gimpchannel.c:275 +msgctxt "undo-type" msgid "Resize Channel" msgstr "Admentañ ar sanell" -#: ../app/core/gimpchannel.c:268 +#: ../app/core/gimpchannel.c:276 +msgctxt "undo-type" msgid "Flip Channel" msgstr "Gwintañ ar sanell" -#: ../app/core/gimpchannel.c:269 +#: ../app/core/gimpchannel.c:277 +msgctxt "undo-type" msgid "Rotate Channel" msgstr "C'hwelañ ar sanell" -#: ../app/core/gimpchannel.c:270 +#: ../app/core/gimpchannel.c:278 #: ../app/core/gimpdrawable-transform.c:885 +msgctxt "undo-type" msgid "Transform Channel" msgstr "Treuzfurmiñ ar sanell" -#: ../app/core/gimpchannel.c:271 +#: ../app/core/gimpchannel.c:279 +msgctxt "undo-type" msgid "Stroke Channel" msgstr "Tresañ ar sanell" -#: ../app/core/gimpchannel.c:293 +#: ../app/core/gimpchannel.c:280 +#: ../app/core/gimpselection.c:583 +msgctxt "undo-type" +msgid "Channel to Selection" +msgstr "Sanell etrezek an diuzad" + +#: ../app/core/gimpchannel.c:281 +msgctxt "undo-type" +msgid "Reorder Channel" +msgstr "Adurzhiañ ar sanell" + +#: ../app/core/gimpchannel.c:282 +msgctxt "undo-type" +msgid "Raise Channel" +msgstr "Sevel ar sanell" + +#: ../app/core/gimpchannel.c:283 +msgctxt "undo-type" +msgid "Raise Channel to Top" +msgstr "Sevel ar sanell d'an uhelañ" + +#: ../app/core/gimpchannel.c:284 +msgctxt "undo-type" +msgid "Lower Channel" +msgstr "Diskenn ar sanell" + +#: ../app/core/gimpchannel.c:285 +msgctxt "undo-type" +msgid "Lower Channel to Bottom" +msgstr "Diskenn ar sanell d'an izelañ" + +#: ../app/core/gimpchannel.c:286 +msgid "Channel cannot be raised higher." +msgstr "N'haller ket sevel ar sanell uheloc'h." + +#: ../app/core/gimpchannel.c:287 +msgid "Channel cannot be lowered more." +msgstr "N'haller ket diskenn ar sanell izeloc'h." + +#: ../app/core/gimpchannel.c:309 +msgctxt "undo-type" msgid "Feather Channel" msgstr "Kuñvaat ar sanell" -#: ../app/core/gimpchannel.c:294 +#: ../app/core/gimpchannel.c:310 +msgctxt "undo-type" msgid "Sharpen Channel" msgstr "Lemmaat ar sanell" -#: ../app/core/gimpchannel.c:295 +#: ../app/core/gimpchannel.c:311 +msgctxt "undo-type" msgid "Clear Channel" msgstr "Skarzhañ ar sanell" -#: ../app/core/gimpchannel.c:296 +#: ../app/core/gimpchannel.c:312 +msgctxt "undo-type" msgid "Fill Channel" msgstr "Leuniañ ar sanell" -#: ../app/core/gimpchannel.c:297 +#: ../app/core/gimpchannel.c:313 +msgctxt "undo-type" msgid "Invert Channel" msgstr "Tuginañ ar sanell" -#: ../app/core/gimpchannel.c:298 +#: ../app/core/gimpchannel.c:314 +msgctxt "undo-type" msgid "Border Channel" msgstr "Riblenn ar sanell" -#: ../app/core/gimpchannel.c:299 +#: ../app/core/gimpchannel.c:315 +msgctxt "undo-type" msgid "Grow Channel" msgstr "Kreskaat ar sanell" -#: ../app/core/gimpchannel.c:300 +#: ../app/core/gimpchannel.c:316 +msgctxt "undo-type" msgid "Shrink Channel" msgstr "Bihanaat ar sanell" -#: ../app/core/gimpchannel.c:712 +#: ../app/core/gimpchannel.c:728 msgid "Cannot stroke empty channel." msgstr "N'haller ket tresañ ur sanell c'houllo" -#: ../app/core/gimpchannel.c:1715 +#: ../app/core/gimpchannel.c:1752 +msgctxt "undo-type" msgid "Set Channel Color" msgstr "Arventennañ liv ar sanell" -#: ../app/core/gimpchannel.c:1781 +#: ../app/core/gimpchannel.c:1818 +msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Arventennañ demerez ar sanell" -#: ../app/core/gimpchannel.c:1889 +#: ../app/core/gimpchannel.c:1926 #: ../app/core/gimpselection.c:532 msgid "Selection Mask" msgstr "Maskl diuzañ" -#: ../app/core/gimpcontext.c:650 +#: ../app/core/gimpcontext.c:640 msgid "Opacity" msgstr "Demerez" -#: ../app/core/gimpcontext.c:658 +#: ../app/core/gimpcontext.c:648 msgid "Paint Mode" msgstr "Mod pentañ" @@ -7640,32 +7615,24 @@ msgstr "" #: ../app/core/gimpdatafactory.c:536 #: ../app/core/gimpdatafactory.c:539 -#: ../app/core/gimpitem.c:423 -#: ../app/core/gimpitem.c:426 +#: ../app/core/gimpitem.c:425 +#: ../app/core/gimpitem.c:428 msgid "copy" msgstr "eilañ" #: ../app/core/gimpdatafactory.c:548 -#: ../app/core/gimpitem.c:435 +#: ../app/core/gimpitem.c:437 #, c-format msgid "%s copy" msgstr "Eilañ %s" #: ../app/core/gimpdatafactory.c:741 #, 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." 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." msgstr "Un teuliad roadennoù skrivus kefluniet (%s) hoc'h eus, koulskoude n'eus ket eus an teuliad-mañ. Mar plij, krouit an teuliad pe ratreit ho kefluniadur en ur vont er gwellvezioù, rann 'Teuliadoù'." #: ../app/core/gimpdatafactory.c:762 #, c-format -#| msgid "" -#| "You have a writable data folder configured, but this folder is not part " -#| "of your data search path. This can only happen if you edited gimprc " -#| "manually, please fix it in the preferences dialog's 'folders' section." 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 "Un teuliad roadennoù skrivus kefluniet hoc'h eus, koulskoude n'eo ket an teuliad-mañ ul lod eus ho treug da glask roadennoù. Moarvat hoc'h eus embannet gimprc dre zorn, mar plij ratreit an dra-se en ur vont er gwellvezioù, rann 'Teuliadoù'." @@ -7686,16 +7653,17 @@ msgstr "" "%s" #: ../app/core/gimpdrawable-blend.c:244 -#: ../app/tools/gimpblendtool.c:109 +msgctxt "undo-type" msgid "Blend" msgstr "Kemmeskad" #: ../app/core/gimpdrawable-brightness-contrast.c:70 +msgctxt "undo-type" msgid "Brightness_Contrast" msgstr "Lintr_Dargemm" #: ../app/core/gimpdrawable-brightness-contrast.c:81 -#: ../app/tools/gimpbrightnesscontrasttool.c:111 +msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "Lintr-Dargemm" @@ -7704,25 +7672,25 @@ msgid "No patterns available for this operation." msgstr "Goustur hegerz ebet evit ar gwezhiadur-mañ." #: ../app/core/gimpdrawable-bucket-fill.c:286 -msgctxt "command" +msgctxt "undo-type" msgid "Bucket Fill" -msgstr "Sailh leuniañ" +msgstr "Leuniañ" #: ../app/core/gimpdrawable-color-balance.c:79 #: ../app/core/gimpdrawable-color-balance.c:89 -#: ../app/tools/gimpcolorbalancetool.c:94 +msgctxt "undo-type" msgid "Color Balance" msgstr "Mentel al livioù" #: ../app/core/gimpdrawable-colorize.c:72 #: ../app/core/gimpdrawable-colorize.c:84 -#: ../app/tools/gimpcolorizetool.c:90 +msgctxt "undo-type" msgid "Colorize" msgstr "Livañ" #: ../app/core/gimpdrawable-curves.c:162 #: ../app/core/gimpdrawable-curves.c:179 -#: ../app/tools/gimpcurvestool.c:140 +msgctxt "undo-type" msgid "Curves" msgstr "Krommennoù" @@ -7733,6 +7701,7 @@ msgid "Desaturate" msgstr "Dibeurvec'hiañ" #: ../app/core/gimpdrawable-equalize.c:52 +msgctxt "undo-type" msgid "Equalize" msgstr "Kevatalaat" @@ -7761,6 +7730,7 @@ msgid "Levels" msgstr "Liveoù" #: ../app/core/gimpdrawable-offset.c:315 +msgctxt "undo-type" msgid "Offset Drawable" msgstr "Linkañ an tresad" @@ -7771,8 +7741,9 @@ msgid "Posterize" msgstr "Skritellaat" #: ../app/core/gimpdrawable-stroke.c:435 +msgctxt "undo-type" msgid "Render Stroke" -msgstr "Deouez an tres" +msgstr "Lakaat deouez war an tres" #: ../app/core/gimpdrawable-threshold.c:70 #: ../app/core/gimpdrawable-threshold.c:81 @@ -7780,24 +7751,19 @@ msgstr "Deouez an tres" msgid "Threshold" msgstr "Gwehin" -#: ../app/core/gimpdrawable-transform.c:566 -msgid "Transform" -msgstr "Treuzfurmiñ" - #: ../app/core/gimpdrawable-transform.c:644 -#: ../app/tools/gimpfliptool.c:116 -msgctxt "command" +msgctxt "undo-type" msgid "Flip" msgstr "Gwintañ" #: ../app/core/gimpdrawable-transform.c:744 -#: ../app/tools/gimprotatetool.c:121 -msgctxt "command" +msgctxt "undo-type" msgid "Rotate" msgstr "C'hwelañ" #: ../app/core/gimpdrawable-transform.c:883 -#: ../app/core/gimplayer.c:264 +#: ../app/core/gimplayer.c:272 +msgctxt "undo-type" msgid "Transform Layer" msgstr "Treuzfurmiñ an dreuzfollenn" @@ -7805,8 +7771,12 @@ msgstr "Treuzfurmiñ an dreuzfollenn" msgid "Transformation" msgstr "Treuzfurmadur" +#: ../app/core/gimpdrawable.c:486 +msgctxt "undo-type" +msgid "Scale" +msgstr "Skeulaat" + #: ../app/core/gimpdynamicsoutput.c:106 -#| msgid "Output Levels" msgid "Output type" msgstr "Rizh an ec'hankañ" @@ -7889,46 +7859,57 @@ msgid "Layer Group" msgstr "Strollad treuzfollennoù" #: ../app/core/gimpgrouplayer.c:179 +msgctxt "undo-type" msgid "Rename Layer Group" msgstr "Adenvel ar strollad treuzfollennoù" #: ../app/core/gimpgrouplayer.c:180 +msgctxt "undo-type" msgid "Move Layer Group" msgstr "Dilec'hiañ ar strollad treuzfollennoù" #: ../app/core/gimpgrouplayer.c:181 +msgctxt "undo-type" msgid "Scale Layer Group" msgstr "Skeulaat ar strollad treuzfollennoù" #: ../app/core/gimpgrouplayer.c:182 +msgctxt "undo-type" msgid "Resize Layer Group" msgstr "Admentañ ar strollad treuzfollennoù" #: ../app/core/gimpgrouplayer.c:183 +msgctxt "undo-type" msgid "Flip Layer Group" msgstr "Gwintañ ar strollad treuzfollennoù" #: ../app/core/gimpgrouplayer.c:184 +msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "C'hwelañ ar strollad treuzfollennoù" #: ../app/core/gimpgrouplayer.c:185 +msgctxt "undo-type" msgid "Transform Layer Group" msgstr "Treuzfurmiñ ar strollad treuzfollennoù" #: ../app/core/gimpimage-arrange.c:142 +msgctxt "undo-type" msgid "Arrange Objects" msgstr "Kempenn an ergorennoù" #: ../app/core/gimpimage-colormap.c:67 +msgctxt "undo-type" msgid "Set Colormap" msgstr "Arventennañ al livaoueg" #: ../app/core/gimpimage-colormap.c:132 +msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Kemmañ enankad al livaoueg" #: ../app/core/gimpimage-colormap.c:157 +msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Ouzhpennañ al liv d'al livaoueg" @@ -7937,14 +7918,17 @@ msgid "Cannot convert image: palette is empty." msgstr "N'haller ket amdreiñ ar skeudenn : goullo eo al livaoueg." #: ../app/core/gimpimage-convert.c:807 +msgctxt "undo-type" msgid "Convert Image to RGB" -msgstr "Amdreiñ ar skeudenn da RVB" +msgstr "Amdreiñ ar skeudenn da vod RVB" #: ../app/core/gimpimage-convert.c:811 +msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "Amdreiñ ar skeudenn da liveoù louedoù" #: ../app/core/gimpimage-convert.c:815 +msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "Amdreiñ ar skeudenn da livioù ibiliet" @@ -7957,59 +7941,64 @@ msgid "Converting to indexed colors (stage 3)" msgstr "Oc'h amdreiñ da livioù ibiliet (pazenn 3)" #: ../app/core/gimpimage-crop.c:129 -msgctxt "command" +msgctxt "undo-type" msgid "Crop Image" msgstr "Didroc'hañ ar skeudenn" #: ../app/core/gimpimage-crop.c:132 #: ../app/core/gimpimage-resize.c:86 +msgctxt "undo-type" msgid "Resize Image" msgstr "Admentañ ar skeudenn" -#: ../app/core/gimpimage-grid.c:62 -#: ../app/dialogs/grid-dialog.c:152 -msgid "Grid" -msgstr "Kael" - #: ../app/core/gimpimage-guides.c:51 +msgctxt "undo-type" msgid "Add Horizontal Guide" msgstr "Ouzhpennañ un dealf a-zremm" #: ../app/core/gimpimage-guides.c:74 +msgctxt "undo-type" msgid "Add Vertical Guide" msgstr "Ouzhpennañ un dealf a-serzh" #: ../app/core/gimpimage-guides.c:117 -#: ../app/tools/gimpmovetool.c:563 +msgctxt "undo-type" msgid "Remove Guide" msgstr "Dilemel an dealf" #: ../app/core/gimpimage-guides.c:142 +msgctxt "undo-type" msgid "Move Guide" msgstr "Dilec'hiañ an dealf" #: ../app/core/gimpimage-item-list.c:51 +msgctxt "undo-type" msgid "Translate Items" -msgstr "Treiñ an ergorennoù" +msgstr "Treiñ an elfennoù" #: ../app/core/gimpimage-item-list.c:78 +msgctxt "undo-type" msgid "Flip Items" msgstr "Gwintañ an ergorennoù" #: ../app/core/gimpimage-item-list.c:105 +msgctxt "undo-type" msgid "Rotate Items" msgstr "C'hwelañ an ergorennoù" #: ../app/core/gimpimage-item-list.c:135 +msgctxt "undo-type" msgid "Transform Items" msgstr "Treuzfurmiñ an ergorennoù" #: ../app/core/gimpimage-merge.c:108 #: ../app/core/gimpimage-merge.c:122 +msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Toueziañ an treuzfollennoù hewel" #: ../app/core/gimpimage-merge.c:176 +msgctxt "undo-type" msgid "Flatten Image" msgstr "Pladañ ar skeudenn" @@ -8026,14 +8015,17 @@ msgid "There is no visible layer to merge down to." msgstr "N'eus treuzfollenn hewel ebet da doueziañ." #: ../app/core/gimpimage-merge.c:255 +msgctxt "undo-type" msgid "Merge Down" msgstr "Toueziañ etrezek an traoñ" #: ../app/core/gimpimage-merge.c:277 +msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Toueziañ ar strollad treuzfollennoù" #: ../app/core/gimpimage-merge.c:330 +msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Toueziañ an treugoù hewel" @@ -8041,150 +8033,102 @@ msgstr "Toueziañ an treugoù hewel" msgid "Not enough visible paths for a merge. There must be at least two." msgstr "N'eus ket treugoù hewel a-walc'h evit un toueziadur. Daou anezho zo ret da vihanañ." +#: ../app/core/gimpimage-new.c:135 +msgid "Background" +msgstr "Drekva" + #: ../app/core/gimpimage-quick-mask.c:85 +msgctxt "undo-type" msgid "Enable Quick Mask" msgstr "Gweredekaat ar maskl herrek" #: ../app/core/gimpimage-quick-mask.c:135 +msgctxt "undo-type" msgid "Disable Quick Mask" msgstr "Diweredekaat ar maskl herrek" #: ../app/core/gimpimage-sample-points.c:53 +msgctxt "undo-type" msgid "Add Sample Point" msgstr "Ouzhpennañ poentoù standilhonañ" #: ../app/core/gimpimage-sample-points.c:101 -#: ../app/tools/gimpcolortool.c:432 +msgctxt "undo-type" msgid "Remove Sample Point" msgstr "Dilemel ar poent standilhonañ" #: ../app/core/gimpimage-sample-points.c:138 +msgctxt "undo-type" msgid "Move Sample Point" msgstr "Dilec'hiañ ar poent standilhonañ" +#: ../app/core/gimpimage-scale.c:87 +msgctxt "undo-type" +msgid "Scale Image" +msgstr "Skeulaat ar skeudenn" + #: ../app/core/gimpimage-undo-push.c:862 #, c-format msgid "Can't undo %s" msgstr "N'haller ket dizober %s" #: ../app/core/gimpimage.c:1632 +msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Kemmañ diarunusted ar skeudenn" #: ../app/core/gimpimage.c:1684 +msgctxt "undo-type" msgid "Change Image Unit" msgstr "Kemmañ unanenn ar skeudenn" #: ../app/core/gimpimage.c:2654 +msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Stagañ un arvevad ouzh ar skeudenn" #: ../app/core/gimpimage.c:2695 +msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Dilemel an arvevad diouzh ar skeudenn" -#: ../app/core/gimpimage.c:3283 +#: ../app/core/gimpimage.c:3404 +msgctxt "undo-type" msgid "Add Layer" msgstr "Ouzhpennañ un dreuzfollenn" -#: ../app/core/gimpimage.c:3333 -#: ../app/core/gimpimage.c:3353 +#: ../app/core/gimpimage.c:3454 +#: ../app/core/gimpimage.c:3474 +msgctxt "undo-type" msgid "Remove Layer" msgstr "Dilemel an dreuzfollenn" -#: ../app/core/gimpimage.c:3346 +#: ../app/core/gimpimage.c:3467 +msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Dilemel an diuzad war neuñv" -#: ../app/core/gimpimage.c:3503 -msgid "Layer cannot be raised higher." -msgstr "N'haller ket sevel an dreuzfollenn uheloc'h." - -#: ../app/core/gimpimage.c:3509 -msgid "Raise Layer" -msgstr "Sevel an dreuzfollenn" - -#: ../app/core/gimpimage.c:3521 -msgid "Raise Layer to Top" -msgstr "Sevel an dreuzfollenn d'an uhelañ" - -#: ../app/core/gimpimage.c:3543 -msgid "Layer cannot be lowered more." -msgstr "N'haller ket diskenn an dreuzfollenn izeloc'h." - -#: ../app/core/gimpimage.c:3549 -msgid "Lower Layer" -msgstr "Diskenn an dreuzfollenn" - -#: ../app/core/gimpimage.c:3568 -msgid "Lower Layer to Bottom" -msgstr "Diskenn an dreuzfollenn d'an izelañ" - -#: ../app/core/gimpimage.c:3615 +#: ../app/core/gimpimage.c:3633 +msgctxt "undo-type" msgid "Add Channel" msgstr "Ouzhpennañ ur sanell" -#: ../app/core/gimpimage.c:3653 -#: ../app/core/gimpimage.c:3665 +#: ../app/core/gimpimage.c:3671 +#: ../app/core/gimpimage.c:3683 +msgctxt "undo-type" msgid "Remove Channel" msgstr "Dilemel ar sanell" -#: ../app/core/gimpimage.c:3703 -msgid "Channel cannot be raised higher." -msgstr "N'haller ket sevel ar sanell uheloc'h." - -#: ../app/core/gimpimage.c:3709 -msgid "Raise Channel" -msgstr "Sevel ar sanell" - -#: ../app/core/gimpimage.c:3721 -msgid "Raise Channel to Top" -msgstr "Sevel ar sanell d'an uhelañ" - -#: ../app/core/gimpimage.c:3744 -msgid "Channel cannot be lowered more." -msgstr "N'haller ket diskenn ar sanell izeloc'h." - -#: ../app/core/gimpimage.c:3750 -msgid "Lower Channel" -msgstr "Diskenn ar sanell" - -#: ../app/core/gimpimage.c:3769 -msgid "Lower Channel to Bottom" -msgstr "Diskenn ar sanell d'an izelañ" - -#: ../app/core/gimpimage.c:3816 +#: ../app/core/gimpimage.c:3730 +msgctxt "undo-type" msgid "Add Path" -msgstr "Ouzhpennañ un treug" +msgstr "Ouzhpennañ un dreuzfollenn" -#: ../app/core/gimpimage.c:3847 +#: ../app/core/gimpimage.c:3761 +msgctxt "undo-type" msgid "Remove Path" msgstr "Dilemel an treug" -#: ../app/core/gimpimage.c:3877 -msgid "Path cannot be raised higher." -msgstr "N'haller ket sevel an treug uheloc'h." - -#: ../app/core/gimpimage.c:3883 -msgid "Raise Path" -msgstr "Sevel an treug" - -#: ../app/core/gimpimage.c:3895 -msgid "Raise Path to Top" -msgstr "Sevel an treug d'an uhelañ" - -#: ../app/core/gimpimage.c:3917 -msgid "Path cannot be lowered more." -msgstr "N'haller ket diskenn an treug izeloc'h." - -#: ../app/core/gimpimage.c:3923 -msgid "Lower Path" -msgstr "Diskenn an treug" - -#: ../app/core/gimpimage.c:3942 -msgid "Lower Path to Bottom" -msgstr "Diskenn an treug d'an izelañ" - #: ../app/core/gimpimagefile.c:534 #: ../app/dialogs/preferences-dialog.c:1711 msgid "Folder" @@ -8242,62 +8186,108 @@ msgstr[1] "%d a dreuzfollennoù" msgid "Could not open thumbnail '%s': %s" msgstr "N'haller ket digeriñ ar velvenn '%s' : %s" -#: ../app/core/gimpitem.c:1542 +#: ../app/core/gimpitem.c:1564 +msgctxt "undo-type" msgid "Attach Parasite" msgstr "Stagañ un arvevad" -#: ../app/core/gimpitem.c:1552 +#: ../app/core/gimpitem.c:1574 +msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Stagañ un arvevad ouzh an ergorenn" -#: ../app/core/gimpitem.c:1594 -#: ../app/core/gimpitem.c:1601 +#: ../app/core/gimpitem.c:1616 +#: ../app/core/gimpitem.c:1623 +msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Dilemel un arvevad ouzh an ergorenn" #: ../app/core/gimplayer-floating-sel.c:95 +msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Eoriañ an diuzad war neuñv" #: ../app/core/gimplayer-floating-sel.c:126 -#: ../app/core/gimplayer.c:579 +#: ../app/core/gimplayer.c:595 msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel." msgstr "N'haller ket krouiñ un dreuzfollenn nevez diwar an diuzad war neuñv rak d'ur sanell pe d'ur maskl treuzfollenn eo an diuzad-mañ." #: ../app/core/gimplayer-floating-sel.c:133 +msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "Diuzad war neuñv etrezek an dreuzfollenn" -#: ../app/core/gimplayer.c:258 +#: ../app/core/gimplayer.c:266 +msgctxt "undo-type" msgid "Rename Layer" msgstr "Adenvel an dreuzfollenn" -#: ../app/core/gimplayer.c:259 -#: ../app/pdb/layer-cmds.c:443 -#: ../app/pdb/layer-cmds.c:481 +#: ../app/core/gimplayer.c:267 +msgctxt "undo-type" msgid "Move Layer" msgstr "Dilec'hiañ an dreuzfollenn" -#: ../app/core/gimplayer.c:261 +#: ../app/core/gimplayer.c:268 +msgctxt "undo-type" +msgid "Scale Layer" +msgstr "Skeulaat an dreuzfollenn" + +#: ../app/core/gimplayer.c:269 +msgctxt "undo-type" msgid "Resize Layer" msgstr "Admentañ an dreuzfollenn" -#: ../app/core/gimplayer.c:262 +#: ../app/core/gimplayer.c:270 +msgctxt "undo-type" msgid "Flip Layer" msgstr "Gwintañ an dreuzfollenn" -#: ../app/core/gimplayer.c:263 +#: ../app/core/gimplayer.c:271 +msgctxt "undo-type" msgid "Rotate Layer" msgstr "C'hwelañ an dreuzfollenn" -#: ../app/core/gimplayer.c:421 -#: ../app/core/gimplayer.c:1458 -#: ../app/core/gimplayermask.c:234 +#: ../app/core/gimplayer.c:274 +msgctxt "undo-type" +msgid "Reorder Layer" +msgstr "Adurzhiañ an dreuzfollenn" + +#: ../app/core/gimplayer.c:275 +msgctxt "undo-type" +msgid "Raise Layer" +msgstr "Sevel an dreuzfollenn" + +#: ../app/core/gimplayer.c:276 +msgctxt "undo-type" +msgid "Raise Layer to Top" +msgstr "Sevel an dreuzfollenn d'an uhelañ" + +#: ../app/core/gimplayer.c:277 +msgctxt "undo-type" +msgid "Lower Layer" +msgstr "Diskenn an dreuzfollenn" + +#: ../app/core/gimplayer.c:278 +msgctxt "undo-type" +msgid "Lower Layer to Bottom" +msgstr "Diskenn an dreuzfollenn d'an izelañ" + +#: ../app/core/gimplayer.c:279 +msgid "Layer cannot be raised higher." +msgstr "N'haller ket sevel an dreuzfollenn uheloc'h." + +#: ../app/core/gimplayer.c:280 +msgid "Layer cannot be lowered more." +msgstr "N'haller ket diskenn an dreuzfollenn izeloc'h." + +#: ../app/core/gimplayer.c:437 +#: ../app/core/gimplayer.c:1491 +#: ../app/core/gimplayermask.c:235 #, c-format msgid "%s mask" msgstr "maskl %s" -#: ../app/core/gimplayer.c:460 +#: ../app/core/gimplayer.c:476 #, c-format msgid "" "Floating Selection\n" @@ -8306,53 +8296,71 @@ msgstr "" "Diuzad war neuñv\n" "(%s)" -#: ../app/core/gimplayer.c:1382 +#: ../app/core/gimplayer.c:1415 msgid "Unable to add a layer mask since the layer already has one." msgstr "" "N'haller ket ouzhpennañ ur maskl\n" "d'an dreuzfollenn rak unan zo gantañ endeo." -#: ../app/core/gimplayer.c:1393 +#: ../app/core/gimplayer.c:1426 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "N'haller ket ouzhpennañ ur maskl\n" "e ventoù disheñvel diouzh re an dreuzfollenn." -#: ../app/core/gimplayer.c:1513 +#: ../app/core/gimplayer.c:1432 +msgctxt "undo-type" +msgid "Add Layer Mask" +msgstr "Ouzhpennañ ur maskl treuzfollenn" + +#: ../app/core/gimplayer.c:1546 +msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Treuzdougen ar sanell alfa etrezek ar maskl" -#: ../app/core/gimplayer.c:1683 -#: ../app/core/gimplayermask.c:260 +#: ../app/core/gimplayer.c:1716 +#: ../app/core/gimplayermask.c:261 +msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Arloañ ar maskl treuzfollenn" -#: ../app/core/gimplayer.c:1684 +#: ../app/core/gimplayer.c:1717 +msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Dilemel ar maskl treuzfollenn" -#: ../app/core/gimplayer.c:1803 +#: ../app/core/gimplayer.c:1836 +msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Ouzhpennañ ur sanell alfa" -#: ../app/core/gimplayer.c:1857 +#: ../app/core/gimplayer.c:1890 +msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Dilemel ar sanell alfa" -#: ../app/core/gimplayer.c:1877 +#: ../app/core/gimplayer.c:1910 +msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Treuzfollenn ouzh mentoù ar skeudenn" #: ../app/core/gimplayermask.c:110 +msgctxt "undo-type" msgid "Move Layer Mask" msgstr "Dilec'hiañ ar maskl treuzfollenn" -#: ../app/core/gimplayermask.c:184 +#: ../app/core/gimplayermask.c:111 +msgctxt "undo-type" +msgid "Layer Mask to Selection" +msgstr "Maskl treuzfollenn ouzh an diuzad" + +#: ../app/core/gimplayermask.c:185 #, c-format msgid "Cannot rename layer masks." msgstr "N'haller ket adenvel ar maskloù treuzfollenn." -#: ../app/core/gimplayermask.c:328 +#: ../app/core/gimplayermask.c:329 +msgctxt "undo-type" msgid "Show Layer Mask" msgstr "Diskouez ar maskl treuzfollenn" @@ -8459,26 +8467,55 @@ msgid "Please wait" msgstr "Gortozit, mar plij..." #: ../app/core/gimpselection.c:154 -#: ../app/tools/gimpeditselectiontool.c:241 +msgctxt "undo-type" msgid "Move Selection" msgstr "Dilec'hiañ an diuzad" +#: ../app/core/gimpselection.c:155 +msgctxt "undo-type" +msgid "Stroke Selection" +msgstr "Tresañ an diuzad" + +#: ../app/core/gimpselection.c:171 +msgctxt "undo-type" +msgid "Feather Selection" +msgstr "Kuñvaat an diuzad" + #: ../app/core/gimpselection.c:172 +msgctxt "undo-type" msgid "Sharpen Selection" msgstr "Lemmaat an diuzad" #: ../app/core/gimpselection.c:173 +msgctxt "undo-type" msgid "Select None" msgstr "Na diuzañ netra" #: ../app/core/gimpselection.c:174 +msgctxt "undo-type" msgid "Select All" msgstr "Diuzañ pep tra" #: ../app/core/gimpselection.c:175 +msgctxt "undo-type" msgid "Invert Selection" msgstr "Tuginañ an diuzad" +#: ../app/core/gimpselection.c:176 +msgctxt "undo-type" +msgid "Border Selection" +msgstr "Riblenniñ an diuzad" + +#: ../app/core/gimpselection.c:177 +msgctxt "undo-type" +msgid "Grow Selection" +msgstr "Kreskaat an diuzad" + +#: ../app/core/gimpselection.c:178 +msgctxt "undo-type" +msgid "Shrink Selection" +msgstr "Bihanaat an diuzad" + #: ../app/core/gimpselection.c:285 msgid "There is no selection to stroke." msgstr "Diuzad ebet da dresañ." @@ -8492,6 +8529,7 @@ msgid "Cannot float selection because the selected region is empty." msgstr "N'haller ket krouiñ un diuzad war neuñv rak goullo eo ar maez bet diuzet." #: ../app/core/gimpselection.c:851 +msgctxt "undo-type" msgid "Float Selection" msgstr "Diuzad war neuñv" @@ -8503,22 +8541,18 @@ msgstr "Treuzfollenn war neuñv" 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 "Amdreiñ ur c'hevre dre c'haran (90°) d'ur c'hevre a-veskell ma 'z afe ar c'haran dreist ur pellder kevatal da muioc'h eget : (bevenn ar c'haran * tevder al linenn) diouzh ar poent kevreañ bremanel." -#: ../app/core/gimptemplate.c:106 +#: ../app/core/gimptemplate.c:100 msgid "The unit used for coordinate display when not in dot-for-dot mode." msgstr "An unanenn evit skrammañ an daveennoù pa ne vez ket ar mod pikenn ouzh pikenn." -#: ../app/core/gimptemplate.c:113 +#: ../app/core/gimptemplate.c:107 msgid "The horizontal image resolution." msgstr "Diarunusted a-zremm ar skeudenn." -#: ../app/core/gimptemplate.c:119 +#: ../app/core/gimptemplate.c:113 msgid "The vertical image resolution." msgstr "Diarunusted a-serzh ar skeudenn." -#: ../app/core/gimptemplate.c:405 -msgid "Background" -msgstr "Drekva" - #: ../app/core/gimpunit.c:56 msgctxt "unit-singular" msgid "pixel" @@ -8641,7 +8675,7 @@ msgstr "_Iriennañ liv :" #: ../app/dialogs/convert-dialog.c:260 msgid "Enable dithering of _transparency" -msgstr "Gweredekaat iriennañ ar _boullder" +msgstr "Gweredekaat iriennañ an _treuzweluster" #: ../app/dialogs/convert-dialog.c:287 msgid "Converting to indexed colors" @@ -8652,7 +8686,7 @@ msgstr "Oc'h amdreiñ da livioù ibiliet" msgid "Cannot convert to a palette with more than 256 colors." msgstr "N'haller ket amdreiñ d'ul livaoueg gant muioc'h a 265 liv." -#: ../app/dialogs/dialogs-constructors.c:218 +#: ../app/dialogs/dialogs-constructors.c:212 #: ../app/gui/gui.c:164 #: ../app/gui/gui-message.c:145 msgid "GIMP Message" @@ -8736,7 +8770,7 @@ msgstr "_Mod :" msgid "_Opacity:" msgstr "De_merez :" -#: ../app/dialogs/file-open-dialog.c:255 +#: ../app/dialogs/file-open-dialog.c:267 msgid "Open layers" msgstr "Digeriñ treuzfollennoù" @@ -8789,7 +8823,7 @@ msgid "Saving canceled" msgstr "Enrolladur dilezet" #: ../app/dialogs/file-save-dialog.c:705 -#: ../app/widgets/gimpdnd-xds.c:183 +#: ../app/widgets/gimpdnd-xds.c:185 #, c-format msgid "" "Saving '%s' failed:\n" @@ -8808,6 +8842,10 @@ msgstr "Kefluniañ ar gael" msgid "Configure Image Grid" msgstr "Kefluniañ skeudenn ar gael" +#: ../app/dialogs/grid-dialog.c:152 +msgid "Grid" +msgstr "Kael" + #: ../app/dialogs/image-merge-layers-dialog.c:64 msgid "Merge Layers" msgstr "Toueziañ an treuzfollennoù" @@ -9271,7 +9309,6 @@ msgid "Interface" msgstr "Ketal" #: ../app/dialogs/preferences-dialog.c:1598 -#| msgid "Language:" msgid "Language" msgstr "Yezh" @@ -9591,7 +9628,7 @@ msgstr "Skrammañ" #. Transparency #: ../app/dialogs/preferences-dialog.c:2298 msgid "Transparency" -msgstr "Demerez" +msgstr "Treuzweluster" #: ../app/dialogs/preferences-dialog.c:2302 msgid "_Check style:" @@ -9978,19 +10015,19 @@ msgstr "Ment an dreuzfollenn" msgid "Resize _layers:" msgstr "Admentañ an treuzfollennoù :" -#: ../app/dialogs/resolution-calibrate-dialog.c:72 +#: ../app/dialogs/resolution-calibrate-dialog.c:69 msgid "Calibrate Monitor Resolution" msgstr "Stalonañ diarunusted ar skramm" -#: ../app/dialogs/resolution-calibrate-dialog.c:131 +#: ../app/dialogs/resolution-calibrate-dialog.c:128 msgid "Measure the rulers and enter their lengths:" msgstr "Muzuliañ ar reolennoù hag enankañ o led :" -#: ../app/dialogs/resolution-calibrate-dialog.c:156 +#: ../app/dialogs/resolution-calibrate-dialog.c:153 msgid "_Horizontal:" msgstr "A-_zremm :" -#: ../app/dialogs/resolution-calibrate-dialog.c:161 +#: ../app/dialogs/resolution-calibrate-dialog.c:158 msgid "_Vertical:" msgstr "A-_serzh :" @@ -10181,25 +10218,25 @@ msgstr "S" msgid "_Sample Merged" msgstr "Standilhonoù toueziet" -#: ../app/display/gimpdisplayshell.c:500 +#: ../app/display/gimpdisplayshell.c:502 msgid "Access the image menu" msgstr "Tizhout lañser ar skeudennoù" -#: ../app/display/gimpdisplayshell.c:611 +#: ../app/display/gimpdisplayshell.c:616 msgid "Zoom image when window size changes" msgstr "Zoumañ a ra ar skeudenn pa gemm ment ar prenestr" -#: ../app/display/gimpdisplayshell.c:640 +#: ../app/display/gimpdisplayshell.c:645 msgid "Toggle Quick Mask" msgstr "(Diw)gweredekaat ar maskl herrek" -#: ../app/display/gimpdisplayshell.c:663 +#: ../app/display/gimpdisplayshell.c:668 msgid "Navigate the image display" msgstr "Merdeiñ war skrammad ar skeudenn" -#: ../app/display/gimpdisplayshell.c:731 -#: ../app/display/gimpdisplayshell.c:1316 -#: ../app/widgets/gimptoolbox.c:311 +#: ../app/display/gimpdisplayshell.c:736 +#: ../app/display/gimpdisplayshell.c:1315 +#: ../app/widgets/gimptoolbox.c:315 msgid "Drop image files here to open them" msgstr "Riklañ ar restroù skeudennoù amañ a-benn o digeriñ" @@ -10270,13 +10307,13 @@ msgid "The active layer's pixels are locked." msgstr "Prennet eo pikselioù an dreuzfollenn oberiant." #: ../app/display/gimpdisplayshell-dnd.c:512 -#: ../app/widgets/gimplayertreeview.c:757 +#: ../app/widgets/gimplayertreeview.c:734 msgid "Drop layers" msgstr "Lakaat treuzfollennoù" #: ../app/display/gimpdisplayshell-dnd.c:635 #: ../app/display/gimpdisplayshell-dnd.c:657 -#: ../app/widgets/gimplayertreeview.c:834 +#: ../app/widgets/gimplayertreeview.c:811 #: ../app/widgets/gimptoolbox-dnd.c:274 msgid "Dropped Buffer" msgstr "Skurzer lakaet" @@ -10289,12 +10326,12 @@ msgstr "Siloù skrammañ al livioù" msgid "Configure Color Display Filters" msgstr "Kefluniañ siloù skrammañ al livioù" -#: ../app/display/gimpdisplayshell-handlers.c:605 +#: ../app/display/gimpdisplayshell-handlers.c:587 #, c-format msgid "Image saved to '%s'" msgstr "Skeudenn bet enrollet e '%s'" -#: ../app/display/gimpdisplayshell-handlers.c:619 +#: ../app/display/gimpdisplayshell-handlers.c:601 #, c-format msgid "Image exported to '%s'" msgstr "Skeudenn bet ezporzhiet e '%s'" @@ -10329,7 +10366,7 @@ msgstr "(skarzhañ)" #: ../app/display/gimpdisplayshell-title.c:356 #: ../app/display/gimpdisplayshell-title.c:369 -#: ../app/widgets/gimpactiongroup.c:848 +#: ../app/widgets/gimpactiongroup.c:870 msgid "(none)" msgstr "(Tra ebet)" @@ -10345,7 +10382,7 @@ msgstr "(erlec'hiet)" msgid " (imported)" msgstr "(enporzhiet)" -#: ../app/display/gimpstatusbar.c:375 +#: ../app/display/gimpstatusbar.c:361 #, c-format msgid "Cancel %s" msgstr "Dilezel %s" @@ -10415,7 +10452,7 @@ msgstr "ket ur restr Liveoù mod GIMP" msgid "Documents" msgstr "Teulioù" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:114 msgid "GIMP Startup" msgstr "Loc'hadur eus GIMP" @@ -10424,11 +10461,11 @@ msgstr "Loc'hadur eus GIMP" msgid "Airbrush" msgstr "Aervroust" -#: ../app/paint/gimpbrushcore.c:431 +#: ../app/paint/gimpbrushcore.c:435 msgid "No brushes available for use with this tool." msgstr "N'eus broust hegerz ebet da arverañ gant ar benveg-mañ." -#: ../app/paint/gimpbrushcore.c:438 +#: ../app/paint/gimpbrushcore.c:442 msgid "No paint dynamics available for use with this tool." msgstr "N'eus dialusk broust hegerz ebet da arverañ gant ar benveg-mañ." @@ -10493,7 +10530,7 @@ msgstr "N'eus ket pikoù a-walc'h gant an tres" msgid "Paint" msgstr "Pentañ" -#: ../app/paint/gimppaintoptions.c:136 +#: ../app/paint/gimppaintoptions.c:138 msgid "Brush Scale" msgstr "Skeul ar broust" @@ -10564,7 +10601,7 @@ msgstr "Lemmaat" msgid "Combine Masks" msgstr "Kedaozañ ar maskloù" -#: ../app/pdb/drawable-cmds.c:941 +#: ../app/pdb/drawable-cmds.c:885 msgid "Plug-In" msgstr "Enlugellad" @@ -10700,47 +10737,57 @@ msgstr "Anv hentenn bentañ goullo didalvoudek" msgid "Paint method '%s' does not exist" msgstr "An hentenn bentañ '%s' n'eus ket anezhi" -#: ../app/pdb/gimppdb-utils.c:316 +#: ../app/pdb/gimppdb-utils.c:318 #, c-format msgid "Item '%s' (%d) can not be used because it has not been added to an image" msgstr "An ergorenn '%s' (%d) n'hall ket bezañ arveret rak n'eo ket bet ouzhpennet d'ar skeudenn" -#: ../app/pdb/gimppdb-utils.c:341 +#: ../app/pdb/gimppdb-utils.c:328 +#, c-format +msgid "Item '%s' (%d) can not be used because it is attached to another image" +msgstr "An ergorenn '%s' (%d) n'hall ket bezañ arveret rak staget eo d'ur skeudenn all" + +#: ../app/pdb/gimppdb-utils.c:357 +#, c-format +msgid "Item '%s' (%d) can not be used because it is not a direct child of an item tree" +msgstr "An ergorenn '%s' (%d) n'hall ket bezañ arveret rak n'eo ket ur bugel war-eeun eus gwezennad an ergorennoù" + +#: ../app/pdb/gimppdb-utils.c:379 #, c-format msgid "Item '%s' (%d) has already been added to an image" msgstr "An ergorenn '%s' (%d) zo ket ouzhpennet d'ar skeudenn endeo" -#: ../app/pdb/gimppdb-utils.c:349 +#: ../app/pdb/gimppdb-utils.c:387 #, c-format msgid "Trying to add item '%s' (%d) to wrong image" msgstr "O klask da ouzhpennañ an ergorenn '%s' (%d) d'ar skeudenn fall" -#: ../app/pdb/gimppdb-utils.c:368 +#: ../app/pdb/gimppdb-utils.c:406 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" msgstr "An ergorenn '%s' (%d) n'hall ket bezañ daskemmet rak prennet eo hec'h endalc'had" -#: ../app/pdb/gimppdb-utils.c:388 +#: ../app/pdb/gimppdb-utils.c:426 #, c-format msgid "Item '%s' (%d) cannot be modified because it is a group item" msgstr "An ergorenn '%s' (%d) n'hall ket bezañ daskemmet rak ur strollad eo" -#: ../app/pdb/gimppdb-utils.c:409 +#: ../app/pdb/gimppdb-utils.c:447 #, c-format msgid "Layer '%s' (%d) can not be used because it is not a text layer" msgstr "An dreuzfollenn '%s' (%d) n'hall ket bezañ arveret rak n'eo ket un dreuzfollennad testenn" -#: ../app/pdb/gimppdb-utils.c:450 +#: ../app/pdb/gimppdb-utils.c:488 #, c-format msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" msgstr "Ar skeudenn '%s' (%d) zo he rizh '%s' met ur skeudenn he rizh '%s\" a oa gortozet" -#: ../app/pdb/gimppdb-utils.c:473 +#: ../app/pdb/gimppdb-utils.c:511 #, c-format msgid "Image '%s' (%d) is already of type '%s'" msgstr "Ar skeudenn '%s' (%d) zo he rizh '%s' endeo" -#: ../app/pdb/gimppdb-utils.c:501 +#: ../app/pdb/gimppdb-utils.c:539 #, c-format msgid "Vectors object %d does not contain stroke with ID %d" msgstr "An ergorenn dre sturiadelloù %d n'he deus ket tresoù dre naoudioù (ID) %d enni." @@ -10796,10 +10843,15 @@ msgstr "An treugennad '%s' en deus distroet '%s' evel ur werzh distreiñ '%s' ( msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range." msgstr "An treugennad '%s' zo bet galvet gant ar werzh '%s' evit un arguzenn '%s' (#%d, rizh %s). Er maez eus al ledad emañ ar werzh-mañ." -#: ../app/pdb/image-cmds.c:2311 +#: ../app/pdb/image-cmds.c:2341 msgid "Image resolution is out of bounds, using the default resolution instead." msgstr "Dreist ar bevennoù emañ diarunusted ar skeudenn, diarunusted dre ziouer en he lec'h." +#: ../app/pdb/layer-cmds.c:443 +#: ../app/pdb/layer-cmds.c:481 +msgid "Move Layer" +msgstr "Dilec'hiañ an dreuzfollenn" + #: ../app/pdb/selection-tools-cmds.c:217 #: ../app/tools/gimpfreeselecttool.c:198 msgid "Free Select" @@ -10811,57 +10863,57 @@ msgid "Failed to create text layer" msgstr "C'hwitadenn war krouiñ an dreuzfolennad testenn" #: ../app/pdb/text-layer-cmds.c:162 -#: ../app/pdb/text-layer-cmds.c:234 -#: ../app/pdb/text-layer-cmds.c:313 -#: ../app/pdb/text-layer-cmds.c:386 -#: ../app/pdb/text-layer-cmds.c:458 -#: ../app/pdb/text-layer-cmds.c:530 -#: ../app/pdb/text-layer-cmds.c:602 -#: ../app/pdb/text-layer-cmds.c:674 -#: ../app/pdb/text-layer-cmds.c:746 -#: ../app/pdb/text-layer-cmds.c:816 -#: ../app/pdb/text-layer-cmds.c:888 -#: ../app/pdb/text-layer-cmds.c:960 -#: ../app/pdb/text-layer-cmds.c:1032 -#: ../app/pdb/text-layer-cmds.c:1068 -#: ../app/pdb/text-layer-cmds.c:1147 +#: ../app/pdb/text-layer-cmds.c:272 +#: ../app/pdb/text-layer-cmds.c:351 +#: ../app/pdb/text-layer-cmds.c:424 +#: ../app/pdb/text-layer-cmds.c:496 +#: ../app/pdb/text-layer-cmds.c:568 +#: ../app/pdb/text-layer-cmds.c:640 +#: ../app/pdb/text-layer-cmds.c:712 +#: ../app/pdb/text-layer-cmds.c:784 +#: ../app/pdb/text-layer-cmds.c:854 +#: ../app/pdb/text-layer-cmds.c:926 +#: ../app/pdb/text-layer-cmds.c:998 +#: ../app/pdb/text-layer-cmds.c:1070 +#: ../app/pdb/text-layer-cmds.c:1106 +#: ../app/pdb/text-layer-cmds.c:1185 msgid "Set text layer attribute" msgstr "Arventennañ doareenn an dreuzfolennad testenn" -#: ../app/pdb/vectors-cmds.c:644 +#: ../app/pdb/vectors-cmds.c:587 msgid "Remove path stroke" msgstr "Dilemel tresadur un treug" -#: ../app/pdb/vectors-cmds.c:680 +#: ../app/pdb/vectors-cmds.c:623 msgid "Close path stroke" msgstr "Serriñ tresadur un treug" -#: ../app/pdb/vectors-cmds.c:720 +#: ../app/pdb/vectors-cmds.c:663 msgid "Translate path stroke" msgstr "Treiñ tresadur un treug" -#: ../app/pdb/vectors-cmds.c:760 +#: ../app/pdb/vectors-cmds.c:703 msgid "Scale path stroke" msgstr "Skeulaat tresadur un treug" -#: ../app/pdb/vectors-cmds.c:802 +#: ../app/pdb/vectors-cmds.c:745 msgid "Rotate path stroke" msgstr "C'hwelañ tresadur un treug" -#: ../app/pdb/vectors-cmds.c:842 -#: ../app/pdb/vectors-cmds.c:886 +#: ../app/pdb/vectors-cmds.c:785 +#: ../app/pdb/vectors-cmds.c:829 msgid "Flip path stroke" msgstr "Gwintañ tresadur un treug" -#: ../app/pdb/vectors-cmds.c:1015 -#: ../app/pdb/vectors-cmds.c:1137 -#: ../app/pdb/vectors-cmds.c:1356 +#: ../app/pdb/vectors-cmds.c:958 +#: ../app/pdb/vectors-cmds.c:1080 +#: ../app/pdb/vectors-cmds.c:1299 msgid "Add path stroke" msgstr "Ouzhpennañ tresadur un treug" -#: ../app/pdb/vectors-cmds.c:1189 -#: ../app/pdb/vectors-cmds.c:1242 -#: ../app/pdb/vectors-cmds.c:1303 +#: ../app/pdb/vectors-cmds.c:1132 +#: ../app/pdb/vectors-cmds.c:1185 +#: ../app/pdb/vectors-cmds.c:1246 msgid "Extend path stroke" msgstr "Ledanaat tresadur an treug" @@ -11075,19 +11127,16 @@ msgstr "" "Direizh eo perzhioù testenn zo, moarvat. Keit ha ma chomo diembann an destenn n'eus abeg ebet da vezañ nec'het diwar he fenn." #: ../app/text/text-enums.c:23 -#| msgid "Dynamics" msgctxt "text-box-mode" msgid "Dynamic" msgstr "Dialusk" #: ../app/text/text-enums.c:24 -#| msgctxt "source-align-mode" -#| msgid "Fixed" msgctxt "text-box-mode" msgid "Fixed" msgstr "Ratreet" -#: ../app/tools/gimp-tools.c:325 +#: ../app/tools/gimp-tools.c:352 msgid "" "This tool has\n" "no options." @@ -11104,8 +11153,6 @@ msgid "_Airbrush" msgstr "_Aervroust" #: ../app/tools/gimpairbrushtool.c:88 -#| msgctxt "layer-mode-effects" -#| msgid "Lighten only" msgid "Motion only" msgstr "Fiñval hepken" @@ -11116,7 +11163,6 @@ msgid "Rate:" msgstr "Feur :" #: ../app/tools/gimpairbrushtool.c:103 -#| msgid "Yellow:" msgid "Flow:" msgstr "Lanv :" @@ -11251,6 +11297,10 @@ msgstr "Donder uc'hek :" msgid "Threshold:" msgstr "Gwehin :" +#: ../app/tools/gimpblendtool.c:109 +msgid "Blend" +msgstr "Kemmeskad" + #: ../app/tools/gimpblendtool.c:110 msgid "Blend Tool: Fill selected area with a color gradient" msgstr "Benveg Meskañ : Leuniañ ar maez diuzet gant un ilrezenn liv" @@ -11278,6 +11328,10 @@ msgstr "%s evit dilec'hiañ al linenn a-bezh" msgid "Blend: " msgstr "Meskañ : " +#: ../app/tools/gimpbrightnesscontrasttool.c:111 +msgid "Brightness-Contrast" +msgstr "Lintr-Dargemm" + #: ../app/tools/gimpbrightnesscontrasttool.c:112 msgid "Brightness/Contrast Tool: Adjust brightness and contrast" msgstr "Benveg Lintr/Dargemm : Kengeidañ al lintr hag an dargemm" @@ -11392,6 +11446,11 @@ msgstr "Benveg Diuzañ dre Liv : Diuzañ maezioù gant livioù damheñvel" msgid "_By Color Select" msgstr "Diuz_ad dre liv" +#: ../app/tools/gimpbycolorselecttool.c:82 +msgctxt "command" +msgid "Select by Color" +msgstr "Diuzañ dre liv" + #: ../app/tools/gimpclonetool.c:61 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" msgstr "Benveg Klonañ : eilañ dre ziuz ur skeudenn pe ur goustur en ur arverañ ur broust" @@ -11426,6 +11485,10 @@ msgstr "Tarzh" msgid "Alignment:" msgstr "Desteudadur :" +#: ../app/tools/gimpcolorbalancetool.c:94 +msgid "Color Balance" +msgstr "Mentel al livioù" + #: ../app/tools/gimpcolorbalancetool.c:95 msgid "Color Balance Tool: Adjust color distribution" msgstr "Benveg Kempouez al livioù : kengeidañ dasparzhadur al livioù" @@ -11497,6 +11560,10 @@ msgstr "Adderaouekaat an _etremez" msgid "Preserve _luminosity" msgstr "Mirout al _lintr" +#: ../app/tools/gimpcolorizetool.c:90 +msgid "Colorize" +msgstr "Livañ" + #: ../app/tools/gimpcolorizetool.c:91 msgid "Colorize Tool: Colorize the image" msgstr "Benveg Livañ : Livañ ar skeudenn" @@ -11602,16 +11669,20 @@ msgstr "Klikañ war ar skeudenn evit ouzhpennañ al liv war al livaoueg" msgid "Color Picker Information" msgstr "Stlennoù ar c'harrennig livioù" -#: ../app/tools/gimpcolortool.c:260 -#: ../app/tools/gimpcolortool.c:440 +#: ../app/tools/gimpcolortool.c:268 +#: ../app/tools/gimpcolortool.c:452 msgid "Move Sample Point: " msgstr "Dilec'hiañ ar poent standilhonañ : " -#: ../app/tools/gimpcolortool.c:433 +#: ../app/tools/gimpcolortool.c:444 +msgid "Remove Sample Point" +msgstr "Dilemel ar poent standilhonañ" + +#: ../app/tools/gimpcolortool.c:445 msgid "Cancel Sample Point" msgstr "Dilezel ur poent standilhonañ" -#: ../app/tools/gimpcolortool.c:441 +#: ../app/tools/gimpcolortool.c:453 msgid "Add Sample Point: " msgstr "Ouzhpennañ ur poent standilhonañ : " @@ -11687,6 +11758,10 @@ msgstr "Klikañ pe bouezañ war Enankañ evit didroc'hañ" msgid "There is no active layer to crop." msgstr "N'eus treuzfollenn oberiant ebet da zidroc'hañ." +#: ../app/tools/gimpcurvestool.c:140 +msgid "Curves" +msgstr "Krommennoù" + #: ../app/tools/gimpcurvestool.c:141 msgid "Curves Tool: Adjust color curves" msgstr "Benveg Krommennoù : Kengeidañ krommennoù liv" @@ -11761,8 +11836,8 @@ msgid "Desaturate (Remove Colors)" msgstr "Dibeurvec'hiañ (Dilemel al livioù)" #: ../app/tools/gimpdesaturatetool.c:124 -msgid "Desaturate does only operate on RGB layers." -msgstr "War treuzfollennoù RGG e wered an dibeurvec'hiañ nemetken." +msgid "Desaturate only operates on RGB layers." +msgstr "War treuzfollennoù mod RGG e wered an dibeurvec'hiañ nemetken." #: ../app/tools/gimpdesaturatetool.c:193 msgid "Choose shade of gray based on:" @@ -11821,6 +11896,10 @@ msgstr "Etremez" msgid "Exposure:" msgstr "Kizadur :" +#: ../app/tools/gimpeditselectiontool.c:241 +msgid "Move Selection" +msgstr "Dilec'hiañ an diuzad" + #: ../app/tools/gimpeditselectiontool.c:245 #: ../app/tools/gimpeditselectiontool.c:1249 msgid "Move Floating Selection" @@ -11845,7 +11924,7 @@ msgstr "Diuzañ _elipsenn" #: ../app/tools/gimperasertool.c:66 msgid "Eraser Tool: Erase to background or transparency using a brush" -msgstr "Benveg Diverkell : Diverkañ betek an drekva pe treuzwelusted un ur arverañ ur broust" +msgstr "Benveg Diverkell : Diverkañ an drekva pe an treuzweluster en ur arverañ ur broust" #: ../app/tools/gimperasertool.c:67 msgid "_Eraser" @@ -11892,6 +11971,11 @@ msgstr "Benveg Gwintañ : Tuginañ an dreuzfollenn, an diuzad pe an treug a-zrem msgid "_Flip" msgstr "_Gwintañ" +#: ../app/tools/gimpfliptool.c:116 +msgctxt "command" +msgid "Flip" +msgstr "Gwintañ" + #: ../app/tools/gimpforegroundselectoptions.c:78 #: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" @@ -11985,7 +12069,7 @@ msgstr "Merkañ ar rakva dre bentañ an ergorenn da eztennañ" msgid "Roughly outline the object to extract" msgstr "Sevel dre vras trolinenn an ergorenn da eztennañ" -#: ../app/tools/gimpforegroundselecttool.c:769 +#: ../app/tools/gimpforegroundselecttool.c:773 msgctxt "command" msgid "Foreground Select" msgstr "Diuzad ar rakva" @@ -12031,6 +12115,11 @@ msgstr "Benveg Diuzañ amspis : Diuzañ ur maez kevelek war diazez al liv" msgid "Fu_zzy Select" msgstr "Diu_zad dispis" +#: ../app/tools/gimpfuzzyselecttool.c:80 +msgctxt "command" +msgid "Fuzzy Select" +msgstr "Diuzad dispis" + #: ../app/tools/gimpgegltool.c:93 #: ../app/tools/gimpgegltool.c:112 msgid "GEGL Operation" @@ -12058,8 +12147,6 @@ msgid "Operation Settings" msgstr "Arventennoù gwezhiañ" #: ../app/tools/gimpgegltool.c:435 -#| msgctxt "edit-action" -#| msgid "Remove all operations from the undo history" msgid "Select an operation from the list above" msgstr "Diuzañ ur gwezhadur diwar roll a-us" @@ -12183,7 +12270,7 @@ msgstr "Kengeidañ" #: ../app/tools/gimpinkoptions-gui.c:67 #: ../app/tools/gimpinkoptions-gui.c:92 #: ../app/tools/gimprectangleoptions.c:972 -#: ../app/tools/gimptextoptions.c:471 +#: ../app/tools/gimptextoptions.c:489 msgid "Size:" msgstr "Ment :" @@ -12457,16 +12544,20 @@ msgstr "Benveg Dilec'hiañ : Dilec'hiañ an treuzfollennoù, an diuzadoù hag an msgid "_Move" msgstr "_Dilec'hiañ" -#: ../app/tools/gimpmovetool.c:277 -#: ../app/tools/gimpmovetool.c:569 +#: ../app/tools/gimpmovetool.c:285 +#: ../app/tools/gimpmovetool.c:581 msgid "Move Guide: " msgstr "Dilec'hiañ un dealf : " -#: ../app/tools/gimpmovetool.c:563 +#: ../app/tools/gimpmovetool.c:575 +msgid "Remove Guide" +msgstr "Dilemel an dealf" + +#: ../app/tools/gimpmovetool.c:575 msgid "Cancel Guide" msgstr "Nullañ an dealf" -#: ../app/tools/gimpmovetool.c:569 +#: ../app/tools/gimpmovetool.c:581 msgid "Add Guide: " msgstr "Ouzhpennañ un dealf : " @@ -12481,14 +12572,14 @@ msgstr "_Barr livañ" #: ../app/tools/gimppaintoptions-gui.c:90 #: ../app/tools/gimpselectionoptions.c:210 #: ../app/widgets/gimpbrushselect.c:193 -#: ../app/widgets/gimplayertreeview.c:289 +#: ../app/widgets/gimplayertreeview.c:266 msgid "Mode:" msgstr "Mod :" #: ../app/tools/gimppaintoptions-gui.c:105 #: ../app/tools/gimptransformoptions.c:347 #: ../app/widgets/gimpbrushselect.c:180 -#: ../app/widgets/gimplayertreeview.c:312 +#: ../app/widgets/gimplayertreeview.c:289 msgid "Opacity:" msgstr "Demerez :" @@ -12671,7 +12762,7 @@ msgid "_Rectangle Select" msgstr "Diuzad _reizhkornek" #: ../app/tools/gimprectangletool.c:1156 -#: ../app/tools/gimprectangletool.c:2103 +#: ../app/tools/gimprectangletool.c:2130 msgid "Rectangle: " msgstr "Reizhkorn : " @@ -12680,8 +12771,8 @@ msgid "Allow completely transparent regions to be selected" msgstr "Aotren ar maezioù treuzwelus da vat da vezañ diuzet" #: ../app/tools/gimpregionselectoptions.c:89 -msgid "Base region_select on all visible layers" -msgstr "Diuzad ur maez diazez war an holl dreuzfollennoù hewel" +msgid "Base selection on all visible layers" +msgstr "Diuzad ur maez diazezet war an holl dreuzfollennoù hewel" #: ../app/tools/gimpregionselectoptions.c:201 msgid "Select transparent areas" @@ -12707,6 +12798,11 @@ msgstr "Benveg c'hwelañ : C'hwelañ an dreuzfollenn an treug pe an diuzad" msgid "_Rotate" msgstr "_C'hwelañ" +#: ../app/tools/gimprotatetool.c:121 +msgctxt "command" +msgid "Rotate" +msgstr "C'hwelañ" + #: ../app/tools/gimprotatetool.c:188 msgid "_Angle:" msgstr "_Korn :" @@ -12737,7 +12833,7 @@ msgid "Scale" msgstr "Skeulaat" #: ../app/tools/gimpselectionoptions.c:257 -#: ../app/tools/gimptextoptions.c:484 +#: ../app/tools/gimptextoptions.c:502 msgid "Antialiasing" msgstr "Lufrañ" @@ -12822,63 +12918,63 @@ msgstr "Klikañ evit ledanaat" msgid "Click to smudge the line" msgstr "Klikañ evit ledanaat al linenn" -#: ../app/tools/gimptextoptions.c:133 +#: ../app/tools/gimptextoptions.c:137 msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes" msgstr "Ar feurioù kengeidañ a veka an nodrezhoù evit kaout lizherennoù spis gant ar mentoù bihan." -#: ../app/tools/gimptextoptions.c:141 +#: ../app/tools/gimptextoptions.c:145 msgid "The text language may have an effect on the way the text is rendered." msgstr "Marteze e vo un efed war deouez an destenn e-keñver yezh an destenn." -#: ../app/tools/gimptextoptions.c:157 +#: ../app/tools/gimptextoptions.c:161 msgid "Indentation of the first line" msgstr "Dentadur al linenn gentañ" -#: ../app/tools/gimptextoptions.c:163 +#: ../app/tools/gimptextoptions.c:167 msgid "Adjust line spacing" msgstr "Kengeidañ esaouiñ al linennoù" -#: ../app/tools/gimptextoptions.c:169 +#: ../app/tools/gimptextoptions.c:173 msgid "Adjust letter spacing" msgstr "Kengeidañ esaouiñ al lizherennoù" -#: ../app/tools/gimptextoptions.c:175 +#: ../app/tools/gimptextoptions.c:179 msgid "Text box resize mode" msgstr "Mod admentañ ar voestad testenn" -#: ../app/tools/gimptextoptions.c:182 +#: ../app/tools/gimptextoptions.c:186 msgid "Use an external editor window for text entry, instead of direct-on-canvas editing" msgstr "Arverit prenestr un embanner diavaez evit an enankad testenn e-lec'h embann war-eeun war ar steuenn" -#: ../app/tools/gimptextoptions.c:464 +#: ../app/tools/gimptextoptions.c:482 msgid "Font:" msgstr "Nodrezh :" -#: ../app/tools/gimptextoptions.c:480 +#: ../app/tools/gimptextoptions.c:498 msgid "Use editor" msgstr "Arverañ an embanner" -#: ../app/tools/gimptextoptions.c:500 +#: ../app/tools/gimptextoptions.c:518 msgid "Hinting:" msgstr "Feurioù kengeidañ :" -#: ../app/tools/gimptextoptions.c:504 +#: ../app/tools/gimptextoptions.c:522 msgid "Text Color" msgstr "Liv an destenn" -#: ../app/tools/gimptextoptions.c:509 +#: ../app/tools/gimptextoptions.c:527 msgid "Color:" msgstr "Liv :" -#: ../app/tools/gimptextoptions.c:515 +#: ../app/tools/gimptextoptions.c:533 msgid "Justify:" msgstr "Marzekaat :" -#: ../app/tools/gimptextoptions.c:538 +#: ../app/tools/gimptextoptions.c:556 msgid "Box:" msgstr "Boest :" -#: ../app/tools/gimptextoptions.c:552 +#: ../app/tools/gimptextoptions.c:570 msgid "Language:" msgstr "Yezh :" @@ -12917,7 +13013,7 @@ msgstr "" "\n" "Embann an dreuzfollenn pe grouiñ unan nevez diwar he doareennoù testennek a vez graet." -#: ../app/tools/gimptexttool-editor.c:1111 +#: ../app/tools/gimptexttool-editor.c:1118 msgid "GIMP Text Editor" msgstr "Embanner testennoù GIMP" @@ -13032,303 +13128,365 @@ msgstr "" msgid "Selection from Path" msgstr "Diuzad diouzh an treug" -#: ../app/tools/gimpvectortool.c:163 +#: ../app/tools/gimpvectortool.c:162 msgid "Paths Tool: Create and edit paths" msgstr "Benveg an treugoù : Krouiñ ha daskemmañ treugoù" -#: ../app/tools/gimpvectortool.c:164 +#: ../app/tools/gimpvectortool.c:163 msgid "Pat_hs" msgstr "Treu_goù" -#: ../app/tools/gimpvectortool.c:254 +#: ../app/tools/gimpvectortool.c:253 msgid "The active path is locked." msgstr "Prennet eo an treug oberiant." -#: ../app/tools/gimpvectortool.c:342 +#: ../app/tools/gimpvectortool.c:341 msgid "Add Stroke" msgstr "Ouzhpennañ un tresadur" -#: ../app/tools/gimpvectortool.c:366 +#: ../app/tools/gimpvectortool.c:365 msgid "Add Anchor" msgstr "Ouzhpennañ un eor" -#: ../app/tools/gimpvectortool.c:392 +#: ../app/tools/gimpvectortool.c:391 msgid "Insert Anchor" msgstr "Enlakaat un eor" -#: ../app/tools/gimpvectortool.c:423 +#: ../app/tools/gimpvectortool.c:422 msgid "Drag Handle" msgstr "Sachañ war un dornell" -#: ../app/tools/gimpvectortool.c:453 +#: ../app/tools/gimpvectortool.c:452 msgid "Drag Anchor" msgstr "Sachañ war un eor" -#: ../app/tools/gimpvectortool.c:471 +#: ../app/tools/gimpvectortool.c:470 msgid "Drag Anchors" msgstr "Sachañ war eorioù" -#: ../app/tools/gimpvectortool.c:494 +#: ../app/tools/gimpvectortool.c:493 msgid "Drag Curve" msgstr "Drag krommennoù" -#: ../app/tools/gimpvectortool.c:523 +#: ../app/tools/gimpvectortool.c:522 msgid "Connect Strokes" msgstr "Kennaskañ an tresadurioù" -#: ../app/tools/gimpvectortool.c:555 +#: ../app/tools/gimpvectortool.c:554 msgid "Drag Path" msgstr "Sachañ war an treug" -#: ../app/tools/gimpvectortool.c:566 +#: ../app/tools/gimpvectortool.c:565 msgid "Convert Edge" msgstr "Amdreiñ ur riblenn" -#: ../app/tools/gimpvectortool.c:597 +#: ../app/tools/gimpvectortool.c:596 msgid "Delete Anchor" msgstr "Dilemel un eor" -#: ../app/tools/gimpvectortool.c:620 +#: ../app/tools/gimpvectortool.c:619 msgid "Delete Segment" msgstr "Dilemel ur regenn" -#: ../app/tools/gimpvectortool.c:839 +#: ../app/tools/gimpvectortool.c:838 msgid "Move Anchors" msgstr "Dilec'hiañ eorioù" -#: ../app/tools/gimpvectortool.c:1199 +#: ../app/tools/gimpvectortool.c:1198 msgid "Click to pick path to edit" msgstr "Klikañ evit diuzañ un treug da zaskemmañ" -#: ../app/tools/gimpvectortool.c:1203 +#: ../app/tools/gimpvectortool.c:1202 msgid "Click to create a new path" msgstr "Klikañ evit krouiñ un treug nevez" -#: ../app/tools/gimpvectortool.c:1207 +#: ../app/tools/gimpvectortool.c:1206 msgid "Click to create a new component of the path" msgstr "Klikañ evit krouiñ ur parzh nevez eus an treug" -#: ../app/tools/gimpvectortool.c:1211 +#: ../app/tools/gimpvectortool.c:1210 msgid "Click or Click-Drag to create a new anchor" msgstr "Klikañ pe klikañ-riklañ evit krouiñ un eor nevez" -#: ../app/tools/gimpvectortool.c:1221 -#: ../app/tools/gimpvectortool.c:1228 +#: ../app/tools/gimpvectortool.c:1220 +#: ../app/tools/gimpvectortool.c:1227 msgid "Click-Drag to move the anchor around" msgstr "Klikañ-riklañ evit dilec'hiañ an eor tro-dro dezhi" -#: ../app/tools/gimpvectortool.c:1232 -#: ../app/tools/gimpvectortool.c:1255 +#: ../app/tools/gimpvectortool.c:1231 +#: ../app/tools/gimpvectortool.c:1254 msgid "Click-Drag to move the anchors around" msgstr "Klikañ-riklañ evit dilec'hiañ an eorioù tro-dro dezhi" -#: ../app/tools/gimpvectortool.c:1238 +#: ../app/tools/gimpvectortool.c:1237 msgid "Click-Drag to move the handle around" msgstr "Klikañ-riklañ evit dilec'hiañ an dornelloù tro-dro dezhi" -#: ../app/tools/gimpvectortool.c:1245 -#| msgid "Click-Drag to move the handle around" +#: ../app/tools/gimpvectortool.c:1244 msgid "Click-Drag to move the handles around symmetrically" msgstr "Klikañ-riklañ evit dilec'hiañ an dornelloù tro-dro dezhi gant un doare kemparzhel" -#: ../app/tools/gimpvectortool.c:1260 +#: ../app/tools/gimpvectortool.c:1259 msgid "Click-Drag to change the shape of the curve" msgstr "Klikañ-riklañ evit kemmañ stumm ar grommenn" -#: ../app/tools/gimpvectortool.c:1263 +#: ../app/tools/gimpvectortool.c:1262 #, c-format msgid "%s: symmetrical" msgstr "%s : kemparzhek" -#: ../app/tools/gimpvectortool.c:1268 +#: ../app/tools/gimpvectortool.c:1267 msgid "Click-Drag to move the component around" msgstr "Klikañ-riklañ evit dilec'hiañ ar parzh dro dro dezhañ" -#: ../app/tools/gimpvectortool.c:1276 +#: ../app/tools/gimpvectortool.c:1275 msgid "Click-Drag to move the path around" msgstr "Klikañ-riklañ evit dilec'hiañ an treug dro dro dezhañ" -#: ../app/tools/gimpvectortool.c:1280 +#: ../app/tools/gimpvectortool.c:1279 msgid "Click-Drag to insert an anchor on the path" msgstr "Klikañ-riklañ evit enlakaat un eor war an treug" -#: ../app/tools/gimpvectortool.c:1288 +#: ../app/tools/gimpvectortool.c:1287 msgid "Click to delete this anchor" msgstr "Klikañ evit dilemel an eor-mañ" -#: ../app/tools/gimpvectortool.c:1292 +#: ../app/tools/gimpvectortool.c:1291 msgid "Click to connect this anchor with the selected endpoint" msgstr "Klikañ evit kennaskañ an eor-mañ ouzh ar poent dibenn bet dibabet" -#: ../app/tools/gimpvectortool.c:1297 +#: ../app/tools/gimpvectortool.c:1296 msgid "Click to open up the path" msgstr "Klikañ evit digeriñ an treug" -#: ../app/tools/gimpvectortool.c:1301 +#: ../app/tools/gimpvectortool.c:1300 msgid "Click to make this node angular" msgstr "Klikañ a-benn ma yay ar c'hlom-mañ da gornek" -#: ../app/tools/gimpvectortool.c:1811 +#: ../app/tools/gimpvectortool.c:1810 msgid "Delete Anchors" msgstr "Dilemel an eorioù" -#: ../app/tools/gimpvectortool.c:1957 -msgid "Path to selection" -msgstr "Treug etrezek an diuzad" - -#: ../app/tools/gimpvectortool.c:1984 +#: ../app/tools/gimpvectortool.c:1981 msgid "There is no active layer or channel to stroke to" msgstr "N'eus treuzfollenn pe sanell oberiant ebet da dresañ warno." -#: ../app/tools/tools-enums.c:91 +#: ../app/tools/tools-enums.c:92 msgctxt "rectangle-guide" msgid "No guides" msgstr "Dealf ebet" -#: ../app/tools/tools-enums.c:92 +#: ../app/tools/tools-enums.c:93 msgctxt "rectangle-guide" msgid "Center lines" msgstr "Kreizañ al linennoù" -#: ../app/tools/tools-enums.c:93 +#: ../app/tools/tools-enums.c:94 msgctxt "rectangle-guide" msgid "Rule of thirds" msgstr "Reolenn an trederennoù" -#: ../app/tools/tools-enums.c:94 +#: ../app/tools/tools-enums.c:95 +msgctxt "rectangle-guide" +msgid "Rule of fifths" +msgstr "Reolenn ar pempvedennoù" + +#: ../app/tools/tools-enums.c:96 msgctxt "rectangle-guide" msgid "Golden sections" msgstr "Diuzadoù alaouret" -#: ../app/tools/tools-enums.c:95 +#: ../app/tools/tools-enums.c:97 msgctxt "rectangle-guide" msgid "Diagonal lines" msgstr "Beskelloù" -#: ../app/tools/tools-enums.c:185 +#: ../app/tools/tools-enums.c:187 msgctxt "rectangle-tool-fixed-rule" msgid "Aspect ratio" msgstr "Parenn an neuz" -#: ../app/tools/tools-enums.c:186 +#: ../app/tools/tools-enums.c:188 msgctxt "rectangle-tool-fixed-rule" msgid "Width" msgstr "Led" -#: ../app/tools/tools-enums.c:187 +#: ../app/tools/tools-enums.c:189 msgctxt "rectangle-tool-fixed-rule" msgid "Height" msgstr "Sav" -#: ../app/tools/tools-enums.c:188 +#: ../app/tools/tools-enums.c:190 msgctxt "rectangle-tool-fixed-rule" msgid "Size" msgstr "Ment" -#: ../app/tools/tools-enums.c:217 +#: ../app/tools/tools-enums.c:219 msgctxt "rect-select-mode" msgid "Free select" msgstr "Diuzad gant an dorn" -#: ../app/tools/tools-enums.c:218 +#: ../app/tools/tools-enums.c:220 msgctxt "rect-select-mode" msgid "Fixed size" msgstr "Ment fest" -#: ../app/tools/tools-enums.c:219 +#: ../app/tools/tools-enums.c:221 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" msgstr "Parenn neuz fest" -#: ../app/tools/tools-enums.c:248 +#: ../app/tools/tools-enums.c:250 msgctxt "transform-type" msgid "Layer" msgstr "Treuzfollenn" -#: ../app/tools/tools-enums.c:249 +#: ../app/tools/tools-enums.c:251 msgctxt "transform-type" msgid "Selection" msgstr "Diuzad" -#: ../app/tools/tools-enums.c:250 +#: ../app/tools/tools-enums.c:252 msgctxt "transform-type" msgid "Path" msgstr "Treug" -#: ../app/tools/tools-enums.c:280 +#: ../app/tools/tools-enums.c:282 msgctxt "transform-preview-type" msgid "Outline" msgstr "Trolinenn" -#: ../app/tools/tools-enums.c:281 +#: ../app/tools/tools-enums.c:283 msgctxt "transform-preview-type" msgid "Grid" msgstr "Kael" -#: ../app/tools/tools-enums.c:282 +#: ../app/tools/tools-enums.c:284 msgctxt "transform-preview-type" msgid "Image" msgstr "Skeudenn" -#: ../app/tools/tools-enums.c:283 +#: ../app/tools/tools-enums.c:285 msgctxt "transform-preview-type" msgid "Image + Grid" msgstr "Skeudenn + Kael" -#: ../app/tools/tools-enums.c:311 +#: ../app/tools/tools-enums.c:313 msgctxt "transform-grid-type" msgid "Number of grid lines" msgstr "Niver a linennoù er gael" -#: ../app/tools/tools-enums.c:312 +#: ../app/tools/tools-enums.c:314 msgctxt "transform-grid-type" msgid "Grid line spacing" msgstr "Esaou al linennoù er gael" -#: ../app/tools/tools-enums.c:341 +#: ../app/tools/tools-enums.c:343 msgctxt "vector-mode" msgid "Design" msgstr "Ergrafañ" -#: ../app/tools/tools-enums.c:342 +#: ../app/tools/tools-enums.c:344 msgctxt "vector-mode" msgid "Edit" msgstr "Embann" -#: ../app/tools/tools-enums.c:343 +#: ../app/tools/tools-enums.c:345 msgctxt "vector-mode" msgid "Move" msgstr "Dilec'hiañ" -#: ../app/vectors/gimpvectors.c:195 +#: ../app/vectors/gimpvectors.c:203 +msgctxt "undo-type" msgid "Rename Path" msgstr "Adenvel an treug" -#: ../app/vectors/gimpvectors.c:196 -#: ../app/vectors/gimpvectors.c:335 +#: ../app/vectors/gimpvectors.c:204 +msgctxt "undo-type" msgid "Move Path" msgstr "Dilec'hiañ an treug" -#: ../app/vectors/gimpvectors.c:197 +#: ../app/vectors/gimpvectors.c:205 +msgctxt "undo-type" msgid "Scale Path" msgstr "Skeulaat an treug" -#: ../app/vectors/gimpvectors.c:198 +#: ../app/vectors/gimpvectors.c:206 +msgctxt "undo-type" msgid "Resize Path" msgstr "Admentañ an treug" -#: ../app/vectors/gimpvectors.c:199 -#: ../app/vectors/gimpvectors.c:434 +#: ../app/vectors/gimpvectors.c:207 +msgctxt "undo-type" msgid "Flip Path" msgstr "Gwintañ an treug" -#: ../app/vectors/gimpvectors.c:200 -#: ../app/vectors/gimpvectors.c:465 +#: ../app/vectors/gimpvectors.c:208 +msgctxt "undo-type" msgid "Rotate Path" msgstr "C'hwelañ an treug" -#: ../app/vectors/gimpvectors.c:201 -#: ../app/vectors/gimpvectors.c:495 +#: ../app/vectors/gimpvectors.c:209 +msgctxt "undo-type" +msgid "Transform Path" +msgstr "Treuzfurmiñ an treug" + +#: ../app/vectors/gimpvectors.c:210 +msgctxt "undo-type" +msgid "Stroke Path" +msgstr "Tresañ an treug" + +#: ../app/vectors/gimpvectors.c:211 +msgctxt "undo-type" +msgid "Path to Selection" +msgstr "Treug d'an diuzad" + +#: ../app/vectors/gimpvectors.c:212 +msgctxt "undo-type" +msgid "Reorder Path" +msgstr "Adurzhiañ an treug" + +#: ../app/vectors/gimpvectors.c:213 +msgctxt "undo-type" +msgid "Raise Path" +msgstr "Sevel an treug" + +#: ../app/vectors/gimpvectors.c:214 +msgctxt "undo-type" +msgid "Raise Path to Top" +msgstr "Sevel an treug d'an uhelañ" + +#: ../app/vectors/gimpvectors.c:215 +msgctxt "undo-type" +msgid "Lower Path" +msgstr "Diskenn an treug" + +#: ../app/vectors/gimpvectors.c:216 +msgctxt "undo-type" +msgid "Lower Path to Bottom" +msgstr "Diskenn an treug d'an izelañ" + +#: ../app/vectors/gimpvectors.c:217 +msgid "Path cannot be raised higher." +msgstr "N'haller ket sevel an treug uheloc'h." + +#: ../app/vectors/gimpvectors.c:218 +msgid "Path cannot be lowered more." +msgstr "N'haller ket diskenn an treug izeloc'h." + +#: ../app/vectors/gimpvectors.c:351 +msgid "Move Path" +msgstr "Dilec'hiañ an treug" + +#: ../app/vectors/gimpvectors.c:450 +msgid "Flip Path" +msgstr "Gwintañ an treug" + +#: ../app/vectors/gimpvectors.c:481 +msgid "Rotate Path" +msgstr "C'hwelañ an treug" + +#: ../app/vectors/gimpvectors.c:511 msgid "Transform Path" msgstr "Treuzfurmiñ an treug" @@ -13363,7 +13521,7 @@ msgstr "C'hwitadenn war enporzhiañ an treugoù diouzh '%s' : %s" msgid "_Search:" msgstr "_Klask :" -#: ../app/widgets/gimpactiongroup.c:845 +#: ../app/widgets/gimpactiongroup.c:867 #, c-format msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGGA (%0.3f, %0.3f, %0.3f, %0.3f)" @@ -13440,10 +13598,6 @@ msgstr "Dregantad led ar broust" msgid "(None)" msgstr "(Tra ebet)" -#: ../app/widgets/gimpchanneltreeview.c:134 -msgid "Reorder Channel" -msgstr "Adurzhiañ ar sanell" - #: ../app/widgets/gimpcolordialog.c:149 msgid "Add the current color to the color history" msgstr "Ouzhpennañ al liv bremanel da roll istor al livioù" @@ -13542,15 +13696,15 @@ msgstr "Du :" msgid "Alpha:" msgstr "Alfa :" -#: ../app/widgets/gimpcolormapeditor.c:225 +#: ../app/widgets/gimpcolormapeditor.c:223 msgid "Color index:" msgstr "Ibil al livioù :" -#: ../app/widgets/gimpcolormapeditor.c:235 +#: ../app/widgets/gimpcolormapeditor.c:233 msgid "HTML notation:" msgstr "Notenniñ HTML :" -#: ../app/widgets/gimpcolormapeditor.c:489 +#: ../app/widgets/gimpcolormapeditor.c:487 msgid "Only indexed images have a colormap." msgstr "Gant ar skeudennoù o livioù ibiliet hepken ez eus ul livaoueg." @@ -13558,11 +13712,11 @@ msgstr "Gant ar skeudennoù o livioù ibiliet hepken ez eus ul livaoueg." msgid "Palette" msgstr "Livaoueg" -#: ../app/widgets/gimpcontainerpopup.c:547 +#: ../app/widgets/gimpcontainerpopup.c:578 msgid "Smaller Previews" msgstr "Alberzioù bihanoc'h" -#: ../app/widgets/gimpcontainerpopup.c:552 +#: ../app/widgets/gimpcontainerpopup.c:583 msgid "Larger Previews" msgstr "Alberzioù brasoc'h" @@ -13816,23 +13970,20 @@ msgstr "Distreiñ" msgid "%s (read only)" msgstr "%s (mod lenn nemetken)" -#: ../app/widgets/gimpdeviceeditor.c:160 -#| msgid "Delete the selected settings" +#: ../app/widgets/gimpdeviceeditor.c:161 msgid "Delete the selected device" msgstr "Dilemel an drobarzhell diuzet" -#: ../app/widgets/gimpdeviceeditor.c:468 -#| msgid "Delete the selected settings" +#: ../app/widgets/gimpdeviceeditor.c:469 msgid "Delete Device Settings" msgstr "Dilemel arventennoù an drobarzhell" -#: ../app/widgets/gimpdeviceeditor.c:489 +#: ../app/widgets/gimpdeviceeditor.c:490 #, c-format -#| msgid "Delete '%s'?" msgid "Delete \"%s\"?" msgstr "Dilemel \"%s\"?" -#: ../app/widgets/gimpdeviceeditor.c:492 +#: ../app/widgets/gimpdeviceeditor.c:493 msgid "" "You are about to delete this device's stored settings.\n" "The next time this device is plugged, default settings will be used." @@ -13847,25 +13998,21 @@ msgid "Pressure" msgstr "Gwask" #: ../app/widgets/gimpdeviceinfoeditor.c:143 -#| msgid "Tilt" msgid "X tilt" msgstr "Stouadur X" #: ../app/widgets/gimpdeviceinfoeditor.c:144 -#| msgid "Tilt" msgid "Y tilt" msgstr "Stouadur Y" #: ../app/widgets/gimpdeviceinfoeditor.c:145 #: ../app/widgets/gimpdynamicseditor.c:152 #: ../app/widgets/gimpdynamicsoutputeditor.c:241 -#| msgid "Mouse Wheel" msgid "Wheel" msgstr "Rodig" #. the axes #: ../app/widgets/gimpdeviceinfoeditor.c:192 -#| msgid "Pixels" msgid "Axes" msgstr "Ahelioù" @@ -13877,19 +14024,16 @@ msgstr "Stokelloù" #: ../app/widgets/gimpdeviceinfoeditor.c:366 #: ../app/widgets/gimpdeviceinfoeditor.c:584 #, c-format -#| msgid "(none)" msgid "none" msgstr "Tra ebet" #: ../app/widgets/gimpdeviceinfoeditor.c:414 #, c-format -#| msgid "Curves" msgid "%s Curve" msgstr "Krommenn %s" #: ../app/widgets/gimpdeviceinfoeditor.c:473 #: ../app/widgets/gimpdynamicsoutputeditor.c:196 -#| msgid "R_eset Color" msgid "_Reset Curve" msgstr "Adderaou_ekaat ar c'hrommañ gant un doare kemparzhek" @@ -13898,44 +14042,43 @@ msgstr "Adderaou_ekaat ar c'hrommañ gant un doare kemparzhek" msgid "The axis '%s' has no curve" msgstr "N'eus ket ur grommenn gant an ahel-mañ '%s' " -#: ../app/widgets/gimpdevicestatus.c:137 +#: ../app/widgets/gimpdevicestatus.c:139 msgid "Save device status" msgstr "Enrollañ stad an drobarzhell" -#: ../app/widgets/gimpdevicestatus.c:446 +#: ../app/widgets/gimpdevicestatus.c:448 #, c-format msgid "Foreground: %d, %d, %d" msgstr "Rakva : %d, %d, %d" -#: ../app/widgets/gimpdevicestatus.c:451 +#: ../app/widgets/gimpdevicestatus.c:453 #, c-format msgid "Background: %d, %d, %d" msgstr "Drekva : %d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:201 +#: ../app/widgets/gimpdnd-xds.c:203 msgid "The given filename does not have any known file extension." msgstr "An anv restr lavaret n'en deus ket un askouezhadenn restr anavezet." -#: ../app/widgets/gimpdnd-xds.c:219 +#: ../app/widgets/gimpdnd-xds.c:221 msgid "File Exists" msgstr "Ar restr zo anezhi" -#: ../app/widgets/gimpdnd-xds.c:224 +#: ../app/widgets/gimpdnd-xds.c:226 msgid "_Replace" msgstr "_Amsaviñ" -#: ../app/widgets/gimpdnd-xds.c:235 +#: ../app/widgets/gimpdnd-xds.c:237 #, c-format msgid "A file named '%s' already exists." msgstr "Ur restr anvet '%s' zo anezhi endeo." -#: ../app/widgets/gimpdnd-xds.c:240 +#: ../app/widgets/gimpdnd-xds.c:242 msgid "Do you want to replace it with the image you are saving?" msgstr "Fellout a ra deoc'h hec'h amsaviñ ouzh ar skeudenn emaoc'h oc'h enrollañ ?" #. String used to separate dockables, e.g. "Tool Options, Layers" #: ../app/widgets/gimpdock.h:34 -#| msgid "," msgctxt "dock" msgid ", " msgstr "," @@ -13956,16 +14099,16 @@ msgctxt "dock" msgid " | " msgstr " | " -#: ../app/widgets/gimpdockable.c:235 +#: ../app/widgets/gimpdockbook.c:290 msgid "Configure this tab" msgstr "Kefluniañ an ivinell-mañ" #. Auto button -#: ../app/widgets/gimpdockwindow.c:351 +#: ../app/widgets/gimpdockwindow.c:353 msgid "Auto" msgstr "Emgefreek" -#: ../app/widgets/gimpdockwindow.c:362 +#: ../app/widgets/gimpdockwindow.c:364 msgid "When enabled the dialog automatically follows the image you are working on." msgstr "Mar bez gweredekaet e vo heuliet ar skeudenn emaoc'h o labourat warni gant ar voestad emziviz." @@ -14251,7 +14394,6 @@ msgid "Querying..." msgstr "O c'houlenn..." #: ../app/widgets/gimpimagepropview.c:122 -#| msgid "Size in memory:" msgid "Size in pixels:" msgstr "Ment e pikselioù :" @@ -14330,19 +14472,15 @@ msgstr "livioù" msgid "Lock:" msgstr "Prennañ :" -#: ../app/widgets/gimpitemtreeview.c:1423 +#: ../app/widgets/gimpitemtreeview.c:1481 msgid "Set Item Exclusive Visible" msgstr "Arventennañ an ergorenn hewel dispellaus" -#: ../app/widgets/gimpitemtreeview.c:1431 +#: ../app/widgets/gimpitemtreeview.c:1489 msgid "Set Item Exclusive Linked" msgstr "Arventennañ an ergorenn kevreet dispellaus" -#: ../app/widgets/gimplayertreeview.c:235 -msgid "Reorder Layer" -msgstr "Adurzhiañ an dreuzfollenn" - -#: ../app/widgets/gimplayertreeview.c:332 +#: ../app/widgets/gimplayertreeview.c:309 msgid "Lock alpha channel" msgstr "Prennañ ar sanell alfa" @@ -14387,51 +14525,51 @@ msgstr "" msgid "Invalid UTF-8" msgstr "UTF-8 didalvoudek" -#: ../app/widgets/gimpsettingsbox.c:240 +#: ../app/widgets/gimpsettingsbox.c:241 msgid "Pick a setting from the list" msgstr "Pakañ un arventenn diwar ar roll" -#: ../app/widgets/gimpsettingsbox.c:261 +#: ../app/widgets/gimpsettingsbox.c:262 msgid "Add settings to favorites" msgstr "Ouzhpennañ an arventennoù d'ho re well" -#: ../app/widgets/gimpsettingsbox.c:289 +#: ../app/widgets/gimpsettingsbox.c:290 msgid "_Import Settings from File..." msgstr "Enporzh_iañ an arventennoù diouzh ur restr..." -#: ../app/widgets/gimpsettingsbox.c:295 +#: ../app/widgets/gimpsettingsbox.c:296 msgid "_Export Settings to File..." msgstr "_Ezporzhiañ an arventennoù en ur restr..." -#: ../app/widgets/gimpsettingsbox.c:302 +#: ../app/widgets/gimpsettingsbox.c:303 msgid "_Manage Settings..." msgstr "Ar_deiñ an arventennoù..." -#: ../app/widgets/gimpsettingsbox.c:589 +#: ../app/widgets/gimpsettingsbox.c:590 msgid "Add Settings to Favorites" msgstr "Ouzhpennañ an arventennoù er re well" -#: ../app/widgets/gimpsettingsbox.c:592 +#: ../app/widgets/gimpsettingsbox.c:593 msgid "Enter a name for the settings" msgstr "Roit un anv evit an arventennoù" -#: ../app/widgets/gimpsettingsbox.c:593 +#: ../app/widgets/gimpsettingsbox.c:594 msgid "Saved Settings" msgstr "Arventennoù enrollet" -#: ../app/widgets/gimpsettingsbox.c:629 +#: ../app/widgets/gimpsettingsbox.c:630 msgid "Manage Saved Settings" msgstr "Ardeiñ an arventennoù enrollet" -#: ../app/widgets/gimpsettingseditor.c:173 +#: ../app/widgets/gimpsettingseditor.c:174 msgid "Import settings from a file" msgstr "Enporzhiañ an arventennoù diouzh ur restr" -#: ../app/widgets/gimpsettingseditor.c:182 +#: ../app/widgets/gimpsettingseditor.c:183 msgid "Export the selected settings to a file" msgstr "Ezporzhiañ an arventennoù diuzet en ur restr" -#: ../app/widgets/gimpsettingseditor.c:191 +#: ../app/widgets/gimpsettingseditor.c:192 msgid "Delete the selected settings" msgstr "Dilemel an arventennoù diuzet" @@ -14473,11 +14611,11 @@ msgstr "Goustur ar c'hourzhell :" msgid "Dash _preset:" msgstr "Ragarventenn ar _gourzhell :" -#: ../app/widgets/gimptagentry.c:45 +#: ../app/widgets/gimptagentry.c:43 msgid "filter" msgstr "sil" -#: ../app/widgets/gimptagentry.c:46 +#: ../app/widgets/gimptagentry.c:44 msgid "enter tags" msgstr "roit klavioù" @@ -14485,7 +14623,7 @@ msgstr "roit klavioù" #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1718 +#: ../app/widgets/gimptagentry.c:1716 msgid "," msgstr "," @@ -14547,25 +14685,19 @@ msgstr "Hedad nodoù UTF-8 didalvoudek er restr '%s'." msgid "_Use selected font" msgstr "Arverañ an nodrezh bet di_uzet" -#: ../app/widgets/gimptextstyleeditor.c:200 -#| msgctxt "layers-action" -#| msgid "Change the size of the layer content" +#: ../app/widgets/gimptextstyleeditor.c:192 msgid "Change size of selected text" msgstr "Kemmañ ment an destenn bet diuzet" -#: ../app/widgets/gimptextstyleeditor.c:219 -#| msgctxt "edit-action" -#| msgid "Clear the selected pixels" +#: ../app/widgets/gimptextstyleeditor.c:211 msgid "Clear style of selected text" msgstr "Skarzhañ stil an destenn bet diuzet" -#: ../app/widgets/gimptextstyleeditor.c:239 +#: ../app/widgets/gimptextstyleeditor.c:231 msgid "Change kerning of selected text" msgstr "Kemmañ esaouiñ an destenn diuzet" -#: ../app/widgets/gimptextstyleeditor.c:255 -#| msgctxt "layers-action" -#| msgid "Change the size of the layer content" +#: ../app/widgets/gimptextstyleeditor.c:247 msgid "Change baseline of selected text" msgstr "Kemmañ linenn diazez an destenn bet diuzet" @@ -14655,45 +14787,72 @@ msgstr "" "An ilrezenn oberiant.\n" "Klikañ evit digeriñ boestad emziviz an ilrezennoù." -#: ../app/widgets/gimptooleditor.c:294 +#: ../app/widgets/gimptooleditor.c:295 msgid "Raise this tool" msgstr "Sevel ar benveg-mañ" -#: ../app/widgets/gimptooleditor.c:295 +#: ../app/widgets/gimptooleditor.c:296 msgid "Raise this tool to the top" msgstr "Sevel ar benveg-mañ d'an uhelañ" -#: ../app/widgets/gimptooleditor.c:302 +#: ../app/widgets/gimptooleditor.c:303 msgid "Lower this tool" msgstr "Diskenn ar benveg-mañ" -#: ../app/widgets/gimptooleditor.c:303 +#: ../app/widgets/gimptooleditor.c:304 msgid "Lower this tool to the bottom" msgstr "Diskenn ar benveg-mañ d'an izelañ" -#: ../app/widgets/gimptooleditor.c:310 +#: ../app/widgets/gimptooleditor.c:311 msgid "Reset tool order and visibility" msgstr "Adderaouekaat urzh hag hewelusted ar binvioù" -#: ../app/widgets/gimptooloptionseditor.c:206 +#: ../app/widgets/gimptooloptionseditor.c:208 msgid "Save options to..." msgstr "Enrollañ an dibarzhioù e..." -#: ../app/widgets/gimptooloptionseditor.c:214 +#: ../app/widgets/gimptooloptionseditor.c:216 msgid "Restore options from..." msgstr "Assav an dibarzhioù diouzh..." -#: ../app/widgets/gimptooloptionseditor.c:222 +#: ../app/widgets/gimptooloptionseditor.c:224 msgid "Delete saved options..." msgstr "Dilemel an dibarzhioù enrollet..." -#: ../app/widgets/gimptooloptionseditor.c:562 +#: ../app/widgets/gimptooloptionseditor.c:573 #, c-format msgid "Error saving tool options presets: %s" msgstr "Fazi en ur enrollañ ragarventennoù dibarzhioù ar binvioù : %s" +#: ../app/widgets/gimptoolpreseteditor.c:109 +msgid "Apply stored FG/BG" +msgstr "Arloañ ar rakva/drekva enrollet" + +#: ../app/widgets/gimptoolpreseteditor.c:115 +msgid "Apply stored brush" +msgstr "Arloañ ar broust enrollet" + +#: ../app/widgets/gimptoolpreseteditor.c:121 +msgid "Apply stored dynamics" +msgstr "Arloañ an dialuskoù enrollet" + +#: ../app/widgets/gimptoolpreseteditor.c:127 +msgid "Apply stored gradient" +msgstr "Arloañ an ilrezenn enrollet" + +#: ../app/widgets/gimptoolpreseteditor.c:133 +msgid "Apply stored pattern" +msgstr "Arloañ ar goustur enrollet" + +#: ../app/widgets/gimptoolpreseteditor.c:139 +msgid "Apply stored pallete" +msgstr "Arloañ al livaoueg enrollet" + +#: ../app/widgets/gimptoolpreseteditor.c:145 +msgid "Apply stored font" +msgstr "Arloañ an nodrezh enrollet" + #: ../app/widgets/gimptranslationstore.c:105 -#| msgid "Language:" msgid "System Language" msgstr "Yezh ar reizhiad" @@ -14718,11 +14877,7 @@ msgstr "Ur fazi zo bet e-pad ma oa o tezrannañ despizadur al lañser diouzh %s msgid "[ Base Image ]" msgstr "[ skeudenn diazez ]" -#: ../app/widgets/gimpvectorstreeview.c:116 -msgid "Reorder path" -msgstr "Adurzhiañ an treug" - -#: ../app/widgets/gimpvectorstreeview.c:118 +#: ../app/widgets/gimpvectorstreeview.c:112 msgid "Lock path strokes" msgstr "Prennañ tresadurioù an treugoù" @@ -14746,22 +14901,22 @@ msgstr "Digeriñ boestad emziviz diuzañ al livaouegoù" msgid "Open the font selection dialog" msgstr "Digeriñ boestad emziviz diuzañ an nodrezhoù" -#: ../app/widgets/gimpwidgets-utils.c:649 +#: ../app/widgets/gimpwidgets-utils.c:670 #, c-format msgid "%s (try %s)" msgstr "%s (klask %s)" -#: ../app/widgets/gimpwidgets-utils.c:649 +#: ../app/widgets/gimpwidgets-utils.c:670 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../app/widgets/gimpwidgets-utils.c:653 +#: ../app/widgets/gimpwidgets-utils.c:674 #, c-format msgid "%s (try %s, %s)" msgstr "%s (klask %s, %s)" -#: ../app/widgets/gimpwidgets-utils.c:657 +#: ../app/widgets/gimpwidgets-utils.c:678 #, c-format msgid "%s (try %s, %s, %s)" msgstr "%s (klask %s, %s, %s)" @@ -14826,55 +14981,60 @@ msgctxt "histogram-scale" msgid "Logarithmic histogram" msgstr "Tellun treoliek" -#: ../app/widgets/widgets-enums.c:213 +#: ../app/widgets/widgets-enums.c:215 msgctxt "tab-style" msgid "Icon" msgstr "Arlun" -#: ../app/widgets/widgets-enums.c:214 +#: ../app/widgets/widgets-enums.c:216 msgctxt "tab-style" msgid "Current status" msgstr "Stad vremanel" -#: ../app/widgets/widgets-enums.c:215 +#: ../app/widgets/widgets-enums.c:217 msgctxt "tab-style" msgid "Text" msgstr "Testenn" -#: ../app/widgets/widgets-enums.c:216 +#: ../app/widgets/widgets-enums.c:218 msgctxt "tab-style" msgid "Description" msgstr "Deskrivadur" -#: ../app/widgets/widgets-enums.c:217 +#: ../app/widgets/widgets-enums.c:219 msgctxt "tab-style" msgid "Icon & text" msgstr "Arlun & testenn" -#: ../app/widgets/widgets-enums.c:218 +#: ../app/widgets/widgets-enums.c:220 msgctxt "tab-style" msgid "Icon & desc" msgstr "Arlun & deskriv." -#: ../app/widgets/widgets-enums.c:219 +#: ../app/widgets/widgets-enums.c:221 msgctxt "tab-style" msgid "Status & text" msgstr "Stad & testenn" -#: ../app/widgets/widgets-enums.c:220 +#: ../app/widgets/widgets-enums.c:222 msgctxt "tab-style" msgid "Status & desc" msgstr "Stad & deskriv." -#: ../app/xcf/xcf-load.c:329 +#: ../app/widgets/widgets-enums.c:223 +msgctxt "tab-style" +msgid "Undefined" +msgstr "Andespizet" + +#: ../app/xcf/xcf-load.c:332 msgid "This XCF file is corrupt! I have loaded as much of it as I can, but it is incomplete." msgstr "Kontronet eo ar restr mod XCF-mañ ! Karget em eus pezh a oa tro d'ober, diglok eo koulskoude." -#: ../app/xcf/xcf-load.c:340 +#: ../app/xcf/xcf-load.c:343 msgid "This XCF file is corrupt! I could not even salvage any partial image data from it." msgstr "Kontronet eo ar restr mod XCF-mañ ! Ne vin ket gouest da saveteiñ un darn eus roadennoù ar skeudenn diouti." -#: ../app/xcf/xcf-load.c:404 +#: ../app/xcf/xcf-load.c:407 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -14901,27 +15061,27 @@ msgstr "Fazi skrivañ XCF : %s" msgid "Could not seek in XCF file: %s" msgstr "N'haller ket klask er restr XCF : %s" -#: ../app/xcf/xcf.c:98 -#: ../app/xcf/xcf.c:166 +#: ../app/xcf/xcf.c:99 +#: ../app/xcf/xcf.c:167 msgid "GIMP XCF image" msgstr "Skeudenn GIMP XCF" -#: ../app/xcf/xcf.c:270 +#: ../app/xcf/xcf.c:271 #, c-format msgid "Opening '%s'" msgstr "O tigeriñ '%s'" -#: ../app/xcf/xcf.c:312 +#: ../app/xcf/xcf.c:313 #, c-format msgid "XCF error: unsupported XCF file version %d encountered" msgstr "Fazi XCF : Handelv %d eus ar mentrezh XCF anskor bet kejet outi" -#: ../app/xcf/xcf.c:382 +#: ../app/xcf/xcf.c:383 #, c-format msgid "Saving '%s'" msgstr "Oc'h enrollañ '%s'" -#: ../app/xcf/xcf.c:402 +#: ../app/xcf/xcf.c:403 #, c-format msgid "Error saving XCF file: %s" msgstr "Fazi enrollañ ar restr XCF : %s" @@ -14972,189 +15132,9 @@ msgstr "Bezit asur ez eo hewel ar Voestad binvioù !" msgid "Couldn't start '%s': %s" msgstr "N'haller ket loc'hañ '%s' : %s" -#~ msgctxt "undo-type" -#~ msgid "Reorder layer" -#~ msgstr "Adurzhiañ an dreuzfollenn" -#~ msgctxt "undo-type" -#~ msgid "Reorder channel" -#~ msgstr "Adurzhiañ ar sanell" -#~ msgctxt "undo-type" -#~ msgid "Reorder path" -#~ msgstr "Adurzhiañ an treug" -#~ msgid "Pressure:" -#~ msgstr "Gwask :" -#~ msgid "Empty Channel" -#~ msgstr "Sanell c'houllo" -#~ msgid "Pixel dimensions:" -#~ msgstr "Mentoù e pikselioù :" -#~ msgid "Empty Layer" -#~ msgstr "Treuzfollenn c'houllo" -#~ msgid "Empty Path" -#~ msgstr "Treug goullo" -#~ msgid "You can drop dockable dialogs here" -#~ msgstr "Amañ e c'hallot lakaat boestadoù emziviz stagus." -#~ msgid "" -#~ "The window type hint that is set on the toolbox. This may affect how your " -#~ "window manager decorates and handles the toolbox window." +#~ msgctxt "file-action" +#~ msgid "Save this image with a different name, but keep its current name" #~ msgstr "" -#~ "An erbedadenn evit ar rizh prenestr arventennet e-keñver ar voestad " -#~ "binvioù. An doare ma vo kinklet ha dornataet ar voestad binvioù a vez " -#~ "tizhet ganti." -#~ msgid "" -#~ "Sets the external web browser to be used. This can be an absolute path " -#~ "or the name of an executable to search for in the user's PATH. If the " -#~ "command contains '%s' it will be replaced with the URL, otherwise the URL " -#~ "will be appended to the command with a space separating the two." -#~ msgstr "" -#~ "Arventennañ a ra ar merdeer web diavaez da vezañ arveret. Un treug dizave " -#~ "pe anv eus un erounezad da glask e PATH an arveriad eo. Mar bez '%s' en " -#~ "arc'had e vo amsavet gant an URL, a-hend-all e vo liammet an URL ouzh an " -#~ "arc'had gant un esaou etre an eil hag egile." -#~ msgctxt "undo-type" -#~ msgid "Reposition layer" -#~ msgstr "Adlec'hiañ an dreuzfollenn" -#~ msgctxt "undo-type" -#~ msgid "Reposition channel" -#~ msgstr "Adlec'hiañ ar sanell" -#~ msgctxt "undo-type" -#~ msgid "Reposition path" -#~ msgstr "Adlec'hiañ an treug" -#~ msgid "Web Browser" -#~ msgstr "Merdeer web" -#~ msgid "_Web browser to use:" -#~ msgstr "Merdeer _web da arverañ :" -#~ msgid "Hint for other _docks:" -#~ msgstr "Erbe_dadenn evit prenestroù stagus all :" -#~ msgid "tool|_Zoom" -#~ msgstr "tool|_Zoum" -#~ msgid "Direction:" -#~ msgstr "Roud :" -#~ msgid "New brush" -#~ msgstr "Broust nevez" -#~ msgid "_Aspect" -#~ msgstr "_Neuz" -#~ msgid "Sample Merged" -#~ msgstr "Standilhonoù toueziet" -#~ msgid "T_ools" -#~ msgstr "_Binvioù" -#~ msgid "Open the tools dialog" -#~ msgstr "Digeriñ boestad emziviz ar binvioù" -#~ msgid "Remove dangling entries" -#~ msgstr "Dilemel an e_nankadoù direizh" -#~ msgid "Copy the selected region to a named buffer" -#~ msgstr "Eilañ ar maez bet diuzet en ur skurzer anvet" -#~ msgid "Fill with P_attern" -#~ msgstr "Leuniañ gant ur _goustur" -#~ msgid "Save error log" -#~ msgstr "Enrollañ kerzhlevr ar fazioù" -#~ msgid "Save selection" -#~ msgstr "Enrollañ an diuzad" -#~ msgid "Save as _Template..." -#~ msgstr "Enrollañ evel _patrom..." -#~ msgid "Rescan font list" -#~ msgstr "Adlenn roll an nodrezhoù" -#~ msgid "New gradient" -#~ msgstr "Ilrezenn nevez" -#~ msgid "Set Opacity" -#~ msgstr "Arventennañ an demerez" -#~ msgid "Delete color" -#~ msgstr "Dilemel al liv" -#~ msgid "New palette" -#~ msgstr "Livaoueg nevez" -#~ msgid "New pattern" -#~ msgstr "Goustur nevez" -#~ msgid "select|_All" -#~ msgstr "select|_An holl anezho" -#~ msgid "select|_None" -#~ msgstr "select|_netra" -#~ msgid "Edit the selected template" -#~ msgstr "Embann ar patrom diuzet" -#~ msgid "Delete the selected template" -#~ msgstr "Dilemel ar patrom diuzet" -#~ msgid "R_aise Tool" -#~ msgstr "Benveg Se_vel" -#~ msgid "Raise tool" -#~ msgstr "Benveg Sevel" -#~ msgid "Ra_ise to Top" -#~ msgstr "Sevel betek an uhel_añ" -#~ msgid "Raise tool to top" -#~ msgstr "Benveg Sevel betek an uhelañ" -#~ msgid "L_ower Tool" -#~ msgstr "Benveg Dis_kenn" -#~ msgid "Lo_wer to Bottom" -#~ msgstr "Diskenn betek an i_zelañ" -#~ msgid "Lower tool to bottom" -#~ msgstr "Benveg Diskenn betek an izelañ" -#~ msgid "_Reset Order & Visibility" -#~ msgstr "Adde_raouekaat an urzh hag an hewelusted" -#~ msgid "_Show in Toolbox" -#~ msgstr "Diskouez er voe_stad binvioù" -#~ msgid "New path..." -#~ msgstr "Treug nevez..." -#~ msgid "_New Path" -#~ msgstr "Treug _nevez" -#~ msgid "Add" -#~ msgstr "Ouzhpennañ" -#~ msgid "Intersect" -#~ msgstr "Kenskejañ" -#~ msgid "When enabled, GIMP will show mnemonics in menus." -#~ msgstr "" -#~ "Mar bez gweredekaet e vo diskouezet ar berradennoù el lañserioù gant GIMP." -#~ msgid "" -#~ "When enabled, dock windows (the toolbox and palettes) are set to be " -#~ "transient to the active image window. Most window managers will keep the " -#~ "dock windows above the image window then, but it may also have other " -#~ "effects." -#~ msgstr "" -#~ "Mar gweredekaet e vo arventennet ar prenestroù stagus (boestadoù binvioù " -#~ "ha livaouegoù) a-benn bezañ dibad e-keñver ar prenestr oberiant. An darn " -#~ "vrasañ eus an ardoerioù prenestroù a viro ar prenestroù stagus a-us d'ar " -#~ "skeudenn neuze, met efedoù all a c'hall degouezhout ivez." -#~ msgid "Remove floating selection" -#~ msgstr "Dilemel an diuzad war neuñv" -#~ msgid "Rigor floating selection" -#~ msgstr "Sonnaat un diuzad war neuñv" -#~ msgid "Relax floating selection" -#~ msgstr "Disonnaat un diuzad war neuñv" -#~ msgid "plural|percent" -#~ msgstr "plural|dregantad" -#~ msgid "Show menu _mnemonics (access keys)" -#~ msgstr "Diskouez ar berradennoù klavier (stokelloù haezhiñ)" -#~ msgid "Toolbox and other docks are transient to the active image window" -#~ msgstr "" -#~ "Ar voestad binvioù ha prenestroù stagus all zo dibad e-keñver prenestr ar " -#~ "skeudenn oberiant" -#~ msgid "quality|Low" -#~ msgstr "quality|izel" -#~ msgid "quality|High" -#~ msgstr "quality|uhel" -#~ msgid "Do_n't Save" -#~ msgstr "Na e_nrollañ ket" -#~ msgid "RGB-empty" -#~ msgstr "RGG-goullo" -#~ msgid "grayscale-empty" -#~ msgstr "liveoù louedoù-goullo" -#~ msgid "grayscale" -#~ msgstr "liveoù louedoù" -#~ msgid "indexed-empty" -#~ msgstr "ibiliet-goullo" -#~ msgid "indexed" -#~ msgstr "ibiliet" -#~ msgid "Cannot rigor this layer because it is not a floating selection." -#~ msgstr "" -#~ "N'haller ket sonnaat an dreuzfollenn-mañ rak n'eo ket un diuzad war neuñv." -#~ msgid "Cannot relax this layer because it is not a floating selection." -#~ msgstr "" -#~ "N'haller ket disonnaat an dreuzfollenn-mañ rak n'eo ket un diuzad war " -#~ "neuñv." -#~ msgid "" -#~ "If available, hints from the font are used but you may prefer to always " -#~ "use the automatic hinter" -#~ msgstr "" -#~ "Mar hegerz e vo arveret ar feurioù kengeidañ a zo en nodrezh. Tu zo da " -#~ "arverañ ar c'hengeidañ emgefreek mar fell deoc'h." -#~ msgid "Force auto-hinter" -#~ msgstr "Bountañ war ar c'hengeidañ emgefreek" -#~ msgid "GIMP Image Editor" -#~ msgstr "Embanner skeudennoù GIMP" +#~ "Enrollañ ar skeudenn-mañ gant un anv disheñvel, mirout hec'h anv bremanel " +#~ "avat" diff --git a/po/es.po b/po/es.po index 243f14fdae..6a8f0a3916 100644 --- a/po/es.po +++ b/po/es.po @@ -1,29 +1,29 @@ # translation of gimp.master.po to Español -# Copyright © 1998-2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# Copyright © 1998-2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the gimp package. # # Pablo G. del Campo , 2003, 2004. # Alonso Lara , 2005. # Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. # Francisco Vila , 2003, 2004, 2005, 2006, 2007. -# Jorge González , 2007, 2008. -# Francisco Vila , 2003, 2004, 2005, 2006, 2007, 2008, 2009. -# Jorge González , 2009. +# Francisco Vila , 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010. # Rodrigo Sancho Senosiain +# Jorge González , 2007, 2008, 2009, 2010. +# msgid "" msgstr "" "Project-Id-Version: gimp.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&component=general\n" -"POT-Creation-Date: 2009-08-06 19:36+0000\n" -"PO-Revision-Date: 2009-08-05 10:53+0200\n" -"Last-Translator: Francisco Vila \n" +"POT-Creation-Date: 2010-08-28 16:51+0000\n" +"PO-Revision-Date: 2010-08-30 05:58+0200\n" +"Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../app/about.h:23 msgid "GIMP" @@ -35,10 +35,10 @@ msgstr "Programa de manipulación de imágenes de GNU" #: ../app/about.h:29 msgid "" -"Copyright © 1995-2009\n" +"Copyright © 1995-2010\n" "Spencer Kimball, Peter Mattis and the GIMP Development Team" msgstr "" -"Copyright © 1995-2009\n" +"Copyright © 1995-2010\n" "Spencer Kimball, Peter Mattis y el equipo de desarrollo del GIMP" #: ../app/about.h:33 @@ -70,7 +70,7 @@ msgstr "" "junto con este programa. Si no ha sido así, consulte ." -#: ../app/app.c:213 +#: ../app/app.c:220 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -129,8 +129,8 @@ msgid "Do not load any fonts" msgstr "No cargar ninguna tipografía" #: ../app/main.c:175 -msgid "Do not show a startup window" -msgstr "No mostrar una ventana de inicio" +msgid "Do not show a splash screen" +msgstr "No mostrar una pantalla de arranque" #: ../app/main.c:180 msgid "Do not use shared memory between GIMP and plugins" @@ -154,11 +154,11 @@ msgstr "Usar un archivo de sistema «gimprc» alternativo" #: ../app/main.c:205 msgid "Batch command to run (can be used multiple times)" -msgstr "Comando por lotes que ejecutar (puede usarse varias veces)" +msgstr "Instrucción por lotes que ejecutar (puede usarse varias veces)" #: ../app/main.c:210 msgid "The procedure to process batch commands with" -msgstr "El procedimiento con el que se procesarán los comandos en lotes" +msgstr "El procedimiento con el que se procesarán las instrucciones en lotes" #: ../app/main.c:215 msgid "Send messages to console instead of using a dialog" @@ -216,7 +216,7 @@ msgstr "(Teclee un carácter cualquiera para cerrar esta ventana)\n" msgid "GIMP output. You can minimize this window, but don't close it." msgstr "Salida del GIMP. Puede minimizar esta ventana, pero no la cierre." -#: ../app/sanity.c:363 +#: ../app/sanity.c:398 #, c-format msgid "" "The configured filename encoding cannot be converted to UTF-8: %s\n" @@ -228,7 +228,7 @@ msgstr "" "\n" "Compruebe el valor de la variable de entorno G_FILENAME_ENCODING." -#: ../app/sanity.c:382 +#: ../app/sanity.c:417 #, c-format msgid "" "The name of the directory holding the GIMP user configuration cannot be " @@ -246,201 +246,222 @@ msgstr "" "establezca la variable de entorno G_FILENAME_ENCODING." #. show versions of libraries used by GIMP -#: ../app/version.c:63 +#: ../app/version.c:64 #, c-format msgid "using %s version %s (compiled against version %s)" msgstr "utilizando %s versión %s (compilado contra la versión %s)" -#: ../app/version.c:126 ../tools/gimp-remote.c:94 +#: ../app/version.c:127 ../tools/gimp-remote.c:94 #, c-format msgid "%s version %s" msgstr "%s versión %s" -#: ../app/actions/actions.c:103 ../app/dialogs/dialogs.c:223 +#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:353 #: ../app/widgets/gimpbrusheditor.c:89 msgid "Brush Editor" msgstr "Editor de pinceles" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:106 ../app/core/gimp.c:855 -#: ../app/dialogs/dialogs.c:158 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/actions/actions.c:112 ../app/core/gimp.c:953 +#: ../app/dialogs/dialogs.c:282 ../app/dialogs/preferences-dialog.c:2720 msgid "Brushes" msgstr "Pinceles" -#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:168 +#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292 msgid "Buffers" msgstr "Búferes" -#: ../app/actions/actions.c:112 ../app/dialogs/dialogs.c:181 +#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311 msgid "Channels" msgstr "Canales" -#: ../app/actions/actions.c:115 ../app/dialogs/convert-dialog.c:174 -#: ../app/dialogs/dialogs.c:189 +#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174 +#: ../app/dialogs/dialogs.c:319 msgid "Colormap" msgstr "Mapa de colores" -#: ../app/actions/actions.c:118 +#: ../app/actions/actions.c:124 msgid "Configuration" msgstr "Configuración" -#: ../app/actions/actions.c:121 +#: ../app/actions/actions.c:127 msgid "Context" msgstr "Contexto" -#: ../app/actions/actions.c:124 ../app/dialogs/dialogs.c:151 +#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275 msgid "Pointer Information" msgstr "Información del puntero" -#: ../app/actions/actions.c:127 +#: ../app/actions/actions.c:133 msgid "Debug" msgstr "Depurar" -#: ../app/actions/actions.c:130 +#: ../app/actions/actions.c:136 msgid "Dialogs" msgstr "Diálogos" -#: ../app/actions/actions.c:133 +#: ../app/actions/actions.c:139 msgid "Dock" msgstr "Empotrable" -#: ../app/actions/actions.c:136 +#: ../app/actions/actions.c:142 msgid "Dockable" msgstr "Empotrable" #. Document History -#: ../app/actions/actions.c:139 ../app/dialogs/dialogs.c:170 -#: ../app/dialogs/preferences-dialog.c:1601 +#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:294 +#: ../app/dialogs/preferences-dialog.c:1573 msgid "Document History" msgstr "Historial del documento" -#: ../app/actions/actions.c:142 +#: ../app/actions/actions.c:148 msgid "Drawable" msgstr "Dibujable" -#: ../app/actions/actions.c:145 +#. Some things do not have grids, so just list +#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:300 +msgid "Paint Dynamics" +msgstr "Dinámica de la pintura" + +#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:357 +#: ../app/widgets/gimpdynamicseditor.c:94 +msgid "Paint Dynamics Editor" +msgstr "Editor de dinámica de la pintura" + +#: ../app/actions/actions.c:157 msgid "Edit" msgstr "Editar" -#: ../app/actions/actions.c:148 ../app/dialogs/dialogs.c:147 +#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271 msgid "Error Console" msgstr "Consola de errores" -#: ../app/actions/actions.c:151 +#: ../app/actions/actions.c:163 msgid "File" msgstr "Archivo" -#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:166 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:290 +#: ../app/dialogs/preferences-dialog.c:2740 msgid "Fonts" msgstr "Tipografías" -#: ../app/actions/actions.c:157 ../app/dialogs/dialogs.c:227 +#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:361 #: ../app/widgets/gimpgradienteditor.c:275 msgid "Gradient Editor" msgstr "Editor de degradados" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:160 ../app/core/gimp.c:867 -#: ../app/dialogs/dialogs.c:162 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/actions/actions.c:172 ../app/core/gimp.c:973 +#: ../app/dialogs/dialogs.c:286 ../app/dialogs/preferences-dialog.c:2736 msgid "Gradients" msgstr "Degradados" -#: ../app/actions/actions.c:163 +#. initialize the list of gimp tool presets +#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 +#: ../app/dialogs/dialogs.c:302 +msgid "Tool Presets" +msgstr "Ajustes prefijados de las herramientas" + +#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:369 +#: ../app/widgets/gimptoolpreseteditor.c:75 +msgid "Tool Preset Editor" +msgstr "Editor de ajustes prefijados de las herramientas" + +#: ../app/actions/actions.c:181 msgid "Help" msgstr "Ayuda" -#: ../app/actions/actions.c:166 +#: ../app/actions/actions.c:184 msgid "Image" msgstr "Imagen" #. list & grid views -#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:156 +#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:280 msgid "Images" msgstr "Imágenes" -#: ../app/actions/actions.c:172 ../app/dialogs/dialogs.c:177 +#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:307 #: ../app/dialogs/resize-dialog.c:287 msgid "Layers" msgstr "Capas" -#: ../app/actions/actions.c:175 ../app/dialogs/dialogs.c:231 +#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:365 #: ../app/widgets/gimppaletteeditor.c:154 msgid "Palette Editor" msgstr "Editor de paleta" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:178 ../app/core/gimp.c:863 -#: ../app/dialogs/dialogs.c:164 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/actions/actions.c:196 ../app/core/gimp.c:968 +#: ../app/dialogs/dialogs.c:288 ../app/dialogs/preferences-dialog.c:2732 msgid "Palettes" msgstr "Paletas" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:181 ../app/core/gimp.c:859 -#: ../app/dialogs/dialogs.c:160 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/actions/actions.c:199 ../app/core/gimp.c:963 +#: ../app/dialogs/dialogs.c:284 ../app/dialogs/preferences-dialog.c:2728 msgid "Patterns" msgstr "Patrones" -#: ../app/actions/actions.c:184 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2744 msgid "Plug-Ins" msgstr "Complementos" -#: ../app/actions/actions.c:187 ../app/core/gimpchannel.c:371 +#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:385 msgid "Quick Mask" msgstr "Máscara rápida" -#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:205 +#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335 msgid "Sample Points" msgstr "Puntos de muestra" -#: ../app/actions/actions.c:193 +#: ../app/actions/actions.c:211 msgid "Select" msgstr "Seleccionar" #. initialize the template list -#: ../app/actions/actions.c:196 ../app/core/gimp.c:876 -#: ../app/dialogs/dialogs.c:172 +#: ../app/actions/actions.c:214 ../app/core/gimp.c:988 +#: ../app/dialogs/dialogs.c:296 msgid "Templates" msgstr "Plantillas" -#: ../app/actions/actions.c:199 +#: ../app/actions/actions.c:217 msgid "Text Tool" msgstr "Herramienta de texto" -#: ../app/actions/actions.c:202 +#: ../app/actions/actions.c:220 msgid "Text Editor" msgstr "Editor de textos" -#: ../app/actions/actions.c:205 ../app/dialogs/dialogs.c:139 -#: ../app/dialogs/preferences-dialog.c:1883 ../app/gui/gui.c:429 +#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263 +#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:430 msgid "Tool Options" msgstr "Opciones de herramienta" -#: ../app/actions/actions.c:208 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolbox.c:927 msgid "Tools" msgstr "Herramientas" -#: ../app/actions/actions.c:211 ../app/dialogs/dialogs.c:185 +#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:315 #: ../app/tools/gimpvectortool.c:161 msgid "Paths" msgstr "Rutas" -#: ../app/actions/actions.c:214 +#: ../app/actions/actions.c:232 msgid "View" msgstr "Vista" -#: ../app/actions/actions.c:217 +#: ../app/actions/actions.c:235 msgid "Windows" msgstr "Ventanas" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:504 +#: ../app/actions/actions.c:584 #, c-format msgid "%s: %.2f" msgstr "%s: %.2f" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:530 +#: ../app/actions/actions.c:610 #, c-format msgid "%s: %d" msgstr "%s: %d" @@ -711,7 +732,7 @@ msgid "Intersect this channel with the current selection" msgstr "Intersectar este canal con la selección actual" #: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:404 +#: ../app/actions/channels-commands.c:402 msgid "Channel Attributes" msgstr "Atributos del canal" @@ -728,11 +749,14 @@ msgstr "Editar el color del canal" msgid "_Fill opacity:" msgstr "Opacidad del _relleno:" -#: ../app/actions/channels-commands.c:116 +#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:271 +#: ../app/widgets/gimpchanneltreeview.c:334 +msgid "Channel" +msgstr "Canal" + #: ../app/actions/channels-commands.c:117 #: ../app/actions/channels-commands.c:159 -#: ../app/actions/channels-commands.c:163 -#: ../app/widgets/gimpchanneltreeview.c:340 +#: ../app/widgets/gimpchanneltreeview.c:329 msgid "New Channel" msgstr "Canal nuevo" @@ -744,19 +768,14 @@ msgstr "Opciones del canal nuevo" msgid "New Channel Color" msgstr "Canal de color nuevo" -#: ../app/actions/channels-commands.c:245 -#: ../app/display/gimpdisplayshell-dnd.c:589 -#: ../app/widgets/gimpchanneltreeview.c:272 -#: ../app/widgets/gimplayertreeview.c:808 ../app/widgets/gimptoolbox-dnd.c:313 +#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:252 +#: ../app/display/gimpdisplayshell-dnd.c:599 +#: ../app/widgets/gimpchanneltreeview.c:261 +#: ../app/widgets/gimplayertreeview.c:785 #, c-format msgid "%s Channel Copy" msgstr "Copia del canal %s" -#: ../app/actions/channels-commands.c:316 ../app/core/gimpselection.c:583 -#: ../app/pdb/selection-cmds.c:453 ../app/pdb/selection-cmds.c:520 -msgid "Channel to Selection" -msgstr "Canal a selección" - #: ../app/actions/colormap-actions.c:44 msgctxt "colormap-action" msgid "Colormap Menu" @@ -917,17 +936,17 @@ msgstr "Intercambia los colores de frente y fondo" msgid "Paint Mode: %s" msgstr "Modo de pintura: %s" -#: ../app/actions/context-commands.c:551 +#: ../app/actions/context-commands.c:552 #, c-format msgid "Brush Shape: %s" msgstr "Forma del pincel: %s" -#: ../app/actions/context-commands.c:610 +#: ../app/actions/context-commands.c:612 #, c-format msgid "Brush Radius: %2.2f" msgstr "Radio del pincel: %2.2f" -#: ../app/actions/context-commands.c:714 +#: ../app/actions/context-commands.c:720 #, c-format msgid "Brush Angle: %2.2f" msgstr "Ángulo del pincel: %2.2f" @@ -947,14 +966,14 @@ msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "Usar el color compuesto de todas las capas visibles" -#: ../app/actions/data-commands.c:106 ../app/actions/documents-commands.c:342 -#: ../app/actions/file-commands.c:193 ../app/dialogs/file-open-dialog.c:221 -#: ../app/dialogs/file-open-dialog.c:266 -#: ../app/dialogs/file-open-location-dialog.c:212 -#: ../app/dialogs/file-open-location-dialog.c:224 -#: ../app/display/gimpdisplayshell-dnd.c:542 -#: ../app/widgets/gimplayertreeview.c:768 ../app/widgets/gimptoolbox-dnd.c:158 -#: ../app/widgets/gimptoolbox.c:973 +#: ../app/actions/data-commands.c:104 ../app/actions/documents-commands.c:343 +#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:233 +#: ../app/dialogs/file-open-dialog.c:278 +#: ../app/dialogs/file-open-location-dialog.c:213 +#: ../app/dialogs/file-open-location-dialog.c:225 +#: ../app/display/gimpdisplayshell-dnd.c:552 +#: ../app/widgets/gimplayertreeview.c:745 ../app/widgets/gimptoolbox-dnd.c:178 +#: ../app/widgets/gimptoolbox.c:1222 #, c-format msgid "" "Opening '%s' failed:\n" @@ -964,367 +983,429 @@ msgstr "" "La apertura de «%s» ha fallado:\n" "%s" -#: ../app/actions/data-commands.c:132 -#: ../app/core/gimpbrushgenerated-load.c:124 ../app/core/gimpimage.c:1426 -#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:222 -#: ../app/core/gimppalette.c:378 ../app/dialogs/palette-import-dialog.c:771 -#: ../app/widgets/gimpdnd-xds.c:92 +#: ../app/actions/data-commands.c:133 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1522 +#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:223 +#: ../app/core/gimppalette.c:379 ../app/dialogs/palette-import-dialog.c:771 +#: ../app/widgets/gimpdnd-xds.c:94 msgid "Untitled" msgstr "Sin nombre" -#: ../app/actions/data-commands.c:232 +#: ../app/actions/data-commands.c:238 msgid "Delete Object" msgstr "Borrar objeto" -#: ../app/actions/data-commands.c:255 +#: ../app/actions/data-commands.c:261 #, c-format msgid "Delete '%s'?" msgstr "¿Borrar «%s»?" -#: ../app/actions/data-commands.c:258 +#: ../app/actions/data-commands.c:264 #, c-format msgid "" "Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "" "¿Está seguro de que quiere eliminar «%s» de la lista y borrarlo del disco?" -#: ../app/actions/dialogs-actions.c:38 +#: ../app/actions/dialogs-actions.c:44 +msgctxt "windows-action" +msgid "Tool_box" +msgstr "_Caja de herramientas" + +#: ../app/actions/dialogs-actions.c:50 msgctxt "dialogs-action" msgid "Tool _Options" msgstr "_Opciones de herramienta" -#: ../app/actions/dialogs-actions.c:39 +#: ../app/actions/dialogs-actions.c:51 msgctxt "dialogs-action" msgid "Open the tool options dialog" msgstr "Abre el diálogo de opciones de herramienta" -#: ../app/actions/dialogs-actions.c:44 +#: ../app/actions/dialogs-actions.c:56 msgctxt "dialogs-action" msgid "_Device Status" msgstr "Estado del _dispositivo" -#: ../app/actions/dialogs-actions.c:45 +#: ../app/actions/dialogs-actions.c:57 msgctxt "dialogs-action" msgid "Open the device status dialog" msgstr "Abre el diálogo de estado de los dispositivos" -#: ../app/actions/dialogs-actions.c:50 +#: ../app/actions/dialogs-actions.c:62 msgctxt "dialogs-action" msgid "_Layers" msgstr "_Capas" -#: ../app/actions/dialogs-actions.c:51 +#: ../app/actions/dialogs-actions.c:63 msgctxt "dialogs-action" msgid "Open the layers dialog" msgstr "Abre el diálogo de capas" -#: ../app/actions/dialogs-actions.c:56 +#: ../app/actions/dialogs-actions.c:68 msgctxt "dialogs-action" msgid "_Channels" msgstr "_Canales" -#: ../app/actions/dialogs-actions.c:57 +#: ../app/actions/dialogs-actions.c:69 msgctxt "dialogs-action" msgid "Open the channels dialog" msgstr "Abre el diálogo de canales" -#: ../app/actions/dialogs-actions.c:62 +#: ../app/actions/dialogs-actions.c:74 msgctxt "dialogs-action" msgid "_Paths" msgstr "_Rutas" -#: ../app/actions/dialogs-actions.c:63 +#: ../app/actions/dialogs-actions.c:75 msgctxt "dialogs-action" msgid "Open the paths dialog" msgstr "Abre el diálogo de rutas" -#: ../app/actions/dialogs-actions.c:68 +#: ../app/actions/dialogs-actions.c:80 msgctxt "dialogs-action" msgid "Color_map" msgstr "_Mapa de colores" -#: ../app/actions/dialogs-actions.c:69 +#: ../app/actions/dialogs-actions.c:81 msgctxt "dialogs-action" msgid "Open the colormap dialog" msgstr "Abre el diálogo de mapas de color" -#: ../app/actions/dialogs-actions.c:74 +#: ../app/actions/dialogs-actions.c:86 msgctxt "dialogs-action" msgid "Histogra_m" msgstr "Histogra_ma" -#: ../app/actions/dialogs-actions.c:75 +#: ../app/actions/dialogs-actions.c:87 msgctxt "dialogs-action" msgid "Open the histogram dialog" msgstr "Abre el diálogo de histograma" -#: ../app/actions/dialogs-actions.c:80 +#: ../app/actions/dialogs-actions.c:92 msgctxt "dialogs-action" msgid "_Selection Editor" msgstr "Editor de _selección" -#: ../app/actions/dialogs-actions.c:81 +#: ../app/actions/dialogs-actions.c:93 msgctxt "dialogs-action" msgid "Open the selection editor" msgstr "Abre el editor de selección" -#: ../app/actions/dialogs-actions.c:86 +#: ../app/actions/dialogs-actions.c:98 msgctxt "dialogs-action" msgid "Na_vigation" msgstr "Na_vegación" -#: ../app/actions/dialogs-actions.c:87 +#: ../app/actions/dialogs-actions.c:99 msgctxt "dialogs-action" msgid "Open the display navigation dialog" msgstr "Abre el diálogo de navegación por la presentación" -#: ../app/actions/dialogs-actions.c:92 +#: ../app/actions/dialogs-actions.c:104 msgctxt "dialogs-action" msgid "Undo _History" msgstr "_Historial de deshacer" -#: ../app/actions/dialogs-actions.c:93 +#: ../app/actions/dialogs-actions.c:105 msgctxt "dialogs-action" msgid "Open the undo history dialog" msgstr "Abre el diálogo del historial de deshacer" -#: ../app/actions/dialogs-actions.c:98 +#: ../app/actions/dialogs-actions.c:110 msgctxt "dialogs-action" msgid "Pointer" msgstr "Puntero" -#: ../app/actions/dialogs-actions.c:99 +#: ../app/actions/dialogs-actions.c:111 msgctxt "dialogs-action" msgid "Open the pointer information dialog" msgstr "Abre el diálogo de información del puntero" -#: ../app/actions/dialogs-actions.c:104 +#: ../app/actions/dialogs-actions.c:116 msgctxt "dialogs-action" msgid "_Sample Points" msgstr "Punto_s de muestra" -#: ../app/actions/dialogs-actions.c:105 +#: ../app/actions/dialogs-actions.c:117 msgctxt "dialogs-action" msgid "Open the sample points dialog" msgstr "Abre el diálogo de puntos de muestreo" -#: ../app/actions/dialogs-actions.c:110 +#: ../app/actions/dialogs-actions.c:122 msgctxt "dialogs-action" msgid "Colo_rs" msgstr "Colo_res" -#: ../app/actions/dialogs-actions.c:111 +#: ../app/actions/dialogs-actions.c:123 msgctxt "dialogs-action" msgid "Open the FG/BG color dialog" msgstr "Abre el diálogo de colores de frente/fondo" -#: ../app/actions/dialogs-actions.c:116 +#: ../app/actions/dialogs-actions.c:128 msgctxt "dialogs-action" msgid "_Brushes" msgstr "_Pinceles" -#: ../app/actions/dialogs-actions.c:117 +#: ../app/actions/dialogs-actions.c:129 msgctxt "dialogs-action" msgid "Open the brushes dialog" msgstr "Abre el diálogo de pinceles" -#: ../app/actions/dialogs-actions.c:122 +#: ../app/actions/dialogs-actions.c:134 msgctxt "dialogs-action" msgid "Brush Editor" msgstr "Editor de pinceles" -#: ../app/actions/dialogs-actions.c:123 +#: ../app/actions/dialogs-actions.c:135 msgctxt "dialogs-action" msgid "Open the brush editor" msgstr "Abrir el editor de pinceles" -#: ../app/actions/dialogs-actions.c:128 +#: ../app/actions/dialogs-actions.c:140 +msgctxt "dialogs-action" +msgid "Paint Dynamics" +msgstr "Dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:141 +msgctxt "dialogs-action" +msgid "Open paint dynamics dialog" +msgstr "Abre el diálogo de dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:146 +msgctxt "dialogs-action" +msgid "Paint Dynamics Editor" +msgstr "Editor de dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:147 +msgctxt "dialogs-action" +msgid "Open the paint dynamics editor" +msgstr "Abre el editor de dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:152 msgctxt "dialogs-action" msgid "P_atterns" msgstr "_Patrones" -#: ../app/actions/dialogs-actions.c:129 +#: ../app/actions/dialogs-actions.c:153 msgctxt "dialogs-action" msgid "Open the patterns dialog" msgstr "Abre el diálogo de patrones" # Es Degradado -#: ../app/actions/dialogs-actions.c:134 +#: ../app/actions/dialogs-actions.c:158 msgctxt "dialogs-action" msgid "_Gradients" msgstr "_Degradados" -#: ../app/actions/dialogs-actions.c:135 +#: ../app/actions/dialogs-actions.c:159 msgctxt "dialogs-action" msgid "Open the gradients dialog" msgstr "Abre el diálogo de degradados" -#: ../app/actions/dialogs-actions.c:140 +#: ../app/actions/dialogs-actions.c:164 msgctxt "dialogs-action" msgid "Gradient Editor" msgstr "Editor de degradados" -#: ../app/actions/dialogs-actions.c:141 +#: ../app/actions/dialogs-actions.c:165 msgctxt "dialogs-action" msgid "Open the gradient editor" msgstr "Abrir el editor de degradados" -#: ../app/actions/dialogs-actions.c:146 +#: ../app/actions/dialogs-actions.c:170 msgctxt "dialogs-action" msgid "Pal_ettes" msgstr "Pal_etas" -#: ../app/actions/dialogs-actions.c:147 +#: ../app/actions/dialogs-actions.c:171 msgctxt "dialogs-action" msgid "Open the palettes dialog" msgstr "Abre el diálogo de paletas" -#: ../app/actions/dialogs-actions.c:152 +#: ../app/actions/dialogs-actions.c:176 msgctxt "dialogs-action" msgid "Palette Editor" msgstr "Editor de paleta" -#: ../app/actions/dialogs-actions.c:153 +#: ../app/actions/dialogs-actions.c:177 msgctxt "dialogs-action" msgid "Open the palette editor" msgstr "Abrir el editor de paletas" -#: ../app/actions/dialogs-actions.c:158 +#: ../app/actions/dialogs-actions.c:182 +msgctxt "dialogs-action" +msgid "Tool presets" +msgstr "Ajustes prefijados de herramienta" + +#: ../app/actions/dialogs-actions.c:183 +msgctxt "dialogs-action" +msgid "Open tool presets dialog" +msgstr "Abre el diálogo de ajustes prefijados de herramienta" + +#: ../app/actions/dialogs-actions.c:188 msgctxt "dialogs-action" msgid "_Fonts" msgstr "_Tipografías" -#: ../app/actions/dialogs-actions.c:159 +#: ../app/actions/dialogs-actions.c:189 msgctxt "dialogs-action" msgid "Open the fonts dialog" msgstr "Abre el diálogo de tipografías" -#: ../app/actions/dialogs-actions.c:164 +#: ../app/actions/dialogs-actions.c:194 msgctxt "dialogs-action" msgid "B_uffers" msgstr "B_úferes" -#: ../app/actions/dialogs-actions.c:165 +#: ../app/actions/dialogs-actions.c:195 msgctxt "dialogs-action" msgid "Open the named buffers dialog" msgstr "Abre el diálogo de búferes con nombre" -#: ../app/actions/dialogs-actions.c:170 +#: ../app/actions/dialogs-actions.c:200 msgctxt "dialogs-action" msgid "_Images" msgstr "_Imágenes" -#: ../app/actions/dialogs-actions.c:171 +#: ../app/actions/dialogs-actions.c:201 msgctxt "dialogs-action" msgid "Open the images dialog" msgstr "Abre el diálogo de imágenes" -#: ../app/actions/dialogs-actions.c:176 +#: ../app/actions/dialogs-actions.c:206 msgctxt "dialogs-action" msgid "Document Histor_y" msgstr "_Historial del documento" -#: ../app/actions/dialogs-actions.c:177 +#: ../app/actions/dialogs-actions.c:207 msgctxt "dialogs-action" msgid "Open the document history dialog" msgstr "Abre el diálogo de la historia del documento" -#: ../app/actions/dialogs-actions.c:182 +#: ../app/actions/dialogs-actions.c:212 msgctxt "dialogs-action" msgid "_Templates" msgstr "Plan_tillas" -#: ../app/actions/dialogs-actions.c:183 +#: ../app/actions/dialogs-actions.c:213 msgctxt "dialogs-action" msgid "Open the image templates dialog" msgstr "Abre el diálogo de las plantillas de imagen" -#: ../app/actions/dialogs-actions.c:188 +#: ../app/actions/dialogs-actions.c:218 msgctxt "dialogs-action" msgid "Error Co_nsole" msgstr "Co_nsola de errores" -#: ../app/actions/dialogs-actions.c:189 +#: ../app/actions/dialogs-actions.c:219 msgctxt "dialogs-action" msgid "Open the error console" msgstr "Abre la consola de errores" -#: ../app/actions/dialogs-actions.c:199 +#: ../app/actions/dialogs-actions.c:229 msgctxt "dialogs-action" msgid "_Preferences" msgstr "_Preferencias" -#: ../app/actions/dialogs-actions.c:200 +#: ../app/actions/dialogs-actions.c:230 msgctxt "dialogs-action" msgid "Open the preferences dialog" msgstr "Abre el diálogo de preferencias" -#: ../app/actions/dialogs-actions.c:205 +#: ../app/actions/dialogs-actions.c:235 +msgctxt "dialogs-action" +msgid "_Input Devices" +msgstr "D_ispositivos de entrada" + +#: ../app/actions/dialogs-actions.c:236 +msgctxt "dialogs-action" +msgid "Open the input devices editor" +msgstr "Abrir el editor de dispositivos de entrada" + +#: ../app/actions/dialogs-actions.c:241 msgctxt "dialogs-action" msgid "_Keyboard Shortcuts" msgstr "Combinaciones de _teclas" -#: ../app/actions/dialogs-actions.c:206 +#: ../app/actions/dialogs-actions.c:242 msgctxt "dialogs-action" msgid "Open the keyboard shortcuts editor" msgstr "Abre el editor de combinaciones de teclas" -#: ../app/actions/dialogs-actions.c:211 +#: ../app/actions/dialogs-actions.c:247 msgctxt "dialogs-action" msgid "_Modules" msgstr "_Módulos" -#: ../app/actions/dialogs-actions.c:212 +#: ../app/actions/dialogs-actions.c:248 msgctxt "dialogs-action" msgid "Open the module manager dialog" msgstr "Abre el diálogo del gestor de módulos" -#: ../app/actions/dialogs-actions.c:217 +#: ../app/actions/dialogs-actions.c:253 msgctxt "dialogs-action" msgid "_Tip of the Day" msgstr "_Consejo del día" -#: ../app/actions/dialogs-actions.c:218 +#: ../app/actions/dialogs-actions.c:254 msgctxt "dialogs-action" msgid "Show some helpful tips on using GIMP" msgstr "Mostrar consejos útiles sobre el uso del GIMP" -#: ../app/actions/dialogs-actions.c:223 +#: ../app/actions/dialogs-actions.c:259 msgctxt "dialogs-action" msgid "_About" msgstr "A_cerca de" -#: ../app/actions/dialogs-actions.c:224 +#: ../app/actions/dialogs-actions.c:260 msgctxt "dialogs-action" msgid "About GIMP" msgstr "Acerca del GIMP" -#: ../app/actions/dock-actions.c:42 +#: ../app/actions/dialogs-actions.c:304 +#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:770 +msgid "Toolbox" +msgstr "Caja de herramientas" + +#: ../app/actions/dialogs-actions.c:305 +msgid "Raise the toolbox" +msgstr "Saca la caja de herramientas" + +#: ../app/actions/dialogs-actions.c:309 +msgid "New Toolbox" +msgstr "Caja de herramientas nueva" + +#: ../app/actions/dialogs-actions.c:310 +msgid "Create a new toolbox" +msgstr "Crea una caja de herramientas nueva" + +#: ../app/actions/dock-actions.c:45 msgctxt "dock-action" msgid "M_ove to Screen" msgstr "_Mover a la pantalla" -#: ../app/actions/dock-actions.c:46 +#: ../app/actions/dock-actions.c:49 msgctxt "dock-action" msgid "Close Dock" msgstr "Cerrar empotrable" -#: ../app/actions/dock-actions.c:51 +#: ../app/actions/dock-actions.c:54 msgctxt "dock-action" msgid "_Open Display..." msgstr "_Abrir pantalla…" -#: ../app/actions/dock-actions.c:52 +#: ../app/actions/dock-actions.c:55 msgctxt "dock-action" msgid "Connect to another display" msgstr "Conectar a otra pantalla" -#: ../app/actions/dock-actions.c:60 +#: ../app/actions/dock-actions.c:63 msgctxt "dock-action" msgid "_Show Image Selection" msgstr "_Mostrar la selección de la imagen" -#: ../app/actions/dock-actions.c:66 +#: ../app/actions/dock-actions.c:69 msgctxt "dock-action" msgid "Auto _Follow Active Image" msgstr "_Seguir automáticamente la imagen activa" @@ -1429,27 +1510,32 @@ msgctxt "tab-style" msgid "St_atus & Text" msgstr "Est_ado y texto" -#: ../app/actions/dockable-actions.c:124 +#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224 +msgctxt "tab-style" +msgid "Automatic" +msgstr "Automático" + +#: ../app/actions/dockable-actions.c:126 msgctxt "dockable-action" msgid "Loc_k Tab to Dock" msgstr "_Fijar la pestaña en el empotrable" -#: ../app/actions/dockable-actions.c:126 +#: ../app/actions/dockable-actions.c:128 msgctxt "dockable-action" msgid "Protect this tab from being dragged with the mouse pointer" msgstr "Proteger esta pestaña para evitar el arrastre con el ratón" -#: ../app/actions/dockable-actions.c:132 +#: ../app/actions/dockable-actions.c:134 msgctxt "dockable-action" msgid "Show _Button Bar" msgstr "Mostrar la _barra de botones" -#: ../app/actions/dockable-actions.c:141 +#: ../app/actions/dockable-actions.c:143 msgctxt "dockable-action" msgid "View as _List" msgstr "Ver como _lista" -#: ../app/actions/dockable-actions.c:146 +#: ../app/actions/dockable-actions.c:148 msgctxt "dockable-action" msgid "View as _Grid" msgstr "Ver como re_jilla" @@ -1551,15 +1637,15 @@ msgstr "" "Elimina las entradas para las que no está disponible el archivo " "correspondiente" -#: ../app/actions/documents-commands.c:191 +#: ../app/actions/documents-commands.c:192 msgid "Clear Document History" msgstr "Borrar el histórico del documento" -#: ../app/actions/documents-commands.c:214 +#: ../app/actions/documents-commands.c:215 msgid "Clear the Recent Documents list?" msgstr "¿Borrar la lista de documentos recientes?" -#: ../app/actions/documents-commands.c:217 +#: ../app/actions/documents-commands.c:218 msgid "" "Clearing the document history will permanently remove all images from the " "recent documents list." @@ -1609,71 +1695,82 @@ msgstr "Desplazar los píxeles y opcionalmente redoblarlos en los bordes" #: ../app/actions/drawable-actions.c:73 msgctxt "drawable-action" -msgid "_Linked" -msgstr "_Enlazado" - -#: ../app/actions/drawable-actions.c:74 -msgctxt "drawable-action" -msgid "Toggle the linked state" -msgstr "Alternar el estado de enlazado" - -#: ../app/actions/drawable-actions.c:80 -msgctxt "drawable-action" msgid "_Visible" msgstr "_Visible" -#: ../app/actions/drawable-actions.c:81 +#: ../app/actions/drawable-actions.c:74 msgctxt "drawable-action" msgid "Toggle visibility" msgstr "Alternar el estado de visibilidad" -#: ../app/actions/drawable-actions.c:90 +#: ../app/actions/drawable-actions.c:80 +msgctxt "drawable-action" +msgid "_Linked" +msgstr "_Enlazado" + +#: ../app/actions/drawable-actions.c:81 +msgctxt "drawable-action" +msgid "Toggle the linked state" +msgstr "Alternar el estado de enlazado" + +#. GIMP_STOCK_LOCK +#: ../app/actions/drawable-actions.c:87 +msgctxt "drawable-action" +msgid "L_ock pixels" +msgstr "Fijar píxe_les" + +#: ../app/actions/drawable-actions.c:89 +msgctxt "drawable-action" +msgid "Keep the pixels on this drawable from being modified" +msgstr "Evita que se puedan modificar los píxeles de este dibujable" + +#: ../app/actions/drawable-actions.c:98 msgctxt "drawable-action" msgid "Flip _Horizontally" msgstr "Voltear _horizontalmente" -#: ../app/actions/drawable-actions.c:91 +#: ../app/actions/drawable-actions.c:99 msgctxt "drawable-action" msgid "Flip horizontally" msgstr "Voltear horizontalmente" -#: ../app/actions/drawable-actions.c:96 +#: ../app/actions/drawable-actions.c:104 msgctxt "drawable-action" msgid "Flip _Vertically" msgstr "Voltear _verticalmente" -#: ../app/actions/drawable-actions.c:97 +#: ../app/actions/drawable-actions.c:105 msgctxt "drawable-action" msgid "Flip vertically" msgstr "Voltear verticalmente" -#: ../app/actions/drawable-actions.c:105 +#: ../app/actions/drawable-actions.c:113 msgctxt "drawable-action" msgid "Rotate 90° _clockwise" msgstr "Rotar 90° en sentido _horario" -#: ../app/actions/drawable-actions.c:106 +#: ../app/actions/drawable-actions.c:114 msgctxt "drawable-action" msgid "Rotate 90 degrees to the right" msgstr "Rotar 90 grados hacia la derecha" -#: ../app/actions/drawable-actions.c:111 +#: ../app/actions/drawable-actions.c:119 msgctxt "drawable-action" msgid "Rotate _180°" msgstr "Rotar _180°" # Poner cabeza abajo -#: ../app/actions/drawable-actions.c:112 +#: ../app/actions/drawable-actions.c:120 msgctxt "drawable-action" msgid "Turn upside-down" msgstr "Voltear verticalmente" -#: ../app/actions/drawable-actions.c:117 +#: ../app/actions/drawable-actions.c:125 msgctxt "drawable-action" msgid "Rotate 90° counter-clock_wise" msgstr "Rotar 90° en sentido _antihorario" -#: ../app/actions/drawable-actions.c:118 +#: ../app/actions/drawable-actions.c:126 msgctxt "drawable-action" msgid "Rotate 90 degrees to the left" msgstr "Rotar 90 grados hacia la izquierda" @@ -1690,6 +1787,81 @@ msgstr "La inversión no funciona con capas indexadas." msgid "White Balance operates only on RGB color layers." msgstr "El balance de blancos sólo funciona sobre capas con color RGB." +#: ../app/actions/dynamics-actions.c:42 +msgctxt "dynamics-action" +msgid "Paint Dynamics Menu" +msgstr "Menú de dinámica de la pintura" + +#: ../app/actions/dynamics-actions.c:46 +msgctxt "dynamics-action" +msgid "_New Dynamics" +msgstr "_Nueva dinámica" + +#: ../app/actions/dynamics-actions.c:47 +msgctxt "dynamics-action" +msgid "Create a new dynamics" +msgstr "Crear una dinámica nueva" + +#: ../app/actions/dynamics-actions.c:52 +msgctxt "dynamics-action" +msgid "D_uplicate Dynamics" +msgstr "D_uplicar la dinámica" + +#: ../app/actions/dynamics-actions.c:53 +msgctxt "dynamics-action" +msgid "Duplicate this dynamics" +msgstr "Duplicar esta dinámica" + +#: ../app/actions/dynamics-actions.c:58 +msgctxt "dynamics-action" +msgid "Copy Dynamics _Location" +msgstr "Copiar ruta de la dinámica" + +#: ../app/actions/dynamics-actions.c:59 +msgctxt "dynamics-action" +msgid "Copy dynamics file location to clipboard" +msgstr "Copiar al portapapeles la ruta del archivo de dinámica" + +#: ../app/actions/dynamics-actions.c:64 +msgctxt "dynamics-action" +msgid "_Delete Dynamics" +msgstr "Eliminar _dinámica" + +#: ../app/actions/dynamics-actions.c:65 +msgctxt "dynamics-action" +msgid "Delete this dynamics" +msgstr "Eliminar esta dinámica" + +#: ../app/actions/dynamics-actions.c:70 +msgctxt "dynamics-action" +msgid "_Refresh Dynamicss" +msgstr "_Renovar dinámica" + +#: ../app/actions/dynamics-actions.c:71 +msgctxt "dynamics-action" +msgid "Refresh dynamics" +msgstr "Renovar la dinámica" + +#: ../app/actions/dynamics-actions.c:79 +msgctxt "dynamics-action" +msgid "_Edit Dynamics..." +msgstr "_Editar la dinámica…" + +#: ../app/actions/dynamics-actions.c:80 +msgctxt "dynamics-action" +msgid "Edit dynamics" +msgstr "Editar la dinámica" + +#: ../app/actions/dynamics-editor-actions.c:42 +msgctxt "dynamics-editor-action" +msgid "Paint Dynamics Editor Menu" +msgstr "Menú del editor de dinámica de la pintura" + +#: ../app/actions/dynamics-editor-actions.c:50 +msgctxt "dynamics-editor-action" +msgid "Edit Active Dynamics" +msgstr "Editar la dinámica activa" + #: ../app/actions/edit-actions.c:63 msgctxt "edit-action" msgid "_Edit" @@ -1932,63 +2104,63 @@ msgctxt "edit-action" msgid "Fill the selection using the active pattern" msgstr "Rellenar la selección utilizando el patrón activo" -#: ../app/actions/edit-actions.c:283 +#: ../app/actions/edit-actions.c:295 #, c-format msgid "_Undo %s" msgstr "De_shacer %s" -#: ../app/actions/edit-actions.c:290 +#: ../app/actions/edit-actions.c:302 #, c-format msgid "_Redo %s" msgstr "_Rehacer %s" -#: ../app/actions/edit-actions.c:305 +#: ../app/actions/edit-actions.c:317 #, c-format msgid "_Fade %s..." msgstr "_Desvanecer %s…" -#: ../app/actions/edit-actions.c:317 +#: ../app/actions/edit-actions.c:329 msgid "_Undo" msgstr "Des_hacer" -#: ../app/actions/edit-actions.c:318 +#: ../app/actions/edit-actions.c:330 msgid "_Redo" msgstr "_Rehacer" -#: ../app/actions/edit-actions.c:319 +#: ../app/actions/edit-actions.c:331 msgid "_Fade..." msgstr "_Desvanecer…" -#: ../app/actions/edit-commands.c:134 +#: ../app/actions/edit-commands.c:136 msgid "Clear Undo History" msgstr "Vaciar historial de deshacer" -#: ../app/actions/edit-commands.c:160 +#: ../app/actions/edit-commands.c:162 msgid "Really clear image's undo history?" msgstr "¿Seguro que quiere vaciar el histórico de deshacer de la imagen?" -#: ../app/actions/edit-commands.c:172 +#: ../app/actions/edit-commands.c:175 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." msgstr "" "Al limpiar el historial de deshacer de esta imagen se recuperarán %s de " "memoria." -#: ../app/actions/edit-commands.c:202 +#: ../app/actions/edit-commands.c:205 msgid "Cut pixels to the clipboard" msgstr "Cortar los píxeles al portapapeles" -#: ../app/actions/edit-commands.c:232 ../app/actions/edit-commands.c:261 +#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264 msgid "Copied pixels to the clipboard" msgstr "Píxeles copiados a una memoria intermedia con nombre" #: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:359 -#: ../app/actions/edit-commands.c:537 +#: ../app/actions/edit-commands.c:538 msgid "There is no image data in the clipboard to paste." msgstr "No hay datos de imágenes para pegar en el portapapeles." #: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180 -#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:295 +#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:345 msgid "Clipboard" msgstr "Portapapeles" @@ -2009,16 +2181,16 @@ msgstr "Copiar (con nombre)" msgid "Copy Visible Named " msgstr "Copiar visible con nombre" -#: ../app/actions/edit-commands.c:554 +#: ../app/actions/edit-commands.c:555 msgid "There is no active layer or channel to cut from." msgstr "No hay una capa o canal activo desde donde cortar." -#: ../app/actions/edit-commands.c:559 ../app/actions/edit-commands.c:591 -#: ../app/actions/edit-commands.c:615 +#: ../app/actions/edit-commands.c:560 ../app/actions/edit-commands.c:592 +#: ../app/actions/edit-commands.c:616 msgid "(Unnamed Buffer)" msgstr "(Búfer sin nombre)" -#: ../app/actions/edit-commands.c:586 +#: ../app/actions/edit-commands.c:587 msgid "There is no active layer or channel to copy from." msgstr "No hay una capa o canal activo desde donde se pueda copiar." @@ -2075,7 +2247,7 @@ msgstr "No se puede guardar. No hay nada seleccionado." msgid "Save Error Log to File" msgstr "Guardar registro de errores en un archivo" -#: ../app/actions/error-console-commands.c:156 +#: ../app/actions/error-console-commands.c:157 #, c-format msgid "" "Error writing file '%s':\n" @@ -2084,213 +2256,226 @@ msgstr "" "Error al escribir el archivo «%s»:\n" "%s" -#: ../app/actions/file-actions.c:67 +#: ../app/actions/file-actions.c:71 msgctxt "file-action" msgid "_File" msgstr "_Archivo" -#: ../app/actions/file-actions.c:68 +#: ../app/actions/file-actions.c:72 msgctxt "file-action" -msgid "Create" -msgstr "Crear" +msgid "Crea_te" +msgstr "C_rear" -#: ../app/actions/file-actions.c:69 +#: ../app/actions/file-actions.c:73 msgctxt "file-action" msgid "Open _Recent" msgstr "Abrir _reciente" -#: ../app/actions/file-actions.c:72 +#: ../app/actions/file-actions.c:76 msgctxt "file-action" msgid "_Open..." msgstr "_Abrir…" -#: ../app/actions/file-actions.c:73 +#: ../app/actions/file-actions.c:77 msgctxt "file-action" msgid "Open an image file" msgstr "Abrir un archivo de imagen" -#: ../app/actions/file-actions.c:78 +#: ../app/actions/file-actions.c:82 msgctxt "file-action" msgid "Op_en as Layers..." msgstr "_Abrir como capas…" -#: ../app/actions/file-actions.c:79 +#: ../app/actions/file-actions.c:83 msgctxt "file-action" msgid "Open an image file as layers" msgstr "Abrir un archivo de imagen como capas" # Location lo traducimos por lugar (Serrador) -#: ../app/actions/file-actions.c:84 +#: ../app/actions/file-actions.c:88 msgctxt "file-action" msgid "Open _Location..." msgstr "Abrir _lugar…" -#: ../app/actions/file-actions.c:85 +#: ../app/actions/file-actions.c:89 msgctxt "file-action" msgid "Open an image file from a specified location" msgstr "Abrir un archivo de imagen desde una ubicación especificada" -#: ../app/actions/file-actions.c:90 +#: ../app/actions/file-actions.c:94 msgctxt "file-action" -msgid "Create _Template..." -msgstr "Crear una plan_tilla nueva…" +msgid "Create Template..." +msgstr "Crear plantilla…" -#: ../app/actions/file-actions.c:91 +#: ../app/actions/file-actions.c:95 msgctxt "file-action" msgid "Create a new template from this image" msgstr "Crear una nueva plantilla a partir de esta imagen" -#: ../app/actions/file-actions.c:96 +#: ../app/actions/file-actions.c:100 msgctxt "file-action" msgid "Re_vert" msgstr "Re_vertir" -#: ../app/actions/file-actions.c:97 +#: ../app/actions/file-actions.c:101 msgctxt "file-action" msgid "Reload the image file from disk" msgstr "Volver a cargar la imagen desde el disco" -#: ../app/actions/file-actions.c:102 +#: ../app/actions/file-actions.c:106 msgctxt "file-action" msgid "Close all" msgstr "Cerrar todo" -#: ../app/actions/file-actions.c:103 +#: ../app/actions/file-actions.c:107 msgctxt "file-action" msgid "Close all opened images" msgstr "Cerrar todas las imágenes abiertas" -#: ../app/actions/file-actions.c:108 +#: ../app/actions/file-actions.c:112 msgctxt "file-action" msgid "_Quit" msgstr "_Salir" -#: ../app/actions/file-actions.c:109 +#: ../app/actions/file-actions.c:113 msgctxt "file-action" msgid "Quit the GNU Image Manipulation Program" msgstr "Salir del programa de manipulación de imágenes de GNU" -#: ../app/actions/file-actions.c:117 +#: ../app/actions/file-actions.c:121 msgctxt "file-action" msgid "_Save" msgstr "_Guardar" -#: ../app/actions/file-actions.c:118 +#: ../app/actions/file-actions.c:122 msgctxt "file-action" msgid "Save this image" msgstr "Guardar esta imagen" -#: ../app/actions/file-actions.c:123 +#: ../app/actions/file-actions.c:127 msgctxt "file-action" msgid "Save _As..." msgstr "Guardar _como…" -#: ../app/actions/file-actions.c:124 +#: ../app/actions/file-actions.c:128 msgctxt "file-action" msgid "Save this image with a different name" msgstr "Guardar esta imagen con un nombre diferente" -#: ../app/actions/file-actions.c:129 +#: ../app/actions/file-actions.c:133 msgctxt "file-action" msgid "Save a Cop_y..." msgstr "Guardar una cop_ia…" -#: ../app/actions/file-actions.c:131 +#: ../app/actions/file-actions.c:135 msgctxt "file-action" -msgid "Save this image with a different name, but keep its current name" +msgid "" +"Save a copy of this image, without affecting the source file (if any) or the " +"current state of the image" msgstr "" -"Guardar esta imagen con un nombre diferente, pero conservar su nombre actual" +"Guardar una copia de esta imagen, sin afectar al archivo original (si " +"existe) o al estado actual de la imagen" -#: ../app/actions/file-actions.c:136 +#: ../app/actions/file-actions.c:140 msgctxt "file-action" msgid "Save and Close..." msgstr "Guardar y cerrar…" -#: ../app/actions/file-actions.c:137 +#: ../app/actions/file-actions.c:141 msgctxt "file-action" msgid "Save this image and close its window" msgstr "Guardar esta imagen y cerrar su ventana" -#: ../app/actions/file-actions.c:142 +#: ../app/actions/file-actions.c:146 msgctxt "file-action" msgid "Export to" msgstr "Exportar a" -#: ../app/actions/file-actions.c:143 +#: ../app/actions/file-actions.c:147 msgctxt "file-action" -msgid "Export the image back to the import source in the import format" +msgid "Export the image again" +msgstr "Volver a exportar la imagen" + +#: ../app/actions/file-actions.c:152 +msgctxt "file-action" +msgid "Overwrite" +msgstr "Sobreescribir" + +#: ../app/actions/file-actions.c:153 +msgctxt "file-action" +msgid "Export the image back to the imported file in the import format" msgstr "" "Volver a exportar la imagen a la fuente de importación en el formato de " "importación" -#: ../app/actions/file-actions.c:148 +#: ../app/actions/file-actions.c:158 msgctxt "file-action" msgid "Export..." msgstr "Exportar…" -#: ../app/actions/file-actions.c:149 +#: ../app/actions/file-actions.c:159 msgctxt "file-action" msgid "Export the image to various file formats such as PNG or JPEG" msgstr "Exportar la imagen a diversos formatos de archivo como PNG o JPEG" -#: ../app/actions/file-actions.c:273 -#, c-format -msgid "Overwrite %s" -msgstr "Sobreescribir %s" - -#: ../app/actions/file-actions.c:276 +#: ../app/actions/file-actions.c:292 #, c-format msgid "Export to %s" msgstr "Exportar a %s" -#: ../app/actions/file-actions.c:285 +#: ../app/actions/file-actions.c:298 +#, c-format +msgid "Overwrite %s" +msgstr "Sobreescribir %s" + +#: ../app/actions/file-actions.c:306 msgid "Export to" msgstr "Exportar a" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:470 +#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:475 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Abrir imagen" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:133 msgid "Open Image as Layers" msgstr "Abrir imagen como capas" -#: ../app/actions/file-commands.c:264 +#: ../app/actions/file-commands.c:265 msgid "No changes need to be saved" msgstr "No es necesario guardar ningún cambio" -#: ../app/actions/file-commands.c:271 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95 msgid "Save Image" msgstr "Guardar imagen" -#: ../app/actions/file-commands.c:277 +#: ../app/actions/file-commands.c:278 msgid "Save a Copy of the Image" msgstr "Guardar una copia de la imagen" -#: ../app/actions/file-commands.c:334 +#: ../app/actions/file-commands.c:338 msgid "Create New Template" msgstr "Crear una plantilla nueva" -#: ../app/actions/file-commands.c:338 +#: ../app/actions/file-commands.c:342 msgid "Enter a name for this template" msgstr "Introduzca un nombre para esta plantilla" -#: ../app/actions/file-commands.c:373 +#: ../app/actions/file-commands.c:377 msgid "Revert failed. No file name associated with this image." msgstr "" "Falló al revertir. No hay un nombre de archivo asociado con esta imagen." -#: ../app/actions/file-commands.c:386 +#: ../app/actions/file-commands.c:390 msgid "Revert Image" msgstr "Revertir imagen" -#: ../app/actions/file-commands.c:416 +#: ../app/actions/file-commands.c:421 #, c-format msgid "Revert '%s' to '%s'?" msgstr "¿Quiere revertir «%s» a «%s»?" -#: ../app/actions/file-commands.c:422 +#: ../app/actions/file-commands.c:427 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2298,11 +2483,11 @@ msgstr "" "Al revertir la imagen al estado guardado en el disco, perderá todos sus " "cambios, incluyendo toda la información de deshacer." -#: ../app/actions/file-commands.c:630 +#: ../app/actions/file-commands.c:638 msgid "(Unnamed Template)" msgstr "(Plantilla sin nombre)" -#: ../app/actions/file-commands.c:682 +#: ../app/actions/file-commands.c:690 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2600,43 +2785,43 @@ msgstr "Re_centrar puntos medios en la selección" msgid "Re-distribute _Handles in Selection" msgstr "Redistribuir los _tiradores en la selección" -#: ../app/actions/gradient-editor-commands.c:85 +#: ../app/actions/gradient-editor-commands.c:84 msgid "Left Endpoint Color" msgstr "Color del punto final izquierdo" -#: ../app/actions/gradient-editor-commands.c:87 +#: ../app/actions/gradient-editor-commands.c:86 msgid "Gradient Segment's Left Endpoint Color" msgstr "Color del punto final izquierdo del segmento del degradado" -#: ../app/actions/gradient-editor-commands.c:236 +#: ../app/actions/gradient-editor-commands.c:235 msgid "Right Endpoint Color" msgstr "Color del punto final derecho" -#: ../app/actions/gradient-editor-commands.c:238 +#: ../app/actions/gradient-editor-commands.c:237 msgid "Gradient Segment's Right Endpoint Color" msgstr "Color del punto final derecho del segmento del degradado" -#: ../app/actions/gradient-editor-commands.c:452 +#: ../app/actions/gradient-editor-commands.c:451 msgid "Replicate Segment" msgstr "Replicar segmento" -#: ../app/actions/gradient-editor-commands.c:453 +#: ../app/actions/gradient-editor-commands.c:452 msgid "Replicate Gradient Segment" msgstr "Replicar segmento del degradado" -#: ../app/actions/gradient-editor-commands.c:457 +#: ../app/actions/gradient-editor-commands.c:456 msgid "Replicate Selection" msgstr "Replicar selección" -#: ../app/actions/gradient-editor-commands.c:458 +#: ../app/actions/gradient-editor-commands.c:457 msgid "Replicate Gradient Selection" msgstr "Replicar selección del degradado" -#: ../app/actions/gradient-editor-commands.c:471 +#: ../app/actions/gradient-editor-commands.c:470 msgid "Replicate" msgstr "Replicar" -#: ../app/actions/gradient-editor-commands.c:492 +#: ../app/actions/gradient-editor-commands.c:491 msgid "" "Select the number of times\n" "to replicate the selected segment." @@ -2644,7 +2829,7 @@ msgstr "" "Seleccione la cantidad de veces\n" "a replicar el segmento seleccionado." -#: ../app/actions/gradient-editor-commands.c:495 +#: ../app/actions/gradient-editor-commands.c:494 msgid "" "Select the number of times\n" "to replicate the selection." @@ -2652,27 +2837,27 @@ msgstr "" "Seleccione la cantidad de veces\n" "a replicar la selección." -#: ../app/actions/gradient-editor-commands.c:554 +#: ../app/actions/gradient-editor-commands.c:553 msgid "Split Segment Uniformly" msgstr "Partir el segmento uniformemente" -#: ../app/actions/gradient-editor-commands.c:555 +#: ../app/actions/gradient-editor-commands.c:554 msgid "Split Gradient Segment Uniformly" msgstr "Partir el segmento de degradado uniformemente" -#: ../app/actions/gradient-editor-commands.c:559 +#: ../app/actions/gradient-editor-commands.c:558 msgid "Split Segments Uniformly" msgstr "Partir los segmentos uniformemente" -#: ../app/actions/gradient-editor-commands.c:560 +#: ../app/actions/gradient-editor-commands.c:559 msgid "Split Gradient Segments Uniformly" msgstr "Partir los segmentos de degradado uniformemente" -#: ../app/actions/gradient-editor-commands.c:573 +#: ../app/actions/gradient-editor-commands.c:572 msgid "Split" msgstr "Partir" -#: ../app/actions/gradient-editor-commands.c:595 +#: ../app/actions/gradient-editor-commands.c:594 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." @@ -2680,7 +2865,7 @@ msgstr "" "Seleccione la cantidad de partes uniformes \n" "en que quiere partir el segmento seleccionado." -#: ../app/actions/gradient-editor-commands.c:598 +#: ../app/actions/gradient-editor-commands.c:597 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -2788,252 +2973,252 @@ msgctxt "help-action" msgid "Show the help for a specific user interface item" msgstr "Mostrar la ayuda para un elemento específico del interfaz de usuario" -#: ../app/actions/image-actions.c:47 ../app/actions/image-actions.c:51 +#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52 msgctxt "image-action" msgid "Image Menu" msgstr "Menú de imagen" -#: ../app/actions/image-actions.c:54 +#: ../app/actions/image-actions.c:55 msgctxt "image-action" msgid "_Image" msgstr "_Imagen" -#: ../app/actions/image-actions.c:55 +#: ../app/actions/image-actions.c:56 msgctxt "image-action" msgid "_Mode" msgstr "_Modo" -#: ../app/actions/image-actions.c:56 +#: ../app/actions/image-actions.c:57 msgctxt "image-action" msgid "_Transform" msgstr "_Transformar" -#: ../app/actions/image-actions.c:57 +#: ../app/actions/image-actions.c:58 msgctxt "image-action" msgid "_Guides" msgstr "Líneas _guía" -#: ../app/actions/image-actions.c:59 +#: ../app/actions/image-actions.c:60 msgctxt "image-action" msgid "_Colors" msgstr "_Colores" -#: ../app/actions/image-actions.c:60 +#: ../app/actions/image-actions.c:61 msgctxt "image-action" msgid "I_nfo" msgstr "In_fo" -#: ../app/actions/image-actions.c:61 +#: ../app/actions/image-actions.c:62 msgctxt "image-action" msgid "_Auto" msgstr "_Auto" -#: ../app/actions/image-actions.c:62 +#: ../app/actions/image-actions.c:63 msgctxt "image-action" msgid "_Map" msgstr "_Mapa" -#: ../app/actions/image-actions.c:63 +#: ../app/actions/image-actions.c:64 msgctxt "image-action" msgid "C_omponents" msgstr "_Componentes" -#: ../app/actions/image-actions.c:66 +#: ../app/actions/image-actions.c:67 msgctxt "image-action" msgid "_New..." msgstr "_Nuevo…" -#: ../app/actions/image-actions.c:67 +#: ../app/actions/image-actions.c:68 msgctxt "image-action" msgid "Create a new image" msgstr "Crea una imagen nueva" -#: ../app/actions/image-actions.c:72 +#: ../app/actions/image-actions.c:73 msgctxt "image-action" msgid "Can_vas Size..." msgstr "Tamaño del _lienzo…" -#: ../app/actions/image-actions.c:73 +#: ../app/actions/image-actions.c:74 msgctxt "image-action" msgid "Adjust the image dimensions" msgstr "Ajustar las dimensiones de la imagen" -#: ../app/actions/image-actions.c:78 +#: ../app/actions/image-actions.c:79 msgctxt "image-action" msgid "Fit Canvas to L_ayers" msgstr "_Ajustar lienzo a las capas" -#: ../app/actions/image-actions.c:79 +#: ../app/actions/image-actions.c:80 msgctxt "image-action" msgid "Resize the image to enclose all layers" msgstr "Redimensionar la imagen para cubrir todas las capas" -#: ../app/actions/image-actions.c:84 +#: ../app/actions/image-actions.c:85 msgctxt "image-action" msgid "F_it Canvas to Selection" msgstr "L_ienzo al tamaño de la selección" -#: ../app/actions/image-actions.c:85 +#: ../app/actions/image-actions.c:86 msgctxt "image-action" msgid "Resize the image to the extents of the selection" msgstr "Cambia el tamaño de la imagen a las dimensiones de la selección" -#: ../app/actions/image-actions.c:90 +#: ../app/actions/image-actions.c:91 msgctxt "image-action" msgid "_Print Size..." msgstr "Tamaño de la im_presión…" -#: ../app/actions/image-actions.c:91 +#: ../app/actions/image-actions.c:92 msgctxt "image-action" msgid "Adjust the print resolution" msgstr "Ajustar la resolución de impresión" -#: ../app/actions/image-actions.c:96 +#: ../app/actions/image-actions.c:97 msgctxt "image-action" msgid "_Scale Image..." msgstr "E_scalar la imagen…" -#: ../app/actions/image-actions.c:97 +#: ../app/actions/image-actions.c:98 msgctxt "image-action" msgid "Change the size of the image content" msgstr "Cambia el tamaño del contenido de la imagen" -#: ../app/actions/image-actions.c:102 +#: ../app/actions/image-actions.c:103 msgctxt "image-action" msgid "_Crop to Selection" msgstr "Re_cortar a la selección" -#: ../app/actions/image-actions.c:103 +#: ../app/actions/image-actions.c:104 msgctxt "image-action" msgid "Crop the image to the extents of the selection" msgstr "Recorta la imagen a las dimensiones de la selección" -#: ../app/actions/image-actions.c:108 +#: ../app/actions/image-actions.c:109 msgctxt "image-action" msgid "_Duplicate" msgstr "_Duplicar" -#: ../app/actions/image-actions.c:109 +#: ../app/actions/image-actions.c:110 msgctxt "image-action" msgid "Create a duplicate of this image" msgstr "Crea un duplicado de esta imagen" -#: ../app/actions/image-actions.c:114 +#: ../app/actions/image-actions.c:115 msgctxt "image-action" msgid "Merge Visible _Layers..." msgstr "Combinar las capas _visibles…" -#: ../app/actions/image-actions.c:115 +#: ../app/actions/image-actions.c:116 msgctxt "image-action" msgid "Merge all visible layers into one layer" msgstr "Combina todas las capas visibles en una sola capa" -#: ../app/actions/image-actions.c:120 +#: ../app/actions/image-actions.c:121 msgctxt "image-action" msgid "_Flatten Image" msgstr "A_planar la imagen" -#: ../app/actions/image-actions.c:121 +#: ../app/actions/image-actions.c:122 msgctxt "image-action" msgid "Merge all layers into one and remove transparency" msgstr "Combina todas las capas en una y quita la transparencia" -#: ../app/actions/image-actions.c:126 +#: ../app/actions/image-actions.c:127 msgctxt "image-action" msgid "Configure G_rid..." msgstr "Configurar la _rejilla…" -#: ../app/actions/image-actions.c:127 +#: ../app/actions/image-actions.c:128 msgctxt "image-action" msgid "Configure the grid for this image" msgstr "Configura la rejilla para esta imagen" -#: ../app/actions/image-actions.c:132 +#: ../app/actions/image-actions.c:133 msgctxt "image-action" msgid "Image Pr_operties" msgstr "_Propiedades de la imagen" -#: ../app/actions/image-actions.c:133 +#: ../app/actions/image-actions.c:134 msgctxt "image-action" msgid "Display information about this image" msgstr "Muestra información sobre esta imagen" -#: ../app/actions/image-actions.c:141 +#: ../app/actions/image-actions.c:142 msgctxt "image-convert-action" msgid "_RGB" msgstr "_RGB" -#: ../app/actions/image-actions.c:142 +#: ../app/actions/image-actions.c:143 msgctxt "image-convert-action" msgid "Convert the image to the RGB colorspace" msgstr "Convierte la imagen al espacio de colores RGB" -#: ../app/actions/image-actions.c:146 +#: ../app/actions/image-actions.c:147 msgctxt "image-convert-action" msgid "_Grayscale" msgstr "Escala de _grises" -#: ../app/actions/image-actions.c:147 +#: ../app/actions/image-actions.c:148 msgctxt "image-convert-action" msgid "Convert the image to grayscale" msgstr "Convierte la imagen a tonos de grises" -#: ../app/actions/image-actions.c:151 +#: ../app/actions/image-actions.c:152 msgctxt "image-convert-action" msgid "_Indexed..." msgstr "_Indexado…" -#: ../app/actions/image-actions.c:152 +#: ../app/actions/image-actions.c:153 msgctxt "image-convert-action" msgid "Convert the image to indexed colors" msgstr "Convierte la imagen a colores indexados" -#: ../app/actions/image-actions.c:159 +#: ../app/actions/image-actions.c:160 msgctxt "image-action" msgid "Flip _Horizontally" msgstr "Voltear _horizontalmente" -#: ../app/actions/image-actions.c:160 +#: ../app/actions/image-actions.c:161 msgctxt "image-action" msgid "Flip image horizontally" msgstr "Voltea la imagen horizontalmente" -#: ../app/actions/image-actions.c:165 +#: ../app/actions/image-actions.c:166 msgctxt "image-action" msgid "Flip _Vertically" msgstr "Voltear _verticalmente" -#: ../app/actions/image-actions.c:166 +#: ../app/actions/image-actions.c:167 msgctxt "image-action" msgid "Flip image vertically" msgstr "Voltea la imagen verticalmente" -#: ../app/actions/image-actions.c:174 +#: ../app/actions/image-actions.c:175 msgctxt "image-action" msgid "Rotate 90° _clockwise" msgstr "Rotar 90° en sentido _horario" -#: ../app/actions/image-actions.c:175 +#: ../app/actions/image-actions.c:176 msgctxt "image-action" msgid "Rotate the image 90 degrees to the right" msgstr "Rota la imagen 90 grados a la derecha" -#: ../app/actions/image-actions.c:180 +#: ../app/actions/image-actions.c:181 msgctxt "image-action" msgid "Rotate _180°" msgstr "Rotar _180°" -#: ../app/actions/image-actions.c:181 +#: ../app/actions/image-actions.c:182 msgctxt "image-action" msgid "Turn the image upside-down" msgstr "Pone la imagen cabeza abajo" -#: ../app/actions/image-actions.c:186 +#: ../app/actions/image-actions.c:187 msgctxt "image-action" msgid "Rotate 90° counter-clock_wise" msgstr "Rotar 90° en sentido _antihorario" -#: ../app/actions/image-actions.c:187 +#: ../app/actions/image-actions.c:188 msgctxt "image-action" msgid "Rotate the image 90 degrees to the left" msgstr "Rota la imagen 90 grados a la izquierda" @@ -3042,48 +3227,48 @@ msgstr "Rota la imagen 90 grados a la izquierda" msgid "Set Image Canvas Size" msgstr "Establece el tamaño del lienzo de la imagen" -#: ../app/actions/image-commands.c:262 ../app/actions/image-commands.c:283 -#: ../app/actions/image-commands.c:561 +#: ../app/actions/image-commands.c:265 ../app/actions/image-commands.c:289 +#: ../app/actions/image-commands.c:581 msgid "Resizing" msgstr "Redimensionando" -#: ../app/actions/image-commands.c:307 +#: ../app/actions/image-commands.c:316 msgid "Set Image Print Resolution" msgstr "Establecer la resolución de impresión de la imagen" -#: ../app/actions/image-commands.c:363 +#: ../app/actions/image-commands.c:378 #: ../app/pdb/drawable-transform-cmds.c:147 #: ../app/pdb/drawable-transform-cmds.c:222 msgid "Flipping" msgstr "Volteando" -#: ../app/actions/image-commands.c:384 +#: ../app/actions/image-commands.c:402 #: ../app/pdb/drawable-transform-cmds.c:524 -#: ../app/pdb/drawable-transform-cmds.c:603 ../app/pdb/image-cmds.c:532 +#: ../app/pdb/drawable-transform-cmds.c:603 ../app/pdb/image-cmds.c:534 #: ../app/pdb/transform-tools-cmds.c:214 ../app/tools/gimprotatetool.c:122 msgid "Rotating" msgstr "Rotando" -#: ../app/actions/image-commands.c:410 ../app/actions/layers-commands.c:670 +#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:691 msgid "Cannot crop because the current selection is empty." msgstr "No se puede recortar porque la selección actual está vacía." -#: ../app/actions/image-commands.c:608 +#: ../app/actions/image-commands.c:628 msgid "Change Print Size" msgstr "Cambiar el tamaño de la impresión" -#: ../app/actions/image-commands.c:649 ../app/core/gimpimage-scale.c:87 +#: ../app/actions/image-commands.c:669 msgid "Scale Image" msgstr "Escalar la imagen" #. Scaling -#: ../app/actions/image-commands.c:660 ../app/actions/layers-commands.c:1135 -#: ../app/dialogs/preferences-dialog.c:1928 +#: ../app/actions/image-commands.c:680 ../app/actions/layers-commands.c:1145 +#: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:681 -#: ../app/pdb/drawable-transform-cmds.c:757 ../app/pdb/image-cmds.c:404 -#: ../app/pdb/image-cmds.c:440 ../app/pdb/layer-cmds.c:288 -#: ../app/pdb/layer-cmds.c:333 ../app/pdb/transform-tools-cmds.c:290 -#: ../app/tools/gimpscaletool.c:107 +#: ../app/pdb/drawable-transform-cmds.c:757 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/layer-cmds.c:298 +#: ../app/pdb/layer-cmds.c:343 ../app/pdb/transform-tools-cmds.c:290 +#: ../app/tools/gimpscaletool.c:106 msgid "Scaling" msgstr "Escalado" @@ -3122,26 +3307,21 @@ msgctxt "images-action" msgid "Delete this image" msgstr "Borrar esta imagen" -#: ../app/actions/layers-actions.c:47 +#: ../app/actions/layers-actions.c:49 msgctxt "layers-action" msgid "Layers Menu" msgstr "Menú de capas" -#: ../app/actions/layers-actions.c:51 +#: ../app/actions/layers-actions.c:53 msgctxt "layers-action" msgid "_Layer" msgstr "_Capa" -#: ../app/actions/layers-actions.c:53 +#: ../app/actions/layers-actions.c:55 msgctxt "layers-action" msgid "Stac_k" msgstr "_Pila" -#: ../app/actions/layers-actions.c:55 -msgctxt "layers-action" -msgid "Te_xt to Selection" -msgstr "Te_xto a selección" - #: ../app/actions/layers-actions.c:57 msgctxt "layers-action" msgid "_Mask" @@ -3192,7 +3372,7 @@ msgctxt "layers-action" msgid "Edit the layer's name" msgstr "Editar el nombre de la capa" -#: ../app/actions/layers-actions.c:82 +#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:598 msgctxt "layers-action" msgid "_New Layer..." msgstr "Capa _nueva…" @@ -3200,9 +3380,9 @@ msgstr "Capa _nueva…" #: ../app/actions/layers-actions.c:83 msgctxt "layers-action" msgid "Create a new layer and add it to the image" -msgstr "Crea una capa nueva y la añade a la imagen" +msgstr "Crear una capa nueva y la añade a la imagen" -#: ../app/actions/layers-actions.c:88 +#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:599 msgctxt "layers-action" msgid "_New Layer" msgstr "Capa _nueva" @@ -3223,20 +3403,14 @@ msgid "Create a new layer from what is visible in this image" msgstr "Crear una capa nueva a partir de lo que es visible en esta imagen" #: ../app/actions/layers-actions.c:101 -#, fuzzy -#| msgctxt "layers-action" -#| msgid "_New Layer..." msgctxt "layers-action" -msgid "_New Group Layer..." -msgstr "Capa _nueva…" +msgid "New Layer _Group..." +msgstr "_Grupo de capas nuevo…" #: ../app/actions/layers-actions.c:102 -#, fuzzy -#| msgctxt "layers-action" -#| msgid "Create a new layer and add it to the image" msgctxt "layers-action" -msgid "Create a new group layer and add it to the image" -msgstr "Crea una capa nueva y la añade a la imagen" +msgid "Create a new layer group and add it to the image" +msgstr "Crear un grupo de capas nuevo y lo añade a la imagen" #: ../app/actions/layers-actions.c:107 msgctxt "layers-action" @@ -3246,7 +3420,7 @@ msgstr "D_uplicar la capa" #: ../app/actions/layers-actions.c:109 msgctxt "layers-action" msgid "Create a duplicate of the layer and add it to the image" -msgstr "Crea un duplicado de la capa y la añade a la imagen" +msgstr "Crear un duplicado de la capa y la añade a la imagen" #: ../app/actions/layers-actions.c:114 msgctxt "layers-action" @@ -3266,7 +3440,7 @@ msgstr "_Elevar capa" #: ../app/actions/layers-actions.c:121 msgctxt "layers-action" msgid "Raise this layer one step in the layer stack" -msgstr "Eleva esta capa un nivel dentro de la pila de capas" +msgstr "Elevar esta capa un nivel dentro de la pila de capas" #: ../app/actions/layers-actions.c:126 msgctxt "layers-action" @@ -3276,7 +3450,7 @@ msgstr "Capa a la _cima" #: ../app/actions/layers-actions.c:127 msgctxt "layers-action" msgid "Move this layer to the top of the layer stack" -msgstr "Mueve esta capa a la parte superior de la pila de capas" +msgstr "Mover esta capa a la parte superior de la pila de capas" #: ../app/actions/layers-actions.c:132 msgctxt "layers-action" @@ -3286,7 +3460,7 @@ msgstr "_Bajar capa" #: ../app/actions/layers-actions.c:133 msgctxt "layers-action" msgid "Lower this layer one step in the layer stack" -msgstr "Baja esta capa un nivel dentro de la pila de capas" +msgstr "Bajar esta capa un nivel dentro de la pila de capas" #: ../app/actions/layers-actions.c:138 msgctxt "layers-action" @@ -3296,7 +3470,7 @@ msgstr "Capa al _fondo" #: ../app/actions/layers-actions.c:139 msgctxt "layers-action" msgid "Move this layer to the bottom of the layer stack" -msgstr "Mueve esta capa a la parte inferior de la pila de capas" +msgstr "Mover esta capa a la parte inferior de la pila de capas" #: ../app/actions/layers-actions.c:144 msgctxt "layers-action" @@ -3315,328 +3489,329 @@ msgstr "Combinar hacia aba_jo" #: ../app/actions/layers-actions.c:151 msgctxt "layers-action" -msgid "Merge this layer with the one below it" -msgstr "Combina esta capa con la que está bajo ella" +msgid "Merge this layer with the first visible layer below it" +msgstr "" +"Combinar esta capa con la primera capa visible que está por debajo de ella" #: ../app/actions/layers-actions.c:156 msgctxt "layers-action" +msgid "Merge Layer Group" +msgstr "Combinar grupo de capas" + +#: ../app/actions/layers-actions.c:157 +msgctxt "layers-action" +msgid "Merge the layer group's layers into one normal layer" +msgstr "Combinar todas las capas del grupo en una sola capa normal" + +#: ../app/actions/layers-actions.c:162 +msgctxt "layers-action" msgid "Merge _Visible Layers..." msgstr "Combinar las capas _visibles…" -#: ../app/actions/layers-actions.c:157 +#: ../app/actions/layers-actions.c:163 msgctxt "layers-action" msgid "Merge all visible layers into one layer" -msgstr "Combina todas las capas visibles en una sola capa" +msgstr "Combinar todas las capas visibles en una sola capa" -#: ../app/actions/layers-actions.c:162 +#: ../app/actions/layers-actions.c:168 msgctxt "layers-action" msgid "_Flatten Image" msgstr "A_planar la imagen" -#: ../app/actions/layers-actions.c:163 +#: ../app/actions/layers-actions.c:169 msgctxt "layers-action" msgid "Merge all layers into one and remove transparency" -msgstr "Combina todas las capas en una y quita la transparencia" +msgstr "Combinar todas las capas en una y quita la transparencia" -#: ../app/actions/layers-actions.c:168 +#: ../app/actions/layers-actions.c:174 msgctxt "layers-action" msgid "_Discard Text Information" msgstr "_Descartar información de texto" -#: ../app/actions/layers-actions.c:169 +#: ../app/actions/layers-actions.c:175 msgctxt "layers-action" msgid "Turn this text layer into a normal layer" -msgstr "Convierte esta capa de texto en una capa normal" +msgstr "Convertir esta capa de texto en una capa normal" -#: ../app/actions/layers-actions.c:174 +#: ../app/actions/layers-actions.c:180 msgctxt "layers-action" msgid "Text to _Path" msgstr "Texto a _ruta" -#: ../app/actions/layers-actions.c:175 +#: ../app/actions/layers-actions.c:181 msgctxt "layers-action" msgid "Create a path from this text layer" -msgstr "Crea una ruta a partir de esta capa de texto" +msgstr "Crear una ruta a partir de esta capa de texto" -#: ../app/actions/layers-actions.c:180 +#: ../app/actions/layers-actions.c:186 msgctxt "layers-action" msgid "Text alon_g Path" msgstr "Texto _siguiendo una ruta" -#: ../app/actions/layers-actions.c:181 +#: ../app/actions/layers-actions.c:187 msgctxt "layers-action" msgid "Warp this layer's text along the current path" msgstr "Hacer seguir el texto de esta capa a lo largo de la ruta" -#: ../app/actions/layers-actions.c:186 +#: ../app/actions/layers-actions.c:192 msgctxt "layers-action" msgid "Layer B_oundary Size..." msgstr "Tamaño de b_orde de capa…" -#: ../app/actions/layers-actions.c:187 +#: ../app/actions/layers-actions.c:193 msgctxt "layers-action" msgid "Adjust the layer dimensions" -msgstr "Ajusta las dimensiones de la capa" +msgstr "Ajustar las dimensiones de la capa" -#: ../app/actions/layers-actions.c:192 +#: ../app/actions/layers-actions.c:198 msgctxt "layers-action" msgid "Layer to _Image Size" msgstr "Capa a tamaño de _imagen" -#: ../app/actions/layers-actions.c:193 +#: ../app/actions/layers-actions.c:199 msgctxt "layers-action" msgid "Resize the layer to the size of the image" -msgstr "Redimensiona la capa al tamaño de la imagen" +msgstr "Redimensionar la capa al tamaño de la imagen" -#: ../app/actions/layers-actions.c:198 +#: ../app/actions/layers-actions.c:204 msgctxt "layers-action" msgid "_Scale Layer..." msgstr "E_scalar capa…" -#: ../app/actions/layers-actions.c:199 +#: ../app/actions/layers-actions.c:205 msgctxt "layers-action" msgid "Change the size of the layer content" -msgstr "Cambia el tamaño del contenido de la capa" +msgstr "Cambiar el tamaño del contenido de la capa" -#: ../app/actions/layers-actions.c:204 +#: ../app/actions/layers-actions.c:210 msgctxt "layers-action" msgid "_Crop to Selection" msgstr "Re_cortar a la selección" -#: ../app/actions/layers-actions.c:205 +#: ../app/actions/layers-actions.c:211 msgctxt "layers-action" msgid "Crop the layer to the extents of the selection" -msgstr "Recorta la capa a las dimensiones de la selección" +msgstr "Recortar la capa a las dimensiones de la selección" -#: ../app/actions/layers-actions.c:210 +#: ../app/actions/layers-actions.c:216 msgctxt "layers-action" msgid "Add La_yer Mask..." msgstr "Añadir má_scara de capa…" -#: ../app/actions/layers-actions.c:212 +#: ../app/actions/layers-actions.c:218 msgctxt "layers-action" msgid "Add a mask that allows non-destructive editing of transparency" msgstr "" -"Añade una máscara que permita la edición no destructiva de la transparencia" +"Añadir una máscara que permita la edición no destructiva de la transparencia" -#: ../app/actions/layers-actions.c:217 +#: ../app/actions/layers-actions.c:223 msgctxt "layers-action" msgid "Add Alpha C_hannel" msgstr "Añadir canal al_fa" -#: ../app/actions/layers-actions.c:218 +#: ../app/actions/layers-actions.c:224 msgctxt "layers-action" msgid "Add transparency information to the layer" -msgstr "Añade información de transparencia a la capa" +msgstr "Añadir información de transparencia a la capa" -#: ../app/actions/layers-actions.c:223 +#: ../app/actions/layers-actions.c:229 msgctxt "layers-action" msgid "_Remove Alpha Channel" msgstr "Elimina_r el canal Alfa" -#: ../app/actions/layers-actions.c:224 +#: ../app/actions/layers-actions.c:230 msgctxt "layers-action" msgid "Remove transparency information from the layer" -msgstr "Quita la información de transparencia de la capa" +msgstr "Quitar la información de transparencia de la capa" -#: ../app/actions/layers-actions.c:232 +#: ../app/actions/layers-actions.c:238 msgctxt "layers-action" msgid "Lock Alph_a Channel" msgstr "Bloquear el canal alf_a" -#: ../app/actions/layers-actions.c:234 +#: ../app/actions/layers-actions.c:240 msgctxt "layers-action" msgid "Keep transparency information on this layer from being modified" msgstr "" -"Evita que la información de transparencia de esta capa pueda ser modificada" +"Evitar que la información de transparencia de esta capa pueda ser modificada" -#: ../app/actions/layers-actions.c:240 +#: ../app/actions/layers-actions.c:246 msgctxt "layers-action" msgid "_Edit Layer Mask" msgstr "_Editar máscara de capa" -#: ../app/actions/layers-actions.c:241 +#: ../app/actions/layers-actions.c:247 msgctxt "layers-action" msgid "Work on the layer mask" msgstr "Trabajar sobre la máscara de capa" -#: ../app/actions/layers-actions.c:247 +#: ../app/actions/layers-actions.c:253 msgctxt "layers-action" msgid "S_how Layer Mask" msgstr "_Mostrar máscara de capa" -#: ../app/actions/layers-actions.c:253 +#: ../app/actions/layers-actions.c:259 msgctxt "layers-action" msgid "_Disable Layer Mask" msgstr "_Desactivar máscara de capa" -#: ../app/actions/layers-actions.c:254 +#: ../app/actions/layers-actions.c:260 msgctxt "layers-action" msgid "Dismiss the effect of the layer mask" msgstr "Ignorar el efecto de la máscara de capa" -#: ../app/actions/layers-actions.c:263 +#: ../app/actions/layers-actions.c:269 msgctxt "layers-action" msgid "Apply Layer _Mask" msgstr "Aplicar _máscara de capa" -#: ../app/actions/layers-actions.c:264 +#: ../app/actions/layers-actions.c:270 msgctxt "layers-action" msgid "Apply the effect of the layer mask and remove it" msgstr "Aplicar el efecto de la máscara de capa y quitarla" -#: ../app/actions/layers-actions.c:269 +#: ../app/actions/layers-actions.c:275 msgctxt "layers-action" msgid "Delete Layer Mas_k" msgstr "Borrar másca_ra de capa" -#: ../app/actions/layers-actions.c:270 +#: ../app/actions/layers-actions.c:276 msgctxt "layers-action" msgid "Remove the layer mask and its effect" msgstr "Quitar la máscara de capa y su efecto" -#: ../app/actions/layers-actions.c:278 +#: ../app/actions/layers-actions.c:284 msgctxt "layers-action" msgid "_Mask to Selection" msgstr "_Máscara a selección" -#: ../app/actions/layers-actions.c:279 +#: ../app/actions/layers-actions.c:285 msgctxt "layers-action" msgid "Replace the selection with the layer mask" msgstr "Sustituir la selección con la máscara de capa" -#: ../app/actions/layers-actions.c:284 +#: ../app/actions/layers-actions.c:290 msgctxt "layers-action" msgid "_Add to Selection" msgstr "_Añadir a selección" -#: ../app/actions/layers-actions.c:285 +#: ../app/actions/layers-actions.c:291 msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "Añadir la máscara de capa a la selección actual" -#: ../app/actions/layers-actions.c:290 ../app/actions/layers-actions.c:319 -#: ../app/actions/layers-actions.c:349 +#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325 msgctxt "layers-action" msgid "_Subtract from Selection" msgstr "_Sustraer de selección" -#: ../app/actions/layers-actions.c:291 +#: ../app/actions/layers-actions.c:297 msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "Sustraer la máscara de capa de la selección actual" -#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:326 -#: ../app/actions/layers-actions.c:356 +#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332 msgctxt "layers-action" msgid "_Intersect with Selection" msgstr "_Interseccionar con selección" -#: ../app/actions/layers-actions.c:297 +#: ../app/actions/layers-actions.c:303 msgctxt "layers-action" msgid "Intersect the layer mask with the current selection" msgstr "" "Establecer la máscara de capa como su intersección con la selección actual" -#: ../app/actions/layers-actions.c:305 +#: ../app/actions/layers-actions.c:311 msgctxt "layers-action" msgid "Al_pha to Selection" msgstr "Alfa a _selección" -#: ../app/actions/layers-actions.c:307 +#: ../app/actions/layers-actions.c:313 msgctxt "layers-action" msgid "Replace the selection with the layer's alpha channel" msgstr "Sustituir la selección con el canal alfa de la capa" -#: ../app/actions/layers-actions.c:312 ../app/actions/layers-actions.c:342 +#: ../app/actions/layers-actions.c:318 msgctxt "layers-action" msgid "A_dd to Selection" msgstr "_Añadir a selección" -#: ../app/actions/layers-actions.c:314 +#: ../app/actions/layers-actions.c:320 msgctxt "layers-action" msgid "Add the layer's alpha channel to the current selection" msgstr "Añadir el canal alfa de la capa a la selección actual" -#: ../app/actions/layers-actions.c:321 +#: ../app/actions/layers-actions.c:327 msgctxt "layers-action" msgid "Subtract the layer's alpha channel from the current selection" msgstr "Sustraer el canal alfa de la capa de la selección actual" -#: ../app/actions/layers-actions.c:328 +#: ../app/actions/layers-actions.c:334 msgctxt "layers-action" msgid "Intersect the layer's alpha channel with the current selection" msgstr "" "Establecer la selección actual como su intersección con el canal alfa de la " "capa" -#: ../app/actions/layers-actions.c:336 -msgctxt "layers-action" -msgid "_Text to Selection" -msgstr "_Texto a selección" - -#: ../app/actions/layers-actions.c:337 -msgctxt "layers-action" -msgid "Replace the selection with the text layer's outline" -msgstr "Sustituir la selección por borde exterior de la capa de texto" - -#: ../app/actions/layers-actions.c:344 -msgctxt "layers-action" -msgid "Add the text layer's outline to the current selection" -msgstr "Añadir el borde exterior de la capa del texto a la selección actual" - -#: ../app/actions/layers-actions.c:351 -msgctxt "layers-action" -msgid "Subtract the text layer's outline from the current selection" -msgstr "Sustraer el borde exterior de la capa de texto de la selección actual" - -#: ../app/actions/layers-actions.c:358 -msgctxt "layers-action" -msgid "Intersect the text layer's outline with the current selection" -msgstr "" -"Establecer el borde exterior de la capa de texto como su intersección con la " -"selección actual" - -#: ../app/actions/layers-actions.c:366 +#: ../app/actions/layers-actions.c:342 msgctxt "layers-action" msgid "Select _Top Layer" msgstr "Seleccionar la capa _superior" -#: ../app/actions/layers-actions.c:367 +#: ../app/actions/layers-actions.c:343 msgctxt "layers-action" msgid "Select the topmost layer" msgstr "Seleccionar la capa más alta" -#: ../app/actions/layers-actions.c:372 +#: ../app/actions/layers-actions.c:348 msgctxt "layers-action" msgid "Select _Bottom Layer" msgstr "Seleccionar la capa i_nferior" -#: ../app/actions/layers-actions.c:373 +#: ../app/actions/layers-actions.c:349 msgctxt "layers-action" msgid "Select the bottommost layer" msgstr "Seleccionar la capa más baja" -#: ../app/actions/layers-actions.c:378 +#: ../app/actions/layers-actions.c:354 msgctxt "layers-action" msgid "Select _Previous Layer" msgstr "Seleccionar la _capa anterior" -#: ../app/actions/layers-actions.c:379 +#: ../app/actions/layers-actions.c:355 msgctxt "layers-action" msgid "Select the layer above the current layer" msgstr "Seleccionar la capa por encima de la actual" -#: ../app/actions/layers-actions.c:384 +#: ../app/actions/layers-actions.c:360 msgctxt "layers-action" msgid "Select _Next Layer" msgstr "Seleccionar la capa siguie_nte" -#: ../app/actions/layers-actions.c:385 +#: ../app/actions/layers-actions.c:361 msgctxt "layers-action" msgid "Select the layer below the current layer" msgstr "Seleccionar la capa por debajo de la actual" +#. Will be followed with e.g. "Shift-Click +#. on thumbnail" +#. +#: ../app/actions/layers-actions.c:442 +msgid "Shortcut: " +msgstr "Combinación de teclas: " + +#. Will be prepended with a modifier key +#. string, e.g. "Shift" +#. +#: ../app/actions/layers-actions.c:447 +msgid "-Click on thumbnail in Layers dockable" +msgstr "-Pulse sobre la miniatura del empotrable de capas" + +#: ../app/actions/layers-actions.c:593 ../app/actions/layers-actions.c:594 +msgctxt "layers-action" +msgid "To _New Layer" +msgstr "A una capa _nueva" + #: ../app/actions/layers-commands.c:203 msgid "Layer Attributes" msgstr "Atributos de la capa" @@ -3645,10 +3820,13 @@ msgstr "Atributos de la capa" msgid "Edit Layer Attributes" msgstr "Editar atributos de capa" -#: ../app/actions/layers-commands.c:250 ../app/actions/layers-commands.c:252 -#: ../app/actions/layers-commands.c:320 ../app/actions/layers-commands.c:324 -#: ../app/widgets/gimpdrawabletreeview.c:327 -#: ../app/widgets/gimplayertreeview.c:869 +#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:265 +msgid "Layer" +msgstr "Capa" + +#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 +#: ../app/widgets/gimpdrawabletreeview.c:337 +#: ../app/widgets/gimplayertreeview.c:846 msgid "New Layer" msgstr "Capa nueva" @@ -3656,31 +3834,27 @@ msgstr "Capa nueva" msgid "Create a New Layer" msgstr "Crear una capa nueva" -#: ../app/actions/layers-commands.c:354 +#: ../app/actions/layers-commands.c:356 msgid "Visible" msgstr "Visible" -#: ../app/actions/layers-commands.c:601 +#: ../app/actions/layers-commands.c:618 msgid "Set Layer Boundary Size" msgstr "Establecer el tamaño de borde de capa" -#: ../app/actions/layers-commands.c:642 ../app/core/gimplayer.c:255 +#: ../app/actions/layers-commands.c:663 msgid "Scale Layer" msgstr "Escalar la capa" -#: ../app/actions/layers-commands.c:680 +#: ../app/actions/layers-commands.c:701 msgid "Crop Layer" msgstr "Recortar la capa" -#: ../app/actions/layers-commands.c:819 -msgid "Layer Mask to Selection" -msgstr "Máscara de capa a selección" - -#: ../app/actions/layers-commands.c:1070 +#: ../app/actions/layers-commands.c:1080 msgid "Please select a channel first" msgstr "Seleccione un canal primero" -#: ../app/actions/layers-commands.c:1078 ../app/core/gimplayer.c:1332 +#: ../app/actions/layers-commands.c:1088 #: ../app/dialogs/layer-add-mask-dialog.c:82 msgid "Add Layer Mask" msgstr "Añadir máscara de capa" @@ -3840,11 +4014,11 @@ msgctxt "palettes-action" msgid "Edit palette" msgstr "Editar la paleta" -#: ../app/actions/palettes-commands.c:73 +#: ../app/actions/palettes-commands.c:72 msgid "Merge Palette" msgstr "Combinar la paleta" -#: ../app/actions/palettes-commands.c:77 +#: ../app/actions/palettes-commands.c:76 msgid "Enter a name for the merged palette" msgstr "Introduzca un nombre para la paleta combinada" @@ -4048,21 +4222,21 @@ msgctxt "plug-in-action" msgid "Show the last used plug-in dialog again" msgstr "Muestra otra vez el diálogo del último complemento utilizado" -#: ../app/actions/plug-in-actions.c:523 +#: ../app/actions/plug-in-actions.c:531 #, c-format msgid "Re_peat \"%s\"" msgstr "Re_petir «%s»" -#: ../app/actions/plug-in-actions.c:524 +#: ../app/actions/plug-in-actions.c:532 #, c-format msgid "R_e-Show \"%s\"" msgstr "Volv_er a mostrar «%s»" -#: ../app/actions/plug-in-actions.c:540 +#: ../app/actions/plug-in-actions.c:548 msgid "Repeat Last" msgstr "Repetir el último" -#: ../app/actions/plug-in-actions.c:542 +#: ../app/actions/plug-in-actions.c:550 msgid "Re-Show Last" msgstr "Volver a mostrar el último" @@ -4075,32 +4249,32 @@ msgid "Do you really want to reset all filters to default values?" msgstr "" "¿Realmente desea reiniciar todos los filtros con sus valores predeterminados?" -#: ../app/actions/quick-mask-actions.c:42 +#: ../app/actions/quick-mask-actions.c:43 msgctxt "quick-mask-action" msgid "Quick Mask Menu" msgstr "Menú de la máscara rápida" -#: ../app/actions/quick-mask-actions.c:46 +#: ../app/actions/quick-mask-actions.c:47 msgctxt "quick-mask-action" msgid "_Configure Color and Opacity..." msgstr "_Configurar el color y la opacidad…" -#: ../app/actions/quick-mask-actions.c:54 +#: ../app/actions/quick-mask-actions.c:55 msgctxt "quick-mask-action" msgid "Toggle _Quick Mask" msgstr "Activar máscara _rápida" -#: ../app/actions/quick-mask-actions.c:55 +#: ../app/actions/quick-mask-actions.c:56 msgctxt "quick-mask-action" msgid "Toggle Quick Mask on/off" msgstr "Activar o desactiva la máscara rápida" -#: ../app/actions/quick-mask-actions.c:64 +#: ../app/actions/quick-mask-actions.c:65 msgctxt "quick-mask-action" msgid "Mask _Selected Areas" msgstr "Enmascarar las áreas _seleccionadas" -#: ../app/actions/quick-mask-actions.c:69 +#: ../app/actions/quick-mask-actions.c:70 msgctxt "quick-mask-action" msgid "Mask _Unselected Areas" msgstr "Enmascarar las áreas _no seleccionadas" @@ -4266,60 +4440,60 @@ msgctxt "select-action" msgid "Stroke the selection with last used values" msgstr "Trazar la selección con los últimos valores usados" -#: ../app/actions/select-commands.c:154 ../app/core/gimpselection.c:172 +#: ../app/actions/select-commands.c:155 msgid "Feather Selection" msgstr "Difuminar selección [Feather]" -#: ../app/actions/select-commands.c:158 +#: ../app/actions/select-commands.c:159 msgid "Feather selection by" msgstr "Difuminar selección en" -#: ../app/actions/select-commands.c:192 ../app/core/gimpselection.c:179 +#: ../app/actions/select-commands.c:196 msgid "Shrink Selection" msgstr "Encoger selección" -#: ../app/actions/select-commands.c:196 +#: ../app/actions/select-commands.c:200 msgid "Shrink selection by" msgstr "Encoger selección en" -#: ../app/actions/select-commands.c:204 +#: ../app/actions/select-commands.c:208 msgid "_Shrink from image border" msgstr "_Encoger desde el borde de la imagen" -#: ../app/actions/select-commands.c:229 ../app/core/gimpselection.c:178 +#: ../app/actions/select-commands.c:236 msgid "Grow Selection" msgstr "Agrandar selección" -#: ../app/actions/select-commands.c:233 +#: ../app/actions/select-commands.c:240 msgid "Grow selection by" msgstr "Agrandar selección en" -#: ../app/actions/select-commands.c:256 ../app/core/gimpselection.c:177 +#: ../app/actions/select-commands.c:266 msgid "Border Selection" msgstr "Selección de borde" # ¿Bordear selección por (serrador) -#: ../app/actions/select-commands.c:260 +#: ../app/actions/select-commands.c:270 msgid "Border selection by" msgstr "Selección de borde en" #. Feather button -#: ../app/actions/select-commands.c:269 +#: ../app/actions/select-commands.c:279 msgid "_Feather border" msgstr "_Difuminar los bordes" #. Edge lock button -#: ../app/actions/select-commands.c:282 +#: ../app/actions/select-commands.c:292 msgid "_Lock selection to image edges" msgstr "Fijar _la selección a los bordes de la imagen" -#: ../app/actions/select-commands.c:332 ../app/actions/select-commands.c:365 -#: ../app/actions/vectors-commands.c:393 ../app/actions/vectors-commands.c:427 +#: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375 +#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 #: ../app/dialogs/stroke-dialog.c:289 msgid "There is no active layer or channel to stroke to." msgstr "No hay una capa o canal activo adonde se pueda trazar." -#: ../app/actions/select-commands.c:338 ../app/core/gimpselection.c:156 +#: ../app/actions/select-commands.c:348 msgid "Stroke Selection" msgstr "Trazar selección" @@ -4378,24 +4552,24 @@ msgctxt "templates-action" msgid "Delete this template" msgstr "Borrar esta plantilla" -#: ../app/actions/templates-commands.c:112 +#: ../app/actions/templates-commands.c:111 msgid "New Template" msgstr "Plantilla nueva" -#: ../app/actions/templates-commands.c:115 +#: ../app/actions/templates-commands.c:114 msgid "Create a New Template" msgstr "Crear una plantilla nueva" -#: ../app/actions/templates-commands.c:175 -#: ../app/actions/templates-commands.c:178 +#: ../app/actions/templates-commands.c:174 +#: ../app/actions/templates-commands.c:177 msgid "Edit Template" msgstr "Editar plantilla" -#: ../app/actions/templates-commands.c:213 +#: ../app/actions/templates-commands.c:212 msgid "Delete Template" msgstr "Borrar la plantilla" -#: ../app/actions/templates-commands.c:239 +#: ../app/actions/templates-commands.c:238 #, c-format msgid "" "Are you sure you want to delete template '%s' from the list and from disk?" @@ -4442,21 +4616,21 @@ msgid "From right to left" msgstr "De derecha a izquierda" #: ../app/actions/text-editor-commands.c:62 -#: ../app/actions/text-tool-commands.c:110 +#: ../app/actions/text-tool-commands.c:117 msgid "Open Text File (UTF-8)" msgstr "Abrir archivo de texto (UTF-8)" #: ../app/actions/text-editor-commands.c:143 -#: ../app/actions/text-tool-commands.c:218 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:139 ../app/core/gimpbrush-load.c:419 -#: ../app/core/gimpbrushgenerated-load.c:72 -#: ../app/core/gimpbrushpipe-load.c:80 ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:61 ../app/core/gimppalette-load.c:75 -#: ../app/core/gimppalette-load.c:271 ../app/core/gimppalette-load.c:316 -#: ../app/core/gimppalette-load.c:372 ../app/core/gimppalette-load.c:461 -#: ../app/core/gimppalette-load.c:627 ../app/core/gimppattern-load.c:75 -#: ../app/tools/gimpcurvestool.c:631 ../app/tools/gimplevelstool.c:743 -#: ../app/xcf/xcf.c:328 +#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 +#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:422 +#: ../app/core/gimpbrushgenerated-load.c:73 +#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 +#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76 +#: ../app/core/gimppalette-load.c:273 ../app/core/gimppalette-load.c:319 +#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466 +#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76 +#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747 +#: ../app/xcf/xcf.c:329 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "No se ha podido abrir «%s» para lectura: %s" @@ -4609,8 +4783,8 @@ msgid "Enter a new name for the saved options" msgstr "Introduzca un nombre nuevo para las opciones guardadas" #: ../app/actions/tool-options-commands.c:185 -msgid "Reset Tool Options" -msgstr "Reiniciar las opciones de herramientas" +msgid "Reset All Tool Options" +msgstr "Reiniciar todas las opciones de las herramientas" #: ../app/actions/tool-options-commands.c:208 msgid "Do you really want to reset all tool options to default values?" @@ -4618,6 +4792,83 @@ msgstr "" "¿Realmente desea reiniciar todas las opciones de herramientas con sus " "valores predeterminados?" +#: ../app/actions/tool-preset-actions.c:44 +msgctxt "tool-preset-action" +msgid "Tool Preset Menu" +msgstr "Menú de ajustes prefijados de herramienta" + +#: ../app/actions/tool-preset-actions.c:48 +msgctxt "tool-preset-action" +msgid "_New Tool Preset" +msgstr "_Nuevo ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-actions.c:49 +msgctxt "tool-preset-action" +msgid "Create a new tool preset" +msgstr "Crear un ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-actions.c:54 +msgctxt "tool-preset-action" +msgid "D_uplicate Tool Preset" +msgstr "D_uplicar ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-actions.c:55 +msgctxt "tool-preset-action" +msgid "Duplicate this tool preset" +msgstr "Duplicar este ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-actions.c:60 +msgctxt "tool-preset-action" +msgid "Copy Tool Preset _Location" +msgstr "Copiar _ruta del ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-actions.c:61 +msgctxt "tool-preset-action" +msgid "Copy tool preset file location to clipboard" +msgstr "" +"Copiar la ruta del archivo de ajustes prefijados de herramienta al " +"portapapeles" + +#: ../app/actions/tool-preset-actions.c:66 +msgctxt "tool-preset-action" +msgid "_Delete Tool Preset" +msgstr "_Eliminar ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-actions.c:67 +msgctxt "tool-preset-action" +msgid "Delete this tool preset" +msgstr "Eliminar este ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-actions.c:72 +msgctxt "tool-preset-action" +msgid "_Refresh Tool Presets" +msgstr "_Refrescar los ajustes prefijados de herramienta" + +#: ../app/actions/tool-preset-actions.c:73 +msgctxt "tool-preset-action" +msgid "Refresh tool presets" +msgstr "Refrescar los ajustes de herramienta prefijados" + +#: ../app/actions/tool-preset-actions.c:81 +msgctxt "tool-preset-action" +msgid "_Edit Tool Preset..." +msgstr "_Editar ajuste prefijado de herramienta…" + +#: ../app/actions/tool-preset-actions.c:82 +msgctxt "tool-preset-action" +msgid "Edit this tool preset" +msgstr "Editar este ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-editor-actions.c:42 +msgctxt "tool-preset-editor-action" +msgid "Tool Preset Editor Menu" +msgstr "Menú del editor de ajustes prefijados de herramienta" + +#: ../app/actions/tool-preset-editor-actions.c:50 +msgctxt "tool-preset-editor-action" +msgid "Edit Active Tool Preset" +msgstr "Editar el ajuste prefijado de la herramienta activa" + #: ../app/actions/tools-actions.c:45 msgctxt "tools-action" msgid "_Tools" @@ -4818,574 +5069,579 @@ msgctxt "vectors-action" msgid "_Linked" msgstr "_Enlazado" -#: ../app/actions/vectors-actions.c:162 +#. GIMP_STOCK_LOCK +#: ../app/actions/vectors-actions.c:159 +msgctxt "vectors-action" +msgid "L_ock strokes" +msgstr "B_loquear los trazos" + +#: ../app/actions/vectors-actions.c:168 msgctxt "vectors-action" msgid "Path to Sele_ction" msgstr "Ruta a sele_cción" -#: ../app/actions/vectors-actions.c:163 +#: ../app/actions/vectors-actions.c:169 msgctxt "vectors-action" msgid "Path to selection" msgstr "Ruta a selección" -#: ../app/actions/vectors-actions.c:168 +#: ../app/actions/vectors-actions.c:174 msgctxt "vectors-action" msgid "Fr_om Path" msgstr "A partir de una _ruta" -#: ../app/actions/vectors-actions.c:169 +#: ../app/actions/vectors-actions.c:175 msgctxt "vectors-action" msgid "Replace selection with path" msgstr "Sustituir la selección con la ruta" -#: ../app/actions/vectors-actions.c:174 +#: ../app/actions/vectors-actions.c:180 msgctxt "vectors-action" msgid "_Add to Selection" msgstr "_Añadir a selección" -#: ../app/actions/vectors-actions.c:175 +#: ../app/actions/vectors-actions.c:181 msgctxt "vectors-action" msgid "Add path to selection" msgstr "Añadir ruta a selección" -#: ../app/actions/vectors-actions.c:180 +#: ../app/actions/vectors-actions.c:186 msgctxt "vectors-action" msgid "_Subtract from Selection" msgstr "_Sustraer de selección" -#: ../app/actions/vectors-actions.c:181 +#: ../app/actions/vectors-actions.c:187 msgctxt "vectors-action" msgid "Subtract path from selection" msgstr "Sustraer la ruta de la selección" -#: ../app/actions/vectors-actions.c:186 +#: ../app/actions/vectors-actions.c:192 msgctxt "vectors-action" msgid "_Intersect with Selection" msgstr "_Intersectar con selección" -#: ../app/actions/vectors-actions.c:187 +#: ../app/actions/vectors-actions.c:193 msgctxt "vectors-action" msgid "Intersect path with selection" msgstr "Establecer la ruta como su intersección con la selección" -#: ../app/actions/vectors-actions.c:195 +#: ../app/actions/vectors-actions.c:201 msgctxt "vectors-action" msgid "Selecti_on to Path" msgstr "Se_lección a ruta" -#: ../app/actions/vectors-actions.c:196 ../app/actions/vectors-actions.c:202 +#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208 msgctxt "vectors-action" msgid "Selection to path" msgstr "Selección a ruta" -#: ../app/actions/vectors-actions.c:201 +#: ../app/actions/vectors-actions.c:207 msgctxt "vectors-action" msgid "To _Path" msgstr "A _ruta" -#: ../app/actions/vectors-actions.c:207 +#: ../app/actions/vectors-actions.c:213 msgctxt "vectors-action" msgid "Selection to Path (_Advanced)" msgstr "Selección a ruta (_avanzado)" -#: ../app/actions/vectors-actions.c:208 +#: ../app/actions/vectors-actions.c:214 msgctxt "vectors-action" msgid "Advanced options" msgstr "Opciones avanzadas" -#: ../app/actions/vectors-commands.c:138 +#: ../app/actions/vectors-commands.c:137 msgid "Path Attributes" msgstr "Atributos de la ruta" -#: ../app/actions/vectors-commands.c:141 +#: ../app/actions/vectors-commands.c:140 msgid "Edit Path Attributes" msgstr "Editar atributos de la ruta" -#: ../app/actions/vectors-commands.c:165 ../app/actions/vectors-commands.c:166 -#: ../app/actions/vectors-commands.c:188 +#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:202 +#: ../app/widgets/gimpvectorstreeview.c:252 +msgid "Path" +msgstr "Ruta" + +#: ../app/actions/vectors-commands.c:165 msgid "New Path" msgstr "Nueva ruta" -#: ../app/actions/vectors-commands.c:169 +#: ../app/actions/vectors-commands.c:168 msgid "New Path Options" msgstr "Opciones de ruta nueva" -#: ../app/actions/vectors-commands.c:316 ../app/pdb/paths-cmds.c:641 -#: ../app/pdb/vectors-cmds.c:1252 -msgid "Path to Selection" -msgstr "Ruta a selección" - -#: ../app/actions/vectors-commands.c:399 ../app/tools/gimpvectoroptions.c:198 -#: ../app/tools/gimpvectortool.c:1948 ../app/vectors/gimpvectors.c:203 +#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198 +#: ../app/tools/gimpvectortool.c:1987 msgid "Stroke Path" msgstr "Trazar ruta" -#: ../app/actions/view-actions.c:68 +#: ../app/actions/view-actions.c:69 msgctxt "view-action" msgid "_View" msgstr "_Vista" -#: ../app/actions/view-actions.c:69 +#: ../app/actions/view-actions.c:70 msgctxt "view-action" msgid "_Zoom" msgstr "_Ampliación" -#: ../app/actions/view-actions.c:70 +#: ../app/actions/view-actions.c:71 msgctxt "view-action" msgid "_Padding Color" msgstr "Color de _relleno" -#: ../app/actions/view-actions.c:72 +#: ../app/actions/view-actions.c:73 msgctxt "view-action" msgid "Move to Screen" msgstr "Mover a la pantalla" -#: ../app/actions/view-actions.c:76 +#: ../app/actions/view-actions.c:77 msgctxt "view-action" msgid "_New View" msgstr "Vista _nueva" -#: ../app/actions/view-actions.c:77 +#: ../app/actions/view-actions.c:78 msgctxt "view-action" msgid "Create another view on this image" msgstr "Crea otra vista en esta imagen" -#: ../app/actions/view-actions.c:82 +#: ../app/actions/view-actions.c:83 msgctxt "view-action" msgid "_Close" msgstr "_Cerrar" -#: ../app/actions/view-actions.c:83 +#: ../app/actions/view-actions.c:84 msgctxt "view-action" msgid "Close this image window" msgstr "Cerrar esta ventana de imagen" -#: ../app/actions/view-actions.c:88 +#: ../app/actions/view-actions.c:89 msgctxt "view-action" msgid "_Fit Image in Window" msgstr "_Ajustar imagen a la ventana" -#: ../app/actions/view-actions.c:89 +#: ../app/actions/view-actions.c:90 msgctxt "view-action" msgid "Adjust the zoom ratio so that the image becomes fully visible" msgstr "Ajusta la ampliación para que la imagen se vea completamente" # fuzzy -#: ../app/actions/view-actions.c:94 +#: ../app/actions/view-actions.c:95 msgctxt "view-action" msgid "Fi_ll Window" msgstr "Ocupar toda _la ventana" -#: ../app/actions/view-actions.c:95 +#: ../app/actions/view-actions.c:96 msgctxt "view-action" msgid "Adjust the zoom ratio so that the entire window is used" msgstr "Ajusta la ampliación para que la ventana se use por completo" -#: ../app/actions/view-actions.c:100 +#: ../app/actions/view-actions.c:101 msgctxt "view-action" msgid "Re_vert Zoom" msgstr "Re_vertir la ampliación" -#: ../app/actions/view-actions.c:101 +#: ../app/actions/view-actions.c:102 msgctxt "view-action" msgid "Restore the previous zoom level" msgstr "Recuperar el nivel de ampliación previo" -#: ../app/actions/view-actions.c:106 +#: ../app/actions/view-actions.c:107 msgctxt "view-action" msgid "Na_vigation Window" msgstr "Ventana de na_vegación" -#: ../app/actions/view-actions.c:107 +#: ../app/actions/view-actions.c:108 msgctxt "view-action" msgid "Show an overview window for this image" msgstr "Muestra una venta de vista general para esta imagen" -#: ../app/actions/view-actions.c:112 +#: ../app/actions/view-actions.c:113 msgctxt "view-action" msgid "Display _Filters..." msgstr "Mostrar _filtros…" -#: ../app/actions/view-actions.c:113 +#: ../app/actions/view-actions.c:114 msgctxt "view-action" msgid "Configure filters applied to this view" msgstr "Configurar filtros aplicados a esta vista" # //R Creo que hace esto -#: ../app/actions/view-actions.c:118 +#: ../app/actions/view-actions.c:119 msgctxt "view-action" msgid "Shrink _Wrap" msgstr "_Ajustar encogiendo" -#: ../app/actions/view-actions.c:119 +#: ../app/actions/view-actions.c:120 msgctxt "view-action" msgid "Reduce the image window to the size of the image display" msgstr "Ajustar la ventana al tamaño con que se muestra la imagen" -#: ../app/actions/view-actions.c:124 +#: ../app/actions/view-actions.c:125 msgctxt "view-action" msgid "_Open Display..." msgstr "_Abrir pantalla…" -#: ../app/actions/view-actions.c:125 +#: ../app/actions/view-actions.c:126 msgctxt "view-action" msgid "Connect to another display" msgstr "Conectar a otra pantalla" -#: ../app/actions/view-actions.c:133 +#: ../app/actions/view-actions.c:134 msgctxt "view-action" msgid "_Dot for Dot" msgstr "P_unto por punto" -#: ../app/actions/view-actions.c:134 +#: ../app/actions/view-actions.c:135 msgctxt "view-action" msgid "A pixel on the screen represents an image pixel" msgstr "Un píxel en la pantalla representa un píxel de la imagen" -#: ../app/actions/view-actions.c:140 +#: ../app/actions/view-actions.c:141 msgctxt "view-action" msgid "Show _Selection" msgstr "Mostrar la s_elección" -#: ../app/actions/view-actions.c:141 +#: ../app/actions/view-actions.c:142 msgctxt "view-action" msgid "Display the selection outline" msgstr "Muestra el contorno de la selección" -#: ../app/actions/view-actions.c:147 +#: ../app/actions/view-actions.c:148 msgctxt "view-action" msgid "Show _Layer Boundary" msgstr "Mostrar el _límite de la capa" -#: ../app/actions/view-actions.c:148 +#: ../app/actions/view-actions.c:149 msgctxt "view-action" msgid "Draw a border around the active layer" msgstr "Dibuja un borde alrededor de la capa activa" -#: ../app/actions/view-actions.c:154 +#: ../app/actions/view-actions.c:155 msgctxt "view-action" msgid "Show _Guides" msgstr "Mostrar _guías" -#: ../app/actions/view-actions.c:155 +#: ../app/actions/view-actions.c:156 msgctxt "view-action" msgid "Display the image's guides" msgstr "Muestra las líneas guía de la imagen" -#: ../app/actions/view-actions.c:161 +#: ../app/actions/view-actions.c:162 msgctxt "view-action" msgid "S_how Grid" msgstr "Mostrar _rejilla" -#: ../app/actions/view-actions.c:162 +#: ../app/actions/view-actions.c:163 msgctxt "view-action" msgid "Display the image's grid" msgstr "Muestra la rejilla de la imagen" -#: ../app/actions/view-actions.c:168 +#: ../app/actions/view-actions.c:169 msgctxt "view-action" msgid "Show Sample Points" msgstr "Mostrar puntos de muestra" -#: ../app/actions/view-actions.c:169 +#: ../app/actions/view-actions.c:170 msgctxt "view-action" msgid "Display the image's color sample points" msgstr "Muestra los puntos de muestreo de color de la imagen" -#: ../app/actions/view-actions.c:175 +#: ../app/actions/view-actions.c:176 msgctxt "view-action" msgid "Sn_ap to Guides" msgstr "Ajust_ar a las guías" -#: ../app/actions/view-actions.c:176 +#: ../app/actions/view-actions.c:177 msgctxt "view-action" msgid "Tool operations snap to guides" msgstr "Las operaciones de las herramientas se ajustan a las líneas guía" -#: ../app/actions/view-actions.c:182 +#: ../app/actions/view-actions.c:183 msgctxt "view-action" msgid "Sna_p to Grid" msgstr "Ajustar a la re_jilla" -#: ../app/actions/view-actions.c:183 +#: ../app/actions/view-actions.c:184 msgctxt "view-action" msgid "Tool operations snap to the grid" msgstr "Las operaciones de las herramientas se ajustan a la rejilla" -#: ../app/actions/view-actions.c:189 +#: ../app/actions/view-actions.c:190 msgctxt "view-action" msgid "Snap to _Canvas Edges" msgstr "Ajustar a los bordes del _lienzo" -#: ../app/actions/view-actions.c:190 +#: ../app/actions/view-actions.c:191 msgctxt "view-action" msgid "Tool operations snap to the canvas edges" msgstr "Las operaciones de las herramientas se ajustan a los bordes del lienzo" -#: ../app/actions/view-actions.c:196 +#: ../app/actions/view-actions.c:197 msgctxt "view-action" msgid "Snap t_o Active Path" msgstr "Ajustar a la _ruta activa" -#: ../app/actions/view-actions.c:197 +#: ../app/actions/view-actions.c:198 msgctxt "view-action" msgid "Tool operations snap to the active path" msgstr "Las operaciones de las herramientas se ajustan a la ruta activa" -#: ../app/actions/view-actions.c:203 +#: ../app/actions/view-actions.c:204 msgctxt "view-action" msgid "Show _Menubar" msgstr "_Mostrar la barra de menú" -#: ../app/actions/view-actions.c:204 +#: ../app/actions/view-actions.c:205 msgctxt "view-action" msgid "Show this window's menubar" msgstr "Muestra la barra de menús de esta ventana" -#: ../app/actions/view-actions.c:210 +#: ../app/actions/view-actions.c:211 msgctxt "view-action" msgid "Show R_ulers" msgstr "Mostrar las _reglas" -#: ../app/actions/view-actions.c:211 +#: ../app/actions/view-actions.c:212 msgctxt "view-action" msgid "Show this window's rulers" msgstr "Muestra las reglas de medición de esta ventana" -#: ../app/actions/view-actions.c:217 +#: ../app/actions/view-actions.c:218 msgctxt "view-action" msgid "Show Scroll_bars" msgstr "Mostrar las _barras de desplazamiento" -#: ../app/actions/view-actions.c:218 +#: ../app/actions/view-actions.c:219 msgctxt "view-action" msgid "Show this window's scrollbars" msgstr "Muestra las barras de desplazamiento de esta ventana" -#: ../app/actions/view-actions.c:224 +#: ../app/actions/view-actions.c:225 msgctxt "view-action" msgid "Show S_tatusbar" msgstr "Mostrar la barra de es_tado" -#: ../app/actions/view-actions.c:225 +#: ../app/actions/view-actions.c:226 msgctxt "view-action" msgid "Show this window's statusbar" msgstr "Muestra la barra de estado de esta ventana" -#: ../app/actions/view-actions.c:231 +#: ../app/actions/view-actions.c:232 msgctxt "view-action" msgid "Fullscr_een" msgstr "Pantalla compl_eta" -#: ../app/actions/view-actions.c:232 +#: ../app/actions/view-actions.c:233 msgctxt "view-action" msgid "Toggle fullscreen view" msgstr "Activa o desactiva la vista de pantalla completa" -#: ../app/actions/view-actions.c:263 +#: ../app/actions/view-actions.c:264 msgctxt "view-zoom-action" msgid "Zoom _Out" msgstr "Re_ducir" -#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 +#: ../app/actions/view-actions.c:265 ../app/actions/view-actions.c:277 msgctxt "view-action" msgid "Zoom out" msgstr "Reducir" -#: ../app/actions/view-actions.c:269 +#: ../app/actions/view-actions.c:270 msgctxt "view-zoom-action" msgid "Zoom _In" msgstr "_Ampliar" -#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 +#: ../app/actions/view-actions.c:271 ../app/actions/view-actions.c:283 msgctxt "view-action" msgid "Zoom in" msgstr "Ampliar" -#: ../app/actions/view-actions.c:275 +#: ../app/actions/view-actions.c:276 msgctxt "view-zoom-action" msgid "Zoom Out" msgstr "Reducir" -#: ../app/actions/view-actions.c:281 +#: ../app/actions/view-actions.c:282 msgctxt "view-zoom-action" msgid "Zoom In" msgstr "Ampliar" -#: ../app/actions/view-actions.c:300 +#: ../app/actions/view-actions.c:301 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" msgstr "1_6:1 (1600%)" -#: ../app/actions/view-actions.c:301 +#: ../app/actions/view-actions.c:302 msgctxt "view-zoom-action" msgid "Zoom 16:1" msgstr "Ampliación 16:1" -#: ../app/actions/view-actions.c:306 +#: ../app/actions/view-actions.c:307 msgctxt "view-zoom-action" msgid "_8:1 (800%)" msgstr "_8:1 (800%)" -#: ../app/actions/view-actions.c:307 +#: ../app/actions/view-actions.c:308 msgctxt "view-zoom-action" msgid "Zoom 8:1" msgstr "Ampliación 8:1" -#: ../app/actions/view-actions.c:312 +#: ../app/actions/view-actions.c:313 msgctxt "view-zoom-action" msgid "_4:1 (400%)" msgstr "_4:1 (400%)" -#: ../app/actions/view-actions.c:313 +#: ../app/actions/view-actions.c:314 msgctxt "view-zoom-action" msgid "Zoom 4:1" msgstr "Ampliación 4:1" -#: ../app/actions/view-actions.c:318 +#: ../app/actions/view-actions.c:319 msgctxt "view-zoom-action" msgid "_2:1 (200%)" msgstr "_2:1 (200%)" -#: ../app/actions/view-actions.c:319 +#: ../app/actions/view-actions.c:320 msgctxt "view-zoom-action" msgid "Zoom 2:1" msgstr "Ampliación 2:1" -#: ../app/actions/view-actions.c:324 +#: ../app/actions/view-actions.c:325 msgctxt "view-zoom-action" msgid "_1:1 (100%)" msgstr "_1:1 (100%)" -#: ../app/actions/view-actions.c:325 +#: ../app/actions/view-actions.c:326 msgctxt "view-zoom-action" msgid "Zoom 1:1" msgstr "Ampliación 1:1" -#: ../app/actions/view-actions.c:330 +#: ../app/actions/view-actions.c:331 msgctxt "view-zoom-action" msgid "1:_2 (50%)" msgstr "1:_2 (50%)" -#: ../app/actions/view-actions.c:331 +#: ../app/actions/view-actions.c:332 msgctxt "view-zoom-action" msgid "Zoom 1:2" msgstr "Ampliación 1:2" -#: ../app/actions/view-actions.c:336 +#: ../app/actions/view-actions.c:337 msgctxt "view-zoom-action" msgid "1:_4 (25%)" msgstr "1:_4 (25%)" -#: ../app/actions/view-actions.c:337 +#: ../app/actions/view-actions.c:338 msgctxt "view-zoom-action" msgid "Zoom 1:4" msgstr "Ampliación 1:4" -#: ../app/actions/view-actions.c:342 +#: ../app/actions/view-actions.c:343 msgctxt "view-zoom-action" msgid "1:_8 (12.5%)" msgstr "1:_8 (12.5%)" -#: ../app/actions/view-actions.c:343 +#: ../app/actions/view-actions.c:344 msgctxt "view-zoom-action" msgid "Zoom 1:8" msgstr "Ampliación 1:8" -#: ../app/actions/view-actions.c:348 +#: ../app/actions/view-actions.c:349 msgctxt "view-zoom-action" msgid "1:1_6 (6.25%)" msgstr "1:1_6 (6.25%)" -#: ../app/actions/view-actions.c:349 +#: ../app/actions/view-actions.c:350 msgctxt "view-zoom-action" msgid "Zoom 1:16" msgstr "Ampliación 1:16" -#: ../app/actions/view-actions.c:354 +#: ../app/actions/view-actions.c:355 msgctxt "view-zoom-action" msgid "Othe_r..." msgstr "Ot_ros…" -#: ../app/actions/view-actions.c:355 +#: ../app/actions/view-actions.c:356 msgctxt "view-zoom-action" msgid "Set a custom zoom factor" msgstr "Establece un factor de ampliación personalizado" -#: ../app/actions/view-actions.c:363 +#: ../app/actions/view-actions.c:364 msgctxt "view-padding-color" msgid "From _Theme" msgstr "Del _tema" -#: ../app/actions/view-actions.c:364 +#: ../app/actions/view-actions.c:365 msgctxt "view-padding-color" msgid "Use the current theme's background color" msgstr "Usar el color de fondo del tema actual" -#: ../app/actions/view-actions.c:369 +#: ../app/actions/view-actions.c:370 msgctxt "view-padding-color" msgid "_Light Check Color" msgstr "Color de los cuadros c_laros" -#: ../app/actions/view-actions.c:370 +#: ../app/actions/view-actions.c:371 msgctxt "view-padding-color" msgid "Use the light check color" msgstr "Usar el color de los cuadrados claros" -#: ../app/actions/view-actions.c:375 +#: ../app/actions/view-actions.c:376 msgctxt "view-padding-color" msgid "_Dark Check Color" msgstr "Color de los cuadros o_scuros" -#: ../app/actions/view-actions.c:376 +#: ../app/actions/view-actions.c:377 msgctxt "view-padding-color" msgid "Use the dark check color" msgstr "Usar el color de los cuadrados oscuros" -#: ../app/actions/view-actions.c:381 +#: ../app/actions/view-actions.c:382 msgctxt "view-padding-color" msgid "Select _Custom Color..." msgstr "Seleccionar color _personalizado…" -#: ../app/actions/view-actions.c:382 +#: ../app/actions/view-actions.c:383 msgctxt "view-padding-color" msgid "Use an arbitrary color" msgstr "Usar un color arbitrario" -#: ../app/actions/view-actions.c:387 +#: ../app/actions/view-actions.c:388 msgctxt "view-padding-color" msgid "As in _Preferences" msgstr "Como en las _preferencias" -#: ../app/actions/view-actions.c:389 +#: ../app/actions/view-actions.c:390 msgctxt "view-padding-color" msgid "Reset padding color to what's configured in preferences" msgstr "Reiniciar el color de relleno a lo establecido en las preferencias" -#: ../app/actions/view-actions.c:580 +#: ../app/actions/view-actions.c:589 #, c-format msgid "Re_vert Zoom (%d%%)" msgstr "Re_vertir la ampliación (%d%%)" -#: ../app/actions/view-actions.c:588 +#: ../app/actions/view-actions.c:597 msgid "Re_vert Zoom" msgstr "Re_vertir la ampliación" -#: ../app/actions/view-actions.c:718 +#: ../app/actions/view-actions.c:733 #, c-format msgid "Othe_r (%s)..." msgstr "Ot_ro (%s)…" -#: ../app/actions/view-actions.c:727 +#: ../app/actions/view-actions.c:742 #, c-format msgid "_Zoom (%s)" msgstr "A_mpliación (%s)" -#: ../app/actions/view-commands.c:614 +#: ../app/actions/view-commands.c:580 msgid "Set Canvas Padding Color" msgstr "Establecer el color de relleno del lienzo" -#: ../app/actions/view-commands.c:616 +#: ../app/actions/view-commands.c:582 msgid "Set Custom Canvas Padding Color" msgstr "Establecer el color personalizado de relleno del lienzo" @@ -5399,30 +5655,47 @@ msgstr "Pantalla %s" msgid "Move this window to screen %s" msgstr "Mover esta ventana a la pantalla %s" -#: ../app/actions/windows-actions.c:80 +#: ../app/actions/windows-actions.c:85 msgctxt "windows-action" msgid "_Windows" msgstr "_Ventanas" -#: ../app/actions/windows-actions.c:82 +#: ../app/actions/windows-actions.c:87 msgctxt "windows-action" msgid "_Recently Closed Docks" msgstr "Empotrables cerrados _recientemente" -#: ../app/actions/windows-actions.c:84 +#: ../app/actions/windows-actions.c:89 msgctxt "windows-action" msgid "_Dockable Dialogs" msgstr "_Diálogos empotrables" -#: ../app/actions/windows-actions.c:87 +#: ../app/actions/windows-actions.c:95 msgctxt "windows-action" -msgid "Tool_box" -msgstr "_Caja de herramientas" +msgid "Hide Docks" +msgstr "Ocultar los empotrables" -#: ../app/actions/windows-actions.c:88 +#: ../app/actions/windows-actions.c:103 msgctxt "windows-action" -msgid "Raise the toolbox" -msgstr "Saca la caja de herramientas" +msgid "" +"When enabled docks and other dialogs are hidden, leaving only image windows." +msgstr "" +"Ocultar los empotrables activos y otros diálogos, dejando sólo las ventanas " +"de imagen." + +#: ../app/actions/windows-actions.c:109 +msgctxt "windows-action" +msgid "Single-Window Mode" +msgstr "Modo de ventana única" + +#: ../app/actions/windows-actions.c:110 +msgctxt "windows-action" +msgid "" +"When enabled GIMP is in a single-window mode. Far from completely " +"implemented!" +msgstr "" +"Cuando se activa, el GIMP está en el modo de ventana única. ¡Aún lejos de " +"estar completamente implementado!" #: ../app/base/base-enums.c:23 msgctxt "curve-type" @@ -5613,12 +5886,107 @@ msgid "Failed to resize swap file: %s" msgstr "" "Se produjo un fallo al cambiar el tamaño del archivo de intercambio: %s" +#: ../app/config/config-enums.c:24 +msgctxt "cursor-mode" +msgid "Tool icon" +msgstr "Icono de herramienta" + +#: ../app/config/config-enums.c:25 +msgctxt "cursor-mode" +msgid "Tool icon with crosshair" +msgstr "Icono de herramienta con cruz" + +#: ../app/config/config-enums.c:26 +msgctxt "cursor-mode" +msgid "Crosshair only" +msgstr "Sólo cruz" + +#: ../app/config/config-enums.c:56 +msgctxt "canvas-padding-mode" +msgid "From theme" +msgstr "Del tema" + +#: ../app/config/config-enums.c:57 +msgctxt "canvas-padding-mode" +msgid "Light check color" +msgstr "Color de los cuadros claros" + +#: ../app/config/config-enums.c:58 +msgctxt "canvas-padding-mode" +msgid "Dark check color" +msgstr "Color de los cuadros oscuros" + +#: ../app/config/config-enums.c:59 +msgctxt "canvas-padding-mode" +msgid "Custom color" +msgstr "Color personalizado" + +#: ../app/config/config-enums.c:88 +msgctxt "space-bar-action" +msgid "No action" +msgstr "Sin acción" + +#: ../app/config/config-enums.c:89 +msgctxt "space-bar-action" +msgid "Pan view" +msgstr "Vista panorámica" + +#: ../app/config/config-enums.c:90 +msgctxt "space-bar-action" +msgid "Switch to Move tool" +msgstr "Cambiar a la herramienta Mover" + +#: ../app/config/config-enums.c:118 +msgctxt "zoom-quality" +msgid "Low" +msgstr "Baja" + +#: ../app/config/config-enums.c:119 +msgctxt "zoom-quality" +msgid "High" +msgstr "Alta" + +#: ../app/config/config-enums.c:147 +msgctxt "help-browser-type" +msgid "GIMP help browser" +msgstr "Visor de ayuda de GIMP" + +#: ../app/config/config-enums.c:148 +msgctxt "help-browser-type" +msgid "Web browser" +msgstr "Navegador web" + +#: ../app/config/config-enums.c:177 +msgctxt "window-hint" +msgid "Normal window" +msgstr "Ventana normal" + +#: ../app/config/config-enums.c:178 +msgctxt "window-hint" +msgid "Utility window" +msgstr "Ventana de utilidades" + +#: ../app/config/config-enums.c:179 +msgctxt "window-hint" +msgid "Keep above" +msgstr "Mantener por encima" + +#: ../app/config/config-enums.c:207 +msgctxt "cursor-format" +msgid "Black & white" +msgstr "Blanco y negro" + +#: ../app/config/config-enums.c:208 +msgctxt "cursor-format" +msgid "Fancy" +msgstr "Fantasía" + #: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 #: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 #: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:55 -#: ../app/gui/themes.c:238 ../app/tools/gimpcurvestool.c:684 -#: ../app/tools/gimplevelstool.c:796 ../app/vectors/gimpvectors-export.c:82 -#: ../app/xcf/xcf.c:421 +#: ../app/gui/themes.c:238 ../app/tools/gimpcurvestool.c:690 +#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 +#: ../app/xcf/xcf.c:422 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "No se ha podido abrir «%s» para escritura: %s" @@ -5656,7 +6024,11 @@ msgstr "" "la ventana de su imagen. Esto es muy útil para los gestores de ventanas que " "estén utilizando «pulsar para obtener el foco»." -#: ../app/config/gimprc-blurbs.h:23 +#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 +msgid "Sets the dynamics search path." +msgstr "Establece la ruta de búsqueda de dinámicas." + +#: ../app/config/gimprc-blurbs.h:33 msgid "" "Sets the canvas padding color used if the padding mode is set to custom " "color." @@ -5664,29 +6036,29 @@ msgstr "" "Establece el color de relleno del lienzo usado si el modo de relleno está " "definido como color personalizado." -#: ../app/config/gimprc-blurbs.h:27 +#: ../app/config/gimprc-blurbs.h:37 msgid "Specifies how the area around the image should be drawn." msgstr "Especifica cómo debe dibujarse el área alrededor de la imagen." -#: ../app/config/gimprc-blurbs.h:33 +#: ../app/config/gimprc-blurbs.h:43 msgid "How to handle embedded color profiles when opening a file." msgstr "Cómo tratar los perfiles de color incrustados al abrir un archivo." -#: ../app/config/gimprc-blurbs.h:36 +#: ../app/config/gimprc-blurbs.h:46 msgid "Ask for confirmation before closing an image without saving." msgstr "" "Solicitar una confirmación antes de cerrar una imagen que no ha sido " "guardada." -#: ../app/config/gimprc-blurbs.h:39 +#: ../app/config/gimprc-blurbs.h:49 msgid "Sets the pixel format to use for mouse pointers." msgstr "Establece el formato de píxel para los cursores del ratón." -#: ../app/config/gimprc-blurbs.h:42 +#: ../app/config/gimprc-blurbs.h:52 msgid "Sets the type of mouse pointers to use." msgstr "Establece el tipo de punteros del ratón que usar." -#: ../app/config/gimprc-blurbs.h:45 +#: ../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." @@ -5695,7 +6067,7 @@ msgstr "" "forma predeterminada. Sin embargo requieren procesamiento extra que quizá " "usted podría necesitar si no los utiliza." -#: ../app/config/gimprc-blurbs.h:53 +#: ../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." @@ -5703,13 +6075,13 @@ msgstr "" "Cuando se encuentre activado esto asegurará que cada píxel de una imagen se " "asigne a un píxel de la pantalla." -#: ../app/config/gimprc-blurbs.h:75 +#: ../app/config/gimprc-blurbs.h:93 msgid "This is the distance in pixels where Guide and Grid snapping activates." msgstr "" "Esto es la distancia en píxeles a partir del cual se activa el ajuste a la " "rejilla y la guía." -#: ../app/config/gimprc-blurbs.h:91 +#: ../app/config/gimprc-blurbs.h:109 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 " @@ -5717,55 +6089,62 @@ msgid "" "the original is greater than a specified threshold. This value represents " "the default threshold." msgstr "" -"Herramientas como «Selección difusa» y «Relleno» buscan regiones basándose en " -"un algoritmo de búsqueda de semilla. El relleno de semilla arranca en el " +"Las herramientas como «Selección difusa» y «Relleno» buscan regiones basándose " +"en un algoritmo de búsqueda de semilla. El relleno de semilla arranca en el " "píxel seleccionado inicialmente y avanza en todas direcciones hasta que la " "diferencia de la intensidad del píxel del original es más grande que el " "umbral especificado. Este valor representa el umbral predeterminado." -#: ../app/config/gimprc-blurbs.h:104 +#: ../app/config/gimprc-blurbs.h:122 msgid "" -"The window type hint that is set on dock windows. This may affect the way " -"your window manager decorates and handles dock windows." +"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 "" -"La opción de tipo de ventana que es utilizada en las ventanas empotrables. " -"Esto podría afectar la forma en que su gestor de ventanas decora y maneja " -"las ventanas empotrables." +"La opción de tipo de ventana que se utiliza en las ventanas empotrables y en " +"la ventana de la caja de herramientas. Esto podría afectar la forma en que " +"su gestor de ventanas decora y maneja estas ventanas." -#: ../app/config/gimprc-blurbs.h:135 +#: ../app/config/gimprc-blurbs.h:154 msgid "When enabled, the selected brush will be used for all tools." msgstr "" "Cuando esté activado, el pincel seleccionado se usará para todas las " "herramientas." -#: ../app/config/gimprc-blurbs.h:141 +#: ../app/config/gimprc-blurbs.h:157 +msgid "When enabled, the selected dynamics will be used for all tools." +msgstr "" +"Cuando esté activado, se usará la dinámica seleccionada para todas las " +"herramientas." + +#: ../app/config/gimprc-blurbs.h:163 msgid "When enabled, the selected gradient will be used for all tools." msgstr "" "Cuando esté activado, el degradado seleccionado se usará para todas las " "herramientas." -#: ../app/config/gimprc-blurbs.h:144 +#: ../app/config/gimprc-blurbs.h:166 msgid "When enabled, the selected pattern will be used for all tools." msgstr "" "Cuando esté activado, el patrón seleccionado será usado para todas las " "herramientas." -#: ../app/config/gimprc-blurbs.h:158 +#: ../app/config/gimprc-blurbs.h:180 msgid "Sets the browser used by the help system." msgstr "Establece el visor que usará el sistema de ayuda." -#: ../app/config/gimprc-blurbs.h:169 +#: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window status bars." msgstr "" "Establece el texto que aparecerá en las barras de estado de las ventanas de " "imágenes." -#: ../app/config/gimprc-blurbs.h:172 +#: ../app/config/gimprc-blurbs.h:194 msgid "Sets the text to appear in image window titles." msgstr "" "Establece el texto que aparecerá en los títulos de las ventanas de imágenes." -#: ../app/config/gimprc-blurbs.h:175 +#: ../app/config/gimprc-blurbs.h:197 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." @@ -5773,27 +6152,31 @@ msgstr "" "Cuando se encuentre activado esto asegurará que la imagen se vea completa " "después de abrirse, de otro modo será mostrada con una escala de 1:1." -#: ../app/config/gimprc-blurbs.h:179 +#: ../app/config/gimprc-blurbs.h:201 msgid "" "Install a private colormap; might be useful on 8-bit (256 colors) displays." msgstr "" "Instala un mapa de color privado; podría ser muy útil en las pantallas de 8 " "bits (256 colores)." -#: ../app/config/gimprc-blurbs.h:182 +#: ../app/config/gimprc-blurbs.h:204 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" "Establece el nivel de interpolación utilizado para el redimensionado y otras " "transformaciones." -#: ../app/config/gimprc-blurbs.h:189 +#: ../app/config/gimprc-blurbs.h:211 +msgid "Specifies the language to use for the user interface." +msgstr "Establecer el idioma de la interfaz de usuario." + +#: ../app/config/gimprc-blurbs.h:214 msgid "How many recently opened image filenames to keep on the File menu." msgstr "" "Cuántos nombres de archivos de imágenes abiertas recientemente se deben " "mantener en el menú Archivo." -#: ../app/config/gimprc-blurbs.h:192 +#: ../app/config/gimprc-blurbs.h:217 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." @@ -5801,7 +6184,7 @@ msgstr "" "Velocidad de las hormigas marchantes en el contorno de la selección. Este " "valor está en milisegundos (menos tiempo indica una marcha mas rápida)." -#: ../app/config/gimprc-blurbs.h:196 +#: ../app/config/gimprc-blurbs.h:221 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." @@ -5809,7 +6192,7 @@ msgstr "" "GIMP advertirá al usuario si realiza un intento de crear una imagen que " "podría requerir más memoria que el tamaño especificado aquí." -#: ../app/config/gimprc-blurbs.h:200 +#: ../app/config/gimprc-blurbs.h:225 msgid "" "Generally only a concern for 8-bit displays, this sets the minimum number of " "system colors allocated for GIMP." @@ -5817,7 +6200,7 @@ msgstr "" "Generalmente sólo es importante para pantallas de 8 bits, esto define el " "número mínimo de colores del sistema reservados para GIMP." -#: ../app/config/gimprc-blurbs.h:210 +#: ../app/config/gimprc-blurbs.h:235 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 " @@ -5827,7 +6210,7 @@ msgstr "" "establece a 0, se fuerza una consulta al servidor X para obtener la " "resolución horizontal y vertical." -#: ../app/config/gimprc-blurbs.h:215 +#: ../app/config/gimprc-blurbs.h:240 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 " @@ -5837,16 +6220,16 @@ msgstr "" "establece a 0, se fuerza una consulta al servidor X para obtener la " "resolución horizontal y vertical." -#: ../app/config/gimprc-blurbs.h:220 +#: ../app/config/gimprc-blurbs.h:245 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 "" "Si está activado, la herramienta de movimiento cambia la capa editada o ruta " -"como activa. Esto acostumbraba ser el comportamiento predeterminado en las " +"como activa. Esto solía ser el comportamiento predeterminado en las " "versiones más antiguas." -#: ../app/config/gimprc-blurbs.h:224 +#: ../app/config/gimprc-blurbs.h:249 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." @@ -5854,12 +6237,12 @@ msgstr "" "Establece el tamaño de la vista previa de la navegación disponible en la " "esquina inferior derecha de la ventana de la imagen." -#: ../app/config/gimprc-blurbs.h:228 +#: ../app/config/gimprc-blurbs.h:253 msgid "Sets how many processors GIMP should try to use simultaneously." msgstr "" "Establece cuántos procesadores debe intentar usar simultáneamente GIMP." -#: ../app/config/gimprc-blurbs.h:241 +#: ../app/config/gimprc-blurbs.h:266 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 " @@ -5873,7 +6256,7 @@ msgstr "" "ser más preciso, pero podría ser más lento. Perversamente en algunos " "servidores X al activarse esta opción se obtiene un pintado más rápido." -#: ../app/config/gimprc-blurbs.h:257 +#: ../app/config/gimprc-blurbs.h:282 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 " @@ -5883,7 +6266,7 @@ msgstr "" "Disponer de las vistas previas en el diálogo de capas y canales queda bien, " "pero puede ralentizar las cosas al trabajar con imágenes grandes." -#: ../app/config/gimprc-blurbs.h:262 +#: ../app/config/gimprc-blurbs.h:287 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." @@ -5891,7 +6274,7 @@ msgstr "" "Establece el tamaño de la vista previa usado para las vistas preliminares de " "las capas y los canales en los diálogos nuevos creados." -#: ../app/config/gimprc-blurbs.h:266 +#: ../app/config/gimprc-blurbs.h:291 msgid "" "When enabled, the image window will automatically resize itself whenever the " "physical image size changes." @@ -5899,7 +6282,7 @@ msgstr "" "Cuando se encuentre activado, la ventana de la imagen se redimensionará " "automáticamente cuando cambie el tamaño físico de la imagen." -#: ../app/config/gimprc-blurbs.h:270 +#: ../app/config/gimprc-blurbs.h:295 msgid "" "When enabled, the image window will automatically resize itself when zooming " "into and out of images." @@ -5907,19 +6290,19 @@ msgstr "" "Cuando se encuentre activado, la ventana de la imagen se redimensionará " "automáticamente al ampliar o reducir las imágenes." -#: ../app/config/gimprc-blurbs.h:274 +#: ../app/config/gimprc-blurbs.h:299 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "" "Permitir a GIMP intentar restaurar la última sesión guardada en cada inicio." -#: ../app/config/gimprc-blurbs.h:277 +#: ../app/config/gimprc-blurbs.h:302 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "" "Recordar la herramienta, el patrón, el color y los pinceles actuales entre " "distintas sesiones de GIMP." -#: ../app/config/gimprc-blurbs.h:281 +#: ../app/config/gimprc-blurbs.h:306 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." @@ -5927,17 +6310,17 @@ msgstr "" "Mantener un registro permanente de todos los archivos abiertos y guardados " "en la lista de documentos recientes." -#: ../app/config/gimprc-blurbs.h:285 +#: ../app/config/gimprc-blurbs.h:310 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" "Guardar las posiciones y tamaños de los diálogos principales al salir de " "GIMP." -#: ../app/config/gimprc-blurbs.h:288 +#: ../app/config/gimprc-blurbs.h:313 msgid "Save the tool options when GIMP exits." msgstr "Guardar las opciones de herramientas al salir de GIMP." -#: ../app/config/gimprc-blurbs.h:294 +#: ../app/config/gimprc-blurbs.h:319 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." @@ -5945,7 +6328,7 @@ msgstr "" "Cuando está habilitado todas la herramientas de pintura mostrarán una vista " "previa del contorno de el pincel actual." -#: ../app/config/gimprc-blurbs.h:298 +#: ../app/config/gimprc-blurbs.h:323 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 " @@ -5955,7 +6338,7 @@ msgstr "" "a la página de ayuda relacionada. Sin ese botón, la página de ayuda puede " "verse al pulsar F1." -#: ../app/config/gimprc-blurbs.h:303 +#: ../app/config/gimprc-blurbs.h:328 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." @@ -5963,93 +6346,103 @@ msgstr "" "Cuando se encuentre activado, el cursor se mostrará sobre la imagen cuando " "se use una herramienta de pintura." -#: ../app/config/gimprc-blurbs.h:307 +#: ../app/config/gimprc-blurbs.h:332 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." msgstr "" "Cuando está activado la barra de estado es visible de forma predeterminada. " -"Esto también puede ser activado con el comando «Ver->Mostrar la barra de " +"Esto también se puede activar con la instrucción «Ver->Mostrar la barra de " "estado»." -#: ../app/config/gimprc-blurbs.h:311 +#: ../app/config/gimprc-blurbs.h:336 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." msgstr "" "Cuando está activado las reglas están visibles de forma predeterminada. Esto " -"también puede ser activado con el comando «Ver->Mostrar las reglas»." +"también se puede activar con la instrucción «Ver->Mostrar las reglas»." -#: ../app/config/gimprc-blurbs.h:315 +#: ../app/config/gimprc-blurbs.h:340 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." msgstr "" "Cuando está activado las barras de desplazamiento están visibles de forma " -"predeterminada. Esto también puede ser activado con el comando «Ver->Mostrar " -"las barras de desplazamiento»." +"predeterminada. Esto también se puede activar con la instrucción «Ver-" +">Mostrar las barras de desplazamiento»." -#: ../app/config/gimprc-blurbs.h:319 +#: ../app/config/gimprc-blurbs.h:344 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." msgstr "" "Cuando está activado la barra de estado es visible de forma predeterminada. " -"Esto también puede ser activado con el comando «Ver->Mostrar la barra de " -"estado»." +"Esto también puede puede activarse con la instrucción «Ver->Mostrar la barra " +"de estado»." -#: ../app/config/gimprc-blurbs.h:323 +#: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." msgstr "" "Cuando está activado la selección es visible de forma predeterminada. Esto " -"también puede ser activado con el comando «Ver->Mostrar la selección»." +"también puede activarse con la instrucción «Ver->Mostrar la selección»." -#: ../app/config/gimprc-blurbs.h:327 +#: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." msgstr "" "Cuando está activado el límite de la capa es visible de forma " -"predeterminada. Esto también puede ser activado con el comando «Ver->Mostrar " +"predeterminada. Esto también puede activarse con la instrucción «Ver->Mostrar " "el límite de la capa»." -#: ../app/config/gimprc-blurbs.h:331 +#: ../app/config/gimprc-blurbs.h:356 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." msgstr "" "Cuando está activado las reglas están visibles de forma predeterminada. Esto " -"también puede ser activado con el comando «Ver->Mostrar las reglas»." +"también puede activarse con la instrucción «Ver->Mostrar las reglas»." -#: ../app/config/gimprc-blurbs.h:335 +#: ../app/config/gimprc-blurbs.h:360 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." msgstr "" "Cuando está activado la rejilla es visible de forma predeterminada. Esto " -"también puede ser activado con el comando «Ver->Mostrar la rejilla»." +"también puede activarse con la instrucción «Ver->Mostrar la rejilla»." -#: ../app/config/gimprc-blurbs.h:339 +#: ../app/config/gimprc-blurbs.h:364 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." msgstr "" "Cuando está activado los puntos de muestra están visibles de forma " -"predeterminada. Esto también puede activarse con el comando «Ver->Mostrar " +"predeterminada. Esto también puede activarse con la instrucción «Ver->Mostrar " "puntos de muestra»." -#: ../app/config/gimprc-blurbs.h:343 +#: ../app/config/gimprc-blurbs.h:368 msgid "Show a tooltip when the pointer hovers over an item." msgstr "Presentar una ayuda cuando el puntero pasa por encima de un elemento." -#: ../app/config/gimprc-blurbs.h:346 +#: ../app/config/gimprc-blurbs.h:371 +msgid "Use GIMP in a single-window mode." +msgstr "Usar el GIMP en modo de ventana única." + +#: ../app/config/gimprc-blurbs.h:374 +msgid "Hide docks and other windows, leaving only image windows." +msgstr "" +"Ocultar empotrables y otras ventanas, dejando únicamente las ventanas de " +"imagen." + +#: ../app/config/gimprc-blurbs.h:377 msgid "What to do when the space bar is pressed in the image window." msgstr "" "Qué hacer cuando la barra espaciadora se pulsa en la ventana de imagen." -#: ../app/config/gimprc-blurbs.h:349 +#: ../app/config/gimprc-blurbs.h:380 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 " @@ -6067,11 +6460,11 @@ msgstr "" "un directorio montado sobre NFS. Por estas razones quizá sea conveniente " "colocar su archivo de intercambio en «/tmp»." -#: ../app/config/gimprc-blurbs.h:358 +#: ../app/config/gimprc-blurbs.h:389 msgid "When enabled, menus can be torn off." msgstr "Cuando se encuentre activado, los menús podrán ser separados." -#: ../app/config/gimprc-blurbs.h:361 +#: ../app/config/gimprc-blurbs.h:392 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." @@ -6080,16 +6473,16 @@ msgstr "" "elementos del menú presionando una combinación de teclas mientras el " "elemento del menú está seleccionado." -#: ../app/config/gimprc-blurbs.h:365 +#: ../app/config/gimprc-blurbs.h:396 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "Guardar las combinaciones de teclas modificadas al salir de GIMP." -#: ../app/config/gimprc-blurbs.h:368 +#: ../app/config/gimprc-blurbs.h:399 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "" "Restaurar las combinaciones de teclas guardadas en cada inicio de GIMP." -#: ../app/config/gimprc-blurbs.h:371 +#: ../app/config/gimprc-blurbs.h:402 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 " @@ -6102,12 +6495,12 @@ msgstr "" "permanecer, por lo tanto es mejor si esta carpeta no está compartida con " "otros usuarios." -#: ../app/config/gimprc-blurbs.h:383 +#: ../app/config/gimprc-blurbs.h:414 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "" "Establece el tamaño de la miniatura que se muestra en el diálogo Abrir." -#: ../app/config/gimprc-blurbs.h:386 +#: ../app/config/gimprc-blurbs.h:417 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." @@ -6116,7 +6509,7 @@ msgstr "" "archivo que se está previsualizando es más pequeño que el tamaño establecido " "aquí." -#: ../app/config/gimprc-blurbs.h:390 +#: ../app/config/gimprc-blurbs.h:421 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 " @@ -6128,40 +6521,31 @@ msgstr "" "con imágenes que no cabrían en la memoria de otra forma. Si tiene mucha RAM, " "quizá quiera poner esto a un valor más alto." -#: ../app/config/gimprc-blurbs.h:396 +#: ../app/config/gimprc-blurbs.h:427 msgid "Show the current foreground and background colors in the toolbox." msgstr "" "Mostrar los colores de frente y fondo actuales en la caja de herramientas." -#: ../app/config/gimprc-blurbs.h:399 +#: ../app/config/gimprc-blurbs.h:430 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "" "Mostrar los pinceles, patrones y degradados activos en la caja de " "herramientas" -#: ../app/config/gimprc-blurbs.h:402 +#: ../app/config/gimprc-blurbs.h:433 msgid "Show the currently active image in the toolbox." msgstr "Mostrar la imagen activa en la caja de herramientas." -#: ../app/config/gimprc-blurbs.h:408 -msgid "" -"The window type hint that is set on the toolbox. This may affect how your " -"window manager decorates and handles the toolbox window." -msgstr "" -"La opción de tipo de ventana que se utiliza en la caja de herramientas. Esto " -"podría afectar la forma en que su gestor de ventanas decora y maneja la " -"ventana de la caja de herramientas." - -#: ../app/config/gimprc-blurbs.h:412 +#: ../app/config/gimprc-blurbs.h:439 msgid "Sets the manner in which transparency is displayed in images." msgstr "Establece la forma en que se muestra la transparencia en las imágenes." -#: ../app/config/gimprc-blurbs.h:415 +#: ../app/config/gimprc-blurbs.h:442 msgid "Sets the size of the checkerboard used to display transparency." msgstr "" "Establece el tamaño del cuadriculado utilizado para mostrar la transparencia." -#: ../app/config/gimprc-blurbs.h:418 +#: ../app/config/gimprc-blurbs.h:445 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." @@ -6169,7 +6553,7 @@ msgstr "" "Cuando se encuentre activado GIMP no guardará una imagen si no se ha " "modificado desde que se abrió." -#: ../app/config/gimprc-blurbs.h:422 +#: ../app/config/gimprc-blurbs.h:449 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." @@ -6178,7 +6562,7 @@ msgstr "" "niveles de deshacer se mantienen disponibles hasta que se alcanza el límite " "de niveles de deshacer." -#: ../app/config/gimprc-blurbs.h:426 +#: ../app/config/gimprc-blurbs.h:453 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 " @@ -6189,29 +6573,16 @@ msgstr "" "configuración sólo pueden deshacerse tantos niveles deshacer como este " "configurado." -#: ../app/config/gimprc-blurbs.h:431 +#: ../app/config/gimprc-blurbs.h:458 msgid "Sets the size of the previews in the Undo History." msgstr "Obtiene el tamaño de las vistas previas en el Histórico de deshacer." -#: ../app/config/gimprc-blurbs.h:434 +#: ../app/config/gimprc-blurbs.h:461 msgid "When enabled, pressing F1 will open the help browser." msgstr "Cuando se encuentre activado, pulsando F1 se abrirá el visor de ayuda." -#: ../app/config/gimprc-blurbs.h:445 -#, c-format -msgid "" -"Sets the external web browser to be used. This can be an absolute path or " -"the name of an executable to search for in the user's PATH. If the command " -"contains '%s' it will be replaced with the URL, otherwise the URL will be " -"appended to the command with a space separating the two." -msgstr "" -"Define el navegador externo que se usará. Esto puede ser una ruta absoluta " -"o el nombre de un ejecutable que se encuentre en la ruta del usuario. Si el " -"comando contiene «%s» será reemplazado con la URL; si no, la URL será añadida " -"al comando con un espacio separando a ambos." - #: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133 -#: ../app/core/gimp-units.c:163 ../app/gui/session.c:205 +#: ../app/core/gimp-units.c:163 ../app/gui/session.c:243 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "Error fatal de análisis" @@ -6551,471 +6922,529 @@ msgctxt "thumbnail-size" msgid "Large (256x256)" msgstr "Grande (256x256)" -#: ../app/core/core-enums.c:869 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "<>" msgstr "<>" -#: ../app/core/core-enums.c:870 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Scale image" msgstr "Escalar la imagen" -#: ../app/core/core-enums.c:871 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Resize image" msgstr "Redimensionar imagen" -#: ../app/core/core-enums.c:872 +#: ../app/core/core-enums.c:873 msgctxt "undo-type" msgid "Flip image" msgstr "Voltear la imagen" -#: ../app/core/core-enums.c:873 +#: ../app/core/core-enums.c:874 msgctxt "undo-type" msgid "Rotate image" msgstr "Rotar la imagen" -#: ../app/core/core-enums.c:874 +#: ../app/core/core-enums.c:875 msgctxt "undo-type" msgid "Crop image" msgstr "Recortar la imagen" -#: ../app/core/core-enums.c:875 +#: ../app/core/core-enums.c:876 msgctxt "undo-type" msgid "Convert image" msgstr "Convertir la imagen" -#: ../app/core/core-enums.c:876 +#: ../app/core/core-enums.c:877 msgctxt "undo-type" msgid "Remove item" msgstr "Eliminar el elemento" -#: ../app/core/core-enums.c:877 +#: ../app/core/core-enums.c:878 msgctxt "undo-type" msgid "Merge layers" msgstr "Combinar capas" -#: ../app/core/core-enums.c:878 +#: ../app/core/core-enums.c:879 msgctxt "undo-type" msgid "Merge paths" msgstr "Combinar rutas" -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:880 msgctxt "undo-type" msgid "Quick Mask" msgstr "Máscara rápida" -#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:911 +#: ../app/core/gimpimage-grid.c:62 msgctxt "undo-type" msgid "Grid" msgstr "Rejilla" -#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Guide" msgstr "Guía" -#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:913 +#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Sample Point" msgstr "Punto de muestra" -#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:914 +#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Capa/canal" -#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:915 +#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Modificación de capa o canal" -#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Selection mask" msgstr "Máscara de selección" -#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:919 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "Item visibility" msgstr "Visibilidad del elemento" -#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:920 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "Enlazar o desenlazar elemento" -#: ../app/core/core-enums.c:888 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Item properties" msgstr "Propiedades del elemento" -#: ../app/core/core-enums.c:889 ../app/core/core-enums.c:918 +#: ../app/core/core-enums.c:890 ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Move item" msgstr "Mover el elemento" -#: ../app/core/core-enums.c:890 +#: ../app/core/core-enums.c:891 msgctxt "undo-type" msgid "Scale item" msgstr "Escalar elemento" -#: ../app/core/core-enums.c:891 +#: ../app/core/core-enums.c:892 msgctxt "undo-type" msgid "Resize item" msgstr "Redimensionar elemento" -#: ../app/core/core-enums.c:892 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Add layer" msgstr "Añadir capa" -#: ../app/core/core-enums.c:893 ../app/core/core-enums.c:929 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Add layer mask" msgstr "Añadir máscara de capa" -#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:931 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:935 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Aplicar máscara de capa" -#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:941 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Selección flotante a capa" -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:897 msgctxt "undo-type" msgid "Float selection" msgstr "Selección flotante" -#: ../app/core/core-enums.c:897 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Anclar la selección flotante" -#: ../app/core/core-enums.c:898 +#: ../app/core/core-enums.c:899 ../app/core/gimp-edit.c:261 msgctxt "undo-type" msgid "Paste" msgstr "Pegar" -#: ../app/core/core-enums.c:899 +#: ../app/core/core-enums.c:900 ../app/core/gimp-edit.c:500 msgctxt "undo-type" msgid "Cut" msgstr "Cortar" -#: ../app/core/core-enums.c:900 +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Text" msgstr "Texto" -#: ../app/core/core-enums.c:901 ../app/core/core-enums.c:942 +#: ../app/core/core-enums.c:902 ../app/core/core-enums.c:944 +#: ../app/core/gimpdrawable-transform.c:566 msgctxt "undo-type" msgid "Transform" msgstr "Transformar" -#: ../app/core/core-enums.c:902 ../app/core/core-enums.c:943 +#: ../app/core/core-enums.c:903 ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Paint" msgstr "Pintar" -#: ../app/core/core-enums.c:903 ../app/core/core-enums.c:946 +#: ../app/core/core-enums.c:904 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Attach parasite" msgstr "Adjuntar parásito" -#: ../app/core/core-enums.c:904 ../app/core/core-enums.c:947 +#: ../app/core/core-enums.c:905 ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Remove parasite" msgstr "Eliminar parásito" -#: ../app/core/core-enums.c:905 +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Import paths" msgstr "Importar rutas" -#: ../app/core/core-enums.c:906 +#: ../app/core/core-enums.c:907 msgctxt "undo-type" msgid "Plug-In" msgstr "Complemento" -#: ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Image type" msgstr "Tipo de imagen" -#: ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Image size" msgstr "Tamaño de la imagen" -#: ../app/core/core-enums.c:909 +#: ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Image resolution change" msgstr "Cambio de resolución de la imagen" -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Change indexed palette" msgstr "Cambiar la paleta indexada" -#: ../app/core/core-enums.c:917 +#: ../app/core/core-enums.c:918 +msgctxt "undo-type" +msgid "Reorder item" +msgstr "Reordenar elemento" + +#: ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Rename item" msgstr "Renombrar elemento" -#: ../app/core/core-enums.c:921 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "New layer" msgstr "Capa nueva" -#: ../app/core/core-enums.c:922 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Delete layer" msgstr "Borra la capa" -#: ../app/core/core-enums.c:923 -#, fuzzy -#| msgid "Reorder Layer" -msgctxt "undo-type" -msgid "Reorder layer" -msgstr "Reordenar la capa" - -#: ../app/core/core-enums.c:924 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Set layer mode" msgstr "Definir el modo de la capa" -#: ../app/core/core-enums.c:925 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Set layer opacity" msgstr "Definir la opacidad de la capa" -#: ../app/core/core-enums.c:926 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" msgstr "Bloquear o desbloquear el canal Alfa" -#: ../app/core/core-enums.c:927 +#: ../app/core/core-enums.c:928 +msgctxt "undo-type" +msgid "Suspend group layer resize" +msgstr "Suspender el redimensionamiento del grupo de capas" + +#: ../app/core/core-enums.c:929 +msgctxt "undo-type" +msgid "Resume group layer resize" +msgstr "Reanudar el redimensionamiento del gurpo de capas" + +#: ../app/core/core-enums.c:930 +msgctxt "undo-type" +msgid "Convert group layer" +msgstr "Convertir el grupo de capas" + +#: ../app/core/core-enums.c:931 msgctxt "undo-type" msgid "Text layer" msgstr "Capa de texto" -#: ../app/core/core-enums.c:928 +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Text layer modification" msgstr "Modificación de la capa de texto" -#: ../app/core/core-enums.c:930 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Delete layer mask" msgstr "Borrar máscara de capa" -#: ../app/core/core-enums.c:932 +#: ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Show layer mask" msgstr "Mostrar máscara de capa" -#: ../app/core/core-enums.c:933 +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "New channel" msgstr "Nuevo canal" -#: ../app/core/core-enums.c:934 +#: ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Delete channel" msgstr "Borra el canal" -#: ../app/core/core-enums.c:935 -#, fuzzy -#| msgid "Reorder Channel" -msgctxt "undo-type" -msgid "Reorder channel" -msgstr "Reordenar el canal" - -#: ../app/core/core-enums.c:936 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Channel color" msgstr "Color del canal" -#: ../app/core/core-enums.c:937 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New path" msgstr "Nueva ruta" -#: ../app/core/core-enums.c:938 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete path" msgstr "Borrar ruta" -#: ../app/core/core-enums.c:939 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Path modification" msgstr "Modificación de la ruta" -#: ../app/core/core-enums.c:940 -#, fuzzy -#| msgid "Reorder path" -msgctxt "undo-type" -msgid "Reorder path" -msgstr "Reordenar la ruta" - -#: ../app/core/core-enums.c:944 +#: ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Ink" msgstr "Tinta" -#: ../app/core/core-enums.c:945 +#: ../app/core/core-enums.c:947 msgctxt "undo-type" msgid "Select foreground" msgstr "Seleccionar primer plano" -#: ../app/core/core-enums.c:948 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Not undoable" msgstr "No se puede deshacer" -#: ../app/core/core-enums.c:1220 +#: ../app/core/core-enums.c:1222 msgctxt "select-criterion" msgid "Composite" msgstr "Compuesto" -#: ../app/core/core-enums.c:1221 +#: ../app/core/core-enums.c:1223 msgctxt "select-criterion" msgid "Red" msgstr "Rojo" -#: ../app/core/core-enums.c:1222 +#: ../app/core/core-enums.c:1224 msgctxt "select-criterion" msgid "Green" msgstr "Verde" -#: ../app/core/core-enums.c:1223 +#: ../app/core/core-enums.c:1225 msgctxt "select-criterion" msgid "Blue" msgstr "Azul" -#: ../app/core/core-enums.c:1224 +#: ../app/core/core-enums.c:1226 msgctxt "select-criterion" msgid "Hue" msgstr "Tono" -#: ../app/core/core-enums.c:1225 +#: ../app/core/core-enums.c:1227 msgctxt "select-criterion" msgid "Saturation" msgstr "Saturación" -#: ../app/core/core-enums.c:1226 +#: ../app/core/core-enums.c:1228 msgctxt "select-criterion" msgid "Value" msgstr "Valor" -#: ../app/core/core-enums.c:1255 +#: ../app/core/core-enums.c:1257 msgctxt "message-severity" msgid "Message" msgstr "Mensaje" -#: ../app/core/core-enums.c:1256 +#: ../app/core/core-enums.c:1258 msgctxt "message-severity" msgid "Warning" msgstr "Advertencia" -#: ../app/core/core-enums.c:1257 +#: ../app/core/core-enums.c:1259 msgctxt "message-severity" msgid "Error" msgstr "Error" -#: ../app/core/core-enums.c:1286 +#: ../app/core/core-enums.c:1288 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Preguntar qué hacer" -#: ../app/core/core-enums.c:1287 +#: ../app/core/core-enums.c:1289 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Conservar perfil incrustado" -#: ../app/core/core-enums.c:1288 +#: ../app/core/core-enums.c:1290 msgctxt "color-profile-policy" msgid "Convert to RGB workspace" msgstr "Convertir al espacio de colores RGB" -#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:232 -#: ../app/gui/session.c:307 ../app/menus/menus.c:434 -#: ../app/widgets/gimpdevices.c:258 +#: ../app/core/core-enums.c:1327 +msgctxt "dynamics-output-type" +msgid "Opacity" +msgstr "Opacidad" + +#: ../app/core/core-enums.c:1328 +msgctxt "dynamics-output-type" +msgid "Size" +msgstr "Tamaño" + +#: ../app/core/core-enums.c:1329 +msgctxt "dynamics-output-type" +msgid "Angle" +msgstr "Ángulo" + +#: ../app/core/core-enums.c:1330 +msgctxt "dynamics-output-type" +msgid "Color" +msgstr "Color" + +#: ../app/core/core-enums.c:1331 +msgctxt "dynamics-output-type" +msgid "Hardness" +msgstr "Dureza" + +#: ../app/core/core-enums.c:1332 +msgctxt "dynamics-output-type" +msgid "Force" +msgstr "Fuerza" + +#: ../app/core/core-enums.c:1333 +msgctxt "dynamics-output-type" +msgid "Aspect ratio" +msgstr "Proporción de aspecto" + +#: ../app/core/core-enums.c:1334 +msgctxt "dynamics-output-type" +msgid "Spacing" +msgstr "Espaciado" + +#: ../app/core/core-enums.c:1335 +msgctxt "dynamics-output-type" +msgid "Rate" +msgstr "Tasa" + +#: ../app/core/core-enums.c:1336 +msgctxt "dynamics-output-type" +msgid "Flow" +msgstr "Flujo" + +#: ../app/core/core-enums.c:1337 +msgctxt "dynamics-output-type" +msgid "Jitter" +msgstr "Vibración" + +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:344 +#: ../app/gui/session.c:349 ../app/menus/menus.c:464 +#: ../app/widgets/gimpdevices.c:269 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "El borrado de «%s» ha fallado: %s" -#: ../app/core/gimp-edit.c:189 ../app/core/gimp-edit.c:324 +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:304 msgid "Pasted Layer" msgstr "Capa pegada" -#: ../app/core/gimp-edit.c:260 -msgid "Paste" -msgstr "Pegar" - -#: ../app/core/gimp-edit.c:443 +#: ../app/core/gimp-edit.c:388 +msgctxt "undo-type" msgid "Clear" msgstr "Limpiar" -#: ../app/core/gimp-edit.c:462 +#: ../app/core/gimp-edit.c:407 +msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "Rellenar con el color del frente" -#: ../app/core/gimp-edit.c:466 +#: ../app/core/gimp-edit.c:411 +msgctxt "undo-type" msgid "Fill with Background Color" msgstr "Rellenar con el color del fondo" -#: ../app/core/gimp-edit.c:470 +#: ../app/core/gimp-edit.c:415 +msgctxt "undo-type" msgid "Fill with White" msgstr "Rellenar con blanco" -#: ../app/core/gimp-edit.c:474 +#: ../app/core/gimp-edit.c:419 +msgctxt "undo-type" msgid "Fill with Transparency" msgstr "Rellenar con transparencia" -#: ../app/core/gimp-edit.c:478 +#: ../app/core/gimp-edit.c:423 +msgctxt "undo-type" msgid "Fill with Pattern" msgstr "Rellenar con un patrón" -#: ../app/core/gimp-edit.c:555 -msgid "Cut" -msgstr "Cortar" - -#: ../app/core/gimp-edit.c:572 +#: ../app/core/gimp-edit.c:512 msgid "Global Buffer" msgstr "Búfer global" -#: ../app/core/gimp-gradients.c:60 +#: ../app/core/gimp-gradients.c:62 msgid "FG to BG (RGB)" msgstr "Frente a fondo (RGB)" -#: ../app/core/gimp-gradients.c:65 +#: ../app/core/gimp-gradients.c:70 +msgid "FG to BG (Hardedge)" +msgstr "Frente a fondo (bordes duros)" + +#: ../app/core/gimp-gradients.c:87 msgid "FG to BG (HSV counter-clockwise)" msgstr "Frente a fondo (HSV en sentido antihorario)" -#: ../app/core/gimp-gradients.c:70 +#: ../app/core/gimp-gradients.c:95 msgid "FG to BG (HSV clockwise hue)" msgstr "Frente a fondo (HSV tono en sentido horario)" -#: ../app/core/gimp-gradients.c:75 +#: ../app/core/gimp-gradients.c:103 msgid "FG to Transparent" msgstr "Frente a transparente" #. 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". +#. * 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:es" -#: ../app/core/gimp-user-install.c:153 +#: ../app/core/gimp-user-install.c:154 #, c-format msgid "" "It seems you have used GIMP %s before. GIMP will now migrate your user " @@ -7024,7 +7453,7 @@ msgstr "" "Parece que ha usado GIMP %s antes. GIMP migrará sus ajustes de usuario a «%" "s»." -#: ../app/core/gimp-user-install.c:158 +#: ../app/core/gimp-user-install.c:159 #, c-format msgid "" "It appears that you are using GIMP for the first time. GIMP will now create " @@ -7033,109 +7462,113 @@ msgstr "" "Parece que está usando GIMP por primera vez. GIMP creará ahora una carpeta " "llamada «%s» y copiará algunos archivos en ella." -#: ../app/core/gimp-user-install.c:309 +#: ../app/core/gimp-user-install.c:311 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "Copiando el archivo «%s» desde «%s»…" -#: ../app/core/gimp-user-install.c:324 ../app/core/gimp-user-install.c:350 +#: ../app/core/gimp-user-install.c:326 ../app/core/gimp-user-install.c:352 #, c-format msgid "Creating folder '%s'..." msgstr "Creando la carpeta «%s»…" -#: ../app/core/gimp-user-install.c:335 ../app/core/gimp-user-install.c:361 +#: ../app/core/gimp-user-install.c:337 ../app/core/gimp-user-install.c:363 #, c-format msgid "Cannot create folder '%s': %s" msgstr "No se puede crear la carpeta «%s»: %s" -#: ../app/core/gimp.c:554 +#: ../app/core/gimp.c:597 msgid "Initialization" msgstr "Inicialización" #. register all internal procedures -#: ../app/core/gimp.c:633 +#: ../app/core/gimp.c:698 msgid "Internal Procedures" msgstr "Procedimientos internos" #. initialize the global parasite table -#: ../app/core/gimp.c:851 +#: ../app/core/gimp.c:949 msgid "Looking for data files" msgstr "Buscando archivos de datos" -#: ../app/core/gimp.c:851 +#: ../app/core/gimp.c:949 msgid "Parasites" msgstr "Parásitos" +#. initialize the list of gimp dynamics +#: ../app/core/gimp.c:958 ../app/dialogs/preferences-dialog.c:2724 +msgid "Dynamics" +msgstr "Dinámica" + #. initialize the list of fonts -#: ../app/core/gimp.c:871 +#: ../app/core/gimp.c:978 msgid "Fonts (this may take a while)" msgstr "Tipografías (esto puede tardar un rato)" #. initialize the module list -#: ../app/core/gimp.c:880 ../app/dialogs/preferences-dialog.c:2778 +#: ../app/core/gimp.c:992 ../app/dialogs/preferences-dialog.c:2752 msgid "Modules" msgstr "Módulos" #. update tag cache -#: ../app/core/gimp.c:884 +#: ../app/core/gimp.c:996 msgid "Updating tag cache" msgstr "Actualizar la caché de etiquetas" -#: ../app/core/gimpbrush-load.c:176 +#: ../app/core/gimpbrush-load.c:178 #, c-format msgid "Could not read %d bytes from '%s': %s" msgstr "No se ha podido leer %d bytes de «%s»: %s" -#: ../app/core/gimpbrush-load.c:196 +#: ../app/core/gimpbrush-load.c:198 #, c-format msgid "Fatal parse error in brush file '%s': Width = 0." msgstr "Error fatal de análisis en el archivo de pincel «%s»: Anchura = 0." -#: ../app/core/gimpbrush-load.c:205 +#: ../app/core/gimpbrush-load.c:207 #, c-format msgid "Fatal parse error in brush file '%s': Height = 0." msgstr "Error fatal de análisis en el archivo de pincel «%s»: Altura = 0." -#: ../app/core/gimpbrush-load.c:214 +#: ../app/core/gimpbrush-load.c:216 #, c-format msgid "Fatal parse error in brush file '%s': Bytes = 0." msgstr "Error fatal de análisis en el archivo de pincel «%s»: Bytes = 0." -#: ../app/core/gimpbrush-load.c:238 +#: ../app/core/gimpbrush-load.c:240 #, c-format msgid "Fatal parse error in brush file '%s': Unknown depth %d." msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: Profundidad desconocida " "%d." -#: ../app/core/gimpbrush-load.c:251 +#: ../app/core/gimpbrush-load.c:253 #, c-format msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: Versión desconocida %d." -#: ../app/core/gimpbrush-load.c:267 ../app/core/gimpbrush-load.c:387 -#: ../app/core/gimpbrush-load.c:719 +#: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389 +#: ../app/core/gimpbrush-load.c:722 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: El archivo parece estar " "truncado." -#: ../app/core/gimpbrush-load.c:275 ../app/core/gimpbrushgenerated-load.c:127 -#: ../app/core/gimpbrushpipe-load.c:96 +#: ../app/core/gimpbrush-load.c:277 ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Cadena UTF-8 inválida en el archivo de pincel «%s»." -#: ../app/core/gimpbrush-load.c:282 ../app/core/gimpitem.c:627 -#: ../app/core/gimppattern-load.c:145 +#: ../app/core/gimpbrush-load.c:284 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:82 -#: ../app/tools/gimpvectortool.c:301 +#: ../app/tools/gimpvectortool.c:318 msgid "Unnamed" msgstr "Sin nombre" -#: ../app/core/gimpbrush-load.c:376 +#: ../app/core/gimpbrush-load.c:378 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7145,7 +7578,7 @@ msgstr "" "no soportado %d\n" "Los pinceles de GIMP deben ser GRAY (GRISES) o RGBA." -#: ../app/core/gimpbrush-load.c:447 +#: ../app/core/gimpbrush-load.c:450 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." @@ -7153,7 +7586,7 @@ msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: Imposible decodificar " "el formato abr versión %d." -#: ../app/core/gimpbrush-load.c:614 +#: ../app/core/gimpbrush-load.c:617 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" @@ -7164,14 +7597,14 @@ msgstr "" msgid "Brush Spacing" msgstr "Espaciado del pincel" -#: ../app/core/gimpbrushgenerated-load.c:86 +#: ../app/core/gimpbrushgenerated-load.c:87 #, c-format msgid "Fatal parse error in brush file '%s': Not a GIMP brush file." msgstr "" "Error fatal de análisis: en el archivo de pincel «%s»: No es un archivo de " "pincel de GIMP." -#: ../app/core/gimpbrushgenerated-load.c:103 +#: ../app/core/gimpbrushgenerated-load.c:104 #, c-format msgid "" "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." @@ -7179,7 +7612,7 @@ msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: Versión de pincel de " "GIMP desconocida en la línea %d." -#: ../app/core/gimpbrushgenerated-load.c:149 +#: ../app/core/gimpbrushgenerated-load.c:150 #, c-format msgid "" "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." @@ -7187,47 +7620,47 @@ msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: Forma de pincel de GIMP " "desconocida en la línea %d." -#: ../app/core/gimpbrushgenerated-load.c:225 +#: ../app/core/gimpbrushgenerated-load.c:226 #, c-format msgid "Line %d: %s" msgstr "Línea %d: %s" -#: ../app/core/gimpbrushgenerated-load.c:227 +#: ../app/core/gimpbrushgenerated-load.c:228 #, c-format msgid "File is truncated in line %d" msgstr "El archivo está truncado en la línea %d" -#: ../app/core/gimpbrushgenerated-load.c:230 +#: ../app/core/gimpbrushgenerated-load.c:231 #, c-format msgid "Error while reading brush file '%s': %s" msgstr "Ocurrió un error al leer el archivo de pincel «%s»: %s" -#: ../app/core/gimpbrushgenerated.c:128 +#: ../app/core/gimpbrushgenerated.c:129 msgid "Brush Shape" msgstr "Forma del pincel" -#: ../app/core/gimpbrushgenerated.c:136 +#: ../app/core/gimpbrushgenerated.c:137 msgid "Brush Radius" msgstr "Radio del pincel" -#: ../app/core/gimpbrushgenerated.c:143 +#: ../app/core/gimpbrushgenerated.c:144 msgid "Brush Spikes" msgstr "Puntas del pincel" -#: ../app/core/gimpbrushgenerated.c:150 +#: ../app/core/gimpbrushgenerated.c:151 msgid "Brush Hardness" msgstr "Dureza del pincel" -#: ../app/core/gimpbrushgenerated.c:158 ../app/paint/gimppaintoptions.c:250 +#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:143 msgid "Brush Aspect Ratio" msgstr "Proporción de aspecto del pincel" -#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:254 +#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:147 msgid "Brush Angle" msgstr "Ángulo del pincel" -#: ../app/core/gimpbrushpipe-load.c:112 ../app/core/gimpbrushpipe-load.c:132 -#: ../app/core/gimpbrushpipe-load.c:222 +#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 +#: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" @@ -7235,105 +7668,156 @@ msgstr "" "corrupto." #: ../app/core/gimpchannel-select.c:59 -msgctxt "command" +msgctxt "undo-type" msgid "Rectangle Select" msgstr "Selección rectangular" #: ../app/core/gimpchannel-select.c:110 -msgctxt "command" +msgctxt "undo-type" msgid "Ellipse Select" msgstr "Selección elíptica" #: ../app/core/gimpchannel-select.c:164 -msgctxt "command" +msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Selección rectangular redondeada" -#: ../app/core/gimpchannel-select.c:433 +#: ../app/core/gimpchannel-select.c:433 ../app/core/gimplayer.c:273 +msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Alfa a selección" #: ../app/core/gimpchannel-select.c:471 #, c-format +msgctxt "undo-type" msgid "%s Channel to Selection" -msgstr "canal %s a selección" +msgstr "Canal %s a selección" -#: ../app/core/gimpchannel-select.c:519 ../app/tools/gimpfuzzyselecttool.c:80 -msgctxt "command" +#: ../app/core/gimpchannel-select.c:519 +msgctxt "undo-type" msgid "Fuzzy Select" msgstr "Selección difusa" #: ../app/core/gimpchannel-select.c:566 -#: ../app/tools/gimpbycolorselecttool.c:82 -msgctxt "command" +msgctxt "undo-type" msgid "Select by Color" msgstr "Seleccionar por color" -#: ../app/core/gimpchannel.c:265 -msgid "Channel" -msgstr "Canal" - -#: ../app/core/gimpchannel.c:266 +#: ../app/core/gimpchannel.c:272 +msgctxt "undo-type" msgid "Rename Channel" msgstr "Renombrar el canal" -#: ../app/core/gimpchannel.c:267 +#: ../app/core/gimpchannel.c:273 +msgctxt "undo-type" msgid "Move Channel" msgstr "Mover el canal" -#: ../app/core/gimpchannel.c:268 +#: ../app/core/gimpchannel.c:274 +msgctxt "undo-type" msgid "Scale Channel" msgstr "Escalar el canal" -#: ../app/core/gimpchannel.c:269 +#: ../app/core/gimpchannel.c:275 +msgctxt "undo-type" msgid "Resize Channel" msgstr "Redimensionar el canal" -#: ../app/core/gimpchannel.c:270 +#: ../app/core/gimpchannel.c:276 +msgctxt "undo-type" msgid "Flip Channel" msgstr "Voltear el canal" -#: ../app/core/gimpchannel.c:271 +#: ../app/core/gimpchannel.c:277 +msgctxt "undo-type" msgid "Rotate Channel" msgstr "Rotar el canal" -#: ../app/core/gimpchannel.c:272 ../app/core/gimpdrawable-transform.c:885 +#: ../app/core/gimpchannel.c:278 ../app/core/gimpdrawable-transform.c:885 +msgctxt "undo-type" msgid "Transform Channel" msgstr "Transformar el canal" -#: ../app/core/gimpchannel.c:273 +#: ../app/core/gimpchannel.c:279 +msgctxt "undo-type" msgid "Stroke Channel" -msgstr "Canal de marcado" +msgstr "Impresionar el canal" -#: ../app/core/gimpchannel.c:295 +#: ../app/core/gimpchannel.c:280 ../app/core/gimpselection.c:583 +msgctxt "undo-type" +msgid "Channel to Selection" +msgstr "Canal a selección" + +#: ../app/core/gimpchannel.c:281 +msgctxt "undo-type" +msgid "Reorder Channel" +msgstr "Reordenar el canal" + +#: ../app/core/gimpchannel.c:282 +msgctxt "undo-type" +msgid "Raise Channel" +msgstr "Elevar el canal" + +#: ../app/core/gimpchannel.c:283 +msgctxt "undo-type" +msgid "Raise Channel to Top" +msgstr "Elevar el canal hasta lo alto" + +#: ../app/core/gimpchannel.c:284 +msgctxt "undo-type" +msgid "Lower Channel" +msgstr "Bajar el canal" + +#: ../app/core/gimpchannel.c:285 +msgctxt "undo-type" +msgid "Lower Channel to Bottom" +msgstr "Bajar el canal hasta lo más bajo" + +#: ../app/core/gimpchannel.c:286 +msgid "Channel cannot be raised higher." +msgstr "El canal no puede ser elevado más alto." + +#: ../app/core/gimpchannel.c:287 +msgid "Channel cannot be lowered more." +msgstr "El canal no puede descender más." + +#: ../app/core/gimpchannel.c:309 +msgctxt "undo-type" msgid "Feather Channel" msgstr "Difuminar el canal" -#: ../app/core/gimpchannel.c:296 +#: ../app/core/gimpchannel.c:310 +msgctxt "undo-type" msgid "Sharpen Channel" msgstr "Enfocar el canal" -#: ../app/core/gimpchannel.c:297 +#: ../app/core/gimpchannel.c:311 +msgctxt "undo-type" msgid "Clear Channel" msgstr "Limpiar el canal" -#: ../app/core/gimpchannel.c:298 +#: ../app/core/gimpchannel.c:312 +msgctxt "undo-type" msgid "Fill Channel" msgstr "Rellenar el canal" -#: ../app/core/gimpchannel.c:299 +#: ../app/core/gimpchannel.c:313 +msgctxt "undo-type" msgid "Invert Channel" msgstr "Invertir el canal" -#: ../app/core/gimpchannel.c:300 +#: ../app/core/gimpchannel.c:314 +msgctxt "undo-type" msgid "Border Channel" msgstr "Bordear el canal" -#: ../app/core/gimpchannel.c:301 +#: ../app/core/gimpchannel.c:315 +msgctxt "undo-type" msgid "Grow Channel" msgstr "Agrandar el canal" -#: ../app/core/gimpchannel.c:302 +#: ../app/core/gimpchannel.c:316 +msgctxt "undo-type" msgid "Shrink Channel" msgstr "Achicar el canal" @@ -7341,33 +7825,35 @@ msgstr "Achicar el canal" msgid "Cannot stroke empty channel." msgstr "No se puede trazar un canal vacío." -#: ../app/core/gimpchannel.c:1714 +#: ../app/core/gimpchannel.c:1752 +msgctxt "undo-type" msgid "Set Channel Color" msgstr "Definir el color del canal" -#: ../app/core/gimpchannel.c:1780 +#: ../app/core/gimpchannel.c:1818 +msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Definir la opacidad del canal" -#: ../app/core/gimpchannel.c:1888 ../app/core/gimpselection.c:532 +#: ../app/core/gimpchannel.c:1926 ../app/core/gimpselection.c:532 msgid "Selection Mask" msgstr "Máscara de selección" -#: ../app/core/gimpcontext.c:593 ../app/tools/gimppaintoptions-gui.c:175 +#: ../app/core/gimpcontext.c:640 msgid "Opacity" msgstr "Opacidad" -#: ../app/core/gimpcontext.c:601 +#: ../app/core/gimpcontext.c:648 msgid "Paint Mode" msgstr "Modo de pintura" -#: ../app/core/gimpdata.c:569 ../app/core/gimptoolpresets.c:278 +#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277 #, c-format msgid "Could not delete '%s': %s" msgstr "No se ha podido borrar «%s»: %s" -#: ../app/core/gimpdatafactory.c:436 ../app/core/gimpdatafactory.c:596 -#: ../app/core/gimpdatafactory.c:616 +#: ../app/core/gimpdatafactory.c:427 ../app/core/gimpdatafactory.c:456 +#: ../app/core/gimpdatafactory.c:622 ../app/core/gimpdatafactory.c:644 #, c-format msgid "" "Failed to save data:\n" @@ -7378,21 +7864,44 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:515 ../app/core/gimpdatafactory.c:518 -#: ../app/core/gimpitem.c:388 ../app/core/gimpitem.c:391 +#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539 +#: ../app/core/gimpitem.c:425 ../app/core/gimpitem.c:428 msgid "copy" msgstr "copiar" -#: ../app/core/gimpdatafactory.c:527 ../app/core/gimpitem.c:400 +#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:437 #, c-format msgid "%s copy" msgstr "Copia de %s" -#: ../app/core/gimpdatafactory.c:597 -msgid "You don't have a writable data folder configured." -msgstr "No tiene una carpeta de datos escribibles configurada." +#: ../app/core/gimpdatafactory.c:741 +#, 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." +msgstr "" +"Tiene configurada una carpeta escribible de datos (%s), pero esta carpeta no " +"existe. Cree la carpeta o arregle su configuración en la sección «Carpetas» " +"del diálogo Preferencias." -#: ../app/core/gimpdatafactory.c:796 +#: ../app/core/gimpdatafactory.c:762 +#, 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 "" +"Tiene configurada una carpeta escribible de datos, pero esta carpeta no " +"forma parte de su ruta de búsqueda. Probablemente ha editado manualmente el " +"archivo gimprc, arréglelo en la sección «Carpetas» del diálogo Preferencias. " + +#: ../app/core/gimpdatafactory.c:772 +#, c-format +msgid "You don't have any writable data folder configured." +msgstr "No tiene configurada una carpeta escribible de datos." + +#: ../app/core/gimpdatafactory.c:889 #, c-format msgid "" "Failed to load data:\n" @@ -7403,16 +7912,18 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdrawable-blend.c:244 ../app/tools/gimpblendtool.c:109 +#: ../app/core/gimpdrawable-blend.c:244 +msgctxt "undo-type" msgid "Blend" -msgstr "Mezcla" +msgstr "Mezclar" #: ../app/core/gimpdrawable-brightness-contrast.c:70 +msgctxt "undo-type" msgid "Brightness_Contrast" msgstr "Brillo-_Contraste" #: ../app/core/gimpdrawable-brightness-contrast.c:81 -#: ../app/tools/gimpbrightnesscontrasttool.c:111 +msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "Brillo-Contraste" @@ -7421,23 +7932,24 @@ msgid "No patterns available for this operation." msgstr "No hay patrones disponibles para esta operación." #: ../app/core/gimpdrawable-bucket-fill.c:286 -msgctxt "command" +msgctxt "undo-type" msgid "Bucket Fill" msgstr "Relleno de cubeta" #: ../app/core/gimpdrawable-color-balance.c:79 #: ../app/core/gimpdrawable-color-balance.c:89 -#: ../app/tools/gimpcolorbalancetool.c:94 +msgctxt "undo-type" msgid "Color Balance" msgstr "Balance de color" #: ../app/core/gimpdrawable-colorize.c:72 -#: ../app/core/gimpdrawable-colorize.c:84 ../app/tools/gimpcolorizetool.c:90 +#: ../app/core/gimpdrawable-colorize.c:84 +msgctxt "undo-type" msgid "Colorize" msgstr "Colorear" #: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179 -#: ../app/tools/gimpcurvestool.c:140 +msgctxt "undo-type" msgid "Curves" msgstr "Curvas" @@ -7448,6 +7960,7 @@ msgid "Desaturate" msgstr "Desaturar" #: ../app/core/gimpdrawable-equalize.c:52 +msgctxt "undo-type" msgid "Equalize" msgstr "Ecualizar" @@ -7474,6 +7987,7 @@ msgid "Levels" msgstr "Niveles" #: ../app/core/gimpdrawable-offset.c:315 +msgctxt "undo-type" msgid "Offset Drawable" msgstr "Desplazar el dibujable" @@ -7483,6 +7997,7 @@ msgid "Posterize" msgstr "Posterizar" #: ../app/core/gimpdrawable-stroke.c:435 +msgctxt "undo-type" msgid "Render Stroke" msgstr "Renderizar el trazo" @@ -7491,21 +8006,18 @@ msgstr "Renderizar el trazo" msgid "Threshold" msgstr "Umbral B/N" -#: ../app/core/gimpdrawable-transform.c:566 -msgid "Transform" -msgstr "Transformar" - -#: ../app/core/gimpdrawable-transform.c:644 ../app/tools/gimpfliptool.c:116 -msgctxt "command" +#: ../app/core/gimpdrawable-transform.c:644 +msgctxt "undo-type" msgid "Flip" msgstr "Voltear" -#: ../app/core/gimpdrawable-transform.c:744 ../app/tools/gimprotatetool.c:121 -msgctxt "command" +#: ../app/core/gimpdrawable-transform.c:744 +msgctxt "undo-type" msgid "Rotate" msgstr "Rotar" -#: ../app/core/gimpdrawable-transform.c:883 ../app/core/gimplayer.c:259 +#: ../app/core/gimpdrawable-transform.c:883 ../app/core/gimplayer.c:272 +msgctxt "undo-type" msgid "Transform Layer" msgstr "Transformar la capa" @@ -7513,53 +8025,62 @@ msgstr "Transformar la capa" msgid "Transformation" msgstr "Transformación" -#: ../app/core/gimpgradient-load.c:70 ../app/core/gimpgradient-load.c:95 -#: ../app/core/gimpgradient-load.c:116 ../app/core/gimpgradient-load.c:167 +#: ../app/core/gimpdrawable.c:486 +msgctxt "undo-type" +msgid "Scale" +msgstr "Redimensionar" + +#: ../app/core/gimpdynamicsoutput.c:106 +msgid "Output type" +msgstr "Tipo de salida" + +#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96 +#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168 #, c-format msgid "Fatal parse error in gradient file '%s': Read error in line %d." msgstr "" "Error fatal de análisis en el archivo de degradado «%s»: Error de lectura en " "la línea %d." -#: ../app/core/gimpgradient-load.c:80 +#: ../app/core/gimpgradient-load.c:81 #, c-format msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." msgstr "" "Error fatal de análisis: en el archivo de degradados «%s»: No es un archivo " "de degradados de GIMP." -#: ../app/core/gimpgradient-load.c:108 +#: ../app/core/gimpgradient-load.c:109 #, c-format msgid "Invalid UTF-8 string in gradient file '%s'." msgstr "Cadena UTF-8 inválida en el archivo de degradado «%s»." -#: ../app/core/gimpgradient-load.c:135 +#: ../app/core/gimpgradient-load.c:136 #, c-format msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." msgstr "" "Error fatal de análisis en el archivo de degradados «%s»: El archivo está " "corrupto en la línea %d." -#: ../app/core/gimpgradient-load.c:217 ../app/core/gimpgradient-load.c:228 +#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229 #, c-format msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d." msgstr "" "Error fatal de análisis en el archivo de degradados «%s»: Segmento %d " "corrupto en la línea %d." -#: ../app/core/gimpgradient-load.c:240 ../app/core/gimpgradient-load.c:254 +#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255 #, c-format msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." msgstr "" "El archivo de degradado «%s» está corrompido. Los segmentos no se expanden a " "través del rango 0-1." -#: ../app/core/gimpgradient-load.c:333 +#: ../app/core/gimpgradient-load.c:335 #, c-format msgid "No linear gradients found in '%s'" msgstr "No se encontraron degradados lineales en «%s»" -#: ../app/core/gimpgradient-load.c:343 +#: ../app/core/gimpgradient-load.c:345 #, c-format msgid "Failed to import gradients from '%s': %s" msgstr "Fallo al importar degradados desde «%s»: %s" @@ -7600,255 +8121,280 @@ msgstr "" "Desplazamiento vertical de la primera línea de la rejilla, puede ser un " "número negativo." -#: ../app/core/gimpimage-arrange.c:142 -msgid "Arrange Objects" -msgstr "Colocar objetos" +#: ../app/core/gimpgrouplayer.c:178 ../app/core/gimpgrouplayer.c:837 +msgid "Layer Group" +msgstr "Grupo de capas" -#: ../app/core/gimpimage-colormap.c:62 +#: ../app/core/gimpgrouplayer.c:179 +msgctxt "undo-type" +msgid "Rename Layer Group" +msgstr "Renombrar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:180 +msgctxt "undo-type" +msgid "Move Layer Group" +msgstr "Mover el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:181 +msgctxt "undo-type" +msgid "Scale Layer Group" +msgstr "Escalar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:182 +msgctxt "undo-type" +msgid "Resize Layer Group" +msgstr "Redimensionar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:183 +msgctxt "undo-type" +msgid "Flip Layer Group" +msgstr "Voltear el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:184 +msgctxt "undo-type" +msgid "Rotate Layer Group" +msgstr "Rotar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:185 +msgctxt "undo-type" +msgid "Transform Layer Group" +msgstr "Transformar el grupo de capas" + +#: ../app/core/gimpimage-arrange.c:142 +msgctxt "undo-type" +msgid "Arrange Objects" +msgstr "Disponer objetos" + +#: ../app/core/gimpimage-colormap.c:67 +msgctxt "undo-type" msgid "Set Colormap" msgstr "Establecer mapa de colores" -#: ../app/core/gimpimage-colormap.c:117 +#: ../app/core/gimpimage-colormap.c:132 +msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Cambiar entrada del mapa de colores" -#: ../app/core/gimpimage-colormap.c:137 +#: ../app/core/gimpimage-colormap.c:157 +msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Añadir color al mapa de colores" -#: ../app/core/gimpimage-convert.c:792 +#: ../app/core/gimpimage-convert.c:791 msgid "Cannot convert image: palette is empty." msgstr "No se puede convertir la imagen, la paleta está vacía." -#: ../app/core/gimpimage-convert.c:808 +#: ../app/core/gimpimage-convert.c:807 +msgctxt "undo-type" msgid "Convert Image to RGB" msgstr "Convertir la imagen a RGB" -#: ../app/core/gimpimage-convert.c:812 +#: ../app/core/gimpimage-convert.c:811 +msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "Convertir la imagen a escala de grises" -#: ../app/core/gimpimage-convert.c:816 +#: ../app/core/gimpimage-convert.c:815 +msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "Convertir la imagen a colores indexados" -#: ../app/core/gimpimage-convert.c:895 +#: ../app/core/gimpimage-convert.c:894 msgid "Converting to indexed colors (stage 2)" msgstr "Convirtiendo a colores indexados (paso 2)" -#: ../app/core/gimpimage-convert.c:940 +#: ../app/core/gimpimage-convert.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "Convirtiendo a colores indexados (paso 3)" -#: ../app/core/gimpimage-crop.c:135 -msgctxt "command" +#: ../app/core/gimpimage-crop.c:129 +msgctxt "undo-type" msgid "Crop Image" msgstr "Recortar la imagen" -#: ../app/core/gimpimage-crop.c:138 ../app/core/gimpimage-resize.c:96 +#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86 +msgctxt "undo-type" msgid "Resize Image" msgstr "Redimensionar la imagen" -#: ../app/core/gimpimage-grid.c:57 ../app/dialogs/grid-dialog.c:152 -msgid "Grid" -msgstr "Rejilla" - -#: ../app/core/gimpimage-guides.c:50 +#: ../app/core/gimpimage-guides.c:51 +msgctxt "undo-type" msgid "Add Horizontal Guide" msgstr "Añadir una guía horizontal" -#: ../app/core/gimpimage-guides.c:73 +#: ../app/core/gimpimage-guides.c:74 +msgctxt "undo-type" msgid "Add Vertical Guide" msgstr "Añadir una guía vertical" -#: ../app/core/gimpimage-guides.c:114 ../app/tools/gimpmovetool.c:568 +#: ../app/core/gimpimage-guides.c:117 +msgctxt "undo-type" msgid "Remove Guide" msgstr "Eliminar la guía" -#: ../app/core/gimpimage-guides.c:139 +#: ../app/core/gimpimage-guides.c:142 +msgctxt "undo-type" msgid "Move Guide" msgstr "Mover la guía" #: ../app/core/gimpimage-item-list.c:51 +msgctxt "undo-type" msgid "Translate Items" msgstr "Trasladar elementos" #: ../app/core/gimpimage-item-list.c:78 +msgctxt "undo-type" msgid "Flip Items" msgstr "Voltear elementos" #: ../app/core/gimpimage-item-list.c:105 +msgctxt "undo-type" msgid "Rotate Items" msgstr "Rotar elementos" #: ../app/core/gimpimage-item-list.c:135 +msgctxt "undo-type" msgid "Transform Items" msgstr "Transformar elementos" -#: ../app/core/gimpimage-merge.c:102 ../app/core/gimpimage-merge.c:114 +#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122 +msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Combinar las capas visibles" -#: ../app/core/gimpimage-merge.c:165 +#: ../app/core/gimpimage-merge.c:176 +msgctxt "undo-type" msgid "Flatten Image" msgstr "Aplanar la imagen" -#: ../app/core/gimpimage-merge.c:214 +#: ../app/core/gimpimage-merge.c:225 +msgid "Cannot merge down to a layer group." +msgstr "No se puede hacer una combinación a un grupo de capas." + +#: ../app/core/gimpimage-merge.c:232 +msgid "The layer to merge down to is locked." +msgstr "La capa a la que se pretende combinar está bloqueada." + +#: ../app/core/gimpimage-merge.c:244 +msgid "There is no visible layer to merge down to." +msgstr "No hay ninguna capa visible a la que hacer la combinación." + +#: ../app/core/gimpimage-merge.c:255 +msgctxt "undo-type" msgid "Merge Down" msgstr "Combinar hacia abajo" -#: ../app/core/gimpimage-merge.c:254 +#: ../app/core/gimpimage-merge.c:277 +msgctxt "undo-type" +msgid "Merge Layer Group" +msgstr "Combinar el grupo de capas" + +#: ../app/core/gimpimage-merge.c:330 +msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Combinar las rutas visibles" -#: ../app/core/gimpimage-merge.c:290 +#: ../app/core/gimpimage-merge.c:366 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "No hay suficientes capas visibles para hacer una combinación. Deben haber " "por lo menos dos." -#: ../app/core/gimpimage-quick-mask.c:81 +#: ../app/core/gimpimage-new.c:135 +msgid "Background" +msgstr "Fondo" + +#: ../app/core/gimpimage-quick-mask.c:85 +msgctxt "undo-type" msgid "Enable Quick Mask" msgstr "Activar la máscara rápida" -#: ../app/core/gimpimage-quick-mask.c:131 +#: ../app/core/gimpimage-quick-mask.c:135 +msgctxt "undo-type" msgid "Disable Quick Mask" msgstr "Desactivar la máscara rápida" -#: ../app/core/gimpimage-sample-points.c:52 +#: ../app/core/gimpimage-sample-points.c:53 +msgctxt "undo-type" msgid "Add Sample Point" msgstr "Añadir punto de muestra" -#: ../app/core/gimpimage-sample-points.c:97 ../app/tools/gimpcolortool.c:431 +#: ../app/core/gimpimage-sample-points.c:101 +msgctxt "undo-type" msgid "Remove Sample Point" -msgstr "Eliminar punto de muestra" +msgstr "Quitar punto de muestra" -#: ../app/core/gimpimage-sample-points.c:134 +#: ../app/core/gimpimage-sample-points.c:138 +msgctxt "undo-type" msgid "Move Sample Point" msgstr "Mover punto de muestra" -#: ../app/core/gimpimage-undo-push.c:838 +#: ../app/core/gimpimage-scale.c:87 +msgctxt "undo-type" +msgid "Scale Image" +msgstr "Escalar la imagen" + +#: ../app/core/gimpimage-undo-push.c:862 #, c-format msgid "Can't undo %s" msgstr "No se puede deshacer %s" -#: ../app/core/gimpimage.c:1528 +#: ../app/core/gimpimage.c:1632 +msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Cambiar la resolución de la imagen" -#: ../app/core/gimpimage.c:1572 +#: ../app/core/gimpimage.c:1684 +msgctxt "undo-type" msgid "Change Image Unit" msgstr "Cambiar la unidad de medida" -#: ../app/core/gimpimage.c:2468 +#: ../app/core/gimpimage.c:2654 +msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Adjuntar parásito a la imagen" -#: ../app/core/gimpimage.c:2506 +#: ../app/core/gimpimage.c:2695 +msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Eliminar el parásito de la imagen" -#: ../app/core/gimpimage.c:3082 +#: ../app/core/gimpimage.c:3404 +msgctxt "undo-type" msgid "Add Layer" msgstr "Añadir una capa" -#: ../app/core/gimpimage.c:3135 ../app/core/gimpimage.c:3161 +#: ../app/core/gimpimage.c:3454 ../app/core/gimpimage.c:3474 +msgctxt "undo-type" msgid "Remove Layer" msgstr "Eliminar una capa" -#: ../app/core/gimpimage.c:3154 +#: ../app/core/gimpimage.c:3467 +msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Eliminar la selección flotante" -#: ../app/core/gimpimage.c:3328 -msgid "Layer cannot be raised higher." -msgstr "La capa no puede ser elevada más alto." - -#: ../app/core/gimpimage.c:3336 -msgid "Raise Layer" -msgstr "Elevar la capa" - -#: ../app/core/gimpimage.c:3359 -msgid "Layer cannot be lowered more." -msgstr "La capa no puede bajarse más." - -#: ../app/core/gimpimage.c:3367 -msgid "Lower Layer" -msgstr "Bajar la capa" - -#: ../app/core/gimpimage.c:3383 -msgid "Raise Layer to Top" -msgstr "Elevar la capa hasta lo más alto" - -#: ../app/core/gimpimage.c:3405 -msgid "Lower Layer to Bottom" -msgstr "Bajar la capa hasta la parte más baja" - -#: ../app/core/gimpimage.c:3500 +#: ../app/core/gimpimage.c:3633 +msgctxt "undo-type" msgid "Add Channel" msgstr "Añadir un canal" -#: ../app/core/gimpimage.c:3543 ../app/core/gimpimage.c:3559 +#: ../app/core/gimpimage.c:3671 ../app/core/gimpimage.c:3683 +msgctxt "undo-type" msgid "Remove Channel" -msgstr "Eliminar el canal" +msgstr "Eliminar un canal" -#: ../app/core/gimpimage.c:3628 -msgid "Channel cannot be raised higher." -msgstr "El canal no puede ser elevado más alto." - -#: ../app/core/gimpimage.c:3636 -msgid "Raise Channel" -msgstr "Elevar el canal" - -#: ../app/core/gimpimage.c:3652 -msgid "Raise Channel to Top" -msgstr "Elevar el canal hasta lo alto" - -#: ../app/core/gimpimage.c:3676 -msgid "Channel cannot be lowered more." -msgstr "El canal no puede descender más." - -#: ../app/core/gimpimage.c:3684 -msgid "Lower Channel" -msgstr "Bajar el canal" - -#: ../app/core/gimpimage.c:3706 -msgid "Lower Channel to Bottom" -msgstr "Bajar el canal hasta lo más bajo" - -#: ../app/core/gimpimage.c:3803 +#: ../app/core/gimpimage.c:3730 +msgctxt "undo-type" msgid "Add Path" msgstr "Añadir una ruta" -#: ../app/core/gimpimage.c:3843 +#: ../app/core/gimpimage.c:3761 +msgctxt "undo-type" msgid "Remove Path" -msgstr "Eliminar la ruta" +msgstr "Eliminar una ruta" -#: ../app/core/gimpimage.c:3906 -msgid "Path cannot be raised higher." -msgstr "La ruta no puede ser elevada más alto." - -#: ../app/core/gimpimage.c:3914 -msgid "Raise Path" -msgstr "Elevar la ruta" - -#: ../app/core/gimpimage.c:3930 -msgid "Raise Path to Top" -msgstr "Elevar la ruta hasta el principio" - -#: ../app/core/gimpimage.c:3953 -msgid "Path cannot be lowered more." -msgstr "La ruta no puede descender más." - -#: ../app/core/gimpimage.c:3961 -msgid "Lower Path" -msgstr "Bajar la ruta" - -#: ../app/core/gimpimage.c:3983 -msgid "Lower Path to Bottom" -msgstr "Bajar la ruta hasta el fondo" - -#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1730 +#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711 msgid "Folder" msgstr "Carpeta" @@ -7889,7 +8435,7 @@ msgid_plural "%d × %d pixels" msgstr[0] "%d x %d píxel" msgstr[1] "%d x %d píxeles" -#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:316 +#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:335 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -7901,23 +8447,27 @@ msgstr[1] "%d capas" msgid "Could not open thumbnail '%s': %s" msgstr "No se ha podido abrir la miniatura «%s»: %s" -#: ../app/core/gimpitem.c:1412 +#: ../app/core/gimpitem.c:1564 +msgctxt "undo-type" msgid "Attach Parasite" msgstr "Adjuntar parásito" -#: ../app/core/gimpitem.c:1422 +#: ../app/core/gimpitem.c:1574 +msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Adjuntar una parásito al elemento" -#: ../app/core/gimpitem.c:1464 ../app/core/gimpitem.c:1471 +#: ../app/core/gimpitem.c:1616 ../app/core/gimpitem.c:1623 +msgctxt "undo-type" msgid "Remove Parasite from Item" -msgstr "Eliminar el parásito del elemento" +msgstr "Eliminar un parásito del elemento" -#: ../app/core/gimplayer-floating-sel.c:98 +#: ../app/core/gimplayer-floating-sel.c:95 +msgctxt "undo-type" msgid "Anchor Floating Selection" -msgstr "Anclar la selección flotante" +msgstr "Anclar una selección flotante" -#: ../app/core/gimplayer-floating-sel.c:131 ../app/core/gimplayer.c:690 +#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:595 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -7925,42 +8475,81 @@ msgstr "" "No se puede crear una capa nueva a partir de la selección flotante porque " "ésta pertenece a una máscara de capa o canal." -#: ../app/core/gimplayer-floating-sel.c:138 +#: ../app/core/gimplayer-floating-sel.c:133 +msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "Selección flotante a capa" -#: ../app/core/gimplayer.c:252 -msgid "Layer" -msgstr "Capa" - -#: ../app/core/gimplayer.c:253 +#: ../app/core/gimplayer.c:266 +msgctxt "undo-type" msgid "Rename Layer" -msgstr "Renombrar la capa" +msgstr "Renombrar una capa" -#: ../app/core/gimplayer.c:254 ../app/pdb/layer-cmds.c:433 -#: ../app/pdb/layer-cmds.c:471 +#: ../app/core/gimplayer.c:267 +msgctxt "undo-type" msgid "Move Layer" -msgstr "Mover la capa" +msgstr "Mover una capa" -#: ../app/core/gimplayer.c:256 +#: ../app/core/gimplayer.c:268 +msgctxt "undo-type" +msgid "Scale Layer" +msgstr "Escalar una capa" + +#: ../app/core/gimplayer.c:269 +msgctxt "undo-type" msgid "Resize Layer" -msgstr "Redimensionar la capa" +msgstr "Redimensionar una capa" -#: ../app/core/gimplayer.c:257 +#: ../app/core/gimplayer.c:270 +msgctxt "undo-type" msgid "Flip Layer" -msgstr "Voltear la capa" +msgstr "Voltear una capa" -#: ../app/core/gimplayer.c:258 +#: ../app/core/gimplayer.c:271 +msgctxt "undo-type" msgid "Rotate Layer" -msgstr "Rotar la capa" +msgstr "Rotar una capa" -#: ../app/core/gimplayer.c:415 ../app/core/gimplayer.c:1391 -#: ../app/core/gimplayermask.c:220 +#: ../app/core/gimplayer.c:274 +msgctxt "undo-type" +msgid "Reorder Layer" +msgstr "Reordenar una capa" + +#: ../app/core/gimplayer.c:275 +msgctxt "undo-type" +msgid "Raise Layer" +msgstr "Elevar una capa" + +#: ../app/core/gimplayer.c:276 +msgctxt "undo-type" +msgid "Raise Layer to Top" +msgstr "Elevar una capa hasta lo más alto" + +#: ../app/core/gimplayer.c:277 +msgctxt "undo-type" +msgid "Lower Layer" +msgstr "Bajar una capa" + +#: ../app/core/gimplayer.c:278 +msgctxt "undo-type" +msgid "Lower Layer to Bottom" +msgstr "Bajar una capa hasta la parte más baja" + +#: ../app/core/gimplayer.c:279 +msgid "Layer cannot be raised higher." +msgstr "La capa no puede ser elevada más alto." + +#: ../app/core/gimplayer.c:280 +msgid "Layer cannot be lowered more." +msgstr "La capa no puede bajarse más." + +#: ../app/core/gimplayer.c:437 ../app/core/gimplayer.c:1491 +#: ../app/core/gimplayermask.c:235 #, c-format msgid "%s mask" msgstr "máscara %s" -#: ../app/core/gimplayer.c:455 +#: ../app/core/gimplayer.c:476 #, c-format msgid "" "Floating Selection\n" @@ -7969,84 +8558,102 @@ msgstr "" "Selección flotante\n" "(%s)" -#: ../app/core/gimplayer.c:1315 +#: ../app/core/gimplayer.c:1415 msgid "Unable to add a layer mask since the layer already has one." msgstr "No se puede añadir una máscara de capa dado que la capa ya posee una." -#: ../app/core/gimplayer.c:1326 +#: ../app/core/gimplayer.c:1426 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "No se puede añadir una máscara de capa de dimensiones distintas a la capa " "especificada." -#: ../app/core/gimplayer.c:1446 +#: ../app/core/gimplayer.c:1432 +msgctxt "undo-type" +msgid "Add Layer Mask" +msgstr "Añadir máscara de capa" + +#: ../app/core/gimplayer.c:1546 +msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Transferir alfa a la máscara" -#: ../app/core/gimplayer.c:1621 ../app/core/gimplayermask.c:247 +#: ../app/core/gimplayer.c:1716 ../app/core/gimplayermask.c:261 +msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Aplicar máscara de capa" -#: ../app/core/gimplayer.c:1622 +#: ../app/core/gimplayer.c:1717 +msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Borrar máscara de capa" -#: ../app/core/gimplayer.c:1741 +#: ../app/core/gimplayer.c:1836 +msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Añadir un canal alfa" -#: ../app/core/gimplayer.c:1795 +#: ../app/core/gimplayer.c:1890 +msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Eliminar el canal alfa" -#: ../app/core/gimplayer.c:1815 +#: ../app/core/gimplayer.c:1910 +msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Capa a tamaño de imagen" -#: ../app/core/gimplayermask.c:108 +#: ../app/core/gimplayermask.c:110 +msgctxt "undo-type" msgid "Move Layer Mask" msgstr "Mover la máscara de la capa" -#: ../app/core/gimplayermask.c:170 +#: ../app/core/gimplayermask.c:111 +msgctxt "undo-type" +msgid "Layer Mask to Selection" +msgstr "Máscara de capa a selección" + +#: ../app/core/gimplayermask.c:185 #, c-format msgid "Cannot rename layer masks." msgstr "No se pueden renombrar las máscaras de capa." -#: ../app/core/gimplayermask.c:315 +#: ../app/core/gimplayermask.c:329 +msgctxt "undo-type" msgid "Show Layer Mask" msgstr "Mostrar la máscara de la capa" -#: ../app/core/gimppalette-import.c:427 +#: ../app/core/gimppalette-import.c:438 #, c-format msgid "Index %d" msgstr "Índice: %d" -#: ../app/core/gimppalette-import.c:531 +#: ../app/core/gimppalette-import.c:547 #, c-format msgid "Unknown type of palette file: %s" msgstr "Tipo de archivo de paleta desconocido: %s" -#: ../app/core/gimppalette-load.c:84 ../app/core/gimppalette-load.c:110 -#: ../app/core/gimppalette-load.c:131 ../app/core/gimppalette-load.c:160 -#: ../app/core/gimppalette-load.c:236 +#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:111 +#: ../app/core/gimppalette-load.c:132 ../app/core/gimppalette-load.c:161 +#: ../app/core/gimppalette-load.c:237 #, c-format msgid "Fatal parse error in palette file '%s': Read error in line %d." msgstr "" "Error fatal de análisis en el archivo de paleta «%s»: Error de lectura en la " "línea %d." -#: ../app/core/gimppalette-load.c:94 +#: ../app/core/gimppalette-load.c:95 #, c-format msgid "Fatal parse error in palette file '%s': Missing magic header." msgstr "" "Error fatal de análisis en el archivo de paleta «%s»: Cabecera mágica perdida." -#: ../app/core/gimppalette-load.c:123 +#: ../app/core/gimppalette-load.c:124 #, c-format msgid "Invalid UTF-8 string in palette file '%s'" msgstr "Cadena UTF-8 inválida en el archivo de paleta «%s»" -#: ../app/core/gimppalette-load.c:147 +#: ../app/core/gimppalette-load.c:148 #, c-format msgid "" "Reading palette file '%s': Invalid number of columns in line %d. Using " @@ -8055,49 +8662,49 @@ msgstr "" "Leyendo el archivo de paleta «%s»: Número inválido de columnas en la línea %" "d. Usando el valor predeterminado." -#: ../app/core/gimppalette-load.c:183 +#: ../app/core/gimppalette-load.c:184 #, c-format msgid "Reading palette file '%s': Missing RED component in line %d." msgstr "" "Leyendo el archivo de paleta «%s»: Falta la componente ROJO en la línea %d." -#: ../app/core/gimppalette-load.c:191 +#: ../app/core/gimppalette-load.c:192 #, c-format msgid "Reading palette file '%s': Missing GREEN component in line %d." msgstr "" "Leyendo el archivo de paleta «%s»: Falta la componente VERDE en la línea %d." -#: ../app/core/gimppalette-load.c:199 +#: ../app/core/gimppalette-load.c:200 #, c-format msgid "Reading palette file '%s': Missing BLUE component in line %d." msgstr "" "Leyendo el archivo de paleta «%s»: Falta la componente AZUL en la línea %d." -#: ../app/core/gimppalette-load.c:209 +#: ../app/core/gimppalette-load.c:210 #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." msgstr "" "Leyendo el archivo de paleta «%s»: Valor RGB fuera de rango en la línea %d." -#: ../app/core/gimppalette-load.c:472 +#: ../app/core/gimppalette-load.c:477 #, c-format msgid "Could not read header from palette file '%s'" msgstr "No se ha podido leer la cabecera del archivo de paleta «%s»" -#: ../app/core/gimppalette-load.c:495 ../app/core/gimppalette-load.c:583 +#: ../app/core/gimppalette-load.c:500 ../app/core/gimppalette-load.c:588 #, c-format msgid "Fatal parse error in palette file '%s'" msgstr "Error fatal de análisis en el archivo de paleta «%s»" -#: ../app/core/gimppattern-load.c:84 ../app/core/gimppattern-load.c:130 -#: ../app/core/gimppattern-load.c:161 +#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131 +#: ../app/core/gimppattern-load.c:162 #, c-format msgid "Fatal parse error in pattern file '%s': File appears truncated." msgstr "" "Error fatal de análisis en el archivo de patrón «%s»: El archivo parece estar " "truncado." -#: ../app/core/gimppattern-load.c:103 +#: ../app/core/gimppattern-load.c:104 #, c-format msgid "" "Fatal parse error in pattern file '%s': Unknown pattern format version %d." @@ -8105,7 +8712,7 @@ msgstr "" "Error de análisis fatal en el archivo de patrón «%s»: Versión del formato de " "patrón desconocida %d." -#: ../app/core/gimppattern-load.c:113 +#: ../app/core/gimppattern-load.c:114 #, c-format msgid "" "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" @@ -8115,7 +8722,7 @@ msgstr "" "no soportada %d.\n" "Los patrones de GIMP deben ser GRAY o RGB." -#: ../app/core/gimppattern-load.c:138 +#: ../app/core/gimppattern-load.c:139 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "Cadena UTF-8 inválida en el archivo de patrón «%s»." @@ -8131,25 +8738,55 @@ msgstr "" msgid "Please wait" msgstr "Por favor, espere" -#: ../app/core/gimpselection.c:155 ../app/tools/gimpeditselectiontool.c:240 +#: ../app/core/gimpselection.c:154 +msgctxt "undo-type" msgid "Move Selection" msgstr "Mover la selección" -#: ../app/core/gimpselection.c:173 -msgid "Sharpen Selection" -msgstr "Enfocar la selección" +#: ../app/core/gimpselection.c:155 +msgctxt "undo-type" +msgid "Stroke Selection" +msgstr "Trazar la selección" -#: ../app/core/gimpselection.c:174 +#: ../app/core/gimpselection.c:171 +msgctxt "undo-type" +msgid "Feather Selection" +msgstr "Difuminar la selección" + +#: ../app/core/gimpselection.c:172 +msgctxt "undo-type" +msgid "Sharpen Selection" +msgstr "Enfocar la selección" + +#: ../app/core/gimpselection.c:173 +msgctxt "undo-type" msgid "Select None" msgstr "Seleccionar nada" -#: ../app/core/gimpselection.c:175 +#: ../app/core/gimpselection.c:174 +msgctxt "undo-type" msgid "Select All" msgstr "Seleccionar todo" -#: ../app/core/gimpselection.c:176 +#: ../app/core/gimpselection.c:175 +msgctxt "undo-type" msgid "Invert Selection" -msgstr "Invertir selección" +msgstr "Invertir la selección" + +#: ../app/core/gimpselection.c:176 +msgctxt "undo-type" +msgid "Border Selection" +msgstr "Selección de borde" + +#: ../app/core/gimpselection.c:177 +msgctxt "undo-type" +msgid "Grow Selection" +msgstr "Agrandar selección" + +#: ../app/core/gimpselection.c:178 +msgctxt "undo-type" +msgid "Shrink Selection" +msgstr "Encoger selección" #: ../app/core/gimpselection.c:285 msgid "There is no selection to stroke." @@ -8166,8 +8803,9 @@ msgstr "" "vacía." #: ../app/core/gimpselection.c:851 +msgctxt "undo-type" msgid "Float Selection" -msgstr "Selección flotante" +msgstr "Flotar la selección" #: ../app/core/gimpselection.c:867 msgid "Floated Layer" @@ -8182,24 +8820,20 @@ msgstr "" "extendiese hasta una distancia mayor que el límite de mediana multiplicado " "por el grosor de la línea a partir del punto real de unión." -#: ../app/core/gimptemplate.c:105 +#: ../app/core/gimptemplate.c:100 msgid "The unit used for coordinate display when not in dot-for-dot mode." msgstr "" "La unidad utilizada para las coordenadas de visualización cuando no se " "encuentra en modo de punto por punto." -#: ../app/core/gimptemplate.c:112 +#: ../app/core/gimptemplate.c:107 msgid "The horizontal image resolution." msgstr "La resolución horizontal de la imagen." -#: ../app/core/gimptemplate.c:118 +#: ../app/core/gimptemplate.c:113 msgid "The vertical image resolution." msgstr "La resolución vertical de la imagen." -#: ../app/core/gimptemplate.c:404 -msgid "Background" -msgstr "Fondo" - #: ../app/core/gimpunit.c:56 msgctxt "unit-singular" msgid "pixel" @@ -8260,16 +8894,16 @@ msgctxt "plural" msgid "percent" msgstr "porcentaje" -#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:479 +#: ../app/dialogs/about-dialog.c:102 ../app/gui/gui.c:484 msgid "About GIMP" msgstr "Acerca del GIMP" -#: ../app/dialogs/about-dialog.c:122 +#: ../app/dialogs/about-dialog.c:111 msgid "Visit the GIMP website" msgstr "Visite el sitio web de GIMP" #. Translators: insert your names here, separated by newline -#: ../app/dialogs/about-dialog.c:127 +#: ../app/dialogs/about-dialog.c:116 msgid "translator-credits" msgstr "" "Alonso Lara\n" @@ -8277,11 +8911,11 @@ msgstr "" "Pablo G. del Campo\n" "Francisco Vila" -#: ../app/dialogs/about-dialog.c:532 +#: ../app/dialogs/about-dialog.c:509 msgid "GIMP is brought to you by" msgstr "GIMP se ha realizado para usted por" -#: ../app/dialogs/about-dialog.c:606 +#: ../app/dialogs/about-dialog.c:583 msgid "This is an unstable development release." msgstr "Esta es una versión de desarrollo inestable." @@ -8330,72 +8964,72 @@ msgstr "Activar difuminado de _transparencia" msgid "Converting to indexed colors" msgstr "Convirtiendo a colores indexados" -#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:150 +#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:152 msgid "Cannot convert to a palette with more than 256 colors." msgstr "No se puede convertir a una paleta con más de 256 colores." -#: ../app/dialogs/dialogs-constructors.c:191 ../app/gui/gui.c:160 -#: ../app/gui/gui-message.c:147 +#: ../app/dialogs/dialogs-constructors.c:212 ../app/gui/gui.c:164 +#: ../app/gui/gui-message.c:145 msgid "GIMP Message" msgstr "Mensaje de GIMP" -#: ../app/dialogs/dialogs.c:143 +#: ../app/dialogs/dialogs.c:267 msgid "Devices" msgstr "Dispositivos" -#: ../app/dialogs/dialogs.c:143 +#: ../app/dialogs/dialogs.c:267 msgid "Device Status" msgstr "Estado del dispositivo" -#: ../app/dialogs/dialogs.c:147 +#: ../app/dialogs/dialogs.c:271 msgid "Errors" msgstr "Errores" -#: ../app/dialogs/dialogs.c:151 +#: ../app/dialogs/dialogs.c:275 msgid "Pointer" msgstr "Puntero" -#: ../app/dialogs/dialogs.c:170 +#: ../app/dialogs/dialogs.c:294 msgid "History" msgstr "Historial" -#: ../app/dialogs/dialogs.c:172 +#: ../app/dialogs/dialogs.c:296 msgid "Image Templates" msgstr "Plantillas de imágenes" -#: ../app/dialogs/dialogs.c:193 +#: ../app/dialogs/dialogs.c:323 msgid "Histogram" msgstr "Histograma" -#: ../app/dialogs/dialogs.c:197 +#: ../app/dialogs/dialogs.c:327 msgid "Selection" msgstr "Selección" -#: ../app/dialogs/dialogs.c:197 +#: ../app/dialogs/dialogs.c:327 msgid "Selection Editor" msgstr "Editor de selección" -#: ../app/dialogs/dialogs.c:201 +#: ../app/dialogs/dialogs.c:331 msgid "Undo" msgstr "Deshacer" -#: ../app/dialogs/dialogs.c:201 +#: ../app/dialogs/dialogs.c:331 msgid "Undo History" msgstr "Historial de deshacer" -#: ../app/dialogs/dialogs.c:211 +#: ../app/dialogs/dialogs.c:341 msgid "Navigation" msgstr "Navegación" -#: ../app/dialogs/dialogs.c:211 +#: ../app/dialogs/dialogs.c:341 msgid "Display Navigation" msgstr "Navegación de la vista" -#: ../app/dialogs/dialogs.c:217 +#: ../app/dialogs/dialogs.c:347 msgid "FG/BG" msgstr "PP/SP" -#: ../app/dialogs/dialogs.c:217 +#: ../app/dialogs/dialogs.c:347 msgid "FG/BG Color" msgstr "Color PP/SP" @@ -8404,20 +9038,20 @@ msgstr "Color PP/SP" msgid "Fade %s" msgstr "Desvanecer %s" -#: ../app/dialogs/fade-dialog.c:123 +#: ../app/dialogs/fade-dialog.c:122 msgid "_Fade" msgstr "_Desvanecer" -#: ../app/dialogs/fade-dialog.c:158 +#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "_Modo:" -#: ../app/dialogs/fade-dialog.c:164 +#: ../app/dialogs/fade-dialog.c:163 msgid "_Opacity:" msgstr "_Opacidad:" # ¿O es abrir capas? depende del contexto. FVD -#: ../app/dialogs/file-open-dialog.c:255 +#: ../app/dialogs/file-open-dialog.c:267 msgid "Open layers" msgstr "Abrir capas" @@ -8433,6 +9067,10 @@ msgstr "Introduzca dirección (URI):" msgid "Export Image" msgstr "Exportar la imagen" +#: ../app/dialogs/file-save-dialog.c:106 +msgid "_Export" +msgstr "_Exportar" + #: ../app/dialogs/file-save-dialog.c:468 msgid "" "Saving remote files needs to determine the file format from the file " @@ -8486,7 +9124,7 @@ msgstr "¿Seguro que quiere guardar la imagen con este nombre?" msgid "Saving canceled" msgstr "Guardado cancelado" -#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:183 +#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185 #, c-format msgid "" "Saving '%s' failed:\n" @@ -8505,6 +9143,10 @@ msgstr "Configurar la rejilla" msgid "Configure Image Grid" msgstr "Configurar la rejilla de la imagen" +#: ../app/dialogs/grid-dialog.c:152 +msgid "Grid" +msgstr "Rejilla" + #: ../app/dialogs/image-merge-layers-dialog.c:64 msgid "Merge Layers" msgstr "Combinar capas" @@ -8542,7 +9184,7 @@ msgid "Create a New Image" msgstr "Crear una imagen nueva" #: ../app/dialogs/image-new-dialog.c:144 -#: ../app/dialogs/preferences-dialog.c:2034 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "_Template:" msgstr "Plan_tilla:" @@ -8613,6 +9255,10 @@ msgstr "" msgid "Is this what you want to do?" msgstr "¿Es eso lo que quiere hacer?" +#: ../app/dialogs/input-devices-dialog.c:55 +msgid "Configure Input Devices" +msgstr "Configurar los dispositivos de entrada" + #: ../app/dialogs/keyboard-shortcuts-dialog.c:48 msgid "Configure Keyboard Shortcuts" msgstr "Configurar combinaciones de teclas" @@ -8647,12 +9293,12 @@ msgstr "_Nombre de la capa:" #. The size labels #: ../app/dialogs/layer-options-dialog.c:139 -#: ../app/tools/gimpmeasuretool.c:1070 +#: ../app/tools/gimpmeasuretool.c:1074 msgid "Width:" msgstr "Anchura:" #: ../app/dialogs/layer-options-dialog.c:145 -#: ../app/tools/gimpmeasuretool.c:1098 +#: ../app/tools/gimpmeasuretool.c:1102 msgid "Height:" msgstr "Altura:" @@ -8676,31 +9322,31 @@ msgstr "Necesitará reiniciar GIMP para que los cambios tengan efecto." msgid "Module" msgstr "Módulo" -#: ../app/dialogs/module-dialog.c:464 +#: ../app/dialogs/module-dialog.c:465 msgid "Only in memory" msgstr "Sólo en memoria" -#: ../app/dialogs/module-dialog.c:469 +#: ../app/dialogs/module-dialog.c:470 msgid "No longer available" msgstr "Ya no se encuentra disponible" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:494 msgid "Author:" msgstr "Autor:" -#: ../app/dialogs/module-dialog.c:499 +#: ../app/dialogs/module-dialog.c:495 msgid "Version:" msgstr "Versión:" -#: ../app/dialogs/module-dialog.c:500 +#: ../app/dialogs/module-dialog.c:496 msgid "Date:" msgstr "Fecha:" -#: ../app/dialogs/module-dialog.c:501 +#: ../app/dialogs/module-dialog.c:497 msgid "Copyright:" msgstr "Copyright:" -#: ../app/dialogs/module-dialog.c:502 +#: ../app/dialogs/module-dialog.c:498 msgid "Location:" msgstr "Ubicación:" @@ -8771,7 +9417,7 @@ msgstr "Seleccionar origen" # Es Degradado #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1949 +#: ../app/dialogs/preferences-dialog.c:1923 msgid "_Gradient" msgstr "_Degradado" @@ -8830,26 +9476,22 @@ msgstr "Vista previa" msgid "The selected source contains no colors." msgstr "La fuente seleccionada no contiene colores." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Restablecer todas las preferencias" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "" "¿Realmente desea reiniciar todas las preferencias a sus valores " "predeterminados?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:354 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "Necesitará reiniciar GIMP para que los siguientes cambios tengan efecto:" -#: ../app/dialogs/preferences-dialog.c:505 -msgid "Configure Input Devices" -msgstr "Configurar los dispositivos de entrada" - -#: ../app/dialogs/preferences-dialog.c:582 +#: ../app/dialogs/preferences-dialog.c:538 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -8857,17 +9499,17 @@ msgstr "" "Sus combinaciones de teclas se restablecerán a los valores de fábrica la " "próxima vez que inicie GIMP." -#: ../app/dialogs/preferences-dialog.c:593 +#: ../app/dialogs/preferences-dialog.c:549 msgid "Remove all Keyboard Shortcuts" msgstr "Eliminar todas las combinaciones de teclas" -#: ../app/dialogs/preferences-dialog.c:615 +#: ../app/dialogs/preferences-dialog.c:571 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "" "¿Realmente desea eliminar todas las combinaciones de teclas de todos los " "menús?" -#: ../app/dialogs/preferences-dialog.c:656 +#: ../app/dialogs/preferences-dialog.c:612 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -8875,7 +9517,7 @@ msgstr "" "Su configuración de ventanas se restablecerá al valor de fábrica la próxima " "vez que inicie GIMP." -#: ../app/dialogs/preferences-dialog.c:691 +#: ../app/dialogs/preferences-dialog.c:647 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -8883,7 +9525,7 @@ msgstr "" "Su configuración de dispositivos de entrada se restablecerá a los valores de " "fábrica la siguiente vez que inicie GIMP." -#: ../app/dialogs/preferences-dialog.c:726 +#: ../app/dialogs/preferences-dialog.c:682 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -8891,751 +9533,751 @@ msgstr "" "Sus opciones de herramientas se restablecerán a los valores predeterminados " "la próxima vez que inicie GIMP." -#: ../app/dialogs/preferences-dialog.c:1294 +#: ../app/dialogs/preferences-dialog.c:1266 msgid "Show _menubar" msgstr "Mostrar la barra de _menús" -#: ../app/dialogs/preferences-dialog.c:1298 +#: ../app/dialogs/preferences-dialog.c:1270 msgid "Show _rulers" msgstr "Mostrar las _reglas" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1273 msgid "Show scroll_bars" msgstr "Mostrar las _barras de desplazamiento" -#: ../app/dialogs/preferences-dialog.c:1304 +#: ../app/dialogs/preferences-dialog.c:1276 msgid "Show s_tatusbar" msgstr "Mostrar la barra de es_tado" -#: ../app/dialogs/preferences-dialog.c:1312 +#: ../app/dialogs/preferences-dialog.c:1284 msgid "Show s_election" msgstr "Mostrar la s_elección" -#: ../app/dialogs/preferences-dialog.c:1315 +#: ../app/dialogs/preferences-dialog.c:1287 msgid "Show _layer boundary" msgstr "Mostrar el _límite de la capa" -#: ../app/dialogs/preferences-dialog.c:1318 +#: ../app/dialogs/preferences-dialog.c:1290 msgid "Show _guides" msgstr "Mostrar las _guías" -#: ../app/dialogs/preferences-dialog.c:1321 +#: ../app/dialogs/preferences-dialog.c:1293 msgid "Show gri_d" msgstr "Mostrar la _rejilla" -#: ../app/dialogs/preferences-dialog.c:1327 +#: ../app/dialogs/preferences-dialog.c:1299 msgid "Canvas _padding mode:" msgstr "Modo de _relleno del lienzo:" -#: ../app/dialogs/preferences-dialog.c:1332 +#: ../app/dialogs/preferences-dialog.c:1304 msgid "Custom p_adding color:" msgstr "Color de _relleno del lienzo:" -#: ../app/dialogs/preferences-dialog.c:1333 +#: ../app/dialogs/preferences-dialog.c:1305 msgid "Select Custom Canvas Padding Color" msgstr "Establecer el color personalizado de relleno del lienzo" -#: ../app/dialogs/preferences-dialog.c:1422 +#: ../app/dialogs/preferences-dialog.c:1394 msgid "Preferences" msgstr "Preferencias" -#: ../app/dialogs/preferences-dialog.c:1535 -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:1507 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Environment" msgstr "Entorno" -#: ../app/dialogs/preferences-dialog.c:1549 +#: ../app/dialogs/preferences-dialog.c:1521 msgid "Resource Consumption" msgstr "Consumo de recursos" -#: ../app/dialogs/preferences-dialog.c:1559 +#: ../app/dialogs/preferences-dialog.c:1531 msgid "Minimal number of _undo levels:" msgstr "Número mínimo de niveles de _deshacer:" -#: ../app/dialogs/preferences-dialog.c:1562 +#: ../app/dialogs/preferences-dialog.c:1534 msgid "Maximum undo _memory:" msgstr "_Memoria máxima para deshacer:" -#: ../app/dialogs/preferences-dialog.c:1565 +#: ../app/dialogs/preferences-dialog.c:1537 msgid "Tile cache _size:" msgstr "Tamaño del caché de _mosaico:" -#: ../app/dialogs/preferences-dialog.c:1568 +#: ../app/dialogs/preferences-dialog.c:1540 msgid "Maximum _new image size:" msgstr "Tamaño máximo de la imagen _nueva:" -#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1545 msgid "Number of _processors to use:" msgstr "Número de _procesadores que usar:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1578 +#: ../app/dialogs/preferences-dialog.c:1550 msgid "Image Thumbnails" msgstr "Miniaturas de imágenes" -#: ../app/dialogs/preferences-dialog.c:1583 +#: ../app/dialogs/preferences-dialog.c:1555 msgid "Size of _thumbnails:" msgstr "Tamaño de las _miniaturas:" -#: ../app/dialogs/preferences-dialog.c:1587 +#: ../app/dialogs/preferences-dialog.c:1559 msgid "Maximum _filesize for thumbnailing:" msgstr "Tamaño _máximo del archivo para miniaturizar:" #. File Saving -#: ../app/dialogs/preferences-dialog.c:1591 +#: ../app/dialogs/preferences-dialog.c:1563 msgid "Saving Images" msgstr "Guardando imágenes" -#: ../app/dialogs/preferences-dialog.c:1594 +#: ../app/dialogs/preferences-dialog.c:1566 msgid "Confirm closing of unsa_ved images" msgstr "Confirmar el cierre de las _imágenes no guardadas" -#: ../app/dialogs/preferences-dialog.c:1604 +#: ../app/dialogs/preferences-dialog.c:1576 msgid "Keep record of used files in the Recent Documents list" msgstr "" "Mantener un registro de los archivos utilizados en la lista de documentos " "recientes" -#: ../app/dialogs/preferences-dialog.c:1613 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "User Interface" msgstr "Interfaz de usuario" -#: ../app/dialogs/preferences-dialog.c:1616 +#: ../app/dialogs/preferences-dialog.c:1588 msgid "Interface" msgstr "Interfaz" +#: ../app/dialogs/preferences-dialog.c:1598 +msgid "Language" +msgstr "Idioma" + #. Previews -#: ../app/dialogs/preferences-dialog.c:1623 +#: ../app/dialogs/preferences-dialog.c:1604 msgid "Previews" msgstr "Vistas previas" -#: ../app/dialogs/preferences-dialog.c:1626 +#: ../app/dialogs/preferences-dialog.c:1607 msgid "_Enable layer & channel previews" msgstr "_Activar las vistas previas de las capas y los canales" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1613 msgid "_Default layer & channel preview size:" msgstr "Tamaño predeterminado de las vistas previas de _capas y canales:" -#: ../app/dialogs/preferences-dialog.c:1635 +#: ../app/dialogs/preferences-dialog.c:1616 msgid "Na_vigation preview size:" msgstr "Tamaño de vistas previas de _navegación:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1620 msgid "Keyboard Shortcuts" msgstr "Combinaciones de teclas" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "_Use dynamic keyboard shortcuts" msgstr "Usar combinaciones de teclas _dinámicas" -#: ../app/dialogs/preferences-dialog.c:1647 +#: ../app/dialogs/preferences-dialog.c:1628 msgid "Configure _Keyboard Shortcuts..." msgstr "Configurar las combinaciones de _teclas…" -#: ../app/dialogs/preferences-dialog.c:1654 +#: ../app/dialogs/preferences-dialog.c:1635 msgid "_Save keyboard shortcuts on exit" msgstr "_Guardar las combinaciones de teclas al salir" -#: ../app/dialogs/preferences-dialog.c:1658 +#: ../app/dialogs/preferences-dialog.c:1639 msgid "Save Keyboard Shortcuts _Now" msgstr "Guardar las combinaciones de teclas _ahora" -#: ../app/dialogs/preferences-dialog.c:1665 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Restablecer las combinaciones de teclas a los valores predeterminados" -#: ../app/dialogs/preferences-dialog.c:1674 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Remove _All Keyboard Shortcuts" msgstr "Eliminar _todas las combinaciones de teclas" -#: ../app/dialogs/preferences-dialog.c:1686 -#: ../app/dialogs/preferences-dialog.c:1725 +#: ../app/dialogs/preferences-dialog.c:1667 +#: ../app/dialogs/preferences-dialog.c:1706 msgid "Theme" msgstr "Tema" -#: ../app/dialogs/preferences-dialog.c:1695 +#: ../app/dialogs/preferences-dialog.c:1676 msgid "Select Theme" msgstr "Seleccionar un tema" -#: ../app/dialogs/preferences-dialog.c:1777 +#: ../app/dialogs/preferences-dialog.c:1758 msgid "Reload C_urrent Theme" msgstr "Recargar el tema act_ual" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1770 msgid "Help System" msgstr "Sistema de ayuda" #. General -#: ../app/dialogs/preferences-dialog.c:1801 -#: ../app/dialogs/preferences-dialog.c:1895 -#: ../app/dialogs/preferences-dialog.c:2092 +#: ../app/dialogs/preferences-dialog.c:1782 +#: ../app/dialogs/preferences-dialog.c:1866 +#: ../app/dialogs/preferences-dialog.c:2066 #: ../app/widgets/gimpcontrollereditor.c:188 msgid "General" msgstr "General" -#: ../app/dialogs/preferences-dialog.c:1804 +#: ../app/dialogs/preferences-dialog.c:1785 msgid "Show _tooltips" msgstr "Mostrar _consejos" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1788 msgid "Show help _buttons" msgstr "Mostrar _botones de ayuda" -#: ../app/dialogs/preferences-dialog.c:1820 +#: ../app/dialogs/preferences-dialog.c:1801 msgid "Use the online version" msgstr "Usar la versión en línea" -#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1802 msgid "Use a locally installed copy" msgstr "Usar una copia instalada localmente" -#: ../app/dialogs/preferences-dialog.c:1822 +#: ../app/dialogs/preferences-dialog.c:1803 msgid "User manual:" msgstr "Manual del usuario:" -#: ../app/dialogs/preferences-dialog.c:1829 +#: ../app/dialogs/preferences-dialog.c:1810 msgid "There's a local installation of the user manual." msgstr "Existe una instalación local del manual de usuario." -#: ../app/dialogs/preferences-dialog.c:1834 +#: ../app/dialogs/preferences-dialog.c:1815 msgid "The user manual is not installed locally." msgstr "El manual del usuario no está instalado localmente." #. Help Browser -#: ../app/dialogs/preferences-dialog.c:1857 +#: ../app/dialogs/preferences-dialog.c:1838 msgid "Help Browser" msgstr "Visor de ayuda" -#: ../app/dialogs/preferences-dialog.c:1861 +#: ../app/dialogs/preferences-dialog.c:1842 msgid "H_elp browser to use:" msgstr "_Visor de ayuda:" -#: ../app/dialogs/preferences-dialog.c:1866 -msgid "Web Browser" -msgstr "Navegador web" - -#: ../app/dialogs/preferences-dialog.c:1870 -msgid "_Web browser to use:" -msgstr "Navegador _web:" - -#: ../app/dialogs/preferences-dialog.c:1898 +#: ../app/dialogs/preferences-dialog.c:1869 msgid "_Save tool options on exit" msgstr "G_uardar las opciones de herramientas al salir" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1873 msgid "Save Tool Options _Now" msgstr "Guardar las opciones de herramientas _ahora" -#: ../app/dialogs/preferences-dialog.c:1909 +#: ../app/dialogs/preferences-dialog.c:1880 msgid "_Reset Saved Tool Options to Default Values" msgstr "" "R_estaurar las opciones de herramientas guardadas a los valores " "predeterminados" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1919 +#: ../app/dialogs/preferences-dialog.c:1890 msgid "Guide & Grid Snapping" msgstr "Ajuste a la rejilla y la guía" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1895 msgid "_Snap distance:" msgstr "Distancia del a_juste:" -#: ../app/dialogs/preferences-dialog.c:1932 +#: ../app/dialogs/preferences-dialog.c:1903 msgid "Default _interpolation:" msgstr "_Interpolación predeterminada:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1939 +#: ../app/dialogs/preferences-dialog.c:1910 msgid "Paint Options Shared Between Tools" msgstr "Opciones de pintado compartidas entre las herramientas" -#: ../app/dialogs/preferences-dialog.c:1943 +#: ../app/dialogs/preferences-dialog.c:1914 msgid "_Brush" msgstr "_Pincel" -#: ../app/dialogs/preferences-dialog.c:1946 +#: ../app/dialogs/preferences-dialog.c:1917 +msgid "_Dynamics" +msgstr "_Dinámica" + +#: ../app/dialogs/preferences-dialog.c:1920 msgid "_Pattern" msgstr "_Patrón" -#: ../app/dialogs/preferences-dialog.c:1952 +#: ../app/dialogs/preferences-dialog.c:1926 msgid "Move Tool" msgstr "Herramienta mover" -#: ../app/dialogs/preferences-dialog.c:1956 +#: ../app/dialogs/preferences-dialog.c:1930 msgid "Set layer or path as active" msgstr "Definir capa o ruta como activa" -#: ../app/dialogs/preferences-dialog.c:1969 ../app/widgets/gimptoolbox.c:627 -msgid "Toolbox" -msgstr "Caja de herramientas" - #. Appearance -#: ../app/dialogs/preferences-dialog.c:1981 -#: ../app/dialogs/preferences-dialog.c:2165 +#: ../app/dialogs/preferences-dialog.c:1955 +#: ../app/dialogs/preferences-dialog.c:2139 #: ../app/widgets/gimpgrideditor.c:203 msgid "Appearance" msgstr "Apariencia" -#: ../app/dialogs/preferences-dialog.c:1985 +#: ../app/dialogs/preferences-dialog.c:1959 msgid "Show _foreground & background color" msgstr "Mostrar color de _fondo y frente" -#: ../app/dialogs/preferences-dialog.c:1989 +#: ../app/dialogs/preferences-dialog.c:1963 msgid "Show active _brush, pattern & gradient" msgstr "Mostrar _pinceles, patrones y degradados activos" -#: ../app/dialogs/preferences-dialog.c:1993 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "Show active _image" msgstr "Mostrar imagen _activa" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Tools configuration" msgstr "Configuración de las herramientas" -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:1990 msgid "Default New Image" msgstr "Imagen nueva predeterminada" -#: ../app/dialogs/preferences-dialog.c:2019 +#: ../app/dialogs/preferences-dialog.c:1993 msgid "Default Image" msgstr "Imagen predeterminada" -#: ../app/dialogs/preferences-dialog.c:2056 +#: ../app/dialogs/preferences-dialog.c:2030 msgid "Default Image Grid" msgstr "Rejilla de imagen predeterminada" -#: ../app/dialogs/preferences-dialog.c:2059 +#: ../app/dialogs/preferences-dialog.c:2033 msgid "Default Grid" msgstr "Rejilla predeterminada" -#: ../app/dialogs/preferences-dialog.c:2080 +#: ../app/dialogs/preferences-dialog.c:2054 msgid "Image Windows" msgstr "Ventanas de imagen" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Use \"_Dot for dot\" by default" -msgstr "Usar «p_unto por punto» por omisión" +msgstr "Usar «p_unto por punto» de forma predeterminada" -#: ../app/dialogs/preferences-dialog.c:2101 +#: ../app/dialogs/preferences-dialog.c:2075 msgid "Marching _ants speed:" msgstr "Velocid_ad del «desfile de hormigas»:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2105 +#: ../app/dialogs/preferences-dialog.c:2079 msgid "Zoom & Resize Behavior" msgstr "Comportamiento de la redimensión y la ampliación" -#: ../app/dialogs/preferences-dialog.c:2109 +#: ../app/dialogs/preferences-dialog.c:2083 msgid "Resize window on _zoom" msgstr "Redimensionar la ventana al a_mpliar" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2086 msgid "Resize window on image _size change" msgstr "Redimen_sionar la ventana al cambiar el tamaño de la imagen" -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2092 msgid "Fit to window" msgstr "Ajustar a la ventana" -#: ../app/dialogs/preferences-dialog.c:2120 +#: ../app/dialogs/preferences-dialog.c:2094 msgid "Initial zoom _ratio:" msgstr "_Proporción de ampliación inicial:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2098 msgid "Space Bar" msgstr "Barra espaciadora" -#: ../app/dialogs/preferences-dialog.c:2130 +#: ../app/dialogs/preferences-dialog.c:2104 msgid "_While space bar is pressed:" msgstr "_Mientras se pulsa la barra espaciadora:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2134 +#: ../app/dialogs/preferences-dialog.c:2108 msgid "Mouse Pointers" msgstr "Punteros del ratón" -#: ../app/dialogs/preferences-dialog.c:2138 +#: ../app/dialogs/preferences-dialog.c:2112 msgid "Show _brush outline" msgstr "Mostrar el contorno del _pincel" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2115 msgid "Show pointer for paint _tools" msgstr "Mostrar el puntero de las herramientas de _pintura" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2121 msgid "Pointer _mode:" msgstr "_Modo del puntero:" -#: ../app/dialogs/preferences-dialog.c:2150 +#: ../app/dialogs/preferences-dialog.c:2124 msgid "Pointer re_ndering:" msgstr "Re_nderizado del puntero:" -#: ../app/dialogs/preferences-dialog.c:2162 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Image Window Appearance" msgstr "Apariencia de la ventana de la imagen" -#: ../app/dialogs/preferences-dialog.c:2173 +#: ../app/dialogs/preferences-dialog.c:2147 msgid "Default Appearance in Normal Mode" msgstr "Apariencia predeterminada en el modo normal" -#: ../app/dialogs/preferences-dialog.c:2178 +#: ../app/dialogs/preferences-dialog.c:2152 msgid "Default Appearance in Fullscreen Mode" msgstr "Apariencia predeterminada en el modo de pantalla completa" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "Image Title & Statusbar Format" msgstr "Formato del título de imagen y la barra de estado" -#: ../app/dialogs/preferences-dialog.c:2190 +#: ../app/dialogs/preferences-dialog.c:2164 msgid "Title & Status" msgstr "Título y estado" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2182 msgid "Current format" msgstr "Formato actual" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2183 msgid "Default format" msgstr "Formato predeterminado" -#: ../app/dialogs/preferences-dialog.c:2210 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Show zoom percentage" msgstr "Mostrar el porcentaje de ampliación" -#: ../app/dialogs/preferences-dialog.c:2211 +#: ../app/dialogs/preferences-dialog.c:2185 msgid "Show zoom ratio" msgstr "Mostrar la relación de ampliación" -#: ../app/dialogs/preferences-dialog.c:2212 +#: ../app/dialogs/preferences-dialog.c:2186 msgid "Show image size" msgstr "Mostrar el tamaño de imagen" -#: ../app/dialogs/preferences-dialog.c:2225 +#: ../app/dialogs/preferences-dialog.c:2199 msgid "Image Title Format" msgstr "Formato del título de imagen" -#: ../app/dialogs/preferences-dialog.c:2227 +#: ../app/dialogs/preferences-dialog.c:2201 msgid "Image Statusbar Format" msgstr "Formato de la barra de estado de la imagen" -#: ../app/dialogs/preferences-dialog.c:2312 +#: ../app/dialogs/preferences-dialog.c:2286 msgid "Display" msgstr "Pantalla" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2324 +#: ../app/dialogs/preferences-dialog.c:2298 msgid "Transparency" msgstr "Transparencia" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2302 msgid "_Check style:" msgstr "Estilo de la _cuadrícula:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2305 msgid "Check _size:" msgstr "Ta_maño de la cuadrícula:" -#: ../app/dialogs/preferences-dialog.c:2334 +#: ../app/dialogs/preferences-dialog.c:2308 msgid "Monitor Resolution" msgstr "Resolución de monitor" # Debe ir en minúsculas por las reglas de estilo #. Pixels -#: ../app/dialogs/preferences-dialog.c:2338 -#: ../app/display/gimpcursorview.c:202 ../app/widgets/gimpgrideditor.c:268 +#: ../app/dialogs/preferences-dialog.c:2312 +#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:268 #: ../app/widgets/gimpgrideditor.c:300 msgid "Pixels" msgstr "píxeles" -#: ../app/dialogs/preferences-dialog.c:2356 +#: ../app/dialogs/preferences-dialog.c:2330 msgid "Horizontal" msgstr "Horizontal" -#: ../app/dialogs/preferences-dialog.c:2358 +#: ../app/dialogs/preferences-dialog.c:2332 msgid "Vertical" msgstr "Vertical" -#: ../app/dialogs/preferences-dialog.c:2360 -#: ../app/widgets/gimpimagepropview.c:476 +#: ../app/dialogs/preferences-dialog.c:2334 +#: ../app/widgets/gimpimagepropview.c:475 msgid "ppi" msgstr "ppp" -#: ../app/dialogs/preferences-dialog.c:2376 +#: ../app/dialogs/preferences-dialog.c:2350 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Detectar automáticamente (actualmente %d x %d ppp)" -#: ../app/dialogs/preferences-dialog.c:2396 +#: ../app/dialogs/preferences-dialog.c:2370 msgid "_Enter manually" msgstr "Introducir _manualmente" -#: ../app/dialogs/preferences-dialog.c:2411 +#: ../app/dialogs/preferences-dialog.c:2385 msgid "C_alibrate..." msgstr "C_alibrar…" -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2408 msgid "Color Management" msgstr "Gestión del color" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_RGB profile:" msgstr "Perfil _RGB:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2429 msgid "Select RGB Color Profile" msgstr "Seleccionar el perfil de color RGB" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2430 msgid "_CMYK profile:" msgstr "Perfil _CMYK:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2431 msgid "Select CMYK Color Profile" msgstr "Seleccionar el perfil de color CMYK" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2432 msgid "_Monitor profile:" msgstr "Perfil del _monitor:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2433 msgid "Select Monitor Color Profile" msgstr "Seleccionar el perfil de color del monitor" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2434 msgid "_Print simulation profile:" msgstr "Perfil de simulación de _impresión:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2435 msgid "Select Printer Color Profile" msgstr "Seleccionar el perfil de color de la impresora" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2446 msgid "_Mode of operation:" msgstr "_Modo de operación:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2476 msgid "_Try to use the system monitor profile" msgstr "In_tentar utilizar el perfil de monitor del sistema" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2486 msgid "_Display rendering intent:" msgstr "Prueba de renderizado en _pantalla:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Softproof rendering intent:" msgstr "_Pseudoprueba de renderizado:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2508 msgid "Mark out of gamut colors" msgstr "Marcar a partir de los colores del gamut" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2513 msgid "Select Warning Color" msgstr "Seleccionar el color de las advertencias" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2526 msgid "File Open behaviour:" msgstr "Comportamiento de apertura de archivos:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2538 msgid "Input Devices" msgstr "Dispositivos de entrada" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2548 msgid "Extended Input Devices" msgstr "Dispositivos de entrada extendidos" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2552 msgid "Configure E_xtended Input Devices..." msgstr "Configurar los dispositivos de entrada e_xtendidos…" -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2559 msgid "_Save input device settings on exit" msgstr "Guardar la configuración del dispositivo de entrada al _salir" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2563 msgid "Save Input Device Settings _Now" msgstr "Guardar la configuración del dispositivo de entrada _ahora" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2570 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "" "_Restablecer la configuración guardada del dispositivo de entrada a los " -"valores de fábrica" +"valores predeterminados" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2585 msgid "Additional Input Controllers" msgstr "Controles adicionales de entrada" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2588 msgid "Input Controllers" msgstr "Controladores de entrada" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2604 msgid "Window Management" msgstr "Gestión de la ventana" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2613 msgid "Window Manager Hints" msgstr "Hints del gestor de ventanas" -#: ../app/dialogs/preferences-dialog.c:2645 -msgid "Hint for the _toolbox:" -msgstr "Hint para la caja de herramien_tas:" +#: ../app/dialogs/preferences-dialog.c:2619 +msgid "Hint for _docks and toolbox:" +msgstr "Pista para los emprotables y la caja de herramien_tas:" -#: ../app/dialogs/preferences-dialog.c:2649 -msgid "Hint for other _docks:" -msgstr "Hint para otros e_mpotrables:" - -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "Focus" msgstr "Foco" -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Activate the _focused image" msgstr "Activar la imagen con el _foco" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2660 +#: ../app/dialogs/preferences-dialog.c:2630 msgid "Window Positions" msgstr "Posiciones de las ventanas" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Save window positions on exit" msgstr "G_uardar posiciones de ventanas al salir" -#: ../app/dialogs/preferences-dialog.c:2667 +#: ../app/dialogs/preferences-dialog.c:2637 msgid "Save Window Positions _Now" msgstr "Guardar las posiciones de las ventanas _ahora" -#: ../app/dialogs/preferences-dialog.c:2674 +#: ../app/dialogs/preferences-dialog.c:2644 msgid "_Reset Saved Window Positions to Default Values" msgstr "" "R_estaurar las posiciones de ventana guardadas a los valores predeterminados" -#: ../app/dialogs/preferences-dialog.c:2689 +#: ../app/dialogs/preferences-dialog.c:2659 msgid "Folders" msgstr "Carpetas" -#: ../app/dialogs/preferences-dialog.c:2709 +#: ../app/dialogs/preferences-dialog.c:2679 msgid "Temporary folder:" msgstr "Carpeta temporal:" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2680 msgid "Select Folder for Temporary Files" msgstr "Seleccione la carpeta para los archivos temporales" -#: ../app/dialogs/preferences-dialog.c:2714 +#: ../app/dialogs/preferences-dialog.c:2684 msgid "Swap folder:" msgstr "Carpeta de intercambio:" -#: ../app/dialogs/preferences-dialog.c:2715 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Select Swap Folder" msgstr "Seleccionar la carpeta de intercambio" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2720 msgid "Brush Folders" msgstr "Carpetas de pinceles" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Select Brush Folders" msgstr "Seleccionar la carpeta de pinceles" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2724 +msgid "Dynamics Folders" +msgstr "Carpetas de dinámicas" + +#: ../app/dialogs/preferences-dialog.c:2726 +msgid "Select Dynamics Folders" +msgstr "Selecciona las carpetas de dinámicas" + +#: ../app/dialogs/preferences-dialog.c:2728 msgid "Pattern Folders" msgstr "Carpetas de patrones" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2730 msgid "Select Pattern Folders" msgstr "Seleccionar la carpeta de patrones" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2732 msgid "Palette Folders" msgstr "Carpetas de paletas" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2734 msgid "Select Palette Folders" msgstr "Seleccionar las carpetas de paletas" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2736 msgid "Gradient Folders" msgstr "Carpetas de degradados" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2738 msgid "Select Gradient Folders" msgstr "Seleccionar las carpetas de degradados" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2740 msgid "Font Folders" msgstr "Carpetas de tipografías" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Select Font Folders" msgstr "Seleccionar las carpetas de tipografías" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2744 msgid "Plug-In Folders" msgstr "Carpetas de complementos" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2746 msgid "Select Plug-In Folders" msgstr "Seleccionar las carpetas de complementos" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Scripts" msgstr "Guiones" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Script-Fu Folders" msgstr "Carpetas de scripts-fu" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2750 msgid "Select Script-Fu Folders" msgstr "Seleccionar la carpeta de script-fu" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2752 msgid "Module Folders" msgstr "Carpetas de módulos" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Select Module Folders" msgstr "Seleccionar las carpetas de módulos" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Interpreters" msgstr "Intérpretes" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Interpreter Folders" msgstr "Carpetas del intérprete" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2758 msgid "Select Interpreter Folders" msgstr "Seleccionar las carpetas de los intérpretes" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Environment Folders" msgstr "Carpetas de entorno" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2762 msgid "Select Environment Folders" msgstr "Seleccionar las carpetas de entorno" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2764 msgid "Themes" msgstr "Temas" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2764 msgid "Theme Folders" msgstr "Carpetas de temas" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "Select Theme Folders" msgstr "Seleccionar las carpetas de temas" @@ -9671,30 +10313,30 @@ msgstr "Resolución _Y:" msgid "pixels/%a" msgstr "píxeles/%a" -#: ../app/dialogs/quit-dialog.c:103 +#: ../app/dialogs/quit-dialog.c:104 msgid "Quit GIMP" msgstr "Salir de GIMP" -#: ../app/dialogs/quit-dialog.c:103 +#: ../app/dialogs/quit-dialog.c:104 msgid "Close All Images" msgstr "Cerrar todas las imágenes" -#: ../app/dialogs/quit-dialog.c:162 +#: ../app/dialogs/quit-dialog.c:163 msgid "If you quit GIMP now, these changes will be lost." msgstr "Si sale de GIMP ahora, estos cambios se perderán." -#: ../app/dialogs/quit-dialog.c:165 +#: ../app/dialogs/quit-dialog.c:166 msgid "If you close these images now, changes will be lost." msgstr "Si cierra ahora estas imágenes, se perderán los cambios." -#: ../app/dialogs/quit-dialog.c:212 +#: ../app/dialogs/quit-dialog.c:213 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "Hay una imagen con cambios no guardados:" msgstr[1] "Hay %d imágenes con cambios no guardados:" -#: ../app/dialogs/quit-dialog.c:234 +#: ../app/dialogs/quit-dialog.c:235 msgid "_Discard Changes" msgstr "_Descartar cambios" @@ -9857,159 +10499,91 @@ msgstr "_Escalar las rutas importadas para ajustar la imagen" msgid "Path name:" msgstr "Nombre de la ruta:" -#: ../app/display/display-enums.c:24 -msgctxt "cursor-mode" -msgid "Tool icon" -msgstr "Icono de herramienta" - -#: ../app/display/display-enums.c:25 -msgctxt "cursor-mode" -msgid "Tool icon with crosshair" -msgstr "Icono de herramienta con cruz" - -#: ../app/display/display-enums.c:26 -msgctxt "cursor-mode" -msgid "Crosshair only" -msgstr "Sólo cruz" - -#: ../app/display/display-enums.c:87 -msgctxt "canvas-padding-mode" -msgid "From theme" -msgstr "Del tema" - -#: ../app/display/display-enums.c:88 -msgctxt "canvas-padding-mode" -msgid "Light check color" -msgstr "Color de los cuadros claros" - -#: ../app/display/display-enums.c:89 -msgctxt "canvas-padding-mode" -msgid "Dark check color" -msgstr "Color de los cuadros oscuros" - -#: ../app/display/display-enums.c:90 -msgctxt "canvas-padding-mode" -msgid "Custom color" -msgstr "Color personalizado" - -#: ../app/display/display-enums.c:119 -msgctxt "space-bar-action" -msgid "No action" -msgstr "Sin acción" - -#: ../app/display/display-enums.c:120 -msgctxt "space-bar-action" -msgid "Pan view" -msgstr "Vista panorámica" - -#: ../app/display/display-enums.c:121 -msgctxt "space-bar-action" -msgid "Switch to Move tool" -msgstr "Cambiar a la herramienta Mover" - -#: ../app/display/display-enums.c:149 -msgctxt "zoom-quality" -msgid "Low" -msgstr "Baja" - -#: ../app/display/display-enums.c:150 -msgctxt "zoom-quality" -msgid "High" -msgstr "Alta" - -#: ../app/display/gimpcursorview.c:212 ../app/display/gimpcursorview.c:218 -#: ../app/display/gimpcursorview.c:237 ../app/display/gimpcursorview.c:243 -#: ../app/display/gimpcursorview.c:262 ../app/display/gimpcursorview.c:268 -#: ../app/display/gimpcursorview.c:284 ../app/display/gimpcursorview.c:291 -#: ../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:623 +#: ../app/display/gimpcursorview.c:210 ../app/display/gimpcursorview.c:216 +#: ../app/display/gimpcursorview.c:235 ../app/display/gimpcursorview.c:241 +#: ../app/display/gimpcursorview.c:260 ../app/display/gimpcursorview.c:266 +#: ../app/display/gimpcursorview.c:282 ../app/display/gimpcursorview.c:289 +#: ../app/display/gimpcursorview.c:664 ../app/display/gimpcursorview.c:665 +#: ../app/display/gimpcursorview.c:666 ../app/display/gimpcursorview.c:667 +#: ../app/display/gimpcursorview.c:780 ../app/display/gimpcursorview.c:781 +#: ../app/display/gimpcursorview.c:782 ../app/display/gimpcursorview.c:783 +#: ../app/widgets/gimpcolorframe.c:630 msgid "n/a" msgstr "n/d" -#: ../app/display/gimpcursorview.c:215 ../app/display/gimpcursorview.c:240 -#: ../app/display/gimpcursorview.c:265 +#: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238 +#: ../app/display/gimpcursorview.c:263 +#: ../app/widgets/gimpdeviceinfoeditor.c:140 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 -#: ../app/display/gimpcursorview.c:271 +#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 +#: ../app/display/gimpcursorview.c:269 +#: ../app/widgets/gimpdeviceinfoeditor.c:141 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:227 +#: ../app/display/gimpcursorview.c:225 msgid "Units" msgstr "Unidades" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:250 msgid "Selection Bounding Box" msgstr "Caja circundante de la selección" #. Width -#: ../app/display/gimpcursorview.c:288 +#: ../app/display/gimpcursorview.c:286 msgid "W" msgstr "An" #. Height -#: ../app/display/gimpcursorview.c:295 +#: ../app/display/gimpcursorview.c:293 msgid "H" msgstr "Al" -#: ../app/display/gimpcursorview.c:322 +#: ../app/display/gimpcursorview.c:320 msgid "_Sample Merged" msgstr "_Muestra combinada" -#: ../app/display/gimpdisplay-handlers.c:169 -#, c-format -msgid "Image saved to '%s'" -msgstr "Imagen guardada en «%s»" - -#: ../app/display/gimpdisplay-handlers.c:183 -#, c-format -msgid "Image exported to '%s'" -msgstr "Imagen exportada en «%s»" - -#: ../app/display/gimpdisplayshell.c:1119 +#: ../app/display/gimpdisplayshell.c:502 msgid "Access the image menu" msgstr "Ir al menú de imagen" -#: ../app/display/gimpdisplayshell.c:1224 +#: ../app/display/gimpdisplayshell.c:616 msgid "Zoom image when window size changes" msgstr "Ampliar imagen cuando cambia el tamaño de ventana" -#: ../app/display/gimpdisplayshell.c:1253 +#: ../app/display/gimpdisplayshell.c:645 msgid "Toggle Quick Mask" msgstr "Activar máscara rápida" -#: ../app/display/gimpdisplayshell.c:1274 +#: ../app/display/gimpdisplayshell.c:668 msgid "Navigate the image display" msgstr "Navegar por la imagen" -#: ../app/display/gimpdisplayshell.c:1369 -#: ../app/display/gimpdisplayshell.c:1459 ../app/widgets/gimptoolbox.c:220 +#: ../app/display/gimpdisplayshell.c:736 +#: ../app/display/gimpdisplayshell.c:1315 ../app/widgets/gimptoolbox.c:315 msgid "Drop image files here to open them" msgstr "Arrastre hasta aquí los archivos de imagen para abrirlos" -#: ../app/display/gimpdisplayshell-close.c:146 -#: ../app/display/gimpdisplayshell-close.c:216 +#: ../app/display/gimpdisplayshell-close.c:153 +#: ../app/display/gimpdisplayshell-close.c:223 #, c-format msgid "Close %s" msgstr "Cerrar %s" -#: ../app/display/gimpdisplayshell-close.c:157 +#: ../app/display/gimpdisplayshell-close.c:164 msgid "Close _without Saving" msgstr "Cerrar si_n guardar" -#: ../app/display/gimpdisplayshell-close.c:224 +#: ../app/display/gimpdisplayshell-close.c:231 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "¿Desea guardar los cambios a la imagen «%s» antes de cerrar?" -#: ../app/display/gimpdisplayshell-close.c:246 +#: ../app/display/gimpdisplayshell-close.c:254 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10019,7 +10593,7 @@ msgstr[0] "" msgstr[1] "" "Si no guarda la imagen, los cambios desde las últimas %d horas se perderán." -#: ../app/display/gimpdisplayshell-close.c:256 +#: ../app/display/gimpdisplayshell-close.c:264 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10034,7 +10608,7 @@ msgstr[1] "" "Si no guarda la imagen, los cambios desde la última hora y %d minutos se " "perderán." -#: ../app/display/gimpdisplayshell-close.c:267 +#: ../app/display/gimpdisplayshell-close.c:275 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10044,110 +10618,135 @@ msgstr[0] "" msgstr[1] "" "Si no guarda la imagen, los cambios desde los últimos %d minutos se perderán." -#: ../app/display/gimpdisplayshell-dnd.c:255 -#: ../app/display/gimpdisplayshell-dnd.c:592 -#: ../app/display/gimpdisplayshell-dnd.c:664 +#: ../app/display/gimpdisplayshell-dnd.c:232 +#: ../app/display/gimpdisplayshell-dnd.c:602 +#: ../app/display/gimpdisplayshell-dnd.c:667 msgid "Drop New Layer" msgstr "Soltar la capa nueva" -#: ../app/display/gimpdisplayshell-dnd.c:302 +#: ../app/display/gimpdisplayshell-dnd.c:275 msgid "Drop New Path" msgstr "Borrar la ruta nueva" -#: ../app/display/gimpdisplayshell-dnd.c:502 -#: ../app/widgets/gimplayertreeview.c:757 +#: ../app/display/gimpdisplayshell-dnd.c:347 +#: ../app/display/gimpdisplayshell-dnd.c:442 ../app/tools/gimpblendtool.c:174 +#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:279 +msgid "Cannot modify the pixels of layer groups." +msgstr "No se pueden modificar píxeles de los grupos de capas." + +#: ../app/display/gimpdisplayshell-dnd.c:355 +#: ../app/display/gimpdisplayshell-dnd.c:450 ../app/tools/gimpblendtool.c:181 +#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:335 +#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:286 +#: ../app/tools/gimptransformtool.c:349 ../app/tools/gimptransformtool.c:1193 +msgid "The active layer's pixels are locked." +msgstr "Los píxeles de la capa activa están bloqueados." + +#: ../app/display/gimpdisplayshell-dnd.c:512 +#: ../app/widgets/gimplayertreeview.c:734 msgid "Drop layers" msgstr "Descartar las capas" -#: ../app/display/gimpdisplayshell-dnd.c:654 -#: ../app/widgets/gimplayertreeview.c:834 ../app/widgets/gimptoolbox-dnd.c:361 +#: ../app/display/gimpdisplayshell-dnd.c:635 +#: ../app/display/gimpdisplayshell-dnd.c:657 +#: ../app/widgets/gimplayertreeview.c:811 ../app/widgets/gimptoolbox-dnd.c:274 msgid "Dropped Buffer" msgstr "Búfer descartado" -#: ../app/display/gimpdisplayshell-filter-dialog.c:75 +#: ../app/display/gimpdisplayshell-filter-dialog.c:78 msgid "Color Display Filters" msgstr "Filtros de pantalla de color" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:81 msgid "Configure Color Display Filters" msgstr "Configuración de los filtros de colores de la pantalla" +#: ../app/display/gimpdisplayshell-handlers.c:587 +#, c-format +msgid "Image saved to '%s'" +msgstr "Imagen guardada en «%s»" + +#: ../app/display/gimpdisplayshell-handlers.c:601 +#, c-format +msgid "Image exported to '%s'" +msgstr "Imagen exportada en «%s»" + #: ../app/display/gimpdisplayshell-layer-select.c:120 msgid "Layer Select" msgstr "Selección de capas" -#: ../app/display/gimpdisplayshell-scale-dialog.c:113 +#: ../app/display/gimpdisplayshell-scale-dialog.c:114 msgid "Zoom Ratio" msgstr "Relación de aumento" -#: ../app/display/gimpdisplayshell-scale-dialog.c:115 +#: ../app/display/gimpdisplayshell-scale-dialog.c:116 msgid "Select Zoom Ratio" msgstr "Seleccione la relación de aumento" -#: ../app/display/gimpdisplayshell-scale-dialog.c:158 +#: ../app/display/gimpdisplayshell-scale-dialog.c:161 msgid "Zoom ratio:" msgstr "Relación de aumento:" -#: ../app/display/gimpdisplayshell-scale-dialog.c:183 +#: ../app/display/gimpdisplayshell-scale-dialog.c:186 msgid "Zoom:" msgstr "Aumento:" -#: ../app/display/gimpdisplayshell-title.c:284 +#: ../app/display/gimpdisplayshell-title.c:303 msgid "(modified)" msgstr "(modificada)" -#: ../app/display/gimpdisplayshell-title.c:289 +#: ../app/display/gimpdisplayshell-title.c:308 msgid "(clean)" msgstr "(limpia)" -#: ../app/display/gimpdisplayshell-title.c:337 -#: ../app/display/gimpdisplayshell-title.c:350 -#: ../app/widgets/gimpactiongroup.c:825 +#: ../app/display/gimpdisplayshell-title.c:356 +#: ../app/display/gimpdisplayshell-title.c:369 +#: ../app/widgets/gimpactiongroup.c:870 msgid "(none)" msgstr "(ninguna)" -#: ../app/display/gimpdisplayshell-title.c:483 +#: ../app/display/gimpdisplayshell-title.c:500 msgid " (exported)" msgstr " (exportada)" -#: ../app/display/gimpdisplayshell-title.c:485 +#: ../app/display/gimpdisplayshell-title.c:502 msgid " (overwritten)" msgstr " (sobreescrita)" -#: ../app/display/gimpdisplayshell-title.c:491 +#: ../app/display/gimpdisplayshell-title.c:508 msgid " (imported)" msgstr " (importada)" -#: ../app/display/gimpstatusbar.c:346 +#: ../app/display/gimpstatusbar.c:361 #, c-format msgid "Cancel %s" msgstr "Cancelar %s" -#: ../app/file/file-open.c:133 ../app/file/file-save.c:112 +#: ../app/file/file-open.c:136 ../app/file/file-save.c:112 msgid "Not a regular file" msgstr "No es un archivo regular" -#: ../app/file/file-open.c:185 +#: ../app/file/file-open.c:188 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "" "El complemento %s finalizó correctamente pero no ha devuelto una imagen" -#: ../app/file/file-open.c:196 +#: ../app/file/file-open.c:199 #, c-format msgid "%s plug-In could not open image" msgstr "El complemento %s no ha podido abrir la imagen" -#: ../app/file/file-open.c:513 +#: ../app/file/file-open.c:518 msgid "Image doesn't contain any layers" msgstr "La imagen no contiene ninguna capa" -#: ../app/file/file-open.c:566 +#: ../app/file/file-open.c:571 #, c-format msgid "Opening '%s' failed: %s" msgstr "La apertura de «%s» ha fallado: %s" -#: ../app/file/file-open.c:675 +#: ../app/file/file-open.c:678 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10186,48 +10785,53 @@ msgid "not a GIMP Levels file" msgstr "no es un archivo de niveles GIMP" #. initialize the document history -#: ../app/gui/gui.c:426 +#: ../app/gui/gui.c:427 msgid "Documents" msgstr "Documentos" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:114 msgid "GIMP Startup" msgstr "Inicio de GIMP" -#: ../app/paint/gimpairbrush.c:70 ../app/tools/gimpairbrushtool.c:53 +#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:53 msgid "Airbrush" msgstr "Aerógrafo" -#: ../app/paint/gimpbrushcore.c:370 +#: ../app/paint/gimpbrushcore.c:435 msgid "No brushes available for use with this tool." msgstr "No hay pinceles disponibles para usar con esta herramienta." -#: ../app/paint/gimpclone.c:100 ../app/tools/gimpclonetool.c:60 +#: ../app/paint/gimpbrushcore.c:442 +msgid "No paint dynamics available for use with this tool." +msgstr "" +"No hay dinámicas de pintura disponibles para su uso con esta herramienta." + +#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60 msgid "Clone" msgstr "Clonar" -#: ../app/paint/gimpclone.c:141 +#: ../app/paint/gimpclone.c:143 msgid "No patterns available for use with this tool." msgstr "No hay patrones disponibles para usar con esta herramienta." -#: ../app/paint/gimpconvolve.c:78 +#: ../app/paint/gimpconvolve.c:80 msgid "Convolve" msgstr "Convolución" # //R ???? -#: ../app/paint/gimpdodgeburn.c:89 +#: ../app/paint/gimpdodgeburn.c:91 msgid "Dodge/Burn" msgstr "blanquear/ennegrecer" -#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65 +#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65 msgid "Eraser" msgstr "Goma de borrar" -#: ../app/paint/gimpheal.c:116 ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:118 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "Sanear" -#: ../app/paint/gimpheal.c:155 +#: ../app/paint/gimpheal.c:157 msgid "Healing does not operate on indexed layers." msgstr "El saneado no funciona en capas indexadas." @@ -10247,7 +10851,7 @@ msgstr "Proporción de aspecto de la gota de tinta" msgid "Ink Blob Angle" msgstr "Ángulo de la gota de tinta" -#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:50 +#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:50 msgid "Paintbrush" msgstr "Pincel" @@ -10259,7 +10863,7 @@ msgstr "No hay suficientes puntos para trazar" msgid "Paint" msgstr "Pintar" -#: ../app/paint/gimppaintoptions.c:245 +#: ../app/paint/gimppaintoptions.c:138 msgid "Brush Scale" msgstr "Escala del pincel" @@ -10276,11 +10880,11 @@ msgstr "Clonar con perspectiva" msgid "Perspective Clone does not operate on indexed layers." msgstr "La clonación de perspectiva no funciona sobre capas indexadas." -#: ../app/paint/gimpsmudge.c:81 ../app/tools/gimpsmudgetool.c:52 +#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:52 msgid "Smudge" msgstr "Borronear" -#: ../app/paint/gimpsourcecore.c:230 +#: ../app/paint/gimpsourcecore.c:232 msgid "Set a source image first." msgstr "Establezca una imagen de origen primero." @@ -10328,7 +10932,7 @@ msgstr "Enfoque" msgid "Combine Masks" msgstr "Combinar máscaras" -#: ../app/pdb/drawable-cmds.c:884 +#: ../app/pdb/drawable-cmds.c:885 msgid "Plug-In" msgstr "Complemento" @@ -10355,7 +10959,7 @@ msgstr "Transformación 2D" msgid "2D Transforming" msgstr "Aplicando transformación 2D" -#: ../app/pdb/edit-cmds.c:714 ../app/tools/gimpblendtool.c:228 +#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:243 msgid "Blending" msgstr "Mezclando" @@ -10381,123 +10985,150 @@ msgstr "" msgid "Procedure '%s' not found" msgstr "No se encuentra el procedimiento «%s»" -#: ../app/pdb/gimppdb-utils.c:58 +#: ../app/pdb/gimppdb-utils.c:73 msgid "Invalid empty brush name" msgstr "Nombre vacío del pincel no válido" -#: ../app/pdb/gimppdb-utils.c:68 +#: ../app/pdb/gimppdb-utils.c:82 #, c-format msgid "Brush '%s' not found" msgstr "No se encuentra el pincel «%s»" -#: ../app/pdb/gimppdb-utils.c:73 +#: ../app/pdb/gimppdb-utils.c:87 #, c-format msgid "Brush '%s' is not editable" msgstr "El pincel «%s» no es editable" -#: ../app/pdb/gimppdb-utils.c:99 +#: ../app/pdb/gimppdb-utils.c:113 #, c-format msgid "Brush '%s' is not a generated brush" msgstr "El pincel «%s» no es un pincel generado" -#: ../app/pdb/gimppdb-utils.c:119 +#: ../app/pdb/gimppdb-utils.c:133 msgid "Invalid empty pattern name" msgstr "Nombre vacío del patrón no válido" -#: ../app/pdb/gimppdb-utils.c:129 +#: ../app/pdb/gimppdb-utils.c:142 #, c-format msgid "Pattern '%s' not found" msgstr "No se encuentra el patrón «%s»" -#: ../app/pdb/gimppdb-utils.c:149 +#: ../app/pdb/gimppdb-utils.c:162 msgid "Invalid empty gradient name" msgstr "Nombre vacío del degradado no válido" -#: ../app/pdb/gimppdb-utils.c:159 +#: ../app/pdb/gimppdb-utils.c:171 #, c-format msgid "Gradient '%s' not found" msgstr "No se encuentra el degradado «%s»" -#: ../app/pdb/gimppdb-utils.c:164 +#: ../app/pdb/gimppdb-utils.c:176 #, c-format msgid "Gradient '%s' is not editable" msgstr "El degradado «%s» no es editable" -#: ../app/pdb/gimppdb-utils.c:185 +#: ../app/pdb/gimppdb-utils.c:197 msgid "Invalid empty palette name" msgstr "Nombre vacío de paleta no válido" -#: ../app/pdb/gimppdb-utils.c:195 +#: ../app/pdb/gimppdb-utils.c:206 #, c-format msgid "Palette '%s' not found" msgstr "No se encuentra la paleta «%s»" -#: ../app/pdb/gimppdb-utils.c:200 +#: ../app/pdb/gimppdb-utils.c:211 #, c-format msgid "Palette '%s' is not editable" msgstr "La paleta «%s» no es editable" -#: ../app/pdb/gimppdb-utils.c:220 +#: ../app/pdb/gimppdb-utils.c:231 msgid "Invalid empty font name" msgstr "Nombre vacío de tipografía no válido" -#: ../app/pdb/gimppdb-utils.c:230 +#: ../app/pdb/gimppdb-utils.c:241 #, c-format msgid "Font '%s' not found" msgstr "No se encuentra la tipografía «%s»" -#: ../app/pdb/gimppdb-utils.c:249 +#: ../app/pdb/gimppdb-utils.c:260 msgid "Invalid empty buffer name" msgstr "Nombre vacío de búfer no válido" -#: ../app/pdb/gimppdb-utils.c:259 +#: ../app/pdb/gimppdb-utils.c:270 #, c-format msgid "Named buffer '%s' not found" msgstr "No se encuentra el búfer con nombre «%s»" -#: ../app/pdb/gimppdb-utils.c:278 +#: ../app/pdb/gimppdb-utils.c:289 msgid "Invalid empty paint method name" msgstr "Nombre vacío de método de pintura no válido" -#: ../app/pdb/gimppdb-utils.c:288 +#: ../app/pdb/gimppdb-utils.c:299 #, c-format msgid "Paint method '%s' does not exist" msgstr "No existe el método de pintura «%s»" -#: ../app/pdb/gimppdb-utils.c:304 +#: ../app/pdb/gimppdb-utils.c:318 #, c-format msgid "" "Item '%s' (%d) can not be used because it has not been added to an image" msgstr "" -"El elemento «%s» (%d) no se puede usar porque no se ha añadido a una imagen" +"No se puede usar el elemento «%s» (%d) porque no se ha añadido a una imagen" -#: ../app/pdb/gimppdb-utils.c:326 +#: ../app/pdb/gimppdb-utils.c:328 +#, c-format +msgid "Item '%s' (%d) can not be used because it is attached to another image" +msgstr "" +"No se puede usar el elemento «%s» (%d) porque está asignado a otra imagen" + +#: ../app/pdb/gimppdb-utils.c:357 +#, c-format +msgid "" +"Item '%s' (%d) can not be used because it is not a direct child of an item " +"tree" +msgstr "" +"No se puede usar el elemento «%s» (%d) porque no es un descendiente directo " +"de un árbol de elementos" + +#: ../app/pdb/gimppdb-utils.c:379 #, c-format msgid "Item '%s' (%d) has already been added to an image" msgstr "El elemento «%s» (%d) ya se ha añadido a una imagen" -#: ../app/pdb/gimppdb-utils.c:334 +#: ../app/pdb/gimppdb-utils.c:387 #, c-format msgid "Trying to add item '%s' (%d) to wrong image" msgstr "Intentando añadir el elemento «%s» (%d) a la imagen equivocada" -#: ../app/pdb/gimppdb-utils.c:353 +#: ../app/pdb/gimppdb-utils.c:406 +#, c-format +msgid "Item '%s' (%d) cannot be modified because its contents are locked" +msgstr "" +"No se puede modificar el elemento «%s» (%d) porque su contenido está bloqueado" + +#: ../app/pdb/gimppdb-utils.c:426 +#, c-format +msgid "Item '%s' (%d) cannot be modified because it is a group item" +msgstr "" +"No se puede modificar el elemento «%s» (%d) porque es un elemento de grupo" + +#: ../app/pdb/gimppdb-utils.c:447 #, c-format msgid "Layer '%s' (%d) can not be used because it is not a text layer" -msgstr "La capa «%s» (%d) no se puede usar porque no es una capa de texto" +msgstr "No se puede usar la capa «%s» (%d) porque no es una capa de texto" -#: ../app/pdb/gimppdb-utils.c:394 +#: ../app/pdb/gimppdb-utils.c:488 #, c-format msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" msgstr "" "La imagen «%s» (%d) es del tipo «%s», pero se esperaba una imagen del tipo «%s»" -#: ../app/pdb/gimppdb-utils.c:417 +#: ../app/pdb/gimppdb-utils.c:511 #, c-format msgid "Image '%s' (%d) is already of type '%s'" msgstr "La imagen «%s» (%d) ya es del tipo «%s»" -#: ../app/pdb/gimppdb-utils.c:440 +#: ../app/pdb/gimppdb-utils.c:539 #, c-format msgid "Vectors object %d does not contain stroke with ID %d" msgstr "El objeto de vectores %d no contiene un trazo con el ID %d" @@ -10592,12 +11223,16 @@ msgstr "" "El procedimiento «%s» se ha llamado con un valor «%s» para el argumento «%s» (#%" "d, tipo %s). Este valor está fuera de los límites." -#: ../app/pdb/image-cmds.c:2297 +#: ../app/pdb/image-cmds.c:2484 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "" "La resolución de la Imagen se sale de los límites; usando la resolución " -"predefinida en su lugar." +"predeterminada en su lugar." + +#: ../app/pdb/layer-cmds.c:443 ../app/pdb/layer-cmds.c:481 +msgid "Move Layer" +msgstr "Mover la capa" #: ../app/pdb/selection-tools-cmds.c:217 ../app/tools/gimpfreeselecttool.c:198 msgid "Free Select" @@ -10608,17 +11243,51 @@ msgstr "Selección libre" msgid "Failed to create text layer" msgstr "No se ha podido crear la capa de texto" -#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:234 -#: ../app/pdb/text-layer-cmds.c:313 ../app/pdb/text-layer-cmds.c:386 -#: ../app/pdb/text-layer-cmds.c:458 ../app/pdb/text-layer-cmds.c:530 -#: ../app/pdb/text-layer-cmds.c:602 ../app/pdb/text-layer-cmds.c:674 -#: ../app/pdb/text-layer-cmds.c:746 ../app/pdb/text-layer-cmds.c:816 -#: ../app/pdb/text-layer-cmds.c:888 ../app/pdb/text-layer-cmds.c:960 -#: ../app/pdb/text-layer-cmds.c:1032 ../app/pdb/text-layer-cmds.c:1068 -#: ../app/pdb/text-layer-cmds.c:1147 +#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:272 +#: ../app/pdb/text-layer-cmds.c:351 ../app/pdb/text-layer-cmds.c:424 +#: ../app/pdb/text-layer-cmds.c:496 ../app/pdb/text-layer-cmds.c:568 +#: ../app/pdb/text-layer-cmds.c:640 ../app/pdb/text-layer-cmds.c:712 +#: ../app/pdb/text-layer-cmds.c:784 ../app/pdb/text-layer-cmds.c:854 +#: ../app/pdb/text-layer-cmds.c:926 ../app/pdb/text-layer-cmds.c:998 +#: ../app/pdb/text-layer-cmds.c:1070 ../app/pdb/text-layer-cmds.c:1106 +#: ../app/pdb/text-layer-cmds.c:1185 msgid "Set text layer attribute" msgstr "Establecer el atributo de la capa de texto" +#: ../app/pdb/vectors-cmds.c:587 +msgid "Remove path stroke" +msgstr "Eliminar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:623 +msgid "Close path stroke" +msgstr "Cerrar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:663 +msgid "Translate path stroke" +msgstr "Trasladar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:703 +msgid "Scale path stroke" +msgstr "Escalar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:745 +msgid "Rotate path stroke" +msgstr "Rotar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:785 ../app/pdb/vectors-cmds.c:829 +msgid "Flip path stroke" +msgstr "Voltear trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:958 ../app/pdb/vectors-cmds.c:1080 +#: ../app/pdb/vectors-cmds.c:1299 +msgid "Add path stroke" +msgstr "Añadir un trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:1132 ../app/pdb/vectors-cmds.c:1185 +#: ../app/pdb/vectors-cmds.c:1246 +msgid "Extend path stroke" +msgstr "Extender trazado de ruta" + #: ../app/plug-in/gimpenvirontable.c:281 #, c-format msgid "Empty variable name in environment file %s" @@ -10639,7 +11308,7 @@ msgstr "Intérprete erróneo referenciado en el archivo del intérprete %s: %s" msgid "Bad binary format string in interpreter file %s" msgstr "Cadena de formato binario errónea en el archivo del intérprete %s" -#: ../app/plug-in/gimpplugin-message.c:422 +#: ../app/plug-in/gimpplugin-message.c:450 #, c-format msgid "" "Calling error for procedure '%s':\n" @@ -10648,7 +11317,7 @@ msgstr "" "Error de llamada para el procedimiento «%s»:\n" "%s" -#: ../app/plug-in/gimpplugin-message.c:431 +#: ../app/plug-in/gimpplugin-message.c:459 #, c-format msgid "" "Execution error for procedure '%s':\n" @@ -10704,15 +11373,15 @@ msgstr "Inicializando los complementos" msgid "Starting Extensions" msgstr "Inicializando los añadidos" -#: ../app/plug-in/gimppluginmanager.c:303 +#: ../app/plug-in/gimppluginmanager.c:297 msgid "Plug-In Interpreters" msgstr "Intérpretes de complementos" -#: ../app/plug-in/gimppluginmanager.c:310 +#: ../app/plug-in/gimppluginmanager.c:304 msgid "Plug-In Environment" msgstr "Entorno de complementos" -#: ../app/plug-in/gimppluginprocedure.c:990 +#: ../app/plug-in/gimppluginprocedure.c:995 #, c-format msgid "" "Calling error for '%s':\n" @@ -10721,7 +11390,7 @@ msgstr "" "Error de llamada para «%s»:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:1002 +#: ../app/plug-in/gimppluginprocedure.c:1007 #, c-format msgid "" "Execution error for '%s':\n" @@ -10769,54 +11438,54 @@ msgstr "" "El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el " "saxofón detrás del palenque de paja." -#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:2152 +#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1368 msgid "Add Text Layer" msgstr "Añadir una capa de texto" -#: ../app/text/gimptextlayer.c:136 +#: ../app/text/gimptextlayer.c:139 msgid "Text Layer" msgstr "Capa de texto" -#: ../app/text/gimptextlayer.c:137 +#: ../app/text/gimptextlayer.c:140 msgid "Rename Text Layer" msgstr "Renombrar la capa de texto" -#: ../app/text/gimptextlayer.c:138 +#: ../app/text/gimptextlayer.c:141 msgid "Move Text Layer" msgstr "Mover la capa de texto" -#: ../app/text/gimptextlayer.c:139 +#: ../app/text/gimptextlayer.c:142 msgid "Scale Text Layer" msgstr "Escalar la capa de texto" -#: ../app/text/gimptextlayer.c:140 +#: ../app/text/gimptextlayer.c:143 msgid "Resize Text Layer" msgstr "Redimensionar la capa de texto" -#: ../app/text/gimptextlayer.c:141 +#: ../app/text/gimptextlayer.c:144 msgid "Flip Text Layer" msgstr "Voltear la capa de texto" -#: ../app/text/gimptextlayer.c:142 +#: ../app/text/gimptextlayer.c:145 msgid "Rotate Text Layer" msgstr "Rotar la capa de texto" -#: ../app/text/gimptextlayer.c:143 +#: ../app/text/gimptextlayer.c:146 msgid "Transform Text Layer" msgstr "Transformar la capa de texto" -#: ../app/text/gimptextlayer.c:493 +#: ../app/text/gimptextlayer.c:507 msgid "Discard Text Information" msgstr "Eliminar la información de texto" -#: ../app/text/gimptextlayer.c:544 +#: ../app/text/gimptextlayer.c:560 msgid "Due to lack of any fonts, text functionality is not available." msgstr "" "Debido a la falta de tipografías la funcionalidad de texto no está " "disponible." # Aquí creo que Empty es adjetivo también -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:611 msgid "Empty Text Layer" msgstr "Capa de texto vacía" @@ -10835,7 +11504,17 @@ msgstr "" "Algunas propiedades del texto podrían estar incorrectas. Al menos que quiera " "editar la capa de texto no necesitará preocuparse por esto." -#: ../app/tools/gimp-tools.c:325 +#: ../app/text/text-enums.c:23 +msgctxt "text-box-mode" +msgid "Dynamic" +msgstr "Dinámico" + +#: ../app/text/text-enums.c:24 +msgctxt "text-box-mode" +msgid "Fixed" +msgstr "Fijo" + +#: ../app/tools/gimp-tools.c:352 msgid "" "This tool has\n" "no options." @@ -10851,24 +11530,28 @@ msgstr "Herramienta aerógrafo: pintar con presión variable mediante un pincel" msgid "_Airbrush" msgstr "_Aerógrafo" -#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:216 +#: ../app/tools/gimpairbrushtool.c:88 +msgid "Motion only" +msgstr "Sólo movimiento" + +#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimpconvolvetool.c:216 #: ../app/tools/gimpsmudgetool.c:96 msgid "Rate:" msgstr "Tasa:" -#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimppaintoptions-gui.c:241 -msgid "Pressure:" -msgstr "Presión:" +#: ../app/tools/gimpairbrushtool.c:103 +msgid "Flow:" +msgstr "Flujo:" -#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:767 +#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:768 msgid "Align" msgstr "Alineado" -#: ../app/tools/gimpaligntool.c:135 +#: ../app/tools/gimpaligntool.c:136 msgid "Alignment Tool: Align or arrange layers and other objects" msgstr "Herramienta de alineación:Alinee o coloque capas y otros objetos" -#: ../app/tools/gimpaligntool.c:136 +#: ../app/tools/gimpaligntool.c:137 msgid "_Align" msgstr "_Alineado" @@ -10900,67 +11583,67 @@ msgstr "Pulse para elegir esta ruta como primer elemento" msgid "Click to add this path to the list" msgstr "Pulse para añadir esta ruta a la lista" -#: ../app/tools/gimpaligntool.c:779 +#: ../app/tools/gimpaligntool.c:780 msgid "Relative to:" msgstr "Relativo a:" -#: ../app/tools/gimpaligntool.c:797 +#: ../app/tools/gimpaligntool.c:798 msgid "Align left edge of target" msgstr "Alinear al borde izquierdo del objetivo" -#: ../app/tools/gimpaligntool.c:803 +#: ../app/tools/gimpaligntool.c:804 msgid "Align center of target" msgstr "Alinear al centro del objetivo" -#: ../app/tools/gimpaligntool.c:809 +#: ../app/tools/gimpaligntool.c:810 msgid "Align right edge of target" msgstr "Alinear al borde derecho del objetivo" -#: ../app/tools/gimpaligntool.c:819 +#: ../app/tools/gimpaligntool.c:820 msgid "Align top edge of target" msgstr "Alinear al borde superior del objetivo" -#: ../app/tools/gimpaligntool.c:825 +#: ../app/tools/gimpaligntool.c:826 msgid "Align middle of target" msgstr "Alinear a la mitad del objetivo" -#: ../app/tools/gimpaligntool.c:831 +#: ../app/tools/gimpaligntool.c:832 msgid "Align bottom of target" msgstr "Alinear a la parte inferior del objetivo" -#: ../app/tools/gimpaligntool.c:835 +#: ../app/tools/gimpaligntool.c:836 msgid "Distribute" msgstr "Distribuir" -#: ../app/tools/gimpaligntool.c:849 +#: ../app/tools/gimpaligntool.c:850 msgid "Distribute left edges of targets" msgstr "Distribuir los bordes izquierdos de los objetivos" -#: ../app/tools/gimpaligntool.c:856 +#: ../app/tools/gimpaligntool.c:857 msgid "Distribute horizontal centers of targets" msgstr "Distribuir horizontalmente los centros de los objetivos" -#: ../app/tools/gimpaligntool.c:863 +#: ../app/tools/gimpaligntool.c:864 msgid "Distribute right edges of targets" msgstr "Distribuir los bordes derechos de los objetivos" -#: ../app/tools/gimpaligntool.c:873 +#: ../app/tools/gimpaligntool.c:874 msgid "Distribute top edges of targets" msgstr "Distribuir los bordes superiores de los objetivos" -#: ../app/tools/gimpaligntool.c:880 +#: ../app/tools/gimpaligntool.c:881 msgid "Distribute vertical centers of targets" msgstr "Distribuir los centros verticales de los objetivos" -#: ../app/tools/gimpaligntool.c:886 +#: ../app/tools/gimpaligntool.c:887 msgid "Distribute bottoms of targets" msgstr "Distribuir las partes inferiores de los objetivos" -#: ../app/tools/gimpaligntool.c:894 ../app/tools/gimpblendoptions.c:221 +#: ../app/tools/gimpaligntool.c:895 ../app/tools/gimpblendoptions.c:221 msgid "Offset:" msgstr "Desplazamiento:" -#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:890 +#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:305 msgid "Gradient:" msgstr "Degradado:" @@ -10968,7 +11651,7 @@ msgstr "Degradado:" msgid "Shape:" msgstr "Forma:" -#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:914 +#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:236 msgid "Repeat:" msgstr "Repetir:" @@ -10986,6 +11669,10 @@ msgstr "Profundidad máxima:" msgid "Threshold:" msgstr "Umbral:" +#: ../app/tools/gimpblendtool.c:109 +msgid "Blend" +msgstr "Mezcla" + #: ../app/tools/gimpblendtool.c:110 msgid "Blend Tool: Fill selected area with a color gradient" msgstr "" @@ -10996,24 +11683,28 @@ msgstr "" msgid "Blen_d" msgstr "_Mezcla [Blend]" -#: ../app/tools/gimpblendtool.c:166 +#: ../app/tools/gimpblendtool.c:167 msgid "Blend does not operate on indexed layers." msgstr "La mezcla no funciona sobre capas indexadas." -#: ../app/tools/gimpblendtool.c:405 ../app/tools/gimppainttool.c:571 +#: ../app/tools/gimpblendtool.c:423 ../app/tools/gimppainttool.c:634 #, c-format msgid "%s for constrained angles" msgstr "%s para ángulos restringidos" -#: ../app/tools/gimpblendtool.c:406 +#: ../app/tools/gimpblendtool.c:424 #, c-format msgid "%s to move the whole line" msgstr "%s para mover toda la línea" -#: ../app/tools/gimpblendtool.c:410 +#: ../app/tools/gimpblendtool.c:428 msgid "Blend: " msgstr "Mezcla: " +#: ../app/tools/gimpbrightnesscontrasttool.c:111 +msgid "Brightness-Contrast" +msgstr "Brillo-Contraste" + #: ../app/tools/gimpbrightnesscontrasttool.c:112 msgid "Brightness/Contrast Tool: Adjust brightness and contrast" msgstr "Herramienta de brillo/contraste: Ajusta el brillo y el contraste" @@ -11034,19 +11725,19 @@ msgstr "Importar los ajustes de Brillo y contraste" msgid "Export Brightness-Contrast settings" msgstr "Exportar los ajustes de Brillo y contraste" -#: ../app/tools/gimpbrightnesscontrasttool.c:184 +#: ../app/tools/gimpbrightnesscontrasttool.c:183 msgid "Brightness-Contrast does not operate on indexed layers." msgstr "Brillo-Contraste no funciona sobre capas indexadas." -#: ../app/tools/gimpbrightnesscontrasttool.c:323 +#: ../app/tools/gimpbrightnesscontrasttool.c:320 msgid "_Brightness:" msgstr "_Brillo:" -#: ../app/tools/gimpbrightnesscontrasttool.c:338 +#: ../app/tools/gimpbrightnesscontrasttool.c:335 msgid "Con_trast:" msgstr "Con_traste:" -#: ../app/tools/gimpbrightnesscontrasttool.c:352 +#: ../app/tools/gimpbrightnesscontrasttool.c:349 msgid "Edit these Settings as Levels" msgstr "Editar estos ajustes como niveles" @@ -11093,7 +11784,7 @@ msgstr "Rellenar áreas transparentes" #: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:113 #: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98 -#: ../app/tools/gimpperspectiveclonetool.c:938 +#: ../app/tools/gimpperspectiveclonetool.c:951 #: ../app/tools/gimpregionselectoptions.c:207 msgid "Sample merged" msgstr "Muestra combinada" @@ -11102,16 +11793,16 @@ msgstr "Muestra combinada" msgid "Fill by:" msgstr "Rellenar con:" -#: ../app/tools/gimpbucketfilltool.c:81 +#: ../app/tools/gimpbucketfilltool.c:85 msgid "Bucket Fill" msgstr "Relleno de cubeta" -#: ../app/tools/gimpbucketfilltool.c:82 +#: ../app/tools/gimpbucketfilltool.c:86 msgid "Bucket Fill Tool: Fill selected area with a color or pattern" msgstr "" "Herramienta de relleno: Rellenar con un color o patrón el área seleccionada" -#: ../app/tools/gimpbucketfilltool.c:83 +#: ../app/tools/gimpbucketfilltool.c:87 msgid "_Bucket Fill" msgstr "_Relleno" @@ -11129,6 +11820,11 @@ msgstr "" msgid "_By Color Select" msgstr "Selección por c_olor" +#: ../app/tools/gimpbycolorselecttool.c:82 +msgctxt "command" +msgid "Select by Color" +msgstr "Seleccionar por color" + #: ../app/tools/gimpclonetool.c:61 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" msgstr "" @@ -11153,15 +11849,19 @@ msgid "Click to set a new clone source" msgstr "Pulse para fijar un origen de clonado" #: ../app/tools/gimpclonetool.c:108 -#: ../app/tools/gimpperspectiveclonetool.c:933 +#: ../app/tools/gimpperspectiveclonetool.c:946 msgid "Source" msgstr "Origen" #: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110 -#: ../app/tools/gimpperspectiveclonetool.c:954 +#: ../app/tools/gimpperspectiveclonetool.c:967 msgid "Alignment:" msgstr "Alineación:" +#: ../app/tools/gimpcolorbalancetool.c:94 +msgid "Color Balance" +msgstr "Balance de color" + #: ../app/tools/gimpcolorbalancetool.c:95 msgid "Color Balance Tool: Adjust color distribution" msgstr "Herramienta de balance de color: ajustar la distribución del color" @@ -11182,56 +11882,60 @@ msgstr "Importar ajustes de balance de color" msgid "Export Color Balance Settings" msgstr "Exportar los ajustes de balance de color" -#: ../app/tools/gimpcolorbalancetool.c:163 +#: ../app/tools/gimpcolorbalancetool.c:162 msgid "Color Balance operates only on RGB color layers." msgstr "El balance de color sólo funciona sobre capas de color RGB." -#: ../app/tools/gimpcolorbalancetool.c:270 +#: ../app/tools/gimpcolorbalancetool.c:267 msgid "Select Range to Adjust" msgstr "Seleccione el rango para ajustar" -#: ../app/tools/gimpcolorbalancetool.c:279 ../app/tools/gimplevelstool.c:172 +#: ../app/tools/gimpcolorbalancetool.c:276 ../app/tools/gimplevelstool.c:172 msgid "Adjust Color Levels" msgstr "Ajustar los niveles de color" -#: ../app/tools/gimpcolorbalancetool.c:296 -#: ../app/tools/gimphuesaturationtool.c:255 +#: ../app/tools/gimpcolorbalancetool.c:293 +#: ../app/tools/gimphuesaturationtool.c:252 msgid "Cyan" msgstr "Cian" -#: ../app/tools/gimpcolorbalancetool.c:296 -#: ../app/tools/gimphuesaturationtool.c:252 +#: ../app/tools/gimpcolorbalancetool.c:293 +#: ../app/tools/gimphuesaturationtool.c:249 msgid "Red" msgstr "Rojo" -#: ../app/tools/gimpcolorbalancetool.c:305 -#: ../app/tools/gimphuesaturationtool.c:257 +#: ../app/tools/gimpcolorbalancetool.c:302 +#: ../app/tools/gimphuesaturationtool.c:254 msgid "Magenta" msgstr "Magenta" -#: ../app/tools/gimpcolorbalancetool.c:305 -#: ../app/tools/gimphuesaturationtool.c:254 +#: ../app/tools/gimpcolorbalancetool.c:302 +#: ../app/tools/gimphuesaturationtool.c:251 msgid "Green" msgstr "Verde" -#: ../app/tools/gimpcolorbalancetool.c:314 -#: ../app/tools/gimphuesaturationtool.c:253 +#: ../app/tools/gimpcolorbalancetool.c:311 +#: ../app/tools/gimphuesaturationtool.c:250 msgid "Yellow" msgstr "Amarillo" -#: ../app/tools/gimpcolorbalancetool.c:314 -#: ../app/tools/gimphuesaturationtool.c:256 +#: ../app/tools/gimpcolorbalancetool.c:311 +#: ../app/tools/gimphuesaturationtool.c:253 msgid "Blue" msgstr "Azul" -#: ../app/tools/gimpcolorbalancetool.c:325 +#: ../app/tools/gimpcolorbalancetool.c:322 msgid "R_eset Range" msgstr "R_einiciar el rango" -#: ../app/tools/gimpcolorbalancetool.c:334 +#: ../app/tools/gimpcolorbalancetool.c:331 msgid "Preserve _luminosity" msgstr "Conservar la _luminosidad" +#: ../app/tools/gimpcolorizetool.c:90 +msgid "Colorize" +msgstr "Colorear" + #: ../app/tools/gimpcolorizetool.c:91 msgid "Colorize Tool: Colorize the image" msgstr "Herramineta de coloreo: colorear la imagen" @@ -11252,26 +11956,26 @@ msgstr "Importar los ajustes de Colorear" msgid "Export Colorize Settings" msgstr "Exportar los ajustes de Colorear" -#: ../app/tools/gimpcolorizetool.c:156 +#: ../app/tools/gimpcolorizetool.c:157 msgid "Colorize operates only on RGB color layers." msgstr "Colorear sólo funciona sobre capas de color RGB." -#: ../app/tools/gimpcolorizetool.c:221 +#: ../app/tools/gimpcolorizetool.c:225 msgid "Select Color" msgstr "Seleccionar el color" -#: ../app/tools/gimpcolorizetool.c:238 -#: ../app/tools/gimphuesaturationtool.c:388 +#: ../app/tools/gimpcolorizetool.c:242 +#: ../app/tools/gimphuesaturationtool.c:385 msgid "_Hue:" msgstr "_Tono:" -#: ../app/tools/gimpcolorizetool.c:253 -#: ../app/tools/gimphuesaturationtool.c:426 +#: ../app/tools/gimpcolorizetool.c:257 +#: ../app/tools/gimphuesaturationtool.c:423 msgid "_Saturation:" msgstr "_Saturación:" -#: ../app/tools/gimpcolorizetool.c:268 -#: ../app/tools/gimphuesaturationtool.c:407 +#: ../app/tools/gimpcolorizetool.c:272 +#: ../app/tools/gimphuesaturationtool.c:404 msgid "_Lightness:" msgstr "_Luminosidad:" @@ -11319,11 +12023,11 @@ msgstr "_Recoge-color" msgid "Click in any image to view its color" msgstr "Pulse sobre cualquier imagen para ver su color" -#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:476 +#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:493 msgid "Click in any image to pick the foreground color" msgstr "Pulse sobre cualquier imagen para recoger el color de frente" -#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:482 +#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:499 msgid "Click in any image to pick the background color" msgstr "Pulse sobre cualquier imagen para recoger el color de fondo" @@ -11336,15 +12040,19 @@ msgstr "Pulse sobre cualquier imagen para añadir el color a la paleta" msgid "Color Picker Information" msgstr "Información del recoge-color" -#: ../app/tools/gimpcolortool.c:260 ../app/tools/gimpcolortool.c:439 +#: ../app/tools/gimpcolortool.c:268 ../app/tools/gimpcolortool.c:452 msgid "Move Sample Point: " msgstr "Mover punto de muestra: " -#: ../app/tools/gimpcolortool.c:432 +#: ../app/tools/gimpcolortool.c:444 +msgid "Remove Sample Point" +msgstr "Eliminar punto de muestra" + +#: ../app/tools/gimpcolortool.c:445 msgid "Cancel Sample Point" msgstr "Cancelar punto de muestra" -#: ../app/tools/gimpcolortool.c:440 +#: ../app/tools/gimpcolortool.c:453 msgid "Add Sample Point: " msgstr "Añadir punto de muestra: " @@ -11418,6 +12126,14 @@ msgstr "_Recortar" msgid "Click or press Enter to crop" msgstr "Pulse o presione «Retorno» para recortar" +#: ../app/tools/gimpcroptool.c:328 +msgid "There is no active layer to crop." +msgstr "No hay una capa activa que cortar." + +#: ../app/tools/gimpcurvestool.c:140 +msgid "Curves" +msgstr "Curvas" + #: ../app/tools/gimpcurvestool.c:141 msgid "Curves Tool: Adjust color curves" msgstr "Herramienta de curvas: ajustar las curvas de color" @@ -11438,40 +12154,40 @@ msgstr "Importar curvas" msgid "Export Curves" msgstr "Exportar curvas" -#: ../app/tools/gimpcurvestool.c:221 +#: ../app/tools/gimpcurvestool.c:222 msgid "Curves does not operate on indexed layers." msgstr "Las curvas no funcionan sobre capas indexadas." -#: ../app/tools/gimpcurvestool.c:326 +#: ../app/tools/gimpcurvestool.c:330 msgid "Click to add a control point" msgstr "Pulse para añadir un punto de control" -#: ../app/tools/gimpcurvestool.c:331 +#: ../app/tools/gimpcurvestool.c:335 msgid "Click to add control points to all channels" msgstr "Pulse para añadir puntos de control a todos los canales" -#: ../app/tools/gimpcurvestool.c:336 +#: ../app/tools/gimpcurvestool.c:340 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Pulse para situar sobre la curva (pruebe Mayús o Ctrl)" -#: ../app/tools/gimpcurvestool.c:449 ../app/tools/gimplevelstool.c:380 +#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "Ca_nal:" -#: ../app/tools/gimpcurvestool.c:475 ../app/tools/gimplevelstool.c:404 +#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "R_einiciar el canal" -#: ../app/tools/gimpcurvestool.c:565 +#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:460 msgid "Curve _type:" msgstr "_Tipo de curva:" -#: ../app/tools/gimpcurvestool.c:640 ../app/tools/gimplevelstool.c:752 +#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "No se ha podido leer la cabecera de «%s»: %s" -#: ../app/tools/gimpcurvestool.c:713 +#: ../app/tools/gimpcurvestool.c:719 msgid "Use _old curves file format" msgstr "Usar el formato antigu_o de archivo de curvas" @@ -11487,11 +12203,11 @@ msgstr "_Desaturar…" msgid "Desaturate (Remove Colors)" msgstr "Desaturar (eliminar colores)" -#: ../app/tools/gimpdesaturatetool.c:125 -msgid "Desaturate does only operate on RGB layers." +#: ../app/tools/gimpdesaturatetool.c:124 +msgid "Desaturate only operates on RGB layers." msgstr "La desaturación sólo funciona sobre capas RGB." -#: ../app/tools/gimpdesaturatetool.c:191 +#: ../app/tools/gimpdesaturatetool.c:193 msgid "Choose shade of gray based on:" msgstr "Seleccionar un poco de gris basado en:" @@ -11552,13 +12268,17 @@ msgstr "Rango" msgid "Exposure:" msgstr "Exposición:" -#: ../app/tools/gimpeditselectiontool.c:244 -#: ../app/tools/gimpeditselectiontool.c:1229 +#: ../app/tools/gimpeditselectiontool.c:241 +msgid "Move Selection" +msgstr "Mover la selección" + +#: ../app/tools/gimpeditselectiontool.c:245 +#: ../app/tools/gimpeditselectiontool.c:1249 msgid "Move Floating Selection" msgstr "Mover la selección flotante" -#: ../app/tools/gimpeditselectiontool.c:457 -#: ../app/tools/gimpeditselectiontool.c:726 +#: ../app/tools/gimpeditselectiontool.c:464 +#: ../app/tools/gimpeditselectiontool.c:739 msgid "Move: " msgstr "Mover: " @@ -11628,6 +12348,11 @@ msgstr "" msgid "_Flip" msgstr "_Voltear" +#: ../app/tools/gimpfliptool.c:116 +msgctxt "command" +msgid "Flip" +msgstr "Voltear" + # //R Ojito #: ../app/tools/gimpforegroundselectoptions.c:78 #: ../app/tools/gimpselectionoptions.c:78 @@ -11729,7 +12454,7 @@ msgstr "Marque el frente pintando sobre el objeto que quiere extraer" msgid "Roughly outline the object to extract" msgstr "Dibuje un círculo aproximado alrededor del objeto que quiere extraer" -#: ../app/tools/gimpforegroundselecttool.c:768 +#: ../app/tools/gimpforegroundselecttool.c:773 msgctxt "command" msgid "Foreground Select" msgstr "Selección del frente" @@ -11745,26 +12470,26 @@ msgstr "" msgid "_Free Select" msgstr "Selección _libre" -#: ../app/tools/gimpfreeselecttool.c:1117 +#: ../app/tools/gimpfreeselecttool.c:1119 msgid "Click to complete selection" msgstr "Pulse para completar la selección" -#: ../app/tools/gimpfreeselecttool.c:1121 +#: ../app/tools/gimpfreeselecttool.c:1123 msgid "Click-Drag to move segment vertex" msgstr "Pulse y arrastre para mover el vértice del segmento" -#: ../app/tools/gimpfreeselecttool.c:1126 +#: ../app/tools/gimpfreeselecttool.c:1128 msgid "Return commits, Escape cancels, Backspace removes last segment" msgstr "" "Retorno realiza la acción, Escape cancela, Retroceso quita el último segmento" -#: ../app/tools/gimpfreeselecttool.c:1130 +#: ../app/tools/gimpfreeselecttool.c:1132 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" msgstr "" "Pulse y arrastre para añadir un segmento libre, pulse para añadir un " "segmento poligonal" -#: ../app/tools/gimpfreeselecttool.c:1583 +#: ../app/tools/gimpfreeselecttool.c:1625 msgctxt "command" msgid "Free Select" msgstr "Selección libre" @@ -11781,32 +12506,41 @@ msgstr "Selección difusa: Selecciona una región contigua basándose en el colo msgid "Fu_zzy Select" msgstr "Selección _difusa" -#: ../app/tools/gimpgegltool.c:92 ../app/tools/gimpgegltool.c:111 +#: ../app/tools/gimpfuzzyselecttool.c:80 +msgctxt "command" +msgid "Fuzzy Select" +msgstr "Selección difusa" + +#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112 msgid "GEGL Operation" msgstr "Operación de GEGL" -#: ../app/tools/gimpgegltool.c:93 +#: ../app/tools/gimpgegltool.c:94 msgid "GEGL Tool: Use an arbitrary GEGL operation" msgstr "Herramienta GEGL: Utilice una operación GEGL arbitraria" # Location lo traducimos por lugar (Serrador) -#: ../app/tools/gimpgegltool.c:94 +#: ../app/tools/gimpgegltool.c:95 msgid "_GEGL Operation..." msgstr "Operación _GEGL…" -#: ../app/tools/gimpgegltool.c:158 +#: ../app/tools/gimpgegltool.c:160 msgid "GEGL operations do not operate on indexed layers." msgstr "Las operaciones de GEGL no funcionan sobre capas indexadas." -#: ../app/tools/gimpgegltool.c:333 +#: ../app/tools/gimpgegltool.c:371 msgid "_Operation:" msgstr "_Operación:" #. The options vbox -#: ../app/tools/gimpgegltool.c:404 +#: ../app/tools/gimpgegltool.c:430 msgid "Operation Settings" msgstr "Ajustes de la operación" +#: ../app/tools/gimpgegltool.c:435 +msgid "Select an operation from the list above" +msgstr "Seleccionar una operación de la lista de arriba" + #: ../app/tools/gimphealtool.c:53 msgid "Healing Tool: Heal image irregularities" msgstr "Herramienta de saneado: sanear irregularidades de la imagen" @@ -11817,7 +12551,7 @@ msgstr "_Sanear" #: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79 msgid "Click to heal" -msgstr "Pulse para sanear" +msgstr "Pulsar para sanear" #: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81 #, c-format @@ -11826,7 +12560,7 @@ msgstr "%s para fijar un nuevo origen de saneado" #: ../app/tools/gimphealtool.c:80 msgid "Click to set a new heal source" -msgstr "Pulse para establecer un nuevo origen de saneado" +msgstr "Pulsar para establecer un nuevo origen de saneado" #: ../app/tools/gimphistogramoptions.c:126 msgid "Histogram Scale" @@ -11854,55 +12588,55 @@ msgstr "Importar los ajustes de tono y saturación" msgid "Export Hue-Saturation Settings" msgstr "Exportar los ajustes de tono y saturación" -#: ../app/tools/gimphuesaturationtool.c:171 +#: ../app/tools/gimphuesaturationtool.c:170 msgid "Hue-Saturation operates only on RGB color layers." msgstr "Tono-saturación sólo funciona sobre capas de color RGB." -#: ../app/tools/gimphuesaturationtool.c:251 +#: ../app/tools/gimphuesaturationtool.c:248 msgid "M_aster" msgstr "P_rincipal" -#: ../app/tools/gimphuesaturationtool.c:251 +#: ../app/tools/gimphuesaturationtool.c:248 msgid "Adjust all colors" msgstr "Ajustar todos los colores" -#: ../app/tools/gimphuesaturationtool.c:252 +#: ../app/tools/gimphuesaturationtool.c:249 msgid "_R" msgstr "_R" -#: ../app/tools/gimphuesaturationtool.c:253 +#: ../app/tools/gimphuesaturationtool.c:250 msgid "_Y" msgstr "_Y" -#: ../app/tools/gimphuesaturationtool.c:254 +#: ../app/tools/gimphuesaturationtool.c:251 msgid "_G" msgstr "_G" -#: ../app/tools/gimphuesaturationtool.c:255 +#: ../app/tools/gimphuesaturationtool.c:252 msgid "_C" msgstr "_C" -#: ../app/tools/gimphuesaturationtool.c:256 +#: ../app/tools/gimphuesaturationtool.c:253 msgid "_B" msgstr "_B" -#: ../app/tools/gimphuesaturationtool.c:257 +#: ../app/tools/gimphuesaturationtool.c:254 msgid "_M" msgstr "_M" -#: ../app/tools/gimphuesaturationtool.c:262 +#: ../app/tools/gimphuesaturationtool.c:259 msgid "Select Primary Color to Adjust" msgstr "Seleccione el color primario para modificar" -#: ../app/tools/gimphuesaturationtool.c:352 +#: ../app/tools/gimphuesaturationtool.c:349 msgid "_Overlap:" msgstr "S_olapar:" -#: ../app/tools/gimphuesaturationtool.c:371 +#: ../app/tools/gimphuesaturationtool.c:368 msgid "Adjust Selected Color" msgstr "Modificar el color seleccionado" -#: ../app/tools/gimphuesaturationtool.c:447 +#: ../app/tools/gimphuesaturationtool.c:444 msgid "R_eset Color" msgstr "R_establecer el color" @@ -11915,7 +12649,7 @@ msgstr "Aju_stes prefijados:" msgid "Settings saved to '%s'" msgstr "Preferencias guardades «%s»" -#: ../app/tools/gimpimagemaptool.c:316 +#: ../app/tools/gimpimagemaptool.c:367 msgid "_Preview" msgstr "Vista _previa" @@ -11925,12 +12659,12 @@ msgid "Adjustment" msgstr "Ajuste" #: ../app/tools/gimpinkoptions-gui.c:67 ../app/tools/gimpinkoptions-gui.c:92 -#: ../app/tools/gimprectangleoptions.c:972 ../app/tools/gimptextoptions.c:455 +#: ../app/tools/gimprectangleoptions.c:972 ../app/tools/gimptextoptions.c:489 msgid "Size:" msgstr "Tamaño:" -#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1042 -#: ../app/tools/gimppaintoptions-gui.c:168 +#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1046 +#: ../app/tools/gimppaintoptions-gui.c:137 #: ../app/widgets/gimpbrusheditor.c:207 msgid "Angle:" msgstr "Ángulo:" @@ -11941,7 +12675,6 @@ msgid "Sensitivity" msgstr "Sensibilidad" #: ../app/tools/gimpinkoptions-gui.c:99 -#: ../app/tools/gimppaintoptions-gui.c:259 msgid "Tilt:" msgstr "Alabeo:" @@ -11984,32 +12717,32 @@ msgstr "" msgid "Intelligent _Scissors" msgstr "Tijeras _inteligentes" -#: ../app/tools/gimpiscissorstool.c:942 ../app/tools/gimpmeasuretool.c:612 +#: ../app/tools/gimpiscissorstool.c:938 ../app/tools/gimpmeasuretool.c:617 msgid "Click-Drag to move this point" msgstr "Pulse y arrastre para mover este punto" -#: ../app/tools/gimpiscissorstool.c:944 ../app/tools/gimpiscissorstool.c:1009 +#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpiscissorstool.c:1005 #, c-format msgid "%s: disable auto-snap" msgstr "%s: dehabilitar el autoajuste" -#: ../app/tools/gimpiscissorstool.c:961 +#: ../app/tools/gimpiscissorstool.c:957 msgid "Click to close the curve" msgstr "Pulse para cerrar la curva" -#: ../app/tools/gimpiscissorstool.c:967 +#: ../app/tools/gimpiscissorstool.c:963 msgid "Click to add a point on this segment" msgstr "Pulse para añadir un punto sobre este segmento" -#: ../app/tools/gimpiscissorstool.c:981 +#: ../app/tools/gimpiscissorstool.c:977 msgid "Click or press Enter to convert to a selection" msgstr "Pulse con el ratón o presione «Retorno» para convertir a una selección" -#: ../app/tools/gimpiscissorstool.c:991 +#: ../app/tools/gimpiscissorstool.c:987 msgid "Press Enter to convert to a selection" msgstr "Presione «Retorno» para convertir a una selección" -#: ../app/tools/gimpiscissorstool.c:1006 +#: ../app/tools/gimpiscissorstool.c:1002 msgid "Click or Click-Drag to add a point" msgstr "Pulse o arrastre para añadir un punto" @@ -12029,54 +12762,54 @@ msgstr "Importar niveles" msgid "Export Levels" msgstr "Exportar niveles" -#: ../app/tools/gimplevelstool.c:228 +#: ../app/tools/gimplevelstool.c:229 msgid "Levels does not operate on indexed layers." msgstr "Los niveles no funcionan sobre capas indexadas." -#: ../app/tools/gimplevelstool.c:310 +#: ../app/tools/gimplevelstool.c:314 msgid "Pick black point" msgstr "Seleccionar un punto negro" -#: ../app/tools/gimplevelstool.c:314 +#: ../app/tools/gimplevelstool.c:318 msgid "Pick gray point" msgstr "Seleccionar un punto gris" -#: ../app/tools/gimplevelstool.c:318 +#: ../app/tools/gimplevelstool.c:322 msgid "Pick white point" msgstr "Seleccionar un punto blanco" #. Input levels frame -#: ../app/tools/gimplevelstool.c:419 +#: ../app/tools/gimplevelstool.c:423 msgid "Input Levels" msgstr "Niveles de entrada" -#: ../app/tools/gimplevelstool.c:522 +#: ../app/tools/gimplevelstool.c:526 msgid "Gamma" msgstr "Gamma" #. Output levels frame -#: ../app/tools/gimplevelstool.c:564 +#: ../app/tools/gimplevelstool.c:568 msgid "Output Levels" msgstr "Niveles de salida" #. all channels frame -#: ../app/tools/gimplevelstool.c:641 +#: ../app/tools/gimplevelstool.c:645 msgid "All Channels" msgstr "Todos los canales" -#: ../app/tools/gimplevelstool.c:653 ../app/tools/gimpthresholdtool.c:264 +#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268 msgid "_Auto" msgstr "_Auto" -#: ../app/tools/gimplevelstool.c:655 +#: ../app/tools/gimplevelstool.c:659 msgid "Adjust levels automatically" msgstr "Ajustar los niveles automáticamente" -#: ../app/tools/gimplevelstool.c:682 +#: ../app/tools/gimplevelstool.c:686 msgid "Edit these Settings as Curves" msgstr "Editar estos ajustes como curvas" -#: ../app/tools/gimplevelstool.c:825 +#: ../app/tools/gimplevelstool.c:829 msgid "Use _old levels file format" msgstr "Usar el formato antigu_o de archivo de niveles" @@ -12099,61 +12832,62 @@ msgid "Zoom Tool: Adjust the zoom level" msgstr "Herramienta de ampliación: ajustar el nivel de ampliación" #: ../app/tools/gimpmagnifytool.c:89 -msgid "tool|_Zoom" +msgctxt "tool" +msgid "_Zoom" msgstr "_Ampliación" #: ../app/tools/gimpmeasureoptions.c:123 msgid "Use info window" msgstr "Usar la ventana de información" -#: ../app/tools/gimpmeasuretool.c:122 +#: ../app/tools/gimpmeasuretool.c:123 msgid "Measure" msgstr "Medir" -#: ../app/tools/gimpmeasuretool.c:123 +#: ../app/tools/gimpmeasuretool.c:124 msgid "Measure Tool: Measure distances and angles" msgstr "Herramienta de medida: medir distancias y ángulos" -#: ../app/tools/gimpmeasuretool.c:124 +#: ../app/tools/gimpmeasuretool.c:125 msgid "_Measure" msgstr "_Medir" -#: ../app/tools/gimpmeasuretool.c:243 +#: ../app/tools/gimpmeasuretool.c:245 msgid "Add Guides" msgstr "Añadir guías" -#: ../app/tools/gimpmeasuretool.c:563 +#: ../app/tools/gimpmeasuretool.c:568 msgid "Click to place vertical and horizontal guides" msgstr "Pulse para colocar guías verticales y horizontales" -#: ../app/tools/gimpmeasuretool.c:572 +#: ../app/tools/gimpmeasuretool.c:577 msgid "Click to place a horizontal guide" msgstr "Pulse para colocar una guía horizontal" -#: ../app/tools/gimpmeasuretool.c:587 +#: ../app/tools/gimpmeasuretool.c:592 msgid "Click to place a vertical guide" msgstr "Pulse para colocar una guía vertical" -#: ../app/tools/gimpmeasuretool.c:601 +#: ../app/tools/gimpmeasuretool.c:606 msgid "Click-Drag to add a new point" msgstr "Pulse y arrastre para añadir un punto nuevo" -#: ../app/tools/gimpmeasuretool.c:632 +#: ../app/tools/gimpmeasuretool.c:637 msgid "Click-Drag to move all points" msgstr "Pulse y arrastre para mover todos los puntos" -#: ../app/tools/gimpmeasuretool.c:881 ../app/tools/gimpmeasuretool.c:1025 -#: ../app/tools/gimpmeasuretool.c:1081 ../app/tools/gimpmeasuretool.c:1109 -#: ../app/tools/gimppainttool.c:580 +#: ../app/tools/gimpmeasuretool.c:884 ../app/tools/gimpmeasuretool.c:1029 +#: ../app/tools/gimpmeasuretool.c:1085 ../app/tools/gimpmeasuretool.c:1113 +#: ../app/tools/gimppainttool.c:643 msgid "pixels" msgstr "píxeles" #. tool->display->shell -#: ../app/tools/gimpmeasuretool.c:993 +#: ../app/tools/gimpmeasuretool.c:997 msgid "Measure Distances and Angles" msgstr "Medida de distancias y ángulos" -#: ../app/tools/gimpmeasuretool.c:1014 +#: ../app/tools/gimpmeasuretool.c:1018 msgid "Distance:" msgstr "Distancia:" @@ -12181,28 +12915,32 @@ msgstr "Mover la ruta activa" msgid "Move:" msgstr "Mover:" -#: ../app/tools/gimpmovetool.c:128 +#: ../app/tools/gimpmovetool.c:129 msgctxt "tool" msgid "Move" msgstr "Mover" -#: ../app/tools/gimpmovetool.c:129 +#: ../app/tools/gimpmovetool.c:130 msgid "Move Tool: Move layers, selections, and other objects" msgstr "Herramienta mover: mover capas, selecciones y otros objetos" -#: ../app/tools/gimpmovetool.c:130 +#: ../app/tools/gimpmovetool.c:131 msgid "_Move" msgstr "_Mover" -#: ../app/tools/gimpmovetool.c:278 ../app/tools/gimpmovetool.c:574 +#: ../app/tools/gimpmovetool.c:285 ../app/tools/gimpmovetool.c:581 msgid "Move Guide: " msgstr "Mover la guía: " -#: ../app/tools/gimpmovetool.c:568 +#: ../app/tools/gimpmovetool.c:575 +msgid "Remove Guide" +msgstr "Eliminar la guía" + +#: ../app/tools/gimpmovetool.c:575 msgid "Cancel Guide" msgstr "Cancelar la guía" -#: ../app/tools/gimpmovetool.c:574 +#: ../app/tools/gimpmovetool.c:581 msgid "Add Guide: " msgstr "Añadir guía: " @@ -12214,113 +12952,81 @@ msgstr "Herramienta pincel: pintar trazos de bordes suaves mediante un pincel" msgid "_Paintbrush" msgstr "_Pincel" -#: ../app/tools/gimppaintoptions-gui.c:121 +#: ../app/tools/gimppaintoptions-gui.c:90 #: ../app/tools/gimpselectionoptions.c:210 -#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:300 +#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:266 msgid "Mode:" msgstr "Modo:" -#: ../app/tools/gimppaintoptions-gui.c:136 +#: ../app/tools/gimppaintoptions-gui.c:105 #: ../app/tools/gimptransformoptions.c:347 -#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:315 +#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:289 msgid "Opacity:" msgstr "Opacidad:" -#: ../app/tools/gimppaintoptions-gui.c:149 +#: ../app/tools/gimppaintoptions-gui.c:118 msgid "Brush:" msgstr "Pinceles:" -#: ../app/tools/gimppaintoptions-gui.c:154 +#: ../app/tools/gimppaintoptions-gui.c:123 msgid "Scale:" msgstr "Escala:" -#: ../app/tools/gimppaintoptions-gui.c:161 +#: ../app/tools/gimppaintoptions-gui.c:130 msgid "Aspect Ratio:" msgstr "Proporción de aspecto:" -#: ../app/tools/gimppaintoptions-gui.c:181 -msgid "Hardness" -msgstr "Dureza" - -#: ../app/tools/gimppaintoptions-gui.c:187 -msgid "Rate" -msgstr "Tasa" - -#: ../app/tools/gimppaintoptions-gui.c:193 -msgid "Size" -msgstr "Tamaño" - -#: ../app/tools/gimppaintoptions-gui.c:199 -msgid "Aspect ratio" -msgstr "Proporción de aspecto" - -#: ../app/tools/gimppaintoptions-gui.c:206 -msgid "Angle" -msgstr "Á_ngulo" - -#: ../app/tools/gimppaintoptions-gui.c:212 -msgid "Color" -msgstr "Color" - -#: ../app/tools/gimppaintoptions-gui.c:229 -msgid "Brush Dynamics" -msgstr "Dinámica del pincel" - -#: ../app/tools/gimppaintoptions-gui.c:247 -msgid "Velocity:" -msgstr "Velocidad:" - -#: ../app/tools/gimppaintoptions-gui.c:253 -msgid "Direction:" -msgstr "Dirección:" - -#: ../app/tools/gimppaintoptions-gui.c:265 -msgid "Random:" -msgstr "Aleatorio:" - -#: ../app/tools/gimppaintoptions-gui.c:325 +#: ../app/tools/gimppaintoptions-gui.c:162 msgid "Incremental" msgstr "Incremental" -#: ../app/tools/gimppaintoptions-gui.c:341 +#: ../app/tools/gimppaintoptions-gui.c:178 msgid "Hard edge" msgstr "Bordes duros" -#: ../app/tools/gimppaintoptions-gui.c:807 +#: ../app/tools/gimppaintoptions-gui.c:212 msgid "Fade out" msgstr "Desvanecimiento" -#: ../app/tools/gimppaintoptions-gui.c:816 -#: ../app/tools/gimppaintoptions-gui.c:899 +#: ../app/tools/gimppaintoptions-gui.c:221 msgid "Length:" msgstr "Longitud:" -#: ../app/tools/gimppaintoptions-gui.c:843 +#: ../app/tools/gimppaintoptions-gui.c:241 +#: ../app/widgets/gimpviewablebox.c:223 +msgid "Reverse" +msgstr "Invertido" + +#: ../app/tools/gimppaintoptions-gui.c:261 msgid "Apply Jitter" msgstr "Aplicar «jitter»" -#: ../app/tools/gimppaintoptions-gui.c:848 +#: ../app/tools/gimppaintoptions-gui.c:266 msgid "Amount:" msgstr "Cuenta:" -#: ../app/tools/gimppaintoptions-gui.c:873 +#: ../app/tools/gimppaintoptions-gui.c:288 msgid "Use color from gradient" msgstr "Utilizar los colores del degradado" -#: ../app/tools/gimppainttool.c:137 +#: ../app/tools/gimppainttool.c:142 msgid "Click to paint" msgstr "Pulse para pintar" -#: ../app/tools/gimppainttool.c:138 +#: ../app/tools/gimppainttool.c:143 msgid "Click to draw the line" msgstr "Pulse para trazar la línea" -#: ../app/tools/gimppainttool.c:139 +#: ../app/tools/gimppainttool.c:144 #, c-format msgid "%s to pick a color" msgstr "%s para recoger un color" -#: ../app/tools/gimppainttool.c:627 +#: ../app/tools/gimppainttool.c:279 +msgid "Cannot paint on layer groups." +msgstr "No se puede pintar sobre un grupo de capas." + +#: ../app/tools/gimppainttool.c:689 #, c-format msgid "%s for a straight line" msgstr "%s para una línea recta" @@ -12345,7 +13051,7 @@ msgstr "" msgid "_Perspective Clone" msgstr "Clonar con _perspectiva" -#: ../app/tools/gimpperspectiveclonetool.c:694 +#: ../app/tools/gimpperspectiveclonetool.c:703 msgid "Ctrl-Click to set a clone source" msgstr "Ctrl-pulsación para fijar un origen de clonado" @@ -12384,11 +13090,11 @@ msgstr "_Posterizar…" msgid "Posterize (Reduce Number of Colors)" msgstr "Posterizar (reducir el número de colores)" -#: ../app/tools/gimpposterizetool.c:151 +#: ../app/tools/gimpposterizetool.c:152 msgid "Posterize does not operate on indexed layers." msgstr "Posterizar no funciona sobre capas indexadas." -#: ../app/tools/gimpposterizetool.c:226 +#: ../app/tools/gimpposterizetool.c:230 msgid "Posterize _levels:" msgstr "Nive_les de posterización:" @@ -12444,7 +13150,7 @@ msgstr "" msgid "_Rectangle Select" msgstr "Selección _rectangular" -#: ../app/tools/gimprectangletool.c:1151 ../app/tools/gimprectangletool.c:2091 +#: ../app/tools/gimprectangletool.c:1156 ../app/tools/gimprectangletool.c:2130 msgid "Rectangle: " msgstr "Rectángulo: " @@ -12453,8 +13159,8 @@ msgid "Allow completely transparent regions to be selected" msgstr "Permitir seleccionar las regiones completamente transparentes" #: ../app/tools/gimpregionselectoptions.c:89 -msgid "Base region_select on all visible layers" -msgstr "Selección de la región base en todas las capas visibles" +msgid "Base selection on all visible layers" +msgstr "Selección base en todas las capas visibles" #: ../app/tools/gimpregionselectoptions.c:201 msgid "Select transparent areas" @@ -12480,6 +13186,11 @@ msgstr "Herramienta de rotación: rotar la capa, selección o ruta" msgid "_Rotate" msgstr "_Rotar" +#: ../app/tools/gimprotatetool.c:121 +msgctxt "command" +msgid "Rotate" +msgstr "Rotar" + #: ../app/tools/gimprotatetool.c:188 msgid "_Angle:" msgstr "Á_ngulo:" @@ -12492,24 +13203,24 @@ msgstr "Centro _X:" msgid "Center _Y:" msgstr "Centro _Y:" -#: ../app/tools/gimpscaletool.c:78 +#: ../app/tools/gimpscaletool.c:77 msgid "Scale" msgstr "Redimensionar" -#: ../app/tools/gimpscaletool.c:79 +#: ../app/tools/gimpscaletool.c:78 msgid "Scale Tool: Scale the layer, selection or path" msgstr "Herramienta de escalado: escalar la capa, selección o ruta" -#: ../app/tools/gimpscaletool.c:80 +#: ../app/tools/gimpscaletool.c:79 msgid "_Scale" msgstr "E_scalar" -#: ../app/tools/gimpscaletool.c:106 +#: ../app/tools/gimpscaletool.c:105 msgctxt "command" msgid "Scale" msgstr "Redimensionar" -#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:468 +#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:502 msgid "Antialiasing" msgstr "Alisado" @@ -12517,39 +13228,39 @@ msgstr "Alisado" msgid "Feather edges" msgstr "Difuminar los bordes" -#: ../app/tools/gimpselectiontool.c:251 +#: ../app/tools/gimpselectiontool.c:253 msgid "Click-Drag to replace the current selection" msgstr "Pulse y arrastre para sustituir la selección actual" -#: ../app/tools/gimpselectiontool.c:259 +#: ../app/tools/gimpselectiontool.c:261 msgid "Click-Drag to create a new selection" msgstr "Pulse y arrastre para crear una nueva selección" -#: ../app/tools/gimpselectiontool.c:264 +#: ../app/tools/gimpselectiontool.c:266 msgid "Click-Drag to add to the current selection" msgstr "Pulse y arrastre para añadir a la selección actual" -#: ../app/tools/gimpselectiontool.c:273 +#: ../app/tools/gimpselectiontool.c:275 msgid "Click-Drag to subtract from the current selection" msgstr "Pulse y arrastre para sustraer de la selección actual" -#: ../app/tools/gimpselectiontool.c:282 +#: ../app/tools/gimpselectiontool.c:284 msgid "Click-Drag to intersect with the current selection" msgstr "Pulse y arrastre para intersectar con la selección actual" -#: ../app/tools/gimpselectiontool.c:292 +#: ../app/tools/gimpselectiontool.c:294 msgid "Click-Drag to move the selection mask" msgstr "Pulse y arrastre para mover la máscara de selección" -#: ../app/tools/gimpselectiontool.c:300 +#: ../app/tools/gimpselectiontool.c:302 msgid "Click-Drag to move the selected pixels" msgstr "Pulse y arrastre para mover los píxeles seleccionados" -#: ../app/tools/gimpselectiontool.c:304 +#: ../app/tools/gimpselectiontool.c:306 msgid "Click-Drag to move a copy of the selected pixels" msgstr "Pulse y arrastre para mover una copia de los píxeles seleccionados" -#: ../app/tools/gimpselectiontool.c:308 +#: ../app/tools/gimpselectiontool.c:310 msgid "Click to anchor the floating selection" msgstr "Pulse para anclar la selección flotante" @@ -12597,31 +13308,35 @@ msgstr "Pulse para emborronar" msgid "Click to smudge the line" msgstr "Pulse para emborronar la línea" -#: ../app/tools/gimptextoptions.c:130 +#: ../app/tools/gimptextoptions.c:137 msgid "" "Hinting alters the font outline to produce a crisp bitmap at small sizes" msgstr "" "El «hinting» altera el contorno de la tipografía para producir un mapa de " "bits preciso en tamaños pequeños" -#: ../app/tools/gimptextoptions.c:138 +#: ../app/tools/gimptextoptions.c:145 msgid "The text language may have an effect on the way the text is rendered." msgstr "" "El idioma del texto puede afectar a la forma en que el texto se renderiza." -#: ../app/tools/gimptextoptions.c:154 +#: ../app/tools/gimptextoptions.c:161 msgid "Indentation of the first line" msgstr "Sangrado de la primera línea" -#: ../app/tools/gimptextoptions.c:160 +#: ../app/tools/gimptextoptions.c:167 msgid "Adjust line spacing" msgstr "Modificar el espaciado de las líneas" -#: ../app/tools/gimptextoptions.c:166 +#: ../app/tools/gimptextoptions.c:173 msgid "Adjust letter spacing" msgstr "Modificar el espaciado de las letras" -#: ../app/tools/gimptextoptions.c:173 +#: ../app/tools/gimptextoptions.c:179 +msgid "Text box resize mode" +msgstr "Modo de redimensionamiento de la caja de texto" + +#: ../app/tools/gimptextoptions.c:186 msgid "" "Use an external editor window for text entry, instead of direct-on-canvas " "editing" @@ -12629,63 +13344,63 @@ msgstr "" "Usar una ventana de edición externa para la introducción de texto, en lugar " "de la edición directa sobre el lienzo" -#: ../app/tools/gimptextoptions.c:448 +#: ../app/tools/gimptextoptions.c:482 msgid "Font:" msgstr "Tipografía:" -#: ../app/tools/gimptextoptions.c:464 +#: ../app/tools/gimptextoptions.c:498 msgid "Use editor" msgstr "Usar editor" -#: ../app/tools/gimptextoptions.c:484 +#: ../app/tools/gimptextoptions.c:518 msgid "Hinting:" msgstr "Hinting:" -#: ../app/tools/gimptextoptions.c:488 +#: ../app/tools/gimptextoptions.c:522 msgid "Text Color" msgstr "Color del texto" -#: ../app/tools/gimptextoptions.c:493 +#: ../app/tools/gimptextoptions.c:527 msgid "Color:" msgstr "Color:" -#: ../app/tools/gimptextoptions.c:499 +#: ../app/tools/gimptextoptions.c:533 msgid "Justify:" msgstr "Justificar:" -#: ../app/tools/gimptextoptions.c:531 +#: ../app/tools/gimptextoptions.c:556 +msgid "Box:" +msgstr "Caja:" + +#: ../app/tools/gimptextoptions.c:570 msgid "Language:" msgstr "Idioma:" -#: ../app/tools/gimptexttool.c:225 +#: ../app/tools/gimptexttool.c:193 msgid "Text" msgstr "Texto" -#: ../app/tools/gimptexttool.c:226 +#: ../app/tools/gimptexttool.c:194 msgid "Text Tool: Create or edit text layers" msgstr "Herramienta de texto: crear o editar capas de texto" -#: ../app/tools/gimptexttool.c:227 +#: ../app/tools/gimptexttool.c:195 msgid "Te_xt" msgstr "Te_xto" -#: ../app/tools/gimptexttool.c:1337 +#: ../app/tools/gimptexttool.c:941 msgid "Reshape Text Layer" msgstr "Cambiar forma de la capa de texto" -#: ../app/tools/gimptexttool.c:2231 -msgid "GIMP Text Editor" -msgstr "Editor de textos de GIMP" - -#: ../app/tools/gimptexttool.c:2353 ../app/tools/gimptexttool.c:2356 +#: ../app/tools/gimptexttool.c:1479 ../app/tools/gimptexttool.c:1482 msgid "Confirm Text Editing" msgstr "Confirmar la edición del texto" -#: ../app/tools/gimptexttool.c:2360 +#: ../app/tools/gimptexttool.c:1486 msgid "Create _New Layer" msgstr "Crear una capa _nueva" -#: ../app/tools/gimptexttool.c:2384 +#: ../app/tools/gimptexttool.c:1510 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 " @@ -12700,6 +13415,10 @@ msgstr "" "Puede editar la capa o crear una capa de texto nueva desde sus atributos de " "texto." +#: ../app/tools/gimptexttool-editor.c:1118 +msgid "GIMP Text Editor" +msgstr "Editor de textos de GIMP" + #: ../app/tools/gimpthresholdtool.c:91 msgid "Threshold Tool: Reduce image to two colors using a threshold" msgstr "" @@ -12721,15 +13440,15 @@ msgstr "Importar los ajustes de umbral" msgid "Export Threshold Settings" msgstr "Exportar los ajustes de umbral" -#: ../app/tools/gimpthresholdtool.c:161 +#: ../app/tools/gimpthresholdtool.c:162 msgid "Threshold does not operate on indexed layers." msgstr "El umbral no funciona sobre capas indexadas." -#: ../app/tools/gimpthresholdtool.c:266 +#: ../app/tools/gimpthresholdtool.c:270 msgid "Automatically adjust to optimal binarization threshold" msgstr "Autoajustar al umbral óptimo de binarización" -#: ../app/tools/gimptool.c:857 +#: ../app/tools/gimptool.c:886 msgid "Can't work on an empty image, add a layer first" msgstr "No se puede trabajar sobre una imagen vacía, añada una capa primero" @@ -12738,6 +13457,8 @@ msgid "Transform:" msgstr "Transformar:" #: ../app/tools/gimptransformoptions.c:281 +#: ../app/widgets/gimpdynamicseditor.c:150 +#: ../app/widgets/gimpdynamicsoutputeditor.c:227 msgid "Direction" msgstr "Dirección" @@ -12764,18 +13485,22 @@ msgstr "15 grados (%s)" msgid "Keep aspect (%s)" msgstr "Mantener proporción (%s)" -#: ../app/tools/gimptransformtool.c:237 +#: ../app/tools/gimptransformtool.c:239 msgid "Transforming" msgstr "Transformando" -#: ../app/tools/gimptransformtool.c:1165 +#: ../app/tools/gimptransformtool.c:1192 msgid "There is no layer to transform." msgstr "No hay ninguna capa que transformar." -#: ../app/tools/gimptransformtool.c:1176 +#: ../app/tools/gimptransformtool.c:1205 msgid "There is no path to transform." msgstr "No hay ninguna ruta que transformar." +#: ../app/tools/gimptransformtool.c:1206 +msgid "The active path's strokes are locked." +msgstr "Los trazos de la ruta activa están bloqueados" + #: ../app/tools/gimpvectoroptions.c:76 msgid "Restrict editing to polygons" msgstr "Restringir la edición a poligonales" @@ -12814,320 +13539,391 @@ msgstr "Herramienta de rutas: crear y editar rutas" msgid "Pat_hs" msgstr "_Rutas" -#: ../app/tools/gimpvectortool.c:325 +#: ../app/tools/gimpvectortool.c:253 +msgid "The active path is locked." +msgstr "La ruta activa está bloqueada." + +#: ../app/tools/gimpvectortool.c:341 msgid "Add Stroke" msgstr "Añadir un trazo" -#: ../app/tools/gimpvectortool.c:348 +#: ../app/tools/gimpvectortool.c:365 msgid "Add Anchor" msgstr "Añadir un ancla" -#: ../app/tools/gimpvectortool.c:373 +#: ../app/tools/gimpvectortool.c:391 msgid "Insert Anchor" msgstr "Insertar un ancla" -#: ../app/tools/gimpvectortool.c:403 +#: ../app/tools/gimpvectortool.c:422 msgid "Drag Handle" msgstr "Arrastrar el tirador" -#: ../app/tools/gimpvectortool.c:432 +#: ../app/tools/gimpvectortool.c:452 msgid "Drag Anchor" msgstr "Arrastrar el ancla" -#: ../app/tools/gimpvectortool.c:449 +#: ../app/tools/gimpvectortool.c:470 msgid "Drag Anchors" msgstr "Arrastrar las anclas" -#: ../app/tools/gimpvectortool.c:471 +#: ../app/tools/gimpvectortool.c:493 msgid "Drag Curve" msgstr "Arrastrar la curva" -#: ../app/tools/gimpvectortool.c:499 +#: ../app/tools/gimpvectortool.c:522 msgid "Connect Strokes" msgstr "Conectar los trazos" -#: ../app/tools/gimpvectortool.c:530 +#: ../app/tools/gimpvectortool.c:554 msgid "Drag Path" msgstr "Arrastrar la ruta" -#: ../app/tools/gimpvectortool.c:540 +#: ../app/tools/gimpvectortool.c:565 msgid "Convert Edge" msgstr "Convertir el borde" -#: ../app/tools/gimpvectortool.c:570 +#: ../app/tools/gimpvectortool.c:596 msgid "Delete Anchor" msgstr "Borrar el ancla" -#: ../app/tools/gimpvectortool.c:592 +#: ../app/tools/gimpvectortool.c:619 msgid "Delete Segment" msgstr "Borrar el segmento" -#: ../app/tools/gimpvectortool.c:810 +#: ../app/tools/gimpvectortool.c:838 msgid "Move Anchors" msgstr "Mover las anclas" -#: ../app/tools/gimpvectortool.c:1170 +#: ../app/tools/gimpvectortool.c:1198 msgid "Click to pick path to edit" msgstr "Pulse para elegir la ruta que desea editar" -#: ../app/tools/gimpvectortool.c:1174 +#: ../app/tools/gimpvectortool.c:1202 msgid "Click to create a new path" msgstr "Pulse para crear una ruta nueva" -#: ../app/tools/gimpvectortool.c:1178 +#: ../app/tools/gimpvectortool.c:1206 msgid "Click to create a new component of the path" msgstr "Pulse para crear un componente nuevo de la ruta" -#: ../app/tools/gimpvectortool.c:1182 +#: ../app/tools/gimpvectortool.c:1210 msgid "Click or Click-Drag to create a new anchor" msgstr "Pulse o arrastre para crear un ancla nueva" -#: ../app/tools/gimpvectortool.c:1192 ../app/tools/gimpvectortool.c:1199 +#: ../app/tools/gimpvectortool.c:1220 ../app/tools/gimpvectortool.c:1227 msgid "Click-Drag to move the anchor around" msgstr "Pulse y arrastre para mover el ancla" -#: ../app/tools/gimpvectortool.c:1203 ../app/tools/gimpvectortool.c:1216 +#: ../app/tools/gimpvectortool.c:1231 ../app/tools/gimpvectortool.c:1254 msgid "Click-Drag to move the anchors around" msgstr "Pulse y arrastre para mover las anclas" -#: ../app/tools/gimpvectortool.c:1207 +#: ../app/tools/gimpvectortool.c:1237 msgid "Click-Drag to move the handle around" msgstr "Pulse y arrastre para mover el tirador" -#: ../app/tools/gimpvectortool.c:1221 +#: ../app/tools/gimpvectortool.c:1244 +msgid "Click-Drag to move the handles around symmetrically" +msgstr "Pulse y arrastre para mover los tiradores de forma simétrica" + +#: ../app/tools/gimpvectortool.c:1259 msgid "Click-Drag to change the shape of the curve" msgstr "Pulse y arrastre para cambiar la forma de la curva" -#: ../app/tools/gimpvectortool.c:1224 +#: ../app/tools/gimpvectortool.c:1262 #, c-format msgid "%s: symmetrical" msgstr "%s: simétrico" -#: ../app/tools/gimpvectortool.c:1229 +#: ../app/tools/gimpvectortool.c:1267 msgid "Click-Drag to move the component around" msgstr "Pulse y arrastre para mover el componente alrededor" -#: ../app/tools/gimpvectortool.c:1237 +#: ../app/tools/gimpvectortool.c:1275 msgid "Click-Drag to move the path around" msgstr "Pulse y arrastre para mover la ruta alrededor" -#: ../app/tools/gimpvectortool.c:1241 +#: ../app/tools/gimpvectortool.c:1279 msgid "Click-Drag to insert an anchor on the path" msgstr "Pulsar-arrastrar para insertar un ancla en la ruta" -#: ../app/tools/gimpvectortool.c:1249 +#: ../app/tools/gimpvectortool.c:1287 msgid "Click to delete this anchor" msgstr "Pulse para borrar este ancla" -#: ../app/tools/gimpvectortool.c:1253 +#: ../app/tools/gimpvectortool.c:1291 msgid "Click to connect this anchor with the selected endpoint" msgstr "Pulse para conectar este ancla con el extremo seleccionado" -#: ../app/tools/gimpvectortool.c:1258 +#: ../app/tools/gimpvectortool.c:1296 msgid "Click to open up the path" msgstr "Pulse para abrir la ruta" -#: ../app/tools/gimpvectortool.c:1262 +#: ../app/tools/gimpvectortool.c:1300 msgid "Click to make this node angular" msgstr "Pulse para convertir este nodo en angular" -#: ../app/tools/gimpvectortool.c:1769 +#: ../app/tools/gimpvectortool.c:1810 msgid "Delete Anchors" msgstr "Borrar anclas" -#: ../app/tools/gimpvectortool.c:1915 -msgid "Path to selection" -msgstr "Ruta a selección" - -#: ../app/tools/gimpvectortool.c:1942 +#: ../app/tools/gimpvectortool.c:1981 msgid "There is no active layer or channel to stroke to" msgstr "No hay una capa o canal activo donde se pueda trazar" -#: ../app/tools/tools-enums.c:91 +#: ../app/tools/tools-enums.c:92 msgctxt "rectangle-guide" msgid "No guides" msgstr "Sin guías" -#: ../app/tools/tools-enums.c:92 +#: ../app/tools/tools-enums.c:93 msgctxt "rectangle-guide" msgid "Center lines" msgstr "Líneas medias" -#: ../app/tools/tools-enums.c:93 +#: ../app/tools/tools-enums.c:94 msgctxt "rectangle-guide" msgid "Rule of thirds" msgstr "Regla de los tercios" -#: ../app/tools/tools-enums.c:94 +#: ../app/tools/tools-enums.c:95 +msgctxt "rectangle-guide" +msgid "Rule of fifths" +msgstr "Regla de los quintos" + +#: ../app/tools/tools-enums.c:96 msgctxt "rectangle-guide" msgid "Golden sections" msgstr "Secciones áureas" -#: ../app/tools/tools-enums.c:95 +#: ../app/tools/tools-enums.c:97 msgctxt "rectangle-guide" msgid "Diagonal lines" msgstr "Líneas diagonales" -#: ../app/tools/tools-enums.c:185 +#: ../app/tools/tools-enums.c:187 msgctxt "rectangle-tool-fixed-rule" msgid "Aspect ratio" msgstr "Proporción de aspecto" -#: ../app/tools/tools-enums.c:186 +#: ../app/tools/tools-enums.c:188 msgctxt "rectangle-tool-fixed-rule" msgid "Width" msgstr "Anchura" -#: ../app/tools/tools-enums.c:187 +#: ../app/tools/tools-enums.c:189 msgctxt "rectangle-tool-fixed-rule" msgid "Height" msgstr "Altura" -#: ../app/tools/tools-enums.c:188 +#: ../app/tools/tools-enums.c:190 msgctxt "rectangle-tool-fixed-rule" msgid "Size" msgstr "Tamaño" -#: ../app/tools/tools-enums.c:217 +#: ../app/tools/tools-enums.c:219 msgctxt "rect-select-mode" msgid "Free select" msgstr "Selección libre" -#: ../app/tools/tools-enums.c:218 +#: ../app/tools/tools-enums.c:220 msgctxt "rect-select-mode" msgid "Fixed size" msgstr "Tamaño fijo" -#: ../app/tools/tools-enums.c:219 +#: ../app/tools/tools-enums.c:221 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" msgstr "Proporción fija" -#: ../app/tools/tools-enums.c:248 +#: ../app/tools/tools-enums.c:250 msgctxt "transform-type" msgid "Layer" msgstr "Capa" -#: ../app/tools/tools-enums.c:249 +#: ../app/tools/tools-enums.c:251 msgctxt "transform-type" msgid "Selection" msgstr "Selección" -#: ../app/tools/tools-enums.c:250 +#: ../app/tools/tools-enums.c:252 msgctxt "transform-type" msgid "Path" msgstr "Ruta" -#: ../app/tools/tools-enums.c:280 +#: ../app/tools/tools-enums.c:282 msgctxt "transform-preview-type" msgid "Outline" msgstr "Contorno" -#: ../app/tools/tools-enums.c:281 +#: ../app/tools/tools-enums.c:283 msgctxt "transform-preview-type" msgid "Grid" msgstr "Rejilla" -#: ../app/tools/tools-enums.c:282 +#: ../app/tools/tools-enums.c:284 msgctxt "transform-preview-type" msgid "Image" msgstr "Imagen" -#: ../app/tools/tools-enums.c:283 +#: ../app/tools/tools-enums.c:285 msgctxt "transform-preview-type" msgid "Image + Grid" msgstr "Imagen + Rejilla" -#: ../app/tools/tools-enums.c:311 +#: ../app/tools/tools-enums.c:313 msgctxt "transform-grid-type" msgid "Number of grid lines" msgstr "Número de líneas de la rejilla" -#: ../app/tools/tools-enums.c:312 +#: ../app/tools/tools-enums.c:314 msgctxt "transform-grid-type" msgid "Grid line spacing" msgstr "Espaciado de las líneas de la rejilla" -#: ../app/tools/tools-enums.c:341 +#: ../app/tools/tools-enums.c:343 msgctxt "vector-mode" msgid "Design" msgstr "Diseño" -#: ../app/tools/tools-enums.c:342 +#: ../app/tools/tools-enums.c:344 msgctxt "vector-mode" msgid "Edit" msgstr "Editar" -#: ../app/tools/tools-enums.c:343 +#: ../app/tools/tools-enums.c:345 msgctxt "vector-mode" msgid "Move" msgstr "Mover" -#: ../app/vectors/gimpvectors.c:195 -msgid "Path" -msgstr "Ruta" - -#: ../app/vectors/gimpvectors.c:196 +#: ../app/vectors/gimpvectors.c:203 +msgctxt "undo-type" msgid "Rename Path" msgstr "Renombrar la ruta" -#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:332 +#: ../app/vectors/gimpvectors.c:204 +msgctxt "undo-type" msgid "Move Path" msgstr "Mover la ruta" -#: ../app/vectors/gimpvectors.c:198 +#: ../app/vectors/gimpvectors.c:205 +msgctxt "undo-type" msgid "Scale Path" msgstr "Escalar la ruta" -#: ../app/vectors/gimpvectors.c:199 +#: ../app/vectors/gimpvectors.c:206 +msgctxt "undo-type" msgid "Resize Path" msgstr "Redimensionar la ruta" -#: ../app/vectors/gimpvectors.c:200 ../app/vectors/gimpvectors.c:431 +#: ../app/vectors/gimpvectors.c:207 +msgctxt "undo-type" msgid "Flip Path" msgstr "Voltear la ruta" -#: ../app/vectors/gimpvectors.c:201 ../app/vectors/gimpvectors.c:462 +#: ../app/vectors/gimpvectors.c:208 +msgctxt "undo-type" msgid "Rotate Path" msgstr "Rotar la ruta" -#: ../app/vectors/gimpvectors.c:202 ../app/vectors/gimpvectors.c:492 +#: ../app/vectors/gimpvectors.c:209 +msgctxt "undo-type" msgid "Transform Path" msgstr "Transformar la ruta" -#: ../app/vectors/gimpvectors-export.c:96 +#: ../app/vectors/gimpvectors.c:210 +msgctxt "undo-type" +msgid "Stroke Path" +msgstr "Trazar ruta" + +#: ../app/vectors/gimpvectors.c:211 +msgctxt "undo-type" +msgid "Path to Selection" +msgstr "Ruta a selección" + +#: ../app/vectors/gimpvectors.c:212 +msgctxt "undo-type" +msgid "Reorder Path" +msgstr "Reordenar la ruta" + +#: ../app/vectors/gimpvectors.c:213 +msgctxt "undo-type" +msgid "Raise Path" +msgstr "Elevar la ruta" + +#: ../app/vectors/gimpvectors.c:214 +msgctxt "undo-type" +msgid "Raise Path to Top" +msgstr "Subir la ruta al lugar más alto" + +#: ../app/vectors/gimpvectors.c:215 +msgctxt "undo-type" +msgid "Lower Path" +msgstr "Bajar la ruta" + +#: ../app/vectors/gimpvectors.c:216 +msgctxt "undo-type" +msgid "Lower Path to Bottom" +msgstr "Bajar la ruta al lugar más bajo" + +#: ../app/vectors/gimpvectors.c:217 +msgid "Path cannot be raised higher." +msgstr "La ruta no puede ser elevada más alto." + +#: ../app/vectors/gimpvectors.c:218 +msgid "Path cannot be lowered more." +msgstr "La ruta no puede descender más." + +#: ../app/vectors/gimpvectors.c:351 +msgid "Move Path" +msgstr "Mover la ruta" + +#: ../app/vectors/gimpvectors.c:450 +msgid "Flip Path" +msgstr "Voltear la ruta" + +#: ../app/vectors/gimpvectors.c:481 +msgid "Rotate Path" +msgstr "Rotar la ruta" + +#: ../app/vectors/gimpvectors.c:511 +msgid "Transform Path" +msgstr "Transformar la ruta" + +#: ../app/vectors/gimpvectors-export.c:95 #, c-format msgid "Error while writing '%s': %s" msgstr "Ocurrió un error al escribir «%s»: %s" -#: ../app/vectors/gimpvectors-import.c:308 +#: ../app/vectors/gimpvectors-import.c:330 msgid "Import Paths" msgstr "Importar rutas" -#: ../app/vectors/gimpvectors-import.c:319 +#: ../app/vectors/gimpvectors-import.c:341 msgid "Imported Path" msgstr "Ruta importada" -#: ../app/vectors/gimpvectors-import.c:350 +#: ../app/vectors/gimpvectors-import.c:372 #, c-format msgid "No paths found in '%s'" msgstr "No se encontraron rutas en «%s»" -#: ../app/vectors/gimpvectors-import.c:354 +#: ../app/vectors/gimpvectors-import.c:376 msgid "No paths found in the buffer" msgstr "No se encontraron rutas en el búfer" -#: ../app/vectors/gimpvectors-import.c:364 +#: ../app/vectors/gimpvectors-import.c:386 #, c-format msgid "Failed to import paths from '%s': %s" msgstr "Fallo al importar rutas desde «%s»: %s" # Viendo el programa, parece más bien "cizalla". FVD -#: ../app/widgets/gimpactioneditor.c:70 +#: ../app/widgets/gimpactioneditor.c:66 msgid "_Search:" msgstr "Bu_scar:" -#: ../app/widgets/gimpactiongroup.c:822 +#: ../app/widgets/gimpactiongroup.c:867 #, c-format msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" @@ -13198,18 +13994,10 @@ msgid "Percentage of width of brush" msgstr "Porcentaje del ancho del pincel" #: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257 -#: ../app/widgets/gimpeditor.c:745 +#: ../app/widgets/gimpeditor.c:735 msgid "(None)" msgstr "(Ninguno)" -#: ../app/widgets/gimpchanneltreeview.c:134 -msgid "Reorder Channel" -msgstr "Reordenar el canal" - -#: ../app/widgets/gimpchanneltreeview.c:345 -msgid "Empty Channel" -msgstr "Canal vacío" - #: ../app/widgets/gimpcolordialog.c:149 msgid "Add the current color to the color history" msgstr "Añadir el color actual al historial de colores" @@ -13256,56 +14044,56 @@ msgstr "" "Notación hexadecimal del color como la que se utiliza en el HTML y CSS. Esta " "entrada acepta también nombres de color CSS." -#: ../app/widgets/gimpcolorframe.c:501 +#: ../app/widgets/gimpcolorframe.c:508 msgid "Index:" msgstr "Índice:" -#: ../app/widgets/gimpcolorframe.c:514 ../app/widgets/gimpcolorframe.c:540 +#: ../app/widgets/gimpcolorframe.c:521 ../app/widgets/gimpcolorframe.c:547 msgid "Red:" msgstr "Rojo:" -#: ../app/widgets/gimpcolorframe.c:515 ../app/widgets/gimpcolorframe.c:541 +#: ../app/widgets/gimpcolorframe.c:522 ../app/widgets/gimpcolorframe.c:548 msgid "Green:" msgstr "Verde:" -#: ../app/widgets/gimpcolorframe.c:516 ../app/widgets/gimpcolorframe.c:542 +#: ../app/widgets/gimpcolorframe.c:523 ../app/widgets/gimpcolorframe.c:549 msgid "Blue:" msgstr "Azul:" -#: ../app/widgets/gimpcolorframe.c:529 ../app/widgets/gimpcolorframe.c:562 +#: ../app/widgets/gimpcolorframe.c:536 ../app/widgets/gimpcolorframe.c:569 msgid "Value:" msgstr "Valor:" -#: ../app/widgets/gimpcolorframe.c:553 +#: ../app/widgets/gimpcolorframe.c:560 msgid "Hex:" msgstr "Hex:" -#: ../app/widgets/gimpcolorframe.c:560 +#: ../app/widgets/gimpcolorframe.c:567 msgid "Hue:" msgstr "Tono:" -#: ../app/widgets/gimpcolorframe.c:561 +#: ../app/widgets/gimpcolorframe.c:568 msgid "Sat.:" msgstr "Sat.:" # A ver si de una vez dejamos tranqilito el Cian sin acento. -#: ../app/widgets/gimpcolorframe.c:579 +#: ../app/widgets/gimpcolorframe.c:586 msgid "Cyan:" msgstr "Cian:" -#: ../app/widgets/gimpcolorframe.c:580 +#: ../app/widgets/gimpcolorframe.c:587 msgid "Magenta:" msgstr "Magenta:" -#: ../app/widgets/gimpcolorframe.c:581 +#: ../app/widgets/gimpcolorframe.c:588 msgid "Yellow:" msgstr "Amarillo:" -#: ../app/widgets/gimpcolorframe.c:582 +#: ../app/widgets/gimpcolorframe.c:589 msgid "Black:" msgstr "Negro:" -#: ../app/widgets/gimpcolorframe.c:602 +#: ../app/widgets/gimpcolorframe.c:609 msgid "Alpha:" msgstr "Alfa:" @@ -13317,7 +14105,7 @@ msgstr "Índice de colores:" msgid "HTML notation:" msgstr "Notación HTML:" -#: ../app/widgets/gimpcolormapeditor.c:490 +#: ../app/widgets/gimpcolormapeditor.c:487 msgid "Only indexed images have a colormap." msgstr "Solamente las imágenes indexadas tienen un mapa de colores." @@ -13325,11 +14113,11 @@ msgstr "Solamente las imágenes indexadas tienen un mapa de colores." msgid "Palette" msgstr "Paleta" -#: ../app/widgets/gimpcontainerpopup.c:540 +#: ../app/widgets/gimpcontainerpopup.c:578 msgid "Smaller Previews" msgstr "Vistas previas diminutas" -#: ../app/widgets/gimpcontainerpopup.c:545 +#: ../app/widgets/gimpcontainerpopup.c:583 msgid "Larger Previews" msgstr "Vistas previas enormes" @@ -13357,26 +14145,26 @@ msgstr "Evento" msgid "_Grab event" msgstr "_Capturar un evento" -#: ../app/widgets/gimpcontrollereditor.c:373 +#: ../app/widgets/gimpcontrollereditor.c:372 msgid "Select the next event arriving from the controller" msgstr "Seleccionar el siguiente evento que llega desde el controlador" -#: ../app/widgets/gimpcontrollereditor.c:531 +#: ../app/widgets/gimpcontrollereditor.c:530 #, c-format msgid "Remove the action assigned to '%s'" msgstr "Eliminar la acción asignada a «%s»" -#: ../app/widgets/gimpcontrollereditor.c:536 +#: ../app/widgets/gimpcontrollereditor.c:535 #, c-format msgid "Assign an action to '%s'" msgstr "Asignar una acción «%s»" -#: ../app/widgets/gimpcontrollereditor.c:657 +#: ../app/widgets/gimpcontrollereditor.c:656 #, c-format msgid "Select Action for Event '%s'" msgstr "Seleccionar la acción para el evento «%s»" -#: ../app/widgets/gimpcontrollereditor.c:662 +#: ../app/widgets/gimpcontrollereditor.c:661 msgid "Select Controller Event Action" msgstr "Seleccionar un controlador de acción de evento" @@ -13575,61 +14363,194 @@ msgstr "Rueda del ratón" msgid "Mouse Wheel Events" msgstr "Eventos de la rueda del ratón" -#: ../app/widgets/gimpdataeditor.c:219 +#: ../app/widgets/gimpdataeditor.c:221 msgid "Save" msgstr "Guardar" -#: ../app/widgets/gimpdataeditor.c:227 +#: ../app/widgets/gimpdataeditor.c:229 msgid "Revert" msgstr "Revertir" -#: ../app/widgets/gimpdataeditor.c:443 +#: ../app/widgets/gimpdataeditor.c:445 #, c-format msgid "%s (read only)" msgstr "%s (sólo lectura)" -#: ../app/widgets/gimpdevicestatus.c:137 +#: ../app/widgets/gimpdeviceeditor.c:161 +msgid "Delete the selected device" +msgstr "Eliminar el dispositivo seleccionado" + +#: ../app/widgets/gimpdeviceeditor.c:469 +msgid "Delete Device Settings" +msgstr "Eliminar los ajustes del dispositivo" + +#: ../app/widgets/gimpdeviceeditor.c:490 +#, c-format +msgid "Delete \"%s\"?" +msgstr "¿Borrar «%s»?" + +#: ../app/widgets/gimpdeviceeditor.c:493 +msgid "" +"You are about to delete this device's stored settings.\n" +"The next time this device is plugged, default settings will be used." +msgstr "" +"Va a eliminar los ajustes almacenados de este dispositivo.\n" +"La próxima vez que se conecte este dispositivo, se utilizarán los ajustes " +"predeterminados." + +#: ../app/widgets/gimpdeviceinfoeditor.c:142 +#: ../app/widgets/gimpdynamicseditor.c:148 +#: ../app/widgets/gimpdynamicsoutputeditor.c:213 +msgid "Pressure" +msgstr "Presión" + +#: ../app/widgets/gimpdeviceinfoeditor.c:143 +msgid "X tilt" +msgstr "Inclinación X" + +#: ../app/widgets/gimpdeviceinfoeditor.c:144 +msgid "Y tilt" +msgstr "Inclinación Y" + +#: ../app/widgets/gimpdeviceinfoeditor.c:145 +#: ../app/widgets/gimpdynamicseditor.c:152 +#: ../app/widgets/gimpdynamicsoutputeditor.c:241 +msgid "Wheel" +msgstr "Rueda" + +# Debe ir en minúsculas por las reglas de estilo +#. the axes +#: ../app/widgets/gimpdeviceinfoeditor.c:192 +msgid "Axes" +msgstr "Ejes" + +#. the keys +#: ../app/widgets/gimpdeviceinfoeditor.c:266 +msgid "Keys" +msgstr "Teclas" + +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:584 +#, c-format +msgid "none" +msgstr "ninguna" + +#: ../app/widgets/gimpdeviceinfoeditor.c:414 +#, c-format +msgid "%s Curve" +msgstr "Curva %s" + +#: ../app/widgets/gimpdeviceinfoeditor.c:473 +#: ../app/widgets/gimpdynamicsoutputeditor.c:196 +msgid "_Reset Curve" +msgstr "R_establecer la curva" + +#: ../app/widgets/gimpdeviceinfoeditor.c:486 +#, c-format +msgid "The axis '%s' has no curve" +msgstr "El eje «%s» no tiene ninguna curva" + +#: ../app/widgets/gimpdevicestatus.c:139 msgid "Save device status" msgstr "Guardar estado del dispositivo" -#: ../app/widgets/gimpdevicestatus.c:447 +#: ../app/widgets/gimpdevicestatus.c:448 #, c-format msgid "Foreground: %d, %d, %d" msgstr "Frente: %d, %d, %d" -#: ../app/widgets/gimpdevicestatus.c:452 +#: ../app/widgets/gimpdevicestatus.c:453 #, c-format msgid "Background: %d, %d, %d" msgstr "Fondo: %d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:201 +#: ../app/widgets/gimpdnd-xds.c:203 msgid "The given filename does not have any known file extension." msgstr "El archivo dado no tiene una extensión conocida." -#: ../app/widgets/gimpdnd-xds.c:219 +#: ../app/widgets/gimpdnd-xds.c:221 msgid "File Exists" msgstr "El archivo ya existe" -#: ../app/widgets/gimpdnd-xds.c:224 +#: ../app/widgets/gimpdnd-xds.c:226 msgid "_Replace" msgstr "_Reemplazar" -#: ../app/widgets/gimpdnd-xds.c:235 +#: ../app/widgets/gimpdnd-xds.c:237 #, c-format msgid "A file named '%s' already exists." msgstr "Ya existe un archivo llamado «%s»." -#: ../app/widgets/gimpdnd-xds.c:240 +#: ../app/widgets/gimpdnd-xds.c:242 msgid "Do you want to replace it with the image you are saving?" msgstr "¿Quiere reemplazarlo por la imagen que está guardando?" -#: ../app/widgets/gimpdockable.c:193 +#. String used to separate dockables, e.g. "Tool Options, Layers" +#: ../app/widgets/gimpdock.h:34 +msgctxt "dock" +msgid ", " +msgstr ", " + +#. String used to separate books (GtkNotebooks) within a dock, +#. e.g. "Tool Options, Layers - Brushes" +#. +#: ../app/widgets/gimpdock.h:39 +msgctxt "dock" +msgid " - " +msgstr " - " + +#. String used to separate dock columns, +#. e.g. "Tool Options, Layers - Brushes | Gradients" +#. +#: ../app/widgets/gimpdock.h:44 +msgctxt "dock" +msgid " | " +msgstr " | " + +#: ../app/widgets/gimpdockbook.c:290 msgid "Configure this tab" msgstr "Configurar esta solapa" -#: ../app/widgets/gimpdockseparator.c:43 -msgid "You can drop dockable dialogs here" -msgstr "Puede soltar los diálogos empotrables aquí" +#. Auto button +#: ../app/widgets/gimpdockwindow.c:353 +msgid "Auto" +msgstr "Auto" + +#: ../app/widgets/gimpdockwindow.c:364 +msgid "" +"When enabled the dialog automatically follows the image you are working on." +msgstr "" +"Cuando está activado el diálogo automáticamente sigue a la imagen en la que " +"está trabajando." + +#: ../app/widgets/gimpdrawabletreeview.c:124 +msgid "Lock pixels" +msgstr "Bloquear píxeles" + +#: ../app/widgets/gimpdynamicseditor.c:133 +#: ../app/widgets/gimpdynamicseditor.c:139 +msgid "Mapping matrix" +msgstr "Matriz de mapeado" + +#: ../app/widgets/gimpdynamicseditor.c:149 +#: ../app/widgets/gimpdynamicsoutputeditor.c:220 +msgid "Velocity" +msgstr "Velocidad" + +#: ../app/widgets/gimpdynamicseditor.c:151 +#: ../app/widgets/gimpdynamicsoutputeditor.c:234 +msgid "Tilt" +msgstr "Inclinación" + +#: ../app/widgets/gimpdynamicseditor.c:153 +#: ../app/widgets/gimpdynamicsoutputeditor.c:248 +msgid "Random" +msgstr "Aleatorio" + +#: ../app/widgets/gimpdynamicseditor.c:154 +#: ../app/widgets/gimpdynamicsoutputeditor.c:255 +msgid "Fade" +msgstr "Desvanecer" #: ../app/widgets/gimperrordialog.c:150 msgid "Too many error messages!" @@ -13644,23 +14565,23 @@ msgstr "Los mensajes se redirigen a stderr." msgid "%s Message" msgstr "Mensaje de %s" -#: ../app/widgets/gimpfiledialog.c:315 +#: ../app/widgets/gimpfiledialog.c:326 msgid "Automatically Detected" msgstr "Detectado automáticamente" -#: ../app/widgets/gimpfiledialog.c:329 +#: ../app/widgets/gimpfiledialog.c:343 msgid "By Extension" msgstr "Por extensión" -#: ../app/widgets/gimpfiledialog.c:775 +#: ../app/widgets/gimpfiledialog.c:799 msgid "All files" msgstr "Todos los archivos" -#: ../app/widgets/gimpfiledialog.c:780 +#: ../app/widgets/gimpfiledialog.c:804 msgid "All images" msgstr "Todas las imágenes" -#: ../app/widgets/gimpfiledialog.c:909 +#: ../app/widgets/gimpfiledialog.c:980 #, c-format msgid "Select File _Type (%s)" msgstr "Seleccione el _tipo de archivo (%s)" @@ -13888,15 +14809,15 @@ msgid "" "Edit→Preferences→Default Image." msgstr "" "Sustituir el comentario actual de la imagen por el comentario predeterminado " -"establecido en Editar→Preferenccias→Imagen predeterminada." +"establecido en Editar→Preferencias→Imagen predeterminada." #: ../app/widgets/gimpimageprofileview.c:200 msgid "Querying..." msgstr "Consultando…" #: ../app/widgets/gimpimagepropview.c:122 -msgid "Pixel dimensions:" -msgstr "Dimensiones en píxeles:" +msgid "Size in pixels:" +msgstr "Tamaño en píxeles:" #: ../app/widgets/gimpimagepropview.c:125 msgid "Print size:" @@ -13955,54 +14876,35 @@ msgstr "Número de rutas:" msgid "None" msgstr "Ninguno" -#: ../app/widgets/gimpimagepropview.c:471 +#: ../app/widgets/gimpimagepropview.c:470 #, c-format msgid "pixels/%s" msgstr "píxeles/%s" -#: ../app/widgets/gimpimagepropview.c:473 +#: ../app/widgets/gimpimagepropview.c:472 #, c-format msgid "%g × %g %s" msgstr "%g x %g %s" -#: ../app/widgets/gimpimagepropview.c:494 +#: ../app/widgets/gimpimagepropview.c:493 msgid "colors" msgstr "colores" -#: ../app/widgets/gimpitemtreeview.c:1062 -msgid "Set Item Exclusive Visible" -msgstr "Define al elemento como exclusivo visible" - -#: ../app/widgets/gimpitemtreeview.c:1070 -msgid "Set Item Exclusive Linked" -msgstr "Define al elemento como exclusivo enlazado" - -#: ../app/widgets/gimplayertreeview.c:241 -msgid "Reorder Layer" -msgstr "Reordenar la capa" - -#: ../app/widgets/gimplayertreeview.c:337 -msgid "Lock alpha channel" -msgstr "Bloquear el canal alfa" - -#: ../app/widgets/gimplayertreeview.c:349 +#: ../app/widgets/gimpitemtreeview.c:708 msgid "Lock:" msgstr "Bloquear:" -#: ../app/widgets/gimplayertreeview.c:875 -msgid "Empty Layer" -msgstr "Capa vacía" +#: ../app/widgets/gimpitemtreeview.c:1481 +msgid "Set Item Exclusive Visible" +msgstr "Define al elemento como exclusivo visible" -#: ../app/widgets/gimpmenudock.c:159 -msgid "Auto" -msgstr "Auto" +#: ../app/widgets/gimpitemtreeview.c:1489 +msgid "Set Item Exclusive Linked" +msgstr "Define al elemento como exclusivo enlazado" -#: ../app/widgets/gimpmenudock.c:170 -msgid "" -"When enabled the dialog automatically follows the image you are working on." -msgstr "" -"Cuando está activado el diálogo automáticamente sigue a la imagen en la que " -"está trabajando." +#: ../app/widgets/gimplayertreeview.c:309 +msgid "Lock alpha channel" +msgstr "Bloquear el canal alfa" #: ../app/widgets/gimpmessagebox.c:442 #, c-format @@ -14014,7 +14916,7 @@ msgid "Message repeated once." msgstr "Mensaje repetido una vez." #: ../app/widgets/gimppaletteeditor.c:254 -#: ../app/widgets/gimppaletteeditor.c:740 +#: ../app/widgets/gimppaletteeditor.c:745 msgid "Undefined" msgstr "Indefinido" @@ -14030,7 +14932,7 @@ msgstr "Perfil de color ICC (*.icc, *.icm)" msgid "Progress" msgstr "Progreso" -#: ../app/widgets/gimpselectiondata.c:247 +#: ../app/widgets/gimpselectiondata.c:249 #, c-format msgid "" "The filename '%s' couldn't be converted to a valid URI:\n" @@ -14041,55 +14943,55 @@ msgstr "" "\n" "%s" -#: ../app/widgets/gimpselectiondata.c:251 +#: ../app/widgets/gimpselectiondata.c:253 msgid "Invalid UTF-8" msgstr "UTF-8 inválido" -#: ../app/widgets/gimpsettingsbox.c:240 +#: ../app/widgets/gimpsettingsbox.c:241 msgid "Pick a setting from the list" msgstr "Seleccione un ajuste de la lista" -#: ../app/widgets/gimpsettingsbox.c:261 +#: ../app/widgets/gimpsettingsbox.c:262 msgid "Add settings to favorites" msgstr "Añadir los ajustes a los favoritos" -#: ../app/widgets/gimpsettingsbox.c:289 +#: ../app/widgets/gimpsettingsbox.c:290 msgid "_Import Settings from File..." msgstr "_Importar ajustes desde un archivo…" -#: ../app/widgets/gimpsettingsbox.c:295 +#: ../app/widgets/gimpsettingsbox.c:296 msgid "_Export Settings to File..." msgstr "_Exportar ajustes a un archivo…" -#: ../app/widgets/gimpsettingsbox.c:302 +#: ../app/widgets/gimpsettingsbox.c:303 msgid "_Manage Settings..." msgstr "_Gestionar ajustes…" -#: ../app/widgets/gimpsettingsbox.c:589 +#: ../app/widgets/gimpsettingsbox.c:590 msgid "Add Settings to Favorites" msgstr "Añadir ajustes a los favoritos" -#: ../app/widgets/gimpsettingsbox.c:592 +#: ../app/widgets/gimpsettingsbox.c:593 msgid "Enter a name for the settings" msgstr "Introduzca un nombre para las opciones guardadas" -#: ../app/widgets/gimpsettingsbox.c:593 +#: ../app/widgets/gimpsettingsbox.c:594 msgid "Saved Settings" msgstr "Opciones guardadas" -#: ../app/widgets/gimpsettingsbox.c:629 +#: ../app/widgets/gimpsettingsbox.c:630 msgid "Manage Saved Settings" msgstr "Gestionar las opciones guardadas" -#: ../app/widgets/gimpsettingseditor.c:173 +#: ../app/widgets/gimpsettingseditor.c:174 msgid "Import settings from a file" msgstr "Importar ajustes desde un archivo" -#: ../app/widgets/gimpsettingseditor.c:182 +#: ../app/widgets/gimpsettingseditor.c:183 msgid "Export the selected settings to a file" msgstr "Exportar los ajustes seleccionados a un archivo" -#: ../app/widgets/gimpsettingseditor.c:191 +#: ../app/widgets/gimpsettingseditor.c:192 msgid "Delete the selected settings" msgstr "Borrar los ajustes seleccionados" @@ -14129,7 +15031,7 @@ msgstr "Patrón de punteado:" #: ../app/widgets/gimpstrokeeditor.c:299 msgid "Dash _preset:" -msgstr "_Preconfiguración del punteado:" +msgstr "Ajuste _prefijado del punteado:" #: ../app/widgets/gimptagentry.c:43 msgid "filter" @@ -14143,7 +15045,7 @@ msgstr "introducir etiquetas" #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1653 +#: ../app/widgets/gimptagentry.c:1716 msgid "," msgstr "," @@ -14186,10 +15088,41 @@ msgstr "%d x %d ppp, %s" msgid "%d ppi, %s" msgstr "%d ppp, %s" -#: ../app/widgets/gimptexteditor.c:203 +#: ../app/widgets/gimptextbuffer-serialize.c:338 +#, c-format +msgid "Attribute \"%s\" is invalid on <%s> element in this context" +msgstr "El atributo «%s» no es válido sobre el elemento <%s> en este contexto" + +#: ../app/widgets/gimptextbuffer-serialize.c:410 +#, c-format +msgid "Outermost element in text must be not <%s>" +msgstr "El elemento más externo dentro del texto debe ser , no <%s>" + +#: ../app/widgets/gimptextbuffer.c:1319 +#, c-format +msgid "Invalid UTF-8 data in file '%s'." +msgstr "Datos UTF-8 inválidos en el archivo «%s»." + +#: ../app/widgets/gimptexteditor.c:205 msgid "_Use selected font" msgstr "_Utilizar la tipografía seleccionada" +#: ../app/widgets/gimptextstyleeditor.c:192 +msgid "Change size of selected text" +msgstr "Cambiar el tamaño del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:211 +msgid "Clear style of selected text" +msgstr "Borrar el estilo del texto seleccionad" + +#: ../app/widgets/gimptextstyleeditor.c:231 +msgid "Change kerning of selected text" +msgstr "Cambiar el kerning del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:247 +msgid "Change baseline of selected text" +msgstr "Cambiar la línea de base del texto seleccionado" + #: ../app/widgets/gimpthumbbox.c:343 #, c-format msgid "" @@ -14274,35 +15207,90 @@ msgstr "" "El degradado activo.\n" "Pulse para abrir el diálogo de degradados." -#: ../app/widgets/gimptooloptionseditor.c:164 +#: ../app/widgets/gimptooleditor.c:295 +msgid "Raise this tool" +msgstr "Eleva esta herramienta" + +#: ../app/widgets/gimptooleditor.c:296 +msgid "Raise this tool to the top" +msgstr "Elevar esta herramienta hasta el lugar más alto" + +#: ../app/widgets/gimptooleditor.c:303 +msgid "Lower this tool" +msgstr "Bajar esta herramienta" + +#: ../app/widgets/gimptooleditor.c:304 +msgid "Lower this tool to the bottom" +msgstr "Bajar esta herramienta hasta el lugar más bajo" + +#: ../app/widgets/gimptooleditor.c:311 +msgid "Reset tool order and visibility" +msgstr "Reiniciar el orden y la visibilidad de las herramientas" + +#: ../app/widgets/gimptooloptionseditor.c:208 msgid "Save options to..." msgstr "Guardar las opciones en…" -#: ../app/widgets/gimptooloptionseditor.c:172 +#: ../app/widgets/gimptooloptionseditor.c:216 msgid "Restore options from..." msgstr "Recuperar opciones desde…" -#: ../app/widgets/gimptooloptionseditor.c:180 +#: ../app/widgets/gimptooloptionseditor.c:224 msgid "Delete saved options..." msgstr "Borrar las opciones guardadas…" -#: ../app/widgets/gimptooloptionseditor.c:479 +#: ../app/widgets/gimptooloptionseditor.c:573 #, c-format msgid "Error saving tool options presets: %s" msgstr "" -"Ocurrió un error al guardar los valores predeterminados de las herramientas: " -"%s" +"Ocurrió un error al guardar los ajustes prefijados de las herramientas: %s" -#: ../app/widgets/gimpuimanager.c:740 +#: ../app/widgets/gimptoolpreseteditor.c:109 +msgid "Apply stored FG/BG" +msgstr "Aplicar el primer plano y el fondo almacenados" + +#: ../app/widgets/gimptoolpreseteditor.c:115 +msgid "Apply stored brush" +msgstr "Aplicar el pincel almacenado" + +#: ../app/widgets/gimptoolpreseteditor.c:121 +msgid "Apply stored dynamics" +msgstr "Aplicar la dinámica almacenada" + +#: ../app/widgets/gimptoolpreseteditor.c:127 +msgid "Apply stored gradient" +msgstr "Aplicar el degradado almacenado" + +#: ../app/widgets/gimptoolpreseteditor.c:133 +msgid "Apply stored pattern" +msgstr "Aplicar el patrón almacenado" + +#: ../app/widgets/gimptoolpreseteditor.c:139 +msgid "Apply stored pallete" +msgstr "Aplicar la paleta almacenada" + +#: ../app/widgets/gimptoolpreseteditor.c:145 +msgid "Apply stored font" +msgstr "Aplicar la tipografía almacenada" + +#: ../app/widgets/gimptranslationstore.c:105 +msgid "System Language" +msgstr "Idioma del sistema" + +#: ../app/widgets/gimptranslationstore.c:107 +msgid "English" +msgstr "Inglés" + +#: ../app/widgets/gimpuimanager.c:750 msgid "Your GIMP installation is incomplete:" msgstr "Su instalación de GIMP está incompleta:" -#: ../app/widgets/gimpuimanager.c:742 +#: ../app/widgets/gimpuimanager.c:752 msgid "Please make sure the menu XML files are correctly installed." msgstr "" "Asegúrese de que los archivos XML del menú están instalados correctamente." -#: ../app/widgets/gimpuimanager.c:748 +#: ../app/widgets/gimpuimanager.c:758 #, c-format msgid "There was an error parsing the menu definition from %s: %s" msgstr "Hubo un error al analizar la definición de menú a partir de %s: %s" @@ -14311,14 +15299,9 @@ msgstr "Hubo un error al analizar la definición de menú a partir de %s: %s" msgid "[ Base Image ]" msgstr "[ Imagen Base ]" -#: ../app/widgets/gimpvectorstreeview.c:116 -msgid "Reorder path" -msgstr "Reordenar la ruta" - -# Otra vez Empty es adjetivo. -#: ../app/widgets/gimpvectorstreeview.c:260 -msgid "Empty Path" -msgstr "Ruta vacía" +#: ../app/widgets/gimpvectorstreeview.c:112 +msgid "Lock path strokes" +msgstr "Bloquear los trazos de ruta" #: ../app/widgets/gimpviewablebox.c:80 msgid "Open the brush selection dialog" @@ -14332,10 +15315,6 @@ msgstr "Abre el diálogo de selección de patrón" msgid "Open the gradient selection dialog" msgstr "Abre el diálogo de selección de degradado" -#: ../app/widgets/gimpviewablebox.c:223 -msgid "Reverse" -msgstr "Invertido" - #: ../app/widgets/gimpviewablebox.c:305 msgid "Open the palette selection dialog" msgstr "Abre el diálogo de selección de paleta" @@ -14344,31 +15323,26 @@ msgstr "Abre el diálogo de selección de paleta" msgid "Open the font selection dialog" msgstr "Abre el diálogo de selección de tipografía" -#: ../app/widgets/gimpwidgets-utils.c:651 +#: ../app/widgets/gimpwidgets-utils.c:670 #, c-format msgid "%s (try %s)" msgstr "%s (intente %s)" -#: ../app/widgets/gimpwidgets-utils.c:651 +#: ../app/widgets/gimpwidgets-utils.c:670 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../app/widgets/gimpwidgets-utils.c:655 +#: ../app/widgets/gimpwidgets-utils.c:674 #, c-format msgid "%s (try %s, %s)" msgstr "%s (intente %s, %s)" -#: ../app/widgets/gimpwidgets-utils.c:659 +#: ../app/widgets/gimpwidgets-utils.c:678 #, c-format msgid "%s (try %s, %s, %s)" msgstr "%s (intente %s, %s, %s)" -#: ../app/widgets/gimpwidgets-utils.c:927 -#, c-format -msgid "Invalid UTF-8 data in file '%s'." -msgstr "Datos UTF-8 inválidos en el archivo «%s»." - #: ../app/widgets/widgets-enums.c:23 msgctxt "active-color" msgid "Foreground" @@ -14421,91 +15395,61 @@ msgid "Add to palette" msgstr "Añadir a la paleta" #: ../app/widgets/widgets-enums.c:178 -msgctxt "cursor-format" -msgid "Black & white" -msgstr "Blanco y negro" - -#: ../app/widgets/widgets-enums.c:179 -msgctxt "cursor-format" -msgid "Fancy" -msgstr "Fantasía" - -#: ../app/widgets/widgets-enums.c:207 -msgctxt "help-browser-type" -msgid "GIMP help browser" -msgstr "Visor de ayuda de GIMP" - -#: ../app/widgets/widgets-enums.c:208 -msgctxt "help-browser-type" -msgid "Web browser" -msgstr "Navegador web" - -#: ../app/widgets/widgets-enums.c:236 msgctxt "histogram-scale" msgid "Linear histogram" msgstr "Histograma lineal" -#: ../app/widgets/widgets-enums.c:237 +#: ../app/widgets/widgets-enums.c:179 msgctxt "histogram-scale" msgid "Logarithmic histogram" msgstr "Histograma logarítmico" -#: ../app/widgets/widgets-enums.c:271 +#: ../app/widgets/widgets-enums.c:215 msgctxt "tab-style" msgid "Icon" msgstr "Icono" -#: ../app/widgets/widgets-enums.c:272 +#: ../app/widgets/widgets-enums.c:216 msgctxt "tab-style" msgid "Current status" msgstr "Estado actual" -#: ../app/widgets/widgets-enums.c:273 +#: ../app/widgets/widgets-enums.c:217 msgctxt "tab-style" msgid "Text" msgstr "Texto" -#: ../app/widgets/widgets-enums.c:274 +#: ../app/widgets/widgets-enums.c:218 msgctxt "tab-style" msgid "Description" msgstr "Descripción" -#: ../app/widgets/widgets-enums.c:275 +#: ../app/widgets/widgets-enums.c:219 msgctxt "tab-style" msgid "Icon & text" msgstr "Icono y texto" -#: ../app/widgets/widgets-enums.c:276 +#: ../app/widgets/widgets-enums.c:220 msgctxt "tab-style" msgid "Icon & desc" msgstr "Icono y descr." -#: ../app/widgets/widgets-enums.c:277 +#: ../app/widgets/widgets-enums.c:221 msgctxt "tab-style" msgid "Status & text" msgstr "Estado y texto" -#: ../app/widgets/widgets-enums.c:278 +#: ../app/widgets/widgets-enums.c:222 msgctxt "tab-style" msgid "Status & desc" msgstr "Estado y descripción" -#: ../app/widgets/widgets-enums.c:336 -msgctxt "window-hint" -msgid "Normal window" -msgstr "Ventana normal" +#: ../app/widgets/widgets-enums.c:223 +msgctxt "tab-style" +msgid "Undefined" +msgstr "Indefinido" -#: ../app/widgets/widgets-enums.c:337 -msgctxt "window-hint" -msgid "Utility window" -msgstr "Ventana de utilidades" - -#: ../app/widgets/widgets-enums.c:338 -msgctxt "window-hint" -msgid "Keep above" -msgstr "Mantener por encima" - -#: ../app/xcf/xcf-load.c:280 +#: ../app/xcf/xcf-load.c:332 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -14513,7 +15457,7 @@ msgstr "" "¡Este archivo XCF está corrupto! He cargado de él todo lo que he podido, " "pero está incompleto." -#: ../app/xcf/xcf-load.c:289 +#: ../app/xcf/xcf-load.c:343 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." @@ -14521,7 +15465,7 @@ msgstr "" "¡Este archivo XCF está corrupto! No he podido salvar de él ni siquiera una " "imagen parcial." -#: ../app/xcf/xcf-load.c:327 +#: ../app/xcf/xcf-load.c:407 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -14545,27 +15489,27 @@ msgstr "Ocurrió un error al escribir XCF: %s" msgid "Could not seek in XCF file: %s" msgstr "No se ha podido desplazarse dentro del archivo XCF: %s" -#: ../app/xcf/xcf.c:98 ../app/xcf/xcf.c:166 +#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167 msgid "GIMP XCF image" msgstr "Imagen XCF de GIMP" -#: ../app/xcf/xcf.c:270 +#: ../app/xcf/xcf.c:271 #, c-format msgid "Opening '%s'" msgstr "Abriendo «%s»" -#: ../app/xcf/xcf.c:312 +#: ../app/xcf/xcf.c:313 #, c-format msgid "XCF error: unsupported XCF file version %d encountered" msgstr "" "Error XCF: Se encontró una versión %d de archivo de tipo XCF no soportada" -#: ../app/xcf/xcf.c:382 +#: ../app/xcf/xcf.c:383 #, c-format msgid "Saving '%s'" msgstr "Guardando «%s»" -#: ../app/xcf/xcf.c:402 +#: ../app/xcf/xcf.c:403 #, c-format msgid "Error saving XCF file: %s" msgstr "Ocurrió un error al guardar el archivo XCF: %s" @@ -14617,15 +15561,3 @@ msgstr "¡Asegúrese de que la caja de herramientas está visible!" #, c-format msgid "Couldn't start '%s': %s" msgstr "No se ha podido iniciar «%s»: %s" - -#~ msgctxt "undo-type" -#~ msgid "Reposition layer" -#~ msgstr "Reposicionar la capa" - -#~ msgctxt "undo-type" -#~ msgid "Reposition channel" -#~ msgstr "Reposicionar el canal" - -#~ msgctxt "undo-type" -#~ msgid "Reposition path" -#~ msgstr "Reposicionar la ruta" diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index 70cc1ec62b..730e0f73b5 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -722,15 +722,203 @@ CODE ); } -sub image_get_layer_position { - $blurb = 'Returns the position of the layer in the layer stack.'; +sub image_get_item_position { + $blurb = 'Returns the position of the item in its level of its item tree.'; $help = <<'HELP'; -This procedure determines the position of the specified layer in the -images layer stack. If the layer doesn't exist in the image, an error -is returned. +This procedure determines the position of the specified item in its +level in its item tree in the image. If the item doesn't exist in the +image, or the item is not part of an item tree, an error is returned. HELP + &mitch_pdb_misc('2010', '2.8'); + + @inargs = ( + { name => 'image', type => 'image', + desc => 'The image' }, + { name => 'item', type => 'item', + desc => 'The item' } + ); + + @outargs = ( + { name => 'position', type => 'int32', + desc => "The position of the item in its level in the item tree" } + ); + + + %invoke = ( + code => <<'CODE' +{ + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + position = gimp_item_get_index (item); + else + success = FALSE; +} +CODE + ); +} + +sub image_raise_item { + $blurb = "Raise the specified item in its level in its item tree"; + + $help = <<'HELP'; +This procedure raises the specified item one step in the item tree. +The procecure call will fail if there is no item above it. +HELP + + &mitch_pdb_misc('2010', '2.8'); + + @inargs = ( + { name => 'image', type => 'image', + desc => 'The image' }, + { name => 'item', type => 'item', + desc => 'The item to raise' } + ); + + %invoke = ( + code => <<'CODE' +{ + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_raise_item (image, item, error); + else + success = FALSE; +} +CODE + ); +} + +sub image_lower_item { + $blurb = "Lower the specified item in its level in its item tree"; + + $help = <<'HELP'; +This procedure lowers the specified item one step in the item tree. +The procecure call will fail if there is no item below it. +HELP + + &mitch_pdb_misc('2010', '2.8'); + + @inargs = ( + { name => 'image', type => 'image', + desc => 'The image' }, + { name => 'item', type => 'item', + desc => 'The item to lower' } + ); + + %invoke = ( + code => <<'CODE' +{ + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_lower_item (image, item, error); + else + success = FALSE; +} +CODE + ); +} + +sub image_raise_item_to_top { + $blurb = <<'BLURB'; +Raise the specified item to the top of its level in its item tree +BLURB + + $help = <<'HELP'; +This procedure raises the specified item to top of its level in the +item tree. It will not move the item if there is no item above it. +HELP + + &mitch_pdb_misc('2010', '2.8'); + + @inargs = ( + { name => 'image', type => 'image', + desc => 'The image' }, + { name => 'item', type => 'item', + desc => 'The item to raise to top' } + ); + + %invoke = ( + code => <<'CODE' +{ + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_raise_item_to_top (image, item); + else + success = FALSE; +} +CODE + ); +} + +sub image_lower_item_to_bottom { + $blurb = <<'BLURB'; +Lower the specified item to the bottom of its level in its item tree +BLURB + + $help = <<'HELP'; +This procedure lowers the specified item to bottom of its level in the +item tree. It will not move the layer if there is no layer below it. +HELP + + &mitch_pdb_misc('2010', '2.8'); + + @inargs = ( + { name => 'image', type => 'image', + desc => 'The image' }, + { name => 'item', type => 'item', + desc => 'The item to lower to bottom' } + ); + + %invoke = ( + code => <<'CODE' +{ + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error)) + success = gimp_image_lower_item_to_bottom (image, item); + else + success = FALSE; +} +CODE + ); +} + +sub image_reorder_item { + $blurb = "Reorder the specified item within its item tree"; + + $help = <<'HELP'; +This procedure reorders the specified item within its item tree. +HELP + + &mitch_pdb_misc('2010', '2.8'); + + @inargs = ( + { name => 'image', type => 'image', + desc => 'The image' }, + { name => 'item', type => 'item', + desc => 'The item to reorder' }, + { name => 'parent', type => 'item', + desc => 'The new parent item' }, + { name => 'position', type => 'int32', + desc => 'The new position of the item' } + ); + + %invoke = ( + code => <<'CODE' +{ + if (gimp_pdb_item_is_in_tree (item, image, FALSE, error) && + (parent == NULL || + (gimp_pdb_item_is_in_same_tree (item, parent, image, error) && + gimp_pdb_item_is_group (parent, error) && + gimp_pdb_item_is_not_ancestor (item, parent, error)))) + { + success = gimp_image_reorder_item (image, item, parent, position, + TRUE, NULL); + } + else + success = FALSE; +} +CODE + ); +} + +sub image_get_layer_position { + &std_pdb_deprecated('gimp-image-get-item-position'); &simon_pdb_misc('2006', '2.4'); @inargs = ( @@ -761,14 +949,7 @@ CODE } sub image_raise_layer { - $blurb = "Raise the specified layer in the image's layer stack"; - - $help = <<'HELP'; -This procedure raises the specified layer one step in the existing layer stack. -The procecure call will fail if there is no layer above it. -HELP - - &std_pdb_misc; + &std_pdb_deprecated('gimp-image-raise-item'); @inargs = ( { name => 'image', type => 'image', @@ -790,14 +971,7 @@ CODE } sub image_lower_layer { - $blurb = "Lower the specified layer in the image's layer stack"; - - $help = <<'HELP'; -This procedure lowers the specified layer one step in the existing layer stack. -The procecure call will fail if there is no layer below it. -HELP - - &std_pdb_misc; + &std_pdb_deprecated('gimp-image-lower-item'); @inargs = ( { name => 'image', type => 'image', @@ -819,17 +993,7 @@ CODE } sub image_raise_layer_to_top { - $blurb = <<'BLURB'; -Raise the specified layer in the image's layer stack to top of stack -BLURB - - $help = <<'HELP'; -This procedure raises the specified layer to top of the existing layer stack. -It will not move the layer if there is no layer above it. -HELP - - &wolfgang_pdb_misc('1998'); - $author .= ", Sven Neumann"; + &std_pdb_deprecated('gimp-image-raise-item-to-top'); @inargs = ( { name => 'image', type => 'image', @@ -851,17 +1015,7 @@ CODE } sub image_lower_layer_to_bottom { - $blurb = <<'BLURB'; -Lower the specified layer in the image's layer stack to bottom of stack -BLURB - - $help = <<'HELP'; -This procedure lowers the specified layer to bottom of the existing layer stack. -It will not move the layer if there is no layer below it. -HELP - - &wolfgang_pdb_misc('1998'); - $author .= ", Sven Neumann"; + &std_pdb_deprecated('gimp-image-lower-item-to-bottom'); @inargs = ( { name => 'image', type => 'image', @@ -1128,14 +1282,7 @@ CODE } sub image_get_channel_position { - $blurb = 'Returns the position of the channel in the channel stack.'; - - $help = <<'HELP'; -This procedure determines the position of the specified channel in -the images channel stack. If the channel doesn't exist in the image, -an error is returned. -HELP - + &std_pdb_deprecated('gimp-image-get-item-position'); &simon_pdb_misc('2006', '2.4'); @inargs = ( @@ -1166,15 +1313,7 @@ CODE } sub image_raise_channel { - $blurb = "Raise the specified channel in the image's channel stack"; - - $help = <<'HELP'; -This procedure raises the specified channel one step in the existing -channel stack. The procecure call will fail if there is no channel -above it. -HELP - - &std_pdb_misc; + &std_pdb_deprecated('gimp-image-raise-item'); @inargs = ( { name => 'image', type => 'image', @@ -1196,15 +1335,7 @@ CODE } sub image_lower_channel { - $blurb = "Lower the specified channel in the image's channel stack"; - - $help = <<'HELP'; -This procedure lowers the specified channel one step in the existing -channel stack. The procecure call will fail if there is no channel -below it. -HELP - - &std_pdb_misc; + &std_pdb_deprecated('gimp-image-lower-item'); @inargs = ( { name => 'image', type => 'image', @@ -1358,14 +1489,7 @@ CODE } sub image_get_vectors_position { - $blurb = 'Returns the position of the vectors object in the vectors objects stack.'; - - $help = <<'HELP'; -This procedure determines the position of the specified vectors object in the -images vectors object stack. If the vectors object doesn't exist in the image, -an error is returned. -HELP - + &std_pdb_deprecated('gimp-image-get-item-position'); &simon_pdb_misc('2006', '2.4'); @inargs = ( @@ -1396,14 +1520,7 @@ CODE } sub image_raise_vectors { - $blurb = "Raise the specified vectors in the image's vectors stack"; - - $help = <<'HELP'; -This procedure raises the specified vectors one step in the existing -vectors stack. The procecure call will fail if there is no vectors -above it. -HELP - + &std_pdb_deprecated('gimp-image-raise-item'); &simon_pdb_misc('2005', '2.4'); @inargs = ( @@ -1426,14 +1543,7 @@ CODE } sub image_lower_vectors { - $blurb = "Lower the specified vectors in the image's vectors stack"; - - $help = <<'HELP'; -This procedure lowers the specified vectors one step in the existing -vectors stack. The procecure call will fail if there is no vectors -below it. -HELP - + &std_pdb_deprecated('gimp-image-lower-item'); &simon_pdb_misc('2005', '2.4'); @inargs = ( @@ -1456,16 +1566,7 @@ CODE } sub image_raise_vectors_to_top { - $blurb = <<'BLURB'; -Raise the specified vectors in the image's vectors stack to top of stack -BLURB - - $help = <<'HELP'; -This procedure raises the specified vectors to top of the existing -vectors stack. It will not move the vectors if there is no vectors -above it. -HELP - + &std_pdb_deprecated('gimp-image-raise-item-to-top'); &simon_pdb_misc('2005', '2.4'); @inargs = ( @@ -1488,16 +1589,7 @@ CODE } sub image_lower_vectors_to_bottom { - $blurb = <<'BLURB'; -Lower the specified vectors in the image's vectors stack to bottom of stack -BLURB - - $help = <<'HELP'; -This procedure lowers the specified vectors to bottom of the existing -vectors stack. It will not move the vectors if there is no vectors -below it. -HELP - + &std_pdb_deprecated('gimp-image-lower-item-to-bottom'); &simon_pdb_misc('2005', '2.4'); @inargs = ( @@ -2725,13 +2817,17 @@ CODE image_pick_color image_pick_correlate_layer image_add_layer image_remove_layer + image_add_channel image_remove_channel + image_add_vectors image_remove_vectors + image_get_item_position + image_raise_item image_lower_item + image_raise_item_to_top image_lower_item_to_bottom + image_reorder_item image_get_layer_position image_raise_layer image_lower_layer image_raise_layer_to_top image_lower_layer_to_bottom - image_add_channel image_remove_channel image_get_channel_position image_raise_channel image_lower_channel - image_add_vectors image_remove_vectors image_get_vectors_position image_raise_vectors image_lower_vectors image_raise_vectors_to_top image_lower_vectors_to_bottom @@ -2756,7 +2852,7 @@ CODE image_get_channel_by_tattoo image_get_vectors_by_tattoo); -%exports = (app => [@procs], lib => [@procs[0..46,49..77]]); +%exports = (app => [@procs], lib => [@procs[0..52,55..83]]); $desc = 'Image'; $doc_title = 'gimpimage'; diff --git a/tools/pdbgen/pdb/item.pdb b/tools/pdbgen/pdb/item.pdb index d0cb287045..46e6a2a373 100644 --- a/tools/pdbgen/pdb/item.pdb +++ b/tools/pdbgen/pdb/item.pdb @@ -281,6 +281,117 @@ CODE ); } +sub item_is_group { + $blurb = 'Returns whether the item is a group item.'; + + $help = < 'item', type => 'item', + desc => 'The item' } + ); + + @outargs = ( + { name => 'group', type => 'boolean', + desc => 'TRUE if the item is a group, FALSE otherwise' } + ); + + %invoke = ( + code => <<'CODE' +{ + group = (gimp_viewable_get_children (GIMP_VIEWABLE (item)) != NULL); +} +CODE + ); +} + +sub item_get_parent { + $blurb = "Returns the item's parent item."; + + $help = < 'item', type => 'item', + desc => 'The item' } + ); + + @outargs = ( + { name => 'parent', type => 'item', + desc => "The item's parent item" } + ); + + %invoke = ( + code => <<'CODE' +{ + parent = gimp_item_get_parent (item); +} +CODE + ); +} + +sub item_get_children { + $blurb = "Returns the item's list of children."; + + $help = < 'item', type => 'item', + desc => 'The item' } + ); + + @outargs = ( + { name => 'child_ids', type => 'int32array', + desc => "The item's list of children", + array => { name => 'num_children', + desc => "The item's number of children" } } + ); + + %invoke = ( + code => <<'CODE' +{ + GimpContainer *children = gimp_viewable_get_children (GIMP_VIEWABLE (item)); + + if (children) + { + num_children = gimp_container_get_n_children (children); + + if (num_children) + { + GList *list; + gint i; + + child_ids = g_new (gint32, num_children); + + for (list = GIMP_LIST (children)->list, i = 0; + list; + list = g_list_next (list), i++) + { + child_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data)); + } + } + } + else + success = FALSE; + +} +CODE + ); +} + sub item_get_name { $blurb = "Get the name of the specified item."; @@ -544,6 +655,7 @@ CODE } @headers = qw("core/gimplayermask.h" + "core/gimplist.h" "core/gimpselection.h" "text/gimptextlayer.h" "vectors/gimpvectors.h" @@ -559,6 +671,9 @@ CODE item_is_layer_mask item_is_selection item_is_vectors + item_is_group + item_get_parent + item_get_children item_get_name item_set_name item_get_visible item_set_visible item_get_linked item_set_linked