summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO4
-rw-r--r--patches/glib-2.14.5/generic/mb_cur_max.diff26
-rw-r--r--patches/glib-2.14.5/generic/series1
-rw-r--r--patches/glibmm-2.14.1/generic/glibmm-2.14.1-memset.diff28
-rw-r--r--patches/glibmm-2.14.1/generic/series1
-rw-r--r--patches/gtk+-2.10.9/generic/gtk+-2.12.9-dok-all2.patch9231
-rw-r--r--patches/gtk+-2.14.7/generic/gtk+-2.14.7-autogen.diff191
-rw-r--r--patches/gtk+-2.14.7/generic/gtk+-2.14.7-update-to-r22400.diff39550
-rw-r--r--patches/gtk+-2.14.7/generic/series2
-rw-r--r--rules/atk.make12
-rw-r--r--rules/glib.in6
-rw-r--r--rules/glib.make47
-rw-r--r--rules/glibmm.make12
-rw-r--r--rules/gtk.in9
-rw-r--r--rules/gtk.make63
-rw-r--r--rules/gtkmm.in1
-rw-r--r--rules/gtkmm.make8
-rw-r--r--rules/pango.make28
-rw-r--r--rules/pangomm.in7
-rw-r--r--rules/pangomm.make117
20 files changed, 39989 insertions, 9355 deletions
diff --git a/TODO b/TODO
index 93e4eb486..1b99a6c3a 100644
--- a/TODO
+++ b/TODO
@@ -20,7 +20,7 @@ Prio A
16:46 < ringlej> /opt/tools/lib/ptxdist-1.99.11/config/collection/Kconfig:10: can't open file "generated/ptx_collection.in"
16:47 < ringlej> That was it. I had none marked as "M"
-[ ] Sisyphus:
+[x] Sisyphus:
[...]
----------------------
@@ -41,6 +41,8 @@ Prio A
rsc: glib has recently been updated to a newer 2.12 version; find out
which glibmm version fits the new one and adapt it.
+ Update 20090303 rsc: updated all gtk stack components to latest stable.
+
[ ] mkl/jbe: The 'ps' command from the procps package outputs
"Unknown HZ value! (xx) Assume 100."
on a recently started system. Doing it later again, this message does
diff --git a/patches/glib-2.14.5/generic/mb_cur_max.diff b/patches/glib-2.14.5/generic/mb_cur_max.diff
deleted file mode 100644
index 642a14c03..000000000
--- a/patches/glib-2.14.5/generic/mb_cur_max.diff
+++ /dev/null
@@ -1,26 +0,0 @@
----
- glib/gnulib/vasnprintf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: glib-2.14.5/glib/gnulib/vasnprintf.c
-===================================================================
---- glib-2.14.5.orig/glib/gnulib/vasnprintf.c
-+++ glib-2.14.5/glib/gnulib/vasnprintf.c
-@@ -560,7 +560,7 @@ vasnprintf (char *resultbuf, size_t *len
- break;
-
- case 'c':
--# ifdef HAVE_WINT_T
-+# if defined(HAVE_WINT_T) && defined(MB_CUR_MAX)
- if (type == TYPE_WIDE_CHAR)
- tmp_length = MB_CUR_MAX;
- else
-@@ -569,7 +569,7 @@ vasnprintf (char *resultbuf, size_t *len
- break;
-
- case 's':
--# ifdef HAVE_WCHAR_T
-+# if defined(HAVE_WCHAR_T) && defined(MB_CUR_MAX)
- if (type == TYPE_WIDE_STRING)
- tmp_length =
- local_wcslen (a.arg[dp->arg_index].a.a_wide_string)
diff --git a/patches/glib-2.14.5/generic/series b/patches/glib-2.14.5/generic/series
deleted file mode 100644
index 55c36a555..000000000
--- a/patches/glib-2.14.5/generic/series
+++ /dev/null
@@ -1 +0,0 @@
-mb_cur_max.diff
diff --git a/patches/glibmm-2.14.1/generic/glibmm-2.14.1-memset.diff b/patches/glibmm-2.14.1/generic/glibmm-2.14.1-memset.diff
deleted file mode 100644
index 5a5e867b7..000000000
--- a/patches/glibmm-2.14.1/generic/glibmm-2.14.1-memset.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: include cstring to use memset
-
-Building with gcc-4.3.2 fails like this:
-
-object.cc: In constructor 'Glib::ConstructParams::ConstructParams(const Glib::Class&, const char*, ...)':
-object.cc:110: error: 'memset' was not declared in this scope
-make[6]: *** [object.lo] Error 1
-
-Fix it by including the proper header file.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- glib/glibmm/object.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: glibmm-2.14.1/glib/glibmm/object.cc
-===================================================================
---- glibmm-2.14.1.orig/glib/glibmm/object.cc
-+++ glibmm-2.14.1/glib/glibmm/object.cc
-@@ -27,6 +27,7 @@
- #include <gobject/gvaluecollector.h>
-
- #include <cstdarg>
-+#include <cstring>
-
- //Weak references:
- //I'm not sure what the point of these are apart from being a hacky way out of circular references,
diff --git a/patches/glibmm-2.14.1/generic/series b/patches/glibmm-2.14.1/generic/series
deleted file mode 100644
index b26f81a77..000000000
--- a/patches/glibmm-2.14.1/generic/series
+++ /dev/null
@@ -1 +0,0 @@
-glibmm-2.14.1-memset.diff
diff --git a/patches/gtk+-2.10.9/generic/gtk+-2.12.9-dok-all2.patch b/patches/gtk+-2.10.9/generic/gtk+-2.12.9-dok-all2.patch
deleted file mode 100644
index 7fe4b1b14..000000000
--- a/patches/gtk+-2.10.9/generic/gtk+-2.12.9-dok-all2.patch
+++ /dev/null
@@ -1,9231 +0,0 @@
-Subject: FIXME
-From: Denis Oliver Kropp <dok@directfb.org>
-
-rsc: patch from dok (20080927)
-
-Signed-off-by: FIXME
-
-diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c
-index 6c98f76..18e5fb0 100644
---- a/gdk/directfb/gdkcolor-directfb.c
-+++ b/gdk/directfb/gdkcolor-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include "config.h"
-@@ -152,13 +152,28 @@ gdk_colormap_new (GdkVisual *visual,
- {
- case GDK_VISUAL_PSEUDO_COLOR:
- {
-+ DFBResult ret;
-+ IDirectFB *dfb = _gdk_display_dfb->directfb;
- GdkColormapPrivateDirectFB *private;
- DFBPaletteDescription dsc;
-+ IDirectFBPalette *palette;
-+
-+ dsc.flags = DPDESC_SIZE;
-+ dsc.size = colormap->size;
-+
-+ ret = dfb->CreatePalette (dfb, &dsc, &palette);
-+ if (ret)
-+ {
-+ D_DERROR( ret, "GDKDFB/Colormap: IDirectFB::CreatePalette() with %d entries failed!\n", dsc.size );
-+ return NULL;
-+ }
-+
-
- colormap->colors = g_new0 (GdkColor, colormap->size);
-
- private = g_new0 (GdkColormapPrivateDirectFB, 1);
- private->info = g_new0 (GdkColorInfo, colormap->size);
-+ private->palette = palette;
-
- if (visual == gdk_visual_get_system())
- {
-@@ -166,11 +181,6 @@ gdk_colormap_new (GdkVisual *visual,
- private->info[0].ref_count++;
- }
-
-- dsc.flags = DPDESC_SIZE;
-- dsc.size = colormap->size;
-- _gdk_display->directfb->CreatePalette (
-- _gdk_display->directfb, &dsc, &private->palette);
--
- colormap->windowing_data = private;
-
- gdk_directfb_allocate_color_key (colormap);
-diff --git a/gdk/directfb/gdkcursor-directfb.c b/gdk/directfb/gdkcursor-directfb.c
-index 5c2f92e..ca220ff 100644
---- a/gdk/directfb/gdkcursor-directfb.c
-+++ b/gdk/directfb/gdkcursor-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
- #include <config.h>
- #include "gdk.h"
-@@ -235,10 +235,10 @@ gdk_cursor_new_for_display (GdkDisplay *display,GdkCursorType cursor_type)
- }
- else
- {
-- u32 *dst;
-- int pitch;
-+ void *ptr;
-+ int pitch;
-
-- ret = temp->Lock (temp, DSLF_WRITE, (void**)&dst, &pitch);
-+ ret = temp->Lock (temp, DSLF_WRITE, &ptr, &pitch);
- if (ret)
- {
- DirectFBError ("gdkcursor-directfb.c (gdk_cursor_new): "
-@@ -255,6 +255,7 @@ gdk_cursor_new_for_display (GdkDisplay *display,GdkCursorType cursor_type)
- gint p = ((stock_cursors[cursor_type].width + 7) / 8) * 8;
- gint mp = ((stock_cursors[cursor_type+1].width + 7) / 8) * 8;
-
-+ guint32 *dst = ptr;
- const guchar *src;
- const guchar *mask;
-
-@@ -360,8 +361,7 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
- int width = impl->width;
- int height = impl->height;
-
-- shape=gdk_display_dfb_create_surface(_gdk_display,DSPF_ARGB,width,height);
--
-+ shape = gdk_display_dfb_create_surface (_gdk_display_dfb, DSPF_ARGB, width, height);
- if (!shape)
- {
- return NULL;
-diff --git a/gdk/directfb/gdkdirectfb.h b/gdk/directfb/gdkdirectfb.h
-index bf34802..f6d8d4d 100644
---- a/gdk/directfb/gdkdirectfb.h
-+++ b/gdk/directfb/gdkdirectfb.h
-@@ -26,26 +26,57 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #ifndef __GDK_DIRECTFB_H__
- #define __GDK_DIRECTFB_H__
-
--#include <cairo.h>
--#include <directfb.h>
-+
-+/*
-+ * Group the different Flip()s of several gdk_window_impl_directfb_end_paint()
-+ * to improve speed and visual experience, e.g. switching tabs with a single
-+ * consistent update on the screen.
-+ */
-+#ifndef GDK_DIRECTFB_GROUPED_FLIPS
-+#define GDK_DIRECTFB_GROUPED_FLIPS true
-+#endif
-+
-+/*
-+ * Until DirectFB provides it, we simply set it here.
-+ */
-+#ifndef GDK_DIRECTFB_SCREEN_RESOLUTION
-+#define GDK_DIRECTFB_SCREEN_RESOLUTION 75.0
-+#endif
-+
-+/*
-+ * Enables debugging in all GDK-DirectFB source files.
-+ */
-+#ifndef GDK_DIRECTFB_DEBUG
-+#define GDK_DIRECTFB_DEBUG 0
-+#endif
-+
-+/*
-+ * Global debug switch.
-+ * FIXME: Make <direct/debug.h> reincludable, un+redefining D_DEBUG_AT etc.
-+ */
-+#ifdef __DIRECT__DEBUG_H__
-+#error This file MUST be included BEFORE <direct/debug.h>!
-+#endif
-+#if GDK_DIRECTFB_DEBUG
-+#ifndef DIRECT_ENABLE_DEBUG
-+#define DIRECT_ENABLE_DEBUG
-+#endif
-+#endif
-+
-+
- #include "gdk/gdkprivate.h"
-
--/* macro for a safe call to DirectFB functions */
--#define DFBCHECK(x...) \
-- { \
-- int err = x; \
-- if (err != DFB_OK) { \
-- fprintf( stderr, "%s <%d>:\n\t", __FILE__, __LINE__ ); \
-- DirectFBErrorFatal( #x, err ); \
-- } \
-- }
-+#include <cairo.h>
-+#include <directfb.h>
-+#include <directfb_util.h>
-+#include <directfb_version.h>
-
-
- extern GdkWindow * _gdk_parent_root;
-@@ -56,6 +87,7 @@ G_BEGIN_DECLS
-
- #define GDK_WINDOW_DFB_ID(win) (GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (win)->impl)->dfb_id)
-
-+#define GDK_DFB_BITS_PER_PIXEL(format) (((format) == DSPF_RGB32) ? 24 : DFB_BITS_PER_PIXEL(format))
-
- /* used for the --transparent-unfocused hack */
- extern gboolean gdk_directfb_apply_focus_opacity;
-@@ -81,11 +113,21 @@ GdkWindow * gdk_directfb_window_new (GdkWindow *parent,
- DFBWindowOptions window_options,
- DFBSurfaceCapabilities surface_caps);
-
-+void gdk_directfb_window_flip_region (GdkWindow *window,
-+ GdkRegion *region);
-+
-+void gdk_directfb_window_flush_flips (GdkWindow *window);
-+
-+void gdk_directfb_window_process_all ( void );
-+
-+
- GdkVisual * gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format);
-
- IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window);
- IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window);
-
-+IDirectFBSurface *gdk_directfb_drawable_surface(GdkDrawable *drawable);
-+
- #if (DIRECTFB_MAJOR_VERSION >= 1)
- GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
- IDirectFBSurface *subsurface);
-diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
-index 04275fe..eaf5134 100644
---- a/gdk/directfb/gdkdisplay-directfb.c
-+++ b/gdk/directfb/gdkdisplay-directfb.c
-@@ -26,6 +26,8 @@
-
- #include <config.h>
-
-+#include <direct/mem.h>
-+
- #include <glib.h>
- #include "gdk.h"
- #include "gdkdirectfb.h"
-@@ -36,9 +38,12 @@
- #include "gdkalias.h"
-
-
-+D_DEBUG_DOMAIN( GDKDFB_GrabKeyboard, "GDKDFB/Grab/Kbd", "GDK DirectFB Keyboard Grabbing" );
-+D_DEBUG_DOMAIN( GDKDFB_GrabPointer, "GDKDFB/Grab/Ptr", "GDK DirectFB Pointer Grabbing" );
-+
-
- extern void _gdk_visual_init (void);
--extern void _gdk_events_init (void);
-+extern void _gdk_events_init (GdkDisplay *display);
- extern void _gdk_input_init (void);
- extern void _gdk_dnd_init (void);
- extern void _gdk_windowing_window_init (void);
-@@ -62,22 +67,68 @@ const GOptionEntry _gdk_windowing_args[] =
- { NULL}
- };
-
-+#include <stdlib.h>
-+
-+/*static gpointer
-+_wrapped_direct_malloc (gsize n_bytes)
-+{
-+ printf("%s %zu\n", __FUNCTION__, n_bytes);
-+ return direct_malloc (__FILE__, __LINE__, __FUNCTION__, n_bytes);
-+// return malloc (n_bytes);
-+}
-+
-+static gpointer
-+_wrapped_direct_realloc (gpointer mem,
-+ gsize n_bytes)
-+{
-+ printf("%s %p %zu\n", __FUNCTION__, mem, n_bytes);
-+ return direct_realloc (__FILE__, __LINE__, __FUNCTION__, "<wrapped>", mem, n_bytes);
-+// return realloc (mem, n_bytes);
-+}
-+
-+static void
-+_wrapped_direct_free (gpointer mem)
-+{
-+ printf("%s %p\n", __FUNCTION__, mem);
-+ direct_free (__FILE__, __LINE__, __FUNCTION__, "<wrapped>", mem);
-+// free (mem);
-+}
-+*/
-+/*static GMemVTable wrapped_direct_mem_vtable = {
-+ malloc: _wrapped_direct_malloc,
-+ realloc: _wrapped_direct_realloc,
-+ free: _wrapped_direct_free
-+};
-+*/
-+/*__attribute__((constructor))
-+static void _gdk_directfb_hook_g_onto_direct_mem()
-+{
-+// direct_initialize();
-+ g_mem_set_vtable( &wrapped_direct_mem_vtable );
-+}
-+*/
- /**
- Main entry point for gdk in 2.6 args are parsed
- **/
- GdkDisplay * gdk_display_open (const gchar *display_name)
- {
--
-- if (_gdk_display) {
-- return GDK_DISPLAY_OBJECT(_gdk_display); /* single display only */
-- }
-- DFBResult ret;
-+ DFBResult ret;
- IDirectFB *directfb;
- IDirectFBDisplayLayer *layer;
- IDirectFBInputDevice *keyboard;
-
-- int argc=0;
-- char **argv=NULL;
-+ /* Give at least something to distinguish a bit, allowing the user to create a specific
-+ * directfbrc for gtk+, e.g. in "~/.directfbrc.gtk+" or "/usr/local/etc/directfbrc.gtk+".
-+ */
-+ char *args[] = { "gtk+", NULL };
-+ char **argv = args;
-+ int argc = 1;
-+
-+ /* single display only */
-+ if (_gdk_display)
-+ return GDK_DISPLAY_OBJECT(_gdk_display);
-+
-+// g_mem_set_vtable( &wrapped_direct_mem_vtable );
-
- #if 0 /* arg hack arg support broken*/
- if(directfb_args ) {
-@@ -90,45 +141,53 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
-
- ret = DirectFBInit (&argc,&argv);
- if (ret != DFB_OK)
--{
-+ {
- DirectFBError ("gdk_display_open: DirectFBInit", ret);
- return NULL;
- }
-
-- ret = DirectFBCreate (&directfb);
-+ ret = DirectFBCreate (&directfb);
-
- if (ret != DFB_OK)
- {
- DirectFBError ("gdk_display_open: DirectFBCreate", ret);
- return NULL;
- }
-- _gdk_display = g_object_new(GDK_TYPE_DISPLAY_DFB,NULL);
-- _gdk_display->directfb=directfb;
-+
-+ _gdk_display = g_object_new (GDK_TYPE_DISPLAY_DFB,NULL);
-+ _gdk_display_dfb = GDK_DISPLAY_DFB(_gdk_display);
-+
-+ _gdk_display_dfb->directfb = directfb;
-
- ret = directfb->GetDisplayLayer (directfb, DLID_PRIMARY, &layer);
- if (ret != DFB_OK)
- {
- DirectFBError ("gdk_display_open: GetDisplayLayer", ret);
- directfb->Release (directfb);
-- directfb = NULL;
-+ directfb = NULL;
- return NULL;
- }
-
-
- ret=directfb->GetInputDevice (directfb, DIDID_KEYBOARD, &keyboard);
-
-- if (ret != DFB_OK){
-+ if (ret != DFB_OK)
-+ {
- DirectFBError ("gdk_display_open: GetDisplayLayer", ret);
-- return NULL;
-- }
-+ return NULL;
-+ }
-
-- _gdk_display->layer=layer;
-- _gdk_display->keyboard=keyboard;
-+ _gdk_display_dfb->layer = layer;
-+ _gdk_display_dfb->keyboard = keyboard;
-
-- _gdk_directfb_keyboard_init ();
-+ _gdk_directfb_keyboard_init ();
-
-+ /* Initialize the screen. */
- _gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL);
-
-+ /* Set the screen resolution. */
-+ gdk_screen_set_resolution (_gdk_screen, GDK_DIRECTFB_SCREEN_RESOLUTION);
-+
- _gdk_visual_init ();
-
- gdk_screen_set_default_colormap (_gdk_screen,
-@@ -139,7 +198,8 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
- _gdk_input_init ();
- _gdk_dnd_init ();
-
-- _gdk_events_init ();
-+ _gdk_events_init (GDK_DISPLAY_OBJECT(_gdk_display));
-+
- layer->EnableCursor (layer, 1);
-
- g_signal_emit_by_name (gdk_display_manager_get (),
-@@ -176,30 +236,51 @@ gdk_display_dfb_get_type (void)
- return object_type;
- }
-
--IDirectFBSurface * gdk_display_dfb_create_surface (GdkDisplayDFB *display,int format,int width, int height) {
-- DFBResult ret;
-- IDirectFBSurface *temp;
-- DFBSurfaceDescription dsc;
-- dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
-- dsc.width = width;
-- dsc.height = height;
-- dsc.pixelformat = format;
-- ret = display->directfb->CreateSurface (display->directfb, &dsc, &temp);
-- if (ret)
-- {
-- DirectFBError ("gdk_display_dfb_create_surface ", ret);
-- return NULL;
-- }
-- return temp;
-
-+/*************************************************************************************************
-+ * DirectFB specific functions
-+ */
-+
-+IDirectFBSurface *
-+gdk_display_dfb_create_surface (GdkDisplayDFB *display,
-+ DFBSurfacePixelFormat format,
-+ int width, int height)
-+{
-+ DFBResult ret;
-+ DFBSurfaceDescription dsc;
-+ IDirectFBSurface *temp;
-+
-+ dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
-+ dsc.width = width;
-+ dsc.height = height;
-+ dsc.pixelformat = format;
-+
-+ ret = display->directfb->CreateSurface (display->directfb, &dsc, &temp);
-+ if (ret)
-+ {
-+ D_DERROR (ret, "GDKDFB/Display: IDirectFB::CreateSurface() for %dx%d %s failed!\n",
-+ width, height, dfb_pixelformat_name (format));
-+ return NULL;
-+ }
-+
-+ return temp;
- }
-
-
-+/*************************************************************************************************
-+ * Displays and Screens
-+ */
-
- void
- _gdk_windowing_set_default_display (GdkDisplay *display)
- {
-- _gdk_display=GDK_DISPLAY_DFB(display);
-+ if (!display)
-+ {
-+ _gdk_display = NULL;
-+ return;
-+ }
-+
-+ g_assert (_gdk_display == display);
- }
-
- G_CONST_RETURN gchar *
-@@ -211,6 +292,8 @@ gdk_display_get_name (GdkDisplay *display)
- int
- gdk_display_get_n_screens (GdkDisplay *display)
- {
-+ g_return_val_if_fail (GDK_IS_DISPLAY_DFB (display), 0);
-+
- return 1;
- }
-
-@@ -218,74 +301,91 @@ GdkScreen *
- gdk_display_get_screen (GdkDisplay *display,
- gint screen_num)
- {
-+ g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-+ g_return_val_if_fail (screen_num == 0, NULL);
-+
- return _gdk_screen;
- }
-
- GdkScreen *
- gdk_display_get_default_screen (GdkDisplay *display)
- {
-+ g_return_val_if_fail (GDK_IS_DISPLAY_DFB (display), NULL);
-+
- return _gdk_screen;
- }
-
-+/* CHECK TODO: gdk_display_supports_shapes() returns FALSE, should/could be TRUE? */
- gboolean
--gdk_display_supports_selection_notification (GdkDisplay *display)
--{
-- return FALSE;
--}
--
--gboolean gdk_display_request_selection_notification (GdkDisplay *display,
-- GdkAtom selection)
--
-+gdk_display_supports_shapes (GdkDisplay *display)
- {
-+ g_return_val_if_fail (GDK_IS_DISPLAY_DFB (display), FALSE);
-
-- g_warning("gdk_display_request_selection_notification Unimplemented function \n");
-- return FALSE;
-+ return FALSE;
- }
-
-+/* CHECK TODO: gdk_display_supports_input_shapes() returns FALSE, should/could be TRUE? */
- gboolean
--gdk_display_supports_clipboard_persistence (GdkDisplay *display)
-+gdk_display_supports_input_shapes (GdkDisplay *display)
- {
-- g_warning("gdk_display_supports_clipboard_persistence Unimplemented function \n");
-- return FALSE;
-+ g_return_val_if_fail (GDK_IS_DISPLAY_DFB (display), FALSE);
-+
-+ return FALSE;
- }
-
--void
--gdk_display_store_clipboard (GdkDisplay *display,
-- GdkWindow *clipboard_window,
-- guint32 time_,
-- GdkAtom *targets,
-- gint n_targets)
-+GdkWindow *
-+gdk_display_get_default_group (GdkDisplay *display)
- {
-+ g_return_val_if_fail (GDK_IS_DISPLAY_DFB (display), NULL);
-
-- g_warning("gdk_display_store_clipboard Unimplemented function \n");
--
-+ return _gdk_parent_root;
- }
-
-
-+/***********************************************************************************************************************
-+ * FUN TODO: Selection and Clipboard
-+ */
-+
- gboolean
--gdk_display_supports_shapes (GdkDisplay *display)
-+gdk_display_supports_selection_notification (GdkDisplay *display)
- {
-- return FALSE;
--}
-+ D_UNIMPLEMENTED();
-
-+ return FALSE;
-+}
-
- gboolean
--gdk_display_supports_input_shapes (GdkDisplay *display)
-+gdk_display_request_selection_notification (GdkDisplay *display,
-+ GdkAtom selection)
-+
- {
-- return FALSE;
--}
-+ D_UNIMPLEMENTED();
-
-+ return FALSE;
-+}
-
--GdkWindow *gdk_display_get_default_group (GdkDisplay *display)
-+gboolean
-+gdk_display_supports_clipboard_persistence (GdkDisplay *display)
- {
-- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-- return _gdk_parent_root;
--}
-+ D_UNIMPLEMENTED();
-
-+ return FALSE;
-+}
-
-+void
-+gdk_display_store_clipboard (GdkDisplay *display,
-+ GdkWindow *clipboard_window,
-+ guint32 time_,
-+ GdkAtom *targets,
-+ gint n_targets)
-+{
-+ D_UNIMPLEMENTED();
-+}
-
-
--static gboolean _gdk_directfb_pointer_implicit_grab = FALSE;
-+/***********************************************************************************************************************
-+ * Pointer
-+ */
-
- GdkGrabStatus
- gdk_directfb_pointer_grab (GdkWindow *window,
-@@ -297,12 +397,22 @@ gdk_directfb_pointer_grab (GdkWindow *window,
- gboolean implicit_grab)
- {
- GdkWindow *toplevel;
-- GdkWindowImplDirectFB *impl;
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (window)->impl);
-+
-+ D_DEBUG_AT( GDKDFB_GrabPointer, "%s( %p [" GDKDFB_WIMPL_FORM "], owner %d, mask 0x%x, time %u, %splicit )\n",
-+ __FUNCTION__, window, GDKDFB_WIMPL_V(impl), owner_events, event_mask, time, implicit_grab ? "im" : "ex" );
-+
- if (_gdk_directfb_pointer_grab_window)
- {
-+ GdkWindowObject *grab_priv = GDK_WINDOW_OBJECT(_gdk_directfb_pointer_grab_window);
-+ GdkWindowImplDirectFB *grab_impl = GDK_WINDOW_IMPL_DIRECTFB (grab_priv->impl);
-+
- if (implicit_grab && !_gdk_directfb_pointer_implicit_grab)
- return GDK_GRAB_ALREADY_GRABBED;
-
-+ D_DEBUG_AT( GDKDFB_GrabPointer, " -> Breaking %splicit grab of " GDKDFB_WIMPL_FORM "!\n",
-+ _gdk_directfb_pointer_implicit_grab ? "im" : "ex", GDKDFB_WIMPL_V(grab_impl) );
-+
- gdk_pointer_ungrab (time);
- }
-
-@@ -311,6 +421,8 @@ gdk_directfb_pointer_grab (GdkWindow *window,
-
- if (impl->window)
- {
-+ D_DEBUG_AT( GDKDFB_GrabPointer, " -> Grabbing at top level [" GDKDFB_WIMPL_FORM "].\n", GDKDFB_WIMPL_V(impl) );
-+
- if (impl->window->GrabPointer (impl->window) == DFB_LOCKED)
- return GDK_GRAB_ALREADY_GRABBED;
- }
-@@ -331,16 +443,14 @@ gdk_directfb_pointer_grab (GdkWindow *window,
- gdk_cursor_ref (cursor) : NULL);
-
-
-- gdk_directfb_window_send_crossing_events (NULL,
-+ /* SOON FIXME: send GDK_CROSSING_GRAB and others again */
-+ /*gdk_directfb_window_send_crossing_events (NULL,
- window,
-- GDK_CROSSING_GRAB);
-+ GDK_CROSSING_GRAB);*/
-
- return GDK_GRAB_SUCCESS;
- }
-
--
--
--
- void
- gdk_directfb_pointer_ungrab (guint32 time,
- gboolean implicit_grab)
-@@ -350,18 +460,34 @@ gdk_directfb_pointer_ungrab (guint32 time,
- GdkWindow *old_grab_window;
- GdkWindowImplDirectFB *impl;
-
-+ D_DEBUG_AT( GDKDFB_GrabPointer, "%s( %u, %splicit )\n", __FUNCTION__, time, implicit_grab ? "im" : "ex" );
-+
- if (implicit_grab && !_gdk_directfb_pointer_implicit_grab)
- return;
-
- if (!_gdk_directfb_pointer_grab_window)
- return;
-
-- toplevel =
-- gdk_directfb_window_find_toplevel (_gdk_directfb_pointer_grab_window);
-+#if D_DEBUG_ENABLED
-+ if (_gdk_directfb_pointer_grab_window)
-+ {
-+ GdkWindowObject *grab_priv = GDK_WINDOW_OBJECT(_gdk_directfb_pointer_grab_window);
-+ GdkWindowImplDirectFB *grab_impl = GDK_WINDOW_IMPL_DIRECTFB (grab_priv->impl);
-+
-+ D_DEBUG_AT( GDKDFB_GrabPointer, " -> Finish %splicit grab of " GDKDFB_WIMPL_FORM "!\n",
-+ _gdk_directfb_pointer_implicit_grab ? "im" : "ex", GDKDFB_WIMPL_V(grab_impl) );
-+ }
-+#endif
-+
-+ toplevel = gdk_directfb_window_find_toplevel (_gdk_directfb_pointer_grab_window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (toplevel)->impl);
-
- if (impl->window)
-- impl->window->UngrabPointer (impl->window);
-+ {
-+ D_DEBUG_AT( GDKDFB_GrabPointer, " -> Ungrabbing at top level [" GDKDFB_WIMPL_FORM "].\n", GDKDFB_WIMPL_V(impl) );
-+
-+ impl->window->UngrabPointer (impl->window);
-+ }
-
- if (_gdk_directfb_pointer_grab_confine)
- {
-@@ -381,53 +507,61 @@ gdk_directfb_pointer_ungrab (guint32 time,
- _gdk_directfb_pointer_implicit_grab = FALSE;
-
- mousewin = gdk_window_at_pointer (NULL, NULL);
-- gdk_directfb_window_send_crossing_events (old_grab_window,
-+ /* SOON FIXME: send GDK_CROSSING_UNGRAB and others again */
-+ /*gdk_directfb_window_send_crossing_events (old_grab_window,
- mousewin,
-- GDK_CROSSING_UNGRAB);
-+ GDK_CROSSING_UNGRAB);*/
- g_object_unref (old_grab_window);
- }
-
-+gint
-+gdk_display_pointer_is_grabbed (GdkDisplay *display)
-+{
-+ return _gdk_directfb_pointer_grab_window != NULL;
-+}
-
-+void
-+gdk_display_pointer_ungrab (GdkDisplay *display,guint32 time)
-+{
-+ gdk_directfb_pointer_ungrab (time, _gdk_directfb_pointer_implicit_grab);
-+}
-
-
--/*
-- *--------------------------------------------------------------
-- * gdk_keyboard_grab
-- *
-- * Grabs the keyboard to a specific window
-- *
-- * Arguments:
-- * "window" is the window which will receive the grab
-- * "owner_events" specifies whether events will be reported as is,
-- * or relative to "window"
-- * "time" specifies the time
-- *
-- * Results:
-- *
-- * Side effects:
-- * requires a corresponding call to gdk_keyboard_ungrab
-- *
-- *--------------------------------------------------------------
-+/***********************************************************************************************************************
-+ * Keyboard
- */
-
- GdkGrabStatus
--gdk_display_keyboard_grab (GdkDisplay *display,GdkWindow *window,
-- gint owner_events,
-- guint32 time)
-+gdk_directfb_keyboard_grab (GdkDisplay *display,
-+ GdkWindow *window,
-+ gint owner_events,
-+ guint32 time)
- {
- GdkWindow *toplevel;
- GdkWindowImplDirectFB *impl;
-
- g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
-
-+ D_DEBUG_AT( GDKDFB_GrabKeyboard, "%s( %p [" GDKDFB_WIMPL_FORM "], owner %d, time %u )\n", __FUNCTION__, window,
-+ GDKDFB_WIMPL_V(GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (window)->impl)), owner_events, time );
-+
- if (_gdk_directfb_keyboard_grab_window)
-- gdk_keyboard_ungrab (time);
-+ {
-+ GdkWindowObject *grab_priv = GDK_WINDOW_OBJECT(_gdk_directfb_keyboard_grab_window);
-+ GdkWindowImplDirectFB *grab_impl = GDK_WINDOW_IMPL_DIRECTFB (grab_priv->impl);
-+
-+ D_DEBUG_AT( GDKDFB_GrabKeyboard, " -> Breaking grab of " GDKDFB_WIMPL_FORM "!\n", GDKDFB_WIMPL_V(grab_impl) );
-+
-+ gdk_keyboard_ungrab (time);
-+ }
-
- toplevel = gdk_directfb_window_find_toplevel (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (toplevel)->impl);
-
- if (impl->window)
- {
-+ D_DEBUG_AT( GDKDFB_GrabKeyboard, " -> Grabbing at top level [" GDKDFB_WIMPL_FORM "].\n", GDKDFB_WIMPL_V(impl) );
-+
- if (impl->window->GrabKeyboard (impl->window) == DFB_LOCKED)
- return GDK_GRAB_ALREADY_GRABBED;
- }
-@@ -438,37 +572,82 @@ gdk_display_keyboard_grab (GdkDisplay *display,GdkWindow *window,
- }
-
- void
--gdk_display_keyboard_ungrab (GdkDisplay *display,guint32 time)
-+gdk_directfb_keyboard_ungrab (GdkDisplay *display,
-+ guint32 time)
- {
- GdkWindow *toplevel;
- GdkWindowImplDirectFB *impl;
-
-+ D_DEBUG_AT( GDKDFB_GrabKeyboard, "%s( %u )\n", __FUNCTION__, time );
-+
- if (!_gdk_directfb_keyboard_grab_window)
- return;
-
-- toplevel =
-- gdk_directfb_window_find_toplevel (_gdk_directfb_keyboard_grab_window);
-+#if D_DEBUG_ENABLED
-+ if (_gdk_directfb_keyboard_grab_window)
-+ {
-+ GdkWindowObject *grab_priv = GDK_WINDOW_OBJECT(_gdk_directfb_keyboard_grab_window);
-+ GdkWindowImplDirectFB *grab_impl = GDK_WINDOW_IMPL_DIRECTFB (grab_priv->impl);
-+
-+ D_DEBUG_AT( GDKDFB_GrabKeyboard, " -> Finish grab of " GDKDFB_WIMPL_FORM "!\n", GDKDFB_WIMPL_V(grab_impl) );
-+ }
-+#endif
-+
-+ toplevel = gdk_directfb_window_find_toplevel (_gdk_directfb_keyboard_grab_window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (toplevel)->impl);
-
- if (impl->window)
-- impl->window->UngrabKeyboard (impl->window);
-+ {
-+ D_DEBUG_AT( GDKDFB_GrabKeyboard, " -> Ungrabbing at top level [" GDKDFB_WIMPL_FORM "].\n", GDKDFB_WIMPL_V(impl) );
-+
-+ impl->window->UngrabKeyboard (impl->window);
-+ }
-
- g_object_unref (_gdk_directfb_keyboard_grab_window);
- _gdk_directfb_keyboard_grab_window = NULL;
- }
-
--gint
--gdk_display_pointer_is_grabbed (GdkDisplay *display)
-+/*
-+ *--------------------------------------------------------------
-+ * gdk_keyboard_grab
-+ *
-+ * Grabs the keyboard to a specific window
-+ *
-+ * Arguments:
-+ * "window" is the window which will receive the grab
-+ * "owner_events" specifies whether events will be reported as is,
-+ * or relative to "window"
-+ * "time" specifies the time
-+ *
-+ * Results:
-+ *
-+ * Side effects:
-+ * requires a corresponding call to gdk_keyboard_ungrab
-+ *
-+ *--------------------------------------------------------------
-+ */
-+
-+GdkGrabStatus
-+gdk_display_keyboard_grab (GdkDisplay *display,
-+ GdkWindow *window,
-+ gint owner_events,
-+ guint32 time)
- {
-- return _gdk_directfb_pointer_grab_window != NULL;
-+ return gdk_directfb_keyboard_grab (display, window, owner_events, time);
- }
-
- void
--gdk_display_pointer_ungrab (GdkDisplay *display,guint32 time)
-+gdk_display_keyboard_ungrab (GdkDisplay *display,
-+ guint32 time)
- {
-- gdk_directfb_pointer_ungrab (time, _gdk_directfb_pointer_implicit_grab);
-+ return gdk_directfb_keyboard_ungrab (display, time);
- }
-
-+
-+/***********************************************************************************************************************
-+ * Misc Stuff
-+ */
-+
- void
- gdk_display_beep (GdkDisplay *display)
- {
-@@ -482,10 +661,15 @@ gdk_display_sync (GdkDisplay *display)
- void
- gdk_display_flush (GdkDisplay *display)
- {
-+ gdk_directfb_window_process_all();
- }
-
-
-
-+/***********************************************************************************************************************
-+ * FUN TODO: Startup Notifications
-+ */
-+
- void
- gdk_notify_startup_complete (void)
- {
-@@ -512,12 +696,17 @@ gdk_notify_startup_complete_with_id (const gchar* startup_id)
- }
-
-
-+/***********************************************************************************************************************
-+ * CHECK TODO: Compositing
-+ */
-+
- gboolean
- gdk_display_supports_composite (GdkDisplay *display)
- {
- return FALSE;
- }
-
-+
- #define __GDK_DISPLAY_X11_C__
- #include "gdkaliasdef.c"
-
-diff --git a/gdk/directfb/gdkdisplay-directfb.h b/gdk/directfb/gdkdisplay-directfb.h
-index f5e028a..e2e1e31 100644
---- a/gdk/directfb/gdkdisplay-directfb.h
-+++ b/gdk/directfb/gdkdisplay-directfb.h
-@@ -42,7 +42,12 @@ struct _GdkDisplayDFB
- IDirectFBDisplayLayer *layer;
- IDirectFBEventBuffer *buffer;
- IDirectFBInputDevice *keyboard;
-- GdkKeymap *keymap;
-+ GdkKeymap *keymap;
-+
-+ int event_fd;
-+ GSource *event_source;
-+
-+ GList *client_filters; /* list of filters for client messages */
- };
-
- struct _GdkDisplayDFBClass
-@@ -52,8 +57,6 @@ struct _GdkDisplayDFBClass
-
- GType gdk_display_dfb_get_type (void);
-
--IDirectFBSurface * gdk_display_dfb_create_surface (GdkDisplayDFB *display,int format,int width, int height);
--
- G_END_DECLS
-
- #endif /* GDK_DISPLAY_DFB_H */
-diff --git a/gdk/directfb/gdkdnd-directfb.c b/gdk/directfb/gdkdnd-directfb.c
-index fd20223..6b05eec 100644
---- a/gdk/directfb/gdkdnd-directfb.c
-+++ b/gdk/directfb/gdkdnd-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c
-index adc279a..0fafcf9 100644
---- a/gdk/directfb/gdkdrawable-directfb.c
-+++ b/gdk/directfb/gdkdrawable-directfb.c
-@@ -26,19 +26,22 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
- #include "gdk.h"
- #include <assert.h>
-
-+#include <stdlib.h>
- #include <string.h>
-
- #include "gdkdirectfb.h"
- #include "gdkprivate-directfb.h"
-
-+#include "../../gdk-pixbuf/gdk-pixbuf-private.h"
-+
- #include "gdkinternals.h"
-
-
-@@ -47,15 +50,75 @@
-
- #include "cairo-directfb.h"
-
--#define WARN_UNIMPLEMENTED(func)\
--{\
-- static gboolean first_call = TRUE;\
-- if (first_call)\
-- {\
-- g_message ("unimplemented " func);\
-- first_call = FALSE;\
-- }\
--}
-+
-+#include <direct/debug.h>
-+#include <direct/messages.h>
-+
-+/*
-+ * There can be multiple domains in one file and one domain (same same) in multiple files.
-+ */
-+D_DEBUG_DOMAIN( GDKDFB_Drawable, "GDKDFB/Drawable", "GDK DirectFB Drawable" );
-+D_DEBUG_DOMAIN( GDKDFB_DrawClip, "GDKDFB/DrawClip", "GDK DirectFB Drawable Clip Region" );
-+
-+
-+/* From DirectFB's <gfx/generix/duffs_device.h> */
-+#define DUFF_1() \
-+ case 1:\
-+ SET_PIXEL( D[0], S[0] );
-+
-+#define DUFF_2() \
-+ case 3:\
-+ SET_PIXEL( D[2], S[2] );\
-+ case 2:\
-+ SET_PIXEL( D[1], S[1] );\
-+ DUFF_1()
-+
-+#define DUFF_3() \
-+ case 7:\
-+ SET_PIXEL( D[6], S[6] );\
-+ case 6:\
-+ SET_PIXEL( D[5], S[5] );\
-+ case 5:\
-+ SET_PIXEL( D[4], S[4] );\
-+ case 4:\
-+ SET_PIXEL( D[3], S[3] );\
-+ DUFF_2()
-+
-+#define DUFF_4() \
-+ case 15:\
-+ SET_PIXEL( D[14], S[14] );\
-+ case 14:\
-+ SET_PIXEL( D[13], S[13] );\
-+ case 13:\
-+ SET_PIXEL( D[12], S[12] );\
-+ case 12:\
-+ SET_PIXEL( D[11], S[11] );\
-+ case 11:\
-+ SET_PIXEL( D[10], S[10] );\
-+ case 10:\
-+ SET_PIXEL( D[9], S[9] );\
-+ case 9:\
-+ SET_PIXEL( D[8], S[8] );\
-+ case 8:\
-+ SET_PIXEL( D[7], S[7] );\
-+ DUFF_3()
-+
-+#define SET_PIXEL_DUFFS_DEVICE_N( D, S, w, n ) \
-+do {\
-+ while (w) {\
-+ register int l = w & ((1 << n) - 1);\
-+ switch (l) {\
-+ default:\
-+ l = (1 << n);\
-+ SET_PIXEL( D[(1 << n)-1], S[(1 << n)-1] );\
-+ DUFF_##n()\
-+ }\
-+ D += l;\
-+ S += l;\
-+ w -= l;\
-+ }\
-+} while(0)
-+
-
- static GdkScreen * gdk_directfb_get_screen (GdkDrawable *drawable);
- static void gdk_drawable_impl_directfb_class_init (GdkDrawableImplDirectFBClass *klass);
-@@ -71,6 +134,19 @@ static gboolean accelerated_alpha_blending = FALSE;
- static gpointer parent_class = NULL;
- static const cairo_user_data_key_t gdk_directfb_cairo_key;
-
-+static void (*real_draw_pixbuf) (GdkDrawable *drawable,
-+ GdkGC *gc,
-+ GdkPixbuf *pixbuf,
-+ gint src_x,
-+ gint src_y,
-+ gint dest_x,
-+ gint dest_y,
-+ gint width,
-+ gint height,
-+ GdkRgbDither dither,
-+ gint x_dither,
-+ gint y_dither);
-+
-
- /**********************************************************
- * DirectFB specific implementations of generic functions *
-@@ -85,6 +161,9 @@ gdk_directfb_set_colormap (GdkDrawable *drawable,
-
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p [%dx%d], %p (%dbit) ) <- old %p\n", __FUNCTION__,
-+ drawable, impl->width, impl->height, colormap, colormap ? colormap->visual->depth : -1, impl->colormap );
-+
- if (impl->colormap == colormap)
- return;
-
-@@ -101,13 +180,18 @@ static GdkColormap*
- gdk_directfb_get_colormap (GdkDrawable *drawable)
- {
- GdkColormap *retval;
-+ GdkDrawableImplDirectFB *impl;
-
-- retval = GDK_DRAWABLE_IMPL_DIRECTFB (drawable)->colormap;
-+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-
-- if (!retval) {
-- retval = gdk_colormap_get_system ();
-- gdk_directfb_set_colormap(drawable,retval);
-- }
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p [%dx%d] )\n", __FUNCTION__, drawable, impl->width, impl->height );
-+
-+ if (!impl->colormap)
-+ impl->colormap = gdk_colormap_new( gdk_visual_get_best_with_depth (GDK_DFB_BITS_PER_PIXEL (impl->format)), FALSE );
-+
-+ retval = impl->colormap;
-+
-+ D_DEBUG_AT( GDKDFB_Drawable, " -> %p (%dbit)\n", retval, retval->visual->depth );
-
- return retval;
- }
-@@ -117,7 +201,10 @@ gdk_directfb_get_depth (GdkDrawable *drawable)
- {
- GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-
-- return DFB_BITS_PER_PIXEL (impl->format);
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p [%dx%d] ) <- %dbit\n", __FUNCTION__,
-+ drawable, impl->width, impl->height, GDK_DFB_BITS_PER_PIXEL (impl->format) );
-+
-+ return GDK_DFB_BITS_PER_PIXEL (impl->format);
- }
-
- static void
-@@ -139,24 +226,40 @@ gdk_directfb_get_size (GdkDrawable *drawable,
- static GdkVisual*
- gdk_directfb_get_visual (GdkDrawable *drawable)
- {
-- return gdk_visual_get_system ();
-+ GdkDrawableImplDirectFB *impl;
-+ GdkVisual *visual;
-+
-+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-+
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p [%dx%d] )\n", __FUNCTION__, drawable, impl->width, impl->height );
-+
-+ if (impl->colormap)
-+ visual = impl->colormap->visual;
-+ else
-+ visual = gdk_visual_get_best_with_depth (GDK_DFB_BITS_PER_PIXEL (impl->format));
-+
-+ D_DEBUG_AT( GDKDFB_Drawable, " -> %p (%dbit)\n", visual, visual->depth );
-+
-+ return visual;
- }
-
- /* Calculates the real clipping region for a drawable, taking into account
- * other windows and the gc clip region.
- */
--static GdkRegion *
-+void
- gdk_directfb_clip_region (GdkDrawable *drawable,
- GdkGC *gc,
-- GdkRectangle *draw_rect)
-+ GdkRectangle *draw_rect,
-+ GdkRegion *ret_clip)
- {
- GdkDrawableImplDirectFB *private;
-- GdkRegion *clip_region;
-- GdkRegion *tmpreg;
- GdkRectangle rect;
-
-- g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-- g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
-+ g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-+ g_return_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable));
-+ g_return_if_fail (ret_clip != NULL);
-+
-+ D_DEBUG_AT( GDKDFB_DrawClip, "%s( %p, %p, %p )\n", __FUNCTION__, drawable, gc, draw_rect );
-
- private = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-
-@@ -169,43 +272,64 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
-
- draw_rect = &rect;
- }
-+ D_DEBUG_AT( GDKDFB_DrawClip, " -> draw rectangle == %4d,%4d - %4dx%4d =\n",
-+ draw_rect->x, draw_rect->y, draw_rect->width, draw_rect->height );
-
-- clip_region = gdk_region_rectangle (draw_rect);
-+ temp_region_init_rectangle( ret_clip, draw_rect );
-
-- if (private->buffered && private->paint_region)
-- gdk_region_intersect (clip_region, private->paint_region);
-+ if (private->buffered)
-+ {
-+ D_DEBUG_AT( GDKDFB_DrawClip, " -> buffered region > %4d,%4d - %4dx%4d < (%ld boxes)\n",
-+ GDKDFB_RECTANGLE_VALS_FROM_BOX( &private->paint_region.extents ),
-+ private->paint_region.numRects );
-+
-+ gdk_region_intersect (ret_clip, &private->paint_region);
-+ }
-
- if (gc)
- {
- GdkGCDirectFB *gc_private = GDK_GC_DIRECTFB (gc);
-- GdkRegion *region = gc_private->clip_region;
-+ GdkRegion *region = &gc_private->clip_region;
-
-- if (region)
-+ if (region->numRects)
- {
-+ D_DEBUG_AT( GDKDFB_DrawClip, " -> clipping region > %4d,%4d - %4dx%4d < (%ld boxes)\n",
-+ GDKDFB_RECTANGLE_VALS_FROM_BOX( &region->extents ), region->numRects );
-+
- if (gc->clip_x_origin || gc->clip_y_origin)
- {
-- tmpreg = gdk_region_copy (region);
--
-- gdk_region_offset (tmpreg, gc->clip_x_origin, gc->clip_y_origin);
-- gdk_region_intersect (clip_region, tmpreg);
-- gdk_region_destroy (tmpreg);
-+ gdk_region_offset (ret_clip, -gc->clip_x_origin, -gc->clip_y_origin);
-+ gdk_region_intersect (ret_clip, region);
-+ gdk_region_offset (ret_clip, gc->clip_x_origin, gc->clip_y_origin);
- }
- else
- {
-- gdk_region_intersect (clip_region, region);
-+ gdk_region_intersect (ret_clip, region);
- }
- }
-
- if (gc_private->values_mask & GDK_GC_SUBWINDOW &&
- gc_private->values.subwindow_mode == GDK_INCLUDE_INFERIORS)
-- return clip_region;
-+ return;
-+ }
-+
-+ if (private->buffered)
-+ {
-+ D_DEBUG_AT( GDKDFB_DrawClip, " => returning clip >> %4d,%4d - %4dx%4d << (%ld boxes)\n",
-+ GDKDFB_RECTANGLE_VALS_FROM_BOX( &ret_clip->extents ), ret_clip->numRects );
-+ return;
- }
-
- if (GDK_IS_WINDOW (private->wrapper) &&
- GDK_WINDOW_IS_MAPPED (private->wrapper) &&
- !GDK_WINDOW_OBJECT (private->wrapper)->input_only)
- {
-- GList *cur;
-+ GList *cur;
-+ GdkRegion temp;
-+
-+ temp.numRects = 1;
-+ temp.rects = &temp.extents;
-+ temp.size = 1;
-
- for (cur = GDK_WINDOW_OBJECT (private->wrapper)->children;
- cur;
-@@ -216,23 +340,25 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
-
- cur_private = GDK_WINDOW_OBJECT (cur->data);
-
-- if (!GDK_WINDOW_IS_MAPPED (cur_private) || cur_private->input_only)
-+ if (!GDK_WINDOW_IS_MAPPED (cur_private) || cur_private->input_only || GDK_WINDOW_DESTROYED (cur_private))
- continue;
-
- cur_impl = GDK_DRAWABLE_IMPL_DIRECTFB (cur_private->impl);
-
-- rect.x = cur_private->x;
-- rect.y = cur_private->y;
-- rect.width = cur_impl->width;
-- rect.height = cur_impl->height;
-+ temp.extents.x1 = cur_private->x;
-+ temp.extents.y1 = cur_private->y;
-+ temp.extents.x2 = cur_private->x + cur_impl->width;
-+ temp.extents.y2 = cur_private->y + cur_impl->height;
-+
-+ D_DEBUG_AT( GDKDFB_DrawClip, " -> clipping child [ %4d,%4d - %4dx%4d ] (%ld boxes)\n",
-+ GDKDFB_RECTANGLE_VALS_FROM_BOX( &temp.extents ), temp.numRects );
-
-- tmpreg = gdk_region_rectangle (&rect);
-- gdk_region_subtract (clip_region, tmpreg);
-- gdk_region_destroy (tmpreg);
-+ gdk_region_subtract (ret_clip, &temp);
- }
- }
-
-- return clip_region;
-+ D_DEBUG_AT( GDKDFB_DrawClip, " => returning clip >> %4d,%4d - %4dx%4d << (%ld boxes)\n",
-+ GDKDFB_RECTANGLE_VALS_FROM_BOX( &ret_clip->extents ), ret_clip->numRects );
- }
-
- /* Drawing
-@@ -265,7 +391,7 @@ gdk_directfb_setup_for_drawing (GdkDrawableImplDirectFB *impl,
- GdkColor color = { 0, 0, 0, 0 };
- guchar alpha = 0xFF;
-
-- if (!impl->surface)
-+ if (!impl->surface || (GDK_IS_WINDOW(impl->wrapper) && !GDK_WINDOW_IS_MAPPED(impl->wrapper)))
- return FALSE;
-
- if (gc_private && gc_private->values_mask & GDK_GC_FOREGROUND)
-@@ -318,29 +444,35 @@ gdk_directfb_setup_for_drawing (GdkDrawableImplDirectFB *impl,
- return TRUE;
- }
-
--void
--_gdk_directfb_draw_rectangle (GdkDrawable *drawable,
-- GdkGC *gc,
-- gint filled,
-- gint x,
-- gint y,
-- gint width,
-- gint height)
-+static void
-+gdk_directfb_draw_rectangle (GdkDrawable *drawable,
-+ GdkGC *gc,
-+ gint filled,
-+ gint x,
-+ gint y,
-+ gint width,
-+ gint height)
- {
- GdkDrawableImplDirectFB *impl;
-- GdkRegion *clip;
-+ GdkRegion clip;
- GdkGCDirectFB *gc_private = NULL;
- IDirectFBSurface *surface = NULL;
- gint i;
-
- g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %4d,%4d - %4dx%4d )\n", __FUNCTION__,
-+ drawable, gc, filled ? " filled" : "outline", x, y, width, height );
-+
-+ /*
-+ * UGLY FIXME: It can't be what this function is doing for just filling rectangle (common case)...
-+ */
-+
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-
-- if (!impl->surface)
-+ if (!impl->surface || (GDK_IS_WINDOW(impl->wrapper) && !GDK_WINDOW_IS_MAPPED(impl->wrapper)))
- return;
-
--
- if (gc)
- gc_private = GDK_GC_DIRECTFB (gc);
-
-@@ -362,9 +494,8 @@ _gdk_directfb_draw_rectangle (GdkDrawable *drawable,
- }
- else
- {
-- if (!gdk_directfb_setup_for_drawing (impl, gc_private)){
-+ if (!gdk_directfb_setup_for_drawing (impl, gc_private))
- return;
-- }
- }
- }
- else
-@@ -392,7 +523,7 @@ _gdk_directfb_draw_rectangle (GdkDrawable *drawable,
- {
- GdkRectangle rect = { x, y, width, height };
-
-- clip = gdk_directfb_clip_region (drawable, gc, &rect);
-+ gdk_directfb_clip_region (drawable, gc, &rect, &clip);
-
- if (gc_private && gc_private->values_mask & GDK_GC_FILL)
- {
-@@ -412,6 +543,8 @@ _gdk_directfb_draw_rectangle (GdkDrawable *drawable,
- gc_private->values.tile)
- {
- surface = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (gc_private->values.tile)->impl)->surface;
-+
-+ impl->surface->SetBlittingFlags (impl->surface, DSBLIT_NOFX);
- }
- }
-
-@@ -422,33 +555,36 @@ _gdk_directfb_draw_rectangle (GdkDrawable *drawable,
- if (gc_private->values_mask & GDK_GC_TS_Y_ORIGIN)
- y = gc_private->values.ts_y_origin;
-
-- for (i = 0; i < clip->numRects; i++)
-+ /* SPEED FIXME: Generate a single BatchBlit() from the clipped region as below. */
-+ for (i = 0; i < clip.numRects; i++)
- {
-- DFBRegion reg = { clip->rects[i].x1, clip->rects[i].y1,
-- clip->rects[i].x2, clip->rects[i].y2 };
-+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
-+ clip.rects[i].x2, clip.rects[i].y2 };
-
- impl->surface->SetClip (impl->surface, &reg);
- impl->surface->TileBlit (impl->surface, surface, NULL, x, y);
- }
--
-- impl->surface->SetBlittingFlags (impl->surface, DSBLIT_NOFX);
-- impl->surface->SetClip (impl->surface, NULL);
- }
- else /* normal rectangle filling */
- {
-- for (i = 0; i < clip->numRects; i++)
-+ DFBRectangle rects[clip.numRects];
-+
-+ impl->surface->SetClip (impl->surface, NULL);
-+
-+ for (i = 0; i < clip.numRects; i++)
- {
-- DFBRegion *region = (DFBRegion *) &clip->rects[i];
-+ GdkRegionBox *box = &clip.rects[i];
-
-- impl->surface->FillRectangle (impl->surface,
-- region->x1,
-- region->y1,
-- region->x2 - region->x1,
-- region->y2 - region->y1);
-+ rects[i].x = box->x1;
-+ rects[i].y = box->y1;
-+ rects[i].w = box->x2 - box->x1;
-+ rects[i].h = box->y2 - box->y1;
- }
-+
-+ impl->surface->FillRectangles(impl->surface, rects, clip.numRects);
- }
-
-- gdk_region_destroy (clip);
-+ temp_region_deinit( &clip );
- }
- else
- {
-@@ -461,7 +597,6 @@ _gdk_directfb_draw_rectangle (GdkDrawable *drawable,
- X draws the rectangle one pixel taller and wider. */
- impl->surface->DrawRectangle (impl->surface,
- x, y, width , height);
-- impl->surface->SetClip (impl->surface, NULL);
- }
- }
-
-@@ -476,7 +611,7 @@ gdk_directfb_draw_arc (GdkDrawable *drawable,
- gint angle1,
- gint angle2)
- {
-- WARN_UNIMPLEMENTED (G_STRLOC);
-+ D_UNIMPLEMENTED();
- }
-
- static void
-@@ -486,33 +621,39 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable,
- GdkPoint *points,
- gint npoints)
- {
-+ GdkDrawableImplDirectFB *impl;
-+
- g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %p, %d )\n", __FUNCTION__,
-+ drawable, gc, filled ? " filled" : "outline", points, npoints );
-+
- if (npoints < 3)
- return;
-
-+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-+
-+ if (!impl->surface || (GDK_IS_WINDOW(impl->wrapper) && !GDK_WINDOW_IS_MAPPED(impl->wrapper)))
-+ return;
-+
- if (filled)
- {
-- if (npoints == 3 ||
-- (npoints == 4 &&
-+ if (npoints == 3 || (npoints == 4 &&
- points[0].x == points[npoints-1].x &&
- points[0].y == points[npoints-1].y))
- {
-- GdkDrawableImplDirectFB *impl;
-- GdkRegion *clip;
-+ GdkRegion clip;
- gint i;
-
-- impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
--
- if (!gdk_directfb_setup_for_drawing (impl, GDK_GC_DIRECTFB (gc)))
- return;
-
-- clip = gdk_directfb_clip_region (drawable, gc, NULL);
-+ gdk_directfb_clip_region (drawable, gc, NULL, &clip);
-
-- for (i = 0; i < clip->numRects; i++)
-+ for (i = 0; i < clip.numRects; i++)
- {
-- DFBRegion reg = { clip->rects[i].x1, clip->rects[i].y1,
-- clip->rects[i].x2 , clip->rects[i].y2 };
-+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
-+ clip.rects[i].x2 , clip.rects[i].y2 };
-
- impl->surface->SetClip (impl->surface, &reg);
- impl->surface->FillTriangle (impl->surface,
-@@ -521,8 +662,8 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable,
- points[2].x, points[2].y);
-
- }
-- impl->surface->SetClip (impl->surface, NULL);
-- gdk_region_destroy (clip);
-+
-+ temp_region_deinit( &clip );
-
- return;
- }
-@@ -560,7 +701,7 @@ gdk_directfb_draw_text (GdkDrawable *drawable,
- const gchar *text,
- gint text_length)
- {
-- WARN_UNIMPLEMENTED (G_STRLOC);
-+ D_UNIMPLEMENTED();
- }
-
- static void
-@@ -572,7 +713,7 @@ gdk_directfb_draw_text_wc (GdkDrawable *drawable,
- const GdkWChar *text,
- gint text_length)
- {
-- WARN_UNIMPLEMENTED (G_STRLOC);
-+ D_UNIMPLEMENTED();
- }
-
- static void
-@@ -588,7 +729,7 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
- {
- GdkDrawableImplDirectFB *impl;
- GdkDrawableImplDirectFB *src_impl;
-- GdkRegion *clip;
-+ GdkRegion clip;
- GdkRectangle dest_rect = { xdest,
- ydest,
- xdest + width ,
-@@ -597,9 +738,12 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
- DFBRectangle rect = { xsrc, ysrc, width, height };
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", __FUNCTION__,
-+ drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height );
-+
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-
-- if (!impl->surface)
-+ if (!impl->surface || (GDK_IS_WINDOW(impl->wrapper) && !GDK_WINDOW_IS_MAPPED(impl->wrapper)))
- return;
-
- if (GDK_IS_PIXMAP (src))
-@@ -611,19 +755,21 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
- else
- return;
-
-- clip = gdk_directfb_clip_region (drawable, gc, &dest_rect);
-+ gdk_directfb_clip_region (drawable, gc, &dest_rect, &clip);
-
-- for (i = 0; i < clip->numRects; i++)
-+ impl->surface->SetBlittingFlags (impl->surface, DSBLIT_NOFX);
-+
-+ /* SPEED FIXME: Generate a single BatchBlit() from the clipped region! */
-+ for (i = 0; i < clip.numRects; i++)
- {
-- DFBRegion reg = { clip->rects[i].x1, clip->rects[i].y1,
-- clip->rects[i].x2 , clip->rects[i].y2 };
-+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
-+ clip.rects[i].x2, clip.rects[i].y2 };
-
- impl->surface->SetClip (impl->surface, &reg);
-- impl->surface->Blit (impl->surface, src_impl->surface, &rect,
-- xdest, ydest);
-+ impl->surface->Blit (impl->surface, src_impl->surface, &rect, xdest, ydest);
- }
-- impl->surface->SetClip (impl->surface, NULL);
-- gdk_region_destroy (clip);
-+
-+ temp_region_deinit( &clip );
- }
-
- static void
-@@ -633,10 +779,12 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
- gint npoints)
- {
- GdkDrawableImplDirectFB *impl;
-- GdkRegion *clip;
-+ GdkRegion clip;
-
- DFBRegion region = { points->x, points->y, points->x, points->y };
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", __FUNCTION__, drawable, gc, points, npoints );
-+
- if (npoints < 1)
- return;
-
-@@ -645,11 +793,11 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
- if (!gdk_directfb_setup_for_drawing (impl, GDK_GC_DIRECTFB (gc)))
- return;
-
-- clip = gdk_directfb_clip_region (drawable, gc, NULL);
-+ gdk_directfb_clip_region (drawable, gc, NULL, &clip);
-
- while (npoints > 0)
- {
-- if (gdk_region_point_in (clip, points->x, points->y))
-+ if (gdk_region_point_in (&clip, points->x, points->y))
- {
- impl->surface->FillRectangle (impl->surface,
- points->x, points->y, 1, 1);
-@@ -669,7 +817,7 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
- points++;
- }
-
-- gdk_region_destroy (clip);
-+ temp_region_deinit( &clip );
- }
-
- static void
-@@ -679,10 +827,12 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
- gint nsegs)
- {
- GdkDrawableImplDirectFB *impl;
-- GdkRegion *clip;
-+ GdkRegion clip;
- gint i;
-
-- DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 };
-+// DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 };
-+
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", __FUNCTION__, drawable, gc, segs, nsegs );
-
- if (nsegs < 1)
- return;
-@@ -692,62 +842,19 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
- if (!gdk_directfb_setup_for_drawing (impl, GDK_GC_DIRECTFB (gc)))
- return;
-
-- clip = gdk_directfb_clip_region (drawable, gc, NULL);
-+ gdk_directfb_clip_region (drawable, gc, NULL, &clip);
-
-- for (i = 0; i < clip->numRects; i++)
-+ for (i = 0; i < clip.numRects; i++)
- {
-- DFBRegion reg = { clip->rects[i].x1, clip->rects[i].y1,
-- clip->rects[i].x2, clip->rects[i].y2 };
-+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
-+ clip.rects[i].x2, clip.rects[i].y2 };
-
- impl->surface->SetClip (impl->surface, &reg);
-
- impl->surface->DrawLines (impl->surface, (DFBRegion *)segs, nsegs);
- }
-
-- impl->surface->SetClip (impl->surface, NULL);
--
-- gdk_region_destroy (clip);
--
-- /* everything below can be omitted if the drawing is buffered */
-- if (impl->buffered)
-- return;
--
-- if (region.x1 > region.x2)
-- {
-- region.x1 = segs->x2;
-- region.x2 = segs->x1;
-- }
-- if (region.y1 > region.y2)
-- {
-- region.y1 = segs->y2;
-- region.y2 = segs->y1;
-- }
--
-- while (nsegs > 1)
-- {
-- nsegs--;
-- segs++;
--
-- if (segs->x1 < region.x1)
-- region.x1 = segs->x1;
-- if (segs->x2 < region.x1)
-- region.x1 = segs->x2;
--
-- if (segs->y1 < region.y1)
-- region.y1 = segs->y1;
-- if (segs->y2 < region.y1)
-- region.y1 = segs->y2;
--
-- if (segs->x1 > region.x2)
-- region.x2 = segs->x1;
-- if (segs->x2 > region.x2)
-- region.x2 = segs->x2;
--
-- if (segs->y1 > region.y2)
-- region.y2 = segs->y1;
-- if (segs->y2 > region.y2)
-- region.y2 = segs->y2;
-- }
-+ temp_region_deinit( &clip );
- }
-
- static void
-@@ -757,13 +864,15 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
- gint npoints)
- {
- GdkDrawableImplDirectFB *impl;
-- GdkRegion *clip;
-+ GdkRegion clip;
- gint i;
-
- DFBRegion lines[npoints > 1 ? npoints - 1 : 1];
-
- DFBRegion region = { points->x, points->y, points->x, points->y };
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", __FUNCTION__, drawable, gc, points, npoints );
-+
- if (npoints < 2)
- return;
-
-@@ -801,20 +910,18 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
- lines[i].x2 = points->x;
- lines[i].y2 = points->y;
-
-- clip = gdk_directfb_clip_region (drawable, gc, NULL);
-+ gdk_directfb_clip_region (drawable, gc, NULL, &clip);
-
-- for (i = 0; i < clip->numRects; i++)
-+ for (i = 0; i < clip.numRects; i++)
- {
-- DFBRegion reg = { clip->rects[i].x1, clip->rects[i].y1,
-- clip->rects[i].x2, clip->rects[i].y2 };
-+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
-+ clip.rects[i].x2, clip.rects[i].y2 };
-
- impl->surface->SetClip (impl->surface, &reg);
- impl->surface->DrawLines (impl->surface, lines, npoints - 1);
- }
-
-- impl->surface->SetClip (impl->surface, NULL);
--
-- gdk_region_destroy (clip);
-+ temp_region_deinit( &clip );
- }
-
- static void
-@@ -830,7 +937,7 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
- {
- GdkDrawableImplDirectFB *impl;
- GdkImageDirectFB *image_private;
-- GdkRegion *clip;
-+ GdkRegion clip;
- GdkRectangle dest_rect = { xdest, ydest, width, height };
-
- gint pitch = 0;
-@@ -839,38 +946,476 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
- g_return_if_fail (GDK_IS_DRAWABLE (drawable));
- g_return_if_fail (image != NULL);
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", __FUNCTION__,
-+ drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height );
-+
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
- image_private = image->windowing_data;
-
-- if (!impl->surface)
-+ if (!impl->surface || (GDK_IS_WINDOW(impl->wrapper) && !GDK_WINDOW_IS_MAPPED(impl->wrapper)))
- return;
-
-- clip = gdk_directfb_clip_region (drawable, gc, &dest_rect);
-+ gdk_directfb_clip_region (drawable, gc, &dest_rect, &clip);
-
-- if (!gdk_region_empty (clip))
-+ if (!gdk_region_empty (&clip))
- {
- DFBRectangle src_rect = { xsrc, ysrc, width, height };
-
- image_private->surface->Unlock (image_private->surface);
-
-- for (i = 0; i < clip->numRects; i++)
-+ impl->surface->SetBlittingFlags (impl->surface, DSBLIT_NOFX);
-+
-+ /* SPEED FIXME: Generate a single BatchBlit() from the clipped region! */
-+ for (i = 0; i < clip.numRects; i++)
- {
-- DFBRegion reg = { clip->rects[i].x1, clip->rects[i].y1,
-- clip->rects[i].x2 , clip->rects[i].y2 };
-+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
-+ clip.rects[i].x2 , clip.rects[i].y2 };
-
- impl->surface->SetClip (impl->surface, &reg);
-+
- impl->surface->Blit (impl->surface,
- image_private->surface, &src_rect,
- xdest, ydest);
- }
-- impl->surface->SetClip (impl->surface, NULL);
-
- image_private->surface->Lock (image_private->surface, DSLF_WRITE,
- &image->mem, &pitch);
- image->bpl = pitch;
- }
-
-+ temp_region_deinit( &clip );
-+}
-+
-+static void
-+composite (guchar *src_buf,
-+ gint src_rowstride,
-+ guchar *dest_buf,
-+ gint dest_rowstride,
-+ gint width,
-+ gint height)
-+{
-+ guchar *src = src_buf;
-+ guchar *dest = dest_buf;
-+
-+ while (height--)
-+ {
-+ gint twidth = width;
-+ guchar *p = src;
-+ guchar *q = dest;
-+
-+ while (twidth--)
-+ {
-+ guchar a = p[3];
-+ guint t;
-+
-+ t = a * p[0] + (255 - a) * q[0] + 0x80;
-+ q[0] = (t + (t >> 8)) >> 8;
-+ t = a * p[1] + (255 - a) * q[1] + 0x80;
-+ q[1] = (t + (t >> 8)) >> 8;
-+ t = a * p[2] + (255 - a) * q[2] + 0x80;
-+ q[2] = (t + (t >> 8)) >> 8;
-+
-+ p += 4;
-+ q += 3;
-+ }
-+
-+ src += src_rowstride;
-+ dest += dest_rowstride;
-+ }
-+}
-+
-+static void
-+composite_0888 (guchar *src_buf,
-+ gint src_rowstride,
-+ guchar *dest_buf,
-+ gint dest_rowstride,
-+ GdkByteOrder dest_byte_order,
-+ gint width,
-+ gint height)
-+{
-+ guchar *src = src_buf;
-+ guchar *dest = dest_buf;
-+
-+ while (height--)
-+ {
-+ gint twidth = width;
-+ guchar *p = src;
-+ guchar *q = dest;
-+
-+ if (dest_byte_order == GDK_LSB_FIRST)
-+ {
-+ while (twidth--)
-+ {
-+ guint t;
-+
-+ t = p[3] * p[2] + (255 - p[3]) * q[0] + 0x80;
-+ q[0] = (t + (t >> 8)) >> 8;
-+ t = p[3] * p[1] + (255 - p[3]) * q[1] + 0x80;
-+ q[1] = (t + (t >> 8)) >> 8;
-+ t = p[3] * p[0] + (255 - p[3]) * q[2] + 0x80;
-+ q[2] = (t + (t >> 8)) >> 8;
-+ p += 4;
-+ q += 4;
-+ }
-+ }
-+ else
-+ {
-+ while (twidth--)
-+ {
-+ guint t;
-+
-+ t = p[3] * p[0] + (255 - p[3]) * q[1] + 0x80;
-+ q[1] = (t + (t >> 8)) >> 8;
-+ t = p[3] * p[1] + (255 - p[3]) * q[2] + 0x80;
-+ q[2] = (t + (t >> 8)) >> 8;
-+ t = p[3] * p[2] + (255 - p[3]) * q[3] + 0x80;
-+ q[3] = (t + (t >> 8)) >> 8;
-+ p += 4;
-+ q += 4;
-+ }
-+ }
-+
-+ src += src_rowstride;
-+ dest += dest_rowstride;
-+ }
-+}
-+
-+/* change the last value to adjust the size of the device (1-4) */
-+#define SET_PIXEL_DUFFS_DEVICE( D, S, w ) \
-+ SET_PIXEL_DUFFS_DEVICE_N( D, S, w, 2 )
-+
-+/* From DirectFB's gfx/generic/generic.c */
-+#define SET_PIXEL( D, S ) \
-+ switch (S >> 26) { \
-+ case 0: \
-+ break; \
-+ case 0x3f: \
-+ D = ((S << 8) & 0xF800) | \
-+ ((S >> 5) & 0x07E0) | \
-+ ((S >> 19) & 0x001F); \
-+ break; \
-+ default: \
-+ D = (((( (((S<<8) & 0xf800) | ((S>>19) & 0x001f)) \
-+ - (D & 0xf81f)) * ((S>>26)+1) + ((D & 0xf81f)<<6)) & 0x003e07c0) \
-+ + \
-+ ((( ((S>>5) & 0x07e0) \
-+ - (D & 0x07e0)) * ((S>>26)+1) + ((D & 0x07e0)<<6)) & 0x0001f800)) >> 6; \
-+ }
-+
-+static void
-+composite_565 (guchar *src_buf,
-+ gint src_rowstride,
-+ guchar *dest_buf,
-+ gint dest_rowstride,
-+ GdkByteOrder dest_byte_order,
-+ gint width,
-+ gint height)
-+{
-+ while (height--) {
-+ int w = width;
-+ u16 *D = (u16*) dest_buf;
-+ u32 *S = (u32*) src_buf;
-+#if 1
-+ if ((unsigned long)D & 2) {
-+ SET_PIXEL( D[0], S[0] );
-+ w--;
-+ D++;
-+ S++;
-+ }
-+
-+ int i;
-+ int w2 = w / 2;
-+ u32 *D32 = (u32*) D;
-+
-+ for (i=0; i<w2; i++) {
-+ register u32 S0 = S[(i << 1) + 0];
-+ register u32 S1 = S[(i << 1) + 1];
-+
-+ if ((S0 >> 26) == 0x3f && (S1 >> 26) == 0x3f) {
-+ D32[i] = ((S0 << 8) & 0x0000F800) |
-+ ((S0 >> 5) & 0x000007E0) |
-+ ((S0 >> 19) & 0x0000001F) |
-+ ((S1 << 24) & 0xF8000000) |
-+ ((S1 << 11) & 0x07E00000) |
-+ ((S1 >> 3) & 0x001F0000);
-+ }
-+ else {
-+ SET_PIXEL( D[(i << 1) + 0], S0 );
-+ SET_PIXEL( D[(i << 1) + 1], S1 );
-+ }
-+ }
-+
-+ if (w & 1)
-+ SET_PIXEL( D[w-1], S[w-1] );
-+#else
-+ SET_PIXEL_DUFFS_DEVICE( D, S, w );
-+#endif
-+
-+ dest_buf += dest_rowstride;
-+ src_buf += src_rowstride;
-+ }
-+}
-+
-+#undef SET_PIXEL
-+#undef SET_PIXEL_DUFFS_DEVICE
-+
-+static void
-+gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
-+ GdkGC *gc,
-+ GdkPixbuf *pixbuf,
-+ gint src_x,
-+ gint src_y,
-+ gint dest_x,
-+ gint dest_y,
-+ gint width,
-+ gint height,
-+ GdkRgbDither dither,
-+ gint x_dither,
-+ gint y_dither)
-+{
-+ GdkPixbuf *composited = NULL;
-+#if 0
-+ GdkRegion *clip;
-+ GdkRegion *drect;
-+ GdkRectangle tmp_rect;
-+#endif
-+ GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-+
-+ g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-+ g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
-+ g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
-+ g_return_if_fail (pixbuf->bits_per_sample == 8);
-+
-+ g_return_if_fail (drawable != NULL);
-+
-+ if (width == -1)
-+ width = pixbuf->width;
-+ if (height == -1)
-+ height = pixbuf->height;
-+
-+ g_return_if_fail (width >= 0 && height >= 0);
-+ g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
-+ g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
-+
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", __FUNCTION__,
-+ drawable, gc, pixbuf, src_x, src_y, dest_x, dest_y, width, height );
-+
-+ /* Clip to the drawable; this is required for get_from_drawable() so
-+ * can't be done implicitly
-+ */
-+
-+ if (dest_x < 0)
-+ {
-+ src_x -= dest_x;
-+ width += dest_x;
-+ dest_x = 0;
-+ }
-+
-+ if (dest_y < 0)
-+ {
-+ src_y -= dest_y;
-+ height += dest_y;
-+ dest_y = 0;
-+ }
-+
-+ if ((dest_x + width) > impl->width)
-+ width = impl->width - dest_x;
-+
-+ if ((dest_y + height) > impl->height)
-+ height = impl->height - dest_y;
-+
-+ if (width <= 0 || height <= 0)
-+ return;
-+
-+#if 0
-+ /* Clip to the clip region; this avoids getting more
-+ * image data from the server than we need to.
-+ */
-+
-+ tmp_rect.x = dest_x;
-+ tmp_rect.y = dest_y;
-+ tmp_rect.width = width;
-+ tmp_rect.height = height;
-+
-+ drect = gdk_region_rectangle (&tmp_rect);
-+ clip = gdk_drawable_get_clip_region (drawable);
-+
-+ gdk_region_intersect (drect, clip);
-+
-+ gdk_region_get_clipbox (drect, &tmp_rect);
-+
-+ gdk_region_destroy (drect);
- gdk_region_destroy (clip);
-+
-+ if (tmp_rect.width == 0 ||
-+ tmp_rect.height == 0)
-+ return;
-+#endif
-+
-+ if (pixbuf->has_alpha && impl->format == DSPF_RGB16) {
-+ void *data;
-+ int pitch;
-+
-+ if (impl->surface->Lock( impl->surface, DSLF_READ | DSLF_WRITE, &data, &pitch ) == DFB_OK) {
-+ composite_565( pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4,
-+ pixbuf->rowstride,
-+ data + dest_y * pitch + dest_x * 2,
-+ pitch,
-+ #if G_BYTE_ORDER == G_BIG_ENDIAN
-+ GDK_MSB_FIRST,
-+ #else
-+ GDK_LSB_FIRST,
-+ #endif
-+ width, height );
-+
-+ impl->surface->Unlock( impl->surface );
-+
-+ return;
-+ }
-+ }
-+
-+ /* Actually draw */
-+ if (!gc)
-+ gc = _gdk_drawable_get_scratch_gc (drawable, FALSE);
-+
-+ if (pixbuf->has_alpha)
-+ {
-+ GdkVisual *visual = gdk_drawable_get_visual (drawable);
-+ void (*composite_func) (guchar *src_buf,
-+ gint src_rowstride,
-+ guchar *dest_buf,
-+ gint dest_rowstride,
-+ GdkByteOrder dest_byte_order,
-+ gint width,
-+ gint height) = NULL;
-+
-+ /* First we see if we have a visual-specific composition function that can composite
-+ * the pixbuf data directly onto the image
-+ */
-+ if (visual)
-+ {
-+ gint bits_per_pixel = _gdk_windowing_get_bits_for_depth (gdk_drawable_get_display (drawable),
-+ visual->depth);
-+
-+ if (visual->byte_order == (G_BYTE_ORDER == G_BIG_ENDIAN ? GDK_MSB_FIRST : GDK_LSB_FIRST) &&
-+ visual->depth == 16 &&
-+ visual->red_mask == 0xf800 &&
-+ visual->green_mask == 0x07e0 &&
-+ visual->blue_mask == 0x001f)
-+ composite_func = composite_565;
-+ else if (visual->depth == 24 && bits_per_pixel == 32 &&
-+ visual->red_mask == 0xff0000 &&
-+ visual->green_mask == 0x00ff00 &&
-+ visual->blue_mask == 0x0000ff)
-+ composite_func = composite_0888;
-+ }
-+
-+ /* We can't use our composite func if we are required to dither
-+ */
-+ if (composite_func && !(dither == GDK_RGB_DITHER_MAX && visual->depth != 24))
-+ {
-+#if 0
-+ gint x0, y0;
-+ for (y0 = 0; y0 < height; y0 += GDK_SCRATCH_IMAGE_HEIGHT)
-+ {
-+ gint height1 = MIN (height - y0, GDK_SCRATCH_IMAGE_HEIGHT);
-+ for (x0 = 0; x0 < width; x0 += GDK_SCRATCH_IMAGE_WIDTH)
-+ {
-+ gint xs0, ys0;
-+
-+ gint width1 = MIN (width - x0, GDK_SCRATCH_IMAGE_WIDTH);
-+
-+ GdkImage *image = _gdk_image_get_scratch (gdk_drawable_get_screen (drawable),
-+ width1, height1,
-+ gdk_drawable_get_depth (drawable), &xs0, &ys0);
-+
-+ gdk_drawable_copy_to_image (drawable, image,
-+ dest_x + x0, dest_y + y0,
-+ xs0, ys0,
-+ width1, height1);
-+ (*composite_func) (pixbuf->pixels + (src_y + y0) * pixbuf->rowstride + (src_x + x0) * 4,
-+ pixbuf->rowstride,
-+ (guchar*)image->mem + ys0 * image->bpl + xs0 * image->bpp,
-+ image->bpl,
-+ visual->byte_order,
-+ width1, height1);
-+ gdk_draw_image (drawable, gc, image,
-+ xs0, ys0,
-+ dest_x + x0, dest_y + y0,
-+ width1, height1);
-+ }
-+ }
-+#else
-+ void *data;
-+ int pitch;
-+
-+ if (impl->surface->Lock( impl->surface, DSLF_READ | DSLF_WRITE, &data, &pitch ) == DFB_OK) {
-+ (*composite_func) (pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4,
-+ pixbuf->rowstride,
-+ data + dest_y * pitch + DFB_BYTES_PER_LINE( impl->format, dest_x ),
-+ pitch,
-+ visual->byte_order,
-+ width, height);
-+
-+ impl->surface->Unlock( impl->surface );
-+ }
-+#endif
-+ goto out;
-+ }
-+ else
-+ {
-+ /* No special composition func, convert dest to 24 bit RGB data, composite against
-+ * that, and convert back.
-+ */
-+ composited = gdk_pixbuf_get_from_drawable (NULL,
-+ drawable,
-+ NULL,
-+ dest_x, dest_y,
-+ 0, 0,
-+ width, height);
-+
-+ if (composited)
-+ composite (pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4,
-+ pixbuf->rowstride,
-+ composited->pixels,
-+ composited->rowstride,
-+ width, height);
-+ }
-+ }
-+
-+ if (composited)
-+ {
-+ src_x = 0;
-+ src_y = 0;
-+ pixbuf = composited;
-+ }
-+
-+ if (pixbuf->n_channels == 4)
-+ {
-+ guchar *buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4;
-+
-+ gdk_draw_rgb_32_image_dithalign (drawable, gc,
-+ dest_x, dest_y,
-+ width, height,
-+ dither,
-+ buf, pixbuf->rowstride,
-+ x_dither, y_dither);
-+ }
-+ else /* n_channels == 3 */
-+ {
-+ guchar *buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
-+
-+ gdk_draw_rgb_image_dithalign (drawable, gc,
-+ dest_x, dest_y,
-+ width, height,
-+ dither,
-+ buf, pixbuf->rowstride,
-+ x_dither, y_dither);
-+ }
-+
-+ out:
-+ if (composited)
-+ g_object_unref (composited);
- }
-
- static inline void
-@@ -922,6 +1467,21 @@ convert_rgb_pixbuf_to_image (guchar *src,
- /*
- * Object stuff
- */
-+static inline const char *
-+drawable_impl_type_name( GObject *object )
-+{
-+ if (GDK_IS_PIXMAP (object))
-+ return "PIXMAP";
-+
-+ if (GDK_IS_WINDOW (object))
-+ return "WINDOW";
-+
-+ if (GDK_IS_DRAWABLE_IMPL_DIRECTFB (object))
-+ return "DRAWABLE";
-+
-+ return "unknown";
-+}
-+
-
- static void
- gdk_drawable_impl_directfb_finalize (GObject *object)
-@@ -929,6 +1489,11 @@ gdk_drawable_impl_directfb_finalize (GObject *object)
- GdkDrawableImplDirectFB *impl;
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (object);
-
-+ D_DEBUG_AT( GDKDFB_Drawable, "%s( %p ) <- %dx%d (%s at %4d,%4d)\n", __FUNCTION__,
-+ object, impl->width, impl->height,
-+ drawable_impl_type_name( object ),
-+ impl->abs_x, impl->abs_y );
-+
- gdk_directfb_set_colormap (GDK_DRAWABLE (object), NULL);
- if( impl->cairo_surface ) {
- cairo_surface_finish(impl->cairo_surface);
-@@ -949,7 +1514,7 @@ gdk_drawable_impl_directfb_class_init (GdkDrawableImplDirectFBClass *klass)
- object_class->finalize = gdk_drawable_impl_directfb_finalize;
-
- drawable_class->create_gc = _gdk_directfb_gc_new;
-- drawable_class->draw_rectangle = _gdk_directfb_draw_rectangle;
-+ drawable_class->draw_rectangle = gdk_directfb_draw_rectangle;
- drawable_class->draw_arc = gdk_directfb_draw_arc;
- drawable_class->draw_polygon = gdk_directfb_draw_polygon;
- drawable_class->draw_text = gdk_directfb_draw_text;
-@@ -974,12 +1539,20 @@ gdk_drawable_impl_directfb_class_init (GdkDrawableImplDirectFBClass *klass)
- drawable_class->get_size = gdk_directfb_get_size;
-
- drawable_class->_copy_to_image = _gdk_directfb_copy_to_image;
-- drawable_class->get_screen = gdk_directfb_get_screen;
-+ drawable_class->get_screen = gdk_directfb_get_screen;
-+
-+ /* UGLY FIXME: Temporary getenv() usage. */
-+ if (getenv("GDK_DIRECTFB_DRAW_PIXBUF"))
-+ {
-+ real_draw_pixbuf = drawable_class->draw_pixbuf;
-+ drawable_class->draw_pixbuf = gdk_directfb_draw_pixbuf;
-+ }
-
- /* check for hardware-accelerated alpha-blending */
- {
- DFBGraphicsDeviceDescription desc;
-- _gdk_display->directfb->GetDeviceDescription ( _gdk_display->directfb, &desc);
-+
-+ _gdk_display_dfb->directfb->GetDeviceDescription (_gdk_display_dfb->directfb, &desc);
-
- accelerated_alpha_blending =
- ((desc.acceleration_mask & DFXL_BLIT) &&
-@@ -1030,29 +1603,53 @@ gdk_directfb_cairo_surface_destroy (void *data)
- static cairo_surface_t *
- gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
- {
-- g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-- g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
--
-- GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-- IDirectFB *dfb = GDK_DISPLAY_DFB(gdk_drawable_get_display(drawable))->directfb;
-- if (!impl->cairo_surface) {
--// IDirectFBSurface *surface;
-- // if (impl->surface->GetSubSurface (impl->surface, NULL, &surface) == DFB_OK) {
-- //impl->cairo_surface = cairo_directfb_surface_create (dfb, surface);
-- g_assert( impl->surface != NULL);
-- impl->cairo_surface = cairo_directfb_surface_create (dfb,impl->surface);
-- g_assert( impl->cairo_surface != NULL);
-+ GdkDrawableImplDirectFB *impl;
-+ IDirectFB *dfb;
-+
-+ g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-+ g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
-+
-+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-+ dfb = GDK_DISPLAY_DFB(gdk_drawable_get_display(drawable))->directfb;
-+
-+ if (!impl->cairo_surface) {
-+ IDirectFBSurface *surface;
-+ g_assert (impl->surface != NULL);
-+#if defined(CAIRO_VERSION_CODE) && CAIRO_VERSION_CODE >= CAIRO_VERSION_ENCODE(1,5,5)
-+ impl->surface->GetSubSurface (impl->surface, NULL, &surface);
-+#else
-+ surface = impl->surface;
-+#endif
-+ if (surface) {
-+ impl->cairo_surface = cairo_directfb_surface_create (dfb, surface);
-+ if (impl->cairo_surface) {
- cairo_surface_set_user_data (impl->cairo_surface,
- &gdk_directfb_cairo_key, drawable,
- gdk_directfb_cairo_surface_destroy);
-- // surface->Release (surface);
-- //}
-- } else {
-- cairo_surface_reference (impl->cairo_surface);
-+ }
-+#if defined(CAIRO_VERSION_CODE) && CAIRO_VERSION_CODE >= CAIRO_VERSION_ENCODE(1,5,5)
-+ surface->Release (surface);
-+#endif
- }
-- g_assert( impl->cairo_surface != NULL);
-+ } else {
-+ cairo_surface_reference (impl->cairo_surface);
-+ }
-+
-+ g_assert (impl->cairo_surface != NULL);
- return impl->cairo_surface;
- }
-
-+IDirectFBSurface *
-+gdk_directfb_drawable_surface( GdkDrawable *drawable )
-+{
-+ GdkDrawableImplDirectFB *impl;
-+
-+ g_return_val_if_fail (GDK_IS_DRAWABLE (drawable),NULL);
-+
-+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-+
-+ return impl->surface;
-+}
-+
- #define __GDK_DRAWABLE_X11_C__
- #include "gdkaliasdef.c"
-diff --git a/gdk/directfb/gdkevents-directfb.c b/gdk/directfb/gdkevents-directfb.c
-index 2f55b26..dfc5a89 100644
---- a/gdk/directfb/gdkevents-directfb.c
-+++ b/gdk/directfb/gdkevents-directfb.c
-@@ -26,11 +26,12 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include "config.h"
-+
- #include "gdk.h"
- #include "gdkdirectfb.h"
- #include "gdkprivate-directfb.h"
-@@ -38,9 +39,13 @@
- #include "gdkinternals.h"
-
- #include "gdkkeysyms.h"
-+#include "gdkwindow.h"
-
- #include "gdkinput-directfb.h"
- #include <string.h>
-+#include <unistd.h>
-+
-+#include <sys/poll.h>
-
- #ifndef __GDK_X_H__
- #define __GDK_X_H__
-@@ -49,175 +54,278 @@ gboolean gdk_net_wm_supports (GdkAtom property);
-
- #include "gdkalias.h"
-
--#define EventBuffer _gdk_display->buffer
--#define DirectFB _gdk_display->directfb
--
--
-+/*
-+ * EASY FIXME: Replace macros DirectFB and EventBuffer! At least rename and add display argument.
-+ */
-+#define EventBuffer _gdk_display_dfb->buffer
-+#define DirectFB _gdk_display_dfb->directfb
-
-
--#include "gdkaliasdef.c"
-+D_DEBUG_DOMAIN( GDKDFB_Events, "GDKDFB/Events", "GDK DirectFB Events" );
-+D_DEBUG_DOMAIN( GDKDFB_EventCheck, "GDKDFB/EventCheck", "GDK DirectFB Event Checking" );
-+D_DEBUG_DOMAIN( GDKDFB_EventTrans, "GDKDFB/EventTrans", "GDK DirectFB Event Translation" );
-
--/*********************************************
-- * Functions for maintaining the event queue *
-- *********************************************/
-+D_DEBUG_DOMAIN( GDKDFB_Crossing, "GDKDFB/Crossing", "GDK DirectFB Crossing" );
-+D_DEBUG_DOMAIN( GDKDFB_CrossX, "GDKDFB/CrossX", "GDK DirectFB Crossing (actual)" );
-
--static GdkEvent * gdk_event_translate (DFBWindowEvent *dfbevent,
-- GdkWindow *window);
-
--/*
-- * Private variable declarations
-- */
--static GList *client_filters; /* Filters for client messages */
-+typedef struct _GdkDisplaySource GdkDisplaySource;
-
--static void
--dfb_events_process_window_event (DFBWindowEvent *event)
-+struct _GdkDisplaySource
- {
-- GdkWindow *window = gdk_directfb_window_id_table_lookup (event->window_id);
--
-- if (! window)
-- return;
-+ GSource source;
-+
-+ GdkDisplay *display;
-+ GPollFD event_poll_fd;
-+};
-+
-+typedef struct {
-+ const DFBWindowEvent *event;
-+ GdkWindow *window;
-+ GdkWindowObject *priv;
-+ GdkWindowImplDirectFB *impl;
-+
-+ GdkEventType type;
-+ GdkEventMask mask;
-+ gint win_x;
-+ gint win_y;
-+ guint button;
-+} GdkEventFactory;
-+
-+/*
-+ * Private function declarations
-+ */
-
-- gdk_event_translate (event, window);
--}
-+static gboolean gdk_event_translate (GdkDisplay *display,
-+ GdkEvent *event,
-+ DFBWindowEvent *dfbevent);
-
--static gboolean
--gdk_event_send_client_message_by_window (GdkEvent *event,
-- GdkWindow *window)
--{
-- GdkEvent *new_event;
-+static gboolean gdk_event_prepare (GSource *source,
-+ gint *timeout);
-+static gboolean gdk_event_check (GSource *source);
-+static gboolean gdk_event_dispatch (GSource *source,
-+ GSourceFunc callback,
-+ gpointer user_data);
-
-- g_return_val_if_fail(event != NULL, FALSE);
-- g_return_val_if_fail(GDK_IS_WINDOW(window), FALSE);
-+static GSource *gdk_display_source_new (GdkDisplay *display);
-+static gboolean gdk_check_dfb_pending (GdkDisplaySource *display_source);
-
-- new_event = gdk_directfb_event_make (window, GDK_CLIENT_EVENT);
-- new_event->client.message_type = event->client.message_type;
-- new_event->client.data_format = event->client.data_format;
-- memcpy(&new_event->client.data,
-- &event->client.data,
-- sizeof(event->client.data));
-+static gboolean gdk_event_send_client_message_by_window (GdkEvent *event,
-+ GdkWindow *window);
-
-- return TRUE;
--}
-+/*
-+ * Private variable declarations
-+ */
-+static GList *display_sources;
-
-+static GSourceFuncs event_funcs = {
-+ gdk_event_prepare,
-+ gdk_event_check,
-+ gdk_event_dispatch,
-+ NULL
-+};
-
--static void
--dfb_events_dispatch (void)
-+static GSource *
-+gdk_display_source_new (GdkDisplay *display)
- {
-- GdkDisplay *display = gdk_display_get_default ();
-- GdkEvent *event;
-+ GSource *source = g_source_new (&event_funcs, sizeof (GdkDisplaySource));
-+ GdkDisplaySource *display_source = (GdkDisplaySource *)source;
-
-- while ((event = _gdk_event_unqueue (display)) != NULL)
-- {
-- if (_gdk_event_func)
-- (*_gdk_event_func) (event, _gdk_event_data);
-+ D_DEBUG_AT( GDKDFB_Events, "%s( %p )\n", __FUNCTION__, display );
-+
-+ display_source->display = display;
-
-- gdk_event_free (event);
-- }
-+ return source;
- }
-
- static gboolean
--dfb_events_io_func (GIOChannel *channel,
-- GIOCondition condition,
-- gpointer data)
-+gdk_check_dfb_pending (GdkDisplaySource *display_source)
- {
-- gsize i;
-- gsize read;
-- GIOStatus result;
-- DFBEvent buf[23];
-- DFBEvent *event;
-+ struct pollfd pollfd;
-
-- result = g_io_channel_read_chars (channel,
-- (gchar *) buf, sizeof (buf), &read, NULL);
-+ D_DEBUG_AT( GDKDFB_EventCheck, "%s( %p )\n", __FUNCTION__, display_source );
-
-- if (result == G_IO_STATUS_ERROR)
-- {
-- g_warning ("%s: GIOError occured", __FUNCTION__);
-- return TRUE;
-- }
-+ g_return_val_if_fail( display_source != NULL, FALSE );
-
-- read /= sizeof (DFBEvent);
--
-- for (i = 0, event = buf; i < read; i++, event++)
-- {
-- switch (event->clazz)
-- {
-- case DFEC_WINDOW:
-- /* TODO workaround to prevent two DWET_ENTER in a row from being delivered */
-- if (event->window.type == DWET_ENTER ) {
-- if ( i>0 && buf[i-1].window.type != DWET_ENTER )
-- dfb_events_process_window_event (&event->window);
-- }
-- else
-- dfb_events_process_window_event (&event->window);
-- break;
-- default:
-- break;
-- }
-- }
-+ D_DEBUG_AT( GDKDFB_EventCheck, " -> 0x%02x\n", display_source->event_poll_fd.revents );
-
-- EventBuffer->Reset (EventBuffer);
-+ pollfd.events = POLL_IN;
-+ pollfd.fd = display_source->event_poll_fd.fd;
-
-- dfb_events_dispatch ();
-+ poll( &pollfd, 1, 0 );
-
-- return TRUE;
-+ return (pollfd.revents & POLL_IN) != 0;
- }
-
-+
-+/*********************************************
-+ * Functions for maintaining the event queue *
-+ *********************************************/
-+
- void
--_gdk_events_init (void)
-+_gdk_events_init (GdkDisplay *display)
- {
-- GIOChannel *channel;
-- GSource *source;
-- DFBResult ret;
-- gint fd;
--
-+ DFBResult ret;
-+ int fd;
-+ GSource *source;
-+ GdkDisplaySource *display_source;
-+ GdkDisplayDFB *display_dfb = GDK_DISPLAY_DFB (display);
-+
-+ D_DEBUG_AT( GDKDFB_Events, "%s( %p )\n", __FUNCTION__, display );
-+
-+ /*
-+ * The setup of system event handling and local event dispatch is now in line
-+ * with the X11 backend to ensure maximum compatibility in a very critical area.
-+ *
-+ * (2008-01-31 - dok)
-+ */
-+
-+ /* Create an event buffer for this display. */
- ret = DirectFB->CreateEventBuffer (DirectFB, &EventBuffer);
- if (ret)
- {
-- DirectFBError ("_gdk_events_init: "
-- "IDirectFB::CreateEventBuffer() failed", ret);
-+ D_DERROR( ret, "%s(): IDirectFB::CreateEventBuffer() for display %p failed!\n",
-+ __FUNCTION__, display );
- return;
- }
-
-+ /*
-+ * Turn buffer into file descriptor mode which writes a copy of each event to the
-+ * file descriptor being our "connection number".
-+ */
- ret = EventBuffer->CreateFileDescriptor (EventBuffer, &fd);
- if (ret)
- {
-- DirectFBError ("_gdk_events_init: "
-- "IDirectFBEventBuffer::CreateFileDescriptor() failed",
-- ret);
-+ D_DERROR( ret, "%s(): IDirectFBEventBuffer::CreateFileDescriptor() for display %p failed!\n",
-+ __FUNCTION__, display );
- return;
- }
-
-- channel = g_io_channel_unix_new (fd);
-+ source = gdk_display_source_new (display);
-
-- g_io_channel_set_encoding (channel, NULL, NULL);
-- g_io_channel_set_buffered (channel, FALSE);
-+ display_dfb->event_fd = fd;
-+ display_dfb->event_source = source;
-
-- source = g_io_create_watch (channel, G_IO_IN);
-+ display_source = (GdkDisplaySource*) source;
-
-- g_source_set_priority (source, G_PRIORITY_DEFAULT);
-- g_source_set_can_recurse (source, TRUE);
-- g_source_set_callback (source, (GSourceFunc) dfb_events_io_func, NULL, NULL);
-+ display_source->event_poll_fd.fd = fd;
-+ display_source->event_poll_fd.events = G_IO_IN;
-
-+ g_source_set_priority (source, GDK_PRIORITY_EVENTS);
-+ g_source_add_poll (source, &display_source->event_poll_fd);
-+ g_source_set_can_recurse (source, TRUE);
- g_source_attach (source, NULL);
-- g_source_unref (source);
-+
-+ display_sources = g_list_prepend (display_sources, display_source);
-+
-+ _gdk_directfb_mouse_window = gdk_window_ref (_gdk_parent_root);
-+}
-+
-+void
-+_gdk_events_uninit (GdkDisplay *display)
-+{
-+ GdkDisplayDFB *display_dfb = GDK_DISPLAY_DFB (display);
-+
-+ if (display_dfb->event_source)
-+ {
-+ display_sources = g_list_remove (display_sources,
-+ display_dfb->event_source);
-+ g_source_destroy (display_dfb->event_source);
-+ g_source_unref (display_dfb->event_source);
-+ display_dfb->event_source = NULL;
-+ }
- }
-
-+/**
-+ * gdk_events_pending:
-+ *
-+ * Checks if any events are ready to be processed for any display.
-+ *
-+ * Return value: %TRUE if any events are pending.
-+ **/
- gboolean
- gdk_events_pending (void)
- {
-- GdkDisplay *display = gdk_display_get_default ();
-+ GList *tmp_list;
-+
-+ D_DEBUG_AT( GDKDFB_Events, "%s()\n", __FUNCTION__ );
-+
-+ /*
-+ * According to GDK X11's implementation we check the local queue AND the system queue.
-+ *
-+ * (2008-01-31 - dok)
-+ */
-
-- return _gdk_event_queue_find_first (display) ? TRUE : FALSE;
-+ /* Check local queues. */
-+ for (tmp_list = display_sources; tmp_list; tmp_list = tmp_list->next)
-+ {
-+ GdkDisplaySource *tmp_source = tmp_list->data;
-+ GdkDisplay *display = tmp_source->display;
-+ GList *tmp_first = _gdk_event_queue_find_first (display);
-+ GdkEvent *tmp_event = (GdkEvent*) tmp_first->data;
-+
-+ if (tmp_event)
-+ {
-+ D_DEBUG_AT( GDKDFB_Events, " -> GDK [%d]\n", tmp_event->type );
-+ return TRUE;
-+ }
-+ }
-+
-+ /* Check DirectFB queues that might contain events not being added to the local queue yet. */
-+ for (tmp_list = display_sources; tmp_list; tmp_list = tmp_list->next)
-+ {
-+ GdkDisplaySource *tmp_source = tmp_list->data;
-+
-+ if (gdk_check_dfb_pending (tmp_source))
-+ {
-+ D_DEBUG_AT( GDKDFB_Events, " -> DFB []\n" );
-+ return TRUE;
-+ }
-+ }
-+
-+ return FALSE;
- }
-
-+/**
-+ * gdk_event_get_graphics_expose:
-+ * @window: the #GdkWindow to wait for the events for.
-+ *
-+ * Waits for a GraphicsExpose or NoExpose event from the X server.
-+ * This is used in the #GtkText and #GtkCList widgets in GTK+ to make sure any
-+ * GraphicsExpose events are handled before the widget is scrolled.
-+ *
-+ * Return value: a #GdkEventExpose if a GraphicsExpose was received, or %NULL if a
-+ * NoExpose event was received.
-+ **/
- GdkEvent *
- gdk_event_get_graphics_expose (GdkWindow *window)
- {
- GdkDisplay *display;
- GList *list;
-
-+ D_DEBUG_AT( GDKDFB_Events, "%s( %p )\n", __FUNCTION__, window );
-+
- g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
-+ /*
-+ * GDK X11 calls XIfEvent here which is specified to wait until the
-+ * user supplied filter function returns true, which it does for
-+ * GraphicsExpose and NoExpose in that case.
-+ *
-+ * But neither does DirectFB send any Expose event at any time, nor
-+ * do I understand why this function should block the main loop.
-+ *
-+ * GDK X11 does no checks on the local queues afterwards, but we have
-+ * to do it, because GDK DirectFB synthesizes Expose events in some
-+ * cases where the X Server would have sent one, e.g. showing a window.
-+ *
-+ * FIXME: To ensure correct order of events we need to add a queue for
-+ * synthesized (expose) events or use the DirectFB event buffer with a
-+ * user event (or universal event) to IDirectFBEventBuffer::PostEvent().
-+ *
-+ * (2008-01-31 - dok)
-+ */
-+
- display = gdk_drawable_get_display (GDK_DRAWABLE (window));
-
- for (list = _gdk_event_queue_find_first (display); list; list = list->next)
-@@ -240,29 +348,217 @@ gdk_event_get_graphics_expose (GdkWindow *window)
- return NULL;
- }
-
-+static void
-+queue_dfbevent (GdkDisplay *display, DFBWindowEvent *dfbevent )
-+{
-+ GdkEvent *event;
-+ GList *node;
-+
-+ event = gdk_event_new (GDK_NOTHING);
-+
-+ event->any.window = NULL;
-+ event->any.send_event = FALSE; /* We don't use PostEvent() so far. */
-+
-+ ((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
-+
-+ node = _gdk_event_queue_append (display, event);
-+
-+ if (gdk_event_translate (display, event, dfbevent))
-+ {
-+ ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
-+ }
-+ else
-+ {
-+ _gdk_event_queue_remove_link (display, node);
-+ g_list_free_1 (node);
-+ gdk_event_free (event);
-+ }
-+}
-+
- void
- _gdk_events_queue (GdkDisplay *display)
- {
-+ int ret;
-+ DFBEvent dfbevent;
-+ DFBWindowEvent dfbmotion = { .type = DWET_NONE };
-+ GdkDisplayDFB *display_dfb = GDK_DISPLAY_DFB (display);
-+ GdkDisplaySource *display_source = (GdkDisplaySource*) display_dfb->event_source;
-+
-+ /*
-+ * GDK X11 does not process all events here, just until one got into the local queue.
-+ */
-+
-+ while (!_gdk_event_queue_find_first (display) && gdk_check_dfb_pending (display_source))
-+ {
-+ /* Read ONE event from the DirectFB queue. */
-+ ret = read (display_dfb->event_fd, &dfbevent, sizeof(dfbevent));
-+ if (ret <= 0)
-+ {
-+ D_PERROR ("%s: Failed to read from event file descriptor!\n", __FUNCTION__);
-+ return;
-+ }
-+
-+ /* Only window events are handled and no others should arrive. */
-+ if (dfbevent.clazz != DFEC_WINDOW)
-+ {
-+ g_warning ("%s: Got event of class %d other than DFEC_WINDOW!\n",
-+ __FUNCTION__, dfbevent.clazz);
-+ continue;
-+ }
-+
-+ /* Got (another) motion event? */
-+ if (dfbevent.window.type == DWET_MOTION)
-+ {
-+ /* Flush old motion event? (only if on another window) */
-+ if (dfbmotion.type != DWET_NONE && dfbmotion.window_id != dfbevent.window.window_id)
-+ {
-+ queue_dfbevent( display, &dfbmotion );
-+ dfbmotion.type = DWET_NONE;
-+ }
-+
-+ /* Keep new motion event, overriding (avoiding) any previous */
-+ dfbmotion = dfbevent.window;
-+ }
-+ else
-+ {
-+ /* Flush motion event? */
-+ if (dfbmotion.type != DWET_NONE)
-+ {
-+ queue_dfbevent( display, &dfbmotion );
-+ dfbmotion.type = DWET_NONE;
-+ }
-+
-+ /* Queue new event */
-+ queue_dfbevent( display, &dfbevent.window );
-+ }
-+ }
-+
-+ /* Flush motion event? */
-+ if (dfbmotion.type != DWET_NONE)
-+ {
-+ queue_dfbevent( display, &dfbmotion );
-+ dfbmotion.type = DWET_NONE;
-+ }
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static gboolean
-+gdk_event_prepare (GSource *source,
-+ gint *timeout)
-+{
-+ gboolean retval;
-+ GdkDisplaySource *display_source = (GdkDisplaySource*)source;
-+ GdkDisplay *display = display_source->display;
-+
-+ GDK_THREADS_ENTER ();
-+
-+ *timeout = -1;
-+ retval = _gdk_event_queue_find_first (display) != NULL || gdk_check_dfb_pending (display_source);
-+
-+ GDK_THREADS_LEAVE ();
-+
-+ return retval;
-+}
-+
-+static gboolean
-+gdk_event_check (GSource *source)
-+{
-+ gboolean retval;
-+ GdkDisplaySource *display_source = (GdkDisplaySource*)source;
-+ GdkDisplay *display = display_source->display;
-+
-+ GDK_THREADS_ENTER ();
-+
-+ if (display_source->event_poll_fd.revents & G_IO_IN)
-+ retval = _gdk_event_queue_find_first (display) != NULL || gdk_check_dfb_pending (display_source);
-+ else
-+ retval = FALSE;
-+
-+ GDK_THREADS_LEAVE ();
-+
-+ return retval;
- }
-
-+static gboolean
-+gdk_event_dispatch (GSource *source,
-+ GSourceFunc callback,
-+ gpointer user_data)
-+{
-+ GdkDisplay *display = ((GdkDisplaySource*)source)->display;
-+ GdkEvent *event;
-+
-+ GDK_THREADS_ENTER ();
-+
-+ _gdk_events_queue (display);
-+ event = _gdk_event_unqueue (display);
-+
-+ if (event)
-+ {
-+ if (_gdk_event_func)
-+ (*_gdk_event_func) (event, _gdk_event_data);
-+
-+ gdk_event_free (event);
-+ }
-+
-+ GDK_THREADS_LEAVE ();
-+
-+ return TRUE;
-+}
-+
-+/**********************************************************************************************************************/
-+
-+/*
-+ *--------------------------------------------------------------
-+ * gdk_flush
-+ *
-+ * Flushes the Xlib output buffer and then waits
-+ * until all requests have been received and processed
-+ * by the X server. The only real use for this function
-+ * is in dealing with XShm.
-+ *
-+ * Arguments:
-+ *
-+ * Results:
-+ *
-+ * Side effects:
-+ *
-+ *--------------------------------------------------------------
-+ */
-+
- void
- gdk_flush (void)
- {
--gdk_display_flush ( GDK_DISPLAY_OBJECT(_gdk_display));
-+ GSList *tmp_list = _gdk_displays;
-+
-+ while (tmp_list)
-+ {
-+ IDirectFB *dfb = GDK_DISPLAY_DFB (tmp_list->data)->directfb;
-+
-+ g_assert (dfb != NULL);
-+
-+ dfb->WaitIdle (dfb);
-+
-+ tmp_list = tmp_list->next;
-+ }
- }
-
- /* Sends a ClientMessage to all toplevel client windows */
- gboolean
--gdk_event_send_client_message_for_display (GdkDisplay *display,
-- GdkEvent *event,
-- guint32 xid)
-+gdk_event_send_client_message_for_display (GdkDisplay *display,
-+ GdkEvent *event,
-+ GdkNativeWindow winid)
- {
-- GdkWindow *win = NULL;
-- gboolean ret = TRUE;
-+ GdkWindow *win;
-+ gboolean ret = FALSE;
-+
-+ /*
-+ * The event should go through the system event queue using IDirectFBEventBuffer::PostEvent().
-+ */
-
- g_return_val_if_fail(event != NULL, FALSE);
-
-- win = gdk_window_lookup_for_display (display, (GdkNativeWindow) xid);
-+ win = gdk_window_lookup_for_display (display, winid);
-
- g_return_val_if_fail(win != NULL, FALSE);
-
-@@ -279,14 +575,12 @@ gdk_event_send_client_message_for_display (GdkDisplay *display,
- }
- else
- {
-- ret &= gdk_event_send_client_message_by_window (event, win);
-+ ret = gdk_event_send_client_message_by_window (event, win);
- }
-
- return ret;
- }
-
--/*****/
--
- guint32
- gdk_directfb_get_time (void)
- {
-@@ -339,13 +633,13 @@ gdk_directfb_child_at (GdkWindow *window,
- gint *winx,
- gint *winy)
- {
-- GdkWindowObject *private;
-+ GdkWindowObject *priv;
- GList *list;
-
- g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
-- private = GDK_WINDOW_OBJECT (window);
-- for (list = private->children; list; list = list->next)
-+ priv = GDK_WINDOW_OBJECT (window);
-+ for (list = priv->children; list; list = list->next)
- {
- GdkWindowObject *win = list->data;
-
-@@ -365,269 +659,1129 @@ gdk_directfb_child_at (GdkWindow *window,
- return window;
- }
-
--static GdkEvent *
--gdk_event_translate (DFBWindowEvent *dfbevent,
-- GdkWindow *window)
-+/**********************************************************************************************************************/
-+
-+static gboolean
-+gdk_event_send_client_message_by_window (GdkEvent *event,
-+ GdkWindow *window)
- {
-- GdkWindowObject *private;
-- GdkDisplay *display;
-- GdkEvent *event = NULL;
-+ GdkEvent *new_event;
-
-- g_return_val_if_fail (dfbevent != NULL, NULL);
-- g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-+ g_return_val_if_fail(event != NULL, FALSE);
-+ g_return_val_if_fail(GDK_IS_WINDOW(window), FALSE);
-
-- private = GDK_WINDOW_OBJECT (window);
-+ /* FIXME: Use the system queue to post events so they come in the correct order. */
-+ D_ONCE("bad function");
-
-- g_object_ref (G_OBJECT (window));
-- display = gdk_drawable_get_display (GDK_DRAWABLE (window));
-+ new_event = gdk_directfb_event_make (window, GDK_CLIENT_EVENT);
-+ new_event->client.message_type = event->client.message_type;
-+ new_event->client.data_format = event->client.data_format;
-+ memcpy(&new_event->client.data,
-+ &event->client.data,
-+ sizeof(event->client.data));
-+
-+ return TRUE;
-+}
-+
-+static gint
-+gdk_event_apply_filters (DFBWindowEvent *dfbevent,
-+ GdkEvent *event,
-+ GList *filters)
-+{
-+ GList *tmp_list;
-+ GdkFilterReturn result;
-+
-+ tmp_list = filters;
-+
-+ while (tmp_list)
-+ {
-+ GdkEventFilter *filter = (GdkEventFilter*) tmp_list->data;
-+
-+ tmp_list = tmp_list->next;
-+ result = filter->function (dfbevent, event, filter->data);
-+ if (result != GDK_FILTER_CONTINUE)
-+ return result;
-+ }
-+
-+ return GDK_FILTER_CONTINUE;
-+}
-+
-+/**********************************************************************************************************************/
-+
-+/* Return an event mask from a DFBWindowEvent */
-+static GdkEventMask
-+get_event_mask_from_dfb_event (const DFBWindowEvent *dfbevent)
-+{
-+ GdkEventMask mask;
-
- switch (dfbevent->type)
- {
- case DWET_BUTTONDOWN:
-+ return GDK_BUTTON_PRESS_MASK;
-+
- case DWET_BUTTONUP:
-- {
-- static gboolean click_grab = FALSE;
-- GdkWindow *child;
-- gint wx, wy;
-- guint mask;
-- guint button;
-+ return GDK_BUTTON_RELEASE_MASK;
-
-- _gdk_directfb_mouse_x = wx = dfbevent->cx;
-- _gdk_directfb_mouse_y = wy = dfbevent->cy;
-+ case DWET_MOTION:
-+ mask = GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK;
-
-- switch (dfbevent->button)
-- {
-- case DIBI_LEFT:
-- button = 1;
-- mask = GDK_BUTTON1_MASK;
-- break;
-- case DIBI_MIDDLE:
-- button = 2;
-- mask = GDK_BUTTON2_MASK;
-- break;
-- case DIBI_RIGHT:
-- button = 3;
-- mask = GDK_BUTTON3_MASK;
-- break;
-- default:
-- button = dfbevent->button + 1;
-- mask = 0;
-- break;
-- }
-+ if (dfbevent->buttons & DIBM_LEFT)
-+ {
-+ mask |= GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
-+ GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK |
-+ GDK_BUTTON1_MASK;
-+ }
-+ if (dfbevent->buttons & DIBM_RIGHT)
-+ {
-+ mask |= GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
-+ GDK_BUTTON_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
-+ GDK_BUTTON3_MASK;
-+ }
-+ if (dfbevent->buttons & DIBM_MIDDLE)
-+ {
-+ mask |= GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
-+ GDK_BUTTON_MOTION_MASK | GDK_BUTTON2_MOTION_MASK |
-+ GDK_BUTTON2_MASK;
-+ }
-+ return mask;
-
-- child = gdk_directfb_child_at (_gdk_parent_root, &wx, &wy);
-+ case DWET_WHEEL:
-+ /* Since applications that want button press events can get
-+ * scroll events on X11 (since scroll wheel events are really
-+ * button press events there), we need to use GDK_BUTTON_PRESS_MASK too.
-+ */
-+ return GDK_SCROLL_MASK | GDK_BUTTON_PRESS_MASK;
-
-- if (_gdk_directfb_pointer_grab_window &&
-- (_gdk_directfb_pointer_grab_events & (dfbevent->type ==
-- DWET_BUTTONDOWN ?
-- GDK_BUTTON_PRESS_MASK :
-- GDK_BUTTON_RELEASE_MASK)) &&
-- (_gdk_directfb_pointer_grab_owner_events == FALSE ||
-- child == _gdk_parent_root) )
-- {
-- GdkDrawableImplDirectFB *impl;
-+ case DWET_KEYDOWN:
-+ return GDK_KEY_PRESS_MASK;
-
-- child = _gdk_directfb_pointer_grab_window;
-- impl = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (child)->impl);
-+ case DWET_KEYUP:
-+ return GDK_KEY_RELEASE_MASK;
-
-- dfbevent->x = dfbevent->cx - impl->abs_x;
-- dfbevent->y = dfbevent->cy - impl->abs_y;
-- }
-- else if (!_gdk_directfb_pointer_grab_window ||
-- (_gdk_directfb_pointer_grab_owner_events == TRUE))
-- {
-- dfbevent->x = wx;
-- dfbevent->y = wy;
-- }
-- else
-- {
-- child = NULL;
-- }
-+ case DWET_CLOSE:
-+ case DWET_DESTROYED:
-+ case DWET_SIZE:
-+ case DWET_POSITION:
-+ case DWET_POSITION_SIZE:
-+ return GDK_STRUCTURE_MASK;
-+
-+ case DWET_ENTER:
-+ return GDK_ENTER_NOTIFY_MASK;
-
-- if (dfbevent->type == DWET_BUTTONDOWN)
-- _gdk_directfb_modifiers |= mask;
-- else
-- _gdk_directfb_modifiers &= ~mask;
-+ case DWET_LEAVE:
-+ return GDK_LEAVE_NOTIFY_MASK;
-
-- if (child)
-- {
-- event =
-- gdk_directfb_event_make (child,
-- dfbevent->type == DWET_BUTTONDOWN ?
-- GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE);
--
-- event->button.x_root = _gdk_directfb_mouse_x;
-- event->button.y_root = _gdk_directfb_mouse_y;
--
-- event->button.x = dfbevent->x;
-- event->button.y = dfbevent->y;
--
-- event->button.state = _gdk_directfb_modifiers;
-- event->button.button = button;
-- event->button.device = display->core_pointer;
--
-- GDK_NOTE (EVENTS,
-- g_message ("button: %d at %d,%d %s with state 0x%08x",
-- event->button.button,
-- (int)event->button.x, (int)event->button.y,
-- dfbevent->type == DWET_BUTTONDOWN ?
-- "pressed" : "released",
-- _gdk_directfb_modifiers));
--
-- if (dfbevent->type == DWET_BUTTONDOWN)
-- _gdk_event_button_generate (display, event);
-- }
-+ case DWET_GOTFOCUS:
-+ case DWET_LOSTFOCUS:
-+ return GDK_FOCUS_CHANGE_MASK;
-+
-+ default:
-+ D_WARN( "DFBWindowEventType 0x%08x unknown", dfbevent->type );
-+ }
-+
-+ return GDK_ALL_EVENTS_MASK;
-+}
-+
-+static gboolean
-+gdk_directfb_window_is_ancestor (GdkWindow *ancestor,
-+ GdkWindow *window)
-+{
-+ if (ancestor == NULL || window == NULL)
-+ return FALSE;
-+
-+ return (gdk_window_get_parent (window) == ancestor ||
-+ gdk_directfb_window_is_ancestor (ancestor,
-+ gdk_window_get_parent (window)));
-+}
-
-- /* Handle implicit button grabs: */
-- if (dfbevent->type == DWET_BUTTONDOWN && !click_grab && child)
-+static void
-+fixup_event (GdkEvent *event)
-+{
-+ if (event->any.window)
-+ g_object_ref (event->any.window);
-+ if (((event->any.type == GDK_ENTER_NOTIFY) ||
-+ (event->any.type == GDK_LEAVE_NOTIFY)) &&
-+ (event->crossing.subwindow != NULL))
-+ g_object_ref (event->crossing.subwindow);
-+ event->any.send_event = FALSE;
-+}
-+
-+static void
-+append_event (GdkEvent *event)
-+{
-+ fixup_event (event);
-+ _gdk_event_queue_append (GDK_DISPLAY_OBJECT(_gdk_display), event);
-+}
-+
-+/* FIXME: Refactor and share with scroll event. */
-+static GdkEvent *
-+create_crossing_event (GdkWindow *window,
-+ const DFBWindowEvent *dfbevent,
-+ GdkEventType event_type,
-+ GdkCrossingMode mode,
-+ GdkNotifyType detail)
-+{
-+ GdkEvent *event;
-+ GdkWindowImplDirectFB *impl;
-+
-+ impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (window)->impl);
-+
-+ D_DEBUG_AT( GDKDFB_CrossX, "-> %s [" GDKDFB_WIMPL_FORM "]\n",
-+ event_type == GDK_ENTER_NOTIFY ? "ENTER" :
-+ event_type == GDK_LEAVE_NOTIFY ? "LEAVE" : "<unknown crossing>",
-+ GDKDFB_WIMPL_V(impl) );
-+
-+ event = gdk_event_new (event_type);
-+
-+ event->crossing.window = window;
-+ event->crossing.subwindow = NULL; /* FIXME */
-+ event->crossing.time = (guint32)(dfbevent->timestamp.tv_sec * 1000 + dfbevent->timestamp.tv_usec / 1000);
-+
-+ event->crossing.x = dfbevent->cx - impl->drawable.abs_x;
-+ event->crossing.y = dfbevent->cy - impl->drawable.abs_y;
-+
-+ event->crossing.x_root = dfbevent->cx;
-+ event->crossing.y_root = dfbevent->cy;
-+
-+ event->crossing.mode = mode;
-+ event->crossing.detail = detail;
-+ event->crossing.state = _gdk_directfb_modifiers;
-+
-+ /* FIXME: focus and button state */
-+
-+ if (event_type == GDK_ENTER_NOTIFY)
-+ {
-+ GDK_NOTE (EVENTS,
-+ g_message ("enter notify:\t\twindow: %p detail: %d subwin: %p",
-+ event->crossing.window,
-+ event->crossing.detail,
-+ event->crossing.subwindow));
-+ }
-+ else
-+ GDK_NOTE (EVENTS,
-+ g_message ("leave notify:\t\twindow: %p detail: %d subwin: %p",
-+ event->crossing.window,
-+ event->crossing.detail,
-+ event->crossing.subwindow));
-+
-+ return event;
-+}
-+
-+static void
-+synthesize_enter_event (GdkWindow *window,
-+ const DFBWindowEvent *dfbevent,
-+ GdkCrossingMode mode,
-+ GdkNotifyType detail)
-+{
-+ GdkEvent *event;
-+
-+ if (_gdk_directfb_pointer_grab_window != NULL &&
-+ !_gdk_directfb_pointer_grab_owner_events &&
-+ !(_gdk_directfb_pointer_grab_events & GDK_ENTER_NOTIFY_MASK))
-+ return;
-+
-+ if (!(GDK_WINDOW_OBJECT (window)->event_mask & GDK_ENTER_NOTIFY_MASK))
-+ return;
-+
-+ event = create_crossing_event (window, dfbevent, GDK_ENTER_NOTIFY, mode, detail);
-+
-+ append_event (event);
-+}
-+
-+static void
-+synthesize_enter_events (GdkWindow *from,
-+ GdkWindow *to,
-+ const DFBWindowEvent *dfbevent,
-+ GdkCrossingMode mode,
-+ GdkNotifyType detail)
-+{
-+ GdkWindow *prev = gdk_window_get_parent (to);
-+
-+ if (prev != from)
-+ synthesize_enter_events (from, prev, dfbevent, mode, detail);
-+
-+ synthesize_enter_event (to, dfbevent, mode, detail);
-+}
-+
-+static void
-+synthesize_leave_event (GdkWindow *window,
-+ const DFBWindowEvent *dfbevent,
-+ GdkCrossingMode mode,
-+ GdkNotifyType detail)
-+{
-+ GdkEvent *event;
-+
-+ if (_gdk_directfb_pointer_grab_window != NULL &&
-+ !_gdk_directfb_pointer_grab_owner_events &&
-+ !(_gdk_directfb_pointer_grab_events & GDK_LEAVE_NOTIFY_MASK))
-+ return;
-+
-+ if (!(GDK_WINDOW_OBJECT (window)->event_mask & GDK_LEAVE_NOTIFY_MASK))
-+ return;
-+
-+ event = create_crossing_event (window, dfbevent, GDK_LEAVE_NOTIFY, mode, detail);
-+
-+ append_event (event);
-+}
-+
-+static void
-+synthesize_leave_events (GdkWindow *from,
-+ GdkWindow *to,
-+ const DFBWindowEvent *dfbevent,
-+ GdkCrossingMode mode,
-+ GdkNotifyType detail)
-+{
-+ GdkWindow *next = gdk_window_get_parent (from);
-+
-+ synthesize_leave_event (from, dfbevent, mode, detail);
-+
-+ if (next != to)
-+ synthesize_leave_events (next, to, dfbevent, mode, detail);
-+}
-+
-+static void
-+synthesize_crossing_events (GdkEventFactory *factory,
-+ GdkWindow *window,
-+ GdkCrossingMode mode,
-+ gint x,
-+ gint y)
-+{
-+ GdkWindow *intermediate, *tem, *common_ancestor;
-+
-+ if (window == _gdk_directfb_mouse_window)
-+ return;
-+
-+ if (gdk_directfb_window_is_ancestor (_gdk_directfb_mouse_window, window))
-+ {
-+ /* Pointer has moved to an inferior window. */
-+ synthesize_leave_event (_gdk_directfb_mouse_window, factory->event, mode, GDK_NOTIFY_INFERIOR);
-+
-+ /* If there are intermediate windows, generate ENTER_NOTIFY
-+ * events for them
-+ */
-+ intermediate = gdk_window_get_parent (window);
-+
-+ if (intermediate != _gdk_directfb_mouse_window)
-+ {
-+ synthesize_enter_events (_gdk_directfb_mouse_window, intermediate, factory->event, mode, GDK_NOTIFY_VIRTUAL);
-+ }
-+
-+ synthesize_enter_event (window, factory->event, mode, GDK_NOTIFY_ANCESTOR);
-+ }
-+ else if (gdk_directfb_window_is_ancestor (window, _gdk_directfb_mouse_window))
-+ {
-+ /* Pointer has moved to an ancestor window. */
-+ synthesize_leave_event (_gdk_directfb_mouse_window, factory->event, mode, GDK_NOTIFY_ANCESTOR);
-+
-+ /* If there are intermediate windows, generate LEAVE_NOTIFY
-+ * events for them
-+ */
-+ intermediate = gdk_window_get_parent (_gdk_directfb_mouse_window);
-+ if (intermediate != window)
-+ {
-+ synthesize_leave_events (intermediate, window, factory->event, mode, GDK_NOTIFY_VIRTUAL);
-+ }
-+
-+ synthesize_enter_event (window, factory->event, mode, GDK_NOTIFY_INFERIOR);
-+ }
-+ else if (_gdk_directfb_mouse_window)
-+ {
-+ /* Find least common ancestor of _gdk_directfb_mouse_window and window */
-+ tem = _gdk_directfb_mouse_window;
-+ do {
-+ common_ancestor = gdk_window_get_parent (tem);
-+ tem = common_ancestor;
-+ } while (common_ancestor &&
-+ !gdk_directfb_window_is_ancestor (common_ancestor, window));
-+ if (common_ancestor)
-+ {
-+ synthesize_leave_event (_gdk_directfb_mouse_window, factory->event, mode, GDK_NOTIFY_NONLINEAR);
-+ intermediate = gdk_window_get_parent (_gdk_directfb_mouse_window);
-+ if (intermediate != common_ancestor)
-+ {
-+ synthesize_leave_events (intermediate, common_ancestor,
-+ factory->event, mode, GDK_NOTIFY_NONLINEAR_VIRTUAL);
-+ }
-+ intermediate = gdk_window_get_parent (window);
-+ if (intermediate != common_ancestor)
-+ {
-+ synthesize_enter_events (common_ancestor, intermediate,
-+ factory->event, mode, GDK_NOTIFY_NONLINEAR_VIRTUAL);
-+ }
-+ synthesize_enter_event (window, factory->event, mode, GDK_NOTIFY_NONLINEAR);
-+ }
-+ }
-+ else
-+ {
-+ /* This means we have no _gdk_directfb_mouse_window, which probably
-+ * means that there is a bug somewhere, we should always have
-+ * the root in we don't have another window. Does this ever
-+ * happen?
-+ */
-+ g_warning ("Trying to create crossing event when _gdk_directfb_mouse_window is NULL");
-+ }
-+
-+ _gdk_directfb_events_update_mouse_window (window);
-+
-+ /* FIXME: This does't work when someone calls gdk_window_set_cursor
-+ * during a grab. The right behavior is that the cursor doesn't
-+ * change when a grab is in effect, but in that case it does.
-+ */
-+ if (window && !_gdk_directfb_pointer_grab_window)
-+ _gdk_directfb_events_update_cursor (window);
-+}
-+
-+/* Synthesizes crossing events if necessary, based on the passed in
-+ * DFBEvent. Uses DWET_ENTER and DWET_LEAVE for toplevels and
-+ * the mouse moved/dragged events for child windows, to see if the
-+ * mouse window has changed.
-+ */
-+static void
-+factory_synthesize_crossing (GdkEventFactory *factory)
-+{
-+ GdkWindow *mouse_window;
-+ gint x;
-+ gint y;
-+
-+ switch (factory->event->type)
-+ {
-+ case DWET_MOTION:
-+ /* We only handle moving the pointer to another GDK window.
-+ * Leaving to a non-GDK toplevel window (or window title bar or
-+ * the desktop) is covered by NSMouseExited events.
-+ */
-+ x = factory->event->cx;
-+ y = factory->event->cy;
-+ mouse_window = gdk_directfb_child_at (_gdk_parent_root, &x, &y);
-+ if (mouse_window != _gdk_parent_root)
-+ synthesize_crossing_events (factory, mouse_window, GDK_CROSSING_NORMAL, x, y);
-+
-+ break;
-+
-+ case DWET_ENTER:
-+ {
-+ GdkWindow *event_toplevel;
-+ GdkWindowImplDirectFB *impl;
-+
-+ /* This is the only case where we actually use the window from
-+ * the event since we need to know which toplevel we entered
-+ * so it can be tracked properly.
-+ */
-+ event_toplevel = factory->window;
-+ impl = factory->impl;
-+
-+ x = factory->win_x;
-+ y = factory->win_y;
-+
-+ mouse_window = gdk_directfb_child_at (event_toplevel, &x, &y);
-+
-+ /* Treat unknown windows (like the title bar buttons or
-+ * desktop) as the root window.
-+ */
-+ if (!mouse_window)
- {
-- if (gdk_directfb_pointer_grab (child, FALSE,
-- gdk_window_get_events (child),
-- NULL, NULL,
-- GDK_CURRENT_TIME,
-- TRUE) == GDK_GRAB_SUCCESS)
-- click_grab = TRUE;
-+ x = factory->event->cx;
-+ y = factory->event->cy;
-+ mouse_window = _gdk_parent_root;
- }
-- else if (dfbevent->type == DWET_BUTTONUP &&
-- !(_gdk_directfb_modifiers & (GDK_BUTTON1_MASK |
-- GDK_BUTTON2_MASK |
-- GDK_BUTTON3_MASK)) && click_grab)
-+
-+ synthesize_crossing_events (factory, mouse_window, GDK_CROSSING_NORMAL, x, y);
-+ }
-+ break;
-+
-+ case DWET_LEAVE:
-+ {
-+ GdkWindow *event_toplevel;
-+ GdkWindowImplDirectFB *impl;
-+
-+ /* We only use NSMouseExited when leaving to the root
-+ * window. The other cases are handled above by checking the
-+ * motion/button events, or getting a NSMouseEntered for
-+ * another GDK window. The reason we don't use NSMouseExited
-+ * for other windows is that directfb first delivers the entered
-+ * event and then the exited which is the opposite from what
-+ * we need.
-+ */
-+ event_toplevel = factory->window;
-+ impl = factory->impl;
-+
-+ x = factory->event->cx;
-+ y = factory->event->cy;
-+
-+ /* If there is a window other than the root window at this
-+ * position, it means we didn't exit to the root window and we
-+ * ignore the event. (Note that we can get NULL here when swithing
-+ * spaces for example.)
-+ *
-+ * FIXME: This is not enough, it doesn't catch the case where
-+ * we leave a GDK window to a non-GDK window that has GDK
-+ * windows below it.
-+ */
-+ mouse_window = gdk_directfb_child_at (event_toplevel, &x, &y);
-+
-+ if (!mouse_window ||
-+ gdk_directfb_window_find_toplevel (mouse_window) ==
-+ gdk_directfb_window_find_toplevel (_gdk_directfb_mouse_window))
- {
-- gdk_directfb_pointer_ungrab (GDK_CURRENT_TIME, TRUE);
-- click_grab = FALSE;
-+ mouse_window = _gdk_parent_root;
- }
-+
-+ if (mouse_window == _gdk_parent_root)
-+ synthesize_crossing_events (factory, _gdk_parent_root, GDK_CROSSING_NORMAL, x, y);
- }
- break;
-
-+ default:
-+ break;
-+ }
-+}
-+
-+/**********************************************************************************************************************/
-+
-+/* Checks if the passed in window is interested in the event mask, and
-+ * if so, it's returned. If not, the event can be propagated through
-+ * its ancestors until one with the right event mask is found, up to
-+ * the nearest toplevel.
-+ */
-+static GdkWindow *
-+find_window_interested_in_event_mask (GdkWindow *window,
-+ GdkEventMask event_mask,
-+ gboolean propagate)
-+{
-+ GdkWindowObject *priv;
-+
-+ priv = GDK_WINDOW_OBJECT (window);
-+ while (priv)
-+ {
-+ if (priv->event_mask & event_mask)
-+ return (GdkWindow *)priv;
-+
-+ if (!propagate)
-+ return NULL;
-+
-+ /* Don't traverse beyond toplevels. */
-+ if (GDK_WINDOW_TYPE (priv) != GDK_WINDOW_CHILD)
-+ break;
-+
-+ priv = priv->parent;
-+ }
-+
-+ return NULL;
-+}
-+
-+/*
-+ * Main part of adaption, may synthesize some events, will determine actual window to which the event should be sent.
-+ */
-+static gboolean
-+factory_process (GdkEventFactory *factory,
-+ GdkWindow **ret_event_window,
-+ GdkWindow **ret_filter_window)
-+{
-+ int wx, wy;
-+ const DFBWindowEvent *dfbevent;
-+ GdkWindow *event_window;
-+ GdkWindow *mouse_window;
-+ GdkWindow *filter_window;
-+ guint mask;
-+ guint button;
-+
-+ g_return_val_if_fail (factory != NULL, FALSE);
-+ g_return_val_if_fail (factory->event != NULL, FALSE);
-+ g_return_val_if_fail (GDK_IS_WINDOW(factory->window), FALSE);
-+
-+ /* Initialize with root window coords. */
-+ dfbevent = factory->event;
-+ wx = dfbevent->cx;
-+ wy = dfbevent->cy;
-+
-+ /* Start with original window. */
-+ event_window = factory->window;
-+
-+ /* We always run the filters for the window where the event
-+ * is delivered, not the window that it relates to
-+ */
-+ filter_window = factory->window;
-+
-+ /* Generate event mask from type, buttons etc. */
-+ factory->mask = get_event_mask_from_dfb_event (dfbevent);
-+
-+ D_DEBUG_AT( GDKDFB_EventTrans, " -> event mask 0x%08x\n", factory->mask );
-+
-+ /* Check event types. */
-+ switch (dfbevent->type)
-+ {
-+ case DWET_BUTTONDOWN:
-+ case DWET_BUTTONUP:
- case DWET_MOTION:
-- {
-- GdkWindow *event_win=NULL;
-- GdkWindow *child;
--
-- _gdk_directfb_mouse_x = dfbevent->cx;
-- _gdk_directfb_mouse_y = dfbevent->cy;
--
-- //child = gdk_directfb_child_at (window, &dfbevent->x, &dfbevent->y);
-- /* Go all the way to root to catch popup menus */
-- int wx=_gdk_directfb_mouse_x;
-- int wy=_gdk_directfb_mouse_y;
-- child = gdk_directfb_child_at (_gdk_parent_root, &wx, &wy);
--
-- /* first let's see if any cossing event has to be send */
-- gdk_directfb_window_send_crossing_events (NULL, child, GDK_CROSSING_NORMAL);
--
-- /* then dispatch the motion event to the window the cursor it's inside */
-- event_win = gdk_directfb_pointer_event_window (child, GDK_MOTION_NOTIFY);
--
--
-- if (event_win)
-- {
--
-- if (event_win == _gdk_directfb_pointer_grab_window) {
-- GdkDrawableImplDirectFB *impl;
--
-- child = _gdk_directfb_pointer_grab_window;
-- impl = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (child)->impl);
--
-- dfbevent->x = _gdk_directfb_mouse_x - impl->abs_x;
-- dfbevent->y = _gdk_directfb_mouse_y - impl->abs_y;
-- }
--
-- event = gdk_directfb_event_make (child, GDK_MOTION_NOTIFY);
--
-- event->motion.x_root = _gdk_directfb_mouse_x;
-- event->motion.y_root = _gdk_directfb_mouse_y;
--
-- //event->motion.x = dfbevent->x;
-- //event->motion.y = dfbevent->y;
-- event->motion.x = wx;
-- event->motion.y = wy;
--
-- event->motion.state = _gdk_directfb_modifiers;
-- event->motion.is_hint = FALSE;
-- event->motion.device = display->core_pointer;
--
-- if (GDK_WINDOW_OBJECT (event_win)->event_mask &
-- GDK_POINTER_MOTION_HINT_MASK)
-- {
-- while (EventBuffer->PeekEvent (EventBuffer,
-- DFB_EVENT (dfbevent)) == DFB_OK
-- && dfbevent->type == DWET_MOTION)
-- {
-- EventBuffer->GetEvent (EventBuffer, DFB_EVENT (dfbevent));
-- event->motion.is_hint = TRUE;
-- }
-- }
-- }
-- /* make sure crossing events go to the event window found */
--/* GdkWindow *ev_win = ( event_win == NULL ) ? gdk_window_at_pointer (NULL,NULL) :event_win;
-- gdk_directfb_window_send_crossing_events (NULL,ev_win,GDK_CROSSING_NORMAL);
--*/
-- }
-+ case DWET_WHEEL:
-+ _gdk_directfb_mouse_x = dfbevent->cx;
-+ _gdk_directfb_mouse_y = dfbevent->cy;
-+
-+ /* Map button to index and mask. */
-+ switch (dfbevent->button)
-+ {
-+ case DIBI_LEFT:
-+ button = 1;
-+ mask = GDK_BUTTON1_MASK;
-+ break;
-+ case DIBI_MIDDLE:
-+ button = 2;
-+ mask = GDK_BUTTON2_MASK;
-+ break;
-+ case DIBI_RIGHT:
-+ button = 3;
-+ mask = GDK_BUTTON3_MASK;
-+ break;
-+ default:
-+ button = dfbevent->button + 1;
-+ mask = 0;
-+ break;
-+ }
-+
-+ factory->button = button;
-+
-+ if (dfbevent->type == DWET_BUTTONDOWN)
-+ _gdk_directfb_modifiers |= mask;
-+ else
-+ _gdk_directfb_modifiers &= ~mask;
-+
-+ factory->type = (dfbevent->type == DWET_BUTTONDOWN ? GDK_BUTTON_PRESS :
-+ dfbevent->type == DWET_BUTTONUP ? GDK_BUTTON_RELEASE :
-+ dfbevent->type == DWET_MOTION ? GDK_MOTION_NOTIFY : GDK_SCROLL);
-+
-+
-+ /* From the docs for XGrabPointer:
-+ *
-+ * If owner_events is True and if a generated pointer event
-+ * would normally be reported to this client, it is reported
-+ * as usual. Otherwise, the event is reported with respect to
-+ * the grab_window and is reported only if selected by
-+ * event_mask. For either value of owner_events, unreported
-+ * events are discarded.
-+ *
-+ * This means we first try the owner, then the grab window,
-+ * then give up.
-+ */
-+ if (_gdk_directfb_pointer_grab_window)
-+ {
-+ if (_gdk_directfb_pointer_grab_owner_events)
-+ {
-+ mouse_window = gdk_directfb_child_at (_gdk_parent_root, &wx, &wy);
-+ event_window = find_window_interested_in_event_mask (mouse_window, factory->mask, TRUE);
-+
-+ /* We have to translate the coordinates if the actual
-+ * window is different from the mouse window.
-+ */
-+ if (mouse_window && event_window && mouse_window != event_window)
-+ {
-+ GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB( GDK_WINDOW_OBJECT(event_window)->impl );
-+
-+ wx = dfbevent->cx - impl->abs_x;
-+ wy = dfbevent->cy - impl->abs_y;
-+ }
-+
-+ if (event_window)
-+ {
-+ D_DEBUG_AT( GDKDFB_EventTrans, " -> owner %4d,%4d (%4d,%4d) [%4d,%4d]\n",
-+ wx, wy, dfbevent->x, dfbevent->y, dfbevent->cx, dfbevent->cy );
-+
-+ break;
-+ }
-+ }
-+
-+ /* Finally check the grab window. */
-+ if (_gdk_directfb_pointer_grab_events & factory->mask)
-+ {
-+ GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB(
-+ GDK_WINDOW_OBJECT(_gdk_directfb_pointer_grab_window)->impl );
-+
-+ wx = dfbevent->cx - impl->abs_x;
-+ wy = dfbevent->cy - impl->abs_y;
-+
-+ event_window = _gdk_directfb_pointer_grab_window;
-+
-+ D_DEBUG_AT( GDKDFB_EventTrans, " -> grab %4d,%4d (%4d,%4d) [%4d,%4d]\n",
-+ wx, wy, dfbevent->x, dfbevent->y, dfbevent->cx, dfbevent->cy );
-+ }
-+ else
-+ event_window = NULL;
-+ }
-+ else
-+ {
-+ /* The non-grabbed case. */
-+ mouse_window = gdk_directfb_child_at (_gdk_parent_root, &wx, &wy);
-+ event_window = find_window_interested_in_event_mask (mouse_window, factory->mask, TRUE);
-+
-+ /* We have to translate the coordinates if the actual
-+ * window is different from the mouse window.
-+ */
-+ if (mouse_window && event_window && mouse_window != event_window)
-+ {
-+ GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB( GDK_WINDOW_OBJECT(event_window)->impl );
-+
-+ wx = dfbevent->cx - impl->abs_x;
-+ wy = dfbevent->cy - impl->abs_y;
-+ }
-+
-+ D_DEBUG_AT( GDKDFB_EventTrans, " -> normal %4d,%4d (%4d,%4d) [%4d,%4d]\n",
-+ wx, wy, dfbevent->x, dfbevent->y, dfbevent->cx, dfbevent->cy );
-+ }
- break;
-
- case DWET_GOTFOCUS:
-- gdk_directfb_change_focus (window);
-+ case DWET_LOSTFOCUS:
-+ factory->type = GDK_FOCUS_CHANGE;
-+ event_window = find_window_interested_in_event_mask (event_window, factory->mask, TRUE);
-+ break;
-
-+ case DWET_POSITION:
-+ case DWET_POSITION_SIZE:
-+ case DWET_SIZE:
-+ factory->type = GDK_CONFIGURE;
-+ event_window = find_window_interested_in_event_mask (event_window, factory->mask, TRUE);
-+ break;
-+
-+ case DWET_KEYDOWN:
-+ case DWET_KEYUP:
-+ factory->type = (dfbevent->type == DWET_KEYUP ? GDK_KEY_RELEASE : GDK_KEY_PRESS);
-+
-+ if (_gdk_directfb_keyboard_grab_window && !_gdk_directfb_keyboard_grab_owner_events)
-+ event_window = _gdk_directfb_keyboard_grab_window;
-+ else
-+ {
-+ if (!_gdk_directfb_keyboard_window)
-+ _gdk_directfb_keyboard_window = g_object_ref (_gdk_parent_root);
-+
-+ event_window = find_window_interested_in_event_mask (_gdk_directfb_keyboard_window, factory->mask, TRUE);
-+ }
-+
-+ break;
-+
-+ case DWET_LEAVE:
-+ factory->type = GDK_LEAVE_NOTIFY;
-+ event_window = gdk_directfb_child_at (_gdk_parent_root, &wx, &wy);
-+
-+ if (event_window == _gdk_parent_root)
-+ event_window = NULL;
-+ break;
-+
-+ case DWET_ENTER:
-+ factory->type = GDK_ENTER_NOTIFY;
-+ event_window = gdk_directfb_child_at (_gdk_parent_root, &wx, &wy);
-+
-+ /* this makes sure pointer is set correctly when it previously left
-+ * a window being not standard shaped
-+ */
-+ if (event_window)
-+ gdk_window_set_cursor (event_window, NULL); /* FIXME */
-+ break;
-+
-+ case DWET_CLOSE:
-+ factory->type = GDK_DELETE;
-+ event_window = find_window_interested_in_event_mask (event_window, factory->mask, TRUE);
-+ break;
-+
-+ case DWET_DESTROYED:
-+ factory->type = GDK_DESTROY;
-+ event_window = find_window_interested_in_event_mask (event_window, factory->mask, TRUE);
-+ break;
-+
-+ default:
-+ D_WARN( "DFBWindowEventType 0x%08x unknown", dfbevent->type );
-+ }
-+
-+ /* Return information. */
-+ factory->win_x = wx;
-+ factory->win_y = wy;
-+
-+ if (ret_event_window)
-+ *ret_event_window = event_window;
-+
-+ if (ret_filter_window)
-+ *ret_filter_window = filter_window;
-+
-+ return true;
-+}
-+
-+static inline bool
-+factory_init (GdkEventFactory *factory,
-+ GdkDisplay *display,
-+ const DFBWindowEvent *dfbevent)
-+{
-+ GdkWindow *window;
-+ GdkWindowObject *priv;
-+
-+ g_return_val_if_fail (factory != NULL, FALSE);
-+ g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-+ g_return_val_if_fail (dfbevent != NULL, FALSE);
-+
-+ memset (factory, 0, sizeof(GdkEventFactory));
-+
-+ window = gdk_window_lookup_for_display (display, dfbevent->window_id);
-+ if (!window)
-+ {
-+ g_warning ("%s: Could not find window for id %u!\n", __FUNCTION__, dfbevent->window_id );
-+ return false;
-+ }
-+
-+ g_return_val_if_fail (GDK_IS_WINDOW(window), FALSE);
-+
-+ priv = GDK_WINDOW_OBJECT (window);
-+
-+ factory->event = dfbevent;
-+ factory->window = window;
-+ factory->priv = priv;
-+ factory->impl = GDK_WINDOW_IMPL_DIRECTFB (priv->impl);
-+ factory->win_x = dfbevent->x;
-+ factory->win_y = dfbevent->y;
-+
-+ return true;
-+}
-+
-+static inline bool
-+factory_build (GdkEventFactory *factory,
-+ GdkEvent *event,
-+ GdkWindow *window)
-+{
-+ const DFBWindowEvent *dfbevent;
-+ guint32 the_time;
-+
-+ g_return_val_if_fail (factory != NULL, FALSE);
-+ g_return_val_if_fail (factory->event != NULL, FALSE);
-+ g_return_val_if_fail (factory->window != NULL, FALSE);
-+ g_return_val_if_fail (event != NULL, FALSE);
-+
-+ if (window)
-+ D_ASSUME( GDK_IS_WINDOW (window) );
-+
-+ dfbevent = factory->event;
-+ the_time = (guint32)(dfbevent->timestamp.tv_sec * 1000 + dfbevent->timestamp.tv_usec / 1000);
-+
-+ event->any.type = factory->type;
-+ event->any.window = window;
-+ event->any.send_event = FALSE; /* We don't use PostEvent() so far. */
-+
-+ switch (factory->type)
-+ {
-+ case GDK_MOTION_NOTIFY:
-+ event->motion.time = the_time;
-+ event->motion.axes = NULL;
-+ break;
-+ case GDK_BUTTON_PRESS:
-+ case GDK_2BUTTON_PRESS:
-+ case GDK_3BUTTON_PRESS:
-+ case GDK_BUTTON_RELEASE:
-+ event->button.time = the_time;
-+ event->button.axes = NULL;
-+ break;
-+ case GDK_KEY_PRESS:
-+ case GDK_KEY_RELEASE:
-+ event->key.time = the_time;
-+ break;
-+ case GDK_ENTER_NOTIFY:
-+ case GDK_LEAVE_NOTIFY:
-+ event->crossing.time = the_time;
-+ break;
-+ case GDK_PROPERTY_NOTIFY:
-+ event->property.time = the_time;
-+ break;
-+ case GDK_SELECTION_CLEAR:
-+ case GDK_SELECTION_REQUEST:
-+ case GDK_SELECTION_NOTIFY:
-+ event->selection.time = the_time;
-+ break;
-+ case GDK_PROXIMITY_IN:
-+ case GDK_PROXIMITY_OUT:
-+ event->proximity.time = the_time;
-+ break;
-+ case GDK_DRAG_ENTER:
-+ case GDK_DRAG_LEAVE:
-+ case GDK_DRAG_MOTION:
-+ case GDK_DRAG_STATUS:
-+ case GDK_DROP_START:
-+ case GDK_DROP_FINISHED:
-+ event->dnd.time = the_time;
-+ break;
-+ case GDK_SCROLL:
-+ event->scroll.time = the_time;
-+ break;
-+ case GDK_FOCUS_CHANGE:
-+ event->focus_change.in = (dfbevent->type == DWET_GOTFOCUS);
-+ break;
-+ case GDK_CONFIGURE:
-+ case GDK_MAP:
-+ case GDK_UNMAP:
-+ case GDK_CLIENT_EVENT:
-+ case GDK_VISIBILITY_NOTIFY:
-+ case GDK_NO_EXPOSE:
-+ case GDK_DELETE:
-+ case GDK_DESTROY:
-+ case GDK_EXPOSE:
-+ default:
-+ break;
-+ }
-+
-+ return true;
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static gboolean
-+gdk_event_translate (GdkDisplay *display,
-+ GdkEvent *event,
-+ DFBWindowEvent *dfbevent)
-+{
-+ GdkEventFactory factory;
-+ GdkWindow *event_window = NULL;
-+ GdkWindowObject *event_private = NULL;
-+ GdkWindowImplDirectFB *event_impl = NULL;
-+ GdkWindow *filter_window = NULL;
-+ gboolean return_val = FALSE;
-+
-+ /* Hmm, no g_goto_if_fail? */
-+#define return goto done
-+ g_return_if_fail (GDK_IS_DISPLAY_DFB(display));
-+ g_return_if_fail (event != NULL);
-+ g_return_if_fail (dfbevent != NULL);
-+#undef return
-+
-+ D_DEBUG_AT( GDKDFB_EventTrans, "%s( %p, %p, %p )\n", __FUNCTION__, display, event, dfbevent );
-+
-+#if DIRECTFB_MAJOR_VERSION >= 1 && DIRECTFB_MINOR_VERSION >= 1
-+ D_DEBUG_AT( GDKDFB_EventTrans, " -> type %s\n", dfb_window_event_type_name (dfbevent->type) );
-+#endif
-+
-+ /* init this, since the done: block uses it */
-+ event->any.window = NULL;
-+
-+ /* Apply global filters */
-+ if (_gdk_default_filters)
-+ {
-+ GdkFilterReturn result = gdk_event_apply_filters (dfbevent, event,
-+ _gdk_default_filters);
-+ if (result != GDK_FILTER_CONTINUE)
-+ {
-+ return_val = (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
-+ goto done;
-+ }
-+ }
-+
-+ /* Determine the original window of the event, type, mask etc. */
-+ if (!factory_init (&factory, display, dfbevent))
-+ goto done;
-+
-+ if (factory.impl)
-+ D_DEBUG_AT( GDKDFB_EventTrans, " -> window [" GDKDFB_WIMPL_FORM "]\n", GDKDFB_WIMPL_V(factory.impl) );
-+
-+ /* Take care of DWET_ENTER/LEAVE events and mouse movement
-+ * events and emit the right GDK crossing events.
-+ */
-+ factory_synthesize_crossing (&factory);
-+
-+ /* Main part of adaption, may synthesize some events, will determine actual window
-+ * to which the event should be sent and return the window that filters it.
-+ */
-+ if (!factory_process (&factory, &event_window, &filter_window))
-+ goto done;
-+
-+ /* We always run the filters for the window where the event
-+ * is delivered, not the window that it relates to
-+ */
-+ if (filter_window && !GDK_IS_WINDOW (filter_window))
-+ filter_window = NULL;
-+
-+ /* Check window receiving the event. */
-+ if (event_window)
-+ {
-+ if (GDK_IS_WINDOW (event_window))
-+ {
-+ g_object_ref (G_OBJECT (event_window));
-+
-+ event_private = GDK_WINDOW_OBJECT (event_window);
-+ event_impl = GDK_WINDOW_IMPL_DIRECTFB(event_private->impl);
-+
-+ D_DEBUG_AT( GDKDFB_EventTrans, " -> event win [" GDKDFB_WIMPL_FORM "]\n",
-+ GDKDFB_WIMPL_V(event_impl) );
-+ }
-+ else
-+ event_window = NULL;
-+ }
-+
-+ if (event_private && GDK_WINDOW_DESTROYED (event_window))
-+ {
-+ if (dfbevent->type != DWET_DESTROYED)
-+ goto done;
-+ }
-+ else if (filter_window)
-+ {
-+ /* Apply per-window filters */
-+ GdkWindowObject *filter_private = (GdkWindowObject *) filter_window;
-+
-+ if (filter_private->filters)
-+ {
-+ GdkFilterReturn result;
-+
-+ g_object_ref (filter_window);
-+
-+ result = gdk_event_apply_filters (dfbevent, event,
-+ filter_private->filters);
-+
-+ g_object_unref (filter_window);
-+
-+ if (result != GDK_FILTER_CONTINUE)
-+ {
-+ return_val = (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
-+ goto done;
-+ }
-+ }
-+ }
-+
-+ /* Fill out GDK Event structure. */
-+ if (!factory_build (&factory, event, event_window))
-+ goto done;
-+
-+ switch (dfbevent->type)
-+ {
-+ case DWET_BUTTONDOWN:
-+ case DWET_BUTTONUP:
-+ if (dfbevent->type == DWET_BUTTONDOWN)
-+ {
-+ GdkEventMask event_mask;
-+
-+ GDK_NOTE (EVENTS,
-+ g_message ("button press:\t\twindow: %p x,y: %d %d button: %d",
-+ event_window,
-+ factory.win_x, factory.win_y,
-+ event->button.button));
-+
-+ /* Emulate implicit grab, when the window has both PRESS and RELEASE
-+ * in its mask, like X.
-+ */
-+ event_mask = (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-+ if (!_gdk_directfb_pointer_grab_window && event_window &&
-+ (GDK_WINDOW_OBJECT (event_window)->event_mask & event_mask) == event_mask)
-+ {
-+ gdk_directfb_pointer_grab (event_window, FALSE,
-+ gdk_window_get_events (event_window),
-+ NULL, NULL,
-+ GDK_CURRENT_TIME,
-+ TRUE);
-+ }
-+ }
-+ else
-+ {
-+ GDK_NOTE (EVENTS,
-+ g_message ("button release:\t\twindow: %p x,y: %d %d button: %d",
-+ event_window,
-+ factory.win_x, factory.win_y,
-+ event->button.button));
-+
-+ if (!(_gdk_directfb_modifiers & (GDK_BUTTON1_MASK |
-+ GDK_BUTTON2_MASK |
-+ GDK_BUTTON3_MASK)))
-+ gdk_directfb_pointer_ungrab (GDK_CURRENT_TIME, TRUE);
-+ }
-+
-+
-+ if (event_window)
-+ {
-+ event->button.x_root = _gdk_directfb_mouse_x;
-+ event->button.y_root = _gdk_directfb_mouse_y;
-+
-+ event->button.x = factory.win_x;
-+ event->button.y = factory.win_y;
-+
-+ event->button.state = _gdk_directfb_modifiers;
-+ event->button.button = factory.button;
-+ event->button.device = display->core_pointer;
-+
-+ D_DEBUG_AT( GDKDFB_EventTrans, " => BUTTON %c%d %4.0f,%4.0f (0x%08x)\n",
-+ (dfbevent->type == DWET_BUTTONDOWN) ? '+' : '-',
-+ event->button.button, event->button.x, event->button.y, event->button.state );
-+
-+ if (dfbevent->type == DWET_BUTTONDOWN)
-+ _gdk_event_button_generate (display, event);
-+
-+ return_val = TRUE;
-+ }
-+ break;
-+
-+ case DWET_MOTION:
-+ GDK_NOTE (EVENTS,
-+ g_message ("motion notify:\t\twindow: %p x,y: %d %d hint: %s",
-+ event_window,
-+ factory.win_x, factory.win_y,
-+ (event->motion.is_hint) ? "true" : "false"));
-+
-+ if (event_window)
-+ {
-+ event->motion.x_root = _gdk_directfb_mouse_x;
-+ event->motion.y_root = _gdk_directfb_mouse_y;
-+
-+ event->motion.x = factory.win_x;
-+ event->motion.y = factory.win_y;
-+
-+ event->motion.state = _gdk_directfb_modifiers;
-+ event->motion.is_hint = FALSE;
-+ event->motion.device = display->core_pointer;
-+
-+ D_DEBUG_AT( GDKDFB_EventTrans, " => MOTION %4.0f,%4.0f (0x%08x)\n",
-+ event->motion.x, event->motion.y, event->motion.state );
-+
-+ return_val = TRUE;
-+ }
-+ break;
-+
-+ case DWET_GOTFOCUS:
-+ gdk_directfb_change_focus (event_window);
-+ return_val = TRUE;
- break;
-
- case DWET_LOSTFOCUS:
- gdk_directfb_change_focus (_gdk_parent_root);
--
-+ return_val = TRUE;
- break;
-
- case DWET_POSITION:
-- {
-- GdkWindow *event_win;
-+ factory.priv->x = dfbevent->x;
-+ factory.priv->y = dfbevent->y;
-
-- private->x = dfbevent->x;
-- private->y = dfbevent->y;
--
-- event_win = gdk_directfb_other_event_window (window, GDK_CONFIGURE);
-+ if (event_window)
-+ {
-+ event->configure.x = dfbevent->x;
-+ event->configure.y = dfbevent->y;
-+ event->configure.width = factory.impl->drawable.width;
-+ event->configure.height = factory.impl->drawable.height;
-
-- if (event_win)
-- {
-- event = gdk_directfb_event_make (event_win, GDK_CONFIGURE);
-- event->configure.x = dfbevent->x;
-- event->configure.y = dfbevent->y;
-- event->configure.width =
-- GDK_DRAWABLE_IMPL_DIRECTFB (private->impl)->width;
-- event->configure.height =
-- GDK_DRAWABLE_IMPL_DIRECTFB (private->impl)->height;
-- }
-+ return_val = TRUE;
-+ }
-
-- _gdk_directfb_calc_abs (window);
-- }
-+ _gdk_directfb_calc_abs (factory.window);
- break;
-
- case DWET_POSITION_SIZE:
-- private->x = dfbevent->x;
-- private->y = dfbevent->y;
-+ factory.priv->x = dfbevent->x;
-+ factory.priv->y = dfbevent->y;
- /* fallthru */
-
- case DWET_SIZE:
- {
-- GdkDrawableImplDirectFB *impl;
-- GdkWindow *event_win;
-- GList *list;
--
-- impl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
-+ GList *list;
-
-- event_win = gdk_directfb_other_event_window (window, GDK_CONFIGURE);
--
-- if (event_win)
-+ if (event_window)
- {
-- event = gdk_directfb_event_make (event_win, GDK_CONFIGURE);
-- event->configure.x = private->x;
-- event->configure.y = private->y;
-+ event->configure.x = factory.priv->x;
-+ event->configure.y = factory.priv->y;
- event->configure.width = dfbevent->w;
- event->configure.height = dfbevent->h;
-+
-+ return_val = TRUE;
- }
-
-- impl->width = dfbevent->w;
-- impl->height = dfbevent->h;
-+ factory.impl->drawable.width = dfbevent->w;
-+ factory.impl->drawable.height = dfbevent->h;
-
-- for (list = private->children; list; list = list->next)
-+ for (list = factory.priv->children; list; list = list->next)
- {
- GdkWindowObject *win;
- GdkDrawableImplDirectFB *impl;
-@@ -635,152 +1789,100 @@ gdk_event_translate (DFBWindowEvent *dfbevent,
- win = GDK_WINDOW_OBJECT (list->data);
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (win->impl);
-
-+ /* FIXME: Get rid off that recursive bloat. */
- _gdk_directfb_move_resize_child (GDK_WINDOW (win),
- win->x, win->y,
- impl->width, impl->height);
- }
-
-- _gdk_directfb_calc_abs (window);
-+ /* FIXME: Get rid off that recursive bloat. */
-+ if (dfbevent->type != DWET_SIZE)
-+ _gdk_directfb_calc_abs (factory.window);
-
-- gdk_window_clear (window);
-- gdk_window_invalidate_rect (window, NULL, TRUE);
-+ gdk_window_clear (factory.window);
-+ gdk_window_invalidate_rect (factory.window, NULL, TRUE);
- }
- break;
-
- case DWET_KEYDOWN:
- case DWET_KEYUP:
-- {
-+ if (event_window)
-+ {
-+ gdk_directfb_translate_key_event (dfbevent, &event->key);
-
-- GdkEventType type = (dfbevent->type == DWET_KEYUP ?
-- GDK_KEY_RELEASE : GDK_KEY_PRESS);
-- GdkWindow *event_win =
-- gdk_directfb_keyboard_event_window (gdk_directfb_window_find_focus (),
-- type);
-- if (event_win)
-- {
-- event = gdk_directfb_event_make (event_win, type);
-- gdk_directfb_translate_key_event (dfbevent, &event->key);
-- }
-- }
-+ return_val = TRUE;
-+ }
- break;
-
- case DWET_LEAVE:
-- _gdk_directfb_mouse_x = dfbevent->cx;
-- _gdk_directfb_mouse_y = dfbevent->cy;
--
-- gdk_directfb_window_send_crossing_events (NULL, _gdk_parent_root,
-- GDK_CROSSING_NORMAL);
--
-- if (gdk_directfb_apply_focus_opacity)
-- {
-- if (GDK_WINDOW_IS_MAPPED (window))
-- GDK_WINDOW_IMPL_DIRECTFB (private->impl)->window->SetOpacity
-- (GDK_WINDOW_IMPL_DIRECTFB (private->impl)->window,
-- (GDK_WINDOW_IMPL_DIRECTFB (private->impl)->opacity >> 1) +
-- (GDK_WINDOW_IMPL_DIRECTFB (private->impl)->opacity >> 2));
-- }
-+ if (gdk_directfb_apply_focus_opacity && GDK_WINDOW_IS_MAPPED (factory.window))
-+ factory.impl->window->SetOpacity (factory.impl->window,
-+ factory.impl->opacity / 2 +
-+ factory.impl->opacity / 4);
- break;
-
- case DWET_ENTER:
-- {
-- GdkWindow *child;
--
-- _gdk_directfb_mouse_x = dfbevent->cx;
-- _gdk_directfb_mouse_y = dfbevent->cy;
--
-- child = gdk_directfb_child_at (window, &dfbevent->x, &dfbevent->y);
--
-- /* this makes sure pointer is set correctly when it previously left
-- * a window being not standard shaped
-- */
-- gdk_window_set_cursor (window, NULL);
-- gdk_directfb_window_send_crossing_events (NULL, child,
-- GDK_CROSSING_NORMAL);
--
-- if (gdk_directfb_apply_focus_opacity)
-- {
-- GDK_WINDOW_IMPL_DIRECTFB (private->impl)->window->SetOpacity
-- (GDK_WINDOW_IMPL_DIRECTFB (private->impl)->window,
-- GDK_WINDOW_IMPL_DIRECTFB (private->impl)->opacity);
-- }
-- }
-+ if (gdk_directfb_apply_focus_opacity && GDK_WINDOW_IS_MAPPED (factory.window))
-+ factory.impl->window->SetOpacity (factory.impl->window, factory.impl->opacity);
- break;
-
- case DWET_CLOSE:
-- {
--
-- GdkWindow *event_win;
--
-- event_win = gdk_directfb_other_event_window (window, GDK_DELETE);
--
-- if (event_win)
-- event = gdk_directfb_event_make (event_win, GDK_DELETE);
-- }
-+ return_val = TRUE;
- break;
-
- case DWET_DESTROYED:
-- {
-- GdkWindow *event_win;
--
-- event_win = gdk_directfb_other_event_window (window, GDK_DESTROY);
--
-- if (event_win)
-- event = gdk_directfb_event_make (event_win, GDK_DESTROY);
--
-- gdk_window_destroy_notify (window);
-- }
-+ gdk_window_destroy_notify (factory.window);
-+ return_val = TRUE;
- break;
-
- case DWET_WHEEL:
-- {
-- GdkWindow *event_win;
--
-- _gdk_directfb_mouse_x = dfbevent->cx;
-- _gdk_directfb_mouse_y = dfbevent->cy;
--
-- if (_gdk_directfb_pointer_grab_window)
-- {
-- GdkDrawableImplDirectFB *impl;
--
-- event_win = _gdk_directfb_pointer_grab_window;
-- impl =
-- GDK_DRAWABLE_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (event_win)->impl);
--
-- dfbevent->x = dfbevent->cx - impl->abs_x;
-- dfbevent->y = dfbevent->cy - impl->abs_y;
-- }
-- else
-- {
-- event_win = gdk_directfb_child_at (window,
-- &dfbevent->x, &dfbevent->y);
-- }
--
-- if (event_win)
-- {
-- event = gdk_directfb_event_make (event_win, GDK_SCROLL);
-+ if (event_window)
-+ {
-+ event->scroll.direction = (dfbevent->step < 0 ?
-+ GDK_SCROLL_DOWN : GDK_SCROLL_UP);
-
-- event->scroll.direction = (dfbevent->step < 0 ?
-- GDK_SCROLL_DOWN : GDK_SCROLL_UP);
-+ event->scroll.x_root = _gdk_directfb_mouse_x;
-+ event->scroll.y_root = _gdk_directfb_mouse_y;
-+ event->scroll.x = factory.win_x;
-+ event->scroll.y = factory.win_y;
-+ event->scroll.state = _gdk_directfb_modifiers;
-+ event->scroll.device = display->core_pointer;
-
-- event->scroll.x_root = _gdk_directfb_mouse_x;
-- event->scroll.y_root = _gdk_directfb_mouse_y;
-- event->scroll.x = dfbevent->x;
-- event->scroll.y = dfbevent->y;
-- event->scroll.state = _gdk_directfb_modifiers;
-- event->scroll.device = display->core_pointer;
-- }
-- }
-+ return_val = TRUE;
-+ }
- break;
-
- default:
- g_message ("unhandled DirectFB windowing event 0x%08x", dfbevent->type);
- }
-
-- g_object_unref (G_OBJECT (window));
-
-- return event;
-+done:
-+ if (return_val)
-+ {
-+ if (event->any.window)
-+ g_object_ref (event->any.window);
-+
-+ if (((event->any.type == GDK_ENTER_NOTIFY) ||
-+ (event->any.type == GDK_LEAVE_NOTIFY)) &&
-+ (event->crossing.subwindow != NULL))
-+ g_object_ref (event->crossing.subwindow);
-+ }
-+ else
-+ {
-+ /* Mark this event as having no resources to be freed */
-+ event->any.window = NULL;
-+ event->any.type = GDK_NOTHING;
-+ }
-+
-+ if (event_window)
-+ g_object_unref (event_window);
-+
-+ return return_val;
- }
-
-+/**********************************************************************************************************************/
-+
- gboolean
- gdk_screen_get_setting (GdkScreen *screen,
- const gchar *name,
-@@ -789,22 +1891,51 @@ gdk_screen_get_setting (GdkScreen *screen,
- return FALSE;
- }
-
-+/**
-+ * gdk_display_add_client_message_filter:
-+ * @display: a #GdkDisplay for which this message filter applies
-+ * @message_type: the type of ClientMessage events to receive.
-+ * This will be checked against the @message_type field
-+ * of the XClientMessage event struct.
-+ * @func: the function to call to process the event.
-+ * @data: user data to pass to @func.
-+ *
-+ * Adds a filter to be called when X ClientMessage events are received.
-+ * See gdk_window_add_filter() if you are interested in filtering other
-+ * types of events.
-+ *
-+ * Since: 2.2
-+ **/
- void
- gdk_display_add_client_message_filter (GdkDisplay *display,
- GdkAtom message_type,
- GdkFilterFunc func,
- gpointer data)
- {
-- /* XXX: display should be used */
-- GdkClientFilter *filter = g_new (GdkClientFilter, 1);
-+ GdkClientFilter *filter;
-+ g_return_if_fail (GDK_IS_DISPLAY (display));
-+ filter = g_new (GdkClientFilter, 1);
-
- filter->type = message_type;
- filter->function = func;
- filter->data = data;
-- client_filters = g_list_append (client_filters, filter);
--}
-
-+ GDK_DISPLAY_DFB(display)->client_filters =
-+ g_list_append (GDK_DISPLAY_DFB (display)->client_filters,
-+ filter);
-+}
-
-+/**
-+ * gdk_add_client_message_filter:
-+ * @message_type: the type of ClientMessage events to receive. This will be
-+ * checked against the <structfield>message_type</structfield> field of the
-+ * XClientMessage event struct.
-+ * @func: the function to call to process the event.
-+ * @data: user data to pass to @func.
-+ *
-+ * Adds a filter to the default display to be called when X ClientMessage events
-+ * are received. See gdk_display_add_client_message_filter().
-+ **/
- void
- gdk_add_client_message_filter (GdkAtom message_type,
- GdkFilterFunc func,
-@@ -819,7 +1950,7 @@ gdk_screen_broadcast_client_message (GdkScreen *screen,
- GdkEvent *sev)
- {
- GdkWindow *root_window;
-- GdkWindowObject *private;
-+ GdkWindowObject *priv;
- GList *top_level = NULL;
-
- g_return_if_fail (GDK_IS_SCREEN (screen));
-@@ -829,9 +1960,9 @@ gdk_screen_broadcast_client_message (GdkScreen *screen,
-
- g_return_if_fail(GDK_IS_WINDOW(root_window));
-
-- private = GDK_WINDOW_OBJECT (root_window);
-+ priv = GDK_WINDOW_OBJECT (root_window);
-
-- for (top_level = private->children; top_level; top_level = top_level->next)
-+ for (top_level = priv->children; top_level; top_level = top_level->next)
- {
- gdk_event_send_client_message_for_display (gdk_drawable_get_display(GDK_DRAWABLE(root_window)),
- sev,
-@@ -859,5 +1990,100 @@ gdk_net_wm_supports (GdkAtom property)
- return FALSE;
- }
-
-+/**********************************************************************************************************************/
-+
-+void
-+_gdk_directfb_events_send_map_events (GdkWindow *window)
-+{
-+ GList *list;
-+ GdkWindow *interested_window;
-+ GdkWindowObject *priv = (GdkWindowObject *)window;
-+
-+ interested_window = find_window_interested_in_event_mask (window,
-+ GDK_STRUCTURE_MASK,
-+ TRUE);
-+
-+ if (interested_window)
-+ {
-+ GdkEvent *event = gdk_event_new (GDK_MAP);
-+ event->any.window = interested_window;
-+ append_event (event);
-+ }
-+
-+ for (list = priv->children; list != NULL; list = list->next)
-+ _gdk_directfb_events_send_map_events ((GdkWindow *)list->data);
-+}
-+
-+/* Get current mouse window */
-+GdkWindow *
-+_gdk_directfb_events_get_mouse_window (gboolean consider_grabs)
-+{
-+ if (!consider_grabs)
-+ return _gdk_directfb_mouse_window;
-+
-+ if (_gdk_directfb_pointer_grab_window && !_gdk_directfb_pointer_grab_owner_events)
-+ return _gdk_directfb_pointer_grab_window;
-+
-+ return _gdk_directfb_mouse_window;
-+}
-+
-+/* Update mouse window */
-+void
-+_gdk_directfb_events_update_mouse_window (GdkWindow *window)
-+{
-+ if (window == _gdk_directfb_mouse_window)
-+ return;
-+
-+ if (window)
-+ g_object_ref (window);
-+ if (_gdk_directfb_mouse_window)
-+ g_object_unref (_gdk_directfb_mouse_window);
-+
-+ _gdk_directfb_mouse_window = window;
-+}
-+
-+/* Update current cursor */
-+void
-+_gdk_directfb_events_update_cursor (GdkWindow *window)
-+{
-+ static GdkCursorDirectFB *last_cursor = NULL;
-+
-+ GdkWindowObject *priv = GDK_WINDOW_OBJECT (window);
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (priv->impl);
-+ GdkCursorDirectFB *cursor;
-+
-+ if (_gdk_directfb_pointer_grab_cursor)
-+ cursor = (GdkCursorDirectFB*) _gdk_directfb_pointer_grab_cursor;
-+ else
-+ cursor = (GdkCursorDirectFB*) impl->cursor;
-+
-+ if (cursor != last_cursor)
-+ {
-+ window = gdk_directfb_window_find_toplevel (window);
-+ priv = GDK_WINDOW_OBJECT (window);
-+ impl = GDK_WINDOW_IMPL_DIRECTFB (priv->impl);
-+
-+ if (impl->window)
-+ impl->window->SetCursorShape (impl->window,
-+ cursor->shape,
-+ cursor->hot_x, cursor->hot_y);
-+ last_cursor = cursor;
-+ }
-+}
-+
-+/**********************************************************************************************************************/
-+
-+void
-+_gdk_windowing_event_data_copy (const GdkEvent *src,
-+ GdkEvent *dst)
-+{
-+}
-+
-+void
-+_gdk_windowing_event_data_free (GdkEvent *event)
-+{
-+}
-+
- #define __GDK_EVENTS_X11_C__
- #include "gdkaliasdef.c"
-+
-diff --git a/gdk/directfb/gdkfont-directfb.c b/gdk/directfb/gdkfont-directfb.c
-index 4965ee3..0b4eaf8 100644
---- a/gdk/directfb/gdkfont-directfb.c
-+++ b/gdk/directfb/gdkfont-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #undef GDK_DISABLE_DEPRECATED
-diff --git a/gdk/directfb/gdkgc-directfb.c b/gdk/directfb/gdkgc-directfb.c
-index c8d5293..698e6b2 100644
---- a/gdk/directfb/gdkgc-directfb.c
-+++ b/gdk/directfb/gdkgc-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #undef GDK_DISABLE_DEPRECATED
-@@ -113,8 +113,8 @@ gdk_gc_directfb_finalize (GObject *object)
- GdkGC *gc = GDK_GC (object);
- GdkGCDirectFB *private = GDK_GC_DIRECTFB (gc);
-
-- if (private->clip_region)
-- gdk_region_destroy (private->clip_region);
-+ if (private->clip_region.numRects)
-+ temp_region_deinit (&private->clip_region);
- if (private->values.clip_mask)
- g_object_unref (private->values.clip_mask);
- if (private->values.stipple)
-@@ -262,11 +262,7 @@ gdk_directfb_gc_set_values (GdkGC *gc,
- if (oldpm)
- g_object_unref (oldpm);
-
-- if (private->clip_region)
-- {
-- gdk_region_destroy (private->clip_region);
-- private->clip_region = NULL;
-- }
-+ temp_region_reset (&private->clip_region);
- }
-
- if (values_mask & GDK_GC_SUBWINDOW)
-@@ -355,7 +351,7 @@ gc_unset_clip_mask (GdkGC *gc)
-
- void
- _gdk_windowing_gc_set_clip_region (GdkGC *gc,
-- GdkRegion *region)
-+ GdkRegion *region)
- {
- GdkGCDirectFB *data;
-
-@@ -363,17 +359,13 @@ _gdk_windowing_gc_set_clip_region (GdkGC *gc,
-
- data = GDK_GC_DIRECTFB (gc);
-
-- if (region == data->clip_region)
-+ if (region == &data->clip_region)
- return;
-
-- if (data->clip_region)
-- {
-- gdk_region_destroy (data->clip_region);
-- data->clip_region = NULL;
-- }
--
- if (region)
-- data->clip_region = gdk_region_copy (region);
-+ temp_region_init_copy (&data->clip_region, region);
-+ else
-+ temp_region_reset (&data->clip_region);
-
- gc->clip_x_origin = 0;
- gc->clip_y_origin = 0;
-@@ -394,8 +386,7 @@ _gdk_windowing_gc_copy (GdkGC *dst_gc,
-
- dst_private = GDK_GC_DIRECTFB (dst_gc);
-
-- if (dst_private->clip_region)
-- gdk_region_destroy(dst_private->clip_region);
-+ temp_region_reset(&dst_private->clip_region);
-
- if (dst_private->values_mask & GDK_GC_FONT)
- gdk_font_unref (dst_private->values.font);
-@@ -415,8 +406,6 @@ _gdk_windowing_gc_copy (GdkGC *dst_gc,
- g_object_ref (dst_private->values.stipple);
- if (dst_private->values_mask & GDK_GC_CLIP_MASK)
- g_object_ref (dst_private->values.clip_mask);
-- if (dst_private->clip_region)
-- dst_private->clip_region = gdk_region_copy (dst_private->clip_region);
- }
-
- /**
-diff --git a/gdk/directfb/gdkgeometry-directfb.c b/gdk/directfb/gdkgeometry-directfb.c
-index f36fc22..2ca77a1 100644
---- a/gdk/directfb/gdkgeometry-directfb.c
-+++ b/gdk/directfb/gdkgeometry-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include "config.h"
-@@ -39,6 +39,8 @@
- #include "gdkinternals.h"
- #include "gdkalias.h"
-
-+D_DEBUG_DOMAIN( GDKDFB_Scroll, "GDKDFB/Scroll", "GDK DirectFB Scrolling" );
-+
-
- void
- _gdk_windowing_window_get_offsets (GdkWindow *window,
-@@ -73,54 +75,161 @@ gdk_window_scroll (GdkWindow *window,
- gint dx,
- gint dy)
- {
-- GdkWindowObject *private;
-- GdkDrawableImplDirectFB *impl;
-- GdkRegion *invalidate_region = NULL;
-- GList *list;
-+ int i, n, l;
-+ GList *list;
-+ DFBRectangle visible_dfbrect;
-+ GdkWindowObject *private = GDK_WINDOW_OBJECT (window);
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-+ IDirectFBSurface *surface = impl->drawable.surface;
-+ GdkRegion *invalidate_region = NULL;
-+
-+ D_DEBUG_AT( GDKDFB_Scroll, "%s( %p, %d,%d ) <- [" GDKDFB_WIMPL_FORM "]\n",
-+ __FUNCTION__, window, dx, dy, GDKDFB_WIMPL_V(impl) );
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-- if (GDK_WINDOW_DESTROYED (window))
-+ if (!dx && !dy)
- return;
-
-- private = GDK_WINDOW_OBJECT (window);
-- impl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
-+ /* Move already invalidated region */
-+ if (private->update_area)
-+ {
-+ gdk_region_offset( private->update_area, dx, dy );
-+
-+#if D_DEBUG_ENABLED
-+ D_DEBUG_AT( GDKDFB_Scroll, " -> moved invalid area\n" );
-+
-+ for (i=0; i<private->update_area->numRects; i++)
-+ D_DEBUG_AT( GDKDFB_Scroll, " -> [%d] %4d,%4d-%4dx%4d\n", i,
-+ private->update_area->rects[i].x1,
-+ private->update_area->rects[i].y1,
-+ private->update_area->rects[i].x2 - private->update_area->rects[i].x1,
-+ private->update_area->rects[i].y2 - private->update_area->rects[i].y1 );
-+#endif
-+ }
-+
-+ /* If the window has a visible part... */
-+ if (surface->GetVisibleRectangle( surface, &visible_dfbrect ) == DFB_OK)
-+ {
-+ GdkRectangle visible_rect = { visible_dfbrect.x, visible_dfbrect.y, visible_dfbrect.w, visible_dfbrect.h };
-+ GdkRectangle scrolled_rect;
-
-- if (dx == 0 && dy == 0)
-- return;
-+ /* Generate region to be invalidated based on visible rectangle */
-+ invalidate_region = gdk_region_rectangle (&visible_rect);
-
-- /* Move the current invalid region */
-- if (private->update_area)
-- gdk_region_offset (private->update_area, dx, dy);
-+ /* Calculate scrolled visible rectangle */
-+ scrolled_rect.x = visible_rect.x + dx;
-+ scrolled_rect.y = visible_rect.y + dy;
-+ scrolled_rect.width = visible_rect.width;
-+ scrolled_rect.height = visible_rect.height;
-
-- if (GDK_WINDOW_IS_MAPPED (window))
-- {
-- GdkRectangle clip_rect = { 0, 0, impl->width, impl->height };
-- GdkRectangle rect = { dx, dy, impl->width, impl->height };
-+ D_DEBUG_AT( GDKDFB_Scroll, " -> visible %4d,%4d-%4dx%4d\n",
-+ visible_dfbrect.x, visible_dfbrect.y, visible_dfbrect.w, visible_dfbrect.h );
-
-- invalidate_region = gdk_region_rectangle (&clip_rect);
-+ D_DEBUG_AT( GDKDFB_Scroll, " -> scrolled %4d,%4d-%4dx%4d\n",
-+ scrolled_rect.x, scrolled_rect.y, scrolled_rect.width, scrolled_rect.height );
-
-- if (gdk_rectangle_intersect (&rect, &clip_rect, &rect) &&
-- (!private->update_area ||
-- !gdk_region_rect_in (private->update_area, &rect)))
-+ /* If part of visible rectangle is still visible after scrolling... */
-+ if (gdk_rectangle_intersect (&visible_rect, &scrolled_rect, &scrolled_rect))
- {
-- GdkRegion *region;
--
-- region = gdk_region_rectangle (&rect);
-- gdk_region_subtract (invalidate_region, region);
-- gdk_region_destroy (region);
--
-- if (impl->surface)
-- {
-- DFBRegion update = { rect.x, rect.y,
-- rect.x + rect.width - 1,
-- rect.y + rect.height - 1 };
--
-- impl->surface->SetClip (impl->surface, &update);
-- impl->surface->Blit (impl->surface, impl->surface, NULL, dx, dy);
-- impl->surface->SetClip (impl->surface, NULL);
-- impl->surface->Flip(impl->surface,&update,0);
-- }
-+ GdkRegion *scrolled = gdk_region_rectangle (&scrolled_rect);
-+
-+ D_DEBUG_AT( GDKDFB_Scroll, " => intersect %4d,%4d-%4dx%4d\n",
-+ scrolled_rect.x, scrolled_rect.y, scrolled_rect.width, scrolled_rect.height );
-+
-+ /* Remove still visible part from region to invalidate */
-+ gdk_region_subtract (invalidate_region, scrolled);
-+
-+ /* Remove already invalidated region from region still visible after scrolling */
-+ if (private->update_area)
-+ gdk_region_subtract (scrolled, private->update_area);
-+
-+ /* If any of the still visible parts is still valid... */
-+ if (!gdk_region_empty( scrolled ))
-+ {
-+ int num = scrolled->numRects;
-+ int order[num];
-+ DFBRectangle rects[num];
-+ DFBPoint points[num];
-+
-+ /* Check vertical order required */
-+ if (dy <= 0)
-+ {
-+ /* Check horizontal order required */
-+ if (dx > 0)
-+ {
-+ /* Generate top->bottom, but right->left */
-+ for (i=0, l=0; i<num; i++)
-+ {
-+ if (i < num - 1 && scrolled->rects[i].y1 == scrolled->rects[i+1].y1)
-+ l++;
-+ else
-+ {
-+ for (n=0; n<=l; n++)
-+ order[i-n] = i - l + n;
-+
-+ l = 0;
-+ }
-+ }
-+ }
-+ else
-+ /* Generate top->bottom, left->right */
-+ for (i=0; i<num; i++)
-+ order[i] = i;
-+ }
-+ else
-+ {
-+ /* Check horizontal order required */
-+ if (dx < 0)
-+ {
-+ /* Generate left->right, but bottom->top */
-+ for (i=0, l=0; i<num; i++)
-+ {
-+ if (i < num - 1 && scrolled->rects[i].y1 == scrolled->rects[i+1].y1)
-+ l++;
-+ else
-+ {
-+ for (n=0; n<=l; n++)
-+ order[num-1-i+n] = i - l + n;
-+
-+ l = 0;
-+ }
-+ }
-+ }
-+ else
-+ /* Generate bottom->top, right->left */
-+ for (i=0; i<num; i++)
-+ order[i] = num - 1 - i;
-+ }
-+
-+ /* Generate list of rectangles and points */
-+ for (i=0; i<num; i++)
-+ {
-+ n = order[i];
-+
-+ rects[i].x = scrolled->rects[n].x1 - dx;
-+ rects[i].y = scrolled->rects[n].y1 - dy;
-+ rects[i].w = scrolled->rects[n].x2 - scrolled->rects[n].x1;
-+ rects[i].h = scrolled->rects[n].y2 - scrolled->rects[n].y1;
-+
-+ points[i].x = scrolled->rects[n].x1;
-+ points[i].y = scrolled->rects[n].y1;
-+
-+ D_DEBUG_AT( GDKDFB_Scroll, " => Blit %4d,%4d-%4dx%4d -> %4d,%4d [%d]\n",
-+ rects[i].x, rects[i].y, rects[i].w, rects[i].h, points[i].x, points[i].y, n );
-+ }
-+
-+ surface->SetBlittingFlags (surface, DSBLIT_NOFX);
-+ surface->SetClip (surface, NULL);
-+
-+ /* Run BatchBlit() to copy still visible and still valid parts */
-+ surface->BatchBlit( surface, surface, rects, points, num );
-+
-+ /* Queue or run Flip() on the copied areas */
-+ gdk_directfb_window_flip_region( window, scrolled );
-+ }
-+
-+ gdk_region_destroy( scrolled );
- }
- }
-
-@@ -142,7 +251,18 @@ gdk_window_scroll (GdkWindow *window,
- {
- gdk_window_invalidate_region (window, invalidate_region, TRUE);
- gdk_region_destroy (invalidate_region);
-- }
-+
-+#if D_DEBUG_ENABLED
-+ D_DEBUG_AT( GDKDFB_Scroll, " => invalidated area\n" );
-+
-+ for (i=0; i<private->update_area->numRects; i++)
-+ D_DEBUG_AT( GDKDFB_Scroll, " -> [%d] %4d,%4d-%4dx%4d\n", i,
-+ private->update_area->rects[i].x1,
-+ private->update_area->rects[i].y1,
-+ private->update_area->rects[i].x2 - private->update_area->rects[i].x1,
-+ private->update_area->rects[i].y2 - private->update_area->rects[i].y1 );
-+#endif
-+ }
- }
-
- /**
-@@ -162,9 +282,9 @@ gdk_window_scroll (GdkWindow *window,
- **/
- void
- gdk_window_move_region (GdkWindow *window,
-- GdkRegion *region,
-- gint dx,
-- gint dy)
-+ GdkRegion *region,
-+ gint dx,
-+ gint dy)
- {
- GdkWindowObject *private;
- GdkDrawableImplDirectFB *impl;
-@@ -175,6 +295,8 @@ gdk_window_move_region (GdkWindow *window,
- GdkRegion *moving_invalid_region;
- GdkRectangle dest_extents;
-
-+ D_DEBUG_AT( GDKDFB_Scroll, "%s( %p, %p, %d, %d )\n", __FUNCTION__, window, region, dx, dy );
-+
- g_return_if_fail (GDK_IS_WINDOW (window));
- g_return_if_fail (region != NULL);
-
-@@ -245,9 +367,12 @@ gdk_window_move_region (GdkWindow *window,
- dest_extents.x+dest_extents.width-1,
- dest_extents.y+dest_extents.height-1};
-
-+ impl->surface->SetBlittingFlags (impl->surface, DSBLIT_NOFX);
- impl->surface->SetClip (impl->surface, &destination);
- impl->surface->Blit (impl->surface, impl->surface,&source,dx,dy);
-- impl->surface->SetClip (impl->surface, NULL);
-+
-+ D_DEBUG_AT( GDKDFB_Scroll, " -> flip " DFB_REGION_FORM "\n", DFB_REGION_V(&destination) );
-+
- impl->surface->Flip(impl->surface,&destination,0);
- }
- gdk_region_destroy (src_region);
-diff --git a/gdk/directfb/gdkglobals-directfb.c b/gdk/directfb/gdkglobals-directfb.c
-index 021b5e2..0e7522e 100644
---- a/gdk/directfb/gdkglobals-directfb.c
-+++ b/gdk/directfb/gdkglobals-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-@@ -39,24 +39,55 @@
- #include "gdkalias.h"
-
-
--GdkDisplayDFB *_gdk_display = NULL;
--GdkScreen * _gdk_screen = NULL;
-+/* GdkDirectFB options */
-+gboolean gdk_directfb_apply_focus_opacity = FALSE;
-+gboolean gdk_directfb_enable_color_keying = FALSE;
-+DFBColor gdk_directfb_bg_color = { 0, 0, 0, 0 };
-+DFBColor gdk_directfb_bg_color_key = { 0, 0, 0, 0 };
-+gboolean gdk_directfb_monochrome_fonts = FALSE;
-
--gboolean gdk_directfb_apply_focus_opacity = FALSE;
--gboolean gdk_directfb_enable_color_keying = FALSE;
--DFBColor gdk_directfb_bg_color = { 0, 0, 0, 0 };
--DFBColor gdk_directfb_bg_color_key = { 0, 0, 0, 0 };
--gboolean gdk_directfb_monochrome_fonts = FALSE;
-
--GdkWindow * _gdk_directfb_pointer_grab_window = NULL;
--GdkWindow * _gdk_directfb_keyboard_grab_window = NULL;
--GdkWindow * _gdk_directfb_pointer_grab_confine = NULL;
--gboolean _gdk_directfb_pointer_grab_owner_events = FALSE;
--gboolean _gdk_directfb_keyboard_grab_owner_events = FALSE;
--GdkEventMask _gdk_directfb_pointer_grab_events = 0;
--GdkEventMask _gdk_directfb_keyboard_grab_events = 0;
--GdkCursor * _gdk_directfb_pointer_grab_cursor = NULL;
-+/* Screen object */
-+GdkScreen *_gdk_screen = NULL;
-+
-+/* Display object */
-+GdkDisplay *_gdk_display = NULL;
-+GdkDisplayDFB *_gdk_display_dfb = NULL;
-+
-+/* Root window */
-+GdkWindow *_gdk_parent_root = NULL;
-+
-+/* Entered window */
-+GdkWindow *_gdk_directfb_mouse_window = NULL;
-+
-+/* Focused window */
-+GdkWindow *_gdk_directfb_keyboard_window = NULL;
-+
-+/* Pointer grabs */
-+gboolean _gdk_directfb_pointer_implicit_grab = FALSE;
-+GdkWindow *_gdk_directfb_pointer_grab_window = NULL;
-+gboolean _gdk_directfb_pointer_grab_owner_events = FALSE;
-+GdkWindow *_gdk_directfb_pointer_grab_confine = NULL;
-+GdkEventMask _gdk_directfb_pointer_grab_events = 0;
-+GdkCursor *_gdk_directfb_pointer_grab_cursor = NULL;
-+
-+/* Keyboard grabs */
-+GdkWindow *_gdk_directfb_keyboard_grab_window = NULL;
-+gboolean _gdk_directfb_keyboard_grab_owner_events = FALSE;
-+GdkEventMask _gdk_directfb_keyboard_grab_events = 0;
-+
-+/* Properties */
-+GdkAtom _gdk_selection_property = 0;
-+
-+/* Input Device List */
-+GdkDevice *_gdk_core_pointer = NULL;
-+GList *_gdk_input_devices = NULL;
-+gboolean _gdk_input_ignore_core = FALSE;
-+
-+/* Input Device State */
-+int _gdk_directfb_mouse_x = 0;
-+int _gdk_directfb_mouse_y = 0;
-+GdkModifierType _gdk_directfb_modifiers = 0;
-
--GdkAtom _gdk_selection_property = 0;
-
- #include "gdkaliasdef.c"
-diff --git a/gdk/directfb/gdkim-directfb.c b/gdk/directfb/gdkim-directfb.c
-index f41ec9f..5d155d6 100644
---- a/gdk/directfb/gdkim-directfb.c
-+++ b/gdk/directfb/gdkim-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include "config.h"
-@@ -151,7 +151,7 @@ gdk_wcstombs (const GdkWChar *src)
-
- *bp = 0;
-
-- return mbstr;
-+ return (gchar*)mbstr;
- }
-
-
-diff --git a/gdk/directfb/gdkimage-directfb.c b/gdk/directfb/gdkimage-directfb.c
-index 26833e1..78504c8 100644
---- a/gdk/directfb/gdkimage-directfb.c
-+++ b/gdk/directfb/gdkimage-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-@@ -151,7 +151,7 @@ gdk_image_new_bitmap (GdkVisual *visual,
-
- GDK_NOTE (MISC, g_print ("gdk_image_new_bitmap: %dx%d\n", w, h));
-
-- g_message ("not fully implemented %s", G_STRLOC);
-+ g_message ("not fully implemented %s", __FUNCTION__);
-
- image->bpl = (w + 7) / 8;
- image->mem = g_malloc (image->bpl * h);
-@@ -209,11 +209,11 @@ _gdk_image_new_for_depth (GdkScreen *screen,
- format = DSPF_ARGB;
- break;
- default:
-- g_message ("unimplemented %s for depth %d", G_STRLOC, depth);
-+ g_message ("unimplemented %s for depth %d", __FUNCTION__, depth);
- return NULL;
- }
-
-- surface = gdk_display_dfb_create_surface(_gdk_display,format,width,height);
-+ surface = gdk_display_dfb_create_surface(_gdk_display_dfb,format,width,height);
- if (!surface)
- {
- return NULL;
-@@ -225,7 +225,13 @@ _gdk_image_new_for_depth (GdkScreen *screen,
-
- private->surface = surface;
-
-- surface->Lock( surface, DSLF_WRITE, &image->mem, &pitch );
-+ ret = surface->Lock( surface, DSLF_WRITE, &image->mem, &pitch );
-+ if (ret)
-+ {
-+ DirectFBError( "IDirectFBSurface::Lock() for writing failed!\n", ret );
-+ gdk_image_unref( image );
-+ return NULL;
-+ }
-
- image->type = type;
- image->visual = visual;
-@@ -239,7 +245,7 @@ _gdk_image_new_for_depth (GdkScreen *screen,
- image->depth = depth;
- image->bpp = DFB_BYTES_PER_PIXEL (format);
- image->bpl = pitch;
-- image->bits_per_pixel = DFB_BITS_PER_PIXEL (format);
-+ image->bits_per_pixel = GDK_DFB_BITS_PER_PIXEL (format);
-
- image_list = g_list_prepend (image_list, image);
-
-@@ -261,7 +267,7 @@ _gdk_directfb_copy_to_image (GdkDrawable *drawable,
- GdkImageDirectFB *private;
- int pitch;
- DFBRectangle rect = { src_x, src_y, width, height };
-- IDirectFBDisplayLayer *layer = _gdk_display->layer;
-+ IDirectFBDisplayLayer *layer = _gdk_display_dfb->layer;
-
- g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
- g_return_val_if_fail (image != NULL || (dest_x == 0 && dest_y == 0), NULL);
-@@ -272,7 +278,7 @@ _gdk_directfb_copy_to_image (GdkDrawable *drawable,
- {
- DFBResult ret;
-
-- ret = layer->SetCooperativeLevel (layer, DLSCL_EXCLUSIVE);
-+ ret = layer->SetCooperativeLevel (layer, DLSCL_ADMINISTRATIVE);
- if (ret)
- {
- DirectFBError ("_gdk_directfb_copy_to_image - SetCooperativeLevel",
-@@ -294,16 +300,18 @@ _gdk_directfb_copy_to_image (GdkDrawable *drawable,
-
- if (!image)
- image = gdk_image_new (GDK_IMAGE_NORMAL,
-- gdk_visual_get_system (), width, height);
-+ gdk_drawable_get_visual (drawable), width, height);
-
- private = image->windowing_data;
-
- private->surface->Unlock( private->surface );
-
-- private->surface->Blit( private->surface,
-- impl->surface, &rect, dest_x, dest_y );
-+ private->surface->SetBlittingFlags( private->surface, DSBLIT_NOFX );
-+ private->surface->SetClip( private->surface, NULL );
-
-- private->surface->Lock( private->surface, DSLF_WRITE, &image->mem, &pitch );
-+ private->surface->Blit( private->surface, impl->surface, &rect, dest_x, dest_y );
-+
-+ private->surface->Lock( private->surface, DSLF_READ | DSLF_WRITE, &image->mem, &pitch );
- image->bpl = pitch;
-
- if (impl->wrapper == _gdk_parent_root)
-@@ -403,8 +411,8 @@ gdk_directfb_image_destroy (GdkImage *image)
- if (!private)
- return;
-
-- GDK_NOTE (MISC, g_print ("gdk_directfb_image_destroy: %#x\n",
-- (guint) private->surface));
-+ GDK_NOTE (MISC, g_print ("gdk_directfb_image_destroy: %#lx\n",
-+ (gulong) private->surface));
-
- private->surface->Unlock( private->surface );
- private->surface->Release( private->surface );
-@@ -416,6 +424,7 @@ gdk_directfb_image_destroy (GdkImage *image)
- gint
- _gdk_windowing_get_bits_for_depth (GdkDisplay *display,
- gint depth)
-+
- {
- switch (depth)
- {
-diff --git a/gdk/directfb/gdkinput-directfb.c b/gdk/directfb/gdkinput-directfb.c
-index 5fe9396..334d091 100644
---- a/gdk/directfb/gdkinput-directfb.c
-+++ b/gdk/directfb/gdkinput-directfb.c
-@@ -27,8 +27,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-@@ -50,14 +50,6 @@ static GdkDeviceAxis gdk_input_core_axes[] =
- };
-
-
--GdkDevice * _gdk_core_pointer = NULL;
--GList * _gdk_input_devices = NULL;
--gboolean _gdk_input_ignore_core = FALSE;
--
--int _gdk_directfb_mouse_x = 0;
--int _gdk_directfb_mouse_y = 0;
--
--
- void
- _gdk_init_input_core (void)
- {
-@@ -228,7 +220,7 @@ gboolean
- gdk_device_set_mode (GdkDevice *device,
- GdkInputMode mode)
- {
-- g_message ("unimplemented %s", G_STRLOC);
-+ g_message ("unimplemented %s", __FUNCTION__);
-
- return FALSE;
- }
-@@ -303,7 +295,7 @@ gdk_input_set_extension_events (GdkWindow *window,
- gint mask,
- GdkExtensionMode mode)
- {
-- g_message ("unimplemented %s", G_STRLOC);
-+ g_message ("unimplemented %s", __FUNCTION__);
- }
-
- GList *
-diff --git a/gdk/directfb/gdkinput-directfb.h b/gdk/directfb/gdkinput-directfb.h
-index 71f2a00..085003f 100644
---- a/gdk/directfb/gdkinput-directfb.h
-+++ b/gdk/directfb/gdkinput-directfb.h
-@@ -26,16 +26,13 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #ifndef __GDK_INPUT_DIRECTFB_H__
- #define __GDK_INPUT_DIRECTFB_H__
-
--extern GdkModifierType _gdk_directfb_modifiers;
--extern int _gdk_directfb_mouse_x, _gdk_directfb_mouse_y;
--
- typedef struct _GdkAxisInfo GdkAxisInfo;
- typedef struct _GdkInputWindow GdkInputWindow;
-
-@@ -83,15 +80,6 @@ struct _GdkInputWindow
- gint grabbed;
- };
-
--/* Global data */
--
--#define GDK_IS_CORE(d) (((GdkDevice *)(d)) == _gdk_core_pointer)
--
--extern GList *_gdk_input_devices;
--extern GList *_gdk_input_windows;
--
--extern gint _gdk_input_ignore_core;
--
- /* Function declarations */
-
- /* The following functions are provided by each implementation
-diff --git a/gdk/directfb/gdkkeys-directfb.c b/gdk/directfb/gdkkeys-directfb.c
-index 48d2c5c..7bb750e 100644
---- a/gdk/directfb/gdkkeys-directfb.c
-+++ b/gdk/directfb/gdkkeys-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-@@ -45,8 +45,6 @@
-
- static struct gdk_key *gdk_keys_by_name = NULL;
-
--GdkModifierType _gdk_directfb_modifiers = 0;
--
- static guint *directfb_keymap = NULL;
- static gint directfb_min_keycode = 0;
- static gint directfb_max_keycode = 0;
-@@ -1661,12 +1659,12 @@ gdk_directfb_translate_key (DFBInputDeviceKeyIdentifier key_id,
- return keyval;
- }
-
-- void
-+void
- _gdk_directfb_keyboard_init (void)
- {
- DFBInputDeviceDescription desc;
- gint i, n, length;
-- IDirectFBInputDevice *keyboard=_gdk_display->keyboard;
-+ IDirectFBInputDevice *keyboard=_gdk_display_dfb->keyboard;
-
- if (!keyboard)
- return;
-@@ -1674,7 +1672,7 @@ _gdk_directfb_keyboard_init (void)
- return;
-
- keyboard->GetDescription (keyboard, &desc);
-- _gdk_display->keymap=g_object_new (gdk_keymap_get_type (), NULL);
-+ _gdk_display_dfb->keymap=g_object_new (gdk_keymap_get_type (), NULL);
-
- if (desc.min_keycode < 0 || desc.max_keycode < desc.min_keycode)
- return;
-@@ -1708,8 +1706,8 @@ _gdk_directfb_keyboard_exit (void)
- return;
-
- g_free (directfb_keymap);
-- g_free(_gdk_display->keymap);
-- _gdk_display->keymap = NULL;
-+ g_free(_gdk_display_dfb->keymap);
-+ _gdk_display_dfb->keymap = NULL;
- directfb_keymap = NULL;
- }
-
-@@ -1729,7 +1727,7 @@ gdk_directfb_translate_key_event (DFBWindowEvent *dfb_event,
- event->group = (dfb_event->modifiers & DIMM_ALTGR) ? 1 : 0;
- event->hardware_keycode = dfb_event->key_code;
- event->keyval = gdk_directfb_translate_key (dfb_event->key_id,
-- dfb_event->key_symbol);
-+ dfb_event->key_symbol);
- /* If the device driver didn't send a key_code (happens with remote
- controls), we try to find a suitable key_code by looking at the
- default keymap. */
-@@ -1937,7 +1935,7 @@ gdk_keymap_translate_keyboard_state (GdkKeymap *keymap,
- if (level)
- *level = i;
-
-- if (i && directfb_keymap[index + 2 * *effective_group] != *keyval)
-+ if (keyval && i && directfb_keymap[index + (effective_group ? 2 * *effective_group : 0)] != *keyval)
- if(consumed_modifiers)
- *consumed_modifiers |= GDK_SHIFT_MASK;
-
-diff --git a/gdk/directfb/gdkmain-directfb.c b/gdk/directfb/gdkmain-directfb.c
-index 56e0002..a2503f0 100644
---- a/gdk/directfb/gdkmain-directfb.c
-+++ b/gdk/directfb/gdkmain-directfb.c
-@@ -27,8 +27,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- /*
-@@ -59,9 +59,7 @@
- void
- _gdk_windowing_init (void)
- {
-- /**
-- Not that usable called before parse_args
-- **/
-+ _gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE);
- }
-
- void
-@@ -72,7 +70,7 @@ gdk_set_use_xshm (gboolean use_xshm)
- gboolean
- gdk_get_use_xshm (void)
- {
-- return FALSE;
-+ return TRUE;
- }
-
- void
-@@ -86,20 +84,20 @@ void
- _gdk_windowing_exit (void)
- {
-
-- if (_gdk_display->buffer)
-- _gdk_display->buffer->Release (_gdk_display->buffer);
-+ if (_gdk_display_dfb->buffer)
-+ _gdk_display_dfb->buffer->Release (_gdk_display_dfb->buffer);
-
- _gdk_directfb_keyboard_exit ();
-
-- if (_gdk_display->keyboard)
-- _gdk_display->keyboard->Release (_gdk_display->keyboard);
-+ if (_gdk_display_dfb->keyboard)
-+ _gdk_display_dfb->keyboard->Release (_gdk_display_dfb->keyboard);
-
-- _gdk_display->layer->Release (_gdk_display->layer);
-+ _gdk_display_dfb->layer->Release (_gdk_display_dfb->layer);
-
-- _gdk_display->directfb->Release (_gdk_display->directfb);
-+ _gdk_display_dfb->directfb->Release (_gdk_display_dfb->directfb);
-
-- g_free (_gdk_display);
-- _gdk_display = NULL;
-+ g_free (_gdk_display_dfb);
-+ _gdk_display_dfb = NULL;
- }
-
- gchar *
-@@ -108,117 +106,66 @@ gdk_get_display (void)
- return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
- }
-
--
- /* utils */
--static const guint type_masks[] =
-+static const guint event_type_masks[] =
- {
-- GDK_STRUCTURE_MASK, /* GDK_DELETE = 0, */
-- GDK_STRUCTURE_MASK, /* GDK_DESTROY = 1, */
-- GDK_EXPOSURE_MASK, /* GDK_EXPOSE = 2, */
-- GDK_POINTER_MOTION_MASK, /* GDK_MOTION_NOTIFY = 3, */
-- GDK_BUTTON_PRESS_MASK, /* GDK_BUTTON_PRESS = 4, */
-- GDK_BUTTON_PRESS_MASK, /* GDK_2BUTTON_PRESS = 5, */
-- GDK_BUTTON_PRESS_MASK, /* GDK_3BUTTON_PRESS = 6, */
-- GDK_BUTTON_RELEASE_MASK, /* GDK_BUTTON_RELEASE = 7, */
-- GDK_KEY_PRESS_MASK, /* GDK_KEY_PRESS = 8, */
-- GDK_KEY_RELEASE_MASK, /* GDK_KEY_RELEASE = 9, */
-- GDK_ENTER_NOTIFY_MASK, /* GDK_ENTER_NOTIFY = 10, */
-- GDK_LEAVE_NOTIFY_MASK, /* GDK_LEAVE_NOTIFY = 11, */
-- GDK_FOCUS_CHANGE_MASK, /* GDK_FOCUS_CHANGE = 12, */
-- GDK_STRUCTURE_MASK, /* GDK_CONFIGURE = 13, */
-- GDK_VISIBILITY_NOTIFY_MASK,/* GDK_MAP = 14, */
-- GDK_VISIBILITY_NOTIFY_MASK,/* GDK_UNMAP = 15, */
-- GDK_PROPERTY_CHANGE_MASK, /* GDK_PROPERTY_NOTIFY = 16, */
-- GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_CLEAR = 17, */
-- GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_REQUEST = 18, */
-- GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_NOTIFY = 19, */
-- GDK_PROXIMITY_IN_MASK, /* GDK_PROXIMITY_IN = 20, */
-- GDK_PROXIMITY_OUT_MASK, /* GDK_PROXIMITY_OUT = 21, */
-- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_ENTER = 22, */
-- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_LEAVE = 23, */
-- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_MOTION = 24, */
-- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_STATUS = 25, */
-- GDK_ALL_EVENTS_MASK, /* GDK_DROP_START = 26, */
-- GDK_ALL_EVENTS_MASK, /* GDK_DROP_FINISHED = 27, */
-- GDK_ALL_EVENTS_MASK, /* GDK_CLIENT_EVENT = 28, */
-- GDK_VISIBILITY_NOTIFY_MASK,/* GDK_VISIBILITY_NOTIFY = 29, */
-- GDK_EXPOSURE_MASK, /* GDK_NO_EXPOSE = 30, */
-- GDK_SCROLL_MASK /* GDK_SCROLL = 31 */
-+ GDK_STRUCTURE_MASK, /* GDK_DELETE = 0, */
-+ GDK_STRUCTURE_MASK, /* GDK_DESTROY = 1, */
-+ GDK_EXPOSURE_MASK, /* GDK_EXPOSE = 2, */
-+ GDK_POINTER_MOTION_MASK, /* GDK_MOTION_NOTIFY = 3, */
-+ GDK_BUTTON_PRESS_MASK, /* GDK_BUTTON_PRESS = 4, */
-+ GDK_BUTTON_PRESS_MASK, /* GDK_2BUTTON_PRESS = 5, */
-+ GDK_BUTTON_PRESS_MASK, /* GDK_3BUTTON_PRESS = 6, */
-+ GDK_BUTTON_RELEASE_MASK, /* GDK_BUTTON_RELEASE = 7, */
-+ GDK_KEY_PRESS_MASK, /* GDK_KEY_PRESS = 8, */
-+ GDK_KEY_RELEASE_MASK, /* GDK_KEY_RELEASE = 9, */
-+ GDK_ENTER_NOTIFY_MASK, /* GDK_ENTER_NOTIFY = 10, */
-+ GDK_LEAVE_NOTIFY_MASK, /* GDK_LEAVE_NOTIFY = 11, */
-+ GDK_FOCUS_CHANGE_MASK, /* GDK_FOCUS_CHANGE = 12, */
-+ GDK_STRUCTURE_MASK, /* GDK_CONFIGURE = 13, */
-+ GDK_VISIBILITY_NOTIFY_MASK, /* GDK_MAP = 14, */
-+ GDK_VISIBILITY_NOTIFY_MASK, /* GDK_UNMAP = 15, */
-+ GDK_PROPERTY_CHANGE_MASK, /* GDK_PROPERTY_NOTIFY = 16, */
-+ GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_CLEAR = 17, */
-+ GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_REQUEST = 18, */
-+ GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_NOTIFY = 19, */
-+ GDK_PROXIMITY_IN_MASK, /* GDK_PROXIMITY_IN = 20, */
-+ GDK_PROXIMITY_OUT_MASK, /* GDK_PROXIMITY_OUT = 21, */
-+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_ENTER = 22, */
-+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_LEAVE = 23, */
-+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_MOTION = 24, */
-+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_STATUS = 25, */
-+ GDK_ALL_EVENTS_MASK, /* GDK_DROP_START = 26, */
-+ GDK_ALL_EVENTS_MASK, /* GDK_DROP_FINISHED = 27, */
-+ GDK_ALL_EVENTS_MASK, /* GDK_CLIENT_EVENT = 28, */
-+ GDK_VISIBILITY_NOTIFY_MASK, /* GDK_VISIBILITY_NOTIFY = 29, */
-+ GDK_EXPOSURE_MASK, /* GDK_NO_EXPOSE = 30, */
-+ GDK_SCROLL_MASK | GDK_BUTTON_PRESS_MASK, /* GDK_SCROLL = 31, */
-+ GDK_WINDOW_STATE, /* GDK_WINDOW_STATE = 32, */
-+ GDK_SETTING, /* GDK_SETTING, = 33, */
-+ GDK_OWNER_CHANGE, /* GDK_OWNER_CHANGE = 34, */
-+ GDK_GRAB_BROKEN, /* GDK_GRAB_BROKEN = 35, */
- };
-
--GdkWindow *
--gdk_directfb_other_event_window (GdkWindow *window,
-- GdkEventType type)
-+GdkEventMask
-+gdk_directfb_event_type_mask (GdkEventType type)
- {
-- guint32 evmask;
-- GdkWindow *w;
-+ unsigned int index = type;
-
-- w = window;
-- while (w != _gdk_parent_root)
-- {
-- /* Huge hack, so that we don't propagate events to GtkWindow->frame */
-- if ((w != window) &&
-- (GDK_WINDOW_OBJECT (w)->window_type != GDK_WINDOW_CHILD) &&
-- (g_object_get_data (G_OBJECT (w), "gdk-window-child-handler")))
-- break;
-+ if (index < G_N_ELEMENTS(event_type_masks))
-+ return event_type_masks[index];
-
-- evmask = GDK_WINDOW_OBJECT (w)->event_mask;
-+ g_warning ("%s: event type (%u) outside of known range!\n", __FUNCTION__, index);
-
-- if (evmask & type_masks[type])
-- return w;
--
-- w = gdk_window_get_parent (w);
-- }
--
-- return NULL;
-+ return GDK_ALL_EVENTS_MASK;
- }
-
- GdkWindow *
--gdk_directfb_pointer_event_window (GdkWindow *window,
-- GdkEventType type)
-+gdk_directfb_other_event_window (GdkWindow *window,
-+ GdkEventType type)
- {
-- guint evmask;
-- GdkModifierType mask;
-- GdkWindow *w;
--
-- gdk_directfb_mouse_get_info (NULL, NULL, &mask);
--
-- if (_gdk_directfb_pointer_grab_window && !_gdk_directfb_pointer_grab_owner_events )
-- {
-- evmask = _gdk_directfb_pointer_grab_events;
--
-- if (evmask & (GDK_BUTTON1_MOTION_MASK |
-- GDK_BUTTON2_MOTION_MASK |
-- GDK_BUTTON3_MOTION_MASK))
-- {
-- if (((mask & GDK_BUTTON1_MASK) &&
-- (evmask & GDK_BUTTON1_MOTION_MASK)) ||
-- ((mask & GDK_BUTTON2_MASK) &&
-- (evmask & GDK_BUTTON2_MOTION_MASK)) ||
-- ((mask & GDK_BUTTON3_MASK) &&
-- (evmask & GDK_BUTTON3_MOTION_MASK)))
-- evmask |= GDK_POINTER_MOTION_MASK;
-- }
--
-- if (evmask & type_masks[type]) {
--
-- if( _gdk_directfb_pointer_grab_owner_events ) {
-- return _gdk_directfb_pointer_grab_window;
-- }else {
-- GdkWindowObject *obj= GDK_WINDOW_OBJECT(window);
-- while (obj != NULL &&
-- obj != GDK_WINDOW_OBJECT(_gdk_directfb_pointer_grab_window)) {
-- obj = (GdkWindowObject *)obj->parent;
-- }
-- if( obj ==GDK_WINDOW_OBJECT(_gdk_directfb_pointer_grab_window) ) {
-- return window;
-- }else {
-- //was not child of the grab window so return the grab window
-- return _gdk_directfb_pointer_grab_window;
-- }
-- }
-- }
-- }
-+ guint32 evmask;
-+ GdkWindow *w;
-
- w = window;
- while (w != _gdk_parent_root)
-@@ -231,20 +178,7 @@ gdk_directfb_pointer_event_window (GdkWindow *window,
-
- evmask = GDK_WINDOW_OBJECT (w)->event_mask;
-
-- if (evmask & (GDK_BUTTON1_MOTION_MASK |
-- GDK_BUTTON2_MOTION_MASK |
-- GDK_BUTTON3_MOTION_MASK))
-- {
-- if (((mask & GDK_BUTTON1_MASK) &&
-- (evmask & GDK_BUTTON1_MOTION_MASK)) ||
-- ((mask & GDK_BUTTON2_MASK) &&
-- (evmask & GDK_BUTTON2_MOTION_MASK)) ||
-- ((mask & GDK_BUTTON3_MASK) &&
-- (evmask & GDK_BUTTON3_MOTION_MASK)))
-- evmask |= GDK_POINTER_MOTION_MASK;
-- }
--
-- if (evmask & type_masks[type])
-+ if (evmask & gdk_directfb_event_type_mask(type))
- return w;
-
- w = gdk_window_get_parent (w);
-@@ -277,7 +211,7 @@ gdk_directfb_keyboard_event_window (GdkWindow *window,
-
- evmask = GDK_WINDOW_OBJECT (w)->event_mask;
-
-- if (evmask & type_masks[type])
-+ if (evmask & gdk_directfb_event_type_mask(type))
- return w;
-
- w = gdk_window_get_parent (w);
-@@ -299,6 +233,7 @@ gdk_directfb_event_make (GdkWindow *window,
- switch (type)
- {
- case GDK_MOTION_NOTIFY:
-+ D_ONCE("bad function");
- event->motion.time = the_time;
- event->motion.axes = NULL;
- break;
-@@ -306,15 +241,18 @@ gdk_directfb_event_make (GdkWindow *window,
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
- case GDK_BUTTON_RELEASE:
-+ D_ONCE("bad function");
- event->button.time = the_time;
- event->button.axes = NULL;
- break;
- case GDK_KEY_PRESS:
- case GDK_KEY_RELEASE:
-+ D_ONCE("bad function");
- event->key.time = the_time;
- break;
- case GDK_ENTER_NOTIFY:
- case GDK_LEAVE_NOTIFY:
-+ D_ONCE("bad function");
- event->crossing.time = the_time;
- break;
- case GDK_PROPERTY_NOTIFY:
-@@ -338,6 +276,7 @@ gdk_directfb_event_make (GdkWindow *window,
- event->dnd.time = the_time;
- break;
- case GDK_SCROLL:
-+ D_ONCE("bad function");
- event->scroll.time = the_time;
- break;
- case GDK_FOCUS_CHANGE:
-@@ -351,6 +290,7 @@ gdk_directfb_event_make (GdkWindow *window,
- case GDK_DESTROY:
- case GDK_EXPOSE:
- default:
-+// D_ONCE("bad function");
- break;
- }
-
-@@ -435,10 +375,10 @@ gdk_keyboard_grab (GdkWindow *window,
- gint owner_events,
- guint32 time)
- {
-- return gdk_display_keyboard_grab(gdk_display_get_default(),
-- window,
-- owner_events,
-- time);
-+ return gdk_directfb_keyboard_grab(gdk_display_get_default(),
-+ window,
-+ owner_events,
-+ time);
-
- }
-
-@@ -494,8 +434,8 @@ gdk_pointer_grab (GdkWindow * window,
- GdkCursor * cursor,
- guint32 time)
- {
-- return gdk_directfb_pointer_grab(window, owner_events,event_mask,
-- confine_to,cursor,time,FALSE);
-+ return gdk_directfb_pointer_grab(window, owner_events,event_mask,
-+ confine_to,cursor,time,FALSE);
- }
-
- #define __GDK_MAIN_X11_C__
-diff --git a/gdk/directfb/gdkpixmap-directfb.c b/gdk/directfb/gdkpixmap-directfb.c
-index 22c7b05..ddedebc 100644
---- a/gdk/directfb/gdkpixmap-directfb.c
-+++ b/gdk/directfb/gdkpixmap-directfb.c
-@@ -27,8 +27,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-@@ -109,8 +109,6 @@ gdk_pixmap_impl_directfb_class_init (GdkPixmapImplDirectFBClass *klass)
- static void
- gdk_pixmap_impl_directfb_finalize (GObject *object)
- {
-- GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (object);
--
- if (G_OBJECT_CLASS (parent_class)->finalize)
- G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -147,7 +145,7 @@ gdk_pixmap_new (GdkDrawable *drawable,
- g_return_val_if_fail (draw_impl != NULL, NULL);
-
- draw_impl->surface->GetPixelFormat (draw_impl->surface, &format);
-- depth = DFB_BITS_PER_PIXEL (format);
-+ depth = GDK_DFB_BITS_PER_PIXEL (format);
- }
- else
- {
-@@ -166,19 +164,19 @@ gdk_pixmap_new (GdkDrawable *drawable,
- format = DSPF_RGB16;
- break;
- case 24:
-- format = DSPF_RGB24;
-+ format = DSPF_RGB32;
- break;
- case 32:
-- format = DSPF_RGB32;
-+ format = DSPF_ARGB;
- break;
- default:
-- g_message ("unimplemented %s for depth %d", G_STRLOC, depth);
-+ g_message ("unimplemented %s for depth %d", __FUNCTION__, depth);
- return NULL;
- }
- }
-
- if( !(surface =
-- gdk_display_dfb_create_surface(_gdk_display,format,width,height) )) {
-+ gdk_display_dfb_create_surface(_gdk_display_dfb,format,width,height) )) {
- g_assert( surface != NULL);
- return NULL;
- }
-@@ -219,16 +217,17 @@ gdk_bitmap_create_from_data (GdkDrawable *drawable,
-
- if (pixmap)
- {
-- guchar *dst;
-- gint pitch;
-+ void *ptr;
-+ gint pitch;
-
- IDirectFBSurface *surface;
-
- surface = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (pixmap)->impl)->surface;
-
-- if (surface->Lock( surface, DSLF_WRITE, (void**)(&dst), &pitch ) == DFB_OK)
-+ if (surface->Lock( surface, DSLF_WRITE, &ptr, &pitch ) == DFB_OK)
- {
-- gint i, j;
-+ gint i, j;
-+ guchar *dst = ptr;
-
- for (i = 0; i < height; i++)
- {
-@@ -274,8 +273,8 @@ gdk_pixmap_create_from_data (GdkDrawable *drawable,
- if (pixmap)
- {
- IDirectFBSurface *surface;
-- gchar *dst;
-- gint pitch;
-+ void *ptr;
-+ int pitch;
- gint src_pitch;
-
- depth = gdk_drawable_get_depth (pixmap);
-@@ -284,9 +283,10 @@ gdk_pixmap_create_from_data (GdkDrawable *drawable,
- surface = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (pixmap)->impl)->surface;
-
- if (surface->Lock( surface,
-- DSLF_WRITE, (void**)(&dst), &pitch ) == DFB_OK)
-+ DSLF_WRITE, &ptr, &pitch ) == DFB_OK)
- {
-- gint i;
-+ gint i;
-+ gchar *dst = ptr;
-
- for (i = 0; i < height; i++)
- {
-diff --git a/gdk/directfb/gdkprivate-directfb.h b/gdk/directfb/gdkprivate-directfb.h
-index b645057..a8f22d5 100644
---- a/gdk/directfb/gdkprivate-directfb.h
-+++ b/gdk/directfb/gdkprivate-directfb.h
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #ifndef __GDK_PRIVATE_DIRECTFB_H__
-@@ -38,8 +38,19 @@
- #include "gdkinternals.h"
- #include "gdkcursor.h"
- #include "gdkdisplay-directfb.h"
-+#include "gdkregion-generic.h"
-+#include "gdkprivate-directfb.h"
- #include <cairo.h>
-
-+#include <string.h>
-+
-+#include <directfb_util.h>
-+#include <directfb_version.h>
-+
-+
-+IDirectFBSurface *gdk_display_dfb_create_surface (GdkDisplayDFB *display,
-+ DFBSurfacePixelFormat format,
-+ int width, int height);
-
-
- #define GDK_TYPE_DRAWABLE_IMPL_DIRECTFB (gdk_drawable_impl_directfb_get_type ())
-@@ -68,19 +79,20 @@ struct _GdkDrawableImplDirectFB
-
- gboolean buffered;
-
-- GdkRegion *paint_region;
-+ GdkRegion paint_region;
- gint paint_depth;
- gint width;
- gint height;
- gint abs_x;
- gint abs_y;
-
-+ GdkRegion clip_region;
-+
- GdkColormap *colormap;
-
- IDirectFBSurface *surface;
- DFBSurfacePixelFormat format;
-- cairo_surface_t * cairo_surface;
--
-+ cairo_surface_t *cairo_surface;
- };
-
- typedef struct
-@@ -90,17 +102,6 @@ typedef struct
-
- GType gdk_drawable_impl_directfb_get_type (void);
-
--void _gdk_directfb_draw_rectangle (GdkDrawable *drawable,
-- GdkGC *gc,
-- gint filled,
-- gint x,
-- gint y,
-- gint width,
-- gint height);
--
--void _gdk_directfb_update (GdkDrawableImplDirectFB *impl,
-- DFBRegion *region);
--
- GdkEvent * gdk_directfb_event_make (GdkWindow *window,
- GdkEventType type);
-
-@@ -136,10 +137,17 @@ typedef struct
- } GdkWindowProperty;
-
-
-+typedef enum {
-+ GDKWIF_NONE = 0x00,
-+ GDKWIF_UPDATE = 0x01,
-+ GDKWIF_FLIP = 0x02
-+} GdkWindowImplFlags;
-+
- struct _GdkWindowImplDirectFB
- {
- GdkDrawableImplDirectFB drawable;
-- GdkWindow *gdkWindow;
-+
-+ GdkWindow *gdkWindow;
-
- IDirectFBWindow *window;
-
-@@ -151,6 +159,11 @@ struct _GdkWindowImplDirectFB
- guint8 opacity;
-
- GdkWindowTypeHint type_hint;
-+
-+ DFBUpdates flips;
-+ DFBRegion flip_regions[7];
-+
-+ GdkWindowImplFlags flags;
- };
-
- typedef struct
-@@ -158,11 +171,20 @@ typedef struct
- GdkDrawableImplDirectFBClass parent_class;
- } GdkWindowImplDirectFBClass;
-
--GType gdk_window_impl_directfb_get_type (void);
-
--void gdk_directfb_window_send_crossing_events (GdkWindow *src,
-- GdkWindow *dest,
-- GdkCrossingMode mode);
-+#define GDKDFB_WIMPL_FORM "%4d,%4d-%4dx%4d %d"
-+#define GDKDFB_WIMPL_V(w) ((GdkWindowObject*)((w)->gdkWindow))->x, \
-+ ((GdkWindowObject*)((w)->gdkWindow))->y, \
-+ (w)->drawable.width, (w)->drawable.height, \
-+ (w)->dfb_id
-+
-+#define GDKDFB_REGION_FORM "%4d,%4d-%4dx%4d (%ld boxes)"
-+#define GDKDFB_REGION_V(r) GDKDFB_RECTANGLE_VALS_FROM_BOX(&((r)->extents)), (r)->numRects
-+
-+#define DFB_REGION_FORM "%4d,%4d-%4dx%4d"
-+#define DFB_REGION_V(r) DFB_RECTANGLE_VALS_FROM_REGION(r)
-+
-+GType gdk_window_impl_directfb_get_type (void);
-
- void _gdk_directfb_calc_abs (GdkWindow *window);
-
-@@ -174,6 +196,9 @@ void gdk_directfb_window_id_table_insert (DFBWindowID dfb_id,
- void gdk_directfb_window_id_table_remove (DFBWindowID dfb_id);
- GdkWindow * gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id);
-
-+void _gdk_directfb_events_update_mouse_window (GdkWindow *window);
-+
-+void _gdk_directfb_events_update_cursor (GdkWindow *window);
-
- typedef struct
- {
-@@ -204,7 +229,7 @@ typedef struct
- {
- GdkGC parent_instance;
-
-- GdkRegion *clip_region;
-+ GdkRegion clip_region;
-
- GdkGCValuesMask values_mask;
- GdkGCValues values;
-@@ -235,6 +260,14 @@ void gdk_directfb_event_windows_add (GdkWindow *window);
- void gdk_directfb_event_windows_remove (GdkWindow *window);
- #endif
-
-+GdkGrabStatus gdk_directfb_keyboard_grab (GdkDisplay *display,
-+ GdkWindow *window,
-+ gint owner_events,
-+ guint32 time);
-+
-+void gdk_directfb_keyboard_ungrab(GdkDisplay *display,
-+ guint32 time);
-+
- GdkGrabStatus gdk_directfb_pointer_grab (GdkWindow *window,
- gint owner_events,
- GdkEventMask event_mask,
-@@ -247,10 +280,11 @@ void gdk_directfb_pointer_ungrab (guint32 time,
-
- guint32 gdk_directfb_get_time (void);
-
--GdkWindow * gdk_directfb_pointer_event_window (GdkWindow *window,
-- GdkEventType type);
-+GdkEventMask gdk_directfb_event_type_mask (GdkEventType type);
-+
- GdkWindow * gdk_directfb_keyboard_event_window (GdkWindow *window,
- GdkEventType type);
-+
- GdkWindow * gdk_directfb_other_event_window (GdkWindow *window,
- GdkEventType type);
- void _gdk_selection_window_destroyed (GdkWindow *window);
-@@ -277,23 +311,53 @@ void gdk_directfb_mouse_get_info (gint *x,
- /* Global variables */
- /**********************/
-
--extern GdkDisplayDFB *_gdk_display;
-+/* Screen object */
-+extern GdkScreen *_gdk_screen;
-+
-+/* Display object */
-+extern GdkDisplay *_gdk_display;
-+extern GdkDisplayDFB *_gdk_display_dfb;
-+
-+/* Root window */
-+extern GdkWindow *_gdk_root;
-+
-+/* Entered window */
-+extern GdkWindow *_gdk_directfb_mouse_window;
-+
-+/* Focused window */
-+extern GdkWindow *_gdk_directfb_keyboard_window;
-
- /* Pointer grab info */
--extern GdkWindow * _gdk_directfb_pointer_grab_window;
--extern gboolean _gdk_directfb_pointer_grab_owner_events;
--extern GdkWindow * _gdk_directfb_pointer_grab_confine;
--extern GdkEventMask _gdk_directfb_pointer_grab_events;
--extern GdkCursor * _gdk_directfb_pointer_grab_cursor;
-+extern gboolean _gdk_directfb_pointer_implicit_grab;
-+extern GdkWindow *_gdk_directfb_pointer_grab_window;
-+extern gboolean _gdk_directfb_pointer_grab_owner_events;
-+extern GdkWindow *_gdk_directfb_pointer_grab_confine;
-+extern GdkEventMask _gdk_directfb_pointer_grab_events;
-+extern GdkCursor *_gdk_directfb_pointer_grab_cursor;
-
- /* Keyboard grab info */
--extern GdkWindow * _gdk_directfb_keyboard_grab_window;
--extern GdkEventMask _gdk_directfb_keyboard_grab_events;
--extern gboolean _gdk_directfb_keyboard_grab_owner_events;
-+extern GdkWindow *_gdk_directfb_keyboard_grab_window;
-+extern GdkEventMask _gdk_directfb_keyboard_grab_events;
-+extern gboolean _gdk_directfb_keyboard_grab_owner_events;
-+
-+/* Properties */
-+extern GdkAtom _gdk_selection_property;
-+
-+/* Input Device List */
-+extern GdkDevice *_gdk_core_pointer;
-+extern GList *_gdk_input_devices;
-+extern gint _gdk_input_ignore_core;
-
--extern GdkScreen * _gdk_screen;
-+/* Input Device State */
-+extern GdkModifierType _gdk_directfb_modifiers;
-+extern int _gdk_directfb_mouse_x;
-+extern int _gdk_directfb_mouse_y;
-
--extern GdkAtom _gdk_selection_property;
-+/* Input Windows */
-+extern GList *_gdk_input_windows;
-+
-+
-+#define GDK_IS_CORE(d) (((GdkDevice *)(d)) == _gdk_core_pointer)
-
-
- IDirectFBPalette * gdk_directfb_colormap_get_palette (GdkColormap *colormap);
-@@ -317,5 +381,92 @@ void gdk_fb_window_set_child_handler (GdkWindow *window,
- GdkWindowChildGetPos get_pos,
- gpointer user_data);
-
-+void gdk_directfb_clip_region (GdkDrawable *drawable,
-+ GdkGC *gc,
-+ GdkRectangle *draw_rect,
-+ GdkRegion *ret_clip);
-+
-+void gdk_directfb_window_process (GdkWindowImplDirectFB *impl);
-+
-+/* Utilities for avoiding mallocs */
-+
-+static inline void
-+temp_region_init_copy( GdkRegion *region,
-+ const GdkRegion *source)
-+{
-+ if (region != source) /* don't want to copy to itself */
-+ {
-+ if (region->size < source->numRects)
-+ {
-+ if (region->rects && region->rects != &region->extents)
-+ g_free( region->rects );
-+
-+ region->rects = g_new (GdkRegionBox, source->numRects);
-+ region->size = source->numRects;
-+ }
-+
-+ region->numRects = source->numRects;
-+ region->extents = source->extents;
-+
-+ memcpy( region->rects, source->rects, source->numRects * sizeof (GdkRegionBox) );
-+ }
-+}
-+
-+static inline void
-+temp_region_init_rectangle( GdkRegion *region,
-+ const GdkRectangle *rect )
-+{
-+ region->numRects = 1;
-+ region->rects = &region->extents;
-+ region->extents.x1 = rect->x;
-+ region->extents.y1 = rect->y;
-+ region->extents.x2 = rect->x + rect->width;
-+ region->extents.y2 = rect->y + rect->height;
-+ region->size = 1;
-+}
-+
-+static inline void
-+temp_region_init_rectangle_vals( GdkRegion *region,
-+ int x,
-+ int y,
-+ int w,
-+ int h )
-+{
-+ region->numRects = 1;
-+ region->rects = &region->extents;
-+ region->extents.x1 = x;
-+ region->extents.y1 = y;
-+ region->extents.x2 = x + w;
-+ region->extents.y2 = y + h;
-+ region->size = 1;
-+}
-+
-+static inline void
-+temp_region_reset( GdkRegion *region )
-+{
-+ if (region->size > 32 && region->rects && region->rects != &region->extents) {
-+ g_free( region->rects );
-+
-+ region->size = 1;
-+ region->rects = &region->extents;
-+ }
-+
-+ region->numRects = 0;
-+}
-+
-+static inline void
-+temp_region_deinit( GdkRegion *region )
-+{
-+ if (region->rects && region->rects != &region->extents) {
-+ g_free( region->rects );
-+ region->rects = NULL;
-+ }
-+
-+ region->numRects = 0;
-+}
-+
-+
-+#define GDKDFB_RECTANGLE_VALS_FROM_BOX(s) (s)->x1, (s)->y1, (s)->x2-(s)->x1, (s)->y2-(s)->y1
-+
-
- #endif /* __GDK_PRIVATE_DIRECTFB_H__ */
-diff --git a/gdk/directfb/gdkproperty-directfb.c b/gdk/directfb/gdkproperty-directfb.c
-index 4536a20..dc80652 100644
---- a/gdk/directfb/gdkproperty-directfb.c
-+++ b/gdk/directfb/gdkproperty-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-diff --git a/gdk/directfb/gdkscreen-directfb.c b/gdk/directfb/gdkscreen-directfb.c
-index 8e87d80..67a8f51 100644
---- a/gdk/directfb/gdkscreen-directfb.c
-+++ b/gdk/directfb/gdkscreen-directfb.c
-@@ -27,8 +27,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include "config.h"
-@@ -46,7 +46,7 @@ static GdkColormap *default_colormap = NULL;
- GdkDisplay *
- gdk_screen_get_display (GdkScreen *screen)
- {
-- return GDK_DISPLAY_OBJECT(_gdk_display);
-+ return GDK_DISPLAY_OBJECT(_gdk_display_dfb);
- }
-
- GdkWindow *
-@@ -101,6 +101,27 @@ gdk_screen_get_monitor_geometry (GdkScreen *screen,
- }
-
- gint
-+gdk_screen_get_monitor_width_mm (GdkScreen *screen,
-+ gint monitor_num)
-+{
-+ return gdk_screen_get_width_mm (screen);
-+}
-+
-+gint
-+gdk_screen_get_monitor_height_mm (GdkScreen *screen,
-+ gint monitor_num)
-+{
-+ return gdk_screen_get_height_mm (screen);
-+}
-+
-+gchar *
-+gdk_screen_get_monitor_plug_name (GdkScreen *screen,
-+ gint monitor_num)
-+{
-+ return g_strdup ("DirectFB");
-+}
-+
-+gint
- gdk_screen_get_number (GdkScreen *screen)
- {
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-@@ -127,7 +148,7 @@ gdk_screen_get_width (GdkScreen *screen)
- {
- DFBDisplayLayerConfig dlc;
-
-- _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
-+ _gdk_display_dfb->layer->GetConfiguration (_gdk_display_dfb->layer, &dlc);
-
- return dlc.width;
- }
-@@ -137,7 +158,7 @@ gdk_screen_get_height (GdkScreen *screen)
- {
- DFBDisplayLayerConfig dlc;
-
-- _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
-+ _gdk_display_dfb->layer->GetConfiguration (_gdk_display_dfb->layer, &dlc);
-
- return dlc.height;
- }
-@@ -145,37 +166,21 @@ gdk_screen_get_height (GdkScreen *screen)
- gint
- gdk_screen_get_width_mm (GdkScreen *screen)
- {
-- static gboolean first_call = TRUE;
- DFBDisplayLayerConfig dlc;
-
-- if (first_call)
-- {
-- g_message
-- ("gdk_screen_width_mm() assumes a screen resolution of 72 dpi");
-- first_call = FALSE;
-- }
--
-- _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
-+ _gdk_display_dfb->layer->GetConfiguration (_gdk_display_dfb->layer, &dlc);
-
-- return (dlc.width * 254) / 720;
-+ return (dlc.width * 25.4) / GDK_DIRECTFB_SCREEN_RESOLUTION;
- }
-
- gint
- gdk_screen_get_height_mm (GdkScreen *screen)
- {
-- static gboolean first_call = TRUE;
- DFBDisplayLayerConfig dlc;
-
-- if (first_call)
-- {
-- g_message
-- ("gdk_screen_height_mm() assumes a screen resolution of 72 dpi");
-- first_call = FALSE;
-- }
--
-- _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
-+ _gdk_display_dfb->layer->GetConfiguration (_gdk_display_dfb->layer, &dlc);
-
-- return (dlc.height * 254) / 720;
-+ return (dlc.height * 25.4) / GDK_DIRECTFB_SCREEN_RESOLUTION;
- }
-
- GdkVisual *
-@@ -216,7 +221,7 @@ gboolean
- gdk_screen_is_composited (GdkScreen *screen)
- {
- g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
-- return FALSE;
-+ return TRUE;
- }
-
- #define __GDK_SCREEN_X11_C__
-diff --git a/gdk/directfb/gdkselection-directfb.c b/gdk/directfb/gdkselection-directfb.c
-index dd3348c..ee435ba 100644
---- a/gdk/directfb/gdkselection-directfb.c
-+++ b/gdk/directfb/gdkselection-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include "config.h"
-diff --git a/gdk/directfb/gdkvisual-directfb.c b/gdk/directfb/gdkvisual-directfb.c
-index fb20f57..2d17a16 100644
---- a/gdk/directfb/gdkvisual-directfb.c
-+++ b/gdk/directfb/gdkvisual-directfb.c
-@@ -26,8 +26,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include "config.h"
-@@ -40,34 +40,43 @@
- #include "gdkalias.h"
-
-
-+D_DEBUG_DOMAIN( GDKDFB_Visual, "GDKDFB/Visual", "GDK DirectFB Visual" );
-+
-+/**********************************************************************************************************************/
-+
- struct _GdkVisualClass
- {
- GObjectClass parent_class;
- };
-
-+/**********************************************************************************************************************/
-
- static void gdk_visual_decompose_mask (gulong mask,
- gint *shift,
- gint *prec);
- static GdkVisualDirectFB * gdk_directfb_visual_create (DFBSurfacePixelFormat pixelformat);
-
-+/**********************************************************************************************************************/
-
- static DFBSurfacePixelFormat formats[] =
- {
-- DSPF_ARGB,
-- DSPF_LUT8,
- DSPF_RGB32,
-- DSPF_RGB24,
-+ DSPF_ARGB,
-+// DSPF_RGB24,
- DSPF_RGB16,
- DSPF_ARGB1555,
-- DSPF_RGB332
-+ DSPF_LUT8,
-+ DSPF_RGB332,
- };
-
--GdkVisual * system_visual = NULL;
--static GdkVisualDirectFB * visuals[G_N_ELEMENTS (formats) + 1] = { NULL };
--static gint available_depths[G_N_ELEMENTS (formats) + 1] = {0};
--static GdkVisualType available_types[G_N_ELEMENTS (formats) + 1] = {0};
-+/**********************************************************************************************************************/
-
-+static GdkVisualDirectFB *system_visual;
-+static GdkVisualDirectFB *visuals[G_N_ELEMENTS (formats) + 1] = { NULL };
-+static gint available_depths[G_N_ELEMENTS (formats) + 1] = {0};
-+static GdkVisualType available_types[G_N_ELEMENTS (formats) + 1] = {0};
-+
-+/**********************************************************************************************************************/
-
- static void
- gdk_visual_finalize (GObject *object)
-@@ -112,17 +121,17 @@ gdk_visual_get_type (void)
- void
- _gdk_visual_init ()
- {
-- DFBResult ret;
- DFBDisplayLayerConfig dlc;
- DFBSurfaceDescription desc;
- IDirectFBSurface *dest;
- gint i, c;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s()\n", __FUNCTION__ );
-
-- _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
-+ _gdk_display_dfb->layer->GetConfiguration (_gdk_display_dfb->layer, &dlc);
- g_assert( dlc.pixelformat != DSPF_UNKNOWN);
-
-- dest = gdk_display_dfb_create_surface(_gdk_display,dlc.pixelformat,8,8);
-+ dest = gdk_display_dfb_create_surface(_gdk_display_dfb,dlc.pixelformat,8,8);
- g_assert (dest != NULL);
-
- /* We could provide all visuals since DirectFB allows us to mix
-@@ -143,63 +152,77 @@ _gdk_visual_init ()
- IDirectFBSurface *src;
- DFBAccelerationMask acc;
-
-- desc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
-+ desc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
- desc.width = 8;
- desc.height = 8;
- desc.pixelformat = formats[i];
-- //call direct so fail silently is ok
-- if (_gdk_display->directfb->CreateSurface (_gdk_display->directfb,
-- &desc, &src) != DFB_OK)
-+
-+ /* call direct so fail silently is ok */
-+ if (_gdk_display_dfb->directfb->CreateSurface (_gdk_display_dfb->directfb, &desc, &src) != DFB_OK)
- continue;
-
-- visuals[i] = gdk_directfb_visual_create (formats[i]);
-+ visuals[c] = gdk_directfb_visual_create (formats[i]);
-
- dest->GetAccelerationMask (dest, src, &acc);
-
-- if (acc & DFXL_BLIT || formats[i] == dlc.pixelformat)
-- {
-- system_visual = GDK_VISUAL (visuals[c]);
-- c++;
-- }
-+ if (formats[i] == dlc.pixelformat || (acc & DFXL_BLIT && !system_visual))
-+ system_visual = visuals[c];
-+
-+ c++;
-
- src->Release (src);
- }
-
- dest->Release (dest);
-
-- //fallback to ARGB must be supported
- if (!system_visual)
- {
-- g_assert (visuals[DSPF_ARGB] != NULL);
-- system_visual = GDK_VISUAL(visuals[DSPF_ARGB]);
-+ g_assert( GDK_IS_VISUAL(visuals[0]) );
-+
-+ system_visual = visuals[0];
- }
-
- g_assert (system_visual != NULL);
-+
-+ D_INFO( "GDK/DirectFB: System visual %s\n", dfb_pixelformat_name( system_visual->format ) );
- }
-
- gint
- gdk_visual_get_best_depth (void)
- {
-- return system_visual->depth;
-+ D_DEBUG_AT( GDKDFB_Visual, "%s() -> %d\n", __FUNCTION__, system_visual->visual.depth );
-+
-+ return system_visual->visual.depth;
- }
-
- GdkVisualType
- gdk_visual_get_best_type (void)
- {
-- return system_visual->type;
-+ D_DEBUG_AT( GDKDFB_Visual, "%s() -> %d\n", __FUNCTION__, system_visual->visual.type );
-+
-+ return system_visual->visual.type;
- }
-
- GdkVisual*
- gdk_screen_get_system_visual (GdkScreen *screen)
- {
-+ D_DEBUG_AT( GDKDFB_Visual, "%s( %p ) -> %p (%s)\n", __FUNCTION__,
-+ screen, system_visual, dfb_pixelformat_name( system_visual->format ) );
-+
- g_assert( system_visual);
-- return system_visual;
-+
-+ return GDK_VISUAL (system_visual);
- }
-
- GdkVisual*
- gdk_visual_get_best (void)
- {
-- return system_visual;
-+ D_DEBUG_AT( GDKDFB_Visual, "%s() -> %p (%s)\n", __FUNCTION__,
-+ system_visual, dfb_pixelformat_name( system_visual->format ) );
-+
-+ g_assert( system_visual);
-+
-+ return GDK_VISUAL (system_visual);
- }
-
- GdkVisual*
-@@ -207,16 +230,25 @@ gdk_visual_get_best_with_depth (gint depth)
- {
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s( %d )\n", __FUNCTION__, depth );
-+
- for (i = 0; visuals[i]; i++)
- {
- if( visuals[i] ) {
- GdkVisual *visual = GDK_VISUAL (visuals[i]);
-
- if (depth == visual->depth)
-+ {
-+ D_DEBUG_AT( GDKDFB_Visual, " -> returning %p (%s)\n",
-+ visuals[i], dfb_pixelformat_name( visuals[i]->format ) );
-+
- return visual;
-+ }
- }
- }
-
-+ D_DEBUG_AT( GDKDFB_Visual, " -> returning NULL!\n" );
-+
- return NULL;
- }
-
-@@ -225,16 +257,25 @@ gdk_visual_get_best_with_type (GdkVisualType visual_type)
- {
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s( %d )\n", __FUNCTION__, visual_type );
-+
- for (i = 0; visuals[i]; i++)
- {
- if( visuals[i] ) {
- GdkVisual *visual = GDK_VISUAL (visuals[i]);
-
- if (visual_type == visual->type)
-+ {
-+ D_DEBUG_AT( GDKDFB_Visual, " -> returning %p (%s)\n",
-+ visuals[i], dfb_pixelformat_name( visuals[i]->format ) );
-+
- return visual;
-+ }
- }
- }
-
-+ D_DEBUG_AT( GDKDFB_Visual, " -> returning NULL!\n" );
-+
- return NULL;
- }
-
-@@ -244,17 +285,29 @@ gdk_visual_get_best_with_both (gint depth,
- {
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s( %d, %d )\n", __FUNCTION__, depth, visual_type );
-+
- for (i = 0; visuals[i]; i++)
- {
- if( visuals[i] ) {
- GdkVisual *visual = GDK_VISUAL (visuals[i]);
-
- if (depth == visual->depth && visual_type == visual->type)
-+ {
-+ D_DEBUG_AT( GDKDFB_Visual, " -> returning %p (%s)\n",
-+ visuals[i], dfb_pixelformat_name( visuals[i]->format ) );
-+
- return visual;
-+ }
- }
- }
-
-- return system_visual;
-+ g_assert( system_visual);
-+
-+ D_DEBUG_AT( GDKDFB_Visual, " -> not found! Returning %p (%s)\n",
-+ system_visual, dfb_pixelformat_name( system_visual->format ) );
-+
-+ return GDK_VISUAL (system_visual);
- }
-
- void
-@@ -263,6 +316,8 @@ gdk_query_depths (gint **depths,
- {
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s()\n", __FUNCTION__ );
-+
- for (i = 0; available_depths[i]; i++)
- ;
-
-@@ -276,6 +331,8 @@ gdk_query_visual_types (GdkVisualType **visual_types,
- {
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s()\n", __FUNCTION__ );
-+
- for (i = 0; available_types[i]; i++)
- ;
-
-@@ -289,9 +346,14 @@ gdk_screen_list_visuals (GdkScreen *screen)
- GList *list = NULL;
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s()\n", __FUNCTION__ );
-+
- for (i = 0; visuals[i]; i++)
- if( visuals[i] ) {
- GdkVisual * vis = GDK_VISUAL(visuals[i]);
-+
-+ D_DEBUG_AT( GDKDFB_Visual, " -> %p (%dbit)\n", vis, vis->depth );
-+
- list = g_list_append (list,vis);
- }
-
-@@ -319,10 +381,18 @@ gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format)
- {
- gint i;
-
-+ D_DEBUG_AT( GDKDFB_Visual, "%s( %s )\n", __FUNCTION__,
-+ dfb_pixelformat_name(pixel_format) );
-+
- /* first check if one the registered visuals matches */
- for (i = 0; visuals[i]; i++)
- if ( visuals[i] && visuals[i]->format == pixel_format)
-- return GDK_VISUAL (visuals[i]);
-+ {
-+ D_DEBUG_AT( GDKDFB_Visual, " -> returning %p (%s)\n",
-+ visuals[i], dfb_pixelformat_name( visuals[i]->format ) );
-+
-+ return GDK_VISUAL (visuals[i]);
-+ }
-
- /* none matched, try to create a new one for this pixel_format */
- {
-@@ -334,12 +404,14 @@ gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format)
- desc.height = 8;
- desc.pixelformat = pixel_format;
-
-- if ( _gdk_display->directfb->CreateSurface ( _gdk_display->directfb, &desc, &test) != DFB_OK)
-+ if ( _gdk_display_dfb->directfb->CreateSurface ( _gdk_display_dfb->directfb, &desc, &test) != DFB_OK)
- return NULL;
-
- test->Release (test);
- }
-
-+ D_DEBUG_AT( GDKDFB_Visual, " -> creating new visual for %s!\n", dfb_pixelformat_name( pixel_format ) );
-+
- return GDK_VISUAL(gdk_directfb_visual_create (pixel_format));
- }
-
-@@ -398,7 +470,10 @@ gdk_directfb_visual_create (DFBSurfacePixelFormat pixelformat)
- break;
-
- case DSPF_RGB332:
-- visual->type = GDK_VISUAL_STATIC_COLOR;
-+ visual->type = GDK_VISUAL_TRUE_COLOR;
-+ visual->red_mask = 0x000000E0;
-+ visual->green_mask = 0x0000001C;
-+ visual->blue_mask = 0x00000003;
- visual->bits_per_rgb = 3;
- break;
-
-@@ -418,7 +493,6 @@ gdk_directfb_visual_create (DFBSurfacePixelFormat pixelformat)
- visual->bits_per_rgb = 6;
- break;
-
-- case DSPF_RGB24:
- case DSPF_RGB32:
- case DSPF_ARGB:
- visual->type = GDK_VISUAL_TRUE_COLOR;
-@@ -432,14 +506,14 @@ gdk_directfb_visual_create (DFBSurfacePixelFormat pixelformat)
- g_assert_not_reached ();
- }
-
-+ visual->depth = GDK_DFB_BITS_PER_PIXEL (pixelformat);
-+
- #if G_BYTE_ORDER == G_BIG_ENDIAN
- visual->byte_order = GDK_MSB_FIRST;
- #else
- visual->byte_order = GDK_LSB_FIRST;
- #endif
-
-- visual->depth = DFB_BITS_PER_PIXEL (pixelformat);
--
- switch (visual->type)
- {
- case GDK_VISUAL_TRUE_COLOR:
-@@ -451,9 +525,9 @@ gdk_directfb_visual_create (DFBSurfacePixelFormat pixelformat)
- &visual->blue_shift, &visual->blue_prec);
-
- /* the number of possible levels per color component */
-- visual->colormap_size = 1 << MAX (visual->red_prec,
-+ visual->colormap_size = 0;/*1 << MAX (visual->red_prec,
- MAX (visual->green_prec,
-- visual->blue_prec));
-+ visual->blue_prec));*/
- break;
-
- case GDK_VISUAL_STATIC_COLOR:
-diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
-index f3b11bf..1eca854 100644
---- a/gdk/directfb/gdkwindow-directfb.c
-+++ b/gdk/directfb/gdkwindow-directfb.c
-@@ -27,8 +27,8 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
- #include <config.h>
-@@ -46,6 +46,20 @@
- #include "cairo.h"
- #include <assert.h>
-
-+#include <direct/debug.h>
-+
-+#include <directfb_util.h>
-+
-+
-+
-+
-+
-+D_DEBUG_DOMAIN( GDKDFB_Updates, "GDKDFB/Updates", "GDK DirectFB Updates" );
-+D_DEBUG_DOMAIN( GDKDFB_Paintable, "GDKDFB/Paintable", "GDK DirectFB Paintable" );
-+D_DEBUG_DOMAIN( GDKDFB_Visual, "GDKDFB/Visual", "GDK DirectFB Visual" );
-+D_DEBUG_DOMAIN( GDKDFB_Window, "GDKDFB/Window", "GDK DirectFB Window" );
-+
-+
- static GdkRegion * gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable);
- static void gdk_window_impl_directfb_set_colormap (GdkDrawable *drawable,
- GdkColormap *colormap);
-@@ -53,6 +67,12 @@ static void gdk_window_impl_directfb_init (GdkWindowImplDirectFB *win
- static void gdk_window_impl_directfb_class_init (GdkWindowImplDirectFBClass *klass);
- static void gdk_window_impl_directfb_finalize (GObject *object);
-
-+static void gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface);
-+
-+
-+static gpointer parent_class = NULL;
-+
-+
- typedef struct
- {
- GdkWindowChildChanged changed;
-@@ -61,73 +81,210 @@ typedef struct
- } GdkWindowChildHandlerData;
-
-
-+static inline guint
-+gdk_window_is_toplevel_frozen (GdkWindow *window)
-+{
-+ GdkWindowObject *toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
-+
-+ return toplevel->update_and_descendants_freeze_count;
-+}
-+
- /* Code for dirty-region queueing
- */
-+static guint update_idle = 0;
-+static guint update_timeout = 0;
- static GSList *update_windows = NULL;
--static guint update_idle = 0;
-+static GSList *flip_windows = NULL;
-
--static void
--gdk_window_directfb_process_all_updates (void)
--{
-- GSList *old_update_windows = update_windows;
-- GSList *tmp_list = update_windows;
-
-- if (update_idle)
-- g_source_remove (update_idle);
--
-- update_windows = NULL;
-- update_idle = 0;
-
-- g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL);
-+static gboolean
-+update_handler (gpointer data)
-+{
-+ gdk_directfb_window_process_all();
-
-- while (tmp_list)
-+ return FALSE;
-+}
-+
-+static void
-+add_update_idle_timeout( gboolean idle )
-+{
-+ if (!update_idle && idle)
- {
-- GdkWindowObject *private = (GdkWindowObject *)tmp_list->data;
--
-- if (private->update_freeze_count)
-- update_windows = g_slist_prepend (update_windows, private);
-- else
-- gdk_window_process_updates(tmp_list->data,TRUE);
--
-- g_object_unref (tmp_list->data);
-- tmp_list = tmp_list->next;
-+ D_DEBUG_AT( GDKDFB_Updates, " -> adding idle callback\n" );
-+
-+ update_idle = gdk_threads_add_idle_full( GDK_PRIORITY_REDRAW, update_handler, NULL, NULL );
- }
-
-- g_slist_free (old_update_windows);
-+ if (!update_timeout)
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> adding timeout handler\n" );
-
-+ update_timeout = gdk_threads_add_timeout_full( GDK_PRIORITY_REDRAW, 23, update_handler, NULL, NULL );
-+ }
- }
-
--static gboolean
--gdk_window_update_idle (gpointer data)
-+static void
-+gdk_directfb_window_schedule_update( GdkWindow *window,
-+ GdkRegion *update )
- {
-- gdk_window_directfb_process_all_updates ();
-+ GdkWindowObject *private = GDK_WINDOW_OBJECT (window);
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB( private->impl );
-+
-+ D_DEBUG_AT( GDKDFB_Updates, "%s( %p ) <- freeze count %d\n", __FUNCTION__, window, private->update_freeze_count );
-
-- return FALSE;
-+ if (private->update_area)
-+ gdk_region_union( private->update_area, update );
-+ else
-+ private->update_area = gdk_region_copy( update );
-+
-+ if (private->update_freeze_count || gdk_window_is_toplevel_frozen (window))
-+ return;
-+
-+ if (impl->flags & GDKWIF_UPDATE)
-+ return;
-+
-+ impl->flags |= GDKWIF_UPDATE;
-+
-+ g_object_ref( window );
-+
-+ update_windows = g_slist_prepend( update_windows, window );
-+
-+ add_update_idle_timeout( TRUE );
- }
-
- static void
--gdk_window_schedule_update (GdkWindow *window)
-+gdk_directfb_window_schedule_flip( GdkWindow *window )
- {
-- if (window && GDK_WINDOW_OBJECT (window)->update_freeze_count)
-+ GdkWindowObject *private = GDK_WINDOW_OBJECT( window );
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB( private->impl );
-+
-+ D_DEBUG_AT( GDKDFB_Updates, "%s( %p )\n", __FUNCTION__, window );
-+
-+ if (impl->flags & GDKWIF_FLIP)
- return;
-
-- if (!update_idle)
-+ impl->flags |= GDKWIF_FLIP;
-+
-+ g_object_ref( window );
-+
-+ flip_windows = g_slist_prepend( flip_windows, window );
-+
-+ add_update_idle_timeout( TRUE );
-+}
-+
-+static gboolean
-+update_window_func( GdkWindow *window )
-+{
-+ GdkWindowObject *private = GDK_WINDOW_OBJECT( window );
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB( private->impl );
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " == draw == %p [" GDKDFB_WIMPL_FORM "]\n", window, GDKDFB_WIMPL_V(impl) );
-+
-+ if (GDK_WINDOW_DESTROYED (window))
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> DESTROYED!\n" );
-+ impl->flags &= ~GDKWIF_UPDATE;
-+ g_object_unref( window );
-+ return TRUE;
-+ }
-+
-+ if (!private->update_freeze_count && !gdk_window_is_toplevel_frozen (window))
-+ gdk_directfb_window_process( impl );
-+ else
-+ D_DEBUG_AT( GDKDFB_Updates, " -> FROZEN\n" );
-+
-+ if (private->update_area && private->update_area->numRects > 0)
- {
-- update_idle = gdk_threads_add_idle_full (GDK_PRIORITY_REDRAW,
-- gdk_window_update_idle, NULL, NULL);
-+ D_DEBUG_AT( GDKDFB_Updates, " -> KEEPING " GDKDFB_REGION_FORM "\n", GDKDFB_REGION_V(private->update_area) );
-+ add_update_idle_timeout( FALSE );
-+ return FALSE;
- }
-+
-+ impl->flags &= ~GDKWIF_UPDATE;
-+ g_object_unref( window );
-+
-+ return TRUE;
- }
-
-+static gboolean
-+flip_window_func( GdkWindow *window )
-+{
-+ GdkWindowObject *private = GDK_WINDOW_OBJECT( window );
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB( private->impl );
-
--static GdkWindow *gdk_directfb_window_containing_pointer = NULL;
--static GdkWindow *gdk_directfb_focused_window = NULL;
--static gpointer parent_class = NULL;
--GdkWindow * _gdk_parent_root = NULL;
--static void
--gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface);
-+ D_DEBUG_AT( GDKDFB_Updates, " == flip == %p [" GDKDFB_WIMPL_FORM "]\n", window, GDKDFB_WIMPL_V(impl) );
-+
-+ if (GDK_WINDOW_DESTROYED (window))
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> DESTROYED!\n" );
-+ impl->flags &= ~GDKWIF_FLIP;
-+ g_object_unref( window );
-+ return TRUE;
-+ }
-+
-+ gdk_directfb_window_flush_flips( window );
-+
-+ impl->flags &= ~GDKWIF_FLIP;
-+ g_object_unref( window );
-+
-+ return TRUE;
-+}
-+
-+void
-+gdk_directfb_window_process_all()
-+{
-+ GSList *tmp_list;
-+ GSList *old_update_windows;
-+ GSList *old_flip_windows;
-+
-+ D_DEBUG_AT( GDKDFB_Updates, "%s()\n", __FUNCTION__ );
-+
-+ if (update_idle)
-+ {
-+ g_source_remove (update_idle);
-+ update_idle = 0;
-+ }
-+
-+ if (update_timeout)
-+ {
-+ g_source_remove (update_timeout);
-+ update_timeout = 0;
-+ }
-+
-+ /* Handle all queued drawing */
-+ old_update_windows = tmp_list = update_windows;
-+ update_windows = NULL;
-
-+ while (tmp_list)
-+ {
-+ GdkWindow *window = GDK_WINDOW(tmp_list->data);
-
-+ if (!update_window_func( window ))
-+ update_windows = g_slist_prepend( update_windows, window );
-
-+ tmp_list = tmp_list->next;
-+ }
-+
-+ g_slist_free( old_update_windows );
-+
-+
-+ /* Handle all queued flipping */
-+ old_flip_windows = tmp_list = flip_windows;
-+ flip_windows = NULL;
-+
-+ while (tmp_list)
-+ {
-+ GdkWindow *window = GDK_WINDOW(tmp_list->data);
-+
-+ if (!flip_window_func( window ))
-+ flip_windows = g_slist_prepend( flip_windows, window );
-+
-+ tmp_list = tmp_list->next;
-+ }
-+
-+ g_slist_free( old_flip_windows );
-+}
-
-
- GType
-@@ -182,7 +339,7 @@ gdk_window_impl_directfb_init (GdkWindowImplDirectFB *impl)
- impl->drawable.height = 1;
- //cannot use gdk_cursor_new here since gdk_display_get_default
- //does not work yet.
-- impl->cursor = gdk_cursor_new_for_display (GDK_DISPLAY_OBJECT(_gdk_display),GDK_LEFT_PTR);
-+ impl->cursor = gdk_cursor_new_for_display (GDK_DISPLAY_OBJECT(_gdk_display_dfb),GDK_LEFT_PTR);
- impl->opacity = 255;
- }
-
-@@ -220,6 +377,8 @@ gdk_window_impl_directfb_finalize (GObject *object)
- {
- GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (object);
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p ) <- %dx%d\n", __FUNCTION__, impl, impl->drawable.width, impl->drawable.height );
-+
- if (GDK_WINDOW_IS_MAPPED (impl->drawable.wrapper))
- gdk_window_hide (impl->drawable.wrapper);
-
-@@ -249,12 +408,17 @@ gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable)
- GdkRectangle rect = { 0, 0, 0, 0 };
- DFBRectangle drect = { 0, 0, 0, 0 };
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, drawable );
-+
- if (priv->surface)
- priv->surface->GetVisibleRectangle (priv->surface, &drect);
- rect.x= drect.x;
- rect.y= drect.y;
- rect.width=drect.w;
- rect.height=drect.h;
-+
-+ D_DEBUG_AT( GDKDFB_Window, " -> returning %4d,%4d-%4dx%4d\n", drect.x, drect.y, drect.w, drect.h );
-+
- return gdk_region_rectangle (&rect);
- }
-
-@@ -287,7 +451,9 @@ create_directfb_window (GdkWindowImplDirectFB *impl,
- DFBResult ret;
- IDirectFBWindow *window;
-
-- ret = _gdk_display->layer->CreateWindow (_gdk_display->layer, desc, &window);
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %4dx%4d, caps 0x%08x )\n", __FUNCTION__, desc->width, desc->height, desc->caps );
-+
-+ ret = _gdk_display_dfb->layer->CreateWindow (_gdk_display_dfb->layer, desc, &window);
-
- if (ret != DFB_OK)
- {
-@@ -311,6 +477,12 @@ create_directfb_window (GdkWindowImplDirectFB *impl,
-
- impl->window = window;
-
-+#if GDK_DIRECTFB_GROUPED_FLIPS
-+ //direct_log_printf( NULL, "Initializing (window %p, wimpl %p)\n", win, impl );
-+
-+ dfb_updates_init( &impl->flips, impl->flip_regions, G_N_ELEMENTS(impl->flip_regions) );
-+#endif
-+
- return TRUE;
- }
-
-@@ -323,8 +495,8 @@ _gdk_windowing_window_init (void)
-
- g_assert (_gdk_parent_root == NULL);
-
-- _gdk_display->layer->GetConfiguration(
-- _gdk_display->layer, &dlc );
-+ _gdk_display_dfb->layer->GetConfiguration(
-+ _gdk_display_dfb->layer, &dlc );
-
- _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
- private = GDK_WINDOW_OBJECT (_gdk_parent_root);
-@@ -333,7 +505,7 @@ _gdk_windowing_window_init (void)
- private->window_type = GDK_WINDOW_ROOT;
- private->state = 0;
- private->children = NULL;
-- impl->drawable.paint_region = NULL;
-+// impl->drawable.paint_region = NULL;
- impl->gdkWindow = _gdk_parent_root;
- impl->window = NULL;
- impl->drawable.abs_x = 0;
-@@ -350,7 +522,7 @@ _gdk_windowing_window_init (void)
- desc.flags = DWDESC_CAPS;
- desc.caps = 0;
- desc.caps |= DWCAPS_NODECORATION;
-- desc.caps |= DWCAPS_ALPHACHANNEL;
-+// desc.caps |= DWCAPS_ALPHACHANNEL;
- desc.flags |= ( DWDESC_WIDTH | DWDESC_HEIGHT |
- DWDESC_POSX | DWDESC_POSY );
- desc.posx = 0;
-@@ -362,7 +534,7 @@ _gdk_windowing_window_init (void)
- g_assert(impl->drawable.surface != NULL );
- }
- impl->drawable.surface->GetPixelFormat(impl->drawable.surface,&impl->drawable.format);
-- private->depth = DFB_BITS_PER_PIXEL(impl->drawable.format);
-+ private->depth = GDK_DFB_BITS_PER_PIXEL(impl->drawable.format);
- /*
- Now we can set up the system colormap
- */
-@@ -390,6 +562,8 @@ gdk_directfb_window_new (GdkWindow *parent,
-
- g_return_val_if_fail (attributes != NULL, NULL);
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, parent );
-+
- if (!parent || attributes->window_type != GDK_WINDOW_CHILD)
- parent = _gdk_parent_root;
-
-@@ -400,6 +574,9 @@ gdk_directfb_window_new (GdkWindow *parent,
- parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
- private->parent = parent_private;
-
-+ private->accept_focus = TRUE;
-+ private->focus_on_map = TRUE;
-+
- x = (attributes_mask & GDK_WA_X) ? attributes->x : 0;
- y = (attributes_mask & GDK_WA_Y) ? attributes->y : 0;
-
-@@ -412,32 +589,55 @@ gdk_directfb_window_new (GdkWindow *parent,
- private->x = x;
- private->y = y;
-
-+ D_DEBUG_AT( GDKDFB_Window, " -> rel. x/y: %d,%d\n", x, y );
-+
- _gdk_directfb_calc_abs (window);
-
- impl->drawable.width = MAX (1, attributes->width);
- impl->drawable.height = MAX (1, attributes->height);
-
-+ D_DEBUG_AT( GDKDFB_Window, " -> size: %dx%d\n", impl->drawable.width, impl->drawable.height );
-+
- private->window_type = attributes->window_type;
-
- desc.flags = 0;
-
- if (attributes_mask & GDK_WA_VISUAL)
-- visual = attributes->visual;
-+ {
-+ visual = attributes->visual;
-+
-+ D_DEBUG_AT( GDKDFB_Window, " -> visual: %s\n", dfb_pixelformat_name(((GdkVisualDirectFB *) visual)->format) );
-+ }
- else
- visual = gdk_drawable_get_visual (parent);
-
-+ D_DEBUG_AT( GDKDFB_Visual, " -> visual: %dbit (%s)\n",
-+ visual->depth, dfb_pixelformat_name(((GdkVisualDirectFB *) visual)->format) );
-+
- switch (attributes->wclass)
- {
- case GDK_INPUT_OUTPUT:
- private->input_only = FALSE;
-
-- desc.flags |= DWDESC_PIXELFORMAT;
-+ desc.flags |= DWDESC_PIXELFORMAT | DWDESC_CAPS | DWDESC_OPTIONS;
-+
- desc.pixelformat = ((GdkVisualDirectFB *) visual)->format;
-+ desc.caps = DWCAPS_NONE;
-+ desc.options = window_options;
-
- if (DFB_PIXELFORMAT_HAS_ALPHA (desc.pixelformat))
- {
-- desc.flags |= DWDESC_CAPS;
-- desc.caps = DWCAPS_ALPHACHANNEL;
-+ desc.caps |= DWCAPS_ALPHACHANNEL;
-+ desc.options |= DWOP_ALPHACHANNEL;
-+
-+ D_DEBUG_AT( GDKDFB_Window, " -> ALPHA CHANNEL!!!\n" );
-+ }
-+
-+ if (private->window_type == GDK_WINDOW_TEMP)
-+ {
-+ desc.options |= DWOP_GHOST;
-+
-+ D_DEBUG_AT( GDKDFB_Window, " -> TEMP (GHOST)!!!\n" );
- }
- break;
-
-@@ -515,31 +715,15 @@ gdk_directfb_window_new (GdkWindow *parent,
-
- if (impl->drawable.surface)
- {
-- GdkColormap *colormap;
--
- impl->drawable.surface->GetPixelFormat (impl->drawable.surface,
- &impl->drawable.format);
-
-- private->depth = DFB_BITS_PER_PIXEL(impl->drawable.format);
--
-- if ((attributes_mask & GDK_WA_COLORMAP) && attributes->colormap)
-- {
-- colormap = attributes->colormap;
-- }
-- else
-- {
-- if (gdk_visual_get_system () == visual)
-- colormap = gdk_colormap_get_system ();
-- else
-- colormap =gdk_drawable_get_colormap (parent);
-- }
--
-- gdk_drawable_set_colormap (GDK_DRAWABLE (window), colormap);
-- }
-+ private->depth = GDK_DFB_BITS_PER_PIXEL(impl->drawable.format);
-+ }
- else
- {
- impl->drawable.format = ((GdkVisualDirectFB *)visual)->format;
-- private->depth = visual->depth;
-+ private->depth = visual->depth;
- }
-
- gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
-@@ -572,6 +756,8 @@ gdk_window_new (GdkWindow *parent,
- {
- g_return_val_if_fail (attributes != NULL, NULL);
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, parent );
-+
- return gdk_directfb_window_new (parent, attributes, attributes_mask,
- DWCAPS_NONE, DWOP_NONE, DSCAPS_NONE);
- }
-@@ -596,6 +782,9 @@ _gdk_windowing_window_destroy (GdkWindow *window,
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %srecursing, %sforeign )\n", __FUNCTION__, window,
-+ recursing ? "" : "not ", foreign_destroy ? "" : "no " );
-+
- private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-
-@@ -608,7 +797,7 @@ _gdk_windowing_window_destroy (GdkWindow *window,
- if (window == _gdk_directfb_keyboard_grab_window)
- gdk_keyboard_ungrab (GDK_CURRENT_TIME);
-
-- if (window == gdk_directfb_focused_window)
-+ if (window == _gdk_directfb_keyboard_window)
- gdk_directfb_change_focus (NULL);
-
-
-@@ -637,6 +826,8 @@ gdk_window_destroy_notify (GdkWindow *window)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- if (!GDK_WINDOW_DESTROYED (window))
- {
- if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN)
-@@ -664,61 +855,27 @@ gdk_directfb_window_find_toplevel (GdkWindow *window)
- return _gdk_parent_root;
- }
-
--GdkWindow *
--gdk_directfb_window_find_focus (void)
--{
-- if (_gdk_directfb_keyboard_grab_window)
-- return _gdk_directfb_keyboard_grab_window;
--
-- if (!gdk_directfb_focused_window)
-- gdk_directfb_focused_window = g_object_ref (_gdk_parent_root);
--
-- return gdk_directfb_focused_window;
--}
--
- void
- gdk_directfb_change_focus (GdkWindow *new_focus_window)
- {
-- GdkEventFocus *event;
-- GdkWindow *old_win;
-- GdkWindow *new_win;
-- GdkWindow *event_win;
-+ GdkWindow *old_win;
-+ GdkWindow *new_win;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, new_focus_window );
-
- /* No focus changes while the pointer is grabbed */
- if (_gdk_directfb_pointer_grab_window)
- return;
-
-- old_win = gdk_directfb_focused_window;
-+ old_win = _gdk_directfb_keyboard_window;
- new_win = gdk_directfb_window_find_toplevel (new_focus_window);
-
- if (old_win == new_win)
- return;
-
-- if (old_win)
-- {
-- event_win = gdk_directfb_keyboard_event_window (old_win,
-- GDK_FOCUS_CHANGE);
-- if (event_win)
-- {
-- event = (GdkEventFocus *) gdk_directfb_event_make (event_win,
-- GDK_FOCUS_CHANGE);
-- event->in = FALSE;
-- }
-- }
--
-- event_win = gdk_directfb_keyboard_event_window (new_win,
-- GDK_FOCUS_CHANGE);
-- if (event_win)
-- {
-- event = (GdkEventFocus *) gdk_directfb_event_make (event_win,
-- GDK_FOCUS_CHANGE);
-- event->in = TRUE;
-- }
--
-- if (gdk_directfb_focused_window)
-- g_object_unref (gdk_directfb_focused_window);
-- gdk_directfb_focused_window = g_object_ref (new_win);
-+ if (_gdk_directfb_keyboard_window)
-+ g_object_unref (_gdk_directfb_keyboard_window);
-+ _gdk_directfb_keyboard_window = g_object_ref (new_win);
- }
-
- void
-@@ -759,6 +916,8 @@ gdk_directfb_window_raise (GdkWindow *window)
- {
- GdkWindowObject *parent;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- parent = GDK_WINDOW_OBJECT (window)->parent;
-
- if (parent->children->data == window)
-@@ -775,6 +934,8 @@ gdk_directfb_window_lower (GdkWindow *window)
- {
- GdkWindowObject *parent;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- parent = GDK_WINDOW_OBJECT (window)->parent;
-
- parent->children = g_list_remove (parent->children, window);
-@@ -804,6 +965,8 @@ send_map_events (GdkWindowObject *private)
- if (!GDK_WINDOW_IS_MAPPED (private))
- return;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, private );
-+
- event_win = gdk_directfb_other_event_window ((GdkWindow *) private, GDK_MAP);
- if (event_win)
- gdk_directfb_event_make (event_win, GDK_MAP);
-@@ -812,257 +975,14 @@ send_map_events (GdkWindowObject *private)
- send_map_events (list->data);
- }
-
--static GdkWindow *
--gdk_directfb_find_common_ancestor (GdkWindow *win1,
-- GdkWindow *win2)
--{
-- GdkWindowObject *a;
-- GdkWindowObject *b;
--
-- for (a = GDK_WINDOW_OBJECT (win1); a; a = a->parent)
-- for (b = GDK_WINDOW_OBJECT (win2); b; b = b->parent)
-- {
-- if (a == b)
-- return GDK_WINDOW (a);
-- }
--
-- return NULL;
--}
--
--void
--gdk_directfb_window_send_crossing_events (GdkWindow *src,
-- GdkWindow *dest,
-- GdkCrossingMode mode)
--{
-- GdkWindow *c;
-- GdkWindow *win, *last, *next;
-- GdkEvent *event;
-- gint x, y, x_int, y_int;
-- GdkModifierType modifiers;
-- GSList *path, *list;
-- gboolean non_linear;
-- GdkWindow *a;
-- GdkWindow *b;
-- GdkWindow *event_win;
--
-- /* Do a possible cursor change before checking if we need to
-- generate crossing events so cursor changes due to pointer
-- grabs work correctly. */
-- {
-- static GdkCursorDirectFB *last_cursor = NULL;
--
-- GdkWindowObject *private = GDK_WINDOW_OBJECT (dest);
-- GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-- GdkCursorDirectFB *cursor;
--
-- if (_gdk_directfb_pointer_grab_cursor)
-- cursor = (GdkCursorDirectFB*) _gdk_directfb_pointer_grab_cursor;
-- else
-- cursor = (GdkCursorDirectFB*) impl->cursor;
--
-- if (cursor != last_cursor)
-- {
-- win = gdk_directfb_window_find_toplevel (dest);
-- private = GDK_WINDOW_OBJECT (win);
-- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
--
-- if (impl->window)
-- impl->window->SetCursorShape (impl->window,
-- cursor->shape,
-- cursor->hot_x, cursor->hot_y);
-- last_cursor = cursor;
-- }
-- }
--
-- if (dest == gdk_directfb_window_containing_pointer)
-- return;
--
-- if (gdk_directfb_window_containing_pointer == NULL)
-- gdk_directfb_window_containing_pointer = g_object_ref (_gdk_parent_root);
--
-- if (src)
-- a = src;
-- else
-- a = gdk_directfb_window_containing_pointer;
--
-- b = dest;
--
-- if (a == b)
-- return;
--
-- /* gdk_directfb_window_containing_pointer might have been destroyed.
-- * The refcount we hold on it should keep it, but it's parents
-- * might have died.
-- */
-- if (GDK_WINDOW_DESTROYED (a))
-- a = _gdk_parent_root;
--
-- gdk_directfb_mouse_get_info (&x, &y, &modifiers);
--
-- c = gdk_directfb_find_common_ancestor (a, b);
--
-- non_linear = (c != a) && (c != b);
--
-- event_win = gdk_directfb_pointer_event_window (a, GDK_LEAVE_NOTIFY);
-- if (event_win)
-- {
-- event = gdk_directfb_event_make (event_win, GDK_LEAVE_NOTIFY);
-- event->crossing.subwindow = NULL;
--
-- gdk_window_get_origin (a, &x_int, &y_int);
--
-- event->crossing.x = x - x_int;
-- event->crossing.y = y - y_int;
-- event->crossing.x_root = x;
-- event->crossing.y_root = y;
-- event->crossing.mode = mode;
--
-- if (non_linear)
-- event->crossing.detail = GDK_NOTIFY_NONLINEAR;
-- else if (c == a)
-- event->crossing.detail = GDK_NOTIFY_INFERIOR;
-- else
-- event->crossing.detail = GDK_NOTIFY_ANCESTOR;
--
-- event->crossing.focus = FALSE;
-- event->crossing.state = modifiers;
-- }
--
-- /* Traverse up from a to (excluding) c */
-- if (c != a)
-- {
-- last = a;
-- win = GDK_WINDOW (GDK_WINDOW_OBJECT (a)->parent);
-- while (win != c)
-- {
-- event_win =
-- gdk_directfb_pointer_event_window (win, GDK_LEAVE_NOTIFY);
--
-- if (event_win)
-- {
-- event = gdk_directfb_event_make (event_win, GDK_LEAVE_NOTIFY);
--
-- event->crossing.subwindow = g_object_ref (last);
--
-- gdk_window_get_origin (win, &x_int, &y_int);
--
-- event->crossing.x = x - x_int;
-- event->crossing.y = y - y_int;
-- event->crossing.x_root = x;
-- event->crossing.y_root = y;
-- event->crossing.mode = mode;
--
-- if (non_linear)
-- event->crossing.detail = GDK_NOTIFY_NONLINEAR_VIRTUAL;
-- else
-- event->crossing.detail = GDK_NOTIFY_VIRTUAL;
--
-- event->crossing.focus = FALSE;
-- event->crossing.state = modifiers;
-- }
--
-- last = win;
-- win = GDK_WINDOW (GDK_WINDOW_OBJECT (win)->parent);
-- }
-- }
--
-- /* Traverse down from c to b */
-- if (c != b)
-- {
-- path = NULL;
-- win = GDK_WINDOW (GDK_WINDOW_OBJECT (b)->parent);
-- while (win != c)
-- {
-- path = g_slist_prepend (path, win);
-- win = GDK_WINDOW (GDK_WINDOW_OBJECT (win)->parent);
-- }
--
-- list = path;
-- while (list)
-- {
-- win = GDK_WINDOW (list->data);
-- list = g_slist_next (list);
--
-- if (list)
-- next = GDK_WINDOW (list->data);
-- else
-- next = b;
--
-- event_win =
-- gdk_directfb_pointer_event_window (win, GDK_ENTER_NOTIFY);
--
-- if (event_win)
-- {
-- event = gdk_directfb_event_make (event_win, GDK_ENTER_NOTIFY);
--
-- event->crossing.subwindow = g_object_ref (next);
--
-- gdk_window_get_origin (win, &x_int, &y_int);
--
-- event->crossing.x = x - x_int;
-- event->crossing.y = y - y_int;
-- event->crossing.x_root = x;
-- event->crossing.y_root = y;
-- event->crossing.mode = mode;
--
-- if (non_linear)
-- event->crossing.detail = GDK_NOTIFY_NONLINEAR_VIRTUAL;
-- else
-- event->crossing.detail = GDK_NOTIFY_VIRTUAL;
--
-- event->crossing.focus = FALSE;
-- event->crossing.state = modifiers;
-- }
-- }
--
-- g_slist_free (path);
-- }
--
-- event_win = gdk_directfb_pointer_event_window (b, GDK_ENTER_NOTIFY);
-- if (event_win)
-- {
-- event = gdk_directfb_event_make (event_win, GDK_ENTER_NOTIFY);
--
-- event->crossing.subwindow = NULL;
--
-- gdk_window_get_origin (b, &x_int, &y_int);
--
-- event->crossing.x = x - x_int;
-- event->crossing.y = y - y_int;
-- event->crossing.x_root = x;
-- event->crossing.y_root = y;
-- event->crossing.mode = mode;
--
-- if (non_linear)
-- event->crossing.detail = GDK_NOTIFY_NONLINEAR;
-- else if (c==a)
-- event->crossing.detail = GDK_NOTIFY_ANCESTOR;
-- else
-- event->crossing.detail = GDK_NOTIFY_INFERIOR;
--
-- event->crossing.focus = FALSE;
-- event->crossing.state = modifiers;
-- }
--
-- if (mode != GDK_CROSSING_GRAB)
-- {
-- //this seems to cause focus to change as the pointer moves yuck
-- //gdk_directfb_change_focus (b);
-- if (b != gdk_directfb_window_containing_pointer)
-- {
-- g_object_unref (gdk_directfb_window_containing_pointer);
-- gdk_directfb_window_containing_pointer = g_object_ref (b);
-- }
-- }
--}
--
- static void
- show_window_internal (GdkWindow *window,
- gboolean raise)
- {
- GdkWindowObject *private;
- GdkWindowImplDirectFB *impl;
-- GdkWindow *mousewin;
-+
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %sraise )\n", __FUNCTION__, window, raise ? "" : "no " );
-
- private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-@@ -1078,10 +998,6 @@ show_window_internal (GdkWindow *window,
- {
- send_map_events (private);
-
-- mousewin = gdk_window_at_pointer (NULL, NULL);
-- gdk_directfb_window_send_crossing_events (NULL, mousewin,
-- GDK_CROSSING_NORMAL);
--
- if (private->input_only)
- return;
-
-@@ -1105,6 +1021,8 @@ gdk_window_show_unraised (GdkWindow *window)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- show_window_internal (window, FALSE);
- }
-
-@@ -1113,6 +1031,8 @@ gdk_window_show (GdkWindow *window)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- show_window_internal (window, TRUE);
- }
-
-@@ -1121,11 +1041,12 @@ gdk_window_hide (GdkWindow *window)
- {
- GdkWindowObject *private;
- GdkWindowImplDirectFB *impl;
-- GdkWindow *mousewin;
- GdkWindow *event_win;
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-
-@@ -1151,11 +1072,6 @@ gdk_window_hide (GdkWindow *window)
- if (event_win)
- event = gdk_directfb_event_make (event_win, GDK_UNMAP);
-
-- mousewin = gdk_window_at_pointer (NULL, NULL);
-- gdk_directfb_window_send_crossing_events (NULL,
-- mousewin,
-- GDK_CROSSING_NORMAL);
--
- if (window == _gdk_directfb_pointer_grab_window)
- gdk_pointer_ungrab (GDK_CURRENT_TIME);
- if (window == _gdk_directfb_keyboard_grab_window)
-@@ -1182,6 +1098,8 @@ gdk_window_move (GdkWindow *window,
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d )\n", __FUNCTION__, window, x, y );
-+
- private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-
-@@ -1203,16 +1121,10 @@ gdk_window_move (GdkWindow *window,
-
- if (GDK_WINDOW_IS_MAPPED (private))
- {
-- GdkWindow *mousewin;
- GdkRectangle new = { x, y, width, height };
-
- gdk_rectangle_union (&new, &old, &new);
- gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
--
-- /* The window the pointer is in might have changed */
-- mousewin = gdk_window_at_pointer (NULL, NULL);
-- gdk_directfb_window_send_crossing_events (NULL, mousewin,
-- GDK_CROSSING_NORMAL);
- }
- }
- }
-@@ -1227,6 +1139,8 @@ gdk_window_resize (GdkWindow *window,
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4dx%4d )\n", __FUNCTION__, window, width, height );
-+
- private = GDK_WINDOW_OBJECT (window);
-
- x = private->x;
-@@ -1263,6 +1177,9 @@ _gdk_directfb_move_resize_child (GdkWindow *window,
- private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d ) <- %4d,%4d-%4dx%4d\n", __FUNCTION__, window,
-+ x, y, width, height, private->x, private->y, impl->drawable.width, impl->drawable.height );
-+
- private->x = x;
- private->y = y;
-
-@@ -1318,6 +1235,9 @@ gdk_window_move_resize (GdkWindow *window,
- private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d ) <- %4d,%4d-%4dx%4d\n", __FUNCTION__, window,
-+ x, y, width, height, private->x, private->y, impl->drawable.width, impl->drawable.height );
-+
- if (width < 1)
- width = 1;
- if (height < 1)
-@@ -1360,16 +1280,10 @@ gdk_window_move_resize (GdkWindow *window,
-
- if (GDK_WINDOW_IS_MAPPED (private))
- {
-- GdkWindow *mousewin;
- GdkRectangle new = { x, y, width, height };
-
- gdk_rectangle_union (&new, &old, &new);
- gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
--
-- /* The window the pointer is in might have changed */
-- mousewin = gdk_window_at_pointer (NULL, NULL);
-- gdk_directfb_window_send_crossing_events (NULL, mousewin,
-- GDK_CROSSING_NORMAL);
- }
- }
- }
-@@ -1490,11 +1404,15 @@ _gdk_windowing_window_clear_area (GdkWindow *window,
- gint dx = 0;
- gint dy = 0;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d )\n", __FUNCTION__, window, x, y, width, height );
-+
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-- if (GDK_WINDOW_DESTROYED (window))
-+ if (GDK_WINDOW_DESTROYED (window)) {
-+ D_DEBUG_AT( GDKDFB_Window, " -> DESTROYED!\n" );
- return;
--
-+ }
-+
- private = GDK_WINDOW_OBJECT (window);
-
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
-@@ -1518,8 +1436,10 @@ _gdk_windowing_window_clear_area (GdkWindow *window,
- dy += relative_to->y;
- }
-
-- if (bg_pixmap == GDK_NO_BG)
-+ if (bg_pixmap == GDK_NO_BG) {
-+ D_DEBUG_AT( GDKDFB_Window, " -> NO BG\n" );
- return;
-+ }
-
- if (bg_pixmap && bg_pixmap != GDK_PARENT_RELATIVE_BG)
- {
-@@ -1530,6 +1450,8 @@ _gdk_windowing_window_clear_area (GdkWindow *window,
- values.ts_x_origin = - dx;
- values.ts_y_origin = - dy;
-
-+ D_DEBUG_AT( GDKDFB_Window, " -> PIXMAP\n" );
-+
- gc = gdk_gc_new_with_values (GDK_DRAWABLE (impl), &values,
- GDK_GC_FILL | GDK_GC_TILE |
- GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN);
-@@ -1543,6 +1465,8 @@ _gdk_windowing_window_clear_area (GdkWindow *window,
-
- values.foreground = relative_to->bg_color;
-
-+ D_DEBUG_AT( GDKDFB_Window, " -> COLOR\n" );
-+
- gc = gdk_gc_new_with_values (GDK_DRAWABLE (impl), &values,
- GDK_GC_FOREGROUND);
- }
-@@ -1565,6 +1489,8 @@ _gdk_windowing_window_clear_area_e (GdkWindow *window,
- GdkWindowObject *private;
- GdkWindowImplDirectFB *impl;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d )\n", __FUNCTION__, window, x, y, width, height );
-+
- g_return_if_fail (GDK_IS_WINDOW (window));
-
- private = GDK_WINDOW_OBJECT (window);
-@@ -1585,8 +1511,10 @@ _gdk_windowing_window_clear_area_e (GdkWindow *window,
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-- if (GDK_WINDOW_DESTROYED (window))
-+ if (GDK_WINDOW_DESTROYED (window)) {
-+ D_DEBUG_AT( GDKDFB_Window, " -> DESTROYED!\n" );
- return;
-+ }
-
- _gdk_windowing_window_clear_area (window, x, y, width, height);
-
-@@ -1598,6 +1526,8 @@ gdk_window_raise (GdkWindow *window)
- {
- GdkWindowImplDirectFB *impl;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- g_return_if_fail (GDK_IS_WINDOW (window));
-
- if (GDK_WINDOW_DESTROYED (window))
-@@ -1627,6 +1557,8 @@ gdk_window_lower (GdkWindow *window)
- {
- GdkWindowImplDirectFB *impl;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
-+
- g_return_if_fail (GDK_IS_WINDOW (window));
-
- if (GDK_WINDOW_DESTROYED (window))
-@@ -1666,6 +1598,8 @@ gdk_window_set_hints (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %3d,%3d, min %4dx%4d, max %4dx%4d, flags 0x%08x )\n", __FUNCTION__,
-+ window, x,y, min_width, min_height, max_width, max_height, flags );
- /* N/A */
- }
-
-@@ -1691,6 +1625,7 @@ gdk_window_set_title (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, '%s' )\n", __FUNCTION__, window, title );
- /* N/A */
- }
-
-@@ -1759,15 +1694,18 @@ gdk_window_set_background (GdkWindow *window,
-
- g_return_if_fail (color != NULL);
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %d,%d,%d )\n", __FUNCTION__, window, color->red, color->green, color->blue );
-+
- private = GDK_WINDOW_OBJECT (window);
- private->bg_color = *color;
-
- if (private->bg_pixmap &&
- private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
- private->bg_pixmap != GDK_NO_BG)
-- g_object_unref (private->bg_pixmap);
--
-- private->bg_pixmap = NULL;
-+ {
-+ g_object_unref (private->bg_pixmap);
-+ private->bg_pixmap = NULL;
-+ }
- }
-
- void
-@@ -1775,32 +1713,38 @@ gdk_window_set_back_pixmap (GdkWindow *window,
- GdkPixmap *pixmap,
- gint parent_relative)
- {
-- GdkWindowObject *private;
-- GdkPixmap *old_pixmap;
-+ GdkWindowObject *private = (GdkWindowObject *)window;
-
- g_return_if_fail (GDK_IS_WINDOW (window));
- g_return_if_fail (pixmap == NULL || !parent_relative);
-
-- private = GDK_WINDOW_OBJECT (window);
-- old_pixmap = private->bg_pixmap;
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p, %p, %srelative )\n", __FUNCTION__,
-+ window, pixmap, parent_relative ? "" : "not " );
-+
-+ if (GDK_WINDOW_DESTROYED (window))
-+ return;
-
- if (private->bg_pixmap &&
- private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
- private->bg_pixmap != GDK_NO_BG)
-- {
-- g_object_unref (private->bg_pixmap);
-- }
-+ g_object_unref (private->bg_pixmap);
-
- if (parent_relative)
- {
- private->bg_pixmap = GDK_PARENT_RELATIVE_BG;
-+ GDK_NOTE (MISC, g_print (G_STRLOC ": setting background pixmap to parent_relative\n"));
- }
- else
- {
-- if (pixmap && pixmap != GDK_NO_BG && pixmap != GDK_PARENT_RELATIVE_BG)
-- g_object_ref (pixmap);
--
-- private->bg_pixmap = pixmap;
-+ if (pixmap)
-+ {
-+ g_object_ref (pixmap);
-+ private->bg_pixmap = pixmap;
-+ }
-+ else
-+ {
-+ private->bg_pixmap = GDK_NO_BG;
-+ }
- }
- }
-
-@@ -1813,6 +1757,9 @@ gdk_window_set_cursor (GdkWindow *window,
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-+ if (GDK_WINDOW_DESTROYED (window))
-+ return;
-+
- impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (window)->impl);
- old_cursor = impl->cursor;
-
-@@ -1821,12 +1768,7 @@ gdk_window_set_cursor (GdkWindow *window,
-
- if (gdk_window_at_pointer (NULL, NULL) == window)
- {
-- /* This is a bit evil but we want to keep all cursor changes in
-- one place, so let gdk_directfb_window_send_crossing_events
-- do the work for us. */
--
-- gdk_directfb_window_send_crossing_events (window, window,
-- GDK_CROSSING_NORMAL);
-+ _gdk_directfb_events_update_cursor (window);
- }
- else if (impl->window)
- {
-@@ -1874,7 +1816,7 @@ gdk_window_get_geometry (GdkWindow *window,
- *height = impl->height;
-
- if (depth)
-- *depth = DFB_BITS_PER_PIXEL(impl->format);
-+ *depth = GDK_DFB_BITS_PER_PIXEL(impl->format);
- }
- }
-
-@@ -1902,6 +1844,8 @@ _gdk_directfb_calc_abs (GdkWindow *window)
- impl->abs_y += parent_impl->abs_y;
- }
-
-+ D_DEBUG_AT( GDKDFB_Window, "%s( %p ) -> %4d,%4d\n", __FUNCTION__, window, impl->abs_x, impl->abs_y );
-+
- for (list = private->children; list; list = list->next)
- {
- _gdk_directfb_calc_abs (list->data);
-@@ -2010,7 +1954,7 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
- gint wx, wy;
-
- if (!win_x || !win_y)
-- gdk_directfb_mouse_get_info (&wx, &wy, NULL);
-+ gdk_directfb_mouse_get_info (&wx, &wy, NULL);
-
- if (win_x)
- wx = *win_x;
-@@ -2036,13 +1980,10 @@ _gdk_windowing_get_pointer (GdkDisplay *display,
- gint *y,
- GdkModifierType *mask)
- {
--(void)screen;
--if(screen) {
-- *screen = gdk_display_get_default_screen (display);
--}
--_gdk_windowing_window_get_pointer (display,
-- _gdk_windowing_window_at_pointer(display,NULL,NULL),x,y,mask);
-+ g_return_if_fail (GDK_DISPLAY_DFB(display) == _gdk_display_dfb);
-
-+ *screen = _gdk_screen;
-+ _gdk_windowing_window_get_pointer (_gdk_display, _gdk_parent_root, x, y, mask);
- }
-
- GdkEventMask
-@@ -2052,8 +1993,8 @@ gdk_window_get_events (GdkWindow *window)
-
- if (GDK_WINDOW_DESTROYED (window))
- return 0;
-- else
-- return GDK_WINDOW_OBJECT (window)->event_mask;
-+
-+ return GDK_WINDOW_OBJECT (window)->event_mask;
- }
-
- void
-@@ -2062,12 +2003,14 @@ gdk_window_set_events (GdkWindow *window,
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-
-- if (event_mask & GDK_BUTTON_MOTION_MASK)
-- event_mask |= (GDK_BUTTON1_MOTION_MASK |
-- GDK_BUTTON2_MOTION_MASK |
-- GDK_BUTTON3_MOTION_MASK);
-+ if (GDK_WINDOW_DESTROYED (window))
-+ return;
-
-- GDK_WINDOW_OBJECT (window)->event_mask = event_mask;
-+ /* gdk_window_new() always sets the GDK_STRUCTURE_MASK, so better
-+ * set it here, too. Not that I know or remember why it is
-+ * necessary, will have to test some day.
-+ */
-+ GDK_WINDOW_OBJECT (window)->event_mask = GDK_STRUCTURE_MASK | event_mask;
- }
-
- void
-@@ -2076,6 +2019,7 @@ gdk_window_shape_combine_mask (GdkWindow *window,
- gint x,
- gint y)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2084,6 +2028,7 @@ gdk_window_input_shape_combine_mask (GdkWindow *window,
- gint x,
- gint y)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2092,14 +2037,16 @@ gdk_window_shape_combine_region (GdkWindow *window,
- gint offset_x,
- gint offset_y)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_input_shape_combine_region (GdkWindow *window,
-- GdkRegion *shape_region,
-- gint offset_x,
-- gint offset_y)
-+ GdkRegion *shape_region,
-+ gint offset_x,
-+ gint offset_y)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2111,7 +2058,7 @@ gdk_window_set_override_redirect (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2123,7 +2070,7 @@ gdk_window_set_icon_list (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2137,7 +2084,7 @@ gdk_window_set_icon (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2149,7 +2096,7 @@ gdk_window_set_icon_name (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2161,6 +2108,8 @@ gdk_window_iconify (GdkWindow *window)
- return;
-
- gdk_window_hide (window);
-+
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2172,6 +2121,8 @@ gdk_window_deiconify (GdkWindow *window)
- return;
-
- gdk_window_show (window);
-+
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2182,7 +2133,7 @@ gdk_window_stick (GdkWindow *window)
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2193,7 +2144,7 @@ gdk_window_unstick (GdkWindow *window)
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2214,7 +2165,7 @@ gdk_directfb_window_set_opacity (GdkWindow *window,
- if (impl->window && GDK_WINDOW_IS_MAPPED (window))
- {
- if (gdk_directfb_apply_focus_opacity &&
-- window == gdk_directfb_focused_window)
-+ window == _gdk_directfb_keyboard_window)
- impl->window->SetOpacity (impl->window,
- (impl->opacity >> 1) + (impl->opacity >> 2));
- else
-@@ -2223,6 +2174,101 @@ gdk_directfb_window_set_opacity (GdkWindow *window,
- }
-
- void
-+gdk_directfb_window_flip_region( GdkWindow *window,
-+ GdkRegion *region )
-+{
-+ int i;
-+ GdkWindow *top = NULL;
-+ GdkWindowObject *priv = GDK_WINDOW_OBJECT (window);
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (priv->impl);
-+
-+ D_DEBUG_AT( GDKDFB_Updates, "%s( %p, %p [%ld] )\n", __FUNCTION__, window, region, region->numRects );
-+
-+ if (!region->numRects)
-+ return;
-+
-+#if GDK_DIRECTFB_GROUPED_FLIPS
-+ top = gdk_window_get_toplevel( window );
-+ if (top)
-+ {
-+ GdkWindowObject *top_priv = GDK_WINDOW_OBJECT(top);
-+ GdkWindowImplDirectFB *top_impl = GDK_WINDOW_IMPL_DIRECTFB(top_priv->impl);
-+
-+ int tx = impl->drawable.abs_x - top_priv->x;
-+ int ty = impl->drawable.abs_y - top_priv->y;
-+
-+ for (i=0; i<region->numRects; i++)
-+ {
-+ DFBRegion reg = { region->rects[i].x1 + tx, region->rects[i].y1 + ty,
-+ region->rects[i].x2 + tx - 1, region->rects[i].y2 + ty - 1 };
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " -> queue flip " DFB_REGION_FORM "\n", DFB_REGION_V(&reg) );
-+
-+ dfb_updates_add( &top_impl->flips, &reg );
-+ }
-+
-+ gdk_directfb_window_schedule_flip( top );
-+ }
-+ else
-+#endif
-+ {
-+ IDirectFBSurface *surface = impl->drawable.surface;
-+
-+ for (i=0; i<region->numRects; i++)
-+ {
-+ DFBRegion reg = { region->rects[i].x1, region->rects[i].y1,
-+ region->rects[i].x2 - 1, region->rects[i].y2 - 1 };
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " -> flip " DFB_REGION_FORM "\n", DFB_REGION_V(&reg) );
-+
-+ /* FIXME: Add and use a FlipRegion() method! */
-+ surface->Flip( surface, &reg, DSFLIP_NONE );
-+ }
-+ }
-+}
-+
-+void
-+gdk_directfb_window_flush_flips( GdkWindow *window )
-+{
-+#if GDK_DIRECTFB_GROUPED_FLIPS
-+ int i;
-+ GdkWindowObject *priv = GDK_WINDOW_OBJECT(window);
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB(priv->impl);
-+
-+ D_DEBUG_AT( GDKDFB_Updates, "%s( %p )\n", __FUNCTION__, window );
-+
-+ if (impl->flips.num_regions)
-+ {
-+ int n, d, total, bounding, num = impl->flips.num_regions;
-+
-+ dfb_updates_stat( &impl->flips, &total, &bounding );
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " -> %p flip [%4d,%4d-%4dx%4d] (%d boxes, total %d, bounding %d)\n",
-+ window, DFB_RECTANGLE_VALS_FROM_REGION( &impl->flips.bounding ), num, total, bounding );
-+
-+ n = impl->flips.max_regions - impl->flips.num_regions + 1;
-+ d = n + 1;
-+
-+ if (total < bounding * n / d)
-+ {
-+ for (i=0; i<num; i++)
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> - [%4d,%4d-%4dx%4d] (%d)\n",
-+ DFB_RECTANGLE_VALS_FROM_REGION( &impl->flips.regions[i] ), i );
-+ impl->drawable.surface->Flip( impl->drawable.surface, &impl->flips.regions[i], DSFLIP_NONE );
-+ }
-+ }
-+ else
-+ impl->drawable.surface->Flip( impl->drawable.surface, &impl->flips.bounding, DSFLIP_NONE );
-+
-+ dfb_updates_reset( &impl->flips );
-+ }
-+ else
-+ D_DEBUG_AT( GDKDFB_Updates, " -> %p has no flips!\n", window );
-+#endif
-+}
-+
-+void
- gdk_window_focus (GdkWindow *window,
- guint32 timestamp)
- {
-@@ -2236,11 +2282,16 @@ gdk_window_focus (GdkWindow *window,
- toplevel = gdk_directfb_window_find_toplevel (window);
- if (toplevel != _gdk_parent_root)
- {
-- GdkWindowImplDirectFB *impl;
-+ GdkWindowObject *priv = (GdkWindowObject*) window;
-+
-+ if (priv->accept_focus && priv->window_type != GDK_WINDOW_TEMP)
-+ {
-+ GdkWindowImplDirectFB *impl;
-
-- impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (toplevel)->impl);
-+ impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (toplevel)->impl);
-
-- impl->window->RequestFocus (impl->window);
-+ impl->window->RequestFocus (impl->window);
-+ }
- }
- }
-
-@@ -2252,7 +2303,7 @@ gdk_window_maximize (GdkWindow *window)
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2263,7 +2314,7 @@ gdk_window_unmaximize (GdkWindow *window)
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2281,7 +2332,7 @@ gdk_window_set_type_hint (GdkWindow *window,
- ((GdkWindowImplDirectFB *)((GdkWindowObject *)window)->impl)->type_hint = hint;
-
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- GdkWindowTypeHint
-@@ -2320,6 +2371,8 @@ gdk_window_set_skip_taskbar_hint (GdkWindow *window,
- gboolean skips_taskbar)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-+
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2327,6 +2380,8 @@ gdk_window_set_skip_pager_hint (GdkWindow *window,
- gboolean skips_pager)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-+
-+ D_UNIMPLEMENTED();
- }
-
-
-@@ -2336,18 +2391,18 @@ gdk_window_set_group (GdkWindow *window,
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
- g_return_if_fail (GDK_IS_WINDOW (leader));
-- g_warning(" DirectFb set_group groups not supported \n");
-
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-+ D_UNIMPLEMENTED();
- }
-
- GdkWindow * gdk_window_get_group (GdkWindow *window)
- {
-- g_warning(" DirectFb get_group groups not supported \n");
-- return window;
-+ D_UNIMPLEMENTED();
-+
-+ return window;
- }
-
- void
-@@ -2410,28 +2465,31 @@ gdk_window_set_functions (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- /* N/A */
-- g_message("unimplemented %s", G_STRLOC);
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_set_child_shapes (GdkWindow *window)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_merge_child_shapes (GdkWindow *window)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_set_child_input_shapes (GdkWindow *window)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_merge_child_input_shapes (GdkWindow *window)
- {
-+ D_UNIMPLEMENTED();
- }
-
- gboolean
-@@ -2443,8 +2501,7 @@ gdk_window_set_static_gravities (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return FALSE;
-
-- /* N/A */
-- g_message("unimplemented %s", G_STRLOC);
-+ D_UNIMPLEMENTED();
-
- return FALSE;
- }
-@@ -2462,7 +2519,7 @@ gdk_window_begin_resize_drag (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- g_message("unimplemented %s", G_STRLOC);
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2477,7 +2534,7 @@ gdk_window_begin_move_drag (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- g_message("unimplemented %s", G_STRLOC);
-+ D_UNIMPLEMENTED();
- }
-
- /**
-@@ -2514,7 +2571,7 @@ gdk_window_get_frame_extents (GdkWindow *window,
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
-
- rect->x = impl->abs_x;
-- rect->y = impl->abs_x;
-+ rect->y = impl->abs_y;
- rect->width = impl->width;
- rect->height = impl->height;
- }
-@@ -2586,7 +2643,7 @@ gdk_window_foreign_new_for_display (GdkDisplay* display,GdkNativeWindow anid)
- GdkWindowImplDirectFB *impl =NULL;
- DFBWindowOptions options;
- DFBResult ret;
-- GdkDisplayDFB * gdkdisplay = _gdk_display;
-+ GdkDisplayDFB * gdkdisplay = _gdk_display_dfb;
- IDirectFBWindow *dfbwindow;
-
- window = gdk_window_lookup (anid);
-@@ -2649,7 +2706,7 @@ gdk_window_foreign_new_for_display (GdkDisplay* display,GdkNativeWindow anid)
- impl->drawable.surface->GetPixelFormat (impl->drawable.surface,
- &impl->drawable.format);
-
-- private->depth = DFB_BITS_PER_PIXEL(impl->drawable.format);
-+ private->depth = GDK_DFB_BITS_PER_PIXEL(impl->drawable.format);
- if( parent )
- gdk_drawable_set_colormap (GDK_DRAWABLE (window), gdk_drawable_get_colormap (parent));
- else
-@@ -2708,48 +2765,44 @@ void
- gdk_window_fullscreen (GdkWindow *window)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-- g_warning ("gdk_window_fullscreen() not implemented.\n");
-+
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_unfullscreen (GdkWindow *window)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-- /* g_warning ("gdk_window_unfullscreen() not implemented.\n");*/
-+
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_set_keep_above (GdkWindow *window, gboolean setting)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-- static gboolean first_call = TRUE;
-- if (first_call) {
-- g_warning ("gdk_window_set_keep_above() not implemented.\n");
-- first_call=FALSE;
-- }
--
-+
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
- {
- g_return_if_fail (GDK_IS_WINDOW (window));
-- static gboolean first_call = TRUE;
-- if (first_call) {
-- g_warning ("gdk_window_set_keep_below() not implemented.\n");
-- first_call=FALSE;
-- }
--
-+
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_enable_synchronized_configure (GdkWindow *window)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
- gdk_window_configure_finished (GdkWindow *window)
- {
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2758,7 +2811,7 @@ gdk_display_warp_pointer (GdkDisplay *display,
- gint x,
- gint y)
- {
-- g_warning ("gdk_display_warp_pointer() not implemented.\n");
-+ D_UNIMPLEMENTED();
- }
-
- void
-@@ -2771,235 +2824,367 @@ gdk_window_set_urgency_hint (GdkWindow *window,
- if (GDK_WINDOW_DESTROYED (window))
- return;
-
-- g_warning ("gdk_window_set_urgency_hint() not implemented.\n");
--
-+ D_UNIMPLEMENTED();
- }
-
- static void
--gdk_window_impl_directfb_invalidate_maybe_recurse (GdkPaintable *paintable,
-- GdkRegion *region,
-- gboolean (*child_func) (GdkWindow *, gpointer),
-- gpointer user_data)
-+gdk_window_impl_directfb_invalidate_maybe_recurse (GdkPaintable *paintable,
-+ GdkRegion *region,
-+ gboolean (*child_func) (GdkWindow *, gpointer),
-+ gpointer user_data)
- {
-- GdkWindow *window;
-- GdkWindowObject *private;
-- GdkWindowImplDirectFB *wimpl;
-- GdkDrawableImplDirectFB *impl;
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB( paintable );
-+ GdkWindow *window = impl->gdkWindow;
-+ GdkWindowObject *private = GDK_WINDOW_OBJECT(window);
-+ DFBRectangle visible_rect;
-
-- wimpl = GDK_WINDOW_IMPL_DIRECTFB (paintable);
-- impl = (GdkDrawableImplDirectFB *)wimpl;
-- window = wimpl->gdkWindow;
-- private = (GdkWindowObject *)window;
-+ D_DEBUG_AT( GDKDFB_Updates, "%s( %p ) --" GDKDFB_WIMPL_FORM "--\n", __FUNCTION__, paintable, GDKDFB_WIMPL_V(impl) );
-
-- GdkRegion *visible_region;
-- GList *tmp_list;
-+ if (GDK_WINDOW_DESTROYED (window))
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> DESTROYED!\n" );
-+ return;
-+ }
-+
-+ if (private->input_only)
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> INPUT ONLY!\n" );
-+ return;
-+ }
-
-- g_return_if_fail (window != NULL);
-- g_return_if_fail (GDK_IS_WINDOW (window));
-+ if (!GDK_WINDOW_IS_MAPPED (window))
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> NOT MAPPED!\n" );
-+ return;
-+ }
-+
-+ /* Get the visible portion of the window */
-+ if (impl->drawable.surface->GetVisibleRectangle( impl->drawable.surface, &visible_rect ) == DFB_OK)
-+ {
-+ GdkRegion clipped_invalidate;
-+
-+ temp_region_init_rectangle_vals( &clipped_invalidate, DFB_RECTANGLE_VALS(&visible_rect) );
-+
-+ gdk_region_intersect( &clipped_invalidate, region );
-+
-+ /* Check if the region to invalidate is visible at all */
-+ if (clipped_invalidate.numRects)
-+ {
-+ /* Iterate through child windows... */
-+ GList *tmp_list = private->children;
-+ while (tmp_list)
-+ {
-+ GdkWindowObject *child = tmp_list->data;
-+
-+ /* Skip destroyed input only windows */
-+ if (!GDK_WINDOW_DESTROYED(child) && !child->input_only)
-+ {
-+ GdkDrawableImplDirectFB *child_impl = (GdkDrawableImplDirectFB *) child->impl;
-+ GdkRegion child_region;
-+
-+ temp_region_init_rectangle_vals( &child_region, child->x, child->y,
-+ child_impl->width, child_impl->height );
-+
-+ /* Remove child area from the region to invalidate if not shaped or composited */
-+ if (GDK_WINDOW_IS_MAPPED (child) && !child->shaped && !child->composited)
-+ gdk_region_subtract( &clipped_invalidate, &child_region );
-+
-+ /* Check for recursive invalidation */
-+ if (child_func && child_func((GdkWindow *)child, user_data))
-+ {
-+ gdk_region_intersect( &child_region, region );
-+
-+ /* Check if child window is affected by invalidation */
-+ if (child_region.numRects)
-+ {
-+ gdk_region_offset( &child_region, - child->x, - child->y );
-+
-+ if (GDK_IS_PAINTABLE (child->impl))
-+ gdk_window_impl_directfb_invalidate_maybe_recurse( (GdkPaintable*)child->impl,
-+ &child_region, child_func, user_data );
-+ else
-+ gdk_window_invalidate_maybe_recurse( (GdkWindow *)child,
-+ &child_region, child_func, user_data );
-+ }
-+ }
-+
-+ temp_region_deinit( &child_region );
-+ }
-+
-+ tmp_list = tmp_list->next;
-+ }
-+
-+ /* Something left to invalidate? */
-+ if (clipped_invalidate.numRects)
-+ gdk_directfb_window_schedule_update( window, &clipped_invalidate );
-+ }
-+
-+ temp_region_deinit( &clipped_invalidate );
-+ }
-+}
-+
-+void
-+gdk_directfb_window_process( GdkWindowImplDirectFB *impl )
-+{
-+ GdkWindow *window = impl->gdkWindow;
-+ GdkWindowObject *private = GDK_WINDOW_OBJECT(window);
-+ GdkRegion *updates = private->update_area;
-+ DFBRectangle visible_rect;
-
-+ D_DEBUG_AT( GDKDFB_Updates, "%s() #####" GDKDFB_WIMPL_FORM "#####\n", __FUNCTION__, GDKDFB_WIMPL_V(impl) );
-+
-+ /* Check if destroyed */
- if (GDK_WINDOW_DESTROYED (window))
-- return;
--
-- if (private->input_only || !GDK_WINDOW_IS_MAPPED (window))
-- return;
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> DESTROYED!\n" );
-+ return;
-+ }
-+
-+ /* Check for updates */
-+ if (!updates)
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> NO UPDATES!\n" );
-+ return;
-+ }
-
-- visible_region = gdk_drawable_get_visible_region (window);
-- gdk_region_intersect (visible_region, region);
-+ D_DEBUG_AT( GDKDFB_Updates, " -> update area " GDKDFB_REGION_FORM "\n", GDKDFB_REGION_V(updates) );
-
-- tmp_list = private->children;
-- while (tmp_list)
-+ /* Check for freeze counter */
-+ if (private->update_freeze_count)
- {
-- GdkWindowObject *child = tmp_list->data;
--
-- if (!child->input_only)
-- {
-- GdkRegion *child_region;
-- GdkRectangle child_rect;
--
-- gdk_window_get_position ((GdkWindow *)child,
-- &child_rect.x, &child_rect.y);
-- gdk_drawable_get_size ((GdkDrawable *)child,
-- &child_rect.width, &child_rect.height);
--
-- child_region = gdk_region_rectangle (&child_rect);
--
-- /* remove child area from the invalid area of the parent */
-- if (GDK_WINDOW_IS_MAPPED (child) && !child->shaped)
-- gdk_region_subtract (visible_region, child_region);
--
-- if (child_func && (*child_func) ((GdkWindow *)child, user_data))
-- {
-- gdk_region_offset (region, - child_rect.x, - child_rect.y);
-- gdk_region_offset (child_region, - child_rect.x, - child_rect.y);
-- gdk_region_intersect (child_region, region);
--
-- gdk_window_invalidate_maybe_recurse ((GdkWindow *)child,
-- child_region, child_func, user_data);
--
-- gdk_region_offset (region, child_rect.x, child_rect.y);
-- }
--
-- gdk_region_destroy (child_region);
-- }
-+ D_DEBUG_AT( GDKDFB_Updates, " -> FROZEN! (%d)\n", private->update_freeze_count );
-+ return;
-+ }
-
-- tmp_list = tmp_list->next;
-+ /* Check for top level freeze counter */
-+ if (gdk_window_is_toplevel_frozen (window))
-+ {
-+ D_DEBUG_AT( GDKDFB_Updates, " -> TOP LEVEL FROZEN! (%d)\n", gdk_window_is_toplevel_frozen (window) );
-+ return;
- }
--
-- if (!gdk_region_empty (visible_region))
-+
-+ /* Check if events should be delivered and get the visible portion of the window */
-+ if (_gdk_event_func && (private->event_mask & GDK_EXPOSURE_MASK) &&
-+ GDK_WINDOW_IS_MAPPED (window) && gdk_window_is_viewable (window) &&
-+ impl->drawable.surface->GetVisibleRectangle( impl->drawable.surface, &visible_rect ) == DFB_OK)
- {
--
-- if (private->update_area)
-- {
-- gdk_region_union (private->update_area, visible_region);
-- }
-- else
-- {
-- update_windows = g_slist_prepend (update_windows, window);
-- private->update_area = gdk_region_copy (visible_region);
-- gdk_window_schedule_update (window);
-- }
-+ GdkRegion clipped_update;
-+
-+ temp_region_init_rectangle_vals( &clipped_update, DFB_RECTANGLE_VALS(&visible_rect) );
-+
-+ gdk_region_intersect( &clipped_update, updates );
-+
-+ updates->numRects = 0;
-+
-+
-+ /* Iterate through child windows... */
-+ GList *tmp_list = private->children;
-+ while (tmp_list)
-+ {
-+ GdkWindowObject *child = tmp_list->data;
-+
-+ /* Remove child area from the region to update if not shaped, composited, destroyed or input only */
-+ if (!GDK_WINDOW_DESTROYED(child) && !child->input_only &&
-+ GDK_WINDOW_IS_MAPPED(child) && !child->composited && !child->shaped)
-+ {
-+ GdkDrawableImplDirectFB *child_impl = (GdkDrawableImplDirectFB *) child->impl;
-+ GdkRegion child_region;
-+
-+ temp_region_init_rectangle_vals( &child_region, child->x, child->y, child_impl->width, child_impl->height );
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " -> clipping out - %4d,%4d-%4dx%4d\n",
-+ GDKDFB_RECTANGLE_VALS_FROM_BOX( &child_region.extents ) );
-+
-+ gdk_region_subtract( &clipped_update, &child_region );
-+
-+ temp_region_deinit( &child_region );
-+ }
-+
-+ tmp_list = tmp_list->next;
-+ }
-+
-+
-+ /* Check if the visible part needs an update */
-+ if (clipped_update.numRects)
-+ {
-+ GdkEvent event;
-+
-+ /* Synthesize expose event */
-+ event.expose.type = GDK_EXPOSE;
-+ event.expose.window = g_object_ref( window );
-+ event.expose.send_event = FALSE;
-+ event.expose.count = 0;
-+ event.expose.region = &clipped_update;
-+ event.expose.area.x = clipped_update.extents.x1;
-+ event.expose.area.y = clipped_update.extents.y1;
-+ event.expose.area.width = clipped_update.extents.x2 - clipped_update.extents.x1;
-+ event.expose.area.height = clipped_update.extents.y2 - clipped_update.extents.y1;
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " => clipped update " GDKDFB_REGION_FORM "\n", GDKDFB_REGION_V(&clipped_update) );
-+
-+ _gdk_event_func( &event, _gdk_event_data );
-+
-+ g_object_unref( window );
-+ }
-+
-+ temp_region_deinit( &clipped_update );
- }
-- gdk_region_destroy (visible_region);
-+ else
-+ updates->numRects = 0;
- }
-
--
- static void
--gdk_window_impl_directfb_process_updates (GdkPaintable *paintable,
-- gboolean update_children)
-+gdk_window_impl_directfb_process_updates_internal (GdkPaintable *paintable,
-+ gboolean update_children)
- {
-- GdkWindow *window;
-- GdkWindowObject *private;
-- GdkWindowImplDirectFB *wimpl;
-- GdkDrawableImplDirectFB *impl;
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB( paintable );
-
-- wimpl = GDK_WINDOW_IMPL_DIRECTFB (paintable);
-- impl = (GdkDrawableImplDirectFB *)wimpl;
-- window = wimpl->gdkWindow;
-- private = (GdkWindowObject *)window;
-- gboolean save_region = FALSE;
-+ D_DEBUG_AT( GDKDFB_Updates, "%s( %p )\n", __FUNCTION__, paintable );
-
-- /* If an update got queued during update processing, we can get a
-- * window in the update queue that has an empty update_area.
-- * just ignore it.
-- */
-- if (private->update_area)
-+ gdk_directfb_window_process( impl );
-+
-+ if (update_children)
- {
-- GdkRegion *update_area = private->update_area;
-- private->update_area = NULL;
--
-- if (_gdk_event_func && gdk_window_is_viewable (window))
-- {
-- GdkRectangle window_rect;
-- GdkRegion *expose_region;
-- GdkRegion *window_region;
-- gint width, height;
-- save_region = _gdk_windowing_window_queue_antiexpose (window, update_area);
--
-- if (save_region)
-- expose_region = gdk_region_copy (update_area);
-- else
-- expose_region = update_area;
--
-- gdk_drawable_get_size (GDK_DRAWABLE (private), &width, &height);
--
-- window_rect.x = 0;
-- window_rect.y = 0;
-- window_rect.width = width;
-- window_rect.height = height;
--
-- window_region = gdk_region_rectangle (&window_rect);
-- gdk_region_intersect (expose_region,
-- window_region);
-- gdk_region_destroy (window_region);
--
-- if (!gdk_region_empty (expose_region) &&
-- (private->event_mask & GDK_EXPOSURE_MASK))
-- {
-- GdkEvent event;
--
-- event.expose.type = GDK_EXPOSE;
-- event.expose.window = g_object_ref (window);
-- event.expose.send_event = FALSE;
-- event.expose.count = 0;
-- event.expose.region = expose_region;
-- gdk_region_get_clipbox (expose_region, &event.expose.area);
-- (*_gdk_event_func) (&event, _gdk_event_data);
--
-- g_object_unref (window);
-- }
--
-- if (expose_region != update_area)
-- gdk_region_destroy (expose_region);
-- }
-- if (!save_region)
-- gdk_region_destroy (update_area);
-+ GdkWindowObject *priv = GDK_WINDOW_OBJECT( impl->gdkWindow );
-+
-+ GList *tmp_list = priv->children;
-+ while (tmp_list)
-+ {
-+ GdkWindowObject *private = (GdkWindowObject *) tmp_list->data;
-+
-+ if (GDK_IS_PAINTABLE (private->impl))
-+ gdk_window_impl_directfb_process_updates_internal( (GdkPaintable*)private->impl, TRUE );
-+ else
-+ gdk_window_process_updates (tmp_list->data, TRUE);
-+
-+ tmp_list = tmp_list->next;
-+ }
- }
- }
-
-+static void
-+gdk_window_impl_directfb_process_updates (GdkPaintable *paintable,
-+ gboolean update_children)
-+{
-+ GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB( paintable );
-+
-+ D_DEBUG_AT( GDKDFB_Updates, "%s( %p, with%s children )\n", __FUNCTION__, paintable, update_children ? "" : "out" );
-+
-+ gdk_window_impl_directfb_process_updates_internal( paintable, update_children );
-+
-+ gdk_directfb_window_flush_flips( impl->gdkWindow );
-+}
-+
-
- static void
- gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable,
-- GdkRegion *region)
-+ GdkRegion *region)
- {
- GdkDrawableImplDirectFB *impl;
-- GdkWindowImplDirectFB *wimpl;
-+ GdkWindowImplDirectFB *wimpl;
- gint i;
-
--
-- g_assert (region != NULL );
- wimpl = GDK_WINDOW_IMPL_DIRECTFB (paintable);
-- impl = (GdkDrawableImplDirectFB *)wimpl;
-- impl->buffered = TRUE;
-- impl->paint_depth++;
-+ impl = (GdkDrawableImplDirectFB *)wimpl;
-
-- if (!region)
-- return;
-+ g_return_if_fail (region != NULL);
-+
-+ D_DEBUG_AT( GDKDFB_Paintable, "%s( %p ) <- [" GDKDFB_WIMPL_FORM "] (%d)\n", __FUNCTION__, paintable,
-+ GDKDFB_WIMPL_V(wimpl), impl->paint_depth );
-+
-+ /* When it's buffered... */
-+ if (impl->buffered)
-+ {
-+ /* ...we're already painting on it! */
-+ g_assert( impl->paint_depth > 0 );
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " -> already " GDKDFB_REGION_FORM "\n", GDKDFB_REGION_V(&impl->paint_region) );
-
-- if (impl->paint_region)
-- gdk_region_union (impl->paint_region, region);
-+ /* Add the new region to the paint region... */
-+ gdk_region_union (&impl->paint_region, region);
-+ }
- else
-- impl->paint_region = gdk_region_copy (region);
-+ {
-+ /* ...otherwise it's the first time! */
-+ g_assert( impl->paint_depth == 0 );
-+
-+ /* Generate the clip region for painting around child windows. */
-+ gdk_directfb_clip_region( GDK_DRAWABLE(paintable), NULL, NULL, &impl->clip_region );
-+
-+ /* Initialize the paint region with the new one... */
-+ temp_region_init_copy( &impl->paint_region, region );
-+
-+ impl->buffered = TRUE;
-+ }
-+
-+ D_DEBUG_AT( GDKDFB_Updates, " -> painting " GDKDFB_REGION_FORM "\n", GDKDFB_REGION_V(&impl->paint_region) );
-+
-+ /* ...but clip the initial/compound result against the clip region. */
-+ gdk_region_intersect (&impl->paint_region, &impl->clip_region);
-
-+ D_DEBUG_AT( GDKDFB_Updates, " -> clipped " GDKDFB_REGION_FORM "\n", GDKDFB_REGION_V(&impl->paint_region) );
-+
-+ impl->paint_depth++;
-+
-+
-+ GdkRegion temp;
-+ memset(&temp,0,sizeof(temp));
-+ temp_region_init_copy( &temp, region );
-+ gdk_region_intersect (&temp, &impl->clip_region);
-+
-+ region = &temp;
- for (i = 0; i < region->numRects; i++)
- {
- GdkRegionBox *box = &region->rects[i];
-
-+ D_DEBUG_AT( GDKDFB_Paintable, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) );
-+
- _gdk_windowing_window_clear_area (GDK_WINDOW(wimpl->gdkWindow),
- box->x1,
- box->y1,
- box->x2 - box->x1,
- box->y2 - box->y1);
--
- }
-+
-+ temp_region_deinit( &temp );
- }
-
- static void
- gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
- {
- GdkDrawableImplDirectFB *impl;
-+ GdkWindowImplDirectFB *wimpl;
-
-- impl = GDK_DRAWABLE_IMPL_DIRECTFB (paintable);
-+ wimpl = GDK_WINDOW_IMPL_DIRECTFB (paintable);
-+ impl = (GdkDrawableImplDirectFB *)wimpl;
-+
-+ D_DEBUG_AT( GDKDFB_Paintable, "%s( %p ) <- [" GDKDFB_WIMPL_FORM "] (%d)\n", __FUNCTION__,
-+ paintable, GDKDFB_WIMPL_V(wimpl), impl->paint_depth );
-
- g_return_if_fail (impl->paint_depth > 0);
-
-+ g_assert( impl->buffered );
-+
- impl->paint_depth--;
-
- if (impl->paint_depth == 0)
- {
-+ GdkWindow *window = GDK_WINDOW( impl->wrapper );
-+
- impl->buffered = FALSE;
-
-- if (impl->paint_region)
-+ temp_region_deinit( &impl->clip_region );
-+
-+ /* Queue or run Flip() on the copied areas */
-+ if (impl->paint_region.numRects)
- {
-- DFBRegion reg = { impl->paint_region->extents.x1,
-- impl->paint_region->extents.y1,
-- impl->paint_region->extents.x2 ,
-- impl->paint_region->extents.y2 };
--
-- impl->surface->Flip(impl->surface, &reg,0);
-- gdk_region_destroy (impl->paint_region);
-- impl->paint_region = NULL;
-+ gdk_directfb_window_flip_region( window, &impl->paint_region );
-+
-+ temp_region_reset( &impl->paint_region );
- }
- }
-+ else
-+ D_DEBUG_AT( GDKDFB_Paintable, " -> depth is still %d\n", impl->paint_depth );
- }
-
-
-@@ -3038,6 +3223,7 @@ gdk_window_set_opacity (GdkWindow *window,
- else if (opacity > 1)
- opacity = 1;
- cardinal = opacity * 0xff;
-+
- gdk_directfb_window_set_opacity(window,cardinal);
- }
-
-@@ -3045,6 +3231,7 @@ void
- _gdk_windowing_window_set_composited (GdkWindow *window,
- gboolean composited)
- {
-+ D_UNIMPLEMENTED();
- }
-
-
-diff --git a/gdk/directfb/gdkwindowid.c b/gdk/directfb/gdkwindowid.c
-index b6ba747..38b6d9f 100644
---- a/gdk/directfb/gdkwindowid.c
-+++ b/gdk/directfb/gdkwindowid.c
-@@ -26,16 +26,20 @@
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
-- * Written by Denis Oliver Kropp <dok@convergence.de> and
-- * Sven Neumann <sven@convergence.de>
-+ * Written by Denis Oliver Kropp <dok@directfb.org> and
-+ * Sven Neumann <sven@directfb.org>
- */
-
--#include "config.h"
-+#include <config.h>
-
- #include "gdkdirectfb.h"
- #include "gdkprivate-directfb.h"
-
-
-+D_DEBUG_DOMAIN( GDKDFB_WinIDTable, "GDKDFB/WinIDTable", "GDK DirectFB Window ID Table" );
-+D_DEBUG_DOMAIN( GDKDFB_WinIDLookup, "GDKDFB/WinIDLookup", "GDK DirectFB Window ID Table Lookups" );
-+
-+
- static GHashTable *window_id_ht = NULL;
-
-
-@@ -43,6 +47,10 @@ void
- gdk_directfb_window_id_table_insert (DFBWindowID dfb_id,
- GdkWindow *window)
- {
-+ g_return_if_fail (GDK_IS_WINDOW (window));
-+
-+ D_DEBUG_AT( GDKDFB_WinIDTable, "%s( %u, %p )\n", __FUNCTION__, dfb_id, window );
-+
- if (!window_id_ht)
- window_id_ht = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-@@ -52,8 +60,10 @@ gdk_directfb_window_id_table_insert (DFBWindowID dfb_id,
- void
- gdk_directfb_window_id_table_remove (DFBWindowID dfb_id)
- {
-- if (window_id_ht)
-- g_hash_table_remove (window_id_ht, GUINT_TO_POINTER (dfb_id));
-+ D_DEBUG_AT( GDKDFB_WinIDTable, "%s( %u )\n", __FUNCTION__, dfb_id );
-+
-+ if (window_id_ht && !g_hash_table_remove (window_id_ht, GUINT_TO_POINTER (dfb_id)))
-+ D_WARN ("no window with id %u found", dfb_id);
- }
-
- GdkWindow *
-@@ -61,9 +71,17 @@ gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id)
- {
- GdkWindow *window = NULL;
-
-+ D_DEBUG_AT( GDKDFB_WinIDLookup, "%s( %u )\n", __FUNCTION__, dfb_id );
-+
- if (window_id_ht)
- window = (GdkWindow *) g_hash_table_lookup (window_id_ht,
- GUINT_TO_POINTER (dfb_id));
-
-+ D_DEBUG_AT( GDKDFB_WinIDLookup, " -> %p\n", window );
-+
-+ if (window)
-+ g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-+
- return window;
- }
-+
diff --git a/patches/gtk+-2.14.7/generic/gtk+-2.14.7-autogen.diff b/patches/gtk+-2.14.7/generic/gtk+-2.14.7-autogen.diff
new file mode 100644
index 000000000..09049415f
--- /dev/null
+++ b/patches/gtk+-2.14.7/generic/gtk+-2.14.7-autogen.diff
@@ -0,0 +1,191 @@
+Only in gtk+-2.14.7: autom4te.cache
+diff -ur gtk+-2.14.7-orig/configure gtk+-2.14.7/configure
+--- gtk+-2.14.7-orig/configure 2009-01-07 22:52:17.000000000 +0100
++++ gtk+-2.14.7/configure 2009-03-03 00:06:38.000000000 +0100
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.63 for gtk+ 2.14.7.
++# Generated by GNU Autoconf 2.63 for gtk+ 2.14.8.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
+ #
+@@ -750,8 +750,8 @@
+ # Identity of this package.
+ PACKAGE_NAME='gtk+'
+ PACKAGE_TARNAME='gtk+'
+-PACKAGE_VERSION='2.14.7'
+-PACKAGE_STRING='gtk+ 2.14.7'
++PACKAGE_VERSION='2.14.8'
++PACKAGE_STRING='gtk+ 2.14.8'
+ PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B'
+
+ ac_unique_file="gdk/gdktypes.h"
+@@ -1739,7 +1739,7 @@
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
+-\`configure' configures gtk+ 2.14.7 to adapt to many kinds of systems.
++\`configure' configures gtk+ 2.14.8 to adapt to many kinds of systems.
+
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+
+@@ -1813,7 +1813,7 @@
+
+ if test -n "$ac_init_help"; then
+ case $ac_init_help in
+- short | recursive ) echo "Configuration of gtk+ 2.14.7:";;
++ short | recursive ) echo "Configuration of gtk+ 2.14.8:";;
+ esac
+ cat <<\_ACEOF
+
+@@ -1962,7 +1962,7 @@
+ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
+-gtk+ configure 2.14.7
++gtk+ configure 2.14.8
+ generated by GNU Autoconf 2.63
+
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+@@ -1976,7 +1976,7 @@
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+
+-It was created by gtk+ $as_me 2.14.7, which was
++It was created by gtk+ $as_me 2.14.8, which was
+ generated by GNU Autoconf 2.63. Invocation command line was
+
+ $ $0 $@
+@@ -2646,7 +2646,7 @@
+
+ # Define the identity of the package.
+ PACKAGE='gtk+'
+- VERSION='2.14.7'
++ VERSION='2.14.8'
+
+
+ # Some tools Automake needs.
+@@ -2792,10 +2792,10 @@
+
+ GTK_MAJOR_VERSION=2
+ GTK_MINOR_VERSION=14
+-GTK_MICRO_VERSION=7
+-GTK_INTERFACE_AGE=7
+-GTK_BINARY_AGE=1407
+-GTK_VERSION=2.14.7
++GTK_MICRO_VERSION=8
++GTK_INTERFACE_AGE=8
++GTK_BINARY_AGE=1408
++GTK_VERSION=2.14.8
+ GTK_API_VERSION=2.0
+ GTK_BINARY_VERSION=2.10.0
+
+@@ -2817,7 +2817,7 @@
+
+
+
+-LT_VERSION_INFO="1400:7:1400"
++LT_VERSION_INFO="1400:8:1400"
+ LT_CURRENT_MINUS_AGE=0
+
+
+@@ -2838,7 +2838,7 @@
+ #
+ GDK_PIXBUF_MAJOR=2
+ GDK_PIXBUF_MINOR=14
+-GDK_PIXBUF_MICRO=7
++GDK_PIXBUF_MICRO=8
+ GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
+
+
+@@ -33913,7 +33913,7 @@
+
+
+ if test "x$gdktarget" = "xdirectfb"; then
+- DIRECTFB_REQUIRED_VERSION=0.9.24
++ DIRECTFB_REQUIRED_VERSION=1.0.0
+ { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5
+ $as_echo_n "checking for DirectFB... " >&6; }
+
+@@ -36616,7 +36616,7 @@
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+-This file was extended by gtk+ $as_me 2.14.7, which was
++This file was extended by gtk+ $as_me 2.14.8, which was
+ generated by GNU Autoconf 2.63. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+@@ -36679,7 +36679,7 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_version="\\
+-gtk+ config.status 2.14.7
++gtk+ config.status 2.14.8
+ configured by $0, generated by GNU Autoconf 2.63,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+diff -ur gtk+-2.14.7-orig/gdk/Makefile.in gtk+-2.14.7/gdk/Makefile.in
+--- gtk+-2.14.7-orig/gdk/Makefile.in 2009-01-07 22:52:06.000000000 +0100
++++ gtk+-2.14.7/gdk/Makefile.in 2009-03-03 00:10:22.000000000 +0100
+@@ -389,6 +389,7 @@
+ gdk.def \
+ gdkmarshalers.list \
+ gdkmedialib.h \
++ gdkwindowimpl.h \
+ makeenums.pl \
+ makefile.msc \
+ gdk.symbols \
+@@ -502,8 +503,6 @@
+
+
+ gdk_built_private_headers = \
+- gdkprivate.h \
+- gdkwindowimpl.h \
+ gdkalias.h
+
+
+diff -ur gtk+-2.14.7-orig/modules/other/gail/libgail-util/Makefile.in gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in
+--- gtk+-2.14.7-orig/modules/other/gail/libgail-util/Makefile.in 2009-01-07 22:52:12.000000000 +0100
++++ gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in 2009-03-03 00:10:25.000000000 +0100
+@@ -406,7 +406,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-@OS_WIN32_TRUE@export_symbols = -export-symbols gailutil.def
++@OS_WIN32_TRUE@export_symbols = -export-symbols $(srcdir)/gailutil.def
+ @OS_WIN32_TRUE@no_undefined = -no-undefined
+
+ @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gailutil.lib
+@@ -908,12 +908,12 @@
+ .PHONY: test test-report perf-report full-report
+ # run make test as part of make check
+ check-local: test
+-@OS_WIN32_TRUE@install-libtool-import-lib:
+-@OS_WIN32_TRUE@ $(INSTALL) .libs/libgailutil.dll.a $(DESTDIR)$(libdir)
+-@OS_WIN32_TRUE@uninstall-libtool-import-lib:
+-@OS_WIN32_TRUE@ -rm $(DESTDIR)$(libdir)/libgailutil.dll.a
+-@OS_WIN32_FALSE@install-libtool-import-lib:
+-@OS_WIN32_FALSE@uninstall-libtool-import-lib:
++@OS_WIN32_TRUE@install-def-file: gailutil.def
++@OS_WIN32_TRUE@ $(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir)
++@OS_WIN32_TRUE@uninstall-def-file:
++@OS_WIN32_TRUE@ -rm $(DESTDIR)$(libdir)/gailutil.def
++@OS_WIN32_FALSE@install-def-file:
++@OS_WIN32_FALSE@uninstall-def-file:
+
+ @MS_LIB_AVAILABLE_TRUE@install-ms-lib:
+ @MS_LIB_AVAILABLE_TRUE@ $(INSTALL) gailutil.lib $(DESTDIR)$(libdir)
+@@ -926,9 +926,9 @@
+ gailutil.lib: libgailutil.la gailutil.def
+ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
+
+-install-data-local: install-ms-lib install-libtool-import-lib
++install-data-local: install-ms-lib install-def-file
+
+-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
++uninstall-local: uninstall-ms-lib uninstall-def-file
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/patches/gtk+-2.14.7/generic/gtk+-2.14.7-update-to-r22400.diff b/patches/gtk+-2.14.7/generic/gtk+-2.14.7-update-to-r22400.diff
new file mode 100644
index 000000000..c932d2c41
--- /dev/null
+++ b/patches/gtk+-2.14.7/generic/gtk+-2.14.7-update-to-r22400.diff
@@ -0,0 +1,39550 @@
+Index: gtk/gtktextview.c
+===================================================================
+--- gtk/gtktextview.c (revision 22076)
++++ gtk/gtktextview.c (revision 22450)
+@@ -1465,7 +1465,7 @@
+ * gtk_text_view_get_iter_at_position:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+- * @trailing: location to store an integer indicating where
++ * @trailing: if non-%NULL, location to store an integer indicating where
+ * in the grapheme the user clicked. It will either be
+ * zero, or the number of characters in the grapheme.
+ * 0 represents the trailing edge of the grapheme.
+Index: gtk/gtktextlayout.c
+===================================================================
+--- gtk/gtktextlayout.c (revision 22076)
++++ gtk/gtktextlayout.c (revision 22450)
+@@ -2654,7 +2654,8 @@
+ if (y > display->height - display->top_margin - display->bottom_margin)
+ {
+ byte_index = _gtk_text_line_byte_count (line);
+- *trailing = 0;
++ if (trailing)
++ *trailing = 0;
+ }
+ else
+ {
+Index: gtk/gtktreeview.c
+===================================================================
+--- gtk/gtktreeview.c (revision 22076)
++++ gtk/gtktreeview.c (revision 22450)
+@@ -640,7 +640,7 @@
+ PROP_SEARCH_COLUMN,
+ g_param_spec_int ("search-column",
+ P_("Search Column"),
+- P_("Model column to search through when searching through code"),
++ P_("Model column to search through during interactive search"),
+ -1,
+ G_MAXINT,
+ -1,
+@@ -13353,7 +13353,7 @@
+ * widget
+ *
+ * Turns @tree_view into a drag source for automatic DND. Calling this
+- * method sets reorderable to %FALSE.
++ * method sets #GtkTreeView:reorderable to %FALSE.
+ **/
+ void
+ gtk_tree_view_enable_model_drag_source (GtkTreeView *tree_view,
+@@ -13390,7 +13390,7 @@
+ * widget
+ *
+ * Turns @tree_view into a drop destination for automatic DND. Calling
+- * this method sets reorderable to %FALSE.
++ * this method sets #GtkTreeView:reorderable to %FALSE.
+ **/
+ void
+ gtk_tree_view_enable_model_drag_dest (GtkTreeView *tree_view,
+@@ -13420,7 +13420,7 @@
+ *
+ * Undoes the effect of
+ * gtk_tree_view_enable_model_drag_source(). Calling this method sets
+- * reorderable to %FALSE.
++ * #GtkTreeView:reorderable to %FALSE.
+ **/
+ void
+ gtk_tree_view_unset_rows_drag_source (GtkTreeView *tree_view)
+@@ -13452,7 +13452,7 @@
+ *
+ * Undoes the effect of
+ * gtk_tree_view_enable_model_drag_dest(). Calling this method sets
+- * reorderable to %FALSE.
++ * #GtkTreeView:reorderable to %FALSE.
+ **/
+ void
+ gtk_tree_view_unset_rows_drag_dest (GtkTreeView *tree_view)
+Index: gtk/gtkiconview.c
+===================================================================
+--- gtk/gtkiconview.c (revision 22076)
++++ gtk/gtkiconview.c (revision 22450)
+@@ -6898,9 +6898,10 @@
+ * @n_targets: the number of items in @targets
+ * @actions: the bitmask of possible actions for a drag from this
+ * widget
+- *
+- * Turns @icon_view into a drag source for automatic DND.
+ *
++ * Turns @icon_view into a drag source for automatic DND. Calling this
++ * method sets #GtkIconView:reorderable to %FALSE.
++ *
+ * Since: 2.8
+ **/
+ void
+@@ -6931,9 +6932,10 @@
+ * @n_targets: the number of items in @targets
+ * @actions: the bitmask of possible actions for a drag to this
+ * widget
+- *
+- * Turns @icon_view into a drop destination for automatic DND.
+ *
++ * Turns @icon_view into a drop destination for automatic DND. Calling this
++ * method sets #GtkIconView:reorderable to %FALSE.
++ *
+ * Since: 2.8
+ **/
+ void
+@@ -6960,7 +6962,8 @@
+ * gtk_icon_view_unset_model_drag_source:
+ * @icon_view: a #GtkIconView
+ *
+- * Undoes the effect of gtk_icon_view_enable_model_drag_source().
++ * Undoes the effect of gtk_icon_view_enable_model_drag_source(). Calling this
++ * method sets #GtkIconView:reorderable to %FALSE.
+ *
+ * Since: 2.8
+ **/
+@@ -6982,7 +6985,8 @@
+ * gtk_icon_view_unset_model_drag_dest:
+ * @icon_view: a #GtkIconView
+ *
+- * Undoes the effect of gtk_icon_view_enable_model_drag_dest().
++ * Undoes the effect of gtk_icon_view_enable_model_drag_dest(). Calling this
++ * method sets #GtkIconView:reorderable to %FALSE.
+ *
+ * Since: 2.8
+ **/
+@@ -7260,7 +7264,9 @@
+ * #GtkTreeStore and #GtkListStore support these. If @reorderable is %TRUE, then
+ * the user can reorder the model by dragging and dropping rows. The
+ * developer can listen to these changes by connecting to the model's
+- * row_inserted and row_deleted signals.
++ * row_inserted and row_deleted signals. The reordering is implemented by setting up
++ * the icon view as a drag source and destination. Therefore, drag and
++ * drop can not be used in a reorderable view for any other purpose.
+ *
+ * This function does not give you any degree of control over the order -- any
+ * reordering is allowed. If more control is needed, you should probably
+Index: gtk/gtkmain.c
+===================================================================
+--- gtk/gtkmain.c (revision 22076)
++++ gtk/gtkmain.c (revision 22450)
+@@ -89,6 +89,24 @@
+ * original GTK_LOCALEDIR definition. Yeah, this is a bit sucky.
+ */
+ const gchar *
++_gtk_get_libdir (void)
++{
++ static char *gtk_libdir = NULL;
++ if (gtk_libdir == NULL)
++ {
++ gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll);
++ gchar *slash = strrchr (root, '\\');
++ if (g_ascii_strcasecmp (slash + 1, ".libs") == 0)
++ gtk_libdir = GTK_LIBDIR;
++ else
++ gtk_libdir = g_build_filename (root, "lib", NULL);
++ g_free (root);
++ }
++
++ return gtk_libdir;
++}
++
++const gchar *
+ _gtk_get_localedir (void)
+ {
+ static char *gtk_localedir = NULL;
+@@ -333,20 +351,6 @@
+ }
+
+ const gchar *
+-_gtk_get_libdir (void)
+-{
+- static char *gtk_libdir = NULL;
+- if (gtk_libdir == NULL)
+- {
+- gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll);
+- gtk_libdir = g_build_filename (root, "lib", NULL);
+- g_free (root);
+- }
+-
+- return gtk_libdir;
+-}
+-
+-const gchar *
+ _gtk_get_sysconfdir (void)
+ {
+ static char *gtk_sysconfdir = NULL;
+Index: gtk/gtkimcontextsimple.c
+===================================================================
+--- gtk/gtkimcontextsimple.c (revision 22076)
++++ gtk/gtkimcontextsimple.c (revision 22450)
+@@ -270,7 +270,73 @@
+ return FALSE;
+ }
+
++/* Checks if a keysym is a dead key. Dead key keysym values are defined in
++ * ../gdk/gdkkeysyms.h and the first is GDK_dead_grave. As X.Org is updated,
++ * more dead keys are added and we need to update the upper limit.
++ * Currently, the upper limit is GDK_dead_dasia+1. The +1 has to do with
++ * a temporary issue in the X.Org header files.
++ * In future versions it will be just the keysym (no +1).
++ */
++#define IS_DEAD_KEY(k) \
++ ((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1))
++
++#ifdef GDK_WINDOWING_WIN32
++
++/* On Windows, user expectation is that typing a dead accent followed
++ * by space will input the corresponding spacing character. The X
++ * compose tables are different for dead acute and diaeresis, which
++ * when followed by space produce a plain ASCII apostrophe and double
++ * quote respectively. So special-case those.
++ */
++
+ static gboolean
++check_win32_special_cases (GtkIMContextSimple *context_simple,
++ gint n_compose)
++{
++ if (n_compose == 2 &&
++ context_simple->compose_buffer[1] == GDK_space)
++ {
++ gunichar value = 0;
++
++ switch (context_simple->compose_buffer[0])
++ {
++ case GDK_dead_acute:
++ value = 0x00B4; break;
++ case GDK_dead_diaeresis:
++ value = 0x00A8; break;
++ }
++ if (value > 0)
++ {
++ gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple), value);
++ context_simple->compose_buffer[0] = 0;
++
++ GTK_NOTE (MISC, g_print ("win32: U+%04X\n", value));
++ return TRUE;
++ }
++ }
++ return FALSE;
++}
++
++static void
++check_win32_special_case_after_compact_match (GtkIMContextSimple *context_simple,
++ gint n_compose,
++ guint value)
++{
++ /* On Windows user expectation is that typing two dead accents will input
++ * two corresponding spacing accents.
++ */
++ if (n_compose == 2 &&
++ context_simple->compose_buffer[0] == context_simple->compose_buffer[1] &&
++ IS_DEAD_KEY (context_simple->compose_buffer[0]))
++ {
++ gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple), value);
++ GTK_NOTE (MISC, g_print ("win32: U+%04X ", value));
++ }
++}
++
++#endif
++
++static gboolean
+ check_compact_table (GtkIMContextSimple *context_simple,
+ const GtkComposeTableCompact *table,
+ gint n_compose)
+@@ -292,11 +358,18 @@
+ compare_seq_index);
+
+ if (!seq_index)
+- return FALSE;
++ {
++ GTK_NOTE (MISC, g_print ("compact: no\n"));
++ return FALSE;
++ }
+
+ if (seq_index && n_compose == 1)
+- return TRUE;
++ {
++ GTK_NOTE (MISC, g_print ("compact: yes\n"));
++ return TRUE;
++ }
+
++ GTK_NOTE (MISC, g_print ("compact: %d ", *seq_index));
+ seq = NULL;
+
+ for (i = n_compose-1; i < table->max_seq_len; i++)
+@@ -317,6 +390,8 @@
+ else
+ {
+ g_signal_emit_by_name (context_simple, "preedit-changed");
++
++ GTK_NOTE (MISC, g_print ("yes\n"));
+ return TRUE;
+ }
+ }
+@@ -324,19 +399,27 @@
+ }
+
+ if (!seq)
+- return FALSE;
++ {
++ GTK_NOTE (MISC, g_print ("no\n"));
++ return FALSE;
++ }
+ else
+ {
+ gunichar value;
+
+ value = seq[row_stride - 1];
+-
++
+ gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple), value);
++#ifdef G_OS_WIN32
++ check_win32_special_case_after_compact_match (context_simple, n_compose, value);
++#endif
+ context_simple->compose_buffer[0] = 0;
+
++ GTK_NOTE (MISC, g_print ("U+%04X\n", value));
+ return TRUE;
+ }
+
++ GTK_NOTE (MISC, g_print ("no\n"));
+ return FALSE;
+ }
+
+@@ -407,16 +490,6 @@
+ return FALSE;
+ }
+
+-/* Checks if a keysym is a dead key. Dead key keysym values are defined in
+- * ../gdk/gdkkeysyms.h and the first is GDK_dead_grave. As X.Org is updated,
+- * more dead keys are added and we need to update the upper limit.
+- * Currently, the upper limit is GDK_dead_dasia+1. The +1 has to do with
+- * a temporary issue in the X.Org header files.
+- * In future versions it will be just the keysym (no +1).
+- */
+-#define IS_DEAD_KEY(k) \
+- ((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1))
+-
+ static gboolean
+ check_algorithmically (GtkIMContextSimple *context_simple,
+ gint n_compose)
+@@ -930,6 +1003,25 @@
+ tmp_list = tmp_list->next;
+ }
+
++ GTK_NOTE (MISC, {
++ g_print ("[ ");
++ for (i = 0; i < n_compose; i++)
++ {
++ const gchar *keyval_name = gdk_keyval_name (context_simple->compose_buffer[i]);
++
++ if (keyval_name != NULL)
++ g_print ("%s ", keyval_name);
++ else
++ g_print ("%04x ", context_simple->compose_buffer[i]);
++ }
++ g_print ("] ");
++ });
++
++#ifdef GDK_WINDOWING_WIN32
++ if (check_win32_special_cases (context_simple, n_compose))
++ return TRUE;
++#endif
++
+ if (check_compact_table (context_simple, &gtk_compose_table_compact, n_compose))
+ return TRUE;
+
+Index: gdk-pixbuf/ChangeLog
+===================================================================
+--- gdk-pixbuf/ChangeLog (revision 22076)
++++ gdk-pixbuf/ChangeLog (revision 22450)
+@@ -1,3 +1,27 @@
++2009-01-19 Tor Lillqvist <tml@iki.fi>
++
++ Bug 568305 - gdk-pixbuf mishandles BI_BITFIELDS bmps
++
++ * io-bmp.c (OneLine32): Use unsigned variables so that we can
++ right-shift them without risk of sign extension. Don't "reverse"
++ the alpha value, actually storing 0xFF-alpha, but use it as such.
++
++2009-01-12 Tor Lillqvist <tml@iki.fi>
++
++ Bug 164002 - query scripts don't work uninstalled on windows
++
++ * queryloaders.c (main): Use the configure-time PIXBUF_LIBDIR if
++ the exe is located in a .libs folder, i.e. run in the build
++ directory through a libtool wrapper script or wrapper executable,
++ or in the source folder itself. Otherwise continue to infer the
++ runtime prefix from the exe's location.
++
++2009-01-12 Tor Lillqvist <tml@iki.fi>
++
++ * queryloaders.c (main): Remove the Win9x code path. It had been
++ left by mistake. Win9x code is gone from the rest of GTK+ since
++ 2.12.
++
+ 2009-01-07 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.14.7 ===
+Index: gdk-pixbuf/io-bmp.c
+===================================================================
+--- gdk-pixbuf/io-bmp.c (revision 22076)
++++ gdk-pixbuf/io-bmp.c (revision 22450)
+@@ -762,7 +762,7 @@
+ a_rshift = context->a_bits - a_lshift;
+
+ for (i = 0; i < context->Header.width; i++) {
+- int v, r, g, b, a;
++ unsigned int v, r, g, b, a;
+
+ v = src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
+
+@@ -775,7 +775,7 @@
+ *pixels++ = (g << g_lshift) | (g >> g_rshift);
+ *pixels++ = (b << b_lshift) | (b >> b_rshift);
+ if (context->a_bits)
+- *pixels++ = 0xff - ((a << a_lshift) | (a >> a_rshift));
++ *pixels++ = (a << a_lshift) | (a >> a_rshift);
+ else
+ *pixels++ = 0xff;
+
+Index: gdk-pixbuf/gdk-pixbuf-io.c
+===================================================================
+--- gdk-pixbuf/gdk-pixbuf-io.c (revision 22076)
++++ gdk-pixbuf/gdk-pixbuf-io.c (revision 22450)
+@@ -2406,13 +2406,10 @@
+ data.stream = stream;
+ data.cancellable = cancellable;
+
+- if (!gdk_pixbuf_save_to_callbackv (pixbuf, save_to_stream,
+- &data, type,
+- keys, values,
+- error)) {
+- error = NULL; /* Ignore further errors */
+- res = FALSE;
+- }
++ res = gdk_pixbuf_save_to_callbackv (pixbuf, save_to_stream,
++ &data, type,
++ keys, values,
++ error);
+
+ g_strfreev (keys);
+ g_strfreev (values);
+Index: gdk-pixbuf/queryloaders.c
+===================================================================
+--- gdk-pixbuf/queryloaders.c (revision 22076)
++++ gdk-pixbuf/queryloaders.c (revision 22450)
+@@ -230,27 +230,33 @@
+ * subdirectory of the installation directory, or in
+ * the installation directory itself.
+ */
+- if (G_WIN32_HAVE_WIDECHAR_API ()) {
+- wchar_t fn[1000];
+- GetModuleFileNameW (NULL, fn, G_N_ELEMENTS (fn));
+- runtime_prefix = g_utf16_to_utf8 (fn, -1, NULL, NULL, NULL);
+- }
+- else {
+- char fn[1000];
+- GetModuleFileNameA (NULL, fn, G_N_ELEMENTS (fn));
+- runtime_prefix = g_locale_to_utf8 (fn, -1, NULL, NULL, NULL);
+- }
++ wchar_t fn[1000];
++ GetModuleFileNameW (NULL, fn, G_N_ELEMENTS (fn));
++ runtime_prefix = g_utf16_to_utf8 (fn, -1, NULL, NULL, NULL);
+ slash = strrchr (runtime_prefix, '\\');
+ *slash = '\0';
+ slash = strrchr (runtime_prefix, '\\');
+- if (slash != NULL && g_ascii_strcasecmp (slash + 1, "bin") == 0) {
+- *slash = '\0';
++ /* If running from some weird location, or from the
++ * build directory (either in the .libs folder where
++ * libtool places the real executable when using a
++ * wrapper, or directly from the gdk-pixbuf folder),
++ * use the compile-time libdir.
++ */
++ if (slash == NULL ||
++ g_ascii_strcasecmp (slash + 1, ".libs") == 0 ||
++ g_ascii_strcasecmp (slash + 1, "gdk-pixbuf") == 0) {
++ libdir = PIXBUF_LIBDIR;
+ }
++ else {
++ if (slash != NULL && g_ascii_strcasecmp (slash + 1, "bin") == 0) {
++ *slash = '\0';
++ }
+
+- libdir = g_strconcat (runtime_prefix,
+- "/",
+- PIXBUF_LIBDIR + strlen (GTK_PREFIX) + 1,
+- NULL);
++ libdir = g_strconcat (runtime_prefix,
++ "/",
++ PIXBUF_LIBDIR + strlen (GTK_PREFIX) + 1,
++ NULL);
++ }
+ }
+ else {
+ libdir = PIXBUF_LIBDIR;
+Index: po-properties/es.po
+===================================================================
+--- po-properties/es.po (revision 22076)
++++ po-properties/es.po (revision 22450)
+@@ -10,13 +10,14 @@
+ # Pablo Gonzalo del Campo <pablodc@bigfoot.com>, 2002-2003.
+ # Juan Manuel García Molina <juanma_gm@wanadoo.es>, 2003.
+ # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003 - 2006.
+-# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008.
++# Jorge González <jorgegonz@svn.gnome.org>, 2007, 200, 2009.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gtk+-properties.HEAD\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-01-07 12:13-0500\n"
+-"PO-Revision-Date: 2008-08-17 23:46+0200\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
++"+&component=general\n"
++"POT-Creation-Date: 2009-01-26 09:07+0000\n"
++"PO-Revision-Date: 2009-01-27 08:14+0100\n"
+ "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
+ "Language-Team: Español <gnome-es-list@gnome.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -25,110 +26,112 @@
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ "X-Generator: KBabel 1.11.4\n"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:89
++#: ../gdk-pixbuf/gdk-pixbuf.c:89
+ msgid "Number of Channels"
+ msgstr "Número de canales"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:90
++#: ../gdk-pixbuf/gdk-pixbuf.c:90
+ msgid "The number of samples per pixel"
+ msgstr "El número de muestras por píxel"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:99
++#: ../gdk-pixbuf/gdk-pixbuf.c:99
+ msgid "Colorspace"
+ msgstr "Espacio de color"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:100
++#: ../gdk-pixbuf/gdk-pixbuf.c:100
+ msgid "The colorspace in which the samples are interpreted"
+ msgstr "El espacio de color en el que se interpretan las muestras"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:108
++#: ../gdk-pixbuf/gdk-pixbuf.c:108
+ msgid "Has Alpha"
+ msgstr "Tiene alfa"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:109
++#: ../gdk-pixbuf/gdk-pixbuf.c:109
+ msgid "Whether the pixbuf has an alpha channel"
+ msgstr "Indica si el búfer de píxeles tiene un canal alfa"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:122
++#: ../gdk-pixbuf/gdk-pixbuf.c:122
+ msgid "Bits per Sample"
+ msgstr "Bits por muestra"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:123
++#: ../gdk-pixbuf/gdk-pixbuf.c:123
+ msgid "The number of bits per sample"
+ msgstr "El número de bits por muestra"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:132 gtk/gtklayout.c:632 gtk/gtktreeviewcolumn.c:207
++#: ../gdk-pixbuf/gdk-pixbuf.c:132 ../gtk/gtklayout.c:632
++#: ../gtk/gtktreeviewcolumn.c:207
+ msgid "Width"
+ msgstr "Anchura"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:133
++#: ../gdk-pixbuf/gdk-pixbuf.c:133
+ msgid "The number of columns of the pixbuf"
+ msgstr "El número de columnas del búfer de imagen"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:142 gtk/gtklayout.c:641
++#: ../gdk-pixbuf/gdk-pixbuf.c:142 ../gtk/gtklayout.c:641
+ msgid "Height"
+ msgstr "Altura"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:143
++#: ../gdk-pixbuf/gdk-pixbuf.c:143
+ msgid "The number of rows of the pixbuf"
+ msgstr "El número de filas del búfer de imagen"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:159
++#: ../gdk-pixbuf/gdk-pixbuf.c:159
+ msgid "Rowstride"
+ msgstr "Separación entre filas"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:160
++#: ../gdk-pixbuf/gdk-pixbuf.c:160
+ msgid ""
+ "The number of bytes between the start of a row and the start of the next row"
+ msgstr ""
+ "Número de bytes entre el inicio de una fila y el inicio de la siguiente fila"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:169
++#: ../gdk-pixbuf/gdk-pixbuf.c:169
+ msgid "Pixels"
+ msgstr "Píxeles"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:170
++#: ../gdk-pixbuf/gdk-pixbuf.c:170
+ msgid "A pointer to the pixel data of the pixbuf"
+ msgstr "Un puntero al dato de píxel del búfer de píxeles"
+
+-#: gdk/gdkdisplaymanager.c:103
++#: ../gdk/gdkdisplaymanager.c:103
+ msgid "Default Display"
+ msgstr "Visor predeterminado"
+
+-#: gdk/gdkdisplaymanager.c:104
++#: ../gdk/gdkdisplaymanager.c:104
+ msgid "The default display for GDK"
+ msgstr "El visor predeterminado para GDK"
+
+-#: gdk/gdkpango.c:490 gtk/gtkinvisible.c:86 gtk/gtkmountoperation.c:176
+-#: gtk/gtkstatusicon.c:253 gtk/gtkwindow.c:600
++#: ../gdk/gdkpango.c:490 ../gtk/gtkinvisible.c:86
++#: ../gtk/gtkmountoperation.c:176 ../gtk/gtkstatusicon.c:253
++#: ../gtk/gtkwindow.c:600
+ msgid "Screen"
+ msgstr "Pantalla"
+
+-#: gdk/gdkpango.c:491
++#: ../gdk/gdkpango.c:491
+ msgid "the GdkScreen for the renderer"
+ msgstr "El GdkScreen para el renderizador"
+
+-#: gdk/gdkscreen.c:75
++#: ../gdk/gdkscreen.c:75
+ msgid "Font options"
+ msgstr "Opciones de la tipografía"
+
+-#: gdk/gdkscreen.c:76
++#: ../gdk/gdkscreen.c:76
+ msgid "The default font options for the screen"
+ msgstr "Las opciones predeterminadas de la tipografía para la pantalla"
+
+-#: gdk/gdkscreen.c:83
++#: ../gdk/gdkscreen.c:83
+ msgid "Font resolution"
+ msgstr "Resolución de la tipografía"
+
+-#: gdk/gdkscreen.c:84
++#: ../gdk/gdkscreen.c:84
+ msgid "The resolution for fonts on the screen"
+ msgstr "La resolución para las tipografías en la pantalla"
+
+-#: gtk/gtkaboutdialog.c:200
++#: ../gtk/gtkaboutdialog.c:200
+ msgid "Program name"
+ msgstr "Nombre del programa"
+
+-#: gtk/gtkaboutdialog.c:201
++#: ../gtk/gtkaboutdialog.c:201
+ msgid ""
+ "The name of the program. If this is not set, it defaults to "
+ "g_get_application_name()"
+@@ -136,43 +139,43 @@
+ "El nombre del programa. Si no estuviese establecido, se usará por omisión "
+ "g_get_application_name()"
+
+-#: gtk/gtkaboutdialog.c:215
++#: ../gtk/gtkaboutdialog.c:215
+ msgid "Program version"
+ msgstr "Versión del programa"
+
+-#: gtk/gtkaboutdialog.c:216
++#: ../gtk/gtkaboutdialog.c:216
+ msgid "The version of the program"
+ msgstr "La versión del programa"
+
+-#: gtk/gtkaboutdialog.c:230
++#: ../gtk/gtkaboutdialog.c:230
+ msgid "Copyright string"
+ msgstr "Cadena del copyright"
+
+-#: gtk/gtkaboutdialog.c:231
++#: ../gtk/gtkaboutdialog.c:231
+ msgid "Copyright information for the program"
+ msgstr "Información de copyright del programa"
+
+-#: gtk/gtkaboutdialog.c:248
++#: ../gtk/gtkaboutdialog.c:248
+ msgid "Comments string"
+ msgstr "Cadena de comentarios"
+
+-#: gtk/gtkaboutdialog.c:249
++#: ../gtk/gtkaboutdialog.c:249
+ msgid "Comments about the program"
+ msgstr "Comentarios acerca del programa"
+
+-#: gtk/gtkaboutdialog.c:283
++#: ../gtk/gtkaboutdialog.c:283
+ msgid "Website URL"
+ msgstr "URL del sitio web"
+
+-#: gtk/gtkaboutdialog.c:284
++#: ../gtk/gtkaboutdialog.c:284
+ msgid "The URL for the link to the website of the program"
+ msgstr "La URL para el enlace al sitio web del programa"
+
+-#: gtk/gtkaboutdialog.c:300
++#: ../gtk/gtkaboutdialog.c:300
+ msgid "Website label"
+ msgstr "Etiqueta del sitio web"
+
+-#: gtk/gtkaboutdialog.c:301
++#: ../gtk/gtkaboutdialog.c:301
+ msgid ""
+ "The label for the link to the website of the program. If this is not set, it "
+ "defaults to the URL"
+@@ -180,45 +183,45 @@
+ "La etiqueta para el enlace al sitio web del programa. Si no está "
+ "establecida, se usará la URL de forma predeterminada"
+
+-#: gtk/gtkaboutdialog.c:317
++#: ../gtk/gtkaboutdialog.c:317
+ msgid "Authors"
+ msgstr "Autores"
+
+-#: gtk/gtkaboutdialog.c:318
++#: ../gtk/gtkaboutdialog.c:318
+ msgid "List of authors of the program"
+ msgstr "Lista de autores del programa"
+
+-#: gtk/gtkaboutdialog.c:334
++#: ../gtk/gtkaboutdialog.c:334
+ msgid "Documenters"
+ msgstr "Documentadores"
+
+-#: gtk/gtkaboutdialog.c:335
++#: ../gtk/gtkaboutdialog.c:335
+ msgid "List of people documenting the program"
+ msgstr "Lista de gente documentando el programa"
+
+-#: gtk/gtkaboutdialog.c:351
++#: ../gtk/gtkaboutdialog.c:351
+ msgid "Artists"
+ msgstr "Artistas"
+
+-#: gtk/gtkaboutdialog.c:352
++#: ../gtk/gtkaboutdialog.c:352
+ msgid "List of people who have contributed artwork to the program"
+ msgstr "Lista de gente que ha contribuido con trabajo artístico al programa"
+
+-#: gtk/gtkaboutdialog.c:369
++#: ../gtk/gtkaboutdialog.c:369
+ msgid "Translator credits"
+ msgstr "Créditos de traducción"
+
+-#: gtk/gtkaboutdialog.c:370
++#: ../gtk/gtkaboutdialog.c:370
+ msgid ""
+ "Credits to the translators. This string should be marked as translatable"
+ msgstr ""
+ "Créditos a los traductores. Esta cadena debe etiquetarse como traducible"
+
+-#: gtk/gtkaboutdialog.c:385
++#: ../gtk/gtkaboutdialog.c:385
+ msgid "Logo"
+ msgstr "Logotipo"
+
+-#: gtk/gtkaboutdialog.c:386
++#: ../gtk/gtkaboutdialog.c:386
+ msgid ""
+ "A logo for the about box. If this is not set, it defaults to "
+ "gtk_window_get_default_icon_list()"
+@@ -226,101 +229,102 @@
+ "Un logotipo para la caja «acerca de». Si no se establece, lo predeterminado "
+ "es gtk_window_get_default_icon_list()"
+
+-#: gtk/gtkaboutdialog.c:401
++#: ../gtk/gtkaboutdialog.c:401
+ msgid "Logo Icon Name"
+ msgstr "Nombre del icono del logotipo"
+
+-#: gtk/gtkaboutdialog.c:402
++#: ../gtk/gtkaboutdialog.c:402
+ msgid "A named icon to use as the logo for the about box."
+ msgstr ""
+ "Un icono con nombre para usar como el logotipo para la caja «Acerca de»."
+
+-#: gtk/gtkaboutdialog.c:415
++#: ../gtk/gtkaboutdialog.c:415
+ msgid "Wrap license"
+ msgstr "Ajustar licencia"
+
+-#: gtk/gtkaboutdialog.c:416
++#: ../gtk/gtkaboutdialog.c:416
+ msgid "Whether to wrap the license text."
+ msgstr "Indica si se debe ajustar el texto de la licencia."
+
+-#: gtk/gtkaccellabel.c:129
++#: ../gtk/gtkaccellabel.c:129
+ msgid "Accelerator Closure"
+ msgstr "Cierre del acelerador"
+
+-#: gtk/gtkaccellabel.c:130
++#: ../gtk/gtkaccellabel.c:130
+ msgid "The closure to be monitored for accelerator changes"
+ msgstr "El cierre que monitorizar para cambios en el acelerador"
+
+-#: gtk/gtkaccellabel.c:136
++#: ../gtk/gtkaccellabel.c:136
+ msgid "Accelerator Widget"
+ msgstr "Widget acelerador"
+
+-#: gtk/gtkaccellabel.c:137
++#: ../gtk/gtkaccellabel.c:137
+ msgid "The widget to be monitored for accelerator changes"
+ msgstr "El widget que monitorizar para cambios en el acelerador"
+
+-#: gtk/gtkaction.c:199 gtk/gtkactiongroup.c:170 gtk/gtkprinter.c:123
+-#: gtk/gtktextmark.c:89
++#: ../gtk/gtkaction.c:199 ../gtk/gtkactiongroup.c:170 ../gtk/gtkprinter.c:123
++#: ../gtk/gtktextmark.c:89
+ msgid "Name"
+ msgstr "Nombre"
+
+-#: gtk/gtkaction.c:200
++#: ../gtk/gtkaction.c:200
+ msgid "A unique name for the action."
+ msgstr "Un nombre único para la acción."
+
+-#: gtk/gtkaction.c:215 gtk/gtkbutton.c:199 gtk/gtkexpander.c:195
+-#: gtk/gtkframe.c:105 gtk/gtklabel.c:316 gtk/gtktoolbutton.c:180
++#: ../gtk/gtkaction.c:215 ../gtk/gtkbutton.c:199 ../gtk/gtkexpander.c:195
++#: ../gtk/gtkframe.c:105 ../gtk/gtklabel.c:316 ../gtk/gtktoolbutton.c:180
+ msgid "Label"
+ msgstr "Etiqueta"
+
+-#: gtk/gtkaction.c:216
++#: ../gtk/gtkaction.c:216
+ msgid "The label used for menu items and buttons that activate this action."
+ msgstr ""
+ "La etiqueta que se usa para los elementos de menú y botones que activan esta "
+ "acción."
+
+-#: gtk/gtkaction.c:223
++#: ../gtk/gtkaction.c:223
+ msgid "Short label"
+ msgstr "Etiqueta corta"
+
+-#: gtk/gtkaction.c:224
++#: ../gtk/gtkaction.c:224
+ msgid "A shorter label that may be used on toolbar buttons."
+ msgstr ""
+ "Una etiqueta más corta que quizá se use en los botones de la barra de "
+ "herramientas."
+
+-#: gtk/gtkaction.c:230
++#: ../gtk/gtkaction.c:230
+ msgid "Tooltip"
+ msgstr "Consejo"
+
+-#: gtk/gtkaction.c:231
++#: ../gtk/gtkaction.c:231
+ msgid "A tooltip for this action."
+ msgstr "Un consejo para esta acción."
+
+-#: gtk/gtkaction.c:237
++#: ../gtk/gtkaction.c:237
+ msgid "Stock Icon"
+ msgstr "Icono de inventario"
+
+-#: gtk/gtkaction.c:238
++#: ../gtk/gtkaction.c:238
+ msgid "The stock icon displayed in widgets representing this action."
+ msgstr ""
+ "El icono de inventario mostrado en los widgets representando esta acción."
+
+-#: gtk/gtkaction.c:255 gtk/gtkcellrendererpixbuf.c:171 gtk/gtkimage.c:230
+-#: gtk/gtkprinter.c:172 gtk/gtkstatusicon.c:210 gtk/gtkwindow.c:592
++#: ../gtk/gtkaction.c:255 ../gtk/gtkcellrendererpixbuf.c:171
++#: ../gtk/gtkimage.c:230 ../gtk/gtkprinter.c:172 ../gtk/gtkstatusicon.c:210
++#: ../gtk/gtkwindow.c:592
+ msgid "Icon Name"
+ msgstr "Nombre del icono"
+
+-#: gtk/gtkaction.c:256 gtk/gtkcellrendererpixbuf.c:172 gtk/gtkimage.c:231
+-#: gtk/gtkstatusicon.c:211
++#: ../gtk/gtkaction.c:256 ../gtk/gtkcellrendererpixbuf.c:172
++#: ../gtk/gtkimage.c:231 ../gtk/gtkstatusicon.c:211
+ msgid "The name of the icon from the icon theme"
+ msgstr "El nombre del icono del tema de iconos"
+
+-#: gtk/gtkaction.c:262 gtk/gtktoolitem.c:156
++#: ../gtk/gtkaction.c:262 ../gtk/gtktoolitem.c:156
+ msgid "Visible when horizontal"
+ msgstr "Visible si es horizontal"
+
+-#: gtk/gtkaction.c:263 gtk/gtktoolitem.c:157
++#: ../gtk/gtkaction.c:263 ../gtk/gtktoolitem.c:157
+ msgid ""
+ "Whether the toolbar item is visible when the toolbar is in a horizontal "
+ "orientation."
+@@ -328,11 +332,11 @@
+ "Indica si el elemento de la barra de herramientas es visible cuando la barra "
+ "esté en orientación horizontal."
+
+-#: gtk/gtkaction.c:278
++#: ../gtk/gtkaction.c:278
+ msgid "Visible when overflown"
+ msgstr "Visible cuando rebosa"
+
+-#: gtk/gtkaction.c:279
++#: ../gtk/gtkaction.c:279
+ msgid ""
+ "When TRUE, toolitem proxies for this action are represented in the toolbar "
+ "overflow menu."
+@@ -340,11 +344,11 @@
+ "Cuando sea TRUE, se representan elementos de proximidad para esta acción en "
+ "el menú de rebosamiento de la barra de herramientas."
+
+-#: gtk/gtkaction.c:286 gtk/gtktoolitem.c:163
++#: ../gtk/gtkaction.c:286 ../gtk/gtktoolitem.c:163
+ msgid "Visible when vertical"
+ msgstr "Visible si es vertical"
+
+-#: gtk/gtkaction.c:287 gtk/gtktoolitem.c:164
++#: ../gtk/gtkaction.c:287 ../gtk/gtktoolitem.c:164
+ msgid ""
+ "Whether the toolbar item is visible when the toolbar is in a vertical "
+ "orientation."
+@@ -352,11 +356,11 @@
+ "Indica si el elemento de la barra de herramientas es visible cuando la barra "
+ "esté en orientación vertical."
+
+-#: gtk/gtkaction.c:294 gtk/gtktoolitem.c:170
++#: ../gtk/gtkaction.c:294 ../gtk/gtktoolitem.c:170
+ msgid "Is important"
+ msgstr "Es importante"
+
+-#: gtk/gtkaction.c:295
++#: ../gtk/gtkaction.c:295
+ msgid ""
+ "Whether the action is considered important. When TRUE, toolitem proxies for "
+ "this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
+@@ -365,39 +369,40 @@
+ "los proxies del elemento toolitem muestran texto en el modo "
+ "GTK_TOOLBAR_BOTH_HORIZ."
+
+-#: gtk/gtkaction.c:303
++#: ../gtk/gtkaction.c:303
+ msgid "Hide if empty"
+ msgstr "Ocultar si está vacío"
+
+-#: gtk/gtkaction.c:304
++#: ../gtk/gtkaction.c:304
+ msgid "When TRUE, empty menu proxies for this action are hidden."
+ msgstr ""
+ "Cuando sea TRUE, los elementos de proximidad vacíos del menú para esta "
+ "acción se ocultan."
+
+-#: gtk/gtkaction.c:310 gtk/gtkactiongroup.c:177 gtk/gtkcellrenderer.c:193
+-#: gtk/gtkwidget.c:523
++#: ../gtk/gtkaction.c:310 ../gtk/gtkactiongroup.c:177
++#: ../gtk/gtkcellrenderer.c:193 ../gtk/gtkwidget.c:523
+ msgid "Sensitive"
+ msgstr "Sensible"
+
+-#: gtk/gtkaction.c:311
++#: ../gtk/gtkaction.c:311
+ msgid "Whether the action is enabled."
+ msgstr "Indica si la acción está activada."
+
+-#: gtk/gtkaction.c:317 gtk/gtkactiongroup.c:184 gtk/gtkstatusicon.c:269
+-#: gtk/gtktreeviewcolumn.c:191 gtk/gtkwidget.c:516
++#: ../gtk/gtkaction.c:317 ../gtk/gtkactiongroup.c:184
++#: ../gtk/gtkstatusicon.c:269 ../gtk/gtktreeviewcolumn.c:191
++#: ../gtk/gtkwidget.c:516
+ msgid "Visible"
+ msgstr "Visible"
+
+-#: gtk/gtkaction.c:318
++#: ../gtk/gtkaction.c:318
+ msgid "Whether the action is visible."
+ msgstr "Indica si la acción es visible."
+
+-#: gtk/gtkaction.c:324
++#: ../gtk/gtkaction.c:324
+ msgid "Action Group"
+ msgstr "Grupo de acción"
+
+-#: gtk/gtkaction.c:325
++#: ../gtk/gtkaction.c:325
+ msgid ""
+ "The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
+ "use)."
+@@ -405,72 +410,72 @@
+ "El GtkActionGroup con el que esta GtkAction está asociada, o NULL (para uso "
+ "interno)."
+
+-#: gtk/gtkactiongroup.c:171
++#: ../gtk/gtkactiongroup.c:171
+ msgid "A name for the action group."
+ msgstr "Un nombre para el grupo de la acción."
+
+-#: gtk/gtkactiongroup.c:178
++#: ../gtk/gtkactiongroup.c:178
+ msgid "Whether the action group is enabled."
+ msgstr "Indica si el grupo de acción está activado."
+
+-#: gtk/gtkactiongroup.c:185
++#: ../gtk/gtkactiongroup.c:185
+ msgid "Whether the action group is visible."
+ msgstr "Indica si el grupo de acción es visible."
+
+-#: gtk/gtkadjustment.c:93 gtk/gtkcellrendererprogress.c:128
+-#: gtk/gtkscalebutton.c:202 gtk/gtkspinbutton.c:269
++#: ../gtk/gtkadjustment.c:93 ../gtk/gtkcellrendererprogress.c:128
++#: ../gtk/gtkscalebutton.c:202 ../gtk/gtkspinbutton.c:269
+ msgid "Value"
+ msgstr "Valor"
+
+-#: gtk/gtkadjustment.c:94
++#: ../gtk/gtkadjustment.c:94
+ msgid "The value of the adjustment"
+ msgstr "El valor del ajuste"
+
+-#: gtk/gtkadjustment.c:110
++#: ../gtk/gtkadjustment.c:110
+ msgid "Minimum Value"
+ msgstr "Valor mínimo"
+
+-#: gtk/gtkadjustment.c:111
++#: ../gtk/gtkadjustment.c:111
+ msgid "The minimum value of the adjustment"
+ msgstr "El valor mínimo del ajuste"
+
+-#: gtk/gtkadjustment.c:130
++#: ../gtk/gtkadjustment.c:130
+ msgid "Maximum Value"
+ msgstr "Valor máximo"
+
+-#: gtk/gtkadjustment.c:131
++#: ../gtk/gtkadjustment.c:131
+ msgid "The maximum value of the adjustment"
+ msgstr "El valor máximo del ajuste"
+
+-#: gtk/gtkadjustment.c:147
++#: ../gtk/gtkadjustment.c:147
+ msgid "Step Increment"
+ msgstr "Incremento del paso"
+
+-#: gtk/gtkadjustment.c:148
++#: ../gtk/gtkadjustment.c:148
+ msgid "The step increment of the adjustment"
+ msgstr "El incremente del paso del ajuste"
+
+-#: gtk/gtkadjustment.c:164
++#: ../gtk/gtkadjustment.c:164
+ msgid "Page Increment"
+ msgstr "Incremento de página"
+
+-#: gtk/gtkadjustment.c:165
++#: ../gtk/gtkadjustment.c:165
+ msgid "The page increment of the adjustment"
+ msgstr "El incremento de página del ajuste"
+
+-#: gtk/gtkadjustment.c:184
++#: ../gtk/gtkadjustment.c:184
+ msgid "Page Size"
+ msgstr "Tamaño de página"
+
+-#: gtk/gtkadjustment.c:185
++#: ../gtk/gtkadjustment.c:185
+ msgid "The page size of the adjustment"
+ msgstr "El tamaño de página del ajuste"
+
+-#: gtk/gtkalignment.c:90
++#: ../gtk/gtkalignment.c:90
+ msgid "Horizontal alignment"
+ msgstr "Alineación horizontal"
+
+-#: gtk/gtkalignment.c:91 gtk/gtkbutton.c:250
++#: ../gtk/gtkalignment.c:91 ../gtk/gtkbutton.c:250
+ msgid ""
+ "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
+ "right aligned"
+@@ -478,11 +483,11 @@
+ "Posición horizontal del hijo en el espacio disponible. 0.0 es alineado a la "
+ "izquierda, 1.0 es alineado a la derecha"
+
+-#: gtk/gtkalignment.c:100
++#: ../gtk/gtkalignment.c:100
+ msgid "Vertical alignment"
+ msgstr "Alineación vertical"
+
+-#: gtk/gtkalignment.c:101 gtk/gtkbutton.c:269
++#: ../gtk/gtkalignment.c:101 ../gtk/gtkbutton.c:269
+ msgid ""
+ "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
+ "bottom aligned"
+@@ -490,11 +495,11 @@
+ "Posición vertical del hijo en el espacio disponible. 0.0 es alineado arriba, "
+ "1.0 es alineado abajo"
+
+-#: gtk/gtkalignment.c:109
++#: ../gtk/gtkalignment.c:109
+ msgid "Horizontal scale"
+ msgstr "Escala horizontal"
+
+-#: gtk/gtkalignment.c:110
++#: ../gtk/gtkalignment.c:110
+ msgid ""
+ "If available horizontal space is bigger than needed for the child, how much "
+ "of it to use for the child. 0.0 means none, 1.0 means all"
+@@ -502,11 +507,11 @@
+ "Si el espacio horizontal disponible es mayor que el necesario para el hijo, "
+ "cuánto se debe utilizar para el hijo. 0.0 significa nada, 1.0 significa todo"
+
+-#: gtk/gtkalignment.c:118
++#: ../gtk/gtkalignment.c:118
+ msgid "Vertical scale"
+ msgstr "Escala vertical"
+
+-#: gtk/gtkalignment.c:119
++#: ../gtk/gtkalignment.c:119
+ msgid ""
+ "If available vertical space is bigger than needed for the child, how much of "
+ "it to use for the child. 0.0 means none, 1.0 means all"
+@@ -514,188 +519,188 @@
+ "Si el espacio vertical disponible es mayor que el necesario para el hijo, "
+ "cuánto se debe utilizar para el hijo. 0.0 significa nada, 1.0 significa todo"
+
+-#: gtk/gtkalignment.c:136
++#: ../gtk/gtkalignment.c:136
+ msgid "Top Padding"
+ msgstr "Separación superior"
+
+-#: gtk/gtkalignment.c:137
++#: ../gtk/gtkalignment.c:137
+ msgid "The padding to insert at the top of the widget."
+ msgstr "La separación que introducir por encima del widget."
+
+-#: gtk/gtkalignment.c:153
++#: ../gtk/gtkalignment.c:153
+ msgid "Bottom Padding"
+ msgstr "Separación inferior"
+
+-#: gtk/gtkalignment.c:154
++#: ../gtk/gtkalignment.c:154
+ msgid "The padding to insert at the bottom of the widget."
+ msgstr "La separación que introducir por debajo del widget."
+
+-#: gtk/gtkalignment.c:170
++#: ../gtk/gtkalignment.c:170
+ msgid "Left Padding"
+ msgstr "Separación por la izquierda"
+
+-#: gtk/gtkalignment.c:171
++#: ../gtk/gtkalignment.c:171
+ msgid "The padding to insert at the left of the widget."
+ msgstr "La separación que introducir por el lado izquierdo del widget."
+
+-#: gtk/gtkalignment.c:187
++#: ../gtk/gtkalignment.c:187
+ msgid "Right Padding"
+ msgstr "Separación por la derecha"
+
+-#: gtk/gtkalignment.c:188
++#: ../gtk/gtkalignment.c:188
+ msgid "The padding to insert at the right of the widget."
+ msgstr "La separación que introducir por el lado derecho del widget."
+
+-#: gtk/gtkarrow.c:75
++#: ../gtk/gtkarrow.c:75
+ msgid "Arrow direction"
+ msgstr "Dirección de la flecha"
+
+-#: gtk/gtkarrow.c:76
++#: ../gtk/gtkarrow.c:76
+ msgid "The direction the arrow should point"
+ msgstr "La dirección a la que la flecha apunta"
+
+-#: gtk/gtkarrow.c:84
++#: ../gtk/gtkarrow.c:84
+ msgid "Arrow shadow"
+ msgstr "Sombra de la flecha"
+
+-#: gtk/gtkarrow.c:85
++#: ../gtk/gtkarrow.c:85
+ msgid "Appearance of the shadow surrounding the arrow"
+ msgstr "Apariencia de la sombra que rodea la flecha"
+
+-#: gtk/gtkarrow.c:92 gtk/gtkmenuitem.c:276
++#: ../gtk/gtkarrow.c:92 ../gtk/gtkmenuitem.c:276
+ msgid "Arrow Scaling"
+ msgstr "Escalado de flechas"
+
+-#: gtk/gtkarrow.c:93
++#: ../gtk/gtkarrow.c:93
+ msgid "Amount of space used up by arrow"
+ msgstr "Cantidad de espacio ocupado por flecha"
+
+-#: gtk/gtkaspectframe.c:79
++#: ../gtk/gtkaspectframe.c:79
+ msgid "Horizontal Alignment"
+ msgstr "Alineación horizontal"
+
+-#: gtk/gtkaspectframe.c:80
++#: ../gtk/gtkaspectframe.c:80
+ msgid "X alignment of the child"
+ msgstr "Alineación X del hijo"
+
+-#: gtk/gtkaspectframe.c:86
++#: ../gtk/gtkaspectframe.c:86
+ msgid "Vertical Alignment"
+ msgstr "Alineación vertical"
+
+-#: gtk/gtkaspectframe.c:87
++#: ../gtk/gtkaspectframe.c:87
+ msgid "Y alignment of the child"
+ msgstr "Alineación Y del hijo"
+
+-#: gtk/gtkaspectframe.c:93
++#: ../gtk/gtkaspectframe.c:93
+ msgid "Ratio"
+ msgstr "Proporción"
+
+-#: gtk/gtkaspectframe.c:94
++#: ../gtk/gtkaspectframe.c:94
+ msgid "Aspect ratio if obey_child is FALSE"
+ msgstr "Proporción si obey_child es FALSE"
+
+-#: gtk/gtkaspectframe.c:100
++#: ../gtk/gtkaspectframe.c:100
+ msgid "Obey child"
+ msgstr "Obedecer al hijo"
+
+-#: gtk/gtkaspectframe.c:101
++#: ../gtk/gtkaspectframe.c:101
+ msgid "Force aspect ratio to match that of the frame's child"
+ msgstr "Forzar la proporción para que coincida con el hijo del marco"
+
+-#: gtk/gtkassistant.c:261
++#: ../gtk/gtkassistant.c:261
+ msgid "Header Padding"
+ msgstr "Separación de la cabecera"
+
+-#: gtk/gtkassistant.c:262
++#: ../gtk/gtkassistant.c:262
+ msgid "Number of pixels around the header."
+ msgstr "Número de píxeles alrededor de la cabecera."
+
+-#: gtk/gtkassistant.c:269
++#: ../gtk/gtkassistant.c:269
+ msgid "Content Padding"
+ msgstr "Separación del contenido"
+
+-#: gtk/gtkassistant.c:270
++#: ../gtk/gtkassistant.c:270
+ msgid "Number of pixels around the content pages."
+ msgstr "Número de píxeles alrededor de las páginas de contenidos."
+
+-#: gtk/gtkassistant.c:286
++#: ../gtk/gtkassistant.c:286
+ msgid "Page type"
+ msgstr "Tipo de página"
+
+-#: gtk/gtkassistant.c:287
++#: ../gtk/gtkassistant.c:287
+ msgid "The type of the assistant page"
+ msgstr "El tipo de página del asistente"
+
+-#: gtk/gtkassistant.c:304
++#: ../gtk/gtkassistant.c:304
+ msgid "Page title"
+ msgstr "Título de página"
+
+-#: gtk/gtkassistant.c:305
++#: ../gtk/gtkassistant.c:305
+ msgid "The title of the assistant page"
+ msgstr "El título de la página del asistente"
+
+-#: gtk/gtkassistant.c:321
++#: ../gtk/gtkassistant.c:321
+ msgid "Header image"
+ msgstr "Imagen de la cabecera"
+
+-#: gtk/gtkassistant.c:322
++#: ../gtk/gtkassistant.c:322
+ msgid "Header image for the assistant page"
+ msgstr "Imagen de la cabecera para la página del asistente"
+
+-#: gtk/gtkassistant.c:338
++#: ../gtk/gtkassistant.c:338
+ msgid "Sidebar image"
+ msgstr "Imagen de barra lateral"
+
+-#: gtk/gtkassistant.c:339
++#: ../gtk/gtkassistant.c:339
+ msgid "Sidebar image for the assistant page"
+ msgstr "Imagen de barra lateral para la página del asistente"
+
+-#: gtk/gtkassistant.c:354
++#: ../gtk/gtkassistant.c:354
+ msgid "Page complete"
+ msgstr "Página completa"
+
+-#: gtk/gtkassistant.c:355
++#: ../gtk/gtkassistant.c:355
+ msgid "Whether all required fields on the page have been filled out"
+ msgstr "Indica si todos los campos requeridos en la página se han rellenado"
+
+-#: gtk/gtkbbox.c:91
++#: ../gtk/gtkbbox.c:91
+ msgid "Minimum child width"
+ msgstr "Anchura mínima del hijo"
+
+-#: gtk/gtkbbox.c:92
++#: ../gtk/gtkbbox.c:92
+ msgid "Minimum width of buttons inside the box"
+ msgstr "Anchura mínima de los botones dentro de la caja"
+
+-#: gtk/gtkbbox.c:100
++#: ../gtk/gtkbbox.c:100
+ msgid "Minimum child height"
+ msgstr "Altura mínima del hijo"
+
+-#: gtk/gtkbbox.c:101
++#: ../gtk/gtkbbox.c:101
+ msgid "Minimum height of buttons inside the box"
+ msgstr "Altura mínima de los botones dentro de la caja"
+
+-#: gtk/gtkbbox.c:109
++#: ../gtk/gtkbbox.c:109
+ msgid "Child internal width padding"
+ msgstr "Anchura interna de relleno del hijo"
+
+-#: gtk/gtkbbox.c:110
++#: ../gtk/gtkbbox.c:110
+ msgid "Amount to increase child's size on either side"
+ msgstr "Cantidad en la que se incrementa el tamaño del hijo por cada lado"
+
+-#: gtk/gtkbbox.c:118
++#: ../gtk/gtkbbox.c:118
+ msgid "Child internal height padding"
+ msgstr "Altura interna de relleno del hijo"
+
+-#: gtk/gtkbbox.c:119
++#: ../gtk/gtkbbox.c:119
+ msgid "Amount to increase child's size on the top and bottom"
+ msgstr ""
+ "Cantidad en la que se incrementa el tamaño del hijo por arriba y por abajo"
+
+-#: gtk/gtkbbox.c:127
++#: ../gtk/gtkbbox.c:127
+ msgid "Layout style"
+ msgstr "Estilo de la distribución"
+
+-#: gtk/gtkbbox.c:128
++#: ../gtk/gtkbbox.c:128
+ msgid ""
+ "How to layout the buttons in the box. Possible values are default, spread, "
+ "edge, start and end"
+@@ -703,11 +708,11 @@
+ "Como disponer los botones en la caja. Los valores posibles son: "
+ "predeterminado, esparcidos, esquinas, inicio y final"
+
+-#: gtk/gtkbbox.c:136
++#: ../gtk/gtkbbox.c:136
+ msgid "Secondary"
+ msgstr "Secundario"
+
+-#: gtk/gtkbbox.c:137
++#: ../gtk/gtkbbox.c:137
+ msgid ""
+ "If TRUE, the child appears in a secondary group of children, suitable for, e."
+ "g., help buttons"
+@@ -715,38 +720,38 @@
+ "Si es TRUE, el hijo aparece en un grupo secundario de hijos, apropiado para, "
+ "por ejemplo, botones de ayuda"
+
+-#: gtk/gtkbox.c:98 gtk/gtkexpander.c:219 gtk/gtkiconview.c:666
+-#: gtk/gtktreeviewcolumn.c:216
++#: ../gtk/gtkbox.c:98 ../gtk/gtkexpander.c:219 ../gtk/gtkiconview.c:666
++#: ../gtk/gtktreeviewcolumn.c:216
+ msgid "Spacing"
+ msgstr "Espaciado"
+
+-#: gtk/gtkbox.c:99
++#: ../gtk/gtkbox.c:99
+ msgid "The amount of space between children"
+ msgstr "La cantidad de espacio entre hijos"
+
+-#: gtk/gtkbox.c:108 gtk/gtknotebook.c:649 gtk/gtktable.c:165
+-#: gtk/gtktoolbar.c:580
++#: ../gtk/gtkbox.c:108 ../gtk/gtknotebook.c:649 ../gtk/gtktable.c:165
++#: ../gtk/gtktoolbar.c:580
+ msgid "Homogeneous"
+ msgstr "Homogéneo"
+
+-#: gtk/gtkbox.c:109
++#: ../gtk/gtkbox.c:109
+ msgid "Whether the children should all be the same size"
+ msgstr "Indica si todos los hijos deben ser del mismo tamaño"
+
+-#: gtk/gtkbox.c:116 gtk/gtkpreview.c:101 gtk/gtktoolbar.c:572
+-#: gtk/gtktreeviewcolumn.c:272
++#: ../gtk/gtkbox.c:116 ../gtk/gtkpreview.c:101 ../gtk/gtktoolbar.c:572
++#: ../gtk/gtktreeviewcolumn.c:272
+ msgid "Expand"
+ msgstr "Expandir"
+
+-#: gtk/gtkbox.c:117
++#: ../gtk/gtkbox.c:117
+ msgid "Whether the child should receive extra space when the parent grows"
+ msgstr "Indica si el hijo debe recibir espacio extra cuando el padre crece"
+
+-#: gtk/gtkbox.c:123
++#: ../gtk/gtkbox.c:123
+ msgid "Fill"
+ msgstr "Relleno"
+
+-#: gtk/gtkbox.c:124
++#: ../gtk/gtkbox.c:124
+ msgid ""
+ "Whether extra space given to the child should be allocated to the child or "
+ "used as padding"
+@@ -754,19 +759,19 @@
+ "Indica si el espacio extra dado al hijo debe ser reservado para el en el "
+ "hijo o usado como separación"
+
+-#: gtk/gtkbox.c:130
++#: ../gtk/gtkbox.c:130
+ msgid "Padding"
+ msgstr "Separación"
+
+-#: gtk/gtkbox.c:131
++#: ../gtk/gtkbox.c:131
+ msgid "Extra space to put between the child and its neighbors, in pixels"
+ msgstr "Espacio extra para colocar entre el hijo y sus vecinos, en píxeles"
+
+-#: gtk/gtkbox.c:137
++#: ../gtk/gtkbox.c:137
+ msgid "Pack type"
+ msgstr "Tipo de empaquetado"
+
+-#: gtk/gtkbox.c:138 gtk/gtknotebook.c:716
++#: ../gtk/gtkbox.c:138 ../gtk/gtknotebook.c:716
+ msgid ""
+ "A GtkPackType indicating whether the child is packed with reference to the "
+ "start or end of the parent"
+@@ -774,24 +779,24 @@
+ "Un GtkPackType que indica si el hijo está empaquetado con referencia al "
+ "inicio o el final del padre"
+
+-#: gtk/gtkbox.c:144 gtk/gtknotebook.c:694 gtk/gtkpaned.c:218
+-#: gtk/gtkruler.c:110
++#: ../gtk/gtkbox.c:144 ../gtk/gtknotebook.c:694 ../gtk/gtkpaned.c:218
++#: ../gtk/gtkruler.c:110
+ msgid "Position"
+ msgstr "Posición"
+
+-#: gtk/gtkbox.c:145 gtk/gtknotebook.c:695
++#: ../gtk/gtkbox.c:145 ../gtk/gtknotebook.c:695
+ msgid "The index of the child in the parent"
+ msgstr "El índice del hijo en el padre"
+
+-#: gtk/gtkbuilder.c:96
++#: ../gtk/gtkbuilder.c:96
+ msgid "Translation Domain"
+ msgstr "Dominio de traducción"
+
+-#: gtk/gtkbuilder.c:97
++#: ../gtk/gtkbuilder.c:97
+ msgid "The translation domain used by gettext"
+ msgstr "El dominio de traducción que usa gettext"
+
+-#: gtk/gtkbutton.c:200
++#: ../gtk/gtkbutton.c:200
+ msgid ""
+ "Text of the label widget inside the button, if the button contains a label "
+ "widget"
+@@ -799,12 +804,12 @@
+ "Texto del etiqueta del widget dentro del botón, si el botón contiene una "
+ "etiqueta del widget"
+
+-#: gtk/gtkbutton.c:207 gtk/gtkexpander.c:203 gtk/gtklabel.c:337
+-#: gtk/gtktoolbutton.c:187
++#: ../gtk/gtkbutton.c:207 ../gtk/gtkexpander.c:203 ../gtk/gtklabel.c:337
++#: ../gtk/gtktoolbutton.c:187
+ msgid "Use underline"
+ msgstr "Utilizar subrayado"
+
+-#: gtk/gtkbutton.c:208 gtk/gtkexpander.c:204 gtk/gtklabel.c:338
++#: ../gtk/gtkbutton.c:208 ../gtk/gtkexpander.c:204 ../gtk/gtklabel.c:338
+ msgid ""
+ "If set, an underline in the text indicates the next character should be used "
+ "for the mnemonic accelerator key"
+@@ -812,70 +817,71 @@
+ "Si se establece, un subrayado en el texto indica que el siguiente carácter "
+ "se utiliza como el nemotécnico de la teclas aceleradora"
+
+-#: gtk/gtkbutton.c:215
++#: ../gtk/gtkbutton.c:215
+ msgid "Use stock"
+ msgstr "Usar inventario"
+
+-#: gtk/gtkbutton.c:216
++#: ../gtk/gtkbutton.c:216
+ msgid ""
+ "If set, the label is used to pick a stock item instead of being displayed"
+ msgstr ""
+ "Si se selecciona, la etiqueta se utiliza para tomar un elemento del "
+ "inventario en vez de para mostrarse"
+
+-#: gtk/gtkbutton.c:223 gtk/gtkcombobox.c:789 gtk/gtkfilechooserbutton.c:393
++#: ../gtk/gtkbutton.c:223 ../gtk/gtkcombobox.c:789
++#: ../gtk/gtkfilechooserbutton.c:393
+ msgid "Focus on click"
+ msgstr "Enfocar al pulsar"
+
+-#: gtk/gtkbutton.c:224 gtk/gtkfilechooserbutton.c:394
++#: ../gtk/gtkbutton.c:224 ../gtk/gtkfilechooserbutton.c:394
+ msgid "Whether the button grabs focus when it is clicked with the mouse"
+ msgstr "Indica si el botón obtiene el foco al ser pulsado con el ratón"
+
+-#: gtk/gtkbutton.c:231
++#: ../gtk/gtkbutton.c:231
+ msgid "Border relief"
+ msgstr "Relieve del borde"
+
+-#: gtk/gtkbutton.c:232
++#: ../gtk/gtkbutton.c:232
+ msgid "The border relief style"
+ msgstr "Estilo del relieve del borde"
+
+-#: gtk/gtkbutton.c:249
++#: ../gtk/gtkbutton.c:249
+ msgid "Horizontal alignment for child"
+ msgstr "Alineación horizontal para el hijo"
+
+-#: gtk/gtkbutton.c:268
++#: ../gtk/gtkbutton.c:268
+ msgid "Vertical alignment for child"
+ msgstr "Alineación vertical para el hijo"
+
+-#: gtk/gtkbutton.c:285 gtk/gtkimagemenuitem.c:100
++#: ../gtk/gtkbutton.c:285 ../gtk/gtkimagemenuitem.c:100
+ msgid "Image widget"
+ msgstr "Widget de imagen"
+
+-#: gtk/gtkbutton.c:286
++#: ../gtk/gtkbutton.c:286
+ msgid "Child widget to appear next to the button text"
+ msgstr "Widget hijo que aparece al lado del texto del botón"
+
+-#: gtk/gtkbutton.c:300
++#: ../gtk/gtkbutton.c:300
+ msgid "Image position"
+ msgstr "Posición de la imagen"
+
+-#: gtk/gtkbutton.c:301
++#: ../gtk/gtkbutton.c:301
+ msgid "The position of the image relative to the text"
+ msgstr "Posición de la imagen relativa al texto"
+
+-#: gtk/gtkbutton.c:410
++#: ../gtk/gtkbutton.c:410
+ msgid "Default Spacing"
+ msgstr "Espaciado predeterminado"
+
+-#: gtk/gtkbutton.c:411
++#: ../gtk/gtkbutton.c:411
+ msgid "Extra space to add for CAN_DEFAULT buttons"
+ msgstr "Espacio extra que añadir para los botones CAN_DEFAULT"
+
+-#: gtk/gtkbutton.c:417
++#: ../gtk/gtkbutton.c:417
+ msgid "Default Outside Spacing"
+ msgstr "Espaciado exterior predeterminado"
+
+-#: gtk/gtkbutton.c:418
++#: ../gtk/gtkbutton.c:418
+ msgid ""
+ "Extra space to add for CAN_DEFAULT buttons that is always drawn outside the "
+ "border"
+@@ -883,31 +889,31 @@
+ "Espacio extra que añadir para los botones CAN_DEFAULT que se dibujan siempre "
+ "fuera del borde"
+
+-#: gtk/gtkbutton.c:423
++#: ../gtk/gtkbutton.c:423
+ msgid "Child X Displacement"
+ msgstr "Desplazamiento X del hijo"
+
+-#: gtk/gtkbutton.c:424
++#: ../gtk/gtkbutton.c:424
+ msgid ""
+ "How far in the x direction to move the child when the button is depressed"
+ msgstr ""
+ "Cuánta distancia en la dirección x se mueve el hijo cuando se suelta el botón"
+
+-#: gtk/gtkbutton.c:431
++#: ../gtk/gtkbutton.c:431
+ msgid "Child Y Displacement"
+ msgstr "Desplazamiento Y del hijo"
+
+-#: gtk/gtkbutton.c:432
++#: ../gtk/gtkbutton.c:432
+ msgid ""
+ "How far in the y direction to move the child when the button is depressed"
+ msgstr ""
+ "Cuánta distancia en la dirección y se mueve el hijo cuando se suelta el botón"
+
+-#: gtk/gtkbutton.c:448
++#: ../gtk/gtkbutton.c:448
+ msgid "Displace focus"
+ msgstr "Desplazar el foco"
+
+-#: gtk/gtkbutton.c:449
++#: ../gtk/gtkbutton.c:449
+ msgid ""
+ "Whether the child_displacement_x/_y properties should also affect the focus "
+ "rectangle"
+@@ -915,51 +921,51 @@
+ "Indica si las propiedades child_displacement_x/_y deben afectar también al "
+ "rectángulo del foco"
+
+-#: gtk/gtkbutton.c:462 gtk/gtkentry.c:539 gtk/gtkentry.c:932
++#: ../gtk/gtkbutton.c:462 ../gtk/gtkentry.c:539 ../gtk/gtkentry.c:932
+ msgid "Inner Border"
+ msgstr "Borde interior"
+
+-#: gtk/gtkbutton.c:463
++#: ../gtk/gtkbutton.c:463
+ msgid "Border between button edges and child."
+ msgstr "Borde entre los bordes del botón y el hijo."
+
+-#: gtk/gtkbutton.c:476
++#: ../gtk/gtkbutton.c:476
+ msgid "Image spacing"
+ msgstr "Espaciado de imagen"
+
+-#: gtk/gtkbutton.c:477
++#: ../gtk/gtkbutton.c:477
+ msgid "Spacing in pixels between the image and label"
+ msgstr "Espaciado en píxeles entre la imagen y la etiqueta"
+
+-#: gtk/gtkbutton.c:491
++#: ../gtk/gtkbutton.c:491
+ msgid "Show button images"
+ msgstr "Mostrar imágenes en los botones"
+
+-#: gtk/gtkbutton.c:492
++#: ../gtk/gtkbutton.c:492
+ msgid "Whether images should be shown on buttons"
+ msgstr "Indica si se deben mostrar las imágenes en los botones"
+
+-#: gtk/gtkcalendar.c:440
++#: ../gtk/gtkcalendar.c:440
+ msgid "Year"
+ msgstr "Año"
+
+-#: gtk/gtkcalendar.c:441
++#: ../gtk/gtkcalendar.c:441
+ msgid "The selected year"
+ msgstr "El año seleccionado"
+
+-#: gtk/gtkcalendar.c:454
++#: ../gtk/gtkcalendar.c:454
+ msgid "Month"
+ msgstr "Mes"
+
+-#: gtk/gtkcalendar.c:455
++#: ../gtk/gtkcalendar.c:455
+ msgid "The selected month (as a number between 0 and 11)"
+ msgstr "El mes seleccionado (como un número entre 0 y 11)"
+
+-#: gtk/gtkcalendar.c:469
++#: ../gtk/gtkcalendar.c:469
+ msgid "Day"
+ msgstr "Día"
+
+-#: gtk/gtkcalendar.c:470
++#: ../gtk/gtkcalendar.c:470
+ msgid ""
+ "The selected day (as a number between 1 and 31, or 0 to unselect the "
+ "currently selected day)"
+@@ -967,319 +973,322 @@
+ "El día seleccionado (como un número entre 1 y 31, o 0 para deseleccionar el "
+ "día actualmente seleccionado)"
+
+-#: gtk/gtkcalendar.c:484
++#: ../gtk/gtkcalendar.c:484
+ msgid "Show Heading"
+ msgstr "Mostrar cabecera"
+
+-#: gtk/gtkcalendar.c:485
++#: ../gtk/gtkcalendar.c:485
+ msgid "If TRUE, a heading is displayed"
+ msgstr "Si es TRUE, se muestra una cabecera"
+
+-#: gtk/gtkcalendar.c:499
++#: ../gtk/gtkcalendar.c:499
+ msgid "Show Day Names"
+ msgstr "Mostrar nombres de los días"
+
+-#: gtk/gtkcalendar.c:500
++#: ../gtk/gtkcalendar.c:500
+ msgid "If TRUE, day names are displayed"
+ msgstr "Si es TRUE, se muestran los nombres de los días"
+
+-#: gtk/gtkcalendar.c:513
++#: ../gtk/gtkcalendar.c:513
+ msgid "No Month Change"
+ msgstr "Sin cambio de mes"
+
+-#: gtk/gtkcalendar.c:514
++#: ../gtk/gtkcalendar.c:514
+ msgid "If TRUE, the selected month cannot be changed"
+ msgstr "Si es TRUE, el mes seleccionado no puede cambiarse"
+
+-#: gtk/gtkcalendar.c:528
++#: ../gtk/gtkcalendar.c:528
+ msgid "Show Week Numbers"
+ msgstr "Mostrar números de las semanas"
+
+-#: gtk/gtkcalendar.c:529
++#: ../gtk/gtkcalendar.c:529
+ msgid "If TRUE, week numbers are displayed"
+ msgstr "Si es TRUE, se muestran los números de las semanas"
+
+-#: gtk/gtkcalendar.c:544
++#: ../gtk/gtkcalendar.c:544
+ msgid "Details Width"
+ msgstr "Detalles de la anchura"
+
+-#: gtk/gtkcalendar.c:545
++#: ../gtk/gtkcalendar.c:545
+ msgid "Details width in characters"
+ msgstr "Detalla la anchura en los caracteres"
+
+-#: gtk/gtkcalendar.c:560
++#: ../gtk/gtkcalendar.c:560
+ msgid "Details Height"
+ msgstr "Detalles de la altura"
+
+-#: gtk/gtkcalendar.c:561
++#: ../gtk/gtkcalendar.c:561
+ msgid "Details height in rows"
+ msgstr "Detalla la altura en las filas"
+
+-#: gtk/gtkcalendar.c:577
++#: ../gtk/gtkcalendar.c:577
+ msgid "Show Details"
+ msgstr "Mostrar detalles"
+
+-#: gtk/gtkcalendar.c:578
++#: ../gtk/gtkcalendar.c:578
+ msgid "If TRUE, details are shown"
+ msgstr "Si es TRUE, se muestran los detalles"
+
+-#: gtk/gtkcellrenderer.c:177
++#: ../gtk/gtkcellrenderer.c:177
+ msgid "mode"
+ msgstr "modo"
+
+-#: gtk/gtkcellrenderer.c:178
++#: ../gtk/gtkcellrenderer.c:178
+ msgid "Editable mode of the CellRenderer"
+ msgstr "Modo editable del CellRenderer"
+
+-#: gtk/gtkcellrenderer.c:186
++#: ../gtk/gtkcellrenderer.c:186
+ msgid "visible"
+ msgstr "visible"
+
+-#: gtk/gtkcellrenderer.c:187
++#: ../gtk/gtkcellrenderer.c:187
+ msgid "Display the cell"
+ msgstr "Mostrar la celda"
+
+-#: gtk/gtkcellrenderer.c:194
++#: ../gtk/gtkcellrenderer.c:194
+ msgid "Display the cell sensitive"
+ msgstr "Mostrar la celda sensible"
+
+-#: gtk/gtkcellrenderer.c:201
++#: ../gtk/gtkcellrenderer.c:201
+ msgid "xalign"
+ msgstr "xalign"
+
+-#: gtk/gtkcellrenderer.c:202
++#: ../gtk/gtkcellrenderer.c:202
+ msgid "The x-align"
+ msgstr "La alineación x"
+
+-#: gtk/gtkcellrenderer.c:211
++#: ../gtk/gtkcellrenderer.c:211
+ msgid "yalign"
+ msgstr "yalign"
+
+-#: gtk/gtkcellrenderer.c:212
++#: ../gtk/gtkcellrenderer.c:212
+ msgid "The y-align"
+ msgstr "La alineación y"
+
+-#: gtk/gtkcellrenderer.c:221
++#: ../gtk/gtkcellrenderer.c:221
+ msgid "xpad"
+ msgstr "xpad"
+
+-#: gtk/gtkcellrenderer.c:222
++#: ../gtk/gtkcellrenderer.c:222
+ msgid "The xpad"
+ msgstr "La separación x"
+
+-#: gtk/gtkcellrenderer.c:231
++#: ../gtk/gtkcellrenderer.c:231
+ msgid "ypad"
+ msgstr "ypad"
+
+-#: gtk/gtkcellrenderer.c:232
++#: ../gtk/gtkcellrenderer.c:232
+ msgid "The ypad"
+ msgstr "La separación y"
+
+-#: gtk/gtkcellrenderer.c:241
++#: ../gtk/gtkcellrenderer.c:241
+ msgid "width"
+ msgstr "anchura"
+
+-#: gtk/gtkcellrenderer.c:242
++#: ../gtk/gtkcellrenderer.c:242
+ msgid "The fixed width"
+ msgstr "La anchura fija"
+
+-#: gtk/gtkcellrenderer.c:251
++#: ../gtk/gtkcellrenderer.c:251
+ msgid "height"
+ msgstr "altura"
+
+-#: gtk/gtkcellrenderer.c:252
++#: ../gtk/gtkcellrenderer.c:252
+ msgid "The fixed height"
+ msgstr "La altura fija"
+
+-#: gtk/gtkcellrenderer.c:261
++#: ../gtk/gtkcellrenderer.c:261
+ msgid "Is Expander"
+ msgstr "Es expansor"
+
+-#: gtk/gtkcellrenderer.c:262
++#: ../gtk/gtkcellrenderer.c:262
+ msgid "Row has children"
+ msgstr "La fila tiene hijos"
+
+-#: gtk/gtkcellrenderer.c:270
++#: ../gtk/gtkcellrenderer.c:270
+ msgid "Is Expanded"
+ msgstr "Está expandido"
+
+-#: gtk/gtkcellrenderer.c:271
++#: ../gtk/gtkcellrenderer.c:271
+ msgid "Row is an expander row, and is expanded"
+ msgstr "La fila es una fila de expansor, y está expandida"
+
+-#: gtk/gtkcellrenderer.c:278
++#: ../gtk/gtkcellrenderer.c:278
+ msgid "Cell background color name"
+ msgstr "Nombre del color de fondo de la celda"
+
+-#: gtk/gtkcellrenderer.c:279
++#: ../gtk/gtkcellrenderer.c:279
+ msgid "Cell background color as a string"
+ msgstr "Color de fondo de la celda como una cadena"
+
+-#: gtk/gtkcellrenderer.c:286
++#: ../gtk/gtkcellrenderer.c:286
+ msgid "Cell background color"
+ msgstr "Color de fondo de la celda"
+
+-#: gtk/gtkcellrenderer.c:287
++#: ../gtk/gtkcellrenderer.c:287
+ msgid "Cell background color as a GdkColor"
+ msgstr "Color de fondo de la celda como GdkColor"
+
+-#: gtk/gtkcellrenderer.c:294
++#: ../gtk/gtkcellrenderer.c:294
+ msgid "Editing"
+ msgstr "Editando"
+
+-#: gtk/gtkcellrenderer.c:295
++#: ../gtk/gtkcellrenderer.c:295
+ msgid "Whether the cell renderer is currently in editing mode"
+ msgstr "Indica si la renderización de la celda está en modo de edición"
+
+-#: gtk/gtkcellrenderer.c:303
++#: ../gtk/gtkcellrenderer.c:303
+ msgid "Cell background set"
+ msgstr "Establece el fondo de la celda"
+
+-#: gtk/gtkcellrenderer.c:304
++#: ../gtk/gtkcellrenderer.c:304
+ msgid "Whether this tag affects the cell background color"
+ msgstr "Indica si esta etiqueta afecta el color de fondo de la celda"
+
+-#: gtk/gtkcellrendereraccel.c:104
++#: ../gtk/gtkcellrendereraccel.c:104
+ msgid "Accelerator key"
+ msgstr "Tecla aceleradora"
+
+-#: gtk/gtkcellrendereraccel.c:105
++#: ../gtk/gtkcellrendereraccel.c:105
+ msgid "The keyval of the accelerator"
+ msgstr "El valor de la tecla del acelerador"
+
+-#: gtk/gtkcellrendereraccel.c:121
++#: ../gtk/gtkcellrendereraccel.c:121
+ msgid "Accelerator modifiers"
+ msgstr "Modificadores del acelerador"
+
+-#: gtk/gtkcellrendereraccel.c:122
++#: ../gtk/gtkcellrendereraccel.c:122
+ msgid "The modifier mask of the accelerator"
+ msgstr "La máscara del modificador del acelerador"
+
+-#: gtk/gtkcellrendereraccel.c:139
++#: ../gtk/gtkcellrendereraccel.c:139
+ msgid "Accelerator keycode"
+ msgstr "Código de tecla del acelerador"
+
+-#: gtk/gtkcellrendereraccel.c:140
++#: ../gtk/gtkcellrendereraccel.c:140
+ msgid "The hardware keycode of the accelerator"
+ msgstr "El código de tecla hardware del acelerador"
+
+-#: gtk/gtkcellrendereraccel.c:159
++#: ../gtk/gtkcellrendereraccel.c:159
+ msgid "Accelerator Mode"
+ msgstr "Modo del acelerador"
+
+-#: gtk/gtkcellrendereraccel.c:160
++#: ../gtk/gtkcellrendereraccel.c:160
+ msgid "The type of accelerators"
+ msgstr "El tipo de aceleradores"
+
+-#: gtk/gtkcellrenderercombo.c:107
++#: ../gtk/gtkcellrenderercombo.c:107
+ msgid "Model"
+ msgstr "Modelo"
+
+-#: gtk/gtkcellrenderercombo.c:108
++#: ../gtk/gtkcellrenderercombo.c:108
+ msgid "The model containing the possible values for the combo box"
+ msgstr "El modelo que contiene los valores posibles para el ComboBox"
+
+-#: gtk/gtkcellrenderercombo.c:130 gtk/gtkcomboboxentry.c:106
++#: ../gtk/gtkcellrenderercombo.c:130 ../gtk/gtkcomboboxentry.c:106
+ msgid "Text Column"
+ msgstr "Columna de texto"
+
+-#: gtk/gtkcellrenderercombo.c:131 gtk/gtkcomboboxentry.c:107
++#: ../gtk/gtkcellrenderercombo.c:131 ../gtk/gtkcomboboxentry.c:107
+ msgid "A column in the data source model to get the strings from"
+ msgstr ""
+ "Una columna en el modelo de origen de datos del que se obtienen las cadenas"
+
+-#: gtk/gtkcellrenderercombo.c:148
++#: ../gtk/gtkcellrenderercombo.c:148
+ msgid "Has Entry"
+ msgstr "Tiene entrada"
+
+-#: gtk/gtkcellrenderercombo.c:149
++#: ../gtk/gtkcellrenderercombo.c:149
+ msgid "If FALSE, don't allow to enter strings other than the chosen ones"
+ msgstr "Si es «FALSE», no permitir introducir cadenas distintas de las elegidas"
+
+-#: gtk/gtkcellrendererpixbuf.c:111
++#: ../gtk/gtkcellrendererpixbuf.c:111
+ msgid "Pixbuf Object"
+ msgstr "Objeto Pixbuf"
+
+-#: gtk/gtkcellrendererpixbuf.c:112
++#: ../gtk/gtkcellrendererpixbuf.c:112
+ msgid "The pixbuf to render"
+ msgstr "El pixbuf a renderizar"
+
+-#: gtk/gtkcellrendererpixbuf.c:119
++#: ../gtk/gtkcellrendererpixbuf.c:119
+ msgid "Pixbuf Expander Open"
+ msgstr "Pixbuf del expansor abierto"
+
+-#: gtk/gtkcellrendererpixbuf.c:120
++#: ../gtk/gtkcellrendererpixbuf.c:120
+ msgid "Pixbuf for open expander"
+ msgstr "El pixbuf para el expansor abierto"
+
+-#: gtk/gtkcellrendererpixbuf.c:127
++#: ../gtk/gtkcellrendererpixbuf.c:127
+ msgid "Pixbuf Expander Closed"
+ msgstr "Pixbuf del expansor cerrado"
+
+-#: gtk/gtkcellrendererpixbuf.c:128
++#: ../gtk/gtkcellrendererpixbuf.c:128
+ msgid "Pixbuf for closed expander"
+ msgstr "El pixbuf para el expansor cerrado"
+
+-#: gtk/gtkcellrendererpixbuf.c:135 gtk/gtkimage.c:172 gtk/gtkstatusicon.c:202
++#: ../gtk/gtkcellrendererpixbuf.c:135 ../gtk/gtkimage.c:172
++#: ../gtk/gtkstatusicon.c:202
+ msgid "Stock ID"
+ msgstr "ID del inventario"
+
+-#: gtk/gtkcellrendererpixbuf.c:136
++#: ../gtk/gtkcellrendererpixbuf.c:136
+ msgid "The stock ID of the stock icon to render"
+ msgstr "El ID de inventario del icono de inventario a renderizar"
+
+-#: gtk/gtkcellrendererpixbuf.c:143 gtk/gtkrecentmanager.c:245
+-#: gtk/gtkstatusicon.c:243
++#: ../gtk/gtkcellrendererpixbuf.c:143 ../gtk/gtkrecentmanager.c:245
++#: ../gtk/gtkstatusicon.c:243
+ msgid "Size"
+ msgstr "Tamaño"
+
+-#: gtk/gtkcellrendererpixbuf.c:144
++#: ../gtk/gtkcellrendererpixbuf.c:144
+ msgid "The GtkIconSize value that specifies the size of the rendered icon"
+ msgstr "El valor de GTKIconSize que especifica el tamaño del icono renderizado"
+
+-#: gtk/gtkcellrendererpixbuf.c:153
++#: ../gtk/gtkcellrendererpixbuf.c:153
+ msgid "Detail"
+ msgstr "Detalle"
+
+-#: gtk/gtkcellrendererpixbuf.c:154
++#: ../gtk/gtkcellrendererpixbuf.c:154
+ msgid "Render detail to pass to the theme engine"
+ msgstr "Detalle de renderizado a pasar al motor de temas"
+
+-#: gtk/gtkcellrendererpixbuf.c:187
++#: ../gtk/gtkcellrendererpixbuf.c:187
+ msgid "Follow State"
+ msgstr "Seguir estado"
+
+-#: gtk/gtkcellrendererpixbuf.c:188
++#: ../gtk/gtkcellrendererpixbuf.c:188
+ msgid "Whether the rendered pixbuf should be colorized according to the state"
+ msgstr "Indica si el pixbuf renderizado debe colorearse de acuerdo al estado"
+
+-#: gtk/gtkcellrendererpixbuf.c:205 gtk/gtkimage.c:247 gtk/gtkwindow.c:576
++#: ../gtk/gtkcellrendererpixbuf.c:205 ../gtk/gtkimage.c:247
++#: ../gtk/gtkwindow.c:576
+ msgid "Icon"
+ msgstr "Icono"
+
+-#: gtk/gtkcellrendererpixbuf.c:206 gtk/gtkimage.c:248 gtk/gtkstatusicon.c:227
++#: ../gtk/gtkcellrendererpixbuf.c:206 ../gtk/gtkimage.c:248
++#: ../gtk/gtkstatusicon.c:227
+ msgid "The GIcon being displayed"
+ msgstr "El icono mostrado"
+
+-#: gtk/gtkcellrendererprogress.c:129
++#: ../gtk/gtkcellrendererprogress.c:129
+ msgid "Value of the progress bar"
+ msgstr "Valor de la barra de progreso"
+
+-#: gtk/gtkcellrendererprogress.c:146 gtk/gtkcellrenderertext.c:195
+-#: gtk/gtkentry.c:582 gtk/gtkmessagedialog.c:153 gtk/gtkprogressbar.c:184
+-#: gtk/gtktextbuffer.c:197
++#: ../gtk/gtkcellrendererprogress.c:146 ../gtk/gtkcellrenderertext.c:195
++#: ../gtk/gtkentry.c:582 ../gtk/gtkmessagedialog.c:153
++#: ../gtk/gtkprogressbar.c:184 ../gtk/gtktextbuffer.c:197
+ msgid "Text"
+ msgstr "Texto"
+
+-#: gtk/gtkcellrendererprogress.c:147
++#: ../gtk/gtkcellrendererprogress.c:147
+ msgid "Text on the progress bar"
+ msgstr "Texto en la barra de progreso"
+
+-#: gtk/gtkcellrendererprogress.c:170
++#: ../gtk/gtkcellrendererprogress.c:170
+ msgid "Pulse"
+ msgstr "Pulso"
+
+-#: gtk/gtkcellrendererprogress.c:171
++#: ../gtk/gtkcellrendererprogress.c:171
+ msgid ""
+ "Set this to positive values to indicate that some progress is made, but you "
+ "don't know how much."
+@@ -1287,11 +1296,11 @@
+ "Establezca esto a valores positivos para indicar que se realiza algún "
+ "progreso, pero no se sabe cuánto."
+
+-#: gtk/gtkcellrendererprogress.c:187 gtk/gtkprogress.c:118
++#: ../gtk/gtkcellrendererprogress.c:187 ../gtk/gtkprogress.c:118
+ msgid "Text x alignment"
+ msgstr "Alineación x del texto"
+
+-#: gtk/gtkcellrendererprogress.c:188 gtk/gtkprogress.c:119
++#: ../gtk/gtkcellrendererprogress.c:188 ../gtk/gtkprogress.c:119
+ msgid ""
+ "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
+ "layouts."
+@@ -1299,214 +1308,221 @@
+ "La alineación horizontal del texto, desde 0 (izquierda) hasta 1 (derecha). "
+ "Al revés para distribuciones D-->I."
+
+-#: gtk/gtkcellrendererprogress.c:204 gtk/gtkprogress.c:125
++#: ../gtk/gtkcellrendererprogress.c:204 ../gtk/gtkprogress.c:125
+ msgid "Text y alignment"
+ msgstr "Alineación y del texto"
+
+-#: gtk/gtkcellrendererprogress.c:205 gtk/gtkprogress.c:126
++#: ../gtk/gtkcellrendererprogress.c:205 ../gtk/gtkprogress.c:126
+ msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
+ msgstr "La alineación vertical del texto, desde 0 (superior) a 1 (inferior)."
+
+-#: gtk/gtkcellrendererprogress.c:221 gtk/gtkiconview.c:731
+-#: gtk/gtkprogressbar.c:126 gtk/gtkscalebutton.c:193 gtk/gtkstatusicon.c:301
+-#: gtk/gtktoolbar.c:492 gtk/gtktrayicon-x11.c:95
++#: ../gtk/gtkcellrendererprogress.c:221 ../gtk/gtkiconview.c:731
++#: ../gtk/gtkprogressbar.c:126 ../gtk/gtkscalebutton.c:193
++#: ../gtk/gtkstatusicon.c:301 ../gtk/gtktoolbar.c:492
++#: ../gtk/gtktrayicon-x11.c:95
+ msgid "Orientation"
+ msgstr "Orientación"
+
+-#: gtk/gtkcellrendererprogress.c:222 gtk/gtkprogressbar.c:127
++#: ../gtk/gtkcellrendererprogress.c:222 ../gtk/gtkprogressbar.c:127
+ msgid "Orientation and growth direction of the progress bar"
+ msgstr "Orientación y dirección del crecimiento de la barra de progreso"
+
+-#: gtk/gtkcellrendererspin.c:93 gtk/gtkprogressbar.c:118 gtk/gtkrange.c:346
+-#: gtk/gtkscalebutton.c:221 gtk/gtkspinbutton.c:208
++#: ../gtk/gtkcellrendererspin.c:93 ../gtk/gtkprogressbar.c:118
++#: ../gtk/gtkrange.c:346 ../gtk/gtkscalebutton.c:221
++#: ../gtk/gtkspinbutton.c:208
+ msgid "Adjustment"
+ msgstr "Ajuste"
+
+-#: gtk/gtkcellrendererspin.c:94
++#: ../gtk/gtkcellrendererspin.c:94
+ msgid "The adjustment that holds the value of the spinbutton."
+ msgstr "El ajuste que mantiene el valor del botón incrementable."
+
+-#: gtk/gtkcellrendererspin.c:109
++#: ../gtk/gtkcellrendererspin.c:109
+ msgid "Climb rate"
+ msgstr "Tasa de subida"
+
+-#: gtk/gtkcellrendererspin.c:110 gtk/gtkspinbutton.c:217
++#: ../gtk/gtkcellrendererspin.c:110 ../gtk/gtkspinbutton.c:217
+ msgid "The acceleration rate when you hold down a button"
+ msgstr "La tasa de aceleración cuando mantiene apretado un botón"
+
+-#: gtk/gtkcellrendererspin.c:123 gtk/gtkscale.c:142 gtk/gtkspinbutton.c:226
++#: ../gtk/gtkcellrendererspin.c:123 ../gtk/gtkscale.c:142
++#: ../gtk/gtkspinbutton.c:226
+ msgid "Digits"
+ msgstr "Dígitos"
+
+-#: gtk/gtkcellrendererspin.c:124 gtk/gtkspinbutton.c:227
++#: ../gtk/gtkcellrendererspin.c:124 ../gtk/gtkspinbutton.c:227
+ msgid "The number of decimal places to display"
+ msgstr "El número de lugares decimales que mostrar"
+
+-#: gtk/gtkcellrenderertext.c:196
++#: ../gtk/gtkcellrenderertext.c:196
+ msgid "Text to render"
+ msgstr "Texto a renderizar"
+
+-#: gtk/gtkcellrenderertext.c:203
++#: ../gtk/gtkcellrenderertext.c:203
+ msgid "Markup"
+ msgstr "Marcado"
+
+-#: gtk/gtkcellrenderertext.c:204
++#: ../gtk/gtkcellrenderertext.c:204
+ msgid "Marked up text to render"
+ msgstr "Texto resaltado a renderizar"
+
+-#: gtk/gtkcellrenderertext.c:211 gtk/gtklabel.c:323
++#: ../gtk/gtkcellrenderertext.c:211 ../gtk/gtklabel.c:323
+ msgid "Attributes"
+ msgstr "Atributos"
+
+-#: gtk/gtkcellrenderertext.c:212
++#: ../gtk/gtkcellrenderertext.c:212
+ msgid "A list of style attributes to apply to the text of the renderer"
+ msgstr ""
+ "Un lista de atributos de estilos para aplicar al texto del renderizador"
+
+-#: gtk/gtkcellrenderertext.c:219
++#: ../gtk/gtkcellrenderertext.c:219
+ msgid "Single Paragraph Mode"
+ msgstr "Modo de parágrafo simple"
+
+-#: gtk/gtkcellrenderertext.c:220
++#: ../gtk/gtkcellrenderertext.c:220
+ msgid "Whether or not to keep all text in a single paragraph"
+ msgstr "Indica si debe mantenerse o no todo el texto en un sólo parágrafo"
+
+-#: gtk/gtkcellrenderertext.c:228 gtk/gtkcellview.c:160 gtk/gtktexttag.c:183
++#: ../gtk/gtkcellrenderertext.c:228 ../gtk/gtkcellview.c:160
++#: ../gtk/gtktexttag.c:183
+ msgid "Background color name"
+ msgstr "Nombre del color de fondo"
+
+-#: gtk/gtkcellrenderertext.c:229 gtk/gtkcellview.c:161 gtk/gtktexttag.c:184
++#: ../gtk/gtkcellrenderertext.c:229 ../gtk/gtkcellview.c:161
++#: ../gtk/gtktexttag.c:184
+ msgid "Background color as a string"
+ msgstr "Color de fondo como una cadena"
+
+-#: gtk/gtkcellrenderertext.c:236 gtk/gtkcellview.c:167 gtk/gtktexttag.c:191
++#: ../gtk/gtkcellrenderertext.c:236 ../gtk/gtkcellview.c:167
++#: ../gtk/gtktexttag.c:191
+ msgid "Background color"
+ msgstr "Color de fondo"
+
+-#: gtk/gtkcellrenderertext.c:237 gtk/gtkcellview.c:168
++#: ../gtk/gtkcellrenderertext.c:237 ../gtk/gtkcellview.c:168
+ msgid "Background color as a GdkColor"
+ msgstr "Color de fondo como GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:244 gtk/gtktexttag.c:217
++#: ../gtk/gtkcellrenderertext.c:244 ../gtk/gtktexttag.c:217
+ msgid "Foreground color name"
+ msgstr "Nombre del color de primer plano"
+
+-#: gtk/gtkcellrenderertext.c:245 gtk/gtktexttag.c:218
++#: ../gtk/gtkcellrenderertext.c:245 ../gtk/gtktexttag.c:218
+ msgid "Foreground color as a string"
+ msgstr "Color de primer plano como una cadena"
+
+-#: gtk/gtkcellrenderertext.c:252 gtk/gtktexttag.c:225
++#: ../gtk/gtkcellrenderertext.c:252 ../gtk/gtktexttag.c:225
+ msgid "Foreground color"
+ msgstr "Color de primer plano"
+
+-#: gtk/gtkcellrenderertext.c:253
++#: ../gtk/gtkcellrenderertext.c:253
+ msgid "Foreground color as a GdkColor"
+ msgstr "Color de primer plano como GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:261 gtk/gtkentry.c:506 gtk/gtktexttag.c:251
+-#: gtk/gtktextview.c:568
++#: ../gtk/gtkcellrenderertext.c:261 ../gtk/gtkentry.c:506
++#: ../gtk/gtktexttag.c:251 ../gtk/gtktextview.c:568
+ msgid "Editable"
+ msgstr "Editable"
+
+-#: gtk/gtkcellrenderertext.c:262 gtk/gtktexttag.c:252 gtk/gtktextview.c:569
++#: ../gtk/gtkcellrenderertext.c:262 ../gtk/gtktexttag.c:252
++#: ../gtk/gtktextview.c:569
+ msgid "Whether the text can be modified by the user"
+ msgstr "Indica si el texto puede modificarse por el usuario"
+
+-#: gtk/gtkcellrenderertext.c:269 gtk/gtkcellrenderertext.c:277
+-#: gtk/gtkfontsel.c:188 gtk/gtktexttag.c:267 gtk/gtktexttag.c:275
++#: ../gtk/gtkcellrenderertext.c:269 ../gtk/gtkcellrenderertext.c:277
++#: ../gtk/gtkfontsel.c:188 ../gtk/gtktexttag.c:267 ../gtk/gtktexttag.c:275
+ msgid "Font"
+ msgstr "Tipografía"
+
+-#: gtk/gtkcellrenderertext.c:270 gtk/gtktexttag.c:268
++#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtktexttag.c:268
+ msgid "Font description as a string, e.g. \"Sans Italic 12\""
+ msgstr "Descripción de la tipografía como una cadena, ejemplo: «Sans Italic 12»"
+
+-#: gtk/gtkcellrenderertext.c:278 gtk/gtktexttag.c:276
++#: ../gtk/gtkcellrenderertext.c:278 ../gtk/gtktexttag.c:276
+ msgid "Font description as a PangoFontDescription struct"
+ msgstr "Descripción de la tipografía como una estructura PangoFontDescription"
+
+-#: gtk/gtkcellrenderertext.c:286 gtk/gtktexttag.c:283
++#: ../gtk/gtkcellrenderertext.c:286 ../gtk/gtktexttag.c:283
+ msgid "Font family"
+ msgstr "Familia tipográfica"
+
+-#: gtk/gtkcellrenderertext.c:287 gtk/gtktexttag.c:284
++#: ../gtk/gtkcellrenderertext.c:287 ../gtk/gtktexttag.c:284
+ msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
+ msgstr ""
+ "Nombre de la familia tipográfica, ej. Sans, Helvética, Times, Monospace"
+
+-#: gtk/gtkcellrenderertext.c:294 gtk/gtkcellrenderertext.c:295
+-#: gtk/gtktexttag.c:291
++#: ../gtk/gtkcellrenderertext.c:294 ../gtk/gtkcellrenderertext.c:295
++#: ../gtk/gtktexttag.c:291
+ msgid "Font style"
+ msgstr "Estilo de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:303 gtk/gtkcellrenderertext.c:304
+-#: gtk/gtktexttag.c:300
++#: ../gtk/gtkcellrenderertext.c:303 ../gtk/gtkcellrenderertext.c:304
++#: ../gtk/gtktexttag.c:300
+ msgid "Font variant"
+ msgstr "Variante de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:312 gtk/gtkcellrenderertext.c:313
+-#: gtk/gtktexttag.c:309
++#: ../gtk/gtkcellrenderertext.c:312 ../gtk/gtkcellrenderertext.c:313
++#: ../gtk/gtktexttag.c:309
+ msgid "Font weight"
+ msgstr "Anchura de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:322 gtk/gtkcellrenderertext.c:323
+-#: gtk/gtktexttag.c:320
++#: ../gtk/gtkcellrenderertext.c:322 ../gtk/gtkcellrenderertext.c:323
++#: ../gtk/gtktexttag.c:320
+ msgid "Font stretch"
+ msgstr "Estiramiento de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:331 gtk/gtkcellrenderertext.c:332
+-#: gtk/gtktexttag.c:329
++#: ../gtk/gtkcellrenderertext.c:331 ../gtk/gtkcellrenderertext.c:332
++#: ../gtk/gtktexttag.c:329
+ msgid "Font size"
+ msgstr "Tamaño de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:341 gtk/gtktexttag.c:349
++#: ../gtk/gtkcellrenderertext.c:341 ../gtk/gtktexttag.c:349
+ msgid "Font points"
+ msgstr "Puntos de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:342 gtk/gtktexttag.c:350
++#: ../gtk/gtkcellrenderertext.c:342 ../gtk/gtktexttag.c:350
+ msgid "Font size in points"
+ msgstr "Tamaño de la tipografía en puntos"
+
+-#: gtk/gtkcellrenderertext.c:351 gtk/gtktexttag.c:339
++#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:339
+ msgid "Font scale"
+ msgstr "Escala de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:352
++#: ../gtk/gtkcellrenderertext.c:352
+ msgid "Font scaling factor"
+ msgstr "Factor de escalado de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:361 gtk/gtktexttag.c:418
++#: ../gtk/gtkcellrenderertext.c:361 ../gtk/gtktexttag.c:418
+ msgid "Rise"
+ msgstr "Elevar"
+
+-#: gtk/gtkcellrenderertext.c:362
++#: ../gtk/gtkcellrenderertext.c:362
+ msgid ""
+ "Offset of text above the baseline (below the baseline if rise is negative)"
+ msgstr ""
+ "Desplazamiento del texto sobre la línea base (por debajo de la línea base la "
+ "elevación es negativa)"
+
+-#: gtk/gtkcellrenderertext.c:373 gtk/gtktexttag.c:458
++#: ../gtk/gtkcellrenderertext.c:373 ../gtk/gtktexttag.c:458
+ msgid "Strikethrough"
+ msgstr "Tachar"
+
+-#: gtk/gtkcellrenderertext.c:374 gtk/gtktexttag.c:459
++#: ../gtk/gtkcellrenderertext.c:374 ../gtk/gtktexttag.c:459
+ msgid "Whether to strike through the text"
+ msgstr "Indica si se tacha el texto"
+
+-#: gtk/gtkcellrenderertext.c:381 gtk/gtktexttag.c:466
++#: ../gtk/gtkcellrenderertext.c:381 ../gtk/gtktexttag.c:466
+ msgid "Underline"
+ msgstr "Subrayado"
+
+-#: gtk/gtkcellrenderertext.c:382 gtk/gtktexttag.c:467
++#: ../gtk/gtkcellrenderertext.c:382 ../gtk/gtktexttag.c:467
+ msgid "Style of underline for this text"
+ msgstr "Estilo de subrayado de este texto"
+
+-#: gtk/gtkcellrenderertext.c:390 gtk/gtktexttag.c:378
++#: ../gtk/gtkcellrenderertext.c:390 ../gtk/gtktexttag.c:378
+ msgid "Language"
+ msgstr "Idioma"
+
+-#: gtk/gtkcellrenderertext.c:391
++#: ../gtk/gtkcellrenderertext.c:391
+ msgid ""
+ "The language this text is in, as an ISO code. Pango can use this as a hint "
+ "when rendering the text. If you don't understand this parameter, you "
+@@ -1516,11 +1532,12 @@
+ "como una ayuda cuando está renderizando el texto. Si no comprende este "
+ "parámetro probablemente no lo necesite"
+
+-#: gtk/gtkcellrenderertext.c:411 gtk/gtklabel.c:448 gtk/gtkprogressbar.c:206
++#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtklabel.c:448
++#: ../gtk/gtkprogressbar.c:206
+ msgid "Ellipsize"
+ msgstr "Elipsis"
+
+-#: gtk/gtkcellrenderertext.c:412
++#: ../gtk/gtkcellrenderertext.c:412
+ msgid ""
+ "The preferred place to ellipsize the string, if the cell renderer does not "
+ "have enough room to display the entire string"
+@@ -1528,20 +1545,20 @@
+ "El lugar preferido para la elipsis de la cadena, si el renderizador de la "
+ "celda no tiene espacio suficiente para mostrar la cadena completa"
+
+-#: gtk/gtkcellrenderertext.c:431 gtk/gtkfilechooserbutton.c:421
+-#: gtk/gtklabel.c:468
++#: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtkfilechooserbutton.c:421
++#: ../gtk/gtklabel.c:468
+ msgid "Width In Characters"
+ msgstr "Anchura en caracteres"
+
+-#: gtk/gtkcellrenderertext.c:432 gtk/gtklabel.c:469
++#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtklabel.c:469
+ msgid "The desired width of the label, in characters"
+ msgstr "La anchura deseada de la etiqueta, en caracteres"
+
+-#: gtk/gtkcellrenderertext.c:450 gtk/gtktexttag.c:475
++#: ../gtk/gtkcellrenderertext.c:450 ../gtk/gtktexttag.c:475
+ msgid "Wrap mode"
+ msgstr "Modo de ajuste"
+
+-#: gtk/gtkcellrenderertext.c:451
++#: ../gtk/gtkcellrenderertext.c:451
+ msgid ""
+ "How to break the string into multiple lines, if the cell renderer does not "
+ "have enough room to display the entire string"
+@@ -1549,627 +1566,633 @@
+ "Cómo romper la cadena en líneas múltiples, si el renderizador de la celda no "
+ "tiene suficiente espacio para mostrar la cadena completa"
+
+-#: gtk/gtkcellrenderertext.c:470 gtk/gtkcombobox.c:678
++#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtkcombobox.c:678
+ msgid "Wrap width"
+ msgstr "Ajustar anchura"
+
+-#: gtk/gtkcellrenderertext.c:471
++#: ../gtk/gtkcellrenderertext.c:471
+ msgid "The width at which the text is wrapped"
+ msgstr "La anchura a la que el texto se ajusta"
+
+-#: gtk/gtkcellrenderertext.c:491 gtk/gtktreeviewcolumn.c:297
++#: ../gtk/gtkcellrenderertext.c:491 ../gtk/gtktreeviewcolumn.c:297
+ msgid "Alignment"
+ msgstr "Alineación"
+
+-#: gtk/gtkcellrenderertext.c:492
++#: ../gtk/gtkcellrenderertext.c:492
+ msgid "How to align the lines"
+ msgstr "Cómo alinear las líneas"
+
+-#: gtk/gtkcellrenderertext.c:502 gtk/gtkcellview.c:190 gtk/gtktexttag.c:564
++#: ../gtk/gtkcellrenderertext.c:502 ../gtk/gtkcellview.c:190
++#: ../gtk/gtktexttag.c:564
+ msgid "Background set"
+ msgstr "Establece el fondo"
+
+-#: gtk/gtkcellrenderertext.c:503 gtk/gtkcellview.c:191 gtk/gtktexttag.c:565
++#: ../gtk/gtkcellrenderertext.c:503 ../gtk/gtkcellview.c:191
++#: ../gtk/gtktexttag.c:565
+ msgid "Whether this tag affects the background color"
+ msgstr "Indica si esta etiqueta afecta el color de fondo"
+
+-#: gtk/gtkcellrenderertext.c:506 gtk/gtktexttag.c:576
++#: ../gtk/gtkcellrenderertext.c:506 ../gtk/gtktexttag.c:576
+ msgid "Foreground set"
+ msgstr "Establece el primer plano"
+
+-#: gtk/gtkcellrenderertext.c:507 gtk/gtktexttag.c:577
++#: ../gtk/gtkcellrenderertext.c:507 ../gtk/gtktexttag.c:577
+ msgid "Whether this tag affects the foreground color"
+ msgstr "Indica si esta etiqueta afecta al color de frente"
+
+-#: gtk/gtkcellrenderertext.c:510 gtk/gtktexttag.c:584
++#: ../gtk/gtkcellrenderertext.c:510 ../gtk/gtktexttag.c:584
+ msgid "Editability set"
+ msgstr "Establece la editabilidad"
+
+-#: gtk/gtkcellrenderertext.c:511 gtk/gtktexttag.c:585
++#: ../gtk/gtkcellrenderertext.c:511 ../gtk/gtktexttag.c:585
+ msgid "Whether this tag affects text editability"
+ msgstr "Indica si esta etiqueta afecta la editabilidad del texto"
+
+-#: gtk/gtkcellrenderertext.c:514 gtk/gtktexttag.c:588
++#: ../gtk/gtkcellrenderertext.c:514 ../gtk/gtktexttag.c:588
+ msgid "Font family set"
+ msgstr "Establece familia tipográfica"
+
+-#: gtk/gtkcellrenderertext.c:515 gtk/gtktexttag.c:589
++#: ../gtk/gtkcellrenderertext.c:515 ../gtk/gtktexttag.c:589
+ msgid "Whether this tag affects the font family"
+ msgstr "Indica si esta etiqueta afecta a la familia de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:518 gtk/gtktexttag.c:592
++#: ../gtk/gtkcellrenderertext.c:518 ../gtk/gtktexttag.c:592
+ msgid "Font style set"
+ msgstr "Establece el estilo de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:519 gtk/gtktexttag.c:593
++#: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtktexttag.c:593
+ msgid "Whether this tag affects the font style"
+ msgstr "Indica si esta etiqueta afecta el estilo de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:522 gtk/gtktexttag.c:596
++#: ../gtk/gtkcellrenderertext.c:522 ../gtk/gtktexttag.c:596
+ msgid "Font variant set"
+ msgstr "Establece la variante de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:523 gtk/gtktexttag.c:597
++#: ../gtk/gtkcellrenderertext.c:523 ../gtk/gtktexttag.c:597
+ msgid "Whether this tag affects the font variant"
+ msgstr "Indica si esta etiqueta afecta la variante de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:526 gtk/gtktexttag.c:600
++#: ../gtk/gtkcellrenderertext.c:526 ../gtk/gtktexttag.c:600
+ msgid "Font weight set"
+ msgstr "Establece el peso de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:527 gtk/gtktexttag.c:601
++#: ../gtk/gtkcellrenderertext.c:527 ../gtk/gtktexttag.c:601
+ msgid "Whether this tag affects the font weight"
+ msgstr "Indica si esta etiqueta afecta el peso de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:530 gtk/gtktexttag.c:604
++#: ../gtk/gtkcellrenderertext.c:530 ../gtk/gtktexttag.c:604
+ msgid "Font stretch set"
+ msgstr "Establece el ancho de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:531 gtk/gtktexttag.c:605
++#: ../gtk/gtkcellrenderertext.c:531 ../gtk/gtktexttag.c:605
+ msgid "Whether this tag affects the font stretch"
+ msgstr "Indica si esta etiqueta afecta el estiramiento de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:534 gtk/gtktexttag.c:608
++#: ../gtk/gtkcellrenderertext.c:534 ../gtk/gtktexttag.c:608
+ msgid "Font size set"
+ msgstr "Establece el tamaño de tipografía"
+
+-#: gtk/gtkcellrenderertext.c:535 gtk/gtktexttag.c:609
++#: ../gtk/gtkcellrenderertext.c:535 ../gtk/gtktexttag.c:609
+ msgid "Whether this tag affects the font size"
+ msgstr "Indica si esta etiqueta afecta el tamaño de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:538 gtk/gtktexttag.c:612
++#: ../gtk/gtkcellrenderertext.c:538 ../gtk/gtktexttag.c:612
+ msgid "Font scale set"
+ msgstr "Establece la escala de la tipografía"
+
+-#: gtk/gtkcellrenderertext.c:539 gtk/gtktexttag.c:613
++#: ../gtk/gtkcellrenderertext.c:539 ../gtk/gtktexttag.c:613
+ msgid "Whether this tag scales the font size by a factor"
+ msgstr ""
+ "Indica si esta etiqueta escala el tamaño de la tipografía por un factor"
+
+-#: gtk/gtkcellrenderertext.c:542 gtk/gtktexttag.c:632
++#: ../gtk/gtkcellrenderertext.c:542 ../gtk/gtktexttag.c:632
+ msgid "Rise set"
+ msgstr "Establece el elevamiento"
+
+-#: gtk/gtkcellrenderertext.c:543 gtk/gtktexttag.c:633
++#: ../gtk/gtkcellrenderertext.c:543 ../gtk/gtktexttag.c:633
+ msgid "Whether this tag affects the rise"
+ msgstr "Indica si esta etiqueta afecta la elevación"
+
+-#: gtk/gtkcellrenderertext.c:546 gtk/gtktexttag.c:648
++#: ../gtk/gtkcellrenderertext.c:546 ../gtk/gtktexttag.c:648
+ msgid "Strikethrough set"
+ msgstr "Establece el tachado"
+
+-#: gtk/gtkcellrenderertext.c:547 gtk/gtktexttag.c:649
++#: ../gtk/gtkcellrenderertext.c:547 ../gtk/gtktexttag.c:649
+ msgid "Whether this tag affects strikethrough"
+ msgstr "Indica si esta etiqueta afecta el tachado"
+
+-#: gtk/gtkcellrenderertext.c:550 gtk/gtktexttag.c:656
++#: ../gtk/gtkcellrenderertext.c:550 ../gtk/gtktexttag.c:656
+ msgid "Underline set"
+ msgstr "Establece el subrayado"
+
+-#: gtk/gtkcellrenderertext.c:551 gtk/gtktexttag.c:657
++#: ../gtk/gtkcellrenderertext.c:551 ../gtk/gtktexttag.c:657
+ msgid "Whether this tag affects underlining"
+ msgstr "Indica si esta etiqueta afecta el subrayado"
+
+-#: gtk/gtkcellrenderertext.c:554 gtk/gtktexttag.c:620
++#: ../gtk/gtkcellrenderertext.c:554 ../gtk/gtktexttag.c:620
+ msgid "Language set"
+ msgstr "Establece el idioma"
+
+-#: gtk/gtkcellrenderertext.c:555 gtk/gtktexttag.c:621
++#: ../gtk/gtkcellrenderertext.c:555 ../gtk/gtktexttag.c:621
+ msgid "Whether this tag affects the language the text is rendered as"
+ msgstr "Indica si esta etiqueta afecta al idioma en que se renderiza el texto"
+
+-#: gtk/gtkcellrenderertext.c:558
++#: ../gtk/gtkcellrenderertext.c:558
+ msgid "Ellipsize set"
+ msgstr "Establece la elipsis"
+
+-#: gtk/gtkcellrenderertext.c:559
++#: ../gtk/gtkcellrenderertext.c:559
+ msgid "Whether this tag affects the ellipsize mode"
+ msgstr "Indica si esta etiqueta afecta el modo de elipsis"
+
+-#: gtk/gtkcellrenderertext.c:562
++#: ../gtk/gtkcellrenderertext.c:562
+ msgid "Align set"
+ msgstr "Establece alineación"
+
+-#: gtk/gtkcellrenderertext.c:563
++#: ../gtk/gtkcellrenderertext.c:563
+ msgid "Whether this tag affects the alignment mode"
+ msgstr "Indica si esta etiqueta afecta el modo de alineamiento"
+
+-#: gtk/gtkcellrenderertoggle.c:126
++#: ../gtk/gtkcellrenderertoggle.c:126
+ msgid "Toggle state"
+ msgstr "Estado conmutable"
+
+-#: gtk/gtkcellrenderertoggle.c:127
++#: ../gtk/gtkcellrenderertoggle.c:127
+ msgid "The toggle state of the button"
+ msgstr "El estado conmutable del botón"
+
+-#: gtk/gtkcellrenderertoggle.c:134
++#: ../gtk/gtkcellrenderertoggle.c:134
+ msgid "Inconsistent state"
+ msgstr "Estado inconsistente"
+
+-#: gtk/gtkcellrenderertoggle.c:135
++#: ../gtk/gtkcellrenderertoggle.c:135
+ msgid "The inconsistent state of the button"
+ msgstr "El estado inconsistente del botón"
+
+-#: gtk/gtkcellrenderertoggle.c:142
++#: ../gtk/gtkcellrenderertoggle.c:142
+ msgid "Activatable"
+ msgstr "Activable"
+
+-#: gtk/gtkcellrenderertoggle.c:143
++#: ../gtk/gtkcellrenderertoggle.c:143
+ msgid "The toggle button can be activated"
+ msgstr "El botón conmutable puede ser activado"
+
+-#: gtk/gtkcellrenderertoggle.c:150
++#: ../gtk/gtkcellrenderertoggle.c:150
+ msgid "Radio state"
+ msgstr "Estado de radio"
+
+-#: gtk/gtkcellrenderertoggle.c:151
++#: ../gtk/gtkcellrenderertoggle.c:151
+ msgid "Draw the toggle button as a radio button"
+ msgstr "Dibujar el botón de activación como un botón de radio"
+
+-#: gtk/gtkcellrenderertoggle.c:158
++#: ../gtk/gtkcellrenderertoggle.c:158
+ msgid "Indicator size"
+ msgstr "Tamaño del indicador"
+
+-#: gtk/gtkcellrenderertoggle.c:159 gtk/gtkcheckbutton.c:70
+-#: gtk/gtkcheckmenuitem.c:112
++#: ../gtk/gtkcellrenderertoggle.c:159 ../gtk/gtkcheckbutton.c:70
++#: ../gtk/gtkcheckmenuitem.c:112
+ msgid "Size of check or radio indicator"
+ msgstr "Tamaño del indicador de radio o de la casilla"
+
+-#: gtk/gtkcellview.c:182
++#: ../gtk/gtkcellview.c:182
+ msgid "CellView model"
+ msgstr "Modelo CellView"
+
+-#: gtk/gtkcellview.c:183
++#: ../gtk/gtkcellview.c:183
+ msgid "The model for cell view"
+ msgstr "El modelo para la vista de celda"
+
+-#: gtk/gtkcheckbutton.c:69 gtk/gtkcheckmenuitem.c:110 gtk/gtkoptionmenu.c:168
++#: ../gtk/gtkcheckbutton.c:69 ../gtk/gtkcheckmenuitem.c:110
++#: ../gtk/gtkoptionmenu.c:168
+ msgid "Indicator Size"
+ msgstr "Tamaño del indicador"
+
+-#: gtk/gtkcheckbutton.c:77 gtk/gtkexpander.c:245 gtk/gtkoptionmenu.c:174
++#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkexpander.c:245
++#: ../gtk/gtkoptionmenu.c:174
+ msgid "Indicator Spacing"
+ msgstr "Espacio del indicador"
+
+-#: gtk/gtkcheckbutton.c:78
++#: ../gtk/gtkcheckbutton.c:78
+ msgid "Spacing around check or radio indicator"
+ msgstr "Espacio que rodea el indicador de radio o casilla"
+
+-#: gtk/gtkcheckmenuitem.c:87 gtk/gtkmenu.c:498 gtk/gtktoggleaction.c:118
+-#: gtk/gtktogglebutton.c:102 gtk/gtktoggletoolbutton.c:101
++#: ../gtk/gtkcheckmenuitem.c:87 ../gtk/gtkmenu.c:498
++#: ../gtk/gtktoggleaction.c:118 ../gtk/gtktogglebutton.c:102
++#: ../gtk/gtktoggletoolbutton.c:101
+ msgid "Active"
+ msgstr "Activo"
+
+-#: gtk/gtkcheckmenuitem.c:88
++#: ../gtk/gtkcheckmenuitem.c:88
+ msgid "Whether the menu item is checked"
+ msgstr "Indica si el elemento de menú está marcado"
+
+-#: gtk/gtkcheckmenuitem.c:95 gtk/gtktogglebutton.c:110
++#: ../gtk/gtkcheckmenuitem.c:95 ../gtk/gtktogglebutton.c:110
+ msgid "Inconsistent"
+ msgstr "Inconsistente"
+
+-#: gtk/gtkcheckmenuitem.c:96
++#: ../gtk/gtkcheckmenuitem.c:96
+ msgid "Whether to display an \"inconsistent\" state"
+ msgstr "Indica si se debe mostrar un estado «inconsistente»"
+
+-#: gtk/gtkcheckmenuitem.c:103
++#: ../gtk/gtkcheckmenuitem.c:103
+ msgid "Draw as radio menu item"
+ msgstr "Dibujar como un elemento de menú de radio"
+
+-#: gtk/gtkcheckmenuitem.c:104
++#: ../gtk/gtkcheckmenuitem.c:104
+ msgid "Whether the menu item looks like a radio menu item"
+ msgstr ""
+ "Indica si la apariencia del elemento de menú es como un elemento de menú de "
+ "radio"
+
+-#: gtk/gtkcolorbutton.c:171
++#: ../gtk/gtkcolorbutton.c:171
+ msgid "Use alpha"
+ msgstr "Usar alfa"
+
+-#: gtk/gtkcolorbutton.c:172
++#: ../gtk/gtkcolorbutton.c:172
+ msgid "Whether or not to give the color an alpha value"
+ msgstr "Indica si debe darse o no un valor alfa al color"
+
+ # components/music/nautilus-music-view.c:198
+-#: gtk/gtkcolorbutton.c:186 gtk/gtkfilechooserbutton.c:407
+-#: gtk/gtkfontbutton.c:142 gtk/gtkprintjob.c:116 gtk/gtktreeviewcolumn.c:264
++#: ../gtk/gtkcolorbutton.c:186 ../gtk/gtkfilechooserbutton.c:407
++#: ../gtk/gtkfontbutton.c:142 ../gtk/gtkprintjob.c:116
++#: ../gtk/gtktreeviewcolumn.c:264
+ msgid "Title"
+ msgstr "Título"
+
+-#: gtk/gtkcolorbutton.c:187
++#: ../gtk/gtkcolorbutton.c:187
+ msgid "The title of the color selection dialog"
+ msgstr "El título del diálogo de selección del color"
+
+-#: gtk/gtkcolorbutton.c:201 gtk/gtkcolorsel.c:293
++#: ../gtk/gtkcolorbutton.c:201 ../gtk/gtkcolorsel.c:293
+ msgid "Current Color"
+ msgstr "Color actual"
+
+-#: gtk/gtkcolorbutton.c:202
++#: ../gtk/gtkcolorbutton.c:202
+ msgid "The selected color"
+ msgstr "El color seleccionado"
+
+-#: gtk/gtkcolorbutton.c:216 gtk/gtkcolorsel.c:300
++#: ../gtk/gtkcolorbutton.c:216 ../gtk/gtkcolorsel.c:300
+ msgid "Current Alpha"
+ msgstr "Alfa actual"
+
+-#: gtk/gtkcolorbutton.c:217
++#: ../gtk/gtkcolorbutton.c:217
+ msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
+ msgstr ""
+ "El valor de opacidad actual (0 es completamente transparente, 65535 es "
+ "completamente opaco)"
+
+-#: gtk/gtkcolorsel.c:279
++#: ../gtk/gtkcolorsel.c:279
+ msgid "Has Opacity Control"
+ msgstr "Tiene control de opacidad"
+
+-#: gtk/gtkcolorsel.c:280
++#: ../gtk/gtkcolorsel.c:280
+ msgid "Whether the color selector should allow setting opacity"
+ msgstr "Indica si el selector de color permite seleccionar la opacidad"
+
+-#: gtk/gtkcolorsel.c:286
++#: ../gtk/gtkcolorsel.c:286
+ msgid "Has palette"
+ msgstr "Tiene paleta"
+
+-#: gtk/gtkcolorsel.c:287
++#: ../gtk/gtkcolorsel.c:287
+ msgid "Whether a palette should be used"
+ msgstr "Indica si se debe usar una paleta"
+
+-#: gtk/gtkcolorsel.c:294
++#: ../gtk/gtkcolorsel.c:294
+ msgid "The current color"
+ msgstr "El color actual"
+
+-#: gtk/gtkcolorsel.c:301
++#: ../gtk/gtkcolorsel.c:301
+ msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
+ msgstr ""
+ "El valor de opacidad actual (0 es completamente transparente, 65535 es "
+ "completamente opaco)"
+
+-#: gtk/gtkcolorsel.c:315
++#: ../gtk/gtkcolorsel.c:315
+ msgid "Custom palette"
+ msgstr "Paleta personalizada"
+
+-#: gtk/gtkcolorsel.c:316
++#: ../gtk/gtkcolorsel.c:316
+ msgid "Palette to use in the color selector"
+ msgstr "Paleta que se usará en el selector de colores"
+
+-#: gtk/gtkcolorseldialog.c:102
++#: ../gtk/gtkcolorseldialog.c:102
+ msgid "Color Selection"
+ msgstr "Selección de color"
+
+-#: gtk/gtkcolorseldialog.c:103
++#: ../gtk/gtkcolorseldialog.c:103
+ msgid "The color selection embedded in the dialog."
+ msgstr "La selección de color empotrada en el diálogo."
+
+-#: gtk/gtkcolorseldialog.c:109
++#: ../gtk/gtkcolorseldialog.c:109
+ msgid "OK Button"
+ msgstr "Botón Aceptar"
+
+-#: gtk/gtkcolorseldialog.c:110
++#: ../gtk/gtkcolorseldialog.c:110
+ msgid "The OK button of the dialog."
+ msgstr "El botón Aceptar del diálogo."
+
+-#: gtk/gtkcolorseldialog.c:116
++#: ../gtk/gtkcolorseldialog.c:116
+ msgid "Cancel Button"
+ msgstr "Botón Cancelar"
+
+-#: gtk/gtkcolorseldialog.c:117
++#: ../gtk/gtkcolorseldialog.c:117
+ msgid "The cancel button of the dialog."
+ msgstr "El botón Cancelar del diálogo."
+
+-#: gtk/gtkcolorseldialog.c:123
++#: ../gtk/gtkcolorseldialog.c:123
+ msgid "Help Button"
+ msgstr "Botón Ayuda"
+
+-#: gtk/gtkcolorseldialog.c:124
++#: ../gtk/gtkcolorseldialog.c:124
+ msgid "The help button of the dialog."
+ msgstr "El botón Ayuda del diálogo."
+
+-#: gtk/gtkcombo.c:145
++#: ../gtk/gtkcombo.c:145
+ msgid "Enable arrow keys"
+ msgstr "Activar teclas de flecha"
+
+-#: gtk/gtkcombo.c:146
++#: ../gtk/gtkcombo.c:146
+ msgid "Whether the arrow keys move through the list of items"
+ msgstr ""
+ "Indica si las teclas de flechas se mueven a través de la lista de elementos"
+
+-#: gtk/gtkcombo.c:152
++#: ../gtk/gtkcombo.c:152
+ msgid "Always enable arrows"
+ msgstr "Siempre activar flechas"
+
+-#: gtk/gtkcombo.c:153
++#: ../gtk/gtkcombo.c:153
+ msgid "Obsolete property, ignored"
+ msgstr "Propiedad obsoleta, ignorada"
+
+-#: gtk/gtkcombo.c:159
++#: ../gtk/gtkcombo.c:159
+ msgid "Case sensitive"
+ msgstr "Sensible a la capitalización"
+
+-#: gtk/gtkcombo.c:160
++#: ../gtk/gtkcombo.c:160
+ msgid "Whether list item matching is case sensitive"
+ msgstr ""
+ "Indica si la coincidencia de elementos de la lista es sensible a la "
+ "capitalización"
+
+-#: gtk/gtkcombo.c:167
++#: ../gtk/gtkcombo.c:167
+ msgid "Allow empty"
+ msgstr "Permitir vacío"
+
+-#: gtk/gtkcombo.c:168
++#: ../gtk/gtkcombo.c:168
+ msgid "Whether an empty value may be entered in this field"
+ msgstr "Indica si se puede introducir en este campo un valor vacío"
+
+-#: gtk/gtkcombo.c:175
++#: ../gtk/gtkcombo.c:175
+ msgid "Value in list"
+ msgstr "Valor en la lista"
+
+-#: gtk/gtkcombo.c:176
++#: ../gtk/gtkcombo.c:176
+ msgid "Whether entered values must already be present in the list"
+ msgstr ""
+ "Indica si los valores introducidos deben estar ya presentes en la lista"
+
+-#: gtk/gtkcombobox.c:661
++#: ../gtk/gtkcombobox.c:661
+ msgid "ComboBox model"
+ msgstr "Modelo de ComboBox"
+
+-#: gtk/gtkcombobox.c:662
++#: ../gtk/gtkcombobox.c:662
+ msgid "The model for the combo box"
+ msgstr "El modelo para el ComboBox"
+
+-#: gtk/gtkcombobox.c:679
++#: ../gtk/gtkcombobox.c:679
+ msgid "Wrap width for laying out the items in a grid"
+ msgstr "Ajusta la anchura para distribuir los elementos en una rejilla"
+
+-#: gtk/gtkcombobox.c:701
++#: ../gtk/gtkcombobox.c:701
+ msgid "Row span column"
+ msgstr "Fila expande columna"
+
+-#: gtk/gtkcombobox.c:702
++#: ../gtk/gtkcombobox.c:702
+ msgid "TreeModel column containing the row span values"
+ msgstr "Columna TreeModel que contiene los valores de expansión de la fila"
+
+-#: gtk/gtkcombobox.c:723
++#: ../gtk/gtkcombobox.c:723
+ msgid "Column span column"
+ msgstr "Columna expande columna"
+
+-#: gtk/gtkcombobox.c:724
++#: ../gtk/gtkcombobox.c:724
+ msgid "TreeModel column containing the column span values"
+ msgstr "Columna TreeModel que contiene los valores de expansión de columna"
+
+-#: gtk/gtkcombobox.c:745
++#: ../gtk/gtkcombobox.c:745
+ msgid "Active item"
+ msgstr "Elemento activo"
+
+-#: gtk/gtkcombobox.c:746
++#: ../gtk/gtkcombobox.c:746
+ msgid "The item which is currently active"
+ msgstr "El elemento que está activo actualmente"
+
+-#: gtk/gtkcombobox.c:765 gtk/gtkuimanager.c:220
++#: ../gtk/gtkcombobox.c:765 ../gtk/gtkuimanager.c:220
+ msgid "Add tearoffs to menus"
+ msgstr "Añadir tiradores a los menús"
+
+-#: gtk/gtkcombobox.c:766
++#: ../gtk/gtkcombobox.c:766
+ msgid "Whether dropdowns should have a tearoff menu item"
+ msgstr "Indica si los desplegables deben tener un tirador en el menú"
+
+-#: gtk/gtkcombobox.c:781 gtk/gtkentry.c:531
++#: ../gtk/gtkcombobox.c:781 ../gtk/gtkentry.c:531
+ msgid "Has Frame"
+ msgstr "Tiene marco"
+
+-#: gtk/gtkcombobox.c:782
++#: ../gtk/gtkcombobox.c:782
+ msgid "Whether the combo box draws a frame around the child"
+ msgstr "Indica si el ComboBox dibuja un marco alrededor del hijo"
+
+-#: gtk/gtkcombobox.c:790
++#: ../gtk/gtkcombobox.c:790
+ msgid "Whether the combo box grabs focus when it is clicked with the mouse"
+ msgstr "Indica si el ComboBox obtiene el foco cuando se pulsa con el ratón"
+
+-#: gtk/gtkcombobox.c:805 gtk/gtkmenu.c:553
++#: ../gtk/gtkcombobox.c:805 ../gtk/gtkmenu.c:553
+ msgid "Tearoff Title"
+ msgstr "Título del tirador"
+
+-#: gtk/gtkcombobox.c:806
++#: ../gtk/gtkcombobox.c:806
+ msgid ""
+ "A title that may be displayed by the window manager when the popup is torn-"
+ "off"
+ msgstr ""
+ "Un título que podría mostrar el gestor de ventanas al desprender el emergente"
+
+-#: gtk/gtkcombobox.c:823
++#: ../gtk/gtkcombobox.c:823
+ msgid "Popup shown"
+ msgstr "Emergente mostrado"
+
+-#: gtk/gtkcombobox.c:824
++#: ../gtk/gtkcombobox.c:824
+ msgid "Whether the combo's dropdown is shown"
+ msgstr "Indica si se muestra el desplegable del combo"
+
+-#: gtk/gtkcombobox.c:840
++#: ../gtk/gtkcombobox.c:840
+ msgid "Button Sensitivity"
+ msgstr "Sensibilidad del botón"
+
+-#: gtk/gtkcombobox.c:841
++#: ../gtk/gtkcombobox.c:841
+ msgid "Whether the dropdown button is sensitive when the model is empty"
+ msgstr "Indica si el botón desplegable es sensible cunado el modelo está vacío"
+
+-#: gtk/gtkcombobox.c:848
++#: ../gtk/gtkcombobox.c:848
+ msgid "Appears as list"
+ msgstr "Aparece como una lista"
+
+-#: gtk/gtkcombobox.c:849
++#: ../gtk/gtkcombobox.c:849
+ msgid "Whether dropdowns should look like lists rather than menus"
+ msgstr "Indica si los desplegables se parecen a listas en lugar de menús"
+
+-#: gtk/gtkcombobox.c:865
++#: ../gtk/gtkcombobox.c:865
+ msgid "Arrow Size"
+ msgstr "Tamaño de la flecha"
+
+-#: gtk/gtkcombobox.c:866
++#: ../gtk/gtkcombobox.c:866
+ msgid "The minimum size of the arrow in the combo box"
+ msgstr "El tamaño mínimo de la flecha en la caja combo"
+
+-#: gtk/gtkcombobox.c:881 gtk/gtkentry.c:631 gtk/gtkhandlebox.c:174
+-#: gtk/gtkmenubar.c:194 gtk/gtkstatusbar.c:186 gtk/gtktoolbar.c:630
+-#: gtk/gtkviewport.c:122
++#: ../gtk/gtkcombobox.c:881 ../gtk/gtkentry.c:631 ../gtk/gtkhandlebox.c:174
++#: ../gtk/gtkmenubar.c:194 ../gtk/gtkstatusbar.c:186 ../gtk/gtktoolbar.c:630
++#: ../gtk/gtkviewport.c:122
+ msgid "Shadow type"
+ msgstr "Tipo de sombra"
+
+-#: gtk/gtkcombobox.c:882
++#: ../gtk/gtkcombobox.c:882
+ msgid "Which kind of shadow to draw around the combo box"
+ msgstr "Qué clase de sombra dibujar alrededor de la caja combo"
+
+-#: gtk/gtkcontainer.c:237
++#: ../gtk/gtkcontainer.c:237
+ msgid "Resize mode"
+ msgstr "Modo de redimensión"
+
+-#: gtk/gtkcontainer.c:238
++#: ../gtk/gtkcontainer.c:238
+ msgid "Specify how resize events are handled"
+ msgstr "Especifica cómo se manipulan los eventos de redimensionado"
+
+-#: gtk/gtkcontainer.c:245
++#: ../gtk/gtkcontainer.c:245
+ msgid "Border width"
+ msgstr "Anchura del borde"
+
+-#: gtk/gtkcontainer.c:246
++#: ../gtk/gtkcontainer.c:246
+ msgid "The width of the empty border outside the containers children"
+ msgstr "La anchura del borde vacío fuera de los contenedores hijos"
+
+-#: gtk/gtkcontainer.c:254
++#: ../gtk/gtkcontainer.c:254
+ msgid "Child"
+ msgstr "Hijo"
+
+-#: gtk/gtkcontainer.c:255
++#: ../gtk/gtkcontainer.c:255
+ msgid "Can be used to add a new child to the container"
+ msgstr "Puede usarse para añadir un hijo nuevo al contenedor"
+
+-#: gtk/gtkcurve.c:124
++#: ../gtk/gtkcurve.c:124
+ msgid "Curve type"
+ msgstr "Tipo de curva"
+
+-#: gtk/gtkcurve.c:125
++#: ../gtk/gtkcurve.c:125
+ msgid "Is this curve linear, spline interpolated, or free-form"
+ msgstr "Indica si esta curva es lineal, interpolada de splines, o forma libre"
+
+-#: gtk/gtkcurve.c:132
++#: ../gtk/gtkcurve.c:132
+ msgid "Minimum X"
+ msgstr "X mínimo"
+
+-#: gtk/gtkcurve.c:133
++#: ../gtk/gtkcurve.c:133
+ msgid "Minimum possible value for X"
+ msgstr "Valor mínimo posible para X"
+
+-#: gtk/gtkcurve.c:141
++#: ../gtk/gtkcurve.c:141
+ msgid "Maximum X"
+ msgstr "X máximo"
+
+-#: gtk/gtkcurve.c:142
++#: ../gtk/gtkcurve.c:142
+ msgid "Maximum possible X value"
+ msgstr "Máximo valor posible para X"
+
+-#: gtk/gtkcurve.c:150
++#: ../gtk/gtkcurve.c:150
+ msgid "Minimum Y"
+ msgstr "Y mínimo"
+
+-#: gtk/gtkcurve.c:151
++#: ../gtk/gtkcurve.c:151
+ msgid "Minimum possible value for Y"
+ msgstr "Valor mínimo posible para Y"
+
+-#: gtk/gtkcurve.c:159
++#: ../gtk/gtkcurve.c:159
+ msgid "Maximum Y"
+ msgstr "Y máximo"
+
+-#: gtk/gtkcurve.c:160
++#: ../gtk/gtkcurve.c:160
+ msgid "Maximum possible value for Y"
+ msgstr "Máximo valor posible para Y"
+
+-#: gtk/gtkdialog.c:145
++#: ../gtk/gtkdialog.c:145
+ msgid "Has separator"
+ msgstr "Tiene separador"
+
+-#: gtk/gtkdialog.c:146
++#: ../gtk/gtkdialog.c:146
+ msgid "The dialog has a separator bar above its buttons"
+ msgstr "El diálogo tiene una barra separadora sobre sus botones"
+
+-#: gtk/gtkdialog.c:191
++#: ../gtk/gtkdialog.c:191
+ msgid "Content area border"
+ msgstr "Borde del área de contenidos"
+
+-#: gtk/gtkdialog.c:192
++#: ../gtk/gtkdialog.c:192
+ msgid "Width of border around the main dialog area"
+ msgstr "Anchura del borde alrededor del área principal del diálogo"
+
+-#: gtk/gtkdialog.c:199
++#: ../gtk/gtkdialog.c:199
+ msgid "Button spacing"
+ msgstr "Espaciado de los botones"
+
+-#: gtk/gtkdialog.c:200
++#: ../gtk/gtkdialog.c:200
+ msgid "Spacing between buttons"
+ msgstr "Espaciado entre los botones"
+
+-#: gtk/gtkdialog.c:208
++#: ../gtk/gtkdialog.c:208
+ msgid "Action area border"
+ msgstr "Borde del área de acción"
+
+-#: gtk/gtkdialog.c:209
++#: ../gtk/gtkdialog.c:209
+ msgid "Width of border around the button area at the bottom of the dialog"
+ msgstr ""
+ "Anchura del borde alrededor del área del botón en la parte inferior del "
+ "diálogo"
+
+-#: gtk/gtkentry.c:486 gtk/gtklabel.c:411
++#: ../gtk/gtkentry.c:486 ../gtk/gtklabel.c:411
+ msgid "Cursor Position"
+ msgstr "Posición del cursor"
+
+-#: gtk/gtkentry.c:487 gtk/gtklabel.c:412
++#: ../gtk/gtkentry.c:487 ../gtk/gtklabel.c:412
+ msgid "The current position of the insertion cursor in chars"
+ msgstr "La posición actual del cursor de inserción en caracteres"
+
+-#: gtk/gtkentry.c:496 gtk/gtklabel.c:421
++#: ../gtk/gtkentry.c:496 ../gtk/gtklabel.c:421
+ msgid "Selection Bound"
+ msgstr "Límite de selección"
+
+-#: gtk/gtkentry.c:497 gtk/gtklabel.c:422
++#: ../gtk/gtkentry.c:497 ../gtk/gtklabel.c:422
+ msgid ""
+ "The position of the opposite end of the selection from the cursor in chars"
+ msgstr ""
+ "La posición en caracteres del extremo opuesto de la selección desde el cursor"
+
+-#: gtk/gtkentry.c:507
++#: ../gtk/gtkentry.c:507
+ msgid "Whether the entry contents can be edited"
+ msgstr "Indica si los contenidos de la entrada pueden editarse"
+
+-#: gtk/gtkentry.c:514
++#: ../gtk/gtkentry.c:514
+ msgid "Maximum length"
+ msgstr "Longitud máxima"
+
+-#: gtk/gtkentry.c:515
++#: ../gtk/gtkentry.c:515
+ msgid "Maximum number of characters for this entry. Zero if no maximum"
+ msgstr "Número máximo de caracteres para esta entrada. Cero si no hay máximo"
+
+-#: gtk/gtkentry.c:523
++#: ../gtk/gtkentry.c:523
+ msgid "Visibility"
+ msgstr "Visibilidad"
+
+-#: gtk/gtkentry.c:524
++#: ../gtk/gtkentry.c:524
+ msgid ""
+ "FALSE displays the \"invisible char\" instead of the actual text (password "
+ "mode)"
+@@ -2177,32 +2200,32 @@
+ "FALSE muestra el «carácter invisible» en lugar del texto actual (modo "
+ "contraseña)"
+
+-#: gtk/gtkentry.c:532
++#: ../gtk/gtkentry.c:532
+ msgid "FALSE removes outside bevel from entry"
+ msgstr "FALSE quita el bisel exterior de la entrada"
+
+-#: gtk/gtkentry.c:540
++#: ../gtk/gtkentry.c:540
+ msgid ""
+ "Border between text and frame. Overrides the inner-border style property"
+ msgstr ""
+ "Borde entre el texto y el marco. Toma precedencia sobre la propiedad de "
+ "estilo del borde interno"
+
+-#: gtk/gtkentry.c:547
++#: ../gtk/gtkentry.c:547
+ msgid "Invisible character"
+ msgstr "Carácter invisible"
+
+-#: gtk/gtkentry.c:548
++#: ../gtk/gtkentry.c:548
+ msgid "The character to use when masking entry contents (in \"password mode\")"
+ msgstr ""
+ "El carácter que se usará cuando se enmascaren los contenidos de la entrada "
+ "(en «modo contraseña»)"
+
+-#: gtk/gtkentry.c:555
++#: ../gtk/gtkentry.c:555
+ msgid "Activates default"
+ msgstr "Activar predeterminado"
+
+-#: gtk/gtkentry.c:556
++#: ../gtk/gtkentry.c:556
+ msgid ""
+ "Whether to activate the default widget (such as the default button in a "
+ "dialog) when Enter is pressed"
+@@ -2210,33 +2233,33 @@
+ "Indica si se debe activar el widget predeterminado (como el botón "
+ "predeterminado en un diálogo) cuando se pulse INTRO"
+
+-#: gtk/gtkentry.c:562
++#: ../gtk/gtkentry.c:562
+ msgid "Width in chars"
+ msgstr "Anchura en caracteres"
+
+-#: gtk/gtkentry.c:563
++#: ../gtk/gtkentry.c:563
+ msgid "Number of characters to leave space for in the entry"
+ msgstr "Número de caracteres para dejar de espacio en la entrada"
+
+-#: gtk/gtkentry.c:572
++#: ../gtk/gtkentry.c:572
+ msgid "Scroll offset"
+ msgstr "Desplazamiento del scroll"
+
+-#: gtk/gtkentry.c:573
++#: ../gtk/gtkentry.c:573
+ msgid "Number of pixels of the entry scrolled off the screen to the left"
+ msgstr ""
+ "Número de píxeles de la entrada desplazados en scroll fuera de la pantalla "
+ "hacia la izquierda"
+
+-#: gtk/gtkentry.c:583
++#: ../gtk/gtkentry.c:583
+ msgid "The contents of the entry"
+ msgstr "El contenido de la entrada"
+
+-#: gtk/gtkentry.c:598 gtk/gtkmisc.c:73
++#: ../gtk/gtkentry.c:598 ../gtk/gtkmisc.c:73
+ msgid "X align"
+ msgstr "X alineación"
+
+-#: gtk/gtkentry.c:599 gtk/gtkmisc.c:74
++#: ../gtk/gtkentry.c:599 ../gtk/gtkmisc.c:74
+ msgid ""
+ "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
+ "layouts."
+@@ -2244,130 +2267,130 @@
+ "La alineación horizontal, desde 0 (izquierda) hasta 1 (derecha). Al revés "
+ "para distribuciones D-->I."
+
+-#: gtk/gtkentry.c:615
++#: ../gtk/gtkentry.c:615
+ msgid "Truncate multiline"
+ msgstr "Truncar multilínea"
+
+-#: gtk/gtkentry.c:616
++#: ../gtk/gtkentry.c:616
+ msgid "Whether to truncate multiline pastes to one line."
+ msgstr "Indica si se truncan las pegadas multilíneas a una línea."
+
+-#: gtk/gtkentry.c:632
++#: ../gtk/gtkentry.c:632
+ msgid "Which kind of shadow to draw around the entry when has-frame is set"
+ msgstr ""
+ "Qué clase de sombra dibujar alrededor de la entrada cuando has-frame está "
+ "activado"
+
+-#: gtk/gtkentry.c:647 gtk/gtktextview.c:648
++#: ../gtk/gtkentry.c:647 ../gtk/gtktextview.c:648
+ msgid "Overwrite mode"
+ msgstr "Modo de sobreescritura"
+
+-#: gtk/gtkentry.c:648
++#: ../gtk/gtkentry.c:648
+ msgid "Whether new text overwrites existing text"
+ msgstr "Indica si el texto introducido sobreescribe el existente"
+
+-#: gtk/gtkentry.c:661
++#: ../gtk/gtkentry.c:661
+ msgid "Text length"
+ msgstr "Longitud del texto"
+
+-#: gtk/gtkentry.c:662
++#: ../gtk/gtkentry.c:662
+ msgid "Length of the text currently in the entry"
+ msgstr "Longitud del texto actualmente en la entrada"
+
+-#: gtk/gtkentry.c:933
++#: ../gtk/gtkentry.c:933
+ msgid "Border between text and frame."
+ msgstr "Borde entre el texto y el marco."
+
+-#: gtk/gtkentry.c:938 gtk/gtklabel.c:644
++#: ../gtk/gtkentry.c:938 ../gtk/gtklabel.c:644
+ msgid "Select on focus"
+ msgstr "Seleccionar al enfocar"
+
+-#: gtk/gtkentry.c:939
++#: ../gtk/gtkentry.c:939
+ msgid "Whether to select the contents of an entry when it is focused"
+ msgstr ""
+ "Indica si se deben seleccionar los contenidos de una entrada cuando obtiene "
+ "el foco"
+
+-#: gtk/gtkentry.c:953
++#: ../gtk/gtkentry.c:953
+ msgid "Password Hint Timeout"
+ msgstr "Tiempo de expiración del hint de contraseña"
+
+-#: gtk/gtkentry.c:954
++#: ../gtk/gtkentry.c:954
+ msgid "How long to show the last input character in hidden entries"
+ msgstr ""
+ "Indica durante cuánto tiempo mostrar el último carácter en las entradas "
+ "ocultas"
+
+-#: gtk/gtkentrycompletion.c:279
++#: ../gtk/gtkentrycompletion.c:279
+ msgid "Completion Model"
+ msgstr "Modelo de completado"
+
+-#: gtk/gtkentrycompletion.c:280
++#: ../gtk/gtkentrycompletion.c:280
+ msgid "The model to find matches in"
+ msgstr "El modelo para encontrar coincidencias"
+
+-#: gtk/gtkentrycompletion.c:286
++#: ../gtk/gtkentrycompletion.c:286
+ msgid "Minimum Key Length"
+ msgstr "Longitud mínima de clave"
+
+-#: gtk/gtkentrycompletion.c:287
++#: ../gtk/gtkentrycompletion.c:287
+ msgid "Minimum length of the search key in order to look up matches"
+ msgstr "Longitud mínima de la clave de búsqueda para buscar coincidencias"
+
+-#: gtk/gtkentrycompletion.c:303 gtk/gtkiconview.c:587
++#: ../gtk/gtkentrycompletion.c:303 ../gtk/gtkiconview.c:587
+ msgid "Text column"
+ msgstr "Columna de texto"
+
+-#: gtk/gtkentrycompletion.c:304
++#: ../gtk/gtkentrycompletion.c:304
+ msgid "The column of the model containing the strings."
+ msgstr "La columna del modelo que contiene las cadenas."
+
+-#: gtk/gtkentrycompletion.c:323
++#: ../gtk/gtkentrycompletion.c:323
+ msgid "Inline completion"
+ msgstr "Completado en línea"
+
+-#: gtk/gtkentrycompletion.c:324
++#: ../gtk/gtkentrycompletion.c:324
+ msgid "Whether the common prefix should be inserted automatically"
+ msgstr "Indica si el prefijo común debe insertarse automáticamente"
+
+-#: gtk/gtkentrycompletion.c:338
++#: ../gtk/gtkentrycompletion.c:338
+ msgid "Popup completion"
+ msgstr "Emerger el completado"
+
+-#: gtk/gtkentrycompletion.c:339
++#: ../gtk/gtkentrycompletion.c:339
+ msgid "Whether the completions should be shown in a popup window"
+ msgstr "Indica si los completados deben mostrarse en una ventana emergente"
+
+-#: gtk/gtkentrycompletion.c:354
++#: ../gtk/gtkentrycompletion.c:354
+ msgid "Popup set width"
+ msgstr "El emergente establece la anchura"
+
+-#: gtk/gtkentrycompletion.c:355
++#: ../gtk/gtkentrycompletion.c:355
+ msgid "If TRUE, the popup window will have the same size as the entry"
+ msgstr "Si es TRUE, la ventana emergente tendrá el mismo tamaño que la entrada"
+
+-#: gtk/gtkentrycompletion.c:373
++#: ../gtk/gtkentrycompletion.c:373
+ msgid "Popup single match"
+ msgstr "Coincidencia simple del emergente"
+
+-#: gtk/gtkentrycompletion.c:374
++#: ../gtk/gtkentrycompletion.c:374
+ msgid "If TRUE, the popup window will appear for a single match."
+ msgstr ""
+ "Si es TRUE, la ventana emergente aparecerá para una coincidencia simple."
+
+-#: gtk/gtkentrycompletion.c:388
++#: ../gtk/gtkentrycompletion.c:388
+ msgid "Inline selection"
+ msgstr "Selección en línea"
+
+-#: gtk/gtkentrycompletion.c:389
++#: ../gtk/gtkentrycompletion.c:389
+ msgid "Your description here"
+ msgstr "Aquí su descripción"
+
+-#: gtk/gtkeventbox.c:91
++#: ../gtk/gtkeventbox.c:91
+ msgid "Visible Window"
+ msgstr "Ventana visible"
+
+-#: gtk/gtkeventbox.c:92
++#: ../gtk/gtkeventbox.c:92
+ msgid ""
+ "Whether the event box is visible, as opposed to invisible and only used to "
+ "trap events."
+@@ -2375,11 +2398,11 @@
+ "Indica si la caja de eventos es visible, como contraposición a invisible y "
+ "sólo usada para atrapar eventos."
+
+-#: gtk/gtkeventbox.c:98
++#: ../gtk/gtkeventbox.c:98
+ msgid "Above child"
+ msgstr "Sobre el hijo"
+
+-#: gtk/gtkeventbox.c:99
++#: ../gtk/gtkeventbox.c:99
+ msgid ""
+ "Whether the event-trapping window of the eventbox is above the window of the "
+ "child widget as opposed to below it."
+@@ -2387,142 +2410,143 @@
+ "Indica si la ventana atrapadora de eventos de la caja de eventos está por "
+ "encima del widget hijo como oposición debajo de ésta."
+
+-#: gtk/gtkexpander.c:187
++#: ../gtk/gtkexpander.c:187
+ msgid "Expanded"
+ msgstr "Expandido"
+
+-#: gtk/gtkexpander.c:188
++#: ../gtk/gtkexpander.c:188
+ msgid "Whether the expander has been opened to reveal the child widget"
+ msgstr "Indica si el expansor ha sido abierto para revelar el widget hijo"
+
+-#: gtk/gtkexpander.c:196
++#: ../gtk/gtkexpander.c:196
+ msgid "Text of the expander's label"
+ msgstr "Texto de la etiqueta del expansor"
+
+-#: gtk/gtkexpander.c:211 gtk/gtklabel.c:330
++#: ../gtk/gtkexpander.c:211 ../gtk/gtklabel.c:330
+ msgid "Use markup"
+ msgstr "Usar marcado"
+
+-#: gtk/gtkexpander.c:212 gtk/gtklabel.c:331
++#: ../gtk/gtkexpander.c:212 ../gtk/gtklabel.c:331
+ msgid "The text of the label includes XML markup. See pango_parse_markup()"
+ msgstr "El texto de la etiqueta incluye marcado XML. Vea pango_parse_markup()"
+
+-#: gtk/gtkexpander.c:220
++#: ../gtk/gtkexpander.c:220
+ msgid "Space to put between the label and the child"
+ msgstr "Espacio para colocar entre la etiqueta y el hijo"
+
+-#: gtk/gtkexpander.c:229 gtk/gtkframe.c:147 gtk/gtktoolbutton.c:194
++#: ../gtk/gtkexpander.c:229 ../gtk/gtkframe.c:147 ../gtk/gtktoolbutton.c:194
+ msgid "Label widget"
+ msgstr "Widget etiqueta"
+
+-#: gtk/gtkexpander.c:230
++#: ../gtk/gtkexpander.c:230
+ msgid "A widget to display in place of the usual expander label"
+ msgstr "Un widget para mostrar en lugar de la etiqueta usual del expansor"
+
+-#: gtk/gtkexpander.c:236 gtk/gtktreeview.c:783
++#: ../gtk/gtkexpander.c:236 ../gtk/gtktreeview.c:783
+ msgid "Expander Size"
+ msgstr "Tamaño del expansor"
+
+-#: gtk/gtkexpander.c:237 gtk/gtktreeview.c:784
++#: ../gtk/gtkexpander.c:237 ../gtk/gtktreeview.c:784
+ msgid "Size of the expander arrow"
+ msgstr "Tamaño de la flecha del expansor"
+
+-#: gtk/gtkexpander.c:246
++#: ../gtk/gtkexpander.c:246
+ msgid "Spacing around expander arrow"
+ msgstr "Espaciado alrededor de la flecha del expansor"
+
+-#: gtk/gtkfilechooser.c:194
++#: ../gtk/gtkfilechooser.c:194
+ msgid "Action"
+ msgstr "Acción"
+
+-#: gtk/gtkfilechooser.c:195
++#: ../gtk/gtkfilechooser.c:195
+ msgid "The type of operation that the file selector is performing"
+ msgstr "El tipo de operación que el selector de archivo está realizando"
+
+-#: gtk/gtkfilechooser.c:201
++#: ../gtk/gtkfilechooser.c:201
+ msgid "File System Backend"
+ msgstr "Backend del sistema de archivos"
+
+-#: gtk/gtkfilechooser.c:202
++#: ../gtk/gtkfilechooser.c:202
+ msgid "Name of file system backend to use"
+ msgstr "Nombre del backend del sistema de archivos a usar"
+
+-#: gtk/gtkfilechooser.c:207 gtk/gtkrecentchooser.c:252
++#: ../gtk/gtkfilechooser.c:207 ../gtk/gtkrecentchooser.c:252
+ msgid "Filter"
+ msgstr "Filtro"
+
+-#: gtk/gtkfilechooser.c:208
++#: ../gtk/gtkfilechooser.c:208
+ msgid "The current filter for selecting which files are displayed"
+ msgstr "El filtro actual para seleccionar qué archivos se están mostrando"
+
+-#: gtk/gtkfilechooser.c:213
++#: ../gtk/gtkfilechooser.c:213
+ msgid "Local Only"
+ msgstr "Sólo local"
+
+-#: gtk/gtkfilechooser.c:214
++#: ../gtk/gtkfilechooser.c:214
+ msgid "Whether the selected file(s) should be limited to local file: URLs"
+ msgstr ""
+ "Indica si los archivos seleccionados deben limitarse a archivos locales: URL"
+
+-#: gtk/gtkfilechooser.c:219
++#: ../gtk/gtkfilechooser.c:219
+ msgid "Preview widget"
+ msgstr "Widget de vista previa"
+
+-#: gtk/gtkfilechooser.c:220
++#: ../gtk/gtkfilechooser.c:220
+ msgid "Application supplied widget for custom previews."
+ msgstr ""
+ "Widget de aplicación suministrado para vistas preliminares personalizadas."
+
+-#: gtk/gtkfilechooser.c:225
++#: ../gtk/gtkfilechooser.c:225
+ msgid "Preview Widget Active"
+ msgstr "Widget de vista previa activo"
+
+-#: gtk/gtkfilechooser.c:226
++#: ../gtk/gtkfilechooser.c:226
+ msgid ""
+ "Whether the application supplied widget for custom previews should be shown."
+ msgstr ""
+ "Indica si debe mostrarse el widget suministrado por la aplicación para "
+ "vistas previas personalizadas."
+
+-#: gtk/gtkfilechooser.c:231
++#: ../gtk/gtkfilechooser.c:231
+ msgid "Use Preview Label"
+ msgstr "Usar etiqueta de vista previa"
+
+-#: gtk/gtkfilechooser.c:232
++#: ../gtk/gtkfilechooser.c:232
+ msgid "Whether to display a stock label with the name of the previewed file."
+ msgstr ""
+ "Indica si se debe mostrar una etiqueta de stock con el nombre del archivo "
+ "previsualizado."
+
+-#: gtk/gtkfilechooser.c:237
++#: ../gtk/gtkfilechooser.c:237
+ msgid "Extra widget"
+ msgstr "Widget extra"
+
+-#: gtk/gtkfilechooser.c:238
++#: ../gtk/gtkfilechooser.c:238
+ msgid "Application supplied widget for extra options."
+ msgstr "Widget de aplicación suministrado para opciones extra."
+
+-#: gtk/gtkfilechooser.c:243 gtk/gtkfilesel.c:540 gtk/gtkrecentchooser.c:191
++#: ../gtk/gtkfilechooser.c:243 ../gtk/gtkfilesel.c:540
++#: ../gtk/gtkrecentchooser.c:191
+ msgid "Select Multiple"
+ msgstr "Selección múltiple"
+
+-#: gtk/gtkfilechooser.c:244 gtk/gtkfilesel.c:541
++#: ../gtk/gtkfilechooser.c:244 ../gtk/gtkfilesel.c:541
+ msgid "Whether to allow multiple files to be selected"
+ msgstr "Indica si se permite la selección de múltiples archivos"
+
+-#: gtk/gtkfilechooser.c:250
++#: ../gtk/gtkfilechooser.c:250
+ msgid "Show Hidden"
+ msgstr "Mostrar ocultos"
+
+-#: gtk/gtkfilechooser.c:251
++#: ../gtk/gtkfilechooser.c:251
+ msgid "Whether the hidden files and folders should be displayed"
+ msgstr "Indica si deben mostrarse los archivos y carpetas ocultos"
+
+-#: gtk/gtkfilechooser.c:266
++#: ../gtk/gtkfilechooser.c:266
+ msgid "Do overwrite confirmation"
+ msgstr "Hacer confirmación de sobreescritura"
+
+-#: gtk/gtkfilechooser.c:267
++#: ../gtk/gtkfilechooser.c:267
+ msgid ""
+ "Whether a file chooser in save mode will present an overwrite confirmation "
+ "dialog if necessary."
+@@ -2530,174 +2554,174 @@
+ "Indica si un selector de archivos en modo guardar presentará un diálogo de "
+ "confirmación de sobreescritura si fuese necesario."
+
+-#: gtk/gtkfilechooserbutton.c:376
++#: ../gtk/gtkfilechooserbutton.c:376
+ msgid "Dialog"
+ msgstr "Diálogo"
+
+-#: gtk/gtkfilechooserbutton.c:377
++#: ../gtk/gtkfilechooserbutton.c:377
+ msgid "The file chooser dialog to use."
+ msgstr "El diálogo del selector de archivos que se va a usar."
+
+-#: gtk/gtkfilechooserbutton.c:408
++#: ../gtk/gtkfilechooserbutton.c:408
+ msgid "The title of the file chooser dialog."
+ msgstr "El título del diálogo de selección de archivos."
+
+-#: gtk/gtkfilechooserbutton.c:422
++#: ../gtk/gtkfilechooserbutton.c:422
+ msgid "The desired width of the button widget, in characters."
+ msgstr "La anchura deseada del widget del botón, en caracteres."
+
+-#: gtk/gtkfilesel.c:526 gtk/gtkimage.c:163 gtk/gtkrecentmanager.c:214
+-#: gtk/gtkstatusicon.c:194
++#: ../gtk/gtkfilesel.c:526 ../gtk/gtkimage.c:163 ../gtk/gtkrecentmanager.c:214
++#: ../gtk/gtkstatusicon.c:194
+ msgid "Filename"
+ msgstr "Nombre de archivo"
+
+-#: gtk/gtkfilesel.c:527
++#: ../gtk/gtkfilesel.c:527
+ msgid "The currently selected filename"
+ msgstr "El nombre del archivo actualmente seleccionado"
+
+-#: gtk/gtkfilesel.c:533
++#: ../gtk/gtkfilesel.c:533
+ msgid "Show file operations"
+ msgstr "Mostrar operaciones de archivo"
+
+-#: gtk/gtkfilesel.c:534
++#: ../gtk/gtkfilesel.c:534
+ msgid "Whether buttons for creating/manipulating files should be displayed"
+ msgstr "Indica si se deben mostrar botones para crear/manipular archivos"
+
+-#: gtk/gtkfixed.c:90 gtk/gtklayout.c:596
++#: ../gtk/gtkfixed.c:90 ../gtk/gtklayout.c:596
+ msgid "X position"
+ msgstr "Posición X"
+
+-#: gtk/gtkfixed.c:91 gtk/gtklayout.c:597
++#: ../gtk/gtkfixed.c:91 ../gtk/gtklayout.c:597
+ msgid "X position of child widget"
+ msgstr "Posición X del widget hijo"
+
+-#: gtk/gtkfixed.c:100 gtk/gtklayout.c:606
++#: ../gtk/gtkfixed.c:100 ../gtk/gtklayout.c:606
+ msgid "Y position"
+ msgstr "Posición Y"
+
+-#: gtk/gtkfixed.c:101 gtk/gtklayout.c:607
++#: ../gtk/gtkfixed.c:101 ../gtk/gtklayout.c:607
+ msgid "Y position of child widget"
+ msgstr "Posición Y del widget hijo"
+
+-#: gtk/gtkfontbutton.c:143
++#: ../gtk/gtkfontbutton.c:143
+ msgid "The title of the font selection dialog"
+ msgstr "El título del diálogo de selección de tipografía"
+
+-#: gtk/gtkfontbutton.c:158 gtk/gtkfontsel.c:181
++#: ../gtk/gtkfontbutton.c:158 ../gtk/gtkfontsel.c:181
+ msgid "Font name"
+ msgstr "Nombre de la tipografía"
+
+-#: gtk/gtkfontbutton.c:159
++#: ../gtk/gtkfontbutton.c:159
+ msgid "The name of the selected font"
+ msgstr "El nombre de la tipografía seleccionada"
+
+-#: gtk/gtkfontbutton.c:160
++#: ../gtk/gtkfontbutton.c:160
+ msgid "Sans 12"
+ msgstr "Sans 12"
+
+-#: gtk/gtkfontbutton.c:175
++#: ../gtk/gtkfontbutton.c:175
+ msgid "Use font in label"
+ msgstr "Usar tipografía en la etiqueta"
+
+-#: gtk/gtkfontbutton.c:176
++#: ../gtk/gtkfontbutton.c:176
+ msgid "Whether the label is drawn in the selected font"
+ msgstr "Indica si la etiqueta se dibuja con la tipografía seleccionada"
+
+-#: gtk/gtkfontbutton.c:191
++#: ../gtk/gtkfontbutton.c:191
+ msgid "Use size in label"
+ msgstr "Usar tamaño en la etiqueta"
+
+-#: gtk/gtkfontbutton.c:192
++#: ../gtk/gtkfontbutton.c:192
+ msgid "Whether the label is drawn with the selected font size"
+ msgstr ""
+ "Indica si la etiqueta se dibuja con el tamaño de tipografía seleccionado"
+
+-#: gtk/gtkfontbutton.c:208
++#: ../gtk/gtkfontbutton.c:208
+ msgid "Show style"
+ msgstr "Mostrar estilo"
+
+-#: gtk/gtkfontbutton.c:209
++#: ../gtk/gtkfontbutton.c:209
+ msgid "Whether the selected font style is shown in the label"
+ msgstr "Indica si estilo de tipografía seleccionado se muestra en la etiqueta"
+
+-#: gtk/gtkfontbutton.c:224
++#: ../gtk/gtkfontbutton.c:224
+ msgid "Show size"
+ msgstr "Mostrar tamaño"
+
+-#: gtk/gtkfontbutton.c:225
++#: ../gtk/gtkfontbutton.c:225
+ msgid "Whether selected font size is shown in the label"
+ msgstr ""
+ "Indica si el tamaño de tipografía seleccionado se muestra en la etiqueta"
+
+-#: gtk/gtkfontsel.c:182
++#: ../gtk/gtkfontsel.c:182
+ msgid "The string that represents this font"
+ msgstr "La cadena que representa esta tipografía"
+
+-#: gtk/gtkfontsel.c:189
++#: ../gtk/gtkfontsel.c:189
+ msgid "The GdkFont that is currently selected"
+ msgstr "La GdkFont que está seleccionada actualmente"
+
+-#: gtk/gtkfontsel.c:195
++#: ../gtk/gtkfontsel.c:195
+ msgid "Preview text"
+ msgstr "Vista previa del texto"
+
+-#: gtk/gtkfontsel.c:196
++#: ../gtk/gtkfontsel.c:196
+ msgid "The text to display in order to demonstrate the selected font"
+ msgstr "El texto que mostrar como demostración de la tipografía seleccionada"
+
+-#: gtk/gtkframe.c:106
++#: ../gtk/gtkframe.c:106
+ msgid "Text of the frame's label"
+ msgstr "Texto de la etiqueta del marco"
+
+-#: gtk/gtkframe.c:113
++#: ../gtk/gtkframe.c:113
+ msgid "Label xalign"
+ msgstr "xalign de la etiqueta"
+
+-#: gtk/gtkframe.c:114
++#: ../gtk/gtkframe.c:114
+ msgid "The horizontal alignment of the label"
+ msgstr "La alineación horizontal de la etiqueta"
+
+-#: gtk/gtkframe.c:122
++#: ../gtk/gtkframe.c:122
+ msgid "Label yalign"
+ msgstr "yalign de la etiqueta"
+
+-#: gtk/gtkframe.c:123
++#: ../gtk/gtkframe.c:123
+ msgid "The vertical alignment of the label"
+ msgstr "La alineación vertical de la etiqueta"
+
+-#: gtk/gtkframe.c:131 gtk/gtkhandlebox.c:167
++#: ../gtk/gtkframe.c:131 ../gtk/gtkhandlebox.c:167
+ msgid "Deprecated property, use shadow_type instead"
+ msgstr "Propiedad obsoleta, use shadow_type en su lugar"
+
+-#: gtk/gtkframe.c:138
++#: ../gtk/gtkframe.c:138
+ msgid "Frame shadow"
+ msgstr "Sombra del marco"
+
+-#: gtk/gtkframe.c:139
++#: ../gtk/gtkframe.c:139
+ msgid "Appearance of the frame border"
+ msgstr "Apariencia del borde del marco"
+
+-#: gtk/gtkframe.c:148
++#: ../gtk/gtkframe.c:148
+ msgid "A widget to display in place of the usual frame label"
+ msgstr "Un widget a mostrar en lugar de la usual etiqueta del marco"
+
+-#: gtk/gtkhandlebox.c:175
++#: ../gtk/gtkhandlebox.c:175
+ msgid "Appearance of the shadow that surrounds the container"
+ msgstr "Apariencia de la sombra que rodea al contenedor"
+
+-#: gtk/gtkhandlebox.c:183
++#: ../gtk/gtkhandlebox.c:183
+ msgid "Handle position"
+ msgstr "Posición del tirador"
+
+-#: gtk/gtkhandlebox.c:184
++#: ../gtk/gtkhandlebox.c:184
+ msgid "Position of the handle relative to the child widget"
+ msgstr "Posición del tirador relativa al widget hijo"
+
+-#: gtk/gtkhandlebox.c:192
++#: ../gtk/gtkhandlebox.c:192
+ msgid "Snap edge"
+ msgstr "Ajustar al borde"
+
+-#: gtk/gtkhandlebox.c:193
++#: ../gtk/gtkhandlebox.c:193
+ msgid ""
+ "Side of the handlebox that's lined up with the docking point to dock the "
+ "handlebox"
+@@ -2705,11 +2729,11 @@
+ "Lado de la caja manipuladora que está alineada con el punto de anclaje para "
+ "anclar la caja manejadora"
+
+-#: gtk/gtkhandlebox.c:201
++#: ../gtk/gtkhandlebox.c:201
+ msgid "Snap edge set"
+ msgstr "Ajuste al borde establecido"
+
+-#: gtk/gtkhandlebox.c:202
++#: ../gtk/gtkhandlebox.c:202
+ msgid ""
+ "Whether to use the value from the snap_edge property or a value derived from "
+ "handle_position"
+@@ -2717,11 +2741,11 @@
+ "Indica si se debe usar el valor desde la propiedad snap_edge o un valor "
+ "derivado de handle_position"
+
+-#: gtk/gtkhandlebox.c:209
++#: ../gtk/gtkhandlebox.c:209
+ msgid "Child Detached"
+ msgstr "Hijo desacoplado"
+
+-#: gtk/gtkhandlebox.c:210
++#: ../gtk/gtkhandlebox.c:210
+ msgid ""
+ "A boolean value indicating whether the handlebox's child is attached or "
+ "detached."
+@@ -2729,236 +2753,237 @@
+ "Una variable booleana indicando si el hijo del manejador de la caja está "
+ "acoplado o desacoplado."
+
+-#: gtk/gtkiconview.c:550
++#: ../gtk/gtkiconview.c:550
+ msgid "Selection mode"
+ msgstr "Modo de selección"
+
+-#: gtk/gtkiconview.c:551
++#: ../gtk/gtkiconview.c:551
+ msgid "The selection mode"
+ msgstr "El modo de selección"
+
+-#: gtk/gtkiconview.c:569
++#: ../gtk/gtkiconview.c:569
+ msgid "Pixbuf column"
+ msgstr "Columna de pixbuf"
+
+-#: gtk/gtkiconview.c:570
++#: ../gtk/gtkiconview.c:570
+ msgid "Model column used to retrieve the icon pixbuf from"
+ msgstr "Columna modelo usada para obtener el pixbuf del icono"
+
+-#: gtk/gtkiconview.c:588
++#: ../gtk/gtkiconview.c:588
+ msgid "Model column used to retrieve the text from"
+ msgstr "Columna modelo usada para obtener el texto"
+
+-#: gtk/gtkiconview.c:607
++#: ../gtk/gtkiconview.c:607
+ msgid "Markup column"
+ msgstr "Columna de marcado"
+
+-#: gtk/gtkiconview.c:608
++#: ../gtk/gtkiconview.c:608
+ msgid "Model column used to retrieve the text if using Pango markup"
+ msgstr "Columna modelo usada para obtener el texto si se usa marcado Pango"
+
+-#: gtk/gtkiconview.c:615
++#: ../gtk/gtkiconview.c:615
+ msgid "Icon View Model"
+ msgstr "Modelo de vista de icono"
+
+-#: gtk/gtkiconview.c:616
++#: ../gtk/gtkiconview.c:616
+ msgid "The model for the icon view"
+ msgstr "El modelo para la vista de icono"
+
+-#: gtk/gtkiconview.c:632
++#: ../gtk/gtkiconview.c:632
+ msgid "Number of columns"
+ msgstr "Número de columnas"
+
+-#: gtk/gtkiconview.c:633
++#: ../gtk/gtkiconview.c:633
+ msgid "Number of columns to display"
+ msgstr "El número de columnas que se mostrarán"
+
+-#: gtk/gtkiconview.c:650
++#: ../gtk/gtkiconview.c:650
+ msgid "Width for each item"
+ msgstr "Anchura de cada elemento"
+
+-#: gtk/gtkiconview.c:651
++#: ../gtk/gtkiconview.c:651
+ msgid "The width used for each item"
+ msgstr "La anchura usada por cada elemento"
+
+-#: gtk/gtkiconview.c:667
++#: ../gtk/gtkiconview.c:667
+ msgid "Space which is inserted between cells of an item"
+ msgstr "Espacio que se introduce entre las celdas de un elemento"
+
+-#: gtk/gtkiconview.c:682
++#: ../gtk/gtkiconview.c:682
+ msgid "Row Spacing"
+ msgstr "Espaciado entre filas"
+
+-#: gtk/gtkiconview.c:683
++#: ../gtk/gtkiconview.c:683
+ msgid "Space which is inserted between grid rows"
+ msgstr "Espacio que se introduce entre las filas de la rejilla"
+
+-#: gtk/gtkiconview.c:698
++#: ../gtk/gtkiconview.c:698
+ msgid "Column Spacing"
+ msgstr "Espaciado entre columnas"
+
+-#: gtk/gtkiconview.c:699
++#: ../gtk/gtkiconview.c:699
+ msgid "Space which is inserted between grid columns"
+ msgstr "Espacio que se inserta entre las columnas de la rejilla"
+
+-#: gtk/gtkiconview.c:714
++#: ../gtk/gtkiconview.c:714
+ msgid "Margin"
+ msgstr "Margen"
+
+-#: gtk/gtkiconview.c:715
++#: ../gtk/gtkiconview.c:715
+ msgid "Space which is inserted at the edges of the icon view"
+ msgstr "Espacio que se introduce entre los bordes de la vista de icono"
+
+-#: gtk/gtkiconview.c:732
++#: ../gtk/gtkiconview.c:732
+ msgid ""
+ "How the text and icon of each item are positioned relative to each other"
+ msgstr ""
+ "Cómo se sitúan el texto y el icono para cada elemento relativo a los demás"
+
+-#: gtk/gtkiconview.c:748 gtk/gtktreeview.c:618 gtk/gtktreeviewcolumn.c:307
++#: ../gtk/gtkiconview.c:748 ../gtk/gtktreeview.c:618
++#: ../gtk/gtktreeviewcolumn.c:307
+ msgid "Reorderable"
+ msgstr "Reordenable"
+
+-#: gtk/gtkiconview.c:749 gtk/gtktreeview.c:619
++#: ../gtk/gtkiconview.c:749 ../gtk/gtktreeview.c:619
+ msgid "View is reorderable"
+ msgstr "La vista es reordenable"
+
+-#: gtk/gtkiconview.c:756 gtk/gtktreeview.c:769
++#: ../gtk/gtkiconview.c:756 ../gtk/gtktreeview.c:769
+ msgid "Tooltip Column"
+ msgstr "Columna de consejo"
+
+-#: gtk/gtkiconview.c:757
++#: ../gtk/gtkiconview.c:757
+ msgid "The column in the model containing the tooltip texts for the items"
+ msgstr ""
+ "La columna del modelo que contiene los textos de consejo para los elementos"
+
+-#: gtk/gtkiconview.c:768
++#: ../gtk/gtkiconview.c:768
+ msgid "Selection Box Color"
+ msgstr "Color de la caja de selección"
+
+-#: gtk/gtkiconview.c:769
++#: ../gtk/gtkiconview.c:769
+ msgid "Color of the selection box"
+ msgstr "Color de la caja de selección"
+
+-#: gtk/gtkiconview.c:775
++#: ../gtk/gtkiconview.c:775
+ msgid "Selection Box Alpha"
+ msgstr "Alfa de la caja de selección"
+
+-#: gtk/gtkiconview.c:776
++#: ../gtk/gtkiconview.c:776
+ msgid "Opacity of the selection box"
+ msgstr "Opacidad de la caja de selección"
+
+-#: gtk/gtkimage.c:131 gtk/gtkstatusicon.c:186
++#: ../gtk/gtkimage.c:131 ../gtk/gtkstatusicon.c:186
+ msgid "Pixbuf"
+ msgstr "Pixbuf"
+
+-#: gtk/gtkimage.c:132 gtk/gtkstatusicon.c:187
++#: ../gtk/gtkimage.c:132 ../gtk/gtkstatusicon.c:187
+ msgid "A GdkPixbuf to display"
+ msgstr "Un GdkPixbuf para mostrar"
+
+-#: gtk/gtkimage.c:139
++#: ../gtk/gtkimage.c:139
+ msgid "Pixmap"
+ msgstr "Pixmap"
+
+-#: gtk/gtkimage.c:140
++#: ../gtk/gtkimage.c:140
+ msgid "A GdkPixmap to display"
+ msgstr "Un GdkPixmap para mostrar"
+
+-#: gtk/gtkimage.c:147 gtk/gtkmessagedialog.c:215
++#: ../gtk/gtkimage.c:147 ../gtk/gtkmessagedialog.c:215
+ msgid "Image"
+ msgstr "Imagen"
+
+-#: gtk/gtkimage.c:148
++#: ../gtk/gtkimage.c:148
+ msgid "A GdkImage to display"
+ msgstr "Un GdkImage para mostrar"
+
+-#: gtk/gtkimage.c:155
++#: ../gtk/gtkimage.c:155
+ msgid "Mask"
+ msgstr "Máscara"
+
+-#: gtk/gtkimage.c:156
++#: ../gtk/gtkimage.c:156
+ msgid "Mask bitmap to use with GdkImage or GdkPixmap"
+ msgstr "Máscara bitmap para usar con GdkImage o GdkPixmap"
+
+-#: gtk/gtkimage.c:164 gtk/gtkstatusicon.c:195
++#: ../gtk/gtkimage.c:164 ../gtk/gtkstatusicon.c:195
+ msgid "Filename to load and display"
+ msgstr "Nombre del archivo a cargar y mostrar"
+
+-#: gtk/gtkimage.c:173 gtk/gtkstatusicon.c:203
++#: ../gtk/gtkimage.c:173 ../gtk/gtkstatusicon.c:203
+ msgid "Stock ID for a stock image to display"
+ msgstr "ID de inventario para una imagen de inventario que mostrar"
+
+-#: gtk/gtkimage.c:180
++#: ../gtk/gtkimage.c:180
+ msgid "Icon set"
+ msgstr "Conjunto de iconos"
+
+-#: gtk/gtkimage.c:181
++#: ../gtk/gtkimage.c:181
+ msgid "Icon set to display"
+ msgstr "Conjunto de iconos para mostrar"
+
+-#: gtk/gtkimage.c:188 gtk/gtkscalebutton.c:212 gtk/gtktoolbar.c:547
++#: ../gtk/gtkimage.c:188 ../gtk/gtkscalebutton.c:212 ../gtk/gtktoolbar.c:547
+ msgid "Icon size"
+ msgstr "Tamaño del icono"
+
+-#: gtk/gtkimage.c:189
++#: ../gtk/gtkimage.c:189
+ msgid "Symbolic size to use for stock icon, icon set or named icon"
+ msgstr ""
+ "Tamaño simbólico que usar para el icono de inventario, conjunto de iconos o "
+ "icono nombrado"
+
+-#: gtk/gtkimage.c:205
++#: ../gtk/gtkimage.c:205
+ msgid "Pixel size"
+ msgstr "Tamaño del píxel"
+
+-#: gtk/gtkimage.c:206
++#: ../gtk/gtkimage.c:206
+ msgid "Pixel size to use for named icon"
+ msgstr "Tamaño de píxel que usar para el icono nombrado"
+
+-#: gtk/gtkimage.c:214
++#: ../gtk/gtkimage.c:214
+ msgid "Animation"
+ msgstr "Animación"
+
+-#: gtk/gtkimage.c:215
++#: ../gtk/gtkimage.c:215
+ msgid "GdkPixbufAnimation to display"
+ msgstr "GdkPixbufAnimation para mostrar"
+
+-#: gtk/gtkimage.c:255 gtk/gtkstatusicon.c:234
++#: ../gtk/gtkimage.c:255 ../gtk/gtkstatusicon.c:234
+ msgid "Storage type"
+ msgstr "Tipo de almacenamiento"
+
+-#: gtk/gtkimage.c:256 gtk/gtkstatusicon.c:235
++#: ../gtk/gtkimage.c:256 ../gtk/gtkstatusicon.c:235
+ msgid "The representation being used for image data"
+ msgstr "La representación empleada para los datos de la imagen"
+
+-#: gtk/gtkimagemenuitem.c:101
++#: ../gtk/gtkimagemenuitem.c:101
+ msgid "Child widget to appear next to the menu text"
+ msgstr "Widget hijo que aparecerá al lado del texto del menú"
+
+-#: gtk/gtkimagemenuitem.c:106
++#: ../gtk/gtkimagemenuitem.c:106
+ msgid "Show menu images"
+ msgstr "Mostrar imágenes del menú"
+
+-#: gtk/gtkimagemenuitem.c:107
++#: ../gtk/gtkimagemenuitem.c:107
+ msgid "Whether images should be shown in menus"
+ msgstr "Indica si deben mostrarse o no las imágenes en los menús"
+
+-#: gtk/gtkinvisible.c:87 gtk/gtkwindow.c:601
++#: ../gtk/gtkinvisible.c:87 ../gtk/gtkwindow.c:601
+ msgid "The screen where this window will be displayed"
+ msgstr "La pantalla donde se mostrará esta ventana"
+
+-#: gtk/gtklabel.c:317
++#: ../gtk/gtklabel.c:317
+ msgid "The text of the label"
+ msgstr "El texto de la etiqueta"
+
+-#: gtk/gtklabel.c:324
++#: ../gtk/gtklabel.c:324
+ msgid "A list of style attributes to apply to the text of the label"
+ msgstr "Un lista de atributos de estilos para aplicar al texto de la etiqueta"
+
+-#: gtk/gtklabel.c:345 gtk/gtktexttag.c:359 gtk/gtktextview.c:585
++#: ../gtk/gtklabel.c:345 ../gtk/gtktexttag.c:359 ../gtk/gtktextview.c:585
+ msgid "Justification"
+ msgstr "Justificación"
+
+-#: gtk/gtklabel.c:346
++#: ../gtk/gtklabel.c:346
+ msgid ""
+ "The alignment of the lines in the text of the label relative to each other. "
+ "This does NOT affect the alignment of the label within its allocation. See "
+@@ -2968,11 +2993,11 @@
+ "Esto NO afecta la alineación de la etiqueta dentro de su ubicación. Ver "
+ "GtkMisc::xalign para ello"
+
+-#: gtk/gtklabel.c:354
++#: ../gtk/gtklabel.c:354
+ msgid "Pattern"
+ msgstr "Patrón"
+
+-#: gtk/gtklabel.c:355
++#: ../gtk/gtklabel.c:355
+ msgid ""
+ "A string with _ characters in positions correspond to characters in the text "
+ "to underline"
+@@ -2980,50 +3005,50 @@
+ "Un cadena con caracteres _ en posiciones correspondientes a caracteres en el "
+ "texto a subrayar"
+
+-#: gtk/gtklabel.c:362
++#: ../gtk/gtklabel.c:362
+ msgid "Line wrap"
+ msgstr "Ajuste de línea"
+
+-#: gtk/gtklabel.c:363
++#: ../gtk/gtklabel.c:363
+ msgid "If set, wrap lines if the text becomes too wide"
+ msgstr ""
+ "Si esta definido, ajustar las líneas si el texto se vuelve demasiado ancho"
+
+-#: gtk/gtklabel.c:378
++#: ../gtk/gtklabel.c:378
+ msgid "Line wrap mode"
+ msgstr "Modo de ajuste de línea"
+
+-#: gtk/gtklabel.c:379
++#: ../gtk/gtklabel.c:379
+ msgid "If wrap is set, controls how linewrapping is done"
+ msgstr "Si se establece el ajuste, controla cómo se hace el ajuste de línea"
+
+-#: gtk/gtklabel.c:386
++#: ../gtk/gtklabel.c:386
+ msgid "Selectable"
+ msgstr "Seleccionable"
+
+-#: gtk/gtklabel.c:387
++#: ../gtk/gtklabel.c:387
+ msgid "Whether the label text can be selected with the mouse"
+ msgstr "Indica si el texto de la etiqueta puede ser seleccionado con el ratón"
+
+-#: gtk/gtklabel.c:393
++#: ../gtk/gtklabel.c:393
+ msgid "Mnemonic key"
+ msgstr "Tecla nemónica"
+
+-#: gtk/gtklabel.c:394
++#: ../gtk/gtklabel.c:394
+ msgid "The mnemonic accelerator key for this label"
+ msgstr "La tecla nemotécnica del acelerador para esta etiqueta"
+
+-#: gtk/gtklabel.c:402
++#: ../gtk/gtklabel.c:402
+ msgid "Mnemonic widget"
+ msgstr "Widget nemónico"
+
+-#: gtk/gtklabel.c:403
++#: ../gtk/gtklabel.c:403
+ msgid "The widget to be activated when the label's mnemonic key is pressed"
+ msgstr ""
+ "El widget que se activará cuando se presione la tecla mnemotécnica de la "
+ "etiqueta"
+
+-#: gtk/gtklabel.c:449
++#: ../gtk/gtklabel.c:449
+ msgid ""
+ "The preferred place to ellipsize the string, if the label does not have "
+ "enough room to display the entire string"
+@@ -3031,107 +3056,107 @@
+ "El lugar preferido para la elipsis de la cadena, si la etiqueta no tiene "
+ "suficiente espacio para mostrar la cadena completa"
+
+-#: gtk/gtklabel.c:489
++#: ../gtk/gtklabel.c:489
+ msgid "Single Line Mode"
+ msgstr "Modo de línea única"
+
+-#: gtk/gtklabel.c:490
++#: ../gtk/gtklabel.c:490
+ msgid "Whether the label is in single line mode"
+ msgstr "Indica si la etiqueta está en modo de línea única"
+
+-#: gtk/gtklabel.c:507
++#: ../gtk/gtklabel.c:507
+ msgid "Angle"
+ msgstr "Ángulo"
+
+-#: gtk/gtklabel.c:508
++#: ../gtk/gtklabel.c:508
+ msgid "Angle at which the label is rotated"
+ msgstr "Ángulo al cual la etiqueta se rota"
+
+-#: gtk/gtklabel.c:528
++#: ../gtk/gtklabel.c:528
+ msgid "Maximum Width In Characters"
+ msgstr "Anchura máxima en caracteres"
+
+-#: gtk/gtklabel.c:529
++#: ../gtk/gtklabel.c:529
+ msgid "The desired maximum width of the label, in characters"
+ msgstr "La anchura máxima deseada de la etiqueta, en caracteres"
+
+-#: gtk/gtklabel.c:645
++#: ../gtk/gtklabel.c:645
+ msgid "Whether to select the contents of a selectable label when it is focused"
+ msgstr ""
+ "Indica si se debe seleccionar el contenido de una etiqueta seleccionable "
+ "cuando obtiene el foco"
+
+-#: gtk/gtklayout.c:616 gtk/gtkviewport.c:106
++#: ../gtk/gtklayout.c:616 ../gtk/gtkviewport.c:106
+ msgid "Horizontal adjustment"
+ msgstr "Ajuste horizontal"
+
+-#: gtk/gtklayout.c:617 gtk/gtkscrolledwindow.c:219
++#: ../gtk/gtklayout.c:617 ../gtk/gtkscrolledwindow.c:219
+ msgid "The GtkAdjustment for the horizontal position"
+ msgstr "El ajuste GtkAdjustment para la posición horizontal"
+
+-#: gtk/gtklayout.c:624 gtk/gtkviewport.c:114
++#: ../gtk/gtklayout.c:624 ../gtk/gtkviewport.c:114
+ msgid "Vertical adjustment"
+ msgstr "Ajuste vertical"
+
+-#: gtk/gtklayout.c:625 gtk/gtkscrolledwindow.c:226
++#: ../gtk/gtklayout.c:625 ../gtk/gtkscrolledwindow.c:226
+ msgid "The GtkAdjustment for the vertical position"
+ msgstr "El ajuste GtkAdjustment para la posición vertical"
+
+-#: gtk/gtklayout.c:633
++#: ../gtk/gtklayout.c:633
+ msgid "The width of the layout"
+ msgstr "La anchura de la distribución"
+
+-#: gtk/gtklayout.c:642
++#: ../gtk/gtklayout.c:642
+ msgid "The height of the layout"
+ msgstr "La altura de la distribución"
+
+-#: gtk/gtklinkbutton.c:144
++#: ../gtk/gtklinkbutton.c:144
+ msgid "URI"
+ msgstr "URI"
+
+-#: gtk/gtklinkbutton.c:145
++#: ../gtk/gtklinkbutton.c:145
+ msgid "The URI bound to this button"
+ msgstr "El URI asociado a este botón"
+
+-#: gtk/gtklinkbutton.c:159
++#: ../gtk/gtklinkbutton.c:159
+ msgid "Visited"
+ msgstr "Visitado"
+
+-#: gtk/gtklinkbutton.c:160
++#: ../gtk/gtklinkbutton.c:160
+ msgid "Whether this link has been visited."
+ msgstr "Indica si este enlace se ha visitado."
+
+-#: gtk/gtkmenu.c:499
++#: ../gtk/gtkmenu.c:499
+ msgid "The currently selected menu item"
+ msgstr "El elemento del menú actualmente seleccionado"
+
+-#: gtk/gtkmenu.c:513
++#: ../gtk/gtkmenu.c:513
+ msgid "Accel Group"
+ msgstr "Grupo de aceleración"
+
+-#: gtk/gtkmenu.c:514
++#: ../gtk/gtkmenu.c:514
+ msgid "The accel group holding accelerators for the menu"
+ msgstr "El grupo de aceleración que contiene los aceleradores para el menú"
+
+-#: gtk/gtkmenu.c:528 gtk/gtkmenuitem.c:233
++#: ../gtk/gtkmenu.c:528 ../gtk/gtkmenuitem.c:233
+ msgid "Accel Path"
+ msgstr "Ruta del acelerador"
+
+-#: gtk/gtkmenu.c:529
++#: ../gtk/gtkmenu.c:529
+ msgid "An accel path used to conveniently construct accel paths of child items"
+ msgstr ""
+ "Una ruta de acelerador usada para construir convenientemente rutas de "
+ "aceleración de elementos hijo"
+
+-#: gtk/gtkmenu.c:545
++#: ../gtk/gtkmenu.c:545
+ msgid "Attach Widget"
+ msgstr "Acoplar widget"
+
+-#: gtk/gtkmenu.c:546
++#: ../gtk/gtkmenu.c:546
+ msgid "The widget the menu is attached to"
+ msgstr "El menú al que está acoplado el widget"
+
+-#: gtk/gtkmenu.c:554
++#: ../gtk/gtkmenu.c:554
+ msgid ""
+ "A title that may be displayed by the window manager when this menu is torn-"
+ "off"
+@@ -3139,43 +3164,43 @@
+ "Un título que podría mostrarse por el administrador de ventanas cuando este "
+ "menú se desprenda"
+
+-#: gtk/gtkmenu.c:568
++#: ../gtk/gtkmenu.c:568
+ msgid "Tearoff State"
+ msgstr "Estado de desprendimiento"
+
+-#: gtk/gtkmenu.c:569
++#: ../gtk/gtkmenu.c:569
+ msgid "A boolean that indicates whether the menu is torn-off"
+ msgstr "Un booleano que indica si el menú ha sido desprendido"
+
+-#: gtk/gtkmenu.c:583
++#: ../gtk/gtkmenu.c:583
+ msgid "Monitor"
+ msgstr "Monitor"
+
+-#: gtk/gtkmenu.c:584
++#: ../gtk/gtkmenu.c:584
+ msgid "The monitor the menu will be popped up on"
+ msgstr "El monitor en el que se mostrará el menú"
+
+-#: gtk/gtkmenu.c:590
++#: ../gtk/gtkmenu.c:590
+ msgid "Vertical Padding"
+ msgstr "Separación vertical"
+
+-#: gtk/gtkmenu.c:591
++#: ../gtk/gtkmenu.c:591
+ msgid "Extra space at the top and bottom of the menu"
+ msgstr "El espacio adicional en la parte superior e inferior del menú"
+
+-#: gtk/gtkmenu.c:599
++#: ../gtk/gtkmenu.c:599
+ msgid "Horizontal Padding"
+ msgstr "Separación horizontal"
+
+-#: gtk/gtkmenu.c:600
++#: ../gtk/gtkmenu.c:600
+ msgid "Extra space at the left and right edges of the menu"
+ msgstr "El espacio adicional en los bordes derecho e izquierdo del menú"
+
+-#: gtk/gtkmenu.c:608
++#: ../gtk/gtkmenu.c:608
+ msgid "Vertical Offset"
+ msgstr "Desplazamiento vertical"
+
+-#: gtk/gtkmenu.c:609
++#: ../gtk/gtkmenu.c:609
+ msgid ""
+ "When the menu is a submenu, position it this number of pixels offset "
+ "vertically"
+@@ -3183,11 +3208,11 @@
+ "Cuando el menú es un submenú, colocarlo este número de píxeles de "
+ "desplazamiento vertical"
+
+-#: gtk/gtkmenu.c:617
++#: ../gtk/gtkmenu.c:617
+ msgid "Horizontal Offset"
+ msgstr "Desplazamiento horizontal"
+
+-#: gtk/gtkmenu.c:618
++#: ../gtk/gtkmenu.c:618
+ msgid ""
+ "When the menu is a submenu, position it this number of pixels offset "
+ "horizontally"
+@@ -3195,73 +3220,73 @@
+ "Cuando el menú es un submenú, colocarlo este número de píxeles de "
+ "desplazamiento horizontal"
+
+-#: gtk/gtkmenu.c:626
++#: ../gtk/gtkmenu.c:626
+ msgid "Double Arrows"
+ msgstr "Dobles flechas"
+
+-#: gtk/gtkmenu.c:627
++#: ../gtk/gtkmenu.c:627
+ msgid "When scrolling, always show both arrows."
+ msgstr "Al desplazar, siempre mostrar ambas flechas."
+
+-#: gtk/gtkmenu.c:635
++#: ../gtk/gtkmenu.c:635
+ msgid "Left Attach"
+ msgstr "Acoplar a la izquierda"
+
+-#: gtk/gtkmenu.c:636 gtk/gtktable.c:174
++#: ../gtk/gtkmenu.c:636 ../gtk/gtktable.c:174
+ msgid "The column number to attach the left side of the child to"
+ msgstr "El número de columnas que acoplar al lado izquierdo del hijo"
+
+-#: gtk/gtkmenu.c:643
++#: ../gtk/gtkmenu.c:643
+ msgid "Right Attach"
+ msgstr "Acoplar a la derecha"
+
+-#: gtk/gtkmenu.c:644
++#: ../gtk/gtkmenu.c:644
+ msgid "The column number to attach the right side of the child to"
+ msgstr "El número de columnas que acoplar al lado derecho del hijo"
+
+-#: gtk/gtkmenu.c:651
++#: ../gtk/gtkmenu.c:651
+ msgid "Top Attach"
+ msgstr "Acoplamiento superior"
+
+-#: gtk/gtkmenu.c:652
++#: ../gtk/gtkmenu.c:652
+ msgid "The row number to attach the top of the child to"
+ msgstr "El número de filas que acoplar por encima del hijo"
+
+-#: gtk/gtkmenu.c:659
++#: ../gtk/gtkmenu.c:659
+ msgid "Bottom Attach"
+ msgstr "Acoplamiento inferior"
+
+-#: gtk/gtkmenu.c:660 gtk/gtktable.c:195
++#: ../gtk/gtkmenu.c:660 ../gtk/gtktable.c:195
+ msgid "The row number to attach the bottom of the child to"
+ msgstr "El número de filas que acoplar por debajo del hijo"
+
+-#: gtk/gtkmenu.c:747
++#: ../gtk/gtkmenu.c:747
+ msgid "Can change accelerators"
+ msgstr "Puede cambiar aceleradores"
+
+-#: gtk/gtkmenu.c:748
++#: ../gtk/gtkmenu.c:748
+ msgid ""
+ "Whether menu accelerators can be changed by pressing a key over the menu item"
+ msgstr ""
+ "Indica si los aceleradores del menú pueden cambiarse pulsando una tecla "
+ "sobre el elemento del menú"
+
+-#: gtk/gtkmenu.c:753
++#: ../gtk/gtkmenu.c:753
+ msgid "Delay before submenus appear"
+ msgstr "Retraso antes de que aparezcan los submenús"
+
+-#: gtk/gtkmenu.c:754
++#: ../gtk/gtkmenu.c:754
+ msgid ""
+ "Minimum time the pointer must stay over a menu item before the submenu appear"
+ msgstr ""
+ "Tiempo mínimo en que el puntero debe permanecer sobre un elemento de menú "
+ "antes de que el submenú aparezca"
+
+-#: gtk/gtkmenu.c:761
++#: ../gtk/gtkmenu.c:761
+ msgid "Delay before hiding a submenu"
+ msgstr "Retraso antes de ocultar un submenú"
+
+-#: gtk/gtkmenu.c:762
++#: ../gtk/gtkmenu.c:762
+ msgid ""
+ "The time before hiding a submenu when the pointer is moving towards the "
+ "submenu"
+@@ -3269,286 +3294,286 @@
+ "El tiempo antes de ocultar un submenú cuando el puntero se este moviendo "
+ "hacia el submenú"
+
+-#: gtk/gtkmenubar.c:168
++#: ../gtk/gtkmenubar.c:168
+ msgid "Pack direction"
+ msgstr "Dirección del empaquetado"
+
+-#: gtk/gtkmenubar.c:169
++#: ../gtk/gtkmenubar.c:169
+ msgid "The pack direction of the menubar"
+ msgstr "La dirección del empaquetado de la barra de menú"
+
+-#: gtk/gtkmenubar.c:185
++#: ../gtk/gtkmenubar.c:185
+ msgid "Child Pack direction"
+ msgstr "Dirección de empaquetado del hijo"
+
+-#: gtk/gtkmenubar.c:186
++#: ../gtk/gtkmenubar.c:186
+ msgid "The child pack direction of the menubar"
+ msgstr "La dirección de empaquetado hijo de la barra de menú"
+
+-#: gtk/gtkmenubar.c:195
++#: ../gtk/gtkmenubar.c:195
+ msgid "Style of bevel around the menubar"
+ msgstr "Estilo del bisel alrededor de la barra de menús"
+
+-#: gtk/gtkmenubar.c:202 gtk/gtktoolbar.c:597
++#: ../gtk/gtkmenubar.c:202 ../gtk/gtktoolbar.c:597
+ msgid "Internal padding"
+ msgstr "Relleno interno"
+
+-#: gtk/gtkmenubar.c:203
++#: ../gtk/gtkmenubar.c:203
+ msgid "Amount of border space between the menubar shadow and the menu items"
+ msgstr ""
+ "Número de espacios del borde entre la sombra de la barra de menús y los "
+ "elementos del menú"
+
+-#: gtk/gtkmenubar.c:210
++#: ../gtk/gtkmenubar.c:210
+ msgid "Delay before drop down menus appear"
+ msgstr "Retardo antes de que aparezcan los menús desplegables"
+
+-#: gtk/gtkmenubar.c:211
++#: ../gtk/gtkmenubar.c:211
+ msgid "Delay before the submenus of a menu bar appear"
+ msgstr "Retardo antes de que aparezcan los submenús de una barra de menús"
+
+-#: gtk/gtkmenuitem.c:201
++#: ../gtk/gtkmenuitem.c:201
+ msgid "Right Justified"
+ msgstr "Justificado a la derecha"
+
+-#: gtk/gtkmenuitem.c:202
++#: ../gtk/gtkmenuitem.c:202
+ msgid ""
+ "Sets whether the menu item appears justified at the right side of a menu bar"
+ msgstr ""
+ "Establece si el elemento del menú aparece justificado en la parte derecha de "
+ "una barra de menú"
+
+-#: gtk/gtkmenuitem.c:216
++#: ../gtk/gtkmenuitem.c:216
+ msgid "Submenu"
+ msgstr "Submenú"
+
+-#: gtk/gtkmenuitem.c:217
++#: ../gtk/gtkmenuitem.c:217
+ msgid "The submenu attached to the menu item, or NULL if it has none"
+ msgstr "El submenú acoplado al elemento del menú, o NULL si no tiene ninguno"
+
+-#: gtk/gtkmenuitem.c:234
++#: ../gtk/gtkmenuitem.c:234
+ msgid "Sets the accelerator path of the menu item"
+ msgstr "Establece la ruta del acelerador del elemento del menú"
+
+-#: gtk/gtkmenuitem.c:277
++#: ../gtk/gtkmenuitem.c:277
+ msgid "Amount of space used up by arrow, relative to the menu item's font size"
+ msgstr ""
+ "Cantidad de espacio ocupado por una flecha, relativa al tamaño de tipografía "
+ "del elemento del menú"
+
+-#: gtk/gtkmenuitem.c:290
++#: ../gtk/gtkmenuitem.c:290
+ msgid "Width in Characters"
+ msgstr "Anchura en caracteres"
+
+-#: gtk/gtkmenuitem.c:291
++#: ../gtk/gtkmenuitem.c:291
+ msgid "The minimum desired width of the menu item in characters"
+ msgstr "La anchura mínima deseada del elemento del menú en caracteres"
+
+-#: gtk/gtkmenushell.c:374
++#: ../gtk/gtkmenushell.c:374
+ msgid "Take Focus"
+ msgstr "Toma el foco"
+
+-#: gtk/gtkmenushell.c:375
++#: ../gtk/gtkmenushell.c:375
+ msgid "A boolean that determines whether the menu grabs the keyboard focus"
+ msgstr "Un booleano que indica si el menú obtiene el foco del teclado"
+
+-#: gtk/gtkmenutoolbutton.c:232 gtk/gtkoptionmenu.c:161
++#: ../gtk/gtkmenutoolbutton.c:232 ../gtk/gtkoptionmenu.c:161
+ msgid "Menu"
+ msgstr "Menú"
+
+-#: gtk/gtkmenutoolbutton.c:233
++#: ../gtk/gtkmenutoolbutton.c:233
+ msgid "The dropdown menu"
+ msgstr "El menú desplegable"
+
+-#: gtk/gtkmessagedialog.c:98
++#: ../gtk/gtkmessagedialog.c:98
+ msgid "Image/label border"
+ msgstr "Borde de la imagen/etiqueta"
+
+-#: gtk/gtkmessagedialog.c:99
++#: ../gtk/gtkmessagedialog.c:99
+ msgid "Width of border around the label and image in the message dialog"
+ msgstr ""
+ "Anchura del borde alrededor de la etiqueta y la imagen en el diálogo de "
+ "mensajes"
+
+-#: gtk/gtkmessagedialog.c:114
++#: ../gtk/gtkmessagedialog.c:114
+ msgid "Use separator"
+ msgstr "Usar separador"
+
+-#: gtk/gtkmessagedialog.c:115
++#: ../gtk/gtkmessagedialog.c:115
+ msgid ""
+ "Whether to put a separator between the message dialog's text and the buttons"
+ msgstr ""
+ "Indica si se debe poner un separador entre el texto de diálogo del mensaje y "
+ "los botones"
+
+-#: gtk/gtkmessagedialog.c:128
++#: ../gtk/gtkmessagedialog.c:128
+ msgid "Message Type"
+ msgstr "Tipo de mensaje"
+
+-#: gtk/gtkmessagedialog.c:129
++#: ../gtk/gtkmessagedialog.c:129
+ msgid "The type of message"
+ msgstr "El tipo de mensaje"
+
+-#: gtk/gtkmessagedialog.c:136
++#: ../gtk/gtkmessagedialog.c:136
+ msgid "Message Buttons"
+ msgstr "Botones del mensaje"
+
+-#: gtk/gtkmessagedialog.c:137
++#: ../gtk/gtkmessagedialog.c:137
+ msgid "The buttons shown in the message dialog"
+ msgstr "Los botones mostrados en el diálogo de mensaje"
+
+-#: gtk/gtkmessagedialog.c:154
++#: ../gtk/gtkmessagedialog.c:154
+ msgid "The primary text of the message dialog"
+ msgstr "El texto primario del diálogo de mensaje"
+
+-#: gtk/gtkmessagedialog.c:169
++#: ../gtk/gtkmessagedialog.c:169
+ msgid "Use Markup"
+ msgstr "Usar marcado"
+
+-#: gtk/gtkmessagedialog.c:170
++#: ../gtk/gtkmessagedialog.c:170
+ msgid "The primary text of the title includes Pango markup."
+ msgstr "El texto primario del título incluye marcado Pango."
+
+-#: gtk/gtkmessagedialog.c:184
++#: ../gtk/gtkmessagedialog.c:184
+ msgid "Secondary Text"
+ msgstr "Texto secundario"
+
+-#: gtk/gtkmessagedialog.c:185
++#: ../gtk/gtkmessagedialog.c:185
+ msgid "The secondary text of the message dialog"
+ msgstr "El texto secundario del diálogo de mensaje"
+
+-#: gtk/gtkmessagedialog.c:200
++#: ../gtk/gtkmessagedialog.c:200
+ msgid "Use Markup in secondary"
+ msgstr "Usar marcado en el secundario"
+
+-#: gtk/gtkmessagedialog.c:201
++#: ../gtk/gtkmessagedialog.c:201
+ msgid "The secondary text includes Pango markup."
+ msgstr "El texto secundario incluye marcado Pango."
+
+-#: gtk/gtkmessagedialog.c:216
++#: ../gtk/gtkmessagedialog.c:216
+ msgid "The image"
+ msgstr "La imagen"
+
+-#: gtk/gtkmisc.c:83
++#: ../gtk/gtkmisc.c:83
+ msgid "Y align"
+ msgstr "Alineación Y"
+
+-#: gtk/gtkmisc.c:84
++#: ../gtk/gtkmisc.c:84
+ msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
+ msgstr "La alineación vertical, desde 0 (superior) a 1 (inferior)"
+
+-#: gtk/gtkmisc.c:93
++#: ../gtk/gtkmisc.c:93
+ msgid "X pad"
+ msgstr "X pad"
+
+-#: gtk/gtkmisc.c:94
++#: ../gtk/gtkmisc.c:94
+ msgid ""
+ "The amount of space to add on the left and right of the widget, in pixels"
+ msgstr ""
+ "El número de espacios a añadir a la izquierda y derecha del widget, en "
+ "píxeles"
+
+-#: gtk/gtkmisc.c:103
++#: ../gtk/gtkmisc.c:103
+ msgid "Y pad"
+ msgstr "Y pad"
+
+-#: gtk/gtkmisc.c:104
++#: ../gtk/gtkmisc.c:104
+ msgid ""
+ "The amount of space to add on the top and bottom of the widget, in pixels"
+ msgstr ""
+ "El número de espacio a añadir en la parte superior e inferior del widget, en "
+ "píxeles"
+
+-#: gtk/gtkmountoperation.c:160
++#: ../gtk/gtkmountoperation.c:160
+ msgid "Parent"
+ msgstr "Padre"
+
+-#: gtk/gtkmountoperation.c:161
++#: ../gtk/gtkmountoperation.c:161
+ msgid "The parent window"
+ msgstr "La ventana padre"
+
+-#: gtk/gtkmountoperation.c:168
++#: ../gtk/gtkmountoperation.c:168
+ msgid "Is Showing"
+ msgstr "Está mostrando"
+
+-#: gtk/gtkmountoperation.c:169
++#: ../gtk/gtkmountoperation.c:169
+ msgid "Are we showing a dialog"
+ msgstr "Estamos mostrando un diálogo"
+
+-#: gtk/gtkmountoperation.c:177
++#: ../gtk/gtkmountoperation.c:177
+ msgid "The screen where this window will be displayed."
+ msgstr "La pantalla donde se mostrará esta ventana."
+
+-#: gtk/gtknotebook.c:577
++#: ../gtk/gtknotebook.c:577
+ msgid "Page"
+ msgstr "Página"
+
+-#: gtk/gtknotebook.c:578
++#: ../gtk/gtknotebook.c:578
+ msgid "The index of the current page"
+ msgstr "El índice de la página actual"
+
+-#: gtk/gtknotebook.c:586
++#: ../gtk/gtknotebook.c:586
+ msgid "Tab Position"
+ msgstr "Posición del tabulador"
+
+-#: gtk/gtknotebook.c:587
++#: ../gtk/gtknotebook.c:587
+ msgid "Which side of the notebook holds the tabs"
+ msgstr "Qué lado del cuaderno contiene las solapas"
+
+-#: gtk/gtknotebook.c:594
++#: ../gtk/gtknotebook.c:594
+ msgid "Tab Border"
+ msgstr "Borde de la solapa"
+
+-#: gtk/gtknotebook.c:595
++#: ../gtk/gtknotebook.c:595
+ msgid "Width of the border around the tab labels"
+ msgstr "Anchura del borde alrededor de las etiquetas de las solapas"
+
+-#: gtk/gtknotebook.c:603
++#: ../gtk/gtknotebook.c:603
+ msgid "Horizontal Tab Border"
+ msgstr "Borde de la solapa horizontal"
+
+-#: gtk/gtknotebook.c:604
++#: ../gtk/gtknotebook.c:604
+ msgid "Width of the horizontal border of tab labels"
+ msgstr "Anchura del borde horizontal de las etiquetas de las solapas"
+
+-#: gtk/gtknotebook.c:612
++#: ../gtk/gtknotebook.c:612
+ msgid "Vertical Tab Border"
+ msgstr "Borde de la solapa vertical"
+
+-#: gtk/gtknotebook.c:613
++#: ../gtk/gtknotebook.c:613
+ msgid "Width of the vertical border of tab labels"
+ msgstr "Anchura del borde vertical de las etiquetas de las solapas"
+
+-#: gtk/gtknotebook.c:621
++#: ../gtk/gtknotebook.c:621
+ msgid "Show Tabs"
+ msgstr "Mostrar solapas"
+
+-#: gtk/gtknotebook.c:622
++#: ../gtk/gtknotebook.c:622
+ msgid "Whether tabs should be shown or not"
+ msgstr "Indica si las solapas deben mostrarse o no"
+
+-#: gtk/gtknotebook.c:628
++#: ../gtk/gtknotebook.c:628
+ msgid "Show Border"
+ msgstr "Mostrar borde"
+
+-#: gtk/gtknotebook.c:629
++#: ../gtk/gtknotebook.c:629
+ msgid "Whether the border should be shown or not"
+ msgstr "Indica si el borde debe mostrarse o no"
+
+-#: gtk/gtknotebook.c:635
++#: ../gtk/gtknotebook.c:635
+ msgid "Scrollable"
+ msgstr "Desplazable"
+
+-#: gtk/gtknotebook.c:636
++#: ../gtk/gtknotebook.c:636
+ msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
+ msgstr ""
+ "Si es TRUE, añadir flechas de desplazamiento si no caben todas las solapas"
+
+-#: gtk/gtknotebook.c:642
++#: ../gtk/gtknotebook.c:642
+ msgid "Enable Popup"
+ msgstr "Activar emergente"
+
+-#: gtk/gtknotebook.c:643
++#: ../gtk/gtknotebook.c:643
+ msgid ""
+ "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
+ "you can use to go to a page"
+@@ -3556,358 +3581,360 @@
+ "Si es TRUE, presionando el botón derecho del ratón en el cuaderno emerge un "
+ "menú que puede usar para ir a una página"
+
+-#: gtk/gtknotebook.c:650
++#: ../gtk/gtknotebook.c:650
+ msgid "Whether tabs should have homogeneous sizes"
+ msgstr "Indica si las solapas deben tener tamaños homogéneos"
+
+-#: gtk/gtknotebook.c:656
++#: ../gtk/gtknotebook.c:656
+ msgid "Group ID"
+ msgstr "ID de grupo"
+
+-#: gtk/gtknotebook.c:657
++#: ../gtk/gtknotebook.c:657
+ msgid "Group ID for tabs drag and drop"
+ msgstr "ID de grupo para arrastre y suelte de las solapas"
+
+-#: gtk/gtknotebook.c:673 gtk/gtkradioaction.c:128 gtk/gtkradiobutton.c:82
+-#: gtk/gtkradiomenuitem.c:342 gtk/gtkradiotoolbutton.c:65
++#: ../gtk/gtknotebook.c:673 ../gtk/gtkradioaction.c:128
++#: ../gtk/gtkradiobutton.c:82 ../gtk/gtkradiomenuitem.c:342
++#: ../gtk/gtkradiotoolbutton.c:65
+ msgid "Group"
+ msgstr "Grupo"
+
+-#: gtk/gtknotebook.c:674
++#: ../gtk/gtknotebook.c:674
+ msgid "Group for tabs drag and drop"
+ msgstr "Grupo para arrastre y suelte de las solapas"
+
+-#: gtk/gtknotebook.c:680
++#: ../gtk/gtknotebook.c:680
+ msgid "Tab label"
+ msgstr "Etiqueta de la solapa"
+
+-#: gtk/gtknotebook.c:681
++#: ../gtk/gtknotebook.c:681
+ msgid "The string displayed on the child's tab label"
+ msgstr "La cadena mostrada en la etiqueta de la solapa hija"
+
+-#: gtk/gtknotebook.c:687
++#: ../gtk/gtknotebook.c:687
+ msgid "Menu label"
+ msgstr "Etiqueta de menú"
+
+-#: gtk/gtknotebook.c:688
++#: ../gtk/gtknotebook.c:688
+ msgid "The string displayed in the child's menu entry"
+ msgstr "La cadena mostrada en la entrada de menú hija"
+
+-#: gtk/gtknotebook.c:701
++#: ../gtk/gtknotebook.c:701
+ msgid "Tab expand"
+ msgstr "Expansión de la solapa"
+
+-#: gtk/gtknotebook.c:702
++#: ../gtk/gtknotebook.c:702
+ msgid "Whether to expand the child's tab or not"
+ msgstr "Indica si se deben expandir la solapas del hijo o no"
+
+-#: gtk/gtknotebook.c:708
++#: ../gtk/gtknotebook.c:708
+ msgid "Tab fill"
+ msgstr "Relleno de la solapa"
+
+-#: gtk/gtknotebook.c:709
++#: ../gtk/gtknotebook.c:709
+ msgid "Whether the child's tab should fill the allocated area or not"
+ msgstr "Indica si las solapas hijas deben rellenar el área asignada o no"
+
+-#: gtk/gtknotebook.c:715
++#: ../gtk/gtknotebook.c:715
+ msgid "Tab pack type"
+ msgstr "Tipo de empaquetado de la solapa"
+
+-#: gtk/gtknotebook.c:722
++#: ../gtk/gtknotebook.c:722
+ msgid "Tab reorderable"
+ msgstr "Solapa reordenable"
+
+-#: gtk/gtknotebook.c:723
++#: ../gtk/gtknotebook.c:723
+ msgid "Whether the tab is reorderable by user action or not"
+ msgstr ""
+ "Indica si la solapa se puede o no se puede reordenar por una acción del "
+ "usuario"
+
+-#: gtk/gtknotebook.c:729
++#: ../gtk/gtknotebook.c:729
+ msgid "Tab detachable"
+ msgstr "Solapa desprendible"
+
+-#: gtk/gtknotebook.c:730
++#: ../gtk/gtknotebook.c:730
+ msgid "Whether the tab is detachable"
+ msgstr "Indica si la solapa es desprendible"
+
+-#: gtk/gtknotebook.c:745 gtk/gtkscrollbar.c:83
++#: ../gtk/gtknotebook.c:745 ../gtk/gtkscrollbar.c:83
+ msgid "Secondary backward stepper"
+ msgstr "Flecha de retroceso secundaria"
+
+-#: gtk/gtknotebook.c:746
++#: ../gtk/gtknotebook.c:746
+ msgid ""
+ "Display a second backward arrow button on the opposite end of the tab area"
+ msgstr ""
+ "Muestra una segunda flecha de retroceso en el extremo opuesto del área de "
+ "solapas"
+
+-#: gtk/gtknotebook.c:761 gtk/gtkscrollbar.c:91
++#: ../gtk/gtknotebook.c:761 ../gtk/gtkscrollbar.c:91
+ msgid "Secondary forward stepper"
+ msgstr "Flecha de adelanto secundaria"
+
+-#: gtk/gtknotebook.c:762
++#: ../gtk/gtknotebook.c:762
+ msgid ""
+ "Display a second forward arrow button on the opposite end of the tab area"
+ msgstr ""
+ "Mostrar una segunda flecha de avance en el extremo opuesto del área de "
+ "solapas"
+
+-#: gtk/gtknotebook.c:776 gtk/gtkscrollbar.c:67
++#: ../gtk/gtknotebook.c:776 ../gtk/gtkscrollbar.c:67
+ msgid "Backward stepper"
+ msgstr "Flecha de retroceso"
+
+-#: gtk/gtknotebook.c:777 gtk/gtkscrollbar.c:68
++#: ../gtk/gtknotebook.c:777 ../gtk/gtkscrollbar.c:68
+ msgid "Display the standard backward arrow button"
+ msgstr "Mostrar el botón estándar de flecha de retroceso"
+
+-#: gtk/gtknotebook.c:791 gtk/gtkscrollbar.c:75
++#: ../gtk/gtknotebook.c:791 ../gtk/gtkscrollbar.c:75
+ msgid "Forward stepper"
+ msgstr "Flecha de avance"
+
+-#: gtk/gtknotebook.c:792 gtk/gtkscrollbar.c:76
++#: ../gtk/gtknotebook.c:792 ../gtk/gtkscrollbar.c:76
+ msgid "Display the standard forward arrow button"
+ msgstr "Mostrar el botón estándar de flecha de avance"
+
+-#: gtk/gtknotebook.c:806
++#: ../gtk/gtknotebook.c:806
+ msgid "Tab overlap"
+ msgstr "Solapamiento de la solapa"
+
+-#: gtk/gtknotebook.c:807
++#: ../gtk/gtknotebook.c:807
+ msgid "Size of tab overlap area"
+ msgstr "Tamaño del área de solapamiento de la solapa"
+
+-#: gtk/gtknotebook.c:822
++#: ../gtk/gtknotebook.c:822
+ msgid "Tab curvature"
+ msgstr "Curvatura de la solapa"
+
+-#: gtk/gtknotebook.c:823
++#: ../gtk/gtknotebook.c:823
+ msgid "Size of tab curvature"
+ msgstr "Tamaño de la curvatura de la solapa"
+
+-#: gtk/gtknotebook.c:839
++#: ../gtk/gtknotebook.c:839
+ msgid "Arrow spacing"
+ msgstr "Espaciado de las flechas"
+
+-#: gtk/gtknotebook.c:840
++#: ../gtk/gtknotebook.c:840
+ msgid "Scroll arrow spacing"
+ msgstr "Espaciado del desplazamiento de las flechas"
+
+-#: gtk/gtkobject.c:370
++#: ../gtk/gtkobject.c:370
+ msgid "User Data"
+ msgstr "Datos del usuario"
+
+-#: gtk/gtkobject.c:371
++#: ../gtk/gtkobject.c:371
+ msgid "Anonymous User Data Pointer"
+ msgstr "Puntero de datos del usuario anónimo"
+
+-#: gtk/gtkoptionmenu.c:162
++#: ../gtk/gtkoptionmenu.c:162
+ msgid "The menu of options"
+ msgstr "El menú de opciones"
+
+-#: gtk/gtkoptionmenu.c:169
++#: ../gtk/gtkoptionmenu.c:169
+ msgid "Size of dropdown indicator"
+ msgstr "Tamaño del indicador desplegable"
+
+-#: gtk/gtkoptionmenu.c:175
++#: ../gtk/gtkoptionmenu.c:175
+ msgid "Spacing around indicator"
+ msgstr "Espaciado alrededor del indicador"
+
+-#: gtk/gtkpaned.c:219
++#: ../gtk/gtkpaned.c:219
+ msgid ""
+ "Position of paned separator in pixels (0 means all the way to the left/top)"
+ msgstr ""
+ "Posición del separador cada hoja de la ventana en píxeles (0 significa todo "
+ "el trayecto hacia la izquierda/arriba) "
+
+-#: gtk/gtkpaned.c:227
++#: ../gtk/gtkpaned.c:227
+ msgid "Position Set"
+ msgstr "Posición establecida"
+
+-#: gtk/gtkpaned.c:228
++#: ../gtk/gtkpaned.c:228
+ msgid "TRUE if the Position property should be used"
+ msgstr "TRUE si debe usarse la propiedad «Posición»"
+
+-#: gtk/gtkpaned.c:234
++#: ../gtk/gtkpaned.c:234
+ msgid "Handle Size"
+ msgstr "Tamaño del tirador"
+
+-#: gtk/gtkpaned.c:235
++#: ../gtk/gtkpaned.c:235
+ msgid "Width of handle"
+ msgstr "Anchura del tirador"
+
+-#: gtk/gtkpaned.c:251
++#: ../gtk/gtkpaned.c:251
+ msgid "Minimal Position"
+ msgstr "Posición mínima"
+
+-#: gtk/gtkpaned.c:252
++#: ../gtk/gtkpaned.c:252
+ msgid "Smallest possible value for the \"position\" property"
+ msgstr "El valor más pequeño posible para la propiedad \"position\""
+
+-#: gtk/gtkpaned.c:269
++#: ../gtk/gtkpaned.c:269
+ msgid "Maximal Position"
+ msgstr "Posición máxima"
+
+-#: gtk/gtkpaned.c:270
++#: ../gtk/gtkpaned.c:270
+ msgid "Largest possible value for the \"position\" property"
+ msgstr "El valor más grande posible para la propiedad \"posicion\""
+
+-#: gtk/gtkpaned.c:287
++#: ../gtk/gtkpaned.c:287
+ msgid "Resize"
+ msgstr "Redimensionar"
+
+-#: gtk/gtkpaned.c:288
++#: ../gtk/gtkpaned.c:288
+ msgid "If TRUE, the child expands and shrinks along with the paned widget"
+ msgstr "Si es TRUE, el hijo se expande y encoge junto con el widget dividido"
+
+-#: gtk/gtkpaned.c:303
++#: ../gtk/gtkpaned.c:303
+ msgid "Shrink"
+ msgstr "Encoger"
+
+-#: gtk/gtkpaned.c:304
++#: ../gtk/gtkpaned.c:304
+ msgid "If TRUE, the child can be made smaller than its requisition"
+ msgstr "Si es TRUE, el hijo puede hacerse más pequeño que sus requisitos"
+
+-#: gtk/gtkplug.c:150 gtk/gtkstatusicon.c:285
++#: ../gtk/gtkplug.c:150 ../gtk/gtkstatusicon.c:285
+ msgid "Embedded"
+ msgstr "Empotrado"
+
+-#: gtk/gtkplug.c:151
++#: ../gtk/gtkplug.c:151
+ msgid "Whether or not the plug is embedded"
+ msgstr "Indica si el conector está empotrado"
+
+-#: gtk/gtkplug.c:165
++#: ../gtk/gtkplug.c:165
+ msgid "Socket Window"
+ msgstr "Ventana del socket"
+
+-#: gtk/gtkplug.c:166
++#: ../gtk/gtkplug.c:166
+ msgid "The window of the socket the plug is embedded in"
+ msgstr "La ventana del socket en la que el enchufe está empotrado"
+
+-#: gtk/gtkpreview.c:102
++#: ../gtk/gtkpreview.c:102
+ msgid ""
+ "Whether the preview widget should take up the entire space it is allocated"
+ msgstr ""
+ "Indica si el widget de vista previa debe tomar el espacio entero adonde se "
+ "encuentra situado"
+
+-#: gtk/gtkprinter.c:124
++#: ../gtk/gtkprinter.c:124
+ msgid "Name of the printer"
+ msgstr "Nombre de la impresora"
+
+-#: gtk/gtkprinter.c:130
++#: ../gtk/gtkprinter.c:130
+ msgid "Backend"
+ msgstr "Backend"
+
+-#: gtk/gtkprinter.c:131
++#: ../gtk/gtkprinter.c:131
+ msgid "Backend for the printer"
+ msgstr "Backend para la impresora"
+
+-#: gtk/gtkprinter.c:137
++#: ../gtk/gtkprinter.c:137
+ msgid "Is Virtual"
+ msgstr "Es virtual"
+
+-#: gtk/gtkprinter.c:138
++#: ../gtk/gtkprinter.c:138
+ msgid "FALSE if this represents a real hardware printer"
+ msgstr "FALSE si esto representa una impresora de hardware real"
+
+-#: gtk/gtkprinter.c:144
++#: ../gtk/gtkprinter.c:144
+ msgid "Accepts PDF"
+ msgstr "Acepta PDF"
+
+-#: gtk/gtkprinter.c:145
++#: ../gtk/gtkprinter.c:145
+ msgid "TRUE if this printer can accept PDF"
+ msgstr "TRUE si esta impresora puede aceptar PDF"
+
+-#: gtk/gtkprinter.c:151
++#: ../gtk/gtkprinter.c:151
+ msgid "Accepts PostScript"
+ msgstr "Acepta tabuladores PostScript"
+
+-#: gtk/gtkprinter.c:152
++#: ../gtk/gtkprinter.c:152
+ msgid "TRUE if this printer can accept PostScript"
+ msgstr "TRUE si esta impresora puede aceptar PostScript"
+
+-#: gtk/gtkprinter.c:158
++#: ../gtk/gtkprinter.c:158
+ msgid "State Message"
+ msgstr "Mensaje de estado"
+
+-#: gtk/gtkprinter.c:159
++#: ../gtk/gtkprinter.c:159
+ msgid "String giving the current state of the printer"
+ msgstr "Cadena dando el estado actual de la impresora"
+
+-#: gtk/gtkprinter.c:165
++#: ../gtk/gtkprinter.c:165
+ msgid "Location"
+ msgstr "Lugar"
+
+-#: gtk/gtkprinter.c:166
++#: ../gtk/gtkprinter.c:166
+ msgid "The location of the printer"
+ msgstr "La ubicación de la impresora"
+
+-#: gtk/gtkprinter.c:173
++#: ../gtk/gtkprinter.c:173
+ msgid "The icon name to use for the printer"
+ msgstr "El nombre del icono a usar para la impresora"
+
+-#: gtk/gtkprinter.c:179
++#: ../gtk/gtkprinter.c:179
+ msgid "Job Count"
+ msgstr "Cuenta de tareas"
+
+-#: gtk/gtkprinter.c:180
++#: ../gtk/gtkprinter.c:180
+ msgid "Number of jobs queued in the printer"
+ msgstr "El número de tareas encoladas en la impresora"
+
+-#: gtk/gtkprinter.c:198
++#: ../gtk/gtkprinter.c:198
+ msgid "Paused Printer"
+ msgstr "Impresora pausada"
+
+-#: gtk/gtkprinter.c:199
++#: ../gtk/gtkprinter.c:199
+ msgid "TRUE if this printer is paused"
+ msgstr "TRUE si esta impresora está pausada"
+
+-#: gtk/gtkprinter.c:212
++#: ../gtk/gtkprinter.c:212
+ msgid "Accepting Jobs"
+ msgstr "Aceptando trabajos"
+
+-#: gtk/gtkprinter.c:213
++#: ../gtk/gtkprinter.c:213
+ msgid "TRUE if this printer is accepting new jobs"
+ msgstr "TRUE si esta impresora está aceptando trabajos nuevos"
+
+-#: gtk/gtkprinteroptionwidget.c:123
++#: ../gtk/gtkprinteroptionwidget.c:123
+ msgid "Source option"
+ msgstr "Opciones de origen"
+
+-#: gtk/gtkprinteroptionwidget.c:124
++#: ../gtk/gtkprinteroptionwidget.c:124
+ msgid "The PrinterOption backing this widget"
+ msgstr "La PrinterOption que hay por detrás de este widget"
+
+-#: gtk/gtkprintjob.c:117
++#: ../gtk/gtkprintjob.c:117
+ msgid "Title of the print job"
+ msgstr "El título de la tarea de impresión"
+
+-#: gtk/gtkprintjob.c:125
++#: ../gtk/gtkprintjob.c:125
+ msgid "Printer"
+ msgstr "Impresora"
+
+-#: gtk/gtkprintjob.c:126
++#: ../gtk/gtkprintjob.c:126
+ msgid "Printer to print the job to"
+ msgstr "Impresora donde imprimir la tarea"
+
+-#: gtk/gtkprintjob.c:134
++#: ../gtk/gtkprintjob.c:134
+ msgid "Settings"
+ msgstr "Configuración"
+
+-#: gtk/gtkprintjob.c:135
++#: ../gtk/gtkprintjob.c:135
+ msgid "Printer settings"
+ msgstr "Configuración de la impresora"
+
+-#: gtk/gtkprintjob.c:143 gtk/gtkprintjob.c:144 gtk/gtkprintunixdialog.c:258
++#: ../gtk/gtkprintjob.c:143 ../gtk/gtkprintjob.c:144
++#: ../gtk/gtkprintunixdialog.c:258
+ msgid "Page Setup"
+ msgstr "Configuración de la página"
+
+-#: gtk/gtkprintjob.c:152 gtk/gtkprintoperation.c:1013
++#: ../gtk/gtkprintjob.c:152 ../gtk/gtkprintoperation.c:1013
+ msgid "Track Print Status"
+ msgstr "Seguimiento del estado de impresión"
+
+-#: gtk/gtkprintjob.c:153
++#: ../gtk/gtkprintjob.c:153
+ msgid ""
+ "TRUE if the print job will continue to emit status-changed signals after the "
+ "print data has been sent to the printer or print server."
+@@ -3916,51 +3943,51 @@
+ "estado después de que los datos de impresión se hayan enviado a la impresora "
+ "o servidor de impresoras."
+
+-#: gtk/gtkprintoperation.c:885
++#: ../gtk/gtkprintoperation.c:885
+ msgid "Default Page Setup"
+ msgstr "Configuración de la página predeterminada"
+
+-#: gtk/gtkprintoperation.c:886
++#: ../gtk/gtkprintoperation.c:886
+ msgid "The GtkPageSetup used by default"
+ msgstr "La GtkPageSetup usada por omisión"
+
+-#: gtk/gtkprintoperation.c:904 gtk/gtkprintunixdialog.c:276
++#: ../gtk/gtkprintoperation.c:904 ../gtk/gtkprintunixdialog.c:276
+ msgid "Print Settings"
+ msgstr "Configuración de impresión"
+
+-#: gtk/gtkprintoperation.c:905 gtk/gtkprintunixdialog.c:277
++#: ../gtk/gtkprintoperation.c:905 ../gtk/gtkprintunixdialog.c:277
+ msgid "The GtkPrintSettings used for initializing the dialog"
+ msgstr "Los GtkPrintSettings usados para inicializar el diálogo"
+
+-#: gtk/gtkprintoperation.c:923
++#: ../gtk/gtkprintoperation.c:923
+ msgid "Job Name"
+ msgstr "Nombre de la tarea"
+
+-#: gtk/gtkprintoperation.c:924
++#: ../gtk/gtkprintoperation.c:924
+ msgid "A string used for identifying the print job."
+ msgstr "Una cadena usada para identificar la tarea de impresión."
+
+-#: gtk/gtkprintoperation.c:948
++#: ../gtk/gtkprintoperation.c:948
+ msgid "Number of Pages"
+ msgstr "Número de páginas"
+
+-#: gtk/gtkprintoperation.c:949
++#: ../gtk/gtkprintoperation.c:949
+ msgid "The number of pages in the document."
+ msgstr "El número de páginas en el documento."
+
+-#: gtk/gtkprintoperation.c:970 gtk/gtkprintunixdialog.c:266
++#: ../gtk/gtkprintoperation.c:970 ../gtk/gtkprintunixdialog.c:266
+ msgid "Current Page"
+ msgstr "Página actual"
+
+-#: gtk/gtkprintoperation.c:971 gtk/gtkprintunixdialog.c:267
++#: ../gtk/gtkprintoperation.c:971 ../gtk/gtkprintunixdialog.c:267
+ msgid "The current page in the document"
+ msgstr "La página actual en el documento"
+
+-#: gtk/gtkprintoperation.c:992
++#: ../gtk/gtkprintoperation.c:992
+ msgid "Use full page"
+ msgstr "Usar página completa"
+
+-#: gtk/gtkprintoperation.c:993
++#: ../gtk/gtkprintoperation.c:993
+ msgid ""
+ "TRUE if the origin of the context should be at the corner of the page and "
+ "not the corner of the imageable area"
+@@ -3968,7 +3995,7 @@
+ "TRUE si el origen del contexto debe estar en la esquina de la página y no en "
+ "la esquina del área de donde puede aparecer la imagen"
+
+-#: gtk/gtkprintoperation.c:1014
++#: ../gtk/gtkprintoperation.c:1014
+ msgid ""
+ "TRUE if the print operation will continue to report on the print job status "
+ "after the print data has been sent to the printer or print server."
+@@ -3977,75 +4004,75 @@
+ "impresión después de que los datos de impresión se hayan enviado al servidor "
+ "de impresoras o a la impresora."
+
+-#: gtk/gtkprintoperation.c:1031
++#: ../gtk/gtkprintoperation.c:1031
+ msgid "Unit"
+ msgstr "Unidad"
+
+-#: gtk/gtkprintoperation.c:1032
++#: ../gtk/gtkprintoperation.c:1032
+ msgid "The unit in which distances can be measured in the context"
+ msgstr "La unidad en la que se pueden medir las distancias en el contexto"
+
+-#: gtk/gtkprintoperation.c:1049
++#: ../gtk/gtkprintoperation.c:1049
+ msgid "Show Dialog"
+ msgstr "Mostrar diálogo"
+
+-#: gtk/gtkprintoperation.c:1050
++#: ../gtk/gtkprintoperation.c:1050
+ msgid "TRUE if a progress dialog is shown while printing."
+ msgstr "TRUE si se muestra un diálogo de progreso durante la impresión."
+
+-#: gtk/gtkprintoperation.c:1073
++#: ../gtk/gtkprintoperation.c:1073
+ msgid "Allow Async"
+ msgstr "Permitir asíncrono"
+
+-#: gtk/gtkprintoperation.c:1074
++#: ../gtk/gtkprintoperation.c:1074
+ msgid "TRUE if print process may run asynchronous."
+ msgstr "TRUE si el proceso de impresión puede ejecutarse asíncronamente."
+
+-#: gtk/gtkprintoperation.c:1096 gtk/gtkprintoperation.c:1097
++#: ../gtk/gtkprintoperation.c:1096 ../gtk/gtkprintoperation.c:1097
+ msgid "Export filename"
+ msgstr "Nombre de archivo para exportar"
+
+-#: gtk/gtkprintoperation.c:1111
++#: ../gtk/gtkprintoperation.c:1111
+ msgid "Status"
+ msgstr "Estado"
+
+-#: gtk/gtkprintoperation.c:1112
++#: ../gtk/gtkprintoperation.c:1112
+ msgid "The status of the print operation"
+ msgstr "El estado de la operación de impresión"
+
+-#: gtk/gtkprintoperation.c:1132
++#: ../gtk/gtkprintoperation.c:1132
+ msgid "Status String"
+ msgstr "Cadena de estado"
+
+-#: gtk/gtkprintoperation.c:1133
++#: ../gtk/gtkprintoperation.c:1133
+ msgid "A human-readable description of the status"
+ msgstr "Una descripción leíble por humanos del estado"
+
+-#: gtk/gtkprintoperation.c:1151
++#: ../gtk/gtkprintoperation.c:1151
+ msgid "Custom tab label"
+ msgstr "Etiqueta de solapa personalizada"
+
+-#: gtk/gtkprintoperation.c:1152
++#: ../gtk/gtkprintoperation.c:1152
+ msgid "Label for the tab containing custom widgets."
+ msgstr "Etiqueta para la solapa que contiene widgets personalizados."
+
+-#: gtk/gtkprintunixdialog.c:259
++#: ../gtk/gtkprintunixdialog.c:259
+ msgid "The GtkPageSetup to use"
+ msgstr "El GtkPageSetup a usar"
+
+-#: gtk/gtkprintunixdialog.c:284
++#: ../gtk/gtkprintunixdialog.c:284
+ msgid "Selected Printer"
+ msgstr "Impresora seleccionada"
+
+-#: gtk/gtkprintunixdialog.c:285
++#: ../gtk/gtkprintunixdialog.c:285
+ msgid "The GtkPrinter which is selected"
+ msgstr "El GtkPrinter que está seleccionado"
+
+-#: gtk/gtkprogress.c:102
++#: ../gtk/gtkprogress.c:102
+ msgid "Activity mode"
+ msgstr "Modo de actividad"
+
+-#: gtk/gtkprogress.c:103
++#: ../gtk/gtkprogress.c:103
+ msgid ""
+ "If TRUE, the GtkProgress is in activity mode, meaning that it signals "
+ "something is happening, but not how much of the activity is finished. This "
+@@ -4056,41 +4083,41 @@
+ "Esto se usa cuando está haciendo algo que no sabe cuánto tiempo puede llevar "
+ "finalizarlo."
+
+-#: gtk/gtkprogress.c:111
++#: ../gtk/gtkprogress.c:111
+ msgid "Show text"
+ msgstr "Mostrar texto"
+
+-#: gtk/gtkprogress.c:112
++#: ../gtk/gtkprogress.c:112
+ msgid "Whether the progress is shown as text."
+ msgstr "Indica si el progreso se muestra como texto."
+
+-#: gtk/gtkprogressbar.c:119
++#: ../gtk/gtkprogressbar.c:119
+ msgid "The GtkAdjustment connected to the progress bar (Deprecated)"
+ msgstr "El GtkAdjustment conectado a la barra de progreso (obsoleto)"
+
+-#: gtk/gtkprogressbar.c:135
++#: ../gtk/gtkprogressbar.c:135
+ msgid "Bar style"
+ msgstr "Estilo de la barra"
+
+-#: gtk/gtkprogressbar.c:136
++#: ../gtk/gtkprogressbar.c:136
+ msgid "Specifies the visual style of the bar in percentage mode (Deprecated)"
+ msgstr ""
+ "Especifica el estilo visual de la barra en el modo porcentaje (obsoleto)"
+
+-#: gtk/gtkprogressbar.c:144
++#: ../gtk/gtkprogressbar.c:144
+ msgid "Activity Step"
+ msgstr "Paso de actividad"
+
+-#: gtk/gtkprogressbar.c:145
++#: ../gtk/gtkprogressbar.c:145
+ msgid "The increment used for each iteration in activity mode (Deprecated)"
+ msgstr ""
+ "El incremento usado para cada iteración en el modo actividad (obsoleto)"
+
+-#: gtk/gtkprogressbar.c:152
++#: ../gtk/gtkprogressbar.c:152
+ msgid "Activity Blocks"
+ msgstr "Bloques de actividad"
+
+-#: gtk/gtkprogressbar.c:153
++#: ../gtk/gtkprogressbar.c:153
+ msgid ""
+ "The number of blocks which can fit in the progress bar area in activity mode "
+ "(Deprecated)"
+@@ -4098,11 +4125,11 @@
+ "El número de bloques que pueden entrar en el área de la barra de progreso en "
+ "el modo actividad (obsoleto)"
+
+-#: gtk/gtkprogressbar.c:160
++#: ../gtk/gtkprogressbar.c:160
+ msgid "Discrete Blocks"
+ msgstr "Bloques discretos"
+
+-#: gtk/gtkprogressbar.c:161
++#: ../gtk/gtkprogressbar.c:161
+ msgid ""
+ "The number of discrete blocks in a progress bar (when shown in the discrete "
+ "style)"
+@@ -4110,28 +4137,28 @@
+ "El número de bloques discretos en una barra de progreso (cuando se muestre "
+ "en el estilo discreto)"
+
+-#: gtk/gtkprogressbar.c:168
++#: ../gtk/gtkprogressbar.c:168
+ msgid "Fraction"
+ msgstr "Fracción"
+
+-#: gtk/gtkprogressbar.c:169
++#: ../gtk/gtkprogressbar.c:169
+ msgid "The fraction of total work that has been completed"
+ msgstr "La fracción del trabajo total que ha sido completado"
+
+-#: gtk/gtkprogressbar.c:176
++#: ../gtk/gtkprogressbar.c:176
+ msgid "Pulse Step"
+ msgstr "Paso del pulso"
+
+-#: gtk/gtkprogressbar.c:177
++#: ../gtk/gtkprogressbar.c:177
+ msgid "The fraction of total progress to move the bouncing block when pulsed"
+ msgstr ""
+ "La fracción del progreso total para mover el bloque rebotador cuando se pulsa"
+
+-#: gtk/gtkprogressbar.c:185
++#: ../gtk/gtkprogressbar.c:185
+ msgid "Text to be displayed in the progress bar"
+ msgstr "Texto que se mostrará en la barra de progreso"
+
+-#: gtk/gtkprogressbar.c:207
++#: ../gtk/gtkprogressbar.c:207
+ msgid ""
+ "The preferred place to ellipsize the string, if the progress bar does not "
+ "have enough room to display the entire string, if at all."
+@@ -4139,59 +4166,59 @@
+ "El lugar preferido para la elipsis de la cadena, si la barra de progreso no "
+ "tiene suficiente espacio para mostrar la cadena completa."
+
+-#: gtk/gtkprogressbar.c:214
++#: ../gtk/gtkprogressbar.c:214
+ msgid "XSpacing"
+ msgstr "EspaciadoX"
+
+-#: gtk/gtkprogressbar.c:215
++#: ../gtk/gtkprogressbar.c:215
+ msgid "Extra spacing applied to the width of a progress bar."
+ msgstr "Espacio extra aplicado a la anchura de una barra de progreso."
+
+-#: gtk/gtkprogressbar.c:220
++#: ../gtk/gtkprogressbar.c:220
+ msgid "YSpacing"
+ msgstr "EspaciadoY"
+
+-#: gtk/gtkprogressbar.c:221
++#: ../gtk/gtkprogressbar.c:221
+ msgid "Extra spacing applied to the height of a progress bar."
+ msgstr "Espacio adicional aplicado a la altura >de una barra de progreso."
+
+-#: gtk/gtkprogressbar.c:234
++#: ../gtk/gtkprogressbar.c:234
+ msgid "Min horizontal bar width"
+ msgstr "Anchura mínima de la barra horizontal"
+
+-#: gtk/gtkprogressbar.c:235
++#: ../gtk/gtkprogressbar.c:235
+ msgid "The minimum horizontal width of the progress bar"
+ msgstr "La anchura mínima horizontal de la barra de progreso"
+
+-#: gtk/gtkprogressbar.c:247
++#: ../gtk/gtkprogressbar.c:247
+ msgid "Min horizontal bar height"
+ msgstr "Altura mínima de la barra horizontal"
+
+-#: gtk/gtkprogressbar.c:248
++#: ../gtk/gtkprogressbar.c:248
+ msgid "Minimum horizontal height of the progress bar"
+ msgstr "La altura mínima horizontal de la barra de progreso"
+
+-#: gtk/gtkprogressbar.c:260
++#: ../gtk/gtkprogressbar.c:260
+ msgid "Min vertical bar width"
+ msgstr "Anchura mínima horizontal de la barra"
+
+-#: gtk/gtkprogressbar.c:261
++#: ../gtk/gtkprogressbar.c:261
+ msgid "The minimum vertical width of the progress bar"
+ msgstr "La anchura mínima vertical de la barra de progreso"
+
+-#: gtk/gtkprogressbar.c:273
++#: ../gtk/gtkprogressbar.c:273
+ msgid "Min vertical bar height"
+ msgstr "Altura mínima vertical de la barra"
+
+-#: gtk/gtkprogressbar.c:274
++#: ../gtk/gtkprogressbar.c:274
+ msgid "The minimum vertical height of the progress bar"
+ msgstr "La altura mínima vertical de la barra de progreso"
+
+-#: gtk/gtkradioaction.c:111
++#: ../gtk/gtkradioaction.c:111
+ msgid "The value"
+ msgstr "El valor"
+
+-#: gtk/gtkradioaction.c:112
++#: ../gtk/gtkradioaction.c:112
+ msgid ""
+ "The value returned by gtk_radio_action_get_current_value() when this action "
+ "is the current action of its group."
+@@ -4199,15 +4226,15 @@
+ "El valor devuelto por gtk_radio_action_get_current_value() cuando esta "
+ "acción es la acción actual de su grupo."
+
+-#: gtk/gtkradioaction.c:129
++#: ../gtk/gtkradioaction.c:129
+ msgid "The radio action whose group this action belongs to."
+ msgstr "La acción de radio a cuyo grupo pertenece esta acción."
+
+-#: gtk/gtkradioaction.c:144
++#: ../gtk/gtkradioaction.c:144
+ msgid "The current value"
+ msgstr "El valor actual"
+
+-#: gtk/gtkradioaction.c:145
++#: ../gtk/gtkradioaction.c:145
+ msgid ""
+ "The value property of the currently active member of the group to which this "
+ "action belongs."
+@@ -4215,45 +4242,45 @@
+ "La propiedad del valor del miembro actualmente activo del grupo al que esta "
+ "acción pertenece."
+
+-#: gtk/gtkradiobutton.c:83
++#: ../gtk/gtkradiobutton.c:83
+ msgid "The radio button whose group this widget belongs to."
+ msgstr "El botón de radio a cuyo grupo pertenece este widget."
+
+-#: gtk/gtkradiomenuitem.c:343
++#: ../gtk/gtkradiomenuitem.c:343
+ msgid "The radio menu item whose group this widget belongs to."
+ msgstr "El elemento del menú de radio a cuyo grupo pertenece este widget."
+
+-#: gtk/gtkradiotoolbutton.c:66
++#: ../gtk/gtkradiotoolbutton.c:66
+ msgid "The radio tool button whose group this button belongs to."
+ msgstr "La herramienta de botón de radio a cuyo grupo pertenece este widget."
+
+-#: gtk/gtkrange.c:337
++#: ../gtk/gtkrange.c:337
+ msgid "Update policy"
+ msgstr "Política de actualización"
+
+-#: gtk/gtkrange.c:338
++#: ../gtk/gtkrange.c:338
+ msgid "How the range should be updated on the screen"
+ msgstr "Cómo se debe actualizar el rango en la pantalla"
+
+-#: gtk/gtkrange.c:347
++#: ../gtk/gtkrange.c:347
+ msgid "The GtkAdjustment that contains the current value of this range object"
+ msgstr "El GtkAdjustment que contiene el valor actual de este objeto de rango"
+
+-#: gtk/gtkrange.c:354
++#: ../gtk/gtkrange.c:354
+ msgid "Inverted"
+ msgstr "Invertido"
+
+-#: gtk/gtkrange.c:355
++#: ../gtk/gtkrange.c:355
+ msgid "Invert direction slider moves to increase range value"
+ msgstr ""
+ "Invierte la dirección en que se mueve el deslizador para incrementar el "
+ "valor del rango"
+
+-#: gtk/gtkrange.c:362
++#: ../gtk/gtkrange.c:362
+ msgid "Lower stepper sensitivity"
+ msgstr "Sensibilidad de la flecha inferior"
+
+-#: gtk/gtkrange.c:363
++#: ../gtk/gtkrange.c:363
+ msgid ""
+ "The sensitivity policy for the stepper that points to the adjustment's lower "
+ "side"
+@@ -4261,11 +4288,11 @@
+ "La directiva de sensibilidad del botón de desplazamiento que apunta al lado "
+ "más bajo del ajuste"
+
+-#: gtk/gtkrange.c:371
++#: ../gtk/gtkrange.c:371
+ msgid "Upper stepper sensitivity"
+ msgstr "Sensibilidad de la flecha superior"
+
+-#: gtk/gtkrange.c:372
++#: ../gtk/gtkrange.c:372
+ msgid ""
+ "The sensitivity policy for the stepper that points to the adjustment's upper "
+ "side"
+@@ -4273,91 +4300,91 @@
+ "La directiva de sensibilidad del botón de flecha que apunta al lado más alto "
+ "del ajuste"
+
+-#: gtk/gtkrange.c:389
++#: ../gtk/gtkrange.c:389
+ msgid "Show Fill Level"
+ msgstr "Mostrar nivel de relleno"
+
+-#: gtk/gtkrange.c:390
++#: ../gtk/gtkrange.c:390
+ msgid "Whether to display a fill level indicator graphics on trough."
+ msgstr ""
+ "Indica si se debe mostrar el indicador de nivel de llenado en los gráficos "
+ "mientras se llena."
+
+-#: gtk/gtkrange.c:406
++#: ../gtk/gtkrange.c:406
+ msgid "Restrict to Fill Level"
+ msgstr "Restringir al nivel de llenado"
+
+-#: gtk/gtkrange.c:407
++#: ../gtk/gtkrange.c:407
+ msgid "Whether to restrict the upper boundary to the fill level."
+ msgstr "Indica si se debe restringir el borde superior al nivel de llenado."
+
+-#: gtk/gtkrange.c:422
++#: ../gtk/gtkrange.c:422
+ msgid "Fill Level"
+ msgstr "Nivel de llenado"
+
+-#: gtk/gtkrange.c:423
++#: ../gtk/gtkrange.c:423
+ msgid "The fill level."
+ msgstr "El nivel de llenado."
+
+-#: gtk/gtkrange.c:431
++#: ../gtk/gtkrange.c:431
+ msgid "Slider Width"
+ msgstr "Anchura del deslizador"
+
+-#: gtk/gtkrange.c:432
++#: ../gtk/gtkrange.c:432
+ msgid "Width of scrollbar or scale thumb"
+ msgstr "Anchura de la barra de desplazamiento o escala de miniatura"
+
+-#: gtk/gtkrange.c:439
++#: ../gtk/gtkrange.c:439
+ msgid "Trough Border"
+ msgstr "Borde del carril"
+
+-#: gtk/gtkrange.c:440
++#: ../gtk/gtkrange.c:440
+ msgid "Spacing between thumb/steppers and outer trough bevel"
+ msgstr ""
+ "Espaciado entre la marcador/flechas de desplazamiento y el bisel exterior "
+ "del carril"
+
+-#: gtk/gtkrange.c:447
++#: ../gtk/gtkrange.c:447
+ msgid "Stepper Size"
+ msgstr "Tamaño del botón de flecha de desplazamiento"
+
+-#: gtk/gtkrange.c:448
++#: ../gtk/gtkrange.c:448
+ msgid "Length of step buttons at ends"
+ msgstr "Longitud de los botones de flecha en los extremos"
+
+-#: gtk/gtkrange.c:463
++#: ../gtk/gtkrange.c:463
+ msgid "Stepper Spacing"
+ msgstr "Espaciado de los botones de flecha de desplazamiento"
+
+-#: gtk/gtkrange.c:464
++#: ../gtk/gtkrange.c:464
+ msgid "Spacing between step buttons and thumb"
+ msgstr "Espaciado entre los botones de flecha de desplazamiento y el marcador"
+
+-#: gtk/gtkrange.c:471
++#: ../gtk/gtkrange.c:471
+ msgid "Arrow X Displacement"
+ msgstr "Desplazamiento de la flecha X"
+
+-#: gtk/gtkrange.c:472
++#: ../gtk/gtkrange.c:472
+ msgid ""
+ "How far in the x direction to move the arrow when the button is depressed"
+ msgstr ""
+ "Distancia en la dirección «X» para mover la flecha cuando se suelta el botón "
+
+-#: gtk/gtkrange.c:479
++#: ../gtk/gtkrange.c:479
+ msgid "Arrow Y Displacement"
+ msgstr "Desplazamiento de la flecha Y"
+
+-#: gtk/gtkrange.c:480
++#: ../gtk/gtkrange.c:480
+ msgid ""
+ "How far in the y direction to move the arrow when the button is depressed"
+ msgstr ""
+ "Distancia en la dirección «Y» para mover la flecha cuando se suelta el botón "
+
+-#: gtk/gtkrange.c:488
++#: ../gtk/gtkrange.c:488
+ msgid "Draw slider ACTIVE during drag"
+ msgstr "Dibujar deslizador ACTIVO durante el arrastre"
+
+-#: gtk/gtkrange.c:489
++#: ../gtk/gtkrange.c:489
+ msgid ""
+ "With this option set to TRUE, sliders will be drawn ACTIVE and with shadow "
+ "IN while they are dragged"
+@@ -4365,11 +4392,11 @@
+ "Con esta opción puesta a TRUE, los deslizadores se dibujarán ACTIVOS y con "
+ "sombra DENTRO al arrastrarlos"
+
+-#: gtk/gtkrange.c:503
++#: ../gtk/gtkrange.c:503
+ msgid "Trough Side Details"
+ msgstr "Detalles del lado del carril"
+
+-#: gtk/gtkrange.c:504
++#: ../gtk/gtkrange.c:504
+ msgid ""
+ "When TRUE, the parts of the trough on the two sides of the slider are drawn "
+ "with different details"
+@@ -4377,11 +4404,11 @@
+ "Cuando sea TRUE, las partes del carril en los dos lados del deslizador se "
+ "dibujarán con detalles diferentes"
+
+-#: gtk/gtkrange.c:520
++#: ../gtk/gtkrange.c:520
+ msgid "Trough Under Steppers"
+ msgstr "Carril bajo las flechas de deslizamiento"
+
+-#: gtk/gtkrange.c:521
++#: ../gtk/gtkrange.c:521
+ msgid ""
+ "Whether to draw trough for full length of range or exclude the steppers and "
+ "spacing"
+@@ -4389,272 +4416,274 @@
+ "Indica si se debe dibujar para la longitud completa del rango o excluir las "
+ "flechas de desplazamiento y el espaciado"
+
+-#: gtk/gtkrange.c:534
++#: ../gtk/gtkrange.c:534
+ msgid "Arrow scaling"
+ msgstr "Escalado de flechas"
+
+-#: gtk/gtkrange.c:535
++#: ../gtk/gtkrange.c:535
+ msgid "Arrow scaling with regard to scroll button size"
+ msgstr ""
+ "Escalado de flechas en consideración con el tamaño del botón de "
+ "desplazamiento"
+
+-#: gtk/gtkrecentaction.c:679 gtk/gtkrecentchoosermenu.c:206
++#: ../gtk/gtkrecentaction.c:679 ../gtk/gtkrecentchoosermenu.c:206
+ msgid "Show Numbers"
+ msgstr "Mostrar números"
+
+-#: gtk/gtkrecentaction.c:680 gtk/gtkrecentchoosermenu.c:207
++#: ../gtk/gtkrecentaction.c:680 ../gtk/gtkrecentchoosermenu.c:207
+ msgid "Whether the items should be displayed with a number"
+ msgstr "Indica si los elementos deben mostrarse con un número"
+
+-#: gtk/gtkrecentchooser.c:120
++#: ../gtk/gtkrecentchooser.c:120
+ msgid "Recent Manager"
+ msgstr "Gestor de recientes"
+
+-#: gtk/gtkrecentchooser.c:121
++#: ../gtk/gtkrecentchooser.c:121
+ msgid "The RecentManager object to use"
+ msgstr "El objeto RecentManager que usar"
+
+-#: gtk/gtkrecentchooser.c:135
++#: ../gtk/gtkrecentchooser.c:135
+ msgid "Show Private"
+ msgstr "Mostrar privados"
+
+-#: gtk/gtkrecentchooser.c:136
++#: ../gtk/gtkrecentchooser.c:136
+ msgid "Whether the private items should be displayed"
+ msgstr "Indica si deben mostrarse los elementos privados"
+
+-#: gtk/gtkrecentchooser.c:149
++#: ../gtk/gtkrecentchooser.c:149
+ msgid "Show Tooltips"
+ msgstr "Mostrar consejos"
+
+-#: gtk/gtkrecentchooser.c:150
++#: ../gtk/gtkrecentchooser.c:150
+ msgid "Whether there should be a tooltip on the item"
+ msgstr "Indica si debe haber un consejo en el elemento"
+
+-#: gtk/gtkrecentchooser.c:162
++#: ../gtk/gtkrecentchooser.c:162
+ msgid "Show Icons"
+ msgstr "Mostrar iconos"
+
+-#: gtk/gtkrecentchooser.c:163
++#: ../gtk/gtkrecentchooser.c:163
+ msgid "Whether there should be an icon near the item"
+ msgstr "Indica si debe haber un icono cerca del elemento"
+
+-#: gtk/gtkrecentchooser.c:178
++#: ../gtk/gtkrecentchooser.c:178
+ msgid "Show Not Found"
+ msgstr "Mostrar no encontrados"
+
+-#: gtk/gtkrecentchooser.c:179
++#: ../gtk/gtkrecentchooser.c:179
+ msgid "Whether the items pointing to unavailable resources should be displayed"
+ msgstr ""
+ "Indica si deben mostrarse los elementos que apuntan a recursos no disponibles"
+
+-#: gtk/gtkrecentchooser.c:192
++#: ../gtk/gtkrecentchooser.c:192
+ msgid "Whether to allow multiple items to be selected"
+ msgstr "Indica si se permite la selección de múltiples elementos"
+
+-#: gtk/gtkrecentchooser.c:205
++#: ../gtk/gtkrecentchooser.c:205
+ msgid "Local only"
+ msgstr "Sólo local"
+
+-#: gtk/gtkrecentchooser.c:206
++#: ../gtk/gtkrecentchooser.c:206
+ msgid "Whether the selected resource(s) should be limited to local file: URIs"
+ msgstr ""
+ "Indica si los recursos seleccionados deben limitarse a URI locales file:"
+
+-#: gtk/gtkrecentchooser.c:222 gtk/gtkrecentmanager.c:229
++#: ../gtk/gtkrecentchooser.c:222 ../gtk/gtkrecentmanager.c:229
+ msgid "Limit"
+ msgstr "Límite"
+
+-#: gtk/gtkrecentchooser.c:223
++#: ../gtk/gtkrecentchooser.c:223
+ msgid "The maximum number of items to be displayed"
+ msgstr "El número máximo de elementos a mostrar"
+
+-#: gtk/gtkrecentchooser.c:237
++#: ../gtk/gtkrecentchooser.c:237
+ msgid "Sort Type"
+ msgstr "Tipo de orden"
+
+-#: gtk/gtkrecentchooser.c:238
++#: ../gtk/gtkrecentchooser.c:238
+ msgid "The sorting order of the items displayed"
+ msgstr "El orden de colocación de los elementos mostrados"
+
+-#: gtk/gtkrecentchooser.c:253
++#: ../gtk/gtkrecentchooser.c:253
+ msgid "The current filter for selecting which resources are displayed"
+ msgstr "El filtro actual para seleccionar qué recursos se muestran"
+
+-#: gtk/gtkrecentmanager.c:215
++#: ../gtk/gtkrecentmanager.c:215
+ msgid "The full path to the file to be used to store and read the list"
+ msgstr "La ruta completa al archivo a usar para almacenar y leer la lista"
+
+-#: gtk/gtkrecentmanager.c:230
++#: ../gtk/gtkrecentmanager.c:230
+ msgid ""
+ "The maximum number of items to be returned by gtk_recent_manager_get_items()"
+ msgstr ""
+ "El número máximo de elementos a devolver por gtk_recent_manager_get_items()"
+
+-#: gtk/gtkrecentmanager.c:246
++#: ../gtk/gtkrecentmanager.c:246
+ msgid "The size of the recently used resources list"
+ msgstr "El tamaño de la lista de recursos usados recientemente"
+
+-#: gtk/gtkruler.c:90
++#: ../gtk/gtkruler.c:90
+ msgid "Lower"
+ msgstr "Inferior"
+
+-#: gtk/gtkruler.c:91
++#: ../gtk/gtkruler.c:91
+ msgid "Lower limit of ruler"
+ msgstr "Límite inferior de la regla"
+
+-#: gtk/gtkruler.c:100
++#: ../gtk/gtkruler.c:100
+ msgid "Upper"
+ msgstr "Superior"
+
+-#: gtk/gtkruler.c:101
++#: ../gtk/gtkruler.c:101
+ msgid "Upper limit of ruler"
+ msgstr "Límite superior de la regla"
+
+-#: gtk/gtkruler.c:111
++#: ../gtk/gtkruler.c:111
+ msgid "Position of mark on the ruler"
+ msgstr "Posición de la etiqueta en la regla"
+
+-#: gtk/gtkruler.c:120
++#: ../gtk/gtkruler.c:120
+ msgid "Max Size"
+ msgstr "Tamaño máximo"
+
+-#: gtk/gtkruler.c:121
++#: ../gtk/gtkruler.c:121
+ msgid "Maximum size of the ruler"
+ msgstr "Tamaño máximo de la regla"
+
+-#: gtk/gtkruler.c:136
++#: ../gtk/gtkruler.c:136
+ msgid "Metric"
+ msgstr "Métrica"
+
+-#: gtk/gtkruler.c:137
++#: ../gtk/gtkruler.c:137
+ msgid "The metric used for the ruler"
+ msgstr "La métrica de la regla"
+
+-#: gtk/gtkscale.c:143
++#: ../gtk/gtkscale.c:143
+ msgid "The number of decimal places that are displayed in the value"
+ msgstr "El número de lugares decimales que se mostrarán en el valor"
+
+-#: gtk/gtkscale.c:152
++#: ../gtk/gtkscale.c:152
+ msgid "Draw Value"
+ msgstr "Dibujar valor"
+
+-#: gtk/gtkscale.c:153
++#: ../gtk/gtkscale.c:153
+ msgid "Whether the current value is displayed as a string next to the slider"
+ msgstr ""
+ "Indica si el valor actual se muestra como una cadena contigua al deslizador"
+
+-#: gtk/gtkscale.c:160
++#: ../gtk/gtkscale.c:160
+ msgid "Value Position"
+ msgstr "Posición del valor"
+
+-#: gtk/gtkscale.c:161
++#: ../gtk/gtkscale.c:161
+ msgid "The position in which the current value is displayed"
+ msgstr "La posición en que se muestra el valor actual"
+
+-#: gtk/gtkscale.c:168
++#: ../gtk/gtkscale.c:168
+ msgid "Slider Length"
+ msgstr "Longitud del deslizador"
+
+-#: gtk/gtkscale.c:169
++#: ../gtk/gtkscale.c:169
+ msgid "Length of scale's slider"
+ msgstr "Longitud de la escala del deslizador"
+
+-#: gtk/gtkscale.c:177
++#: ../gtk/gtkscale.c:177
+ msgid "Value spacing"
+ msgstr "Espaciado del valor"
+
+-#: gtk/gtkscale.c:178
++#: ../gtk/gtkscale.c:178
+ msgid "Space between value text and the slider/trough area"
+ msgstr "Espacio entre el texto del valor y el área del deslizador/carril"
+
+-#: gtk/gtkscalebutton.c:194
++#: ../gtk/gtkscalebutton.c:194
+ msgid "The orientation of the scale"
+ msgstr "La orientación de la escala"
+
+-#: gtk/gtkscalebutton.c:203
++#: ../gtk/gtkscalebutton.c:203
+ msgid "The value of the scale"
+ msgstr "El valor de la escala"
+
+-#: gtk/gtkscalebutton.c:213
++#: ../gtk/gtkscalebutton.c:213
+ msgid "The icon size"
+ msgstr "El tamaño del icono"
+
+-#: gtk/gtkscalebutton.c:222
++#: ../gtk/gtkscalebutton.c:222
+ msgid ""
+ "The GtkAdjustment that contains the current value of this scale button object"
+ msgstr ""
+ "El GtkAdjustment que contiene el valor actual de este objeto de botón de "
+ "escala"
+
+-#: gtk/gtkscalebutton.c:250
++#: ../gtk/gtkscalebutton.c:250
+ msgid "Icons"
+ msgstr "Iconos"
+
+-#: gtk/gtkscalebutton.c:251
++#: ../gtk/gtkscalebutton.c:251
+ msgid "List of icon names"
+ msgstr "Lista de nombres de iconos"
+
+-#: gtk/gtkscrollbar.c:50
++#: ../gtk/gtkscrollbar.c:50
+ msgid "Minimum Slider Length"
+ msgstr "Longitud mínima del deslizador"
+
+-#: gtk/gtkscrollbar.c:51
++#: ../gtk/gtkscrollbar.c:51
+ msgid "Minimum length of scrollbar slider"
+ msgstr "Longitud mínima de deslizador de la barras de desplazamiento"
+
+-#: gtk/gtkscrollbar.c:59
++#: ../gtk/gtkscrollbar.c:59
+ msgid "Fixed slider size"
+ msgstr "Tamaño del deslizador fijo"
+
+-#: gtk/gtkscrollbar.c:60
++#: ../gtk/gtkscrollbar.c:60
+ msgid "Don't change slider size, just lock it to the minimum length"
+ msgstr ""
+ "No cambiar el tamaño del deslizador, sólo bloquearlo a la longitud mínima"
+
+-#: gtk/gtkscrollbar.c:84
++#: ../gtk/gtkscrollbar.c:84
+ msgid ""
+ "Display a second backward arrow button on the opposite end of the scrollbar"
+ msgstr ""
+ "Muestra un segundo botón con una flecha de retroceso en el extremo opuesto "
+ "de la barra de desplazamiento"
+
+-#: gtk/gtkscrollbar.c:92
++#: ../gtk/gtkscrollbar.c:92
+ msgid ""
+ "Display a second forward arrow button on the opposite end of the scrollbar"
+ msgstr ""
+ "Muestra un botón secundario con flecha de avance en el extremo opuesto de la "
+ "barra de desplazamiento"
+
+-#: gtk/gtkscrolledwindow.c:218 gtk/gtktext.c:545 gtk/gtktreeview.c:578
++#: ../gtk/gtkscrolledwindow.c:218 ../gtk/gtktext.c:545
++#: ../gtk/gtktreeview.c:578
+ msgid "Horizontal Adjustment"
+ msgstr "Ajuste horizontal"
+
+-#: gtk/gtkscrolledwindow.c:225 gtk/gtktext.c:553 gtk/gtktreeview.c:586
++#: ../gtk/gtkscrolledwindow.c:225 ../gtk/gtktext.c:553
++#: ../gtk/gtktreeview.c:586
+ msgid "Vertical Adjustment"
+ msgstr "Ajuste vertical"
+
+-#: gtk/gtkscrolledwindow.c:232
++#: ../gtk/gtkscrolledwindow.c:232
+ msgid "Horizontal Scrollbar Policy"
+ msgstr "Directiva de la barra de desplazamiento horizontal"
+
+-#: gtk/gtkscrolledwindow.c:233
++#: ../gtk/gtkscrolledwindow.c:233
+ msgid "When the horizontal scrollbar is displayed"
+ msgstr "Cuando mostrar la barra de desplazamiento horizontal"
+
+-#: gtk/gtkscrolledwindow.c:240
++#: ../gtk/gtkscrolledwindow.c:240
+ msgid "Vertical Scrollbar Policy"
+ msgstr "Directiva de la barra de desplazamiento vertical"
+
+-#: gtk/gtkscrolledwindow.c:241
++#: ../gtk/gtkscrolledwindow.c:241
+ msgid "When the vertical scrollbar is displayed"
+ msgstr "Cuando mostrar la barra de desplazamiento vertical"
+
+-#: gtk/gtkscrolledwindow.c:249
++#: ../gtk/gtkscrolledwindow.c:249
+ msgid "Window Placement"
+ msgstr "Colocación de la ventana"
+
+-#: gtk/gtkscrolledwindow.c:250
++#: ../gtk/gtkscrolledwindow.c:250
+ msgid ""
+ "Where the contents are located with respect to the scrollbars. This property "
+ "only takes effect if \"window-placement-set\" is TRUE."
+@@ -4662,11 +4691,11 @@
+ "Dónde se colocan los contenidos respecto a las barras de desplazamiento. "
+ "Esta propiedad sólo tiene efecto si \"window-placement-set\" es TRUE."
+
+-#: gtk/gtkscrolledwindow.c:267
++#: ../gtk/gtkscrolledwindow.c:267
+ msgid "Window Placement Set"
+ msgstr "Establece la colocación de la ventana"
+
+-#: gtk/gtkscrolledwindow.c:268
++#: ../gtk/gtkscrolledwindow.c:268
+ msgid ""
+ "Whether \"window-placement\" should be used to determine the location of the "
+ "contents with respect to the scrollbars."
+@@ -4674,37 +4703,37 @@
+ "Indica si debe usarse \"window-placement\" para determinar el lugar del "
+ "contenido respecto a las barras de desplazamiento."
+
+-#: gtk/gtkscrolledwindow.c:274
++#: ../gtk/gtkscrolledwindow.c:274
+ msgid "Shadow Type"
+ msgstr "Tipo de sombra"
+
+-#: gtk/gtkscrolledwindow.c:275
++#: ../gtk/gtkscrolledwindow.c:275
+ msgid "Style of bevel around the contents"
+ msgstr "Estilo de bisel alrededor de los contenidos"
+
+-#: gtk/gtkscrolledwindow.c:289
++#: ../gtk/gtkscrolledwindow.c:289
+ msgid "Scrollbars within bevel"
+ msgstr "Barras de desplazamiento entre biseles"
+
+-#: gtk/gtkscrolledwindow.c:290
++#: ../gtk/gtkscrolledwindow.c:290
+ msgid "Place scrollbars within the scrolled window's bevel"
+ msgstr ""
+ "Ubicar barras de desplazamiento entre el bisel de la ventana desplazada"
+
+-#: gtk/gtkscrolledwindow.c:296
++#: ../gtk/gtkscrolledwindow.c:296
+ msgid "Scrollbar spacing"
+ msgstr "Espaciado de la barra de desplazamiento"
+
+-#: gtk/gtkscrolledwindow.c:297
++#: ../gtk/gtkscrolledwindow.c:297
+ msgid "Number of pixels between the scrollbars and the scrolled window"
+ msgstr ""
+ "Número de píxeles entre las barras de desplazamiento y la ventana enrollada"
+
+-#: gtk/gtkscrolledwindow.c:312
++#: ../gtk/gtkscrolledwindow.c:312
+ msgid "Scrolled Window Placement"
+ msgstr "Colocación de la ventana donde se ha desplazado"
+
+-#: gtk/gtkscrolledwindow.c:313
++#: ../gtk/gtkscrolledwindow.c:313
+ msgid ""
+ "Where the contents of scrolled windows are located with respect to the "
+ "scrollbars, if not overridden by the scrolled window's own placement."
+@@ -4713,19 +4742,19 @@
+ "respecto a las barras de desplazamiento, si no toma precedencia por el "
+ "propio emplazamiento de la ventana donde se hizo scroll."
+
+-#: gtk/gtkseparatortoolitem.c:105
++#: ../gtk/gtkseparatortoolitem.c:105
+ msgid "Draw"
+ msgstr "Dibujar"
+
+-#: gtk/gtkseparatortoolitem.c:106
++#: ../gtk/gtkseparatortoolitem.c:106
+ msgid "Whether the separator is drawn, or just blank"
+ msgstr "Indica si el separador se dibuja, o sólo se deja en blanco"
+
+-#: gtk/gtksettings.c:215
++#: ../gtk/gtksettings.c:215
+ msgid "Double Click Time"
+ msgstr "Tiempo del doble pulsación"
+
+-#: gtk/gtksettings.c:216
++#: ../gtk/gtksettings.c:216
+ msgid ""
+ "Maximum time allowed between two clicks for them to be considered a double "
+ "click (in milliseconds)"
+@@ -4733,11 +4762,11 @@
+ "Tiempo máximo permitido entre dos pulsaciones para ser considerados como una "
+ "pulsación doble (en milisegundos)"
+
+-#: gtk/gtksettings.c:223
++#: ../gtk/gtksettings.c:223
+ msgid "Double Click Distance"
+ msgstr "Distancia de la pulsación doble"
+
+-#: gtk/gtksettings.c:224
++#: ../gtk/gtksettings.c:224
+ msgid ""
+ "Maximum distance allowed between two clicks for them to be considered a "
+ "double click (in pixels)"
+@@ -4745,35 +4774,35 @@
+ "Distancia máxima permitida entre dos pulsaciones para ser considerados como "
+ "una pulsación doble (en píxeles)"
+
+-#: gtk/gtksettings.c:240
++#: ../gtk/gtksettings.c:240
+ msgid "Cursor Blink"
+ msgstr "Parpadeo del cursor"
+
+-#: gtk/gtksettings.c:241
++#: ../gtk/gtksettings.c:241
+ msgid "Whether the cursor should blink"
+ msgstr "Indica si el cursor debe parpadear"
+
+-#: gtk/gtksettings.c:248
++#: ../gtk/gtksettings.c:248
+ msgid "Cursor Blink Time"
+ msgstr "Tiempo de parpadeo del cursor"
+
+-#: gtk/gtksettings.c:249
++#: ../gtk/gtksettings.c:249
+ msgid "Length of the cursor blink cycle, in milliseconds"
+ msgstr "Longitud del ciclo de parpadeo del cursor, en milisegundos"
+
+-#: gtk/gtksettings.c:268
++#: ../gtk/gtksettings.c:268
+ msgid "Cursor Blink Timeout"
+ msgstr "Intervalo de parpadeo del cursor"
+
+-#: gtk/gtksettings.c:269
++#: ../gtk/gtksettings.c:269
+ msgid "Time after which the cursor stops blinking, in seconds"
+ msgstr "Tiempo tras el que el cursor para de parpadear, en segundos"
+
+-#: gtk/gtksettings.c:276
++#: ../gtk/gtksettings.c:276
+ msgid "Split Cursor"
+ msgstr "Dividir cursor"
+
+-#: gtk/gtksettings.c:277
++#: ../gtk/gtksettings.c:277
+ msgid ""
+ "Whether two cursors should be displayed for mixed left-to-right and right-to-"
+ "left text"
+@@ -4781,161 +4810,161 @@
+ "Indica si deben mostrarse dos cursores para el texto mezclado de izquierda-a-"
+ "derecha y derecha-a-izquierda"
+
+-#: gtk/gtksettings.c:284
++#: ../gtk/gtksettings.c:284
+ msgid "Theme Name"
+ msgstr "Nombre del tema"
+
+-#: gtk/gtksettings.c:285
++#: ../gtk/gtksettings.c:285
+ msgid "Name of theme RC file to load"
+ msgstr "Nombre del archivo RC de tema que cargar"
+
+-#: gtk/gtksettings.c:293
++#: ../gtk/gtksettings.c:293
+ msgid "Icon Theme Name"
+ msgstr "Nombre del tema de iconos"
+
+-#: gtk/gtksettings.c:294
++#: ../gtk/gtksettings.c:294
+ msgid "Name of icon theme to use"
+ msgstr "Nombre del tema de iconos que utilizar"
+
+-#: gtk/gtksettings.c:302
++#: ../gtk/gtksettings.c:302
+ msgid "Fallback Icon Theme Name"
+ msgstr "Nombre del tema de iconos de resguardo"
+
+-#: gtk/gtksettings.c:303
++#: ../gtk/gtksettings.c:303
+ msgid "Name of a icon theme to fall back to"
+ msgstr "Nombre del tema de iconos que utilizar como resguardo"
+
+-#: gtk/gtksettings.c:311
++#: ../gtk/gtksettings.c:311
+ msgid "Key Theme Name"
+ msgstr "Nombre del tema de teclas"
+
+-#: gtk/gtksettings.c:312
++#: ../gtk/gtksettings.c:312
+ msgid "Name of key theme RC file to load"
+ msgstr "Nombre del archivo RC de tema de teclas que cargar"
+
+-#: gtk/gtksettings.c:320
++#: ../gtk/gtksettings.c:320
+ msgid "Menu bar accelerator"
+ msgstr "Acelerador de la barra de menús"
+
+-#: gtk/gtksettings.c:321
++#: ../gtk/gtksettings.c:321
+ msgid "Keybinding to activate the menu bar"
+ msgstr "Combinación de teclas para activar la barra de menús"
+
+-#: gtk/gtksettings.c:329
++#: ../gtk/gtksettings.c:329
+ msgid "Drag threshold"
+ msgstr "Umbral del arrastre"
+
+-#: gtk/gtksettings.c:330
++#: ../gtk/gtksettings.c:330
+ msgid "Number of pixels the cursor can move before dragging"
+ msgstr ""
+ "Número de píxeles que el cursor puede mover antes de iniciar el arrastre"
+
+-#: gtk/gtksettings.c:338
++#: ../gtk/gtksettings.c:338
+ msgid "Font Name"
+ msgstr "Nombre de la tipografía"
+
+-#: gtk/gtksettings.c:339
++#: ../gtk/gtksettings.c:339
+ msgid "Name of default font to use"
+ msgstr "Nombre de la tipografía predeterminada a utilizar"
+
+-#: gtk/gtksettings.c:361
++#: ../gtk/gtksettings.c:361
+ msgid "Icon Sizes"
+ msgstr "Tamaños de los iconos"
+
+-#: gtk/gtksettings.c:362
++#: ../gtk/gtksettings.c:362
+ msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
+ msgstr "Lista de tamaños de los iconos (gtk-menu=16,16:gtk-button=20,20..."
+
+-#: gtk/gtksettings.c:370
++#: ../gtk/gtksettings.c:370
+ msgid "GTK Modules"
+ msgstr "Módulos GTK"
+
+-#: gtk/gtksettings.c:371
++#: ../gtk/gtksettings.c:371
+ msgid "List of currently active GTK modules"
+ msgstr "Lista de módulos GTK activos actualmente"
+
+-#: gtk/gtksettings.c:380
++#: ../gtk/gtksettings.c:380
+ msgid "Xft Antialias"
+ msgstr "Suavizado Xft"
+
+-#: gtk/gtksettings.c:381
++#: ../gtk/gtksettings.c:381
+ msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr ""
+ "Indica si se deben suavizar los bordes de las tipografías Xft; 0=no,1=sí, -"
+ "1=predeterminado"
+
+-#: gtk/gtksettings.c:390
++#: ../gtk/gtksettings.c:390
+ msgid "Xft Hinting"
+ msgstr "Hinting Xft"
+
+-#: gtk/gtksettings.c:391
++#: ../gtk/gtksettings.c:391
+ msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr ""
+ "Indica si se debe usar el hinting de las tipografías Xft; 0=no, 1 =sí, -"
+ "1=predeterminado"
+
+-#: gtk/gtksettings.c:400
++#: ../gtk/gtksettings.c:400
+ msgid "Xft Hint Style"
+ msgstr "Estilo de hinting Xft"
+
+-#: gtk/gtksettings.c:401
++#: ../gtk/gtksettings.c:401
+ msgid ""
+ "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
+ msgstr "Qué grado de hinting usar: ninguno, ligero, medio o completo"
+
+-#: gtk/gtksettings.c:410
++#: ../gtk/gtksettings.c:410
+ msgid "Xft RGBA"
+ msgstr "Xft RGBA"
+
+-#: gtk/gtksettings.c:411
++#: ../gtk/gtksettings.c:411
+ msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
+ msgstr "Tipo de suavizado de subpíxel: ninguno, rgb, bgr, vrgb, vbgr"
+
+-#: gtk/gtksettings.c:420
++#: ../gtk/gtksettings.c:420
+ msgid "Xft DPI"
+ msgstr "PPP Xft (DPI)"
+
+-#: gtk/gtksettings.c:421
++#: ../gtk/gtksettings.c:421
+ msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
+ msgstr ""
+ "Resolución para Xft, en 1024 * puntos/pulgada. -1 para usar el valor "
+ "predeterminado"
+
+-#: gtk/gtksettings.c:430
++#: ../gtk/gtksettings.c:430
+ msgid "Cursor theme name"
+ msgstr "Nombre del tema del cursor"
+
+-#: gtk/gtksettings.c:431
++#: ../gtk/gtksettings.c:431
+ msgid "Name of the cursor theme to use, or NULL to use the default theme"
+ msgstr ""
+ "Nombre del tema de cursor que utilizar, o NULL para usar el tema "
+ "predeterminado"
+
+-#: gtk/gtksettings.c:439
++#: ../gtk/gtksettings.c:439
+ msgid "Cursor theme size"
+ msgstr "Tamaño del tema del cursor"
+
+-#: gtk/gtksettings.c:440
++#: ../gtk/gtksettings.c:440
+ msgid "Size to use for cursors, or 0 to use the default size"
+ msgstr ""
+ "Tamaño que se va a usar para los cursores, o 0 para usar el tamaño "
+ "predeterminado"
+
+-#: gtk/gtksettings.c:450
++#: ../gtk/gtksettings.c:450
+ msgid "Alternative button order"
+ msgstr "Orden de los botones alternativo"
+
+-#: gtk/gtksettings.c:451
++#: ../gtk/gtksettings.c:451
+ msgid "Whether buttons in dialogs should use the alternative button order"
+ msgstr ""
+ "Indica si los botones en los diálogos deben usar un orden de botones "
+ "alternativo"
+
+-#: gtk/gtksettings.c:468
++#: ../gtk/gtksettings.c:468
+ msgid "Alternative sort indicator direction"
+ msgstr "Dirección alternativa del indicador de ordenamiento"
+
+-#: gtk/gtksettings.c:469
++#: ../gtk/gtksettings.c:469
+ msgid ""
+ "Whether the direction of the sort indicators in list and tree views is "
+ "inverted compared to the default (where down means ascending)"
+@@ -4944,11 +4973,11 @@
+ "vista de árbol está invertida en comparación con la predeterminada (donde "
+ "abajo significa ascendente)"
+
+-#: gtk/gtksettings.c:477
++#: ../gtk/gtksettings.c:477
+ msgid "Show the 'Input Methods' menu"
+ msgstr "Mostrar el menú de métodos de entrada"
+
+-#: gtk/gtksettings.c:478
++#: ../gtk/gtksettings.c:478
+ msgid ""
+ "Whether the context menus of entries and text views should offer to change "
+ "the input method"
+@@ -4956,11 +4985,11 @@
+ "Indica si los menús de contexto y las vistas de texto deben ofrecer cambiar "
+ "el método de entrada"
+
+-#: gtk/gtksettings.c:486
++#: ../gtk/gtksettings.c:486
+ msgid "Show the 'Insert Unicode Control Character' menu"
+ msgstr "Mostrar el menú «Insertar carácter de control Unicode»"
+
+-#: gtk/gtksettings.c:487
++#: ../gtk/gtksettings.c:487
+ msgid ""
+ "Whether the context menus of entries and text views should offer to insert "
+ "control characters"
+@@ -4968,235 +4997,235 @@
+ "Indica si los menús de contexto de las estradas y las vistas de texto deben "
+ "ofrecer insertar caracteres de control"
+
+-#: gtk/gtksettings.c:495
++#: ../gtk/gtksettings.c:495
+ msgid "Start timeout"
+ msgstr "Tiempo de expiración de inicio"
+
+-#: gtk/gtksettings.c:496
++#: ../gtk/gtksettings.c:496
+ msgid "Starting value for timeouts, when button is pressed"
+ msgstr "Valor de inicio para las expiraciones, cuando se pulsa el botón"
+
+-#: gtk/gtksettings.c:505
++#: ../gtk/gtksettings.c:505
+ msgid "Repeat timeout"
+ msgstr "Expiración de repetición"
+
+-#: gtk/gtksettings.c:506
++#: ../gtk/gtksettings.c:506
+ msgid "Repeat value for timeouts, when button is pressed"
+ msgstr "Valor de repetición para expiraciones, cuando el botón se pulsa"
+
+-#: gtk/gtksettings.c:515
++#: ../gtk/gtksettings.c:515
+ msgid "Expand timeout"
+ msgstr "Expiración del expansor"
+
+-#: gtk/gtksettings.c:516
++#: ../gtk/gtksettings.c:516
+ msgid "Expand value for timeouts, when a widget is expanding a new region"
+ msgstr ""
+ "Valor de expansión para las expiraciones, cuando un widget está expandiendo "
+ "una región nueva"
+
+-#: gtk/gtksettings.c:551
++#: ../gtk/gtksettings.c:551
+ msgid "Color scheme"
+ msgstr "Esquema de color"
+
+-#: gtk/gtksettings.c:552
++#: ../gtk/gtksettings.c:552
+ msgid "A palette of named colors for use in themes"
+ msgstr "Una paleta de colores con nombre para usar en los temas"
+
+-#: gtk/gtksettings.c:561
++#: ../gtk/gtksettings.c:561
+ msgid "Enable Animations"
+ msgstr "Activar animaciones"
+
+-#: gtk/gtksettings.c:562
++#: ../gtk/gtksettings.c:562
+ msgid "Whether to enable toolkit-wide animations."
+ msgstr "Indica si se activan las animaciones para todo el toolkit."
+
+-#: gtk/gtksettings.c:580
++#: ../gtk/gtksettings.c:580
+ msgid "Enable Touchscreen Mode"
+ msgstr "Activar modo pantalla táctil"
+
+-#: gtk/gtksettings.c:581
++#: ../gtk/gtksettings.c:581
+ msgid "When TRUE, there are no motion notify events delivered on this screen"
+ msgstr ""
+ "Cuando esté a TRUE, no hay eventos de notificación de movimiento entregados "
+ "en esta pantalla"
+
+-#: gtk/gtksettings.c:598
++#: ../gtk/gtksettings.c:598
+ msgid "Tooltip timeout"
+ msgstr "Tiempo de expiración del consejo"
+
+-#: gtk/gtksettings.c:599
++#: ../gtk/gtksettings.c:599
+ msgid "Timeout before tooltip is shown"
+ msgstr "Tiempo de expiración antes de que se muestre el consejo"
+
+-#: gtk/gtksettings.c:624
++#: ../gtk/gtksettings.c:624
+ msgid "Tooltip browse timeout"
+ msgstr "Tiempo de los consejos de navegación"
+
+-#: gtk/gtksettings.c:625
++#: ../gtk/gtksettings.c:625
+ msgid "Timeout before tooltip is shown when browse mode is enabled"
+ msgstr ""
+ "Tiempo de expiración antes de que se muestre el consejo cuando el modo de "
+ "navegación está activado"
+
+-#: gtk/gtksettings.c:646
++#: ../gtk/gtksettings.c:646
+ msgid "Tooltip browse mode timeout"
+ msgstr "Tiempo de los consejos en modo navegación"
+
+-#: gtk/gtksettings.c:647
++#: ../gtk/gtksettings.c:647
+ msgid "Timeout after which browse mode is disabled"
+ msgstr ""
+ "Tiempo de expiración después del cual se desactiva el modo de navegación"
+
+-#: gtk/gtksettings.c:666
++#: ../gtk/gtksettings.c:666
+ msgid "Keynav Cursor Only"
+ msgstr "Sólo cursor para navegar con teclas"
+
+-#: gtk/gtksettings.c:667
++#: ../gtk/gtksettings.c:667
+ msgid "When TRUE, there are only cursor keys available to navigate widgets"
+ msgstr ""
+ "Cuando sea TRUE, sólo hay teclas de cursos disponibles para navegar por los "
+ "widgets"
+
+-#: gtk/gtksettings.c:684
++#: ../gtk/gtksettings.c:684
+ msgid "Keynav Wrap Around"
+ msgstr "Saltar al navegar con el teclado"
+
+-#: gtk/gtksettings.c:685
++#: ../gtk/gtksettings.c:685
+ msgid "Whether to wrap around when keyboard-navigating widgets"
+ msgstr ""
+ "Indica si se ha de saltar alrededor cuando se navegue por los widgets con el "
+ "teclado"
+
+-#: gtk/gtksettings.c:705
++#: ../gtk/gtksettings.c:705
+ msgid "Error Bell"
+ msgstr "Campana de error"
+
+-#: gtk/gtksettings.c:706
++#: ../gtk/gtksettings.c:706
+ msgid "When TRUE, keyboard navigation and other errors will cause a beep"
+ msgstr ""
+ "Cuando sea TRUE, la navegación con el teclado y otros errores causarán un bip"
+
+-#: gtk/gtksettings.c:723
++#: ../gtk/gtksettings.c:723
+ msgid "Color Hash"
+ msgstr "Hash del color"
+
+-#: gtk/gtksettings.c:724
++#: ../gtk/gtksettings.c:724
+ msgid "A hash table representation of the color scheme."
+ msgstr "Una representación en tabla hash del esquema de color."
+
+-#: gtk/gtksettings.c:732
++#: ../gtk/gtksettings.c:732
+ msgid "Default file chooser backend"
+ msgstr "Backend predeterminado del selector de archivos"
+
+-#: gtk/gtksettings.c:733
++#: ../gtk/gtksettings.c:733
+ msgid "Name of the GtkFileChooser backend to use by default"
+ msgstr "Nombre del backend predeterminado del GtkFileChooser"
+
+-#: gtk/gtksettings.c:750
++#: ../gtk/gtksettings.c:750
+ msgid "Default print backend"
+ msgstr "Backend predeterminado de impresión"
+
+-#: gtk/gtksettings.c:751
++#: ../gtk/gtksettings.c:751
+ msgid "List of the GtkPrintBackend backends to use by default"
+ msgstr "Lista de backends GtkPrintBackend para usar por omisión"
+
+-#: gtk/gtksettings.c:774
++#: ../gtk/gtksettings.c:774
+ msgid "Default command to run when displaying a print preview"
+ msgstr ""
+ "Comando predeterminado que ejecutar al mostrar una vista previa de impresión"
+
+-#: gtk/gtksettings.c:775
++#: ../gtk/gtksettings.c:775
+ msgid "Command to run when displaying a print preview"
+ msgstr "Comando que ejecutar al mostrar una vista previa de impresión"
+
+-#: gtk/gtksettings.c:791
++#: ../gtk/gtksettings.c:791
+ msgid "Enable Mnemonics"
+ msgstr "Activar mnemónicos"
+
+-#: gtk/gtksettings.c:792
++#: ../gtk/gtksettings.c:792
+ msgid "Whether labels should have mnemonics"
+ msgstr "Indica si las etiquetas deben tener mnemónicos"
+
+-#: gtk/gtksettings.c:808
++#: ../gtk/gtksettings.c:808
+ msgid "Enable Accelerators"
+ msgstr "Activar aceleradores"
+
+-#: gtk/gtksettings.c:809
++#: ../gtk/gtksettings.c:809
+ msgid "Whether menu items should have accelerators"
+ msgstr "Indica si los elementos del menú deben tener aceleradores"
+
+-#: gtk/gtksettings.c:826
++#: ../gtk/gtksettings.c:826
+ msgid "Recent Files Limit"
+ msgstr "Límite de archivos recientes"
+
+-#: gtk/gtksettings.c:827
++#: ../gtk/gtksettings.c:827
+ msgid "Number of recently used files"
+ msgstr "Número de archivos usados recientemente"
+
+-#: gtk/gtksettings.c:841
++#: ../gtk/gtksettings.c:841
+ msgid "Default IM module"
+ msgstr "Módulo de método de entrada predeterminado"
+
+-#: gtk/gtksettings.c:842
++#: ../gtk/gtksettings.c:842
+ msgid "Which IM module should be used by default"
+ msgstr "Qué módulo de método de entrada se debe usar de forma predeterminada"
+
+-#: gtk/gtksettings.c:860
++#: ../gtk/gtksettings.c:860
+ msgid "Recent Files Max Age"
+ msgstr "Antigüedad máxima de los archivos recientes"
+
+-#: gtk/gtksettings.c:861
++#: ../gtk/gtksettings.c:861
+ msgid "Maximum age of recently used files, in days"
+ msgstr "Máxima antigüedad para los archivos recientemente usados, en días"
+
+-#: gtk/gtksettings.c:870
++#: ../gtk/gtksettings.c:870
+ msgid "Fontconfig configuration timestamp"
+ msgstr "Configuración de la marca de tiempo de fontconfig"
+
+-#: gtk/gtksettings.c:871
++#: ../gtk/gtksettings.c:871
+ msgid "Timestamp of current fontconfig configuration"
+ msgstr "Marca de tiempo de la configuración actual de fontconfig"
+
+-#: gtk/gtksettings.c:893
++#: ../gtk/gtksettings.c:893
+ msgid "Sound Theme Name"
+ msgstr "Nombre del tema de sonido"
+
+-#: gtk/gtksettings.c:894
++#: ../gtk/gtksettings.c:894
+ msgid "XDG sound theme name"
+ msgstr "Nombre del tema de sonido XDG"
+
+ #. Translators: this means sounds that are played as feedback to user input
+-#: gtk/gtksettings.c:916
++#: ../gtk/gtksettings.c:916
+ msgid "Audible Input Feedback"
+ msgstr "Contexto de entrada audible"
+
+-#: gtk/gtksettings.c:917
++#: ../gtk/gtksettings.c:917
+ msgid "Whether to play event sounds as feedback to user input"
+ msgstr ""
+ "Indica si se deben reproducir eventos como respuesta a las entradas del "
+ "usuario"
+
+-#: gtk/gtksettings.c:938
++#: ../gtk/gtksettings.c:938
+ msgid "Enable Event Sounds"
+ msgstr "Activar eventos de sonido"
+
+-#: gtk/gtksettings.c:939
++#: ../gtk/gtksettings.c:939
+ msgid "Whether to play any event sounds at all"
+ msgstr "Indica si se debe reproducir cualquier evento de sonido"
+
+-#: gtk/gtksettings.c:954
++#: ../gtk/gtksettings.c:954
+ msgid "Enable Tooltips"
+ msgstr "Activar consejos"
+
+-#: gtk/gtksettings.c:955
++#: ../gtk/gtksettings.c:955
+ msgid "Whether tooltips should be shown on widgets"
+ msgstr "Indica si se deben mostrar los consejos en los widgets"
+
+-#: gtk/gtksizegroup.c:293
++#: ../gtk/gtksizegroup.c:293
+ msgid "Mode"
+ msgstr "Modo"
+
+-#: gtk/gtksizegroup.c:294
++#: ../gtk/gtksizegroup.c:294
+ msgid ""
+ "The directions in which the size group affects the requested sizes of its "
+ "component widgets"
+@@ -5204,30 +5233,30 @@
+ "Las direcciones en las cuales el tamaño del grupo afecta a los tamaños "
+ "solicitados de sus widgets componentes"
+
+-#: gtk/gtksizegroup.c:310
++#: ../gtk/gtksizegroup.c:310
+ msgid "Ignore hidden"
+ msgstr "Ignorar ocultas"
+
+-#: gtk/gtksizegroup.c:311
++#: ../gtk/gtksizegroup.c:311
+ msgid ""
+ "If TRUE, unmapped widgets are ignored when determining the size of the group"
+ msgstr ""
+ "Si es TRUE, los widgets no mapeados se ignoran al determinar el tamaño del "
+ "grupo"
+
+-#: gtk/gtkspinbutton.c:209
++#: ../gtk/gtkspinbutton.c:209
+ msgid "The adjustment that holds the value of the spinbutton"
+ msgstr "El ajuste que mantiene el valor del botón giratorio"
+
+-#: gtk/gtkspinbutton.c:216
++#: ../gtk/gtkspinbutton.c:216
+ msgid "Climb Rate"
+ msgstr "Tasa de subida"
+
+-#: gtk/gtkspinbutton.c:236
++#: ../gtk/gtkspinbutton.c:236
+ msgid "Snap to Ticks"
+ msgstr "Ajustarse a los ticks"
+
+-#: gtk/gtkspinbutton.c:237
++#: ../gtk/gtkspinbutton.c:237
+ msgid ""
+ "Whether erroneous values are automatically changed to a spin button's "
+ "nearest step increment"
+@@ -5235,171 +5264,171 @@
+ "Indica si los valores erróneos se cambian por el valor más cercano de un "
+ "botón incrementable"
+
+-#: gtk/gtkspinbutton.c:244
++#: ../gtk/gtkspinbutton.c:244
+ msgid "Numeric"
+ msgstr "Numérico"
+
+-#: gtk/gtkspinbutton.c:245
++#: ../gtk/gtkspinbutton.c:245
+ msgid "Whether non-numeric characters should be ignored"
+ msgstr "Indica si se ignoran los caracteres no numéricos"
+
+-#: gtk/gtkspinbutton.c:252
++#: ../gtk/gtkspinbutton.c:252
+ msgid "Wrap"
+ msgstr "Volver al inicio"
+
+-#: gtk/gtkspinbutton.c:253
++#: ../gtk/gtkspinbutton.c:253
+ msgid "Whether a spin button should wrap upon reaching its limits"
+ msgstr ""
+ "Indica si un botón giratorio debe volver al inicio al alcanzar sus límites"
+
+-#: gtk/gtkspinbutton.c:260
++#: ../gtk/gtkspinbutton.c:260
+ msgid "Update Policy"
+ msgstr "Norma de actualización"
+
+-#: gtk/gtkspinbutton.c:261
++#: ../gtk/gtkspinbutton.c:261
+ msgid ""
+ "Whether the spin button should update always, or only when the value is legal"
+ msgstr ""
+ "Indica si el botón incrementable se actualiza siempre, o sólo cuando el "
+ "valor es legal"
+
+-#: gtk/gtkspinbutton.c:270
++#: ../gtk/gtkspinbutton.c:270
+ msgid "Reads the current value, or sets a new value"
+ msgstr "Lee el valor actual, o establece un valor nuevo"
+
+-#: gtk/gtkspinbutton.c:279
++#: ../gtk/gtkspinbutton.c:279
+ msgid "Style of bevel around the spin button"
+ msgstr "Estilo de bisel alrededor del botón giratorio"
+
+-#: gtk/gtkstatusbar.c:141
++#: ../gtk/gtkstatusbar.c:141
+ msgid "Has Resize Grip"
+ msgstr "Tiene tirador de redimensión"
+
+-#: gtk/gtkstatusbar.c:142
++#: ../gtk/gtkstatusbar.c:142
+ msgid "Whether the statusbar has a grip for resizing the toplevel"
+ msgstr ""
+ "Indica si la barra de estado tiene un tirador para redimensionar el nivel "
+ "superior"
+
+-#: gtk/gtkstatusbar.c:187
++#: ../gtk/gtkstatusbar.c:187
+ msgid "Style of bevel around the statusbar text"
+ msgstr "Estilo del bisel alrededor del texto de la barra de estado"
+
+-#: gtk/gtkstatusicon.c:226
++#: ../gtk/gtkstatusicon.c:226
+ msgid "GIcon"
+ msgstr "GIcon"
+
+-#: gtk/gtkstatusicon.c:244
++#: ../gtk/gtkstatusicon.c:244
+ msgid "The size of the icon"
+ msgstr "El tamaño del icono"
+
+-#: gtk/gtkstatusicon.c:254
++#: ../gtk/gtkstatusicon.c:254
+ msgid "The screen where this status icon will be displayed"
+ msgstr "La pantalla donde se mostrará este icono de estado"
+
+-#: gtk/gtkstatusicon.c:261
++#: ../gtk/gtkstatusicon.c:261
+ msgid "Blinking"
+ msgstr "Parpadeo"
+
+-#: gtk/gtkstatusicon.c:262
++#: ../gtk/gtkstatusicon.c:262
+ msgid "Whether or not the status icon is blinking"
+ msgstr "Indica si el icono de estado parpadea"
+
+-#: gtk/gtkstatusicon.c:270
++#: ../gtk/gtkstatusicon.c:270
+ msgid "Whether or not the status icon is visible"
+ msgstr "Indica si la acción es visible"
+
+-#: gtk/gtkstatusicon.c:286
++#: ../gtk/gtkstatusicon.c:286
+ msgid "Whether or not the status icon is embedded"
+ msgstr "Indica si el icono de estado está empotrado"
+
+-#: gtk/gtkstatusicon.c:302 gtk/gtktrayicon-x11.c:96
++#: ../gtk/gtkstatusicon.c:302 ../gtk/gtktrayicon-x11.c:96
+ msgid "The orientation of the tray"
+ msgstr "La orientación de la bandeja"
+
+-#: gtk/gtktable.c:129
++#: ../gtk/gtktable.c:129
+ msgid "Rows"
+ msgstr "Filas"
+
+-#: gtk/gtktable.c:130
++#: ../gtk/gtktable.c:130
+ msgid "The number of rows in the table"
+ msgstr "El número de filas en la tabla"
+
+-#: gtk/gtktable.c:138
++#: ../gtk/gtktable.c:138
+ msgid "Columns"
+ msgstr "Columnas"
+
+-#: gtk/gtktable.c:139
++#: ../gtk/gtktable.c:139
+ msgid "The number of columns in the table"
+ msgstr "El número de columnas en la tabla"
+
+-#: gtk/gtktable.c:147
++#: ../gtk/gtktable.c:147
+ msgid "Row spacing"
+ msgstr "Espaciado entre filas"
+
+-#: gtk/gtktable.c:148
++#: ../gtk/gtktable.c:148
+ msgid "The amount of space between two consecutive rows"
+ msgstr "La cantidad de espacio entre dos filas consecutivas"
+
+-#: gtk/gtktable.c:156
++#: ../gtk/gtktable.c:156
+ msgid "Column spacing"
+ msgstr "Espaciado de la columna"
+
+-#: gtk/gtktable.c:157
++#: ../gtk/gtktable.c:157
+ msgid "The amount of space between two consecutive columns"
+ msgstr "La cantidad de espacio entre dos columnas consecutivas"
+
+-#: gtk/gtktable.c:166
++#: ../gtk/gtktable.c:166
+ msgid "If TRUE, the table cells are all the same width/height"
+ msgstr ""
+ "Si es TRUE, las celdas de la tabla tienen todas de la misma anchura/altura"
+
+-#: gtk/gtktable.c:173
++#: ../gtk/gtktable.c:173
+ msgid "Left attachment"
+ msgstr "Acoplado izquierdo"
+
+-#: gtk/gtktable.c:180
++#: ../gtk/gtktable.c:180
+ msgid "Right attachment"
+ msgstr "Acoplado derecho"
+
+-#: gtk/gtktable.c:181
++#: ../gtk/gtktable.c:181
+ msgid "The column number to attach the right side of a child widget to"
+ msgstr ""
+ "El número de columnas que acoplar hacia el lado derecho de un widget hijo"
+
+-#: gtk/gtktable.c:187
++#: ../gtk/gtktable.c:187
+ msgid "Top attachment"
+ msgstr "Acoplado superior"
+
+-#: gtk/gtktable.c:188
++#: ../gtk/gtktable.c:188
+ msgid "The row number to attach the top of a child widget to"
+ msgstr "El número de fila que acoplar a la parte superior de un widget hijo"
+
+-#: gtk/gtktable.c:194
++#: ../gtk/gtktable.c:194
+ msgid "Bottom attachment"
+ msgstr "Acoplado inferior"
+
+-#: gtk/gtktable.c:201
++#: ../gtk/gtktable.c:201
+ msgid "Horizontal options"
+ msgstr "Opciones horizontales"
+
+-#: gtk/gtktable.c:202
++#: ../gtk/gtktable.c:202
+ msgid "Options specifying the horizontal behaviour of the child"
+ msgstr "Opciones que indicar el comportamiento horizontal del hijo"
+
+-#: gtk/gtktable.c:208
++#: ../gtk/gtktable.c:208
+ msgid "Vertical options"
+ msgstr "Opciones verticales"
+
+-#: gtk/gtktable.c:209
++#: ../gtk/gtktable.c:209
+ msgid "Options specifying the vertical behaviour of the child"
+ msgstr "Opciones que especifican el comportamiento vertical del hijo"
+
+-#: gtk/gtktable.c:215
++#: ../gtk/gtktable.c:215
+ msgid "Horizontal padding"
+ msgstr "Relleno horizontal"
+
+-#: gtk/gtktable.c:216
++#: ../gtk/gtktable.c:216
+ msgid ""
+ "Extra space to put between the child and its left and right neighbors, in "
+ "pixels"
+@@ -5407,11 +5436,11 @@
+ "Espacio extra que poner entre el hijo y sus vecinos izquierdos y derechos, "
+ "en píxeles"
+
+-#: gtk/gtktable.c:222
++#: ../gtk/gtktable.c:222
+ msgid "Vertical padding"
+ msgstr "Relleno vertical"
+
+-#: gtk/gtktable.c:223
++#: ../gtk/gtktable.c:223
+ msgid ""
+ "Extra space to put between the child and its upper and lower neighbors, in "
+ "pixels"
+@@ -5419,77 +5448,77 @@
+ "Espacio extra que poner entre el hijo y sus vecinos superiores e inferiores, "
+ "en píxeles"
+
+-#: gtk/gtktext.c:546
++#: ../gtk/gtktext.c:546
+ msgid "Horizontal adjustment for the text widget"
+ msgstr "Ajuste horizontal para el widget de texto"
+
+-#: gtk/gtktext.c:554
++#: ../gtk/gtktext.c:554
+ msgid "Vertical adjustment for the text widget"
+ msgstr "Ajuste vertical para el widget de texto"
+
+-#: gtk/gtktext.c:561
++#: ../gtk/gtktext.c:561
+ msgid "Line Wrap"
+ msgstr "Ajuste de línea"
+
+-#: gtk/gtktext.c:562
++#: ../gtk/gtktext.c:562
+ msgid "Whether lines are wrapped at widget edges"
+ msgstr "Indica si las líneas se ajustan a los bordes del widget"
+
+-#: gtk/gtktext.c:569
++#: ../gtk/gtktext.c:569
+ msgid "Word Wrap"
+ msgstr "Ajuste de palabra"
+
+-#: gtk/gtktext.c:570
++#: ../gtk/gtktext.c:570
+ msgid "Whether words are wrapped at widget edges"
+ msgstr "Indica si las palabras se ajustan a los bordes del widget"
+
+-#: gtk/gtktextbuffer.c:179
++#: ../gtk/gtktextbuffer.c:179
+ msgid "Tag Table"
+ msgstr "Tabla de etiquetas"
+
+-#: gtk/gtktextbuffer.c:180
++#: ../gtk/gtktextbuffer.c:180
+ msgid "Text Tag Table"
+ msgstr "Tabla de etiquetas de texto"
+
+-#: gtk/gtktextbuffer.c:198
++#: ../gtk/gtktextbuffer.c:198
+ msgid "Current text of the buffer"
+ msgstr "Texto actual del búfer"
+
+-#: gtk/gtktextbuffer.c:212
++#: ../gtk/gtktextbuffer.c:212
+ msgid "Has selection"
+ msgstr "Tiene selección"
+
+-#: gtk/gtktextbuffer.c:213
++#: ../gtk/gtktextbuffer.c:213
+ msgid "Whether the buffer has some text currently selected"
+ msgstr "Indica si el búfer tiene algo de texto actualmente seleccionado"
+
+-#: gtk/gtktextbuffer.c:229
++#: ../gtk/gtktextbuffer.c:229
+ msgid "Cursor position"
+ msgstr "Posición del cursor"
+
+-#: gtk/gtktextbuffer.c:230
++#: ../gtk/gtktextbuffer.c:230
+ msgid ""
+ "The position of the insert mark (as offset from the beginning of the buffer)"
+ msgstr ""
+ "La posición de la marca de inserción (como un desplazamiento desde el "
+ "principio del búfer)"
+
+-#: gtk/gtktextbuffer.c:245
++#: ../gtk/gtktextbuffer.c:245
+ msgid "Copy target list"
+ msgstr "Lista de destinos de la copia"
+
+-#: gtk/gtktextbuffer.c:246
++#: ../gtk/gtktextbuffer.c:246
+ msgid ""
+ "The list of targets this buffer supports for clipboard copying and DND source"
+ msgstr ""
+ "La lista de destinos que soporta este búfer para copiar desde el "
+ "portapapeles y el origen del DND"
+
+-#: gtk/gtktextbuffer.c:261
++#: ../gtk/gtktextbuffer.c:261
+ msgid "Paste target list"
+ msgstr "Lista de destinos de pegado"
+
+-#: gtk/gtktextbuffer.c:262
++#: ../gtk/gtktextbuffer.c:262
+ msgid ""
+ "The list of targets this buffer supports for clipboard pasting and DND "
+ "destination"
+@@ -5497,37 +5526,37 @@
+ "La lista de destinos que soporta este búfer para pegar desde el portapapeles "
+ "y el destino del DND"
+
+-#: gtk/gtktextmark.c:90
++#: ../gtk/gtktextmark.c:90
+ msgid "Mark name"
+ msgstr "Nombre de la marca"
+
+-#: gtk/gtktextmark.c:97
++#: ../gtk/gtktextmark.c:97
+ msgid "Left gravity"
+ msgstr "Gravedad izquierda"
+
+-#: gtk/gtktextmark.c:98
++#: ../gtk/gtktextmark.c:98
+ msgid "Whether the mark has left gravity"
+ msgstr "Indica si la marca tiene gravedad izquierda"
+
+-#: gtk/gtktexttag.c:173
++#: ../gtk/gtktexttag.c:173
+ msgid "Tag name"
+ msgstr "Nombre de etiqueta"
+
+-#: gtk/gtktexttag.c:174
++#: ../gtk/gtktexttag.c:174
+ msgid "Name used to refer to the text tag. NULL for anonymous tags"
+ msgstr ""
+ "Nombre utilizado para referirse a la etiqueta del texto. NULL para etiquetas "
+ "anónimas"
+
+-#: gtk/gtktexttag.c:192
++#: ../gtk/gtktexttag.c:192
+ msgid "Background color as a (possibly unallocated) GdkColor"
+ msgstr "Color de fondo como un (posiblemente no asignado) GdkColor"
+
+-#: gtk/gtktexttag.c:199
++#: ../gtk/gtktexttag.c:199
+ msgid "Background full height"
+ msgstr "Altura completa del fondo"
+
+-#: gtk/gtktexttag.c:200
++#: ../gtk/gtktexttag.c:200
+ msgid ""
+ "Whether the background color fills the entire line height or only the height "
+ "of the tagged characters"
+@@ -5535,49 +5564,49 @@
+ "Indica si el color de fondo rellena el ancho completo de la línea o sólo el "
+ "ancho de los caracteres etiquetados"
+
+-#: gtk/gtktexttag.c:208
++#: ../gtk/gtktexttag.c:208
+ msgid "Background stipple mask"
+ msgstr "Máscara de puntos del fondo"
+
+-#: gtk/gtktexttag.c:209
++#: ../gtk/gtktexttag.c:209
+ msgid "Bitmap to use as a mask when drawing the text background"
+ msgstr "Bitmap a utilizar como una máscara cuando se dibuje el fondo del texto"
+
+-#: gtk/gtktexttag.c:226
++#: ../gtk/gtktexttag.c:226
+ msgid "Foreground color as a (possibly unallocated) GdkColor"
+ msgstr "Color de frente como un (posiblemente no asignado) GdkColor"
+
+-#: gtk/gtktexttag.c:234
++#: ../gtk/gtktexttag.c:234
+ msgid "Foreground stipple mask"
+ msgstr "Máscara de puntos del primer plano"
+
+-#: gtk/gtktexttag.c:235
++#: ../gtk/gtktexttag.c:235
+ msgid "Bitmap to use as a mask when drawing the text foreground"
+ msgstr ""
+ "Bitmap a utilizar como una máscara cuando se arrastre primer plano del texto"
+
+-#: gtk/gtktexttag.c:242
++#: ../gtk/gtktexttag.c:242
+ msgid "Text direction"
+ msgstr "Dirección del texto"
+
+-#: gtk/gtktexttag.c:243
++#: ../gtk/gtktexttag.c:243
+ msgid "Text direction, e.g. right-to-left or left-to-right"
+ msgstr ""
+ "Dirección del texto, por ejemplo: de izquierda-a-derecha o de derecha-a-"
+ "izquierda"
+
+-#: gtk/gtktexttag.c:292
++#: ../gtk/gtktexttag.c:292
+ msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
+ msgstr ""
+ "Estilo de la tipografía como un PangoStyle, por ejemplo: PANGO_STYLE_ITALIC"
+
+-#: gtk/gtktexttag.c:301
++#: ../gtk/gtktexttag.c:301
+ msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
+ msgstr ""
+ "Variante de la tipografía como una PangoVariant, por ejemplo: "
+ "PANGO_VARIANT_SMALL_CAPS"
+
+-#: gtk/gtktexttag.c:310
++#: ../gtk/gtktexttag.c:310
+ msgid ""
+ "Font weight as an integer, see predefined values in PangoWeight; for "
+ "example, PANGO_WEIGHT_BOLD"
+@@ -5585,17 +5614,17 @@
+ "Peso de la tipografía como un entero, vea valores predefinidos en "
+ "PangoWeight; por ejemplo: PANGO_WEIGHT_BOLD"
+
+-#: gtk/gtktexttag.c:321
++#: ../gtk/gtktexttag.c:321
+ msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
+ msgstr ""
+ "Ajuste de la tipografía como un PangoStretch, ejemplo: "
+ "PANGO_STRETCH_CONDENSED"
+
+-#: gtk/gtktexttag.c:330
++#: ../gtk/gtktexttag.c:330
+ msgid "Font size in Pango units"
+ msgstr "Tamaño de la tipografía en unidades de Pango"
+
+-#: gtk/gtktexttag.c:340
++#: ../gtk/gtktexttag.c:340
+ msgid ""
+ "Font size as a scale factor relative to the default font size. This properly "
+ "adapts to theme changes etc. so is recommended. Pango predefines some scales "
+@@ -5606,11 +5635,11 @@
+ "tema, etc. por lo cual se recomienda. Pango define previamente algunas "
+ "escalas tales como PANGO_SCALE_X_LARGE"
+
+-#: gtk/gtktexttag.c:360 gtk/gtktextview.c:586
++#: ../gtk/gtktexttag.c:360 ../gtk/gtktextview.c:586
+ msgid "Left, right, or center justification"
+ msgstr "Justificación a la izquierda, derecha o centro"
+
+-#: gtk/gtktexttag.c:379
++#: ../gtk/gtktexttag.c:379
+ msgid ""
+ "The language this text is in, as an ISO code. Pango can use this as a hint "
+ "when rendering the text. If not set, an appropriate default will be used."
+@@ -5619,31 +5648,31 @@
+ "como una ayuda cuando esta renderizando el texto. Si no se establece este "
+ "parámetro se usará por omisión lo más apropiado."
+
+-#: gtk/gtktexttag.c:386
++#: ../gtk/gtktexttag.c:386
+ msgid "Left margin"
+ msgstr "Margen izquierdo"
+
+-#: gtk/gtktexttag.c:387 gtk/gtktextview.c:595
++#: ../gtk/gtktexttag.c:387 ../gtk/gtktextview.c:595
+ msgid "Width of the left margin in pixels"
+ msgstr "Anchura del margen izquierdo en píxeles"
+
+-#: gtk/gtktexttag.c:396
++#: ../gtk/gtktexttag.c:396
+ msgid "Right margin"
+ msgstr "Margen derecho"
+
+-#: gtk/gtktexttag.c:397 gtk/gtktextview.c:605
++#: ../gtk/gtktexttag.c:397 ../gtk/gtktextview.c:605
+ msgid "Width of the right margin in pixels"
+ msgstr "Anchura del margen derecho en píxeles"
+
+-#: gtk/gtktexttag.c:407 gtk/gtktextview.c:614
++#: ../gtk/gtktexttag.c:407 ../gtk/gtktextview.c:614
+ msgid "Indent"
+ msgstr "Sangrar"
+
+-#: gtk/gtktexttag.c:408 gtk/gtktextview.c:615
++#: ../gtk/gtktexttag.c:408 ../gtk/gtktextview.c:615
+ msgid "Amount to indent the paragraph, in pixels"
+ msgstr "Número de píxeles para el sangrado del párrafo"
+
+-#: gtk/gtktexttag.c:419
++#: ../gtk/gtktexttag.c:419
+ msgid ""
+ "Offset of text above the baseline (below the baseline if rise is negative) "
+ "in Pango units"
+@@ -5651,396 +5680,396 @@
+ "Desplazamiento del texto por encima de la línea base (por debajo de la línea "
+ "base si la elevación es negativa) en unidades Pango"
+
+-#: gtk/gtktexttag.c:428
++#: ../gtk/gtktexttag.c:428
+ msgid "Pixels above lines"
+ msgstr "Píxeles encima de las líneas"
+
+-#: gtk/gtktexttag.c:429 gtk/gtktextview.c:539
++#: ../gtk/gtktexttag.c:429 ../gtk/gtktextview.c:539
+ msgid "Pixels of blank space above paragraphs"
+ msgstr "Píxeles de espacio en blanco encima de los párrafos"
+
+-#: gtk/gtktexttag.c:438
++#: ../gtk/gtktexttag.c:438
+ msgid "Pixels below lines"
+ msgstr "Píxeles debajo de las líneas"
+
+-#: gtk/gtktexttag.c:439 gtk/gtktextview.c:549
++#: ../gtk/gtktexttag.c:439 ../gtk/gtktextview.c:549
+ msgid "Pixels of blank space below paragraphs"
+ msgstr "Píxeles de espacio en blanco debajo de los párrafos"
+
+-#: gtk/gtktexttag.c:448
++#: ../gtk/gtktexttag.c:448
+ msgid "Pixels inside wrap"
+ msgstr "Píxeles dentro del ajuste"
+
+-#: gtk/gtktexttag.c:449 gtk/gtktextview.c:559
++#: ../gtk/gtktexttag.c:449 ../gtk/gtktextview.c:559
+ msgid "Pixels of blank space between wrapped lines in a paragraph"
+ msgstr "Píxeles de espacio en blanco entre las líneas ajustadas en un párrafo"
+
+-#: gtk/gtktexttag.c:476 gtk/gtktextview.c:577
++#: ../gtk/gtktexttag.c:476 ../gtk/gtktextview.c:577
+ msgid ""
+ "Whether to wrap lines never, at word boundaries, or at character boundaries"
+ msgstr ""
+ "Indica si deben ajustarse las líneas, a los límites de las palabras, a los "
+ "límites de los caracteres, o nunca"
+
+-#: gtk/gtktexttag.c:485 gtk/gtktextview.c:624
++#: ../gtk/gtktexttag.c:485 ../gtk/gtktextview.c:624
+ msgid "Tabs"
+ msgstr "Solapas"
+
+-#: gtk/gtktexttag.c:486 gtk/gtktextview.c:625
++#: ../gtk/gtktexttag.c:486 ../gtk/gtktextview.c:625
+ msgid "Custom tabs for this text"
+ msgstr "Pestañas personalizadas para este texto"
+
+-#: gtk/gtktexttag.c:504
++#: ../gtk/gtktexttag.c:504
+ msgid "Invisible"
+ msgstr "Invisible"
+
+-#: gtk/gtktexttag.c:505
++#: ../gtk/gtktexttag.c:505
+ msgid "Whether this text is hidden."
+ msgstr "Indica si este texto está oculto."
+
+-#: gtk/gtktexttag.c:519
++#: ../gtk/gtktexttag.c:519
+ msgid "Paragraph background color name"
+ msgstr "Nombre del color de fondo del parágrafo"
+
+-#: gtk/gtktexttag.c:520
++#: ../gtk/gtktexttag.c:520
+ msgid "Paragraph background color as a string"
+ msgstr "Nombre del color de fondo del parágrafo como una cadena"
+
+-#: gtk/gtktexttag.c:535
++#: ../gtk/gtktexttag.c:535
+ msgid "Paragraph background color"
+ msgstr "Color de fondo del parágrafo"
+
+-#: gtk/gtktexttag.c:536
++#: ../gtk/gtktexttag.c:536
+ msgid "Paragraph background color as a (possibly unallocated) GdkColor"
+ msgstr ""
+ "Color de fondo del parágrafo como un (posiblemente no asignado) GdkColor"
+
+-#: gtk/gtktexttag.c:554
++#: ../gtk/gtktexttag.c:554
+ msgid "Margin Accumulates"
+ msgstr "Acumulación de márgenes"
+
+-#: gtk/gtktexttag.c:555
++#: ../gtk/gtktexttag.c:555
+ msgid "Whether left and right margins accumulate."
+ msgstr "Indica si los márgenes izquierdo y derecho son acumulativos."
+
+-#: gtk/gtktexttag.c:568
++#: ../gtk/gtktexttag.c:568
+ msgid "Background full height set"
+ msgstr "Establece la altura completa del fondo"
+
+-#: gtk/gtktexttag.c:569
++#: ../gtk/gtktexttag.c:569
+ msgid "Whether this tag affects background height"
+ msgstr "Indica si esta etiqueta afecta a la altura del fondo"
+
+-#: gtk/gtktexttag.c:572
++#: ../gtk/gtktexttag.c:572
+ msgid "Background stipple set"
+ msgstr "Establece los puntos del fondo"
+
+-#: gtk/gtktexttag.c:573
++#: ../gtk/gtktexttag.c:573
+ msgid "Whether this tag affects the background stipple"
+ msgstr "Indica si esta etiqueta afecta el fondo punteado"
+
+-#: gtk/gtktexttag.c:580
++#: ../gtk/gtktexttag.c:580
+ msgid "Foreground stipple set"
+ msgstr "Punteo del primer plano establecido"
+
+-#: gtk/gtktexttag.c:581
++#: ../gtk/gtktexttag.c:581
+ msgid "Whether this tag affects the foreground stipple"
+ msgstr "Indica si esta etiqueta afecta al punteo del primer plano"
+
+-#: gtk/gtktexttag.c:616
++#: ../gtk/gtktexttag.c:616
+ msgid "Justification set"
+ msgstr "Justificación establecida"
+
+-#: gtk/gtktexttag.c:617
++#: ../gtk/gtktexttag.c:617
+ msgid "Whether this tag affects paragraph justification"
+ msgstr "Indica si esta etiqueta afecta la justificación del párrafo"
+
+-#: gtk/gtktexttag.c:624
++#: ../gtk/gtktexttag.c:624
+ msgid "Left margin set"
+ msgstr "Margen izquierdo establecido"
+
+-#: gtk/gtktexttag.c:625
++#: ../gtk/gtktexttag.c:625
+ msgid "Whether this tag affects the left margin"
+ msgstr "Indica si esta etiqueta afecta el margen izquierdo"
+
+-#: gtk/gtktexttag.c:628
++#: ../gtk/gtktexttag.c:628
+ msgid "Indent set"
+ msgstr "Sangrado establecido"
+
+-#: gtk/gtktexttag.c:629
++#: ../gtk/gtktexttag.c:629
+ msgid "Whether this tag affects indentation"
+ msgstr "Indica si esta etiqueta afecta al sangrado"
+
+-#: gtk/gtktexttag.c:636
++#: ../gtk/gtktexttag.c:636
+ msgid "Pixels above lines set"
+ msgstr "Píxeles por encima de las líneas establecido"
+
+-#: gtk/gtktexttag.c:637 gtk/gtktexttag.c:641
++#: ../gtk/gtktexttag.c:637 ../gtk/gtktexttag.c:641
+ msgid "Whether this tag affects the number of pixels above lines"
+ msgstr "Indica si esta etiqueta afecta la cantidad de píxeles sobre las líneas"
+
+-#: gtk/gtktexttag.c:640
++#: ../gtk/gtktexttag.c:640
+ msgid "Pixels below lines set"
+ msgstr "Píxeles por debajo de las líneas establecido"
+
+-#: gtk/gtktexttag.c:644
++#: ../gtk/gtktexttag.c:644
+ msgid "Pixels inside wrap set"
+ msgstr "Píxeles dentro del ajuste establecido"
+
+-#: gtk/gtktexttag.c:645
++#: ../gtk/gtktexttag.c:645
+ msgid "Whether this tag affects the number of pixels between wrapped lines"
+ msgstr ""
+ "Indica si esta etiqueta afecta la cantidad de píxeles entre las líneas "
+ "ajustadas"
+
+-#: gtk/gtktexttag.c:652
++#: ../gtk/gtktexttag.c:652
+ msgid "Right margin set"
+ msgstr "Margen derecho establecido"
+
+-#: gtk/gtktexttag.c:653
++#: ../gtk/gtktexttag.c:653
+ msgid "Whether this tag affects the right margin"
+ msgstr "Indica si esta etiqueta afecta el margen derecho"
+
+-#: gtk/gtktexttag.c:660
++#: ../gtk/gtktexttag.c:660
+ msgid "Wrap mode set"
+ msgstr "Modo de ajuste establecido"
+
+-#: gtk/gtktexttag.c:661
++#: ../gtk/gtktexttag.c:661
+ msgid "Whether this tag affects line wrap mode"
+ msgstr "Indica si esta etiqueta afecta el modo de ajuste de línea"
+
+-#: gtk/gtktexttag.c:664
++#: ../gtk/gtktexttag.c:664
+ msgid "Tabs set"
+ msgstr "Tabuladores establecidos"
+
+-#: gtk/gtktexttag.c:665
++#: ../gtk/gtktexttag.c:665
+ msgid "Whether this tag affects tabs"
+ msgstr "Indica si esta etiqueta afecta las tabulaciones"
+
+-#: gtk/gtktexttag.c:668
++#: ../gtk/gtktexttag.c:668
+ msgid "Invisible set"
+ msgstr "Invisibilidad establecida"
+
+-#: gtk/gtktexttag.c:669
++#: ../gtk/gtktexttag.c:669
+ msgid "Whether this tag affects text visibility"
+ msgstr "Indica si esta etiqueta afecta la visibilidad del texto"
+
+-#: gtk/gtktexttag.c:672
++#: ../gtk/gtktexttag.c:672
+ msgid "Paragraph background set"
+ msgstr "Fondo de parágrafo establecido"
+
+-#: gtk/gtktexttag.c:673
++#: ../gtk/gtktexttag.c:673
+ msgid "Whether this tag affects the paragraph background color"
+ msgstr "Indica si esta etiqueta afecta el color de fondo del parágrafo"
+
+-#: gtk/gtktextview.c:538
++#: ../gtk/gtktextview.c:538
+ msgid "Pixels Above Lines"
+ msgstr "Píxeles sobre las líneas"
+
+-#: gtk/gtktextview.c:548
++#: ../gtk/gtktextview.c:548
+ msgid "Pixels Below Lines"
+ msgstr "Píxeles por debajo de las líneas"
+
+-#: gtk/gtktextview.c:558
++#: ../gtk/gtktextview.c:558
+ msgid "Pixels Inside Wrap"
+ msgstr "Píxeles dentro del ajuste"
+
+-#: gtk/gtktextview.c:576
++#: ../gtk/gtktextview.c:576
+ msgid "Wrap Mode"
+ msgstr "Modo de ajuste"
+
+-#: gtk/gtktextview.c:594
++#: ../gtk/gtktextview.c:594
+ msgid "Left Margin"
+ msgstr "Margen izquierdo"
+
+-#: gtk/gtktextview.c:604
++#: ../gtk/gtktextview.c:604
+ msgid "Right Margin"
+ msgstr "Margen derecho"
+
+-#: gtk/gtktextview.c:632
++#: ../gtk/gtktextview.c:632
+ msgid "Cursor Visible"
+ msgstr "Cursor visible"
+
+-#: gtk/gtktextview.c:633
++#: ../gtk/gtktextview.c:633
+ msgid "If the insertion cursor is shown"
+ msgstr "Si se muestra el cursor de inserción"
+
+-#: gtk/gtktextview.c:640
++#: ../gtk/gtktextview.c:640
+ msgid "Buffer"
+ msgstr "Búfer"
+
+-#: gtk/gtktextview.c:641
++#: ../gtk/gtktextview.c:641
+ msgid "The buffer which is displayed"
+ msgstr "El búfer que se está mostrando"
+
+-#: gtk/gtktextview.c:649
++#: ../gtk/gtktextview.c:649
+ msgid "Whether entered text overwrites existing contents"
+ msgstr "Indica si el texto introducido sobreescribe el existente"
+
+-#: gtk/gtktextview.c:656
++#: ../gtk/gtktextview.c:656
+ msgid "Accepts tab"
+ msgstr "Acepta tabuladores"
+
+-#: gtk/gtktextview.c:657
++#: ../gtk/gtktextview.c:657
+ msgid "Whether Tab will result in a tab character being entered"
+ msgstr "Indica si Tab resultará en la introducción de un carácter tabulador"
+
+-#: gtk/gtktextview.c:666
++#: ../gtk/gtktextview.c:666
+ msgid "Error underline color"
+ msgstr "Color de subrayado de errores"
+
+-#: gtk/gtktextview.c:667
++#: ../gtk/gtktextview.c:667
+ msgid "Color with which to draw error-indication underlines"
+ msgstr "Color con el que dibujar el subrayado de indicación de errores"
+
+-#: gtk/gtktoggleaction.c:103
++#: ../gtk/gtktoggleaction.c:103
+ msgid "Create the same proxies as a radio action"
+ msgstr "Crear los mismos proxies como una acción de radio"
+
+-#: gtk/gtktoggleaction.c:104
++#: ../gtk/gtktoggleaction.c:104
+ msgid "Whether the proxies for this action look like radio action proxies"
+ msgstr ""
+ "Indica si la apariencia de los proxies para esta acción es como un proxy de "
+ "acción de radio"
+
+-#: gtk/gtktoggleaction.c:119
++#: ../gtk/gtktoggleaction.c:119
+ msgid "If the toggle action should be active in or not"
+ msgstr "Si la acción de conmutación debe estar activa o no"
+
+-#: gtk/gtktogglebutton.c:103 gtk/gtktoggletoolbutton.c:102
++#: ../gtk/gtktogglebutton.c:103 ../gtk/gtktoggletoolbutton.c:102
+ msgid "If the toggle button should be pressed in or not"
+ msgstr "Si el botón de conmutación debe estar pulsado o no"
+
+-#: gtk/gtktogglebutton.c:111
++#: ../gtk/gtktogglebutton.c:111
+ msgid "If the toggle button is in an \"in between\" state"
+ msgstr "Si el botón de conmutación está en un estado «intermedio»"
+
+-#: gtk/gtktogglebutton.c:118
++#: ../gtk/gtktogglebutton.c:118
+ msgid "Draw Indicator"
+ msgstr "Indicador de dibujo"
+
+-#: gtk/gtktogglebutton.c:119
++#: ../gtk/gtktogglebutton.c:119
+ msgid "If the toggle part of the button is displayed"
+ msgstr "Si se muestra la parte de conmutación del botón"
+
+-#: gtk/gtktoolbar.c:493
++#: ../gtk/gtktoolbar.c:493
+ msgid "The orientation of the toolbar"
+ msgstr "La orientación de la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:501
++#: ../gtk/gtktoolbar.c:501
+ msgid "Toolbar Style"
+ msgstr "Estilo de la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:502
++#: ../gtk/gtktoolbar.c:502
+ msgid "How to draw the toolbar"
+ msgstr "Cómo dibujar la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:509
++#: ../gtk/gtktoolbar.c:509
+ msgid "Show Arrow"
+ msgstr "Mostrar flecha"
+
+-#: gtk/gtktoolbar.c:510
++#: ../gtk/gtktoolbar.c:510
+ msgid "If an arrow should be shown if the toolbar doesn't fit"
+ msgstr ""
+ "Indica si debe mostrarse una flecha si no cabe la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:525
++#: ../gtk/gtktoolbar.c:525
+ msgid "Tooltips"
+ msgstr "Consejos"
+
+-#: gtk/gtktoolbar.c:526
++#: ../gtk/gtktoolbar.c:526
+ msgid "If the tooltips of the toolbar should be active or not"
+ msgstr "Si los consejos de la barra de herramientas deben estar activados o no"
+
+-#: gtk/gtktoolbar.c:548
++#: ../gtk/gtktoolbar.c:548
+ msgid "Size of icons in this toolbar"
+ msgstr "Tamaño de los iconos en esta barra de herramientas"
+
+-#: gtk/gtktoolbar.c:563
++#: ../gtk/gtktoolbar.c:563
+ msgid "Icon size set"
+ msgstr "Tamaño del icono establecido"
+
+-#: gtk/gtktoolbar.c:564
++#: ../gtk/gtktoolbar.c:564
+ msgid "Whether the icon-size property has been set"
+ msgstr "Indica si se ha establecido la propiedad de tamaño del icono"
+
+-#: gtk/gtktoolbar.c:573
++#: ../gtk/gtktoolbar.c:573
+ msgid "Whether the item should receive extra space when the toolbar grows"
+ msgstr ""
+ "Indica si el elemento debe recibir espacio extra cuando la barra crezca"
+
+-#: gtk/gtktoolbar.c:581
++#: ../gtk/gtktoolbar.c:581
+ msgid "Whether the item should be the same size as other homogeneous items"
+ msgstr ""
+ "Indica si el elemento debe ser del mismo tamaño que otros elementos "
+ "homogéneos"
+
+-#: gtk/gtktoolbar.c:588
++#: ../gtk/gtktoolbar.c:588
+ msgid "Spacer size"
+ msgstr "Tamaño del espaciador"
+
+-#: gtk/gtktoolbar.c:589
++#: ../gtk/gtktoolbar.c:589
+ msgid "Size of spacers"
+ msgstr "Tamaño de los espaciadores"
+
+-#: gtk/gtktoolbar.c:598
++#: ../gtk/gtktoolbar.c:598
+ msgid "Amount of border space between the toolbar shadow and the buttons"
+ msgstr ""
+ "Número de espacio del borde entre la sombra de la barra de herramientas y "
+ "los botones"
+
+-#: gtk/gtktoolbar.c:606
++#: ../gtk/gtktoolbar.c:606
+ msgid "Maximum child expand"
+ msgstr "Expansión de hijos máxima"
+
+-#: gtk/gtktoolbar.c:607
++#: ../gtk/gtktoolbar.c:607
+ msgid "Maximum amount of space an expandable item will be given"
+ msgstr "Cantidad máxima de espacio que se le dará a un elemento expandible"
+
+-#: gtk/gtktoolbar.c:615
++#: ../gtk/gtktoolbar.c:615
+ msgid "Space style"
+ msgstr "Estilo del espacio"
+
+-#: gtk/gtktoolbar.c:616
++#: ../gtk/gtktoolbar.c:616
+ msgid "Whether spacers are vertical lines or just blank"
+ msgstr "Indica si los espaciadores son líneas verticales o sólo blancos"
+
+-#: gtk/gtktoolbar.c:623
++#: ../gtk/gtktoolbar.c:623
+ msgid "Button relief"
+ msgstr "Borde del botón"
+
+-#: gtk/gtktoolbar.c:624
++#: ../gtk/gtktoolbar.c:624
+ msgid "Type of bevel around toolbar buttons"
+ msgstr "Tipo de bisel alrededor de los botones de la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:631
++#: ../gtk/gtktoolbar.c:631
+ msgid "Style of bevel around the toolbar"
+ msgstr "Estilo del bisel alrededor de la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:637
++#: ../gtk/gtktoolbar.c:637
+ msgid "Toolbar style"
+ msgstr "Estilo de la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:638
++#: ../gtk/gtktoolbar.c:638
+ msgid ""
+ "Whether default toolbars have text only, text and icons, icons only, etc."
+ msgstr ""
+ "Indica si las barras de herramientas predeterminadas tienen sólo texto, "
+ "texto e iconos, sólo iconos, etc."
+
+-#: gtk/gtktoolbar.c:644
++#: ../gtk/gtktoolbar.c:644
+ msgid "Toolbar icon size"
+ msgstr "Tamaño del icono de la barra de herramientas"
+
+-#: gtk/gtktoolbar.c:645
++#: ../gtk/gtktoolbar.c:645
+ msgid "Size of icons in default toolbars"
+ msgstr "Tamaño de los iconos el las barras de herramientas predeterminadas"
+
+-#: gtk/gtktoolbutton.c:181
++#: ../gtk/gtktoolbutton.c:181
+ msgid "Text to show in the item."
+ msgstr "Texto para mostrar en el elemento."
+
+-#: gtk/gtktoolbutton.c:188
++#: ../gtk/gtktoolbutton.c:188
+ msgid ""
+ "If set, an underline in the label property indicates that the next character "
+ "should be used for the mnemonic accelerator key in the overflow menu"
+@@ -6049,43 +6078,43 @@
+ "siguiente carácter debe utilizarse como el nemotécnico de la combinación de "
+ "teclas en el menú de sobrecarga"
+
+-#: gtk/gtktoolbutton.c:195
++#: ../gtk/gtktoolbutton.c:195
+ msgid "Widget to use as the item label"
+ msgstr "Widget a usar como la etiqueta del elemento"
+
+-#: gtk/gtktoolbutton.c:201
++#: ../gtk/gtktoolbutton.c:201
+ msgid "Stock Id"
+ msgstr "ID del inventario"
+
+-#: gtk/gtktoolbutton.c:202
++#: ../gtk/gtktoolbutton.c:202
+ msgid "The stock icon displayed on the item"
+ msgstr "El icono de inventario mostrado en el elemento"
+
+-#: gtk/gtktoolbutton.c:218
++#: ../gtk/gtktoolbutton.c:218
+ msgid "Icon name"
+ msgstr "Nombre del icono"
+
+-#: gtk/gtktoolbutton.c:219
++#: ../gtk/gtktoolbutton.c:219
+ msgid "The name of the themed icon displayed on the item"
+ msgstr "El nombre del icono del tema mostrado en el elemento"
+
+-#: gtk/gtktoolbutton.c:225
++#: ../gtk/gtktoolbutton.c:225
+ msgid "Icon widget"
+ msgstr "Icono del widget"
+
+-#: gtk/gtktoolbutton.c:226
++#: ../gtk/gtktoolbutton.c:226
+ msgid "Icon widget to display in the item"
+ msgstr "Icono del widget pata mostrar en el elemento"
+
+-#: gtk/gtktoolbutton.c:239
++#: ../gtk/gtktoolbutton.c:239
+ msgid "Icon spacing"
+ msgstr "Espaciado entre iconos"
+
+-#: gtk/gtktoolbutton.c:240
++#: ../gtk/gtktoolbutton.c:240
+ msgid "Spacing in pixels between the icon and label"
+ msgstr "Espaciado en píxeles entre el icono y la etiqueta"
+
+-#: gtk/gtktoolitem.c:171
++#: ../gtk/gtktoolitem.c:171
+ msgid ""
+ "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
+ "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
+@@ -6094,367 +6123,367 @@
+ "Cuando está a TRUE, los botones de la barra de herramientas muestran texto "
+ "en modo GTK_TOOLBAR_BOTH_HORIZ"
+
+-#: gtk/gtktreemodelsort.c:274
++#: ../gtk/gtktreemodelsort.c:274
+ msgid "TreeModelSort Model"
+ msgstr "Modelo TreeModelSort"
+
+-#: gtk/gtktreemodelsort.c:275
++#: ../gtk/gtktreemodelsort.c:275
+ msgid "The model for the TreeModelSort to sort"
+ msgstr "El modelo para el TreeModelSort a ordenar"
+
+-#: gtk/gtktreeview.c:570
++#: ../gtk/gtktreeview.c:570
+ msgid "TreeView Model"
+ msgstr "Modelo TreeView"
+
+-#: gtk/gtktreeview.c:571
++#: ../gtk/gtktreeview.c:571
+ msgid "The model for the tree view"
+ msgstr "El modelo para la vista de árbol"
+
+-#: gtk/gtktreeview.c:579
++#: ../gtk/gtktreeview.c:579
+ msgid "Horizontal Adjustment for the widget"
+ msgstr "Ajuste horizontal para el widget"
+
+-#: gtk/gtktreeview.c:587
++#: ../gtk/gtktreeview.c:587
+ msgid "Vertical Adjustment for the widget"
+ msgstr "Ajuste vertical para el widget"
+
+-#: gtk/gtktreeview.c:594
++#: ../gtk/gtktreeview.c:594
+ msgid "Headers Visible"
+ msgstr "Cabeceras visibles"
+
+-#: gtk/gtktreeview.c:595
++#: ../gtk/gtktreeview.c:595
+ msgid "Show the column header buttons"
+ msgstr "Mostrar botones en los encabezados de columna"
+
+-#: gtk/gtktreeview.c:602
++#: ../gtk/gtktreeview.c:602
+ msgid "Headers Clickable"
+ msgstr "Cabeceras pulsables"
+
+-#: gtk/gtktreeview.c:603
++#: ../gtk/gtktreeview.c:603
+ msgid "Column headers respond to click events"
+ msgstr "Las cabeceras de las columnas responden a los eventos de pulsación"
+
+-#: gtk/gtktreeview.c:610
++#: ../gtk/gtktreeview.c:610
+ msgid "Expander Column"
+ msgstr "Columna expansora"
+
+-#: gtk/gtktreeview.c:611
++#: ../gtk/gtktreeview.c:611
+ msgid "Set the column for the expander column"
+ msgstr "Define la columna para la columna expansora"
+
+-#: gtk/gtktreeview.c:626
++#: ../gtk/gtktreeview.c:626
+ msgid "Rules Hint"
+ msgstr "Consejo de las reglas"
+
+-#: gtk/gtktreeview.c:627
++#: ../gtk/gtktreeview.c:627
+ msgid "Set a hint to the theme engine to draw rows in alternating colors"
+ msgstr ""
+ "Define un consejo para el motor del tema para dibujar las filas con colores "
+ "alternativos"
+
+-#: gtk/gtktreeview.c:634
++#: ../gtk/gtktreeview.c:634
+ msgid "Enable Search"
+ msgstr "Habilitar búsqueda"
+
+-#: gtk/gtktreeview.c:635
++#: ../gtk/gtktreeview.c:635
+ msgid "View allows user to search through columns interactively"
+ msgstr ""
+ "La vista permite a los usuarios buscar en forma interactiva a través de las "
+ "columnas"
+
+-#: gtk/gtktreeview.c:642
++#: ../gtk/gtktreeview.c:642
+ msgid "Search Column"
+ msgstr "Columna de búsqueda"
+
+-#: gtk/gtktreeview.c:643
+-msgid "Model column to search through when searching through code"
++#: ../gtk/gtktreeview.c:643
++#| msgid "Model column to search through when searching through code"
++msgid "Model column to search through during interactive search"
+ msgstr ""
+-"Columna modelo para buscar dentro cuando se esta buscando código por medio "
+-"de ella"
++"Columna modelo para buscar a través de ella en una búsqueda interactiva"
+
+-#: gtk/gtktreeview.c:663
++#: ../gtk/gtktreeview.c:663
+ msgid "Fixed Height Mode"
+ msgstr "Modo de altura fija"
+
+-#: gtk/gtktreeview.c:664
++#: ../gtk/gtktreeview.c:664
+ msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
+ msgstr ""
+ "Acelera GtkTreeView asumiendo que todas las filas tienen la misma altura"
+
+-#: gtk/gtktreeview.c:684
++#: ../gtk/gtktreeview.c:684
+ msgid "Hover Selection"
+ msgstr "Selección al pasar por encima"
+
+-#: gtk/gtktreeview.c:685
++#: ../gtk/gtktreeview.c:685
+ msgid "Whether the selection should follow the pointer"
+ msgstr "Indica si la selección debe seguir al puntero"
+
+-#: gtk/gtktreeview.c:704
++#: ../gtk/gtktreeview.c:704
+ msgid "Hover Expand"
+ msgstr "Expandir al poner el cursor encima"
+
+-#: gtk/gtktreeview.c:705
++#: ../gtk/gtktreeview.c:705
+ msgid ""
+ "Whether rows should be expanded/collapsed when the pointer moves over them"
+ msgstr ""
+ "Indica si las filas deben expandirse/contraerse cuando el puntero se mueve "
+ "sobre ellas"
+
+-#: gtk/gtktreeview.c:719
++#: ../gtk/gtktreeview.c:719
+ msgid "Show Expanders"
+ msgstr "Mostrar expansores"
+
+-#: gtk/gtktreeview.c:720
++#: ../gtk/gtktreeview.c:720
+ msgid "View has expanders"
+ msgstr "La vista tiene expansores"
+
+-#: gtk/gtktreeview.c:734
++#: ../gtk/gtktreeview.c:734
+ msgid "Level Indentation"
+ msgstr "Nivel de sangrado"
+
+-#: gtk/gtktreeview.c:735
++#: ../gtk/gtktreeview.c:735
+ msgid "Extra indentation for each level"
+ msgstr "Sangría extra para cada nivel"
+
+-#: gtk/gtktreeview.c:744
++#: ../gtk/gtktreeview.c:744
+ msgid "Rubber Banding"
+ msgstr "Bandas de goma"
+
+-#: gtk/gtktreeview.c:745
++#: ../gtk/gtktreeview.c:745
+ msgid ""
+ "Whether to enable selection of multiple items by dragging the mouse pointer"
+ msgstr ""
+ "Indica si se debe activar la selección de múltiples elementos arrastrándo el "
+ "puntero del ratón"
+
+-#: gtk/gtktreeview.c:752
++#: ../gtk/gtktreeview.c:752
+ msgid "Enable Grid Lines"
+ msgstr "Activar líneas de la rejilla"
+
+-#: gtk/gtktreeview.c:753
++#: ../gtk/gtktreeview.c:753
+ msgid "Whether grid lines should be drawn in the tree view"
+ msgstr "Indica si debe haber un icono cerca del elemento"
+
+-#: gtk/gtktreeview.c:761
++#: ../gtk/gtktreeview.c:761
+ msgid "Enable Tree Lines"
+ msgstr "Activar líneas del árbol"
+
+-#: gtk/gtktreeview.c:762
++#: ../gtk/gtktreeview.c:762
+ msgid "Whether tree lines should be drawn in the tree view"
+ msgstr "Indica si deben dibujar las líneas en la vista del árbol"
+
+-#: gtk/gtktreeview.c:770
++#: ../gtk/gtktreeview.c:770
+ msgid "The column in the model containing the tooltip texts for the rows"
+ msgstr ""
+ "La columna del modelo que contiene los textos de consejo para las filas"
+
+-#: gtk/gtktreeview.c:792
++#: ../gtk/gtktreeview.c:792
+ msgid "Vertical Separator Width"
+ msgstr "Anchura del separador vertical"
+
+-#: gtk/gtktreeview.c:793
++#: ../gtk/gtktreeview.c:793
+ msgid "Vertical space between cells. Must be an even number"
+ msgstr "Espacio vertical entre celdas. Debe ser un número par"
+
+-#: gtk/gtktreeview.c:801
++#: ../gtk/gtktreeview.c:801
+ msgid "Horizontal Separator Width"
+ msgstr "Anchura del separador horizontal"
+
+-#: gtk/gtktreeview.c:802
++#: ../gtk/gtktreeview.c:802
+ msgid "Horizontal space between cells. Must be an even number"
+ msgstr "Espacio horizontal entre celdas. Debe ser un número par"
+
+-#: gtk/gtktreeview.c:810
++#: ../gtk/gtktreeview.c:810
+ msgid "Allow Rules"
+ msgstr "Permitir reglas"
+
+-#: gtk/gtktreeview.c:811
++#: ../gtk/gtktreeview.c:811
+ msgid "Allow drawing of alternating color rows"
+ msgstr "Permitir el dibujado de filas con colores alternativos"
+
+-#: gtk/gtktreeview.c:817
++#: ../gtk/gtktreeview.c:817
+ msgid "Indent Expanders"
+ msgstr "Sangrar expansores"
+
+-#: gtk/gtktreeview.c:818
++#: ../gtk/gtktreeview.c:818
+ msgid "Make the expanders indented"
+ msgstr "Crea los expansores sangrados"
+
+-#: gtk/gtktreeview.c:824
++#: ../gtk/gtktreeview.c:824
+ msgid "Even Row Color"
+ msgstr "Color de la fila par"
+
+-#: gtk/gtktreeview.c:825
++#: ../gtk/gtktreeview.c:825
+ msgid "Color to use for even rows"
+ msgstr "Color a usar para las filas pares"
+
+-#: gtk/gtktreeview.c:831
++#: ../gtk/gtktreeview.c:831
+ msgid "Odd Row Color"
+ msgstr "Color de la fila impar"
+
+-#: gtk/gtktreeview.c:832
++#: ../gtk/gtktreeview.c:832
+ msgid "Color to use for odd rows"
+ msgstr "Color a usar para las filas impares"
+
+-#: gtk/gtktreeview.c:838
++#: ../gtk/gtktreeview.c:838
+ msgid "Row Ending details"
+ msgstr "Detalles de terminación de fila"
+
+-#: gtk/gtktreeview.c:839
++#: ../gtk/gtktreeview.c:839
+ msgid "Enable extended row background theming"
+ msgstr "Activar tema del fondo de extendido de fila"
+
+-#: gtk/gtktreeview.c:845
++#: ../gtk/gtktreeview.c:845
+ msgid "Grid line width"
+ msgstr "Anchura de la línea de la rejilla"
+
+-#: gtk/gtktreeview.c:846
++#: ../gtk/gtktreeview.c:846
+ msgid "Width, in pixels, of the tree view grid lines"
+ msgstr "Anchura, en píxeles, de la línea indicadora del foco"
+
+-#: gtk/gtktreeview.c:852
++#: ../gtk/gtktreeview.c:852
+ msgid "Tree line width"
+ msgstr "Anchura de la línea del árbol"
+
+-#: gtk/gtktreeview.c:853
++#: ../gtk/gtktreeview.c:853
+ msgid "Width, in pixels, of the tree view lines"
+ msgstr "Anchura, en píxeles, de la línea indicadora del foco"
+
+-#: gtk/gtktreeview.c:859
++#: ../gtk/gtktreeview.c:859
+ msgid "Grid line pattern"
+ msgstr "Patrón de la línea de la rejilla"
+
+-#: gtk/gtktreeview.c:860
++#: ../gtk/gtktreeview.c:860
+ msgid "Dash pattern used to draw the tree view grid lines"
+ msgstr ""
+ "Patrón de guiones utilizado para dibujar las líneas de rejilla de la vista "
+ "de árbol"
+
+-#: gtk/gtktreeview.c:866
++#: ../gtk/gtktreeview.c:866
+ msgid "Tree line pattern"
+ msgstr "Patrón de la línea del árbol"
+
+-#: gtk/gtktreeview.c:867
++#: ../gtk/gtktreeview.c:867
+ msgid "Dash pattern used to draw the tree view lines"
+ msgstr ""
+ "Patrón de guiones utilizado para dibujar las líneas de la vista de árbol"
+
+-#: gtk/gtktreeviewcolumn.c:192
++#: ../gtk/gtktreeviewcolumn.c:192
+ msgid "Whether to display the column"
+ msgstr "Indica si se debe mostrar la columna"
+
+-#: gtk/gtktreeviewcolumn.c:199 gtk/gtkwindow.c:523
++#: ../gtk/gtktreeviewcolumn.c:199 ../gtk/gtkwindow.c:523
+ msgid "Resizable"
+ msgstr "Redimensionable"
+
+-#: gtk/gtktreeviewcolumn.c:200
++#: ../gtk/gtktreeviewcolumn.c:200
+ msgid "Column is user-resizable"
+ msgstr "La columna es ajustable por el usuario"
+
+-#: gtk/gtktreeviewcolumn.c:208
++#: ../gtk/gtktreeviewcolumn.c:208
+ msgid "Current width of the column"
+ msgstr "Anchura actual de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:217
++#: ../gtk/gtktreeviewcolumn.c:217
+ msgid "Space which is inserted between cells"
+ msgstr "Espacio que se introduce entre las celdas"
+
+-#: gtk/gtktreeviewcolumn.c:225
++#: ../gtk/gtktreeviewcolumn.c:225
+ msgid "Sizing"
+ msgstr "Dimensionar"
+
+-#: gtk/gtktreeviewcolumn.c:226
++#: ../gtk/gtktreeviewcolumn.c:226
+ msgid "Resize mode of the column"
+ msgstr "Modo de redimensionado de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:234
++#: ../gtk/gtktreeviewcolumn.c:234
+ msgid "Fixed Width"
+ msgstr "Anchura fijo"
+
+-#: gtk/gtktreeviewcolumn.c:235
++#: ../gtk/gtktreeviewcolumn.c:235
+ msgid "Current fixed width of the column"
+ msgstr "Anchura fijo actual de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:244
++#: ../gtk/gtktreeviewcolumn.c:244
+ msgid "Minimum Width"
+ msgstr "Anchura mínimo"
+
+-#: gtk/gtktreeviewcolumn.c:245
++#: ../gtk/gtktreeviewcolumn.c:245
+ msgid "Minimum allowed width of the column"
+ msgstr "Anchura mínimo permitido de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:254
++#: ../gtk/gtktreeviewcolumn.c:254
+ msgid "Maximum Width"
+ msgstr "Anchura máximo"
+
+-#: gtk/gtktreeviewcolumn.c:255
++#: ../gtk/gtktreeviewcolumn.c:255
+ msgid "Maximum allowed width of the column"
+ msgstr "Anchura máximo permitido de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:265
++#: ../gtk/gtktreeviewcolumn.c:265
+ msgid "Title to appear in column header"
+ msgstr "Título que aparecerá en el encabezado de columna"
+
+-#: gtk/gtktreeviewcolumn.c:273
++#: ../gtk/gtktreeviewcolumn.c:273
+ msgid "Column gets share of extra width allocated to the widget"
+ msgstr ""
+ "La columna obtiene compartición de anchura extra asignada para el widget"
+
+-#: gtk/gtktreeviewcolumn.c:280
++#: ../gtk/gtktreeviewcolumn.c:280
+ msgid "Clickable"
+ msgstr "Pulsable"
+
+-#: gtk/gtktreeviewcolumn.c:281
++#: ../gtk/gtktreeviewcolumn.c:281
+ msgid "Whether the header can be clicked"
+ msgstr "Indica si la cabecera puede ser pulsada"
+
+-#: gtk/gtktreeviewcolumn.c:289
++#: ../gtk/gtktreeviewcolumn.c:289
+ msgid "Widget"
+ msgstr "Widget"
+
+-#: gtk/gtktreeviewcolumn.c:290
++#: ../gtk/gtktreeviewcolumn.c:290
+ msgid "Widget to put in column header button instead of column title"
+ msgstr ""
+ "Widget a colocar en el botón de la cabecera de la columna en lugar del "
+ "título de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:298
++#: ../gtk/gtktreeviewcolumn.c:298
+ msgid "X Alignment of the column header text or widget"
+ msgstr "Alineación X del texto o el widget de la cabecera de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:308
++#: ../gtk/gtktreeviewcolumn.c:308
+ msgid "Whether the column can be reordered around the headers"
+ msgstr "Indica si la columna poder ser reordenada alrededor de las cabeceras"
+
+-#: gtk/gtktreeviewcolumn.c:315
++#: ../gtk/gtktreeviewcolumn.c:315
+ msgid "Sort indicator"
+ msgstr "Indicador de ordenación"
+
+-#: gtk/gtktreeviewcolumn.c:316
++#: ../gtk/gtktreeviewcolumn.c:316
+ msgid "Whether to show a sort indicator"
+ msgstr "Indica si se debe mostrar un indicador de ordenamiento"
+
+-#: gtk/gtktreeviewcolumn.c:323
++#: ../gtk/gtktreeviewcolumn.c:323
+ msgid "Sort order"
+ msgstr "Orden de la ordenación"
+
+-#: gtk/gtktreeviewcolumn.c:324
++#: ../gtk/gtktreeviewcolumn.c:324
+ msgid "Sort direction the sort indicator should indicate"
+ msgstr "Dirección de ordenación que el indicador deberá indicar"
+
+-#: gtk/gtkuimanager.c:221
++#: ../gtk/gtkuimanager.c:221
+ msgid "Whether tearoff menu items should be added to menus"
+ msgstr "Indica si deben añadirse tiradores a los menús"
+
+-#: gtk/gtkuimanager.c:228
++#: ../gtk/gtkuimanager.c:228
+ msgid "Merged UI definition"
+ msgstr "Definición del IU combinado"
+
+-#: gtk/gtkuimanager.c:229
++#: ../gtk/gtkuimanager.c:229
+ msgid "An XML string describing the merged UI"
+ msgstr "Una cadena XML describiendo el IU combinado"
+
+-#: gtk/gtkviewport.c:107
++#: ../gtk/gtkviewport.c:107
+ msgid ""
+ "The GtkAdjustment that determines the values of the horizontal position for "
+ "this viewport"
+@@ -6462,7 +6491,7 @@
+ "El GtkAdjustment que determina los valores de la posición horizontal para "
+ "este puerto de visión"
+
+-#: gtk/gtkviewport.c:115
++#: ../gtk/gtkviewport.c:115
+ msgid ""
+ "The GtkAdjustment that determines the values of the vertical position for "
+ "this viewport"
+@@ -6470,32 +6499,32 @@
+ "El GtkAdjustment que determina los valores de la posición vertical de este "
+ "puerto de visión"
+
+-#: gtk/gtkviewport.c:123
++#: ../gtk/gtkviewport.c:123
+ msgid "Determines how the shadowed box around the viewport is drawn"
+ msgstr ""
+ "Determina como es dibujado el marco sombreado alrededor del puerto de visión"
+
+-#: gtk/gtkwidget.c:483
++#: ../gtk/gtkwidget.c:483
+ msgid "Widget name"
+ msgstr "Nombre del widget"
+
+-#: gtk/gtkwidget.c:484
++#: ../gtk/gtkwidget.c:484
+ msgid "The name of the widget"
+ msgstr "El nombre del widget"
+
+-#: gtk/gtkwidget.c:490
++#: ../gtk/gtkwidget.c:490
+ msgid "Parent widget"
+ msgstr "Widget padre"
+
+-#: gtk/gtkwidget.c:491
++#: ../gtk/gtkwidget.c:491
+ msgid "The parent widget of this widget. Must be a Container widget"
+ msgstr "El widget padre de este widget. Debe ser un widget contenedor"
+
+-#: gtk/gtkwidget.c:498
++#: ../gtk/gtkwidget.c:498
+ msgid "Width request"
+ msgstr "Petición de anchura"
+
+-#: gtk/gtkwidget.c:499
++#: ../gtk/gtkwidget.c:499
+ msgid ""
+ "Override for width request of the widget, or -1 if natural request should be "
+ "used"
+@@ -6503,11 +6532,11 @@
+ "Sobreescribir el ancho solicitado del widget, o -1 si deber ser utilizado la "
+ "solicitud natural"
+
+-#: gtk/gtkwidget.c:507
++#: ../gtk/gtkwidget.c:507
+ msgid "Height request"
+ msgstr "Petición de altura"
+
+-#: gtk/gtkwidget.c:508
++#: ../gtk/gtkwidget.c:508
+ msgid ""
+ "Override for height request of the widget, or -1 if natural request should "
+ "be used"
+@@ -6515,84 +6544,84 @@
+ "Sobreescribir la altura solicitada del widget, o -1 si deber ser utilizada "
+ "la solicitud natural"
+
+-#: gtk/gtkwidget.c:517
++#: ../gtk/gtkwidget.c:517
+ msgid "Whether the widget is visible"
+ msgstr "Indica si el widget es visible"
+
+-#: gtk/gtkwidget.c:524
++#: ../gtk/gtkwidget.c:524
+ msgid "Whether the widget responds to input"
+ msgstr "Indica si el widget responde al ingreso"
+
+-#: gtk/gtkwidget.c:530
++#: ../gtk/gtkwidget.c:530
+ msgid "Application paintable"
+ msgstr "Pintable por la aplicación"
+
+-#: gtk/gtkwidget.c:531
++#: ../gtk/gtkwidget.c:531
+ msgid "Whether the application will paint directly on the widget"
+ msgstr "Indica si la aplicación pintará directamente sobre el widget"
+
+-#: gtk/gtkwidget.c:537
++#: ../gtk/gtkwidget.c:537
+ msgid "Can focus"
+ msgstr "Puede enfocar"
+
+-#: gtk/gtkwidget.c:538
++#: ../gtk/gtkwidget.c:538
+ msgid "Whether the widget can accept the input focus"
+ msgstr "Indica si el widget puede aceptar el foco de entrada"
+
+-#: gtk/gtkwidget.c:544
++#: ../gtk/gtkwidget.c:544
+ msgid "Has focus"
+ msgstr "Tiene foco"
+
+-#: gtk/gtkwidget.c:545
++#: ../gtk/gtkwidget.c:545
+ msgid "Whether the widget has the input focus"
+ msgstr "Indica si el widget tiene el foco de entrada"
+
+-#: gtk/gtkwidget.c:551
++#: ../gtk/gtkwidget.c:551
+ msgid "Is focus"
+ msgstr "Tiene el foco"
+
+-#: gtk/gtkwidget.c:552
++#: ../gtk/gtkwidget.c:552
+ msgid "Whether the widget is the focus widget within the toplevel"
+ msgstr "Indica si el widget es el widget con foco dentro del nivel superior"
+
+-#: gtk/gtkwidget.c:558
++#: ../gtk/gtkwidget.c:558
+ msgid "Can default"
+ msgstr "Puede por omisión"
+
+-#: gtk/gtkwidget.c:559
++#: ../gtk/gtkwidget.c:559
+ msgid "Whether the widget can be the default widget"
+ msgstr "Indica si el widget puede ser el widget predeterminado"
+
+-#: gtk/gtkwidget.c:565
++#: ../gtk/gtkwidget.c:565
+ msgid "Has default"
+ msgstr "Tiene por omisión"
+
+-#: gtk/gtkwidget.c:566
++#: ../gtk/gtkwidget.c:566
+ msgid "Whether the widget is the default widget"
+ msgstr "Indica si el widget es el widget predeterminado"
+
+-#: gtk/gtkwidget.c:572
++#: ../gtk/gtkwidget.c:572
+ msgid "Receives default"
+ msgstr "Recibe por omisión"
+
+-#: gtk/gtkwidget.c:573
++#: ../gtk/gtkwidget.c:573
+ msgid "If TRUE, the widget will receive the default action when it is focused"
+ msgstr ""
+ "Si es TRUE el widget recibirá la acción predeterminada cuando obtiene el foco"
+
+-#: gtk/gtkwidget.c:579
++#: ../gtk/gtkwidget.c:579
+ msgid "Composite child"
+ msgstr "Hijo compuesto"
+
+-#: gtk/gtkwidget.c:580
++#: ../gtk/gtkwidget.c:580
+ msgid "Whether the widget is part of a composite widget"
+ msgstr "Indica si el widget es parte de un widget compuesto"
+
+-#: gtk/gtkwidget.c:586
++#: ../gtk/gtkwidget.c:586
+ msgid "Style"
+ msgstr "Estilo"
+
+-#: gtk/gtkwidget.c:587
++#: ../gtk/gtkwidget.c:587
+ msgid ""
+ "The style of the widget, which contains information about how it will look "
+ "(colors etc)"
+@@ -6600,106 +6629,106 @@
+ "El estilo del widget, que contiene información sobre la apariencia (colores, "
+ "etc)"
+
+-#: gtk/gtkwidget.c:593
++#: ../gtk/gtkwidget.c:593
+ msgid "Events"
+ msgstr "Eventos"
+
+-#: gtk/gtkwidget.c:594
++#: ../gtk/gtkwidget.c:594
+ msgid "The event mask that decides what kind of GdkEvents this widget gets"
+ msgstr ""
+ "La máscara de eventos que decide que tipo de GtkEvents recibe este widget"
+
+-#: gtk/gtkwidget.c:601
++#: ../gtk/gtkwidget.c:601
+ msgid "Extension events"
+ msgstr "Eventos de extensión"
+
+-#: gtk/gtkwidget.c:602
++#: ../gtk/gtkwidget.c:602
+ msgid "The mask that decides what kind of extension events this widget gets"
+ msgstr ""
+ "La máscara que decide que clase de eventos de extensión conseguirá este "
+ "widget"
+
+-#: gtk/gtkwidget.c:609
++#: ../gtk/gtkwidget.c:609
+ msgid "No show all"
+ msgstr "No mostrar todo"
+
+-#: gtk/gtkwidget.c:610
++#: ../gtk/gtkwidget.c:610
+ msgid "Whether gtk_widget_show_all() should not affect this widget"
+ msgstr "Indica que gtk_widget_show_all() no debe afectar a este widget"
+
+-#: gtk/gtkwidget.c:632
++#: ../gtk/gtkwidget.c:632
+ msgid "Has tooltip"
+ msgstr "Tiene consejo"
+
+-#: gtk/gtkwidget.c:633
++#: ../gtk/gtkwidget.c:633
+ msgid "Whether this widget has a tooltip"
+ msgstr "Indica si el widget tiene un consejo"
+
+-#: gtk/gtkwidget.c:653
++#: ../gtk/gtkwidget.c:653
+ msgid "Tooltip Text"
+ msgstr "Texto del consejo"
+
+-#: gtk/gtkwidget.c:654 gtk/gtkwidget.c:675
++#: ../gtk/gtkwidget.c:654 ../gtk/gtkwidget.c:675
+ msgid "The contents of the tooltip for this widget"
+ msgstr "El contenido de los consejos para este widget"
+
+-#: gtk/gtkwidget.c:674
++#: ../gtk/gtkwidget.c:674
+ msgid "Tooltip markup"
+ msgstr "Marcado de consejos"
+
+-#: gtk/gtkwidget.c:689
++#: ../gtk/gtkwidget.c:689
+ msgid "Window"
+ msgstr "Ventana"
+
+-#: gtk/gtkwidget.c:690
++#: ../gtk/gtkwidget.c:690
+ msgid "The widget's window if it is realized"
+ msgstr "La ventana del widget si se realiza"
+
+-#: gtk/gtkwidget.c:2208
++#: ../gtk/gtkwidget.c:2208
+ msgid "Interior Focus"
+ msgstr "Foco interior"
+
+-#: gtk/gtkwidget.c:2209
++#: ../gtk/gtkwidget.c:2209
+ msgid "Whether to draw the focus indicator inside widgets"
+ msgstr "Indica si se ha de dibujar el indicador del foco dentro de los widgets"
+
+-#: gtk/gtkwidget.c:2215
++#: ../gtk/gtkwidget.c:2215
+ msgid "Focus linewidth"
+ msgstr "Dar foco al ancho de línea"
+
+-#: gtk/gtkwidget.c:2216
++#: ../gtk/gtkwidget.c:2216
+ msgid "Width, in pixels, of the focus indicator line"
+ msgstr "Anchura, en píxeles, de la línea indicadora del foco"
+
+-#: gtk/gtkwidget.c:2222
++#: ../gtk/gtkwidget.c:2222
+ msgid "Focus line dash pattern"
+ msgstr "Dar foco a la línea con patrón punteado"
+
+-#: gtk/gtkwidget.c:2223
++#: ../gtk/gtkwidget.c:2223
+ msgid "Dash pattern used to draw the focus indicator"
+ msgstr "Patrón punteado utilizado para dibujar el indicador de foco"
+
+-#: gtk/gtkwidget.c:2228
++#: ../gtk/gtkwidget.c:2228
+ msgid "Focus padding"
+ msgstr "Relleno del foco"
+
+-#: gtk/gtkwidget.c:2229
++#: ../gtk/gtkwidget.c:2229
+ msgid "Width, in pixels, between focus indicator and the widget 'box'"
+ msgstr "Anchura, en píxeles, entre el indicador de foco y la «caja» del widget"
+
+-#: gtk/gtkwidget.c:2234
++#: ../gtk/gtkwidget.c:2234
+ msgid "Cursor color"
+ msgstr "Color del cursor"
+
+-#: gtk/gtkwidget.c:2235
++#: ../gtk/gtkwidget.c:2235
+ msgid "Color with which to draw insertion cursor"
+ msgstr "Color con el cual dibujar el cursor de inserción"
+
+-#: gtk/gtkwidget.c:2240
++#: ../gtk/gtkwidget.c:2240
+ msgid "Secondary cursor color"
+ msgstr "Color secundario del cursor"
+
+-#: gtk/gtkwidget.c:2241
++#: ../gtk/gtkwidget.c:2241
+ msgid ""
+ "Color with which to draw the secondary insertion cursor when editing mixed "
+ "right-to-left and left-to-right text"
+@@ -6707,43 +6736,43 @@
+ "Color con el cual dibujar el cursor de inserción secundario cuando se esta "
+ "editando una mezcla de texto de derecha-a-izquierda y izquierda-a-derecha"
+
+-#: gtk/gtkwidget.c:2246
++#: ../gtk/gtkwidget.c:2246
+ msgid "Cursor line aspect ratio"
+ msgstr "Proporción de la línea del cursor"
+
+-#: gtk/gtkwidget.c:2247
++#: ../gtk/gtkwidget.c:2247
+ msgid "Aspect ratio with which to draw insertion cursor"
+ msgstr "La proporción con la cual dibujar el cursor de inserción"
+
+-#: gtk/gtkwidget.c:2261
++#: ../gtk/gtkwidget.c:2261
+ msgid "Draw Border"
+ msgstr "Dibujar borde"
+
+-#: gtk/gtkwidget.c:2262
++#: ../gtk/gtkwidget.c:2262
+ msgid "Size of areas outside the widget's allocation to draw"
+ msgstr "Tamaño de las áreas fuera de la reserva del widget para dibujar"
+
+-#: gtk/gtkwidget.c:2275
++#: ../gtk/gtkwidget.c:2275
+ msgid "Unvisited Link Color"
+ msgstr "Color del enlace no visitado"
+
+-#: gtk/gtkwidget.c:2276
++#: ../gtk/gtkwidget.c:2276
+ msgid "Color of unvisited links"
+ msgstr "Color de los enlaces no visitados"
+
+-#: gtk/gtkwidget.c:2289
++#: ../gtk/gtkwidget.c:2289
+ msgid "Visited Link Color"
+ msgstr "Color del enlace visitado"
+
+-#: gtk/gtkwidget.c:2290
++#: ../gtk/gtkwidget.c:2290
+ msgid "Color of visited links"
+ msgstr "Color de los enlaces visitados"
+
+-#: gtk/gtkwidget.c:2304
++#: ../gtk/gtkwidget.c:2304
+ msgid "Wide Separators"
+ msgstr "Separadores anchos"
+
+-#: gtk/gtkwidget.c:2305
++#: ../gtk/gtkwidget.c:2305
+ msgid ""
+ "Whether separators have configurable width and should be drawn using a box "
+ "instead of a line"
+@@ -6751,77 +6780,77 @@
+ "Indica si los separadores tienen anchura configurable y deben dibujarse "
+ "usando una caja en lugar de una línea"
+
+-#: gtk/gtkwidget.c:2319
++#: ../gtk/gtkwidget.c:2319
+ msgid "Separator Width"
+ msgstr "Anchura del separador"
+
+-#: gtk/gtkwidget.c:2320
++#: ../gtk/gtkwidget.c:2320
+ msgid "The width of separators if wide-separators is TRUE"
+ msgstr "La anchura de los separadores si «wide-separators« es TRUE"
+
+-#: gtk/gtkwidget.c:2334
++#: ../gtk/gtkwidget.c:2334
+ msgid "Separator Height"
+ msgstr "Altura del separador"
+
+-#: gtk/gtkwidget.c:2335
++#: ../gtk/gtkwidget.c:2335
+ msgid "The height of separators if \"wide-separators\" is TRUE"
+ msgstr "La altura de los separadores si «wide-separators» es TRUE"
+
+-#: gtk/gtkwidget.c:2349
++#: ../gtk/gtkwidget.c:2349
+ msgid "Horizontal Scroll Arrow Length"
+ msgstr "Longitud de la flecha de desplazamiento horizontal"
+
+-#: gtk/gtkwidget.c:2350
++#: ../gtk/gtkwidget.c:2350
+ msgid "The length of horizontal scroll arrows"
+ msgstr "La longitud de las flechas de desplazamiento horizontal"
+
+-#: gtk/gtkwidget.c:2364
++#: ../gtk/gtkwidget.c:2364
+ msgid "Vertical Scroll Arrow Length"
+ msgstr "Longitud de las flechas de desplazamiento vertical"
+
+-#: gtk/gtkwidget.c:2365
++#: ../gtk/gtkwidget.c:2365
+ msgid "The length of vertical scroll arrows"
+ msgstr "La longitud de las flechas de desplazamiento vertical"
+
+-#: gtk/gtkwindow.c:464
++#: ../gtk/gtkwindow.c:464
+ msgid "Window Type"
+ msgstr "Tipo de ventana"
+
+-#: gtk/gtkwindow.c:465
++#: ../gtk/gtkwindow.c:465
+ msgid "The type of the window"
+ msgstr "El tipo de la ventana"
+
+-#: gtk/gtkwindow.c:473
++#: ../gtk/gtkwindow.c:473
+ msgid "Window Title"
+ msgstr "Título de la ventana"
+
+-#: gtk/gtkwindow.c:474
++#: ../gtk/gtkwindow.c:474
+ msgid "The title of the window"
+ msgstr "El título de la ventana"
+
+-#: gtk/gtkwindow.c:481
++#: ../gtk/gtkwindow.c:481
+ msgid "Window Role"
+ msgstr "Rol de la ventana"
+
+-#: gtk/gtkwindow.c:482
++#: ../gtk/gtkwindow.c:482
+ msgid "Unique identifier for the window to be used when restoring a session"
+ msgstr ""
+ "Identificador único para la ventana para usarlo al restaurar una sesión"
+
+-#: gtk/gtkwindow.c:498
++#: ../gtk/gtkwindow.c:498
+ msgid "Startup ID"
+ msgstr "ID de inicio"
+
+-#: gtk/gtkwindow.c:499
++#: ../gtk/gtkwindow.c:499
+ msgid "Unique startup identifier for the window used by startup-notification"
+ msgstr ""
+ "Identificador único de inicio para la ventana usado por startup-notification"
+
+-#: gtk/gtkwindow.c:506
++#: ../gtk/gtkwindow.c:506
+ msgid "Allow Shrink"
+ msgstr "Permitir encoger"
+
+-#: gtk/gtkwindow.c:508
++#: ../gtk/gtkwindow.c:508
+ #, no-c-format
+ msgid ""
+ "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the "
+@@ -6830,25 +6859,25 @@
+ "Si es TRUE la ventana no tiene tamaño mínimo. Colocar este valor como TRUE "
+ "es una mala idea el 99% de las veces"
+
+-#: gtk/gtkwindow.c:515
++#: ../gtk/gtkwindow.c:515
+ msgid "Allow Grow"
+ msgstr "Permitir crecer"
+
+-#: gtk/gtkwindow.c:516
++#: ../gtk/gtkwindow.c:516
+ msgid "If TRUE, users can expand the window beyond its minimum size"
+ msgstr ""
+ "Si es TRUE los usuarios pueden expandir la ventana mas allá de su tamaño "
+ "mínimo"
+
+-#: gtk/gtkwindow.c:524
++#: ../gtk/gtkwindow.c:524
+ msgid "If TRUE, users can resize the window"
+ msgstr "Si es TRUE los usuario pueden redimensionar la ventana"
+
+-#: gtk/gtkwindow.c:531
++#: ../gtk/gtkwindow.c:531
+ msgid "Modal"
+ msgstr "Modal"
+
+-#: gtk/gtkwindow.c:532
++#: ../gtk/gtkwindow.c:532
+ msgid ""
+ "If TRUE, the window is modal (other windows are not usable while this one is "
+ "up)"
+@@ -6856,72 +6885,72 @@
+ "Si es TRUE, esta ventana es modal (no se pueden utilizar otras ventanas "
+ "mientras ésta este encima)"
+
+-#: gtk/gtkwindow.c:539
++#: ../gtk/gtkwindow.c:539
+ msgid "Window Position"
+ msgstr "Posición de la ventana"
+
+-#: gtk/gtkwindow.c:540
++#: ../gtk/gtkwindow.c:540
+ msgid "The initial position of the window"
+ msgstr "La posición inicial de la ventana"
+
+-#: gtk/gtkwindow.c:548
++#: ../gtk/gtkwindow.c:548
+ msgid "Default Width"
+ msgstr "Anchura predeterminada"
+
+-#: gtk/gtkwindow.c:549
++#: ../gtk/gtkwindow.c:549
+ msgid "The default width of the window, used when initially showing the window"
+ msgstr ""
+ "El ancho predeterminado de la ventana, utilizado cuando se muestra "
+ "inicialmente la ventana"
+
+-#: gtk/gtkwindow.c:558
++#: ../gtk/gtkwindow.c:558
+ msgid "Default Height"
+ msgstr "Altura predeterminada"
+
+-#: gtk/gtkwindow.c:559
++#: ../gtk/gtkwindow.c:559
+ msgid ""
+ "The default height of the window, used when initially showing the window"
+ msgstr ""
+ "La altura predeterminada de la ventana, utilizado cuando se muestra "
+ "inicialmente la ventana"
+
+-#: gtk/gtkwindow.c:568
++#: ../gtk/gtkwindow.c:568
+ msgid "Destroy with Parent"
+ msgstr "Destruir con el padre"
+
+-#: gtk/gtkwindow.c:569
++#: ../gtk/gtkwindow.c:569
+ msgid "If this window should be destroyed when the parent is destroyed"
+ msgstr "Indica si esta ventana debe ser destruida cuando el padre se destruye"
+
+-#: gtk/gtkwindow.c:577
++#: ../gtk/gtkwindow.c:577
+ msgid "Icon for this window"
+ msgstr "Icono para esta ventana"
+
+-#: gtk/gtkwindow.c:593
++#: ../gtk/gtkwindow.c:593
+ msgid "Name of the themed icon for this window"
+ msgstr "Nombre del icono del tema para esta ventana"
+
+-#: gtk/gtkwindow.c:608
++#: ../gtk/gtkwindow.c:608
+ msgid "Is Active"
+ msgstr "Está activo"
+
+-#: gtk/gtkwindow.c:609
++#: ../gtk/gtkwindow.c:609
+ msgid "Whether the toplevel is the current active window"
+ msgstr "Indica si el nivel superior es la ventana activa actual"
+
+-#: gtk/gtkwindow.c:616
++#: ../gtk/gtkwindow.c:616
+ msgid "Focus in Toplevel"
+ msgstr "Foco en el nivel superior"
+
+-#: gtk/gtkwindow.c:617
++#: ../gtk/gtkwindow.c:617
+ msgid "Whether the input focus is within this GtkWindow"
+ msgstr "Indica si el foco de entrada esta dentro de este GtkWindow"
+
+-#: gtk/gtkwindow.c:624
++#: ../gtk/gtkwindow.c:624
+ msgid "Type hint"
+ msgstr "Pista de tipo"
+
+-#: gtk/gtkwindow.c:625
++#: ../gtk/gtkwindow.c:625
+ msgid ""
+ "Hint to help the desktop environment understand what kind of window this is "
+ "and how to treat it."
+@@ -6929,98 +6958,98 @@
+ "Pista para ayudar al entorno de escritorio a entender qué clase de ventana "
+ "es ésta y cómo tratar con ella."
+
+-#: gtk/gtkwindow.c:633
++#: ../gtk/gtkwindow.c:633
+ msgid "Skip taskbar"
+ msgstr "Ignorar barra de tareas"
+
+-#: gtk/gtkwindow.c:634
++#: ../gtk/gtkwindow.c:634
+ msgid "TRUE if the window should not be in the task bar."
+ msgstr "TRUE si la ventana no debe estar en la barra de tareas."
+
+-#: gtk/gtkwindow.c:641
++#: ../gtk/gtkwindow.c:641
+ msgid "Skip pager"
+ msgstr "Ignorar paginador"
+
+-#: gtk/gtkwindow.c:642
++#: ../gtk/gtkwindow.c:642
+ msgid "TRUE if the window should not be in the pager."
+ msgstr "TRUE si la ventana no debe estar en el paginador."
+
+-#: gtk/gtkwindow.c:649
++#: ../gtk/gtkwindow.c:649
+ msgid "Urgent"
+ msgstr "Urgente"
+
+-#: gtk/gtkwindow.c:650
++#: ../gtk/gtkwindow.c:650
+ msgid "TRUE if the window should be brought to the user's attention."
+ msgstr "TRUE si la ventana debe llamar la atención del usuario."
+
+-#: gtk/gtkwindow.c:664
++#: ../gtk/gtkwindow.c:664
+ msgid "Accept focus"
+ msgstr "Aceptar foco"
+
+-#: gtk/gtkwindow.c:665
++#: ../gtk/gtkwindow.c:665
+ msgid "TRUE if the window should receive the input focus."
+ msgstr "TRUE si la ventana no debe recibir el foco de entrada."
+
+-#: gtk/gtkwindow.c:679
++#: ../gtk/gtkwindow.c:679
+ msgid "Focus on map"
+ msgstr "Foco en el mapa"
+
+-#: gtk/gtkwindow.c:680
++#: ../gtk/gtkwindow.c:680
+ msgid "TRUE if the window should receive the input focus when mapped."
+ msgstr "TRUE si la ventana debe recibir el foco de entrada al ser mapeada."
+
+-#: gtk/gtkwindow.c:694
++#: ../gtk/gtkwindow.c:694
+ msgid "Decorated"
+ msgstr "Decorado"
+
+-#: gtk/gtkwindow.c:695
++#: ../gtk/gtkwindow.c:695
+ msgid "Whether the window should be decorated by the window manager"
+ msgstr "Indica si la ventana debe ser decorada por el gestor de ventanas"
+
+-#: gtk/gtkwindow.c:709
++#: ../gtk/gtkwindow.c:709
+ msgid "Deletable"
+ msgstr "Borrable"
+
+-#: gtk/gtkwindow.c:710
++#: ../gtk/gtkwindow.c:710
+ msgid "Whether the window frame should have a close button"
+ msgstr "Indica si el marco de la ventana debe tener un botón de cierre"
+
+-#: gtk/gtkwindow.c:726
++#: ../gtk/gtkwindow.c:726
+ msgid "Gravity"
+ msgstr "Gravedad"
+
+-#: gtk/gtkwindow.c:727
++#: ../gtk/gtkwindow.c:727
+ msgid "The window gravity of the window"
+ msgstr "La gravedad de la ventana"
+
+-#: gtk/gtkwindow.c:744
++#: ../gtk/gtkwindow.c:744
+ msgid "Transient for Window"
+ msgstr "Transitorio para la ventana"
+
+-#: gtk/gtkwindow.c:745
++#: ../gtk/gtkwindow.c:745
+ msgid "The transient parent of the dialog"
+ msgstr "El padre transitorio del diálogo"
+
+-#: gtk/gtkwindow.c:759
++#: ../gtk/gtkwindow.c:759
+ msgid "Opacity for Window"
+ msgstr "Opacidad para la ventana"
+
+-#: gtk/gtkwindow.c:760
++#: ../gtk/gtkwindow.c:760
+ msgid "The opacity of the window, from 0 to 1"
+ msgstr "La opacidad de la ventana, desde 0 hasta 1"
+
+-#: modules/input/gtkimcontextxim.c:334
++#: ../modules/input/gtkimcontextxim.c:334
+ msgid "IM Preedit style"
+ msgstr "Estilo de preedición del ME"
+
+-#: modules/input/gtkimcontextxim.c:335
++#: ../modules/input/gtkimcontextxim.c:335
+ msgid "How to draw the input method preedit string"
+ msgstr "Cómo dibujar la cadena del método de entrada de preedición"
+
+-#: modules/input/gtkimcontextxim.c:343
++#: ../modules/input/gtkimcontextxim.c:343
+ msgid "IM Status style"
+ msgstr "Estilo del estado ME"
+
+-#: modules/input/gtkimcontextxim.c:344
++#: ../modules/input/gtkimcontextxim.c:344
+ msgid "How to draw the input method statusbar"
+ msgstr "Cómo dibujar el método de entrada de la barra de estado"
+Index: po-properties/ChangeLog
+===================================================================
+--- po-properties/ChangeLog (revision 22076)
++++ po-properties/ChangeLog (revision 22450)
+@@ -1,3 +1,23 @@
++2009-02-07 Gil Forcada <gforcada@gnome.org>
++
++ * ca.po: Updated Catalan translation by David Planella.
++
++2009-02-01 Daniel Nylander <po@danielnylander.se>
++
++ * sv.po: Updated Swedish translation.
++
++2009-01-27 Jorge Gonzalez <jorgegonz@svn.gnome.org>
++
++ * es.po: Updated Spanish translation
++
++2009-01-26 Claudio Saavedra <csaavedra@igalia.com>
++
++ Merged from trunk:
++
++ Bug 563576 – Dummy po files break the build
++
++ * ast.po: copy contact data from po/ast.po, patch from Adrian Bunk
++
+ 2009-01-07 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.14.7 ===
+Index: po-properties/ca.po
+===================================================================
+--- po-properties/ca.po (revision 22076)
++++ po-properties/ca.po (revision 22450)
+@@ -5,7 +5,7 @@
+ # Jordi Mallach <jordi@sindominio.net>, 2002, 2003.
+ # Mireia Farrús <mifarrus@hotmail.com>, 2003.
+ # Josep Puigdemont <josep.puigdemont@gmail.com>, 2005, 2006.
+-# David Planella <david.planella@gmail.com>, 2008.
++# David Planella <david.planella@gmail.com>, 2008, 2009.
+ #
+ # Recull de termes
+ #
+@@ -26,117 +26,119 @@
+ msgstr ""
+ "Project-Id-Version: gtk+ 2.3.0\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-01-07 12:13-0500\n"
+-"PO-Revision-Date: 2008-10-19 13:18+0200\n"
++"POT-Creation-Date: 2009-02-07 10:38+0100\n"
++"PO-Revision-Date: 2009-02-07 10:10+0100\n"
+ "Last-Translator: David Planella <david.planella@gmail.com>\n"
+ "Language-Team: Catalan <tradgnome@softcatala.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:89
++#: ../gdk-pixbuf/gdk-pixbuf.c:89
+ msgid "Number of Channels"
+ msgstr "Nombre de canals"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:90
++#: ../gdk-pixbuf/gdk-pixbuf.c:90
+ msgid "The number of samples per pixel"
+ msgstr "El nombre de mostres per píxel"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:99
++#: ../gdk-pixbuf/gdk-pixbuf.c:99
+ msgid "Colorspace"
+ msgstr "Espai de color"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:100
++#: ../gdk-pixbuf/gdk-pixbuf.c:100
+ msgid "The colorspace in which the samples are interpreted"
+ msgstr "L'espai de color en el qual s'interpreten les mostres"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:108
++#: ../gdk-pixbuf/gdk-pixbuf.c:108
+ msgid "Has Alpha"
+ msgstr "Té transparència"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:109
++#: ../gdk-pixbuf/gdk-pixbuf.c:109
+ msgid "Whether the pixbuf has an alpha channel"
+ msgstr "Si la memòria de píxels té canal de transparència"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:122
++#: ../gdk-pixbuf/gdk-pixbuf.c:122
+ msgid "Bits per Sample"
+ msgstr "Bits per mostra"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:123
++#: ../gdk-pixbuf/gdk-pixbuf.c:123
+ msgid "The number of bits per sample"
+ msgstr "El nombre de bits per mostra"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:132 gtk/gtklayout.c:632 gtk/gtktreeviewcolumn.c:207
++#: ../gdk-pixbuf/gdk-pixbuf.c:132 ../gtk/gtklayout.c:632
++#: ../gtk/gtktreeviewcolumn.c:207
+ msgid "Width"
+ msgstr "Amplada"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:133
++#: ../gdk-pixbuf/gdk-pixbuf.c:133
+ msgid "The number of columns of the pixbuf"
+ msgstr "El nombre de columnes de la memòria de píxels"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:142 gtk/gtklayout.c:641
++#: ../gdk-pixbuf/gdk-pixbuf.c:142 ../gtk/gtklayout.c:641
+ msgid "Height"
+ msgstr "Alçada"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:143
++#: ../gdk-pixbuf/gdk-pixbuf.c:143
+ msgid "The number of rows of the pixbuf"
+ msgstr "El nombre de files de la memòria de píxels"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:159
++#: ../gdk-pixbuf/gdk-pixbuf.c:159
+ msgid "Rowstride"
+ msgstr "Espai entre files"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:160
++#: ../gdk-pixbuf/gdk-pixbuf.c:160
+ msgid ""
+ "The number of bytes between the start of a row and the start of the next row"
+ msgstr "El nombre de bytes entre l'inici d'una fila i l'inici de la següent"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:169
++#: ../gdk-pixbuf/gdk-pixbuf.c:169
+ msgid "Pixels"
+ msgstr "Píxels"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:170
++#: ../gdk-pixbuf/gdk-pixbuf.c:170
+ msgid "A pointer to the pixel data of the pixbuf"
+ msgstr "Un punter a les dades de píxels de la memòria de píxels"
+
+-#: gdk/gdkdisplaymanager.c:103
++#: ../gdk/gdkdisplaymanager.c:103
+ msgid "Default Display"
+ msgstr "Visualització per defecte"
+
+-#: gdk/gdkdisplaymanager.c:104
++#: ../gdk/gdkdisplaymanager.c:104
+ msgid "The default display for GDK"
+ msgstr "La visualització per defecte per al GDK"
+
+-#: gdk/gdkpango.c:490 gtk/gtkinvisible.c:86 gtk/gtkmountoperation.c:176
+-#: gtk/gtkstatusicon.c:253 gtk/gtkwindow.c:600
++#: ../gdk/gdkpango.c:490 ../gtk/gtkinvisible.c:86
++#: ../gtk/gtkmountoperation.c:176 ../gtk/gtkstatusicon.c:253
++#: ../gtk/gtkwindow.c:600
+ msgid "Screen"
+ msgstr "Pantalla"
+
+-#: gdk/gdkpango.c:491
++#: ../gdk/gdkpango.c:491
+ msgid "the GdkScreen for the renderer"
+ msgstr "el GdkScreen per al representador"
+
+-#: gdk/gdkscreen.c:75
++#: ../gdk/gdkscreen.c:75
+ msgid "Font options"
+ msgstr "Opcions del tipus de lletra"
+
+-#: gdk/gdkscreen.c:76
++#: ../gdk/gdkscreen.c:76
+ msgid "The default font options for the screen"
+ msgstr "Les opcions per defecte del tipus de lletra per a la pantalla"
+
+-#: gdk/gdkscreen.c:83
++#: ../gdk/gdkscreen.c:83
+ msgid "Font resolution"
+ msgstr "Resolució del tipus de lletra"
+
+-#: gdk/gdkscreen.c:84
++#: ../gdk/gdkscreen.c:84
+ msgid "The resolution for fonts on the screen"
+ msgstr "La resolució del tipus de lletra a la pantalla"
+
+-#: gtk/gtkaboutdialog.c:200
++#: ../gtk/gtkaboutdialog.c:200
+ msgid "Program name"
+ msgstr "Nom del programa"
+
+-#: gtk/gtkaboutdialog.c:201
++#: ../gtk/gtkaboutdialog.c:201
+ msgid ""
+ "The name of the program. If this is not set, it defaults to "
+ "g_get_application_name()"
+@@ -144,43 +146,43 @@
+ "El nom del programa. Si no està definit, per defecte serà el valor de "
+ "g_get_application_name()"
+
+-#: gtk/gtkaboutdialog.c:215
++#: ../gtk/gtkaboutdialog.c:215
+ msgid "Program version"
+ msgstr "Versió del programa"
+
+-#: gtk/gtkaboutdialog.c:216
++#: ../gtk/gtkaboutdialog.c:216
+ msgid "The version of the program"
+ msgstr "La versió del programa"
+
+-#: gtk/gtkaboutdialog.c:230
++#: ../gtk/gtkaboutdialog.c:230
+ msgid "Copyright string"
+ msgstr "Cadena del copyright"
+
+-#: gtk/gtkaboutdialog.c:231
++#: ../gtk/gtkaboutdialog.c:231
+ msgid "Copyright information for the program"
+ msgstr "Informació de copyright per al programa"
+
+-#: gtk/gtkaboutdialog.c:248
++#: ../gtk/gtkaboutdialog.c:248
+ msgid "Comments string"
+ msgstr "Cadena de comentaris"
+
+-#: gtk/gtkaboutdialog.c:249
++#: ../gtk/gtkaboutdialog.c:249
+ msgid "Comments about the program"
+ msgstr "Comentaris quant al vostre programa"
+
+-#: gtk/gtkaboutdialog.c:283
++#: ../gtk/gtkaboutdialog.c:283
+ msgid "Website URL"
+ msgstr "URL del lloc web"
+
+-#: gtk/gtkaboutdialog.c:284
++#: ../gtk/gtkaboutdialog.c:284
+ msgid "The URL for the link to the website of the program"
+ msgstr "La URL per a l'enllaç al lloc web del programa"
+
+-#: gtk/gtkaboutdialog.c:300
++#: ../gtk/gtkaboutdialog.c:300
+ msgid "Website label"
+ msgstr "Etiqueta del lloc web"
+
+-#: gtk/gtkaboutdialog.c:301
++#: ../gtk/gtkaboutdialog.c:301
+ msgid ""
+ "The label for the link to the website of the program. If this is not set, it "
+ "defaults to the URL"
+@@ -188,44 +190,44 @@
+ "L'etiqueta per a l'enllaç al lloc web del programa. Si no està definida, "
+ "s'usa el valor de la URL"
+
+-#: gtk/gtkaboutdialog.c:317
++#: ../gtk/gtkaboutdialog.c:317
+ msgid "Authors"
+ msgstr "Autors"
+
+-#: gtk/gtkaboutdialog.c:318
++#: ../gtk/gtkaboutdialog.c:318
+ msgid "List of authors of the program"
+ msgstr "Llista d'autors del programa"
+
+-#: gtk/gtkaboutdialog.c:334
++#: ../gtk/gtkaboutdialog.c:334
+ msgid "Documenters"
+ msgstr "Documentadors"
+
+-#: gtk/gtkaboutdialog.c:335
++#: ../gtk/gtkaboutdialog.c:335
+ msgid "List of people documenting the program"
+ msgstr "Llista de gent que documenta el programa"
+
+-#: gtk/gtkaboutdialog.c:351
++#: ../gtk/gtkaboutdialog.c:351
+ msgid "Artists"
+ msgstr "Artistes"
+
+-#: gtk/gtkaboutdialog.c:352
++#: ../gtk/gtkaboutdialog.c:352
+ msgid "List of people who have contributed artwork to the program"
+ msgstr "Llista de gent que ha contribuït amb imatges al programa"
+
+-#: gtk/gtkaboutdialog.c:369
++#: ../gtk/gtkaboutdialog.c:369
+ msgid "Translator credits"
+ msgstr "Traductors"
+
+-#: gtk/gtkaboutdialog.c:370
++#: ../gtk/gtkaboutdialog.c:370
+ msgid ""
+ "Credits to the translators. This string should be marked as translatable"
+ msgstr "El nom dels traductors. Aquesta cadena s'ha de marcar com a traduïble"
+
+-#: gtk/gtkaboutdialog.c:385
++#: ../gtk/gtkaboutdialog.c:385
+ msgid "Logo"
+ msgstr "Logotip"
+
+-#: gtk/gtkaboutdialog.c:386
++#: ../gtk/gtkaboutdialog.c:386
+ msgid ""
+ "A logo for the about box. If this is not set, it defaults to "
+ "gtk_window_get_default_icon_list()"
+@@ -233,97 +235,98 @@
+ "Un logotip per a la caixa d'informació de l'aplicació. Si no està definit, "
+ "es fa servir el valor de gtk_window_get_default_icon_list()"
+
+-#: gtk/gtkaboutdialog.c:401
++#: ../gtk/gtkaboutdialog.c:401
+ msgid "Logo Icon Name"
+ msgstr "Nom de la icona del logotip"
+
+-#: gtk/gtkaboutdialog.c:402
++#: ../gtk/gtkaboutdialog.c:402
+ msgid "A named icon to use as the logo for the about box."
+ msgstr "Una icona amb nom per a emprar com a logotip a la caixa d'informació"
+
+-#: gtk/gtkaboutdialog.c:415
++#: ../gtk/gtkaboutdialog.c:415
+ msgid "Wrap license"
+ msgstr "Ajusta la llicència"
+
+-#: gtk/gtkaboutdialog.c:416
++#: ../gtk/gtkaboutdialog.c:416
+ msgid "Whether to wrap the license text."
+ msgstr "Si s'han d'ajustar els finals de línia del text de la llicència"
+
+-#: gtk/gtkaccellabel.c:129
++#: ../gtk/gtkaccellabel.c:129
+ msgid "Accelerator Closure"
+ msgstr "Tancament de drecera"
+
+-#: gtk/gtkaccellabel.c:130
++#: ../gtk/gtkaccellabel.c:130
+ msgid "The closure to be monitored for accelerator changes"
+ msgstr "El tancament a monitoritzar per a canvis de drecera"
+
+-#: gtk/gtkaccellabel.c:136
++#: ../gtk/gtkaccellabel.c:136
+ msgid "Accelerator Widget"
+ msgstr "Element d'interfície accelerador"
+
+-#: gtk/gtkaccellabel.c:137
++#: ../gtk/gtkaccellabel.c:137
+ msgid "The widget to be monitored for accelerator changes"
+ msgstr "L'element d'interfície a monitoritzar per a canvis en l'accelerador"
+
+-#: gtk/gtkaction.c:199 gtk/gtkactiongroup.c:170 gtk/gtkprinter.c:123
+-#: gtk/gtktextmark.c:89
++#: ../gtk/gtkaction.c:199 ../gtk/gtkactiongroup.c:170 ../gtk/gtkprinter.c:123
++#: ../gtk/gtktextmark.c:89
+ msgid "Name"
+ msgstr "Nom"
+
+-#: gtk/gtkaction.c:200
++#: ../gtk/gtkaction.c:200
+ msgid "A unique name for the action."
+ msgstr "Un nom únic per a una acció."
+
+-#: gtk/gtkaction.c:215 gtk/gtkbutton.c:199 gtk/gtkexpander.c:195
+-#: gtk/gtkframe.c:105 gtk/gtklabel.c:316 gtk/gtktoolbutton.c:180
++#: ../gtk/gtkaction.c:215 ../gtk/gtkbutton.c:199 ../gtk/gtkexpander.c:195
++#: ../gtk/gtkframe.c:105 ../gtk/gtklabel.c:316 ../gtk/gtktoolbutton.c:180
+ msgid "Label"
+ msgstr "Etiqueta"
+
+-#: gtk/gtkaction.c:216
++#: ../gtk/gtkaction.c:216
+ msgid "The label used for menu items and buttons that activate this action."
+ msgstr ""
+ "L'etiqueta usada per als elements de menú i els botons que activen aquesta "
+ "acció."
+
+-#: gtk/gtkaction.c:223
++#: ../gtk/gtkaction.c:223
+ msgid "Short label"
+ msgstr "Etiqueta breu"
+
+-#: gtk/gtkaction.c:224
++#: ../gtk/gtkaction.c:224
+ msgid "A shorter label that may be used on toolbar buttons."
+ msgstr "Una etiqueta més breu que pot ser usada en botons de la barra d'eines."
+
+-#: gtk/gtkaction.c:230
++#: ../gtk/gtkaction.c:230
+ msgid "Tooltip"
+ msgstr "Indicador de funció"
+
+-#: gtk/gtkaction.c:231
++#: ../gtk/gtkaction.c:231
+ msgid "A tooltip for this action."
+ msgstr "Indicador de funció per a aquesta acció."
+
+-#: gtk/gtkaction.c:237
++#: ../gtk/gtkaction.c:237
+ msgid "Stock Icon"
+ msgstr "Icona"
+
+-#: gtk/gtkaction.c:238
++#: ../gtk/gtkaction.c:238
+ msgid "The stock icon displayed in widgets representing this action."
+ msgstr "La icona mostrada en els controls que representen aquesta acció."
+
+-#: gtk/gtkaction.c:255 gtk/gtkcellrendererpixbuf.c:171 gtk/gtkimage.c:230
+-#: gtk/gtkprinter.c:172 gtk/gtkstatusicon.c:210 gtk/gtkwindow.c:592
++#: ../gtk/gtkaction.c:255 ../gtk/gtkcellrendererpixbuf.c:171
++#: ../gtk/gtkimage.c:230 ../gtk/gtkprinter.c:172 ../gtk/gtkstatusicon.c:210
++#: ../gtk/gtkwindow.c:592
+ msgid "Icon Name"
+ msgstr "Nom de la icona"
+
+-#: gtk/gtkaction.c:256 gtk/gtkcellrendererpixbuf.c:172 gtk/gtkimage.c:231
+-#: gtk/gtkstatusicon.c:211
++#: ../gtk/gtkaction.c:256 ../gtk/gtkcellrendererpixbuf.c:172
++#: ../gtk/gtkimage.c:231 ../gtk/gtkstatusicon.c:211
+ msgid "The name of the icon from the icon theme"
+ msgstr "El nom de la icona del tema d'icones"
+
+-#: gtk/gtkaction.c:262 gtk/gtktoolitem.c:156
++#: ../gtk/gtkaction.c:262 ../gtk/gtktoolitem.c:156
+ msgid "Visible when horizontal"
+ msgstr "Visible en horitzontal"
+
+-#: gtk/gtkaction.c:263 gtk/gtktoolitem.c:157
++#: ../gtk/gtkaction.c:263 ../gtk/gtktoolitem.c:157
+ msgid ""
+ "Whether the toolbar item is visible when the toolbar is in a horizontal "
+ "orientation."
+@@ -331,11 +334,11 @@
+ "Si l'element de la barra d'eines és visible quan la barra d'eines està "
+ "orientada horitzontalment."
+
+-#: gtk/gtkaction.c:278
++#: ../gtk/gtkaction.c:278
+ msgid "Visible when overflown"
+ msgstr "Visible en sobreeiximent"
+
+-#: gtk/gtkaction.c:279
++#: ../gtk/gtkaction.c:279
+ msgid ""
+ "When TRUE, toolitem proxies for this action are represented in the toolbar "
+ "overflow menu."
+@@ -343,11 +346,11 @@
+ "Quan sigui CERT, els apoderats d'elements d'eina per a aquesta acció es "
+ "representaran en el menú sobreeixit de la barra d'eines."
+
+-#: gtk/gtkaction.c:286 gtk/gtktoolitem.c:163
++#: ../gtk/gtkaction.c:286 ../gtk/gtktoolitem.c:163
+ msgid "Visible when vertical"
+ msgstr "Visible en vertical"
+
+-#: gtk/gtkaction.c:287 gtk/gtktoolitem.c:164
++#: ../gtk/gtkaction.c:287 ../gtk/gtktoolitem.c:164
+ msgid ""
+ "Whether the toolbar item is visible when the toolbar is in a vertical "
+ "orientation."
+@@ -355,11 +358,11 @@
+ "Si l'element de la barra d'eines és visible quan la barra d'eines està "
+ "orientada horitzontalment."
+
+-#: gtk/gtkaction.c:294 gtk/gtktoolitem.c:170
++#: ../gtk/gtkaction.c:294 ../gtk/gtktoolitem.c:170
+ msgid "Is important"
+ msgstr "És important"
+
+-#: gtk/gtkaction.c:295
++#: ../gtk/gtkaction.c:295
+ msgid ""
+ "Whether the action is considered important. When TRUE, toolitem proxies for "
+ "this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
+@@ -368,110 +371,111 @@
+ "elements d'eina per a aquesta acció mostraran el text en mode "
+ "GTK_TOOLBAR_BOTH_HORIZ."
+
+-#: gtk/gtkaction.c:303
++#: ../gtk/gtkaction.c:303
+ msgid "Hide if empty"
+ msgstr "Amaga si és buit"
+
+-#: gtk/gtkaction.c:304
++#: ../gtk/gtkaction.c:304
+ msgid "When TRUE, empty menu proxies for this action are hidden."
+ msgstr ""
+ "Quan sigui CERT, els apoderats de menú per a aquesta acció estaran amagats."
+
+-#: gtk/gtkaction.c:310 gtk/gtkactiongroup.c:177 gtk/gtkcellrenderer.c:193
+-#: gtk/gtkwidget.c:523
++#: ../gtk/gtkaction.c:310 ../gtk/gtkactiongroup.c:177
++#: ../gtk/gtkcellrenderer.c:193 ../gtk/gtkwidget.c:523
+ msgid "Sensitive"
+ msgstr "Sensible"
+
+-#: gtk/gtkaction.c:311
++#: ../gtk/gtkaction.c:311
+ msgid "Whether the action is enabled."
+ msgstr "Si l'acció està habilitada."
+
+-#: gtk/gtkaction.c:317 gtk/gtkactiongroup.c:184 gtk/gtkstatusicon.c:269
+-#: gtk/gtktreeviewcolumn.c:191 gtk/gtkwidget.c:516
++#: ../gtk/gtkaction.c:317 ../gtk/gtkactiongroup.c:184
++#: ../gtk/gtkstatusicon.c:269 ../gtk/gtktreeviewcolumn.c:191
++#: ../gtk/gtkwidget.c:516
+ msgid "Visible"
+ msgstr "Visible"
+
+-#: gtk/gtkaction.c:318
++#: ../gtk/gtkaction.c:318
+ msgid "Whether the action is visible."
+ msgstr "Si l'acció és visible"
+
+-#: gtk/gtkaction.c:324
++#: ../gtk/gtkaction.c:324
+ msgid "Action Group"
+ msgstr "Grup de l'acció"
+
+-#: gtk/gtkaction.c:325
++#: ../gtk/gtkaction.c:325
+ msgid ""
+ "The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
+ "use)."
+ msgstr ""
+ "El GtkActionGroup associat amb aquesta GtkAction, o NULL (per a ús intern)."
+
+-#: gtk/gtkactiongroup.c:171
++#: ../gtk/gtkactiongroup.c:171
+ msgid "A name for the action group."
+ msgstr "Un nom per al grup d'acció."
+
+-#: gtk/gtkactiongroup.c:178
++#: ../gtk/gtkactiongroup.c:178
+ msgid "Whether the action group is enabled."
+ msgstr "Si el grup d'acció és habilitat."
+
+-#: gtk/gtkactiongroup.c:185
++#: ../gtk/gtkactiongroup.c:185
+ msgid "Whether the action group is visible."
+ msgstr "Si el grup d'acció és visible"
+
+-#: gtk/gtkadjustment.c:93 gtk/gtkcellrendererprogress.c:128
+-#: gtk/gtkscalebutton.c:202 gtk/gtkspinbutton.c:269
++#: ../gtk/gtkadjustment.c:93 ../gtk/gtkcellrendererprogress.c:128
++#: ../gtk/gtkscalebutton.c:202 ../gtk/gtkspinbutton.c:269
+ msgid "Value"
+ msgstr "Valor"
+
+-#: gtk/gtkadjustment.c:94
++#: ../gtk/gtkadjustment.c:94
+ msgid "The value of the adjustment"
+ msgstr "El valor de l'ajustament"
+
+-#: gtk/gtkadjustment.c:110
++#: ../gtk/gtkadjustment.c:110
+ msgid "Minimum Value"
+ msgstr "Valor mínim"
+
+-#: gtk/gtkadjustment.c:111
++#: ../gtk/gtkadjustment.c:111
+ msgid "The minimum value of the adjustment"
+ msgstr "El valor mínim de l'ajustament"
+
+-#: gtk/gtkadjustment.c:130
++#: ../gtk/gtkadjustment.c:130
+ msgid "Maximum Value"
+ msgstr "Valor màxim"
+
+-#: gtk/gtkadjustment.c:131
++#: ../gtk/gtkadjustment.c:131
+ msgid "The maximum value of the adjustment"
+ msgstr "El valor màxim de l'ajustament"
+
+-#: gtk/gtkadjustment.c:147
++#: ../gtk/gtkadjustment.c:147
+ msgid "Step Increment"
+ msgstr "Increment d'un pas"
+
+-#: gtk/gtkadjustment.c:148
++#: ../gtk/gtkadjustment.c:148
+ msgid "The step increment of the adjustment"
+ msgstr "L'increment de pas de l'ajustament"
+
+-#: gtk/gtkadjustment.c:164
++#: ../gtk/gtkadjustment.c:164
+ msgid "Page Increment"
+ msgstr "Increment de pàgina"
+
+-#: gtk/gtkadjustment.c:165
++#: ../gtk/gtkadjustment.c:165
+ msgid "The page increment of the adjustment"
+ msgstr "L'increment de pàgina de l'ajustament"
+
+-#: gtk/gtkadjustment.c:184
++#: ../gtk/gtkadjustment.c:184
+ msgid "Page Size"
+ msgstr "Mida de pàgina"
+
+-#: gtk/gtkadjustment.c:185
++#: ../gtk/gtkadjustment.c:185
+ msgid "The page size of the adjustment"
+ msgstr "La mida de pàgina de l'ajustament"
+
+-#: gtk/gtkalignment.c:90
++#: ../gtk/gtkalignment.c:90
+ msgid "Horizontal alignment"
+ msgstr "Alineació horitzontal"
+
+-#: gtk/gtkalignment.c:91 gtk/gtkbutton.c:250
++#: ../gtk/gtkalignment.c:91 ../gtk/gtkbutton.c:250
+ msgid ""
+ "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
+ "right aligned"
+@@ -479,11 +483,11 @@
+ "Posició vertical del fill en l'espai disponible. 0.0 s'alinea a l'esquerra, "
+ "1.0 s'alinea a la dreta"
+
+-#: gtk/gtkalignment.c:100
++#: ../gtk/gtkalignment.c:100
+ msgid "Vertical alignment"
+ msgstr "Alineació vertical"
+
+-#: gtk/gtkalignment.c:101 gtk/gtkbutton.c:269
++#: ../gtk/gtkalignment.c:101 ../gtk/gtkbutton.c:269
+ msgid ""
+ "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
+ "bottom aligned"
+@@ -491,11 +495,11 @@
+ "Posició vertical del fill en espai disponible. 0.0 s'alinea a dalt, 1.0 "
+ "s'alinea a baix"
+
+-#: gtk/gtkalignment.c:109
++#: ../gtk/gtkalignment.c:109
+ msgid "Horizontal scale"
+ msgstr "Escala horitzontal"
+
+-#: gtk/gtkalignment.c:110
++#: ../gtk/gtkalignment.c:110
+ msgid ""
+ "If available horizontal space is bigger than needed for the child, how much "
+ "of it to use for the child. 0.0 means none, 1.0 means all"
+@@ -503,11 +507,11 @@
+ "Si l'espai horitzontal disponible és més gran que el necessari per al fill, "
+ "quant se n'ha d'utilitzar per al fill. 0.0 vol dir res, 1.0 vol dir tot"
+
+-#: gtk/gtkalignment.c:118
++#: ../gtk/gtkalignment.c:118
+ msgid "Vertical scale"
+ msgstr "Escala vertical"
+
+-#: gtk/gtkalignment.c:119
++#: ../gtk/gtkalignment.c:119
+ msgid ""
+ "If available vertical space is bigger than needed for the child, how much of "
+ "it to use for the child. 0.0 means none, 1.0 means all"
+@@ -515,187 +519,187 @@
+ "Si l'espai vertical disponible és més gran que el necessari per al fill, "
+ "quant se n'ha d'utilitzar per al fill. 0.0 vol dir res, 1.0 vol dir tot"
+
+-#: gtk/gtkalignment.c:136
++#: ../gtk/gtkalignment.c:136
+ msgid "Top Padding"
+ msgstr "Farciment superior"
+
+-#: gtk/gtkalignment.c:137
++#: ../gtk/gtkalignment.c:137
+ msgid "The padding to insert at the top of the widget."
+ msgstr "El farciment superior per a inserir a l'element d'interfície."
+
+-#: gtk/gtkalignment.c:153
++#: ../gtk/gtkalignment.c:153
+ msgid "Bottom Padding"
+ msgstr "Farciment inferior"
+
+-#: gtk/gtkalignment.c:154
++#: ../gtk/gtkalignment.c:154
+ msgid "The padding to insert at the bottom of the widget."
+ msgstr "El farciment inferior per a inserir a l'element d'interfície."
+
+-#: gtk/gtkalignment.c:170
++#: ../gtk/gtkalignment.c:170
+ msgid "Left Padding"
+ msgstr "Farciment esquerre"
+
+-#: gtk/gtkalignment.c:171
++#: ../gtk/gtkalignment.c:171
+ msgid "The padding to insert at the left of the widget."
+ msgstr "El farciment esquerre per a inserir a l'element d'interfície."
+
+-#: gtk/gtkalignment.c:187
++#: ../gtk/gtkalignment.c:187
+ msgid "Right Padding"
+ msgstr "Farciment dret"
+
+-#: gtk/gtkalignment.c:188
++#: ../gtk/gtkalignment.c:188
+ msgid "The padding to insert at the right of the widget."
+ msgstr "El farciment dret per a inserir a l'element d'interfície."
+
+-#: gtk/gtkarrow.c:75
++#: ../gtk/gtkarrow.c:75
+ msgid "Arrow direction"
+ msgstr "Direcció de la fletxa"
+
+-#: gtk/gtkarrow.c:76
++#: ../gtk/gtkarrow.c:76
+ msgid "The direction the arrow should point"
+ msgstr "La direcció a la que la fletxa ha d'apuntar"
+
+-#: gtk/gtkarrow.c:84
++#: ../gtk/gtkarrow.c:84
+ msgid "Arrow shadow"
+ msgstr "Ombra de la fletxa"
+
+-#: gtk/gtkarrow.c:85
++#: ../gtk/gtkarrow.c:85
+ msgid "Appearance of the shadow surrounding the arrow"
+ msgstr "Aparença de l'ombra que envolta la fletxa"
+
+-#: gtk/gtkarrow.c:92 gtk/gtkmenuitem.c:276
++#: ../gtk/gtkarrow.c:92 ../gtk/gtkmenuitem.c:276
+ msgid "Arrow Scaling"
+ msgstr "Escalat de la fletxa"
+
+-#: gtk/gtkarrow.c:93
++#: ../gtk/gtkarrow.c:93
+ msgid "Amount of space used up by arrow"
+ msgstr "Quantitat d'espai que ocupa la fletxa"
+
+-#: gtk/gtkaspectframe.c:79
++#: ../gtk/gtkaspectframe.c:79
+ msgid "Horizontal Alignment"
+ msgstr "Alineació horitzontal"
+
+-#: gtk/gtkaspectframe.c:80
++#: ../gtk/gtkaspectframe.c:80
+ msgid "X alignment of the child"
+ msgstr "Alineació X del fill"
+
+-#: gtk/gtkaspectframe.c:86
++#: ../gtk/gtkaspectframe.c:86
+ msgid "Vertical Alignment"
+ msgstr "Alineació vertical"
+
+-#: gtk/gtkaspectframe.c:87
++#: ../gtk/gtkaspectframe.c:87
+ msgid "Y alignment of the child"
+ msgstr "Alineació Y del fill"
+
+-#: gtk/gtkaspectframe.c:93
++#: ../gtk/gtkaspectframe.c:93
+ msgid "Ratio"
+ msgstr "Proporció"
+
+-#: gtk/gtkaspectframe.c:94
++#: ../gtk/gtkaspectframe.c:94
+ msgid "Aspect ratio if obey_child is FALSE"
+ msgstr "Proporció si obey_child és FALS"
+
+-#: gtk/gtkaspectframe.c:100
++#: ../gtk/gtkaspectframe.c:100
+ msgid "Obey child"
+ msgstr "Obeeix el fill"
+
+-#: gtk/gtkaspectframe.c:101
++#: ../gtk/gtkaspectframe.c:101
+ msgid "Force aspect ratio to match that of the frame's child"
+ msgstr "Força la proporció perquè coincideixi amb la forma del fill"
+
+-#: gtk/gtkassistant.c:261
++#: ../gtk/gtkassistant.c:261
+ msgid "Header Padding"
+ msgstr "Farciment de la capçalera"
+
+-#: gtk/gtkassistant.c:262
++#: ../gtk/gtkassistant.c:262
+ msgid "Number of pixels around the header."
+ msgstr "Nombre de píxels al voltant de la capçalera."
+
+-#: gtk/gtkassistant.c:269
++#: ../gtk/gtkassistant.c:269
+ msgid "Content Padding"
+ msgstr "Farciment del contingut"
+
+-#: gtk/gtkassistant.c:270
++#: ../gtk/gtkassistant.c:270
+ msgid "Number of pixels around the content pages."
+ msgstr "Nombre de píxels al voltant de les pàgines de contingut."
+
+-#: gtk/gtkassistant.c:286
++#: ../gtk/gtkassistant.c:286
+ msgid "Page type"
+ msgstr "Tipus de pàgina"
+
+-#: gtk/gtkassistant.c:287
++#: ../gtk/gtkassistant.c:287
+ msgid "The type of the assistant page"
+ msgstr "Tipus de pàgina de l'auxiliar"
+
+-#: gtk/gtkassistant.c:304
++#: ../gtk/gtkassistant.c:304
+ msgid "Page title"
+ msgstr "Títol de la pàgina"
+
+-#: gtk/gtkassistant.c:305
++#: ../gtk/gtkassistant.c:305
+ msgid "The title of the assistant page"
+ msgstr "El títol de la pàgina de l'auxiliar"
+
+-#: gtk/gtkassistant.c:321
++#: ../gtk/gtkassistant.c:321
+ msgid "Header image"
+ msgstr "Imatge de la capçalera"
+
+-#: gtk/gtkassistant.c:322
++#: ../gtk/gtkassistant.c:322
+ msgid "Header image for the assistant page"
+ msgstr "Imatge de la capçalera de la pàgina de l'auxiliar"
+
+-#: gtk/gtkassistant.c:338
++#: ../gtk/gtkassistant.c:338
+ msgid "Sidebar image"
+ msgstr "Imatge de la barra lateral"
+
+-#: gtk/gtkassistant.c:339
++#: ../gtk/gtkassistant.c:339
+ msgid "Sidebar image for the assistant page"
+ msgstr "Imatge de la barra lateral de la pàgina de l'auxiliar"
+
+-#: gtk/gtkassistant.c:354
++#: ../gtk/gtkassistant.c:354
+ msgid "Page complete"
+ msgstr "Pàgina completa"
+
+-#: gtk/gtkassistant.c:355
++#: ../gtk/gtkassistant.c:355
+ msgid "Whether all required fields on the page have been filled out"
+ msgstr "Si s'han emplenat tots els camps requerits de la pàgina"
+
+-#: gtk/gtkbbox.c:91
++#: ../gtk/gtkbbox.c:91
+ msgid "Minimum child width"
+ msgstr "Amplada mínima del fill"
+
+-#: gtk/gtkbbox.c:92
++#: ../gtk/gtkbbox.c:92
+ msgid "Minimum width of buttons inside the box"
+ msgstr "Amplada mínima dels botons dins la caixa"
+
+-#: gtk/gtkbbox.c:100
++#: ../gtk/gtkbbox.c:100
+ msgid "Minimum child height"
+ msgstr "Alçada mínima del fill"
+
+-#: gtk/gtkbbox.c:101
++#: ../gtk/gtkbbox.c:101
+ msgid "Minimum height of buttons inside the box"
+ msgstr "Alçada mínima dels botons dins la caixa"
+
+-#: gtk/gtkbbox.c:109
++#: ../gtk/gtkbbox.c:109
+ msgid "Child internal width padding"
+ msgstr "Farciment d'amplada interna del fill"
+
+-#: gtk/gtkbbox.c:110
++#: ../gtk/gtkbbox.c:110
+ msgid "Amount to increase child's size on either side"
+ msgstr "Quantitat en que s'incrementa la mida del fill a cada costat"
+
+-#: gtk/gtkbbox.c:118
++#: ../gtk/gtkbbox.c:118
+ msgid "Child internal height padding"
+ msgstr "Farciment d'alçada interna del fill"
+
+-#: gtk/gtkbbox.c:119
++#: ../gtk/gtkbbox.c:119
+ msgid "Amount to increase child's size on the top and bottom"
+ msgstr "Quantitat en què s'incrementa la mida del fill per dalt i per baix"
+
+-#: gtk/gtkbbox.c:127
++#: ../gtk/gtkbbox.c:127
+ msgid "Layout style"
+ msgstr "Estil de la disposició"
+
+-#: gtk/gtkbbox.c:128
++#: ../gtk/gtkbbox.c:128
+ msgid ""
+ "How to layout the buttons in the box. Possible values are default, spread, "
+ "edge, start and end"
+@@ -703,11 +707,11 @@
+ "Com disposar els botons a la caixa. Els valors possibles són predeterminats, "
+ "escampats, cantonada, inici i final"
+
+-#: gtk/gtkbbox.c:136
++#: ../gtk/gtkbbox.c:136
+ msgid "Secondary"
+ msgstr "Secundari"
+
+-#: gtk/gtkbbox.c:137
++#: ../gtk/gtkbbox.c:137
+ msgid ""
+ "If TRUE, the child appears in a secondary group of children, suitable for, e."
+ "g., help buttons"
+@@ -715,38 +719,38 @@
+ "Si és CERT, el fill apareixerà en un grup secundari de fills, adequat, p.e., "
+ "per als botons d'ajuda"
+
+-#: gtk/gtkbox.c:98 gtk/gtkexpander.c:219 gtk/gtkiconview.c:666
+-#: gtk/gtktreeviewcolumn.c:216
++#: ../gtk/gtkbox.c:98 ../gtk/gtkexpander.c:219 ../gtk/gtkiconview.c:666
++#: ../gtk/gtktreeviewcolumn.c:216
+ msgid "Spacing"
+ msgstr "Espaiament"
+
+-#: gtk/gtkbox.c:99
++#: ../gtk/gtkbox.c:99
+ msgid "The amount of space between children"
+ msgstr "La quantitat d'espai entre fills"
+
+-#: gtk/gtkbox.c:108 gtk/gtknotebook.c:649 gtk/gtktable.c:165
+-#: gtk/gtktoolbar.c:580
++#: ../gtk/gtkbox.c:108 ../gtk/gtknotebook.c:649 ../gtk/gtktable.c:165
++#: ../gtk/gtktoolbar.c:580
+ msgid "Homogeneous"
+ msgstr "Homogeni"
+
+-#: gtk/gtkbox.c:109
++#: ../gtk/gtkbox.c:109
+ msgid "Whether the children should all be the same size"
+ msgstr "Si tots els fills han de tenir la mateixa mida"
+
+-#: gtk/gtkbox.c:116 gtk/gtkpreview.c:101 gtk/gtktoolbar.c:572
+-#: gtk/gtktreeviewcolumn.c:272
++#: ../gtk/gtkbox.c:116 ../gtk/gtkpreview.c:101 ../gtk/gtktoolbar.c:572
++#: ../gtk/gtktreeviewcolumn.c:272
+ msgid "Expand"
+ msgstr "Expandeix"
+
+-#: gtk/gtkbox.c:117
++#: ../gtk/gtkbox.c:117
+ msgid "Whether the child should receive extra space when the parent grows"
+ msgstr "Si el fill ha de rebre espai addicional quan el pare creixi"
+
+-#: gtk/gtkbox.c:123
++#: ../gtk/gtkbox.c:123
+ msgid "Fill"
+ msgstr "Omple"
+
+-#: gtk/gtkbox.c:124
++#: ../gtk/gtkbox.c:124
+ msgid ""
+ "Whether extra space given to the child should be allocated to the child or "
+ "used as padding"
+@@ -754,19 +758,19 @@
+ "Si l'espai addicional del fill s'ha d'assignar al fill o s'ha d'utilitzar "
+ "com a separació"
+
+-#: gtk/gtkbox.c:130
++#: ../gtk/gtkbox.c:130
+ msgid "Padding"
+ msgstr "Separació"
+
+-#: gtk/gtkbox.c:131
++#: ../gtk/gtkbox.c:131
+ msgid "Extra space to put between the child and its neighbors, in pixels"
+ msgstr "Espai addicional per posar entre el fill i els seus veïns, en píxels"
+
+-#: gtk/gtkbox.c:137
++#: ../gtk/gtkbox.c:137
+ msgid "Pack type"
+ msgstr "Tipus de paquet"
+
+-#: gtk/gtkbox.c:138 gtk/gtknotebook.c:716
++#: ../gtk/gtkbox.c:138 ../gtk/gtknotebook.c:716
+ msgid ""
+ "A GtkPackType indicating whether the child is packed with reference to the "
+ "start or end of the parent"
+@@ -774,35 +778,35 @@
+ "Un GtkPackType que indica si el fill s'empaqueta en referència a l'inici o "
+ "al final del pare"
+
+-#: gtk/gtkbox.c:144 gtk/gtknotebook.c:694 gtk/gtkpaned.c:218
+-#: gtk/gtkruler.c:110
++#: ../gtk/gtkbox.c:144 ../gtk/gtknotebook.c:694 ../gtk/gtkpaned.c:218
++#: ../gtk/gtkruler.c:110
+ msgid "Position"
+ msgstr "Posició"
+
+-#: gtk/gtkbox.c:145 gtk/gtknotebook.c:695
++#: ../gtk/gtkbox.c:145 ../gtk/gtknotebook.c:695
+ msgid "The index of the child in the parent"
+ msgstr "L'índex del fill en el pare"
+
+-#: gtk/gtkbuilder.c:96
++#: ../gtk/gtkbuilder.c:96
+ msgid "Translation Domain"
+ msgstr "Domini de la traducció"
+
+-#: gtk/gtkbuilder.c:97
++#: ../gtk/gtkbuilder.c:97
+ msgid "The translation domain used by gettext"
+ msgstr "El domini de la traducció que utilitzarà el gettext"
+
+-#: gtk/gtkbutton.c:200
++#: ../gtk/gtkbutton.c:200
+ msgid ""
+ "Text of the label widget inside the button, if the button contains a label "
+ "widget"
+ msgstr "Text de l'etiqueta dins del botó, si el botó conté una etiqueta"
+
+-#: gtk/gtkbutton.c:207 gtk/gtkexpander.c:203 gtk/gtklabel.c:337
+-#: gtk/gtktoolbutton.c:187
++#: ../gtk/gtkbutton.c:207 ../gtk/gtkexpander.c:203 ../gtk/gtklabel.c:337
++#: ../gtk/gtktoolbutton.c:187
+ msgid "Use underline"
+ msgstr "Utilitza subratllat"
+
+-#: gtk/gtkbutton.c:208 gtk/gtkexpander.c:204 gtk/gtklabel.c:338
++#: ../gtk/gtkbutton.c:208 ../gtk/gtkexpander.c:204 ../gtk/gtklabel.c:338
+ msgid ""
+ "If set, an underline in the text indicates the next character should be used "
+ "for the mnemonic accelerator key"
+@@ -810,70 +814,71 @@
+ "Si s'habilita, un subratllat en el text indica que el caràcter següent "
+ "s'hauria d'utilitzar per a la tecla de drecera"
+
+-#: gtk/gtkbutton.c:215
++#: ../gtk/gtkbutton.c:215
+ msgid "Use stock"
+ msgstr "Utilitzeu estoc"
+
+-#: gtk/gtkbutton.c:216
++#: ../gtk/gtkbutton.c:216
+ msgid ""
+ "If set, the label is used to pick a stock item instead of being displayed"
+ msgstr ""
+ "Si s'habilita, l'etiqueta s'utilitza per escollir un element de l'estoc en "
+ "lloc de ser mostrada"
+
+-#: gtk/gtkbutton.c:223 gtk/gtkcombobox.c:789 gtk/gtkfilechooserbutton.c:393
++#: ../gtk/gtkbutton.c:223 ../gtk/gtkcombobox.c:789
++#: ../gtk/gtkfilechooserbutton.c:393
+ msgid "Focus on click"
+ msgstr "Focus en clicar"
+
+-#: gtk/gtkbutton.c:224 gtk/gtkfilechooserbutton.c:394
++#: ../gtk/gtkbutton.c:224 ../gtk/gtkfilechooserbutton.c:394
+ msgid "Whether the button grabs focus when it is clicked with the mouse"
+ msgstr "Si el botó captura el focus quan s'hi fa clic amb el ratolí"
+
+-#: gtk/gtkbutton.c:231
++#: ../gtk/gtkbutton.c:231
+ msgid "Border relief"
+ msgstr "Relleu del cantó"
+
+-#: gtk/gtkbutton.c:232
++#: ../gtk/gtkbutton.c:232
+ msgid "The border relief style"
+ msgstr "L'estil de relleu del cantó"
+
+-#: gtk/gtkbutton.c:249
++#: ../gtk/gtkbutton.c:249
+ msgid "Horizontal alignment for child"
+ msgstr "Alineació horitzontal per al fill"
+
+-#: gtk/gtkbutton.c:268
++#: ../gtk/gtkbutton.c:268
+ msgid "Vertical alignment for child"
+ msgstr "Alineació vertical per al fill"
+
+-#: gtk/gtkbutton.c:285 gtk/gtkimagemenuitem.c:100
++#: ../gtk/gtkbutton.c:285 ../gtk/gtkimagemenuitem.c:100
+ msgid "Image widget"
+ msgstr "Element d'imatge"
+
+-#: gtk/gtkbutton.c:286
++#: ../gtk/gtkbutton.c:286
+ msgid "Child widget to appear next to the button text"
+ msgstr "Element d'interfície fill que apareix al costat del text del botó"
+
+-#: gtk/gtkbutton.c:300
++#: ../gtk/gtkbutton.c:300
+ msgid "Image position"
+ msgstr "Posició de la imatge"
+
+-#: gtk/gtkbutton.c:301
++#: ../gtk/gtkbutton.c:301
+ msgid "The position of the image relative to the text"
+ msgstr "Posició de la imatge relativa al text"
+
+-#: gtk/gtkbutton.c:410
++#: ../gtk/gtkbutton.c:410
+ msgid "Default Spacing"
+ msgstr "Espaiat per defecte"
+
+-#: gtk/gtkbutton.c:411
++#: ../gtk/gtkbutton.c:411
+ msgid "Extra space to add for CAN_DEFAULT buttons"
+ msgstr "Espai addicional per a afegir per als botons CAN_DEFAULT"
+
+-#: gtk/gtkbutton.c:417
++#: ../gtk/gtkbutton.c:417
+ msgid "Default Outside Spacing"
+ msgstr "Espaiat exterior per defecte"
+
+-#: gtk/gtkbutton.c:418
++#: ../gtk/gtkbutton.c:418
+ msgid ""
+ "Extra space to add for CAN_DEFAULT buttons that is always drawn outside the "
+ "border"
+@@ -881,33 +886,33 @@
+ "L'espai addicional a afegir per als botons definits com a CAN_DEFAULT, que "
+ "sempre es dibuixa fora del contorn"
+
+-#: gtk/gtkbutton.c:423
++#: ../gtk/gtkbutton.c:423
+ msgid "Child X Displacement"
+ msgstr "Desplaçament X del fill"
+
+-#: gtk/gtkbutton.c:424
++#: ../gtk/gtkbutton.c:424
+ msgid ""
+ "How far in the x direction to move the child when the button is depressed"
+ msgstr ""
+ "A quina distància s'ha de moure el fill en la direcció X quan s'alliberi el "
+ "botó"
+
+-#: gtk/gtkbutton.c:431
++#: ../gtk/gtkbutton.c:431
+ msgid "Child Y Displacement"
+ msgstr "Desplaçament Y del fill"
+
+-#: gtk/gtkbutton.c:432
++#: ../gtk/gtkbutton.c:432
+ msgid ""
+ "How far in the y direction to move the child when the button is depressed"
+ msgstr ""
+ "A quina distància s'ha de moure el fill en la direcció Y quan s'alliberi el "
+ "botó"
+
+-#: gtk/gtkbutton.c:448
++#: ../gtk/gtkbutton.c:448
+ msgid "Displace focus"
+ msgstr "Desplaça el focus"
+
+-#: gtk/gtkbutton.c:449
++#: ../gtk/gtkbutton.c:449
+ msgid ""
+ "Whether the child_displacement_x/_y properties should also affect the focus "
+ "rectangle"
+@@ -915,51 +920,51 @@
+ "Si les propietats de desplaçament dels fills també han d'afectar el "
+ "rectangle del focus"
+
+-#: gtk/gtkbutton.c:462 gtk/gtkentry.c:539 gtk/gtkentry.c:932
++#: ../gtk/gtkbutton.c:462 ../gtk/gtkentry.c:539 ../gtk/gtkentry.c:932
+ msgid "Inner Border"
+ msgstr "Vora interior"
+
+-#: gtk/gtkbutton.c:463
++#: ../gtk/gtkbutton.c:463
+ msgid "Border between button edges and child."
+ msgstr "Vora entre el cantó del botó i el fill."
+
+-#: gtk/gtkbutton.c:476
++#: ../gtk/gtkbutton.c:476
+ msgid "Image spacing"
+ msgstr "Espaiat de la imatge"
+
+-#: gtk/gtkbutton.c:477
++#: ../gtk/gtkbutton.c:477
+ msgid "Spacing in pixels between the image and label"
+ msgstr "L'espai, en píxels, entre la imatge i l'etiqueta"
+
+-#: gtk/gtkbutton.c:491
++#: ../gtk/gtkbutton.c:491
+ msgid "Show button images"
+ msgstr "Mostra imatges de botons"
+
+-#: gtk/gtkbutton.c:492
++#: ../gtk/gtkbutton.c:492
+ msgid "Whether images should be shown on buttons"
+ msgstr "Si s'han de mostrar imatges en els botons"
+
+-#: gtk/gtkcalendar.c:440
++#: ../gtk/gtkcalendar.c:440
+ msgid "Year"
+ msgstr "Any"
+
+-#: gtk/gtkcalendar.c:441
++#: ../gtk/gtkcalendar.c:441
+ msgid "The selected year"
+ msgstr "L'any seleccionat"
+
+-#: gtk/gtkcalendar.c:454
++#: ../gtk/gtkcalendar.c:454
+ msgid "Month"
+ msgstr "Mes"
+
+-#: gtk/gtkcalendar.c:455
++#: ../gtk/gtkcalendar.c:455
+ msgid "The selected month (as a number between 0 and 11)"
+ msgstr "El mes seleccionat (com a número entre 0 i 11)"
+
+-#: gtk/gtkcalendar.c:469
++#: ../gtk/gtkcalendar.c:469
+ msgid "Day"
+ msgstr "Dia"
+
+-#: gtk/gtkcalendar.c:470
++#: ../gtk/gtkcalendar.c:470
+ msgid ""
+ "The selected day (as a number between 1 and 31, or 0 to unselect the "
+ "currently selected day)"
+@@ -967,321 +972,324 @@
+ "El dia seleccionat (com a número entre 1 i 31, o 0 per a deseleccionar el "
+ "dia actualment seleccionat)"
+
+-#: gtk/gtkcalendar.c:484
++#: ../gtk/gtkcalendar.c:484
+ msgid "Show Heading"
+ msgstr "Mostra la capçalera"
+
+-#: gtk/gtkcalendar.c:485
++#: ../gtk/gtkcalendar.c:485
+ msgid "If TRUE, a heading is displayed"
+ msgstr "Si és CERT, es mostrarà una capçalera"
+
+-#: gtk/gtkcalendar.c:499
++#: ../gtk/gtkcalendar.c:499
+ msgid "Show Day Names"
+ msgstr "Mostra el nom dels dies"
+
+-#: gtk/gtkcalendar.c:500
++#: ../gtk/gtkcalendar.c:500
+ msgid "If TRUE, day names are displayed"
+ msgstr "Si és CERT, es mostraran els noms dels dies"
+
+-#: gtk/gtkcalendar.c:513
++#: ../gtk/gtkcalendar.c:513
+ msgid "No Month Change"
+ msgstr "No canviïs el mes"
+
+-#: gtk/gtkcalendar.c:514
++#: ../gtk/gtkcalendar.c:514
+ msgid "If TRUE, the selected month cannot be changed"
+ msgstr "Si és CERT, no es podrà canviar el mes seleccionat"
+
+-#: gtk/gtkcalendar.c:528
++#: ../gtk/gtkcalendar.c:528
+ msgid "Show Week Numbers"
+ msgstr "Mostra els números de la setmana"
+
+-#: gtk/gtkcalendar.c:529
++#: ../gtk/gtkcalendar.c:529
+ msgid "If TRUE, week numbers are displayed"
+ msgstr "Si és CERT, es mostraran els números de la setmana"
+
+-#: gtk/gtkcalendar.c:544
++#: ../gtk/gtkcalendar.c:544
+ msgid "Details Width"
+ msgstr "Amplada dels detalls"
+
+-#: gtk/gtkcalendar.c:545
++#: ../gtk/gtkcalendar.c:545
+ msgid "Details width in characters"
+ msgstr "Amplada dels detalls en caràcters"
+
+-#: gtk/gtkcalendar.c:560
++#: ../gtk/gtkcalendar.c:560
+ msgid "Details Height"
+ msgstr "Alçada dels detalls"
+
+-#: gtk/gtkcalendar.c:561
++#: ../gtk/gtkcalendar.c:561
+ msgid "Details height in rows"
+ msgstr "Alçada dels detalls en files"
+
+-#: gtk/gtkcalendar.c:577
++#: ../gtk/gtkcalendar.c:577
+ msgid "Show Details"
+ msgstr "Mostra els detalls"
+
+-#: gtk/gtkcalendar.c:578
++#: ../gtk/gtkcalendar.c:578
+ msgid "If TRUE, details are shown"
+ msgstr "Si és CERT, es mostraran els detalls"
+
+-#: gtk/gtkcellrenderer.c:177
++#: ../gtk/gtkcellrenderer.c:177
+ msgid "mode"
+ msgstr "mode"
+
+-#: gtk/gtkcellrenderer.c:178
++#: ../gtk/gtkcellrenderer.c:178
+ msgid "Editable mode of the CellRenderer"
+ msgstr "Mode editable del CellRenderer"
+
+-#: gtk/gtkcellrenderer.c:186
++#: ../gtk/gtkcellrenderer.c:186
+ msgid "visible"
+ msgstr "visible"
+
+-#: gtk/gtkcellrenderer.c:187
++#: ../gtk/gtkcellrenderer.c:187
+ msgid "Display the cell"
+ msgstr "Mostra la cel·la"
+
+ # FIXME (dpm)
+-#: gtk/gtkcellrenderer.c:194
++#: ../gtk/gtkcellrenderer.c:194
+ msgid "Display the cell sensitive"
+ msgstr "Mostra la cel·la de manera sensible"
+
+-#: gtk/gtkcellrenderer.c:201
++#: ../gtk/gtkcellrenderer.c:201
+ msgid "xalign"
+ msgstr "xalign"
+
+-#: gtk/gtkcellrenderer.c:202
++#: ../gtk/gtkcellrenderer.c:202
+ msgid "The x-align"
+ msgstr "L'alineació x"
+
+-#: gtk/gtkcellrenderer.c:211
++#: ../gtk/gtkcellrenderer.c:211
+ msgid "yalign"
+ msgstr "yaling"
+
+-#: gtk/gtkcellrenderer.c:212
++#: ../gtk/gtkcellrenderer.c:212
+ msgid "The y-align"
+ msgstr "L'alineació y"
+
+-#: gtk/gtkcellrenderer.c:221
++#: ../gtk/gtkcellrenderer.c:221
+ msgid "xpad"
+ msgstr "xpad"
+
+-#: gtk/gtkcellrenderer.c:222
++#: ../gtk/gtkcellrenderer.c:222
+ msgid "The xpad"
+ msgstr "L'xpad"
+
+-#: gtk/gtkcellrenderer.c:231
++#: ../gtk/gtkcellrenderer.c:231
+ msgid "ypad"
+ msgstr "ypad"
+
+-#: gtk/gtkcellrenderer.c:232
++#: ../gtk/gtkcellrenderer.c:232
+ msgid "The ypad"
+ msgstr "L'ypad"
+
+-#: gtk/gtkcellrenderer.c:241
++#: ../gtk/gtkcellrenderer.c:241
+ msgid "width"
+ msgstr "amplada"
+
+-#: gtk/gtkcellrenderer.c:242
++#: ../gtk/gtkcellrenderer.c:242
+ msgid "The fixed width"
+ msgstr "L'amplada fixada"
+
+-#: gtk/gtkcellrenderer.c:251
++#: ../gtk/gtkcellrenderer.c:251
+ msgid "height"
+ msgstr "alçada"
+
+-#: gtk/gtkcellrenderer.c:252
++#: ../gtk/gtkcellrenderer.c:252
+ msgid "The fixed height"
+ msgstr "L'alçada fixada"
+
+-#: gtk/gtkcellrenderer.c:261
++#: ../gtk/gtkcellrenderer.c:261
+ msgid "Is Expander"
+ msgstr "És expansor"
+
+-#: gtk/gtkcellrenderer.c:262
++#: ../gtk/gtkcellrenderer.c:262
+ msgid "Row has children"
+ msgstr "La fila té fills"
+
+-#: gtk/gtkcellrenderer.c:270
++#: ../gtk/gtkcellrenderer.c:270
+ msgid "Is Expanded"
+ msgstr "És expandida"
+
+-#: gtk/gtkcellrenderer.c:271
++#: ../gtk/gtkcellrenderer.c:271
+ msgid "Row is an expander row, and is expanded"
+ msgstr "La fila és expansora, i és expandida"
+
+-#: gtk/gtkcellrenderer.c:278
++#: ../gtk/gtkcellrenderer.c:278
+ msgid "Cell background color name"
+ msgstr "Nom del color de fons de la cel·la"
+
+-#: gtk/gtkcellrenderer.c:279
++#: ../gtk/gtkcellrenderer.c:279
+ msgid "Cell background color as a string"
+ msgstr "Color de fons de la cel·la com a cadena"
+
+-#: gtk/gtkcellrenderer.c:286
++#: ../gtk/gtkcellrenderer.c:286
+ msgid "Cell background color"
+ msgstr "Color de fons de la cel·la"
+
+-#: gtk/gtkcellrenderer.c:287
++#: ../gtk/gtkcellrenderer.c:287
+ msgid "Cell background color as a GdkColor"
+ msgstr "Color de fons de la cel·la com a GdkColor"
+
+-#: gtk/gtkcellrenderer.c:294
++#: ../gtk/gtkcellrenderer.c:294
+ msgid "Editing"
+ msgstr "En edició"
+
+-#: gtk/gtkcellrenderer.c:295
++#: ../gtk/gtkcellrenderer.c:295
+ msgid "Whether the cell renderer is currently in editing mode"
+ msgstr "Si el representador de cel·les està en mode d'edició"
+
+-#: gtk/gtkcellrenderer.c:303
++#: ../gtk/gtkcellrenderer.c:303
+ msgid "Cell background set"
+ msgstr "Conjunt de fons de la cel·la"
+
+-#: gtk/gtkcellrenderer.c:304
++#: ../gtk/gtkcellrenderer.c:304
+ msgid "Whether this tag affects the cell background color"
+ msgstr "Com afecta aquesta etiqueta el color de fons de la cel·la"
+
+-#: gtk/gtkcellrendereraccel.c:104
++#: ../gtk/gtkcellrendereraccel.c:104
+ msgid "Accelerator key"
+ msgstr "Tecla acceleradora"
+
+-#: gtk/gtkcellrendereraccel.c:105
++#: ../gtk/gtkcellrendereraccel.c:105
+ msgid "The keyval of the accelerator"
+ msgstr "El valor de la tecla (keyval) de l'accelerador"
+
+-#: gtk/gtkcellrendereraccel.c:121
++#: ../gtk/gtkcellrendereraccel.c:121
+ msgid "Accelerator modifiers"
+ msgstr "Modificadors de l'accelerador"
+
+-#: gtk/gtkcellrendereraccel.c:122
++#: ../gtk/gtkcellrendereraccel.c:122
+ msgid "The modifier mask of the accelerator"
+ msgstr "La màscara modificadora de l'accelerador"
+
+-#: gtk/gtkcellrendereraccel.c:139
++#: ../gtk/gtkcellrendereraccel.c:139
+ msgid "Accelerator keycode"
+ msgstr "Codi de tecla de l'accelerador"
+
+-#: gtk/gtkcellrendereraccel.c:140
++#: ../gtk/gtkcellrendereraccel.c:140
+ msgid "The hardware keycode of the accelerator"
+ msgstr "El codi de tecla de maquinari de l'accelerador"
+
+-#: gtk/gtkcellrendereraccel.c:159
++#: ../gtk/gtkcellrendereraccel.c:159
+ msgid "Accelerator Mode"
+ msgstr "Mode de l'accelerador"
+
+-#: gtk/gtkcellrendereraccel.c:160
++#: ../gtk/gtkcellrendereraccel.c:160
+ msgid "The type of accelerators"
+ msgstr "El tipus d'acceleradors"
+
+-#: gtk/gtkcellrenderercombo.c:107
++#: ../gtk/gtkcellrenderercombo.c:107
+ msgid "Model"
+ msgstr "Model"
+
+-#: gtk/gtkcellrenderercombo.c:108
++#: ../gtk/gtkcellrenderercombo.c:108
+ msgid "The model containing the possible values for the combo box"
+ msgstr "El model que conté els valors possibles del quadre combinat"
+
+-#: gtk/gtkcellrenderercombo.c:130 gtk/gtkcomboboxentry.c:106
++#: ../gtk/gtkcellrenderercombo.c:130 ../gtk/gtkcomboboxentry.c:106
+ msgid "Text Column"
+ msgstr "Columna de text"
+
+-#: gtk/gtkcellrenderercombo.c:131 gtk/gtkcomboboxentry.c:107
++#: ../gtk/gtkcellrenderercombo.c:131 ../gtk/gtkcomboboxentry.c:107
+ msgid "A column in the data source model to get the strings from"
+ msgstr "Una columna del model de font de dades per obtenir les cadenes"
+
+-#: gtk/gtkcellrenderercombo.c:148
++#: ../gtk/gtkcellrenderercombo.c:148
+ msgid "Has Entry"
+ msgstr "Té una entrada"
+
+-#: gtk/gtkcellrenderercombo.c:149
++#: ../gtk/gtkcellrenderercombo.c:149
+ msgid "If FALSE, don't allow to enter strings other than the chosen ones"
+ msgstr ""
+ "Si és FALS, no es permetrà introduir cadenes que no siguin les seleccionables"
+
+-#: gtk/gtkcellrendererpixbuf.c:111
++#: ../gtk/gtkcellrendererpixbuf.c:111
+ msgid "Pixbuf Object"
+ msgstr "Objecte pixbuf"
+
+-#: gtk/gtkcellrendererpixbuf.c:112
++#: ../gtk/gtkcellrendererpixbuf.c:112
+ msgid "The pixbuf to render"
+ msgstr "El pixbuf per representar"
+
+-#: gtk/gtkcellrendererpixbuf.c:119
++#: ../gtk/gtkcellrendererpixbuf.c:119
+ msgid "Pixbuf Expander Open"
+ msgstr "Expansor pixbuf obert"
+
+-#: gtk/gtkcellrendererpixbuf.c:120
++#: ../gtk/gtkcellrendererpixbuf.c:120
+ msgid "Pixbuf for open expander"
+ msgstr "Pixbuf per a l'expansor obert"
+
+-#: gtk/gtkcellrendererpixbuf.c:127
++#: ../gtk/gtkcellrendererpixbuf.c:127
+ msgid "Pixbuf Expander Closed"
+ msgstr "Expansor pixbuf tancat"
+
+-#: gtk/gtkcellrendererpixbuf.c:128
++#: ../gtk/gtkcellrendererpixbuf.c:128
+ msgid "Pixbuf for closed expander"
+ msgstr "Pixbuf per a l'expansor tancat"
+
+-#: gtk/gtkcellrendererpixbuf.c:135 gtk/gtkimage.c:172 gtk/gtkstatusicon.c:202
++#: ../gtk/gtkcellrendererpixbuf.c:135 ../gtk/gtkimage.c:172
++#: ../gtk/gtkstatusicon.c:202
+ msgid "Stock ID"
+ msgstr "Identificació de l'icona"
+
+-#: gtk/gtkcellrendererpixbuf.c:136
++#: ../gtk/gtkcellrendererpixbuf.c:136
+ msgid "The stock ID of the stock icon to render"
+ msgstr "L'identificador de la icona d'estoc per a representar"
+
+-#: gtk/gtkcellrendererpixbuf.c:143 gtk/gtkrecentmanager.c:245
+-#: gtk/gtkstatusicon.c:243
++#: ../gtk/gtkcellrendererpixbuf.c:143 ../gtk/gtkrecentmanager.c:245
++#: ../gtk/gtkstatusicon.c:243
+ msgid "Size"
+ msgstr "Mida"
+
+-#: gtk/gtkcellrendererpixbuf.c:144
++#: ../gtk/gtkcellrendererpixbuf.c:144
+ msgid "The GtkIconSize value that specifies the size of the rendered icon"
+ msgstr "El valor GtkIconSize que especifica la mida de la icona representada"
+
+-#: gtk/gtkcellrendererpixbuf.c:153
++#: ../gtk/gtkcellrendererpixbuf.c:153
+ msgid "Detail"
+ msgstr "Detall"
+
+-#: gtk/gtkcellrendererpixbuf.c:154
++#: ../gtk/gtkcellrendererpixbuf.c:154
+ msgid "Render detail to pass to the theme engine"
+ msgstr "Detall de representació a passar al motor de tema"
+
+-#: gtk/gtkcellrendererpixbuf.c:187
++#: ../gtk/gtkcellrendererpixbuf.c:187
+ msgid "Follow State"
+ msgstr "Segueix l'estat"
+
+-#: gtk/gtkcellrendererpixbuf.c:188
++#: ../gtk/gtkcellrendererpixbuf.c:188
+ msgid "Whether the rendered pixbuf should be colorized according to the state"
+ msgstr ""
+ "Si la memòria de píxels representada s'hauria d'acolorir segons l'estat"
+
+-#: gtk/gtkcellrendererpixbuf.c:205 gtk/gtkimage.c:247 gtk/gtkwindow.c:576
++#: ../gtk/gtkcellrendererpixbuf.c:205 ../gtk/gtkimage.c:247
++#: ../gtk/gtkwindow.c:576
+ msgid "Icon"
+ msgstr "Icona"
+
+-#: gtk/gtkcellrendererpixbuf.c:206 gtk/gtkimage.c:248 gtk/gtkstatusicon.c:227
++#: ../gtk/gtkcellrendererpixbuf.c:206 ../gtk/gtkimage.c:248
++#: ../gtk/gtkstatusicon.c:227
+ msgid "The GIcon being displayed"
+ msgstr "La icona GIcon que es mostra"
+
+-#: gtk/gtkcellrendererprogress.c:129
++#: ../gtk/gtkcellrendererprogress.c:129
+ msgid "Value of the progress bar"
+ msgstr "Valor de la barra de progrés"
+
+-#: gtk/gtkcellrendererprogress.c:146 gtk/gtkcellrenderertext.c:195
+-#: gtk/gtkentry.c:582 gtk/gtkmessagedialog.c:153 gtk/gtkprogressbar.c:184
+-#: gtk/gtktextbuffer.c:197
++#: ../gtk/gtkcellrendererprogress.c:146 ../gtk/gtkcellrenderertext.c:195
++#: ../gtk/gtkentry.c:582 ../gtk/gtkmessagedialog.c:153
++#: ../gtk/gtkprogressbar.c:184 ../gtk/gtktextbuffer.c:197
+ msgid "Text"
+ msgstr "Text"
+
+-#: gtk/gtkcellrendererprogress.c:147
++#: ../gtk/gtkcellrendererprogress.c:147
+ msgid "Text on the progress bar"
+ msgstr "Text a la barra de progrés"
+
+-#: gtk/gtkcellrendererprogress.c:170
++#: ../gtk/gtkcellrendererprogress.c:170
+ msgid "Pulse"
+ msgstr "Pulsació"
+
+-#: gtk/gtkcellrendererprogress.c:171
++#: ../gtk/gtkcellrendererprogress.c:171
+ msgid ""
+ "Set this to positive values to indicate that some progress is made, but you "
+ "don't know how much."
+@@ -1289,11 +1297,11 @@
+ "Establiu-ho a valors positius per indicar que s'ha fet algun tipus de "
+ "progrés, però no sabeu quant."
+
+-#: gtk/gtkcellrendererprogress.c:187 gtk/gtkprogress.c:118
++#: ../gtk/gtkcellrendererprogress.c:187 ../gtk/gtkprogress.c:118
+ msgid "Text x alignment"
+ msgstr "Alineació del Text x"
+
+-#: gtk/gtkcellrendererprogress.c:188 gtk/gtkprogress.c:119
++#: ../gtk/gtkcellrendererprogress.c:188 ../gtk/gtkprogress.c:119
+ msgid ""
+ "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
+ "layouts."
+@@ -1301,215 +1309,222 @@
+ "L'alineació horitzontal del text, des de 0 (esquerre) a 1 (dreta). Només per "
+ "a formats RTL (dreta a esquerra)."
+
+-#: gtk/gtkcellrendererprogress.c:204 gtk/gtkprogress.c:125
++#: ../gtk/gtkcellrendererprogress.c:204 ../gtk/gtkprogress.c:125
+ msgid "Text y alignment"
+ msgstr "Alineació Text y"
+
+-#: gtk/gtkcellrendererprogress.c:205 gtk/gtkprogress.c:126
++#: ../gtk/gtkcellrendererprogress.c:205 ../gtk/gtkprogress.c:126
+ msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
+ msgstr "L'alineació vertical, des de 0 (a dalt) fins 1 (a baix)."
+
+-#: gtk/gtkcellrendererprogress.c:221 gtk/gtkiconview.c:731
+-#: gtk/gtkprogressbar.c:126 gtk/gtkscalebutton.c:193 gtk/gtkstatusicon.c:301
+-#: gtk/gtktoolbar.c:492 gtk/gtktrayicon-x11.c:95
++#: ../gtk/gtkcellrendererprogress.c:221 ../gtk/gtkiconview.c:731
++#: ../gtk/gtkprogressbar.c:126 ../gtk/gtkscalebutton.c:193
++#: ../gtk/gtkstatusicon.c:301 ../gtk/gtktoolbar.c:492
++#: ../gtk/gtktrayicon-x11.c:95
+ msgid "Orientation"
+ msgstr "Orientació"
+
+-#: gtk/gtkcellrendererprogress.c:222 gtk/gtkprogressbar.c:127
++#: ../gtk/gtkcellrendererprogress.c:222 ../gtk/gtkprogressbar.c:127
+ msgid "Orientation and growth direction of the progress bar"
+ msgstr "Orientació i direcció de creixement de la barra de progrés"
+
+-#: gtk/gtkcellrendererspin.c:93 gtk/gtkprogressbar.c:118 gtk/gtkrange.c:346
+-#: gtk/gtkscalebutton.c:221 gtk/gtkspinbutton.c:208
++#: ../gtk/gtkcellrendererspin.c:93 ../gtk/gtkprogressbar.c:118
++#: ../gtk/gtkrange.c:346 ../gtk/gtkscalebutton.c:221
++#: ../gtk/gtkspinbutton.c:208
+ msgid "Adjustment"
+ msgstr "Ajust"
+
+-#: gtk/gtkcellrendererspin.c:94
++#: ../gtk/gtkcellrendererspin.c:94
+ msgid "The adjustment that holds the value of the spinbutton."
+ msgstr "L'ajustament que reté el valor del botó de gir."
+
+-#: gtk/gtkcellrendererspin.c:109
++#: ../gtk/gtkcellrendererspin.c:109
+ msgid "Climb rate"
+ msgstr "Taxa de pujada"
+
+-#: gtk/gtkcellrendererspin.c:110 gtk/gtkspinbutton.c:217
++#: ../gtk/gtkcellrendererspin.c:110 ../gtk/gtkspinbutton.c:217
+ msgid "The acceleration rate when you hold down a button"
+ msgstr "La taxa d'acceleració quan es manté premut un botó"
+
+-#: gtk/gtkcellrendererspin.c:123 gtk/gtkscale.c:142 gtk/gtkspinbutton.c:226
++#: ../gtk/gtkcellrendererspin.c:123 ../gtk/gtkscale.c:142
++#: ../gtk/gtkspinbutton.c:226
+ msgid "Digits"
+ msgstr "Dígits"
+
+-#: gtk/gtkcellrendererspin.c:124 gtk/gtkspinbutton.c:227
++#: ../gtk/gtkcellrendererspin.c:124 ../gtk/gtkspinbutton.c:227
+ msgid "The number of decimal places to display"
+ msgstr "El nombre de decimals a mostrar"
+
+-#: gtk/gtkcellrenderertext.c:196
++#: ../gtk/gtkcellrenderertext.c:196
+ msgid "Text to render"
+ msgstr "Text per representar"
+
+-#: gtk/gtkcellrenderertext.c:203
++#: ../gtk/gtkcellrenderertext.c:203
+ msgid "Markup"
+ msgstr "Marcatge"
+
+-#: gtk/gtkcellrenderertext.c:204
++#: ../gtk/gtkcellrenderertext.c:204
+ msgid "Marked up text to render"
+ msgstr "Text marcat per representar"
+
+-#: gtk/gtkcellrenderertext.c:211 gtk/gtklabel.c:323
++#: ../gtk/gtkcellrenderertext.c:211 ../gtk/gtklabel.c:323
+ msgid "Attributes"
+ msgstr "Atributs"
+
+-#: gtk/gtkcellrenderertext.c:212
++#: ../gtk/gtkcellrenderertext.c:212
+ msgid "A list of style attributes to apply to the text of the renderer"
+ msgstr "Una llista d'atributs d'estil per a aplicar al text del representador"
+
+-#: gtk/gtkcellrenderertext.c:219
++#: ../gtk/gtkcellrenderertext.c:219
+ msgid "Single Paragraph Mode"
+ msgstr "Mode de paràgraf senzill"
+
+-#: gtk/gtkcellrenderertext.c:220
++#: ../gtk/gtkcellrenderertext.c:220
+ msgid "Whether or not to keep all text in a single paragraph"
+ msgstr "Si s'ha presentar el text en un únic paràgraf"
+
+-#: gtk/gtkcellrenderertext.c:228 gtk/gtkcellview.c:160 gtk/gtktexttag.c:183
++#: ../gtk/gtkcellrenderertext.c:228 ../gtk/gtkcellview.c:160
++#: ../gtk/gtktexttag.c:183
+ msgid "Background color name"
+ msgstr "Nom del color de fons"
+
+-#: gtk/gtkcellrenderertext.c:229 gtk/gtkcellview.c:161 gtk/gtktexttag.c:184
++#: ../gtk/gtkcellrenderertext.c:229 ../gtk/gtkcellview.c:161
++#: ../gtk/gtktexttag.c:184
+ msgid "Background color as a string"
+ msgstr "Color de fons com a cadena"
+
+-#: gtk/gtkcellrenderertext.c:236 gtk/gtkcellview.c:167 gtk/gtktexttag.c:191
++#: ../gtk/gtkcellrenderertext.c:236 ../gtk/gtkcellview.c:167
++#: ../gtk/gtktexttag.c:191
+ msgid "Background color"
+ msgstr "Color de fons"
+
+-#: gtk/gtkcellrenderertext.c:237 gtk/gtkcellview.c:168
++#: ../gtk/gtkcellrenderertext.c:237 ../gtk/gtkcellview.c:168
+ msgid "Background color as a GdkColor"
+ msgstr "Color de fons com a GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:244 gtk/gtktexttag.c:217
++#: ../gtk/gtkcellrenderertext.c:244 ../gtk/gtktexttag.c:217
+ msgid "Foreground color name"
+ msgstr "Nom del color de primer pla"
+
+-#: gtk/gtkcellrenderertext.c:245 gtk/gtktexttag.c:218
++#: ../gtk/gtkcellrenderertext.c:245 ../gtk/gtktexttag.c:218
+ msgid "Foreground color as a string"
+ msgstr "Color de primer pla com a cadena"
+
+-#: gtk/gtkcellrenderertext.c:252 gtk/gtktexttag.c:225
++#: ../gtk/gtkcellrenderertext.c:252 ../gtk/gtktexttag.c:225
+ msgid "Foreground color"
+ msgstr "Color de primer pla"
+
+-#: gtk/gtkcellrenderertext.c:253
++#: ../gtk/gtkcellrenderertext.c:253
+ msgid "Foreground color as a GdkColor"
+ msgstr "Color de primer pla com a GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:261 gtk/gtkentry.c:506 gtk/gtktexttag.c:251
+-#: gtk/gtktextview.c:568
++#: ../gtk/gtkcellrenderertext.c:261 ../gtk/gtkentry.c:506
++#: ../gtk/gtktexttag.c:251 ../gtk/gtktextview.c:568
+ msgid "Editable"
+ msgstr "Editable"
+
+-#: gtk/gtkcellrenderertext.c:262 gtk/gtktexttag.c:252 gtk/gtktextview.c:569
++#: ../gtk/gtkcellrenderertext.c:262 ../gtk/gtktexttag.c:252
++#: ../gtk/gtktextview.c:569
+ msgid "Whether the text can be modified by the user"
+ msgstr "Si el text pot ser modificat per l'usuari"
+
+-#: gtk/gtkcellrenderertext.c:269 gtk/gtkcellrenderertext.c:277
+-#: gtk/gtkfontsel.c:188 gtk/gtktexttag.c:267 gtk/gtktexttag.c:275
++#: ../gtk/gtkcellrenderertext.c:269 ../gtk/gtkcellrenderertext.c:277
++#: ../gtk/gtkfontsel.c:188 ../gtk/gtktexttag.c:267 ../gtk/gtktexttag.c:275
+ msgid "Font"
+ msgstr "Tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:270 gtk/gtktexttag.c:268
++#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtktexttag.c:268
+ msgid "Font description as a string, e.g. \"Sans Italic 12\""
+ msgstr ""
+ "Descripció del tipus de lletra com una cadena, per exemple «Sans Italic 12»"
+
+-#: gtk/gtkcellrenderertext.c:278 gtk/gtktexttag.c:276
++#: ../gtk/gtkcellrenderertext.c:278 ../gtk/gtktexttag.c:276
+ msgid "Font description as a PangoFontDescription struct"
+ msgstr "Descripció del tipus de lletra com a estructura PangoFontDescription"
+
+-#: gtk/gtkcellrenderertext.c:286 gtk/gtktexttag.c:283
++#: ../gtk/gtkcellrenderertext.c:286 ../gtk/gtktexttag.c:283
+ msgid "Font family"
+ msgstr "Família de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:287 gtk/gtktexttag.c:284
++#: ../gtk/gtkcellrenderertext.c:287 ../gtk/gtktexttag.c:284
+ msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
+ msgstr ""
+ "Nom de la família del tipus de lletra, p.ex. Sans, Helvetica, Times, "
+ "Monospace"
+
+-#: gtk/gtkcellrenderertext.c:294 gtk/gtkcellrenderertext.c:295
+-#: gtk/gtktexttag.c:291
++#: ../gtk/gtkcellrenderertext.c:294 ../gtk/gtkcellrenderertext.c:295
++#: ../gtk/gtktexttag.c:291
+ msgid "Font style"
+ msgstr "Estil de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:303 gtk/gtkcellrenderertext.c:304
+-#: gtk/gtktexttag.c:300
++#: ../gtk/gtkcellrenderertext.c:303 ../gtk/gtkcellrenderertext.c:304
++#: ../gtk/gtktexttag.c:300
+ msgid "Font variant"
+ msgstr "Variant de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:312 gtk/gtkcellrenderertext.c:313
+-#: gtk/gtktexttag.c:309
++#: ../gtk/gtkcellrenderertext.c:312 ../gtk/gtkcellrenderertext.c:313
++#: ../gtk/gtktexttag.c:309
+ msgid "Font weight"
+ msgstr "Pes del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:322 gtk/gtkcellrenderertext.c:323
+-#: gtk/gtktexttag.c:320
++#: ../gtk/gtkcellrenderertext.c:322 ../gtk/gtkcellrenderertext.c:323
++#: ../gtk/gtktexttag.c:320
+ msgid "Font stretch"
+ msgstr "Estirament de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:331 gtk/gtkcellrenderertext.c:332
+-#: gtk/gtktexttag.c:329
++#: ../gtk/gtkcellrenderertext.c:331 ../gtk/gtkcellrenderertext.c:332
++#: ../gtk/gtktexttag.c:329
+ msgid "Font size"
+ msgstr "Mida del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:341 gtk/gtktexttag.c:349
++#: ../gtk/gtkcellrenderertext.c:341 ../gtk/gtktexttag.c:349
+ msgid "Font points"
+ msgstr "Punts del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:342 gtk/gtktexttag.c:350
++#: ../gtk/gtkcellrenderertext.c:342 ../gtk/gtktexttag.c:350
+ msgid "Font size in points"
+ msgstr "Mida del tipus de lletra en punts"
+
+-#: gtk/gtkcellrenderertext.c:351 gtk/gtktexttag.c:339
++#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:339
+ msgid "Font scale"
+ msgstr "Escala del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:352
++#: ../gtk/gtkcellrenderertext.c:352
+ msgid "Font scaling factor"
+ msgstr "Factor d'escalat del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:361 gtk/gtktexttag.c:418
++#: ../gtk/gtkcellrenderertext.c:361 ../gtk/gtktexttag.c:418
+ msgid "Rise"
+ msgstr "Elevació"
+
+-#: gtk/gtkcellrenderertext.c:362
++#: ../gtk/gtkcellrenderertext.c:362
+ msgid ""
+ "Offset of text above the baseline (below the baseline if rise is negative)"
+ msgstr ""
+ "Desplaçament del text per sobre de la línia de base (per sota si l'elevació "
+ "és negativa)"
+
+-#: gtk/gtkcellrenderertext.c:373 gtk/gtktexttag.c:458
++#: ../gtk/gtkcellrenderertext.c:373 ../gtk/gtktexttag.c:458
+ msgid "Strikethrough"
+ msgstr "Ratlla"
+
+-#: gtk/gtkcellrenderertext.c:374 gtk/gtktexttag.c:459
++#: ../gtk/gtkcellrenderertext.c:374 ../gtk/gtktexttag.c:459
+ msgid "Whether to strike through the text"
+ msgstr "Si s'ha de ratllar el text"
+
+-#: gtk/gtkcellrenderertext.c:381 gtk/gtktexttag.c:466
++#: ../gtk/gtkcellrenderertext.c:381 ../gtk/gtktexttag.c:466
+ msgid "Underline"
+ msgstr "Subratlla"
+
+-#: gtk/gtkcellrenderertext.c:382 gtk/gtktexttag.c:467
++#: ../gtk/gtkcellrenderertext.c:382 ../gtk/gtktexttag.c:467
+ msgid "Style of underline for this text"
+ msgstr "Estil de subratllat per a aquest text"
+
+-#: gtk/gtkcellrenderertext.c:390 gtk/gtktexttag.c:378
++#: ../gtk/gtkcellrenderertext.c:390 ../gtk/gtktexttag.c:378
+ msgid "Language"
+ msgstr "Idioma"
+
+-#: gtk/gtkcellrenderertext.c:391
++#: ../gtk/gtkcellrenderertext.c:391
+ msgid ""
+ "The language this text is in, as an ISO code. Pango can use this as a hint "
+ "when rendering the text. If you don't understand this parameter, you "
+@@ -1519,11 +1534,12 @@
+ "pista en representar el text. Si no enteneu aquest paràmetre, probablement "
+ "no el necessitareu"
+
+-#: gtk/gtkcellrenderertext.c:411 gtk/gtklabel.c:448 gtk/gtkprogressbar.c:206
++#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtklabel.c:448
++#: ../gtk/gtkprogressbar.c:206
+ msgid "Ellipsize"
+ msgstr "Punts suspensius"
+
+-#: gtk/gtkcellrenderertext.c:412
++#: ../gtk/gtkcellrenderertext.c:412
+ msgid ""
+ "The preferred place to ellipsize the string, if the cell renderer does not "
+ "have enough room to display the entire string"
+@@ -1532,20 +1548,20 @@
+ "representador de cel·les no conté espai suficient per a mostrar tota la "
+ "cadena"
+
+-#: gtk/gtkcellrenderertext.c:431 gtk/gtkfilechooserbutton.c:421
+-#: gtk/gtklabel.c:468
++#: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtkfilechooserbutton.c:421
++#: ../gtk/gtklabel.c:468
+ msgid "Width In Characters"
+ msgstr "Amplada en caràcters"
+
+-#: gtk/gtkcellrenderertext.c:432 gtk/gtklabel.c:469
++#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtklabel.c:469
+ msgid "The desired width of the label, in characters"
+ msgstr "L'amplada desitjada de l'etiqueta, en caràcters"
+
+-#: gtk/gtkcellrenderertext.c:450 gtk/gtktexttag.c:475
++#: ../gtk/gtkcellrenderertext.c:450 ../gtk/gtktexttag.c:475
+ msgid "Wrap mode"
+ msgstr "Mode d'ajust"
+
+-#: gtk/gtkcellrenderertext.c:451
++#: ../gtk/gtkcellrenderertext.c:451
+ msgid ""
+ "How to break the string into multiple lines, if the cell renderer does not "
+ "have enough room to display the entire string"
+@@ -1553,438 +1569,444 @@
+ "Com separar les cadenes en múltiples línies, si el representador de cadenes "
+ "no conté espai suficient per mostrar tota la cadena"
+
+-#: gtk/gtkcellrenderertext.c:470 gtk/gtkcombobox.c:678
++#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtkcombobox.c:678
+ msgid "Wrap width"
+ msgstr "Ajusta l'amplada"
+
+-#: gtk/gtkcellrenderertext.c:471
++#: ../gtk/gtkcellrenderertext.c:471
+ msgid "The width at which the text is wrapped"
+ msgstr "A quina amplada s'ajusta el text"
+
+-#: gtk/gtkcellrenderertext.c:491 gtk/gtktreeviewcolumn.c:297
++#: ../gtk/gtkcellrenderertext.c:491 ../gtk/gtktreeviewcolumn.c:297
+ msgid "Alignment"
+ msgstr "Alineació"
+
+-#: gtk/gtkcellrenderertext.c:492
++#: ../gtk/gtkcellrenderertext.c:492
+ msgid "How to align the lines"
+ msgstr "Com alinear les línies"
+
+-#: gtk/gtkcellrenderertext.c:502 gtk/gtkcellview.c:190 gtk/gtktexttag.c:564
++#: ../gtk/gtkcellrenderertext.c:502 ../gtk/gtkcellview.c:190
++#: ../gtk/gtktexttag.c:564
+ msgid "Background set"
+ msgstr "Conjunt de fons"
+
+-#: gtk/gtkcellrenderertext.c:503 gtk/gtkcellview.c:191 gtk/gtktexttag.c:565
++#: ../gtk/gtkcellrenderertext.c:503 ../gtk/gtkcellview.c:191
++#: ../gtk/gtktexttag.c:565
+ msgid "Whether this tag affects the background color"
+ msgstr "Si aquest marcador afecta el color de fons"
+
+-#: gtk/gtkcellrenderertext.c:506 gtk/gtktexttag.c:576
++#: ../gtk/gtkcellrenderertext.c:506 ../gtk/gtktexttag.c:576
+ msgid "Foreground set"
+ msgstr "Primer pla"
+
+-#: gtk/gtkcellrenderertext.c:507 gtk/gtktexttag.c:577
++#: ../gtk/gtkcellrenderertext.c:507 ../gtk/gtktexttag.c:577
+ msgid "Whether this tag affects the foreground color"
+ msgstr "Si aquest marcador afecta el color de primer pla"
+
+-#: gtk/gtkcellrenderertext.c:510 gtk/gtktexttag.c:584
++#: ../gtk/gtkcellrenderertext.c:510 ../gtk/gtktexttag.c:584
+ msgid "Editability set"
+ msgstr "Editabilitat"
+
+-#: gtk/gtkcellrenderertext.c:511 gtk/gtktexttag.c:585
++#: ../gtk/gtkcellrenderertext.c:511 ../gtk/gtktexttag.c:585
+ msgid "Whether this tag affects text editability"
+ msgstr "Com afecta aquest marcador l'editabilitat"
+
+-#: gtk/gtkcellrenderertext.c:514 gtk/gtktexttag.c:588
++#: ../gtk/gtkcellrenderertext.c:514 ../gtk/gtktexttag.c:588
+ msgid "Font family set"
+ msgstr "Famílies de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:515 gtk/gtktexttag.c:589
++#: ../gtk/gtkcellrenderertext.c:515 ../gtk/gtktexttag.c:589
+ msgid "Whether this tag affects the font family"
+ msgstr "Com afecta aquesta etiqueta la família de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:518 gtk/gtktexttag.c:592
++#: ../gtk/gtkcellrenderertext.c:518 ../gtk/gtktexttag.c:592
+ msgid "Font style set"
+ msgstr "Estils de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:519 gtk/gtktexttag.c:593
++#: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtktexttag.c:593
+ msgid "Whether this tag affects the font style"
+ msgstr "Com afecta aquest marcador l'estil de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:522 gtk/gtktexttag.c:596
++#: ../gtk/gtkcellrenderertext.c:522 ../gtk/gtktexttag.c:596
+ msgid "Font variant set"
+ msgstr "Variants de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:523 gtk/gtktexttag.c:597
++#: ../gtk/gtkcellrenderertext.c:523 ../gtk/gtktexttag.c:597
+ msgid "Whether this tag affects the font variant"
+ msgstr "Com afecta aquest marcador la variant de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:526 gtk/gtktexttag.c:600
++#: ../gtk/gtkcellrenderertext.c:526 ../gtk/gtktexttag.c:600
+ msgid "Font weight set"
+ msgstr "Pes de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:527 gtk/gtktexttag.c:601
++#: ../gtk/gtkcellrenderertext.c:527 ../gtk/gtktexttag.c:601
+ msgid "Whether this tag affects the font weight"
+ msgstr "Si aquest marcador afecta el pes del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:530 gtk/gtktexttag.c:604
++#: ../gtk/gtkcellrenderertext.c:530 ../gtk/gtktexttag.c:604
+ msgid "Font stretch set"
+ msgstr "Estirament del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:531 gtk/gtktexttag.c:605
++#: ../gtk/gtkcellrenderertext.c:531 ../gtk/gtktexttag.c:605
+ msgid "Whether this tag affects the font stretch"
+ msgstr "Com afecta aquest marcador l'estirament de tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:534 gtk/gtktexttag.c:608
++#: ../gtk/gtkcellrenderertext.c:534 ../gtk/gtktexttag.c:608
+ msgid "Font size set"
+ msgstr "Mides del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:535 gtk/gtktexttag.c:609
++#: ../gtk/gtkcellrenderertext.c:535 ../gtk/gtktexttag.c:609
+ msgid "Whether this tag affects the font size"
+ msgstr "Si aquest marcador afecta la mida del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:538 gtk/gtktexttag.c:612
++#: ../gtk/gtkcellrenderertext.c:538 ../gtk/gtktexttag.c:612
+ msgid "Font scale set"
+ msgstr "Escala del tipus de lletra"
+
+-#: gtk/gtkcellrenderertext.c:539 gtk/gtktexttag.c:613
++#: ../gtk/gtkcellrenderertext.c:539 ../gtk/gtktexttag.c:613
+ msgid "Whether this tag scales the font size by a factor"
+ msgstr "Si aquest marcador escala la mida del tipus de lletra per un factor"
+
+-#: gtk/gtkcellrenderertext.c:542 gtk/gtktexttag.c:632
++#: ../gtk/gtkcellrenderertext.c:542 ../gtk/gtktexttag.c:632
+ msgid "Rise set"
+ msgstr "Elevació"
+
+-#: gtk/gtkcellrenderertext.c:543 gtk/gtktexttag.c:633
++#: ../gtk/gtkcellrenderertext.c:543 ../gtk/gtktexttag.c:633
+ msgid "Whether this tag affects the rise"
+ msgstr "Si aquesta etiqueta afecta l'elevació"
+
+-#: gtk/gtkcellrenderertext.c:546 gtk/gtktexttag.c:648
++#: ../gtk/gtkcellrenderertext.c:546 ../gtk/gtktexttag.c:648
+ msgid "Strikethrough set"
+ msgstr "Ratlla"
+
+-#: gtk/gtkcellrenderertext.c:547 gtk/gtktexttag.c:649
++#: ../gtk/gtkcellrenderertext.c:547 ../gtk/gtktexttag.c:649
+ msgid "Whether this tag affects strikethrough"
+ msgstr "Si aquesta etiqueta afecta el ratllat"
+
+-#: gtk/gtkcellrenderertext.c:550 gtk/gtktexttag.c:656
++#: ../gtk/gtkcellrenderertext.c:550 ../gtk/gtktexttag.c:656
+ msgid "Underline set"
+ msgstr "Subratllats"
+
+-#: gtk/gtkcellrenderertext.c:551 gtk/gtktexttag.c:657
++#: ../gtk/gtkcellrenderertext.c:551 ../gtk/gtktexttag.c:657
+ msgid "Whether this tag affects underlining"
+ msgstr "Si aquest marcador afecta el subratllat"
+
+-#: gtk/gtkcellrenderertext.c:554 gtk/gtktexttag.c:620
++#: ../gtk/gtkcellrenderertext.c:554 ../gtk/gtktexttag.c:620
+ msgid "Language set"
+ msgstr "Idioma"
+
+-#: gtk/gtkcellrenderertext.c:555 gtk/gtktexttag.c:621
++#: ../gtk/gtkcellrenderertext.c:555 ../gtk/gtktexttag.c:621
+ msgid "Whether this tag affects the language the text is rendered as"
+ msgstr "Si aquesta etiqueta afecta l'idioma amb el que es representa el text"
+
+-#: gtk/gtkcellrenderertext.c:558
++#: ../gtk/gtkcellrenderertext.c:558
+ msgid "Ellipsize set"
+ msgstr "Punts suspensius"
+
+-#: gtk/gtkcellrenderertext.c:559
++#: ../gtk/gtkcellrenderertext.c:559
+ msgid "Whether this tag affects the ellipsize mode"
+ msgstr "Si aquesta etiqueta afecta el mode de punts suspensius"
+
+-#: gtk/gtkcellrenderertext.c:562
++#: ../gtk/gtkcellrenderertext.c:562
+ msgid "Align set"
+ msgstr "Alineació activada"
+
+-#: gtk/gtkcellrenderertext.c:563
++#: ../gtk/gtkcellrenderertext.c:563
+ msgid "Whether this tag affects the alignment mode"
+ msgstr "Si aquesta etiqueta afecta el mode d'alineació"
+
+-#: gtk/gtkcellrenderertoggle.c:126
++#: ../gtk/gtkcellrenderertoggle.c:126
+ msgid "Toggle state"
+ msgstr "Estat commutat"
+
+-#: gtk/gtkcellrenderertoggle.c:127
++#: ../gtk/gtkcellrenderertoggle.c:127
+ msgid "The toggle state of the button"
+ msgstr "L'estat commutat del botó"
+
+-#: gtk/gtkcellrenderertoggle.c:134
++#: ../gtk/gtkcellrenderertoggle.c:134
+ msgid "Inconsistent state"
+ msgstr "Estat inconsistent"
+
+-#: gtk/gtkcellrenderertoggle.c:135
++#: ../gtk/gtkcellrenderertoggle.c:135
+ msgid "The inconsistent state of the button"
+ msgstr "L'estat inconsistent del botó"
+
+-#: gtk/gtkcellrenderertoggle.c:142
++#: ../gtk/gtkcellrenderertoggle.c:142
+ msgid "Activatable"
+ msgstr "Activable"
+
+-#: gtk/gtkcellrenderertoggle.c:143
++#: ../gtk/gtkcellrenderertoggle.c:143
+ msgid "The toggle button can be activated"
+ msgstr "El botó commutat pot trobar-se activat"
+
+-#: gtk/gtkcellrenderertoggle.c:150
++#: ../gtk/gtkcellrenderertoggle.c:150
+ msgid "Radio state"
+ msgstr "Estat ràdio"
+
+-#: gtk/gtkcellrenderertoggle.c:151
++#: ../gtk/gtkcellrenderertoggle.c:151
+ msgid "Draw the toggle button as a radio button"
+ msgstr "Dibuixa el botó de commutació com a botó de ràdio"
+
+-#: gtk/gtkcellrenderertoggle.c:158
++#: ../gtk/gtkcellrenderertoggle.c:158
+ msgid "Indicator size"
+ msgstr "Mida de l'indicador"
+
+-#: gtk/gtkcellrenderertoggle.c:159 gtk/gtkcheckbutton.c:70
+-#: gtk/gtkcheckmenuitem.c:112
++#: ../gtk/gtkcellrenderertoggle.c:159 ../gtk/gtkcheckbutton.c:70
++#: ../gtk/gtkcheckmenuitem.c:112
+ msgid "Size of check or radio indicator"
+ msgstr "Mida de l'indicador de ràdio o de verificació"
+
+-#: gtk/gtkcellview.c:182
++#: ../gtk/gtkcellview.c:182
+ msgid "CellView model"
+ msgstr "Model CellView"
+
+-#: gtk/gtkcellview.c:183
++#: ../gtk/gtkcellview.c:183
+ msgid "The model for cell view"
+ msgstr "El model per la vista de cel·les"
+
+-#: gtk/gtkcheckbutton.c:69 gtk/gtkcheckmenuitem.c:110 gtk/gtkoptionmenu.c:168
++#: ../gtk/gtkcheckbutton.c:69 ../gtk/gtkcheckmenuitem.c:110
++#: ../gtk/gtkoptionmenu.c:168
+ msgid "Indicator Size"
+ msgstr "Mida de l'indicador"
+
+-#: gtk/gtkcheckbutton.c:77 gtk/gtkexpander.c:245 gtk/gtkoptionmenu.c:174
++#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkexpander.c:245
++#: ../gtk/gtkoptionmenu.c:174
+ msgid "Indicator Spacing"
+ msgstr "Espaiat de l'indicador"
+
+-#: gtk/gtkcheckbutton.c:78
++#: ../gtk/gtkcheckbutton.c:78
+ msgid "Spacing around check or radio indicator"
+ msgstr "Espai que envolta l'indicador de ràdio o de verificació"
+
+-#: gtk/gtkcheckmenuitem.c:87 gtk/gtkmenu.c:498 gtk/gtktoggleaction.c:118
+-#: gtk/gtktogglebutton.c:102 gtk/gtktoggletoolbutton.c:101
++#: ../gtk/gtkcheckmenuitem.c:87 ../gtk/gtkmenu.c:498
++#: ../gtk/gtktoggleaction.c:118 ../gtk/gtktogglebutton.c:102
++#: ../gtk/gtktoggletoolbutton.c:101
+ msgid "Active"
+ msgstr "Actiu"
+
+-#: gtk/gtkcheckmenuitem.c:88
++#: ../gtk/gtkcheckmenuitem.c:88
+ msgid "Whether the menu item is checked"
+ msgstr "Si l'element del menú és seleccionat"
+
+-#: gtk/gtkcheckmenuitem.c:95 gtk/gtktogglebutton.c:110
++#: ../gtk/gtkcheckmenuitem.c:95 ../gtk/gtktogglebutton.c:110
+ msgid "Inconsistent"
+ msgstr "Inconsistent"
+
+-#: gtk/gtkcheckmenuitem.c:96
++#: ../gtk/gtkcheckmenuitem.c:96
+ msgid "Whether to display an \"inconsistent\" state"
+ msgstr "Si s'ha de visualitzar un estat «inconsistent»"
+
+-#: gtk/gtkcheckmenuitem.c:103
++#: ../gtk/gtkcheckmenuitem.c:103
+ msgid "Draw as radio menu item"
+ msgstr "Dibuixa com a element de menú de ràdio"
+
+-#: gtk/gtkcheckmenuitem.c:104
++#: ../gtk/gtkcheckmenuitem.c:104
+ msgid "Whether the menu item looks like a radio menu item"
+ msgstr "Si l'element del menú és seleccionat"
+
+-#: gtk/gtkcolorbutton.c:171
++#: ../gtk/gtkcolorbutton.c:171
+ msgid "Use alpha"
+ msgstr "Utilitza alfa"
+
+-#: gtk/gtkcolorbutton.c:172
++#: ../gtk/gtkcolorbutton.c:172
+ msgid "Whether or not to give the color an alpha value"
+ msgstr "Si s'ha de donar un valor alfa al color"
+
+-#: gtk/gtkcolorbutton.c:186 gtk/gtkfilechooserbutton.c:407
+-#: gtk/gtkfontbutton.c:142 gtk/gtkprintjob.c:116 gtk/gtktreeviewcolumn.c:264
++#: ../gtk/gtkcolorbutton.c:186 ../gtk/gtkfilechooserbutton.c:407
++#: ../gtk/gtkfontbutton.c:142 ../gtk/gtkprintjob.c:116
++#: ../gtk/gtktreeviewcolumn.c:264
+ msgid "Title"
+ msgstr "Títol"
+
+-#: gtk/gtkcolorbutton.c:187
++#: ../gtk/gtkcolorbutton.c:187
+ msgid "The title of the color selection dialog"
+ msgstr "El títol de finestra de selecció del color"
+
+-#: gtk/gtkcolorbutton.c:201 gtk/gtkcolorsel.c:293
++#: ../gtk/gtkcolorbutton.c:201 ../gtk/gtkcolorsel.c:293
+ msgid "Current Color"
+ msgstr "Color actual"
+
+-#: gtk/gtkcolorbutton.c:202
++#: ../gtk/gtkcolorbutton.c:202
+ msgid "The selected color"
+ msgstr "El color seleccionat"
+
+-#: gtk/gtkcolorbutton.c:216 gtk/gtkcolorsel.c:300
++#: ../gtk/gtkcolorbutton.c:216 ../gtk/gtkcolorsel.c:300
+ msgid "Current Alpha"
+ msgstr "Alfa actual"
+
+-#: gtk/gtkcolorbutton.c:217
++#: ../gtk/gtkcolorbutton.c:217
+ msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
+ msgstr ""
+ "The valor d'opacitat seleccionat (0 totalment transparent, 65535 totalment "
+ "opac)"
+
+-#: gtk/gtkcolorsel.c:279
++#: ../gtk/gtkcolorsel.c:279
+ msgid "Has Opacity Control"
+ msgstr "Té control d'opacitat"
+
+-#: gtk/gtkcolorsel.c:280
++#: ../gtk/gtkcolorsel.c:280
+ msgid "Whether the color selector should allow setting opacity"
+ msgstr "Si el selector podria permetre definir l'opacitat"
+
+-#: gtk/gtkcolorsel.c:286
++#: ../gtk/gtkcolorsel.c:286
+ msgid "Has palette"
+ msgstr "Té paleta"
+
+-#: gtk/gtkcolorsel.c:287
++#: ../gtk/gtkcolorsel.c:287
+ msgid "Whether a palette should be used"
+ msgstr "Si s'hauria d'utilitzar una paleta"
+
+-#: gtk/gtkcolorsel.c:294
++#: ../gtk/gtkcolorsel.c:294
+ msgid "The current color"
+ msgstr "El color actual"
+
+-#: gtk/gtkcolorsel.c:301
++#: ../gtk/gtkcolorsel.c:301
+ msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
+ msgstr ""
+ "The valor d'opacitat actual (0 totalment transparent, 65535 totalment opac)"
+
+-#: gtk/gtkcolorsel.c:315
++#: ../gtk/gtkcolorsel.c:315
+ msgid "Custom palette"
+ msgstr "Paleta personalitzada"
+
+-#: gtk/gtkcolorsel.c:316
++#: ../gtk/gtkcolorsel.c:316
+ msgid "Palette to use in the color selector"
+ msgstr "Paleta a utilitzar en el selector de color"
+
+-#: gtk/gtkcolorseldialog.c:102
++#: ../gtk/gtkcolorseldialog.c:102
+ msgid "Color Selection"
+ msgstr "Selecció de color"
+
+-#: gtk/gtkcolorseldialog.c:103
++#: ../gtk/gtkcolorseldialog.c:103
+ msgid "The color selection embedded in the dialog."
+ msgstr "La selecció de color incrustada en el diàleg."
+
+-#: gtk/gtkcolorseldialog.c:109
++#: ../gtk/gtkcolorseldialog.c:109
+ msgid "OK Button"
+ msgstr "Botó D'acord"
+
+-#: gtk/gtkcolorseldialog.c:110
++#: ../gtk/gtkcolorseldialog.c:110
+ msgid "The OK button of the dialog."
+ msgstr "El botó de confirmació del diàleg."
+
+-#: gtk/gtkcolorseldialog.c:116
++#: ../gtk/gtkcolorseldialog.c:116
+ msgid "Cancel Button"
+ msgstr "Botó Cancel·la"
+
+-#: gtk/gtkcolorseldialog.c:117
++#: ../gtk/gtkcolorseldialog.c:117
+ msgid "The cancel button of the dialog."
+ msgstr "El botó de cancel·lació del diàleg."
+
+-#: gtk/gtkcolorseldialog.c:123
++#: ../gtk/gtkcolorseldialog.c:123
+ msgid "Help Button"
+ msgstr "Botó Ajuda"
+
+-#: gtk/gtkcolorseldialog.c:124
++#: ../gtk/gtkcolorseldialog.c:124
+ msgid "The help button of the dialog."
+ msgstr "El botó d'ajuda del diàleg."
+
+-#: gtk/gtkcombo.c:145
++#: ../gtk/gtkcombo.c:145
+ msgid "Enable arrow keys"
+ msgstr "Habilita les tecles de fletxa"
+
+-#: gtk/gtkcombo.c:146
++#: ../gtk/gtkcombo.c:146
+ msgid "Whether the arrow keys move through the list of items"
+ msgstr "Si les tecles de fletxa es mouen a través de la llista d'elements"
+
+-#: gtk/gtkcombo.c:152
++#: ../gtk/gtkcombo.c:152
+ msgid "Always enable arrows"
+ msgstr "Habilita sempre les fletxes"
+
+-#: gtk/gtkcombo.c:153
++#: ../gtk/gtkcombo.c:153
+ msgid "Obsolete property, ignored"
+ msgstr "Propietat obsoleta, ignorada"
+
+-#: gtk/gtkcombo.c:159
++#: ../gtk/gtkcombo.c:159
+ msgid "Case sensitive"
+ msgstr "Diferencia majúscules"
+
+-#: gtk/gtkcombo.c:160
++#: ../gtk/gtkcombo.c:160
+ msgid "Whether list item matching is case sensitive"
+ msgstr "Com els elements emparellats de la llista diferencien majúscules"
+
+-#: gtk/gtkcombo.c:167
++#: ../gtk/gtkcombo.c:167
+ msgid "Allow empty"
+ msgstr "Permetre el buidat"
+
+-#: gtk/gtkcombo.c:168
++#: ../gtk/gtkcombo.c:168
+ msgid "Whether an empty value may be entered in this field"
+ msgstr "Com un valor buit pot ésser introduït en aquest camp"
+
+-#: gtk/gtkcombo.c:175
++#: ../gtk/gtkcombo.c:175
+ msgid "Value in list"
+ msgstr "Valor a la llista"
+
+-#: gtk/gtkcombo.c:176
++#: ../gtk/gtkcombo.c:176
+ msgid "Whether entered values must already be present in the list"
+ msgstr "Com els valors introduïts poden ésser presents a la llista"
+
+-#: gtk/gtkcombobox.c:661
++#: ../gtk/gtkcombobox.c:661
+ msgid "ComboBox model"
+ msgstr "Model quadre combinat"
+
+-#: gtk/gtkcombobox.c:662
++#: ../gtk/gtkcombobox.c:662
+ msgid "The model for the combo box"
+ msgstr "El model per al quadre combinat"
+
+-#: gtk/gtkcombobox.c:679
++#: ../gtk/gtkcombobox.c:679
+ msgid "Wrap width for laying out the items in a grid"
+ msgstr "Ajusta l'amplada per formatar els elements en una graella"
+
+-#: gtk/gtkcombobox.c:701
++#: ../gtk/gtkcombobox.c:701
+ msgid "Row span column"
+ msgstr "Columna de l'abast de les files"
+
+-#: gtk/gtkcombobox.c:702
++#: ../gtk/gtkcombobox.c:702
+ msgid "TreeModel column containing the row span values"
+ msgstr "La columna del TreeModel que conté els valors de l'abast de les files"
+
+-#: gtk/gtkcombobox.c:723
++#: ../gtk/gtkcombobox.c:723
+ msgid "Column span column"
+ msgstr "Columna de l'abast de les columnes"
+
+-#: gtk/gtkcombobox.c:724
++#: ../gtk/gtkcombobox.c:724
+ msgid "TreeModel column containing the column span values"
+ msgstr ""
+ "La columna del TreeModel que conté els valors de l'abast de les columnes"
+
+-#: gtk/gtkcombobox.c:745
++#: ../gtk/gtkcombobox.c:745
+ msgid "Active item"
+ msgstr "Element actiu"
+
+-#: gtk/gtkcombobox.c:746
++#: ../gtk/gtkcombobox.c:746
+ msgid "The item which is currently active"
+ msgstr "L'element que actualment està seleccionat"
+
+-#: gtk/gtkcombobox.c:765 gtk/gtkuimanager.c:220
++#: ../gtk/gtkcombobox.c:765 ../gtk/gtkuimanager.c:220
+ msgid "Add tearoffs to menus"
+ msgstr "Afegeix separadors als menús"
+
+-#: gtk/gtkcombobox.c:766
++#: ../gtk/gtkcombobox.c:766
+ msgid "Whether dropdowns should have a tearoff menu item"
+ msgstr "Si els menús desplegables han de tenir un element per desprendre'ls"
+
+-#: gtk/gtkcombobox.c:781 gtk/gtkentry.c:531
++#: ../gtk/gtkcombobox.c:781 ../gtk/gtkentry.c:531
+ msgid "Has Frame"
+ msgstr "Té marc"
+
+-#: gtk/gtkcombobox.c:782
++#: ../gtk/gtkcombobox.c:782
+ msgid "Whether the combo box draws a frame around the child"
+ msgstr "Si el quadre combinat ha de dibuixar un marc al voltant del fill"
+
+-#: gtk/gtkcombobox.c:790
++#: ../gtk/gtkcombobox.c:790
+ msgid "Whether the combo box grabs focus when it is clicked with the mouse"
+ msgstr "Si el quadre combinat agafa el focus en fer-hi clic amb el ratolí"
+
+-#: gtk/gtkcombobox.c:805 gtk/gtkmenu.c:553
++#: ../gtk/gtkcombobox.c:805 ../gtk/gtkmenu.c:553
+ msgid "Tearoff Title"
+ msgstr "Títol del menú separat"
+
+-#: gtk/gtkcombobox.c:806
++#: ../gtk/gtkcombobox.c:806
+ msgid ""
+ "A title that may be displayed by the window manager when the popup is torn-"
+ "off"
+@@ -1992,179 +2014,179 @@
+ "Un títol que el gestor de finestres pot visualitzar si s'ha desactivat la "
+ "part desplegable d'un quadre combinat"
+
+-#: gtk/gtkcombobox.c:823
++#: ../gtk/gtkcombobox.c:823
+ msgid "Popup shown"
+ msgstr "Part desplegable mostrada"
+
+-#: gtk/gtkcombobox.c:824
++#: ../gtk/gtkcombobox.c:824
+ msgid "Whether the combo's dropdown is shown"
+ msgstr "Si s'està mostrant la part desplegable del quadre combinat"
+
+-#: gtk/gtkcombobox.c:840
++#: ../gtk/gtkcombobox.c:840
+ msgid "Button Sensitivity"
+ msgstr "Sensibilitat del botó"
+
+-#: gtk/gtkcombobox.c:841
++#: ../gtk/gtkcombobox.c:841
+ msgid "Whether the dropdown button is sensitive when the model is empty"
+ msgstr "Si el botó desplegable és sensible quan el model és buit"
+
+-#: gtk/gtkcombobox.c:848
++#: ../gtk/gtkcombobox.c:848
+ msgid "Appears as list"
+ msgstr "Apareix com una llista"
+
+-#: gtk/gtkcombobox.c:849
++#: ../gtk/gtkcombobox.c:849
+ msgid "Whether dropdowns should look like lists rather than menus"
+ msgstr ""
+ "Si els menús desplegables han d'assemblar-se a llistes en lloc de menús"
+
+-#: gtk/gtkcombobox.c:865
++#: ../gtk/gtkcombobox.c:865
+ msgid "Arrow Size"
+ msgstr "Mida de la fletxa"
+
+-#: gtk/gtkcombobox.c:866
++#: ../gtk/gtkcombobox.c:866
+ msgid "The minimum size of the arrow in the combo box"
+ msgstr "La mida mínima de la fletxa al quadre combinat"
+
+-#: gtk/gtkcombobox.c:881 gtk/gtkentry.c:631 gtk/gtkhandlebox.c:174
+-#: gtk/gtkmenubar.c:194 gtk/gtkstatusbar.c:186 gtk/gtktoolbar.c:630
+-#: gtk/gtkviewport.c:122
++#: ../gtk/gtkcombobox.c:881 ../gtk/gtkentry.c:631 ../gtk/gtkhandlebox.c:174
++#: ../gtk/gtkmenubar.c:194 ../gtk/gtkstatusbar.c:186 ../gtk/gtktoolbar.c:630
++#: ../gtk/gtkviewport.c:122
+ msgid "Shadow type"
+ msgstr "Tipus d'ombra"
+
+-#: gtk/gtkcombobox.c:882
++#: ../gtk/gtkcombobox.c:882
+ msgid "Which kind of shadow to draw around the combo box"
+ msgstr "El tipus d'ombra que es dibuixarà al voltant del quadre combinat"
+
+-#: gtk/gtkcontainer.c:237
++#: ../gtk/gtkcontainer.c:237
+ msgid "Resize mode"
+ msgstr "Mode de redimensió"
+
+-#: gtk/gtkcontainer.c:238
++#: ../gtk/gtkcontainer.c:238
+ msgid "Specify how resize events are handled"
+ msgstr "Especifiqueu com redimensionar les incidències gestionades"
+
+-#: gtk/gtkcontainer.c:245
++#: ../gtk/gtkcontainer.c:245
+ msgid "Border width"
+ msgstr "Amplada del contorn"
+
+-#: gtk/gtkcontainer.c:246
++#: ../gtk/gtkcontainer.c:246
+ msgid "The width of the empty border outside the containers children"
+ msgstr "L'amplada del contorn buit fora dels fills de l'element contenidor"
+
+-#: gtk/gtkcontainer.c:254
++#: ../gtk/gtkcontainer.c:254
+ msgid "Child"
+ msgstr "Fill"
+
+-#: gtk/gtkcontainer.c:255
++#: ../gtk/gtkcontainer.c:255
+ msgid "Can be used to add a new child to the container"
+ msgstr "Es pot utilitzar per a afegir un nou fill a la caixa"
+
+-#: gtk/gtkcurve.c:124
++#: ../gtk/gtkcurve.c:124
+ msgid "Curve type"
+ msgstr "Tipus de corba"
+
+-#: gtk/gtkcurve.c:125
++#: ../gtk/gtkcurve.c:125
+ msgid "Is this curve linear, spline interpolated, or free-form"
+ msgstr "És aquesta corba lineal, de tira interpolada, o de lliure-forma"
+
+-#: gtk/gtkcurve.c:132
++#: ../gtk/gtkcurve.c:132
+ msgid "Minimum X"
+ msgstr "X mínim"
+
+-#: gtk/gtkcurve.c:133
++#: ../gtk/gtkcurve.c:133
+ msgid "Minimum possible value for X"
+ msgstr "Valor mínim possible per a X"
+
+-#: gtk/gtkcurve.c:141
++#: ../gtk/gtkcurve.c:141
+ msgid "Maximum X"
+ msgstr "X màxim"
+
+-#: gtk/gtkcurve.c:142
++#: ../gtk/gtkcurve.c:142
+ msgid "Maximum possible X value"
+ msgstr "Valor màxim possible per a X"
+
+-#: gtk/gtkcurve.c:150
++#: ../gtk/gtkcurve.c:150
+ msgid "Minimum Y"
+ msgstr "Y mínim"
+
+-#: gtk/gtkcurve.c:151
++#: ../gtk/gtkcurve.c:151
+ msgid "Minimum possible value for Y"
+ msgstr "Valor mínim possible per a Y"
+
+-#: gtk/gtkcurve.c:159
++#: ../gtk/gtkcurve.c:159
+ msgid "Maximum Y"
+ msgstr "Y màxim"
+
+-#: gtk/gtkcurve.c:160
++#: ../gtk/gtkcurve.c:160
+ msgid "Maximum possible value for Y"
+ msgstr "Valor màxim possible per a Y"
+
+-#: gtk/gtkdialog.c:145
++#: ../gtk/gtkdialog.c:145
+ msgid "Has separator"
+ msgstr "Té separador"
+
+-#: gtk/gtkdialog.c:146
++#: ../gtk/gtkdialog.c:146
+ msgid "The dialog has a separator bar above its buttons"
+ msgstr "El diàleg té una barra espaiadora per sobre dels seus botons"
+
+-#: gtk/gtkdialog.c:191
++#: ../gtk/gtkdialog.c:191
+ msgid "Content area border"
+ msgstr "Contorn de l'àrea de contingut"
+
+-#: gtk/gtkdialog.c:192
++#: ../gtk/gtkdialog.c:192
+ msgid "Width of border around the main dialog area"
+ msgstr "Amplada del contorn al voltant de l'àrea de diàleg principal"
+
+-#: gtk/gtkdialog.c:199
++#: ../gtk/gtkdialog.c:199
+ msgid "Button spacing"
+ msgstr "Espaiat del botó"
+
+-#: gtk/gtkdialog.c:200
++#: ../gtk/gtkdialog.c:200
+ msgid "Spacing between buttons"
+ msgstr "Espaiat entre botons"
+
+-#: gtk/gtkdialog.c:208
++#: ../gtk/gtkdialog.c:208
+ msgid "Action area border"
+ msgstr "Contorn d'àrea d'acció"
+
+-#: gtk/gtkdialog.c:209
++#: ../gtk/gtkdialog.c:209
+ msgid "Width of border around the button area at the bottom of the dialog"
+ msgstr "Amplada del contorn al voltant l'àrea de botons per sota del diàleg"
+
+-#: gtk/gtkentry.c:486 gtk/gtklabel.c:411
++#: ../gtk/gtkentry.c:486 ../gtk/gtklabel.c:411
+ msgid "Cursor Position"
+ msgstr "Posició del cursor"
+
+-#: gtk/gtkentry.c:487 gtk/gtklabel.c:412
++#: ../gtk/gtkentry.c:487 ../gtk/gtklabel.c:412
+ msgid "The current position of the insertion cursor in chars"
+ msgstr "La posició actual del cursor d'inserció en caràcters"
+
+-#: gtk/gtkentry.c:496 gtk/gtklabel.c:421
++#: ../gtk/gtkentry.c:496 ../gtk/gtklabel.c:421
+ msgid "Selection Bound"
+ msgstr "Límit seleccionat"
+
+-#: gtk/gtkentry.c:497 gtk/gtklabel.c:422
++#: ../gtk/gtkentry.c:497 ../gtk/gtklabel.c:422
+ msgid ""
+ "The position of the opposite end of the selection from the cursor in chars"
+ msgstr "La posició del final oposat de la selecció des del cursor en caràcters"
+
+-#: gtk/gtkentry.c:507
++#: ../gtk/gtkentry.c:507
+ msgid "Whether the entry contents can be edited"
+ msgstr "Si els continguts d'entrada es poden editar"
+
+-#: gtk/gtkentry.c:514
++#: ../gtk/gtkentry.c:514
+ msgid "Maximum length"
+ msgstr "Llargada màxima"
+
+-#: gtk/gtkentry.c:515
++#: ../gtk/gtkentry.c:515
+ msgid "Maximum number of characters for this entry. Zero if no maximum"
+ msgstr "Nombre màxim de caràcters per aquesta entrada. Zero si no té màxim"
+
+-#: gtk/gtkentry.c:523
++#: ../gtk/gtkentry.c:523
+ msgid "Visibility"
+ msgstr "Visibilitat"
+
+-#: gtk/gtkentry.c:524
++#: ../gtk/gtkentry.c:524
+ msgid ""
+ "FALSE displays the \"invisible char\" instead of the actual text (password "
+ "mode)"
+@@ -2172,32 +2194,32 @@
+ "FALS mostrarà el «caràcter d'invisibilitat» en lloc del text actual (mode de "
+ "contrasenya)"
+
+-#: gtk/gtkentry.c:532
++#: ../gtk/gtkentry.c:532
+ msgid "FALSE removes outside bevel from entry"
+ msgstr "FALS suprimirà el bisell exterior de l'entrada"
+
+-#: gtk/gtkentry.c:540
++#: ../gtk/gtkentry.c:540
+ msgid ""
+ "Border between text and frame. Overrides the inner-border style property"
+ msgstr ""
+ "Vora entre el text i el marc. Substitueix l'estil de la propietat de la vora "
+ "de dins"
+
+-#: gtk/gtkentry.c:547
++#: ../gtk/gtkentry.c:547
+ msgid "Invisible character"
+ msgstr "Caràcter d'invisibilitat"
+
+-#: gtk/gtkentry.c:548
++#: ../gtk/gtkentry.c:548
+ msgid "The character to use when masking entry contents (in \"password mode\")"
+ msgstr ""
+ "El caràcter a emprar quan s'emmascara el contingut de l'entrada (en «mode "
+ "contrasenya»)"
+
+-#: gtk/gtkentry.c:555
++#: ../gtk/gtkentry.c:555
+ msgid "Activates default"
+ msgstr "Activa per defecte"
+
+-#: gtk/gtkentry.c:556
++#: ../gtk/gtkentry.c:556
+ msgid ""
+ "Whether to activate the default widget (such as the default button in a "
+ "dialog) when Enter is pressed"
+@@ -2205,32 +2227,32 @@
+ "Si s'ha d'activar el giny per defecte (com a botó per defecte en un diàleg) "
+ "quan es prem Retorn"
+
+-#: gtk/gtkentry.c:562
++#: ../gtk/gtkentry.c:562
+ msgid "Width in chars"
+ msgstr "Amplada en caràcters"
+
+-#: gtk/gtkentry.c:563
++#: ../gtk/gtkentry.c:563
+ msgid "Number of characters to leave space for in the entry"
+ msgstr "Nombre de caràcters per als quals deixar espai en l'entrada"
+
+-#: gtk/gtkentry.c:572
++#: ../gtk/gtkentry.c:572
+ msgid "Scroll offset"
+ msgstr "Desplaçament"
+
+-#: gtk/gtkentry.c:573
++#: ../gtk/gtkentry.c:573
+ msgid "Number of pixels of the entry scrolled off the screen to the left"
+ msgstr ""
+ "Nombre de píxels de l'entrada desplaçats cap a l'esquerre de la pantalla"
+
+-#: gtk/gtkentry.c:583
++#: ../gtk/gtkentry.c:583
+ msgid "The contents of the entry"
+ msgstr "Els continguts de l'entrada"
+
+-#: gtk/gtkentry.c:598 gtk/gtkmisc.c:73
++#: ../gtk/gtkentry.c:598 ../gtk/gtkmisc.c:73
+ msgid "X align"
+ msgstr "Alineació X"
+
+-#: gtk/gtkentry.c:599 gtk/gtkmisc.c:74
++#: ../gtk/gtkentry.c:599 ../gtk/gtkmisc.c:74
+ msgid ""
+ "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
+ "layouts."
+@@ -2238,128 +2260,128 @@
+ "L'alineació horitzontal, des de 0 (esquerre) a 1 (dreta). Només per a "
+ "formats RTL (dreta a esquerra)."
+
+-#: gtk/gtkentry.c:615
++#: ../gtk/gtkentry.c:615
+ msgid "Truncate multiline"
+ msgstr "Trunca línies múltiples"
+
+-#: gtk/gtkentry.c:616
++#: ../gtk/gtkentry.c:616
+ msgid "Whether to truncate multiline pastes to one line."
+ msgstr "Si s'han de truncar enganxades de més d'una línia en una de sola."
+
+-#: gtk/gtkentry.c:632
++#: ../gtk/gtkentry.c:632
+ msgid "Which kind of shadow to draw around the entry when has-frame is set"
+ msgstr ""
+ "Quin tipus d'ombra s'ha de dibuixar al voltant de l'entrada quan «has-frame» "
+ "està activat"
+
+-#: gtk/gtkentry.c:647 gtk/gtktextview.c:648
++#: ../gtk/gtkentry.c:647 ../gtk/gtktextview.c:648
+ msgid "Overwrite mode"
+ msgstr "Mode de sobreescriptura"
+
+-#: gtk/gtkentry.c:648
++#: ../gtk/gtkentry.c:648
+ msgid "Whether new text overwrites existing text"
+ msgstr "Si el text introduït de nou sobreescriu l'existent"
+
+-#: gtk/gtkentry.c:661
++#: ../gtk/gtkentry.c:661
+ msgid "Text length"
+ msgstr "Llargada del text"
+
+-#: gtk/gtkentry.c:662
++#: ../gtk/gtkentry.c:662
+ msgid "Length of the text currently in the entry"
+ msgstr "Llargada del text que hi ha actualment a l'entrada"
+
+-#: gtk/gtkentry.c:933
++#: ../gtk/gtkentry.c:933
+ msgid "Border between text and frame."
+ msgstr "Vora entre el text i el quadre."
+
+-#: gtk/gtkentry.c:938 gtk/gtklabel.c:644
++#: ../gtk/gtkentry.c:938 ../gtk/gtklabel.c:644
+ msgid "Select on focus"
+ msgstr "Selecciona en enfocar"
+
+-#: gtk/gtkentry.c:939
++#: ../gtk/gtkentry.c:939
+ msgid "Whether to select the contents of an entry when it is focused"
+ msgstr "Si s'ha de seleccionar els continguts d'una entrada quan s'enfoca"
+
+-#: gtk/gtkentry.c:953
++#: ../gtk/gtkentry.c:953
+ msgid "Password Hint Timeout"
+ msgstr "Temps d'espera de l'ajuda emergent per a contrasenyes"
+
+-#: gtk/gtkentry.c:954
++#: ../gtk/gtkentry.c:954
+ msgid "How long to show the last input character in hidden entries"
+ msgstr ""
+ "Durant quant de temps s'ha de mostrar el darrer caràcter introduït en les "
+ "entrades ocultes"
+
+-#: gtk/gtkentrycompletion.c:279
++#: ../gtk/gtkentrycompletion.c:279
+ msgid "Completion Model"
+ msgstr "Model de compleció"
+
+-#: gtk/gtkentrycompletion.c:280
++#: ../gtk/gtkentrycompletion.c:280
+ msgid "The model to find matches in"
+ msgstr "El model on cercar coincidències"
+
+-#: gtk/gtkentrycompletion.c:286
++#: ../gtk/gtkentrycompletion.c:286
+ msgid "Minimum Key Length"
+ msgstr "Longitud mínima de la clau"
+
+-#: gtk/gtkentrycompletion.c:287
++#: ../gtk/gtkentrycompletion.c:287
+ msgid "Minimum length of the search key in order to look up matches"
+ msgstr "Longitud mínima de la clau de cerca per cercar coincidències"
+
+-#: gtk/gtkentrycompletion.c:303 gtk/gtkiconview.c:587
++#: ../gtk/gtkentrycompletion.c:303 ../gtk/gtkiconview.c:587
+ msgid "Text column"
+ msgstr "Columna de text"
+
+-#: gtk/gtkentrycompletion.c:304
++#: ../gtk/gtkentrycompletion.c:304
+ msgid "The column of the model containing the strings."
+ msgstr "La columna del model que conté les cadenes."
+
+-#: gtk/gtkentrycompletion.c:323
++#: ../gtk/gtkentrycompletion.c:323
+ msgid "Inline completion"
+ msgstr "Compleció en línia"
+
+-#: gtk/gtkentrycompletion.c:324
++#: ../gtk/gtkentrycompletion.c:324
+ msgid "Whether the common prefix should be inserted automatically"
+ msgstr "Si el prefix comú s'hauria d'inserir automàticament"
+
+-#: gtk/gtkentrycompletion.c:338
++#: ../gtk/gtkentrycompletion.c:338
+ msgid "Popup completion"
+ msgstr "Compleció emergent"
+
+-#: gtk/gtkentrycompletion.c:339
++#: ../gtk/gtkentrycompletion.c:339
+ msgid "Whether the completions should be shown in a popup window"
+ msgstr "Si les complecions s'haurien de mostrar en una finestra emergent"
+
+-#: gtk/gtkentrycompletion.c:354
++#: ../gtk/gtkentrycompletion.c:354
+ msgid "Popup set width"
+ msgstr "Amplada del menú emergent"
+
+-#: gtk/gtkentrycompletion.c:355
++#: ../gtk/gtkentrycompletion.c:355
+ msgid "If TRUE, the popup window will have the same size as the entry"
+ msgstr "Si és CERT, la finestra emergent tindrà la mateixa mida que l'entrada"
+
+-#: gtk/gtkentrycompletion.c:373
++#: ../gtk/gtkentrycompletion.c:373
+ msgid "Popup single match"
+ msgstr "Amplada d'una coincidència"
+
+-#: gtk/gtkentrycompletion.c:374
++#: ../gtk/gtkentrycompletion.c:374
+ msgid "If TRUE, the popup window will appear for a single match."
+ msgstr ""
+ "Si és CERT, la finestra emergent apareixerà amb només una coincidència."
+
+-#: gtk/gtkentrycompletion.c:388
++#: ../gtk/gtkentrycompletion.c:388
+ msgid "Inline selection"
+ msgstr "Selecció en línia"
+
+-#: gtk/gtkentrycompletion.c:389
++#: ../gtk/gtkentrycompletion.c:389
+ msgid "Your description here"
+ msgstr "Poseu una descripció aquí"
+
+-#: gtk/gtkeventbox.c:91
++#: ../gtk/gtkeventbox.c:91
+ msgid "Visible Window"
+ msgstr "Finestra visible"
+
+-#: gtk/gtkeventbox.c:92
++#: ../gtk/gtkeventbox.c:92
+ msgid ""
+ "Whether the event box is visible, as opposed to invisible and only used to "
+ "trap events."
+@@ -2367,11 +2389,11 @@
+ "Si la caixa d'esdeveniments és visible, contràriament a invisible i només "
+ "per atrapar esdeveniments."
+
+-#: gtk/gtkeventbox.c:98
++#: ../gtk/gtkeventbox.c:98
+ msgid "Above child"
+ msgstr "Per sobre del fill"
+
+-#: gtk/gtkeventbox.c:99
++#: ../gtk/gtkeventbox.c:99
+ msgid ""
+ "Whether the event-trapping window of the eventbox is above the window of the "
+ "child widget as opposed to below it."
+@@ -2379,143 +2401,144 @@
+ "Si la finestra per atrapar incidències de la caixa d'incidències és per "
+ "sobre de la finestra del giny fill, contràriament a per sota seu."
+
+-#: gtk/gtkexpander.c:187
++#: ../gtk/gtkexpander.c:187
+ msgid "Expanded"
+ msgstr "Estès"
+
+-#: gtk/gtkexpander.c:188
++#: ../gtk/gtkexpander.c:188
+ msgid "Whether the expander has been opened to reveal the child widget"
+ msgstr "Si l'extensor s'ha obert per mostrar el giny fill"
+
+-#: gtk/gtkexpander.c:196
++#: ../gtk/gtkexpander.c:196
+ msgid "Text of the expander's label"
+ msgstr "Text de l'etiqueta de l'expansor"
+
+-#: gtk/gtkexpander.c:211 gtk/gtklabel.c:330
++#: ../gtk/gtkexpander.c:211 ../gtk/gtklabel.c:330
+ msgid "Use markup"
+ msgstr "Utilitza marques"
+
+-#: gtk/gtkexpander.c:212 gtk/gtklabel.c:331
++#: ../gtk/gtkexpander.c:212 ../gtk/gtklabel.c:331
+ msgid "The text of the label includes XML markup. See pango_parse_markup()"
+ msgstr ""
+ "El text de l'etiqueta inclou les marques XML. Vegeu pango_parse_markup()"
+
+-#: gtk/gtkexpander.c:220
++#: ../gtk/gtkexpander.c:220
+ msgid "Space to put between the label and the child"
+ msgstr "Espai a posar entre l'etiqueta i el fill"
+
+-#: gtk/gtkexpander.c:229 gtk/gtkframe.c:147 gtk/gtktoolbutton.c:194
++#: ../gtk/gtkexpander.c:229 ../gtk/gtkframe.c:147 ../gtk/gtktoolbutton.c:194
+ msgid "Label widget"
+ msgstr "Giny etiqueta"
+
+-#: gtk/gtkexpander.c:230
++#: ../gtk/gtkexpander.c:230
+ msgid "A widget to display in place of the usual expander label"
+ msgstr "Un giny per visualitzar en lloc de la típica etiqueta expansora"
+
+-#: gtk/gtkexpander.c:236 gtk/gtktreeview.c:783
++#: ../gtk/gtkexpander.c:236 ../gtk/gtktreeview.c:783
+ msgid "Expander Size"
+ msgstr "Mida de l'expansor"
+
+-#: gtk/gtkexpander.c:237 gtk/gtktreeview.c:784
++#: ../gtk/gtkexpander.c:237 ../gtk/gtktreeview.c:784
+ msgid "Size of the expander arrow"
+ msgstr "Mida de la fila expansora"
+
+-#: gtk/gtkexpander.c:246
++#: ../gtk/gtkexpander.c:246
+ msgid "Spacing around expander arrow"
+ msgstr "Espai al voltant de la fletxa de l'expansor"
+
+-#: gtk/gtkfilechooser.c:194
++#: ../gtk/gtkfilechooser.c:194
+ msgid "Action"
+ msgstr "Acció"
+
+-#: gtk/gtkfilechooser.c:195
++#: ../gtk/gtkfilechooser.c:195
+ msgid "The type of operation that the file selector is performing"
+ msgstr "El tipus d'operació que fa el selector de fitxers"
+
+-#: gtk/gtkfilechooser.c:201
++#: ../gtk/gtkfilechooser.c:201
+ msgid "File System Backend"
+ msgstr "Rerefons del sistema de fitxers"
+
+-#: gtk/gtkfilechooser.c:202
++#: ../gtk/gtkfilechooser.c:202
+ msgid "Name of file system backend to use"
+ msgstr "Nom del rerefons del sistema de fitxers a utilitzar"
+
+-#: gtk/gtkfilechooser.c:207 gtk/gtkrecentchooser.c:252
++#: ../gtk/gtkfilechooser.c:207 ../gtk/gtkrecentchooser.c:252
+ msgid "Filter"
+ msgstr "Filtre"
+
+-#: gtk/gtkfilechooser.c:208
++#: ../gtk/gtkfilechooser.c:208
+ msgid "The current filter for selecting which files are displayed"
+ msgstr "El filtre actual per seleccionar quins fitxers es mostraran"
+
+-#: gtk/gtkfilechooser.c:213
++#: ../gtk/gtkfilechooser.c:213
+ msgid "Local Only"
+ msgstr "Només locals"
+
+-#: gtk/gtkfilechooser.c:214
++#: ../gtk/gtkfilechooser.c:214
+ msgid "Whether the selected file(s) should be limited to local file: URLs"
+ msgstr "Si els fitxers seleccionats s'haurien de limitar a fitxers locals: URL"
+
+-#: gtk/gtkfilechooser.c:219
++#: ../gtk/gtkfilechooser.c:219
+ msgid "Preview widget"
+ msgstr "Giny de visualització prèvia"
+
+-#: gtk/gtkfilechooser.c:220
++#: ../gtk/gtkfilechooser.c:220
+ msgid "Application supplied widget for custom previews."
+ msgstr ""
+ "Giny proporcionat per l'aplicació per a visualitzacions prèvies "
+ "personalitzades."
+
+-#: gtk/gtkfilechooser.c:225
++#: ../gtk/gtkfilechooser.c:225
+ msgid "Preview Widget Active"
+ msgstr "Giny de visualització prèvia actiu"
+
+-#: gtk/gtkfilechooser.c:226
++#: ../gtk/gtkfilechooser.c:226
+ msgid ""
+ "Whether the application supplied widget for custom previews should be shown."
+ msgstr ""
+ "Si s'ha de mostrar el giny de visualització prèvia que l'aplicació "
+ "proporciona"
+
+-#: gtk/gtkfilechooser.c:231
++#: ../gtk/gtkfilechooser.c:231
+ msgid "Use Preview Label"
+ msgstr "Utilitza l'etiqueta de visualització prèvia"
+
+-#: gtk/gtkfilechooser.c:232
++#: ../gtk/gtkfilechooser.c:232
+ msgid "Whether to display a stock label with the name of the previewed file."
+ msgstr ""
+ "Si s'ha de mostrar l'etiqueta predeterminada amb el nom del fitxer "
+ "visualitzat."
+
+-#: gtk/gtkfilechooser.c:237
++#: ../gtk/gtkfilechooser.c:237
+ msgid "Extra widget"
+ msgstr "Giny addicional"
+
+-#: gtk/gtkfilechooser.c:238
++#: ../gtk/gtkfilechooser.c:238
+ msgid "Application supplied widget for extra options."
+ msgstr "Giny proporcionat per l'aplicació per a opcions addicionals."
+
+-#: gtk/gtkfilechooser.c:243 gtk/gtkfilesel.c:540 gtk/gtkrecentchooser.c:191
++#: ../gtk/gtkfilechooser.c:243 ../gtk/gtkfilesel.c:540
++#: ../gtk/gtkrecentchooser.c:191
+ msgid "Select Multiple"
+ msgstr "Selecció múltiple"
+
+-#: gtk/gtkfilechooser.c:244 gtk/gtkfilesel.c:541
++#: ../gtk/gtkfilechooser.c:244 ../gtk/gtkfilesel.c:541
+ msgid "Whether to allow multiple files to be selected"
+ msgstr "Si s'ha permetre que fitxers múltiples siguin seleccionats"
+
+-#: gtk/gtkfilechooser.c:250
++#: ../gtk/gtkfilechooser.c:250
+ msgid "Show Hidden"
+ msgstr "Mostra ocults"
+
+-#: gtk/gtkfilechooser.c:251
++#: ../gtk/gtkfilechooser.c:251
+ msgid "Whether the hidden files and folders should be displayed"
+ msgstr "Si s'han de mostrar els fitxers i directoris ocults"
+
+-#: gtk/gtkfilechooser.c:266
++#: ../gtk/gtkfilechooser.c:266
+ msgid "Do overwrite confirmation"
+ msgstr "Confirma la sobreescriptura"
+
+-#: gtk/gtkfilechooser.c:267
++#: ../gtk/gtkfilechooser.c:267
+ msgid ""
+ "Whether a file chooser in save mode will present an overwrite confirmation "
+ "dialog if necessary."
+@@ -2523,172 +2546,172 @@
+ "Si un selector de fitxers que permeti desar ha de demanar confirmació en cas "
+ "que se sobreescrigui algun fitxer."
+
+-#: gtk/gtkfilechooserbutton.c:376
++#: ../gtk/gtkfilechooserbutton.c:376
+ msgid "Dialog"
+ msgstr "Diàleg"
+
+-#: gtk/gtkfilechooserbutton.c:377
++#: ../gtk/gtkfilechooserbutton.c:377
+ msgid "The file chooser dialog to use."
+ msgstr "El diàleg de selecció de fitxer a utilitzar."
+
+-#: gtk/gtkfilechooserbutton.c:408
++#: ../gtk/gtkfilechooserbutton.c:408
+ msgid "The title of the file chooser dialog."
+ msgstr "El títol del diàleg de selecció de fitxers."
+
+-#: gtk/gtkfilechooserbutton.c:422
++#: ../gtk/gtkfilechooserbutton.c:422
+ msgid "The desired width of the button widget, in characters."
+ msgstr "L'amplada desitjada del giny botó, en caràcters."
+
+-#: gtk/gtkfilesel.c:526 gtk/gtkimage.c:163 gtk/gtkrecentmanager.c:214
+-#: gtk/gtkstatusicon.c:194
++#: ../gtk/gtkfilesel.c:526 ../gtk/gtkimage.c:163 ../gtk/gtkrecentmanager.c:214
++#: ../gtk/gtkstatusicon.c:194
+ msgid "Filename"
+ msgstr "Nom del fitxer"
+
+-#: gtk/gtkfilesel.c:527
++#: ../gtk/gtkfilesel.c:527
+ msgid "The currently selected filename"
+ msgstr "El nom del fitxer seleccionat actualment"
+
+-#: gtk/gtkfilesel.c:533
++#: ../gtk/gtkfilesel.c:533
+ msgid "Show file operations"
+ msgstr "Mostra les operacions de fitxer"
+
+-#: gtk/gtkfilesel.c:534
++#: ../gtk/gtkfilesel.c:534
+ msgid "Whether buttons for creating/manipulating files should be displayed"
+ msgstr "Si s'han de visualitzar els botons per crear/manipular fitxers"
+
+-#: gtk/gtkfixed.c:90 gtk/gtklayout.c:596
++#: ../gtk/gtkfixed.c:90 ../gtk/gtklayout.c:596
+ msgid "X position"
+ msgstr "Posició X"
+
+-#: gtk/gtkfixed.c:91 gtk/gtklayout.c:597
++#: ../gtk/gtkfixed.c:91 ../gtk/gtklayout.c:597
+ msgid "X position of child widget"
+ msgstr "Posició X del giny fill"
+
+-#: gtk/gtkfixed.c:100 gtk/gtklayout.c:606
++#: ../gtk/gtkfixed.c:100 ../gtk/gtklayout.c:606
+ msgid "Y position"
+ msgstr "Posició Y"
+
+-#: gtk/gtkfixed.c:101 gtk/gtklayout.c:607
++#: ../gtk/gtkfixed.c:101 ../gtk/gtklayout.c:607
+ msgid "Y position of child widget"
+ msgstr "Posició Y del giny fill"
+
+-#: gtk/gtkfontbutton.c:143
++#: ../gtk/gtkfontbutton.c:143
+ msgid "The title of the font selection dialog"
+ msgstr "El títol del diàleg de selecció del tipus de lletra"
+
+-#: gtk/gtkfontbutton.c:158 gtk/gtkfontsel.c:181
++#: ../gtk/gtkfontbutton.c:158 ../gtk/gtkfontsel.c:181
+ msgid "Font name"
+ msgstr "Nom de tipus de lletra"
+
+-#: gtk/gtkfontbutton.c:159
++#: ../gtk/gtkfontbutton.c:159
+ msgid "The name of the selected font"
+ msgstr "El nom del tipus de lletra seleccionat"
+
+-#: gtk/gtkfontbutton.c:160
++#: ../gtk/gtkfontbutton.c:160
+ msgid "Sans 12"
+ msgstr "Sans 12"
+
+-#: gtk/gtkfontbutton.c:175
++#: ../gtk/gtkfontbutton.c:175
+ msgid "Use font in label"
+ msgstr "Utilitza el tipus de lletra de l'etiqueta"
+
+-#: gtk/gtkfontbutton.c:176
++#: ../gtk/gtkfontbutton.c:176
+ msgid "Whether the label is drawn in the selected font"
+ msgstr "Si l'etiqueta es dibuixa amb el tipus de lletra seleccionat"
+
+-#: gtk/gtkfontbutton.c:191
++#: ../gtk/gtkfontbutton.c:191
+ msgid "Use size in label"
+ msgstr "Utilitza la mida de l'etiqueta"
+
+-#: gtk/gtkfontbutton.c:192
++#: ../gtk/gtkfontbutton.c:192
+ msgid "Whether the label is drawn with the selected font size"
+ msgstr "Si l'etiqueta es dibuixa amb la mida del tipus de lletra seleccionada"
+
+-#: gtk/gtkfontbutton.c:208
++#: ../gtk/gtkfontbutton.c:208
+ msgid "Show style"
+ msgstr "Mostra l'estil"
+
+-#: gtk/gtkfontbutton.c:209
++#: ../gtk/gtkfontbutton.c:209
+ msgid "Whether the selected font style is shown in the label"
+ msgstr "Si l'estil del tipus de lletra es mostra en l'etiqueta"
+
+-#: gtk/gtkfontbutton.c:224
++#: ../gtk/gtkfontbutton.c:224
+ msgid "Show size"
+ msgstr "Mostra la mida"
+
+-#: gtk/gtkfontbutton.c:225
++#: ../gtk/gtkfontbutton.c:225
+ msgid "Whether selected font size is shown in the label"
+ msgstr "Si es mostra la mida del tipus de lletra en l'etiqueta"
+
+-#: gtk/gtkfontsel.c:182
++#: ../gtk/gtkfontsel.c:182
+ msgid "The string that represents this font"
+ msgstr "La cadena que representa aquest tipus de lletra"
+
+-#: gtk/gtkfontsel.c:189
++#: ../gtk/gtkfontsel.c:189
+ msgid "The GdkFont that is currently selected"
+ msgstr "El GdkFont actualment està seleccionat"
+
+-#: gtk/gtkfontsel.c:195
++#: ../gtk/gtkfontsel.c:195
+ msgid "Preview text"
+ msgstr "Text previsualitzat"
+
+-#: gtk/gtkfontsel.c:196
++#: ../gtk/gtkfontsel.c:196
+ msgid "The text to display in order to demonstrate the selected font"
+ msgstr "El text a visualitzar per a demostrar el tipus de lletra seleccionat"
+
+-#: gtk/gtkframe.c:106
++#: ../gtk/gtkframe.c:106
+ msgid "Text of the frame's label"
+ msgstr "Text de l'etiqueta del marc"
+
+-#: gtk/gtkframe.c:113
++#: ../gtk/gtkframe.c:113
+ msgid "Label xalign"
+ msgstr "Etiqueta xalign"
+
+-#: gtk/gtkframe.c:114
++#: ../gtk/gtkframe.c:114
+ msgid "The horizontal alignment of the label"
+ msgstr "L'alineació horitzontal de l'etiqueta"
+
+-#: gtk/gtkframe.c:122
++#: ../gtk/gtkframe.c:122
+ msgid "Label yalign"
+ msgstr "Etiqueta yalign"
+
+-#: gtk/gtkframe.c:123
++#: ../gtk/gtkframe.c:123
+ msgid "The vertical alignment of the label"
+ msgstr "L'alineació vertical de l'etiqueta"
+
+-#: gtk/gtkframe.c:131 gtk/gtkhandlebox.c:167
++#: ../gtk/gtkframe.c:131 ../gtk/gtkhandlebox.c:167
+ msgid "Deprecated property, use shadow_type instead"
+ msgstr "Propietat obsoleta, utilitzeu «shadow_type» en el seu lloc"
+
+-#: gtk/gtkframe.c:138
++#: ../gtk/gtkframe.c:138
+ msgid "Frame shadow"
+ msgstr "Ombra de marc"
+
+-#: gtk/gtkframe.c:139
++#: ../gtk/gtkframe.c:139
+ msgid "Appearance of the frame border"
+ msgstr "Aparença del contorn del marc"
+
+-#: gtk/gtkframe.c:148
++#: ../gtk/gtkframe.c:148
+ msgid "A widget to display in place of the usual frame label"
+ msgstr "Un giny a visualitzar en lloc del típic marc d'etiqueta"
+
+-#: gtk/gtkhandlebox.c:175
++#: ../gtk/gtkhandlebox.c:175
+ msgid "Appearance of the shadow that surrounds the container"
+ msgstr "Aspecte de l'ombra que envolta el contenidor"
+
+-#: gtk/gtkhandlebox.c:183
++#: ../gtk/gtkhandlebox.c:183
+ msgid "Handle position"
+ msgstr "Gestiona posició"
+
+-#: gtk/gtkhandlebox.c:184
++#: ../gtk/gtkhandlebox.c:184
+ msgid "Position of the handle relative to the child widget"
+ msgstr "Posició de la nansa relativa al giny fill"
+
+-#: gtk/gtkhandlebox.c:192
++#: ../gtk/gtkhandlebox.c:192
+ msgid "Snap edge"
+ msgstr "Contorn ràpid"
+
+-#: gtk/gtkhandlebox.c:193
++#: ../gtk/gtkhandlebox.c:193
+ msgid ""
+ "Side of the handlebox that's lined up with the docking point to dock the "
+ "handlebox"
+@@ -2696,11 +2719,11 @@
+ "Part del handlebox que es programa amb el punt d'amarratge per amarrar el "
+ "handlebox."
+
+-#: gtk/gtkhandlebox.c:201
++#: ../gtk/gtkhandlebox.c:201
+ msgid "Snap edge set"
+ msgstr "Conjunt de contorn ràpid"
+
+-#: gtk/gtkhandlebox.c:202
++#: ../gtk/gtkhandlebox.c:202
+ msgid ""
+ "Whether to use the value from the snap_edge property or a value derived from "
+ "handle_position"
+@@ -2708,11 +2731,11 @@
+ "Si s'ha d'utilitzar el valor de la propietat snap_edge o un valor derivat de "
+ "handle_position"
+
+-#: gtk/gtkhandlebox.c:209
++#: ../gtk/gtkhandlebox.c:209
+ msgid "Child Detached"
+ msgstr "Fill separat"
+
+-#: gtk/gtkhandlebox.c:210
++#: ../gtk/gtkhandlebox.c:210
+ msgid ""
+ "A boolean value indicating whether the handlebox's child is attached or "
+ "detached."
+@@ -2720,237 +2743,238 @@
+ "Un valor booleà que indica si el fill del quadre de nanses està acoblat o "
+ "separat."
+
+-#: gtk/gtkiconview.c:550
++#: ../gtk/gtkiconview.c:550
+ msgid "Selection mode"
+ msgstr "Mode de selecció"
+
+-#: gtk/gtkiconview.c:551
++#: ../gtk/gtkiconview.c:551
+ msgid "The selection mode"
+ msgstr "Mode de selecció"
+
+-#: gtk/gtkiconview.c:569
++#: ../gtk/gtkiconview.c:569
+ msgid "Pixbuf column"
+ msgstr "Columna de memòria de píxel"
+
+-#: gtk/gtkiconview.c:570
++#: ../gtk/gtkiconview.c:570
+ msgid "Model column used to retrieve the icon pixbuf from"
+ msgstr "Columna del model d'on obtenir la icona de la memòria de píxel"
+
+-#: gtk/gtkiconview.c:588
++#: ../gtk/gtkiconview.c:588
+ msgid "Model column used to retrieve the text from"
+ msgstr "Columna del model d'on obtenir el text"
+
+-#: gtk/gtkiconview.c:607
++#: ../gtk/gtkiconview.c:607
+ msgid "Markup column"
+ msgstr "Columna d'etiquetatge"
+
+-#: gtk/gtkiconview.c:608
++#: ../gtk/gtkiconview.c:608
+ msgid "Model column used to retrieve the text if using Pango markup"
+ msgstr ""
+ "Columna del model d'on obtenir el text si es fa servir l'etiquetatge Pango"
+
+-#: gtk/gtkiconview.c:615
++#: ../gtk/gtkiconview.c:615
+ msgid "Icon View Model"
+ msgstr "Model de vista d'icones"
+
+-#: gtk/gtkiconview.c:616
++#: ../gtk/gtkiconview.c:616
+ msgid "The model for the icon view"
+ msgstr "El model per la vista d'icones"
+
+-#: gtk/gtkiconview.c:632
++#: ../gtk/gtkiconview.c:632
+ msgid "Number of columns"
+ msgstr "El nombre de columnes"
+
+-#: gtk/gtkiconview.c:633
++#: ../gtk/gtkiconview.c:633
+ msgid "Number of columns to display"
+ msgstr "El nombre de columnes a mostrar"
+
+-#: gtk/gtkiconview.c:650
++#: ../gtk/gtkiconview.c:650
+ msgid "Width for each item"
+ msgstr "Amplada de cada element"
+
+-#: gtk/gtkiconview.c:651
++#: ../gtk/gtkiconview.c:651
+ msgid "The width used for each item"
+ msgstr "L'amplada utilitzada per cada element"
+
+-#: gtk/gtkiconview.c:667
++#: ../gtk/gtkiconview.c:667
+ msgid "Space which is inserted between cells of an item"
+ msgstr "Espai inserit entre les cel·les de cada element"
+
+-#: gtk/gtkiconview.c:682
++#: ../gtk/gtkiconview.c:682
+ msgid "Row Spacing"
+ msgstr "Espaiat de files"
+
+-#: gtk/gtkiconview.c:683
++#: ../gtk/gtkiconview.c:683
+ msgid "Space which is inserted between grid rows"
+ msgstr "L'espai inserit entre les files d'una graella"
+
+-#: gtk/gtkiconview.c:698
++#: ../gtk/gtkiconview.c:698
+ msgid "Column Spacing"
+ msgstr "Espaiat de columnes"
+
+-#: gtk/gtkiconview.c:699
++#: ../gtk/gtkiconview.c:699
+ msgid "Space which is inserted between grid columns"
+ msgstr "L'espai inserit entre les columnes d'una graella"
+
+-#: gtk/gtkiconview.c:714
++#: ../gtk/gtkiconview.c:714
+ msgid "Margin"
+ msgstr "Marge"
+
+-#: gtk/gtkiconview.c:715
++#: ../gtk/gtkiconview.c:715
+ msgid "Space which is inserted at the edges of the icon view"
+ msgstr "Espai inserit a les cantonades de la vista d'icones"
+
+-#: gtk/gtkiconview.c:732
++#: ../gtk/gtkiconview.c:732
+ msgid ""
+ "How the text and icon of each item are positioned relative to each other"
+ msgstr "El posicionament relatiu entre el text i la icona de cada element"
+
+-#: gtk/gtkiconview.c:748 gtk/gtktreeview.c:618 gtk/gtktreeviewcolumn.c:307
++#: ../gtk/gtkiconview.c:748 ../gtk/gtktreeview.c:618
++#: ../gtk/gtktreeviewcolumn.c:307
+ msgid "Reorderable"
+ msgstr "Reordenable"
+
+-#: gtk/gtkiconview.c:749 gtk/gtktreeview.c:619
++#: ../gtk/gtkiconview.c:749 ../gtk/gtktreeview.c:619
+ msgid "View is reorderable"
+ msgstr "La vista és reordenable"
+
+-#: gtk/gtkiconview.c:756 gtk/gtktreeview.c:769
++#: ../gtk/gtkiconview.c:756 ../gtk/gtktreeview.c:769
+ msgid "Tooltip Column"
+ msgstr "Columna de l'indicador de funció"
+
+-#: gtk/gtkiconview.c:757
++#: ../gtk/gtkiconview.c:757
+ msgid "The column in the model containing the tooltip texts for the items"
+ msgstr ""
+ "La columna del model que conté els textos dels indicadors de funció per als "
+ "elements"
+
+-#: gtk/gtkiconview.c:768
++#: ../gtk/gtkiconview.c:768
+ msgid "Selection Box Color"
+ msgstr "Color de la caixa de selecció"
+
+-#: gtk/gtkiconview.c:769
++#: ../gtk/gtkiconview.c:769
+ msgid "Color of the selection box"
+ msgstr "Color de la caixa de selecció"
+
+-#: gtk/gtkiconview.c:775
++#: ../gtk/gtkiconview.c:775
+ msgid "Selection Box Alpha"
+ msgstr "Transparència de la caixa de selecció"
+
+-#: gtk/gtkiconview.c:776
++#: ../gtk/gtkiconview.c:776
+ msgid "Opacity of the selection box"
+ msgstr "Opacitat de la caixa de selecció"
+
+-#: gtk/gtkimage.c:131 gtk/gtkstatusicon.c:186
++#: ../gtk/gtkimage.c:131 ../gtk/gtkstatusicon.c:186
+ msgid "Pixbuf"
+ msgstr "Pixbuf"
+
+-#: gtk/gtkimage.c:132 gtk/gtkstatusicon.c:187
++#: ../gtk/gtkimage.c:132 ../gtk/gtkstatusicon.c:187
+ msgid "A GdkPixbuf to display"
+ msgstr "Un GdkPixbuf a visualitzar"
+
+-#: gtk/gtkimage.c:139
++#: ../gtk/gtkimage.c:139
+ msgid "Pixmap"
+ msgstr "Mapa de píxels"
+
+-#: gtk/gtkimage.c:140
++#: ../gtk/gtkimage.c:140
+ msgid "A GdkPixmap to display"
+ msgstr "Un GdkPixmap a visualitzar"
+
+-#: gtk/gtkimage.c:147 gtk/gtkmessagedialog.c:215
++#: ../gtk/gtkimage.c:147 ../gtk/gtkmessagedialog.c:215
+ msgid "Image"
+ msgstr "Imatge"
+
+-#: gtk/gtkimage.c:148
++#: ../gtk/gtkimage.c:148
+ msgid "A GdkImage to display"
+ msgstr "Un GdkImage per visualitzar"
+
+-#: gtk/gtkimage.c:155
++#: ../gtk/gtkimage.c:155
+ msgid "Mask"
+ msgstr "Màscara"
+
+-#: gtk/gtkimage.c:156
++#: ../gtk/gtkimage.c:156
+ msgid "Mask bitmap to use with GdkImage or GdkPixmap"
+ msgstr "Màscara de mapa de bits per utilitzar amb GdkImage o GdkPixmap"
+
+-#: gtk/gtkimage.c:164 gtk/gtkstatusicon.c:195
++#: ../gtk/gtkimage.c:164 ../gtk/gtkstatusicon.c:195
+ msgid "Filename to load and display"
+ msgstr "Nom de fitxer per carregar i visualitzar"
+
+-#: gtk/gtkimage.c:173 gtk/gtkstatusicon.c:203
++#: ../gtk/gtkimage.c:173 ../gtk/gtkstatusicon.c:203
+ msgid "Stock ID for a stock image to display"
+ msgstr "ID integrada per a una icona integrada a mostrar"
+
+-#: gtk/gtkimage.c:180
++#: ../gtk/gtkimage.c:180
+ msgid "Icon set"
+ msgstr "Definiu icona"
+
+-#: gtk/gtkimage.c:181
++#: ../gtk/gtkimage.c:181
+ msgid "Icon set to display"
+ msgstr "Definiu icona per visualitzar"
+
+-#: gtk/gtkimage.c:188 gtk/gtkscalebutton.c:212 gtk/gtktoolbar.c:547
++#: ../gtk/gtkimage.c:188 ../gtk/gtkscalebutton.c:212 ../gtk/gtktoolbar.c:547
+ msgid "Icon size"
+ msgstr "Mida d'icona"
+
+-#: gtk/gtkimage.c:189
++#: ../gtk/gtkimage.c:189
+ msgid "Symbolic size to use for stock icon, icon set or named icon"
+ msgstr ""
+ "Mida simbòlica a utilitzar per a la icona del sistema, conjunt d'icones o "
+ "icona especificada"
+
+-#: gtk/gtkimage.c:205
++#: ../gtk/gtkimage.c:205
+ msgid "Pixel size"
+ msgstr "Mida del píxel"
+
+-#: gtk/gtkimage.c:206
++#: ../gtk/gtkimage.c:206
+ msgid "Pixel size to use for named icon"
+ msgstr "Mida del píxel a utilitzar per a la icona especificada"
+
+-#: gtk/gtkimage.c:214
++#: ../gtk/gtkimage.c:214
+ msgid "Animation"
+ msgstr "Animació"
+
+-#: gtk/gtkimage.c:215
++#: ../gtk/gtkimage.c:215
+ msgid "GdkPixbufAnimation to display"
+ msgstr "GdkPixbufAnimation per visualitzar"
+
+-#: gtk/gtkimage.c:255 gtk/gtkstatusicon.c:234
++#: ../gtk/gtkimage.c:255 ../gtk/gtkstatusicon.c:234
+ msgid "Storage type"
+ msgstr "Tipus d'emmagatzemament"
+
+-#: gtk/gtkimage.c:256 gtk/gtkstatusicon.c:235
++#: ../gtk/gtkimage.c:256 ../gtk/gtkstatusicon.c:235
+ msgid "The representation being used for image data"
+ msgstr "La representació utilitzada per les dades de la imatge"
+
+-#: gtk/gtkimagemenuitem.c:101
++#: ../gtk/gtkimagemenuitem.c:101
+ msgid "Child widget to appear next to the menu text"
+ msgstr "Giny fill que apareix pròxim al text del menú"
+
+-#: gtk/gtkimagemenuitem.c:106
++#: ../gtk/gtkimagemenuitem.c:106
+ msgid "Show menu images"
+ msgstr "Mostra imatges del menú"
+
+-#: gtk/gtkimagemenuitem.c:107
++#: ../gtk/gtkimagemenuitem.c:107
+ msgid "Whether images should be shown in menus"
+ msgstr "Si s'han de mostrar imatges en els menús."
+
+-#: gtk/gtkinvisible.c:87 gtk/gtkwindow.c:601
++#: ../gtk/gtkinvisible.c:87 ../gtk/gtkwindow.c:601
+ msgid "The screen where this window will be displayed"
+ msgstr "La pantalla on es mostrarà aquesta finestra"
+
+-#: gtk/gtklabel.c:317
++#: ../gtk/gtklabel.c:317
+ msgid "The text of the label"
+ msgstr "El text de l'etiqueta"
+
+-#: gtk/gtklabel.c:324
++#: ../gtk/gtklabel.c:324
+ msgid "A list of style attributes to apply to the text of the label"
+ msgstr "Una llista d'atributs d'estil per aplicar al text de l'etiqueta"
+
+-#: gtk/gtklabel.c:345 gtk/gtktexttag.c:359 gtk/gtktextview.c:585
++#: ../gtk/gtklabel.c:345 ../gtk/gtktexttag.c:359 ../gtk/gtktextview.c:585
+ msgid "Justification"
+ msgstr "Justificació"
+
+-#: gtk/gtklabel.c:346
++#: ../gtk/gtklabel.c:346
+ msgid ""
+ "The alignment of the lines in the text of the label relative to each other. "
+ "This does NOT affect the alignment of the label within its allocation. See "
+@@ -2960,11 +2984,11 @@
+ "Això NO afecta l'alineació de l'etiqueta en la seva assignació. Vegeu "
+ "GtkMisc::xalign"
+
+-#: gtk/gtklabel.c:354
++#: ../gtk/gtklabel.c:354
+ msgid "Pattern"
+ msgstr "Patró"
+
+-#: gtk/gtklabel.c:355
++#: ../gtk/gtklabel.c:355
+ msgid ""
+ "A string with _ characters in positions correspond to characters in the text "
+ "to underline"
+@@ -2972,47 +2996,47 @@
+ "Una cadena amb caràcters _ en posicions corresponen a caràcters del text per "
+ "subratllar"
+
+-#: gtk/gtklabel.c:362
++#: ../gtk/gtklabel.c:362
+ msgid "Line wrap"
+ msgstr "Ajustament de línia"
+
+-#: gtk/gtklabel.c:363
++#: ../gtk/gtklabel.c:363
+ msgid "If set, wrap lines if the text becomes too wide"
+ msgstr "Si és establert, ajusta les línies si el text arriba a ser massa ample"
+
+-#: gtk/gtklabel.c:378
++#: ../gtk/gtklabel.c:378
+ msgid "Line wrap mode"
+ msgstr "Mode de l'ajustament de línia"
+
+-#: gtk/gtklabel.c:379
++#: ../gtk/gtklabel.c:379
+ msgid "If wrap is set, controls how linewrapping is done"
+ msgstr "Si s'estableix l'ajustament, controla de quina manera es fa"
+
+-#: gtk/gtklabel.c:386
++#: ../gtk/gtklabel.c:386
+ msgid "Selectable"
+ msgstr "Seleccionable"
+
+-#: gtk/gtklabel.c:387
++#: ../gtk/gtklabel.c:387
+ msgid "Whether the label text can be selected with the mouse"
+ msgstr "Si el ratolí pot seleccionar el text de l'etiqueta"
+
+-#: gtk/gtklabel.c:393
++#: ../gtk/gtklabel.c:393
+ msgid "Mnemonic key"
+ msgstr "Clau mnemotècnica"
+
+-#: gtk/gtklabel.c:394
++#: ../gtk/gtklabel.c:394
+ msgid "The mnemonic accelerator key for this label"
+ msgstr "La clau acceleradora mnemotècnica per a aquesta etiqueta"
+
+-#: gtk/gtklabel.c:402
++#: ../gtk/gtklabel.c:402
+ msgid "Mnemonic widget"
+ msgstr "Giny mnemotècnic"
+
+-#: gtk/gtklabel.c:403
++#: ../gtk/gtklabel.c:403
+ msgid "The widget to be activated when the label's mnemonic key is pressed"
+ msgstr "El giny a activar quan se'n premi la clau mnemotècnica"
+
+-#: gtk/gtklabel.c:449
++#: ../gtk/gtklabel.c:449
+ msgid ""
+ "The preferred place to ellipsize the string, if the label does not have "
+ "enough room to display the entire string"
+@@ -3020,107 +3044,107 @@
+ "El lloc preferit on posar punts suspensius a la cadena, si l'etiqueta no té "
+ "prou espai per mostrar tota la cadena"
+
+-#: gtk/gtklabel.c:489
++#: ../gtk/gtklabel.c:489
+ msgid "Single Line Mode"
+ msgstr "Mode de línia simple"
+
+-#: gtk/gtklabel.c:490
++#: ../gtk/gtklabel.c:490
+ msgid "Whether the label is in single line mode"
+ msgstr "Si l'etiqueta està en mode de línia simple"
+
+-#: gtk/gtklabel.c:507
++#: ../gtk/gtklabel.c:507
+ msgid "Angle"
+ msgstr "Angle"
+
+-#: gtk/gtklabel.c:508
++#: ../gtk/gtklabel.c:508
+ msgid "Angle at which the label is rotated"
+ msgstr "L'angle que es gira l'etiqueta"
+
+-#: gtk/gtklabel.c:528
++#: ../gtk/gtklabel.c:528
+ msgid "Maximum Width In Characters"
+ msgstr "Amplada màxima en caràcters"
+
+-#: gtk/gtklabel.c:529
++#: ../gtk/gtklabel.c:529
+ msgid "The desired maximum width of the label, in characters"
+ msgstr "L'amplada màxima desitjada de l'etiqueta, en caràcters"
+
+-#: gtk/gtklabel.c:645
++#: ../gtk/gtklabel.c:645
+ msgid "Whether to select the contents of a selectable label when it is focused"
+ msgstr ""
+ "Si s'han de seleccionar els continguts d'una etiqueta seleccionable quan "
+ "obtingui el focus"
+
+-#: gtk/gtklayout.c:616 gtk/gtkviewport.c:106
++#: ../gtk/gtklayout.c:616 ../gtk/gtkviewport.c:106
+ msgid "Horizontal adjustment"
+ msgstr "Ajust horitzontal"
+
+-#: gtk/gtklayout.c:617 gtk/gtkscrolledwindow.c:219
++#: ../gtk/gtklayout.c:617 ../gtk/gtkscrolledwindow.c:219
+ msgid "The GtkAdjustment for the horizontal position"
+ msgstr "El GtkAdjustment per a la posició horitzontal"
+
+-#: gtk/gtklayout.c:624 gtk/gtkviewport.c:114
++#: ../gtk/gtklayout.c:624 ../gtk/gtkviewport.c:114
+ msgid "Vertical adjustment"
+ msgstr "Ajust vertical"
+
+-#: gtk/gtklayout.c:625 gtk/gtkscrolledwindow.c:226
++#: ../gtk/gtklayout.c:625 ../gtk/gtkscrolledwindow.c:226
+ msgid "The GtkAdjustment for the vertical position"
+ msgstr "El GtkAdjustment per a la posició vertical"
+
+-#: gtk/gtklayout.c:633
++#: ../gtk/gtklayout.c:633
+ msgid "The width of the layout"
+ msgstr "L'amplada de la disposició"
+
+-#: gtk/gtklayout.c:642
++#: ../gtk/gtklayout.c:642
+ msgid "The height of the layout"
+ msgstr "L'alçada de la disposició"
+
+-#: gtk/gtklinkbutton.c:144
++#: ../gtk/gtklinkbutton.c:144
+ msgid "URI"
+ msgstr "URI"
+
+-#: gtk/gtklinkbutton.c:145
++#: ../gtk/gtklinkbutton.c:145
+ msgid "The URI bound to this button"
+ msgstr "L'URI vinculat a aquest botó"
+
+-#: gtk/gtklinkbutton.c:159
++#: ../gtk/gtklinkbutton.c:159
+ msgid "Visited"
+ msgstr "Visitat"
+
+-#: gtk/gtklinkbutton.c:160
++#: ../gtk/gtklinkbutton.c:160
+ msgid "Whether this link has been visited."
+ msgstr "Si s'ha visitat aquest enllaç."
+
+-#: gtk/gtkmenu.c:499
++#: ../gtk/gtkmenu.c:499
+ msgid "The currently selected menu item"
+ msgstr "L'element de menú seleccionat actualment"
+
+-#: gtk/gtkmenu.c:513
++#: ../gtk/gtkmenu.c:513
+ msgid "Accel Group"
+ msgstr "Grup d'acceleradors"
+
+-#: gtk/gtkmenu.c:514
++#: ../gtk/gtkmenu.c:514
+ msgid "The accel group holding accelerators for the menu"
+ msgstr "El grup d'acceleradors que conté els acceleradors del menú"
+
+-#: gtk/gtkmenu.c:528 gtk/gtkmenuitem.c:233
++#: ../gtk/gtkmenu.c:528 ../gtk/gtkmenuitem.c:233
+ msgid "Accel Path"
+ msgstr "Camí de l'accelerador"
+
+-#: gtk/gtkmenu.c:529
++#: ../gtk/gtkmenu.c:529
+ msgid "An accel path used to conveniently construct accel paths of child items"
+ msgstr ""
+ "Un camí d'accelerador que s'utilitza per a construir els camins "
+ "d'accelerador dels elements fill"
+
+-#: gtk/gtkmenu.c:545
++#: ../gtk/gtkmenu.c:545
+ msgid "Attach Widget"
+ msgstr "Giny d'acoblament"
+
+-#: gtk/gtkmenu.c:546
++#: ../gtk/gtkmenu.c:546
+ msgid "The widget the menu is attached to"
+ msgstr "El giny al qual el menú està acoblat"
+
+-#: gtk/gtkmenu.c:554
++#: ../gtk/gtkmenu.c:554
+ msgid ""
+ "A title that may be displayed by the window manager when this menu is torn-"
+ "off"
+@@ -3128,54 +3152,54 @@
+ "Un títol que s'ha de visualitzar mitjançant el gestor de finestres quan "
+ "aquest menú es desactivi"
+
+-#: gtk/gtkmenu.c:568
++#: ../gtk/gtkmenu.c:568
+ msgid "Tearoff State"
+ msgstr "Estat del menú separat"
+
+-#: gtk/gtkmenu.c:569
++#: ../gtk/gtkmenu.c:569
+ msgid "A boolean that indicates whether the menu is torn-off"
+ msgstr "Un booleà que indica si el menú està arrencat"
+
+-#: gtk/gtkmenu.c:583
++#: ../gtk/gtkmenu.c:583
+ msgid "Monitor"
+ msgstr "Monitor"
+
+-#: gtk/gtkmenu.c:584
++#: ../gtk/gtkmenu.c:584
+ msgid "The monitor the menu will be popped up on"
+ msgstr "El monitor on es mostrarà el menú"
+
+-#: gtk/gtkmenu.c:590
++#: ../gtk/gtkmenu.c:590
+ msgid "Vertical Padding"
+ msgstr "Separació vertical"
+
+-#: gtk/gtkmenu.c:591
++#: ../gtk/gtkmenu.c:591
+ msgid "Extra space at the top and bottom of the menu"
+ msgstr "Espai addicional a dalt i abaix del menú"
+
+-#: gtk/gtkmenu.c:599
++#: ../gtk/gtkmenu.c:599
+ msgid "Horizontal Padding"
+ msgstr "Farciment horitzontal"
+
+-#: gtk/gtkmenu.c:600
++#: ../gtk/gtkmenu.c:600
+ msgid "Extra space at the left and right edges of the menu"
+ msgstr "Espai addicional a dreta i esquerra de les vores del menú"
+
+-#: gtk/gtkmenu.c:608
++#: ../gtk/gtkmenu.c:608
+ msgid "Vertical Offset"
+ msgstr "Desplaçament vertical"
+
+-#: gtk/gtkmenu.c:609
++#: ../gtk/gtkmenu.c:609
+ msgid ""
+ "When the menu is a submenu, position it this number of pixels offset "
+ "vertically"
+ msgstr ""
+ "Quan el menú és un submenú, es desplaça verticalment aquest nombre de píxels"
+
+-#: gtk/gtkmenu.c:617
++#: ../gtk/gtkmenu.c:617
+ msgid "Horizontal Offset"
+ msgstr "Desplaçament horitzontal"
+
+-#: gtk/gtkmenu.c:618
++#: ../gtk/gtkmenu.c:618
+ msgid ""
+ "When the menu is a submenu, position it this number of pixels offset "
+ "horizontally"
+@@ -3183,355 +3207,355 @@
+ "Quan el menú és un submenú, es desplaça horitzontalment aquest nombre de "
+ "píxels"
+
+-#: gtk/gtkmenu.c:626
++#: ../gtk/gtkmenu.c:626
+ msgid "Double Arrows"
+ msgstr "Fletxes dobles"
+
+-#: gtk/gtkmenu.c:627
++#: ../gtk/gtkmenu.c:627
+ msgid "When scrolling, always show both arrows."
+ msgstr "Quan es desplaci, sempre mostra totes dues fletxes."
+
+-#: gtk/gtkmenu.c:635
++#: ../gtk/gtkmenu.c:635
+ msgid "Left Attach"
+ msgstr "Adjunt esquerre"
+
+-#: gtk/gtkmenu.c:636 gtk/gtktable.c:174
++#: ../gtk/gtkmenu.c:636 ../gtk/gtktable.c:174
+ msgid "The column number to attach the left side of the child to"
+ msgstr "El número de columna on adjuntar la banda esquerra del fill"
+
+-#: gtk/gtkmenu.c:643
++#: ../gtk/gtkmenu.c:643
+ msgid "Right Attach"
+ msgstr "Adjunt dret"
+
+-#: gtk/gtkmenu.c:644
++#: ../gtk/gtkmenu.c:644
+ msgid "The column number to attach the right side of the child to"
+ msgstr "El número de columna on adjuntar la banda dreta del fill"
+
+-#: gtk/gtkmenu.c:651
++#: ../gtk/gtkmenu.c:651
+ msgid "Top Attach"
+ msgstr "Adjunt superior"
+
+-#: gtk/gtkmenu.c:652
++#: ../gtk/gtkmenu.c:652
+ msgid "The row number to attach the top of the child to"
+ msgstr "El número de fila on adjuntar la part superior del fill"
+
+-#: gtk/gtkmenu.c:659
++#: ../gtk/gtkmenu.c:659
+ msgid "Bottom Attach"
+ msgstr "Adjunt inferior"
+
+-#: gtk/gtkmenu.c:660 gtk/gtktable.c:195
++#: ../gtk/gtkmenu.c:660 ../gtk/gtktable.c:195
+ msgid "The row number to attach the bottom of the child to"
+ msgstr "El número de fila on adjuntar la part inferior del fill"
+
+-#: gtk/gtkmenu.c:747
++#: ../gtk/gtkmenu.c:747
+ msgid "Can change accelerators"
+ msgstr "Poden canviar els acceleradors"
+
+-#: gtk/gtkmenu.c:748
++#: ../gtk/gtkmenu.c:748
+ msgid ""
+ "Whether menu accelerators can be changed by pressing a key over the menu item"
+ msgstr ""
+ "Si els acceleradors del menú es poden canviar prement una tecla sobre "
+ "l'element del menú"
+
+-#: gtk/gtkmenu.c:753
++#: ../gtk/gtkmenu.c:753
+ msgid "Delay before submenus appear"
+ msgstr "Retard abans de que apareguen els submenús"
+
+-#: gtk/gtkmenu.c:754
++#: ../gtk/gtkmenu.c:754
+ msgid ""
+ "Minimum time the pointer must stay over a menu item before the submenu appear"
+ msgstr ""
+ "El temps mínim que el punter ha d'estar sobre d'un element del menú abans "
+ "que n'aparegui el submenú"
+
+-#: gtk/gtkmenu.c:761
++#: ../gtk/gtkmenu.c:761
+ msgid "Delay before hiding a submenu"
+ msgstr "Retard abans d'ocultar un submenú"
+
+-#: gtk/gtkmenu.c:762
++#: ../gtk/gtkmenu.c:762
+ msgid ""
+ "The time before hiding a submenu when the pointer is moving towards the "
+ "submenu"
+ msgstr ""
+ "El temps abans d'ocultar un submenú quan el punter es mou cap al submenú"
+
+-#: gtk/gtkmenubar.c:168
++#: ../gtk/gtkmenubar.c:168
+ msgid "Pack direction"
+ msgstr "Direcció de l'empaquetament"
+
+-#: gtk/gtkmenubar.c:169
++#: ../gtk/gtkmenubar.c:169
+ msgid "The pack direction of the menubar"
+ msgstr "La direcció de l'empaquetament de la barra d'eines"
+
+-#: gtk/gtkmenubar.c:185
++#: ../gtk/gtkmenubar.c:185
+ msgid "Child Pack direction"
+ msgstr "Direcció de l'empaquetament fill"
+
+-#: gtk/gtkmenubar.c:186
++#: ../gtk/gtkmenubar.c:186
+ msgid "The child pack direction of the menubar"
+ msgstr "L'orientació de la barra d'eines"
+
+-#: gtk/gtkmenubar.c:195
++#: ../gtk/gtkmenubar.c:195
+ msgid "Style of bevel around the menubar"
+ msgstr "Estil del bisell que envolta la barra de menú"
+
+-#: gtk/gtkmenubar.c:202 gtk/gtktoolbar.c:597
++#: ../gtk/gtkmenubar.c:202 ../gtk/gtktoolbar.c:597
+ msgid "Internal padding"
+ msgstr "Separació interna"
+
+-#: gtk/gtkmenubar.c:203
++#: ../gtk/gtkmenubar.c:203
+ msgid "Amount of border space between the menubar shadow and the menu items"
+ msgstr ""
+ "Quantitat d'espai del contorn entre l'ombra de la barra de menú i els "
+ "elements del menú"
+
+-#: gtk/gtkmenubar.c:210
++#: ../gtk/gtkmenubar.c:210
+ msgid "Delay before drop down menus appear"
+ msgstr "Retard abans que apareguin els menús desplegables"
+
+-#: gtk/gtkmenubar.c:211
++#: ../gtk/gtkmenubar.c:211
+ msgid "Delay before the submenus of a menu bar appear"
+ msgstr "Retard abans que apareguin els submenús d'una barra de menú"
+
+-#: gtk/gtkmenuitem.c:201
++#: ../gtk/gtkmenuitem.c:201
+ msgid "Right Justified"
+ msgstr "Alinea a la dreta"
+
+-#: gtk/gtkmenuitem.c:202
++#: ../gtk/gtkmenuitem.c:202
+ msgid ""
+ "Sets whether the menu item appears justified at the right side of a menu bar"
+ msgstr ""
+ "Estableix si l'element de menú apareix alineat al costat dret d'una barra de "
+ "menú"
+
+-#: gtk/gtkmenuitem.c:216
++#: ../gtk/gtkmenuitem.c:216
+ msgid "Submenu"
+ msgstr "Submenú"
+
+-#: gtk/gtkmenuitem.c:217
++#: ../gtk/gtkmenuitem.c:217
+ msgid "The submenu attached to the menu item, or NULL if it has none"
+ msgstr "El submenú adjunt a l'element de menú, o bé NULL si no en té cap"
+
+-#: gtk/gtkmenuitem.c:234
++#: ../gtk/gtkmenuitem.c:234
+ msgid "Sets the accelerator path of the menu item"
+ msgstr "Estableix el camí de l'accelerador de l'element de menú"
+
+-#: gtk/gtkmenuitem.c:277
++#: ../gtk/gtkmenuitem.c:277
+ msgid "Amount of space used up by arrow, relative to the menu item's font size"
+ msgstr ""
+ "Quantitat d'espai que ocupa la fletxa en relació a la mida del tipus de "
+ "lletra de l'element de menú"
+
+-#: gtk/gtkmenuitem.c:290
++#: ../gtk/gtkmenuitem.c:290
+ msgid "Width in Characters"
+ msgstr "Amplada en caràcters"
+
+-#: gtk/gtkmenuitem.c:291
++#: ../gtk/gtkmenuitem.c:291
+ msgid "The minimum desired width of the menu item in characters"
+ msgstr "L'amplada desitjada mínima de l'element de menú, en caràcters"
+
+-#: gtk/gtkmenushell.c:374
++#: ../gtk/gtkmenushell.c:374
+ msgid "Take Focus"
+ msgstr "Agafa el focus"
+
+-#: gtk/gtkmenushell.c:375
++#: ../gtk/gtkmenushell.c:375
+ msgid "A boolean that determines whether the menu grabs the keyboard focus"
+ msgstr "Un booleà que indica si el menú agafa el focus del teclat"
+
+-#: gtk/gtkmenutoolbutton.c:232 gtk/gtkoptionmenu.c:161
++#: ../gtk/gtkmenutoolbutton.c:232 ../gtk/gtkoptionmenu.c:161
+ msgid "Menu"
+ msgstr "Menú"
+
+-#: gtk/gtkmenutoolbutton.c:233
++#: ../gtk/gtkmenutoolbutton.c:233
+ msgid "The dropdown menu"
+ msgstr "El menú desplegable"
+
+-#: gtk/gtkmessagedialog.c:98
++#: ../gtk/gtkmessagedialog.c:98
+ msgid "Image/label border"
+ msgstr "Contorn de la imatge/etiqueta"
+
+-#: gtk/gtkmessagedialog.c:99
++#: ../gtk/gtkmessagedialog.c:99
+ msgid "Width of border around the label and image in the message dialog"
+ msgstr ""
+ "Amplada del contorn al voltant de l'etiqueta i de la imatge en el diàleg de "
+ "missatge"
+
+-#: gtk/gtkmessagedialog.c:114
++#: ../gtk/gtkmessagedialog.c:114
+ msgid "Use separator"
+ msgstr "Usa un separador"
+
+-#: gtk/gtkmessagedialog.c:115
++#: ../gtk/gtkmessagedialog.c:115
+ msgid ""
+ "Whether to put a separator between the message dialog's text and the buttons"
+ msgstr "Si posar un separador entre el text i els botons els diàlegs"
+
+-#: gtk/gtkmessagedialog.c:128
++#: ../gtk/gtkmessagedialog.c:128
+ msgid "Message Type"
+ msgstr "Tipus de missatge"
+
+-#: gtk/gtkmessagedialog.c:129
++#: ../gtk/gtkmessagedialog.c:129
+ msgid "The type of message"
+ msgstr "El tipus de missatge"
+
+-#: gtk/gtkmessagedialog.c:136
++#: ../gtk/gtkmessagedialog.c:136
+ msgid "Message Buttons"
+ msgstr "Botons de missatge"
+
+-#: gtk/gtkmessagedialog.c:137
++#: ../gtk/gtkmessagedialog.c:137
+ msgid "The buttons shown in the message dialog"
+ msgstr "Els botons mostrats en el diàleg del missatge"
+
+-#: gtk/gtkmessagedialog.c:154
++#: ../gtk/gtkmessagedialog.c:154
+ msgid "The primary text of the message dialog"
+ msgstr "El text primari del diàleg de missatge"
+
+ # termcat (josep)
+-#: gtk/gtkmessagedialog.c:169
++#: ../gtk/gtkmessagedialog.c:169
+ msgid "Use Markup"
+ msgstr "Utilitza etiquetatge"
+
+-#: gtk/gtkmessagedialog.c:170
++#: ../gtk/gtkmessagedialog.c:170
+ msgid "The primary text of the title includes Pango markup."
+ msgstr "El text primari del títol inclou etiquetatge Pango."
+
+-#: gtk/gtkmessagedialog.c:184
++#: ../gtk/gtkmessagedialog.c:184
+ msgid "Secondary Text"
+ msgstr "Text secundari"
+
+-#: gtk/gtkmessagedialog.c:185
++#: ../gtk/gtkmessagedialog.c:185
+ msgid "The secondary text of the message dialog"
+ msgstr "Els text secundari del diàleg de missatge"
+
+-#: gtk/gtkmessagedialog.c:200
++#: ../gtk/gtkmessagedialog.c:200
+ msgid "Use Markup in secondary"
+ msgstr "Empra etiquetatge en el secundari"
+
+-#: gtk/gtkmessagedialog.c:201
++#: ../gtk/gtkmessagedialog.c:201
+ msgid "The secondary text includes Pango markup."
+ msgstr "El text secundari inclou etiquetatge Pango."
+
+-#: gtk/gtkmessagedialog.c:216
++#: ../gtk/gtkmessagedialog.c:216
+ msgid "The image"
+ msgstr "La imatge"
+
+-#: gtk/gtkmisc.c:83
++#: ../gtk/gtkmisc.c:83
+ msgid "Y align"
+ msgstr "Alineació X"
+
+-#: gtk/gtkmisc.c:84
++#: ../gtk/gtkmisc.c:84
+ msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
+ msgstr "L'alineació vertical, des de 0 (a dalt) fins 1 (a baix)"
+
+-#: gtk/gtkmisc.c:93
++#: ../gtk/gtkmisc.c:93
+ msgid "X pad"
+ msgstr "Farciment X"
+
+-#: gtk/gtkmisc.c:94
++#: ../gtk/gtkmisc.c:94
+ msgid ""
+ "The amount of space to add on the left and right of the widget, in pixels"
+ msgstr "L'alineació d'espai a afegir a esquerra i dreta del giny, en píxels"
+
+-#: gtk/gtkmisc.c:103
++#: ../gtk/gtkmisc.c:103
+ msgid "Y pad"
+ msgstr "Farciment Y"
+
+-#: gtk/gtkmisc.c:104
++#: ../gtk/gtkmisc.c:104
+ msgid ""
+ "The amount of space to add on the top and bottom of the widget, in pixels"
+ msgstr "L'alineació d'espai a afegir de dalt a baix del giny, en píxels"
+
+-#: gtk/gtkmountoperation.c:160
++#: ../gtk/gtkmountoperation.c:160
+ msgid "Parent"
+ msgstr "Pare"
+
+-#: gtk/gtkmountoperation.c:161
++#: ../gtk/gtkmountoperation.c:161
+ msgid "The parent window"
+ msgstr "La finestra pare"
+
+-#: gtk/gtkmountoperation.c:168
++#: ../gtk/gtkmountoperation.c:168
+ msgid "Is Showing"
+ msgstr "Es mostra"
+
+-#: gtk/gtkmountoperation.c:169
++#: ../gtk/gtkmountoperation.c:169
+ msgid "Are we showing a dialog"
+ msgstr "Si es mostra un diàleg"
+
+-#: gtk/gtkmountoperation.c:177
++#: ../gtk/gtkmountoperation.c:177
+ msgid "The screen where this window will be displayed."
+ msgstr "La pantalla en què es mostrarà aquesta finestra."
+
+-#: gtk/gtknotebook.c:577
++#: ../gtk/gtknotebook.c:577
+ msgid "Page"
+ msgstr "Pàgina"
+
+-#: gtk/gtknotebook.c:578
++#: ../gtk/gtknotebook.c:578
+ msgid "The index of the current page"
+ msgstr "L'índex de la pàgina actual"
+
+-#: gtk/gtknotebook.c:586
++#: ../gtk/gtknotebook.c:586
+ msgid "Tab Position"
+ msgstr "Posició de les pestanyes"
+
+-#: gtk/gtknotebook.c:587
++#: ../gtk/gtknotebook.c:587
+ msgid "Which side of the notebook holds the tabs"
+ msgstr "Quin costat del bloc de notes conté les pestanyes"
+
+-#: gtk/gtknotebook.c:594
++#: ../gtk/gtknotebook.c:594
+ msgid "Tab Border"
+ msgstr "Límit de la pestanya"
+
+-#: gtk/gtknotebook.c:595
++#: ../gtk/gtknotebook.c:595
+ msgid "Width of the border around the tab labels"
+ msgstr "Amplada del contorn al voltant de les etiquetes de pestanya"
+
+-#: gtk/gtknotebook.c:603
++#: ../gtk/gtknotebook.c:603
+ msgid "Horizontal Tab Border"
+ msgstr "Contorn pestanya horitzontal"
+
+-#: gtk/gtknotebook.c:604
++#: ../gtk/gtknotebook.c:604
+ msgid "Width of the horizontal border of tab labels"
+ msgstr "Amplada del contorn horitzontal de les etiquetes de pestanya"
+
+-#: gtk/gtknotebook.c:612
++#: ../gtk/gtknotebook.c:612
+ msgid "Vertical Tab Border"
+ msgstr "Contorn pestanya vertical"
+
+-#: gtk/gtknotebook.c:613
++#: ../gtk/gtknotebook.c:613
+ msgid "Width of the vertical border of tab labels"
+ msgstr "Amplada del contorn vertical de les etiquetes de pestanya"
+
+-#: gtk/gtknotebook.c:621
++#: ../gtk/gtknotebook.c:621
+ msgid "Show Tabs"
+ msgstr "Mostra les pestanyes"
+
+-#: gtk/gtknotebook.c:622
++#: ../gtk/gtknotebook.c:622
+ msgid "Whether tabs should be shown or not"
+ msgstr "Si les pestanyes s'haurien de mostrar o no"
+
+-#: gtk/gtknotebook.c:628
++#: ../gtk/gtknotebook.c:628
+ msgid "Show Border"
+ msgstr "Mostra el contorn"
+
+-#: gtk/gtknotebook.c:629
++#: ../gtk/gtknotebook.c:629
+ msgid "Whether the border should be shown or not"
+ msgstr "Si el contorn hauria de ser mostrat o no"
+
+-#: gtk/gtknotebook.c:635
++#: ../gtk/gtknotebook.c:635
+ msgid "Scrollable"
+ msgstr "Desplaçable"
+
+-#: gtk/gtknotebook.c:636
++#: ../gtk/gtknotebook.c:636
+ msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
+ msgstr ""
+ "Si és CERT, s'afegiran fletxes de desplaçament si hi ha massa pestanyes per "
+ "ajustar"
+
+-#: gtk/gtknotebook.c:642
++#: ../gtk/gtknotebook.c:642
+ msgid "Enable Popup"
+ msgstr "Disponible el menú emergent"
+
+-#: gtk/gtknotebook.c:643
++#: ../gtk/gtknotebook.c:643
+ msgid ""
+ "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
+ "you can use to go to a page"
+@@ -3539,356 +3563,358 @@
+ "Si és CERT, prement el botó dret del ratolí sobre el llibre de notes "
+ "apareixerà un menú que podreu utilitzar per anar a una pàgina"
+
+-#: gtk/gtknotebook.c:650
++#: ../gtk/gtknotebook.c:650
+ msgid "Whether tabs should have homogeneous sizes"
+ msgstr "Si les pestanyes haurien de tenir mides homogènies"
+
+-#: gtk/gtknotebook.c:656
++#: ../gtk/gtknotebook.c:656
+ msgid "Group ID"
+ msgstr "ID del grup"
+
+-#: gtk/gtknotebook.c:657
++#: ../gtk/gtknotebook.c:657
+ msgid "Group ID for tabs drag and drop"
+ msgstr "ID del grup per a pestanyes per arrossegar i deixar anar"
+
+-#: gtk/gtknotebook.c:673 gtk/gtkradioaction.c:128 gtk/gtkradiobutton.c:82
+-#: gtk/gtkradiomenuitem.c:342 gtk/gtkradiotoolbutton.c:65
++#: ../gtk/gtknotebook.c:673 ../gtk/gtkradioaction.c:128
++#: ../gtk/gtkradiobutton.c:82 ../gtk/gtkradiomenuitem.c:342
++#: ../gtk/gtkradiotoolbutton.c:65
+ msgid "Group"
+ msgstr "Grup"
+
+-#: gtk/gtknotebook.c:674
++#: ../gtk/gtknotebook.c:674
+ msgid "Group for tabs drag and drop"
+ msgstr "Grup per a l'arrossegament i deixada de pestanyes"
+
+-#: gtk/gtknotebook.c:680
++#: ../gtk/gtknotebook.c:680
+ msgid "Tab label"
+ msgstr "Etiqueta de la pestanya"
+
+-#: gtk/gtknotebook.c:681
++#: ../gtk/gtknotebook.c:681
+ msgid "The string displayed on the child's tab label"
+ msgstr "La cadena mostrada a l'etiqueta de la pestanya del fill"
+
+-#: gtk/gtknotebook.c:687
++#: ../gtk/gtknotebook.c:687
+ msgid "Menu label"
+ msgstr "Etiqueta del menú"
+
+-#: gtk/gtknotebook.c:688
++#: ../gtk/gtknotebook.c:688
+ msgid "The string displayed in the child's menu entry"
+ msgstr "La cadena mostrada a l'entrada de menú del fill"
+
+-#: gtk/gtknotebook.c:701
++#: ../gtk/gtknotebook.c:701
+ msgid "Tab expand"
+ msgstr "Expansió de pestanya"
+
+-#: gtk/gtknotebook.c:702
++#: ../gtk/gtknotebook.c:702
+ msgid "Whether to expand the child's tab or not"
+ msgstr "Si s'ha expandir la pestanya dels fills o no"
+
+-#: gtk/gtknotebook.c:708
++#: ../gtk/gtknotebook.c:708
+ msgid "Tab fill"
+ msgstr "Farciment de pestanya"
+
+-#: gtk/gtknotebook.c:709
++#: ../gtk/gtknotebook.c:709
+ msgid "Whether the child's tab should fill the allocated area or not"
+ msgstr "Si la pestanya del fill hauria d'omplir l'àrea assignada o no"
+
+-#: gtk/gtknotebook.c:715
++#: ../gtk/gtknotebook.c:715
+ msgid "Tab pack type"
+ msgstr "Tipus de paquet de pestanya"
+
+-#: gtk/gtknotebook.c:722
++#: ../gtk/gtknotebook.c:722
+ msgid "Tab reorderable"
+ msgstr "Pestanya reordenable"
+
+-#: gtk/gtknotebook.c:723
++#: ../gtk/gtknotebook.c:723
+ msgid "Whether the tab is reorderable by user action or not"
+ msgstr "Si l'usuari pot fer una acció per canviar l'ordre de les pestanyes"
+
+-#: gtk/gtknotebook.c:729
++#: ../gtk/gtknotebook.c:729
+ msgid "Tab detachable"
+ msgstr "Pestanya separable"
+
+-#: gtk/gtknotebook.c:730
++#: ../gtk/gtknotebook.c:730
+ msgid "Whether the tab is detachable"
+ msgstr "Si la pestanya es pot separar"
+
+-#: gtk/gtknotebook.c:745 gtk/gtkscrollbar.c:83
++#: ../gtk/gtknotebook.c:745 ../gtk/gtkscrollbar.c:83
+ msgid "Secondary backward stepper"
+ msgstr "Caminador posterior secundari"
+
+-#: gtk/gtknotebook.c:746
++#: ../gtk/gtknotebook.c:746
+ msgid ""
+ "Display a second backward arrow button on the opposite end of the tab area"
+ msgstr ""
+ "Mostra una altre botó amb fletxa cap endarrere a l'altre extrem de l'àrea de "
+ "pestanyes"
+
+-#: gtk/gtknotebook.c:761 gtk/gtkscrollbar.c:91
++#: ../gtk/gtknotebook.c:761 ../gtk/gtkscrollbar.c:91
+ msgid "Secondary forward stepper"
+ msgstr "Caminador davanter secundari"
+
+-#: gtk/gtknotebook.c:762
++#: ../gtk/gtknotebook.c:762
+ msgid ""
+ "Display a second forward arrow button on the opposite end of the tab area"
+ msgstr ""
+ "Mostra una altre botó amb fletxa cap endavant a l'altre extrem de l'àrea de "
+ "pestanyes"
+
+-#: gtk/gtknotebook.c:776 gtk/gtkscrollbar.c:67
++#: ../gtk/gtknotebook.c:776 ../gtk/gtkscrollbar.c:67
+ msgid "Backward stepper"
+ msgstr "Caminador posterior"
+
+-#: gtk/gtknotebook.c:777 gtk/gtkscrollbar.c:68
++#: ../gtk/gtknotebook.c:777 ../gtk/gtkscrollbar.c:68
+ msgid "Display the standard backward arrow button"
+ msgstr "Visualitza el botó de retrocés estàndard"
+
+-#: gtk/gtknotebook.c:791 gtk/gtkscrollbar.c:75
++#: ../gtk/gtknotebook.c:791 ../gtk/gtkscrollbar.c:75
+ msgid "Forward stepper"
+ msgstr "Caminador anterior"
+
+-#: gtk/gtknotebook.c:792 gtk/gtkscrollbar.c:76
++#: ../gtk/gtknotebook.c:792 ../gtk/gtkscrollbar.c:76
+ msgid "Display the standard forward arrow button"
+ msgstr "Visualitza el botó d'avanç estàndard"
+
+-#: gtk/gtknotebook.c:806
++#: ../gtk/gtknotebook.c:806
+ msgid "Tab overlap"
+ msgstr "Sobreposat de les pestanyes"
+
+-#: gtk/gtknotebook.c:807
++#: ../gtk/gtknotebook.c:807
+ msgid "Size of tab overlap area"
+ msgstr "Mida de l'àrea del sobreposat de les pestanyes"
+
+-#: gtk/gtknotebook.c:822
++#: ../gtk/gtknotebook.c:822
+ msgid "Tab curvature"
+ msgstr "Curvatura de la pestanya"
+
+-#: gtk/gtknotebook.c:823
++#: ../gtk/gtknotebook.c:823
+ msgid "Size of tab curvature"
+ msgstr "Mida de la curvatura de la pestanya"
+
+-#: gtk/gtknotebook.c:839
++#: ../gtk/gtknotebook.c:839
+ msgid "Arrow spacing"
+ msgstr "Espaiat de la fletxa"
+
+-#: gtk/gtknotebook.c:840
++#: ../gtk/gtknotebook.c:840
+ msgid "Scroll arrow spacing"
+ msgstr "Espaiat de la barra de desplaçament"
+
+-#: gtk/gtkobject.c:370
++#: ../gtk/gtkobject.c:370
+ msgid "User Data"
+ msgstr "Dades d'usuari"
+
+-#: gtk/gtkobject.c:371
++#: ../gtk/gtkobject.c:371
+ msgid "Anonymous User Data Pointer"
+ msgstr "Punter de dades d'usuari anònim"
+
+-#: gtk/gtkoptionmenu.c:162
++#: ../gtk/gtkoptionmenu.c:162
+ msgid "The menu of options"
+ msgstr "El menú d'opcions"
+
+-#: gtk/gtkoptionmenu.c:169
++#: ../gtk/gtkoptionmenu.c:169
+ msgid "Size of dropdown indicator"
+ msgstr "Mida de l'indicador desplegable"
+
+-#: gtk/gtkoptionmenu.c:175
++#: ../gtk/gtkoptionmenu.c:175
+ msgid "Spacing around indicator"
+ msgstr "Espaiat al voltant de l'indicador"
+
+-#: gtk/gtkpaned.c:219
++#: ../gtk/gtkpaned.c:219
+ msgid ""
+ "Position of paned separator in pixels (0 means all the way to the left/top)"
+ msgstr ""
+ "La posició del separador emmarcat en píxels (0 significa de tot el trajecte "
+ "fins l'esquerra/part superior)"
+
+-#: gtk/gtkpaned.c:227
++#: ../gtk/gtkpaned.c:227
+ msgid "Position Set"
+ msgstr "Conjunt posició"
+
+-#: gtk/gtkpaned.c:228
++#: ../gtk/gtkpaned.c:228
+ msgid "TRUE if the Position property should be used"
+ msgstr "CERT si s'ha d'utilitzar l'atribut Position"
+
+-#: gtk/gtkpaned.c:234
++#: ../gtk/gtkpaned.c:234
+ msgid "Handle Size"
+ msgstr "Mida de la nansa"
+
+-#: gtk/gtkpaned.c:235
++#: ../gtk/gtkpaned.c:235
+ msgid "Width of handle"
+ msgstr "Amplada de la nansa"
+
+-#: gtk/gtkpaned.c:251
++#: ../gtk/gtkpaned.c:251
+ msgid "Minimal Position"
+ msgstr "Posició mínima"
+
+-#: gtk/gtkpaned.c:252
++#: ../gtk/gtkpaned.c:252
+ msgid "Smallest possible value for the \"position\" property"
+ msgstr "El valor més petit possible per a la propietat «position»"
+
+-#: gtk/gtkpaned.c:269
++#: ../gtk/gtkpaned.c:269
+ msgid "Maximal Position"
+ msgstr "Posició màxima"
+
+-#: gtk/gtkpaned.c:270
++#: ../gtk/gtkpaned.c:270
+ msgid "Largest possible value for the \"position\" property"
+ msgstr "El valor més gran possible per a la propietat «position»"
+
+-#: gtk/gtkpaned.c:287
++#: ../gtk/gtkpaned.c:287
+ msgid "Resize"
+ msgstr "Reajusta"
+
+-#: gtk/gtkpaned.c:288
++#: ../gtk/gtkpaned.c:288
+ msgid "If TRUE, the child expands and shrinks along with the paned widget"
+ msgstr ""
+ "Si és CERT, el fill s'expandirà o s'encongirà amb el giny de la subfinestra"
+
+-#: gtk/gtkpaned.c:303
++#: ../gtk/gtkpaned.c:303
+ msgid "Shrink"
+ msgstr "Encongeix"
+
+-#: gtk/gtkpaned.c:304
++#: ../gtk/gtkpaned.c:304
+ msgid "If TRUE, the child can be made smaller than its requisition"
+ msgstr "Si és CERT, el fill es podrà fer més petit del necessari"
+
+-#: gtk/gtkplug.c:150 gtk/gtkstatusicon.c:285
++#: ../gtk/gtkplug.c:150 ../gtk/gtkstatusicon.c:285
+ msgid "Embedded"
+ msgstr "Imbricat"
+
+-#: gtk/gtkplug.c:151
++#: ../gtk/gtkplug.c:151
+ msgid "Whether or not the plug is embedded"
+ msgstr "Si l'endoll és imbricat"
+
+-#: gtk/gtkplug.c:165
++#: ../gtk/gtkplug.c:165
+ msgid "Socket Window"
+ msgstr "Finestra del sòcol"
+
+-#: gtk/gtkplug.c:166
++#: ../gtk/gtkplug.c:166
+ msgid "The window of the socket the plug is embedded in"
+ msgstr "La finestra del sòcol en el qual l'endoll està incrustat"
+
+-#: gtk/gtkpreview.c:102
++#: ../gtk/gtkpreview.c:102
+ msgid ""
+ "Whether the preview widget should take up the entire space it is allocated"
+ msgstr ""
+ "Si el giny de visualització prèvia ha d'ocupar tot l'espai que té assignat"
+
+-#: gtk/gtkprinter.c:124
++#: ../gtk/gtkprinter.c:124
+ msgid "Name of the printer"
+ msgstr "Nom de la impressora"
+
+-#: gtk/gtkprinter.c:130
++#: ../gtk/gtkprinter.c:130
+ msgid "Backend"
+ msgstr "Rerefons"
+
+-#: gtk/gtkprinter.c:131
++#: ../gtk/gtkprinter.c:131
+ msgid "Backend for the printer"
+ msgstr "Rerefons per a la impressora"
+
+-#: gtk/gtkprinter.c:137
++#: ../gtk/gtkprinter.c:137
+ msgid "Is Virtual"
+ msgstr "És virtual"
+
+-#: gtk/gtkprinter.c:138
++#: ../gtk/gtkprinter.c:138
+ msgid "FALSE if this represents a real hardware printer"
+ msgstr "FALS si representa una impressora de maquinari real"
+
+-#: gtk/gtkprinter.c:144
++#: ../gtk/gtkprinter.c:144
+ msgid "Accepts PDF"
+ msgstr "Accepta PDF"
+
+-#: gtk/gtkprinter.c:145
++#: ../gtk/gtkprinter.c:145
+ msgid "TRUE if this printer can accept PDF"
+ msgstr "CERT si aquesta impressora accepta PDF"
+
+-#: gtk/gtkprinter.c:151
++#: ../gtk/gtkprinter.c:151
+ msgid "Accepts PostScript"
+ msgstr "Accepta PostScript"
+
+-#: gtk/gtkprinter.c:152
++#: ../gtk/gtkprinter.c:152
+ msgid "TRUE if this printer can accept PostScript"
+ msgstr "CERT si aquesta impressora accepta PostScript"
+
+-#: gtk/gtkprinter.c:158
++#: ../gtk/gtkprinter.c:158
+ msgid "State Message"
+ msgstr "Missatge d'estat"
+
+-#: gtk/gtkprinter.c:159
++#: ../gtk/gtkprinter.c:159
+ msgid "String giving the current state of the printer"
+ msgstr "Cadena que informa de l'estat actual de la impressora"
+
+-#: gtk/gtkprinter.c:165
++#: ../gtk/gtkprinter.c:165
+ msgid "Location"
+ msgstr "Ubicació"
+
+-#: gtk/gtkprinter.c:166
++#: ../gtk/gtkprinter.c:166
+ msgid "The location of the printer"
+ msgstr "La ubicació de la impressora"
+
+-#: gtk/gtkprinter.c:173
++#: ../gtk/gtkprinter.c:173
+ msgid "The icon name to use for the printer"
+ msgstr "El nom de la icona per a la impressora"
+
+-#: gtk/gtkprinter.c:179
++#: ../gtk/gtkprinter.c:179
+ msgid "Job Count"
+ msgstr "Comptatge de treballs"
+
+-#: gtk/gtkprinter.c:180
++#: ../gtk/gtkprinter.c:180
+ msgid "Number of jobs queued in the printer"
+ msgstr "El nombre de treballs a la cua de la impressora"
+
+-#: gtk/gtkprinter.c:198
++#: ../gtk/gtkprinter.c:198
+ msgid "Paused Printer"
+ msgstr "Impressora en pausa"
+
+-#: gtk/gtkprinter.c:199
++#: ../gtk/gtkprinter.c:199
+ msgid "TRUE if this printer is paused"
+ msgstr "CERT si aquesta impressora està en pausa"
+
+-#: gtk/gtkprinter.c:212
++#: ../gtk/gtkprinter.c:212
+ msgid "Accepting Jobs"
+ msgstr "Accepta tasques"
+
+-#: gtk/gtkprinter.c:213
++#: ../gtk/gtkprinter.c:213
+ msgid "TRUE if this printer is accepting new jobs"
+ msgstr "CERT si aquesta impressora accepta tasques noves"
+
+-#: gtk/gtkprinteroptionwidget.c:123
++#: ../gtk/gtkprinteroptionwidget.c:123
+ msgid "Source option"
+ msgstr "Opció de la font"
+
+-#: gtk/gtkprinteroptionwidget.c:124
++#: ../gtk/gtkprinteroptionwidget.c:124
+ msgid "The PrinterOption backing this widget"
+ msgstr "La PrinterOption com a rerefons d'aquest giny"
+
+-#: gtk/gtkprintjob.c:117
++#: ../gtk/gtkprintjob.c:117
+ msgid "Title of the print job"
+ msgstr "Títol del treball d'impressió"
+
+-#: gtk/gtkprintjob.c:125
++#: ../gtk/gtkprintjob.c:125
+ msgid "Printer"
+ msgstr "Impressora"
+
+-#: gtk/gtkprintjob.c:126
++#: ../gtk/gtkprintjob.c:126
+ msgid "Printer to print the job to"
+ msgstr "La impressora on imprimir el treball"
+
+-#: gtk/gtkprintjob.c:134
++#: ../gtk/gtkprintjob.c:134
+ msgid "Settings"
+ msgstr "Paràmetres"
+
+-#: gtk/gtkprintjob.c:135
++#: ../gtk/gtkprintjob.c:135
+ msgid "Printer settings"
+ msgstr "Paràmetres de la impressora"
+
+-#: gtk/gtkprintjob.c:143 gtk/gtkprintjob.c:144 gtk/gtkprintunixdialog.c:258
++#: ../gtk/gtkprintjob.c:143 ../gtk/gtkprintjob.c:144
++#: ../gtk/gtkprintunixdialog.c:258
+ msgid "Page Setup"
+ msgstr "Configuració de la pàgina"
+
+-#: gtk/gtkprintjob.c:152 gtk/gtkprintoperation.c:1013
++#: ../gtk/gtkprintjob.c:152 ../gtk/gtkprintoperation.c:1013
+ msgid "Track Print Status"
+ msgstr "Segueix l'estat de la impressió"
+
+-#: gtk/gtkprintjob.c:153
++#: ../gtk/gtkprintjob.c:153
+ msgid ""
+ "TRUE if the print job will continue to emit status-changed signals after the "
+ "print data has been sent to the printer or print server."
+@@ -3897,51 +3923,51 @@
+ "changed» un cop ja s'hagin transmès les dades a la impressora, o al servidor "
+ "d'impressió."
+
+-#: gtk/gtkprintoperation.c:885
++#: ../gtk/gtkprintoperation.c:885
+ msgid "Default Page Setup"
+ msgstr "Configuració de la pàgina per defecte"
+
+-#: gtk/gtkprintoperation.c:886
++#: ../gtk/gtkprintoperation.c:886
+ msgid "The GtkPageSetup used by default"
+ msgstr "El GtkPageSetup utilitzat per defecte"
+
+-#: gtk/gtkprintoperation.c:904 gtk/gtkprintunixdialog.c:276
++#: ../gtk/gtkprintoperation.c:904 ../gtk/gtkprintunixdialog.c:276
+ msgid "Print Settings"
+ msgstr "Paràmetres de la impressora"
+
+-#: gtk/gtkprintoperation.c:905 gtk/gtkprintunixdialog.c:277
++#: ../gtk/gtkprintoperation.c:905 ../gtk/gtkprintunixdialog.c:277
+ msgid "The GtkPrintSettings used for initializing the dialog"
+ msgstr "El GtkPrintSettings utilitzat per a inicialitzar el diàleg"
+
+-#: gtk/gtkprintoperation.c:923
++#: ../gtk/gtkprintoperation.c:923
+ msgid "Job Name"
+ msgstr "Nom del treball"
+
+-#: gtk/gtkprintoperation.c:924
++#: ../gtk/gtkprintoperation.c:924
+ msgid "A string used for identifying the print job."
+ msgstr "Una cadena per a identificar el treball d'impressió."
+
+-#: gtk/gtkprintoperation.c:948
++#: ../gtk/gtkprintoperation.c:948
+ msgid "Number of Pages"
+ msgstr "Nombre de pàgines"
+
+-#: gtk/gtkprintoperation.c:949
++#: ../gtk/gtkprintoperation.c:949
+ msgid "The number of pages in the document."
+ msgstr "El nombre de pàgines del document."
+
+-#: gtk/gtkprintoperation.c:970 gtk/gtkprintunixdialog.c:266
++#: ../gtk/gtkprintoperation.c:970 ../gtk/gtkprintunixdialog.c:266
+ msgid "Current Page"
+ msgstr "Pàgina actual"
+
+-#: gtk/gtkprintoperation.c:971 gtk/gtkprintunixdialog.c:267
++#: ../gtk/gtkprintoperation.c:971 ../gtk/gtkprintunixdialog.c:267
+ msgid "The current page in the document"
+ msgstr "La pàgina actual en el document"
+
+-#: gtk/gtkprintoperation.c:992
++#: ../gtk/gtkprintoperation.c:992
+ msgid "Use full page"
+ msgstr "Utilitza la pàgina completa"
+
+-#: gtk/gtkprintoperation.c:993
++#: ../gtk/gtkprintoperation.c:993
+ msgid ""
+ "TRUE if the origin of the context should be at the corner of the page and "
+ "not the corner of the imageable area"
+@@ -3949,7 +3975,7 @@
+ "CERT si l'origen del context ha de ser al racó de la pàgina, i no al racó de "
+ "l'àrea representable"
+
+-#: gtk/gtkprintoperation.c:1014
++#: ../gtk/gtkprintoperation.c:1014
+ msgid ""
+ "TRUE if the print operation will continue to report on the print job status "
+ "after the print data has been sent to the printer or print server."
+@@ -3958,76 +3984,76 @@
+ "d'impressió quan ja s'hagin enviat tots les dades a la impressora o al "
+ "servidor d'impressió."
+
+-#: gtk/gtkprintoperation.c:1031
++#: ../gtk/gtkprintoperation.c:1031
+ msgid "Unit"
+ msgstr "Unitat"
+
+-#: gtk/gtkprintoperation.c:1032
++#: ../gtk/gtkprintoperation.c:1032
+ msgid "The unit in which distances can be measured in the context"
+ msgstr "La unitat amb la que es mesuren distàncies en el context"
+
+-#: gtk/gtkprintoperation.c:1049
++#: ../gtk/gtkprintoperation.c:1049
+ msgid "Show Dialog"
+ msgstr "Mostra el diàleg"
+
+-#: gtk/gtkprintoperation.c:1050
++#: ../gtk/gtkprintoperation.c:1050
+ msgid "TRUE if a progress dialog is shown while printing."
+ msgstr "CERT si el diàleg de progrés es mostra mentre s'imprimeix."
+
+ # FIXME (josep)
+-#: gtk/gtkprintoperation.c:1073
++#: ../gtk/gtkprintoperation.c:1073
+ msgid "Allow Async"
+ msgstr "Permet asíncron"
+
+-#: gtk/gtkprintoperation.c:1074
++#: ../gtk/gtkprintoperation.c:1074
+ msgid "TRUE if print process may run asynchronous."
+ msgstr "CERT si el procés d'impressió es pot executar de manera asíncrona."
+
+-#: gtk/gtkprintoperation.c:1096 gtk/gtkprintoperation.c:1097
++#: ../gtk/gtkprintoperation.c:1096 ../gtk/gtkprintoperation.c:1097
+ msgid "Export filename"
+ msgstr "Fitxer a exportar"
+
+-#: gtk/gtkprintoperation.c:1111
++#: ../gtk/gtkprintoperation.c:1111
+ msgid "Status"
+ msgstr "Estat"
+
+-#: gtk/gtkprintoperation.c:1112
++#: ../gtk/gtkprintoperation.c:1112
+ msgid "The status of the print operation"
+ msgstr "L'estat de la operació d'impressió"
+
+-#: gtk/gtkprintoperation.c:1132
++#: ../gtk/gtkprintoperation.c:1132
+ msgid "Status String"
+ msgstr "Cadena d'estat"
+
+-#: gtk/gtkprintoperation.c:1133
++#: ../gtk/gtkprintoperation.c:1133
+ msgid "A human-readable description of the status"
+ msgstr "Descripció de l'estat"
+
+-#: gtk/gtkprintoperation.c:1151
++#: ../gtk/gtkprintoperation.c:1151
+ msgid "Custom tab label"
+ msgstr "Etiqueta de pestanya personalitzada"
+
+-#: gtk/gtkprintoperation.c:1152
++#: ../gtk/gtkprintoperation.c:1152
+ msgid "Label for the tab containing custom widgets."
+ msgstr "Etiqueta per a la pestanya que contingui ginys personalitzats."
+
+-#: gtk/gtkprintunixdialog.c:259
++#: ../gtk/gtkprintunixdialog.c:259
+ msgid "The GtkPageSetup to use"
+ msgstr "El GtkPageSetup a utilitzar"
+
+-#: gtk/gtkprintunixdialog.c:284
++#: ../gtk/gtkprintunixdialog.c:284
+ msgid "Selected Printer"
+ msgstr "Impressora seleccionada"
+
+-#: gtk/gtkprintunixdialog.c:285
++#: ../gtk/gtkprintunixdialog.c:285
+ msgid "The GtkPrinter which is selected"
+ msgstr "La GtkPrinter seleccionada"
+
+-#: gtk/gtkprogress.c:102
++#: ../gtk/gtkprogress.c:102
+ msgid "Activity mode"
+ msgstr "Mode Actiu"
+
+-#: gtk/gtkprogress.c:103
++#: ../gtk/gtkprogress.c:103
+ msgid ""
+ "If TRUE, the GtkProgress is in activity mode, meaning that it signals "
+ "something is happening, but not how much of the activity is finished. This "
+@@ -4038,39 +4064,39 @@
+ "finalitzat. Això s'utilitzarà quan estigueu realitzant alguna acció que no "
+ "sabeu quan durarà."
+
+-#: gtk/gtkprogress.c:111
++#: ../gtk/gtkprogress.c:111
+ msgid "Show text"
+ msgstr "Mostra text"
+
+-#: gtk/gtkprogress.c:112
++#: ../gtk/gtkprogress.c:112
+ msgid "Whether the progress is shown as text."
+ msgstr "Si el progrés s'ha de mostrar com a text."
+
+-#: gtk/gtkprogressbar.c:119
++#: ../gtk/gtkprogressbar.c:119
+ msgid "The GtkAdjustment connected to the progress bar (Deprecated)"
+ msgstr "El GtkAdjustment connectat a la barra de progrés (Obsolet)"
+
+-#: gtk/gtkprogressbar.c:135
++#: ../gtk/gtkprogressbar.c:135
+ msgid "Bar style"
+ msgstr "Estil de barra"
+
+-#: gtk/gtkprogressbar.c:136
++#: ../gtk/gtkprogressbar.c:136
+ msgid "Specifies the visual style of the bar in percentage mode (Deprecated)"
+ msgstr "Especifica l'estil visual de la barra en mode percentatge (Obsolet)"
+
+-#: gtk/gtkprogressbar.c:144
++#: ../gtk/gtkprogressbar.c:144
+ msgid "Activity Step"
+ msgstr "Pas d'activitat"
+
+-#: gtk/gtkprogressbar.c:145
++#: ../gtk/gtkprogressbar.c:145
+ msgid "The increment used for each iteration in activity mode (Deprecated)"
+ msgstr "L'increment utilitzat per cada iteració en modalitat activa (Obsolet)"
+
+-#: gtk/gtkprogressbar.c:152
++#: ../gtk/gtkprogressbar.c:152
+ msgid "Activity Blocks"
+ msgstr "Blocs d'activitat"
+
+-#: gtk/gtkprogressbar.c:153
++#: ../gtk/gtkprogressbar.c:153
+ msgid ""
+ "The number of blocks which can fit in the progress bar area in activity mode "
+ "(Deprecated)"
+@@ -4078,11 +4104,11 @@
+ "El nombre de blocs que s'adapten a l'àrea de la barra de progrés en mode "
+ "d'activitat (Obsolet)"
+
+-#: gtk/gtkprogressbar.c:160
++#: ../gtk/gtkprogressbar.c:160
+ msgid "Discrete Blocks"
+ msgstr "Blocs discrets"
+
+-#: gtk/gtkprogressbar.c:161
++#: ../gtk/gtkprogressbar.c:161
+ msgid ""
+ "The number of discrete blocks in a progress bar (when shown in the discrete "
+ "style)"
+@@ -4090,27 +4116,27 @@
+ "El nombre de blocs discrets en una barra de progrés (quan es mostra en "
+ "l'estil discret)"
+
+-#: gtk/gtkprogressbar.c:168
++#: ../gtk/gtkprogressbar.c:168
+ msgid "Fraction"
+ msgstr "Fracció"
+
+-#: gtk/gtkprogressbar.c:169
++#: ../gtk/gtkprogressbar.c:169
+ msgid "The fraction of total work that has been completed"
+ msgstr "La fracció de treball total que ha estat completada"
+
+-#: gtk/gtkprogressbar.c:176
++#: ../gtk/gtkprogressbar.c:176
+ msgid "Pulse Step"
+ msgstr "Premeu el pas"
+
+-#: gtk/gtkprogressbar.c:177
++#: ../gtk/gtkprogressbar.c:177
+ msgid "The fraction of total progress to move the bouncing block when pulsed"
+ msgstr "La fracció de progrés total a moure quan fou premut el bloc fort"
+
+-#: gtk/gtkprogressbar.c:185
++#: ../gtk/gtkprogressbar.c:185
+ msgid "Text to be displayed in the progress bar"
+ msgstr "El text que es visualitzarà a la barra de progrés"
+
+-#: gtk/gtkprogressbar.c:207
++#: ../gtk/gtkprogressbar.c:207
+ msgid ""
+ "The preferred place to ellipsize the string, if the progress bar does not "
+ "have enough room to display the entire string, if at all."
+@@ -4118,59 +4144,59 @@
+ "El lloc preferit on posar punts suspensius a la cadena, si la barra de "
+ "progrés no té prou espai per tota la cadena."
+
+-#: gtk/gtkprogressbar.c:214
++#: ../gtk/gtkprogressbar.c:214
+ msgid "XSpacing"
+ msgstr "Espaiament X"
+
+-#: gtk/gtkprogressbar.c:215
++#: ../gtk/gtkprogressbar.c:215
+ msgid "Extra spacing applied to the width of a progress bar."
+ msgstr "Espaiament addicional aplicat a l'amplada de la barra de progrés."
+
+-#: gtk/gtkprogressbar.c:220
++#: ../gtk/gtkprogressbar.c:220
+ msgid "YSpacing"
+ msgstr "Espaiament Y"
+
+-#: gtk/gtkprogressbar.c:221
++#: ../gtk/gtkprogressbar.c:221
+ msgid "Extra spacing applied to the height of a progress bar."
+ msgstr "Espaiament addicional aplicat a l'alçada d'una barra de progrés."
+
+-#: gtk/gtkprogressbar.c:234
++#: ../gtk/gtkprogressbar.c:234
+ msgid "Min horizontal bar width"
+ msgstr "Amplada mínima horitzontal de la barra"
+
+-#: gtk/gtkprogressbar.c:235
++#: ../gtk/gtkprogressbar.c:235
+ msgid "The minimum horizontal width of the progress bar"
+ msgstr "L'amplada mínima horitzontal de la barra de progrés"
+
+-#: gtk/gtkprogressbar.c:247
++#: ../gtk/gtkprogressbar.c:247
+ msgid "Min horizontal bar height"
+ msgstr "Alçada mínima horitzontal de la barra"
+
+-#: gtk/gtkprogressbar.c:248
++#: ../gtk/gtkprogressbar.c:248
+ msgid "Minimum horizontal height of the progress bar"
+ msgstr "L'alçada mínima horitzontal de la barra de progrés"
+
+-#: gtk/gtkprogressbar.c:260
++#: ../gtk/gtkprogressbar.c:260
+ msgid "Min vertical bar width"
+ msgstr "Amplada mínima vertical de la barra"
+
+-#: gtk/gtkprogressbar.c:261
++#: ../gtk/gtkprogressbar.c:261
+ msgid "The minimum vertical width of the progress bar"
+ msgstr "L'amplada mínima vertical de la barra de progrés"
+
+-#: gtk/gtkprogressbar.c:273
++#: ../gtk/gtkprogressbar.c:273
+ msgid "Min vertical bar height"
+ msgstr "Alçada mínima vertical de la barra"
+
+-#: gtk/gtkprogressbar.c:274
++#: ../gtk/gtkprogressbar.c:274
+ msgid "The minimum vertical height of the progress bar"
+ msgstr "L'alçada mínima vertical de la barra de progrés"
+
+-#: gtk/gtkradioaction.c:111
++#: ../gtk/gtkradioaction.c:111
+ msgid "The value"
+ msgstr "El valor"
+
+-#: gtk/gtkradioaction.c:112
++#: ../gtk/gtkradioaction.c:112
+ msgid ""
+ "The value returned by gtk_radio_action_get_current_value() when this action "
+ "is the current action of its group."
+@@ -4178,15 +4204,15 @@
+ "el valor que retorna gtk_radio_action_get_current_value() quan aquesta acció "
+ "és l'acció activa del seu grup."
+
+-#: gtk/gtkradioaction.c:129
++#: ../gtk/gtkradioaction.c:129
+ msgid "The radio action whose group this action belongs to."
+ msgstr "L'acció de radi al grup de la qual pertany aquesta acció."
+
+-#: gtk/gtkradioaction.c:144
++#: ../gtk/gtkradioaction.c:144
+ msgid "The current value"
+ msgstr "El valor actual"
+
+-#: gtk/gtkradioaction.c:145
++#: ../gtk/gtkradioaction.c:145
+ msgid ""
+ "The value property of the currently active member of the group to which this "
+ "action belongs."
+@@ -4194,45 +4220,45 @@
+ "El valor de la propietat del membre actualment actiu del grup al qual "
+ "pertany aquesta acció."
+
+-#: gtk/gtkradiobutton.c:83
++#: ../gtk/gtkradiobutton.c:83
+ msgid "The radio button whose group this widget belongs to."
+ msgstr "El botó de grup al grup del qual pertany aquest giny."
+
+-#: gtk/gtkradiomenuitem.c:343
++#: ../gtk/gtkradiomenuitem.c:343
+ msgid "The radio menu item whose group this widget belongs to."
+ msgstr "L'element del botó de grup el grup del qual pertany aquest giny."
+
+ # http://en.wikipedia.org/wiki/Radio_button
+-#: gtk/gtkradiotoolbutton.c:66
++#: ../gtk/gtkradiotoolbutton.c:66
+ msgid "The radio tool button whose group this button belongs to."
+ msgstr "El botó d'opció de l'eina al grup del qual pertany aquest botó."
+
+-#: gtk/gtkrange.c:337
++#: ../gtk/gtkrange.c:337
+ msgid "Update policy"
+ msgstr "Política d'actualització"
+
+-#: gtk/gtkrange.c:338
++#: ../gtk/gtkrange.c:338
+ msgid "How the range should be updated on the screen"
+ msgstr "Com s'ha d'actualitzar el rang a la pantalla"
+
+-#: gtk/gtkrange.c:347
++#: ../gtk/gtkrange.c:347
+ msgid "The GtkAdjustment that contains the current value of this range object"
+ msgstr "El GtkAdjustment que conté el valor actual d'aquest rang d'objectes"
+
+-#: gtk/gtkrange.c:354
++#: ../gtk/gtkrange.c:354
+ msgid "Inverted"
+ msgstr "Invertit"
+
+-#: gtk/gtkrange.c:355
++#: ../gtk/gtkrange.c:355
+ msgid "Invert direction slider moves to increase range value"
+ msgstr ""
+ "El lliscador de direcció invertida es mou per incrementar el valor del rang"
+
+-#: gtk/gtkrange.c:362
++#: ../gtk/gtkrange.c:362
+ msgid "Lower stepper sensitivity"
+ msgstr "Sensibilitat del desplaçador inferior"
+
+-#: gtk/gtkrange.c:363
++#: ../gtk/gtkrange.c:363
+ msgid ""
+ "The sensitivity policy for the stepper that points to the adjustment's lower "
+ "side"
+@@ -4240,11 +4266,11 @@
+ "La directiva de sensibilitat del desplaçador que apunta a la part de baix de "
+ "l'ajustament"
+
+-#: gtk/gtkrange.c:371
++#: ../gtk/gtkrange.c:371
+ msgid "Upper stepper sensitivity"
+ msgstr "Sensibilitat del desplaçador superior"
+
+-#: gtk/gtkrange.c:372
++#: ../gtk/gtkrange.c:372
+ msgid ""
+ "The sensitivity policy for the stepper that points to the adjustment's upper "
+ "side"
+@@ -4252,89 +4278,89 @@
+ "La directiva de sensibilitat del desplaçador que apunta a la part de dalt de "
+ "l'ajustament"
+
+-#: gtk/gtkrange.c:389
++#: ../gtk/gtkrange.c:389
+ msgid "Show Fill Level"
+ msgstr "Mostra el nivell d'emplenat"
+
+-#: gtk/gtkrange.c:390
++#: ../gtk/gtkrange.c:390
+ msgid "Whether to display a fill level indicator graphics on trough."
+ msgstr "Si s'ha de mostrar un gràfic de nivell d'emplenat a la regata."
+
+-#: gtk/gtkrange.c:406
++#: ../gtk/gtkrange.c:406
+ msgid "Restrict to Fill Level"
+ msgstr "Restringeix al nivell d'emplenat"
+
+-#: gtk/gtkrange.c:407
++#: ../gtk/gtkrange.c:407
+ msgid "Whether to restrict the upper boundary to the fill level."
+ msgstr "Si s'ha de restringir el límit superior al nivell d'emplenat."
+
+-#: gtk/gtkrange.c:422
++#: ../gtk/gtkrange.c:422
+ msgid "Fill Level"
+ msgstr "Nivell d'emplenat"
+
+-#: gtk/gtkrange.c:423
++#: ../gtk/gtkrange.c:423
+ msgid "The fill level."
+ msgstr "El nivell d'emplenat."
+
+-#: gtk/gtkrange.c:431
++#: ../gtk/gtkrange.c:431
+ msgid "Slider Width"
+ msgstr "Amplada del lliscador"
+
+-#: gtk/gtkrange.c:432
++#: ../gtk/gtkrange.c:432
+ msgid "Width of scrollbar or scale thumb"
+ msgstr "Amplada de la barra de desplaçament o del lliscador d'escalat"
+
+-#: gtk/gtkrange.c:439
++#: ../gtk/gtkrange.c:439
+ msgid "Trough Border"
+ msgstr "Vora de la regata"
+
+-#: gtk/gtkrange.c:440
++#: ../gtk/gtkrange.c:440
+ msgid "Spacing between thumb/steppers and outer trough bevel"
+ msgstr "Espaiat entre el lliscador i la separació de la vora exterior"
+
+-#: gtk/gtkrange.c:447
++#: ../gtk/gtkrange.c:447
+ msgid "Stepper Size"
+ msgstr "Mida dels desplaçadors"
+
+-#: gtk/gtkrange.c:448
++#: ../gtk/gtkrange.c:448
+ msgid "Length of step buttons at ends"
+ msgstr "Longitud dels botons de desplaçament als extrems"
+
+-#: gtk/gtkrange.c:463
++#: ../gtk/gtkrange.c:463
+ msgid "Stepper Spacing"
+ msgstr "Espaiament dels desplaçadors"
+
+-#: gtk/gtkrange.c:464
++#: ../gtk/gtkrange.c:464
+ msgid "Spacing between step buttons and thumb"
+ msgstr "Espaiament entre els botons de pas i el polze"
+
+-#: gtk/gtkrange.c:471
++#: ../gtk/gtkrange.c:471
+ msgid "Arrow X Displacement"
+ msgstr "Desplaçament X de la fletxa"
+
+-#: gtk/gtkrange.c:472
++#: ../gtk/gtkrange.c:472
+ msgid ""
+ "How far in the x direction to move the arrow when the button is depressed"
+ msgstr ""
+ "A quina distància s'ha de moure la fletxa en la direcció X quan es prem el "
+ "botó"
+
+-#: gtk/gtkrange.c:479
++#: ../gtk/gtkrange.c:479
+ msgid "Arrow Y Displacement"
+ msgstr "Desplaçament Y de la fletxa"
+
+-#: gtk/gtkrange.c:480
++#: ../gtk/gtkrange.c:480
+ msgid ""
+ "How far in the y direction to move the arrow when the button is depressed"
+ msgstr ""
+ "A quina distància s'ha de moure la fletxa en la direcció Y quan es prem el "
+ "botó"
+
+-#: gtk/gtkrange.c:488
++#: ../gtk/gtkrange.c:488
+ msgid "Draw slider ACTIVE during drag"
+ msgstr "Dibuixa el lliscador ACTIU en arrossegar"
+
+-#: gtk/gtkrange.c:489
++#: ../gtk/gtkrange.c:489
+ msgid ""
+ "With this option set to TRUE, sliders will be drawn ACTIVE and with shadow "
+ "IN while they are dragged"
+@@ -4342,11 +4368,11 @@
+ "Si s'estableix aquesta opció com a CERTA, els lliscadors es dibuixaran com a "
+ "ACTIUS amb ombra a DINS quan s'arrosseguin"
+
+-#: gtk/gtkrange.c:503
++#: ../gtk/gtkrange.c:503
+ msgid "Trough Side Details"
+ msgstr "Detalls de les bandes de la regata"
+
+-#: gtk/gtkrange.c:504
++#: ../gtk/gtkrange.c:504
+ msgid ""
+ "When TRUE, the parts of the trough on the two sides of the slider are drawn "
+ "with different details"
+@@ -4354,11 +4380,11 @@
+ "Quan sigui CERT, les parts de la regata de cada banda del lliscador es "
+ "dibuixaran amb detalls diferents"
+
+-#: gtk/gtkrange.c:520
++#: ../gtk/gtkrange.c:520
+ msgid "Trough Under Steppers"
+ msgstr "Regata sota els lliscadors"
+
+-#: gtk/gtkrange.c:521
++#: ../gtk/gtkrange.c:521
+ msgid ""
+ "Whether to draw trough for full length of range or exclude the steppers and "
+ "spacing"
+@@ -4366,272 +4392,274 @@
+ "Si s'ha de dibuixar la regata per a tot l'abast o bé s'han d'excloure els "
+ "lliscadors i l'espaiament"
+
+-#: gtk/gtkrange.c:534
++#: ../gtk/gtkrange.c:534
+ msgid "Arrow scaling"
+ msgstr "Escalat de la fletxa"
+
+-#: gtk/gtkrange.c:535
++#: ../gtk/gtkrange.c:535
+ msgid "Arrow scaling with regard to scroll button size"
+ msgstr ""
+ "L'escalat de la fletxa en referència a la mida del botó de desplaçament"
+
+-#: gtk/gtkrecentaction.c:679 gtk/gtkrecentchoosermenu.c:206
++#: ../gtk/gtkrecentaction.c:679 ../gtk/gtkrecentchoosermenu.c:206
+ msgid "Show Numbers"
+ msgstr "Mostra els nombres"
+
+-#: gtk/gtkrecentaction.c:680 gtk/gtkrecentchoosermenu.c:207
++#: ../gtk/gtkrecentaction.c:680 ../gtk/gtkrecentchoosermenu.c:207
+ msgid "Whether the items should be displayed with a number"
+ msgstr "Si els elements s'han de mostrar amb un nombre"
+
+-#: gtk/gtkrecentchooser.c:120
++#: ../gtk/gtkrecentchooser.c:120
+ msgid "Recent Manager"
+ msgstr "Gestor recent"
+
+-#: gtk/gtkrecentchooser.c:121
++#: ../gtk/gtkrecentchooser.c:121
+ msgid "The RecentManager object to use"
+ msgstr "L'objecte RecentManager a utilitzar"
+
+-#: gtk/gtkrecentchooser.c:135
++#: ../gtk/gtkrecentchooser.c:135
+ msgid "Show Private"
+ msgstr "Mostra privats"
+
+-#: gtk/gtkrecentchooser.c:136
++#: ../gtk/gtkrecentchooser.c:136
+ msgid "Whether the private items should be displayed"
+ msgstr "Si s'han de mostrar els elements privats"
+
+-#: gtk/gtkrecentchooser.c:149
++#: ../gtk/gtkrecentchooser.c:149
+ msgid "Show Tooltips"
+ msgstr "Mostra els indicadors de funció"
+
+-#: gtk/gtkrecentchooser.c:150
++#: ../gtk/gtkrecentchooser.c:150
+ msgid "Whether there should be a tooltip on the item"
+ msgstr "Si hi ha d'haver un indicador de funció per a l'element"
+
+-#: gtk/gtkrecentchooser.c:162
++#: ../gtk/gtkrecentchooser.c:162
+ msgid "Show Icons"
+ msgstr "Mostra icones"
+
+-#: gtk/gtkrecentchooser.c:163
++#: ../gtk/gtkrecentchooser.c:163
+ msgid "Whether there should be an icon near the item"
+ msgstr "Si hi ha d'haver una icona prop de l'element"
+
+-#: gtk/gtkrecentchooser.c:178
++#: ../gtk/gtkrecentchooser.c:178
+ msgid "Show Not Found"
+ msgstr "Mostra els que no es trobin"
+
+-#: gtk/gtkrecentchooser.c:179
++#: ../gtk/gtkrecentchooser.c:179
+ msgid "Whether the items pointing to unavailable resources should be displayed"
+ msgstr "Si s'han de mostrar els elements que apuntin a recursos no disponibles"
+
+-#: gtk/gtkrecentchooser.c:192
++#: ../gtk/gtkrecentchooser.c:192
+ msgid "Whether to allow multiple items to be selected"
+ msgstr "Si s'ha permetre que es puguin seleccionar diversos elements"
+
+-#: gtk/gtkrecentchooser.c:205
++#: ../gtk/gtkrecentchooser.c:205
+ msgid "Local only"
+ msgstr "Només locals"
+
+-#: gtk/gtkrecentchooser.c:206
++#: ../gtk/gtkrecentchooser.c:206
+ msgid "Whether the selected resource(s) should be limited to local file: URIs"
+ msgstr ""
+ "Si els recursos seleccionats s'haurien de limitar a fitxers locals: URI"
+
+-#: gtk/gtkrecentchooser.c:222 gtk/gtkrecentmanager.c:229
++#: ../gtk/gtkrecentchooser.c:222 ../gtk/gtkrecentmanager.c:229
+ msgid "Limit"
+ msgstr "Límit"
+
+-#: gtk/gtkrecentchooser.c:223
++#: ../gtk/gtkrecentchooser.c:223
+ msgid "The maximum number of items to be displayed"
+ msgstr "El nombre màxim d'elements a mostrar"
+
+-#: gtk/gtkrecentchooser.c:237
++#: ../gtk/gtkrecentchooser.c:237
+ msgid "Sort Type"
+ msgstr "Tipus d'ordenació"
+
+-#: gtk/gtkrecentchooser.c:238
++#: ../gtk/gtkrecentchooser.c:238
+ msgid "The sorting order of the items displayed"
+ msgstr "L'ordre d'ordenació dels elements seleccionats"
+
+-#: gtk/gtkrecentchooser.c:253
++#: ../gtk/gtkrecentchooser.c:253
+ msgid "The current filter for selecting which resources are displayed"
+ msgstr "El filtre actual per seleccionar quins fitxers es mostraran"
+
+-#: gtk/gtkrecentmanager.c:215
++#: ../gtk/gtkrecentmanager.c:215
+ msgid "The full path to the file to be used to store and read the list"
+ msgstr "El camí sencer al fitxer a utilitzar per desar i llegir la llista"
+
+-#: gtk/gtkrecentmanager.c:230
++#: ../gtk/gtkrecentmanager.c:230
+ msgid ""
+ "The maximum number of items to be returned by gtk_recent_manager_get_items()"
+ msgstr ""
+ "El nombre màxim d'elements que gtk_recent_manager_get_items() ha de tornar"
+
+-#: gtk/gtkrecentmanager.c:246
++#: ../gtk/gtkrecentmanager.c:246
+ msgid "The size of the recently used resources list"
+ msgstr "La mida de la llista de recursos utilitzada recentment"
+
+ # NOTA: hem posat "superior" més endavant per a "Upper",
+ # es refereix al "límit" (josep)
+-#: gtk/gtkruler.c:90
++#: ../gtk/gtkruler.c:90
+ msgid "Lower"
+ msgstr "Inferior"
+
+-#: gtk/gtkruler.c:91
++#: ../gtk/gtkruler.c:91
+ msgid "Lower limit of ruler"
+ msgstr "Límit inferior de la regla"
+
+-#: gtk/gtkruler.c:100
++#: ../gtk/gtkruler.c:100
+ msgid "Upper"
+ msgstr "Superior"
+
+-#: gtk/gtkruler.c:101
++#: ../gtk/gtkruler.c:101
+ msgid "Upper limit of ruler"
+ msgstr "Límit superior de la regla"
+
+-#: gtk/gtkruler.c:111
++#: ../gtk/gtkruler.c:111
+ msgid "Position of mark on the ruler"
+ msgstr "Posició de la marca a la regla"
+
+-#: gtk/gtkruler.c:120
++#: ../gtk/gtkruler.c:120
+ msgid "Max Size"
+ msgstr "Mida màxima"
+
+-#: gtk/gtkruler.c:121
++#: ../gtk/gtkruler.c:121
+ msgid "Maximum size of the ruler"
+ msgstr "Mida màxima del regle"
+
+-#: gtk/gtkruler.c:136
++#: ../gtk/gtkruler.c:136
+ msgid "Metric"
+ msgstr "Mètrica"
+
+-#: gtk/gtkruler.c:137
++#: ../gtk/gtkruler.c:137
+ msgid "The metric used for the ruler"
+ msgstr "La mètrica utilitzada per al regle"
+
+-#: gtk/gtkscale.c:143
++#: ../gtk/gtkscale.c:143
+ msgid "The number of decimal places that are displayed in the value"
+ msgstr "El nombre de decimals mostrats en el valor"
+
+-#: gtk/gtkscale.c:152
++#: ../gtk/gtkscale.c:152
+ msgid "Draw Value"
+ msgstr "Valor del dibuix"
+
+-#: gtk/gtkscale.c:153
++#: ../gtk/gtkscale.c:153
+ msgid "Whether the current value is displayed as a string next to the slider"
+ msgstr ""
+ "Si el valor actual es mostra com una cadena de text al costat de la barra de "
+ "desplaçament"
+
+-#: gtk/gtkscale.c:160
++#: ../gtk/gtkscale.c:160
+ msgid "Value Position"
+ msgstr "Posició del valor"
+
+-#: gtk/gtkscale.c:161
++#: ../gtk/gtkscale.c:161
+ msgid "The position in which the current value is displayed"
+ msgstr "La posició on es mostrarà el valor actual"
+
+-#: gtk/gtkscale.c:168
++#: ../gtk/gtkscale.c:168
+ msgid "Slider Length"
+ msgstr "Llargària del lliscador"
+
+-#: gtk/gtkscale.c:169
++#: ../gtk/gtkscale.c:169
+ msgid "Length of scale's slider"
+ msgstr "Llargària del lliscador de l'escala"
+
+-#: gtk/gtkscale.c:177
++#: ../gtk/gtkscale.c:177
+ msgid "Value spacing"
+ msgstr "Espaiat del valor"
+
+-#: gtk/gtkscale.c:178
++#: ../gtk/gtkscale.c:178
+ msgid "Space between value text and the slider/trough area"
+ msgstr "Espai entre el text del valor i l'àrea del lliscador/canal"
+
+ # FIXME: no sé ben bé a què es refereix (dpm)
+-#: gtk/gtkscalebutton.c:194
++#: ../gtk/gtkscalebutton.c:194
+ msgid "The orientation of the scale"
+ msgstr "L'orientació de l'escala"
+
+-#: gtk/gtkscalebutton.c:203
++#: ../gtk/gtkscalebutton.c:203
+ msgid "The value of the scale"
+ msgstr "El valor de l'escalat"
+
+-#: gtk/gtkscalebutton.c:213
++#: ../gtk/gtkscalebutton.c:213
+ msgid "The icon size"
+ msgstr "La mida de la icona"
+
+-#: gtk/gtkscalebutton.c:222
++#: ../gtk/gtkscalebutton.c:222
+ msgid ""
+ "The GtkAdjustment that contains the current value of this scale button object"
+ msgstr ""
+ "El GtkAdjustment que conté el valor actual d'aquest objecte de botó d'escalat"
+
+-#: gtk/gtkscalebutton.c:250
++#: ../gtk/gtkscalebutton.c:250
+ msgid "Icons"
+ msgstr "Icones"
+
+-#: gtk/gtkscalebutton.c:251
++#: ../gtk/gtkscalebutton.c:251
+ msgid "List of icon names"
+ msgstr "Llista de noms d'icona"
+
+-#: gtk/gtkscrollbar.c:50
++#: ../gtk/gtkscrollbar.c:50
+ msgid "Minimum Slider Length"
+ msgstr "Llargària mínima del lliscador"
+
+-#: gtk/gtkscrollbar.c:51
++#: ../gtk/gtkscrollbar.c:51
+ msgid "Minimum length of scrollbar slider"
+ msgstr "Llargària mínima de la barra de desplaçament"
+
+-#: gtk/gtkscrollbar.c:59
++#: ../gtk/gtkscrollbar.c:59
+ msgid "Fixed slider size"
+ msgstr "Mida del lliscador fixada"
+
+-#: gtk/gtkscrollbar.c:60
++#: ../gtk/gtkscrollbar.c:60
+ msgid "Don't change slider size, just lock it to the minimum length"
+ msgstr "No canviïs la mida del lliscador, mira la llargària mínima"
+
+-#: gtk/gtkscrollbar.c:84
++#: ../gtk/gtkscrollbar.c:84
+ msgid ""
+ "Display a second backward arrow button on the opposite end of the scrollbar"
+ msgstr ""
+ "Mostra un segon botó de desplaçament enrere a l'altra banda de la barra de "
+ "desplaçament"
+
+-#: gtk/gtkscrollbar.c:92
++#: ../gtk/gtkscrollbar.c:92
+ msgid ""
+ "Display a second forward arrow button on the opposite end of the scrollbar"
+ msgstr ""
+ "Mostra un segon botó de desplaçament cap endavant a l'altra banda de la "
+ "barra de desplaçament"
+
+-#: gtk/gtkscrolledwindow.c:218 gtk/gtktext.c:545 gtk/gtktreeview.c:578
++#: ../gtk/gtkscrolledwindow.c:218 ../gtk/gtktext.c:545
++#: ../gtk/gtktreeview.c:578
+ msgid "Horizontal Adjustment"
+ msgstr "Ajust horitzontal"
+
+-#: gtk/gtkscrolledwindow.c:225 gtk/gtktext.c:553 gtk/gtktreeview.c:586
++#: ../gtk/gtkscrolledwindow.c:225 ../gtk/gtktext.c:553
++#: ../gtk/gtktreeview.c:586
+ msgid "Vertical Adjustment"
+ msgstr "Ajust vertical"
+
+-#: gtk/gtkscrolledwindow.c:232
++#: ../gtk/gtkscrolledwindow.c:232
+ msgid "Horizontal Scrollbar Policy"
+ msgstr "Política de la barra de desplaçament horitzontal"
+
+-#: gtk/gtkscrolledwindow.c:233
++#: ../gtk/gtkscrolledwindow.c:233
+ msgid "When the horizontal scrollbar is displayed"
+ msgstr "Quan la barra de desplaçament horitzontal es mostra"
+
+-#: gtk/gtkscrolledwindow.c:240
++#: ../gtk/gtkscrolledwindow.c:240
+ msgid "Vertical Scrollbar Policy"
+ msgstr "Política de la barra de desplaçament vertical"
+
+-#: gtk/gtkscrolledwindow.c:241
++#: ../gtk/gtkscrolledwindow.c:241
+ msgid "When the vertical scrollbar is displayed"
+ msgstr "Quan es mostra la barra de desplaçament vertical"
+
+-#: gtk/gtkscrolledwindow.c:249
++#: ../gtk/gtkscrolledwindow.c:249
+ msgid "Window Placement"
+ msgstr "Emplaçament de la finestra"
+
+-#: gtk/gtkscrolledwindow.c:250
++#: ../gtk/gtkscrolledwindow.c:250
+ msgid ""
+ "Where the contents are located with respect to the scrollbars. This property "
+ "only takes effect if \"window-placement-set\" is TRUE."
+@@ -4639,11 +4667,11 @@
+ "Si els continguts se situen respecte de les barres de desplaçament. Aquesta "
+ "propietat només té efecte si «windows-placement-set» és CERT."
+
+-#: gtk/gtkscrolledwindow.c:267
++#: ../gtk/gtkscrolledwindow.c:267
+ msgid "Window Placement Set"
+ msgstr "Conjunt d'emplaçament de la finestra"
+
+-#: gtk/gtkscrolledwindow.c:268
++#: ../gtk/gtkscrolledwindow.c:268
+ msgid ""
+ "Whether \"window-placement\" should be used to determine the location of the "
+ "contents with respect to the scrollbars."
+@@ -4651,39 +4679,39 @@
+ "Si s'ha d'utilitzar «window-placement» per a determinar la situació dels "
+ "continguts de la finestra respecte de les barres de desplaçament."
+
+-#: gtk/gtkscrolledwindow.c:274
++#: ../gtk/gtkscrolledwindow.c:274
+ msgid "Shadow Type"
+ msgstr "Tipus d'ombra"
+
+-#: gtk/gtkscrolledwindow.c:275
++#: ../gtk/gtkscrolledwindow.c:275
+ msgid "Style of bevel around the contents"
+ msgstr "Estil del bisell que envolta els continguts"
+
+-#: gtk/gtkscrolledwindow.c:289
++#: ../gtk/gtkscrolledwindow.c:289
+ msgid "Scrollbars within bevel"
+ msgstr "Barres de desplaçament dins del bisell"
+
+-#: gtk/gtkscrolledwindow.c:290
++#: ../gtk/gtkscrolledwindow.c:290
+ msgid "Place scrollbars within the scrolled window's bevel"
+ msgstr ""
+ "Situa les barres de desplaçament dins del bisell de la finestra amb "
+ "desplaçament"
+
+-#: gtk/gtkscrolledwindow.c:296
++#: ../gtk/gtkscrolledwindow.c:296
+ msgid "Scrollbar spacing"
+ msgstr "Espaiat de barra de desplaçament"
+
+-#: gtk/gtkscrolledwindow.c:297
++#: ../gtk/gtkscrolledwindow.c:297
+ msgid "Number of pixels between the scrollbars and the scrolled window"
+ msgstr ""
+ "Nombre de píxels entre les barres de desplaçament i la finestra amb "
+ "desplaçament"
+
+-#: gtk/gtkscrolledwindow.c:312
++#: ../gtk/gtkscrolledwindow.c:312
+ msgid "Scrolled Window Placement"
+ msgstr "Situació de la finestra amb desplaçament"
+
+-#: gtk/gtkscrolledwindow.c:313
++#: ../gtk/gtkscrolledwindow.c:313
+ msgid ""
+ "Where the contents of scrolled windows are located with respect to the "
+ "scrollbars, if not overridden by the scrolled window's own placement."
+@@ -4692,19 +4720,19 @@
+ "barra de desplaçament, si no és que se substitueix per la posició de la "
+ "pròpia finestra."
+
+-#: gtk/gtkseparatortoolitem.c:105
++#: ../gtk/gtkseparatortoolitem.c:105
+ msgid "Draw"
+ msgstr "Dibuixa"
+
+-#: gtk/gtkseparatortoolitem.c:106
++#: ../gtk/gtkseparatortoolitem.c:106
+ msgid "Whether the separator is drawn, or just blank"
+ msgstr "Si es dibuixa el separador o es deixa en blanc"
+
+-#: gtk/gtksettings.c:215
++#: ../gtk/gtksettings.c:215
+ msgid "Double Click Time"
+ msgstr "Temps del doble clic"
+
+-#: gtk/gtksettings.c:216
++#: ../gtk/gtksettings.c:216
+ msgid ""
+ "Maximum time allowed between two clicks for them to be considered a double "
+ "click (in milliseconds)"
+@@ -4712,11 +4740,11 @@
+ "Temps màxim permès entre dos clics perquè es considerin un doble clic (en "
+ "mil·lisegons)"
+
+-#: gtk/gtksettings.c:223
++#: ../gtk/gtksettings.c:223
+ msgid "Double Click Distance"
+ msgstr "Distància de doble clic"
+
+-#: gtk/gtksettings.c:224
++#: ../gtk/gtksettings.c:224
+ msgid ""
+ "Maximum distance allowed between two clicks for them to be considered a "
+ "double click (in pixels)"
+@@ -4724,35 +4752,35 @@
+ "Distància màxima permesa entre dos clics perquè es considerin un doble clic "
+ "(en píxels)"
+
+-#: gtk/gtksettings.c:240
++#: ../gtk/gtksettings.c:240
+ msgid "Cursor Blink"
+ msgstr "Parpelleig del cursor"
+
+-#: gtk/gtksettings.c:241
++#: ../gtk/gtksettings.c:241
+ msgid "Whether the cursor should blink"
+ msgstr "Si el cursor hauria de parpellejar"
+
+-#: gtk/gtksettings.c:248
++#: ../gtk/gtksettings.c:248
+ msgid "Cursor Blink Time"
+ msgstr "Temps de parpelleig del cursor"
+
+-#: gtk/gtksettings.c:249
++#: ../gtk/gtksettings.c:249
+ msgid "Length of the cursor blink cycle, in milliseconds"
+ msgstr "Llargària del cicle de parpelleig del cursor, en mil·lisegons"
+
+-#: gtk/gtksettings.c:268
++#: ../gtk/gtksettings.c:268
+ msgid "Cursor Blink Timeout"
+ msgstr "Temps de parpelleig del cursor"
+
+-#: gtk/gtksettings.c:269
++#: ../gtk/gtksettings.c:269
+ msgid "Time after which the cursor stops blinking, in seconds"
+ msgstr "Temps, en segons, al cap del qual el cursor deixarà de parpallejar"
+
+-#: gtk/gtksettings.c:276
++#: ../gtk/gtksettings.c:276
+ msgid "Split Cursor"
+ msgstr "Cursor partit"
+
+-#: gtk/gtksettings.c:277
++#: ../gtk/gtksettings.c:277
+ msgid ""
+ "Whether two cursors should be displayed for mixed left-to-right and right-to-"
+ "left text"
+@@ -4760,85 +4788,85 @@
+ "Si s'han de mostrar dos cursors en text mixt d'esquerra a dreta i de dreta a "
+ "esquerra"
+
+-#: gtk/gtksettings.c:284
++#: ../gtk/gtksettings.c:284
+ msgid "Theme Name"
+ msgstr "Nom del tema"
+
+-#: gtk/gtksettings.c:285
++#: ../gtk/gtksettings.c:285
+ msgid "Name of theme RC file to load"
+ msgstr "Nom del fitxer del tema RC a carregar"
+
+-#: gtk/gtksettings.c:293
++#: ../gtk/gtksettings.c:293
+ msgid "Icon Theme Name"
+ msgstr "Nom del tema d'icones"
+
+-#: gtk/gtksettings.c:294
++#: ../gtk/gtksettings.c:294
+ msgid "Name of icon theme to use"
+ msgstr "Nom del tema d'icones a utilitzar"
+
+-#: gtk/gtksettings.c:302
++#: ../gtk/gtksettings.c:302
+ msgid "Fallback Icon Theme Name"
+ msgstr "Nom del tema d'icones alternatiu"
+
+-#: gtk/gtksettings.c:303
++#: ../gtk/gtksettings.c:303
+ msgid "Name of a icon theme to fall back to"
+ msgstr "Nom del tema d'icones que es farà servir com a alternativa"
+
+ # FIXME
+-#: gtk/gtksettings.c:311
++#: ../gtk/gtksettings.c:311
+ msgid "Key Theme Name"
+ msgstr "Nom clau del Tema"
+
+ # FIXME
+-#: gtk/gtksettings.c:312
++#: ../gtk/gtksettings.c:312
+ msgid "Name of key theme RC file to load"
+ msgstr "Nom clau del fitxer de tema RC a carregar"
+
+-#: gtk/gtksettings.c:320
++#: ../gtk/gtksettings.c:320
+ msgid "Menu bar accelerator"
+ msgstr "Accelerador de la barra de menú"
+
+-#: gtk/gtksettings.c:321
++#: ../gtk/gtksettings.c:321
+ msgid "Keybinding to activate the menu bar"
+ msgstr "Vinculació de tecla per activar la barra de menú"
+
+-#: gtk/gtksettings.c:329
++#: ../gtk/gtksettings.c:329
+ msgid "Drag threshold"
+ msgstr "Llindar de l'arrossegament"
+
+-#: gtk/gtksettings.c:330
++#: ../gtk/gtksettings.c:330
+ msgid "Number of pixels the cursor can move before dragging"
+ msgstr "Nombre de píxels que el cursor pot moure's abans d'avançar"
+
+-#: gtk/gtksettings.c:338
++#: ../gtk/gtksettings.c:338
+ msgid "Font Name"
+ msgstr "Nom del tipus de lletra"
+
+-#: gtk/gtksettings.c:339
++#: ../gtk/gtksettings.c:339
+ msgid "Name of default font to use"
+ msgstr "Nom per defecte del tipus de lletra a utilitzar"
+
+-#: gtk/gtksettings.c:361
++#: ../gtk/gtksettings.c:361
+ msgid "Icon Sizes"
+ msgstr "Mides d'icona"
+
+-#: gtk/gtksettings.c:362
++#: ../gtk/gtksettings.c:362
+ msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
+ msgstr "Llista de mides d'icona (gtk-menu=16,16:gtk-button=20,20..."
+
+-#: gtk/gtksettings.c:370
++#: ../gtk/gtksettings.c:370
+ msgid "GTK Modules"
+ msgstr "Mòduls GTK"
+
+-#: gtk/gtksettings.c:371
++#: ../gtk/gtksettings.c:371
+ msgid "List of currently active GTK modules"
+ msgstr "Llista de mòduls GTK actualment actius"
+
+-#: gtk/gtksettings.c:380
++#: ../gtk/gtksettings.c:380
+ msgid "Xft Antialias"
+ msgstr "Suavitzat de vores Xft"
+
+-#: gtk/gtksettings.c:381
++#: ../gtk/gtksettings.c:381
+ msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr ""
+ "Si s'ha de suavitzar les vores dels tipus de lletra Xft; 0=no, 1=sí, -"
+@@ -4860,75 +4888,75 @@
+ # CAIRO_HINT_STYLE_MEDIUM Hint outlines with medium strength giving a
+ # compromise between fidelity to the original shapes and contrast
+ # CAIRO_HINT_STYLE_FULL Hint outlines to maximize contrast
+-#: gtk/gtksettings.c:390
++#: ../gtk/gtksettings.c:390
+ msgid "Xft Hinting"
+ msgstr "Transforma el contorn Xft"
+
+-#: gtk/gtksettings.c:391
++#: ../gtk/gtksettings.c:391
+ msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr ""
+ "Si s'ha de transformar el contorn dels tipus de lletra Xft; 0=no, 1=sí, -"
+ "1=predeterminat"
+
+-#: gtk/gtksettings.c:400
++#: ../gtk/gtksettings.c:400
+ msgid "Xft Hint Style"
+ msgstr "Estil de transformació Xft"
+
+-#: gtk/gtksettings.c:401
++#: ../gtk/gtksettings.c:401
+ msgid ""
+ "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
+ msgstr ""
+ "Quin grau de transformació a emprar; hintnone, hintslight, hintmedium, o "
+ "hintfull"
+
+-#: gtk/gtksettings.c:410
++#: ../gtk/gtksettings.c:410
+ msgid "Xft RGBA"
+ msgstr "RGBA de Xft"
+
+ # FIXME: suposo que "none, rgb..." no s'ha de traduir (josep)
+-#: gtk/gtksettings.c:411
++#: ../gtk/gtksettings.c:411
+ msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
+ msgstr "Tipus d'antidentat de subpíxels; none, rgb, bgr, vrgb, vbgr"
+
+-#: gtk/gtksettings.c:420
++#: ../gtk/gtksettings.c:420
+ msgid "Xft DPI"
+ msgstr "DPI de Xft"
+
+-#: gtk/gtksettings.c:421
++#: ../gtk/gtksettings.c:421
+ msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
+ msgstr ""
+ "Resolució per a Xft, en 1024 * punts/polzada. -1 per al valor per defecte"
+
+-#: gtk/gtksettings.c:430
++#: ../gtk/gtksettings.c:430
+ msgid "Cursor theme name"
+ msgstr "Nom del tema del cursor"
+
+-#: gtk/gtksettings.c:431
++#: ../gtk/gtksettings.c:431
+ msgid "Name of the cursor theme to use, or NULL to use the default theme"
+ msgstr ""
+ "Nom del tema de cursors a utilitzar, o NULL per a utilitzar el predeterminat"
+
+-#: gtk/gtksettings.c:439
++#: ../gtk/gtksettings.c:439
+ msgid "Cursor theme size"
+ msgstr "Mida del tema del cursor"
+
+-#: gtk/gtksettings.c:440
++#: ../gtk/gtksettings.c:440
+ msgid "Size to use for cursors, or 0 to use the default size"
+ msgstr "Mida per als cursors, o 0 per a la predeterminada"
+
+-#: gtk/gtksettings.c:450
++#: ../gtk/gtksettings.c:450
+ msgid "Alternative button order"
+ msgstr "Ordre alternatiu de botons"
+
+-#: gtk/gtksettings.c:451
++#: ../gtk/gtksettings.c:451
+ msgid "Whether buttons in dialogs should use the alternative button order"
+ msgstr "Si els botons en els diàlegs haurien d'utilitzar l'ordre alternatiu"
+
+-#: gtk/gtksettings.c:468
++#: ../gtk/gtksettings.c:468
+ msgid "Alternative sort indicator direction"
+ msgstr "Direcció alternativa dels indicadors d'ordenació"
+
+-#: gtk/gtksettings.c:469
++#: ../gtk/gtksettings.c:469
+ msgid ""
+ "Whether the direction of the sort indicators in list and tree views is "
+ "inverted compared to the default (where down means ascending)"
+@@ -4937,11 +4965,11 @@
+ "i en arbre s'ha d'invertir respecte al valor predeterminat (on cap avall "
+ "significa ascendent)"
+
+-#: gtk/gtksettings.c:477
++#: ../gtk/gtksettings.c:477
+ msgid "Show the 'Input Methods' menu"
+ msgstr "Mosta el menú de «Mètodes d'entrada»"
+
+-#: gtk/gtksettings.c:478
++#: ../gtk/gtksettings.c:478
+ msgid ""
+ "Whether the context menus of entries and text views should offer to change "
+ "the input method"
+@@ -4949,11 +4977,11 @@
+ "Si els menús de context de les entrades i visualitzacions de text han "
+ "d'oferir canviar el mètode d'entrada"
+
+-#: gtk/gtksettings.c:486
++#: ../gtk/gtksettings.c:486
+ msgid "Show the 'Insert Unicode Control Character' menu"
+ msgstr "Mostra el meú «Insereix caràcters de control Unicode»"
+
+-#: gtk/gtksettings.c:487
++#: ../gtk/gtksettings.c:487
+ msgid ""
+ "Whether the context menus of entries and text views should offer to insert "
+ "control characters"
+@@ -4961,237 +4989,237 @@
+ "Si els menús de context de les entrades i visualitzacions de text han "
+ "d'oferir entrar caràcters de control"
+
+-#: gtk/gtksettings.c:495
++#: ../gtk/gtksettings.c:495
+ msgid "Start timeout"
+ msgstr "Temps excedit d'inici"
+
+-#: gtk/gtksettings.c:496
++#: ../gtk/gtksettings.c:496
+ msgid "Starting value for timeouts, when button is pressed"
+ msgstr "Valor d'inici per als temps excedits quan es prem un botó"
+
+-#: gtk/gtksettings.c:505
++#: ../gtk/gtksettings.c:505
+ msgid "Repeat timeout"
+ msgstr "Temps excedit per a la repetició"
+
+-#: gtk/gtksettings.c:506
++#: ../gtk/gtksettings.c:506
+ msgid "Repeat value for timeouts, when button is pressed"
+ msgstr "Valor de repetició per als temps excedits quan es prem un botó"
+
+ # FIXME: això no hi ha qui ho entengui (dpm)
+-#: gtk/gtksettings.c:515
++#: ../gtk/gtksettings.c:515
+ msgid "Expand timeout"
+ msgstr "Temps excedit per a l'expansió"
+
+-#: gtk/gtksettings.c:516
++#: ../gtk/gtksettings.c:516
+ msgid "Expand value for timeouts, when a widget is expanding a new region"
+ msgstr ""
+ "Valor d'expansió per als temps excedits quan un giny expandeix una regió nova"
+
+-#: gtk/gtksettings.c:551
++#: ../gtk/gtksettings.c:551
+ msgid "Color scheme"
+ msgstr "Esquema de color"
+
+-#: gtk/gtksettings.c:552
++#: ../gtk/gtksettings.c:552
+ msgid "A palette of named colors for use in themes"
+ msgstr "Una paleta de colors amb nom per a utilitzar en temes"
+
+-#: gtk/gtksettings.c:561
++#: ../gtk/gtksettings.c:561
+ msgid "Enable Animations"
+ msgstr "Habilita les animacions"
+
+-#: gtk/gtksettings.c:562
++#: ../gtk/gtksettings.c:562
+ msgid "Whether to enable toolkit-wide animations."
+ msgstr "Si s'han d'habilitar animacions per als jocs d'eines."
+
+-#: gtk/gtksettings.c:580
++#: ../gtk/gtksettings.c:580
+ msgid "Enable Touchscreen Mode"
+ msgstr "Habilita el mode de pantalla tàctil"
+
+-#: gtk/gtksettings.c:581
++#: ../gtk/gtksettings.c:581
+ msgid "When TRUE, there are no motion notify events delivered on this screen"
+ msgstr ""
+ "Si és CERT, no es notificaran esdeveniments de moviment a aquesta pantalla"
+
+-#: gtk/gtksettings.c:598
++#: ../gtk/gtksettings.c:598
+ msgid "Tooltip timeout"
+ msgstr "Temps d'espera dels indicadors de funció"
+
+-#: gtk/gtksettings.c:599
++#: ../gtk/gtksettings.c:599
+ msgid "Timeout before tooltip is shown"
+ msgstr "Temps d'espera abans de mostrar un indicador de funció"
+
+-#: gtk/gtksettings.c:624
++#: ../gtk/gtksettings.c:624
+ msgid "Tooltip browse timeout"
+ msgstr "Temps d'espera dels indicadors de funció en la navegació"
+
+-#: gtk/gtksettings.c:625
++#: ../gtk/gtksettings.c:625
+ msgid "Timeout before tooltip is shown when browse mode is enabled"
+ msgstr ""
+ "Temps d'espera abans de mostrar un indicador de funció amb el mode de "
+ "navegació activat"
+
+-#: gtk/gtksettings.c:646
++#: ../gtk/gtksettings.c:646
+ msgid "Tooltip browse mode timeout"
+ msgstr "Temps d'espera dels indicadors de funció en mode de navegació"
+
+-#: gtk/gtksettings.c:647
++#: ../gtk/gtksettings.c:647
+ msgid "Timeout after which browse mode is disabled"
+ msgstr "Temps d'espera després del qual s'inhabilitarà el mode de navegació"
+
+-#: gtk/gtksettings.c:666
++#: ../gtk/gtksettings.c:666
+ msgid "Keynav Cursor Only"
+ msgstr "Navegació només amb tecles de cursor"
+
+-#: gtk/gtksettings.c:667
++#: ../gtk/gtksettings.c:667
+ msgid "When TRUE, there are only cursor keys available to navigate widgets"
+ msgstr ""
+ "Si és CERT, només es podran utilitzar les tecles de cursor per a navegar "
+ "pels ginys"
+
+-#: gtk/gtksettings.c:684
++#: ../gtk/gtksettings.c:684
+ msgid "Keynav Wrap Around"
+ msgstr "La navegació per teclat torna a l'inici"
+
+-#: gtk/gtksettings.c:685
++#: ../gtk/gtksettings.c:685
+ msgid "Whether to wrap around when keyboard-navigating widgets"
+ msgstr ""
+ "Si s'ha de tornar a l'inici en arribar al final i a l'inversa en navegar "
+ "pels ginys amb el teclat"
+
+-#: gtk/gtksettings.c:705
++#: ../gtk/gtksettings.c:705
+ msgid "Error Bell"
+ msgstr "Timbre d'error"
+
+-#: gtk/gtksettings.c:706
++#: ../gtk/gtksettings.c:706
+ msgid "When TRUE, keyboard navigation and other errors will cause a beep"
+ msgstr ""
+ "Si és CERT, els errors de la navegació amb el teclat i altres causaran "
+ "l'emissió d'un to sonor"
+
+-#: gtk/gtksettings.c:723
++#: ../gtk/gtksettings.c:723
+ msgid "Color Hash"
+ msgstr "Hash de color"
+
+-#: gtk/gtksettings.c:724
++#: ../gtk/gtksettings.c:724
+ msgid "A hash table representation of the color scheme."
+ msgstr "Una taula hash que representa l'esquema de color."
+
+-#: gtk/gtksettings.c:732
++#: ../gtk/gtksettings.c:732
+ msgid "Default file chooser backend"
+ msgstr "Rerefons predeterminat del selector de fitxers"
+
+-#: gtk/gtksettings.c:733
++#: ../gtk/gtksettings.c:733
+ msgid "Name of the GtkFileChooser backend to use by default"
+ msgstr "Nom del rerefons del GtkFileChooser predeterminat"
+
+-#: gtk/gtksettings.c:750
++#: ../gtk/gtksettings.c:750
+ msgid "Default print backend"
+ msgstr "Rerefons predeterminat per a la impressió"
+
+-#: gtk/gtksettings.c:751
++#: ../gtk/gtksettings.c:751
+ msgid "List of the GtkPrintBackend backends to use by default"
+ msgstr "Llista de rerefons GtkPrintBackend a utilitzar per defecte"
+
+-#: gtk/gtksettings.c:774
++#: ../gtk/gtksettings.c:774
+ msgid "Default command to run when displaying a print preview"
+ msgstr ""
+ "Ordre que s'ha d'executar per defecte quan es mostri la previsualització de "
+ "la impressió"
+
+-#: gtk/gtksettings.c:775
++#: ../gtk/gtksettings.c:775
+ msgid "Command to run when displaying a print preview"
+ msgstr "Ordre a executar en mostrar una previsualització d'impressió"
+
+-#: gtk/gtksettings.c:791
++#: ../gtk/gtksettings.c:791
+ msgid "Enable Mnemonics"
+ msgstr "Habilita els mnemònics"
+
+-#: gtk/gtksettings.c:792
++#: ../gtk/gtksettings.c:792
+ msgid "Whether labels should have mnemonics"
+ msgstr "Si les etiquetes haurien de tenir mnemònics"
+
+-#: gtk/gtksettings.c:808
++#: ../gtk/gtksettings.c:808
+ msgid "Enable Accelerators"
+ msgstr "Habilita els acceleradors"
+
+-#: gtk/gtksettings.c:809
++#: ../gtk/gtksettings.c:809
+ msgid "Whether menu items should have accelerators"
+ msgstr "Si els menús han de tenir acceleradors"
+
+-#: gtk/gtksettings.c:826
++#: ../gtk/gtksettings.c:826
+ msgid "Recent Files Limit"
+ msgstr "Límit de fitxers recents"
+
+-#: gtk/gtksettings.c:827
++#: ../gtk/gtksettings.c:827
+ msgid "Number of recently used files"
+ msgstr "Nombre de fitxers utilitzats recentment"
+
+-#: gtk/gtksettings.c:841
++#: ../gtk/gtksettings.c:841
+ msgid "Default IM module"
+ msgstr "Mòdul de mètodes d'entrada predeterminat"
+
+-#: gtk/gtksettings.c:842
++#: ../gtk/gtksettings.c:842
+ msgid "Which IM module should be used by default"
+ msgstr ""
+ "Quin mòdul de mètodes d'entrada s'ha d'utilitzar de manera predeterminada"
+
+-#: gtk/gtksettings.c:860
++#: ../gtk/gtksettings.c:860
+ msgid "Recent Files Max Age"
+ msgstr "Antiguitat màxima dels fitxers recents"
+
+-#: gtk/gtksettings.c:861
++#: ../gtk/gtksettings.c:861
+ msgid "Maximum age of recently used files, in days"
+ msgstr "Antiguitat màxima dels fitxers utilitzats recentment, en dies"
+
+-#: gtk/gtksettings.c:870
++#: ../gtk/gtksettings.c:870
+ msgid "Fontconfig configuration timestamp"
+ msgstr "Marca horària de la configuració de la fontconfig"
+
+-#: gtk/gtksettings.c:871
++#: ../gtk/gtksettings.c:871
+ msgid "Timestamp of current fontconfig configuration"
+ msgstr "Marca horària de la configuració actual de la fontconfig"
+
+-#: gtk/gtksettings.c:893
++#: ../gtk/gtksettings.c:893
+ msgid "Sound Theme Name"
+ msgstr "Nom del tema de so"
+
+-#: gtk/gtksettings.c:894
++#: ../gtk/gtksettings.c:894
+ msgid "XDG sound theme name"
+ msgstr "Nom del tema de so XDG"
+
+ # FIXME (dpm)
+ #. Translators: this means sounds that are played as feedback to user input
+-#: gtk/gtksettings.c:916
++#: ../gtk/gtksettings.c:916
+ msgid "Audible Input Feedback"
+ msgstr "Sons en resposta a l'activitat de l'usuari"
+
+-#: gtk/gtksettings.c:917
++#: ../gtk/gtksettings.c:917
+ msgid "Whether to play event sounds as feedback to user input"
+ msgstr ""
+ "Si s'han de reproduir sons per als esdeveniments com a reacció a l'activitat "
+ "de l'usuari"
+
+-#: gtk/gtksettings.c:938
++#: ../gtk/gtksettings.c:938
+ msgid "Enable Event Sounds"
+ msgstr "Habilita els sons dels esdeveniments"
+
+-#: gtk/gtksettings.c:939
++#: ../gtk/gtksettings.c:939
+ msgid "Whether to play any event sounds at all"
+ msgstr "Si s'han de reproduir sons per als esdeveniments"
+
+-#: gtk/gtksettings.c:954
++#: ../gtk/gtksettings.c:954
+ msgid "Enable Tooltips"
+ msgstr "Habilita els indicadors de funció"
+
+-#: gtk/gtksettings.c:955
++#: ../gtk/gtksettings.c:955
+ msgid "Whether tooltips should be shown on widgets"
+ msgstr "Si s'han de mostrar els indicadors de funció en els ginys"
+
+-#: gtk/gtksizegroup.c:293
++#: ../gtk/gtksizegroup.c:293
+ msgid "Mode"
+ msgstr "Mode"
+
+-#: gtk/gtksizegroup.c:294
++#: ../gtk/gtksizegroup.c:294
+ msgid ""
+ "The directions in which the size group affects the requested sizes of its "
+ "component widgets"
+@@ -5199,30 +5227,30 @@
+ "Les direccions en les quals el grup de mides afecta les mides sol·licitades "
+ "dels seus ginys d'elements"
+
+-#: gtk/gtksizegroup.c:310
++#: ../gtk/gtksizegroup.c:310
+ msgid "Ignore hidden"
+ msgstr "Ignora els amagats"
+
+-#: gtk/gtksizegroup.c:311
++#: ../gtk/gtksizegroup.c:311
+ msgid ""
+ "If TRUE, unmapped widgets are ignored when determining the size of the group"
+ msgstr ""
+ "Si és CERT, els ginys no mapats s'ignoraran quan es determini la mida del "
+ "grup"
+
+-#: gtk/gtkspinbutton.c:209
++#: ../gtk/gtkspinbutton.c:209
+ msgid "The adjustment that holds the value of the spinbutton"
+ msgstr "L'ajustament que reté el valor del botó de gir"
+
+-#: gtk/gtkspinbutton.c:216
++#: ../gtk/gtkspinbutton.c:216
+ msgid "Climb Rate"
+ msgstr "Taxa de pujada"
+
+-#: gtk/gtkspinbutton.c:236
++#: ../gtk/gtkspinbutton.c:236
+ msgid "Snap to Ticks"
+ msgstr "Desplaça a les marques"
+
+-#: gtk/gtkspinbutton.c:237
++#: ../gtk/gtkspinbutton.c:237
+ msgid ""
+ "Whether erroneous values are automatically changed to a spin button's "
+ "nearest step increment"
+@@ -5230,167 +5258,167 @@
+ "Si els valors erronis es canvien automàticament a l'increment de pas més "
+ "proper d'un botó de rotació"
+
+-#: gtk/gtkspinbutton.c:244
++#: ../gtk/gtkspinbutton.c:244
+ msgid "Numeric"
+ msgstr "Numèric"
+
+-#: gtk/gtkspinbutton.c:245
++#: ../gtk/gtkspinbutton.c:245
+ msgid "Whether non-numeric characters should be ignored"
+ msgstr "Si els caràcters no numèrics s'haurien d'ignorar"
+
+-#: gtk/gtkspinbutton.c:252
++#: ../gtk/gtkspinbutton.c:252
+ msgid "Wrap"
+ msgstr "Ajust"
+
+-#: gtk/gtkspinbutton.c:253
++#: ../gtk/gtkspinbutton.c:253
+ msgid "Whether a spin button should wrap upon reaching its limits"
+ msgstr "Si un botó de rotació ha d'ajustar-se sobre els seus límits"
+
+-#: gtk/gtkspinbutton.c:260
++#: ../gtk/gtkspinbutton.c:260
+ msgid "Update Policy"
+ msgstr "Actualitza la política"
+
+-#: gtk/gtkspinbutton.c:261
++#: ../gtk/gtkspinbutton.c:261
+ msgid ""
+ "Whether the spin button should update always, or only when the value is legal"
+ msgstr ""
+ "Si el botó de rotació s'hauria d'actualitzar sempre, o només quan el valor "
+ "és legal"
+
+-#: gtk/gtkspinbutton.c:270
++#: ../gtk/gtkspinbutton.c:270
+ msgid "Reads the current value, or sets a new value"
+ msgstr "Llegeix el valor actual, o fixa'n un de nou"
+
+-#: gtk/gtkspinbutton.c:279
++#: ../gtk/gtkspinbutton.c:279
+ msgid "Style of bevel around the spin button"
+ msgstr "Estil del bisell al voltant del botó de rotació"
+
+-#: gtk/gtkstatusbar.c:141
++#: ../gtk/gtkstatusbar.c:141
+ msgid "Has Resize Grip"
+ msgstr "Té un agafador per canviar la mida"
+
+-#: gtk/gtkstatusbar.c:142
++#: ../gtk/gtkstatusbar.c:142
+ msgid "Whether the statusbar has a grip for resizing the toplevel"
+ msgstr ""
+ "Si la barra d'estat té un agafador per canviar la mida del nivell superior"
+
+-#: gtk/gtkstatusbar.c:187
++#: ../gtk/gtkstatusbar.c:187
+ msgid "Style of bevel around the statusbar text"
+ msgstr "Estil del bisell que envolta el text de la barra d'estat"
+
+-#: gtk/gtkstatusicon.c:226
++#: ../gtk/gtkstatusicon.c:226
+ msgid "GIcon"
+ msgstr "GIcon"
+
+-#: gtk/gtkstatusicon.c:244
++#: ../gtk/gtkstatusicon.c:244
+ msgid "The size of the icon"
+ msgstr "La mida de la icona"
+
+-#: gtk/gtkstatusicon.c:254
++#: ../gtk/gtkstatusicon.c:254
+ msgid "The screen where this status icon will be displayed"
+ msgstr "La pantalla on es mostrarà aquesta icona d'estat"
+
+-#: gtk/gtkstatusicon.c:261
++#: ../gtk/gtkstatusicon.c:261
+ msgid "Blinking"
+ msgstr "Pampalluguejant"
+
+-#: gtk/gtkstatusicon.c:262
++#: ../gtk/gtkstatusicon.c:262
+ msgid "Whether or not the status icon is blinking"
+ msgstr "Si la icona d'estat està pampalluguejant"
+
+-#: gtk/gtkstatusicon.c:270
++#: ../gtk/gtkstatusicon.c:270
+ msgid "Whether or not the status icon is visible"
+ msgstr "Si la icona d'estat és visible"
+
+-#: gtk/gtkstatusicon.c:286
++#: ../gtk/gtkstatusicon.c:286
+ msgid "Whether or not the status icon is embedded"
+ msgstr "Si la icona d'estat és imbricada"
+
+-#: gtk/gtkstatusicon.c:302 gtk/gtktrayicon-x11.c:96
++#: ../gtk/gtkstatusicon.c:302 ../gtk/gtktrayicon-x11.c:96
+ msgid "The orientation of the tray"
+ msgstr "L'orientació de la safata"
+
+-#: gtk/gtktable.c:129
++#: ../gtk/gtktable.c:129
+ msgid "Rows"
+ msgstr "Files"
+
+-#: gtk/gtktable.c:130
++#: ../gtk/gtktable.c:130
+ msgid "The number of rows in the table"
+ msgstr "El nombre de files a la taula"
+
+-#: gtk/gtktable.c:138
++#: ../gtk/gtktable.c:138
+ msgid "Columns"
+ msgstr "Columnes"
+
+-#: gtk/gtktable.c:139
++#: ../gtk/gtktable.c:139
+ msgid "The number of columns in the table"
+ msgstr "El nombre de columnes a la taula"
+
+-#: gtk/gtktable.c:147
++#: ../gtk/gtktable.c:147
+ msgid "Row spacing"
+ msgstr "Espaiat de files"
+
+-#: gtk/gtktable.c:148
++#: ../gtk/gtktable.c:148
+ msgid "The amount of space between two consecutive rows"
+ msgstr "La quantitat d'espai entre dues files consecutives"
+
+-#: gtk/gtktable.c:156
++#: ../gtk/gtktable.c:156
+ msgid "Column spacing"
+ msgstr "Espaiat de columnes"
+
+-#: gtk/gtktable.c:157
++#: ../gtk/gtktable.c:157
+ msgid "The amount of space between two consecutive columns"
+ msgstr "La quantitat d'espai entre dues columnes consecutives"
+
+-#: gtk/gtktable.c:166
++#: ../gtk/gtktable.c:166
+ msgid "If TRUE, the table cells are all the same width/height"
+ msgstr "Si és CERT les cel·les de la taula tindran la mateixa amplada/alçada"
+
+-#: gtk/gtktable.c:173
++#: ../gtk/gtktable.c:173
+ msgid "Left attachment"
+ msgstr "Adjunt esquerre"
+
+-#: gtk/gtktable.c:180
++#: ../gtk/gtktable.c:180
+ msgid "Right attachment"
+ msgstr "Adjunt dret"
+
+-#: gtk/gtktable.c:181
++#: ../gtk/gtktable.c:181
+ msgid "The column number to attach the right side of a child widget to"
+ msgstr "El número de la columna on s'ha adjuntar el costat dret del giny fill"
+
+-#: gtk/gtktable.c:187
++#: ../gtk/gtktable.c:187
+ msgid "Top attachment"
+ msgstr "Fitxer adjunt superior"
+
+-#: gtk/gtktable.c:188
++#: ../gtk/gtktable.c:188
+ msgid "The row number to attach the top of a child widget to"
+ msgstr "El número de la fila on adjuntar la part superior del giny fill"
+
+-#: gtk/gtktable.c:194
++#: ../gtk/gtktable.c:194
+ msgid "Bottom attachment"
+ msgstr "Fitxer adjunt inferior"
+
+-#: gtk/gtktable.c:201
++#: ../gtk/gtktable.c:201
+ msgid "Horizontal options"
+ msgstr "Opcions horitzontals"
+
+-#: gtk/gtktable.c:202
++#: ../gtk/gtktable.c:202
+ msgid "Options specifying the horizontal behaviour of the child"
+ msgstr "Opcions que especifiquen el comportament horitzontal del fill"
+
+-#: gtk/gtktable.c:208
++#: ../gtk/gtktable.c:208
+ msgid "Vertical options"
+ msgstr "Opcions verticals"
+
+-#: gtk/gtktable.c:209
++#: ../gtk/gtktable.c:209
+ msgid "Options specifying the vertical behaviour of the child"
+ msgstr "Opcions que especifiquen el comportament vertical del fill"
+
+-#: gtk/gtktable.c:215
++#: ../gtk/gtktable.c:215
+ msgid "Horizontal padding"
+ msgstr "Separació horitzontal"
+
+-#: gtk/gtktable.c:216
++#: ../gtk/gtktable.c:216
+ msgid ""
+ "Extra space to put between the child and its left and right neighbors, in "
+ "pixels"
+@@ -5398,11 +5426,11 @@
+ "L'espai addicional que es posarà entre el fill i els seus veïns a l'esquerra "
+ "i dreta, en píxels"
+
+-#: gtk/gtktable.c:222
++#: ../gtk/gtktable.c:222
+ msgid "Vertical padding"
+ msgstr "Separació vertical"
+
+-#: gtk/gtktable.c:223
++#: ../gtk/gtktable.c:223
+ msgid ""
+ "Extra space to put between the child and its upper and lower neighbors, in "
+ "pixels"
+@@ -5410,55 +5438,55 @@
+ "Espai addicional que es posarà entre el fill i els seus veïns de dalt i de "
+ "baix, en píxels"
+
+-#: gtk/gtktext.c:546
++#: ../gtk/gtktext.c:546
+ msgid "Horizontal adjustment for the text widget"
+ msgstr "Ajustament horitzontal pel giny de text"
+
+-#: gtk/gtktext.c:554
++#: ../gtk/gtktext.c:554
+ msgid "Vertical adjustment for the text widget"
+ msgstr "Ajustament vertical pel giny de text"
+
+-#: gtk/gtktext.c:561
++#: ../gtk/gtktext.c:561
+ msgid "Line Wrap"
+ msgstr "Ajustament de línia"
+
+-#: gtk/gtktext.c:562
++#: ../gtk/gtktext.c:562
+ msgid "Whether lines are wrapped at widget edges"
+ msgstr "Si les línies s'han d'ajustar als marges del ginys"
+
+-#: gtk/gtktext.c:569
++#: ../gtk/gtktext.c:569
+ msgid "Word Wrap"
+ msgstr "Ajust de paraula"
+
+-#: gtk/gtktext.c:570
++#: ../gtk/gtktext.c:570
+ msgid "Whether words are wrapped at widget edges"
+ msgstr "Si els mots s'han d'ajustar als marges del ginys"
+
+-#: gtk/gtktextbuffer.c:179
++#: ../gtk/gtktextbuffer.c:179
+ msgid "Tag Table"
+ msgstr "Taula de marcadors"
+
+-#: gtk/gtktextbuffer.c:180
++#: ../gtk/gtktextbuffer.c:180
+ msgid "Text Tag Table"
+ msgstr "Taula de marcadors de text"
+
+-#: gtk/gtktextbuffer.c:198
++#: ../gtk/gtktextbuffer.c:198
+ msgid "Current text of the buffer"
+ msgstr "El text actual de la memòria"
+
+-#: gtk/gtktextbuffer.c:212
++#: ../gtk/gtktextbuffer.c:212
+ msgid "Has selection"
+ msgstr "Té selecció"
+
+-#: gtk/gtktextbuffer.c:213
++#: ../gtk/gtktextbuffer.c:213
+ msgid "Whether the buffer has some text currently selected"
+ msgstr "Si la memòria intermèdia té text seleccionat"
+
+-#: gtk/gtktextbuffer.c:229
++#: ../gtk/gtktextbuffer.c:229
+ msgid "Cursor position"
+ msgstr "Posició del cursor"
+
+-#: gtk/gtktextbuffer.c:230
++#: ../gtk/gtktextbuffer.c:230
+ msgid ""
+ "The position of the insert mark (as offset from the beginning of the buffer)"
+ msgstr ""
+@@ -5466,11 +5494,11 @@
+ "memòria intermèdia)"
+
+ # FIXME
+-#: gtk/gtktextbuffer.c:245
++#: ../gtk/gtktextbuffer.c:245
+ msgid "Copy target list"
+ msgstr "Llista de destinacions de còpia"
+
+-#: gtk/gtktextbuffer.c:246
++#: ../gtk/gtktextbuffer.c:246
+ msgid ""
+ "The list of targets this buffer supports for clipboard copying and DND source"
+ msgstr ""
+@@ -5478,11 +5506,11 @@
+ "per a copiar al porta-retalls i com a fonts d'arrossegar i deixar anar"
+
+ # FIXME
+-#: gtk/gtktextbuffer.c:261
++#: ../gtk/gtktextbuffer.c:261
+ msgid "Paste target list"
+ msgstr "Llista de destinacions d'enganxament"
+
+-#: gtk/gtktextbuffer.c:262
++#: ../gtk/gtktextbuffer.c:262
+ msgid ""
+ "The list of targets this buffer supports for clipboard pasting and DND "
+ "destination"
+@@ -5490,37 +5518,37 @@
+ "La llista de destinacions que aquest element de memòria intermèdia permet "
+ "per a enganxar del porta-retalls i com a fonts d'arrossegar i deixar anar"
+
+-#: gtk/gtktextmark.c:90
++#: ../gtk/gtktextmark.c:90
+ msgid "Mark name"
+ msgstr "Nom de la marca"
+
+-#: gtk/gtktextmark.c:97
++#: ../gtk/gtktextmark.c:97
+ msgid "Left gravity"
+ msgstr "Gravetat esquerra"
+
+-#: gtk/gtktextmark.c:98
++#: ../gtk/gtktextmark.c:98
+ msgid "Whether the mark has left gravity"
+ msgstr "Si la marca té gravetat a l'esquerra"
+
+-#: gtk/gtktexttag.c:173
++#: ../gtk/gtktexttag.c:173
+ msgid "Tag name"
+ msgstr "Nom de marcador"
+
+-#: gtk/gtktexttag.c:174
++#: ../gtk/gtktexttag.c:174
+ msgid "Name used to refer to the text tag. NULL for anonymous tags"
+ msgstr ""
+ "Nom utilitzat per referir-se a un marcador de text. NULL per a marcadors "
+ "anònims"
+
+-#: gtk/gtktexttag.c:192
++#: ../gtk/gtktexttag.c:192
+ msgid "Background color as a (possibly unallocated) GdkColor"
+ msgstr "Color de fons com a (possiblement no assignat) GdkColor"
+
+-#: gtk/gtktexttag.c:199
++#: ../gtk/gtktexttag.c:199
+ msgid "Background full height"
+ msgstr "Alçària completa del fons"
+
+-#: gtk/gtktexttag.c:200
++#: ../gtk/gtktexttag.c:200
+ msgid ""
+ "Whether the background color fills the entire line height or only the height "
+ "of the tagged characters"
+@@ -5529,46 +5557,46 @@
+ "caràcters marcats"
+
+ # FIXME puntejador (josep)
+-#: gtk/gtktexttag.c:208
++#: ../gtk/gtktexttag.c:208
+ msgid "Background stipple mask"
+ msgstr "Màscara del puntejador de fons"
+
+-#: gtk/gtktexttag.c:209
++#: ../gtk/gtktexttag.c:209
+ msgid "Bitmap to use as a mask when drawing the text background"
+ msgstr "Mapa de bits usat com a màscara quan s'ajusta el fons del text"
+
+-#: gtk/gtktexttag.c:226
++#: ../gtk/gtktexttag.c:226
+ msgid "Foreground color as a (possibly unallocated) GdkColor"
+ msgstr "Color de primer pla com a (possiblement no assignat) GdkColor"
+
+ # FIXME puntejador (josep)
+-#: gtk/gtktexttag.c:234
++#: ../gtk/gtktexttag.c:234
+ msgid "Foreground stipple mask"
+ msgstr "Màscara del puntejador de primer pla"
+
+-#: gtk/gtktexttag.c:235
++#: ../gtk/gtktexttag.c:235
+ msgid "Bitmap to use as a mask when drawing the text foreground"
+ msgstr "Mapa de bits usat com a màscara quan s'ajusta el primer pla del text"
+
+-#: gtk/gtktexttag.c:242
++#: ../gtk/gtktexttag.c:242
+ msgid "Text direction"
+ msgstr "Direcció del text"
+
+-#: gtk/gtktexttag.c:243
++#: ../gtk/gtktexttag.c:243
+ msgid "Text direction, e.g. right-to-left or left-to-right"
+ msgstr "Sentit del text, p.ex. dreta-a-esquerra o esquerra-a-dreta"
+
+-#: gtk/gtktexttag.c:292
++#: ../gtk/gtktexttag.c:292
+ msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
+ msgstr "Estil del tipus de lletra com a PangoStyle, p.ex. PANGO_STYLE_ITALIC"
+
+-#: gtk/gtktexttag.c:301
++#: ../gtk/gtktexttag.c:301
+ msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
+ msgstr ""
+ "Variant del tipus de lletra, com a PangoVariant, p.ex. "
+ "PANGO_VARIANT_SMALL_CAPS"
+
+-#: gtk/gtktexttag.c:310
++#: ../gtk/gtktexttag.c:310
+ msgid ""
+ "Font weight as an integer, see predefined values in PangoWeight; for "
+ "example, PANGO_WEIGHT_BOLD"
+@@ -5576,16 +5604,16 @@
+ "Un enter que indica el pes del tipus de lletra, vegeu valors predefinits a "
+ "PangoWeight; per exemple, PANGO_WEIGHT_BOLD"
+
+-#: gtk/gtktexttag.c:321
++#: ../gtk/gtktexttag.c:321
+ msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
+ msgstr ""
+ "Amplia el tipus de lletra, com a PangoStretch, p.ex. PANGO_STRETCH_CONDENSED"
+
+-#: gtk/gtktexttag.c:330
++#: ../gtk/gtktexttag.c:330
+ msgid "Font size in Pango units"
+ msgstr "Mida del tipus de lletra en unitats Pango"
+
+-#: gtk/gtktexttag.c:340
++#: ../gtk/gtktexttag.c:340
+ msgid ""
+ "Font size as a scale factor relative to the default font size. This properly "
+ "adapts to theme changes etc. so is recommended. Pango predefines some scales "
+@@ -5595,11 +5623,11 @@
+ "defecte. Això s'adapta pròpiament a canvis de tema, etc., per tant es "
+ "recomana. El Pango predefineix algunes escales com ara PANGO_SCALE_X_LARGE"
+
+-#: gtk/gtktexttag.c:360 gtk/gtktextview.c:586
++#: ../gtk/gtktexttag.c:360 ../gtk/gtktextview.c:586
+ msgid "Left, right, or center justification"
+ msgstr "Justificació a l'esquerre, dreta, o centre"
+
+-#: gtk/gtktexttag.c:379
++#: ../gtk/gtktexttag.c:379
+ msgid ""
+ "The language this text is in, as an ISO code. Pango can use this as a hint "
+ "when rendering the text. If not set, an appropriate default will be used."
+@@ -5607,31 +5635,31 @@
+ "El codi ISO de l'idioma del text. El Pango ho pot utilitzar com a pista en "
+ "representar el text. Si no s'estableix, s'emprarà el determinat més apropiat."
+
+-#: gtk/gtktexttag.c:386
++#: ../gtk/gtktexttag.c:386
+ msgid "Left margin"
+ msgstr "Marge esquerre"
+
+-#: gtk/gtktexttag.c:387 gtk/gtktextview.c:595
++#: ../gtk/gtktexttag.c:387 ../gtk/gtktextview.c:595
+ msgid "Width of the left margin in pixels"
+ msgstr "Amplada del marge esquerre en píxels"
+
+-#: gtk/gtktexttag.c:396
++#: ../gtk/gtktexttag.c:396
+ msgid "Right margin"
+ msgstr "Marge dret"
+
+-#: gtk/gtktexttag.c:397 gtk/gtktextview.c:605
++#: ../gtk/gtktexttag.c:397 ../gtk/gtktextview.c:605
+ msgid "Width of the right margin in pixels"
+ msgstr "Amplada del marge dret en píxels"
+
+-#: gtk/gtktexttag.c:407 gtk/gtktextview.c:614
++#: ../gtk/gtktexttag.c:407 ../gtk/gtktextview.c:614
+ msgid "Indent"
+ msgstr "Sagnat"
+
+-#: gtk/gtktexttag.c:408 gtk/gtktextview.c:615
++#: ../gtk/gtktexttag.c:408 ../gtk/gtktextview.c:615
+ msgid "Amount to indent the paragraph, in pixels"
+ msgstr "Quantitat a sagnar el paràgraf, en píxels"
+
+-#: gtk/gtktexttag.c:419
++#: ../gtk/gtktexttag.c:419
+ msgid ""
+ "Offset of text above the baseline (below the baseline if rise is negative) "
+ "in Pango units"
+@@ -5639,394 +5667,394 @@
+ "Desplaçament del text per sobre de la línia de base (per sota de la línia de "
+ "base si l'elevació és negativa) en unitats del Pango"
+
+-#: gtk/gtktexttag.c:428
++#: ../gtk/gtktexttag.c:428
+ msgid "Pixels above lines"
+ msgstr "Píxels per sobre les línies"
+
+-#: gtk/gtktexttag.c:429 gtk/gtktextview.c:539
++#: ../gtk/gtktexttag.c:429 ../gtk/gtktextview.c:539
+ msgid "Pixels of blank space above paragraphs"
+ msgstr "Pìxels d'espais en blanc per sobre els paràgrafs"
+
+-#: gtk/gtktexttag.c:438
++#: ../gtk/gtktexttag.c:438
+ msgid "Pixels below lines"
+ msgstr "Píxels per sota les línies"
+
+-#: gtk/gtktexttag.c:439 gtk/gtktextview.c:549
++#: ../gtk/gtktexttag.c:439 ../gtk/gtktextview.c:549
+ msgid "Pixels of blank space below paragraphs"
+ msgstr "Píxels d'espais en blanc per sota els paràgrafs"
+
+-#: gtk/gtktexttag.c:448
++#: ../gtk/gtktexttag.c:448
+ msgid "Pixels inside wrap"
+ msgstr "Píxels dins l'ajustament"
+
+-#: gtk/gtktexttag.c:449 gtk/gtktextview.c:559
++#: ../gtk/gtktexttag.c:449 ../gtk/gtktextview.c:559
+ msgid "Pixels of blank space between wrapped lines in a paragraph"
+ msgstr "Píxels d'espais en blanc entre línies ajustades a un paràgraf"
+
+-#: gtk/gtktexttag.c:476 gtk/gtktextview.c:577
++#: ../gtk/gtktexttag.c:476 ../gtk/gtktextview.c:577
+ msgid ""
+ "Whether to wrap lines never, at word boundaries, or at character boundaries"
+ msgstr ""
+ "Si no s'ha d'ajustar mai les línies, o fer-ho en els límits de les paraules "
+ "o caràcters"
+
+-#: gtk/gtktexttag.c:485 gtk/gtktextview.c:624
++#: ../gtk/gtktexttag.c:485 ../gtk/gtktextview.c:624
+ msgid "Tabs"
+ msgstr "Pestanyes"
+
+-#: gtk/gtktexttag.c:486 gtk/gtktextview.c:625
++#: ../gtk/gtktexttag.c:486 ../gtk/gtktextview.c:625
+ msgid "Custom tabs for this text"
+ msgstr "Pestanyes personalitzades per a aquest text"
+
+-#: gtk/gtktexttag.c:504
++#: ../gtk/gtktexttag.c:504
+ msgid "Invisible"
+ msgstr "Invisible"
+
+-#: gtk/gtktexttag.c:505
++#: ../gtk/gtktexttag.c:505
+ msgid "Whether this text is hidden."
+ msgstr "Si aquest text està amagat."
+
+-#: gtk/gtktexttag.c:519
++#: ../gtk/gtktexttag.c:519
+ msgid "Paragraph background color name"
+ msgstr "Nom del color de fons del paràgraf"
+
+-#: gtk/gtktexttag.c:520
++#: ../gtk/gtktexttag.c:520
+ msgid "Paragraph background color as a string"
+ msgstr "Color de fons del paràgraf com a cadena"
+
+-#: gtk/gtktexttag.c:535
++#: ../gtk/gtktexttag.c:535
+ msgid "Paragraph background color"
+ msgstr "Color de fons del paràgraf"
+
+-#: gtk/gtktexttag.c:536
++#: ../gtk/gtktexttag.c:536
+ msgid "Paragraph background color as a (possibly unallocated) GdkColor"
+ msgstr "Color de fons del paràgraf com a (possiblement no assignat) GdkColor"
+
+-#: gtk/gtktexttag.c:554
++#: ../gtk/gtktexttag.c:554
+ msgid "Margin Accumulates"
+ msgstr "Acumulació de marges"
+
+-#: gtk/gtktexttag.c:555
++#: ../gtk/gtktexttag.c:555
+ msgid "Whether left and right margins accumulate."
+ msgstr "Si s'han d'acumular els marges dret i esquerre."
+
+-#: gtk/gtktexttag.c:568
++#: ../gtk/gtktexttag.c:568
+ msgid "Background full height set"
+ msgstr "Alçària completa de fons fixada"
+
+-#: gtk/gtktexttag.c:569
++#: ../gtk/gtktexttag.c:569
+ msgid "Whether this tag affects background height"
+ msgstr "Si aquesta etiqueta afecta l'alçada del fons"
+
+ # FIXME puntejador (josep)
+-#: gtk/gtktexttag.c:572
++#: ../gtk/gtktexttag.c:572
+ msgid "Background stipple set"
+ msgstr "Puntejador de fons fixat"
+
+ # FIXME puntejador (josep)
+-#: gtk/gtktexttag.c:573
++#: ../gtk/gtktexttag.c:573
+ msgid "Whether this tag affects the background stipple"
+ msgstr "Si aquesta etiqueta afecta el puntejador de fons"
+
+ # FIXME puntejador (josep)
+-#: gtk/gtktexttag.c:580
++#: ../gtk/gtktexttag.c:580
+ msgid "Foreground stipple set"
+ msgstr "Puntejador de primer pla fixat"
+
+ # FIXME puntejador (josep)
+-#: gtk/gtktexttag.c:581
++#: ../gtk/gtktexttag.c:581
+ msgid "Whether this tag affects the foreground stipple"
+ msgstr "Si aquesta etiqueta afecta el puntejador de primer pla"
+
+ # FIXME
+-#: gtk/gtktexttag.c:616
++#: ../gtk/gtktexttag.c:616
+ msgid "Justification set"
+ msgstr "Definiu justificació"
+
+-#: gtk/gtktexttag.c:617
++#: ../gtk/gtktexttag.c:617
+ msgid "Whether this tag affects paragraph justification"
+ msgstr "Si aquesta etiqueta afecta la justificació del paràgraf"
+
+-#: gtk/gtktexttag.c:624
++#: ../gtk/gtktexttag.c:624
+ msgid "Left margin set"
+ msgstr "Marge esquerre fixat"
+
+-#: gtk/gtktexttag.c:625
++#: ../gtk/gtktexttag.c:625
+ msgid "Whether this tag affects the left margin"
+ msgstr "Si aquesta etiqueta afecta el marge esquerre"
+
+-#: gtk/gtktexttag.c:628
++#: ../gtk/gtktexttag.c:628
+ msgid "Indent set"
+ msgstr "Sagnat fixat"
+
+-#: gtk/gtktexttag.c:629
++#: ../gtk/gtktexttag.c:629
+ msgid "Whether this tag affects indentation"
+ msgstr "Si aquesta etiqueta afecta el sagnat"
+
+-#: gtk/gtktexttag.c:636
++#: ../gtk/gtktexttag.c:636
+ msgid "Pixels above lines set"
+ msgstr "Píxels per sobre del conjunt de línies"
+
+-#: gtk/gtktexttag.c:637 gtk/gtktexttag.c:641
++#: ../gtk/gtktexttag.c:637 ../gtk/gtktexttag.c:641
+ msgid "Whether this tag affects the number of pixels above lines"
+ msgstr "Si aquesta etiqueta afecta el nombre de píxels per sobre les línies"
+
+-#: gtk/gtktexttag.c:640
++#: ../gtk/gtktexttag.c:640
+ msgid "Pixels below lines set"
+ msgstr "Píxels per sota del conjunt línies"
+
+-#: gtk/gtktexttag.c:644
++#: ../gtk/gtktexttag.c:644
+ msgid "Pixels inside wrap set"
+ msgstr "Píxels dins del conjunt d'ajust"
+
+-#: gtk/gtktexttag.c:645
++#: ../gtk/gtktexttag.c:645
+ msgid "Whether this tag affects the number of pixels between wrapped lines"
+ msgstr "Si aquest marcador afecta el nombre de píxels entre línies ajustades"
+
+-#: gtk/gtktexttag.c:652
++#: ../gtk/gtktexttag.c:652
+ msgid "Right margin set"
+ msgstr "Marge dret fixat"
+
+-#: gtk/gtktexttag.c:653
++#: ../gtk/gtktexttag.c:653
+ msgid "Whether this tag affects the right margin"
+ msgstr "Quan aquesta etiqueta afecta el marge dret"
+
+-#: gtk/gtktexttag.c:660
++#: ../gtk/gtktexttag.c:660
+ msgid "Wrap mode set"
+ msgstr "Conjunt mode ajust"
+
+-#: gtk/gtktexttag.c:661
++#: ../gtk/gtktexttag.c:661
+ msgid "Whether this tag affects line wrap mode"
+ msgstr "Quan aquesta etiqueta afecta el mode d'ajustat de línia"
+
+-#: gtk/gtktexttag.c:664
++#: ../gtk/gtktexttag.c:664
+ msgid "Tabs set"
+ msgstr "Tabuladors fixats"
+
+-#: gtk/gtktexttag.c:665
++#: ../gtk/gtktexttag.c:665
+ msgid "Whether this tag affects tabs"
+ msgstr "Si aquesta etiqueta afecta els tabuladors"
+
+-#: gtk/gtktexttag.c:668
++#: ../gtk/gtktexttag.c:668
+ msgid "Invisible set"
+ msgstr "Invisible activat"
+
+-#: gtk/gtktexttag.c:669
++#: ../gtk/gtktexttag.c:669
+ msgid "Whether this tag affects text visibility"
+ msgstr "Si aquesta etiqueta afecta la visibilitat del text"
+
+-#: gtk/gtktexttag.c:672
++#: ../gtk/gtktexttag.c:672
+ msgid "Paragraph background set"
+ msgstr "Estableix el fons del paràgraf"
+
+-#: gtk/gtktexttag.c:673
++#: ../gtk/gtktexttag.c:673
+ msgid "Whether this tag affects the paragraph background color"
+ msgstr "Si aquest marcador afecta el color de fons del paràgraf"
+
+-#: gtk/gtktextview.c:538
++#: ../gtk/gtktextview.c:538
+ msgid "Pixels Above Lines"
+ msgstr "Píxels per sobre les línies"
+
+-#: gtk/gtktextview.c:548
++#: ../gtk/gtktextview.c:548
+ msgid "Pixels Below Lines"
+ msgstr "Píxels per sota les línies"
+
+-#: gtk/gtktextview.c:558
++#: ../gtk/gtktextview.c:558
+ msgid "Pixels Inside Wrap"
+ msgstr "Píxels dins de l'ajust"
+
+-#: gtk/gtktextview.c:576
++#: ../gtk/gtktextview.c:576
+ msgid "Wrap Mode"
+ msgstr "Mode ajust"
+
+-#: gtk/gtktextview.c:594
++#: ../gtk/gtktextview.c:594
+ msgid "Left Margin"
+ msgstr "Marge esquerre"
+
+-#: gtk/gtktextview.c:604
++#: ../gtk/gtktextview.c:604
+ msgid "Right Margin"
+ msgstr "Marge dret"
+
+-#: gtk/gtktextview.c:632
++#: ../gtk/gtktextview.c:632
+ msgid "Cursor Visible"
+ msgstr "Cursor visible"
+
+-#: gtk/gtktextview.c:633
++#: ../gtk/gtktextview.c:633
+ msgid "If the insertion cursor is shown"
+ msgstr "Si es mostra el cursor d'inserció"
+
+-#: gtk/gtktextview.c:640
++#: ../gtk/gtktextview.c:640
+ msgid "Buffer"
+ msgstr "Text a memòria intermèdia"
+
+-#: gtk/gtktextview.c:641
++#: ../gtk/gtktextview.c:641
+ msgid "The buffer which is displayed"
+ msgstr "El text a la memòria intermèdia que es mostrarà"
+
+-#: gtk/gtktextview.c:649
++#: ../gtk/gtktextview.c:649
+ msgid "Whether entered text overwrites existing contents"
+ msgstr "Si el text entrat sobreescriu l'existent"
+
+-#: gtk/gtktextview.c:656
++#: ../gtk/gtktextview.c:656
+ msgid "Accepts tab"
+ msgstr "Accepta tabuladors"
+
+-#: gtk/gtktextview.c:657
++#: ../gtk/gtktextview.c:657
+ msgid "Whether Tab will result in a tab character being entered"
+ msgstr "Si la tecla de tabulació entra un caràcter de tabulació"
+
+-#: gtk/gtktextview.c:666
++#: ../gtk/gtktextview.c:666
+ msgid "Error underline color"
+ msgstr "Color de les línie d'error inferiors"
+
+-#: gtk/gtktextview.c:667
++#: ../gtk/gtktextview.c:667
+ msgid "Color with which to draw error-indication underlines"
+ msgstr "El color amb el que es dibuixa la línia inferior que indica un error"
+
+-#: gtk/gtktoggleaction.c:103
++#: ../gtk/gtktoggleaction.c:103
+ msgid "Create the same proxies as a radio action"
+ msgstr "Crea el mateixos apoderats com a acció de ràdio"
+
+-#: gtk/gtktoggleaction.c:104
++#: ../gtk/gtktoggleaction.c:104
+ msgid "Whether the proxies for this action look like radio action proxies"
+ msgstr ""
+ "Si els apoderats per a aquesta acció semblen apoderats d'acció de ràdio"
+
+-#: gtk/gtktoggleaction.c:119
++#: ../gtk/gtktoggleaction.c:119
+ msgid "If the toggle action should be active in or not"
+ msgstr "Si l'acció de commutació ha d'estar activa o no"
+
+-#: gtk/gtktogglebutton.c:103 gtk/gtktoggletoolbutton.c:102
++#: ../gtk/gtktogglebutton.c:103 ../gtk/gtktoggletoolbutton.c:102
+ msgid "If the toggle button should be pressed in or not"
+ msgstr "Si el botó de commutació ha d'estar premut"
+
+-#: gtk/gtktogglebutton.c:111
++#: ../gtk/gtktogglebutton.c:111
+ msgid "If the toggle button is in an \"in between\" state"
+ msgstr "Si el botó de commutació és en un estat «intermedi»"
+
+-#: gtk/gtktogglebutton.c:118
++#: ../gtk/gtktogglebutton.c:118
+ msgid "Draw Indicator"
+ msgstr "Indicador de dibuix"
+
+-#: gtk/gtktogglebutton.c:119
++#: ../gtk/gtktogglebutton.c:119
+ msgid "If the toggle part of the button is displayed"
+ msgstr "Si la part de commutació del botó es visualitza"
+
+-#: gtk/gtktoolbar.c:493
++#: ../gtk/gtktoolbar.c:493
+ msgid "The orientation of the toolbar"
+ msgstr "L'orientació de la barra d'eines"
+
+-#: gtk/gtktoolbar.c:501
++#: ../gtk/gtktoolbar.c:501
+ msgid "Toolbar Style"
+ msgstr "Estil de la barra d'eines"
+
+-#: gtk/gtktoolbar.c:502
++#: ../gtk/gtktoolbar.c:502
+ msgid "How to draw the toolbar"
+ msgstr "Com dibuixar la barra d'eines"
+
+-#: gtk/gtktoolbar.c:509
++#: ../gtk/gtktoolbar.c:509
+ msgid "Show Arrow"
+ msgstr "Mostra la fletxa"
+
+-#: gtk/gtktoolbar.c:510
++#: ../gtk/gtktoolbar.c:510
+ msgid "If an arrow should be shown if the toolbar doesn't fit"
+ msgstr ""
+ "Si s'ha de dibuixar una fletxa en cas que la barra d'eines no hi càpiga"
+
+-#: gtk/gtktoolbar.c:525
++#: ../gtk/gtktoolbar.c:525
+ msgid "Tooltips"
+ msgstr "Indicadors de funció"
+
+-#: gtk/gtktoolbar.c:526
++#: ../gtk/gtktoolbar.c:526
+ msgid "If the tooltips of the toolbar should be active or not"
+ msgstr "Si s'han d'activar els indicadors de funció de la barra d'eines"
+
+-#: gtk/gtktoolbar.c:548
++#: ../gtk/gtktoolbar.c:548
+ msgid "Size of icons in this toolbar"
+ msgstr "Mida de les icones d'aquesta barra d'eines"
+
+-#: gtk/gtktoolbar.c:563
++#: ../gtk/gtktoolbar.c:563
+ msgid "Icon size set"
+ msgstr "Mida de les icones establerta"
+
+-#: gtk/gtktoolbar.c:564
++#: ../gtk/gtktoolbar.c:564
+ msgid "Whether the icon-size property has been set"
+ msgstr "Si la propietat de la mida de les icones s'ha establert"
+
+-#: gtk/gtktoolbar.c:573
++#: ../gtk/gtktoolbar.c:573
+ msgid "Whether the item should receive extra space when the toolbar grows"
+ msgstr "Si l'element ha de rebre espai addicional quan la barra d'eines creixi"
+
+-#: gtk/gtktoolbar.c:581
++#: ../gtk/gtktoolbar.c:581
+ msgid "Whether the item should be the same size as other homogeneous items"
+ msgstr "Si l'element ha de tenir la mateixa mida que altres elements homogenis"
+
+-#: gtk/gtktoolbar.c:588
++#: ../gtk/gtktoolbar.c:588
+ msgid "Spacer size"
+ msgstr "Mida de l'espaiador"
+
+-#: gtk/gtktoolbar.c:589
++#: ../gtk/gtktoolbar.c:589
+ msgid "Size of spacers"
+ msgstr "Mida dels espaiadors"
+
+-#: gtk/gtktoolbar.c:598
++#: ../gtk/gtktoolbar.c:598
+ msgid "Amount of border space between the toolbar shadow and the buttons"
+ msgstr ""
+ "Quantitat d'espai del contorn entre l'ombra de la barra d'eines i els botons"
+
+-#: gtk/gtktoolbar.c:606
++#: ../gtk/gtktoolbar.c:606
+ msgid "Maximum child expand"
+ msgstr "Expansió màxima del fill"
+
+-#: gtk/gtktoolbar.c:607
++#: ../gtk/gtktoolbar.c:607
+ msgid "Maximum amount of space an expandable item will be given"
+ msgstr ""
+ "La quantitat màxima d'espai que es donarà a un element per a poder-s'hi "
+ "expandir"
+
+-#: gtk/gtktoolbar.c:615
++#: ../gtk/gtktoolbar.c:615
+ msgid "Space style"
+ msgstr "Estil de l'espaiador"
+
+-#: gtk/gtktoolbar.c:616
++#: ../gtk/gtktoolbar.c:616
+ msgid "Whether spacers are vertical lines or just blank"
+ msgstr "Si els espaiadors són línies verticals o espais en blanc"
+
+-#: gtk/gtktoolbar.c:623
++#: ../gtk/gtktoolbar.c:623
+ msgid "Button relief"
+ msgstr "Relleu del botó"
+
+-#: gtk/gtktoolbar.c:624
++#: ../gtk/gtktoolbar.c:624
+ msgid "Type of bevel around toolbar buttons"
+ msgstr "Tipus de bisell que envolta els botons la barra d'eines"
+
+-#: gtk/gtktoolbar.c:631
++#: ../gtk/gtktoolbar.c:631
+ msgid "Style of bevel around the toolbar"
+ msgstr "Estil de bisell que envolta la barra d'eines"
+
+-#: gtk/gtktoolbar.c:637
++#: ../gtk/gtktoolbar.c:637
+ msgid "Toolbar style"
+ msgstr "Estil de barra d'eines"
+
+-#: gtk/gtktoolbar.c:638
++#: ../gtk/gtktoolbar.c:638
+ msgid ""
+ "Whether default toolbars have text only, text and icons, icons only, etc."
+ msgstr ""
+ "Si les barres d'eines tenen només text, text i icones, només icones, etc."
+
+-#: gtk/gtktoolbar.c:644
++#: ../gtk/gtktoolbar.c:644
+ msgid "Toolbar icon size"
+ msgstr "Mida de la barra d'eines"
+
+-#: gtk/gtktoolbar.c:645
++#: ../gtk/gtktoolbar.c:645
+ msgid "Size of icons in default toolbars"
+ msgstr "Mida de les icones a la barra d'eines per defecte"
+
+-#: gtk/gtktoolbutton.c:181
++#: ../gtk/gtktoolbutton.c:181
+ msgid "Text to show in the item."
+ msgstr "Text a mostrar en l'element."
+
+-#: gtk/gtktoolbutton.c:188
++#: ../gtk/gtktoolbutton.c:188
+ msgid ""
+ "If set, an underline in the label property indicates that the next character "
+ "should be used for the mnemonic accelerator key in the overflow menu"
+@@ -6035,43 +6063,43 @@
+ "caràcter següent s'hauria d'utilitzar per a la tecla de drecera mnemotècnica "
+ "en el menú"
+
+-#: gtk/gtktoolbutton.c:195
++#: ../gtk/gtktoolbutton.c:195
+ msgid "Widget to use as the item label"
+ msgstr "El giny que s'utilitzarà com a etiqueta de l'element"
+
+-#: gtk/gtktoolbutton.c:201
++#: ../gtk/gtktoolbutton.c:201
+ msgid "Stock Id"
+ msgstr "Id d'estoc"
+
+-#: gtk/gtktoolbutton.c:202
++#: ../gtk/gtktoolbutton.c:202
+ msgid "The stock icon displayed on the item"
+ msgstr "La icona d'estoc que es visualitzarà en l'element"
+
+-#: gtk/gtktoolbutton.c:218
++#: ../gtk/gtktoolbutton.c:218
+ msgid "Icon name"
+ msgstr "Nom de la icona"
+
+-#: gtk/gtktoolbutton.c:219
++#: ../gtk/gtktoolbutton.c:219
+ msgid "The name of the themed icon displayed on the item"
+ msgstr "El nom de la icona de tema que es visualitzarà en l'element"
+
+-#: gtk/gtktoolbutton.c:225
++#: ../gtk/gtktoolbutton.c:225
+ msgid "Icon widget"
+ msgstr "Giny icona"
+
+-#: gtk/gtktoolbutton.c:226
++#: ../gtk/gtktoolbutton.c:226
+ msgid "Icon widget to display in the item"
+ msgstr "El giny icona a mostrar en l'element"
+
+-#: gtk/gtktoolbutton.c:239
++#: ../gtk/gtktoolbutton.c:239
+ msgid "Icon spacing"
+ msgstr "Espaiat entre icones"
+
+-#: gtk/gtktoolbutton.c:240
++#: ../gtk/gtktoolbutton.c:240
+ msgid "Spacing in pixels between the icon and label"
+ msgstr "L'espaiament entre la icona i l'etiqueta"
+
+-#: gtk/gtktoolitem.c:171
++#: ../gtk/gtktoolitem.c:171
+ msgid ""
+ "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
+ "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
+@@ -6079,369 +6107,369 @@
+ "Si l'element de la barra d'eines es considera important. Si és CERT, els "
+ "botons de la barra d'eines mostraran el text en mode GTK_TOOLBAR_BOTH_HORIZ"
+
+-#: gtk/gtktreemodelsort.c:274
++#: ../gtk/gtktreemodelsort.c:274
+ msgid "TreeModelSort Model"
+ msgstr "Model TreeModelSort"
+
+-#: gtk/gtktreemodelsort.c:275
++#: ../gtk/gtktreemodelsort.c:275
+ msgid "The model for the TreeModelSort to sort"
+ msgstr "El model per a TreeModelSort a ordenar"
+
+-#: gtk/gtktreeview.c:570
++#: ../gtk/gtktreeview.c:570
+ msgid "TreeView Model"
+ msgstr "Model de vista d'arbre"
+
+-#: gtk/gtktreeview.c:571
++#: ../gtk/gtktreeview.c:571
+ msgid "The model for the tree view"
+ msgstr "El model per la vista d'arbre"
+
+-#: gtk/gtktreeview.c:579
++#: ../gtk/gtktreeview.c:579
+ msgid "Horizontal Adjustment for the widget"
+ msgstr "Ajustament horitzontal pel giny"
+
+-#: gtk/gtktreeview.c:587
++#: ../gtk/gtktreeview.c:587
+ msgid "Vertical Adjustment for the widget"
+ msgstr "Ajustament vertical pel giny"
+
+-#: gtk/gtktreeview.c:594
++#: ../gtk/gtktreeview.c:594
+ msgid "Headers Visible"
+ msgstr "Capçaleres visibles"
+
+-#: gtk/gtktreeview.c:595
++#: ../gtk/gtktreeview.c:595
+ msgid "Show the column header buttons"
+ msgstr "Mostra botons en els encapçalaments de columna"
+
+-#: gtk/gtktreeview.c:602
++#: ../gtk/gtktreeview.c:602
+ msgid "Headers Clickable"
+ msgstr "Capçaleres clicables"
+
+-#: gtk/gtktreeview.c:603
++#: ../gtk/gtktreeview.c:603
+ msgid "Column headers respond to click events"
+ msgstr "Les capçaleres de columna responen als clics"
+
+-#: gtk/gtktreeview.c:610
++#: ../gtk/gtktreeview.c:610
+ msgid "Expander Column"
+ msgstr "Columna expansora"
+
+-#: gtk/gtktreeview.c:611
++#: ../gtk/gtktreeview.c:611
+ msgid "Set the column for the expander column"
+ msgstr "Estableix la columna per a la columna expansora"
+
+-#: gtk/gtktreeview.c:626
++#: ../gtk/gtktreeview.c:626
+ msgid "Rules Hint"
+ msgstr "Indicació de les regles"
+
+-#: gtk/gtktreeview.c:627
++#: ../gtk/gtktreeview.c:627
+ msgid "Set a hint to the theme engine to draw rows in alternating colors"
+ msgstr ""
+ "Estableix una pista en el motor de temes per dibuixar files en colors "
+ "alternants"
+
+-#: gtk/gtktreeview.c:634
++#: ../gtk/gtktreeview.c:634
+ msgid "Enable Search"
+ msgstr "Habilita la cerca"
+
+-#: gtk/gtktreeview.c:635
++#: ../gtk/gtktreeview.c:635
+ msgid "View allows user to search through columns interactively"
+ msgstr ""
+ "La visualització permet a l'usuari cercar interactivament a través de "
+ "columnes"
+
+-#: gtk/gtktreeview.c:642
++#: ../gtk/gtktreeview.c:642
+ msgid "Search Column"
+ msgstr "Cerca columna"
+
+-#: gtk/gtktreeview.c:643
+-msgid "Model column to search through when searching through code"
+-msgstr "Columna model a cercar mitjançant recerca amb codi"
++#: ../gtk/gtktreeview.c:643
++msgid "Model column to search through during interactive search"
++msgstr "Columna model a cercar durant la cerca interactiva"
+
+-#: gtk/gtktreeview.c:663
++#: ../gtk/gtktreeview.c:663
+ msgid "Fixed Height Mode"
+ msgstr "Mode d'alçada fixa"
+
+-#: gtk/gtktreeview.c:664
++#: ../gtk/gtktreeview.c:664
+ msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
+ msgstr ""
+ "Fa més ràpid el GtkTreeView en assumir que totes les files tenen la mateixa "
+ "alçada"
+
+-#: gtk/gtktreeview.c:684
++#: ../gtk/gtktreeview.c:684
+ msgid "Hover Selection"
+ msgstr "Segueix el punter"
+
+-#: gtk/gtktreeview.c:685
++#: ../gtk/gtktreeview.c:685
+ msgid "Whether the selection should follow the pointer"
+ msgstr "Si la selecció ha de seguir el punter"
+
+-#: gtk/gtktreeview.c:704
++#: ../gtk/gtktreeview.c:704
+ msgid "Hover Expand"
+ msgstr "Expandeix amb el punter"
+
+-#: gtk/gtktreeview.c:705
++#: ../gtk/gtktreeview.c:705
+ msgid ""
+ "Whether rows should be expanded/collapsed when the pointer moves over them"
+ msgstr ""
+ "Si les files s'haurien d'expandir o reduir quan el punter s'hi mou per sobre"
+
+-#: gtk/gtktreeview.c:719
++#: ../gtk/gtktreeview.c:719
+ msgid "Show Expanders"
+ msgstr "Mostra els expansors"
+
+-#: gtk/gtktreeview.c:720
++#: ../gtk/gtktreeview.c:720
+ msgid "View has expanders"
+ msgstr "La visualització té expansors"
+
+-#: gtk/gtktreeview.c:734
++#: ../gtk/gtktreeview.c:734
+ msgid "Level Indentation"
+ msgstr "Nivell del sagnat"
+
+-#: gtk/gtktreeview.c:735
++#: ../gtk/gtktreeview.c:735
+ msgid "Extra indentation for each level"
+ msgstr "Sagnat addicional per a cada nivell"
+
+-#: gtk/gtktreeview.c:744
++#: ../gtk/gtktreeview.c:744
+ msgid "Rubber Banding"
+ msgstr "Selecció per goma elàstica"
+
+-#: gtk/gtktreeview.c:745
++#: ../gtk/gtktreeview.c:745
+ msgid ""
+ "Whether to enable selection of multiple items by dragging the mouse pointer"
+ msgstr ""
+ "Si s'ha permetre seleccionar diversos elements arrossegant el punter de "
+ "ratolí"
+
+-#: gtk/gtktreeview.c:752
++#: ../gtk/gtktreeview.c:752
+ msgid "Enable Grid Lines"
+ msgstr "Habilita les línies de graella"
+
+-#: gtk/gtktreeview.c:753
++#: ../gtk/gtktreeview.c:753
+ msgid "Whether grid lines should be drawn in the tree view"
+ msgstr "Si s'han de mostrar les línies de graella en la visualització d'arbre"
+
+-#: gtk/gtktreeview.c:761
++#: ../gtk/gtktreeview.c:761
+ msgid "Enable Tree Lines"
+ msgstr "Habilita les línies dels arbres"
+
+-#: gtk/gtktreeview.c:762
++#: ../gtk/gtktreeview.c:762
+ msgid "Whether tree lines should be drawn in the tree view"
+ msgstr ""
+ "Si s'han de dibuixar les línies dels arbres en la visualització d'arbre"
+
+-#: gtk/gtktreeview.c:770
++#: ../gtk/gtktreeview.c:770
+ msgid "The column in the model containing the tooltip texts for the rows"
+ msgstr ""
+ "La columna del model que conté els textos dels indicadors de funció per a "
+ "les files"
+
+-#: gtk/gtktreeview.c:792
++#: ../gtk/gtktreeview.c:792
+ msgid "Vertical Separator Width"
+ msgstr "Amplada del separador vertical"
+
+-#: gtk/gtktreeview.c:793
++#: ../gtk/gtktreeview.c:793
+ msgid "Vertical space between cells. Must be an even number"
+ msgstr "Espai vertical entre cel·les. Ha de ser un número parell"
+
+-#: gtk/gtktreeview.c:801
++#: ../gtk/gtktreeview.c:801
+ msgid "Horizontal Separator Width"
+ msgstr "Amplada del separador horitzontal"
+
+-#: gtk/gtktreeview.c:802
++#: ../gtk/gtktreeview.c:802
+ msgid "Horizontal space between cells. Must be an even number"
+ msgstr "Espai horitzontal entre cel·les. Ha de ser un número parell"
+
+ # FIXME (josep)
+-#: gtk/gtktreeview.c:810
++#: ../gtk/gtktreeview.c:810
+ msgid "Allow Rules"
+ msgstr "Permet regles"
+
+-#: gtk/gtktreeview.c:811
++#: ../gtk/gtktreeview.c:811
+ msgid "Allow drawing of alternating color rows"
+ msgstr "Permet el dibuix de les files del color que s'alternen"
+
+-#: gtk/gtktreeview.c:817
++#: ../gtk/gtktreeview.c:817
+ msgid "Indent Expanders"
+ msgstr "Sagna els expansors"
+
+-#: gtk/gtktreeview.c:818
++#: ../gtk/gtktreeview.c:818
+ msgid "Make the expanders indented"
+ msgstr "Fes els expansors sagnats"
+
+-#: gtk/gtktreeview.c:824
++#: ../gtk/gtktreeview.c:824
+ msgid "Even Row Color"
+ msgstr "Color de la fila parell"
+
+-#: gtk/gtktreeview.c:825
++#: ../gtk/gtktreeview.c:825
+ msgid "Color to use for even rows"
+ msgstr "Color a utilitzar a les files parells"
+
+-#: gtk/gtktreeview.c:831
++#: ../gtk/gtktreeview.c:831
+ msgid "Odd Row Color"
+ msgstr "Color de la fila imparell"
+
+-#: gtk/gtktreeview.c:832
++#: ../gtk/gtktreeview.c:832
+ msgid "Color to use for odd rows"
+ msgstr "Color a utilitzar a les files imparells"
+
+-#: gtk/gtktreeview.c:838
++#: ../gtk/gtktreeview.c:838
+ msgid "Row Ending details"
+ msgstr "Detalls finals de la fila"
+
+-#: gtk/gtktreeview.c:839
++#: ../gtk/gtktreeview.c:839
+ msgid "Enable extended row background theming"
+ msgstr "Habilita la tematització avançada dels fons de les files"
+
+-#: gtk/gtktreeview.c:845
++#: ../gtk/gtktreeview.c:845
+ msgid "Grid line width"
+ msgstr "Amplada de línia de la graella"
+
+-#: gtk/gtktreeview.c:846
++#: ../gtk/gtktreeview.c:846
+ msgid "Width, in pixels, of the tree view grid lines"
+ msgstr "L'amplada, en píxels, de la línia de la graella de la vista d'arbre"
+
+-#: gtk/gtktreeview.c:852
++#: ../gtk/gtktreeview.c:852
+ msgid "Tree line width"
+ msgstr "Amplada de la línia de l'arbre"
+
+-#: gtk/gtktreeview.c:853
++#: ../gtk/gtktreeview.c:853
+ msgid "Width, in pixels, of the tree view lines"
+ msgstr "Amplada, en píxels, de les línies de la vista d'arbre"
+
+-#: gtk/gtktreeview.c:859
++#: ../gtk/gtktreeview.c:859
+ msgid "Grid line pattern"
+ msgstr "Patró de les línies de graella"
+
+ # FIXME
+-#: gtk/gtktreeview.c:860
++#: ../gtk/gtktreeview.c:860
+ msgid "Dash pattern used to draw the tree view grid lines"
+ msgstr ""
+ "Patró de traç utilitzat per dibuixar les línies de graella de la "
+ "visualització en arbre"
+
+-#: gtk/gtktreeview.c:866
++#: ../gtk/gtktreeview.c:866
+ msgid "Tree line pattern"
+ msgstr "Patró de la línia dels arbres"
+
+ # FIXME
+-#: gtk/gtktreeview.c:867
++#: ../gtk/gtktreeview.c:867
+ msgid "Dash pattern used to draw the tree view lines"
+ msgstr ""
+ "Patró de traç utilitzat per dibuixar les línies de la visualització en arbre"
+
+-#: gtk/gtktreeviewcolumn.c:192
++#: ../gtk/gtktreeviewcolumn.c:192
+ msgid "Whether to display the column"
+ msgstr "Si es mostra la columna"
+
+-#: gtk/gtktreeviewcolumn.c:199 gtk/gtkwindow.c:523
++#: ../gtk/gtktreeviewcolumn.c:199 ../gtk/gtkwindow.c:523
+ msgid "Resizable"
+ msgstr "Redimensionable"
+
+-#: gtk/gtktreeviewcolumn.c:200
++#: ../gtk/gtktreeviewcolumn.c:200
+ msgid "Column is user-resizable"
+ msgstr "La columna és usuari-redimensionable"
+
+-#: gtk/gtktreeviewcolumn.c:208
++#: ../gtk/gtktreeviewcolumn.c:208
+ msgid "Current width of the column"
+ msgstr "Amplada actual de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:217
++#: ../gtk/gtktreeviewcolumn.c:217
+ msgid "Space which is inserted between cells"
+ msgstr "L'espai inserit entre cel·les"
+
+-#: gtk/gtktreeviewcolumn.c:225
++#: ../gtk/gtktreeviewcolumn.c:225
+ msgid "Sizing"
+ msgstr "Dimensionar"
+
+-#: gtk/gtktreeviewcolumn.c:226
++#: ../gtk/gtktreeviewcolumn.c:226
+ msgid "Resize mode of the column"
+ msgstr "Modalitat de redimensió de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:234
++#: ../gtk/gtktreeviewcolumn.c:234
+ msgid "Fixed Width"
+ msgstr "Amplada fixa"
+
+-#: gtk/gtktreeviewcolumn.c:235
++#: ../gtk/gtktreeviewcolumn.c:235
+ msgid "Current fixed width of the column"
+ msgstr "Amplada fixa actual de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:244
++#: ../gtk/gtktreeviewcolumn.c:244
+ msgid "Minimum Width"
+ msgstr "Amplada mínima"
+
+-#: gtk/gtktreeviewcolumn.c:245
++#: ../gtk/gtktreeviewcolumn.c:245
+ msgid "Minimum allowed width of the column"
+ msgstr "Amplada mínima permesa de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:254
++#: ../gtk/gtktreeviewcolumn.c:254
+ msgid "Maximum Width"
+ msgstr "Amplada màxima"
+
+-#: gtk/gtktreeviewcolumn.c:255
++#: ../gtk/gtktreeviewcolumn.c:255
+ msgid "Maximum allowed width of the column"
+ msgstr "Amplada màxima permesa de la columna"
+
+-#: gtk/gtktreeviewcolumn.c:265
++#: ../gtk/gtktreeviewcolumn.c:265
+ msgid "Title to appear in column header"
+ msgstr "Títol que apareix a la capçalera de la columna"
+
+ # FIXME (josep)
+-#: gtk/gtktreeviewcolumn.c:273
++#: ../gtk/gtktreeviewcolumn.c:273
+ msgid "Column gets share of extra width allocated to the widget"
+ msgstr "La columna obté una porció de l'amplada addicional assignada al giny"
+
+-#: gtk/gtktreeviewcolumn.c:280
++#: ../gtk/gtktreeviewcolumn.c:280
+ msgid "Clickable"
+ msgstr "Clicable"
+
+-#: gtk/gtktreeviewcolumn.c:281
++#: ../gtk/gtktreeviewcolumn.c:281
+ msgid "Whether the header can be clicked"
+ msgstr "Si es pot fer clic a la capçalera"
+
+-#: gtk/gtktreeviewcolumn.c:289
++#: ../gtk/gtktreeviewcolumn.c:289
+ msgid "Widget"
+ msgstr "Giny"
+
+-#: gtk/gtktreeviewcolumn.c:290
++#: ../gtk/gtktreeviewcolumn.c:290
+ msgid "Widget to put in column header button instead of column title"
+ msgstr ""
+ "Giny per posar al botó de capçalera de columna en lloc del títol de columna"
+
+-#: gtk/gtktreeviewcolumn.c:298
++#: ../gtk/gtktreeviewcolumn.c:298
+ msgid "X Alignment of the column header text or widget"
+ msgstr "Alineació X del text de la capçalera de columna o giny"
+
+-#: gtk/gtktreeviewcolumn.c:308
++#: ../gtk/gtktreeviewcolumn.c:308
+ msgid "Whether the column can be reordered around the headers"
+ msgstr "Si la columna pot ser reordenada al voltant la capçalera"
+
+-#: gtk/gtktreeviewcolumn.c:315
++#: ../gtk/gtktreeviewcolumn.c:315
+ msgid "Sort indicator"
+ msgstr "Indicador d'ordenació"
+
+-#: gtk/gtktreeviewcolumn.c:316
++#: ../gtk/gtktreeviewcolumn.c:316
+ msgid "Whether to show a sort indicator"
+ msgstr "Si es mostrarà un indicador d'ordenació"
+
+-#: gtk/gtktreeviewcolumn.c:323
++#: ../gtk/gtktreeviewcolumn.c:323
+ msgid "Sort order"
+ msgstr "Ordre d'ordenació"
+
+-#: gtk/gtktreeviewcolumn.c:324
++#: ../gtk/gtktreeviewcolumn.c:324
+ msgid "Sort direction the sort indicator should indicate"
+ msgstr "Direcció d'ordre que l'indicador haurà d'indicar"
+
+-#: gtk/gtkuimanager.c:221
++#: ../gtk/gtkuimanager.c:221
+ msgid "Whether tearoff menu items should be added to menus"
+ msgstr "Si s'han d'afegir elements de menú tearoffs als menús"
+
+-#: gtk/gtkuimanager.c:228
++#: ../gtk/gtkuimanager.c:228
+ msgid "Merged UI definition"
+ msgstr "Definició d'IU mesclada"
+
+-#: gtk/gtkuimanager.c:229
++#: ../gtk/gtkuimanager.c:229
+ msgid "An XML string describing the merged UI"
+ msgstr "Una cadena XML que descriu la IU mesclada"
+
+-#: gtk/gtkviewport.c:107
++#: ../gtk/gtkviewport.c:107
+ msgid ""
+ "The GtkAdjustment that determines the values of the horizontal position for "
+ "this viewport"
+@@ -6449,7 +6477,7 @@
+ "El GtkAdjustment que determina els valors de la posició horitzontal per a "
+ "aquesta subàrea"
+
+-#: gtk/gtkviewport.c:115
++#: ../gtk/gtkviewport.c:115
+ msgid ""
+ "The GtkAdjustment that determines the values of the vertical position for "
+ "this viewport"
+@@ -6457,31 +6485,31 @@
+ "El GtkAdjustment que determina els valors de la posició vertical per a "
+ "aquesta subàrea"
+
+-#: gtk/gtkviewport.c:123
++#: ../gtk/gtkviewport.c:123
+ msgid "Determines how the shadowed box around the viewport is drawn"
+ msgstr "Determina com es dibuixa el quadre ombrejat al voltant de la subàrea"
+
+-#: gtk/gtkwidget.c:483
++#: ../gtk/gtkwidget.c:483
+ msgid "Widget name"
+ msgstr "Nom del giny"
+
+-#: gtk/gtkwidget.c:484
++#: ../gtk/gtkwidget.c:484
+ msgid "The name of the widget"
+ msgstr "El nom del giny"
+
+-#: gtk/gtkwidget.c:490
++#: ../gtk/gtkwidget.c:490
+ msgid "Parent widget"
+ msgstr "Giny pare"
+
+-#: gtk/gtkwidget.c:491
++#: ../gtk/gtkwidget.c:491
+ msgid "The parent widget of this widget. Must be a Container widget"
+ msgstr "El giny pare d'aquest giny. Ha de ser un giny contenidor"
+
+-#: gtk/gtkwidget.c:498
++#: ../gtk/gtkwidget.c:498
+ msgid "Width request"
+ msgstr "Petició d'amplada"
+
+-#: gtk/gtkwidget.c:499
++#: ../gtk/gtkwidget.c:499
+ msgid ""
+ "Override for width request of the widget, or -1 if natural request should be "
+ "used"
+@@ -6489,11 +6517,11 @@
+ "Substitueix per sol·licitud d'amplada del giny, o -1 si la sol·licitud "
+ "natural hagués de ser utilitzada"
+
+-#: gtk/gtkwidget.c:507
++#: ../gtk/gtkwidget.c:507
+ msgid "Height request"
+ msgstr "Petició d'alçada"
+
+-#: gtk/gtkwidget.c:508
++#: ../gtk/gtkwidget.c:508
+ msgid ""
+ "Override for height request of the widget, or -1 if natural request should "
+ "be used"
+@@ -6501,193 +6529,193 @@
+ "Substitueix per sol·licitud d'alçada del giny, o -1 si la sol·licitud "
+ "natural hagués de ser utilitzada"
+
+-#: gtk/gtkwidget.c:517
++#: ../gtk/gtkwidget.c:517
+ msgid "Whether the widget is visible"
+ msgstr "Si el giny és visible"
+
+-#: gtk/gtkwidget.c:524
++#: ../gtk/gtkwidget.c:524
+ msgid "Whether the widget responds to input"
+ msgstr "Si el giny respon a l'entrada"
+
+-#: gtk/gtkwidget.c:530
++#: ../gtk/gtkwidget.c:530
+ msgid "Application paintable"
+ msgstr "Aplicació dibuixable"
+
+-#: gtk/gtkwidget.c:531
++#: ../gtk/gtkwidget.c:531
+ msgid "Whether the application will paint directly on the widget"
+ msgstr "Si l'aplicació pintarà directament en el giny"
+
+-#: gtk/gtkwidget.c:537
++#: ../gtk/gtkwidget.c:537
+ msgid "Can focus"
+ msgstr "Pot enfocar-se"
+
+-#: gtk/gtkwidget.c:538
++#: ../gtk/gtkwidget.c:538
+ msgid "Whether the widget can accept the input focus"
+ msgstr "Si el giny pot acceptar l'entrada de focus"
+
+-#: gtk/gtkwidget.c:544
++#: ../gtk/gtkwidget.c:544
+ msgid "Has focus"
+ msgstr "Té focus"
+
+-#: gtk/gtkwidget.c:545
++#: ../gtk/gtkwidget.c:545
+ msgid "Whether the widget has the input focus"
+ msgstr "Si el giny té l'entrada de focus"
+
+-#: gtk/gtkwidget.c:551
++#: ../gtk/gtkwidget.c:551
+ msgid "Is focus"
+ msgstr "És focus"
+
+-#: gtk/gtkwidget.c:552
++#: ../gtk/gtkwidget.c:552
+ msgid "Whether the widget is the focus widget within the toplevel"
+ msgstr "Si el giny és el giny de focus dins del nivell superior"
+
+-#: gtk/gtkwidget.c:558
++#: ../gtk/gtkwidget.c:558
+ msgid "Can default"
+ msgstr "Pot per defecte"
+
+-#: gtk/gtkwidget.c:559
++#: ../gtk/gtkwidget.c:559
+ msgid "Whether the widget can be the default widget"
+ msgstr "Si el giny pot ser el giny per defecte"
+
+-#: gtk/gtkwidget.c:565
++#: ../gtk/gtkwidget.c:565
+ msgid "Has default"
+ msgstr "Té per defecte"
+
+-#: gtk/gtkwidget.c:566
++#: ../gtk/gtkwidget.c:566
+ msgid "Whether the widget is the default widget"
+ msgstr "Si el giny és el giny per defecte"
+
+-#: gtk/gtkwidget.c:572
++#: ../gtk/gtkwidget.c:572
+ msgid "Receives default"
+ msgstr "Rep per defecte"
+
+-#: gtk/gtkwidget.c:573
++#: ../gtk/gtkwidget.c:573
+ msgid "If TRUE, the widget will receive the default action when it is focused"
+ msgstr "Si és CERT, el giny rebrà l'acció per defecte quan s'enfoqui"
+
+-#: gtk/gtkwidget.c:579
++#: ../gtk/gtkwidget.c:579
+ msgid "Composite child"
+ msgstr "Fill composat"
+
+-#: gtk/gtkwidget.c:580
++#: ../gtk/gtkwidget.c:580
+ msgid "Whether the widget is part of a composite widget"
+ msgstr "Si el giny es part d'un giny compost o no"
+
+-#: gtk/gtkwidget.c:586
++#: ../gtk/gtkwidget.c:586
+ msgid "Style"
+ msgstr "Estil"
+
+-#: gtk/gtkwidget.c:587
++#: ../gtk/gtkwidget.c:587
+ msgid ""
+ "The style of the widget, which contains information about how it will look "
+ "(colors etc)"
+ msgstr "Estil del giny, que conté informació sobre com es veurà (colors, etc.)"
+
+-#: gtk/gtkwidget.c:593
++#: ../gtk/gtkwidget.c:593
+ msgid "Events"
+ msgstr "Esdeveniments"
+
+-#: gtk/gtkwidget.c:594
++#: ../gtk/gtkwidget.c:594
+ msgid "The event mask that decides what kind of GdkEvents this widget gets"
+ msgstr ""
+ "La màscara d'incidències que decideix quin tipus de GdkEvents obté aquest "
+ "giny"
+
+-#: gtk/gtkwidget.c:601
++#: ../gtk/gtkwidget.c:601
+ msgid "Extension events"
+ msgstr "Esdeveniments d'extensió"
+
+-#: gtk/gtkwidget.c:602
++#: ../gtk/gtkwidget.c:602
+ msgid "The mask that decides what kind of extension events this widget gets"
+ msgstr ""
+ "La màscara que decideix quin tipus d'incidències aconseguirà aquest giny"
+
+ # NOTA: segons la següent cadena, indica si la funció show_all afecta a aquest
+ # giny o no, per tant he deixat el nom del mètode en anglès.
+-#: gtk/gtkwidget.c:609
++#: ../gtk/gtkwidget.c:609
+ msgid "No show all"
+ msgstr "No «show_all»"
+
+-#: gtk/gtkwidget.c:610
++#: ../gtk/gtkwidget.c:610
+ msgid "Whether gtk_widget_show_all() should not affect this widget"
+ msgstr "Si gtk_widget_show_all() no ha d'afectar aquest giny"
+
+-#: gtk/gtkwidget.c:632
++#: ../gtk/gtkwidget.c:632
+ msgid "Has tooltip"
+ msgstr "Té indicador de funció"
+
+-#: gtk/gtkwidget.c:633
++#: ../gtk/gtkwidget.c:633
+ msgid "Whether this widget has a tooltip"
+ msgstr "Si aquest giny té un indicador de funció"
+
+-#: gtk/gtkwidget.c:653
++#: ../gtk/gtkwidget.c:653
+ msgid "Tooltip Text"
+ msgstr "Text de l'indicador de funció"
+
+-#: gtk/gtkwidget.c:654 gtk/gtkwidget.c:675
++#: ../gtk/gtkwidget.c:654 ../gtk/gtkwidget.c:675
+ msgid "The contents of the tooltip for this widget"
+ msgstr "Els continguts de l'indicador de funció d'aquest giny"
+
+-#: gtk/gtkwidget.c:674
++#: ../gtk/gtkwidget.c:674
+ msgid "Tooltip markup"
+ msgstr "Etiquetatge de l'indicador de funció"
+
+-#: gtk/gtkwidget.c:689
++#: ../gtk/gtkwidget.c:689
+ msgid "Window"
+ msgstr "Finestra"
+
+ # Es refereix a http://library.gnome.org/devel/gtk/unstable/GtkWidget.html#gtk-widget-realize (dpm)
+-#: gtk/gtkwidget.c:690
++#: ../gtk/gtkwidget.c:690
+ msgid "The widget's window if it is realized"
+ msgstr "La finestra del giny, en cas que sigui realitzada"
+
+-#: gtk/gtkwidget.c:2208
++#: ../gtk/gtkwidget.c:2208
+ msgid "Interior Focus"
+ msgstr "Focus interior"
+
+-#: gtk/gtkwidget.c:2209
++#: ../gtk/gtkwidget.c:2209
+ msgid "Whether to draw the focus indicator inside widgets"
+ msgstr "Si s'ha de dibuixar l'indicador del focus dins dels ginys"
+
+-#: gtk/gtkwidget.c:2215
++#: ../gtk/gtkwidget.c:2215
+ msgid "Focus linewidth"
+ msgstr "Amplada de línia del focus"
+
+-#: gtk/gtkwidget.c:2216
++#: ../gtk/gtkwidget.c:2216
+ msgid "Width, in pixels, of the focus indicator line"
+ msgstr "Amplada, en píxels, de la línia indicadora del focus"
+
+ # FIXME traç (josep)
+-#: gtk/gtkwidget.c:2222
++#: ../gtk/gtkwidget.c:2222
+ msgid "Focus line dash pattern"
+ msgstr "Patró de traç de la línia de focus"
+
+ # FIXME
+-#: gtk/gtkwidget.c:2223
++#: ../gtk/gtkwidget.c:2223
+ msgid "Dash pattern used to draw the focus indicator"
+ msgstr "Patró de traç utilitzat per dibuixar l'indicador del focus"
+
+-#: gtk/gtkwidget.c:2228
++#: ../gtk/gtkwidget.c:2228
+ msgid "Focus padding"
+ msgstr "Separació del focus"
+
+-#: gtk/gtkwidget.c:2229
++#: ../gtk/gtkwidget.c:2229
+ msgid "Width, in pixels, between focus indicator and the widget 'box'"
+ msgstr "Amplada, en píxels, entre l'indicador de focus i el giny 'box'"
+
+-#: gtk/gtkwidget.c:2234
++#: ../gtk/gtkwidget.c:2234
+ msgid "Cursor color"
+ msgstr "Color del cursor"
+
+-#: gtk/gtkwidget.c:2235
++#: ../gtk/gtkwidget.c:2235
+ msgid "Color with which to draw insertion cursor"
+ msgstr "Color amb el que es dibuixa el cursor d'inserció"
+
+-#: gtk/gtkwidget.c:2240
++#: ../gtk/gtkwidget.c:2240
+ msgid "Secondary cursor color"
+ msgstr "Color del cursor secundari"
+
+-#: gtk/gtkwidget.c:2241
++#: ../gtk/gtkwidget.c:2241
+ msgid ""
+ "Color with which to draw the secondary insertion cursor when editing mixed "
+ "right-to-left and left-to-right text"
+@@ -6695,43 +6723,43 @@
+ "Color per dibuixar el cursor d'inserció secundària en editar la barreja del "
+ "text de dreta-a-esquerra i d'esquerra-a-dreta."
+
+-#: gtk/gtkwidget.c:2246
++#: ../gtk/gtkwidget.c:2246
+ msgid "Cursor line aspect ratio"
+ msgstr "Ràtio d'aspecte de la línia del cursor"
+
+-#: gtk/gtkwidget.c:2247
++#: ../gtk/gtkwidget.c:2247
+ msgid "Aspect ratio with which to draw insertion cursor"
+ msgstr "Ràtio d'aspecte amb el que dibuixar el cursor d'inserció"
+
+-#: gtk/gtkwidget.c:2261
++#: ../gtk/gtkwidget.c:2261
+ msgid "Draw Border"
+ msgstr "Dibuixa la vora"
+
+-#: gtk/gtkwidget.c:2262
++#: ../gtk/gtkwidget.c:2262
+ msgid "Size of areas outside the widget's allocation to draw"
+ msgstr "Mida de les àrees a dibuixar fora de la ubicació del giny"
+
+-#: gtk/gtkwidget.c:2275
++#: ../gtk/gtkwidget.c:2275
+ msgid "Unvisited Link Color"
+ msgstr "Color dels enllaços no visitats"
+
+-#: gtk/gtkwidget.c:2276
++#: ../gtk/gtkwidget.c:2276
+ msgid "Color of unvisited links"
+ msgstr "El color dels enllaços que no s'hagin visitat"
+
+-#: gtk/gtkwidget.c:2289
++#: ../gtk/gtkwidget.c:2289
+ msgid "Visited Link Color"
+ msgstr "Color dels enllaços visitats"
+
+-#: gtk/gtkwidget.c:2290
++#: ../gtk/gtkwidget.c:2290
+ msgid "Color of visited links"
+ msgstr "El color dels enllaços que s'hagin visitat"
+
+-#: gtk/gtkwidget.c:2304
++#: ../gtk/gtkwidget.c:2304
+ msgid "Wide Separators"
+ msgstr "Separadors amples"
+
+-#: gtk/gtkwidget.c:2305
++#: ../gtk/gtkwidget.c:2305
+ msgid ""
+ "Whether separators have configurable width and should be drawn using a box "
+ "instead of a line"
+@@ -6739,76 +6767,76 @@
+ "Si els separadors tenen una amplada configurable, i s'haurien de dibuixar "
+ "amb una caixa enlloc d'una línia"
+
+-#: gtk/gtkwidget.c:2319
++#: ../gtk/gtkwidget.c:2319
+ msgid "Separator Width"
+ msgstr "Amplada del separador"
+
+-#: gtk/gtkwidget.c:2320
++#: ../gtk/gtkwidget.c:2320
+ msgid "The width of separators if wide-separators is TRUE"
+ msgstr "L'amplada dels separadors si «wide-separators» és CERT"
+
+-#: gtk/gtkwidget.c:2334
++#: ../gtk/gtkwidget.c:2334
+ msgid "Separator Height"
+ msgstr "Alçada del separador"
+
+-#: gtk/gtkwidget.c:2335
++#: ../gtk/gtkwidget.c:2335
+ msgid "The height of separators if \"wide-separators\" is TRUE"
+ msgstr "L'alçada dels separadors si «wide-separators» és CERT"
+
+-#: gtk/gtkwidget.c:2349
++#: ../gtk/gtkwidget.c:2349
+ msgid "Horizontal Scroll Arrow Length"
+ msgstr "Longitud de la fletxa de desplaçament horitzontal"
+
+-#: gtk/gtkwidget.c:2350
++#: ../gtk/gtkwidget.c:2350
+ msgid "The length of horizontal scroll arrows"
+ msgstr "La longitud de la fletxa de desplaçament horitzontal"
+
+-#: gtk/gtkwidget.c:2364
++#: ../gtk/gtkwidget.c:2364
+ msgid "Vertical Scroll Arrow Length"
+ msgstr "Longitud de la fletxa de desplaçament vertical"
+
+-#: gtk/gtkwidget.c:2365
++#: ../gtk/gtkwidget.c:2365
+ msgid "The length of vertical scroll arrows"
+ msgstr "La longitud de la fletxa de desplaçament vertical"
+
+-#: gtk/gtkwindow.c:464
++#: ../gtk/gtkwindow.c:464
+ msgid "Window Type"
+ msgstr "Tipus de finestra"
+
+-#: gtk/gtkwindow.c:465
++#: ../gtk/gtkwindow.c:465
+ msgid "The type of the window"
+ msgstr "El tipus de finestra"
+
+-#: gtk/gtkwindow.c:473
++#: ../gtk/gtkwindow.c:473
+ msgid "Window Title"
+ msgstr "Títol de finestra"
+
+-#: gtk/gtkwindow.c:474
++#: ../gtk/gtkwindow.c:474
+ msgid "The title of the window"
+ msgstr "El títol de finestra"
+
+-#: gtk/gtkwindow.c:481
++#: ../gtk/gtkwindow.c:481
+ msgid "Window Role"
+ msgstr "Rol de la finestra"
+
+-#: gtk/gtkwindow.c:482
++#: ../gtk/gtkwindow.c:482
+ msgid "Unique identifier for the window to be used when restoring a session"
+ msgstr "Identificador únic de la finestra a utilitzar en restaurar una sessió"
+
+-#: gtk/gtkwindow.c:498
++#: ../gtk/gtkwindow.c:498
+ msgid "Startup ID"
+ msgstr "ID d'inici"
+
+-#: gtk/gtkwindow.c:499
++#: ../gtk/gtkwindow.c:499
+ msgid "Unique startup identifier for the window used by startup-notification"
+ msgstr ""
+ "Identificador únic de la finestra utilitzada per a la notificació de l'inici"
+
+-#: gtk/gtkwindow.c:506
++#: ../gtk/gtkwindow.c:506
+ msgid "Allow Shrink"
+ msgstr "Permet encongir"
+
+-#: gtk/gtkwindow.c:508
++#: ../gtk/gtkwindow.c:508
+ #, no-c-format
+ msgid ""
+ "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the "
+@@ -6817,25 +6845,25 @@
+ "Si és CERT, la finestra no tindrà una mida mínima. Fixant-ho a CERT és el "
+ "99% del temps una mala idea"
+
+-#: gtk/gtkwindow.c:515
++#: ../gtk/gtkwindow.c:515
+ msgid "Allow Grow"
+ msgstr "Permet creixement"
+
+-#: gtk/gtkwindow.c:516
++#: ../gtk/gtkwindow.c:516
+ msgid "If TRUE, users can expand the window beyond its minimum size"
+ msgstr ""
+ "Si és CERT, els usuaris podran expandir la finestra més enllà de la seva "
+ "mida mínima"
+
+-#: gtk/gtkwindow.c:524
++#: ../gtk/gtkwindow.c:524
+ msgid "If TRUE, users can resize the window"
+ msgstr "Si és CERT, els usuaris podran redimensionar la finestra"
+
+-#: gtk/gtkwindow.c:531
++#: ../gtk/gtkwindow.c:531
+ msgid "Modal"
+ msgstr "Modal"
+
+-#: gtk/gtkwindow.c:532
++#: ../gtk/gtkwindow.c:532
+ msgid ""
+ "If TRUE, the window is modal (other windows are not usable while this one is "
+ "up)"
+@@ -6843,72 +6871,72 @@
+ "Si és CERT, la finestra serà modal (les altres finestres no es podran "
+ "utilitzar mentre aquesta estigui oberta)"
+
+-#: gtk/gtkwindow.c:539
++#: ../gtk/gtkwindow.c:539
+ msgid "Window Position"
+ msgstr "Posició de la finestra"
+
+-#: gtk/gtkwindow.c:540
++#: ../gtk/gtkwindow.c:540
+ msgid "The initial position of the window"
+ msgstr "La posició inicial de la finestra"
+
+-#: gtk/gtkwindow.c:548
++#: ../gtk/gtkwindow.c:548
+ msgid "Default Width"
+ msgstr "Amplada per defecte"
+
+-#: gtk/gtkwindow.c:549
++#: ../gtk/gtkwindow.c:549
+ msgid "The default width of the window, used when initially showing the window"
+ msgstr ""
+ "L'amplada per defecte de la finestra, utilitzada quan es mostra inicialment "
+ "la finestra"
+
+-#: gtk/gtkwindow.c:558
++#: ../gtk/gtkwindow.c:558
+ msgid "Default Height"
+ msgstr "Alçària per defecte"
+
+-#: gtk/gtkwindow.c:559
++#: ../gtk/gtkwindow.c:559
+ msgid ""
+ "The default height of the window, used when initially showing the window"
+ msgstr ""
+ "L'alçada per defecte de la finestra, utilitzada quan es mostra inicialment "
+ "la finestra"
+
+-#: gtk/gtkwindow.c:568
++#: ../gtk/gtkwindow.c:568
+ msgid "Destroy with Parent"
+ msgstr "Destrueix amb el pare"
+
+-#: gtk/gtkwindow.c:569
++#: ../gtk/gtkwindow.c:569
+ msgid "If this window should be destroyed when the parent is destroyed"
+ msgstr "Si s'hauria de destruir aquesta finestra quan es destrueixi el pare"
+
+-#: gtk/gtkwindow.c:577
++#: ../gtk/gtkwindow.c:577
+ msgid "Icon for this window"
+ msgstr "Icona per a aquesta finestra"
+
+-#: gtk/gtkwindow.c:593
++#: ../gtk/gtkwindow.c:593
+ msgid "Name of the themed icon for this window"
+ msgstr "Nom de la icona del tema per a aquesta finestra"
+
+-#: gtk/gtkwindow.c:608
++#: ../gtk/gtkwindow.c:608
+ msgid "Is Active"
+ msgstr "Està activa"
+
+-#: gtk/gtkwindow.c:609
++#: ../gtk/gtkwindow.c:609
+ msgid "Whether the toplevel is the current active window"
+ msgstr "Si el giny de nivell superior és la finestra activa actualment"
+
+-#: gtk/gtkwindow.c:616
++#: ../gtk/gtkwindow.c:616
+ msgid "Focus in Toplevel"
+ msgstr "Focus al nivell superior"
+
+-#: gtk/gtkwindow.c:617
++#: ../gtk/gtkwindow.c:617
+ msgid "Whether the input focus is within this GtkWindow"
+ msgstr "Si el focus d'entrada és en aquest GtkWindow"
+
+-#: gtk/gtkwindow.c:624
++#: ../gtk/gtkwindow.c:624
+ msgid "Type hint"
+ msgstr "Tecleja pista"
+
+-#: gtk/gtkwindow.c:625
++#: ../gtk/gtkwindow.c:625
+ msgid ""
+ "Hint to help the desktop environment understand what kind of window this is "
+ "and how to treat it."
+@@ -6916,101 +6944,101 @@
+ "Pista per ajudar l'entorn d'escriptori a entendre quin tipus de finestra és "
+ "i com tractar-la."
+
+-#: gtk/gtkwindow.c:633
++#: ../gtk/gtkwindow.c:633
+ msgid "Skip taskbar"
+ msgstr "Omet la barra de tasques"
+
+-#: gtk/gtkwindow.c:634
++#: ../gtk/gtkwindow.c:634
+ msgid "TRUE if the window should not be in the task bar."
+ msgstr "CERT si la finestra no ha de ser a la barra de tasques."
+
+-#: gtk/gtkwindow.c:641
++#: ../gtk/gtkwindow.c:641
+ msgid "Skip pager"
+ msgstr "Omet el paginador"
+
+-#: gtk/gtkwindow.c:642
++#: ../gtk/gtkwindow.c:642
+ msgid "TRUE if the window should not be in the pager."
+ msgstr "CERT si la finestra no ha de ser al paginador."
+
+-#: gtk/gtkwindow.c:649
++#: ../gtk/gtkwindow.c:649
+ msgid "Urgent"
+ msgstr "Urgent"
+
+-#: gtk/gtkwindow.c:650
++#: ../gtk/gtkwindow.c:650
+ msgid "TRUE if the window should be brought to the user's attention."
+ msgstr "CERT si la finestra no ha de captar l'atenció de l'usuari."
+
+-#: gtk/gtkwindow.c:664
++#: ../gtk/gtkwindow.c:664
+ msgid "Accept focus"
+ msgstr "Accepta el focus"
+
+-#: gtk/gtkwindow.c:665
++#: ../gtk/gtkwindow.c:665
+ msgid "TRUE if the window should receive the input focus."
+ msgstr "CERT si la finestra ha de rebre el focus d'entrada."
+
+-#: gtk/gtkwindow.c:679
++#: ../gtk/gtkwindow.c:679
+ msgid "Focus on map"
+ msgstr "Focus en mapar"
+
+-#: gtk/gtkwindow.c:680
++#: ../gtk/gtkwindow.c:680
+ msgid "TRUE if the window should receive the input focus when mapped."
+ msgstr "CERT si la finestra ha de rebre el focus d'entrada quan es mapi."
+
+ # NOTE: the window (josep)
+-#: gtk/gtkwindow.c:694
++#: ../gtk/gtkwindow.c:694
+ msgid "Decorated"
+ msgstr "Decorada"
+
+-#: gtk/gtkwindow.c:695
++#: ../gtk/gtkwindow.c:695
+ msgid "Whether the window should be decorated by the window manager"
+ msgstr "Si el gestor de finestres ha de decorar la finestra."
+
+-#: gtk/gtkwindow.c:709
++#: ../gtk/gtkwindow.c:709
+ msgid "Deletable"
+ msgstr "Suprimible"
+
+-#: gtk/gtkwindow.c:710
++#: ../gtk/gtkwindow.c:710
+ msgid "Whether the window frame should have a close button"
+ msgstr "Si el marc de la finestra ha de tenir un botó de tancar"
+
+-#: gtk/gtkwindow.c:726
++#: ../gtk/gtkwindow.c:726
+ msgid "Gravity"
+ msgstr "Gravetat"
+
+-#: gtk/gtkwindow.c:727
++#: ../gtk/gtkwindow.c:727
+ msgid "The window gravity of the window"
+ msgstr "La gravetat de finestra de la finestra"
+
+-#: gtk/gtkwindow.c:744
++#: ../gtk/gtkwindow.c:744
+ msgid "Transient for Window"
+ msgstr "Finestra transitòria"
+
+-#: gtk/gtkwindow.c:745
++#: ../gtk/gtkwindow.c:745
+ msgid "The transient parent of the dialog"
+ msgstr "El pare transitori del diàleg"
+
+-#: gtk/gtkwindow.c:759
++#: ../gtk/gtkwindow.c:759
+ msgid "Opacity for Window"
+ msgstr "Opacitat de la finestra"
+
+-#: gtk/gtkwindow.c:760
++#: ../gtk/gtkwindow.c:760
+ msgid "The opacity of the window, from 0 to 1"
+ msgstr "La opacitat de la finestra, de 0 a 1"
+
+ # ID
+-#: modules/input/gtkimcontextxim.c:334
++#: ../modules/input/gtkimcontextxim.c:334
+ msgid "IM Preedit style"
+ msgstr "Estil preedició IM"
+
+-#: modules/input/gtkimcontextxim.c:335
++#: ../modules/input/gtkimcontextxim.c:335
+ msgid "How to draw the input method preedit string"
+ msgstr "Com dibuixar la cadena de preedició del mètode d'entrada"
+
+-#: modules/input/gtkimcontextxim.c:343
++#: ../modules/input/gtkimcontextxim.c:343
+ msgid "IM Status style"
+ msgstr "Estil de l'estat IM"
+
+-#: modules/input/gtkimcontextxim.c:344
++#: ../modules/input/gtkimcontextxim.c:344
+ msgid "How to draw the input method statusbar"
+ msgstr "Com dibuixar la barra d'estat del mètode d'entrada"
+
+Index: po-properties/sv.po
+===================================================================
+--- po-properties/sv.po (revision 22076)
++++ po-properties/sv.po (revision 22450)
+@@ -1,8 +1,8 @@
+ # Swedish messages for GTK+ properties.
+-# Copyright (C) 1999-2008 Free Software Foundation, Inc.
+-# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008.
++# Copyright (C) 1999-2009 Free Software Foundation, Inc.
+ # Tomas Ögren <stric@ing.umu.se>, 1999.
+ # Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003, 2004, 2005.
++# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009.
+ #
+ # $Id: sv.po,v 1.52 2006/08/28 21:46:53 dnylande Exp $
+ #
+@@ -10,8 +10,8 @@
+ msgstr ""
+ "Project-Id-Version: gtk+ properties\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-01-07 12:13-0500\n"
+-"PO-Revision-Date: 2008-08-25 20:56+0100\n"
++"POT-Creation-Date: 2009-02-01 01:01+0100\n"
++"PO-Revision-Date: 2009-02-01 01:01+0100\n"
+ "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+ "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+ "MIME-Version: 1.0\n"
+@@ -19,6884 +19,6676 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:89
++#: ../gdk-pixbuf/gdk-pixbuf.c:89
+ msgid "Number of Channels"
+ msgstr "Antal kanaler"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:90
++#: ../gdk-pixbuf/gdk-pixbuf.c:90
+ msgid "The number of samples per pixel"
+ msgstr "Antal prov per bildpunkt"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:99
++#: ../gdk-pixbuf/gdk-pixbuf.c:99
+ msgid "Colorspace"
+ msgstr "Färgrymd"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:100
++#: ../gdk-pixbuf/gdk-pixbuf.c:100
+ msgid "The colorspace in which the samples are interpreted"
+ msgstr "Den färgrymd i vilken proven tolkas"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:108
++#: ../gdk-pixbuf/gdk-pixbuf.c:108
+ msgid "Has Alpha"
+ msgstr "Har alfa"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:109
++#: ../gdk-pixbuf/gdk-pixbuf.c:109
+ msgid "Whether the pixbuf has an alpha channel"
+ msgstr "Huruvida pixbufen har en alfakanal"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:122
++#: ../gdk-pixbuf/gdk-pixbuf.c:122
+ msgid "Bits per Sample"
+ msgstr "Bitar per prov"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:123
++#: ../gdk-pixbuf/gdk-pixbuf.c:123
+ msgid "The number of bits per sample"
+ msgstr "Antalet bitar per prov"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:132 gtk/gtklayout.c:632 gtk/gtktreeviewcolumn.c:207
++#: ../gdk-pixbuf/gdk-pixbuf.c:132
++#: ../gtk/gtklayout.c:632
++#: ../gtk/gtktreeviewcolumn.c:207
+ msgid "Width"
+ msgstr "Bredd"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:133
++#: ../gdk-pixbuf/gdk-pixbuf.c:133
+ msgid "The number of columns of the pixbuf"
+ msgstr "Antalet kolumner i pixbufen"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:142 gtk/gtklayout.c:641
++#: ../gdk-pixbuf/gdk-pixbuf.c:142
++#: ../gtk/gtklayout.c:641
+ msgid "Height"
+ msgstr "Höjd"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:143
++#: ../gdk-pixbuf/gdk-pixbuf.c:143
+ msgid "The number of rows of the pixbuf"
+ msgstr "Antalet rader i pixbufen"
+
+ # Osäker
+-#: gdk-pixbuf/gdk-pixbuf.c:159
++#: ../gdk-pixbuf/gdk-pixbuf.c:159
+ msgid "Rowstride"
+ msgstr "Radhöjd"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:160
+-msgid ""
+-"The number of bytes between the start of a row and the start of the next row"
++#: ../gdk-pixbuf/gdk-pixbuf.c:160
++msgid "The number of bytes between the start of a row and the start of the next row"
+ msgstr "Antalet byte mellan början av en rad och början på nästa rad"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:169
++#: ../gdk-pixbuf/gdk-pixbuf.c:169
+ msgid "Pixels"
+ msgstr "Bildpunkter"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:170
++#: ../gdk-pixbuf/gdk-pixbuf.c:170
+ msgid "A pointer to the pixel data of the pixbuf"
+ msgstr "En pekare till bildpunktsdata för pixbufen"
+
+-#: gdk/gdkdisplaymanager.c:103
++#: ../gdk/gdkdisplaymanager.c:103
+ msgid "Default Display"
+ msgstr "Standarddisplay"
+
+-#: gdk/gdkdisplaymanager.c:104
++#: ../gdk/gdkdisplaymanager.c:104
+ msgid "The default display for GDK"
+ msgstr "Standarddisplayen för GDK"
+
+ # Se http://bugzilla.gnome.org/show_bug.cgi?id=148437 -- detta ska vara
+ # "skärm"
+-#: gdk/gdkpango.c:490 gtk/gtkinvisible.c:86 gtk/gtkmountoperation.c:176
+-#: gtk/gtkstatusicon.c:253 gtk/gtkwindow.c:600
++#: ../gdk/gdkpango.c:490
++#: ../gtk/gtkinvisible.c:86
++#: ../gtk/gtkmountoperation.c:176
++#: ../gtk/gtkstatusicon.c:253
++#: ../gtk/gtkwindow.c:600
+ msgid "Screen"
+ msgstr "Skärm"
+
+-#: gdk/gdkpango.c:491
++#: ../gdk/gdkpango.c:491
+ msgid "the GdkScreen for the renderer"
+ msgstr "GdkScreen för renderaren"
+
+-#: gdk/gdkscreen.c:75
++#: ../gdk/gdkscreen.c:75
+ msgid "Font options"
+ msgstr "Typsnittsalternativ"
+
+-#: gdk/gdkscreen.c:76
++#: ../gdk/gdkscreen.c:76
+ msgid "The default font options for the screen"
+ msgstr "Standardtypsnittsalternativen för skärmen"
+
+-#: gdk/gdkscreen.c:83
++#: ../gdk/gdkscreen.c:83
+ msgid "Font resolution"
+ msgstr "Typsnittsupplösning"
+
+-#: gdk/gdkscreen.c:84
++#: ../gdk/gdkscreen.c:84
+ msgid "The resolution for fonts on the screen"
+ msgstr "Upplösningen för typsnitt på skärmen"
+
+-#: gtk/gtkaboutdialog.c:200
++#: ../gtk/gtkaboutdialog.c:200
+ msgid "Program name"
+ msgstr "Programnamn"
+
+-#: gtk/gtkaboutdialog.c:201
+-msgid ""
+-"The name of the program. If this is not set, it defaults to "
+-"g_get_application_name()"
+-msgstr ""
+-"Namnet på programmet. Om detta inte är angivet är standardalternativet "
+-"g_get_application_name()"
++#: ../gtk/gtkaboutdialog.c:201
++msgid "The name of the program. If this is not set, it defaults to g_get_application_name()"
++msgstr "Namnet på programmet. Om detta inte är angivet är standardalternativet g_get_application_name()"
+
+-#: gtk/gtkaboutdialog.c:215
++#: ../gtk/gtkaboutdialog.c:215
+ msgid "Program version"
+ msgstr "Programversion"
+
+-#: gtk/gtkaboutdialog.c:216
++#: ../gtk/gtkaboutdialog.c:216
+ msgid "The version of the program"
+ msgstr "Programmets version"
+
+-#: gtk/gtkaboutdialog.c:230
++#: ../gtk/gtkaboutdialog.c:230
+ msgid "Copyright string"
+ msgstr "Copyrightsträng"
+
+-#: gtk/gtkaboutdialog.c:231
++#: ../gtk/gtkaboutdialog.c:231
+ msgid "Copyright information for the program"
+ msgstr "Copyrightinformation om programmet"
+
+-#: gtk/gtkaboutdialog.c:248
++#: ../gtk/gtkaboutdialog.c:248
+ msgid "Comments string"
+ msgstr "Kommentarsträng"
+
+-#: gtk/gtkaboutdialog.c:249
++#: ../gtk/gtkaboutdialog.c:249
+ msgid "Comments about the program"
+ msgstr "Kommentarer om programmet"
+
+-#: gtk/gtkaboutdialog.c:283
++#: ../gtk/gtkaboutdialog.c:283
+ msgid "Website URL"
+ msgstr "URL till webbplats"
+
+-#: gtk/gtkaboutdialog.c:284
++#: ../gtk/gtkaboutdialog.c:284
+ msgid "The URL for the link to the website of the program"
+ msgstr "URL:en för länken till programmets webbplats"
+
+-#: gtk/gtkaboutdialog.c:300
++#: ../gtk/gtkaboutdialog.c:300
+ msgid "Website label"
+ msgstr "Webbplatsetikett"
+
+-#: gtk/gtkaboutdialog.c:301
+-msgid ""
+-"The label for the link to the website of the program. If this is not set, it "
+-"defaults to the URL"
+-msgstr ""
+-"Etiketten för länken till programmets webbplats. Om detta inte är angivet är "
+-"standardalternativet URL:en"
++#: ../gtk/gtkaboutdialog.c:301
++msgid "The label for the link to the website of the program. If this is not set, it defaults to the URL"
++msgstr "Etiketten för länken till programmets webbplats. Om detta inte är angivet är standardalternativet URL:en"
+
+-#: gtk/gtkaboutdialog.c:317
++#: ../gtk/gtkaboutdialog.c:317
+ msgid "Authors"
+ msgstr "Upphovsmän"
+
+-#: gtk/gtkaboutdialog.c:318
++#: ../gtk/gtkaboutdialog.c:318
+ msgid "List of authors of the program"
+ msgstr "Lista med programmets upphovsmän"
+
+-#: gtk/gtkaboutdialog.c:334
++#: ../gtk/gtkaboutdialog.c:334
+ msgid "Documenters"
+ msgstr "Dokumentatörer"
+
+-#: gtk/gtkaboutdialog.c:335
++#: ../gtk/gtkaboutdialog.c:335
+ msgid "List of people documenting the program"
+ msgstr "Lista med folk som dokumenterat programmet"
+
+-#: gtk/gtkaboutdialog.c:351
++#: ../gtk/gtkaboutdialog.c:351
+ msgid "Artists"
+ msgstr "Artister"
+
+-#: gtk/gtkaboutdialog.c:352
++#: ../gtk/gtkaboutdialog.c:352
+ msgid "List of people who have contributed artwork to the program"
+ msgstr "Lista med folk som har bidragit med grafik till programmet"
+
+-#: gtk/gtkaboutdialog.c:369
++#: ../gtk/gtkaboutdialog.c:369
+ msgid "Translator credits"
+ msgstr "Tack till översättare"
+
+-#: gtk/gtkaboutdialog.c:370
+-msgid ""
+-"Credits to the translators. This string should be marked as translatable"
+-msgstr ""
+-"Tack till översättarna. Denna sträng ska vara markerad för översättning"
++#: ../gtk/gtkaboutdialog.c:370
++msgid "Credits to the translators. This string should be marked as translatable"
++msgstr "Tack till översättarna. Denna sträng ska vara markerad för översättning"
+
+-#: gtk/gtkaboutdialog.c:385
++#: ../gtk/gtkaboutdialog.c:385
+ msgid "Logo"
+ msgstr "Logotyp"
+
+-#: gtk/gtkaboutdialog.c:386
+-msgid ""
+-"A logo for the about box. If this is not set, it defaults to "
+-"gtk_window_get_default_icon_list()"
+-msgstr ""
+-"En logotyp för om-rutan. Om detta inte är angivet är standardalternativet "
+-"gtk_window_get_default_icon_list()"
++#: ../gtk/gtkaboutdialog.c:386
++msgid "A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"
++msgstr "En logotyp för om-rutan. Om detta inte är angivet är standardalternativet gtk_window_get_default_icon_list()"
+
+-#: gtk/gtkaboutdialog.c:401
++#: ../gtk/gtkaboutdialog.c:401
+ msgid "Logo Icon Name"
+ msgstr "Namn på logotypikon"
+
+-#: gtk/gtkaboutdialog.c:402
++#: ../gtk/gtkaboutdialog.c:402
+ msgid "A named icon to use as the logo for the about box."
+ msgstr "En namngiven ikon att använda som logotyp för om-rutan."
+
+-#: gtk/gtkaboutdialog.c:415
++#: ../gtk/gtkaboutdialog.c:415
+ msgid "Wrap license"
+ msgstr "Radbryt licensen"
+
+-#: gtk/gtkaboutdialog.c:416
++#: ../gtk/gtkaboutdialog.c:416
+ msgid "Whether to wrap the license text."
+ msgstr "Huruvida licenstexten ska radbrytas."
+
+-#: gtk/gtkaccellabel.c:129
++#: ../gtk/gtkaccellabel.c:129
+ msgid "Accelerator Closure"
+ msgstr "Genvägsstängning"
+
+-#: gtk/gtkaccellabel.c:130
++#: ../gtk/gtkaccellabel.c:130
+ msgid "The closure to be monitored for accelerator changes"
+ msgstr "Stängningen som ska övervakas för genvägsändringar"
+
+-#: gtk/gtkaccellabel.c:136
++#: ../gtk/gtkaccellabel.c:136
+ msgid "Accelerator Widget"
+ msgstr "Genvägswidget"
+
+-#: gtk/gtkaccellabel.c:137
++#: ../gtk/gtkaccellabel.c:137
+ msgid "The widget to be monitored for accelerator changes"
+ msgstr "Widgeten som ska övervakas för genvägsändringar"
+
+-#: gtk/gtkaction.c:199 gtk/gtkactiongroup.c:170 gtk/gtkprinter.c:123
+-#: gtk/gtktextmark.c:89
++#: ../gtk/gtkaction.c:199
++#: ../gtk/gtkactiongroup.c:170
++#: ../gtk/gtkprinter.c:123
++#: ../gtk/gtktextmark.c:89
+ msgid "Name"
+ msgstr "Namn"
+
+-#: gtk/gtkaction.c:200
++#: ../gtk/gtkaction.c:200
+ msgid "A unique name for the action."
+ msgstr "Ett unikt namn för åtgärden."
+
+-#: gtk/gtkaction.c:215 gtk/gtkbutton.c:199 gtk/gtkexpander.c:195
+-#: gtk/gtkframe.c:105 gtk/gtklabel.c:316 gtk/gtktoolbutton.c:180
++#: ../gtk/gtkaction.c:215
++#: ../gtk/gtkbutton.c:199
++#: ../gtk/gtkexpander.c:195
++#: ../gtk/gtkframe.c:105
++#: ../gtk/gtklabel.c:316
++#: ../gtk/gtktoolbutton.c:180
+ msgid "Label"
+ msgstr "Etikett"
+
+-#: gtk/gtkaction.c:216
++#: ../gtk/gtkaction.c:216
+ msgid "The label used for menu items and buttons that activate this action."
+-msgstr ""
+-"Etiketten som används för menyobjekt och knappar som aktiverar denna åtgärd."
++msgstr "Etiketten som används för menyobjekt och knappar som aktiverar denna åtgärd."
+
+-#: gtk/gtkaction.c:223
++#: ../gtk/gtkaction.c:223
+ msgid "Short label"
+ msgstr "Kort etikett"
+
+-#: gtk/gtkaction.c:224
++#: ../gtk/gtkaction.c:224
+ msgid "A shorter label that may be used on toolbar buttons."
+ msgstr "En kortare etikett som kan användas på verktygsradsknappar."
+
+-#: gtk/gtkaction.c:230
++#: ../gtk/gtkaction.c:230
+ msgid "Tooltip"
+ msgstr "Verktygstips"
+
+-#: gtk/gtkaction.c:231
++#: ../gtk/gtkaction.c:231
+ msgid "A tooltip for this action."
+ msgstr "Ett verktygstips för denna åtgärd."
+
+-#: gtk/gtkaction.c:237
++#: ../gtk/gtkaction.c:237
+ msgid "Stock Icon"
+ msgstr "Standardikon"
+
+-#: gtk/gtkaction.c:238
++#: ../gtk/gtkaction.c:238
+ msgid "The stock icon displayed in widgets representing this action."
+ msgstr "Standardikonen som visas i widgetar som representerar denna åtgärd."
+
+-#: gtk/gtkaction.c:255 gtk/gtkcellrendererpixbuf.c:171 gtk/gtkimage.c:230
+-#: gtk/gtkprinter.c:172 gtk/gtkstatusicon.c:210 gtk/gtkwindow.c:592
++#: ../gtk/gtkaction.c:255
++#: ../gtk/gtkcellrendererpixbuf.c:171
++#: ../gtk/gtkimage.c:230
++#: ../gtk/gtkprinter.c:172
++#: ../gtk/gtkstatusicon.c:210
++#: ../gtk/gtkwindow.c:592
+ msgid "Icon Name"
+ msgstr "Ikonnamn"
+
+-#: gtk/gtkaction.c:256 gtk/gtkcellrendererpixbuf.c:172 gtk/gtkimage.c:231
+-#: gtk/gtkstatusicon.c:211
++#: ../gtk/gtkaction.c:256
++#: ../gtk/gtkcellrendererpixbuf.c:172
++#: ../gtk/gtkimage.c:231
++#: ../gtk/gtkstatusicon.c:211
+ msgid "The name of the icon from the icon theme"
+ msgstr "Namnet på ikonen från ikontemat"
+
+-#: gtk/gtkaction.c:262 gtk/gtktoolitem.c:156
++#: ../gtk/gtkaction.c:262
++#: ../gtk/gtktoolitem.c:156
+ msgid "Visible when horizontal"
+ msgstr "Synlig då horisontell"
+
+-#: gtk/gtkaction.c:263 gtk/gtktoolitem.c:157
+-msgid ""
+-"Whether the toolbar item is visible when the toolbar is in a horizontal "
+-"orientation."
+-msgstr ""
+-"Huruvida verktygsradsobjektet är synligt då verktygsraden är orienterad "
+-"horisontellt."
++#: ../gtk/gtkaction.c:263
++#: ../gtk/gtktoolitem.c:157
++msgid "Whether the toolbar item is visible when the toolbar is in a horizontal orientation."
++msgstr "Huruvida verktygsradsobjektet är synligt då verktygsraden är orienterad horisontellt."
+
+-#: gtk/gtkaction.c:278
++#: ../gtk/gtkaction.c:278
+ msgid "Visible when overflown"
+ msgstr "Synlig då spilld"
+
+-#: gtk/gtkaction.c:279
+-msgid ""
+-"When TRUE, toolitem proxies for this action are represented in the toolbar "
+-"overflow menu."
+-msgstr ""
+-"Då detta är SANT visas ställföreträdare för verktygsobjekt för denna åtgärd "
+-"i verktygsradens spillmeny."
++#: ../gtk/gtkaction.c:279
++msgid "When TRUE, toolitem proxies for this action are represented in the toolbar overflow menu."
++msgstr "Då detta är SANT visas ställföreträdare för verktygsobjekt för denna åtgärd i verktygsradens spillmeny."
+
+-#: gtk/gtkaction.c:286 gtk/gtktoolitem.c:163
++#: ../gtk/gtkaction.c:286
++#: ../gtk/gtktoolitem.c:163
+ msgid "Visible when vertical"
+ msgstr "Synlig då vertikal"
+
+-#: gtk/gtkaction.c:287 gtk/gtktoolitem.c:164
+-msgid ""
+-"Whether the toolbar item is visible when the toolbar is in a vertical "
+-"orientation."
+-msgstr ""
+-"Huruvida verktygsradsobjektet är synligt då verktygsraden är orienterad "
+-"vertikalt."
++#: ../gtk/gtkaction.c:287
++#: ../gtk/gtktoolitem.c:164
++msgid "Whether the toolbar item is visible when the toolbar is in a vertical orientation."
++msgstr "Huruvida verktygsradsobjektet är synligt då verktygsraden är orienterad vertikalt."
+
+-#: gtk/gtkaction.c:294 gtk/gtktoolitem.c:170
++#: ../gtk/gtkaction.c:294
++#: ../gtk/gtktoolitem.c:170
+ msgid "Is important"
+ msgstr "Är viktig"
+
+-#: gtk/gtkaction.c:295
+-msgid ""
+-"Whether the action is considered important. When TRUE, toolitem proxies for "
+-"this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
+-msgstr ""
+-"Huruvida åtgärden är viktig. Då detta är SANT visar ställföreträdare för "
+-"verktygsobjekt för denna åtgärd text i GTK_TOOLBAR_BOTH_HORIZ-läge."
++#: ../gtk/gtkaction.c:295
++msgid "Whether the action is considered important. When TRUE, toolitem proxies for this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
++msgstr "Huruvida åtgärden är viktig. Då detta är SANT visar ställföreträdare för verktygsobjekt för denna åtgärd text i GTK_TOOLBAR_BOTH_HORIZ-läge."
+
+-#: gtk/gtkaction.c:303
++#: ../gtk/gtkaction.c:303
+ msgid "Hide if empty"
+ msgstr "Dölj om tom"
+
+-#: gtk/gtkaction.c:304
++#: ../gtk/gtkaction.c:304
+ msgid "When TRUE, empty menu proxies for this action are hidden."
+ msgstr "Då detta är SANT döljs tomma menyställföreträdare för denna åtgärd."
+
+-#: gtk/gtkaction.c:310 gtk/gtkactiongroup.c:177 gtk/gtkcellrenderer.c:193
+-#: gtk/gtkwidget.c:523
++#: ../gtk/gtkaction.c:310
++#: ../gtk/gtkactiongroup.c:177
++#: ../gtk/gtkcellrenderer.c:193
++#: ../gtk/gtkwidget.c:523
+ msgid "Sensitive"
+ msgstr "Känslig"
+
+-#: gtk/gtkaction.c:311
++#: ../gtk/gtkaction.c:311
+ msgid "Whether the action is enabled."
+ msgstr "Huruvida åtgärden är aktiverad."
+
+-#: gtk/gtkaction.c:317 gtk/gtkactiongroup.c:184 gtk/gtkstatusicon.c:269
+-#: gtk/gtktreeviewcolumn.c:191 gtk/gtkwidget.c:516
++#: ../gtk/gtkaction.c:317
++#: ../gtk/gtkactiongroup.c:184
++#: ../gtk/gtkstatusicon.c:269
++#: ../gtk/gtktreeviewcolumn.c:191
++#: ../gtk/gtkwidget.c:516
+ msgid "Visible"
+ msgstr "Synlig"
+
+-#: gtk/gtkaction.c:318
++#: ../gtk/gtkaction.c:318
+ msgid "Whether the action is visible."
+ msgstr "Huruvida åtgärden är synlig."
+
+-#: gtk/gtkaction.c:324
++#: ../gtk/gtkaction.c:324
+ msgid "Action Group"
+ msgstr "Åtgärdsgrupp"
+
+-#: gtk/gtkaction.c:325
+-msgid ""
+-"The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
+-"use)."
+-msgstr ""
+-"Den GtkActionGroup som denna GtkAction är associerad med, eller NULL (för "
+-"internt bruk)."
++#: ../gtk/gtkaction.c:325
++msgid "The GtkActionGroup this GtkAction is associated with, or NULL (for internal use)."
++msgstr "Den GtkActionGroup som denna GtkAction är associerad med, eller NULL (för internt bruk)."
+
+-#: gtk/gtkactiongroup.c:171
++#: ../gtk/gtkactiongroup.c:171
+ msgid "A name for the action group."
+ msgstr "Ett namn för åtgärdsgruppen."
+
+-#: gtk/gtkactiongroup.c:178
++#: ../gtk/gtkactiongroup.c:178
+ msgid "Whether the action group is enabled."
+ msgstr "Huruvida åtgärdsgruppen är aktiverad."
+
+-#: gtk/gtkactiongroup.c:185
++#: ../gtk/gtkactiongroup.c:185
+ msgid "Whether the action group is visible."
+ msgstr "Huruvida åtgärdsgruppen är synlig."
+
+-#: gtk/gtkadjustment.c:93 gtk/gtkcellrendererprogress.c:128
+-#: gtk/gtkscalebutton.c:202 gtk/gtkspinbutton.c:269
++#: ../gtk/gtkadjustment.c:93
++#: ../gtk/gtkcellrendererprogress.c:128
++#: ../gtk/gtkscalebutton.c:202
++#: ../gtk/gtkspinbutton.c:269
+ msgid "Value"
+ msgstr "Värde"
+
+-#: gtk/gtkadjustment.c:94
++#: ../gtk/gtkadjustment.c:94
+ msgid "The value of the adjustment"
+ msgstr "Värdet på justeringen"
+
+-#: gtk/gtkadjustment.c:110
++#: ../gtk/gtkadjustment.c:110
+ msgid "Minimum Value"
+ msgstr "Minsta värde"
+
+-#: gtk/gtkadjustment.c:111
++#: ../gtk/gtkadjustment.c:111
+ msgid "The minimum value of the adjustment"
+ msgstr "Minsta värdet på justeringen"
+
+-#: gtk/gtkadjustment.c:130
++#: ../gtk/gtkadjustment.c:130
+ msgid "Maximum Value"
+ msgstr "Största värde"
+
+-#: gtk/gtkadjustment.c:131
++#: ../gtk/gtkadjustment.c:131
+ msgid "The maximum value of the adjustment"
+ msgstr "Största värdet på justeringen"
+
+-#: gtk/gtkadjustment.c:147
++#: ../gtk/gtkadjustment.c:147
+ msgid "Step Increment"
+ msgstr "Stegökning"
+
+-#: gtk/gtkadjustment.c:148
++#: ../gtk/gtkadjustment.c:148
+ msgid "The step increment of the adjustment"
+ msgstr "Stegökningen på justeringen"
+
+-#: gtk/gtkadjustment.c:164
++#: ../gtk/gtkadjustment.c:164
+ msgid "Page Increment"
+ msgstr "Sidökning"
+
+-#: gtk/gtkadjustment.c:165
++#: ../gtk/gtkadjustment.c:165
+ msgid "The page increment of the adjustment"
+ msgstr "Sidökningen på justeringen"
+
+-#: gtk/gtkadjustment.c:184
++#: ../gtk/gtkadjustment.c:184
+ msgid "Page Size"
+ msgstr "Sidstorlek"
+
+-#: gtk/gtkadjustment.c:185
++#: ../gtk/gtkadjustment.c:185
+ msgid "The page size of the adjustment"
+ msgstr "Sidstorleken på justeringen"
+
+-#: gtk/gtkalignment.c:90
++#: ../gtk/gtkalignment.c:90
+ msgid "Horizontal alignment"
+ msgstr "Horisontell justering"
+
+-#: gtk/gtkalignment.c:91 gtk/gtkbutton.c:250
+-msgid ""
+-"Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
+-"right aligned"
+-msgstr ""
+-"Horisontell position av barnet i tillgängligt utrymme. 0,0 är "
+-"vänsterjusterat, 1,0 är högerjusterat"
++#: ../gtk/gtkalignment.c:91
++#: ../gtk/gtkbutton.c:250
++msgid "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"
++msgstr "Horisontell position av barnet i tillgängligt utrymme. 0,0 är vänsterjusterat, 1,0 är högerjusterat"
+
+-#: gtk/gtkalignment.c:100
++#: ../gtk/gtkalignment.c:100
+ msgid "Vertical alignment"
+ msgstr "Vertikal justering"
+
+-#: gtk/gtkalignment.c:101 gtk/gtkbutton.c:269
+-msgid ""
+-"Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
+-"bottom aligned"
+-msgstr ""
+-"Vertikal position av barnet i tillgängligt utrymme. 0,0 är "
+-"överkantsjusterat, 1,0 är nederkantsjusterat"
++#: ../gtk/gtkalignment.c:101
++#: ../gtk/gtkbutton.c:269
++msgid "Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"
++msgstr "Vertikal position av barnet i tillgängligt utrymme. 0,0 är överkantsjusterat, 1,0 är nederkantsjusterat"
+
+-#: gtk/gtkalignment.c:109
++#: ../gtk/gtkalignment.c:109
+ msgid "Horizontal scale"
+ msgstr "Horisontell skala"
+
+-#: gtk/gtkalignment.c:110
+-msgid ""
+-"If available horizontal space is bigger than needed for the child, how much "
+-"of it to use for the child. 0.0 means none, 1.0 means all"
+-msgstr ""
+-"Om tillgängligt horisontellt utrymme är större än vad som krävs för barnet, "
+-"är detta hur mycket av det som ska användas för barnet. 0,0 betyder inget, "
+-"1,0 betyder allt"
++#: ../gtk/gtkalignment.c:110
++msgid "If available horizontal space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"
++msgstr "Om tillgängligt horisontellt utrymme är större än vad som krävs för barnet, är detta hur mycket av det som ska användas för barnet. 0,0 betyder inget, 1,0 betyder allt"
+
+-#: gtk/gtkalignment.c:118
++#: ../gtk/gtkalignment.c:118
+ msgid "Vertical scale"
+ msgstr "Vertikal skala"
+
+-#: gtk/gtkalignment.c:119
+-msgid ""
+-"If available vertical space is bigger than needed for the child, how much of "
+-"it to use for the child. 0.0 means none, 1.0 means all"
+-msgstr ""
+-"Om tillgängligt vertikalt utrymme är större än vad som krävs för barnet, är "
+-"detta hur mycket av det som ska användas för barnet. 0,0 betyder inget, 1,0 "
+-"betyder allt"
++#: ../gtk/gtkalignment.c:119
++msgid "If available vertical space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"
++msgstr "Om tillgängligt vertikalt utrymme är större än vad som krävs för barnet, är detta hur mycket av det som ska användas för barnet. 0,0 betyder inget, 1,0 betyder allt"
+
+-#: gtk/gtkalignment.c:136
++#: ../gtk/gtkalignment.c:136
+ msgid "Top Padding"
+ msgstr "Överkantsutfyllnad"
+
+-#: gtk/gtkalignment.c:137
++#: ../gtk/gtkalignment.c:137
+ msgid "The padding to insert at the top of the widget."
+ msgstr "Den utfyllnad som ska infogas överst i widgeten."
+
+-#: gtk/gtkalignment.c:153
++#: ../gtk/gtkalignment.c:153
+ msgid "Bottom Padding"
+ msgstr "Nederkantsutfyllnad"
+
+-#: gtk/gtkalignment.c:154
++#: ../gtk/gtkalignment.c:154
+ msgid "The padding to insert at the bottom of the widget."
+ msgstr "Den utfyllnad som ska infogas nederst i widgeten."
+
+-#: gtk/gtkalignment.c:170
++#: ../gtk/gtkalignment.c:170
+ msgid "Left Padding"
+ msgstr "Vänsterutfyllnad"
+
+-#: gtk/gtkalignment.c:171
++#: ../gtk/gtkalignment.c:171
+ msgid "The padding to insert at the left of the widget."
+ msgstr "Den utfyllnad som ska infogas till vänster om widgeten."
+
+-#: gtk/gtkalignment.c:187
++#: ../gtk/gtkalignment.c:187
+ msgid "Right Padding"
+ msgstr "Högerutfyllnad"
+
+-#: gtk/gtkalignment.c:188
++#: ../gtk/gtkalignment.c:188
+ msgid "The padding to insert at the right of the widget."
+ msgstr "Den utfyllnad som ska infogas till höger om widgeten."
+
+-#: gtk/gtkarrow.c:75
++#: ../gtk/gtkarrow.c:75
+ msgid "Arrow direction"
+ msgstr "Pilriktning"
+
+-#: gtk/gtkarrow.c:76
++#: ../gtk/gtkarrow.c:76
+ msgid "The direction the arrow should point"
+ msgstr "Riktningen som pilen ska peka"
+
+-#: gtk/gtkarrow.c:84
++#: ../gtk/gtkarrow.c:84
+ msgid "Arrow shadow"
+ msgstr "Pilskugga"
+
+-#: gtk/gtkarrow.c:85
++#: ../gtk/gtkarrow.c:85
+ msgid "Appearance of the shadow surrounding the arrow"
+ msgstr "Utseende på skuggan som omger pilen"
+
+-#: gtk/gtkarrow.c:92 gtk/gtkmenuitem.c:276
++#: ../gtk/gtkarrow.c:92
++#: ../gtk/gtkmenuitem.c:276
+ msgid "Arrow Scaling"
+ msgstr "Pilskalning"
+
+-#: gtk/gtkarrow.c:93
++#: ../gtk/gtkarrow.c:93
+ msgid "Amount of space used up by arrow"
+ msgstr "Mängd utrymme som används av pil"
+
+-#: gtk/gtkaspectframe.c:79
++#: ../gtk/gtkaspectframe.c:79
+ msgid "Horizontal Alignment"
+ msgstr "Horisontell justering"
+
+-#: gtk/gtkaspectframe.c:80
++#: ../gtk/gtkaspectframe.c:80
+ msgid "X alignment of the child"
+ msgstr "X-justering av barnet"
+
+-#: gtk/gtkaspectframe.c:86
++#: ../gtk/gtkaspectframe.c:86
+ msgid "Vertical Alignment"
+ msgstr "Vertikal justering"
+
+-#: gtk/gtkaspectframe.c:87
++#: ../gtk/gtkaspectframe.c:87
+ msgid "Y alignment of the child"
+ msgstr "Y-justering av barnet"
+
+-#: gtk/gtkaspectframe.c:93
++#: ../gtk/gtkaspectframe.c:93
+ msgid "Ratio"
+ msgstr "Förhållande"
+
+-#: gtk/gtkaspectframe.c:94
++#: ../gtk/gtkaspectframe.c:94
+ msgid "Aspect ratio if obey_child is FALSE"
+ msgstr "Proportionsförhållande om obey_child är FALSKT"
+
+-#: gtk/gtkaspectframe.c:100
++#: ../gtk/gtkaspectframe.c:100
+ msgid "Obey child"
+ msgstr "Lyd barn"
+
+-#: gtk/gtkaspectframe.c:101
++#: ../gtk/gtkaspectframe.c:101
+ msgid "Force aspect ratio to match that of the frame's child"
+ msgstr "Tvinga proportionsförhållande för att matcha den av ramens barn"
+
+-#: gtk/gtkassistant.c:261
++#: ../gtk/gtkassistant.c:261
+ msgid "Header Padding"
+ msgstr "Huvudutfyllnad"
+
+-#: gtk/gtkassistant.c:262
++#: ../gtk/gtkassistant.c:262
+ msgid "Number of pixels around the header."
+ msgstr "Antal bildpunkter runt huvudet."
+
+-#: gtk/gtkassistant.c:269
++#: ../gtk/gtkassistant.c:269
+ msgid "Content Padding"
+ msgstr "Innehållsutfyllnad"
+
+-#: gtk/gtkassistant.c:270
++#: ../gtk/gtkassistant.c:270
+ msgid "Number of pixels around the content pages."
+ msgstr "Antal bildpunkter runt innehållssidorna."
+
+-#: gtk/gtkassistant.c:286
++#: ../gtk/gtkassistant.c:286
+ msgid "Page type"
+ msgstr "Sidtyp"
+
+-#: gtk/gtkassistant.c:287
++#: ../gtk/gtkassistant.c:287
+ msgid "The type of the assistant page"
+ msgstr "Typen för guidesidan"
+
+-#: gtk/gtkassistant.c:304
++#: ../gtk/gtkassistant.c:304
+ msgid "Page title"
+ msgstr "Sidtitel"
+
+-#: gtk/gtkassistant.c:305
++#: ../gtk/gtkassistant.c:305
+ msgid "The title of the assistant page"
+ msgstr "Titeln på guidesidan"
+
+-#: gtk/gtkassistant.c:321
++#: ../gtk/gtkassistant.c:321
+ msgid "Header image"
+ msgstr "Huvudbild"
+
+-#: gtk/gtkassistant.c:322
++#: ../gtk/gtkassistant.c:322
+ msgid "Header image for the assistant page"
+ msgstr "Huvudbild för guidesidan"
+
+-#: gtk/gtkassistant.c:338
++#: ../gtk/gtkassistant.c:338
+ msgid "Sidebar image"
+ msgstr "Sidopanelsbild"
+
+-#: gtk/gtkassistant.c:339
++#: ../gtk/gtkassistant.c:339
+ msgid "Sidebar image for the assistant page"
+ msgstr "Sidopanelsbild för guidesidan"
+
+-#: gtk/gtkassistant.c:354
++#: ../gtk/gtkassistant.c:354
+ msgid "Page complete"
+ msgstr "Sida komplett"
+
+-#: gtk/gtkassistant.c:355
++#: ../gtk/gtkassistant.c:355
+ msgid "Whether all required fields on the page have been filled out"
+ msgstr "Huruvida alla nödvändiga fält på sidan har fyllts i"
+
+-#: gtk/gtkbbox.c:91
++#: ../gtk/gtkbbox.c:91
+ msgid "Minimum child width"
+ msgstr "Minsta bredd på barn"
+
+-#: gtk/gtkbbox.c:92
++#: ../gtk/gtkbbox.c:92
+ msgid "Minimum width of buttons inside the box"
+ msgstr "Minsta bredd på knappar inuti rutan"
+
+-#: gtk/gtkbbox.c:100
++#: ../gtk/gtkbbox.c:100
+ msgid "Minimum child height"
+ msgstr "Minsta höjd på barn"
+
+-#: gtk/gtkbbox.c:101
++#: ../gtk/gtkbbox.c:101
+ msgid "Minimum height of buttons inside the box"
+ msgstr "Minsta höjd på knappar inuti rutan"
+
+-#: gtk/gtkbbox.c:109
++#: ../gtk/gtkbbox.c:109
+ msgid "Child internal width padding"
+ msgstr "Intern utfyllnad i bredd runt barn"
+
+-#: gtk/gtkbbox.c:110
++#: ../gtk/gtkbbox.c:110
+ msgid "Amount to increase child's size on either side"
+ msgstr "Mängd att öka barns storlek på var sida"
+
+-#: gtk/gtkbbox.c:118
++#: ../gtk/gtkbbox.c:118
+ msgid "Child internal height padding"
+ msgstr "Intern utfyllnad i höjd runt barn"
+
+-#: gtk/gtkbbox.c:119
++#: ../gtk/gtkbbox.c:119
+ msgid "Amount to increase child's size on the top and bottom"
+ msgstr "Mängd att öka barns storlek överst och nederst"
+
+-#: gtk/gtkbbox.c:127
++#: ../gtk/gtkbbox.c:127
+ msgid "Layout style"
+ msgstr "Utseendestil"
+
+-#: gtk/gtkbbox.c:128
+-msgid ""
+-"How to layout the buttons in the box. Possible values are default, spread, "
+-"edge, start and end"
+-msgstr ""
+-"Hur knappar ska placeras ut i rutan. Möjliga värden är standard, spridd, "
+-"kant, start och slut"
++#: ../gtk/gtkbbox.c:128
++msgid "How to layout the buttons in the box. Possible values are default, spread, edge, start and end"
++msgstr "Hur knappar ska placeras ut i rutan. Möjliga värden är standard, spridd, kant, start och slut"
+
+-#: gtk/gtkbbox.c:136
++#: ../gtk/gtkbbox.c:136
+ msgid "Secondary"
+ msgstr "Sekundär"
+
+-#: gtk/gtkbbox.c:137
+-msgid ""
+-"If TRUE, the child appears in a secondary group of children, suitable for, e."
+-"g., help buttons"
+-msgstr ""
+-"Om SANT kommer barnet att visas i en sekundär grupp med barn. Användbart "
+-"exempelvis för hjälpknappar"
++#: ../gtk/gtkbbox.c:137
++msgid "If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons"
++msgstr "Om SANT kommer barnet att visas i en sekundär grupp med barn. Användbart exempelvis för hjälpknappar"
+
+-#: gtk/gtkbox.c:98 gtk/gtkexpander.c:219 gtk/gtkiconview.c:666
+-#: gtk/gtktreeviewcolumn.c:216
++#: ../gtk/gtkbox.c:98
++#: ../gtk/gtkexpander.c:219
++#: ../gtk/gtkiconview.c:666
++#: ../gtk/gtktreeviewcolumn.c:216
+ msgid "Spacing"
+ msgstr "Utrymme"
+
+-#: gtk/gtkbox.c:99
++#: ../gtk/gtkbox.c:99
+ msgid "The amount of space between children"
+ msgstr "Mängden utrymme mellan barn"
+
+-#: gtk/gtkbox.c:108 gtk/gtknotebook.c:649 gtk/gtktable.c:165
+-#: gtk/gtktoolbar.c:580
++#: ../gtk/gtkbox.c:108
++#: ../gtk/gtknotebook.c:649
++#: ../gtk/gtktable.c:165
++#: ../gtk/gtktoolbar.c:580
+ msgid "Homogeneous"
+ msgstr "Homogena"
+
+-#: gtk/gtkbox.c:109
++#: ../gtk/gtkbox.c:109
+ msgid "Whether the children should all be the same size"
+ msgstr "Huruvida barnen allihop ska vara av samma storlek"
+
+-#: gtk/gtkbox.c:116 gtk/gtkpreview.c:101 gtk/gtktoolbar.c:572
+-#: gtk/gtktreeviewcolumn.c:272
++#: ../gtk/gtkbox.c:116
++#: ../gtk/gtkpreview.c:101
++#: ../gtk/gtktoolbar.c:572
++#: ../gtk/gtktreeviewcolumn.c:272
+ msgid "Expand"
+ msgstr "Expandera"
+
+-#: gtk/gtkbox.c:117
++#: ../gtk/gtkbox.c:117
+ msgid "Whether the child should receive extra space when the parent grows"
+ msgstr "Huruvida barnet ska få extra utrymme när föräldern växer"
+
+-#: gtk/gtkbox.c:123
++#: ../gtk/gtkbox.c:123
+ msgid "Fill"
+ msgstr "Fyll"
+
+-#: gtk/gtkbox.c:124
+-msgid ""
+-"Whether extra space given to the child should be allocated to the child or "
+-"used as padding"
+-msgstr ""
+-"Huruvida extra utrymme som ges till barnet ska allokeras till barnet eller "
+-"användas som utfyllnad"
++#: ../gtk/gtkbox.c:124
++msgid "Whether extra space given to the child should be allocated to the child or used as padding"
++msgstr "Huruvida extra utrymme som ges till barnet ska allokeras till barnet eller användas som utfyllnad"
+
+-#: gtk/gtkbox.c:130
++#: ../gtk/gtkbox.c:130
+ msgid "Padding"
+ msgstr "Utfyllnad"
+
+-#: gtk/gtkbox.c:131
++#: ../gtk/gtkbox.c:131
+ msgid "Extra space to put between the child and its neighbors, in pixels"
+-msgstr ""
+-"Extra utrymme att placera mellan barnet och dess grannar, i bildpunkter"
++msgstr "Extra utrymme att placera mellan barnet och dess grannar, i bildpunkter"
+
+-#: gtk/gtkbox.c:137
++#: ../gtk/gtkbox.c:137
+ msgid "Pack type"
+ msgstr "Packningstyp"
+
+-#: gtk/gtkbox.c:138 gtk/gtknotebook.c:716
+-msgid ""
+-"A GtkPackType indicating whether the child is packed with reference to the "
+-"start or end of the parent"
+-msgstr ""
+-"En GtkPackType som indikerar huruvida barnet packas med avseende på början "
+-"eller slutet på föräldern"
++#: ../gtk/gtkbox.c:138
++#: ../gtk/gtknotebook.c:716
++msgid "A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"
++msgstr "En GtkPackType som indikerar huruvida barnet packas med avseende på början eller slutet på föräldern"
+
+-#: gtk/gtkbox.c:144 gtk/gtknotebook.c:694 gtk/gtkpaned.c:218
+-#: gtk/gtkruler.c:110
++#: ../gtk/gtkbox.c:144
++#: ../gtk/gtknotebook.c:694
++#: ../gtk/gtkpaned.c:218
++#: ../gtk/gtkruler.c:110
+ msgid "Position"
+ msgstr "Position"
+
+-#: gtk/gtkbox.c:145 gtk/gtknotebook.c:695
++#: ../gtk/gtkbox.c:145
++#: ../gtk/gtknotebook.c:695
+ msgid "The index of the child in the parent"
+ msgstr "Indexet för barnet i föräldern"
+
+-#: gtk/gtkbuilder.c:96
++#: ../gtk/gtkbuilder.c:96
+ msgid "Translation Domain"
+ msgstr "Översättningsdomän"
+
+-#: gtk/gtkbuilder.c:97
++#: ../gtk/gtkbuilder.c:97
+ msgid "The translation domain used by gettext"
+ msgstr "Översättningsdomänen som används av gettext"
+
+-#: gtk/gtkbutton.c:200
+-msgid ""
+-"Text of the label widget inside the button, if the button contains a label "
+-"widget"
+-msgstr ""
+-"Texten på etikettwidgeten inuti knappen, om knappen innehåller en "
+-"etikettwidget"
++#: ../gtk/gtkbutton.c:200
++msgid "Text of the label widget inside the button, if the button contains a label widget"
++msgstr "Texten på etikettwidgeten inuti knappen, om knappen innehåller en etikettwidget"
+
+-#: gtk/gtkbutton.c:207 gtk/gtkexpander.c:203 gtk/gtklabel.c:337
+-#: gtk/gtktoolbutton.c:187
++#: ../gtk/gtkbutton.c:207
++#: ../gtk/gtkexpander.c:203
++#: ../gtk/gtklabel.c:337
++#: ../gtk/gtktoolbutton.c:187
+ msgid "Use underline"
+ msgstr "Använd understrykning"
+
+-#: gtk/gtkbutton.c:208 gtk/gtkexpander.c:204 gtk/gtklabel.c:338
+-msgid ""
+-"If set, an underline in the text indicates the next character should be used "
+-"for the mnemonic accelerator key"
+-msgstr ""
+-"Om detta är angivet kommer en understrykning i texten att indikera att nästa "
+-"tecken ska användas som en genvägstangent"
++#: ../gtk/gtkbutton.c:208
++#: ../gtk/gtkexpander.c:204
++#: ../gtk/gtklabel.c:338
++msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
++msgstr "Om detta är angivet kommer en understrykning i texten att indikera att nästa tecken ska användas som en genvägstangent"
+
+-#: gtk/gtkbutton.c:215
++#: ../gtk/gtkbutton.c:215
+ msgid "Use stock"
+ msgstr "Använd standard"
+
+-#: gtk/gtkbutton.c:216
+-msgid ""
+-"If set, the label is used to pick a stock item instead of being displayed"
+-msgstr ""
+-"Om detta är angivet kommer etiketten att användas för att plocka ett "
+-"standardobjekt istället för att visas"
++#: ../gtk/gtkbutton.c:216
++msgid "If set, the label is used to pick a stock item instead of being displayed"
++msgstr "Om detta är angivet kommer etiketten att användas för att plocka ett standardobjekt istället för att visas"
+
+-#: gtk/gtkbutton.c:223 gtk/gtkcombobox.c:789 gtk/gtkfilechooserbutton.c:393
++#: ../gtk/gtkbutton.c:223
++#: ../gtk/gtkcombobox.c:789
++#: ../gtk/gtkfilechooserbutton.c:393
+ msgid "Focus on click"
+ msgstr "Fokusera vid klick"
+
+-#: gtk/gtkbutton.c:224 gtk/gtkfilechooserbutton.c:394
++#: ../gtk/gtkbutton.c:224
++#: ../gtk/gtkfilechooserbutton.c:394
+ msgid "Whether the button grabs focus when it is clicked with the mouse"
+ msgstr "Huruvida knappen tar fokus när den klickas på med musen"
+
+-#: gtk/gtkbutton.c:231
++#: ../gtk/gtkbutton.c:231
+ msgid "Border relief"
+ msgstr "Kantrelief"
+
+-#: gtk/gtkbutton.c:232
++#: ../gtk/gtkbutton.c:232
+ msgid "The border relief style"
+ msgstr "Reliefstilen på kanten"
+
+-#: gtk/gtkbutton.c:249
++#: ../gtk/gtkbutton.c:249
+ msgid "Horizontal alignment for child"
+ msgstr "Horisontell justering för barn"
+
+-#: gtk/gtkbutton.c:268
++#: ../gtk/gtkbutton.c:268
+ msgid "Vertical alignment for child"
+ msgstr "Vertikal justering för barn"
+
+-#: gtk/gtkbutton.c:285 gtk/gtkimagemenuitem.c:100
++#: ../gtk/gtkbutton.c:285
++#: ../gtk/gtkimagemenuitem.c:100
+ msgid "Image widget"
+ msgstr "Bildwidget"
+
+-#: gtk/gtkbutton.c:286
++#: ../gtk/gtkbutton.c:286
+ msgid "Child widget to appear next to the button text"
+ msgstr "Barnwidget att visa bredvid knapptexten"
+
+-#: gtk/gtkbutton.c:300
++#: ../gtk/gtkbutton.c:300
+ msgid "Image position"
+ msgstr "Bildposition"
+
+-#: gtk/gtkbutton.c:301
++#: ../gtk/gtkbutton.c:301
+ msgid "The position of the image relative to the text"
+ msgstr "Position på bilden relativ till texten"
+
+-#: gtk/gtkbutton.c:410
++#: ../gtk/gtkbutton.c:410
+ msgid "Default Spacing"
+ msgstr "Standardutrymme"
+
+-#: gtk/gtkbutton.c:411
++#: ../gtk/gtkbutton.c:411
+ msgid "Extra space to add for CAN_DEFAULT buttons"
+ msgstr "Extra utrymme att lägga till för alla CAN_DEFAULT-knappar"
+
+-#: gtk/gtkbutton.c:417
++#: ../gtk/gtkbutton.c:417
+ msgid "Default Outside Spacing"
+ msgstr "Standardutrymme på utsidan"
+
+-#: gtk/gtkbutton.c:418
+-msgid ""
+-"Extra space to add for CAN_DEFAULT buttons that is always drawn outside the "
+-"border"
+-msgstr ""
+-"Extra utrymme att lägga till för CAN_DEFAULT-knappar som alltid visas "
+-"utanför kanten"
++#: ../gtk/gtkbutton.c:418
++msgid "Extra space to add for CAN_DEFAULT buttons that is always drawn outside the border"
++msgstr "Extra utrymme att lägga till för CAN_DEFAULT-knappar som alltid visas utanför kanten"
+
+-#: gtk/gtkbutton.c:423
++#: ../gtk/gtkbutton.c:423
+ msgid "Child X Displacement"
+ msgstr "X-förflyttning av barn"
+
+-#: gtk/gtkbutton.c:424
+-msgid ""
+-"How far in the x direction to move the child when the button is depressed"
++#: ../gtk/gtkbutton.c:424
++msgid "How far in the x direction to move the child when the button is depressed"
+ msgstr "Hur långt bort i x-riktingen barnet ska flyttas då knappen trycks ned"
+
+-#: gtk/gtkbutton.c:431
++#: ../gtk/gtkbutton.c:431
+ msgid "Child Y Displacement"
+ msgstr "Y-förflyttning av barn"
+
+-#: gtk/gtkbutton.c:432
+-msgid ""
+-"How far in the y direction to move the child when the button is depressed"
++#: ../gtk/gtkbutton.c:432
++msgid "How far in the y direction to move the child when the button is depressed"
+ msgstr "Hur långt bort i y-riktningen barnet ska flyttas då knappen trycks ned"
+
+-#: gtk/gtkbutton.c:448
++#: ../gtk/gtkbutton.c:448
+ msgid "Displace focus"
+ msgstr "Förflytta fokus"
+
+-#: gtk/gtkbutton.c:449
+-msgid ""
+-"Whether the child_displacement_x/_y properties should also affect the focus "
+-"rectangle"
+-msgstr ""
+-"Huruvida egenskaperna child_displacement_x/_y även ska påverka "
+-"fokusrektangeln"
++#: ../gtk/gtkbutton.c:449
++msgid "Whether the child_displacement_x/_y properties should also affect the focus rectangle"
++msgstr "Huruvida egenskaperna child_displacement_x/_y även ska påverka fokusrektangeln"
+
+-#: gtk/gtkbutton.c:462 gtk/gtkentry.c:539 gtk/gtkentry.c:932
++#: ../gtk/gtkbutton.c:462
++#: ../gtk/gtkentry.c:539
++#: ../gtk/gtkentry.c:932
+ msgid "Inner Border"
+ msgstr "Inre kant"
+
+-#: gtk/gtkbutton.c:463
++#: ../gtk/gtkbutton.c:463
+ msgid "Border between button edges and child."
+ msgstr "Kant mellan knappsidor och barn."
+
+-#: gtk/gtkbutton.c:476
++#: ../gtk/gtkbutton.c:476
+ msgid "Image spacing"
+ msgstr "Bildutrymme"
+
+-#: gtk/gtkbutton.c:477
++#: ../gtk/gtkbutton.c:477
+ msgid "Spacing in pixels between the image and label"
+ msgstr "Utrymme att placera mellan bilden och etiketten (i bildpunkter)"
+
+-#: gtk/gtkbutton.c:491
++#: ../gtk/gtkbutton.c:491
+ msgid "Show button images"
+ msgstr "Visa knappbilder"
+
+-#: gtk/gtkbutton.c:492
++#: ../gtk/gtkbutton.c:492
+ msgid "Whether images should be shown on buttons"
+ msgstr "Huruvida bilder ska visas på knappar"
+
+-#: gtk/gtkcalendar.c:440
++#: ../gtk/gtkcalendar.c:440
+ msgid "Year"
+ msgstr "År"
+
+-#: gtk/gtkcalendar.c:441
++#: ../gtk/gtkcalendar.c:441
+ msgid "The selected year"
+ msgstr "Det markerade året"
+
+-#: gtk/gtkcalendar.c:454
++#: ../gtk/gtkcalendar.c:454
+ msgid "Month"
+ msgstr "Månad"
+
+-#: gtk/gtkcalendar.c:455
++#: ../gtk/gtkcalendar.c:455
+ msgid "The selected month (as a number between 0 and 11)"
+ msgstr "Den markerade månaden (som ett tal mellan 0 och 11)"
+
+-#: gtk/gtkcalendar.c:469
++#: ../gtk/gtkcalendar.c:469
+ msgid "Day"
+ msgstr "Dag"
+
+-#: gtk/gtkcalendar.c:470
+-msgid ""
+-"The selected day (as a number between 1 and 31, or 0 to unselect the "
+-"currently selected day)"
+-msgstr ""
+-"Den markerade dagen (som ett tal mellan 1 och 31, eller 0 för att avmarkera "
+-"den för tillfället markerade dagen)"
++#: ../gtk/gtkcalendar.c:470
++msgid "The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"
++msgstr "Den markerade dagen (som ett tal mellan 1 och 31, eller 0 för att avmarkera den för tillfället markerade dagen)"
+
+-#: gtk/gtkcalendar.c:484
++#: ../gtk/gtkcalendar.c:484
+ msgid "Show Heading"
+ msgstr "Visa tabellhuvud"
+
+-#: gtk/gtkcalendar.c:485
++#: ../gtk/gtkcalendar.c:485
+ msgid "If TRUE, a heading is displayed"
+ msgstr "Om SANT visas ett tabellhuvud"
+
+-#: gtk/gtkcalendar.c:499
++#: ../gtk/gtkcalendar.c:499
+ msgid "Show Day Names"
+ msgstr "Visa dagsnamn"
+
+-#: gtk/gtkcalendar.c:500
++#: ../gtk/gtkcalendar.c:500
+ msgid "If TRUE, day names are displayed"
+ msgstr "Om SANT visas dagsnamn"
+
+-#: gtk/gtkcalendar.c:513
++#: ../gtk/gtkcalendar.c:513
+ msgid "No Month Change"
+ msgstr "Ingen månadsändring"
+
+-#: gtk/gtkcalendar.c:514
++#: ../gtk/gtkcalendar.c:514
+ msgid "If TRUE, the selected month cannot be changed"
+ msgstr "Om SANT kan den markerade månaden inte ändras"
+
+-#: gtk/gtkcalendar.c:528
++#: ../gtk/gtkcalendar.c:528
+ msgid "Show Week Numbers"
+ msgstr "Visa veckonummer"
+
+-#: gtk/gtkcalendar.c:529
++#: ../gtk/gtkcalendar.c:529
+ msgid "If TRUE, week numbers are displayed"
+ msgstr "Om SANT visas veckonummer"
+
+-#: gtk/gtkcalendar.c:544
++#: ../gtk/gtkcalendar.c:544
+ msgid "Details Width"
+ msgstr "Bredd för detaljer"
+
+-#: gtk/gtkcalendar.c:545
++#: ../gtk/gtkcalendar.c:545
+ msgid "Details width in characters"
+ msgstr "Bredd för detaljer, i tecken"
+
+-#: gtk/gtkcalendar.c:560
++#: ../gtk/gtkcalendar.c:560
+ msgid "Details Height"
+ msgstr "Höjd för detaljer"
+
+-#: gtk/gtkcalendar.c:561
++#: ../gtk/gtkcalendar.c:561
+ msgid "Details height in rows"
+ msgstr "Höjd för detaljer, i rader"
+
+-#: gtk/gtkcalendar.c:577
++#: ../gtk/gtkcalendar.c:577
+ msgid "Show Details"
+ msgstr "Visa detaljer"
+
+-#: gtk/gtkcalendar.c:578
++#: ../gtk/gtkcalendar.c:578
+ msgid "If TRUE, details are shown"
+ msgstr "Om SANT visas detaljer"
+
+-#: gtk/gtkcellrenderer.c:177
++#: ../gtk/gtkcellrenderer.c:177
+ msgid "mode"
+ msgstr "läge"
+
+-#: gtk/gtkcellrenderer.c:178
++#: ../gtk/gtkcellrenderer.c:178
+ msgid "Editable mode of the CellRenderer"
+ msgstr "Redigerbart läge för CellRenderer"
+
+-#: gtk/gtkcellrenderer.c:186
++#: ../gtk/gtkcellrenderer.c:186
+ msgid "visible"
+ msgstr "synlig"
+
+-#: gtk/gtkcellrenderer.c:187
++#: ../gtk/gtkcellrenderer.c:187
+ msgid "Display the cell"
+ msgstr "Visa cellen"
+
+-#: gtk/gtkcellrenderer.c:194
++#: ../gtk/gtkcellrenderer.c:194
+ msgid "Display the cell sensitive"
+ msgstr "Visa cellen som känslig"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcellrenderer.c:201
++#: ../gtk/gtkcellrenderer.c:201
+ msgid "xalign"
+ msgstr "x-justering"
+
+-#: gtk/gtkcellrenderer.c:202
++#: ../gtk/gtkcellrenderer.c:202
+ msgid "The x-align"
+ msgstr "X-justeringen"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcellrenderer.c:211
++#: ../gtk/gtkcellrenderer.c:211
+ msgid "yalign"
+ msgstr "y-justering"
+
+-#: gtk/gtkcellrenderer.c:212
++#: ../gtk/gtkcellrenderer.c:212
+ msgid "The y-align"
+ msgstr "Y-justeringen"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcellrenderer.c:221
++#: ../gtk/gtkcellrenderer.c:221
+ msgid "xpad"
+ msgstr "x-utfyllnad"
+
+-#: gtk/gtkcellrenderer.c:222
++#: ../gtk/gtkcellrenderer.c:222
+ msgid "The xpad"
+ msgstr "X-utfyllnaden"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcellrenderer.c:231
++#: ../gtk/gtkcellrenderer.c:231
+ msgid "ypad"
+ msgstr "y-utfyllnad"
+
+-#: gtk/gtkcellrenderer.c:232
++#: ../gtk/gtkcellrenderer.c:232
+ msgid "The ypad"
+ msgstr "Y-utfyllnaden"
+
+-#: gtk/gtkcellrenderer.c:241
++#: ../gtk/gtkcellrenderer.c:241
+ msgid "width"
+ msgstr "bredd"
+
+-#: gtk/gtkcellrenderer.c:242
++#: ../gtk/gtkcellrenderer.c:242
+ msgid "The fixed width"
+ msgstr "Den fasta bredden"
+
+-#: gtk/gtkcellrenderer.c:251
++#: ../gtk/gtkcellrenderer.c:251
+ msgid "height"
+ msgstr "höjd"
+
+-#: gtk/gtkcellrenderer.c:252
++#: ../gtk/gtkcellrenderer.c:252
+ msgid "The fixed height"
+ msgstr "Den fasta höjden"
+
+-#: gtk/gtkcellrenderer.c:261
++#: ../gtk/gtkcellrenderer.c:261
+ msgid "Is Expander"
+ msgstr "Är expanderare"
+
+-#: gtk/gtkcellrenderer.c:262
++#: ../gtk/gtkcellrenderer.c:262
+ msgid "Row has children"
+ msgstr "Rad har barn"
+
+-#: gtk/gtkcellrenderer.c:270
++#: ../gtk/gtkcellrenderer.c:270
+ msgid "Is Expanded"
+ msgstr "Är expanderad"
+
+-#: gtk/gtkcellrenderer.c:271
++#: ../gtk/gtkcellrenderer.c:271
+ msgid "Row is an expander row, and is expanded"
+ msgstr "Raden är en expanderingsrad, och är expanderad"
+
+-#: gtk/gtkcellrenderer.c:278
++#: ../gtk/gtkcellrenderer.c:278
+ msgid "Cell background color name"
+ msgstr "Namn på cellbakgrundsfärg"
+
+-#: gtk/gtkcellrenderer.c:279
++#: ../gtk/gtkcellrenderer.c:279
+ msgid "Cell background color as a string"
+ msgstr "Cellbakgrundsfärg som en sträng"
+
+-#: gtk/gtkcellrenderer.c:286
++#: ../gtk/gtkcellrenderer.c:286
+ msgid "Cell background color"
+ msgstr "Cellbakgrundsfärg"
+
+-#: gtk/gtkcellrenderer.c:287
++#: ../gtk/gtkcellrenderer.c:287
+ msgid "Cell background color as a GdkColor"
+ msgstr "Cellbakgrundsfärg som en GdkColor"
+
+-#: gtk/gtkcellrenderer.c:294
++#: ../gtk/gtkcellrenderer.c:294
+ msgid "Editing"
+ msgstr "Redigering"
+
+-#: gtk/gtkcellrenderer.c:295
++#: ../gtk/gtkcellrenderer.c:295
+ msgid "Whether the cell renderer is currently in editing mode"
+ msgstr "Huruvida cellrenderaren för närvarande är i redigeringsläge"
+
+-#: gtk/gtkcellrenderer.c:303
++#: ../gtk/gtkcellrenderer.c:303
+ msgid "Cell background set"
+ msgstr "Cellbakgrund inställd"
+
+-#: gtk/gtkcellrenderer.c:304
++#: ../gtk/gtkcellrenderer.c:304
+ msgid "Whether this tag affects the cell background color"
+ msgstr "Huruvida denna tagg påverkar cellbakgrundsfärgen"
+
+-#: gtk/gtkcellrendereraccel.c:104
++#: ../gtk/gtkcellrendereraccel.c:104
+ msgid "Accelerator key"
+ msgstr "Snabbtangent"
+
+-#: gtk/gtkcellrendereraccel.c:105
++#: ../gtk/gtkcellrendereraccel.c:105
+ msgid "The keyval of the accelerator"
+ msgstr "Nyckelvärdet för snabbtangenten"
+
+-#: gtk/gtkcellrendereraccel.c:121
++#: ../gtk/gtkcellrendereraccel.c:121
+ msgid "Accelerator modifiers"
+ msgstr "Genvägsmodiferare"
+
+-#: gtk/gtkcellrendereraccel.c:122
++#: ../gtk/gtkcellrendereraccel.c:122
+ msgid "The modifier mask of the accelerator"
+ msgstr "Modifierarmasken för genvägen"
+
+-#: gtk/gtkcellrendereraccel.c:139
++#: ../gtk/gtkcellrendereraccel.c:139
+ msgid "Accelerator keycode"
+ msgstr "Genvägstangentkod"
+
+-#: gtk/gtkcellrendereraccel.c:140
++#: ../gtk/gtkcellrendereraccel.c:140
+ msgid "The hardware keycode of the accelerator"
+ msgstr "Hårdvarutangentkoden för genvägen"
+
+-#: gtk/gtkcellrendereraccel.c:159
++#: ../gtk/gtkcellrendereraccel.c:159
+ msgid "Accelerator Mode"
+ msgstr "Genvägsläge"
+
+-#: gtk/gtkcellrendereraccel.c:160
++#: ../gtk/gtkcellrendereraccel.c:160
+ msgid "The type of accelerators"
+ msgstr "Typen av genvägar"
+
+-#: gtk/gtkcellrenderercombo.c:107
++#: ../gtk/gtkcellrenderercombo.c:107
+ msgid "Model"
+ msgstr "Modell"
+
+-#: gtk/gtkcellrenderercombo.c:108
++#: ../gtk/gtkcellrenderercombo.c:108
+ msgid "The model containing the possible values for the combo box"
+ msgstr "Modellen som innehåller de möjliga värdena för kombinationsrutan"
+
+-#: gtk/gtkcellrenderercombo.c:130 gtk/gtkcomboboxentry.c:106
++#: ../gtk/gtkcellrenderercombo.c:130
++#: ../gtk/gtkcomboboxentry.c:106
+ msgid "Text Column"
+ msgstr "Textkolumn"
+
+-#: gtk/gtkcellrenderercombo.c:131 gtk/gtkcomboboxentry.c:107
++#: ../gtk/gtkcellrenderercombo.c:131
++#: ../gtk/gtkcomboboxentry.c:107
+ msgid "A column in the data source model to get the strings from"
+ msgstr "En kolumn i datakällmodellen att hämta strängar från"
+
+-#: gtk/gtkcellrenderercombo.c:148
++#: ../gtk/gtkcellrenderercombo.c:148
+ msgid "Has Entry"
+ msgstr "Har post"
+
+-#: gtk/gtkcellrenderercombo.c:149
++#: ../gtk/gtkcellrenderercombo.c:149
+ msgid "If FALSE, don't allow to enter strings other than the chosen ones"
+-msgstr ""
+-"Om detta är FALSKT kommer det inte att vara tillåtet att ange andra strängar "
+-"än de utvalda"
++msgstr "Om detta är FALSKT kommer det inte att vara tillåtet att ange andra strängar än de utvalda"
+
+-#: gtk/gtkcellrendererpixbuf.c:111
++#: ../gtk/gtkcellrendererpixbuf.c:111
+ msgid "Pixbuf Object"
+ msgstr "Pixbuf-objekt"
+
+-#: gtk/gtkcellrendererpixbuf.c:112
++#: ../gtk/gtkcellrendererpixbuf.c:112
+ msgid "The pixbuf to render"
+ msgstr "Pixbuf:en att rendera"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcellrendererpixbuf.c:119
++#: ../gtk/gtkcellrendererpixbuf.c:119
+ msgid "Pixbuf Expander Open"
+ msgstr "Pixbuf-expanderare, öppen"
+
+-#: gtk/gtkcellrendererpixbuf.c:120
++#: ../gtk/gtkcellrendererpixbuf.c:120
+ msgid "Pixbuf for open expander"
+ msgstr "Pixbuf för öppen expanderare"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcellrendererpixbuf.c:127
++#: ../gtk/gtkcellrendererpixbuf.c:127
+ msgid "Pixbuf Expander Closed"
+ msgstr "Pixbuf-expanderare, stängd"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcellrendererpixbuf.c:128
++#: ../gtk/gtkcellrendererpixbuf.c:128
+ msgid "Pixbuf for closed expander"
+ msgstr "Pixbuf för stängd expanderare"
+
+-#: gtk/gtkcellrendererpixbuf.c:135 gtk/gtkimage.c:172 gtk/gtkstatusicon.c:202
++#: ../gtk/gtkcellrendererpixbuf.c:135
++#: ../gtk/gtkimage.c:172
++#: ../gtk/gtkstatusicon.c:202
+ msgid "Stock ID"
+ msgstr "Standard-ID"
+
+-#: gtk/gtkcellrendererpixbuf.c:136
++#: ../gtk/gtkcellrendererpixbuf.c:136
+ msgid "The stock ID of the stock icon to render"
+ msgstr "Standard-ID på standardikonen att rendera"
+
+-#: gtk/gtkcellrendererpixbuf.c:143 gtk/gtkrecentmanager.c:245
+-#: gtk/gtkstatusicon.c:243
++#: ../gtk/gtkcellrendererpixbuf.c:143
++#: ../gtk/gtkrecentmanager.c:245
++#: ../gtk/gtkstatusicon.c:243
+ msgid "Size"
+ msgstr "Storlek"
+
+-#: gtk/gtkcellrendererpixbuf.c:144
++#: ../gtk/gtkcellrendererpixbuf.c:144
+ msgid "The GtkIconSize value that specifies the size of the rendered icon"
+ msgstr "Det GtkIconSize-värde som anger storleken på den renderade ikonen"
+
+-#: gtk/gtkcellrendererpixbuf.c:153
++#: ../gtk/gtkcellrendererpixbuf.c:153
+ msgid "Detail"
+ msgstr "Detalj"
+
+-#: gtk/gtkcellrendererpixbuf.c:154
++#: ../gtk/gtkcellrendererpixbuf.c:154
+ msgid "Render detail to pass to the theme engine"
+ msgstr "Renderingsdetalj att skicka till temamotorn"
+
+-#: gtk/gtkcellrendererpixbuf.c:187
++#: ../gtk/gtkcellrendererpixbuf.c:187
+ msgid "Follow State"
+ msgstr "Följ tillstånd"
+
+-#: gtk/gtkcellrendererpixbuf.c:188
++#: ../gtk/gtkcellrendererpixbuf.c:188
+ msgid "Whether the rendered pixbuf should be colorized according to the state"
+ msgstr "Huruvida den renderade pixbufen ska färgsättas enligt tillståndet"
+
+-#: gtk/gtkcellrendererpixbuf.c:205 gtk/gtkimage.c:247 gtk/gtkwindow.c:576
++#: ../gtk/gtkcellrendererpixbuf.c:205
++#: ../gtk/gtkimage.c:247
++#: ../gtk/gtkwindow.c:576
+ msgid "Icon"
+ msgstr "Ikon"
+
+-#: gtk/gtkcellrendererpixbuf.c:206 gtk/gtkimage.c:248 gtk/gtkstatusicon.c:227
++#: ../gtk/gtkcellrendererpixbuf.c:206
++#: ../gtk/gtkimage.c:248
++#: ../gtk/gtkstatusicon.c:227
+ msgid "The GIcon being displayed"
+ msgstr "GIcon som visas"
+
+-#: gtk/gtkcellrendererprogress.c:129
++#: ../gtk/gtkcellrendererprogress.c:129
+ msgid "Value of the progress bar"
+ msgstr "Värde på förloppsmätaren"
+
+-#: gtk/gtkcellrendererprogress.c:146 gtk/gtkcellrenderertext.c:195
+-#: gtk/gtkentry.c:582 gtk/gtkmessagedialog.c:153 gtk/gtkprogressbar.c:184
+-#: gtk/gtktextbuffer.c:197
++#: ../gtk/gtkcellrendererprogress.c:146
++#: ../gtk/gtkcellrenderertext.c:195
++#: ../gtk/gtkentry.c:582
++#: ../gtk/gtkmessagedialog.c:153
++#: ../gtk/gtkprogressbar.c:184
++#: ../gtk/gtktextbuffer.c:197
+ msgid "Text"
+ msgstr "Text"
+
+-#: gtk/gtkcellrendererprogress.c:147
++#: ../gtk/gtkcellrendererprogress.c:147
+ msgid "Text on the progress bar"
+ msgstr "Text på förloppsmätaren"
+
+-#: gtk/gtkcellrendererprogress.c:170
++#: ../gtk/gtkcellrendererprogress.c:170
+ msgid "Pulse"
+ msgstr "Puls"
+
+-#: gtk/gtkcellrendererprogress.c:171
+-msgid ""
+-"Set this to positive values to indicate that some progress is made, but you "
+-"don't know how much."
+-msgstr ""
+-"Ställ in den här till positiva värden för att indikera att förloppet "
+-"ändrats, men du vet inte hur mycket."
++#: ../gtk/gtkcellrendererprogress.c:171
++msgid "Set this to positive values to indicate that some progress is made, but you don't know how much."
++msgstr "Ställ in den här till positiva värden för att indikera att förloppet ändrats, men du vet inte hur mycket."
+
+-#: gtk/gtkcellrendererprogress.c:187 gtk/gtkprogress.c:118
++#: ../gtk/gtkcellrendererprogress.c:187
++#: ../gtk/gtkprogress.c:118
+ msgid "Text x alignment"
+ msgstr "X-justering för text"
+
+-#: gtk/gtkcellrendererprogress.c:188 gtk/gtkprogress.c:119
+-msgid ""
+-"The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
+-"layouts."
+-msgstr ""
+-"Den horisontella textjusteringen, från 0 (vänster) till 1 (höger). Omvänd "
+-"för höger-till-vänster-layouter."
++#: ../gtk/gtkcellrendererprogress.c:188
++#: ../gtk/gtkprogress.c:119
++msgid "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
++msgstr "Den horisontella textjusteringen, från 0 (vänster) till 1 (höger). Omvänd för höger-till-vänster-layouter."
+
+-#: gtk/gtkcellrendererprogress.c:204 gtk/gtkprogress.c:125
++#: ../gtk/gtkcellrendererprogress.c:204
++#: ../gtk/gtkprogress.c:125
+ msgid "Text y alignment"
+ msgstr "Y-justering för text"
+
+-#: gtk/gtkcellrendererprogress.c:205 gtk/gtkprogress.c:126
++#: ../gtk/gtkcellrendererprogress.c:205
++#: ../gtk/gtkprogress.c:126
+ msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
+ msgstr "Den vertikala textjusteringen, från 0 (överst) till 1 (nederst)."
+
+-#: gtk/gtkcellrendererprogress.c:221 gtk/gtkiconview.c:731
+-#: gtk/gtkprogressbar.c:126 gtk/gtkscalebutton.c:193 gtk/gtkstatusicon.c:301
+-#: gtk/gtktoolbar.c:492 gtk/gtktrayicon-x11.c:95
++#: ../gtk/gtkcellrendererprogress.c:221
++#: ../gtk/gtkiconview.c:731
++#: ../gtk/gtkprogressbar.c:126
++#: ../gtk/gtkscalebutton.c:193
++#: ../gtk/gtkstatusicon.c:301
++#: ../gtk/gtktoolbar.c:492
++#: ../gtk/gtktrayicon-x11.c:95
+ msgid "Orientation"
+ msgstr "Orientering"
+
+-#: gtk/gtkcellrendererprogress.c:222 gtk/gtkprogressbar.c:127
++#: ../gtk/gtkcellrendererprogress.c:222
++#: ../gtk/gtkprogressbar.c:127
+ msgid "Orientation and growth direction of the progress bar"
+ msgstr "Orientering och tillväxtriktning för förloppsmätaren"
+
+-#: gtk/gtkcellrendererspin.c:93 gtk/gtkprogressbar.c:118 gtk/gtkrange.c:346
+-#: gtk/gtkscalebutton.c:221 gtk/gtkspinbutton.c:208
++#: ../gtk/gtkcellrendererspin.c:93
++#: ../gtk/gtkprogressbar.c:118
++#: ../gtk/gtkrange.c:346
++#: ../gtk/gtkscalebutton.c:221
++#: ../gtk/gtkspinbutton.c:208
+ msgid "Adjustment"
+ msgstr "Justering"
+
+-#: gtk/gtkcellrendererspin.c:94
++#: ../gtk/gtkcellrendererspin.c:94
+ msgid "The adjustment that holds the value of the spinbutton."
+ msgstr "Justeringen som håller värdet på snurrknappen."
+
+-#: gtk/gtkcellrendererspin.c:109
++#: ../gtk/gtkcellrendererspin.c:109
+ msgid "Climb rate"
+ msgstr "Klättringsfrekvens"
+
+-#: gtk/gtkcellrendererspin.c:110 gtk/gtkspinbutton.c:217
++#: ../gtk/gtkcellrendererspin.c:110
++#: ../gtk/gtkspinbutton.c:217
+ msgid "The acceleration rate when you hold down a button"
+ msgstr "Accelerationen då du trycker ned en knapp"
+
+-#: gtk/gtkcellrendererspin.c:123 gtk/gtkscale.c:142 gtk/gtkspinbutton.c:226
++#: ../gtk/gtkcellrendererspin.c:123
++#: ../gtk/gtkscale.c:142
++#: ../gtk/gtkspinbutton.c:226
+ msgid "Digits"
+ msgstr "Siffror"
+
+-#: gtk/gtkcellrendererspin.c:124 gtk/gtkspinbutton.c:227
++#: ../gtk/gtkcellrendererspin.c:124
++#: ../gtk/gtkspinbutton.c:227
+ msgid "The number of decimal places to display"
+ msgstr "Antalet siffror att visas"
+
+-#: gtk/gtkcellrenderertext.c:196
++#: ../gtk/gtkcellrenderertext.c:196
+ msgid "Text to render"
+ msgstr "Text att rendera"
+
+-#: gtk/gtkcellrenderertext.c:203
++#: ../gtk/gtkcellrenderertext.c:203
+ msgid "Markup"
+ msgstr "Markup"
+
+-#: gtk/gtkcellrenderertext.c:204
++#: ../gtk/gtkcellrenderertext.c:204
+ msgid "Marked up text to render"
+ msgstr "Markup-text att rendera"
+
+-#: gtk/gtkcellrenderertext.c:211 gtk/gtklabel.c:323
++#: ../gtk/gtkcellrenderertext.c:211
++#: ../gtk/gtklabel.c:323
+ msgid "Attributes"
+ msgstr "Attribut"
+
+-#: gtk/gtkcellrenderertext.c:212
++#: ../gtk/gtkcellrenderertext.c:212
+ msgid "A list of style attributes to apply to the text of the renderer"
+ msgstr "En lista med stilattribut att applicera på texten av renderaren"
+
+-#: gtk/gtkcellrenderertext.c:219
++#: ../gtk/gtkcellrenderertext.c:219
+ msgid "Single Paragraph Mode"
+ msgstr "Enkelstyckesläge"
+
+-#: gtk/gtkcellrenderertext.c:220
++#: ../gtk/gtkcellrenderertext.c:220
+ msgid "Whether or not to keep all text in a single paragraph"
+ msgstr "Huruvida all text ska vara i ett enda stycke eller inte"
+
+-#: gtk/gtkcellrenderertext.c:228 gtk/gtkcellview.c:160 gtk/gtktexttag.c:183
++#: ../gtk/gtkcellrenderertext.c:228
++#: ../gtk/gtkcellview.c:160
++#: ../gtk/gtktexttag.c:183
+ msgid "Background color name"
+ msgstr "Namn på bakgrundsfärg"
+
+-#: gtk/gtkcellrenderertext.c:229 gtk/gtkcellview.c:161 gtk/gtktexttag.c:184
++#: ../gtk/gtkcellrenderertext.c:229
++#: ../gtk/gtkcellview.c:161
++#: ../gtk/gtktexttag.c:184
+ msgid "Background color as a string"
+ msgstr "Bakgrundsfärg som en sträng"
+
+-#: gtk/gtkcellrenderertext.c:236 gtk/gtkcellview.c:167 gtk/gtktexttag.c:191
++#: ../gtk/gtkcellrenderertext.c:236
++#: ../gtk/gtkcellview.c:167
++#: ../gtk/gtktexttag.c:191
+ msgid "Background color"
+ msgstr "Bakgrundsfärg"
+
+-#: gtk/gtkcellrenderertext.c:237 gtk/gtkcellview.c:168
++#: ../gtk/gtkcellrenderertext.c:237
++#: ../gtk/gtkcellview.c:168
+ msgid "Background color as a GdkColor"
+ msgstr "Bakgrundsfärg som en GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:244 gtk/gtktexttag.c:217
++#: ../gtk/gtkcellrenderertext.c:244
++#: ../gtk/gtktexttag.c:217
+ msgid "Foreground color name"
+ msgstr "Namn på förgrundsfärg"
+
+-#: gtk/gtkcellrenderertext.c:245 gtk/gtktexttag.c:218
++#: ../gtk/gtkcellrenderertext.c:245
++#: ../gtk/gtktexttag.c:218
+ msgid "Foreground color as a string"
+ msgstr "Förgrundsfärg som en sträng"
+
+-#: gtk/gtkcellrenderertext.c:252 gtk/gtktexttag.c:225
++#: ../gtk/gtkcellrenderertext.c:252
++#: ../gtk/gtktexttag.c:225
+ msgid "Foreground color"
+ msgstr "Förgrundsfärg"
+
+-#: gtk/gtkcellrenderertext.c:253
++#: ../gtk/gtkcellrenderertext.c:253
+ msgid "Foreground color as a GdkColor"
+ msgstr "Förgrundsfärg som en GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:261 gtk/gtkentry.c:506 gtk/gtktexttag.c:251
+-#: gtk/gtktextview.c:568
++#: ../gtk/gtkcellrenderertext.c:261
++#: ../gtk/gtkentry.c:506
++#: ../gtk/gtktexttag.c:251
++#: ../gtk/gtktextview.c:568
+ msgid "Editable"
+ msgstr "Redigerbar"
+
+-#: gtk/gtkcellrenderertext.c:262 gtk/gtktexttag.c:252 gtk/gtktextview.c:569
++#: ../gtk/gtkcellrenderertext.c:262
++#: ../gtk/gtktexttag.c:252
++#: ../gtk/gtktextview.c:569
+ msgid "Whether the text can be modified by the user"
+ msgstr "Huruvida texten kan ändras av användaren"
+
+-#: gtk/gtkcellrenderertext.c:269 gtk/gtkcellrenderertext.c:277
+-#: gtk/gtkfontsel.c:188 gtk/gtktexttag.c:267 gtk/gtktexttag.c:275
++#: ../gtk/gtkcellrenderertext.c:269
++#: ../gtk/gtkcellrenderertext.c:277
++#: ../gtk/gtkfontsel.c:188
++#: ../gtk/gtktexttag.c:267
++#: ../gtk/gtktexttag.c:275
+ msgid "Font"
+ msgstr "Typsnitt"
+
+-#: gtk/gtkcellrenderertext.c:270 gtk/gtktexttag.c:268
++#: ../gtk/gtkcellrenderertext.c:270
++#: ../gtk/gtktexttag.c:268
+ msgid "Font description as a string, e.g. \"Sans Italic 12\""
+ msgstr "Typsnittsbeskrivning som en sträng, t.ex. \"Sans Italic 12\""
+
+-#: gtk/gtkcellrenderertext.c:278 gtk/gtktexttag.c:276
++#: ../gtk/gtkcellrenderertext.c:278
++#: ../gtk/gtktexttag.c:276
+ msgid "Font description as a PangoFontDescription struct"
+ msgstr "Typsnittsbeskrivning som en PangoFontDescription-struct"
+
+-#: gtk/gtkcellrenderertext.c:286 gtk/gtktexttag.c:283
++#: ../gtk/gtkcellrenderertext.c:286
++#: ../gtk/gtktexttag.c:283
+ msgid "Font family"
+ msgstr "Typsnittsfamilj"
+
+-#: gtk/gtkcellrenderertext.c:287 gtk/gtktexttag.c:284
++#: ../gtk/gtkcellrenderertext.c:287
++#: ../gtk/gtktexttag.c:284
+ msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
+-msgstr ""
+-"Namn på typsnittsfamiljen, till exempel Sans, Helvetica, Times, Monospace"
++msgstr "Namn på typsnittsfamiljen, till exempel Sans, Helvetica, Times, Monospace"
+
+-#: gtk/gtkcellrenderertext.c:294 gtk/gtkcellrenderertext.c:295
+-#: gtk/gtktexttag.c:291
++#: ../gtk/gtkcellrenderertext.c:294
++#: ../gtk/gtkcellrenderertext.c:295
++#: ../gtk/gtktexttag.c:291
+ msgid "Font style"
+ msgstr "Typsnittsstil"
+
+-#: gtk/gtkcellrenderertext.c:303 gtk/gtkcellrenderertext.c:304
+-#: gtk/gtktexttag.c:300
++#: ../gtk/gtkcellrenderertext.c:303
++#: ../gtk/gtkcellrenderertext.c:304
++#: ../gtk/gtktexttag.c:300
+ msgid "Font variant"
+ msgstr "Typsnittsvariant"
+
+-#: gtk/gtkcellrenderertext.c:312 gtk/gtkcellrenderertext.c:313
+-#: gtk/gtktexttag.c:309
++#: ../gtk/gtkcellrenderertext.c:312
++#: ../gtk/gtkcellrenderertext.c:313
++#: ../gtk/gtktexttag.c:309
+ msgid "Font weight"
+ msgstr "Typsnittsvikt"
+
+-#: gtk/gtkcellrenderertext.c:322 gtk/gtkcellrenderertext.c:323
+-#: gtk/gtktexttag.c:320
++#: ../gtk/gtkcellrenderertext.c:322
++#: ../gtk/gtkcellrenderertext.c:323
++#: ../gtk/gtktexttag.c:320
+ msgid "Font stretch"
+ msgstr "Typsnittsbredd"
+
+-#: gtk/gtkcellrenderertext.c:331 gtk/gtkcellrenderertext.c:332
+-#: gtk/gtktexttag.c:329
++#: ../gtk/gtkcellrenderertext.c:331
++#: ../gtk/gtkcellrenderertext.c:332
++#: ../gtk/gtktexttag.c:329
+ msgid "Font size"
+ msgstr "Typsnittsstorlek"
+
+-#: gtk/gtkcellrenderertext.c:341 gtk/gtktexttag.c:349
++#: ../gtk/gtkcellrenderertext.c:341
++#: ../gtk/gtktexttag.c:349
+ msgid "Font points"
+ msgstr "Typsnittspunkter"
+
+-#: gtk/gtkcellrenderertext.c:342 gtk/gtktexttag.c:350
++#: ../gtk/gtkcellrenderertext.c:342
++#: ../gtk/gtktexttag.c:350
+ msgid "Font size in points"
+ msgstr "Typsnittsstorlek i punkter"
+
+-#: gtk/gtkcellrenderertext.c:351 gtk/gtktexttag.c:339
++#: ../gtk/gtkcellrenderertext.c:351
++#: ../gtk/gtktexttag.c:339
+ msgid "Font scale"
+ msgstr "Typsnittsskalning"
+
+-#: gtk/gtkcellrenderertext.c:352
++#: ../gtk/gtkcellrenderertext.c:352
+ msgid "Font scaling factor"
+ msgstr "Typsnittsskalfaktor"
+
+-#: gtk/gtkcellrenderertext.c:361 gtk/gtktexttag.c:418
++#: ../gtk/gtkcellrenderertext.c:361
++#: ../gtk/gtktexttag.c:418
+ msgid "Rise"
+ msgstr "Höjning"
+
+-#: gtk/gtkcellrenderertext.c:362
+-msgid ""
+-"Offset of text above the baseline (below the baseline if rise is negative)"
+-msgstr ""
+-"Avstånd för texten ovanför baslinjen (nedanför baslinjen om höjning är "
+-"negativt)"
++#: ../gtk/gtkcellrenderertext.c:362
++msgid "Offset of text above the baseline (below the baseline if rise is negative)"
++msgstr "Avstånd för texten ovanför baslinjen (nedanför baslinjen om höjning är negativt)"
+
+-#: gtk/gtkcellrenderertext.c:373 gtk/gtktexttag.c:458
++#: ../gtk/gtkcellrenderertext.c:373
++#: ../gtk/gtktexttag.c:458
+ msgid "Strikethrough"
+ msgstr "Genomstrykning"
+
+-#: gtk/gtkcellrenderertext.c:374 gtk/gtktexttag.c:459
++#: ../gtk/gtkcellrenderertext.c:374
++#: ../gtk/gtktexttag.c:459
+ msgid "Whether to strike through the text"
+ msgstr "Huruvida texten ska genomstrykas"
+
+-#: gtk/gtkcellrenderertext.c:381 gtk/gtktexttag.c:466
++#: ../gtk/gtkcellrenderertext.c:381
++#: ../gtk/gtktexttag.c:466
+ msgid "Underline"
+ msgstr "Understruken"
+
+-#: gtk/gtkcellrenderertext.c:382 gtk/gtktexttag.c:467
++#: ../gtk/gtkcellrenderertext.c:382
++#: ../gtk/gtktexttag.c:467
+ msgid "Style of underline for this text"
+ msgstr "Stil på understrykningen för denna text"
+
+-#: gtk/gtkcellrenderertext.c:390 gtk/gtktexttag.c:378
++#: ../gtk/gtkcellrenderertext.c:390
++#: ../gtk/gtktexttag.c:378
+ msgid "Language"
+ msgstr "Språk"
+
+-#: gtk/gtkcellrenderertext.c:391
+-msgid ""
+-"The language this text is in, as an ISO code. Pango can use this as a hint "
+-"when rendering the text. If you don't understand this parameter, you "
+-"probably don't need it"
+-msgstr ""
+-"Språket som denna text är i, angivet som ISO-kod. Pango kan använda detta "
+-"som ett tips vid rendering av text. Om du inte förstår denna parameter "
+-"behöver du den troligtvis inte"
++#: ../gtk/gtkcellrenderertext.c:391
++msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it"
++msgstr "Språket som denna text är i, angivet som ISO-kod. Pango kan använda detta som ett tips vid rendering av text. Om du inte förstår denna parameter behöver du den troligtvis inte"
+
+-#: gtk/gtkcellrenderertext.c:411 gtk/gtklabel.c:448 gtk/gtkprogressbar.c:206
++#: ../gtk/gtkcellrenderertext.c:411
++#: ../gtk/gtklabel.c:448
++#: ../gtk/gtkprogressbar.c:206
+ msgid "Ellipsize"
+ msgstr "Elliptisera"
+
+-#: gtk/gtkcellrenderertext.c:412
+-msgid ""
+-"The preferred place to ellipsize the string, if the cell renderer does not "
+-"have enough room to display the entire string"
+-msgstr ""
+-"Den föredragna platsen att elliptisera strängen, om cellrenderaren inte har "
+-"tillräckligt med utrymme för att visa hela strängen"
++#: ../gtk/gtkcellrenderertext.c:412
++msgid "The preferred place to ellipsize the string, if the cell renderer does not have enough room to display the entire string"
++msgstr "Den föredragna platsen att elliptisera strängen, om cellrenderaren inte har tillräckligt med utrymme för att visa hela strängen"
+
+-#: gtk/gtkcellrenderertext.c:431 gtk/gtkfilechooserbutton.c:421
+-#: gtk/gtklabel.c:468
++#: ../gtk/gtkcellrenderertext.c:431
++#: ../gtk/gtkfilechooserbutton.c:421
++#: ../gtk/gtklabel.c:468
+ msgid "Width In Characters"
+ msgstr "Bredd i antal tecken"
+
+-#: gtk/gtkcellrenderertext.c:432 gtk/gtklabel.c:469
++#: ../gtk/gtkcellrenderertext.c:432
++#: ../gtk/gtklabel.c:469
+ msgid "The desired width of the label, in characters"
+ msgstr "Den önskade bredden på etiketten, i antal tecken"
+
+-#: gtk/gtkcellrenderertext.c:450 gtk/gtktexttag.c:475
++#: ../gtk/gtkcellrenderertext.c:450
++#: ../gtk/gtktexttag.c:475
+ msgid "Wrap mode"
+ msgstr "Automatisk radbrytning"
+
+-#: gtk/gtkcellrenderertext.c:451
+-msgid ""
+-"How to break the string into multiple lines, if the cell renderer does not "
+-"have enough room to display the entire string"
+-msgstr ""
+-"Hur strängen ska delas upp i flera rader, om cellrenderaren inte har "
+-"tillräckligt med utrymme för att visa hela strängen"
++#: ../gtk/gtkcellrenderertext.c:451
++msgid "How to break the string into multiple lines, if the cell renderer does not have enough room to display the entire string"
++msgstr "Hur strängen ska delas upp i flera rader, om cellrenderaren inte har tillräckligt med utrymme för att visa hela strängen"
+
+-#: gtk/gtkcellrenderertext.c:470 gtk/gtkcombobox.c:678
++#: ../gtk/gtkcellrenderertext.c:470
++#: ../gtk/gtkcombobox.c:678
+ msgid "Wrap width"
+ msgstr "Radbrytningsbredd"
+
+-#: gtk/gtkcellrenderertext.c:471
++#: ../gtk/gtkcellrenderertext.c:471
+ msgid "The width at which the text is wrapped"
+ msgstr "Bredden på vilken texten radbryts"
+
+-#: gtk/gtkcellrenderertext.c:491 gtk/gtktreeviewcolumn.c:297
++#: ../gtk/gtkcellrenderertext.c:491
++#: ../gtk/gtktreeviewcolumn.c:297
+ msgid "Alignment"
+ msgstr "Justering"
+
+-#: gtk/gtkcellrenderertext.c:492
++#: ../gtk/gtkcellrenderertext.c:492
+ msgid "How to align the lines"
+ msgstr "Hur rader ska justeras"
+
+-#: gtk/gtkcellrenderertext.c:502 gtk/gtkcellview.c:190 gtk/gtktexttag.c:564
++#: ../gtk/gtkcellrenderertext.c:502
++#: ../gtk/gtkcellview.c:190
++#: ../gtk/gtktexttag.c:564
+ msgid "Background set"
+ msgstr "Bakgrund inställd"
+
+-#: gtk/gtkcellrenderertext.c:503 gtk/gtkcellview.c:191 gtk/gtktexttag.c:565
++#: ../gtk/gtkcellrenderertext.c:503
++#: ../gtk/gtkcellview.c:191
++#: ../gtk/gtktexttag.c:565
+ msgid "Whether this tag affects the background color"
+ msgstr "Huruvida denna tagg påverkar bakgrundsfärgen"
+
+-#: gtk/gtkcellrenderertext.c:506 gtk/gtktexttag.c:576
++#: ../gtk/gtkcellrenderertext.c:506
++#: ../gtk/gtktexttag.c:576
+ msgid "Foreground set"
+ msgstr "Förgrund inställd"
+
+-#: gtk/gtkcellrenderertext.c:507 gtk/gtktexttag.c:577
++#: ../gtk/gtkcellrenderertext.c:507
++#: ../gtk/gtktexttag.c:577
+ msgid "Whether this tag affects the foreground color"
+ msgstr "Huruvida denna tagg påverkar förgrundsfärgen"
+
+-#: gtk/gtkcellrenderertext.c:510 gtk/gtktexttag.c:584
++#: ../gtk/gtkcellrenderertext.c:510
++#: ../gtk/gtktexttag.c:584
+ msgid "Editability set"
+ msgstr "Redigerbarhet inställd"
+
+-#: gtk/gtkcellrenderertext.c:511 gtk/gtktexttag.c:585
++#: ../gtk/gtkcellrenderertext.c:511
++#: ../gtk/gtktexttag.c:585
+ msgid "Whether this tag affects text editability"
+ msgstr "Huruvida denna tagg påverkar redigerbarheten för texten"
+
+-#: gtk/gtkcellrenderertext.c:514 gtk/gtktexttag.c:588
++#: ../gtk/gtkcellrenderertext.c:514
++#: ../gtk/gtktexttag.c:588
+ msgid "Font family set"
+ msgstr "Typsnittsfamilj inställd"
+
+-#: gtk/gtkcellrenderertext.c:515 gtk/gtktexttag.c:589
++#: ../gtk/gtkcellrenderertext.c:515
++#: ../gtk/gtktexttag.c:589
+ msgid "Whether this tag affects the font family"
+ msgstr "Huruvida denna tagg påverkar typsnittsfamiljen"
+
+-#: gtk/gtkcellrenderertext.c:518 gtk/gtktexttag.c:592
++#: ../gtk/gtkcellrenderertext.c:518
++#: ../gtk/gtktexttag.c:592
+ msgid "Font style set"
+ msgstr "Typsnittsstil inställd"
+
+-#: gtk/gtkcellrenderertext.c:519 gtk/gtktexttag.c:593
++#: ../gtk/gtkcellrenderertext.c:519
++#: ../gtk/gtktexttag.c:593
+ msgid "Whether this tag affects the font style"
+ msgstr "Huruvida denna tagg påverkar typsnittsstilen"
+
+-#: gtk/gtkcellrenderertext.c:522 gtk/gtktexttag.c:596
++#: ../gtk/gtkcellrenderertext.c:522
++#: ../gtk/gtktexttag.c:596
+ msgid "Font variant set"
+ msgstr "Typsnittsvariant inställd"
+
+-#: gtk/gtkcellrenderertext.c:523 gtk/gtktexttag.c:597
++#: ../gtk/gtkcellrenderertext.c:523
++#: ../gtk/gtktexttag.c:597
+ msgid "Whether this tag affects the font variant"
+ msgstr "Huruvida denna tagg påverkar typsnittsvarianten"
+
+-#: gtk/gtkcellrenderertext.c:526 gtk/gtktexttag.c:600
++#: ../gtk/gtkcellrenderertext.c:526
++#: ../gtk/gtktexttag.c:600
+ msgid "Font weight set"
+ msgstr "Typsnittsvikt inställd"
+
+-#: gtk/gtkcellrenderertext.c:527 gtk/gtktexttag.c:601
++#: ../gtk/gtkcellrenderertext.c:527
++#: ../gtk/gtktexttag.c:601
+ msgid "Whether this tag affects the font weight"
+ msgstr "Huruvida denna tagg påverkar typsnittsvikten"
+
+-#: gtk/gtkcellrenderertext.c:530 gtk/gtktexttag.c:604
++#: ../gtk/gtkcellrenderertext.c:530
++#: ../gtk/gtktexttag.c:604
+ msgid "Font stretch set"
+ msgstr "Typsnittsbredd inställd"
+
+-#: gtk/gtkcellrenderertext.c:531 gtk/gtktexttag.c:605
++#: ../gtk/gtkcellrenderertext.c:531
++#: ../gtk/gtktexttag.c:605
+ msgid "Whether this tag affects the font stretch"
+ msgstr "Huruvida denna tagg påverkar typsnittsbredden"
+
+-#: gtk/gtkcellrenderertext.c:534 gtk/gtktexttag.c:608
++#: ../gtk/gtkcellrenderertext.c:534
++#: ../gtk/gtktexttag.c:608
+ msgid "Font size set"
+ msgstr "Typsnittsstorlek inställd"
+
+-#: gtk/gtkcellrenderertext.c:535 gtk/gtktexttag.c:609
++#: ../gtk/gtkcellrenderertext.c:535
++#: ../gtk/gtktexttag.c:609
+ msgid "Whether this tag affects the font size"
+ msgstr "Huruvida denna tagg påverkar typsnittsstorleken"
+
+-#: gtk/gtkcellrenderertext.c:538 gtk/gtktexttag.c:612
++#: ../gtk/gtkcellrenderertext.c:538
++#: ../gtk/gtktexttag.c:612
+ msgid "Font scale set"
+ msgstr "Typsnittsskalning inställd"
+
+-#: gtk/gtkcellrenderertext.c:539 gtk/gtktexttag.c:613
++#: ../gtk/gtkcellrenderertext.c:539
++#: ../gtk/gtktexttag.c:613
+ msgid "Whether this tag scales the font size by a factor"
+ msgstr "Huruvida denna tagg skalar typsnittet med en faktor"
+
+-#: gtk/gtkcellrenderertext.c:542 gtk/gtktexttag.c:632
++#: ../gtk/gtkcellrenderertext.c:542
++#: ../gtk/gtktexttag.c:632
+ msgid "Rise set"
+ msgstr "Höjning inställd"
+
+-#: gtk/gtkcellrenderertext.c:543 gtk/gtktexttag.c:633
++#: ../gtk/gtkcellrenderertext.c:543
++#: ../gtk/gtktexttag.c:633
+ msgid "Whether this tag affects the rise"
+ msgstr "Huruvida denna tagg påverkar höjningen"
+
+-#: gtk/gtkcellrenderertext.c:546 gtk/gtktexttag.c:648
++#: ../gtk/gtkcellrenderertext.c:546
++#: ../gtk/gtktexttag.c:648
+ msgid "Strikethrough set"
+ msgstr "Genomstrykning inställd"
+
+-#: gtk/gtkcellrenderertext.c:547 gtk/gtktexttag.c:649
++#: ../gtk/gtkcellrenderertext.c:547
++#: ../gtk/gtktexttag.c:649
+ msgid "Whether this tag affects strikethrough"
+ msgstr "Huruvida denna tagg påverkar genomstrykningen"
+
+-#: gtk/gtkcellrenderertext.c:550 gtk/gtktexttag.c:656
++#: ../gtk/gtkcellrenderertext.c:550
++#: ../gtk/gtktexttag.c:656
+ msgid "Underline set"
+ msgstr "Understrykning inställd"
+
+-#: gtk/gtkcellrenderertext.c:551 gtk/gtktexttag.c:657
++#: ../gtk/gtkcellrenderertext.c:551
++#: ../gtk/gtktexttag.c:657
+ msgid "Whether this tag affects underlining"
+ msgstr "Huruvida denna tagg påverkar understrykningen"
+
+-#: gtk/gtkcellrenderertext.c:554 gtk/gtktexttag.c:620
++#: ../gtk/gtkcellrenderertext.c:554
++#: ../gtk/gtktexttag.c:620
+ msgid "Language set"
+ msgstr "Språk inställt"
+
+-#: gtk/gtkcellrenderertext.c:555 gtk/gtktexttag.c:621
++#: ../gtk/gtkcellrenderertext.c:555
++#: ../gtk/gtktexttag.c:621
+ msgid "Whether this tag affects the language the text is rendered as"
+ msgstr "Huruvida denna tagg påverkar språket texten renderas som"
+
+-#: gtk/gtkcellrenderertext.c:558
++#: ../gtk/gtkcellrenderertext.c:558
+ msgid "Ellipsize set"
+ msgstr "Elliptisera samling"
+
+-#: gtk/gtkcellrenderertext.c:559
++#: ../gtk/gtkcellrenderertext.c:559
+ msgid "Whether this tag affects the ellipsize mode"
+ msgstr "Huruvida denna tagg påverkar elliptiseringsläget"
+
+-#: gtk/gtkcellrenderertext.c:562
++#: ../gtk/gtkcellrenderertext.c:562
+ msgid "Align set"
+ msgstr "Justering inställd"
+
+-#: gtk/gtkcellrenderertext.c:563
++#: ../gtk/gtkcellrenderertext.c:563
+ msgid "Whether this tag affects the alignment mode"
+ msgstr "Huruvida denna tagg påverkar justeringsläget"
+
+-#: gtk/gtkcellrenderertoggle.c:126
++#: ../gtk/gtkcellrenderertoggle.c:126
+ msgid "Toggle state"
+ msgstr "Växlingstillstånd"
+
+-#: gtk/gtkcellrenderertoggle.c:127
++#: ../gtk/gtkcellrenderertoggle.c:127
+ msgid "The toggle state of the button"
+ msgstr "Knappens växlingstillstånd"
+
+-#: gtk/gtkcellrenderertoggle.c:134
++#: ../gtk/gtkcellrenderertoggle.c:134
+ msgid "Inconsistent state"
+ msgstr "Inkonsekvent tillstånd"
+
+-#: gtk/gtkcellrenderertoggle.c:135
++#: ../gtk/gtkcellrenderertoggle.c:135
+ msgid "The inconsistent state of the button"
+ msgstr "Knappens inkonsekventa tillstånd"
+
+-#: gtk/gtkcellrenderertoggle.c:142
++#: ../gtk/gtkcellrenderertoggle.c:142
+ msgid "Activatable"
+ msgstr "Aktiverbar"
+
+-#: gtk/gtkcellrenderertoggle.c:143
++#: ../gtk/gtkcellrenderertoggle.c:143
+ msgid "The toggle button can be activated"
+ msgstr "Växlingsknappen kan aktiveras"
+
+-#: gtk/gtkcellrenderertoggle.c:150
++#: ../gtk/gtkcellrenderertoggle.c:150
+ msgid "Radio state"
+ msgstr "Radiotillstånd"
+
+-#: gtk/gtkcellrenderertoggle.c:151
++#: ../gtk/gtkcellrenderertoggle.c:151
+ msgid "Draw the toggle button as a radio button"
+ msgstr "Rita växlingsknappen som en radioknapp"
+
+-#: gtk/gtkcellrenderertoggle.c:158
++#: ../gtk/gtkcellrenderertoggle.c:158
+ msgid "Indicator size"
+ msgstr "Indikatorstorlek"
+
+-#: gtk/gtkcellrenderertoggle.c:159 gtk/gtkcheckbutton.c:70
+-#: gtk/gtkcheckmenuitem.c:112
++#: ../gtk/gtkcellrenderertoggle.c:159
++#: ../gtk/gtkcheckbutton.c:70
++#: ../gtk/gtkcheckmenuitem.c:112
+ msgid "Size of check or radio indicator"
+ msgstr "Storlek på kryss- eller radioindikator"
+
+-#: gtk/gtkcellview.c:182
++#: ../gtk/gtkcellview.c:182
+ msgid "CellView model"
+ msgstr "Cellvisningsmodell"
+
+-#: gtk/gtkcellview.c:183
++#: ../gtk/gtkcellview.c:183
+ msgid "The model for cell view"
+ msgstr "Modellen för cellvisning"
+
+-#: gtk/gtkcheckbutton.c:69 gtk/gtkcheckmenuitem.c:110 gtk/gtkoptionmenu.c:168
++#: ../gtk/gtkcheckbutton.c:69
++#: ../gtk/gtkcheckmenuitem.c:110
++#: ../gtk/gtkoptionmenu.c:168
+ msgid "Indicator Size"
+ msgstr "Indikatorstorlek"
+
+-#: gtk/gtkcheckbutton.c:77 gtk/gtkexpander.c:245 gtk/gtkoptionmenu.c:174
++#: ../gtk/gtkcheckbutton.c:77
++#: ../gtk/gtkexpander.c:245
++#: ../gtk/gtkoptionmenu.c:174
+ msgid "Indicator Spacing"
+ msgstr "Indikatorutrymme"
+
+-#: gtk/gtkcheckbutton.c:78
++#: ../gtk/gtkcheckbutton.c:78
+ msgid "Spacing around check or radio indicator"
+ msgstr "Utrymme runt kryss- eller radioindikator"
+
+-#: gtk/gtkcheckmenuitem.c:87 gtk/gtkmenu.c:498 gtk/gtktoggleaction.c:118
+-#: gtk/gtktogglebutton.c:102 gtk/gtktoggletoolbutton.c:101
++#: ../gtk/gtkcheckmenuitem.c:87
++#: ../gtk/gtkmenu.c:498
++#: ../gtk/gtktoggleaction.c:118
++#: ../gtk/gtktogglebutton.c:102
++#: ../gtk/gtktoggletoolbutton.c:101
+ msgid "Active"
+ msgstr "Aktiv"
+
+-#: gtk/gtkcheckmenuitem.c:88
++#: ../gtk/gtkcheckmenuitem.c:88
+ msgid "Whether the menu item is checked"
+ msgstr "Huruvida menyobjektet är kryssat"
+
+ # SUN CHANGED MESSAGE
+-#: gtk/gtkcheckmenuitem.c:95 gtk/gtktogglebutton.c:110
++#: ../gtk/gtkcheckmenuitem.c:95
++#: ../gtk/gtktogglebutton.c:110
+ msgid "Inconsistent"
+ msgstr "Inkonsekvent"
+
+-#: gtk/gtkcheckmenuitem.c:96
++#: ../gtk/gtkcheckmenuitem.c:96
+ msgid "Whether to display an \"inconsistent\" state"
+ msgstr "Huruvida ett \"inkonsekvent\" tillstånd ska visas"
+
+-#: gtk/gtkcheckmenuitem.c:103
++#: ../gtk/gtkcheckmenuitem.c:103
+ msgid "Draw as radio menu item"
+ msgstr "Rita som radiomenyobjekt"
+
+-#: gtk/gtkcheckmenuitem.c:104
++#: ../gtk/gtkcheckmenuitem.c:104
+ msgid "Whether the menu item looks like a radio menu item"
+ msgstr "Huruvida menyobjektet ser ut som ett radiomenyobjekt"
+
+-#: gtk/gtkcolorbutton.c:171
++#: ../gtk/gtkcolorbutton.c:171
+ msgid "Use alpha"
+ msgstr "Använd alfa"
+
+-#: gtk/gtkcolorbutton.c:172
++#: ../gtk/gtkcolorbutton.c:172
+ msgid "Whether or not to give the color an alpha value"
+ msgstr "Huruvida färgen ska ges ett alfavärde eller inte"
+
+-#: gtk/gtkcolorbutton.c:186 gtk/gtkfilechooserbutton.c:407
+-#: gtk/gtkfontbutton.c:142 gtk/gtkprintjob.c:116 gtk/gtktreeviewcolumn.c:264
++#: ../gtk/gtkcolorbutton.c:186
++#: ../gtk/gtkfilechooserbutton.c:407
++#: ../gtk/gtkfontbutton.c:142
++#: ../gtk/gtkprintjob.c:116
++#: ../gtk/gtktreeviewcolumn.c:264
+ msgid "Title"
+ msgstr "Titel"
+
+-#: gtk/gtkcolorbutton.c:187
++#: ../gtk/gtkcolorbutton.c:187
+ msgid "The title of the color selection dialog"
+ msgstr "Titeln på färgvalsdialogen"
+
+-#: gtk/gtkcolorbutton.c:201 gtk/gtkcolorsel.c:293
++#: ../gtk/gtkcolorbutton.c:201
++#: ../gtk/gtkcolorsel.c:293
+ msgid "Current Color"
+ msgstr "Aktuell färg"
+
+-#: gtk/gtkcolorbutton.c:202
++#: ../gtk/gtkcolorbutton.c:202
+ msgid "The selected color"
+ msgstr "Den markerade färgen"
+
+-#: gtk/gtkcolorbutton.c:216 gtk/gtkcolorsel.c:300
++#: ../gtk/gtkcolorbutton.c:216
++#: ../gtk/gtkcolorsel.c:300
+ msgid "Current Alpha"
+ msgstr "Aktuellt alfavärde"
+
+-#: gtk/gtkcolorbutton.c:217
++#: ../gtk/gtkcolorbutton.c:217
+ msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
+ msgstr "Det valda opakhetsvärdet (0 är helt transparent, 65535 helt opakt)"
+
+-#: gtk/gtkcolorsel.c:279
++#: ../gtk/gtkcolorsel.c:279
+ msgid "Has Opacity Control"
+ msgstr "Har opakhetskontoll"
+
+-#: gtk/gtkcolorsel.c:280
++#: ../gtk/gtkcolorsel.c:280
+ msgid "Whether the color selector should allow setting opacity"
+ msgstr "Huruvida färgväljaren ska tillåta inställning av opakhet"
+
+-#: gtk/gtkcolorsel.c:286
++#: ../gtk/gtkcolorsel.c:286
+ msgid "Has palette"
+ msgstr "Har palett"
+
+-#: gtk/gtkcolorsel.c:287
++#: ../gtk/gtkcolorsel.c:287
+ msgid "Whether a palette should be used"
+ msgstr "Huruvida en palett ska användas"
+
+-#: gtk/gtkcolorsel.c:294
++#: ../gtk/gtkcolorsel.c:294
+ msgid "The current color"
+ msgstr "Den aktuella färgen"
+
+-#: gtk/gtkcolorsel.c:301
++#: ../gtk/gtkcolorsel.c:301
+ msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
+ msgstr "Aktuellt opakhetsvärde (0 är helt transparent, 65535 helt opakt)"
+
+-#: gtk/gtkcolorsel.c:315
++#: ../gtk/gtkcolorsel.c:315
+ msgid "Custom palette"
+ msgstr "Anpassad palett"
+
+-#: gtk/gtkcolorsel.c:316
++#: ../gtk/gtkcolorsel.c:316
+ msgid "Palette to use in the color selector"
+ msgstr "Palett att använda i färgväljaren"
+
+-#: gtk/gtkcolorseldialog.c:102
++#: ../gtk/gtkcolorseldialog.c:102
+ msgid "Color Selection"
+ msgstr "Färgval"
+
+-#: gtk/gtkcolorseldialog.c:103
++#: ../gtk/gtkcolorseldialog.c:103
+ msgid "The color selection embedded in the dialog."
+ msgstr "Färgväljaren inbäddad i dialogrutan."
+
+-#: gtk/gtkcolorseldialog.c:109
++#: ../gtk/gtkcolorseldialog.c:109
+ msgid "OK Button"
+ msgstr "OK-knapp"
+
+-#: gtk/gtkcolorseldialog.c:110
++#: ../gtk/gtkcolorseldialog.c:110
+ msgid "The OK button of the dialog."
+ msgstr "OK-knappen för dialogrutan."
+
+-#: gtk/gtkcolorseldialog.c:116
++#: ../gtk/gtkcolorseldialog.c:116
+ msgid "Cancel Button"
+ msgstr "Avbryt-knapp"
+
+ # Bättre ord?
+-#: gtk/gtkcolorseldialog.c:117
++#: ../gtk/gtkcolorseldialog.c:117
+ msgid "The cancel button of the dialog."
+ msgstr "Avbryt-knappen för dialogrutan."
+
+-#: gtk/gtkcolorseldialog.c:123
++#: ../gtk/gtkcolorseldialog.c:123
+ msgid "Help Button"
+ msgstr "Hjälp-knapp"
+
+-#: gtk/gtkcolorseldialog.c:124
++#: ../gtk/gtkcolorseldialog.c:124
+ msgid "The help button of the dialog."
+ msgstr "Hjälp-knappen för dialogrutan."
+
+-#: gtk/gtkcombo.c:145
++#: ../gtk/gtkcombo.c:145
+ msgid "Enable arrow keys"
+ msgstr "Använd piltangenter"
+
+-#: gtk/gtkcombo.c:146
++#: ../gtk/gtkcombo.c:146
+ msgid "Whether the arrow keys move through the list of items"
+ msgstr "Huruvida piltangenter flyttar genom listan med objekt"
+
+-#: gtk/gtkcombo.c:152
++#: ../gtk/gtkcombo.c:152
+ msgid "Always enable arrows"
+ msgstr "Använd alltid pilar"
+
+-#: gtk/gtkcombo.c:153
++#: ../gtk/gtkcombo.c:153
+ msgid "Obsolete property, ignored"
+ msgstr "Föråldrad egenskap, ignorerad"
+
+-#: gtk/gtkcombo.c:159
++#: ../gtk/gtkcombo.c:159
+ msgid "Case sensitive"
+ msgstr "Gör skillnad på VERSALER/gemener"
+
+-#: gtk/gtkcombo.c:160
++#: ../gtk/gtkcombo.c:160
+ msgid "Whether list item matching is case sensitive"
+ msgstr "Huruvida listobjektet gör skillnad på versaler/gemener"
+
+-#: gtk/gtkcombo.c:167
++#: ../gtk/gtkcombo.c:167
+ msgid "Allow empty"
+ msgstr "Tillåt tomt"
+
+-#: gtk/gtkcombo.c:168
++#: ../gtk/gtkcombo.c:168
+ msgid "Whether an empty value may be entered in this field"
+ msgstr "Huruvida ett tomt värde kan anges i detta fält"
+
+-#: gtk/gtkcombo.c:175
++#: ../gtk/gtkcombo.c:175
+ msgid "Value in list"
+ msgstr "Värde i lista"
+
+-#: gtk/gtkcombo.c:176
++#: ../gtk/gtkcombo.c:176
+ msgid "Whether entered values must already be present in the list"
+ msgstr "Huruvida angivna värden redan måste finnas i listan"
+
+-#: gtk/gtkcombobox.c:661
++#: ../gtk/gtkcombobox.c:661
+ msgid "ComboBox model"
+ msgstr "ComboBox-modell"
+
+-#: gtk/gtkcombobox.c:662
++#: ../gtk/gtkcombobox.c:662
+ msgid "The model for the combo box"
+ msgstr "Modellen för kombinationsrutan"
+
+-#: gtk/gtkcombobox.c:679
++#: ../gtk/gtkcombobox.c:679
+ msgid "Wrap width for laying out the items in a grid"
+ msgstr "Radbrytningsbredd för utläggning av objekten i ett rutnät"
+
+-#: gtk/gtkcombobox.c:701
++#: ../gtk/gtkcombobox.c:701
+ msgid "Row span column"
+ msgstr "Radspannskolumn"
+
+-#: gtk/gtkcombobox.c:702
++#: ../gtk/gtkcombobox.c:702
+ msgid "TreeModel column containing the row span values"
+ msgstr "TreeModel-kolumn som innehåller radspannsvärden"
+
+-#: gtk/gtkcombobox.c:723
++#: ../gtk/gtkcombobox.c:723
+ msgid "Column span column"
+ msgstr "Kolumnspannskolumn"
+
+-#: gtk/gtkcombobox.c:724
++#: ../gtk/gtkcombobox.c:724
+ msgid "TreeModel column containing the column span values"
+ msgstr "TreeModel-kolumn som innehåller kolumnspannsvärden"
+
+-#: gtk/gtkcombobox.c:745
++#: ../gtk/gtkcombobox.c:745
+ msgid "Active item"
+ msgstr "Aktivt objekt"
+
+-#: gtk/gtkcombobox.c:746
++#: ../gtk/gtkcombobox.c:746
+ msgid "The item which is currently active"
+ msgstr "Det objekt som är aktivt för tillfället"
+
+-#: gtk/gtkcombobox.c:765 gtk/gtkuimanager.c:220
++#: ../gtk/gtkcombobox.c:765
++#: ../gtk/gtkuimanager.c:220
+ msgid "Add tearoffs to menus"
+ msgstr "Lägg till löstagbara i menyer"
+
+-#: gtk/gtkcombobox.c:766
++#: ../gtk/gtkcombobox.c:766
+ msgid "Whether dropdowns should have a tearoff menu item"
+ msgstr "Huruvida nedfällningar ska ha ett löstagbart menyobjekt"
+
+-#: gtk/gtkcombobox.c:781 gtk/gtkentry.c:531
++#: ../gtk/gtkcombobox.c:781
++#: ../gtk/gtkentry.c:531
+ msgid "Has Frame"
+ msgstr "Har ram"
+
+-#: gtk/gtkcombobox.c:782
++#: ../gtk/gtkcombobox.c:782
+ msgid "Whether the combo box draws a frame around the child"
+ msgstr "Huruvida kombinationsrutan ritar en ram runt barnet"
+
+-#: gtk/gtkcombobox.c:790
++#: ../gtk/gtkcombobox.c:790
+ msgid "Whether the combo box grabs focus when it is clicked with the mouse"
+ msgstr "Huruvida kombinationsrutan tar fokus när den klickas på med musen"
+
+-#: gtk/gtkcombobox.c:805 gtk/gtkmenu.c:553
++#: ../gtk/gtkcombobox.c:805
++#: ../gtk/gtkmenu.c:553
+ msgid "Tearoff Title"
+ msgstr "Löstagbar titel"
+
+-#: gtk/gtkcombobox.c:806
+-msgid ""
+-"A title that may be displayed by the window manager when the popup is torn-"
+-"off"
+-msgstr ""
+-"En titel som kan visas av fönsterhanteraren då denna popupmeny tas loss"
++#: ../gtk/gtkcombobox.c:806
++msgid "A title that may be displayed by the window manager when the popup is torn-off"
++msgstr "En titel som kan visas av fönsterhanteraren då denna popupmeny tas loss"
+
+-#: gtk/gtkcombobox.c:823
++#: ../gtk/gtkcombobox.c:823
+ msgid "Popup shown"
+ msgstr "Popup visas"
+
+-#: gtk/gtkcombobox.c:824
++#: ../gtk/gtkcombobox.c:824
+ msgid "Whether the combo's dropdown is shown"
+ msgstr "Huruvida kombinationsrutans rullgardinsmeny visas"
+
+-#: gtk/gtkcombobox.c:840
++#: ../gtk/gtkcombobox.c:840
+ msgid "Button Sensitivity"
+ msgstr "Knappkänslighet"
+
+-#: gtk/gtkcombobox.c:841
++#: ../gtk/gtkcombobox.c:841
+ msgid "Whether the dropdown button is sensitive when the model is empty"
+ msgstr "Huruvida rullgardinsknappen är känslig när modellen är tom"
+
+-#: gtk/gtkcombobox.c:848
++#: ../gtk/gtkcombobox.c:848
+ msgid "Appears as list"
+ msgstr "Visas som lista"
+
+-#: gtk/gtkcombobox.c:849
++#: ../gtk/gtkcombobox.c:849
+ msgid "Whether dropdowns should look like lists rather than menus"
+ msgstr "Huruvida nedfällningar ska se ut som listor istället för menyer"
+
+-#: gtk/gtkcombobox.c:865
++#: ../gtk/gtkcombobox.c:865
+ msgid "Arrow Size"
+ msgstr "Pilstorlek"
+
+-#: gtk/gtkcombobox.c:866
++#: ../gtk/gtkcombobox.c:866
+ msgid "The minimum size of the arrow in the combo box"
+ msgstr "Minsta storleken för pilen i kombinationsrutan"
+
+-#: gtk/gtkcombobox.c:881 gtk/gtkentry.c:631 gtk/gtkhandlebox.c:174
+-#: gtk/gtkmenubar.c:194 gtk/gtkstatusbar.c:186 gtk/gtktoolbar.c:630
+-#: gtk/gtkviewport.c:122
++#: ../gtk/gtkcombobox.c:881
++#: ../gtk/gtkentry.c:631
++#: ../gtk/gtkhandlebox.c:174
++#: ../gtk/gtkmenubar.c:194
++#: ../gtk/gtkstatusbar.c:186
++#: ../gtk/gtktoolbar.c:630
++#: ../gtk/gtkviewport.c:122
+ msgid "Shadow type"
+ msgstr "Skuggtyp"
+
+-#: gtk/gtkcombobox.c:882
++#: ../gtk/gtkcombobox.c:882
+ msgid "Which kind of shadow to draw around the combo box"
+ msgstr "Vilken typ av skugga som ska ritas runt kombinationsrutan"
+
+-#: gtk/gtkcontainer.c:237
++#: ../gtk/gtkcontainer.c:237
+ msgid "Resize mode"
+ msgstr "Storleksändringsläge"
+
+-#: gtk/gtkcontainer.c:238
++#: ../gtk/gtkcontainer.c:238
+ msgid "Specify how resize events are handled"
+ msgstr "Ange hur storleksändringshändelser hanteras"
+
+-#: gtk/gtkcontainer.c:245
++#: ../gtk/gtkcontainer.c:245
+ msgid "Border width"
+ msgstr "Kantbredd"
+
+-#: gtk/gtkcontainer.c:246
++#: ../gtk/gtkcontainer.c:246
+ msgid "The width of the empty border outside the containers children"
+ msgstr "Bredden på den tomma kanten utanför behållarens barn"
+
+-#: gtk/gtkcontainer.c:254
++#: ../gtk/gtkcontainer.c:254
+ msgid "Child"
+ msgstr "Barn"
+
+-#: gtk/gtkcontainer.c:255
++#: ../gtk/gtkcontainer.c:255
+ msgid "Can be used to add a new child to the container"
+ msgstr "Kan användas för att lägga till ett nytt barn till behållaren"
+
+-#: gtk/gtkcurve.c:124
++#: ../gtk/gtkcurve.c:124
+ msgid "Curve type"
+ msgstr "Kurvtyp"
+
+-#: gtk/gtkcurve.c:125
++#: ../gtk/gtkcurve.c:125
+ msgid "Is this curve linear, spline interpolated, or free-form"
+ msgstr "Är denna kurva linjär, spline-interpolerad eller friform"
+
+-#: gtk/gtkcurve.c:132
++#: ../gtk/gtkcurve.c:132
+ msgid "Minimum X"
+ msgstr "Minsta X"
+
+-#: gtk/gtkcurve.c:133
++#: ../gtk/gtkcurve.c:133
+ msgid "Minimum possible value for X"
+ msgstr "Minsta möjliga värde på X"
+
+-#: gtk/gtkcurve.c:141
++#: ../gtk/gtkcurve.c:141
+ msgid "Maximum X"
+ msgstr "Största X"
+
+-#: gtk/gtkcurve.c:142
++#: ../gtk/gtkcurve.c:142
+ msgid "Maximum possible X value"
+ msgstr "Största möjliga värde på X"
+
+-#: gtk/gtkcurve.c:150
++#: ../gtk/gtkcurve.c:150
+ msgid "Minimum Y"
+ msgstr "Minsta Y"
+
+-#: gtk/gtkcurve.c:151
++#: ../gtk/gtkcurve.c:151
+ msgid "Minimum possible value for Y"
+ msgstr "Minsta möjliga värde på Y"
+
+-#: gtk/gtkcurve.c:159
++#: ../gtk/gtkcurve.c:159
+ msgid "Maximum Y"
+ msgstr "Största Y"
+
+-#: gtk/gtkcurve.c:160
++#: ../gtk/gtkcurve.c:160
+ msgid "Maximum possible value for Y"
+ msgstr "Största möjliga värde på Y"
+
+-#: gtk/gtkdialog.c:145
++#: ../gtk/gtkdialog.c:145
+ msgid "Has separator"
+ msgstr "Har avgränsare"
+
+-#: gtk/gtkdialog.c:146
++#: ../gtk/gtkdialog.c:146
+ msgid "The dialog has a separator bar above its buttons"
+ msgstr "Dialogen har en avgränsarrad ovanför dess knappar"
+
+-#: gtk/gtkdialog.c:191
++#: ../gtk/gtkdialog.c:191
+ msgid "Content area border"
+ msgstr "Kant för innehållsområde"
+
+-#: gtk/gtkdialog.c:192
++#: ../gtk/gtkdialog.c:192
+ msgid "Width of border around the main dialog area"
+ msgstr "Bredd på kanten runt huvuddialogområdet"
+
+-#: gtk/gtkdialog.c:199
++#: ../gtk/gtkdialog.c:199
+ msgid "Button spacing"
+ msgstr "Knapputrymme"
+
+-#: gtk/gtkdialog.c:200
++#: ../gtk/gtkdialog.c:200
+ msgid "Spacing between buttons"
+ msgstr "Utrymme mellan knappar"
+
+-#: gtk/gtkdialog.c:208
++#: ../gtk/gtkdialog.c:208
+ msgid "Action area border"
+ msgstr "Kant på åtgärdsområde"
+
+-#: gtk/gtkdialog.c:209
++#: ../gtk/gtkdialog.c:209
+ msgid "Width of border around the button area at the bottom of the dialog"
+ msgstr "Bredd på kanten runt knappområdet runt nederkanten på dialogen"
+
+-#: gtk/gtkentry.c:486 gtk/gtklabel.c:411
++#: ../gtk/gtkentry.c:486
++#: ../gtk/gtklabel.c:411
+ msgid "Cursor Position"
+ msgstr "Markörposition"
+
+-#: gtk/gtkentry.c:487 gtk/gtklabel.c:412
++#: ../gtk/gtkentry.c:487
++#: ../gtk/gtklabel.c:412
+ msgid "The current position of the insertion cursor in chars"
+ msgstr "Den aktuella positionen på insättningspekaren i antal tecken"
+
+-#: gtk/gtkentry.c:496 gtk/gtklabel.c:421
++#: ../gtk/gtkentry.c:496
++#: ../gtk/gtklabel.c:421
+ msgid "Selection Bound"
+ msgstr "Markeringsgräns"
+
+-#: gtk/gtkentry.c:497 gtk/gtklabel.c:422
+-msgid ""
+-"The position of the opposite end of the selection from the cursor in chars"
+-msgstr ""
+-"Positionen för den motsatta änden av markeringen från markören i antal tecken"
++#: ../gtk/gtkentry.c:497
++#: ../gtk/gtklabel.c:422
++msgid "The position of the opposite end of the selection from the cursor in chars"
++msgstr "Positionen för den motsatta änden av markeringen från markören i antal tecken"
+
+-#: gtk/gtkentry.c:507
++#: ../gtk/gtkentry.c:507
+ msgid "Whether the entry contents can be edited"
+ msgstr "Huruvida fältets innehåll kan redigeras"
+
+-#: gtk/gtkentry.c:514
++#: ../gtk/gtkentry.c:514
+ msgid "Maximum length"
+ msgstr "Maxlängd"
+
+-#: gtk/gtkentry.c:515
++#: ../gtk/gtkentry.c:515
+ msgid "Maximum number of characters for this entry. Zero if no maximum"
+ msgstr "Maximala antalet tecken i detta fält. Noll om inget maxvärde"
+
+-#: gtk/gtkentry.c:523
++#: ../gtk/gtkentry.c:523
+ msgid "Visibility"
+ msgstr "Synlighet"
+
+-#: gtk/gtkentry.c:524
+-msgid ""
+-"FALSE displays the \"invisible char\" instead of the actual text (password "
+-"mode)"
+-msgstr ""
+-"FALSKT visar det \"osynliga tecknet\" istället för den verkliga texten "
+-"(lösenordsläge)"
++#: ../gtk/gtkentry.c:524
++msgid "FALSE displays the \"invisible char\" instead of the actual text (password mode)"
++msgstr "FALSKT visar det \"osynliga tecknet\" istället för den verkliga texten (lösenordsläge)"
+
+-#: gtk/gtkentry.c:532
++#: ../gtk/gtkentry.c:532
+ msgid "FALSE removes outside bevel from entry"
+ msgstr "FALSKT tar bort den yttre avfasningen från fältet"
+
+-#: gtk/gtkentry.c:540
+-msgid ""
+-"Border between text and frame. Overrides the inner-border style property"
++#: ../gtk/gtkentry.c:540
++msgid "Border between text and frame. Overrides the inner-border style property"
+ msgstr "Kant mellan text och ram. Åsidosätter den inre kantstilsegenskapen"
+
+-#: gtk/gtkentry.c:547
++#: ../gtk/gtkentry.c:547
+ msgid "Invisible character"
+ msgstr "Osynligt tecken"
+
+-#: gtk/gtkentry.c:548
++#: ../gtk/gtkentry.c:548
+ msgid "The character to use when masking entry contents (in \"password mode\")"
+-msgstr ""
+-"Tecknet att använda när fältets innehåll ska maskeras (i \"lösenordsläge\")"
++msgstr "Tecknet att använda när fältets innehåll ska maskeras (i \"lösenordsläge\")"
+
+-#: gtk/gtkentry.c:555
++#: ../gtk/gtkentry.c:555
+ msgid "Activates default"
+ msgstr "Aktiverar standard"
+
+-#: gtk/gtkentry.c:556
+-msgid ""
+-"Whether to activate the default widget (such as the default button in a "
+-"dialog) when Enter is pressed"
+-msgstr ""
+-"Huruvida standardwidgeten ska aktiveras (som exempelvis standardknappen i "
+-"ett dialogfönster) när Retur trycks ned"
++#: ../gtk/gtkentry.c:556
++msgid "Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed"
++msgstr "Huruvida standardwidgeten ska aktiveras (som exempelvis standardknappen i ett dialogfönster) när Retur trycks ned"
+
+-#: gtk/gtkentry.c:562
++#: ../gtk/gtkentry.c:562
+ msgid "Width in chars"
+ msgstr "Bredd i antal tecken"
+
+-#: gtk/gtkentry.c:563
++#: ../gtk/gtkentry.c:563
+ msgid "Number of characters to leave space for in the entry"
+ msgstr "Antal tecken som ska lämnas plats till i fältet"
+
+-#: gtk/gtkentry.c:572
++#: ../gtk/gtkentry.c:572
+ msgid "Scroll offset"
+ msgstr "Rullningsavstånd"
+
+-#: gtk/gtkentry.c:573
++#: ../gtk/gtkentry.c:573
+ msgid "Number of pixels of the entry scrolled off the screen to the left"
+-msgstr ""
+-"Antalet bildpunkter i objektet som är rullad utanför skärmen till vänster"
++msgstr "Antalet bildpunkter i objektet som är rullad utanför skärmen till vänster"
+
+-#: gtk/gtkentry.c:583
++#: ../gtk/gtkentry.c:583
+ msgid "The contents of the entry"
+ msgstr "Innehållet i fältet"
+
+-#: gtk/gtkentry.c:598 gtk/gtkmisc.c:73
++#: ../gtk/gtkentry.c:598
++#: ../gtk/gtkmisc.c:73
+ msgid "X align"
+ msgstr "X-justering"
+
+-#: gtk/gtkentry.c:599 gtk/gtkmisc.c:74
+-msgid ""
+-"The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
+-"layouts."
+-msgstr ""
+-"Den horisontella justeringen, från 0 (vänster) till 1 (höger). Omvänd för "
+-"höger-till-vänster-layouter."
++#: ../gtk/gtkentry.c:599
++#: ../gtk/gtkmisc.c:74
++msgid "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
++msgstr "Den horisontella justeringen, från 0 (vänster) till 1 (höger). Omvänd för höger-till-vänster-layouter."
+
+-#: gtk/gtkentry.c:615
++#: ../gtk/gtkentry.c:615
+ msgid "Truncate multiline"
+ msgstr "Kapa flerradersrad"
+
+-#: gtk/gtkentry.c:616
++#: ../gtk/gtkentry.c:616
+ msgid "Whether to truncate multiline pastes to one line."
+ msgstr "Huruvida inklistringar av flerraderrad ska kapas till en rad."
+
+-#: gtk/gtkentry.c:632
++#: ../gtk/gtkentry.c:632
+ msgid "Which kind of shadow to draw around the entry when has-frame is set"
+-msgstr ""
+-"Vilken typ av skugga som ska ritas runt fältet när has-frame är inställd"
++msgstr "Vilken typ av skugga som ska ritas runt fältet när has-frame är inställd"
+
+-#: gtk/gtkentry.c:647 gtk/gtktextview.c:648
++#: ../gtk/gtkentry.c:647
++#: ../gtk/gtktextview.c:648
+ msgid "Overwrite mode"
+ msgstr "Överskrivningsläge"
+
+-#: gtk/gtkentry.c:648
++#: ../gtk/gtkentry.c:648
+ msgid "Whether new text overwrites existing text"
+ msgstr "Huruvida ny text skriver över befintlig text"
+
+-#: gtk/gtkentry.c:661
++#: ../gtk/gtkentry.c:661
+ msgid "Text length"
+ msgstr "Textlängd"
+
+-#: gtk/gtkentry.c:662
++#: ../gtk/gtkentry.c:662
+ msgid "Length of the text currently in the entry"
+ msgstr "Längden på aktuell text i posten "
+
+-#: gtk/gtkentry.c:933
++#: ../gtk/gtkentry.c:933
+ msgid "Border between text and frame."
+ msgstr "Kant mellan text och ram."
+
+-#: gtk/gtkentry.c:938 gtk/gtklabel.c:644
++#: ../gtk/gtkentry.c:938
++#: ../gtk/gtklabel.c:644
+ msgid "Select on focus"
+ msgstr "Markera vid fokus"
+
+-#: gtk/gtkentry.c:939
++#: ../gtk/gtkentry.c:939
+ msgid "Whether to select the contents of an entry when it is focused"
+ msgstr "Huruvida ett fälts innehåll markeras då fältet får fokus"
+
+-#: gtk/gtkentry.c:953
++#: ../gtk/gtkentry.c:953
+ msgid "Password Hint Timeout"
+ msgstr "Tidsgräns för lösenordstips"
+
+-#: gtk/gtkentry.c:954
++#: ../gtk/gtkentry.c:954
+ msgid "How long to show the last input character in hidden entries"
+ msgstr "Hur länge det senaste inmatade tecknet i dolda objekt ska visas"
+
+-#: gtk/gtkentrycompletion.c:279
++#: ../gtk/gtkentrycompletion.c:279
+ msgid "Completion Model"
+ msgstr "Ifyllningsmodell"
+
+-#: gtk/gtkentrycompletion.c:280
++#: ../gtk/gtkentrycompletion.c:280
+ msgid "The model to find matches in"
+ msgstr "Modellen för att hitta träffar"
+
+-#: gtk/gtkentrycompletion.c:286
++#: ../gtk/gtkentrycompletion.c:286
+ msgid "Minimum Key Length"
+ msgstr "Minsta nyckellängd"
+
+-#: gtk/gtkentrycompletion.c:287
++#: ../gtk/gtkentrycompletion.c:287
+ msgid "Minimum length of the search key in order to look up matches"
+ msgstr "Minsta längd på söknyckeln för att hitta träffar"
+
+-#: gtk/gtkentrycompletion.c:303 gtk/gtkiconview.c:587
++#: ../gtk/gtkentrycompletion.c:303
++#: ../gtk/gtkiconview.c:587
+ msgid "Text column"
+ msgstr "Textkolumn"
+
+-#: gtk/gtkentrycompletion.c:304
++#: ../gtk/gtkentrycompletion.c:304
+ msgid "The column of the model containing the strings."
+ msgstr "Kolumnen för modellen som innehåller strängarna."
+
+-#: gtk/gtkentrycompletion.c:323
++#: ../gtk/gtkentrycompletion.c:323
+ msgid "Inline completion"
+ msgstr "Inlineifyllning"
+
+-#: gtk/gtkentrycompletion.c:324
++#: ../gtk/gtkentrycompletion.c:324
+ msgid "Whether the common prefix should be inserted automatically"
+ msgstr "Huruvida det gemensamma prefixet ska infogas automatiskt"
+
+-#: gtk/gtkentrycompletion.c:338
++#: ../gtk/gtkentrycompletion.c:338
+ msgid "Popup completion"
+ msgstr "Popupifyllning"
+
+-#: gtk/gtkentrycompletion.c:339
++#: ../gtk/gtkentrycompletion.c:339
+ msgid "Whether the completions should be shown in a popup window"
+ msgstr "Huruvida ifyllningarna ska visas i ett popupfönster"
+
+-#: gtk/gtkentrycompletion.c:354
++#: ../gtk/gtkentrycompletion.c:354
+ msgid "Popup set width"
+ msgstr "Popup med fast bredd"
+
+-#: gtk/gtkentrycompletion.c:355
++#: ../gtk/gtkentrycompletion.c:355
+ msgid "If TRUE, the popup window will have the same size as the entry"
+ msgstr "OM detta är SANT kommer popupfönstret att ha samma storlek som fältet"
+
+-#: gtk/gtkentrycompletion.c:373
++#: ../gtk/gtkentrycompletion.c:373
+ msgid "Popup single match"
+ msgstr "Popup för enstaka träff"
+
+-#: gtk/gtkentrycompletion.c:374
++#: ../gtk/gtkentrycompletion.c:374
+ msgid "If TRUE, the popup window will appear for a single match."
+ msgstr "Om detta är SANT kommer popupfönstret att visas för en enstaka träff."
+
+-#: gtk/gtkentrycompletion.c:388
++#: ../gtk/gtkentrycompletion.c:388
+ msgid "Inline selection"
+ msgstr "Inline-markering"
+
+-#: gtk/gtkentrycompletion.c:389
++#: ../gtk/gtkentrycompletion.c:389
+ msgid "Your description here"
+ msgstr "Din beskrivning här"
+
+-#: gtk/gtkeventbox.c:91
++#: ../gtk/gtkeventbox.c:91
+ msgid "Visible Window"
+ msgstr "Synligt fönster"
+
+-#: gtk/gtkeventbox.c:92
+-msgid ""
+-"Whether the event box is visible, as opposed to invisible and only used to "
+-"trap events."
+-msgstr ""
+-"Huruvida händelserutan är synlig istället för osynlig och endast använd för "
+-"att fånga händelser."
++#: ../gtk/gtkeventbox.c:92
++msgid "Whether the event box is visible, as opposed to invisible and only used to trap events."
++msgstr "Huruvida händelserutan är synlig istället för osynlig och endast använd för att fånga händelser."
+
+-#: gtk/gtkeventbox.c:98
++#: ../gtk/gtkeventbox.c:98
+ msgid "Above child"
+ msgstr "Ovanför barn"
+
+-#: gtk/gtkeventbox.c:99
+-msgid ""
+-"Whether the event-trapping window of the eventbox is above the window of the "
+-"child widget as opposed to below it."
+-msgstr ""
+-"Huruvida händelserutans händelsefångande fönster är över barnwidgetens "
+-"fönster istället för under det."
++#: ../gtk/gtkeventbox.c:99
++msgid "Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it."
++msgstr "Huruvida händelserutans händelsefångande fönster är över barnwidgetens fönster istället för under det."
+
+-#: gtk/gtkexpander.c:187
++#: ../gtk/gtkexpander.c:187
+ msgid "Expanded"
+ msgstr "Expanderad"
+
+-#: gtk/gtkexpander.c:188
++#: ../gtk/gtkexpander.c:188
+ msgid "Whether the expander has been opened to reveal the child widget"
+ msgstr "Huruvida expanderaren har öppnats för att avslöja barnwidgeten"
+
+-#: gtk/gtkexpander.c:196
++#: ../gtk/gtkexpander.c:196
+ msgid "Text of the expander's label"
+ msgstr "Text på expanderarens etikett"
+
+-#: gtk/gtkexpander.c:211 gtk/gtklabel.c:330
++#: ../gtk/gtkexpander.c:211
++#: ../gtk/gtklabel.c:330
+ msgid "Use markup"
+ msgstr "Använd markup"
+
+-#: gtk/gtkexpander.c:212 gtk/gtklabel.c:331
++#: ../gtk/gtkexpander.c:212
++#: ../gtk/gtklabel.c:331
+ msgid "The text of the label includes XML markup. See pango_parse_markup()"
+ msgstr "Etikettens text innehåller XML-markup. Se pango_parse_markup()"
+
+-#: gtk/gtkexpander.c:220
++#: ../gtk/gtkexpander.c:220
+ msgid "Space to put between the label and the child"
+ msgstr "Utrymme att placera mellan etiketten och barnet"
+
+-#: gtk/gtkexpander.c:229 gtk/gtkframe.c:147 gtk/gtktoolbutton.c:194
++#: ../gtk/gtkexpander.c:229
++#: ../gtk/gtkframe.c:147
++#: ../gtk/gtktoolbutton.c:194
+ msgid "Label widget"
+ msgstr "Etikettwidget"
+
+-#: gtk/gtkexpander.c:230
++#: ../gtk/gtkexpander.c:230
+ msgid "A widget to display in place of the usual expander label"
+ msgstr "En widget att visa istället för den vanliga expanderaretiketten"
+
+-#: gtk/gtkexpander.c:236 gtk/gtktreeview.c:783
++#: ../gtk/gtkexpander.c:236
++#: ../gtk/gtktreeview.c:783
+ msgid "Expander Size"
+ msgstr "Storlek på expanderare"
+
+-#: gtk/gtkexpander.c:237 gtk/gtktreeview.c:784
++#: ../gtk/gtkexpander.c:237
++#: ../gtk/gtktreeview.c:784
+ msgid "Size of the expander arrow"
+ msgstr "Storlek på expanderarpilen"
+
+-#: gtk/gtkexpander.c:246
++#: ../gtk/gtkexpander.c:246
+ msgid "Spacing around expander arrow"
+ msgstr "Utrymme runt expanderarpil"
+
+-#: gtk/gtkfilechooser.c:194
++#: ../gtk/gtkfilechooser.c:194
+ msgid "Action"
+ msgstr "Åtgärd"
+
+-#: gtk/gtkfilechooser.c:195
++#: ../gtk/gtkfilechooser.c:195
+ msgid "The type of operation that the file selector is performing"
+ msgstr "Typen av åtgärd som filväljaren utför"
+
+-#: gtk/gtkfilechooser.c:201
++#: ../gtk/gtkfilechooser.c:201
+ msgid "File System Backend"
+ msgstr "Filsystemsbakände"
+
+-#: gtk/gtkfilechooser.c:202
++#: ../gtk/gtkfilechooser.c:202
+ msgid "Name of file system backend to use"
+ msgstr "Namn på filsystemsbakände att använda"
+
+-#: gtk/gtkfilechooser.c:207 gtk/gtkrecentchooser.c:252
++#: ../gtk/gtkfilechooser.c:207
++#: ../gtk/gtkrecentchooser.c:252
+ msgid "Filter"
+ msgstr "Filter"
+
+-#: gtk/gtkfilechooser.c:208
++#: ../gtk/gtkfilechooser.c:208
+ msgid "The current filter for selecting which files are displayed"
+ msgstr "Det aktuella filtret för val av vilka filer som visas"
+
+-#: gtk/gtkfilechooser.c:213
++#: ../gtk/gtkfilechooser.c:213
+ msgid "Local Only"
+ msgstr "Endast lokala"
+
+-#: gtk/gtkfilechooser.c:214
++#: ../gtk/gtkfilechooser.c:214
+ msgid "Whether the selected file(s) should be limited to local file: URLs"
+ msgstr "Huruvida de valda filerna ska begränsas till lokala file:-URI:er"
+
+-#: gtk/gtkfilechooser.c:219
++#: ../gtk/gtkfilechooser.c:219
+ msgid "Preview widget"
+ msgstr "Förhandsvisningswidget"
+
+-#: gtk/gtkfilechooser.c:220
++#: ../gtk/gtkfilechooser.c:220
+ msgid "Application supplied widget for custom previews."
+ msgstr "Programtillhandahållen widget för anpassade förhandsvisningar."
+
+-#: gtk/gtkfilechooser.c:225
++#: ../gtk/gtkfilechooser.c:225
+ msgid "Preview Widget Active"
+ msgstr "Förhandsvisningswidget aktiv"
+
+-#: gtk/gtkfilechooser.c:226
+-msgid ""
+-"Whether the application supplied widget for custom previews should be shown."
+-msgstr ""
+-"Huruvida den programtillhandahållna widgeten för anpassade förhandsvisningar "
+-"ska visas."
++#: ../gtk/gtkfilechooser.c:226
++msgid "Whether the application supplied widget for custom previews should be shown."
++msgstr "Huruvida den programtillhandahållna widgeten för anpassade förhandsvisningar ska visas."
+
+-#: gtk/gtkfilechooser.c:231
++#: ../gtk/gtkfilechooser.c:231
+ msgid "Use Preview Label"
+ msgstr "Använd förhandsvisningsetikett"
+
+-#: gtk/gtkfilechooser.c:232
++#: ../gtk/gtkfilechooser.c:232
+ msgid "Whether to display a stock label with the name of the previewed file."
+-msgstr ""
+-"Huruvida en standardetikett med namnet på den förhandsvisade filen ska visas."
++msgstr "Huruvida en standardetikett med namnet på den förhandsvisade filen ska visas."
+
+-#: gtk/gtkfilechooser.c:237
++#: ../gtk/gtkfilechooser.c:237
+ msgid "Extra widget"
+ msgstr "Extrawidget"
+
+-#: gtk/gtkfilechooser.c:238
++#: ../gtk/gtkfilechooser.c:238
+ msgid "Application supplied widget for extra options."
+ msgstr "Programtillhandahållen widget för extra alternativ."
+
+-#: gtk/gtkfilechooser.c:243 gtk/gtkfilesel.c:540 gtk/gtkrecentchooser.c:191
++#: ../gtk/gtkfilechooser.c:243
++#: ../gtk/gtkfilesel.c:540
++#: ../gtk/gtkrecentchooser.c:191
+ msgid "Select Multiple"
+ msgstr "Välj flera"
+
+-#: gtk/gtkfilechooser.c:244 gtk/gtkfilesel.c:541
++#: ../gtk/gtkfilechooser.c:244
++#: ../gtk/gtkfilesel.c:541
+ msgid "Whether to allow multiple files to be selected"
+ msgstr "Huruvida flera filer kan väljas"
+
+-#: gtk/gtkfilechooser.c:250
++#: ../gtk/gtkfilechooser.c:250
+ msgid "Show Hidden"
+ msgstr "Visa dolda"
+
+-#: gtk/gtkfilechooser.c:251
++#: ../gtk/gtkfilechooser.c:251
+ msgid "Whether the hidden files and folders should be displayed"
+ msgstr "Huruvida de dolda filerna och mapparna ska visas"
+
+-#: gtk/gtkfilechooser.c:266
++#: ../gtk/gtkfilechooser.c:266
+ msgid "Do overwrite confirmation"
+ msgstr "Utför överskrivningsbekräftelse"
+
+-#: gtk/gtkfilechooser.c:267
+-msgid ""
+-"Whether a file chooser in save mode will present an overwrite confirmation "
+-"dialog if necessary."
+-msgstr ""
+-"Huruvidare en filväljare i sparandeläge kommer att visa en "
+-"överskrivningsbekräftelsedialog om så behövs."
++#: ../gtk/gtkfilechooser.c:267
++msgid "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary."
++msgstr "Huruvidare en filväljare i sparandeläge kommer att visa en överskrivningsbekräftelsedialog om så behövs."
+
+-#: gtk/gtkfilechooserbutton.c:376
++#: ../gtk/gtkfilechooserbutton.c:376
+ msgid "Dialog"
+ msgstr "Dialog"
+
+-#: gtk/gtkfilechooserbutton.c:377
++#: ../gtk/gtkfilechooserbutton.c:377
+ msgid "The file chooser dialog to use."
+ msgstr "Filväljardialogen att använda."
+
+-#: gtk/gtkfilechooserbutton.c:408
++#: ../gtk/gtkfilechooserbutton.c:408
+ msgid "The title of the file chooser dialog."
+ msgstr "Titeln på filväljardialogen."
+
+-#: gtk/gtkfilechooserbutton.c:422
++#: ../gtk/gtkfilechooserbutton.c:422
+ msgid "The desired width of the button widget, in characters."
+ msgstr "Den önskade bredden på knappwidgeten, i antal tecken."
+
+-#: gtk/gtkfilesel.c:526 gtk/gtkimage.c:163 gtk/gtkrecentmanager.c:214
+-#: gtk/gtkstatusicon.c:194
++#: ../gtk/gtkfilesel.c:526
++#: ../gtk/gtkimage.c:163
++#: ../gtk/gtkrecentmanager.c:214
++#: ../gtk/gtkstatusicon.c:194
+ msgid "Filename"
+ msgstr "Filnamn"
+
+-#: gtk/gtkfilesel.c:527
++#: ../gtk/gtkfilesel.c:527
+ msgid "The currently selected filename"
+ msgstr "Det filnamn som är valt för tillfället"
+
+-#: gtk/gtkfilesel.c:533
++#: ../gtk/gtkfilesel.c:533
+ msgid "Show file operations"
+ msgstr "Visa filoperationer"
+
+-#: gtk/gtkfilesel.c:534
++#: ../gtk/gtkfilesel.c:534
+ msgid "Whether buttons for creating/manipulating files should be displayed"
+ msgstr "Huruvida knappar för skapande/manipulering av filer ska visas"
+
+-#: gtk/gtkfixed.c:90 gtk/gtklayout.c:596
++#: ../gtk/gtkfixed.c:90
++#: ../gtk/gtklayout.c:596
+ msgid "X position"
+ msgstr "X-position"
+
+-#: gtk/gtkfixed.c:91 gtk/gtklayout.c:597
++#: ../gtk/gtkfixed.c:91
++#: ../gtk/gtklayout.c:597
+ msgid "X position of child widget"
+ msgstr "X-position på barnwidgeten"
+
+-#: gtk/gtkfixed.c:100 gtk/gtklayout.c:606
++#: ../gtk/gtkfixed.c:100
++#: ../gtk/gtklayout.c:606
+ msgid "Y position"
+ msgstr "Y-position"
+
+-#: gtk/gtkfixed.c:101 gtk/gtklayout.c:607
++#: ../gtk/gtkfixed.c:101
++#: ../gtk/gtklayout.c:607
+ msgid "Y position of child widget"
+ msgstr "Y-position på barnwidgeten"
+
+-#: gtk/gtkfontbutton.c:143
++#: ../gtk/gtkfontbutton.c:143
+ msgid "The title of the font selection dialog"
+ msgstr "Titeln på typsnittsväljardialogen"
+
+-#: gtk/gtkfontbutton.c:158 gtk/gtkfontsel.c:181
++#: ../gtk/gtkfontbutton.c:158
++#: ../gtk/gtkfontsel.c:181
+ msgid "Font name"
+ msgstr "Typsnittsnamn"
+
+-#: gtk/gtkfontbutton.c:159
++#: ../gtk/gtkfontbutton.c:159
+ msgid "The name of the selected font"
+ msgstr "Namnet på det valda typsnittet"
+
+-#: gtk/gtkfontbutton.c:160
++#: ../gtk/gtkfontbutton.c:160
+ msgid "Sans 12"
+ msgstr "Sans 12"
+
+-#: gtk/gtkfontbutton.c:175
++#: ../gtk/gtkfontbutton.c:175
+ msgid "Use font in label"
+ msgstr "Använd typsnitt i etikett"
+
+-#: gtk/gtkfontbutton.c:176
++#: ../gtk/gtkfontbutton.c:176
+ msgid "Whether the label is drawn in the selected font"
+ msgstr "Huruvida etiketten ritas med det valda typsnittet"
+
+-#: gtk/gtkfontbutton.c:191
++#: ../gtk/gtkfontbutton.c:191
+ msgid "Use size in label"
+ msgstr "Använd storlek i etikett"
+
+-#: gtk/gtkfontbutton.c:192
++#: ../gtk/gtkfontbutton.c:192
+ msgid "Whether the label is drawn with the selected font size"
+ msgstr "Huruvida etiketten ritas med den valda typsnittsstorleken"
+
+-#: gtk/gtkfontbutton.c:208
++#: ../gtk/gtkfontbutton.c:208
+ msgid "Show style"
+ msgstr "Visa stil"
+
+-#: gtk/gtkfontbutton.c:209
++#: ../gtk/gtkfontbutton.c:209
+ msgid "Whether the selected font style is shown in the label"
+ msgstr "Huruvida den valda typsnittsstilen visas i etiketten"
+
+-#: gtk/gtkfontbutton.c:224
++#: ../gtk/gtkfontbutton.c:224
+ msgid "Show size"
+ msgstr "Visa storlek"
+
+-#: gtk/gtkfontbutton.c:225
++#: ../gtk/gtkfontbutton.c:225
+ msgid "Whether selected font size is shown in the label"
+ msgstr "Huruvida den valda typsnittsstorleken visas i etiketten"
+
+-#: gtk/gtkfontsel.c:182
++#: ../gtk/gtkfontsel.c:182
+ msgid "The string that represents this font"
+ msgstr "Strängen som representerar detta typsnitt"
+
+-#: gtk/gtkfontsel.c:189
++#: ../gtk/gtkfontsel.c:189
+ msgid "The GdkFont that is currently selected"
+ msgstr "Den GdkFont som är vald för tillfället"
+
+-#: gtk/gtkfontsel.c:195
++#: ../gtk/gtkfontsel.c:195
+ msgid "Preview text"
+ msgstr "Förhandsvisningstext"
+
+-#: gtk/gtkfontsel.c:196
++#: ../gtk/gtkfontsel.c:196
+ msgid "The text to display in order to demonstrate the selected font"
+ msgstr "Den text som ska visas för att demonstrera det valda typsnittet"
+
+-#: gtk/gtkframe.c:106
++#: ../gtk/gtkframe.c:106
+ msgid "Text of the frame's label"
+ msgstr "Text på ramens etikett"
+
+-#: gtk/gtkframe.c:113
++#: ../gtk/gtkframe.c:113
+ msgid "Label xalign"
+ msgstr "X-justering av etikett"
+
+-#: gtk/gtkframe.c:114
++#: ../gtk/gtkframe.c:114
+ msgid "The horizontal alignment of the label"
+ msgstr "Den horisontella justeringen av etiketten"
+
+-#: gtk/gtkframe.c:122
++#: ../gtk/gtkframe.c:122
+ msgid "Label yalign"
+ msgstr "Y-justering av etikett"
+
+-#: gtk/gtkframe.c:123
++#: ../gtk/gtkframe.c:123
+ msgid "The vertical alignment of the label"
+ msgstr "Den vertikala justeringen av etiketten"
+
+-#: gtk/gtkframe.c:131 gtk/gtkhandlebox.c:167
++#: ../gtk/gtkframe.c:131
++#: ../gtk/gtkhandlebox.c:167
+ msgid "Deprecated property, use shadow_type instead"
+ msgstr "Föråldrad egenskap, använd shadow_type istället"
+
+-#: gtk/gtkframe.c:138
++#: ../gtk/gtkframe.c:138
+ msgid "Frame shadow"
+ msgstr "Ramskugga"
+
+-#: gtk/gtkframe.c:139
++#: ../gtk/gtkframe.c:139
+ msgid "Appearance of the frame border"
+ msgstr "Utseende på ramkanten"
+
+-#: gtk/gtkframe.c:148
++#: ../gtk/gtkframe.c:148
+ msgid "A widget to display in place of the usual frame label"
+ msgstr "En widget att visa istället för den vanliga rametiketten"
+
+-#: gtk/gtkhandlebox.c:175
++#: ../gtk/gtkhandlebox.c:175
+ msgid "Appearance of the shadow that surrounds the container"
+ msgstr "Utseende på skuggan som omger behållaren"
+
+-#: gtk/gtkhandlebox.c:183
++#: ../gtk/gtkhandlebox.c:183
+ msgid "Handle position"
+ msgstr "Handtagsposition"
+
+-#: gtk/gtkhandlebox.c:184
++#: ../gtk/gtkhandlebox.c:184
+ msgid "Position of the handle relative to the child widget"
+ msgstr "Position på handtaget relativt barnwidgeten"
+
+-#: gtk/gtkhandlebox.c:192
++#: ../gtk/gtkhandlebox.c:192
+ msgid "Snap edge"
+ msgstr "Fäst kant"
+
+-#: gtk/gtkhandlebox.c:193
+-msgid ""
+-"Side of the handlebox that's lined up with the docking point to dock the "
+-"handlebox"
+-msgstr ""
+-"Sida på handtaget som är jämsides med dockningspunkten för att docka "
+-"handtaget"
++#: ../gtk/gtkhandlebox.c:193
++msgid "Side of the handlebox that's lined up with the docking point to dock the handlebox"
++msgstr "Sida på handtaget som är jämsides med dockningspunkten för att docka handtaget"
+
+-#: gtk/gtkhandlebox.c:201
++#: ../gtk/gtkhandlebox.c:201
+ msgid "Snap edge set"
+ msgstr "Fäst kant inställd"
+
+-#: gtk/gtkhandlebox.c:202
+-msgid ""
+-"Whether to use the value from the snap_edge property or a value derived from "
+-"handle_position"
+-msgstr ""
+-"Huruvida värdet från egenskapen snap_edge eller ett värde härlett från "
+-"handle_position ska användas"
++#: ../gtk/gtkhandlebox.c:202
++msgid "Whether to use the value from the snap_edge property or a value derived from handle_position"
++msgstr "Huruvida värdet från egenskapen snap_edge eller ett värde härlett från handle_position ska användas"
+
+-#: gtk/gtkhandlebox.c:209
++#: ../gtk/gtkhandlebox.c:209
+ msgid "Child Detached"
+ msgstr "Barn frånkopplat"
+
+-#: gtk/gtkhandlebox.c:210
+-msgid ""
+-"A boolean value indicating whether the handlebox's child is attached or "
+-"detached."
+-msgstr ""
+-"Ett booleskt värde som indikerar huruvida handlebox:ens barn är fäst eller "
+-"frånkopplat."
++#: ../gtk/gtkhandlebox.c:210
++msgid "A boolean value indicating whether the handlebox's child is attached or detached."
++msgstr "Ett booleskt värde som indikerar huruvida handlebox:ens barn är fäst eller frånkopplat."
+
+-#: gtk/gtkiconview.c:550
++#: ../gtk/gtkiconview.c:550
+ msgid "Selection mode"
+ msgstr "Markeringsläge"
+
+-#: gtk/gtkiconview.c:551
++#: ../gtk/gtkiconview.c:551
+ msgid "The selection mode"
+ msgstr "Markeringsläget"
+
+-#: gtk/gtkiconview.c:569
++#: ../gtk/gtkiconview.c:569
+ msgid "Pixbuf column"
+ msgstr "Pixbufkolumn"
+
+-#: gtk/gtkiconview.c:570
++#: ../gtk/gtkiconview.c:570
+ msgid "Model column used to retrieve the icon pixbuf from"
+ msgstr "Modellkolumn som används för att hämta ikonpixbufen från"
+
+-#: gtk/gtkiconview.c:588
++#: ../gtk/gtkiconview.c:588
+ msgid "Model column used to retrieve the text from"
+ msgstr "Modellkolumn som används för att hämta texten från"
+
+-#: gtk/gtkiconview.c:607
++#: ../gtk/gtkiconview.c:607
+ msgid "Markup column"
+ msgstr "Markupkolumn"
+
+-#: gtk/gtkiconview.c:608
++#: ../gtk/gtkiconview.c:608
+ msgid "Model column used to retrieve the text if using Pango markup"
+ msgstr "Modellkolumn som används för att hämta texten om Pango-markup används"
+
+-#: gtk/gtkiconview.c:615
++#: ../gtk/gtkiconview.c:615
+ msgid "Icon View Model"
+ msgstr "Ikonvymodell"
+
+-#: gtk/gtkiconview.c:616
++#: ../gtk/gtkiconview.c:616
+ msgid "The model for the icon view"
+ msgstr "Modellen för ikonvyn"
+
+-#: gtk/gtkiconview.c:632
++#: ../gtk/gtkiconview.c:632
+ msgid "Number of columns"
+ msgstr "Antal kolumner"
+
+-#: gtk/gtkiconview.c:633
++#: ../gtk/gtkiconview.c:633
+ msgid "Number of columns to display"
+ msgstr "Antalet kolumner att visa"
+
+-#: gtk/gtkiconview.c:650
++#: ../gtk/gtkiconview.c:650
+ msgid "Width for each item"
+ msgstr "Bredd på varje objekt"
+
+-#: gtk/gtkiconview.c:651
++#: ../gtk/gtkiconview.c:651
+ msgid "The width used for each item"
+ msgstr "Bredden som används på varje objekt"
+
+-#: gtk/gtkiconview.c:667
++#: ../gtk/gtkiconview.c:667
+ msgid "Space which is inserted between cells of an item"
+ msgstr "Utrymme som infogas mellan cellerna i ett objekt"
+
+-#: gtk/gtkiconview.c:682
++#: ../gtk/gtkiconview.c:682
+ msgid "Row Spacing"
+ msgstr "Radutrymme"
+
+-#: gtk/gtkiconview.c:683
++#: ../gtk/gtkiconview.c:683
+ msgid "Space which is inserted between grid rows"
+ msgstr "Utrymme som infogas mellan rader i rutnät"
+
+-#: gtk/gtkiconview.c:698
++#: ../gtk/gtkiconview.c:698
+ msgid "Column Spacing"
+ msgstr "Kolumnutrymme"
+
+-#: gtk/gtkiconview.c:699
++#: ../gtk/gtkiconview.c:699
+ msgid "Space which is inserted between grid columns"
+ msgstr "Utrymme som infogas mellan kolumner i rutnät"
+
+-#: gtk/gtkiconview.c:714
++#: ../gtk/gtkiconview.c:714
+ msgid "Margin"
+ msgstr "Marginal"
+
+-#: gtk/gtkiconview.c:715
++#: ../gtk/gtkiconview.c:715
+ msgid "Space which is inserted at the edges of the icon view"
+ msgstr "Utrymme som infogas vid kanterna på ikonvyn"
+
+-#: gtk/gtkiconview.c:732
+-msgid ""
+-"How the text and icon of each item are positioned relative to each other"
++#: ../gtk/gtkiconview.c:732
++msgid "How the text and icon of each item are positioned relative to each other"
+ msgstr "Hur texten och ikonen för varje objekt positioneras relativt varandra"
+
+-#: gtk/gtkiconview.c:748 gtk/gtktreeview.c:618 gtk/gtktreeviewcolumn.c:307
++#: ../gtk/gtkiconview.c:748
++#: ../gtk/gtktreeview.c:618
++#: ../gtk/gtktreeviewcolumn.c:307
+ msgid "Reorderable"
+ msgstr "Omarrangeringsbar"
+
+-#: gtk/gtkiconview.c:749 gtk/gtktreeview.c:619
++#: ../gtk/gtkiconview.c:749
++#: ../gtk/gtktreeview.c:619
+ msgid "View is reorderable"
+ msgstr "Vyn är omarrangeringsbar"
+
+-#: gtk/gtkiconview.c:756 gtk/gtktreeview.c:769
++#: ../gtk/gtkiconview.c:756
++#: ../gtk/gtktreeview.c:769
+ msgid "Tooltip Column"
+ msgstr "Verktygstipskolumn"
+
+-#: gtk/gtkiconview.c:757
++#: ../gtk/gtkiconview.c:757
+ msgid "The column in the model containing the tooltip texts for the items"
+ msgstr "Kolumnen för modellen som innehåller verktygstipstexterna för objekten"
+
+-#: gtk/gtkiconview.c:768
++#: ../gtk/gtkiconview.c:768
+ msgid "Selection Box Color"
+ msgstr "Färg på markeringsruta"
+
+-#: gtk/gtkiconview.c:769
++#: ../gtk/gtkiconview.c:769
+ msgid "Color of the selection box"
+ msgstr "Färgen på markeringsrutan"
+
+-#: gtk/gtkiconview.c:775
++#: ../gtk/gtkiconview.c:775
+ msgid "Selection Box Alpha"
+ msgstr "Alfavärde för markeringsrutan"
+
+-#: gtk/gtkiconview.c:776
++#: ../gtk/gtkiconview.c:776
+ msgid "Opacity of the selection box"
+ msgstr "Opakhet för markeringsrutan"
+
+-#: gtk/gtkimage.c:131 gtk/gtkstatusicon.c:186
++#: ../gtk/gtkimage.c:131
++#: ../gtk/gtkstatusicon.c:186
+ msgid "Pixbuf"
+ msgstr "Pixbuf"
+
+-#: gtk/gtkimage.c:132 gtk/gtkstatusicon.c:187
++#: ../gtk/gtkimage.c:132
++#: ../gtk/gtkstatusicon.c:187
+ msgid "A GdkPixbuf to display"
+ msgstr "En GdkPixbuf att visa"
+
+-#: gtk/gtkimage.c:139
++#: ../gtk/gtkimage.c:139
+ msgid "Pixmap"
+ msgstr "Pixmap"
+
+-#: gtk/gtkimage.c:140
++#: ../gtk/gtkimage.c:140
+ msgid "A GdkPixmap to display"
+ msgstr "En GdkPixmap att visa"
+
+-#: gtk/gtkimage.c:147 gtk/gtkmessagedialog.c:215
++#: ../gtk/gtkimage.c:147
++#: ../gtk/gtkmessagedialog.c:215
+ msgid "Image"
+ msgstr "Bild"
+
+-#: gtk/gtkimage.c:148
++#: ../gtk/gtkimage.c:148
+ msgid "A GdkImage to display"
+ msgstr "En GdkImage att visa"
+
+-#: gtk/gtkimage.c:155
++#: ../gtk/gtkimage.c:155
+ msgid "Mask"
+ msgstr "Mask"
+
+-#: gtk/gtkimage.c:156
++#: ../gtk/gtkimage.c:156
+ msgid "Mask bitmap to use with GdkImage or GdkPixmap"
+ msgstr "Maskbitmappsbild att använda med GdkImage eller GdkPixmap"
+
+-#: gtk/gtkimage.c:164 gtk/gtkstatusicon.c:195
++#: ../gtk/gtkimage.c:164
++#: ../gtk/gtkstatusicon.c:195
+ msgid "Filename to load and display"
+ msgstr "Filnamn att läsa in och visa"
+
+-#: gtk/gtkimage.c:173 gtk/gtkstatusicon.c:203
++#: ../gtk/gtkimage.c:173
++#: ../gtk/gtkstatusicon.c:203
+ msgid "Stock ID for a stock image to display"
+ msgstr "Standard-ID för en standardbild att visa"
+
+-#: gtk/gtkimage.c:180
++#: ../gtk/gtkimage.c:180
+ msgid "Icon set"
+ msgstr "Ikonsamling"
+
+-#: gtk/gtkimage.c:181
++#: ../gtk/gtkimage.c:181
+ msgid "Icon set to display"
+ msgstr "Ikonsamling att visa"
+
+-#: gtk/gtkimage.c:188 gtk/gtkscalebutton.c:212 gtk/gtktoolbar.c:547
++#: ../gtk/gtkimage.c:188
++#: ../gtk/gtkscalebutton.c:212
++#: ../gtk/gtktoolbar.c:547
+ msgid "Icon size"
+ msgstr "Ikonstorlek"
+
+-#: gtk/gtkimage.c:189
++#: ../gtk/gtkimage.c:189
+ msgid "Symbolic size to use for stock icon, icon set or named icon"
+-msgstr ""
+-"Symbolisk storlek att använda för standardikon, ikonsamling eller namngiven "
+-"ikon"
++msgstr "Symbolisk storlek att använda för standardikon, ikonsamling eller namngiven ikon"
+
+-#: gtk/gtkimage.c:205
++#: ../gtk/gtkimage.c:205
+ msgid "Pixel size"
+ msgstr "Bildpunktsstorlek"
+
+-#: gtk/gtkimage.c:206
++#: ../gtk/gtkimage.c:206
+ msgid "Pixel size to use for named icon"
+ msgstr "Bildpunktsstorlek att använda för namngiven ikon"
+
+-#: gtk/gtkimage.c:214
++#: ../gtk/gtkimage.c:214
+ msgid "Animation"
+ msgstr "Animering"
+
+-#: gtk/gtkimage.c:215
++#: ../gtk/gtkimage.c:215
+ msgid "GdkPixbufAnimation to display"
+ msgstr "GdkPixbufAnimation att visa"
+
+-#: gtk/gtkimage.c:255 gtk/gtkstatusicon.c:234
++#: ../gtk/gtkimage.c:255
++#: ../gtk/gtkstatusicon.c:234
+ msgid "Storage type"
+ msgstr "Lagringstyp"
+
+-#: gtk/gtkimage.c:256 gtk/gtkstatusicon.c:235
++#: ../gtk/gtkimage.c:256
++#: ../gtk/gtkstatusicon.c:235
+ msgid "The representation being used for image data"
+ msgstr "Representationen som används för bilddata"
+
+-#: gtk/gtkimagemenuitem.c:101
++#: ../gtk/gtkimagemenuitem.c:101
+ msgid "Child widget to appear next to the menu text"
+ msgstr "Bildwidget att visa vid sidan om menytexten"
+
+-#: gtk/gtkimagemenuitem.c:106
++#: ../gtk/gtkimagemenuitem.c:106
+ msgid "Show menu images"
+ msgstr "Visa menybilder"
+
+-#: gtk/gtkimagemenuitem.c:107
++#: ../gtk/gtkimagemenuitem.c:107
+ msgid "Whether images should be shown in menus"
+ msgstr "Huruvida bilder ska visas i menyer"
+
+-#: gtk/gtkinvisible.c:87 gtk/gtkwindow.c:601
++#: ../gtk/gtkinvisible.c:87
++#: ../gtk/gtkwindow.c:601
+ msgid "The screen where this window will be displayed"
+ msgstr "Den skärm där detta fönster kommer att visas"
+
+-#: gtk/gtklabel.c:317
++#: ../gtk/gtklabel.c:317
+ msgid "The text of the label"
+ msgstr "Texten på etiketten"
+
+-#: gtk/gtklabel.c:324
++#: ../gtk/gtklabel.c:324
+ msgid "A list of style attributes to apply to the text of the label"
+ msgstr "En lista med stilattribut att tillämpa på texten i etiketten"
+
+-#: gtk/gtklabel.c:345 gtk/gtktexttag.c:359 gtk/gtktextview.c:585
++#: ../gtk/gtklabel.c:345
++#: ../gtk/gtktexttag.c:359
++#: ../gtk/gtktextview.c:585
+ msgid "Justification"
+ msgstr "Justering"
+
+-#: gtk/gtklabel.c:346
+-msgid ""
+-"The alignment of the lines in the text of the label relative to each other. "
+-"This does NOT affect the alignment of the label within its allocation. See "
+-"GtkMisc::xalign for that"
+-msgstr ""
+-"Justering av raderna i etikettens text relativt varandra. Detta påverkar "
+-"INTE justeringen av etiketten inom dess allokering. Se GtkMisc::xalign för "
+-"det"
++#: ../gtk/gtklabel.c:346
++msgid "The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that"
++msgstr "Justering av raderna i etikettens text relativt varandra. Detta påverkar INTE justeringen av etiketten inom dess allokering. Se GtkMisc::xalign för det"
+
+-#: gtk/gtklabel.c:354
++#: ../gtk/gtklabel.c:354
+ msgid "Pattern"
+ msgstr "Mönster"
+
+-#: gtk/gtklabel.c:355
+-msgid ""
+-"A string with _ characters in positions correspond to characters in the text "
+-"to underline"
+-msgstr ""
+-"En sträng med \"_\"-tecken i positioner som motsvarar tecken i texten som "
+-"ska understrykas"
++#: ../gtk/gtklabel.c:355
++msgid "A string with _ characters in positions correspond to characters in the text to underline"
++msgstr "En sträng med \"_\"-tecken i positioner som motsvarar tecken i texten som ska understrykas"
+
+-#: gtk/gtklabel.c:362
++#: ../gtk/gtklabel.c:362
+ msgid "Line wrap"
+ msgstr "Radbryt"
+
+-#: gtk/gtklabel.c:363
++#: ../gtk/gtklabel.c:363
+ msgid "If set, wrap lines if the text becomes too wide"
+ msgstr "Om detta är angivet kommer texten att radbrytas om den blir för bred"
+
+-#: gtk/gtklabel.c:378
++#: ../gtk/gtklabel.c:378
+ msgid "Line wrap mode"
+ msgstr "Radbrytsläge"
+
+-#: gtk/gtklabel.c:379
++#: ../gtk/gtklabel.c:379
+ msgid "If wrap is set, controls how linewrapping is done"
+ msgstr "Om brytning är inställd, kontrollera hur radbrytning hanteras"
+
+-#: gtk/gtklabel.c:386
++#: ../gtk/gtklabel.c:386
+ msgid "Selectable"
+ msgstr "Markerbar"
+
+-#: gtk/gtklabel.c:387
++#: ../gtk/gtklabel.c:387
+ msgid "Whether the label text can be selected with the mouse"
+ msgstr "Huruvida texten i etiketten kan markeras med musen"
+
+-#: gtk/gtklabel.c:393
++#: ../gtk/gtklabel.c:393
+ msgid "Mnemonic key"
+ msgstr "Snabbtangent"
+
+-#: gtk/gtklabel.c:394
++#: ../gtk/gtklabel.c:394
+ msgid "The mnemonic accelerator key for this label"
+ msgstr "Snabbtangenten för denna etikett"
+
+-#: gtk/gtklabel.c:402
++#: ../gtk/gtklabel.c:402
+ msgid "Mnemonic widget"
+ msgstr "Snabbtangentswidget"
+
+-#: gtk/gtklabel.c:403
++#: ../gtk/gtklabel.c:403
+ msgid "The widget to be activated when the label's mnemonic key is pressed"
+ msgstr "Den widget som ska aktiveras då etikettens snabbtangent trycks ned"
+
+-#: gtk/gtklabel.c:449
+-msgid ""
+-"The preferred place to ellipsize the string, if the label does not have "
+-"enough room to display the entire string"
+-msgstr ""
+-"Den föredragna platsen att elliptisera strängen, om etiketten inte har "
+-"tillräckligt med utrymme för att visa hela strängen"
++#: ../gtk/gtklabel.c:449
++msgid "The preferred place to ellipsize the string, if the label does not have enough room to display the entire string"
++msgstr "Den föredragna platsen att elliptisera strängen, om etiketten inte har tillräckligt med utrymme för att visa hela strängen"
+
+-#: gtk/gtklabel.c:489
++#: ../gtk/gtklabel.c:489
+ msgid "Single Line Mode"
+ msgstr "Enkelradsläge"
+
+-#: gtk/gtklabel.c:490
++#: ../gtk/gtklabel.c:490
+ msgid "Whether the label is in single line mode"
+ msgstr "Huruvida etiketten är i enkelradsläge"
+
+-#: gtk/gtklabel.c:507
++#: ../gtk/gtklabel.c:507
+ msgid "Angle"
+ msgstr "Vinkel"
+
+-#: gtk/gtklabel.c:508
++#: ../gtk/gtklabel.c:508
+ msgid "Angle at which the label is rotated"
+ msgstr "Vinkel som etiketten roteras"
+
+-#: gtk/gtklabel.c:528
++#: ../gtk/gtklabel.c:528
+ msgid "Maximum Width In Characters"
+ msgstr "Maximal bredd i antal tecken"
+
+-#: gtk/gtklabel.c:529
++#: ../gtk/gtklabel.c:529
+ msgid "The desired maximum width of the label, in characters"
+ msgstr "Den önskade maximala bredden på etiketten, i antal tecken"
+
+-#: gtk/gtklabel.c:645
++#: ../gtk/gtklabel.c:645
+ msgid "Whether to select the contents of a selectable label when it is focused"
+ msgstr "Huruvida innehållet av en valbra etikett väljs när den fokuseras"
+
+-#: gtk/gtklayout.c:616 gtk/gtkviewport.c:106
++#: ../gtk/gtklayout.c:616
++#: ../gtk/gtkviewport.c:106
+ msgid "Horizontal adjustment"
+ msgstr "Horisontell justering"
+
+-#: gtk/gtklayout.c:617 gtk/gtkscrolledwindow.c:219
++#: ../gtk/gtklayout.c:617
++#: ../gtk/gtkscrolledwindow.c:219
+ msgid "The GtkAdjustment for the horizontal position"
+ msgstr "GtkAdjustment på den horisontella positionen"
+
+-#: gtk/gtklayout.c:624 gtk/gtkviewport.c:114
++#: ../gtk/gtklayout.c:624
++#: ../gtk/gtkviewport.c:114
+ msgid "Vertical adjustment"
+ msgstr "Vertikal justering"
+
+-#: gtk/gtklayout.c:625 gtk/gtkscrolledwindow.c:226
++#: ../gtk/gtklayout.c:625
++#: ../gtk/gtkscrolledwindow.c:226
+ msgid "The GtkAdjustment for the vertical position"
+ msgstr "GtkAdjustment på den vertikala positionen"
+
+-#: gtk/gtklayout.c:633
++#: ../gtk/gtklayout.c:633
+ msgid "The width of the layout"
+ msgstr "Bredden på layouten"
+
+-#: gtk/gtklayout.c:642
++#: ../gtk/gtklayout.c:642
+ msgid "The height of the layout"
+ msgstr "Höjden på layouten"
+
+-#: gtk/gtklinkbutton.c:144
++#: ../gtk/gtklinkbutton.c:144
+ msgid "URI"
+ msgstr "URI"
+
+-#: gtk/gtklinkbutton.c:145
++#: ../gtk/gtklinkbutton.c:145
+ msgid "The URI bound to this button"
+ msgstr "Den URI som bundits till denna knapp"
+
+-#: gtk/gtklinkbutton.c:159
++#: ../gtk/gtklinkbutton.c:159
+ msgid "Visited"
+ msgstr "Besökt"
+
+-#: gtk/gtklinkbutton.c:160
++#: ../gtk/gtklinkbutton.c:160
+ msgid "Whether this link has been visited."
+ msgstr "Huruvida denna länk har besökts."
+
+-#: gtk/gtkmenu.c:499
++#: ../gtk/gtkmenu.c:499
+ msgid "The currently selected menu item"
+ msgstr "Det för närvarande markerade menyobjektet"
+
+-#: gtk/gtkmenu.c:513
++#: ../gtk/gtkmenu.c:513
+ msgid "Accel Group"
+ msgstr "Genvägsgrupp"
+
+-#: gtk/gtkmenu.c:514
++#: ../gtk/gtkmenu.c:514
+ msgid "The accel group holding accelerators for the menu"
+ msgstr "Genvägsgruppen som innehåller genvägar för menyn"
+
+-#: gtk/gtkmenu.c:528 gtk/gtkmenuitem.c:233
++#: ../gtk/gtkmenu.c:528
++#: ../gtk/gtkmenuitem.c:233
+ msgid "Accel Path"
+ msgstr "Genvägssökväg"
+
+-#: gtk/gtkmenu.c:529
++#: ../gtk/gtkmenu.c:529
+ msgid "An accel path used to conveniently construct accel paths of child items"
+-msgstr ""
+-"En genvägssökväg som använd för att bekvämt skapa genvägssökvägar för "
+-"barnobjekt"
++msgstr "En genvägssökväg som använd för att bekvämt skapa genvägssökvägar för barnobjekt"
+
+-#: gtk/gtkmenu.c:545
++#: ../gtk/gtkmenu.c:545
+ msgid "Attach Widget"
+ msgstr "Fäst widget"
+
+-#: gtk/gtkmenu.c:546
++#: ../gtk/gtkmenu.c:546
+ msgid "The widget the menu is attached to"
+ msgstr "Widgeten som menyn är fäst till"
+
+-#: gtk/gtkmenu.c:554
+-msgid ""
+-"A title that may be displayed by the window manager when this menu is torn-"
+-"off"
++#: ../gtk/gtkmenu.c:554
++msgid "A title that may be displayed by the window manager when this menu is torn-off"
+ msgstr "En titel som kan visas av fönsterhanteraren då denna meny tas loss"
+
+-#: gtk/gtkmenu.c:568
++#: ../gtk/gtkmenu.c:568
+ msgid "Tearoff State"
+ msgstr "Löstagbarhetstillstånd"
+
+-#: gtk/gtkmenu.c:569
++#: ../gtk/gtkmenu.c:569
+ msgid "A boolean that indicates whether the menu is torn-off"
+ msgstr "Ett booleskt värde som indikerar huruvida menyn har tagits loss"
+
+-#: gtk/gtkmenu.c:583
++#: ../gtk/gtkmenu.c:583
+ msgid "Monitor"
+ msgstr "Skärm"
+
+-#: gtk/gtkmenu.c:584
++#: ../gtk/gtkmenu.c:584
+ msgid "The monitor the menu will be popped up on"
+ msgstr "Skärmen som menyn ska visas på"
+
+-#: gtk/gtkmenu.c:590
++#: ../gtk/gtkmenu.c:590
+ msgid "Vertical Padding"
+ msgstr "Vertikal utfyllnad"
+
+-#: gtk/gtkmenu.c:591
++#: ../gtk/gtkmenu.c:591
+ msgid "Extra space at the top and bottom of the menu"
+ msgstr "Extra utrymme överst och nederst i menyn"
+
+-#: gtk/gtkmenu.c:599
++#: ../gtk/gtkmenu.c:599
+ msgid "Horizontal Padding"
+ msgstr "Horisontell utfyllnad"
+
+-#: gtk/gtkmenu.c:600
++#: ../gtk/gtkmenu.c:600
+ msgid "Extra space at the left and right edges of the menu"
+ msgstr "Extra utrymme på vänstra och högra kanterna av menyn"
+
+-#: gtk/gtkmenu.c:608
++#: ../gtk/gtkmenu.c:608
+ msgid "Vertical Offset"
+ msgstr "Vertikalt avstånd"
+
+-#: gtk/gtkmenu.c:609
+-msgid ""
+-"When the menu is a submenu, position it this number of pixels offset "
+-"vertically"
+-msgstr ""
+-"Positionera menyn med vertikalt avstånd i detta antal bildpunkter när den är "
+-"en undermeny"
++#: ../gtk/gtkmenu.c:609
++msgid "When the menu is a submenu, position it this number of pixels offset vertically"
++msgstr "Positionera menyn med vertikalt avstånd i detta antal bildpunkter när den är en undermeny"
+
+-#: gtk/gtkmenu.c:617
++#: ../gtk/gtkmenu.c:617
+ msgid "Horizontal Offset"
+ msgstr "Horisontellt avstånd"
+
+-#: gtk/gtkmenu.c:618
+-msgid ""
+-"When the menu is a submenu, position it this number of pixels offset "
+-"horizontally"
+-msgstr ""
+-"Positionera menyn med horisontellt avstånd i detta antal bildpunkter när den "
+-"är en undermeny"
++#: ../gtk/gtkmenu.c:618
++msgid "When the menu is a submenu, position it this number of pixels offset horizontally"
++msgstr "Positionera menyn med horisontellt avstånd i detta antal bildpunkter när den är en undermeny"
+
+-#: gtk/gtkmenu.c:626
++#: ../gtk/gtkmenu.c:626
+ msgid "Double Arrows"
+ msgstr "Dubbelpilar"
+
+-#: gtk/gtkmenu.c:627
++#: ../gtk/gtkmenu.c:627
+ msgid "When scrolling, always show both arrows."
+ msgstr "Visa alltid båda pilarna vid rullning."
+
+-#: gtk/gtkmenu.c:635
++#: ../gtk/gtkmenu.c:635
+ msgid "Left Attach"
+ msgstr "Vänsterfäste"
+
+-#: gtk/gtkmenu.c:636 gtk/gtktable.c:174
++#: ../gtk/gtkmenu.c:636
++#: ../gtk/gtktable.c:174
+ msgid "The column number to attach the left side of the child to"
+ msgstr "Det kolumnnummer som vänster sida av barnet ska fästas vid"
+
+-#: gtk/gtkmenu.c:643
++#: ../gtk/gtkmenu.c:643
+ msgid "Right Attach"
+ msgstr "Högerfäste"
+
+-#: gtk/gtkmenu.c:644
++#: ../gtk/gtkmenu.c:644
+ msgid "The column number to attach the right side of the child to"
+ msgstr "Det kolumnnummer som höger sida av barnet ska fästas vid"
+
+-#: gtk/gtkmenu.c:651
++#: ../gtk/gtkmenu.c:651
+ msgid "Top Attach"
+ msgstr "Övre fäste"
+
+-#: gtk/gtkmenu.c:652
++#: ../gtk/gtkmenu.c:652
+ msgid "The row number to attach the top of the child to"
+ msgstr "Det radnummer som överkanten på barnet ska fästas vid"
+
+-#: gtk/gtkmenu.c:659
++#: ../gtk/gtkmenu.c:659
+ msgid "Bottom Attach"
+ msgstr "Nedre fäste"
+
+-#: gtk/gtkmenu.c:660 gtk/gtktable.c:195
++#: ../gtk/gtkmenu.c:660
++#: ../gtk/gtktable.c:195
+ msgid "The row number to attach the bottom of the child to"
+ msgstr "Det radnummer som nederkanten på barnet ska fästas vid"
+
+-#: gtk/gtkmenu.c:747
++#: ../gtk/gtkmenu.c:747
+ msgid "Can change accelerators"
+ msgstr "Kan ändra snabbtangenter"
+
+-#: gtk/gtkmenu.c:748
+-msgid ""
+-"Whether menu accelerators can be changed by pressing a key over the menu item"
+-msgstr ""
+-"Huruvida menysnabbtangenter kan ändras genom att en tangent trycks ovanför "
+-"menyobjektet"
++#: ../gtk/gtkmenu.c:748
++msgid "Whether menu accelerators can be changed by pressing a key over the menu item"
++msgstr "Huruvida menysnabbtangenter kan ändras genom att en tangent trycks ovanför menyobjektet"
+
+-#: gtk/gtkmenu.c:753
++#: ../gtk/gtkmenu.c:753
+ msgid "Delay before submenus appear"
+ msgstr "Fördröjning innan undermenyer visas"
+
+-#: gtk/gtkmenu.c:754
+-msgid ""
+-"Minimum time the pointer must stay over a menu item before the submenu appear"
+-msgstr ""
+-"Minsta tid som pekaren måste stanna över ett menyobjekt innan undermenyn "
+-"visas"
++#: ../gtk/gtkmenu.c:754
++msgid "Minimum time the pointer must stay over a menu item before the submenu appear"
++msgstr "Minsta tid som pekaren måste stanna över ett menyobjekt innan undermenyn visas"
+
+-#: gtk/gtkmenu.c:761
++#: ../gtk/gtkmenu.c:761
+ msgid "Delay before hiding a submenu"
+ msgstr "Fördröjning innan en undermeny döljs"
+
+-#: gtk/gtkmenu.c:762
+-msgid ""
+-"The time before hiding a submenu when the pointer is moving towards the "
+-"submenu"
++#: ../gtk/gtkmenu.c:762
++msgid "The time before hiding a submenu when the pointer is moving towards the submenu"
+ msgstr "Tiden innan en undermeny ska döljas när pekaren rör sig mot undermenyn"
+
+-#: gtk/gtkmenubar.c:168
++#: ../gtk/gtkmenubar.c:168
+ msgid "Pack direction"
+ msgstr "Packningsriktning"
+
+-#: gtk/gtkmenubar.c:169
++#: ../gtk/gtkmenubar.c:169
+ msgid "The pack direction of the menubar"
+ msgstr "Packningsriktningen på menyraden"
+
+-#: gtk/gtkmenubar.c:185
++#: ../gtk/gtkmenubar.c:185
+ msgid "Child Pack direction"
+ msgstr "Barnpackningsriktning"
+
+-#: gtk/gtkmenubar.c:186
++#: ../gtk/gtkmenubar.c:186
+ msgid "The child pack direction of the menubar"
+ msgstr "Barnpackningsriktningen på menyraden"
+
+-#: gtk/gtkmenubar.c:195
++#: ../gtk/gtkmenubar.c:195
+ msgid "Style of bevel around the menubar"
+ msgstr "Stil på avfasning runt menyraden"
+
+-#: gtk/gtkmenubar.c:202 gtk/gtktoolbar.c:597
++#: ../gtk/gtkmenubar.c:202
++#: ../gtk/gtktoolbar.c:597
+ msgid "Internal padding"
+ msgstr "Intern utfyllnad"
+
+-#: gtk/gtkmenubar.c:203
++#: ../gtk/gtkmenubar.c:203
+ msgid "Amount of border space between the menubar shadow and the menu items"
+ msgstr "Mängd kantutrymme mellan skuggan på menyraden och menyobjekten"
+
+-#: gtk/gtkmenubar.c:210
++#: ../gtk/gtkmenubar.c:210
+ msgid "Delay before drop down menus appear"
+ msgstr "Fördröjning innan utfällningsmenyer visas"
+
+-#: gtk/gtkmenubar.c:211
++#: ../gtk/gtkmenubar.c:211
+ msgid "Delay before the submenus of a menu bar appear"
+ msgstr "Fördröjning innan undermenyer till en menyrad visas"
+
+-#: gtk/gtkmenuitem.c:201
++#: ../gtk/gtkmenuitem.c:201
+ msgid "Right Justified"
+ msgstr "Högerjusterad"
+
+-#: gtk/gtkmenuitem.c:202
+-msgid ""
+-"Sets whether the menu item appears justified at the right side of a menu bar"
+-msgstr ""
+-"Ställer in huruvida menyobjektet visas justerat på höger sida av en menyrad"
++#: ../gtk/gtkmenuitem.c:202
++msgid "Sets whether the menu item appears justified at the right side of a menu bar"
++msgstr "Ställer in huruvida menyobjektet visas justerat på höger sida av en menyrad"
+
+-#: gtk/gtkmenuitem.c:216
++#: ../gtk/gtkmenuitem.c:216
+ msgid "Submenu"
+ msgstr "Undermeny"
+
+-#: gtk/gtkmenuitem.c:217
++#: ../gtk/gtkmenuitem.c:217
+ msgid "The submenu attached to the menu item, or NULL if it has none"
+ msgstr "Undermenyn kopplad till menyobjektet, eller NULL om den inte har någon"
+
+-#: gtk/gtkmenuitem.c:234
++#: ../gtk/gtkmenuitem.c:234
+ msgid "Sets the accelerator path of the menu item"
+ msgstr "Ställer in genvägssökvägen till menyobjektet"
+
+-#: gtk/gtkmenuitem.c:277
++#: ../gtk/gtkmenuitem.c:277
+ msgid "Amount of space used up by arrow, relative to the menu item's font size"
+-msgstr ""
+-"Mängd utrymme som används av pil, relativ till menyobjektets typsnittsstorlek"
++msgstr "Mängd utrymme som används av pil, relativ till menyobjektets typsnittsstorlek"
+
+-#: gtk/gtkmenuitem.c:290
++#: ../gtk/gtkmenuitem.c:290
+ msgid "Width in Characters"
+ msgstr "Bredd i antal tecken"
+
+-#: gtk/gtkmenuitem.c:291
++#: ../gtk/gtkmenuitem.c:291
+ msgid "The minimum desired width of the menu item in characters"
+ msgstr "Den kortaste bredden på menyobjektet, i antal tecken"
+
+-#: gtk/gtkmenushell.c:374
++#: ../gtk/gtkmenushell.c:374
+ msgid "Take Focus"
+ msgstr "Ta fokus"
+
+-#: gtk/gtkmenushell.c:375
++#: ../gtk/gtkmenushell.c:375
+ msgid "A boolean that determines whether the menu grabs the keyboard focus"
+ msgstr "Ett booleskt värde som avgör huruvida menyn tar tangentbordsfokuset"
+
+-#: gtk/gtkmenutoolbutton.c:232 gtk/gtkoptionmenu.c:161
++#: ../gtk/gtkmenutoolbutton.c:232
++#: ../gtk/gtkoptionmenu.c:161
+ msgid "Menu"
+ msgstr "Meny"
+
+-#: gtk/gtkmenutoolbutton.c:233
++#: ../gtk/gtkmenutoolbutton.c:233
+ msgid "The dropdown menu"
+ msgstr "Nedfällningsmenyn"
+
+-#: gtk/gtkmessagedialog.c:98
++#: ../gtk/gtkmessagedialog.c:98
+ msgid "Image/label border"
+ msgstr "Bild-/etikettkant"
+
+-#: gtk/gtkmessagedialog.c:99
++#: ../gtk/gtkmessagedialog.c:99
+ msgid "Width of border around the label and image in the message dialog"
+ msgstr "Bredd på ramen runt etiketten och bilden i meddelandedialogen"
+
+-#: gtk/gtkmessagedialog.c:114
++#: ../gtk/gtkmessagedialog.c:114
+ msgid "Use separator"
+ msgstr "Använd avgränsare"
+
+-#: gtk/gtkmessagedialog.c:115
+-msgid ""
+-"Whether to put a separator between the message dialog's text and the buttons"
+-msgstr ""
+-"Huruvida en avgränsare ska placeras mellan meddelandedialogens text och "
+-"knapparna"
++#: ../gtk/gtkmessagedialog.c:115
++msgid "Whether to put a separator between the message dialog's text and the buttons"
++msgstr "Huruvida en avgränsare ska placeras mellan meddelandedialogens text och knapparna"
+
+-#: gtk/gtkmessagedialog.c:128
++#: ../gtk/gtkmessagedialog.c:128
+ msgid "Message Type"
+ msgstr "Meddelandetyp"
+
+-#: gtk/gtkmessagedialog.c:129
++#: ../gtk/gtkmessagedialog.c:129
+ msgid "The type of message"
+ msgstr "Typen av meddelande"
+
+-#: gtk/gtkmessagedialog.c:136
++#: ../gtk/gtkmessagedialog.c:136
+ msgid "Message Buttons"
+ msgstr "Meddelandeknappar"
+
+-#: gtk/gtkmessagedialog.c:137
++#: ../gtk/gtkmessagedialog.c:137
+ msgid "The buttons shown in the message dialog"
+ msgstr "Knapparna som visas i meddelandedialogen"
+
+-#: gtk/gtkmessagedialog.c:154
++#: ../gtk/gtkmessagedialog.c:154
+ msgid "The primary text of the message dialog"
+ msgstr "Primära texten för meddelandedialogen"
+
+-#: gtk/gtkmessagedialog.c:169
++#: ../gtk/gtkmessagedialog.c:169
+ msgid "Use Markup"
+ msgstr "Använd markup"
+
+-#: gtk/gtkmessagedialog.c:170
++#: ../gtk/gtkmessagedialog.c:170
+ msgid "The primary text of the title includes Pango markup."
+ msgstr "Primära texten för titeln inkluderar Pango-markup."
+
+-#: gtk/gtkmessagedialog.c:184
++#: ../gtk/gtkmessagedialog.c:184
+ msgid "Secondary Text"
+ msgstr "Sekundär text"
+
+-#: gtk/gtkmessagedialog.c:185
++#: ../gtk/gtkmessagedialog.c:185
+ msgid "The secondary text of the message dialog"
+ msgstr "Sekundära texten för meddelandedialogen"
+
+-#: gtk/gtkmessagedialog.c:200
++#: ../gtk/gtkmessagedialog.c:200
+ msgid "Use Markup in secondary"
+ msgstr "Använd markup i sekundär"
+
+-#: gtk/gtkmessagedialog.c:201
++#: ../gtk/gtkmessagedialog.c:201
+ msgid "The secondary text includes Pango markup."
+ msgstr "Sekundär text som inkluderar Pango-markup."
+
+-#: gtk/gtkmessagedialog.c:216
++#: ../gtk/gtkmessagedialog.c:216
+ msgid "The image"
+ msgstr "Bilden"
+
+-#: gtk/gtkmisc.c:83
++#: ../gtk/gtkmisc.c:83
+ msgid "Y align"
+ msgstr "Y-justering"
+
+-#: gtk/gtkmisc.c:84
++#: ../gtk/gtkmisc.c:84
+ msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
+ msgstr "Vertikal justering, från 0 (överst) till 1 (nederst)"
+
+-#: gtk/gtkmisc.c:93
++#: ../gtk/gtkmisc.c:93
+ msgid "X pad"
+ msgstr "X-utfyllnad"
+
+-#: gtk/gtkmisc.c:94
+-msgid ""
+-"The amount of space to add on the left and right of the widget, in pixels"
+-msgstr ""
+-"Mängden utrymme att lägga till på vänster och höger sida, i bildpunkter"
++#: ../gtk/gtkmisc.c:94
++msgid "The amount of space to add on the left and right of the widget, in pixels"
++msgstr "Mängden utrymme att lägga till på vänster och höger sida, i bildpunkter"
+
+-#: gtk/gtkmisc.c:103
++#: ../gtk/gtkmisc.c:103
+ msgid "Y pad"
+ msgstr "Y-utfyllnad"
+
+-#: gtk/gtkmisc.c:104
+-msgid ""
+-"The amount of space to add on the top and bottom of the widget, in pixels"
+-msgstr ""
+-"Mängden utrymme att lägga till på vänster och höger sida, i bildpunkter"
++#: ../gtk/gtkmisc.c:104
++msgid "The amount of space to add on the top and bottom of the widget, in pixels"
++msgstr "Mängden utrymme att lägga till på vänster och höger sida, i bildpunkter"
+
+-#: gtk/gtkmountoperation.c:160
++#: ../gtk/gtkmountoperation.c:160
+ msgid "Parent"
+ msgstr "Förälder"
+
+-#: gtk/gtkmountoperation.c:161
++#: ../gtk/gtkmountoperation.c:161
+ msgid "The parent window"
+ msgstr "Föräldrafönstret"
+
+-#: gtk/gtkmountoperation.c:168
++#: ../gtk/gtkmountoperation.c:168
+ msgid "Is Showing"
+ msgstr "Visar"
+
+-#: gtk/gtkmountoperation.c:169
++#: ../gtk/gtkmountoperation.c:169
+ msgid "Are we showing a dialog"
+ msgstr "Visar vi en dialogruta"
+
+-#: gtk/gtkmountoperation.c:177
++#: ../gtk/gtkmountoperation.c:177
+ msgid "The screen where this window will be displayed."
+ msgstr "Den skärm där detta fönster kommer att visas."
+
+-#: gtk/gtknotebook.c:577
++#: ../gtk/gtknotebook.c:577
+ msgid "Page"
+ msgstr "Sida"
+
+-#: gtk/gtknotebook.c:578
++#: ../gtk/gtknotebook.c:578
+ msgid "The index of the current page"
+ msgstr "Indexet för den aktuella sidan"
+
+-#: gtk/gtknotebook.c:586
++#: ../gtk/gtknotebook.c:586
+ msgid "Tab Position"
+ msgstr "Flikposition"
+
+-#: gtk/gtknotebook.c:587
++#: ../gtk/gtknotebook.c:587
+ msgid "Which side of the notebook holds the tabs"
+ msgstr "Vilken sida på flikhäftet som har flikarna"
+
+-#: gtk/gtknotebook.c:594
++#: ../gtk/gtknotebook.c:594
+ msgid "Tab Border"
+ msgstr "Flikram"
+
+-#: gtk/gtknotebook.c:595
++#: ../gtk/gtknotebook.c:595
+ msgid "Width of the border around the tab labels"
+ msgstr "Bredd på ramen runt fliketiketterna"
+
+-#: gtk/gtknotebook.c:603
++#: ../gtk/gtknotebook.c:603
+ msgid "Horizontal Tab Border"
+ msgstr "Horisontell flikram"
+
+-#: gtk/gtknotebook.c:604
++#: ../gtk/gtknotebook.c:604
+ msgid "Width of the horizontal border of tab labels"
+ msgstr "Bredd på den horisontella ramen runt fliketiketter"
+
+-#: gtk/gtknotebook.c:612
++#: ../gtk/gtknotebook.c:612
+ msgid "Vertical Tab Border"
+ msgstr "Vertikal flikram"
+
+-#: gtk/gtknotebook.c:613
++#: ../gtk/gtknotebook.c:613
+ msgid "Width of the vertical border of tab labels"
+ msgstr "Bredd på den vertikala ramen runt fliketiketter"
+
+-#: gtk/gtknotebook.c:621
++#: ../gtk/gtknotebook.c:621
+ msgid "Show Tabs"
+ msgstr "Visa flikar"
+
+-#: gtk/gtknotebook.c:622
++#: ../gtk/gtknotebook.c:622
+ msgid "Whether tabs should be shown or not"
+ msgstr "Huruvida flikar ska visas eller inte"
+
+-#: gtk/gtknotebook.c:628
++#: ../gtk/gtknotebook.c:628
+ msgid "Show Border"
+ msgstr "Visa ram"
+
+-#: gtk/gtknotebook.c:629
++#: ../gtk/gtknotebook.c:629
+ msgid "Whether the border should be shown or not"
+ msgstr "Huruvida ramen ska visas eller inte"
+
+-#: gtk/gtknotebook.c:635
++#: ../gtk/gtknotebook.c:635
+ msgid "Scrollable"
+ msgstr "Rullningsbar"
+
+-#: gtk/gtknotebook.c:636
++#: ../gtk/gtknotebook.c:636
+ msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
+-msgstr ""
+-"Om SANT kommer rullningspilar att läggas till om det finns fler flikar än "
+-"vad som ryms"
++msgstr "Om SANT kommer rullningspilar att läggas till om det finns fler flikar än vad som ryms"
+
+-#: gtk/gtknotebook.c:642
++#: ../gtk/gtknotebook.c:642
+ msgid "Enable Popup"
+ msgstr "Använd popupmeny"
+
+-#: gtk/gtknotebook.c:643
+-msgid ""
+-"If TRUE, pressing the right mouse button on the notebook pops up a menu that "
+-"you can use to go to a page"
+-msgstr ""
+-"Om SANT kommer ett tryck på höger musknapp på flikhäftet att visa en "
+-"popupmeny som du kan använda för att gå till en sida"
++#: ../gtk/gtknotebook.c:643
++msgid "If TRUE, pressing the right mouse button on the notebook pops up a menu that you can use to go to a page"
++msgstr "Om SANT kommer ett tryck på höger musknapp på flikhäftet att visa en popupmeny som du kan använda för att gå till en sida"
+
+-#: gtk/gtknotebook.c:650
++#: ../gtk/gtknotebook.c:650
+ msgid "Whether tabs should have homogeneous sizes"
+ msgstr "Huruvida flikar ska ha samma storlek"
+
+-#: gtk/gtknotebook.c:656
++#: ../gtk/gtknotebook.c:656
+ msgid "Group ID"
+ msgstr "Grupp-id"
+
+-#: gtk/gtknotebook.c:657
++#: ../gtk/gtknotebook.c:657
+ msgid "Group ID for tabs drag and drop"
+ msgstr "Grupp-id för flikarnas drag-och-släpp"
+
+-#: gtk/gtknotebook.c:673 gtk/gtkradioaction.c:128 gtk/gtkradiobutton.c:82
+-#: gtk/gtkradiomenuitem.c:342 gtk/gtkradiotoolbutton.c:65
++#: ../gtk/gtknotebook.c:673
++#: ../gtk/gtkradioaction.c:128
++#: ../gtk/gtkradiobutton.c:82
++#: ../gtk/gtkradiomenuitem.c:342
++#: ../gtk/gtkradiotoolbutton.c:65
+ msgid "Group"
+ msgstr "Grupp"
+
+-#: gtk/gtknotebook.c:674
++#: ../gtk/gtknotebook.c:674
+ msgid "Group for tabs drag and drop"
+ msgstr "Grupp för flikarnas drag-och-släpp"
+
+-#: gtk/gtknotebook.c:680
++#: ../gtk/gtknotebook.c:680
+ msgid "Tab label"
+ msgstr "Fliketikett"
+
+-#: gtk/gtknotebook.c:681
++#: ../gtk/gtknotebook.c:681
+ msgid "The string displayed on the child's tab label"
+ msgstr "Strängen som visas på barnets fliketikett"
+
+-#: gtk/gtknotebook.c:687
++#: ../gtk/gtknotebook.c:687
+ msgid "Menu label"
+ msgstr "Menyetikett"
+
+-#: gtk/gtknotebook.c:688
++#: ../gtk/gtknotebook.c:688
+ msgid "The string displayed in the child's menu entry"
+ msgstr "Strängen som visas i barnets menyobjekt"
+
+-#: gtk/gtknotebook.c:701
++#: ../gtk/gtknotebook.c:701
+ msgid "Tab expand"
+ msgstr "Flikexpandering"
+
+-#: gtk/gtknotebook.c:702
++#: ../gtk/gtknotebook.c:702
+ msgid "Whether to expand the child's tab or not"
+ msgstr "Huruvida barnets flik ska expanderas eller inte"
+
+-#: gtk/gtknotebook.c:708
++#: ../gtk/gtknotebook.c:708
+ msgid "Tab fill"
+ msgstr "Flikfyllning"
+
+-#: gtk/gtknotebook.c:709
++#: ../gtk/gtknotebook.c:709
+ msgid "Whether the child's tab should fill the allocated area or not"
+ msgstr "Huruvida barnets flik ska fylla det allokerade området eller inte"
+
+-#: gtk/gtknotebook.c:715
++#: ../gtk/gtknotebook.c:715
+ msgid "Tab pack type"
+ msgstr "Flikpackningstyp"
+
+-#: gtk/gtknotebook.c:722
++#: ../gtk/gtknotebook.c:722
+ msgid "Tab reorderable"
+ msgstr "Omarrangeringsbar flik"
+
+-#: gtk/gtknotebook.c:723
++#: ../gtk/gtknotebook.c:723
+ msgid "Whether the tab is reorderable by user action or not"
+ msgstr "Huruvida fliken är omarrangeringsbar av en användaråtgärd eller inte"
+
+-#: gtk/gtknotebook.c:729
++#: ../gtk/gtknotebook.c:729
+ msgid "Tab detachable"
+ msgstr "Flik löstagbar"
+
+-#: gtk/gtknotebook.c:730
++#: ../gtk/gtknotebook.c:730
+ msgid "Whether the tab is detachable"
+ msgstr "Huruvida fliken är möjlig att koppla loss."
+
+-#: gtk/gtknotebook.c:745 gtk/gtkscrollbar.c:83
++#: ../gtk/gtknotebook.c:745
++#: ../gtk/gtkscrollbar.c:83
+ msgid "Secondary backward stepper"
+ msgstr "Sekundär baklängesstegare"
+
+-#: gtk/gtknotebook.c:746
+-msgid ""
+-"Display a second backward arrow button on the opposite end of the tab area"
++#: ../gtk/gtknotebook.c:746
++msgid "Display a second backward arrow button on the opposite end of the tab area"
+ msgstr "Visa en andra bakåtpil-knapp på motsatt sida av flikområdet"
+
+-#: gtk/gtknotebook.c:761 gtk/gtkscrollbar.c:91
++#: ../gtk/gtknotebook.c:761
++#: ../gtk/gtkscrollbar.c:91
+ msgid "Secondary forward stepper"
+ msgstr "Sekundär framlängesstegare"
+
+-#: gtk/gtknotebook.c:762
+-msgid ""
+-"Display a second forward arrow button on the opposite end of the tab area"
++#: ../gtk/gtknotebook.c:762
++msgid "Display a second forward arrow button on the opposite end of the tab area"
+ msgstr "Visa en andra framåtpil-knapp på motsatt sida av flikområdet"
+
+-#: gtk/gtknotebook.c:776 gtk/gtkscrollbar.c:67
++#: ../gtk/gtknotebook.c:776
++#: ../gtk/gtkscrollbar.c:67
+ msgid "Backward stepper"
+ msgstr "Baklängesstegare"
+
+-#: gtk/gtknotebook.c:777 gtk/gtkscrollbar.c:68
++#: ../gtk/gtknotebook.c:777
++#: ../gtk/gtkscrollbar.c:68
+ msgid "Display the standard backward arrow button"
+ msgstr "Visa standardknappen med baklängespil"
+
+-#: gtk/gtknotebook.c:791 gtk/gtkscrollbar.c:75
++#: ../gtk/gtknotebook.c:791
++#: ../gtk/gtkscrollbar.c:75
+ msgid "Forward stepper"
+ msgstr "Framåtstegare"
+
+-#: gtk/gtknotebook.c:792 gtk/gtkscrollbar.c:76
++#: ../gtk/gtknotebook.c:792
++#: ../gtk/gtkscrollbar.c:76
+ msgid "Display the standard forward arrow button"
+ msgstr "Visa standardknappen med framåtpil"
+
+-#: gtk/gtknotebook.c:806
++#: ../gtk/gtknotebook.c:806
+ msgid "Tab overlap"
+ msgstr "Fliköverlappning"
+
+-#: gtk/gtknotebook.c:807
++#: ../gtk/gtknotebook.c:807
+ msgid "Size of tab overlap area"
+ msgstr "Storlek på fliköverlappningsområdet"
+
+-#: gtk/gtknotebook.c:822
++#: ../gtk/gtknotebook.c:822
+ msgid "Tab curvature"
+ msgstr "Flikdeformering"
+
+-#: gtk/gtknotebook.c:823
++#: ../gtk/gtknotebook.c:823
+ msgid "Size of tab curvature"
+ msgstr "Storlek på flikdeformering"
+
+-#: gtk/gtknotebook.c:839
++#: ../gtk/gtknotebook.c:839
+ msgid "Arrow spacing"
+ msgstr "Pilutrymme"
+
+-#: gtk/gtknotebook.c:840
++#: ../gtk/gtknotebook.c:840
+ msgid "Scroll arrow spacing"
+ msgstr "Utrymme för rullningspil"
+
+-#: gtk/gtkobject.c:370
++#: ../gtk/gtkobject.c:370
+ msgid "User Data"
+ msgstr "Användardata"
+
+-#: gtk/gtkobject.c:371
++#: ../gtk/gtkobject.c:371
+ msgid "Anonymous User Data Pointer"
+ msgstr "Pekare till anonym användardata"
+
+-#: gtk/gtkoptionmenu.c:162
++#: ../gtk/gtkoptionmenu.c:162
+ msgid "The menu of options"
+ msgstr "Alternativmenyn"
+
+-#: gtk/gtkoptionmenu.c:169
++#: ../gtk/gtkoptionmenu.c:169
+ msgid "Size of dropdown indicator"
+ msgstr "Storlek på nedfällningsindikator"
+
+-#: gtk/gtkoptionmenu.c:175
++#: ../gtk/gtkoptionmenu.c:175
+ msgid "Spacing around indicator"
+ msgstr "Utrymme runt indikator"
+
+-#: gtk/gtkpaned.c:219
+-msgid ""
+-"Position of paned separator in pixels (0 means all the way to the left/top)"
+-msgstr ""
+-"Position på panelavgränsare i bildpunkter (0 betyder längst till vänster/"
+-"överst)"
++#: ../gtk/gtkpaned.c:219
++msgid "Position of paned separator in pixels (0 means all the way to the left/top)"
++msgstr "Position på panelavgränsare i bildpunkter (0 betyder längst till vänster/överst)"
+
+-#: gtk/gtkpaned.c:227
++#: ../gtk/gtkpaned.c:227
+ msgid "Position Set"
+ msgstr "Inställd position"
+
+-#: gtk/gtkpaned.c:228
++#: ../gtk/gtkpaned.c:228
+ msgid "TRUE if the Position property should be used"
+ msgstr "SANT om positionsegenskapen ska användas"
+
+-#: gtk/gtkpaned.c:234
++#: ../gtk/gtkpaned.c:234
+ msgid "Handle Size"
+ msgstr "Storlek på handtag"
+
+-#: gtk/gtkpaned.c:235
++#: ../gtk/gtkpaned.c:235
+ msgid "Width of handle"
+ msgstr "Bredd på handtag"
+
+-#: gtk/gtkpaned.c:251
++#: ../gtk/gtkpaned.c:251
+ msgid "Minimal Position"
+ msgstr "Minimal position"
+
+-#: gtk/gtkpaned.c:252
++#: ../gtk/gtkpaned.c:252
+ msgid "Smallest possible value for the \"position\" property"
+ msgstr "Minsta möjliga värde för egenskapen \"position\""
+
+-#: gtk/gtkpaned.c:269
++#: ../gtk/gtkpaned.c:269
+ msgid "Maximal Position"
+ msgstr "Maximal position"
+
+-#: gtk/gtkpaned.c:270
++#: ../gtk/gtkpaned.c:270
+ msgid "Largest possible value for the \"position\" property"
+ msgstr "Största möjliga värde för egenskapen \"position\""
+
+-#: gtk/gtkpaned.c:287
++#: ../gtk/gtkpaned.c:287
+ msgid "Resize"
+ msgstr "Ändra storlek"
+
+-#: gtk/gtkpaned.c:288
++#: ../gtk/gtkpaned.c:288
+ msgid "If TRUE, the child expands and shrinks along with the paned widget"
+ msgstr "Om SANT expanderar barnet och krymper tillsammans med panelwidgeten"
+
+-#: gtk/gtkpaned.c:303
++#: ../gtk/gtkpaned.c:303
+ msgid "Shrink"
+ msgstr "Krymp"
+
+-#: gtk/gtkpaned.c:304
++#: ../gtk/gtkpaned.c:304
+ msgid "If TRUE, the child can be made smaller than its requisition"
+ msgstr "Om SANT kan barnet göras mindre än dess begäran"
+
+-#: gtk/gtkplug.c:150 gtk/gtkstatusicon.c:285
++#: ../gtk/gtkplug.c:150
++#: ../gtk/gtkstatusicon.c:285
+ msgid "Embedded"
+ msgstr "Inbäddad"
+
+-#: gtk/gtkplug.c:151
++#: ../gtk/gtkplug.c:151
+ msgid "Whether or not the plug is embedded"
+ msgstr "Huruvida pluggen är inbäddad eller inte"
+
+-#: gtk/gtkplug.c:165
++#: ../gtk/gtkplug.c:165
+ msgid "Socket Window"
+ msgstr "Uttagsfönster"
+
+-#: gtk/gtkplug.c:166
++#: ../gtk/gtkplug.c:166
+ msgid "The window of the socket the plug is embedded in"
+ msgstr "Fönstret för uttaget som pluggen är inbäddad i"
+
+-#: gtk/gtkpreview.c:102
+-msgid ""
+-"Whether the preview widget should take up the entire space it is allocated"
+-msgstr ""
+-"Huruvida förhandsvisningswidgeten ska fylla ut hela det utrymme det har "
+-"allokerats"
++#: ../gtk/gtkpreview.c:102
++msgid "Whether the preview widget should take up the entire space it is allocated"
++msgstr "Huruvida förhandsvisningswidgeten ska fylla ut hela det utrymme det har allokerats"
+
+-#: gtk/gtkprinter.c:124
++#: ../gtk/gtkprinter.c:124
+ msgid "Name of the printer"
+ msgstr "Namn på skrivaren"
+
+-#: gtk/gtkprinter.c:130
++#: ../gtk/gtkprinter.c:130
+ msgid "Backend"
+ msgstr "Bakände"
+
+-#: gtk/gtkprinter.c:131
++#: ../gtk/gtkprinter.c:131
+ msgid "Backend for the printer"
+ msgstr "Bakände för skrivaren"
+
+-#: gtk/gtkprinter.c:137
++#: ../gtk/gtkprinter.c:137
+ msgid "Is Virtual"
+ msgstr "Är virtuell"
+
+-#: gtk/gtkprinter.c:138
++#: ../gtk/gtkprinter.c:138
+ msgid "FALSE if this represents a real hardware printer"
+ msgstr "FALSE om detta representerar en riktig hårdvaruskrivare"
+
+-#: gtk/gtkprinter.c:144
++#: ../gtk/gtkprinter.c:144
+ msgid "Accepts PDF"
+ msgstr "Accepterar PDF"
+
+-#: gtk/gtkprinter.c:145
++#: ../gtk/gtkprinter.c:145
+ msgid "TRUE if this printer can accept PDF"
+ msgstr "TRUE om denna skrivare kan ta emot PDF"
+
+-#: gtk/gtkprinter.c:151
++#: ../gtk/gtkprinter.c:151
+ msgid "Accepts PostScript"
+ msgstr "Accepterar PostScript"
+
+-#: gtk/gtkprinter.c:152
++#: ../gtk/gtkprinter.c:152
+ msgid "TRUE if this printer can accept PostScript"
+ msgstr "TRUE om denna skrivare kan ta emot PostScript"
+
+-#: gtk/gtkprinter.c:158
++#: ../gtk/gtkprinter.c:158
+ msgid "State Message"
+ msgstr "Tillståndsmeddelande"
+
+-#: gtk/gtkprinter.c:159
++#: ../gtk/gtkprinter.c:159
+ msgid "String giving the current state of the printer"
+ msgstr "Sträng som ger aktuellt tillstånd för skrivaren"
+
+-#: gtk/gtkprinter.c:165
++#: ../gtk/gtkprinter.c:165
+ msgid "Location"
+ msgstr "Plats"
+
+-#: gtk/gtkprinter.c:166
++#: ../gtk/gtkprinter.c:166
+ msgid "The location of the printer"
+ msgstr "Platsen för skrivaren"
+
+ # Osäker.
+-#: gtk/gtkprinter.c:173
++#: ../gtk/gtkprinter.c:173
+ msgid "The icon name to use for the printer"
+ msgstr "Ikonnamnet att använda för skrivaren"
+
+-#: gtk/gtkprinter.c:179
++#: ../gtk/gtkprinter.c:179
+ msgid "Job Count"
+ msgstr "Jobbantal"
+
+-#: gtk/gtkprinter.c:180
++#: ../gtk/gtkprinter.c:180
+ msgid "Number of jobs queued in the printer"
+ msgstr "Antalet jobb som finns i skrivarens kö"
+
+-#: gtk/gtkprinter.c:198
++#: ../gtk/gtkprinter.c:198
+ msgid "Paused Printer"
+ msgstr "Pausad skrivare"
+
+-#: gtk/gtkprinter.c:199
++#: ../gtk/gtkprinter.c:199
+ msgid "TRUE if this printer is paused"
+ msgstr "TRUE om denna skrivare är pausad"
+
+-#: gtk/gtkprinter.c:212
++#: ../gtk/gtkprinter.c:212
+ msgid "Accepting Jobs"
+ msgstr "Accepterar jobb"
+
+-#: gtk/gtkprinter.c:213
++#: ../gtk/gtkprinter.c:213
+ msgid "TRUE if this printer is accepting new jobs"
+ msgstr "TRUE om denna skrivare accepterar nya jobb"
+
+-#: gtk/gtkprinteroptionwidget.c:123
++#: ../gtk/gtkprinteroptionwidget.c:123
+ msgid "Source option"
+ msgstr "Källalternativ"
+
+-#: gtk/gtkprinteroptionwidget.c:124
++#: ../gtk/gtkprinteroptionwidget.c:124
+ msgid "The PrinterOption backing this widget"
+ msgstr "Den PrinterOption som står bakom denna widget"
+
+-#: gtk/gtkprintjob.c:117
++#: ../gtk/gtkprintjob.c:117
+ msgid "Title of the print job"
+ msgstr "Titel på utskriftsjobbet"
+
+-#: gtk/gtkprintjob.c:125
++#: ../gtk/gtkprintjob.c:125
+ msgid "Printer"
+ msgstr "Skrivare"
+
+-#: gtk/gtkprintjob.c:126
++#: ../gtk/gtkprintjob.c:126
+ msgid "Printer to print the job to"
+ msgstr "Skrivare att skriva ut jobbet till"
+
+-#: gtk/gtkprintjob.c:134
++#: ../gtk/gtkprintjob.c:134
+ msgid "Settings"
+ msgstr "Inställningar"
+
+-#: gtk/gtkprintjob.c:135
++#: ../gtk/gtkprintjob.c:135
+ msgid "Printer settings"
+ msgstr "Skrivarinställningar"
+
+-#: gtk/gtkprintjob.c:143 gtk/gtkprintjob.c:144 gtk/gtkprintunixdialog.c:258
++#: ../gtk/gtkprintjob.c:143
++#: ../gtk/gtkprintjob.c:144
++#: ../gtk/gtkprintunixdialog.c:258
+ msgid "Page Setup"
+ msgstr "Sidinställning"
+
+-#: gtk/gtkprintjob.c:152 gtk/gtkprintoperation.c:1013
++#: ../gtk/gtkprintjob.c:152
++#: ../gtk/gtkprintoperation.c:1013
+ msgid "Track Print Status"
+ msgstr "Spåra utskriftsstatus"
+
+-#: gtk/gtkprintjob.c:153
+-msgid ""
+-"TRUE if the print job will continue to emit status-changed signals after the "
+-"print data has been sent to the printer or print server."
+-msgstr ""
+-"TRUE om utskriftsjobbet ska fortsätta att skicka statusändrade signaler "
+-"efter att utskriftsdata har skickats till skrivaren eller utskriftsservern."
++#: ../gtk/gtkprintjob.c:153
++msgid "TRUE if the print job will continue to emit status-changed signals after the print data has been sent to the printer or print server."
++msgstr "TRUE om utskriftsjobbet ska fortsätta att skicka statusändrade signaler efter att utskriftsdata har skickats till skrivaren eller utskriftsservern."
+
+-#: gtk/gtkprintoperation.c:885
++#: ../gtk/gtkprintoperation.c:885
+ msgid "Default Page Setup"
+ msgstr "Standardsidinställning"
+
+-#: gtk/gtkprintoperation.c:886
++#: ../gtk/gtkprintoperation.c:886
+ msgid "The GtkPageSetup used by default"
+ msgstr "GtkPageSetup som används som standard"
+
+-#: gtk/gtkprintoperation.c:904 gtk/gtkprintunixdialog.c:276
++#: ../gtk/gtkprintoperation.c:904
++#: ../gtk/gtkprintunixdialog.c:276
+ msgid "Print Settings"
+ msgstr "Utskriftsinställningar"
+
+-#: gtk/gtkprintoperation.c:905 gtk/gtkprintunixdialog.c:277
++#: ../gtk/gtkprintoperation.c:905
++#: ../gtk/gtkprintunixdialog.c:277
+ msgid "The GtkPrintSettings used for initializing the dialog"
+ msgstr "GtkPrintSettings som används för att initiera dialogen"
+
+-#: gtk/gtkprintoperation.c:923
++#: ../gtk/gtkprintoperation.c:923
+ msgid "Job Name"
+ msgstr "Jobbnamn"
+
+-#: gtk/gtkprintoperation.c:924
++#: ../gtk/gtkprintoperation.c:924
+ msgid "A string used for identifying the print job."
+ msgstr "En sträng som används för att identifiera utskriftsjobbet."
+
+-#: gtk/gtkprintoperation.c:948
++#: ../gtk/gtkprintoperation.c:948
+ msgid "Number of Pages"
+ msgstr "Antal sidor"
+
+-#: gtk/gtkprintoperation.c:949
++#: ../gtk/gtkprintoperation.c:949
+ msgid "The number of pages in the document."
+ msgstr "Antalet sidor i dokumentet."
+
+-#: gtk/gtkprintoperation.c:970 gtk/gtkprintunixdialog.c:266
++#: ../gtk/gtkprintoperation.c:970
++#: ../gtk/gtkprintunixdialog.c:266
+ msgid "Current Page"
+ msgstr "Aktuell sida"
+
+-#: gtk/gtkprintoperation.c:971 gtk/gtkprintunixdialog.c:267
++#: ../gtk/gtkprintoperation.c:971
++#: ../gtk/gtkprintunixdialog.c:267
+ msgid "The current page in the document"
+ msgstr "Aktuella sidan i dokumentet"
+
+-#: gtk/gtkprintoperation.c:992
++#: ../gtk/gtkprintoperation.c:992
+ msgid "Use full page"
+ msgstr "Använd hela sidan"
+
+-#: gtk/gtkprintoperation.c:993
+-msgid ""
+-"TRUE if the origin of the context should be at the corner of the page and "
+-"not the corner of the imageable area"
+-msgstr ""
+-"TRUE om sammanhangets ursprung bör vara hörnet av sidan och inte hörnet av "
+-"det bildmässiga området"
++#: ../gtk/gtkprintoperation.c:993
++msgid "TRUE if the origin of the context should be at the corner of the page and not the corner of the imageable area"
++msgstr "TRUE om sammanhangets ursprung bör vara hörnet av sidan och inte hörnet av det bildmässiga området"
+
+-#: gtk/gtkprintoperation.c:1014
+-msgid ""
+-"TRUE if the print operation will continue to report on the print job status "
+-"after the print data has been sent to the printer or print server."
+-msgstr ""
+-"TRUE om utskriftsoperationen ska fortsätta att rapportera om statusen för "
+-"utskriftsjobbet efter att utskriftsdata har skickats till skrivaren eller "
+-"utskriftsservern."
++#: ../gtk/gtkprintoperation.c:1014
++msgid "TRUE if the print operation will continue to report on the print job status after the print data has been sent to the printer or print server."
++msgstr "TRUE om utskriftsoperationen ska fortsätta att rapportera om statusen för utskriftsjobbet efter att utskriftsdata har skickats till skrivaren eller utskriftsservern."
+
+-#: gtk/gtkprintoperation.c:1031
++#: ../gtk/gtkprintoperation.c:1031
+ msgid "Unit"
+ msgstr "Enhet"
+
+-#: gtk/gtkprintoperation.c:1032
++#: ../gtk/gtkprintoperation.c:1032
+ msgid "The unit in which distances can be measured in the context"
+ msgstr "Enheten som avstånd kan mätas efter i sammanhanget"
+
+-#: gtk/gtkprintoperation.c:1049
++#: ../gtk/gtkprintoperation.c:1049
+ msgid "Show Dialog"
+ msgstr "Visa dialog"
+
+-#: gtk/gtkprintoperation.c:1050
++#: ../gtk/gtkprintoperation.c:1050
+ msgid "TRUE if a progress dialog is shown while printing."
+ msgstr "TRUE om en förloppsdialog visas vid utskrift."
+
+-#: gtk/gtkprintoperation.c:1073
++#: ../gtk/gtkprintoperation.c:1073
+ msgid "Allow Async"
+ msgstr "Tillåt asynkront"
+
+-#: gtk/gtkprintoperation.c:1074
++#: ../gtk/gtkprintoperation.c:1074
+ msgid "TRUE if print process may run asynchronous."
+ msgstr "TRUE om en utskriftsprocess kan köras asynkront."
+
+-#: gtk/gtkprintoperation.c:1096 gtk/gtkprintoperation.c:1097
++#: ../gtk/gtkprintoperation.c:1096
++#: ../gtk/gtkprintoperation.c:1097
+ msgid "Export filename"
+ msgstr "Exportera filnamn"
+
+-#: gtk/gtkprintoperation.c:1111
++#: ../gtk/gtkprintoperation.c:1111
+ msgid "Status"
+ msgstr "Status"
+
+-#: gtk/gtkprintoperation.c:1112
++#: ../gtk/gtkprintoperation.c:1112
+ msgid "The status of the print operation"
+ msgstr "Statusen för utskriftsåtgärden"
+
+-#: gtk/gtkprintoperation.c:1132
++#: ../gtk/gtkprintoperation.c:1132
+ msgid "Status String"
+ msgstr "Statussträng"
+
+-#: gtk/gtkprintoperation.c:1133
++#: ../gtk/gtkprintoperation.c:1133
+ msgid "A human-readable description of the status"
+ msgstr "En läsbar beskrivning av statusen"
+
+-#: gtk/gtkprintoperation.c:1151
++#: ../gtk/gtkprintoperation.c:1151
+ msgid "Custom tab label"
+ msgstr "Anpassad fliketikett"
+
+-#: gtk/gtkprintoperation.c:1152
++#: ../gtk/gtkprintoperation.c:1152
+ msgid "Label for the tab containing custom widgets."
+ msgstr "Etikett för fliken som innehåller anpassade widgetar."
+
+-#: gtk/gtkprintunixdialog.c:259
++#: ../gtk/gtkprintunixdialog.c:259
+ msgid "The GtkPageSetup to use"
+ msgstr "GtkPageSetup att använda"
+
+-#: gtk/gtkprintunixdialog.c:284
++#: ../gtk/gtkprintunixdialog.c:284
+ msgid "Selected Printer"
+ msgstr "Markerad skrivare"
+
+-#: gtk/gtkprintunixdialog.c:285
++#: ../gtk/gtkprintunixdialog.c:285
+ msgid "The GtkPrinter which is selected"
+ msgstr "GtkPrinter som är markerad"
+
+-#: gtk/gtkprogress.c:102
++#: ../gtk/gtkprogress.c:102
+ msgid "Activity mode"
+ msgstr "Aktivitetsläge"
+
+-#: gtk/gtkprogress.c:103
+-msgid ""
+-"If TRUE, the GtkProgress is in activity mode, meaning that it signals "
+-"something is happening, but not how much of the activity is finished. This "
+-"is used when you're doing something but don't know how long it will take."
+-msgstr ""
+-"Om SANT är GtkProgress i aktivitetsläge, vilket betyder att det signalerar "
+-"att något händer, men inte hur mycket aktiviteten är slutförd. Detta används "
+-"när du gör någonting som du inte vet hur lång tid det kommer att ta."
++#: ../gtk/gtkprogress.c:103
++msgid "If TRUE, the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something but don't know how long it will take."
++msgstr "Om SANT är GtkProgress i aktivitetsläge, vilket betyder att det signalerar att något händer, men inte hur mycket aktiviteten är slutförd. Detta används när du gör någonting som du inte vet hur lång tid det kommer att ta."
+
+-#: gtk/gtkprogress.c:111
++#: ../gtk/gtkprogress.c:111
+ msgid "Show text"
+ msgstr "Visa text"
+
+-#: gtk/gtkprogress.c:112
++#: ../gtk/gtkprogress.c:112
+ msgid "Whether the progress is shown as text."
+ msgstr "Huruvida förloppet visas som text."
+
+-#: gtk/gtkprogressbar.c:119
++#: ../gtk/gtkprogressbar.c:119
+ msgid "The GtkAdjustment connected to the progress bar (Deprecated)"
+ msgstr "GtkAdjustment ansluten till förloppsmätaren (föråldrat)"
+
+-#: gtk/gtkprogressbar.c:135
++#: ../gtk/gtkprogressbar.c:135
+ msgid "Bar style"
+ msgstr "Mätarstil"
+
+-#: gtk/gtkprogressbar.c:136
++#: ../gtk/gtkprogressbar.c:136
+ msgid "Specifies the visual style of the bar in percentage mode (Deprecated)"
+ msgstr "Anger utseendet på mätaren i procentläge (föråldrat)"
+
+-#: gtk/gtkprogressbar.c:144
++#: ../gtk/gtkprogressbar.c:144
+ msgid "Activity Step"
+ msgstr "Aktivitetssteg"
+
+-#: gtk/gtkprogressbar.c:145
++#: ../gtk/gtkprogressbar.c:145
+ msgid "The increment used for each iteration in activity mode (Deprecated)"
+ msgstr "Ökningen som används för varje iterering i aktivitetsläge (föråldrat)"
+
+-#: gtk/gtkprogressbar.c:152
++#: ../gtk/gtkprogressbar.c:152
+ msgid "Activity Blocks"
+ msgstr "Aktivitetsblock"
+
+-#: gtk/gtkprogressbar.c:153
+-msgid ""
+-"The number of blocks which can fit in the progress bar area in activity mode "
+-"(Deprecated)"
+-msgstr ""
+-"Antalet block som kan passa in i förloppsmätarområdet i aktivitetsläge "
+-"(föråldrat)"
++#: ../gtk/gtkprogressbar.c:153
++msgid "The number of blocks which can fit in the progress bar area in activity mode (Deprecated)"
++msgstr "Antalet block som kan passa in i förloppsmätarområdet i aktivitetsläge (föråldrat)"
+
+-#: gtk/gtkprogressbar.c:160
++#: ../gtk/gtkprogressbar.c:160
+ msgid "Discrete Blocks"
+ msgstr "Diskreta block"
+
+-#: gtk/gtkprogressbar.c:161
+-msgid ""
+-"The number of discrete blocks in a progress bar (when shown in the discrete "
+-"style)"
+-msgstr ""
+-"Antalet diskreta block i en förloppsmätare (när den visas i diskret stil)"
++#: ../gtk/gtkprogressbar.c:161
++msgid "The number of discrete blocks in a progress bar (when shown in the discrete style)"
++msgstr "Antalet diskreta block i en förloppsmätare (när den visas i diskret stil)"
+
+-#: gtk/gtkprogressbar.c:168
++#: ../gtk/gtkprogressbar.c:168
+ msgid "Fraction"
+ msgstr "Andel"
+
+-#: gtk/gtkprogressbar.c:169
++#: ../gtk/gtkprogressbar.c:169
+ msgid "The fraction of total work that has been completed"
+ msgstr "Andelen av det totala arbetet som har färdigställts"
+
+-#: gtk/gtkprogressbar.c:176
++#: ../gtk/gtkprogressbar.c:176
+ msgid "Pulse Step"
+ msgstr "Pulssteg"
+
+-#: gtk/gtkprogressbar.c:177
++#: ../gtk/gtkprogressbar.c:177
+ msgid "The fraction of total progress to move the bouncing block when pulsed"
+-msgstr ""
+-"Andelen av det totala förloppet att flytta det studsande blocket när det "
+-"pulsas"
++msgstr "Andelen av det totala förloppet att flytta det studsande blocket när det pulsas"
+
+-#: gtk/gtkprogressbar.c:185
++#: ../gtk/gtkprogressbar.c:185
+ msgid "Text to be displayed in the progress bar"
+ msgstr "Text att visa i förloppsmätaren"
+
+-#: gtk/gtkprogressbar.c:207
+-msgid ""
+-"The preferred place to ellipsize the string, if the progress bar does not "
+-"have enough room to display the entire string, if at all."
+-msgstr ""
+-"Den föredragna platsen att elliptisera strängen, om det alls ska göras, om "
+-"förloppsmätaren inte har tillräckligt med utrymme för att visa hela strängen."
++#: ../gtk/gtkprogressbar.c:207
++msgid "The preferred place to ellipsize the string, if the progress bar does not have enough room to display the entire string, if at all."
++msgstr "Den föredragna platsen att elliptisera strängen, om det alls ska göras, om förloppsmätaren inte har tillräckligt med utrymme för att visa hela strängen."
+
+-#: gtk/gtkprogressbar.c:214
++#: ../gtk/gtkprogressbar.c:214
+ msgid "XSpacing"
+ msgstr "X-utrymme"
+
+-#: gtk/gtkprogressbar.c:215
++#: ../gtk/gtkprogressbar.c:215
+ msgid "Extra spacing applied to the width of a progress bar."
+ msgstr "Extra utrymme tillämpas till bredden för en förloppsmätare."
+
+-#: gtk/gtkprogressbar.c:220
++#: ../gtk/gtkprogressbar.c:220
+ msgid "YSpacing"
+ msgstr "YUtrymme"
+
+-#: gtk/gtkprogressbar.c:221
++#: ../gtk/gtkprogressbar.c:221
+ msgid "Extra spacing applied to the height of a progress bar."
+ msgstr "Extra utrymme tillämpas till höjden för en förloppsmätare."
+
+-#: gtk/gtkprogressbar.c:234
++#: ../gtk/gtkprogressbar.c:234
+ msgid "Min horizontal bar width"
+ msgstr "Minsta horisontella stapelbredd"
+
+-#: gtk/gtkprogressbar.c:235
++#: ../gtk/gtkprogressbar.c:235
+ msgid "The minimum horizontal width of the progress bar"
+ msgstr "Den minsta horisontella bredden för förloppsmätaren"
+
+-#: gtk/gtkprogressbar.c:247
++#: ../gtk/gtkprogressbar.c:247
+ msgid "Min horizontal bar height"
+ msgstr "Minsta horisontella stapelhöjd"
+
+-#: gtk/gtkprogressbar.c:248
++#: ../gtk/gtkprogressbar.c:248
+ msgid "Minimum horizontal height of the progress bar"
+ msgstr "Minsta horisontella höjden för förloppsmätaren"
+
+-#: gtk/gtkprogressbar.c:260
++#: ../gtk/gtkprogressbar.c:260
+ msgid "Min vertical bar width"
+ msgstr "Minsta vertikala stapelbredd"
+
+-#: gtk/gtkprogressbar.c:261
++#: ../gtk/gtkprogressbar.c:261
+ msgid "The minimum vertical width of the progress bar"
+ msgstr "Den minsta vertikala bredden för förloppsmätaren"
+
+-#: gtk/gtkprogressbar.c:273
++#: ../gtk/gtkprogressbar.c:273
+ msgid "Min vertical bar height"
+ msgstr "Minsta vertikala stapelhöjd"
+
+-#: gtk/gtkprogressbar.c:274
++#: ../gtk/gtkprogressbar.c:274
+ msgid "The minimum vertical height of the progress bar"
+ msgstr "Den minsta vertikala höjden för förloppsmätaren"
+
+-#: gtk/gtkradioaction.c:111
++#: ../gtk/gtkradioaction.c:111
+ msgid "The value"
+ msgstr "Värdet"
+
+-#: gtk/gtkradioaction.c:112
+-msgid ""
+-"The value returned by gtk_radio_action_get_current_value() when this action "
+-"is the current action of its group."
+-msgstr ""
+-"Värdet som returneras av gtk_radio_action_get_current_value() då denna "
+-"åtgärd är den aktuella åtgärden i sin grupp."
++#: ../gtk/gtkradioaction.c:112
++msgid "The value returned by gtk_radio_action_get_current_value() when this action is the current action of its group."
++msgstr "Värdet som returneras av gtk_radio_action_get_current_value() då denna åtgärd är den aktuella åtgärden i sin grupp."
+
+-#: gtk/gtkradioaction.c:129
++#: ../gtk/gtkradioaction.c:129
+ msgid "The radio action whose group this action belongs to."
+ msgstr "Den radioåtgärd vars grupp denna åtgärd tillhör."
+
+-#: gtk/gtkradioaction.c:144
++#: ../gtk/gtkradioaction.c:144
+ msgid "The current value"
+ msgstr "Det aktuella värdet"
+
+-#: gtk/gtkradioaction.c:145
+-msgid ""
+-"The value property of the currently active member of the group to which this "
+-"action belongs."
+-msgstr ""
+-"Värdet för den för närvarande aktiva medlemmen av gruppen till vilken denna "
+-"åtgärd hör till."
++#: ../gtk/gtkradioaction.c:145
++msgid "The value property of the currently active member of the group to which this action belongs."
++msgstr "Värdet för den för närvarande aktiva medlemmen av gruppen till vilken denna åtgärd hör till."
+
+-#: gtk/gtkradiobutton.c:83
++#: ../gtk/gtkradiobutton.c:83
+ msgid "The radio button whose group this widget belongs to."
+ msgstr "Den radioknapp vars grupp denna widget tillhör."
+
+-#: gtk/gtkradiomenuitem.c:343
++#: ../gtk/gtkradiomenuitem.c:343
+ msgid "The radio menu item whose group this widget belongs to."
+ msgstr "Det radioknappsobjekt vars grupp denna widget tillhör."
+
+-#: gtk/gtkradiotoolbutton.c:66
++#: ../gtk/gtkradiotoolbutton.c:66
+ msgid "The radio tool button whose group this button belongs to."
+ msgstr "Den radioknapp vars grupp denna knapp tillhör."
+
+-#: gtk/gtkrange.c:337
++#: ../gtk/gtkrange.c:337
+ msgid "Update policy"
+ msgstr "Uppdateringspolicy"
+
+-#: gtk/gtkrange.c:338
++#: ../gtk/gtkrange.c:338
+ msgid "How the range should be updated on the screen"
+ msgstr "Hur intervallet ska uppdateras på skärmen"
+
+-#: gtk/gtkrange.c:347
++#: ../gtk/gtkrange.c:347
+ msgid "The GtkAdjustment that contains the current value of this range object"
+-msgstr ""
+-"GtkAdjustment som innehåller det aktuella värdet på detta intervallobjekt"
++msgstr "GtkAdjustment som innehåller det aktuella värdet på detta intervallobjekt"
+
+-#: gtk/gtkrange.c:354
++#: ../gtk/gtkrange.c:354
+ msgid "Inverted"
+ msgstr "Inverterad"
+
+-#: gtk/gtkrange.c:355
++#: ../gtk/gtkrange.c:355
+ msgid "Invert direction slider moves to increase range value"
+-msgstr ""
+-"Invertera riktningen som rullningslisten flyttar sig för att öka "
+-"intervallvärdet"
++msgstr "Invertera riktningen som rullningslisten flyttar sig för att öka intervallvärdet"
+
+-#: gtk/gtkrange.c:362
++#: ../gtk/gtkrange.c:362
+ msgid "Lower stepper sensitivity"
+ msgstr "Lägre stegarkänslighet"
+
+-#: gtk/gtkrange.c:363
+-msgid ""
+-"The sensitivity policy for the stepper that points to the adjustment's lower "
+-"side"
++#: ../gtk/gtkrange.c:363
++msgid "The sensitivity policy for the stepper that points to the adjustment's lower side"
+ msgstr "Känslighetspolicyn för stegaren som pekar till justeringens lägre sida"
+
+-#: gtk/gtkrange.c:371
++#: ../gtk/gtkrange.c:371
+ msgid "Upper stepper sensitivity"
+ msgstr "Övre stegarkänslighet"
+
+-#: gtk/gtkrange.c:372
+-msgid ""
+-"The sensitivity policy for the stepper that points to the adjustment's upper "
+-"side"
++#: ../gtk/gtkrange.c:372
++msgid "The sensitivity policy for the stepper that points to the adjustment's upper side"
+ msgstr "Känslighetspolicyn för stegaren som pekar till justeringens övre sida"
+
+-#: gtk/gtkrange.c:389
++#: ../gtk/gtkrange.c:389
+ msgid "Show Fill Level"
+ msgstr "Visa fyllnadsnivå"
+
+-#: gtk/gtkrange.c:390
++#: ../gtk/gtkrange.c:390
+ msgid "Whether to display a fill level indicator graphics on trough."
+ msgstr "Huruvida en fyllnadsnivåindikator ska visas vid tråg."
+
+-#: gtk/gtkrange.c:406
++#: ../gtk/gtkrange.c:406
+ msgid "Restrict to Fill Level"
+ msgstr "Begränsa till fyllnadsnivå"
+
+-#: gtk/gtkrange.c:407
++#: ../gtk/gtkrange.c:407
+ msgid "Whether to restrict the upper boundary to the fill level."
+ msgstr "Huruvida den övre fyllnadsnivågränsen ska begränsas."
+
+-#: gtk/gtkrange.c:422
++#: ../gtk/gtkrange.c:422
+ msgid "Fill Level"
+ msgstr "Fyllnadsnivå"
+
+-#: gtk/gtkrange.c:423
++#: ../gtk/gtkrange.c:423
+ msgid "The fill level."
+ msgstr "Fyllnadsnivån."
+
+-#: gtk/gtkrange.c:431
++#: ../gtk/gtkrange.c:431
+ msgid "Slider Width"
+ msgstr "Bredd på rullningslist"
+
+-#: gtk/gtkrange.c:432
++#: ../gtk/gtkrange.c:432
+ msgid "Width of scrollbar or scale thumb"
+ msgstr "Bredd på rullningslisten eller skalning"
+
+-#: gtk/gtkrange.c:439
++#: ../gtk/gtkrange.c:439
+ msgid "Trough Border"
+ msgstr "Trågkant"
+
+ # Förslag mottages tacksamt
+-#: gtk/gtkrange.c:440
++#: ../gtk/gtkrange.c:440
+ msgid "Spacing between thumb/steppers and outer trough bevel"
+ msgstr "Utrymme mellan tumme/stegare och yttre trågavfasning"
+
+-#: gtk/gtkrange.c:447
++#: ../gtk/gtkrange.c:447
+ msgid "Stepper Size"
+ msgstr "Stegarstorlek"
+
+-#: gtk/gtkrange.c:448
++#: ../gtk/gtkrange.c:448
+ msgid "Length of step buttons at ends"
+ msgstr "Längd på stegknappar vid ändarna"
+
+-#: gtk/gtkrange.c:463
++#: ../gtk/gtkrange.c:463
+ msgid "Stepper Spacing"
+ msgstr "Stegarutrymme"
+
+-#: gtk/gtkrange.c:464
++#: ../gtk/gtkrange.c:464
+ msgid "Spacing between step buttons and thumb"
+ msgstr "Utrymme mellan stegknappar och steg"
+
+-#: gtk/gtkrange.c:471
++#: ../gtk/gtkrange.c:471
+ msgid "Arrow X Displacement"
+ msgstr "X-förflyttning av pil"
+
+-#: gtk/gtkrange.c:472
+-msgid ""
+-"How far in the x direction to move the arrow when the button is depressed"
++#: ../gtk/gtkrange.c:472
++msgid "How far in the x direction to move the arrow when the button is depressed"
+ msgstr "Hur långt bort i x-riktingen pilen ska flyttas då knappen trycks ned"
+
+-#: gtk/gtkrange.c:479
++#: ../gtk/gtkrange.c:479
+ msgid "Arrow Y Displacement"
+ msgstr "Y-förflyttning av pil"
+
+-#: gtk/gtkrange.c:480
+-msgid ""
+-"How far in the y direction to move the arrow when the button is depressed"
++#: ../gtk/gtkrange.c:480
++msgid "How far in the y direction to move the arrow when the button is depressed"
+ msgstr "Hur långt bort i y-riktningen pilen ska flyttas då knappen trycks ned"
+
+-#: gtk/gtkrange.c:488
++#: ../gtk/gtkrange.c:488
+ msgid "Draw slider ACTIVE during drag"
+ msgstr "Rita ut draglisten AKTIV under dragning"
+
+-#: gtk/gtkrange.c:489
+-msgid ""
+-"With this option set to TRUE, sliders will be drawn ACTIVE and with shadow "
+-"IN while they are dragged"
+-msgstr ""
+-"Med det här alternativ inställt till TRUE kommer draglister att ritas AKTIVA "
+-"och med skugga I när de dras"
++#: ../gtk/gtkrange.c:489
++msgid "With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged"
++msgstr "Med det här alternativ inställt till TRUE kommer draglister att ritas AKTIVA och med skugga I när de dras"
+
+-#: gtk/gtkrange.c:503
++#: ../gtk/gtkrange.c:503
+ msgid "Trough Side Details"
+ msgstr "Detaljer för trågsida"
+
+-#: gtk/gtkrange.c:504
+-msgid ""
+-"When TRUE, the parts of the trough on the two sides of the slider are drawn "
+-"with different details"
+-msgstr ""
+-"När TRUE kommer delarna av tråget på båda sidor av draglisten att ritas ut "
+-"med olika detaljer"
++#: ../gtk/gtkrange.c:504
++msgid "When TRUE, the parts of the trough on the two sides of the slider are drawn with different details"
++msgstr "När TRUE kommer delarna av tråget på båda sidor av draglisten att ritas ut med olika detaljer"
+
+-#: gtk/gtkrange.c:520
++#: ../gtk/gtkrange.c:520
+ msgid "Trough Under Steppers"
+ msgstr "Tråg under stegare"
+
+-#: gtk/gtkrange.c:521
+-msgid ""
+-"Whether to draw trough for full length of range or exclude the steppers and "
+-"spacing"
+-msgstr ""
+-"Huruvida tråget ska ritas ut för hela längden eller undanta stegarna och "
+-"mellanrum"
++#: ../gtk/gtkrange.c:521
++msgid "Whether to draw trough for full length of range or exclude the steppers and spacing"
++msgstr "Huruvida tråget ska ritas ut för hela längden eller undanta stegarna och mellanrum"
+
+-#: gtk/gtkrange.c:534
++#: ../gtk/gtkrange.c:534
+ msgid "Arrow scaling"
+ msgstr "Pilskalning"
+
+-#: gtk/gtkrange.c:535
++#: ../gtk/gtkrange.c:535
+ msgid "Arrow scaling with regard to scroll button size"
+ msgstr "Pilskalning med hänseende till storleken för rullningsknapp"
+
+-#: gtk/gtkrecentaction.c:679 gtk/gtkrecentchoosermenu.c:206
++#: ../gtk/gtkrecentaction.c:679
++#: ../gtk/gtkrecentchoosermenu.c:206
+ msgid "Show Numbers"
+ msgstr "Visa nummer"
+
+-#: gtk/gtkrecentaction.c:680 gtk/gtkrecentchoosermenu.c:207
++#: ../gtk/gtkrecentaction.c:680
++#: ../gtk/gtkrecentchoosermenu.c:207
+ msgid "Whether the items should be displayed with a number"
+ msgstr "Huruvida objekten ska visas med ett nummer"
+
+-#: gtk/gtkrecentchooser.c:120
++#: ../gtk/gtkrecentchooser.c:120
+ msgid "Recent Manager"
+ msgstr "Senaste hanterare"
+
+-#: gtk/gtkrecentchooser.c:121
++#: ../gtk/gtkrecentchooser.c:121
+ msgid "The RecentManager object to use"
+ msgstr "RecentManager-objektet att använda"
+
+-#: gtk/gtkrecentchooser.c:135
++#: ../gtk/gtkrecentchooser.c:135
+ msgid "Show Private"
+ msgstr "Visa privat"
+
+-#: gtk/gtkrecentchooser.c:136
++#: ../gtk/gtkrecentchooser.c:136
+ msgid "Whether the private items should be displayed"
+ msgstr "Huruvida privata objekt ska visas"
+
+-#: gtk/gtkrecentchooser.c:149
++#: ../gtk/gtkrecentchooser.c:149
+ msgid "Show Tooltips"
+ msgstr "Visa verktygstips"
+
+-#: gtk/gtkrecentchooser.c:150
++#: ../gtk/gtkrecentchooser.c:150
+ msgid "Whether there should be a tooltip on the item"
+ msgstr "Huruvida det ska finnas ett verktygstips på objektet"
+
+-#: gtk/gtkrecentchooser.c:162
++#: ../gtk/gtkrecentchooser.c:162
+ msgid "Show Icons"
+ msgstr "Visa ikoner"
+
+-#: gtk/gtkrecentchooser.c:163
++#: ../gtk/gtkrecentchooser.c:163
+ msgid "Whether there should be an icon near the item"
+ msgstr "Huruvida det ska finnas en ikon nära objektet"
+
+-#: gtk/gtkrecentchooser.c:178
++#: ../gtk/gtkrecentchooser.c:178
+ msgid "Show Not Found"
+ msgstr "Visa Hittades inte"
+
+-#: gtk/gtkrecentchooser.c:179
++#: ../gtk/gtkrecentchooser.c:179
+ msgid "Whether the items pointing to unavailable resources should be displayed"
+ msgstr "Huruvida objekt som pekar till otillgängliga resurser ska visas"
+
+-#: gtk/gtkrecentchooser.c:192
++#: ../gtk/gtkrecentchooser.c:192
+ msgid "Whether to allow multiple items to be selected"
+ msgstr "Huruvida att flera objekt kan väljas ska tillåtas"
+
+-#: gtk/gtkrecentchooser.c:205
++#: ../gtk/gtkrecentchooser.c:205
+ msgid "Local only"
+ msgstr "Endast lokala"
+
+-#: gtk/gtkrecentchooser.c:206
++#: ../gtk/gtkrecentchooser.c:206
+ msgid "Whether the selected resource(s) should be limited to local file: URIs"
+ msgstr "Huruvida de valda resurs(erna) ska begränsas till lokala file:-URI:er"
+
+-#: gtk/gtkrecentchooser.c:222 gtk/gtkrecentmanager.c:229
++#: ../gtk/gtkrecentchooser.c:222
++#: ../gtk/gtkrecentmanager.c:229
+ msgid "Limit"
+ msgstr "Gräns"
+
+-#: gtk/gtkrecentchooser.c:223
++#: ../gtk/gtkrecentchooser.c:223
+ msgid "The maximum number of items to be displayed"
+ msgstr "Maximalt antal objekt som ska visas"
+
+-#: gtk/gtkrecentchooser.c:237
++#: ../gtk/gtkrecentchooser.c:237
+ msgid "Sort Type"
+ msgstr "Sorteringstyp"
+
+-#: gtk/gtkrecentchooser.c:238
++#: ../gtk/gtkrecentchooser.c:238
+ msgid "The sorting order of the items displayed"
+ msgstr "Sorteringsordningen för visade objekt"
+
+-#: gtk/gtkrecentchooser.c:253
++#: ../gtk/gtkrecentchooser.c:253
+ msgid "The current filter for selecting which resources are displayed"
+ msgstr "Det aktuella filtret för val av vilka resurser som visas"
+
+-#: gtk/gtkrecentmanager.c:215
++#: ../gtk/gtkrecentmanager.c:215
+ msgid "The full path to the file to be used to store and read the list"
+-msgstr ""
+-"Fullständiga sökvägen till filen som ska användas för att lagra och läsa "
+-"listan"
++msgstr "Fullständiga sökvägen till filen som ska användas för att lagra och läsa listan"
+
+-#: gtk/gtkrecentmanager.c:230
+-msgid ""
+-"The maximum number of items to be returned by gtk_recent_manager_get_items()"
++#: ../gtk/gtkrecentmanager.c:230
++msgid "The maximum number of items to be returned by gtk_recent_manager_get_items()"
+ msgstr "Maximalt antal objekt att returnera av gtk_recent_manager_get_items()"
+
+-#: gtk/gtkrecentmanager.c:246
++#: ../gtk/gtkrecentmanager.c:246
+ msgid "The size of the recently used resources list"
+ msgstr "Storleken för senast använda resurslistan"
+
+-#: gtk/gtkruler.c:90
++#: ../gtk/gtkruler.c:90
+ msgid "Lower"
+ msgstr "Lägre"
+
+-#: gtk/gtkruler.c:91
++#: ../gtk/gtkruler.c:91
+ msgid "Lower limit of ruler"
+ msgstr "Lägre gräns för linjal"
+
+-#: gtk/gtkruler.c:100
++#: ../gtk/gtkruler.c:100
+ msgid "Upper"
+ msgstr "Övre"
+
+-#: gtk/gtkruler.c:101
++#: ../gtk/gtkruler.c:101
+ msgid "Upper limit of ruler"
+ msgstr "Övre gräns för linjal"
+
+-#: gtk/gtkruler.c:111
++#: ../gtk/gtkruler.c:111
+ msgid "Position of mark on the ruler"
+ msgstr "Position för märket på linjalen"
+
+-#: gtk/gtkruler.c:120
++#: ../gtk/gtkruler.c:120
+ msgid "Max Size"
+ msgstr "Maxstorlek"
+
+-#: gtk/gtkruler.c:121
++#: ../gtk/gtkruler.c:121
+ msgid "Maximum size of the ruler"
+ msgstr "Största storlek på linjalen"
+
+ # Osäker.
+-#: gtk/gtkruler.c:136
++#: ../gtk/gtkruler.c:136
+ msgid "Metric"
+ msgstr "Metrik"
+
+ # Osäker.
+-#: gtk/gtkruler.c:137
++#: ../gtk/gtkruler.c:137
+ msgid "The metric used for the ruler"
+ msgstr "Metriken som används i linjalen"
+
+-#: gtk/gtkscale.c:143
++#: ../gtk/gtkscale.c:143
+ msgid "The number of decimal places that are displayed in the value"
+ msgstr "Antalet tecken som visas i värdet"
+
+-#: gtk/gtkscale.c:152
++#: ../gtk/gtkscale.c:152
+ msgid "Draw Value"
+ msgstr "Visa värde"
+
+-#: gtk/gtkscale.c:153
++#: ../gtk/gtkscale.c:153
+ msgid "Whether the current value is displayed as a string next to the slider"
+-msgstr ""
+-"Huruvida det aktuella värdet visas som en sträng bredvid rullningslisten"
++msgstr "Huruvida det aktuella värdet visas som en sträng bredvid rullningslisten"
+
+-#: gtk/gtkscale.c:160
++#: ../gtk/gtkscale.c:160
+ msgid "Value Position"
+ msgstr "Värdeposition"
+
+-#: gtk/gtkscale.c:161
++#: ../gtk/gtkscale.c:161
+ msgid "The position in which the current value is displayed"
+ msgstr "Positionen som det aktuella värdet visas på"
+
+-#: gtk/gtkscale.c:168
++#: ../gtk/gtkscale.c:168
+ msgid "Slider Length"
+ msgstr "Längd på rullningslist"
+
+-#: gtk/gtkscale.c:169
++#: ../gtk/gtkscale.c:169
+ msgid "Length of scale's slider"
+ msgstr "Längd på skalans rullningslist"
+
+-#: gtk/gtkscale.c:177
++#: ../gtk/gtkscale.c:177
+ msgid "Value spacing"
+ msgstr "Värdeutrymme"
+
+-#: gtk/gtkscale.c:178
++#: ../gtk/gtkscale.c:178
+ msgid "Space between value text and the slider/trough area"
+ msgstr "Utrymme mellan värdetext och draglist/trågområdet"
+
+-#: gtk/gtkscalebutton.c:194
++#: ../gtk/gtkscalebutton.c:194
+ msgid "The orientation of the scale"
+ msgstr "Orienteringen för skalan"
+
+-#: gtk/gtkscalebutton.c:203
++#: ../gtk/gtkscalebutton.c:203
+ msgid "The value of the scale"
+ msgstr "Värdet på skalan"
+
+-#: gtk/gtkscalebutton.c:213
++#: ../gtk/gtkscalebutton.c:213
+ msgid "The icon size"
+ msgstr "Ikonstorleken"
+
+-#: gtk/gtkscalebutton.c:222
+-msgid ""
+-"The GtkAdjustment that contains the current value of this scale button object"
+-msgstr ""
+-"GtkAdjustment som innehåller det aktuella värdet på detta skalknappsobjekt"
++#: ../gtk/gtkscalebutton.c:222
++msgid "The GtkAdjustment that contains the current value of this scale button object"
++msgstr "GtkAdjustment som innehåller det aktuella värdet på detta skalknappsobjekt"
+
+-#: gtk/gtkscalebutton.c:250
++#: ../gtk/gtkscalebutton.c:250
+ msgid "Icons"
+ msgstr "Ikoner"
+
+-#: gtk/gtkscalebutton.c:251
++#: ../gtk/gtkscalebutton.c:251
+ msgid "List of icon names"
+ msgstr "Lista över ikonnamn"
+
+-#: gtk/gtkscrollbar.c:50
++#: ../gtk/gtkscrollbar.c:50
+ msgid "Minimum Slider Length"
+ msgstr "Minsta bredd på rullningslist"
+
+-#: gtk/gtkscrollbar.c:51
++#: ../gtk/gtkscrollbar.c:51
+ msgid "Minimum length of scrollbar slider"
+ msgstr "Minsta längd på lullningslisten"
+
+-#: gtk/gtkscrollbar.c:59
++#: ../gtk/gtkscrollbar.c:59
+ msgid "Fixed slider size"
+ msgstr "Fast storlek på rullningslist"
+
+-#: gtk/gtkscrollbar.c:60
++#: ../gtk/gtkscrollbar.c:60
+ msgid "Don't change slider size, just lock it to the minimum length"
+-msgstr ""
+-"Ändra inte storleken på rullningslisten, lås den bara till den minsta längden"
++msgstr "Ändra inte storleken på rullningslisten, lås den bara till den minsta längden"
+
+-#: gtk/gtkscrollbar.c:84
+-msgid ""
+-"Display a second backward arrow button on the opposite end of the scrollbar"
+-msgstr ""
+-"Visa en andra knapp med baklängespil på motsatt sida av rullningslisten"
++#: ../gtk/gtkscrollbar.c:84
++msgid "Display a second backward arrow button on the opposite end of the scrollbar"
++msgstr "Visa en andra knapp med baklängespil på motsatt sida av rullningslisten"
+
+-#: gtk/gtkscrollbar.c:92
+-msgid ""
+-"Display a second forward arrow button on the opposite end of the scrollbar"
++#: ../gtk/gtkscrollbar.c:92
++msgid "Display a second forward arrow button on the opposite end of the scrollbar"
+ msgstr "Visa en andra framåtpil-knapp på motsatt sida av rullningslisten"
+
+-#: gtk/gtkscrolledwindow.c:218 gtk/gtktext.c:545 gtk/gtktreeview.c:578
++#: ../gtk/gtkscrolledwindow.c:218
++#: ../gtk/gtktext.c:545
++#: ../gtk/gtktreeview.c:578
+ msgid "Horizontal Adjustment"
+ msgstr "Horisontell justering"
+
+-#: gtk/gtkscrolledwindow.c:225 gtk/gtktext.c:553 gtk/gtktreeview.c:586
++#: ../gtk/gtkscrolledwindow.c:225
++#: ../gtk/gtktext.c:553
++#: ../gtk/gtktreeview.c:586
+ msgid "Vertical Adjustment"
+ msgstr "Vertikal justering"
+
+-#: gtk/gtkscrolledwindow.c:232
++#: ../gtk/gtkscrolledwindow.c:232
+ msgid "Horizontal Scrollbar Policy"
+ msgstr "Policy för horisontella rullningslister"
+
+-#: gtk/gtkscrolledwindow.c:233
++#: ../gtk/gtkscrolledwindow.c:233
+ msgid "When the horizontal scrollbar is displayed"
+ msgstr "När den horisontella rullningslisten visas"
+
+-#: gtk/gtkscrolledwindow.c:240
++#: ../gtk/gtkscrolledwindow.c:240
+ msgid "Vertical Scrollbar Policy"
+ msgstr "Policy för vertikal rullningslista"
+
+-#: gtk/gtkscrolledwindow.c:241
++#: ../gtk/gtkscrolledwindow.c:241
+ msgid "When the vertical scrollbar is displayed"
+ msgstr "När den vertikala rullningslisten visas"
+
+-#: gtk/gtkscrolledwindow.c:249
++#: ../gtk/gtkscrolledwindow.c:249
+ msgid "Window Placement"
+ msgstr "Fönsterplacering"
+
+-#: gtk/gtkscrolledwindow.c:250
+-msgid ""
+-"Where the contents are located with respect to the scrollbars. This property "
+-"only takes effect if \"window-placement-set\" is TRUE."
+-msgstr ""
+-"Där innehållet placeras i förhållande till rullningslisterna. Denna egenskap "
+-"blir endast aktiv om \"window-placement-set\" är TRUE."
++#: ../gtk/gtkscrolledwindow.c:250
++msgid "Where the contents are located with respect to the scrollbars. This property only takes effect if \"window-placement-set\" is TRUE."
++msgstr "Där innehållet placeras i förhållande till rullningslisterna. Denna egenskap blir endast aktiv om \"window-placement-set\" är TRUE."
+
+-#: gtk/gtkscrolledwindow.c:267
++#: ../gtk/gtkscrolledwindow.c:267
+ msgid "Window Placement Set"
+ msgstr "Fönsterplacering"
+
+-#: gtk/gtkscrolledwindow.c:268
+-msgid ""
+-"Whether \"window-placement\" should be used to determine the location of the "
+-"contents with respect to the scrollbars."
+-msgstr ""
+-"Huruvida \"window-placement\" ska används för att fastställa platsen för "
+-"innehållet i förhållande till rullningslisterna."
++#: ../gtk/gtkscrolledwindow.c:268
++msgid "Whether \"window-placement\" should be used to determine the location of the contents with respect to the scrollbars."
++msgstr "Huruvida \"window-placement\" ska används för att fastställa platsen för innehållet i förhållande till rullningslisterna."
+
+-#: gtk/gtkscrolledwindow.c:274
++#: ../gtk/gtkscrolledwindow.c:274
+ msgid "Shadow Type"
+ msgstr "Skuggtyp"
+
+-#: gtk/gtkscrolledwindow.c:275
++#: ../gtk/gtkscrolledwindow.c:275
+ msgid "Style of bevel around the contents"
+ msgstr "Stil på avfasning runt innehållet"
+
+-#: gtk/gtkscrolledwindow.c:289
++#: ../gtk/gtkscrolledwindow.c:289
+ msgid "Scrollbars within bevel"
+ msgstr "Rullningslist inom avfasning"
+
+-#: gtk/gtkscrolledwindow.c:290
++#: ../gtk/gtkscrolledwindow.c:290
+ msgid "Place scrollbars within the scrolled window's bevel"
+ msgstr "Placera rullningslister inom det rullade fönstrets avrundning"
+
+-#: gtk/gtkscrolledwindow.c:296
++#: ../gtk/gtkscrolledwindow.c:296
+ msgid "Scrollbar spacing"
+ msgstr "Rullningslistutrymme"
+
+-#: gtk/gtkscrolledwindow.c:297
++#: ../gtk/gtkscrolledwindow.c:297
+ msgid "Number of pixels between the scrollbars and the scrolled window"
+ msgstr "Antalet bildpunkter mellan rullningslisterna och det rullade fönstret"
+
+-#: gtk/gtkscrolledwindow.c:312
++#: ../gtk/gtkscrolledwindow.c:312
+ msgid "Scrolled Window Placement"
+ msgstr "Placering för rullade fönster"
+
+-#: gtk/gtkscrolledwindow.c:313
+-msgid ""
+-"Where the contents of scrolled windows are located with respect to the "
+-"scrollbars, if not overridden by the scrolled window's own placement."
+-msgstr ""
+-"Där innehållet i rullade fönster placeras i förhållande till "
+-"rullningslisterna, om inte åsidosatt av det rullade fönstrets egna placering."
++#: ../gtk/gtkscrolledwindow.c:313
++msgid "Where the contents of scrolled windows are located with respect to the scrollbars, if not overridden by the scrolled window's own placement."
++msgstr "Där innehållet i rullade fönster placeras i förhållande till rullningslisterna, om inte åsidosatt av det rullade fönstrets egna placering."
+
+-#: gtk/gtkseparatortoolitem.c:105
++#: ../gtk/gtkseparatortoolitem.c:105
+ msgid "Draw"
+ msgstr "Rita"
+
+-#: gtk/gtkseparatortoolitem.c:106
++#: ../gtk/gtkseparatortoolitem.c:106
+ msgid "Whether the separator is drawn, or just blank"
+ msgstr "Huruvida avgränsaren är ritad eller enbart tom"
+
+-#: gtk/gtksettings.c:215
++#: ../gtk/gtksettings.c:215
+ msgid "Double Click Time"
+ msgstr "Tid för dubbelklick"
+
+-#: gtk/gtksettings.c:216
+-msgid ""
+-"Maximum time allowed between two clicks for them to be considered a double "
+-"click (in milliseconds)"
+-msgstr ""
+-"Största tid som tillåts mellan två klick för att de ska betraktas som en "
+-"dubbelklickning (i millisekunder)"
++#: ../gtk/gtksettings.c:216
++msgid "Maximum time allowed between two clicks for them to be considered a double click (in milliseconds)"
++msgstr "Största tid som tillåts mellan två klick för att de ska betraktas som en dubbelklickning (i millisekunder)"
+
+-#: gtk/gtksettings.c:223
++#: ../gtk/gtksettings.c:223
+ msgid "Double Click Distance"
+ msgstr "Avstånd för dubbelklick"
+
+-#: gtk/gtksettings.c:224
+-msgid ""
+-"Maximum distance allowed between two clicks for them to be considered a "
+-"double click (in pixels)"
+-msgstr ""
+-"Största avstånd som tillåts mellan två klick för att de ska betraktas som en "
+-"dubbelklickning (i bildpunkter)"
++#: ../gtk/gtksettings.c:224
++msgid "Maximum distance allowed between two clicks for them to be considered a double click (in pixels)"
++msgstr "Största avstånd som tillåts mellan två klick för att de ska betraktas som en dubbelklickning (i bildpunkter)"
+
+-#: gtk/gtksettings.c:240
++#: ../gtk/gtksettings.c:240
+ msgid "Cursor Blink"
+ msgstr "Markörblinkning"
+
+-#: gtk/gtksettings.c:241
++#: ../gtk/gtksettings.c:241
+ msgid "Whether the cursor should blink"
+ msgstr "Huruvida markören ska blinka"
+
+-#: gtk/gtksettings.c:248
++#: ../gtk/gtksettings.c:248
+ msgid "Cursor Blink Time"
+ msgstr "Blinktid för markör"
+
+-#: gtk/gtksettings.c:249
++#: ../gtk/gtksettings.c:249
+ msgid "Length of the cursor blink cycle, in milliseconds"
+ msgstr "Längd på markörens blinkcykel, i millisekunder"
+
+-#: gtk/gtksettings.c:268
++#: ../gtk/gtksettings.c:268
+ msgid "Cursor Blink Timeout"
+ msgstr "Tidsgräns för markörblinkning"
+
+-#: gtk/gtksettings.c:269
++#: ../gtk/gtksettings.c:269
+ msgid "Time after which the cursor stops blinking, in seconds"
+ msgstr "Tid efter vilken markören slutar blinka, i sekunder"
+
+-#: gtk/gtksettings.c:276
++#: ../gtk/gtksettings.c:276
+ msgid "Split Cursor"
+ msgstr "Delad markör"
+
+-#: gtk/gtksettings.c:277
+-msgid ""
+-"Whether two cursors should be displayed for mixed left-to-right and right-to-"
+-"left text"
+-msgstr ""
+-"Huruvida två markörer ska visas för blandad vänster-till-höger- och höger-"
+-"till-vänster-text"
++#: ../gtk/gtksettings.c:277
++msgid "Whether two cursors should be displayed for mixed left-to-right and right-to-left text"
++msgstr "Huruvida två markörer ska visas för blandad vänster-till-höger- och höger-till-vänster-text"
+
+-#: gtk/gtksettings.c:284
++#: ../gtk/gtksettings.c:284
+ msgid "Theme Name"
+ msgstr "Temanamn"
+
+-#: gtk/gtksettings.c:285
++#: ../gtk/gtksettings.c:285
+ msgid "Name of theme RC file to load"
+ msgstr "Namn på den tema-RC-fil som ska läsas in"
+
+-#: gtk/gtksettings.c:293
++#: ../gtk/gtksettings.c:293
+ msgid "Icon Theme Name"
+ msgstr "Namn på ikontema"
+
+-#: gtk/gtksettings.c:294
++#: ../gtk/gtksettings.c:294
+ msgid "Name of icon theme to use"
+ msgstr "Namn på ikontemat att använda"
+
+-#: gtk/gtksettings.c:302
++#: ../gtk/gtksettings.c:302
+ msgid "Fallback Icon Theme Name"
+ msgstr "Ikontema att falla tillbaka på"
+
+-#: gtk/gtksettings.c:303
++#: ../gtk/gtksettings.c:303
+ msgid "Name of a icon theme to fall back to"
+ msgstr "Namnet på ikontemat att falla tillbaka på"
+
+-#: gtk/gtksettings.c:311
++#: ../gtk/gtksettings.c:311
+ msgid "Key Theme Name"
+ msgstr "Nyckeltemanamn"
+
+-#: gtk/gtksettings.c:312
++#: ../gtk/gtksettings.c:312
+ msgid "Name of key theme RC file to load"
+ msgstr "Namn på den nyckeltema-RC-fil som ska läsas in"
+
+-#: gtk/gtksettings.c:320
++#: ../gtk/gtksettings.c:320
+ msgid "Menu bar accelerator"
+ msgstr "Snabbtangent för menyrad"
+
+-#: gtk/gtksettings.c:321
++#: ../gtk/gtksettings.c:321
+ msgid "Keybinding to activate the menu bar"
+ msgstr "Snabbtangent för att aktivera menyraden"
+
+-#: gtk/gtksettings.c:329
++#: ../gtk/gtksettings.c:329
+ msgid "Drag threshold"
+ msgstr "Dragtröskel"
+
+-#: gtk/gtksettings.c:330
++#: ../gtk/gtksettings.c:330
+ msgid "Number of pixels the cursor can move before dragging"
+ msgstr "Antalet bildpunkter markören kan flyttas innan drag"
+
+-#: gtk/gtksettings.c:338
++#: ../gtk/gtksettings.c:338
+ msgid "Font Name"
+ msgstr "Typsnittsnamn"
+
+-#: gtk/gtksettings.c:339
++#: ../gtk/gtksettings.c:339
+ msgid "Name of default font to use"
+ msgstr "Namn på standardtypsnittet att använda"
+
+-#: gtk/gtksettings.c:361
++#: ../gtk/gtksettings.c:361
+ msgid "Icon Sizes"
+ msgstr "Ikonstorlekar"
+
+-#: gtk/gtksettings.c:362
++#: ../gtk/gtksettings.c:362
+ msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
+ msgstr "Lista med ikonstorlekar (gtk-menu=16,16;gtk-button=20,20..."
+
+-#: gtk/gtksettings.c:370
++#: ../gtk/gtksettings.c:370
+ msgid "GTK Modules"
+ msgstr "GTK-moduler"
+
+-#: gtk/gtksettings.c:371
++#: ../gtk/gtksettings.c:371
+ msgid "List of currently active GTK modules"
+ msgstr "Lista med GTK-moduler som är aktiva för tillfället"
+
+-#: gtk/gtksettings.c:380
++#: ../gtk/gtksettings.c:380
+ msgid "Xft Antialias"
+ msgstr "Xft-kantutjämning"
+
+-#: gtk/gtksettings.c:381
++#: ../gtk/gtksettings.c:381
+ msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr "Huruvida Xft-typsnitt ska kantutjämnas; 0=nej, 1=ja, -1=standardvärdet"
+
+-#: gtk/gtksettings.c:390
++#: ../gtk/gtksettings.c:390
+ msgid "Xft Hinting"
+ msgstr "Xft-hintning"
+
+-#: gtk/gtksettings.c:391
++#: ../gtk/gtksettings.c:391
+ msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr "Huruvida Xft-typsnitt ska hintas; 0=nej, 1=ja, -1=standardvärdet"
+
+-#: gtk/gtksettings.c:400
++#: ../gtk/gtksettings.c:400
+ msgid "Xft Hint Style"
+ msgstr "Xft-hintningsstil"
+
+-#: gtk/gtksettings.c:401
+-msgid ""
+-"What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
+-msgstr ""
+-"Vilken grad av hintning att använda; hintaingen, hintaliten, hintamellan, "
+-"eller hintafullständig"
++#: ../gtk/gtksettings.c:401
++msgid "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
++msgstr "Vilken grad av hintning att använda; hintaingen, hintaliten, hintamellan, eller hintafullständig"
+
+-#: gtk/gtksettings.c:410
++#: ../gtk/gtksettings.c:410
+ msgid "Xft RGBA"
+ msgstr "Xft-RGBA"
+
+-#: gtk/gtksettings.c:411
++#: ../gtk/gtksettings.c:411
+ msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
+ msgstr "Typ av underbildpunktskantutjämning; ingen, rgb, bgr, vrgb, vbgr"
+
+-#: gtk/gtksettings.c:420
++#: ../gtk/gtksettings.c:420
+ msgid "Xft DPI"
+ msgstr "Xft-DPI"
+
+-#: gtk/gtksettings.c:421
++#: ../gtk/gtksettings.c:421
+ msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
+-msgstr ""
+-"Upplösning för Xft, i 1024 × punkter/tum. -1 för att använda standardvärdet"
++msgstr "Upplösning för Xft, i 1024 × punkter/tum. -1 för att använda standardvärdet"
+
+-#: gtk/gtksettings.c:430
++#: ../gtk/gtksettings.c:430
+ msgid "Cursor theme name"
+ msgstr "Namn på markörtema"
+
+-#: gtk/gtksettings.c:431
++#: ../gtk/gtksettings.c:431
+ msgid "Name of the cursor theme to use, or NULL to use the default theme"
+-msgstr ""
+-"Namn på markörtemat att använda, eller NULL för att använda standardtemat"
++msgstr "Namn på markörtemat att använda, eller NULL för att använda standardtemat"
+
+-#: gtk/gtksettings.c:439
++#: ../gtk/gtksettings.c:439
+ msgid "Cursor theme size"
+ msgstr "Storlek på markörtema"
+
+-#: gtk/gtksettings.c:440
++#: ../gtk/gtksettings.c:440
+ msgid "Size to use for cursors, or 0 to use the default size"
+-msgstr ""
+-"Storlek att använda på markörer, eller 0 för att använda standardstorleken"
++msgstr "Storlek att använda på markörer, eller 0 för att använda standardstorleken"
+
+-#: gtk/gtksettings.c:450
++#: ../gtk/gtksettings.c:450
+ msgid "Alternative button order"
+ msgstr "Alternativ knappordning"
+
+-#: gtk/gtksettings.c:451
++#: ../gtk/gtksettings.c:451
+ msgid "Whether buttons in dialogs should use the alternative button order"
+ msgstr "Huruvida knappar i dialoger ska använda den alternativa knappordningen"
+
+-#: gtk/gtksettings.c:468
++#: ../gtk/gtksettings.c:468
+ msgid "Alternative sort indicator direction"
+ msgstr "Alternativ riktning för sorteringsindikator"
+
+-#: gtk/gtksettings.c:469
+-msgid ""
+-"Whether the direction of the sort indicators in list and tree views is "
+-"inverted compared to the default (where down means ascending)"
+-msgstr ""
+-"Huruvida riktningen på sorteringsindikatorerna i list- och trädvyer är "
+-"inverterade jämfört med standarden (där ner betyder stigande)"
++#: ../gtk/gtksettings.c:469
++msgid "Whether the direction of the sort indicators in list and tree views is inverted compared to the default (where down means ascending)"
++msgstr "Huruvida riktningen på sorteringsindikatorerna i list- och trädvyer är inverterade jämfört med standarden (där ner betyder stigande)"
+
+-#: gtk/gtksettings.c:477
++#: ../gtk/gtksettings.c:477
+ msgid "Show the 'Input Methods' menu"
+ msgstr "Visa \"Inmatningsmetoder\"-menyn"
+
+-#: gtk/gtksettings.c:478
+-msgid ""
+-"Whether the context menus of entries and text views should offer to change "
+-"the input method"
+-msgstr ""
+-"Huruvida sammanhangsmenyer av poster och textvyer ska erbjuda ändring av "
+-"inmatningsmetod"
++#: ../gtk/gtksettings.c:478
++msgid "Whether the context menus of entries and text views should offer to change the input method"
++msgstr "Huruvida sammanhangsmenyer av poster och textvyer ska erbjuda ändring av inmatningsmetod"
+
+-#: gtk/gtksettings.c:486
++#: ../gtk/gtksettings.c:486
+ msgid "Show the 'Insert Unicode Control Character' menu"
+ msgstr "Visa \"Infoga Unicode-styrtecken\"-menyn"
+
+-#: gtk/gtksettings.c:487
+-msgid ""
+-"Whether the context menus of entries and text views should offer to insert "
+-"control characters"
+-msgstr ""
+-"Huruvida sammanhangsmenyer av poster och textvyer ska erbjuda att infoga "
+-"styrtecken"
++#: ../gtk/gtksettings.c:487
++msgid "Whether the context menus of entries and text views should offer to insert control characters"
++msgstr "Huruvida sammanhangsmenyer av poster och textvyer ska erbjuda att infoga styrtecken"
+
+-#: gtk/gtksettings.c:495
++#: ../gtk/gtksettings.c:495
+ msgid "Start timeout"
+ msgstr "Tidsgräns för start"
+
+-#: gtk/gtksettings.c:496
++#: ../gtk/gtksettings.c:496
+ msgid "Starting value for timeouts, when button is pressed"
+ msgstr "Startvärde för tidsgränser, när knappen blir nedtryckt"
+
+-#: gtk/gtksettings.c:505
++#: ../gtk/gtksettings.c:505
+ msgid "Repeat timeout"
+ msgstr "Tidsgräns för upprepning"
+
+-#: gtk/gtksettings.c:506
++#: ../gtk/gtksettings.c:506
+ msgid "Repeat value for timeouts, when button is pressed"
+ msgstr "Upprepningsvärde för tidsgränser, när knappen blir nedtryckt"
+
+-#: gtk/gtksettings.c:515
++#: ../gtk/gtksettings.c:515
+ msgid "Expand timeout"
+ msgstr "Utöka tidsgräns"
+
+-#: gtk/gtksettings.c:516
++#: ../gtk/gtksettings.c:516
+ msgid "Expand value for timeouts, when a widget is expanding a new region"
+ msgstr "Expandera värde för tidsgränser, när en widget expanderar en ny region"
+
+-#: gtk/gtksettings.c:551
++#: ../gtk/gtksettings.c:551
+ msgid "Color scheme"
+ msgstr "Färgschema"
+
+-#: gtk/gtksettings.c:552
++#: ../gtk/gtksettings.c:552
+ msgid "A palette of named colors for use in themes"
+ msgstr "En palett av namngivna färger att använda i teman"
+
+-#: gtk/gtksettings.c:561
++#: ../gtk/gtksettings.c:561
+ msgid "Enable Animations"
+ msgstr "Aktivera animeringar"
+
+-#: gtk/gtksettings.c:562
++#: ../gtk/gtksettings.c:562
+ msgid "Whether to enable toolkit-wide animations."
+ msgstr "Huruvida verktygslådebreda animeringar ska aktiveras."
+
+-#: gtk/gtksettings.c:580
++#: ../gtk/gtksettings.c:580
+ msgid "Enable Touchscreen Mode"
+ msgstr "Aktivera pekskärmsläge"
+
+-#: gtk/gtksettings.c:581
++#: ../gtk/gtksettings.c:581
+ msgid "When TRUE, there are no motion notify events delivered on this screen"
+-msgstr ""
+-"När TRUE kommer inga rörelsenotifieringshändelser att levereras på denna "
+-"skärm"
++msgstr "När TRUE kommer inga rörelsenotifieringshändelser att levereras på denna skärm"
+
+-#: gtk/gtksettings.c:598
++#: ../gtk/gtksettings.c:598
+ msgid "Tooltip timeout"
+ msgstr "Tidsgräns för verktygstips"
+
+-#: gtk/gtksettings.c:599
++#: ../gtk/gtksettings.c:599
+ msgid "Timeout before tooltip is shown"
+ msgstr "Tidsgräns innan verktygstips visas"
+
+-#: gtk/gtksettings.c:624
++#: ../gtk/gtksettings.c:624
+ msgid "Tooltip browse timeout"
+ msgstr "Tidsgräns för bläddring i verktygstips"
+
+-#: gtk/gtksettings.c:625
++#: ../gtk/gtksettings.c:625
+ msgid "Timeout before tooltip is shown when browse mode is enabled"
+ msgstr "Tidsgräns innan verktygstips visas när bläddringsläge är aktiverat"
+
+-#: gtk/gtksettings.c:646
++#: ../gtk/gtksettings.c:646
+ msgid "Tooltip browse mode timeout"
+ msgstr "Tidsgräns för bläddringsläge för verktygstips"
+
+-#: gtk/gtksettings.c:647
++#: ../gtk/gtksettings.c:647
+ msgid "Timeout after which browse mode is disabled"
+ msgstr "Tidsgräns efter vilken bläddringsläget inaktiveras"
+
+-#: gtk/gtksettings.c:666
++#: ../gtk/gtksettings.c:666
+ msgid "Keynav Cursor Only"
+ msgstr "Tangentnavigeringsmarkör endast"
+
+-#: gtk/gtksettings.c:667
++#: ../gtk/gtksettings.c:667
+ msgid "When TRUE, there are only cursor keys available to navigate widgets"
+-msgstr ""
+-"När TRUE finns det endast markörtangenter tillgängliga för att navigera "
+-"bland widgetar"
++msgstr "När TRUE finns det endast markörtangenter tillgängliga för att navigera bland widgetar"
+
+-#: gtk/gtksettings.c:684
++#: ../gtk/gtksettings.c:684
+ msgid "Keynav Wrap Around"
+ msgstr "Radbrytning för tangentnavigering"
+
+-#: gtk/gtksettings.c:685
++#: ../gtk/gtksettings.c:685
+ msgid "Whether to wrap around when keyboard-navigating widgets"
+-msgstr ""
+-"Huruvida radbrytning ska ske vid tangentbordsnavigering bland widgetar "
++msgstr "Huruvida radbrytning ska ske vid tangentbordsnavigering bland widgetar "
+
+-#: gtk/gtksettings.c:705
++#: ../gtk/gtksettings.c:705
+ msgid "Error Bell"
+ msgstr "Felklocka"
+
+-#: gtk/gtksettings.c:706
++#: ../gtk/gtksettings.c:706
+ msgid "When TRUE, keyboard navigation and other errors will cause a beep"
+-msgstr ""
+-"När TRUE kommer tangentbordsnavigering och andra fel att orsaka ett pip"
++msgstr "När TRUE kommer tangentbordsnavigering och andra fel att orsaka ett pip"
+
+-#: gtk/gtksettings.c:723
++#: ../gtk/gtksettings.c:723
+ msgid "Color Hash"
+ msgstr "Färgrymd"
+
+-#: gtk/gtksettings.c:724
++#: ../gtk/gtksettings.c:724
+ msgid "A hash table representation of the color scheme."
+ msgstr "En hashtabell som representerar färgschemat."
+
+-#: gtk/gtksettings.c:732
++#: ../gtk/gtksettings.c:732
+ msgid "Default file chooser backend"
+ msgstr "Standardbakände för filväljare"
+
+-#: gtk/gtksettings.c:733
++#: ../gtk/gtksettings.c:733
+ msgid "Name of the GtkFileChooser backend to use by default"
+ msgstr "Namn på den GtkFileChooser-bakände som ska användas som standard"
+
+-#: gtk/gtksettings.c:750
++#: ../gtk/gtksettings.c:750
+ msgid "Default print backend"
+ msgstr "Standardbakände för utskrifter"
+
+-#: gtk/gtksettings.c:751
++#: ../gtk/gtksettings.c:751
+ msgid "List of the GtkPrintBackend backends to use by default"
+ msgstr "Lista på de GtkPrintBackend-bakändor som ska användas som standard"
+
+-#: gtk/gtksettings.c:774
++#: ../gtk/gtksettings.c:774
+ msgid "Default command to run when displaying a print preview"
+ msgstr "Standardkommando att köra vid förhandsvisning av utskrift "
+
+-#: gtk/gtksettings.c:775
++#: ../gtk/gtksettings.c:775
+ msgid "Command to run when displaying a print preview"
+ msgstr "Kommando att köra vid visning av en utskriftförhandsvisning"
+
+-#: gtk/gtksettings.c:791
++#: ../gtk/gtksettings.c:791
+ msgid "Enable Mnemonics"
+ msgstr "Aktivera minnesstöd"
+
+-#: gtk/gtksettings.c:792
++#: ../gtk/gtksettings.c:792
+ msgid "Whether labels should have mnemonics"
+ msgstr "Huruvida etiketter ska ha minnesstöd"
+
+-#: gtk/gtksettings.c:808
++#: ../gtk/gtksettings.c:808
+ msgid "Enable Accelerators"
+ msgstr "Aktivera snabbtangenter"
+
+-#: gtk/gtksettings.c:809
++#: ../gtk/gtksettings.c:809
+ msgid "Whether menu items should have accelerators"
+ msgstr "Huruvida menyobjekt ska ha snabbtangenter"
+
+-#: gtk/gtksettings.c:826
++#: ../gtk/gtksettings.c:826
+ msgid "Recent Files Limit"
+ msgstr "Gräns för Senaste filer"
+
+-#: gtk/gtksettings.c:827
++#: ../gtk/gtksettings.c:827
+ msgid "Number of recently used files"
+ msgstr "Antal senast använda filer"
+
+-#: gtk/gtksettings.c:841
++#: ../gtk/gtksettings.c:841
+ msgid "Default IM module"
+ msgstr "Standard-IM-modul"
+
+-#: gtk/gtksettings.c:842
++#: ../gtk/gtksettings.c:842
+ msgid "Which IM module should be used by default"
+ msgstr "Vilken IM-modul som ska användas som standard"
+
+-#: gtk/gtksettings.c:860
++#: ../gtk/gtksettings.c:860
+ msgid "Recent Files Max Age"
+ msgstr "Maximal ålder för Senaste filer"
+
+-#: gtk/gtksettings.c:861
++#: ../gtk/gtksettings.c:861
+ msgid "Maximum age of recently used files, in days"
+ msgstr "Maximal ålder för senast använda filer, i dagar"
+
+-#: gtk/gtksettings.c:870
++#: ../gtk/gtksettings.c:870
+ msgid "Fontconfig configuration timestamp"
+ msgstr "Fontconfig-konfigurationens tidsstämpel"
+
+-#: gtk/gtksettings.c:871
++#: ../gtk/gtksettings.c:871
+ msgid "Timestamp of current fontconfig configuration"
+ msgstr "Tidsstämpel för aktuell fontconfig-konfiguration"
+
+-#: gtk/gtksettings.c:893
++#: ../gtk/gtksettings.c:893
+ msgid "Sound Theme Name"
+ msgstr "Namn på ljudtema"
+
+-#: gtk/gtksettings.c:894
++#: ../gtk/gtksettings.c:894
+ msgid "XDG sound theme name"
+ msgstr "Namn på XDG-ljudtema"
+
+ #. Translators: this means sounds that are played as feedback to user input
+-#: gtk/gtksettings.c:916
++#: ../gtk/gtksettings.c:916
+ msgid "Audible Input Feedback"
+ msgstr "Ljudåterkoppling för inmatning"
+
+-#: gtk/gtksettings.c:917
++#: ../gtk/gtksettings.c:917
+ msgid "Whether to play event sounds as feedback to user input"
+-msgstr ""
+-"Huruvida händelseljud som spelas upp som återkoppling till användarinmatning"
++msgstr "Huruvida händelseljud som spelas upp som återkoppling till användarinmatning"
+
+-#: gtk/gtksettings.c:938
++#: ../gtk/gtksettings.c:938
+ msgid "Enable Event Sounds"
+ msgstr "Aktivera händelseljud"
+
+-#: gtk/gtksettings.c:939
++#: ../gtk/gtksettings.c:939
+ msgid "Whether to play any event sounds at all"
+ msgstr "Huruvida händelseljud ska spelas överhuvudtaget"
+
+-#: gtk/gtksettings.c:954
++#: ../gtk/gtksettings.c:954
+ msgid "Enable Tooltips"
+ msgstr "Aktivera verktygstips"
+
+-#: gtk/gtksettings.c:955
++#: ../gtk/gtksettings.c:955
+ msgid "Whether tooltips should be shown on widgets"
+ msgstr "Huruvida verktygstips ska visas på widgetar"
+
+-#: gtk/gtksizegroup.c:293
++#: ../gtk/gtksizegroup.c:293
+ msgid "Mode"
+ msgstr "Läge"
+
+-#: gtk/gtksizegroup.c:294
+-msgid ""
+-"The directions in which the size group affects the requested sizes of its "
+-"component widgets"
+-msgstr ""
+-"De riktningar i vilka storleksgruppen påverkar de begärda storlekarna på "
+-"dess komponentwidgetar"
++#: ../gtk/gtksizegroup.c:294
++msgid "The directions in which the size group affects the requested sizes of its component widgets"
++msgstr "De riktningar i vilka storleksgruppen påverkar de begärda storlekarna på dess komponentwidgetar"
+
+-#: gtk/gtksizegroup.c:310
++#: ../gtk/gtksizegroup.c:310
+ msgid "Ignore hidden"
+ msgstr "Ignorera dolda"
+
+-#: gtk/gtksizegroup.c:311
+-msgid ""
+-"If TRUE, unmapped widgets are ignored when determining the size of the group"
+-msgstr ""
+-"Om detta är SANT kommer ej mappade widgetar att ignoreras vid avgörandet av "
+-"storleken på gruppen"
++#: ../gtk/gtksizegroup.c:311
++msgid "If TRUE, unmapped widgets are ignored when determining the size of the group"
++msgstr "Om detta är SANT kommer ej mappade widgetar att ignoreras vid avgörandet av storleken på gruppen"
+
+-#: gtk/gtkspinbutton.c:209
++#: ../gtk/gtkspinbutton.c:209
+ msgid "The adjustment that holds the value of the spinbutton"
+ msgstr "Justeringen som håller värdet på snurrknappen"
+
+-#: gtk/gtkspinbutton.c:216
++#: ../gtk/gtkspinbutton.c:216
+ msgid "Climb Rate"
+ msgstr "Klättringshastighet"
+
+-#: gtk/gtkspinbutton.c:236
++#: ../gtk/gtkspinbutton.c:236
+ msgid "Snap to Ticks"
+ msgstr "Fäst vid tick"
+
+-#: gtk/gtkspinbutton.c:237
+-msgid ""
+-"Whether erroneous values are automatically changed to a spin button's "
+-"nearest step increment"
+-msgstr ""
+-"Huruvida felaktiga värden automatiskt korrigeras till en snurrknapps "
+-"närmaste stegökning"
++#: ../gtk/gtkspinbutton.c:237
++msgid "Whether erroneous values are automatically changed to a spin button's nearest step increment"
++msgstr "Huruvida felaktiga värden automatiskt korrigeras till en snurrknapps närmaste stegökning"
+
+-#: gtk/gtkspinbutton.c:244
++#: ../gtk/gtkspinbutton.c:244
+ msgid "Numeric"
+ msgstr "Numerisk"
+
+-#: gtk/gtkspinbutton.c:245
++#: ../gtk/gtkspinbutton.c:245
+ msgid "Whether non-numeric characters should be ignored"
+ msgstr "Huruvida icke-numeriska tecken ska ignoreras"
+
+-#: gtk/gtkspinbutton.c:252
++#: ../gtk/gtkspinbutton.c:252
+ msgid "Wrap"
+ msgstr "Börja om"
+
+-#: gtk/gtkspinbutton.c:253
++#: ../gtk/gtkspinbutton.c:253
+ msgid "Whether a spin button should wrap upon reaching its limits"
+ msgstr "Huruvida en snurrknapp ska börja om då dess gränser nås"
+
+-#: gtk/gtkspinbutton.c:260
++#: ../gtk/gtkspinbutton.c:260
+ msgid "Update Policy"
+ msgstr "Uppdateringspolicy"
+
+-#: gtk/gtkspinbutton.c:261
+-msgid ""
+-"Whether the spin button should update always, or only when the value is legal"
+-msgstr ""
+-"Huruvida snurrknappen alltid ska uppdatera, eller endast då värdet är giltigt"
++#: ../gtk/gtkspinbutton.c:261
++msgid "Whether the spin button should update always, or only when the value is legal"
++msgstr "Huruvida snurrknappen alltid ska uppdatera, eller endast då värdet är giltigt"
+
+-#: gtk/gtkspinbutton.c:270
++#: ../gtk/gtkspinbutton.c:270
+ msgid "Reads the current value, or sets a new value"
+ msgstr "Läser aktuellt värde, eller ställer in ett nytt värde"
+
+-#: gtk/gtkspinbutton.c:279
++#: ../gtk/gtkspinbutton.c:279
+ msgid "Style of bevel around the spin button"
+ msgstr "Stil på avfasning runt snurrknappen"
+
+-#: gtk/gtkstatusbar.c:141
++#: ../gtk/gtkstatusbar.c:141
+ msgid "Has Resize Grip"
+ msgstr "Har handtag för storleksändring"
+
+-#: gtk/gtkstatusbar.c:142
++#: ../gtk/gtkstatusbar.c:142
+ msgid "Whether the statusbar has a grip for resizing the toplevel"
+ msgstr "Huruvida statusraden har ett handtag för storleksändring av toppnivån"
+
+-#: gtk/gtkstatusbar.c:187
++#: ../gtk/gtkstatusbar.c:187
+ msgid "Style of bevel around the statusbar text"
+ msgstr "Stil på avfasningen runt statusradstexten"
+
+-#: gtk/gtkstatusicon.c:226
++#: ../gtk/gtkstatusicon.c:226
+ msgid "GIcon"
+ msgstr "GIcon"
+
+-#: gtk/gtkstatusicon.c:244
++#: ../gtk/gtkstatusicon.c:244
+ msgid "The size of the icon"
+ msgstr "Storleken på ikonen"
+
+-#: gtk/gtkstatusicon.c:254
++#: ../gtk/gtkstatusicon.c:254
+ msgid "The screen where this status icon will be displayed"
+ msgstr "Skärmen där denna statusikon kommer att visas"
+
+-#: gtk/gtkstatusicon.c:261
++#: ../gtk/gtkstatusicon.c:261
+ msgid "Blinking"
+ msgstr "Blinkar"
+
+-#: gtk/gtkstatusicon.c:262
++#: ../gtk/gtkstatusicon.c:262
+ msgid "Whether or not the status icon is blinking"
+ msgstr "Huruvida statusikonen blinkar eller inte"
+
+-#: gtk/gtkstatusicon.c:270
++#: ../gtk/gtkstatusicon.c:270
+ msgid "Whether or not the status icon is visible"
+ msgstr "Huruvida statusikonen är synlig eller inte"
+
+-#: gtk/gtkstatusicon.c:286
++#: ../gtk/gtkstatusicon.c:286
+ msgid "Whether or not the status icon is embedded"
+ msgstr "Huruvida statusikonen är inbäddad eller inte"
+
+-#: gtk/gtkstatusicon.c:302 gtk/gtktrayicon-x11.c:96
++#: ../gtk/gtkstatusicon.c:302
++#: ../gtk/gtktrayicon-x11.c:96
+ msgid "The orientation of the tray"
+ msgstr "Orienteringen för lådan"
+
+-#: gtk/gtktable.c:129
++#: ../gtk/gtktable.c:129
+ msgid "Rows"
+ msgstr "Rader"
+
+-#: gtk/gtktable.c:130
++#: ../gtk/gtktable.c:130
+ msgid "The number of rows in the table"
+ msgstr "Antalet rader i tabellen"
+
+-#: gtk/gtktable.c:138
++#: ../gtk/gtktable.c:138
+ msgid "Columns"
+ msgstr "Kolumner"
+
+-#: gtk/gtktable.c:139
++#: ../gtk/gtktable.c:139
+ msgid "The number of columns in the table"
+ msgstr "Antalet kolumner i tabellen"
+
+-#: gtk/gtktable.c:147
++#: ../gtk/gtktable.c:147
+ msgid "Row spacing"
+ msgstr "Radutrymme"
+
+-#: gtk/gtktable.c:148
++#: ../gtk/gtktable.c:148
+ msgid "The amount of space between two consecutive rows"
+ msgstr "Mängden utrymme mellan två efterföljande rader"
+
+-#: gtk/gtktable.c:156
++#: ../gtk/gtktable.c:156
+ msgid "Column spacing"
+ msgstr "Kolumnutrymme"
+
+-#: gtk/gtktable.c:157
++#: ../gtk/gtktable.c:157
+ msgid "The amount of space between two consecutive columns"
+ msgstr "Mängden utrymme mellan två efterföljande kolumner"
+
+-#: gtk/gtktable.c:166
++#: ../gtk/gtktable.c:166
+ msgid "If TRUE, the table cells are all the same width/height"
+ msgstr "Om SANT betyder detta att alla tabellceller har samma bredd/höjd"
+
+-#: gtk/gtktable.c:173
++#: ../gtk/gtktable.c:173
+ msgid "Left attachment"
+ msgstr "Vänsterfäste"
+
+-#: gtk/gtktable.c:180
++#: ../gtk/gtktable.c:180
+ msgid "Right attachment"
+ msgstr "Högerfäste"
+
+-#: gtk/gtktable.c:181
++#: ../gtk/gtktable.c:181
+ msgid "The column number to attach the right side of a child widget to"
+ msgstr "Det kolumnnummer som höger sida av en barnwidget ska fästas vid"
+
+-#: gtk/gtktable.c:187
++#: ../gtk/gtktable.c:187
+ msgid "Top attachment"
+ msgstr "Övre fäste"
+
+-#: gtk/gtktable.c:188
++#: ../gtk/gtktable.c:188
+ msgid "The row number to attach the top of a child widget to"
+ msgstr "Det radnummer som överkanten på en barnwidget ska fästas vid"
+
+-#: gtk/gtktable.c:194
++#: ../gtk/gtktable.c:194
+ msgid "Bottom attachment"
+ msgstr "Nedre fäste"
+
+-#: gtk/gtktable.c:201
++#: ../gtk/gtktable.c:201
+ msgid "Horizontal options"
+ msgstr "Horisontella alternativ"
+
+-#: gtk/gtktable.c:202
++#: ../gtk/gtktable.c:202
+ msgid "Options specifying the horizontal behaviour of the child"
+ msgstr "Alternativ som anger det horisontella beteendet på barnet"
+
+-#: gtk/gtktable.c:208
++#: ../gtk/gtktable.c:208
+ msgid "Vertical options"
+ msgstr "Vertikala alternativ"
+
+-#: gtk/gtktable.c:209
++#: ../gtk/gtktable.c:209
+ msgid "Options specifying the vertical behaviour of the child"
+ msgstr "Alternativ som anger det vertikala beteendet på barnet"
+
+-#: gtk/gtktable.c:215
++#: ../gtk/gtktable.c:215
+ msgid "Horizontal padding"
+ msgstr "Horisontell utfyllnad"
+
+-#: gtk/gtktable.c:216
+-msgid ""
+-"Extra space to put between the child and its left and right neighbors, in "
+-"pixels"
+-msgstr ""
+-"Extra utrymme att lägga till mellan barnet och dess vänstra och högra "
+-"grannar, i bildpunkter"
++#: ../gtk/gtktable.c:216
++msgid "Extra space to put between the child and its left and right neighbors, in pixels"
++msgstr "Extra utrymme att lägga till mellan barnet och dess vänstra och högra grannar, i bildpunkter"
+
+-#: gtk/gtktable.c:222
++#: ../gtk/gtktable.c:222
+ msgid "Vertical padding"
+ msgstr "Vertikal utfyllnad"
+
+-#: gtk/gtktable.c:223
+-msgid ""
+-"Extra space to put between the child and its upper and lower neighbors, in "
+-"pixels"
+-msgstr ""
+-"Extra utrymme att lägga till mellan barnet och dess övre och nedre grannar, "
+-"i bildpunkter"
++#: ../gtk/gtktable.c:223
++msgid "Extra space to put between the child and its upper and lower neighbors, in pixels"
++msgstr "Extra utrymme att lägga till mellan barnet och dess övre och nedre grannar, i bildpunkter"
+
+-#: gtk/gtktext.c:546
++#: ../gtk/gtktext.c:546
+ msgid "Horizontal adjustment for the text widget"
+ msgstr "Horisontell justering för textwidgeten"
+
+-#: gtk/gtktext.c:554
++#: ../gtk/gtktext.c:554
+ msgid "Vertical adjustment for the text widget"
+ msgstr "Vertikal justering för textwidgeten"
+
+-#: gtk/gtktext.c:561
++#: ../gtk/gtktext.c:561
+ msgid "Line Wrap"
+ msgstr "Radbryt"
+
+-#: gtk/gtktext.c:562
++#: ../gtk/gtktext.c:562
+ msgid "Whether lines are wrapped at widget edges"
+ msgstr "Huruvida radbrytning sker vid widgetkanter"
+
+-#: gtk/gtktext.c:569
++#: ../gtk/gtktext.c:569
+ msgid "Word Wrap"
+ msgstr "Ordbryt"
+
+-#: gtk/gtktext.c:570
++#: ../gtk/gtktext.c:570
+ msgid "Whether words are wrapped at widget edges"
+ msgstr "Huruvida ord bryts vid widgetkanter"
+
+-#: gtk/gtktextbuffer.c:179
++#: ../gtk/gtktextbuffer.c:179
+ msgid "Tag Table"
+ msgstr "Taggtabell"
+
+-#: gtk/gtktextbuffer.c:180
++#: ../gtk/gtktextbuffer.c:180
+ msgid "Text Tag Table"
+ msgstr "Texttaggtabell"
+
+-#: gtk/gtktextbuffer.c:198
++#: ../gtk/gtktextbuffer.c:198
+ msgid "Current text of the buffer"
+ msgstr "Aktuell text i bufferten"
+
+-#: gtk/gtktextbuffer.c:212
++#: ../gtk/gtktextbuffer.c:212
+ msgid "Has selection"
+ msgstr "Har markering"
+
+-#: gtk/gtktextbuffer.c:213
++#: ../gtk/gtktextbuffer.c:213
+ msgid "Whether the buffer has some text currently selected"
+ msgstr "Huruvida bufferten har någon text för närvarande markerad"
+
+-#: gtk/gtktextbuffer.c:229
++#: ../gtk/gtktextbuffer.c:229
+ msgid "Cursor position"
+ msgstr "Markörposition"
+
+-#: gtk/gtktextbuffer.c:230
+-msgid ""
+-"The position of the insert mark (as offset from the beginning of the buffer)"
+-msgstr ""
+-"Positionen för infogningsmarkeringen (som position från början av bufferten)"
++#: ../gtk/gtktextbuffer.c:230
++msgid "The position of the insert mark (as offset from the beginning of the buffer)"
++msgstr "Positionen för infogningsmarkeringen (som position från början av bufferten)"
+
+-#: gtk/gtktextbuffer.c:245
++#: ../gtk/gtktextbuffer.c:245
+ msgid "Copy target list"
+ msgstr "Kopiera mållista"
+
+-#: gtk/gtktextbuffer.c:246
+-msgid ""
+-"The list of targets this buffer supports for clipboard copying and DND source"
+-msgstr ""
+-"Listan över mål som den här bufferten har stöd för urklippskopiering och dra-"
+-"och-släpp-källa"
++#: ../gtk/gtktextbuffer.c:246
++msgid "The list of targets this buffer supports for clipboard copying and DND source"
++msgstr "Listan över mål som den här bufferten har stöd för urklippskopiering och dra-och-släpp-källa"
+
+-#: gtk/gtktextbuffer.c:261
++#: ../gtk/gtktextbuffer.c:261
+ msgid "Paste target list"
+ msgstr "Klistra in mållista"
+
+-#: gtk/gtktextbuffer.c:262
+-msgid ""
+-"The list of targets this buffer supports for clipboard pasting and DND "
+-"destination"
+-msgstr ""
+-"Listan över mål som den här bufferten har stöd för urklippsinklistring och "
+-"dra-och-släpp-mål"
++#: ../gtk/gtktextbuffer.c:262
++msgid "The list of targets this buffer supports for clipboard pasting and DND destination"
++msgstr "Listan över mål som den här bufferten har stöd för urklippsinklistring och dra-och-släpp-mål"
+
+-#: gtk/gtktextmark.c:90
++#: ../gtk/gtktextmark.c:90
+ msgid "Mark name"
+ msgstr "Markeringsnamn"
+
+-#: gtk/gtktextmark.c:97
++#: ../gtk/gtktextmark.c:97
+ msgid "Left gravity"
+ msgstr "Vänstergravitet"
+
+-#: gtk/gtktextmark.c:98
++#: ../gtk/gtktextmark.c:98
+ msgid "Whether the mark has left gravity"
+ msgstr "Huruvida markeringen har vänstergravitet"
+
+-#: gtk/gtktexttag.c:173
++#: ../gtk/gtktexttag.c:173
+ msgid "Tag name"
+ msgstr "Taggnamn"
+
+-#: gtk/gtktexttag.c:174
++#: ../gtk/gtktexttag.c:174
+ msgid "Name used to refer to the text tag. NULL for anonymous tags"
+ msgstr "Namn som används för att peka på texttaggen. NULL för anonyma taggar"
+
+-#: gtk/gtktexttag.c:192
++#: ../gtk/gtktexttag.c:192
+ msgid "Background color as a (possibly unallocated) GdkColor"
+ msgstr "Bakgrundsfärg som en (möjligtvis oallokerad) GdkColor"
+
+-#: gtk/gtktexttag.c:199
++#: ../gtk/gtktexttag.c:199
+ msgid "Background full height"
+ msgstr "Bakgrundens fullständiga höjd"
+
+-#: gtk/gtktexttag.c:200
+-msgid ""
+-"Whether the background color fills the entire line height or only the height "
+-"of the tagged characters"
+-msgstr ""
+-"Huruvida bakgrundsfärgen fyller hela radhöjden eller endast höjden på de "
+-"taggade tecknen"
++#: ../gtk/gtktexttag.c:200
++msgid "Whether the background color fills the entire line height or only the height of the tagged characters"
++msgstr "Huruvida bakgrundsfärgen fyller hela radhöjden eller endast höjden på de taggade tecknen"
+
+-#: gtk/gtktexttag.c:208
++#: ../gtk/gtktexttag.c:208
+ msgid "Background stipple mask"
+ msgstr "Bakgrundens punkteringsmask"
+
+-#: gtk/gtktexttag.c:209
++#: ../gtk/gtktexttag.c:209
+ msgid "Bitmap to use as a mask when drawing the text background"
+ msgstr "Bitmappsbild att använda som mask när textbakgrunden ritas"
+
+-#: gtk/gtktexttag.c:226
++#: ../gtk/gtktexttag.c:226
+ msgid "Foreground color as a (possibly unallocated) GdkColor"
+ msgstr "Förgrundsfärg som en (möjligtvis oallokerad) GdkColor"
+
+-#: gtk/gtktexttag.c:234
++#: ../gtk/gtktexttag.c:234
+ msgid "Foreground stipple mask"
+ msgstr "Förgrundens punkteringsmask"
+
+-#: gtk/gtktexttag.c:235
++#: ../gtk/gtktexttag.c:235
+ msgid "Bitmap to use as a mask when drawing the text foreground"
+ msgstr "Bitmappsbild att använda som mask när textförgrunden ritas"
+
+-#: gtk/gtktexttag.c:242
++#: ../gtk/gtktexttag.c:242
+ msgid "Text direction"
+ msgstr "Textriktning"
+
+-#: gtk/gtktexttag.c:243
++#: ../gtk/gtktexttag.c:243
+ msgid "Text direction, e.g. right-to-left or left-to-right"
+ msgstr "Textriktning, d.v.s. höger till vänster eller vänster till höger"
+
+-#: gtk/gtktexttag.c:292
++#: ../gtk/gtktexttag.c:292
+ msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
+ msgstr "Typsnittsstil som en PangoStyle, t.ex. PANGO_STYLE_ITALIC"
+
+-#: gtk/gtktexttag.c:301
++#: ../gtk/gtktexttag.c:301
+ msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
+ msgstr "Typsnittsvariant som en PangoVariant, t.ex. PANGO_VARIANT_SMALL_CAPS"
+
+-#: gtk/gtktexttag.c:310
+-msgid ""
+-"Font weight as an integer, see predefined values in PangoWeight; for "
+-"example, PANGO_WEIGHT_BOLD"
+-msgstr ""
+-"Typsnittsvikt som ett heltal, se fördefinierade värden i PangoWeight; t.ex. "
+-"PANGO_WEIGHT_BOLD"
++#: ../gtk/gtktexttag.c:310
++msgid "Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD"
++msgstr "Typsnittsvikt som ett heltal, se fördefinierade värden i PangoWeight; t.ex. PANGO_WEIGHT_BOLD"
+
+-#: gtk/gtktexttag.c:321
++#: ../gtk/gtktexttag.c:321
+ msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
+ msgstr "Typsnittsbredd som en PangoStretch, t.ex. PANGO_STRETCH_CONDENSED"
+
+-#: gtk/gtktexttag.c:330
++#: ../gtk/gtktexttag.c:330
+ msgid "Font size in Pango units"
+ msgstr "Typsnittsstorlek i Pango-enheter"
+
+-#: gtk/gtktexttag.c:340
+-msgid ""
+-"Font size as a scale factor relative to the default font size. This properly "
+-"adapts to theme changes etc. so is recommended. Pango predefines some scales "
+-"such as PANGO_SCALE_X_LARGE"
+-msgstr ""
+-"Typsnittsstorlek som en skalfaktor relativt standardtypsnittsstorleken. "
+-"Detta anpassar sig till temaändringar med mera och rekommenderas. Pango "
+-"fördefinierar en del skalor som exempelvis PANGO_SCALE_X_LARGE"
++#: ../gtk/gtktexttag.c:340
++msgid "Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE"
++msgstr "Typsnittsstorlek som en skalfaktor relativt standardtypsnittsstorleken. Detta anpassar sig till temaändringar med mera och rekommenderas. Pango fördefinierar en del skalor som exempelvis PANGO_SCALE_X_LARGE"
+
+-#: gtk/gtktexttag.c:360 gtk/gtktextview.c:586
++#: ../gtk/gtktexttag.c:360
++#: ../gtk/gtktextview.c:586
+ msgid "Left, right, or center justification"
+ msgstr "Vänsterjustering, högerjustering eller centrering"
+
+-#: gtk/gtktexttag.c:379
+-msgid ""
+-"The language this text is in, as an ISO code. Pango can use this as a hint "
+-"when rendering the text. If not set, an appropriate default will be used."
+-msgstr ""
+-"Språket som denna text är i, angivet som ISO-kod. Pango kan använda detta "
+-"som ett tips vid rendering av text. Om detta inte är angivet kommer ett "
+-"lämpligt standardalternativ att användas."
++#: ../gtk/gtktexttag.c:379
++msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If not set, an appropriate default will be used."
++msgstr "Språket som denna text är i, angivet som ISO-kod. Pango kan använda detta som ett tips vid rendering av text. Om detta inte är angivet kommer ett lämpligt standardalternativ att användas."
+
+-#: gtk/gtktexttag.c:386
++#: ../gtk/gtktexttag.c:386
+ msgid "Left margin"
+ msgstr "Vänstermarginal"
+
+-#: gtk/gtktexttag.c:387 gtk/gtktextview.c:595
++#: ../gtk/gtktexttag.c:387
++#: ../gtk/gtktextview.c:595
+ msgid "Width of the left margin in pixels"
+ msgstr "Bredd på vänstermarginalen i bildpunkter"
+
+-#: gtk/gtktexttag.c:396
++#: ../gtk/gtktexttag.c:396
+ msgid "Right margin"
+ msgstr "Högermarginal"
+
+-#: gtk/gtktexttag.c:397 gtk/gtktextview.c:605
++#: ../gtk/gtktexttag.c:397
++#: ../gtk/gtktextview.c:605
+ msgid "Width of the right margin in pixels"
+ msgstr "Bredd på högermarginalen i bildpunkter"
+
+-#: gtk/gtktexttag.c:407 gtk/gtktextview.c:614
++#: ../gtk/gtktexttag.c:407
++#: ../gtk/gtktextview.c:614
+ msgid "Indent"
+ msgstr "Gör indrag"
+
+-#: gtk/gtktexttag.c:408 gtk/gtktextview.c:615
++#: ../gtk/gtktexttag.c:408
++#: ../gtk/gtktextview.c:615
+ msgid "Amount to indent the paragraph, in pixels"
+ msgstr "Hur mycket stycket ska dras in, i bildpunkter"
+
+-#: gtk/gtktexttag.c:419
+-msgid ""
+-"Offset of text above the baseline (below the baseline if rise is negative) "
+-"in Pango units"
+-msgstr ""
+-"Avstånd för texten ovanför baslinjen (nedanför baslinjen om höjning är "
+-"negativt) i Pango-enheter"
++#: ../gtk/gtktexttag.c:419
++msgid "Offset of text above the baseline (below the baseline if rise is negative) in Pango units"
++msgstr "Avstånd för texten ovanför baslinjen (nedanför baslinjen om höjning är negativt) i Pango-enheter"
+
+-#: gtk/gtktexttag.c:428
++#: ../gtk/gtktexttag.c:428
+ msgid "Pixels above lines"
+ msgstr "Bildpunkter ovanför rader"
+
+-#: gtk/gtktexttag.c:429 gtk/gtktextview.c:539
++#: ../gtk/gtktexttag.c:429
++#: ../gtk/gtktextview.c:539
+ msgid "Pixels of blank space above paragraphs"
+ msgstr "Bildpunkter med tomt utrymme ovanför stycken"
+
+-#: gtk/gtktexttag.c:438
++#: ../gtk/gtktexttag.c:438
+ msgid "Pixels below lines"
+ msgstr "Bildpunkter nedanför rader"
+
+-#: gtk/gtktexttag.c:439 gtk/gtktextview.c:549
++#: ../gtk/gtktexttag.c:439
++#: ../gtk/gtktextview.c:549
+ msgid "Pixels of blank space below paragraphs"
+ msgstr "Bildpunkter med tomt utrymme nedanför stycken"
+
+-#: gtk/gtktexttag.c:448
++#: ../gtk/gtktexttag.c:448
+ msgid "Pixels inside wrap"
+ msgstr "Bildpunkter mellan radbrytningar"
+
+-#: gtk/gtktexttag.c:449 gtk/gtktextview.c:559
++#: ../gtk/gtktexttag.c:449
++#: ../gtk/gtktextview.c:559
+ msgid "Pixels of blank space between wrapped lines in a paragraph"
+ msgstr "Bildpunkter med tomt utrymme mellan radbrytningar i ett stycke"
+
+-#: gtk/gtktexttag.c:476 gtk/gtktextview.c:577
+-msgid ""
+-"Whether to wrap lines never, at word boundaries, or at character boundaries"
+-msgstr ""
+-"Huruvida radbrytningar inte alls ska ske, om de ska ske mellan ord, eller "
+-"mellan tecken"
++#: ../gtk/gtktexttag.c:476
++#: ../gtk/gtktextview.c:577
++msgid "Whether to wrap lines never, at word boundaries, or at character boundaries"
++msgstr "Huruvida radbrytningar inte alls ska ske, om de ska ske mellan ord, eller mellan tecken"
+
+-#: gtk/gtktexttag.c:485 gtk/gtktextview.c:624
++#: ../gtk/gtktexttag.c:485
++#: ../gtk/gtktextview.c:624
+ msgid "Tabs"
+ msgstr "Tabbsteg"
+
+-#: gtk/gtktexttag.c:486 gtk/gtktextview.c:625
++#: ../gtk/gtktexttag.c:486
++#: ../gtk/gtktextview.c:625
+ msgid "Custom tabs for this text"
+ msgstr "Anpassade tabbsteg för denna text"
+
+-#: gtk/gtktexttag.c:504
++#: ../gtk/gtktexttag.c:504
+ msgid "Invisible"
+ msgstr "Osynlig"
+
+-#: gtk/gtktexttag.c:505
++#: ../gtk/gtktexttag.c:505
+ msgid "Whether this text is hidden."
+ msgstr "Huruvida denna text är dold."
+
+-#: gtk/gtktexttag.c:519
++#: ../gtk/gtktexttag.c:519
+ msgid "Paragraph background color name"
+ msgstr "Namn på styckebakgrundsfärg"
+
+-#: gtk/gtktexttag.c:520
++#: ../gtk/gtktexttag.c:520
+ msgid "Paragraph background color as a string"
+ msgstr "Styckebakgrundsfärg som en sträng"
+
+-#: gtk/gtktexttag.c:535
++#: ../gtk/gtktexttag.c:535
+ msgid "Paragraph background color"
+ msgstr "Styckebakgrundsfärg"
+
+-#: gtk/gtktexttag.c:536
++#: ../gtk/gtktexttag.c:536
+ msgid "Paragraph background color as a (possibly unallocated) GdkColor"
+ msgstr "Styckebakgrundsfärg som en (möjligtvis oallokerad) GdkColor"
+
+-#: gtk/gtktexttag.c:554
++#: ../gtk/gtktexttag.c:554
+ msgid "Margin Accumulates"
+ msgstr "Marginaler ackumuleras"
+
+-#: gtk/gtktexttag.c:555
++#: ../gtk/gtktexttag.c:555
+ msgid "Whether left and right margins accumulate."
+ msgstr "Huruvida vänstra och högra marginalerna ackumuleras."
+
+-#: gtk/gtktexttag.c:568
++#: ../gtk/gtktexttag.c:568
+ msgid "Background full height set"
+ msgstr "Bakgrund i fullständig höjd inställd"
+
+-#: gtk/gtktexttag.c:569
++#: ../gtk/gtktexttag.c:569
+ msgid "Whether this tag affects background height"
+ msgstr "Huruvida denna tagg påverkar bakgrundens höjd"
+
+-#: gtk/gtktexttag.c:572
++#: ../gtk/gtktexttag.c:572
+ msgid "Background stipple set"
+ msgstr "Bakgrundspunktering inställd"
+
+-#: gtk/gtktexttag.c:573
++#: ../gtk/gtktexttag.c:573
+ msgid "Whether this tag affects the background stipple"
+ msgstr "Huruvida denna tagg påverkar bagrundspunkteringen"
+
+-#: gtk/gtktexttag.c:580
++#: ../gtk/gtktexttag.c:580
+ msgid "Foreground stipple set"
+ msgstr "Förgrundspunktering inställd"
+
+-#: gtk/gtktexttag.c:581
++#: ../gtk/gtktexttag.c:581
+ msgid "Whether this tag affects the foreground stipple"
+ msgstr "Huruvida denna tagg påverkar förgrundens punktering"
+
+-#: gtk/gtktexttag.c:616
++#: ../gtk/gtktexttag.c:616
+ msgid "Justification set"
+ msgstr "Justering inställd"
+
+-#: gtk/gtktexttag.c:617
++#: ../gtk/gtktexttag.c:617
+ msgid "Whether this tag affects paragraph justification"
+ msgstr "Huruvida denna tagg påverkar styckets justering"
+
+-#: gtk/gtktexttag.c:624
++#: ../gtk/gtktexttag.c:624
+ msgid "Left margin set"
+ msgstr "Vänstermarginal inställd"
+
+-#: gtk/gtktexttag.c:625
++#: ../gtk/gtktexttag.c:625
+ msgid "Whether this tag affects the left margin"
+ msgstr "Huruvida denna tagg påverkar vänstermarginalen"
+
+-#: gtk/gtktexttag.c:628
++#: ../gtk/gtktexttag.c:628
+ msgid "Indent set"
+ msgstr "Indrag inställt"
+
+-#: gtk/gtktexttag.c:629
++#: ../gtk/gtktexttag.c:629
+ msgid "Whether this tag affects indentation"
+ msgstr "Huruvida denna tagg påverkar indraget"
+
+-#: gtk/gtktexttag.c:636
++#: ../gtk/gtktexttag.c:636
+ msgid "Pixels above lines set"
+ msgstr "Bildpunkter ovanför rader inställt"
+
+-#: gtk/gtktexttag.c:637 gtk/gtktexttag.c:641
++#: ../gtk/gtktexttag.c:637
++#: ../gtk/gtktexttag.c:641
+ msgid "Whether this tag affects the number of pixels above lines"
+ msgstr "Huruvida denna tagg påverkar antalet bildpunkter ovanför rader"
+
+-#: gtk/gtktexttag.c:640
++#: ../gtk/gtktexttag.c:640
+ msgid "Pixels below lines set"
+ msgstr "Bildpunkter nedanför rader inställt"
+
+-#: gtk/gtktexttag.c:644
++#: ../gtk/gtktexttag.c:644
+ msgid "Pixels inside wrap set"
+ msgstr "Bildpunkter inuti radbrytningar inställt"
+
+-#: gtk/gtktexttag.c:645
++#: ../gtk/gtktexttag.c:645
+ msgid "Whether this tag affects the number of pixels between wrapped lines"
+ msgstr "Huruvida denna tagg påverkar antalet bildpunkter mellan radbrytningar"
+
+-#: gtk/gtktexttag.c:652
++#: ../gtk/gtktexttag.c:652
+ msgid "Right margin set"
+ msgstr "Högermarginal inställd"
+
+-#: gtk/gtktexttag.c:653
++#: ../gtk/gtktexttag.c:653
+ msgid "Whether this tag affects the right margin"
+ msgstr "Huruvida denna tagg påverkar högermarginalen"
+
+-#: gtk/gtktexttag.c:660
++#: ../gtk/gtktexttag.c:660
+ msgid "Wrap mode set"
+ msgstr "Radbrytningsläge inställt"
+
+-#: gtk/gtktexttag.c:661
++#: ../gtk/gtktexttag.c:661
+ msgid "Whether this tag affects line wrap mode"
+ msgstr "Huruvida denna tagg påverkar radbrytningsläget"
+
+-#: gtk/gtktexttag.c:664
++#: ../gtk/gtktexttag.c:664
+ msgid "Tabs set"
+ msgstr "Tabbsteg inställt"
+
+-#: gtk/gtktexttag.c:665
++#: ../gtk/gtktexttag.c:665
+ msgid "Whether this tag affects tabs"
+ msgstr "Huruvida denna tagg påverkar tabbsteg"
+
+-#: gtk/gtktexttag.c:668
++#: ../gtk/gtktexttag.c:668
+ msgid "Invisible set"
+ msgstr "Osynlig inställd"
+
+-#: gtk/gtktexttag.c:669
++#: ../gtk/gtktexttag.c:669
+ msgid "Whether this tag affects text visibility"
+ msgstr "Huruvida denna tagg påverkar textens synlighet"
+
+-#: gtk/gtktexttag.c:672
++#: ../gtk/gtktexttag.c:672
+ msgid "Paragraph background set"
+ msgstr "Styckebakgrund inställd"
+
+-#: gtk/gtktexttag.c:673
++#: ../gtk/gtktexttag.c:673
+ msgid "Whether this tag affects the paragraph background color"
+ msgstr "Huruvida denna tagg påverkar styckebakgrundsfärgen"
+
+-#: gtk/gtktextview.c:538
++#: ../gtk/gtktextview.c:538
+ msgid "Pixels Above Lines"
+ msgstr "Bildpunkter ovanför rader"
+
+-#: gtk/gtktextview.c:548
++#: ../gtk/gtktextview.c:548
+ msgid "Pixels Below Lines"
+ msgstr "Bildpunkter nedanför rader"
+
+-#: gtk/gtktextview.c:558
++#: ../gtk/gtktextview.c:558
+ msgid "Pixels Inside Wrap"
+ msgstr "Bildpunkter mellan radbrytningar"
+
+-#: gtk/gtktextview.c:576
++#: ../gtk/gtktextview.c:576
+ msgid "Wrap Mode"
+ msgstr "Radbrytningsläge"
+
+-#: gtk/gtktextview.c:594
++#: ../gtk/gtktextview.c:594
+ msgid "Left Margin"
+ msgstr "Vänstermarginal"
+
+-#: gtk/gtktextview.c:604
++#: ../gtk/gtktextview.c:604
+ msgid "Right Margin"
+ msgstr "Högermarginal"
+
+-#: gtk/gtktextview.c:632
++#: ../gtk/gtktextview.c:632
+ msgid "Cursor Visible"
+ msgstr "Synlig markör"
+
+-#: gtk/gtktextview.c:633
++#: ../gtk/gtktextview.c:633
+ msgid "If the insertion cursor is shown"
+ msgstr "Huruvida insättningsmarkören visas"
+
+-#: gtk/gtktextview.c:640
++#: ../gtk/gtktextview.c:640
+ msgid "Buffer"
+ msgstr "Buffert"
+
+-#: gtk/gtktextview.c:641
++#: ../gtk/gtktextview.c:641
+ msgid "The buffer which is displayed"
+ msgstr "Bufferten som visas"
+
+-#: gtk/gtktextview.c:649
++#: ../gtk/gtktextview.c:649
+ msgid "Whether entered text overwrites existing contents"
+ msgstr "Huruvida inmatad text skriver över befintligt innehåll"
+
+-#: gtk/gtktextview.c:656
++#: ../gtk/gtktextview.c:656
+ msgid "Accepts tab"
+ msgstr "Accepterar tabulator"
+
+-#: gtk/gtktextview.c:657
++#: ../gtk/gtktextview.c:657
+ msgid "Whether Tab will result in a tab character being entered"
+-msgstr ""
+-"Huruvida ett tabulatorsteg kommer att resultera i att ett tabulatortecken "
+-"anges"
++msgstr "Huruvida ett tabulatorsteg kommer att resultera i att ett tabulatortecken anges"
+
+-#: gtk/gtktextview.c:666
++#: ../gtk/gtktextview.c:666
+ msgid "Error underline color"
+ msgstr "Felunderstrykningsfärg"
+
+-#: gtk/gtktextview.c:667
++#: ../gtk/gtktextview.c:667
+ msgid "Color with which to draw error-indication underlines"
+ msgstr "Färg att rita felindikerande understrykningar med"
+
+-#: gtk/gtktoggleaction.c:103
++#: ../gtk/gtktoggleaction.c:103
+ msgid "Create the same proxies as a radio action"
+ msgstr "Skapa samma ställföreträdare som en radioåtgärd"
+
+-#: gtk/gtktoggleaction.c:104
++#: ../gtk/gtktoggleaction.c:104
+ msgid "Whether the proxies for this action look like radio action proxies"
+-msgstr ""
+-"Huruvida ställföreträdarna för denna åtgärd ser ut som ställföreträdare för "
+-"radioåtgärder"
++msgstr "Huruvida ställföreträdarna för denna åtgärd ser ut som ställföreträdare för radioåtgärder"
+
+-#: gtk/gtktoggleaction.c:119
++#: ../gtk/gtktoggleaction.c:119
+ msgid "If the toggle action should be active in or not"
+ msgstr "Om växlingsåtgärden ska vara aktiv in eller inte"
+
+-#: gtk/gtktogglebutton.c:103 gtk/gtktoggletoolbutton.c:102
++#: ../gtk/gtktogglebutton.c:103
++#: ../gtk/gtktoggletoolbutton.c:102
+ msgid "If the toggle button should be pressed in or not"
+ msgstr "Om växlingsknappen ska vara nedtryckt eller inte"
+
+-#: gtk/gtktogglebutton.c:111
++#: ../gtk/gtktogglebutton.c:111
+ msgid "If the toggle button is in an \"in between\" state"
+ msgstr "Om växlingsknappen är i ett \"mellanläge\""
+
+-#: gtk/gtktogglebutton.c:118
++#: ../gtk/gtktogglebutton.c:118
+ msgid "Draw Indicator"
+ msgstr "Ritningsindikator"
+
+-#: gtk/gtktogglebutton.c:119
++#: ../gtk/gtktogglebutton.c:119
+ msgid "If the toggle part of the button is displayed"
+ msgstr "Om växlingsdelen av knappen visas"
+
+-#: gtk/gtktoolbar.c:493
++#: ../gtk/gtktoolbar.c:493
+ msgid "The orientation of the toolbar"
+ msgstr "Orienteringen för verktygsraden"
+
+-#: gtk/gtktoolbar.c:501
++#: ../gtk/gtktoolbar.c:501
+ msgid "Toolbar Style"
+ msgstr "Stil på verktygsrad"
+
+-#: gtk/gtktoolbar.c:502
++#: ../gtk/gtktoolbar.c:502
+ msgid "How to draw the toolbar"
+ msgstr "Hur verktygsraden ska ritas"
+
+-#: gtk/gtktoolbar.c:509
++#: ../gtk/gtktoolbar.c:509
+ msgid "Show Arrow"
+ msgstr "Visa pil"
+
+-#: gtk/gtktoolbar.c:510
++#: ../gtk/gtktoolbar.c:510
+ msgid "If an arrow should be shown if the toolbar doesn't fit"
+ msgstr "Om en pil ska visas om verktygsraden inte passar"
+
+-#: gtk/gtktoolbar.c:525
++#: ../gtk/gtktoolbar.c:525
+ msgid "Tooltips"
+ msgstr "Verktygstips"
+
+-#: gtk/gtktoolbar.c:526
++#: ../gtk/gtktoolbar.c:526
+ msgid "If the tooltips of the toolbar should be active or not"
+ msgstr "Om verktygstipsen på verktygsraden ska vara aktiva eller inte"
+
+-#: gtk/gtktoolbar.c:548
++#: ../gtk/gtktoolbar.c:548
+ msgid "Size of icons in this toolbar"
+ msgstr "Storlek på ikoner i denna verktygsrad"
+
+-#: gtk/gtktoolbar.c:563
++#: ../gtk/gtktoolbar.c:563
+ msgid "Icon size set"
+ msgstr "Ikonstorlek inställd"
+
+-#: gtk/gtktoolbar.c:564
++#: ../gtk/gtktoolbar.c:564
+ msgid "Whether the icon-size property has been set"
+ msgstr "Huruvida egenskapen ikonstorlek har ställts in"
+
+-#: gtk/gtktoolbar.c:573
++#: ../gtk/gtktoolbar.c:573
+ msgid "Whether the item should receive extra space when the toolbar grows"
+ msgstr "Huruvida objektet ska få extra utrymme när verktygsraden växer"
+
+-#: gtk/gtktoolbar.c:581
++#: ../gtk/gtktoolbar.c:581
+ msgid "Whether the item should be the same size as other homogeneous items"
+ msgstr "Huruvida objektet ska vara av samma storlek som andra liknande objekt"
+
+-#: gtk/gtktoolbar.c:588
++#: ../gtk/gtktoolbar.c:588
+ msgid "Spacer size"
+ msgstr "Storlek på utfyllnad"
+
+-#: gtk/gtktoolbar.c:589
++#: ../gtk/gtktoolbar.c:589
+ msgid "Size of spacers"
+ msgstr "Storlek på utfyllnad"
+
+-#: gtk/gtktoolbar.c:598
++#: ../gtk/gtktoolbar.c:598
+ msgid "Amount of border space between the toolbar shadow and the buttons"
+ msgstr "Mängden kantutrymme mellan skuggan från verktygsraden och knapparna"
+
+-#: gtk/gtktoolbar.c:606
++#: ../gtk/gtktoolbar.c:606
+ msgid "Maximum child expand"
+ msgstr "Maximal barnexpanderare"
+
+-#: gtk/gtktoolbar.c:607
++#: ../gtk/gtktoolbar.c:607
+ msgid "Maximum amount of space an expandable item will be given"
+ msgstr "Maximal mängd utrymme som ett expanderbart objekt ska ges"
+
+-#: gtk/gtktoolbar.c:615
++#: ../gtk/gtktoolbar.c:615
+ msgid "Space style"
+ msgstr "Stil på utfyllnad"
+
+-#: gtk/gtktoolbar.c:616
++#: ../gtk/gtktoolbar.c:616
+ msgid "Whether spacers are vertical lines or just blank"
+ msgstr "Huruvida utfyllnad är vertikala linjer eller enbart tomt"
+
+-#: gtk/gtktoolbar.c:623
++#: ../gtk/gtktoolbar.c:623
+ msgid "Button relief"
+ msgstr "Knapprelief"
+
+-#: gtk/gtktoolbar.c:624
++#: ../gtk/gtktoolbar.c:624
+ msgid "Type of bevel around toolbar buttons"
+ msgstr "Typ av avfasning runt verktygsradsknappar"
+
+-#: gtk/gtktoolbar.c:631
++#: ../gtk/gtktoolbar.c:631
+ msgid "Style of bevel around the toolbar"
+ msgstr "Stil på avfasning runt verktygsraden"
+
+-#: gtk/gtktoolbar.c:637
++#: ../gtk/gtktoolbar.c:637
+ msgid "Toolbar style"
+ msgstr "Stil på verktygsrad"
+
+-#: gtk/gtktoolbar.c:638
+-msgid ""
+-"Whether default toolbars have text only, text and icons, icons only, etc."
+-msgstr ""
+-"Huruvida standardverktygsrader endast har text, text och ikoner, endast "
+-"ikoner, osv."
++#: ../gtk/gtktoolbar.c:638
++msgid "Whether default toolbars have text only, text and icons, icons only, etc."
++msgstr "Huruvida standardverktygsrader endast har text, text och ikoner, endast ikoner, osv."
+
+-#: gtk/gtktoolbar.c:644
++#: ../gtk/gtktoolbar.c:644
+ msgid "Toolbar icon size"
+ msgstr "Ikonstorlek på verktygsrad"
+
+-#: gtk/gtktoolbar.c:645
++#: ../gtk/gtktoolbar.c:645
+ msgid "Size of icons in default toolbars"
+ msgstr "Storlek på ikoner i standardverktygsrader"
+
+-#: gtk/gtktoolbutton.c:181
++#: ../gtk/gtktoolbutton.c:181
+ msgid "Text to show in the item."
+ msgstr "Text att visa i objektet."
+
+-#: gtk/gtktoolbutton.c:188
+-msgid ""
+-"If set, an underline in the label property indicates that the next character "
+-"should be used for the mnemonic accelerator key in the overflow menu"
+-msgstr ""
+-"Om detta är angivet kommer en understrykning i etikettegenskapen att "
+-"indikera att nästa tecken ska användas som en genvägstangent i spillmenyn"
++#: ../gtk/gtktoolbutton.c:188
++msgid "If set, an underline in the label property indicates that the next character should be used for the mnemonic accelerator key in the overflow menu"
++msgstr "Om detta är angivet kommer en understrykning i etikettegenskapen att indikera att nästa tecken ska användas som en genvägstangent i spillmenyn"
+
+-#: gtk/gtktoolbutton.c:195
++#: ../gtk/gtktoolbutton.c:195
+ msgid "Widget to use as the item label"
+ msgstr "Widget att använda som objektetikett"
+
+-#: gtk/gtktoolbutton.c:201
++#: ../gtk/gtktoolbutton.c:201
+ msgid "Stock Id"
+ msgstr "Standard-id"
+
+-#: gtk/gtktoolbutton.c:202
++#: ../gtk/gtktoolbutton.c:202
+ msgid "The stock icon displayed on the item"
+ msgstr "Standardikonen som visas på objektet"
+
+-#: gtk/gtktoolbutton.c:218
++#: ../gtk/gtktoolbutton.c:218
+ msgid "Icon name"
+ msgstr "Ikonstorlek"
+
+-#: gtk/gtktoolbutton.c:219
++#: ../gtk/gtktoolbutton.c:219
+ msgid "The name of the themed icon displayed on the item"
+ msgstr "Namnet på temaikonen som visas på objektet"
+
+-#: gtk/gtktoolbutton.c:225
++#: ../gtk/gtktoolbutton.c:225
+ msgid "Icon widget"
+ msgstr "Ikonwidget"
+
+-#: gtk/gtktoolbutton.c:226
++#: ../gtk/gtktoolbutton.c:226
+ msgid "Icon widget to display in the item"
+ msgstr "Ikonsamling att visa i objektet"
+
+-#: gtk/gtktoolbutton.c:239
++#: ../gtk/gtktoolbutton.c:239
+ msgid "Icon spacing"
+ msgstr "Ikonutrymme"
+
+-#: gtk/gtktoolbutton.c:240
++#: ../gtk/gtktoolbutton.c:240
+ msgid "Spacing in pixels between the icon and label"
+ msgstr "Utrymme mellan ikonen och etikett (i bildpunkter)"
+
+-#: gtk/gtktoolitem.c:171
+-msgid ""
+-"Whether the toolbar item is considered important. When TRUE, toolbar buttons "
+-"show text in GTK_TOOLBAR_BOTH_HORIZ mode"
+-msgstr ""
+-"Huruvida verktygsradsobjektet är viktigt. Då detta är SANT visar "
+-"verktygsradsknappar text i GTK_TOOLBAR_BOTH_HORIZ-läge"
++#: ../gtk/gtktoolitem.c:171
++msgid "Whether the toolbar item is considered important. When TRUE, toolbar buttons show text in GTK_TOOLBAR_BOTH_HORIZ mode"
++msgstr "Huruvida verktygsradsobjektet är viktigt. Då detta är SANT visar verktygsradsknappar text i GTK_TOOLBAR_BOTH_HORIZ-läge"
+
+-#: gtk/gtktreemodelsort.c:274
++#: ../gtk/gtktreemodelsort.c:274
+ msgid "TreeModelSort Model"
+ msgstr "Modell för TreeModelSort"
+
+-#: gtk/gtktreemodelsort.c:275
++#: ../gtk/gtktreemodelsort.c:275
+ msgid "The model for the TreeModelSort to sort"
+ msgstr "Modell för TreeModelSort att sortera"
+
+-#: gtk/gtktreeview.c:570
++#: ../gtk/gtktreeview.c:570
+ msgid "TreeView Model"
+ msgstr "Trädvymodell"
+
+-#: gtk/gtktreeview.c:571
++#: ../gtk/gtktreeview.c:571
+ msgid "The model for the tree view"
+ msgstr "Modell för trädvyn"
+
+-#: gtk/gtktreeview.c:579
++#: ../gtk/gtktreeview.c:579
+ msgid "Horizontal Adjustment for the widget"
+ msgstr "Horisontell justering för widgeten"
+
+-#: gtk/gtktreeview.c:587
++#: ../gtk/gtktreeview.c:587
+ msgid "Vertical Adjustment for the widget"
+ msgstr "Vertikal justering för widgeten"
+
+-#: gtk/gtktreeview.c:594
++#: ../gtk/gtktreeview.c:594
+ msgid "Headers Visible"
+ msgstr "Huvuden är synliga"
+
+-#: gtk/gtktreeview.c:595
++#: ../gtk/gtktreeview.c:595
+ msgid "Show the column header buttons"
+ msgstr "Visa knappar i kolumnhuvuden"
+
+-#: gtk/gtktreeview.c:602
++#: ../gtk/gtktreeview.c:602
+ msgid "Headers Clickable"
+ msgstr "Huvuden är klickbara"
+
+-#: gtk/gtktreeview.c:603
++#: ../gtk/gtktreeview.c:603
+ msgid "Column headers respond to click events"
+ msgstr "Kolumnhuvuden svarar på klickhändelser"
+
+-#: gtk/gtktreeview.c:610
++#: ../gtk/gtktreeview.c:610
+ msgid "Expander Column"
+ msgstr "Expanderarkolumn"
+
+-#: gtk/gtktreeview.c:611
++#: ../gtk/gtktreeview.c:611
+ msgid "Set the column for the expander column"
+ msgstr "Ställ in kolumnen för expanderarkolumnen"
+
+-#: gtk/gtktreeview.c:626
++#: ../gtk/gtktreeview.c:626
+ msgid "Rules Hint"
+ msgstr "Regeltips"
+
+-#: gtk/gtktreeview.c:627
++#: ../gtk/gtktreeview.c:627
+ msgid "Set a hint to the theme engine to draw rows in alternating colors"
+ msgstr "Ställ in ett tips för temamotorn att rita rader i alternerande färger"
+
+-#: gtk/gtktreeview.c:634
++#: ../gtk/gtktreeview.c:634
+ msgid "Enable Search"
+ msgstr "Använd sökning"
+
+-#: gtk/gtktreeview.c:635
++#: ../gtk/gtktreeview.c:635
+ msgid "View allows user to search through columns interactively"
+ msgstr "Vyn tillåter användaren att söka igenom kolumner interaktivt"
+
+-#: gtk/gtktreeview.c:642
++#: ../gtk/gtktreeview.c:642
+ msgid "Search Column"
+ msgstr "Sök kolumn"
+
+-#: gtk/gtktreeview.c:643
+-msgid "Model column to search through when searching through code"
+-msgstr "Modellkolumn att söka igenom vid kodgenomsökning"
++#: ../gtk/gtktreeview.c:643
++msgid "Model column to search through during interactive search"
++msgstr "Modellkolumn att söka igenom vid interaktiv sökning"
+
+-#: gtk/gtktreeview.c:663
++#: ../gtk/gtktreeview.c:663
+ msgid "Fixed Height Mode"
+ msgstr "Läge med fast höjd"
+
+-#: gtk/gtktreeview.c:664
++#: ../gtk/gtktreeview.c:664
+ msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
+ msgstr "Snabbar upp GtkTreeView genom att antaga att alla rader har samma höjd"
+
+-#: gtk/gtktreeview.c:684
++#: ../gtk/gtktreeview.c:684
+ msgid "Hover Selection"
+ msgstr "Svävningsmarkering"
+
+-#: gtk/gtktreeview.c:685
++#: ../gtk/gtktreeview.c:685
+ msgid "Whether the selection should follow the pointer"
+ msgstr "Huruvida markeringen ska följa pekaren"
+
+-#: gtk/gtktreeview.c:704
++#: ../gtk/gtktreeview.c:704
+ msgid "Hover Expand"
+ msgstr "Svävningsexpansion"
+
+-#: gtk/gtktreeview.c:705
+-msgid ""
+-"Whether rows should be expanded/collapsed when the pointer moves over them"
++#: ../gtk/gtktreeview.c:705
++msgid "Whether rows should be expanded/collapsed when the pointer moves over them"
+ msgstr "Huruvida rader ska fällas ut/fällas in då pekaren flyttas över dem"
+
+-#: gtk/gtktreeview.c:719
++#: ../gtk/gtktreeview.c:719
+ msgid "Show Expanders"
+ msgstr "Visa expanderare"
+
+-#: gtk/gtktreeview.c:720
++#: ../gtk/gtktreeview.c:720
+ msgid "View has expanders"
+ msgstr "Vy har expanderare"
+
+-#: gtk/gtktreeview.c:734
++#: ../gtk/gtktreeview.c:734
+ msgid "Level Indentation"
+ msgstr "Indenteringsnivå"
+
+-#: gtk/gtktreeview.c:735
++#: ../gtk/gtktreeview.c:735
+ msgid "Extra indentation for each level"
+ msgstr "Extra indentering för varje nivå"
+
+-#: gtk/gtktreeview.c:744
++#: ../gtk/gtktreeview.c:744
+ msgid "Rubber Banding"
+ msgstr "Gummiband"
+
+-#: gtk/gtktreeview.c:745
+-msgid ""
+-"Whether to enable selection of multiple items by dragging the mouse pointer"
++#: ../gtk/gtktreeview.c:745
++msgid "Whether to enable selection of multiple items by dragging the mouse pointer"
+ msgstr "Huruvida flera objekt kan markeras genom att dra muspekaren"
+
+-#: gtk/gtktreeview.c:752
++#: ../gtk/gtktreeview.c:752
+ msgid "Enable Grid Lines"
+ msgstr "Aktivera rutnät"
+
+-#: gtk/gtktreeview.c:753
++#: ../gtk/gtktreeview.c:753
+ msgid "Whether grid lines should be drawn in the tree view"
+ msgstr "Huruvida rutnät ska ritas i trädvyn"
+
+-#: gtk/gtktreeview.c:761
++#: ../gtk/gtktreeview.c:761
+ msgid "Enable Tree Lines"
+ msgstr "Aktivera trädrader"
+
+-#: gtk/gtktreeview.c:762
++#: ../gtk/gtktreeview.c:762
+ msgid "Whether tree lines should be drawn in the tree view"
+ msgstr "Huruvida trädlinjer ska ritas i trädvyn"
+
+-#: gtk/gtktreeview.c:770
++#: ../gtk/gtktreeview.c:770
+ msgid "The column in the model containing the tooltip texts for the rows"
+ msgstr "Kolumnen för modellen som innehåller verktygstipstexterna för raderna"
+
+-#: gtk/gtktreeview.c:792
++#: ../gtk/gtktreeview.c:792
+ msgid "Vertical Separator Width"
+ msgstr "Vertikal avgränsarbredd"
+
+-#: gtk/gtktreeview.c:793
++#: ../gtk/gtktreeview.c:793
+ msgid "Vertical space between cells. Must be an even number"
+ msgstr "Vertikalt utrymme mellan celler. Måste vara ett jämnt tal"
+
+-#: gtk/gtktreeview.c:801
++#: ../gtk/gtktreeview.c:801
+ msgid "Horizontal Separator Width"
+ msgstr "Horisontell avgränsarbredd"
+
+-#: gtk/gtktreeview.c:802
++#: ../gtk/gtktreeview.c:802
+ msgid "Horizontal space between cells. Must be an even number"
+ msgstr "Horisontellt utrymme mellan celler. Måsta vara ett jämnt tal"
+
+-#: gtk/gtktreeview.c:810
++#: ../gtk/gtktreeview.c:810
+ msgid "Allow Rules"
+ msgstr "Tillåt linjaler"
+
+-#: gtk/gtktreeview.c:811
++#: ../gtk/gtktreeview.c:811
+ msgid "Allow drawing of alternating color rows"
+ msgstr "Tillåt ritning av alternerande färgrader"
+
+-#: gtk/gtktreeview.c:817
++#: ../gtk/gtktreeview.c:817
+ msgid "Indent Expanders"
+ msgstr "Indentera expanderare"
+
+-#: gtk/gtktreeview.c:818
++#: ../gtk/gtktreeview.c:818
+ msgid "Make the expanders indented"
+ msgstr "Gör expanderarna indenterade"
+
+-#: gtk/gtktreeview.c:824
++#: ../gtk/gtktreeview.c:824
+ msgid "Even Row Color"
+ msgstr "Färg på jämna rader"
+
+-#: gtk/gtktreeview.c:825
++#: ../gtk/gtktreeview.c:825
+ msgid "Color to use for even rows"
+ msgstr "Färg att använda på jämna rader"
+
+-#: gtk/gtktreeview.c:831
++#: ../gtk/gtktreeview.c:831
+ msgid "Odd Row Color"
+ msgstr "Färg på udda rader"
+
+-#: gtk/gtktreeview.c:832
++#: ../gtk/gtktreeview.c:832
+ msgid "Color to use for odd rows"
+ msgstr "Färg att använda på udda rader"
+
+-#: gtk/gtktreeview.c:838
++#: ../gtk/gtktreeview.c:838
+ msgid "Row Ending details"
+ msgstr "Detaljer för radslut"
+
+-#: gtk/gtktreeview.c:839
++#: ../gtk/gtktreeview.c:839
+ msgid "Enable extended row background theming"
+ msgstr "Aktivera utökat radbakgrundstema"
+
+-#: gtk/gtktreeview.c:845
++#: ../gtk/gtktreeview.c:845
+ msgid "Grid line width"
+ msgstr "Rutnätsradbredd"
+
+-#: gtk/gtktreeview.c:846
++#: ../gtk/gtktreeview.c:846
+ msgid "Width, in pixels, of the tree view grid lines"
+ msgstr "Bredd, i bildpunkter, på trädvyns rutnätsrader"
+
+-#: gtk/gtktreeview.c:852
++#: ../gtk/gtktreeview.c:852
+ msgid "Tree line width"
+ msgstr "Trädradsbredd"
+
+-#: gtk/gtktreeview.c:853
++#: ../gtk/gtktreeview.c:853
+ msgid "Width, in pixels, of the tree view lines"
+ msgstr "Bredd, i bildpunkter, på trädvyns rader"
+
+-#: gtk/gtktreeview.c:859
++#: ../gtk/gtktreeview.c:859
+ msgid "Grid line pattern"
+ msgstr "Rutnätsradmönster"
+
+-#: gtk/gtktreeview.c:860
++#: ../gtk/gtktreeview.c:860
+ msgid "Dash pattern used to draw the tree view grid lines"
+ msgstr "Punktmönster som används för att rita trädvyns rutnätslinjer"
+
+-#: gtk/gtktreeview.c:866
++#: ../gtk/gtktreeview.c:866
+ msgid "Tree line pattern"
+ msgstr "Trädradsmönster"
+
+-#: gtk/gtktreeview.c:867
++#: ../gtk/gtktreeview.c:867
+ msgid "Dash pattern used to draw the tree view lines"
+ msgstr "Punktmönster som används för att rita trädvyns linjer"
+
+-#: gtk/gtktreeviewcolumn.c:192
++#: ../gtk/gtktreeviewcolumn.c:192
+ msgid "Whether to display the column"
+ msgstr "Huruvida kolumnen ska visas"
+
+-#: gtk/gtktreeviewcolumn.c:199 gtk/gtkwindow.c:523
++#: ../gtk/gtktreeviewcolumn.c:199
++#: ../gtk/gtkwindow.c:523
+ msgid "Resizable"
+ msgstr "Storleksändringsbar"
+
+-#: gtk/gtktreeviewcolumn.c:200
++#: ../gtk/gtktreeviewcolumn.c:200
+ msgid "Column is user-resizable"
+ msgstr "Användaren kan ändra storleken på kolumnen"
+
+-#: gtk/gtktreeviewcolumn.c:208
++#: ../gtk/gtktreeviewcolumn.c:208
+ msgid "Current width of the column"
+ msgstr "Aktuell bredd på kolumnen"
+
+-#: gtk/gtktreeviewcolumn.c:217
++#: ../gtk/gtktreeviewcolumn.c:217
+ msgid "Space which is inserted between cells"
+ msgstr "Utrymme som infogas mellan celler"
+
+-#: gtk/gtktreeviewcolumn.c:225
++#: ../gtk/gtktreeviewcolumn.c:225
+ msgid "Sizing"
+ msgstr "Storleksändring"
+
+-#: gtk/gtktreeviewcolumn.c:226
++#: ../gtk/gtktreeviewcolumn.c:226
+ msgid "Resize mode of the column"
+ msgstr "Kolumnens storleksändringsläge"
+
+-#: gtk/gtktreeviewcolumn.c:234
++#: ../gtk/gtktreeviewcolumn.c:234
+ msgid "Fixed Width"
+ msgstr "Fast bredd"
+
+-#: gtk/gtktreeviewcolumn.c:235
++#: ../gtk/gtktreeviewcolumn.c:235
+ msgid "Current fixed width of the column"
+ msgstr "Aktuell fast bredd på kolumnen"
+
+-#: gtk/gtktreeviewcolumn.c:244
++#: ../gtk/gtktreeviewcolumn.c:244
+ msgid "Minimum Width"
+ msgstr "Minsta bredd"
+
+-#: gtk/gtktreeviewcolumn.c:245
++#: ../gtk/gtktreeviewcolumn.c:245
+ msgid "Minimum allowed width of the column"
+ msgstr "Minsta tillåtna bredd på kolumnen"
+
+-#: gtk/gtktreeviewcolumn.c:254
++#: ../gtk/gtktreeviewcolumn.c:254
+ msgid "Maximum Width"
+ msgstr "Största bredd"
+
+-#: gtk/gtktreeviewcolumn.c:255
++#: ../gtk/gtktreeviewcolumn.c:255
+ msgid "Maximum allowed width of the column"
+ msgstr "Största tillåtna bredd på kolumnen"
+
+-#: gtk/gtktreeviewcolumn.c:265
++#: ../gtk/gtktreeviewcolumn.c:265
+ msgid "Title to appear in column header"
+ msgstr "Titel att visa i kolumnhuvudet"
+
+-#: gtk/gtktreeviewcolumn.c:273
++#: ../gtk/gtktreeviewcolumn.c:273
+ msgid "Column gets share of extra width allocated to the widget"
+ msgstr "Kolumnen får del av extra bredd som allokeras till widgeten"
+
+-#: gtk/gtktreeviewcolumn.c:280
++#: ../gtk/gtktreeviewcolumn.c:280
+ msgid "Clickable"
+ msgstr "Klickbar"
+
+-#: gtk/gtktreeviewcolumn.c:281
++#: ../gtk/gtktreeviewcolumn.c:281
+ msgid "Whether the header can be clicked"
+ msgstr "Huruvida huvudet kan klickas i"
+
+-#: gtk/gtktreeviewcolumn.c:289
++#: ../gtk/gtktreeviewcolumn.c:289
+ msgid "Widget"
+ msgstr "Widget"
+
+-#: gtk/gtktreeviewcolumn.c:290
++#: ../gtk/gtktreeviewcolumn.c:290
+ msgid "Widget to put in column header button instead of column title"
+ msgstr "Widget att placera kolumnhuvudets knapp istället för kolumntiteln"
+
+-#: gtk/gtktreeviewcolumn.c:298
++#: ../gtk/gtktreeviewcolumn.c:298
+ msgid "X Alignment of the column header text or widget"
+ msgstr "X-justering av kolumnhuvudets text eller widget"
+
+-#: gtk/gtktreeviewcolumn.c:308
++#: ../gtk/gtktreeviewcolumn.c:308
+ msgid "Whether the column can be reordered around the headers"
+ msgstr "Huruvida kolumnen kan omarrangeras runt huvudena"
+
+-#: gtk/gtktreeviewcolumn.c:315
++#: ../gtk/gtktreeviewcolumn.c:315
+ msgid "Sort indicator"
+ msgstr "Sorteringsindikator"
+
+-#: gtk/gtktreeviewcolumn.c:316
++#: ../gtk/gtktreeviewcolumn.c:316
+ msgid "Whether to show a sort indicator"
+ msgstr "Huruvida en sorteringsindikator ska visas"
+
+-#: gtk/gtktreeviewcolumn.c:323
++#: ../gtk/gtktreeviewcolumn.c:323
+ msgid "Sort order"
+ msgstr "Sorteringsordning"
+
+-#: gtk/gtktreeviewcolumn.c:324
++#: ../gtk/gtktreeviewcolumn.c:324
+ msgid "Sort direction the sort indicator should indicate"
+ msgstr "Sorteringsriktning som sorteringsindikatorn ska indikera"
+
+-#: gtk/gtkuimanager.c:221
++#: ../gtk/gtkuimanager.c:221
+ msgid "Whether tearoff menu items should be added to menus"
+ msgstr "Huruvida löstagbara menyobjekt ska läggas till i menyer"
+
+-#: gtk/gtkuimanager.c:228
++#: ../gtk/gtkuimanager.c:228
+ msgid "Merged UI definition"
+ msgstr "Sammanslagen användargränssnittsdefinition"
+
+-#: gtk/gtkuimanager.c:229
++#: ../gtk/gtkuimanager.c:229
+ msgid "An XML string describing the merged UI"
+ msgstr "En XML-sträng som beskriver det sammanslagna användargränssnittet"
+
+-#: gtk/gtkviewport.c:107
+-msgid ""
+-"The GtkAdjustment that determines the values of the horizontal position for "
+-"this viewport"
+-msgstr ""
+-"Det GtkAdjustment som avgör värdena på den horisontella positionen för denna "
+-"skrivbordsvy"
++#: ../gtk/gtkviewport.c:107
++msgid "The GtkAdjustment that determines the values of the horizontal position for this viewport"
++msgstr "Det GtkAdjustment som avgör värdena på den horisontella positionen för denna skrivbordsvy"
+
+-#: gtk/gtkviewport.c:115
+-msgid ""
+-"The GtkAdjustment that determines the values of the vertical position for "
+-"this viewport"
+-msgstr ""
+-"Det GtkAdjustment som avgör värdena på den vertikala positionen för denna "
+-"skrivbordsvy"
++#: ../gtk/gtkviewport.c:115
++msgid "The GtkAdjustment that determines the values of the vertical position for this viewport"
++msgstr "Det GtkAdjustment som avgör värdena på den vertikala positionen för denna skrivbordsvy"
+
+-#: gtk/gtkviewport.c:123
++#: ../gtk/gtkviewport.c:123
+ msgid "Determines how the shadowed box around the viewport is drawn"
+ msgstr "Bestämmer hur den skuggade rutan runt skrivbordsvyn ritas"
+
+-#: gtk/gtkwidget.c:483
++#: ../gtk/gtkwidget.c:483
+ msgid "Widget name"
+ msgstr "Widgetnamn"
+
+-#: gtk/gtkwidget.c:484
++#: ../gtk/gtkwidget.c:484
+ msgid "The name of the widget"
+ msgstr "Namnen på widgeten"
+
+-#: gtk/gtkwidget.c:490
++#: ../gtk/gtkwidget.c:490
+ msgid "Parent widget"
+ msgstr "Förälderwidget"
+
+-#: gtk/gtkwidget.c:491
++#: ../gtk/gtkwidget.c:491
+ msgid "The parent widget of this widget. Must be a Container widget"
+ msgstr "Förälderwidgeten till denna widget. Måste vara en behållarwidget"
+
+-#: gtk/gtkwidget.c:498
++#: ../gtk/gtkwidget.c:498
+ msgid "Width request"
+ msgstr "Breddbegäran"
+
+-#: gtk/gtkwidget.c:499
+-msgid ""
+-"Override for width request of the widget, or -1 if natural request should be "
+-"used"
+-msgstr ""
+-"Åsidosättande för breddbegäran av widgeten, eller -1 om naturlig begäran ska "
+-"användas"
++#: ../gtk/gtkwidget.c:499
++msgid "Override for width request of the widget, or -1 if natural request should be used"
++msgstr "Åsidosättande för breddbegäran av widgeten, eller -1 om naturlig begäran ska användas"
+
+-#: gtk/gtkwidget.c:507
++#: ../gtk/gtkwidget.c:507
+ msgid "Height request"
+ msgstr "Höjdbegäran"
+
+-#: gtk/gtkwidget.c:508
+-msgid ""
+-"Override for height request of the widget, or -1 if natural request should "
+-"be used"
+-msgstr ""
+-"Åsidosättande för höjdbegäran av widgeten, eller -1 om naturlig begäran ska "
+-"användas"
++#: ../gtk/gtkwidget.c:508
++msgid "Override for height request of the widget, or -1 if natural request should be used"
++msgstr "Åsidosättande för höjdbegäran av widgeten, eller -1 om naturlig begäran ska användas"
+
+-#: gtk/gtkwidget.c:517
++#: ../gtk/gtkwidget.c:517
+ msgid "Whether the widget is visible"
+ msgstr "Huruvida widgeten är synlig"
+
+-#: gtk/gtkwidget.c:524
++#: ../gtk/gtkwidget.c:524
+ msgid "Whether the widget responds to input"
+ msgstr "Huruvida widgeten svarar på inmatning"
+
+-#: gtk/gtkwidget.c:530
++#: ../gtk/gtkwidget.c:530
+ msgid "Application paintable"
+ msgstr "Programmet kan rita"
+
+-#: gtk/gtkwidget.c:531
++#: ../gtk/gtkwidget.c:531
+ msgid "Whether the application will paint directly on the widget"
+ msgstr "Huruvida programmet kan rita direkt på widgeten"
+
+-#: gtk/gtkwidget.c:537
++#: ../gtk/gtkwidget.c:537
+ msgid "Can focus"
+ msgstr "Kan få fokus"
+
+-#: gtk/gtkwidget.c:538
++#: ../gtk/gtkwidget.c:538
+ msgid "Whether the widget can accept the input focus"
+ msgstr "Huruvida widgeten kan acceptera inmatningsfokus"
+
+-#: gtk/gtkwidget.c:544
++#: ../gtk/gtkwidget.c:544
+ msgid "Has focus"
+ msgstr "Har fokus"
+
+-#: gtk/gtkwidget.c:545
++#: ../gtk/gtkwidget.c:545
+ msgid "Whether the widget has the input focus"
+ msgstr "Huruvida widgeten har inmatningsfokus"
+
+-#: gtk/gtkwidget.c:551
++#: ../gtk/gtkwidget.c:551
+ msgid "Is focus"
+ msgstr "Är fokus"
+
+-#: gtk/gtkwidget.c:552
++#: ../gtk/gtkwidget.c:552
+ msgid "Whether the widget is the focus widget within the toplevel"
+ msgstr "Huruvida widgeten är fokuswidgeten på toppnivån"
+
+-#: gtk/gtkwidget.c:558
++#: ../gtk/gtkwidget.c:558
+ msgid "Can default"
+ msgstr "Kan vara standard"
+
+-#: gtk/gtkwidget.c:559
++#: ../gtk/gtkwidget.c:559
+ msgid "Whether the widget can be the default widget"
+ msgstr "Huruvida widgeten kan vara standardwidgeten"
+
+-#: gtk/gtkwidget.c:565
++#: ../gtk/gtkwidget.c:565
+ msgid "Has default"
+ msgstr "Har standard"
+
+-#: gtk/gtkwidget.c:566
++#: ../gtk/gtkwidget.c:566
+ msgid "Whether the widget is the default widget"
+ msgstr "Huruvida widgeten är standardwidgeten"
+
+-#: gtk/gtkwidget.c:572
++#: ../gtk/gtkwidget.c:572
+ msgid "Receives default"
+ msgstr "Mottar standard"
+
+-#: gtk/gtkwidget.c:573
++#: ../gtk/gtkwidget.c:573
+ msgid "If TRUE, the widget will receive the default action when it is focused"
+ msgstr "Om SANT kommer widgeten att motta standardåtgärden då den har fokus"
+
+-#: gtk/gtkwidget.c:579
++#: ../gtk/gtkwidget.c:579
+ msgid "Composite child"
+ msgstr "Sammansatt barn"
+
+-#: gtk/gtkwidget.c:580
++#: ../gtk/gtkwidget.c:580
+ msgid "Whether the widget is part of a composite widget"
+ msgstr "Huruvida widgeten är en del av en sammansatt widget"
+
+-#: gtk/gtkwidget.c:586
++#: ../gtk/gtkwidget.c:586
+ msgid "Style"
+ msgstr "Stil"
+
+-#: gtk/gtkwidget.c:587
+-msgid ""
+-"The style of the widget, which contains information about how it will look "
+-"(colors etc)"
+-msgstr ""
+-"Stilen på widgeten, som innehåller information om hur den kommer att se ut "
+-"(färger osv)"
++#: ../gtk/gtkwidget.c:587
++msgid "The style of the widget, which contains information about how it will look (colors etc)"
++msgstr "Stilen på widgeten, som innehåller information om hur den kommer att se ut (färger osv)"
+
+-#: gtk/gtkwidget.c:593
++#: ../gtk/gtkwidget.c:593
+ msgid "Events"
+ msgstr "Händelser"
+
+-#: gtk/gtkwidget.c:594
++#: ../gtk/gtkwidget.c:594
+ msgid "The event mask that decides what kind of GdkEvents this widget gets"
+ msgstr "Händelsemasken som avgör vilken typ av GdkEvent som denna widget får"
+
+-#: gtk/gtkwidget.c:601
++#: ../gtk/gtkwidget.c:601
+ msgid "Extension events"
+ msgstr "Utökningshändelser"
+
+-#: gtk/gtkwidget.c:602
++#: ../gtk/gtkwidget.c:602
+ msgid "The mask that decides what kind of extension events this widget gets"
+ msgstr "Masken som avgör vilken typ av utökningshändelser som denna widget får"
+
+-#: gtk/gtkwidget.c:609
++#: ../gtk/gtkwidget.c:609
+ msgid "No show all"
+ msgstr "Visa inte alla"
+
+-#: gtk/gtkwidget.c:610
++#: ../gtk/gtkwidget.c:610
+ msgid "Whether gtk_widget_show_all() should not affect this widget"
+ msgstr "Huruvida gtk_widget_show_all() inte ska påverka denna widget"
+
+-#: gtk/gtkwidget.c:632
++#: ../gtk/gtkwidget.c:632
+ msgid "Has tooltip"
+ msgstr "Har verktygstips"
+
+-#: gtk/gtkwidget.c:633
++#: ../gtk/gtkwidget.c:633
+ msgid "Whether this widget has a tooltip"
+ msgstr "Huruvida denna widget har ett verktygstips"
+
+-#: gtk/gtkwidget.c:653
++#: ../gtk/gtkwidget.c:653
+ msgid "Tooltip Text"
+ msgstr "Text för verktygstips"
+
+-#: gtk/gtkwidget.c:654 gtk/gtkwidget.c:675
++#: ../gtk/gtkwidget.c:654
++#: ../gtk/gtkwidget.c:675
+ msgid "The contents of the tooltip for this widget"
+ msgstr "Innehållet i verktygstipset för denna widget"
+
+-#: gtk/gtkwidget.c:674
++#: ../gtk/gtkwidget.c:674
+ msgid "Tooltip markup"
+ msgstr "Verktygstips-markup"
+
+-#: gtk/gtkwidget.c:689
++#: ../gtk/gtkwidget.c:689
+ msgid "Window"
+ msgstr "Fönster"
+
+-#: gtk/gtkwidget.c:690
++#: ../gtk/gtkwidget.c:690
+ msgid "The widget's window if it is realized"
+ msgstr "Widgetens fönster om det finns"
+
+-#: gtk/gtkwidget.c:2208
++#: ../gtk/gtkwidget.c:2208
+ msgid "Interior Focus"
+ msgstr "Interiörfokus"
+
+-#: gtk/gtkwidget.c:2209
++#: ../gtk/gtkwidget.c:2209
+ msgid "Whether to draw the focus indicator inside widgets"
+ msgstr "Huruvida fokusindikatorn ritas inuti widgetar"
+
+-#: gtk/gtkwidget.c:2215
++#: ../gtk/gtkwidget.c:2215
+ msgid "Focus linewidth"
+ msgstr "Fokuslinjebredd"
+
+-#: gtk/gtkwidget.c:2216
++#: ../gtk/gtkwidget.c:2216
+ msgid "Width, in pixels, of the focus indicator line"
+ msgstr "Bredd, i bildpunkter, på fokusindikatorlinjen"
+
+-#: gtk/gtkwidget.c:2222
++#: ../gtk/gtkwidget.c:2222
+ msgid "Focus line dash pattern"
+ msgstr "Punktmönster för fokuslinje"
+
+-#: gtk/gtkwidget.c:2223
++#: ../gtk/gtkwidget.c:2223
+ msgid "Dash pattern used to draw the focus indicator"
+ msgstr "Punktmönster som används för att rita fokusindikatorn"
+
+-#: gtk/gtkwidget.c:2228
++#: ../gtk/gtkwidget.c:2228
+ msgid "Focus padding"
+ msgstr "Fokusutfyllnad"
+
+-#: gtk/gtkwidget.c:2229
++#: ../gtk/gtkwidget.c:2229
+ msgid "Width, in pixels, between focus indicator and the widget 'box'"
+ msgstr "Bredd, i bildpunkter, mellan fokusindikatorn och \"widgetrutan\""
+
+-#: gtk/gtkwidget.c:2234
++#: ../gtk/gtkwidget.c:2234
+ msgid "Cursor color"
+ msgstr "Markörfärg"
+
+-#: gtk/gtkwidget.c:2235
++#: ../gtk/gtkwidget.c:2235
+ msgid "Color with which to draw insertion cursor"
+ msgstr "Färg att rita insättningsmarkören med"
+
+-#: gtk/gtkwidget.c:2240
++#: ../gtk/gtkwidget.c:2240
+ msgid "Secondary cursor color"
+ msgstr "Sekundär markörfärg"
+
+-#: gtk/gtkwidget.c:2241
+-msgid ""
+-"Color with which to draw the secondary insertion cursor when editing mixed "
+-"right-to-left and left-to-right text"
+-msgstr ""
+-"Färg med vilken den sekundära insättningspekaren vid redigering av blandad "
+-"höger-till-vänster- och vänster-till-höger-text ritas"
++#: ../gtk/gtkwidget.c:2241
++msgid "Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text"
++msgstr "Färg med vilken den sekundära insättningspekaren vid redigering av blandad höger-till-vänster- och vänster-till-höger-text ritas"
+
+-#: gtk/gtkwidget.c:2246
++#: ../gtk/gtkwidget.c:2246
+ msgid "Cursor line aspect ratio"
+ msgstr "Proportioner för markörrad"
+
+-#: gtk/gtkwidget.c:2247
++#: ../gtk/gtkwidget.c:2247
+ msgid "Aspect ratio with which to draw insertion cursor"
+ msgstr "Proportioner att rita insättningsmarkören med"
+
+-#: gtk/gtkwidget.c:2261
++#: ../gtk/gtkwidget.c:2261
+ msgid "Draw Border"
+ msgstr "Rita ram"
+
+-#: gtk/gtkwidget.c:2262
++#: ../gtk/gtkwidget.c:2262
+ msgid "Size of areas outside the widget's allocation to draw"
+ msgstr "Storlek på områden utanför widgetens allokering för att rita"
+
+-#: gtk/gtkwidget.c:2275
++#: ../gtk/gtkwidget.c:2275
+ msgid "Unvisited Link Color"
+ msgstr "Inte besökt länkfärg"
+
+-#: gtk/gtkwidget.c:2276
++#: ../gtk/gtkwidget.c:2276
+ msgid "Color of unvisited links"
+ msgstr "Färg på inte besökta länkar"
+
+-#: gtk/gtkwidget.c:2289
++#: ../gtk/gtkwidget.c:2289
+ msgid "Visited Link Color"
+ msgstr "Besökt länkfärg"
+
+-#: gtk/gtkwidget.c:2290
++#: ../gtk/gtkwidget.c:2290
+ msgid "Color of visited links"
+ msgstr "Färg på besökta länkar"
+
+-#: gtk/gtkwidget.c:2304
++#: ../gtk/gtkwidget.c:2304
+ msgid "Wide Separators"
+ msgstr "Breda avgränsare"
+
+-#: gtk/gtkwidget.c:2305
+-msgid ""
+-"Whether separators have configurable width and should be drawn using a box "
+-"instead of a line"
+-msgstr ""
+-"Huruvida avgränsare har konfigurerbar bredd och ska ritas ut med en ruta "
+-"istället för en linje"
++#: ../gtk/gtkwidget.c:2305
++msgid "Whether separators have configurable width and should be drawn using a box instead of a line"
++msgstr "Huruvida avgränsare har konfigurerbar bredd och ska ritas ut med en ruta istället för en linje"
+
+-#: gtk/gtkwidget.c:2319
++#: ../gtk/gtkwidget.c:2319
+ msgid "Separator Width"
+ msgstr "Avgränsarbredd"
+
+-#: gtk/gtkwidget.c:2320
++#: ../gtk/gtkwidget.c:2320
+ msgid "The width of separators if wide-separators is TRUE"
+ msgstr "Bredden på avgränsare om wide-separators är TRUE"
+
+-#: gtk/gtkwidget.c:2334
++#: ../gtk/gtkwidget.c:2334
+ msgid "Separator Height"
+ msgstr "Avgränsarhöjd"
+
+-#: gtk/gtkwidget.c:2335
++#: ../gtk/gtkwidget.c:2335
+ msgid "The height of separators if \"wide-separators\" is TRUE"
+ msgstr "Höjden på avgränsare om \"wide-separators\" är TRUE"
+
+-#: gtk/gtkwidget.c:2349
++#: ../gtk/gtkwidget.c:2349
+ msgid "Horizontal Scroll Arrow Length"
+ msgstr "Längd på horisontell rullningspil"
+
+-#: gtk/gtkwidget.c:2350
++#: ../gtk/gtkwidget.c:2350
+ msgid "The length of horizontal scroll arrows"
+ msgstr "Längden på horisonella rullningspilar"
+
+-#: gtk/gtkwidget.c:2364
++#: ../gtk/gtkwidget.c:2364
+ msgid "Vertical Scroll Arrow Length"
+ msgstr "Längd på vertikal rullningspil"
+
+-#: gtk/gtkwidget.c:2365
++#: ../gtk/gtkwidget.c:2365
+ msgid "The length of vertical scroll arrows"
+ msgstr "Längden på vertikala rullningspilar"
+
+-#: gtk/gtkwindow.c:464
++#: ../gtk/gtkwindow.c:464
+ msgid "Window Type"
+ msgstr "Fönstertyp"
+
+-#: gtk/gtkwindow.c:465
++#: ../gtk/gtkwindow.c:465
+ msgid "The type of the window"
+ msgstr "Typen av fönster"
+
+-#: gtk/gtkwindow.c:473
++#: ../gtk/gtkwindow.c:473
+ msgid "Window Title"
+ msgstr "Fönstertitel"
+
+-#: gtk/gtkwindow.c:474
++#: ../gtk/gtkwindow.c:474
+ msgid "The title of the window"
+ msgstr "Titeln på fönstret"
+
+-#: gtk/gtkwindow.c:481
++#: ../gtk/gtkwindow.c:481
+ msgid "Window Role"
+ msgstr "Fönsterroll"
+
+-#: gtk/gtkwindow.c:482
++#: ../gtk/gtkwindow.c:482
+ msgid "Unique identifier for the window to be used when restoring a session"
+-msgstr ""
+-"Unik identifierare för fönstret som ska användas vid återställning av en "
+-"session"
++msgstr "Unik identifierare för fönstret som ska användas vid återställning av en session"
+
+-#: gtk/gtkwindow.c:498
++#: ../gtk/gtkwindow.c:498
+ msgid "Startup ID"
+ msgstr "Uppstarts-id"
+
+-#: gtk/gtkwindow.c:499
++#: ../gtk/gtkwindow.c:499
+ msgid "Unique startup identifier for the window used by startup-notification"
+-msgstr ""
+-"Unik uppstartsidentifierare för fönstret som ska användas av startup-"
+-"notification"
++msgstr "Unik uppstartsidentifierare för fönstret som ska användas av startup-notification"
+
+-#: gtk/gtkwindow.c:506
++#: ../gtk/gtkwindow.c:506
+ msgid "Allow Shrink"
+ msgstr "Tillåt krympning"
+
+-#: gtk/gtkwindow.c:508
++#: ../gtk/gtkwindow.c:508
+ #, no-c-format
+-msgid ""
+-"If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the "
+-"time a bad idea"
+-msgstr ""
+-"Om SANT har fönstret ingen minsta storlek. Att ställa in detta till SANT är "
+-"en dum idé i 99% av fallen"
++msgid "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"
++msgstr "Om SANT har fönstret ingen minsta storlek. Att ställa in detta till SANT är en dum idé i 99% av fallen"
+
+-#: gtk/gtkwindow.c:515
++#: ../gtk/gtkwindow.c:515
+ msgid "Allow Grow"
+ msgstr "Tillåt växande"
+
+-#: gtk/gtkwindow.c:516
++#: ../gtk/gtkwindow.c:516
+ msgid "If TRUE, users can expand the window beyond its minimum size"
+ msgstr "Om SANT kan användare utöka fönstret utöver dess minsta storlek"
+
+-#: gtk/gtkwindow.c:524
++#: ../gtk/gtkwindow.c:524
+ msgid "If TRUE, users can resize the window"
+ msgstr "Om SANT kan användare storleksändra fönstret"
+
+-#: gtk/gtkwindow.c:531
++#: ../gtk/gtkwindow.c:531
+ msgid "Modal"
+ msgstr "Modalt"
+
+-#: gtk/gtkwindow.c:532
+-msgid ""
+-"If TRUE, the window is modal (other windows are not usable while this one is "
+-"up)"
+-msgstr ""
+-"Om SANT är fönstret modalt (andra fönster är inte användbara så länge detta "
+-"fönster visas)"
++#: ../gtk/gtkwindow.c:532
++msgid "If TRUE, the window is modal (other windows are not usable while this one is up)"
++msgstr "Om SANT är fönstret modalt (andra fönster är inte användbara så länge detta fönster visas)"
+
+-#: gtk/gtkwindow.c:539
++#: ../gtk/gtkwindow.c:539
+ msgid "Window Position"
+ msgstr "Fönsterposition"
+
+-#: gtk/gtkwindow.c:540
++#: ../gtk/gtkwindow.c:540
+ msgid "The initial position of the window"
+ msgstr "Den första positionen på fönstret"
+
+-#: gtk/gtkwindow.c:548
++#: ../gtk/gtkwindow.c:548
+ msgid "Default Width"
+ msgstr "Standardbredd"
+
+-#: gtk/gtkwindow.c:549
++#: ../gtk/gtkwindow.c:549
+ msgid "The default width of the window, used when initially showing the window"
+ msgstr "Standardbredden på fönstret, används då fönstret först visas"
+
+-#: gtk/gtkwindow.c:558
++#: ../gtk/gtkwindow.c:558
+ msgid "Default Height"
+ msgstr "Standardhöjd"
+
+-#: gtk/gtkwindow.c:559
+-msgid ""
+-"The default height of the window, used when initially showing the window"
++#: ../gtk/gtkwindow.c:559
++msgid "The default height of the window, used when initially showing the window"
+ msgstr "Standardhöjden på fönstret, används då fönstret först visas"
+
+-#: gtk/gtkwindow.c:568
++#: ../gtk/gtkwindow.c:568
+ msgid "Destroy with Parent"
+ msgstr "Förstör med förälder"
+
+-#: gtk/gtkwindow.c:569
++#: ../gtk/gtkwindow.c:569
+ msgid "If this window should be destroyed when the parent is destroyed"
+ msgstr "Om detta fönster ska förstöras då dess förälder förstörs"
+
+-#: gtk/gtkwindow.c:577
++#: ../gtk/gtkwindow.c:577
+ msgid "Icon for this window"
+ msgstr "Ikon för detta fönster"
+
+-#: gtk/gtkwindow.c:593
++#: ../gtk/gtkwindow.c:593
+ msgid "Name of the themed icon for this window"
+ msgstr "Namnet på den tematiserade ikonen för detta fönster"
+
+-#: gtk/gtkwindow.c:608
++#: ../gtk/gtkwindow.c:608
+ msgid "Is Active"
+ msgstr "Är aktiv"
+
+-#: gtk/gtkwindow.c:609
++#: ../gtk/gtkwindow.c:609
+ msgid "Whether the toplevel is the current active window"
+ msgstr "Huruvida toppnivån är det för tillfället aktiva fönstret"
+
+-#: gtk/gtkwindow.c:616
++#: ../gtk/gtkwindow.c:616
+ msgid "Focus in Toplevel"
+ msgstr "Fokus i toppnivå"
+
+-#: gtk/gtkwindow.c:617
++#: ../gtk/gtkwindow.c:617
+ msgid "Whether the input focus is within this GtkWindow"
+ msgstr "Huruvida inmatningsfokus är inom detta GtkWindow"
+
+-#: gtk/gtkwindow.c:624
++#: ../gtk/gtkwindow.c:624
+ msgid "Type hint"
+ msgstr "Typtips"
+
+-#: gtk/gtkwindow.c:625
+-msgid ""
+-"Hint to help the desktop environment understand what kind of window this is "
+-"and how to treat it."
+-msgstr ""
+-"Tips för att hjälpa skrivbordmiljön förstå vad för typ av fönster detta är "
+-"och hur det ska behandlas."
++#: ../gtk/gtkwindow.c:625
++msgid "Hint to help the desktop environment understand what kind of window this is and how to treat it."
++msgstr "Tips för att hjälpa skrivbordmiljön förstå vad för typ av fönster detta är och hur det ska behandlas."
+
+-#: gtk/gtkwindow.c:633
++#: ../gtk/gtkwindow.c:633
+ msgid "Skip taskbar"
+ msgstr "Hoppa över fönsterlista"
+
+-#: gtk/gtkwindow.c:634
++#: ../gtk/gtkwindow.c:634
+ msgid "TRUE if the window should not be in the task bar."
+ msgstr "SANT om fönstret inte ska visas i fönsterlistan."
+
+-#: gtk/gtkwindow.c:641
++#: ../gtk/gtkwindow.c:641
+ msgid "Skip pager"
+ msgstr "Hoppa över väljaren"
+
+-#: gtk/gtkwindow.c:642
++#: ../gtk/gtkwindow.c:642
+ msgid "TRUE if the window should not be in the pager."
+ msgstr "SANT om fönstret inte ska vara i skrivbordsväljaren."
+
+-#: gtk/gtkwindow.c:649
++#: ../gtk/gtkwindow.c:649
+ msgid "Urgent"
+ msgstr "Brådskande"
+
+-#: gtk/gtkwindow.c:650
++#: ../gtk/gtkwindow.c:650
+ msgid "TRUE if the window should be brought to the user's attention."
+ msgstr "SANT om användaren ska göras uppmärksam på fönstret."
+
+-#: gtk/gtkwindow.c:664
++#: ../gtk/gtkwindow.c:664
+ msgid "Accept focus"
+ msgstr "Acceptera fokus"
+
+-#: gtk/gtkwindow.c:665
++#: ../gtk/gtkwindow.c:665
+ msgid "TRUE if the window should receive the input focus."
+ msgstr "SANT om fönstret ska få inmatningsfokus."
+
+-#: gtk/gtkwindow.c:679
++#: ../gtk/gtkwindow.c:679
+ msgid "Focus on map"
+ msgstr "Fokusera vid mappning"
+
+-#: gtk/gtkwindow.c:680
++#: ../gtk/gtkwindow.c:680
+ msgid "TRUE if the window should receive the input focus when mapped."
+ msgstr "SANT om fönstret ska få inmatningsfokus då det mappas."
+
+-#: gtk/gtkwindow.c:694
++#: ../gtk/gtkwindow.c:694
+ msgid "Decorated"
+ msgstr "Dekorerat"
+
+-#: gtk/gtkwindow.c:695
++#: ../gtk/gtkwindow.c:695
+ msgid "Whether the window should be decorated by the window manager"
+ msgstr "Huruvida fönstret ska vara dekorerat i fönsterhanteraren"
+
+-#: gtk/gtkwindow.c:709
++#: ../gtk/gtkwindow.c:709
+ msgid "Deletable"
+ msgstr "Borttagningsbart"
+
+-#: gtk/gtkwindow.c:710
++#: ../gtk/gtkwindow.c:710
+ msgid "Whether the window frame should have a close button"
+ msgstr "Huruvida fönsterramen ska ha en stängningsknapp"
+
+-#: gtk/gtkwindow.c:726
++#: ../gtk/gtkwindow.c:726
+ msgid "Gravity"
+ msgstr "Gravitet"
+
+-#: gtk/gtkwindow.c:727
++#: ../gtk/gtkwindow.c:727
+ msgid "The window gravity of the window"
+ msgstr "Fönstrets fönstergravitet"
+
+ # Bättre ord saknas
+-#: gtk/gtkwindow.c:744
++#: ../gtk/gtkwindow.c:744
+ msgid "Transient for Window"
+ msgstr "Kortvarighet för fönster"
+
+ # Bättre ord?
+-#: gtk/gtkwindow.c:745
++#: ../gtk/gtkwindow.c:745
+ msgid "The transient parent of the dialog"
+ msgstr "Kortvarig förälder för dialogrutan"
+
+-#: gtk/gtkwindow.c:759
++#: ../gtk/gtkwindow.c:759
+ msgid "Opacity for Window"
+ msgstr "Opakhet för fönster"
+
+-#: gtk/gtkwindow.c:760
++#: ../gtk/gtkwindow.c:760
+ msgid "The opacity of the window, from 0 to 1"
+ msgstr "Opakheten för fönstret, från 0 till 1"
+
+-#: modules/input/gtkimcontextxim.c:334
++#: ../modules/input/gtkimcontextxim.c:334
+ msgid "IM Preedit style"
+ msgstr "IM-förredigeringsstil"
+
+-#: modules/input/gtkimcontextxim.c:335
++#: ../modules/input/gtkimcontextxim.c:335
+ msgid "How to draw the input method preedit string"
+ msgstr "Hur inmatningsmetodens förredigeringssträng ska ritas"
+
+-#: modules/input/gtkimcontextxim.c:343
++#: ../modules/input/gtkimcontextxim.c:343
+ msgid "IM Status style"
+ msgstr "IM-statusstil"
+
+-#: modules/input/gtkimcontextxim.c:344
++#: ../modules/input/gtkimcontextxim.c:344
+ msgid "How to draw the input method statusbar"
+ msgstr "Hur inmatningsmetodens statusrad ska ritas"
+
+ #~ msgid "Whether stock icons should be shown in buttons"
+ #~ msgstr "Huruvida standardikoner ska visas i knappar"
+-
+ #~ msgid "Cancelled"
+ #~ msgstr "Avbruten"
+-
+ #~ msgid "Whether or not the operation has been successfully cancelled"
+ #~ msgstr "Huruvida avbrytandet av åtgärden har lyckats eller inte"
+-
+ #~ msgid ""
+ #~ "A number between 0.0 and 1.0 specifying the horizontal alignment of the "
+ #~ "text in the progress widget"
+ #~ msgstr ""
+ #~ "Ett tal mellan 0.0 och 1.0 som anger den horisontella justeringen av "
+ #~ "texten i förloppswidgeten"
+-
+ #~ msgid ""
+ #~ "A number between 0.0 and 1.0 specifying the vertical alignment of the "
+ #~ "text in the progress widget"
+@@ -6907,78 +6699,59 @@
+ #, fuzzy
+ #~ msgid "The current page in the document."
+ #~ msgstr "Sidstorleken på justeringen"
+-
+ #~ msgid "Homogenous"
+ #~ msgstr "Homogena"
+
+ #, fuzzy
+ #~ msgid "Show Preview"
+ #~ msgstr "Visa text"
+-
+ #~ msgid ""
+ #~ "Whether a file chooser in save modewill present an overwrite confirmation "
+ #~ "dialog if necessary."
+ #~ msgstr ""
+ #~ "Huruvidare en filväljare i sparandeläge kommer att visa en "
+ #~ "överskrivningsbekräftelsedialog om så behövs."
+-
+ #~ msgid "What degree of hinting to use; none, slight, medium, or full"
+ #~ msgstr ""
+ #~ "Vilken grad av hintning att använda; ingen, liten, mellan, eller "
+ #~ "fullständig"
+-
+ #~ msgid ""
+ #~ "Offset of text above the baseline (below the baseline if rise is "
+ #~ "negative) in pixels"
+ #~ msgstr ""
+ #~ "Avstånd för texten ovanför baslinjen (nedanför baslinjen om höjning är "
+ #~ "negativt) i bildpunkter"
+-
+ #~ msgid "Space which is inserted between grid column"
+ #~ msgstr "Mellanrum som infogas mellan kolumn i rutnät"
+-
+ #~ msgid "Whether this text is hidden. Not implemented in GTK 2.0"
+ #~ msgstr "Huruvida denna text är dold. Inte implementerat i GTK 2.0"
+-
+ #~ msgid ""
+ #~ "Whether rows should be expanded/collaped when the pointer moves over them"
+ #~ msgstr "Huruvida rader ska fällas ut/fällas in då pekaren flyttas över dem"
+-
+ #~ msgid "Width in characters"
+ #~ msgstr "Bredd i antal tecken"
+-
+ #~ msgid "Maximum Width in Characters"
+ #~ msgstr "Maximal bredd i antal tecken"
+-
+ #~ msgid "Modules"
+ #~ msgstr "Moduler"
+-
+ #~ msgid "Module"
+ #~ msgstr "Modul"
+-
+ #~ msgid "Width In Chararacters"
+ #~ msgstr "Bredd i antal tecken"
+-
+ #~ msgid "Whether the browse dialog is visible or not."
+ #~ msgstr "Huruvida bläddringsdialogen är synlig eller inte."
+-
+ #~ msgid "Row separator column"
+ #~ msgstr "Radavskiljarkolumn"
+-
+ #~ msgid "ComboBox appareance"
+ #~ msgstr "ComboBox-utseende"
+-
+ #~ msgid "ComboBox appearance, where TRUE means Windows-style."
+ #~ msgstr "ComboBox-utseende, där SANT betyder av Windows-typ."
+-
+ #~ msgid "The horizontal alignment, from 0 (left) to 1 (right)"
+ #~ msgstr "Horisontell justering, från 0 (vänster) till 1 (höger)"
+-
+ #~ msgid "Folder Mode"
+ #~ msgstr "Mappläge"
+-
+ #~ msgid "Whether to select folders rather than files"
+ #~ msgstr "Huruvida den mappar ska väljas istället för filer"
+-
+ #~ msgid "File System"
+ #~ msgstr "Filsystem"
++
+Index: po-properties/sl.po
+===================================================================
+--- po-properties/sl.po (revision 22076)
++++ po-properties/sl.po (revision 22450)
+@@ -9,6837 +9,6663 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: GTK+ 1.4.0\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-01-07 12:13-0500\n"
+-"PO-Revision-Date: 2008-09-25 19:43+0100\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk+&component=general\n"
++"POT-Creation-Date: 2009-02-19 22:33+0000\n"
++"PO-Revision-Date: 2009-02-24 16:29+0100\n"
+ "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+ "Language-Team: slovenian <sl@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+-"%100==4 ? 3 : 0);\n"
++"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+ "X-Poedit-Language: Slovenian\n"
+ "X-Poedit-Country: SLOVENIA\n"
+ "X-Poedit-SourceCharset: iso-8859-1\n"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:89
++#: ../gdk-pixbuf/gdk-pixbuf.c:89
+ msgid "Number of Channels"
+ msgstr "Število kanalov"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:90
++#: ../gdk-pixbuf/gdk-pixbuf.c:90
+ msgid "The number of samples per pixel"
+ msgstr "Število vzorcev na slikovno točko"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:99
++#: ../gdk-pixbuf/gdk-pixbuf.c:99
+ msgid "Colorspace"
+ msgstr "Barvni prostor"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:100
++#: ../gdk-pixbuf/gdk-pixbuf.c:100
+ msgid "The colorspace in which the samples are interpreted"
+ msgstr "Barvni prostor, v katerem so interpretirani vzorci"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:108
++#: ../gdk-pixbuf/gdk-pixbuf.c:108
+ msgid "Has Alpha"
+ msgstr "Ima kanal alfa"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:109
++#: ../gdk-pixbuf/gdk-pixbuf.c:109
+ msgid "Whether the pixbuf has an alpha channel"
+ msgstr "Ali naj ima pixbuf kanal alfa"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:122
++#: ../gdk-pixbuf/gdk-pixbuf.c:122
+ msgid "Bits per Sample"
+ msgstr "Bitov na vzorec"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:123
++#: ../gdk-pixbuf/gdk-pixbuf.c:123
+ msgid "The number of bits per sample"
+ msgstr "Število bitov na vzorec"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:132 gtk/gtklayout.c:632 gtk/gtktreeviewcolumn.c:207
++#: ../gdk-pixbuf/gdk-pixbuf.c:132
++#: ../gtk/gtklayout.c:632
++#: ../gtk/gtktreeviewcolumn.c:207
+ msgid "Width"
+ msgstr "Širina"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:133
++#: ../gdk-pixbuf/gdk-pixbuf.c:133
+ msgid "The number of columns of the pixbuf"
+ msgstr "Število stolpcev v slikovnem medpomnilniku (pixbuf)"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:142 gtk/gtklayout.c:641
++#: ../gdk-pixbuf/gdk-pixbuf.c:142
++#: ../gtk/gtklayout.c:641
+ msgid "Height"
+ msgstr "Višina"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:143
++#: ../gdk-pixbuf/gdk-pixbuf.c:143
+ msgid "The number of rows of the pixbuf"
+ msgstr "Število vrstic v slikovnem medpomnilniku (pixbuf)"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:159
++#: ../gdk-pixbuf/gdk-pixbuf.c:159
+ msgid "Rowstride"
+ msgstr "Bitne vrstice"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:160
+-msgid ""
+-"The number of bytes between the start of a row and the start of the next row"
++#: ../gdk-pixbuf/gdk-pixbuf.c:160
++msgid "The number of bytes between the start of a row and the start of the next row"
+ msgstr "Število bajtov med začetkom vrstice in začetkom naslednje vrstice"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:169
++#: ../gdk-pixbuf/gdk-pixbuf.c:169
+ msgid "Pixels"
+ msgstr "Točke"
+
+-#: gdk-pixbuf/gdk-pixbuf.c:170
++#: ../gdk-pixbuf/gdk-pixbuf.c:170
+ msgid "A pointer to the pixel data of the pixbuf"
+ msgstr "Kazalec na podatke slikovne točke v medpomnilniku slikovnih točk"
+
+-#: gdk/gdkdisplaymanager.c:103
++#: ../gdk/gdkdisplaymanager.c:103
+ msgid "Default Display"
+ msgstr "Privzeti zaslon"
+
+-#: gdk/gdkdisplaymanager.c:104
++#: ../gdk/gdkdisplaymanager.c:104
+ msgid "The default display for GDK"
+ msgstr "Privzet zaslon za GDK"
+
+-#: gdk/gdkpango.c:490 gtk/gtkinvisible.c:86 gtk/gtkmountoperation.c:176
+-#: gtk/gtkstatusicon.c:253 gtk/gtkwindow.c:600
++#: ../gdk/gdkpango.c:490
++#: ../gtk/gtkinvisible.c:86
++#: ../gtk/gtkmountoperation.c:176
++#: ../gtk/gtkstatusicon.c:253
++#: ../gtk/gtkwindow.c:600
+ msgid "Screen"
+ msgstr "Zaslon"
+
+-#: gdk/gdkpango.c:491
++#: ../gdk/gdkpango.c:491
+ msgid "the GdkScreen for the renderer"
+ msgstr "GdkScreen za upodobitev"
+
+-#: gdk/gdkscreen.c:75
++#: ../gdk/gdkscreen.c:75
+ msgid "Font options"
+ msgstr "Možnosti pisave"
+
+-#: gdk/gdkscreen.c:76
++#: ../gdk/gdkscreen.c:76
+ msgid "The default font options for the screen"
+ msgstr "Privzete možnosti pisave za zaslon"
+
+-#: gdk/gdkscreen.c:83
++#: ../gdk/gdkscreen.c:83
+ msgid "Font resolution"
+ msgstr "Ločljivost pisave"
+
+-#: gdk/gdkscreen.c:84
++#: ../gdk/gdkscreen.c:84
+ msgid "The resolution for fonts on the screen"
+ msgstr "Ločljivost pisav na zaslonu"
+
+-#: gtk/gtkaboutdialog.c:200
++#: ../gtk/gtkaboutdialog.c:200
+ msgid "Program name"
+ msgstr "Ime programa"
+
+-#: gtk/gtkaboutdialog.c:201
+-msgid ""
+-"The name of the program. If this is not set, it defaults to "
+-"g_get_application_name()"
+-msgstr ""
+-"Ime programa. V primeru, da vrednost ni nastavljena, je privzeto določeno "
+-"g_get_application_name()"
++#: ../gtk/gtkaboutdialog.c:201
++msgid "The name of the program. If this is not set, it defaults to g_get_application_name()"
++msgstr "Ime programa. V primeru, da vrednost ni nastavljena, je privzeto določeno g_get_application_name()"
+
+-#: gtk/gtkaboutdialog.c:215
++#: ../gtk/gtkaboutdialog.c:215
+ msgid "Program version"
+ msgstr "Različica programa"
+
+-#: gtk/gtkaboutdialog.c:216
++#: ../gtk/gtkaboutdialog.c:216
+ msgid "The version of the program"
+ msgstr "Različica programa"
+
+-#: gtk/gtkaboutdialog.c:230
++#: ../gtk/gtkaboutdialog.c:230
+ msgid "Copyright string"
+ msgstr "Niz o avtorskih pravicah"
+
+-#: gtk/gtkaboutdialog.c:231
++#: ../gtk/gtkaboutdialog.c:231
+ msgid "Copyright information for the program"
+ msgstr "Podatki o avtorskih pravicah za program"
+
+-#: gtk/gtkaboutdialog.c:248
++#: ../gtk/gtkaboutdialog.c:248
+ msgid "Comments string"
+ msgstr "Niz komentarja"
+
+-#: gtk/gtkaboutdialog.c:249
++#: ../gtk/gtkaboutdialog.c:249
+ msgid "Comments about the program"
+ msgstr "Komentarji o programu"
+
+-#: gtk/gtkaboutdialog.c:283
++#: ../gtk/gtkaboutdialog.c:283
+ msgid "Website URL"
+ msgstr "URL spletnega mesta"
+
+-#: gtk/gtkaboutdialog.c:284
++#: ../gtk/gtkaboutdialog.c:284
+ msgid "The URL for the link to the website of the program"
+ msgstr "URL za povezavo do spletnega mesta programa"
+
+-#: gtk/gtkaboutdialog.c:300
++#: ../gtk/gtkaboutdialog.c:300
+ msgid "Website label"
+ msgstr "Oznaka spletnega mesta"
+
+-#: gtk/gtkaboutdialog.c:301
+-msgid ""
+-"The label for the link to the website of the program. If this is not set, it "
+-"defaults to the URL"
+-msgstr ""
+-"Oznaka za povezavo do spletnega mesta programa. V primeru, da vrednost ni "
+-"nastavljena, je privzeto uporabljen URL"
++#: ../gtk/gtkaboutdialog.c:301
++msgid "The label for the link to the website of the program. If this is not set, it defaults to the URL"
++msgstr "Oznaka za povezavo do spletnega mesta programa. V primeru, da vrednost ni nastavljena, je privzeto uporabljen URL"
+
+-#: gtk/gtkaboutdialog.c:317
++#: ../gtk/gtkaboutdialog.c:317
+ msgid "Authors"
+ msgstr "Avtorji"
+
+-#: gtk/gtkaboutdialog.c:318
++#: ../gtk/gtkaboutdialog.c:318
+ msgid "List of authors of the program"
+ msgstr "Seznam avtorjev programa"
+
+-#: gtk/gtkaboutdialog.c:334
++#: ../gtk/gtkaboutdialog.c:334
+ msgid "Documenters"
+ msgstr "Pisci dokumentacije"
+
+-#: gtk/gtkaboutdialog.c:335
++#: ../gtk/gtkaboutdialog.c:335
+ msgid "List of people documenting the program"
+ msgstr "Seznam ljudi, ki so dokumentirali program"
+
+-#: gtk/gtkaboutdialog.c:351
++#: ../gtk/gtkaboutdialog.c:351
+ msgid "Artists"
+ msgstr "Umetniki"
+
+-#: gtk/gtkaboutdialog.c:352
++#: ../gtk/gtkaboutdialog.c:352
+ msgid "List of people who have contributed artwork to the program"
+ msgstr "Seznam ljudi, ki so programu prispevali umetniška dela"
+
+-#: gtk/gtkaboutdialog.c:369
++#: ../gtk/gtkaboutdialog.c:369
+ msgid "Translator credits"
+ msgstr "Zasluge prevajalcev"
+
+-#: gtk/gtkaboutdialog.c:370
+-msgid ""
+-"Credits to the translators. This string should be marked as translatable"
++#: ../gtk/gtkaboutdialog.c:370
++msgid "Credits to the translators. This string should be marked as translatable"
+ msgstr "Zasluge prevajalcem. Ta niz bi moral biti označen kot prevedljiv"
+
+-#: gtk/gtkaboutdialog.c:385
++#: ../gtk/gtkaboutdialog.c:385
+ msgid "Logo"
+ msgstr "Logotip"
+
+-#: gtk/gtkaboutdialog.c:386
+-msgid ""
+-"A logo for the about box. If this is not set, it defaults to "
+-"gtk_window_get_default_icon_list()"
+-msgstr ""
+-"Logotip za polje o programu. V primeru, da vrednost ni nastavljena,je "
+-"privzeto določena vrednost gtk_window_get_default_icon_list()"
++#: ../gtk/gtkaboutdialog.c:386
++msgid "A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"
++msgstr "Logotip za polje o programu. V primeru, da vrednost ni nastavljena,je privzeto določena vrednost gtk_window_get_default_icon_list()"
+
+-#: gtk/gtkaboutdialog.c:401
++#: ../gtk/gtkaboutdialog.c:401
+ msgid "Logo Icon Name"
+ msgstr "Ime ikone logotipa"
+
+-#: gtk/gtkaboutdialog.c:402
++#: ../gtk/gtkaboutdialog.c:402
+ msgid "A named icon to use as the logo for the about box."
+ msgstr "Imenovana ikona, ki naj služi kot logotip v oknu o programu."
+
+-#: gtk/gtkaboutdialog.c:415
++#: ../gtk/gtkaboutdialog.c:415
+ msgid "Wrap license"
+ msgstr "Prelomi licenco"
+
+-#: gtk/gtkaboutdialog.c:416
++#: ../gtk/gtkaboutdialog.c:416
+ msgid "Whether to wrap the license text."
+ msgstr "Ali naj bo besedilo licence prelomljeno."
+
+-#: gtk/gtkaccellabel.c:129
++#: ../gtk/gtkaccellabel.c:129
+ msgid "Accelerator Closure"
+ msgstr "Zaprtje pospeševalnika"
+
+-#: gtk/gtkaccellabel.c:130
++#: ../gtk/gtkaccellabel.c:130
+ msgid "The closure to be monitored for accelerator changes"
+ msgstr "Zaprtje naj bo nadzorovano za spremembe pospeševalnika"
+
+-#: gtk/gtkaccellabel.c:136
++#: ../gtk/gtkaccellabel.c:136
+ msgid "Accelerator Widget"
+ msgstr "Gradnik pospeševalnika"
+
+-#: gtk/gtkaccellabel.c:137
++#: ../gtk/gtkaccellabel.c:137
+ msgid "The widget to be monitored for accelerator changes"
+ msgstr "Gradnik, nadzorovan za spremembe pospeševalnika"
+
+-#: gtk/gtkaction.c:199 gtk/gtkactiongroup.c:170 gtk/gtkprinter.c:123
+-#: gtk/gtktextmark.c:89
++#: ../gtk/gtkaction.c:199
++#: ../gtk/gtkactiongroup.c:170
++#: ../gtk/gtkprinter.c:123
++#: ../gtk/gtktextmark.c:89
+ msgid "Name"
+ msgstr "Ime"
+
+-#: gtk/gtkaction.c:200
++#: ../gtk/gtkaction.c:200
+ msgid "A unique name for the action."
+ msgstr "Enkratno ime za dejanje."
+
+-#: gtk/gtkaction.c:215 gtk/gtkbutton.c:199 gtk/gtkexpander.c:195
+-#: gtk/gtkframe.c:105 gtk/gtklabel.c:316 gtk/gtktoolbutton.c:180
++#: ../gtk/gtkaction.c:215
++#: ../gtk/gtkbutton.c:199
++#: ../gtk/gtkexpander.c:195
++#: ../gtk/gtkframe.c:105
++#: ../gtk/gtklabel.c:316
++#: ../gtk/gtktoolbutton.c:180
+ msgid "Label"
+ msgstr "Oznaka"
+
+-#: gtk/gtkaction.c:216
++#: ../gtk/gtkaction.c:216
+ msgid "The label used for menu items and buttons that activate this action."
+ msgstr "Oznaka uporabljena za izbire menija in gumbe, ki to dejanje zaženejo."
+
+-#: gtk/gtkaction.c:223
++#: ../gtk/gtkaction.c:223
+ msgid "Short label"
+ msgstr "Kratek naziv"
+
+-#: gtk/gtkaction.c:224
++#: ../gtk/gtkaction.c:224
+ msgid "A shorter label that may be used on toolbar buttons."
+ msgstr "Krajši napis, uporaben za gumbe orodne vrstice."
+
+-#: gtk/gtkaction.c:230
++#: ../gtk/gtkaction.c:230
+ msgid "Tooltip"
+ msgstr "Orodni namig"
+
+-#: gtk/gtkaction.c:231
++#: ../gtk/gtkaction.c:231
+ msgid "A tooltip for this action."
+ msgstr "Orodni namig za to dejanje."
+
+-#: gtk/gtkaction.c:237
++#: ../gtk/gtkaction.c:237
+ msgid "Stock Icon"
+ msgstr "Skladna ikona"
+
+-#: gtk/gtkaction.c:238
++#: ../gtk/gtkaction.c:238
+ msgid "The stock icon displayed in widgets representing this action."
+ msgstr "Ikona, prikazana v gradnikih, ki predstavlja to dejanje."
+
+-#: gtk/gtkaction.c:255 gtk/gtkcellrendererpixbuf.c:171 gtk/gtkimage.c:230
+-#: gtk/gtkprinter.c:172 gtk/gtkstatusicon.c:210 gtk/gtkwindow.c:592
++#: ../gtk/gtkaction.c:255
++#: ../gtk/gtkcellrendererpixbuf.c:171
++#: ../gtk/gtkimage.c:230
++#: ../gtk/gtkprinter.c:172
++#: ../gtk/gtkstatusicon.c:210
++#: ../gtk/gtkwindow.c:592
+ msgid "Icon Name"
+ msgstr "Ime ikone"
+
+-#: gtk/gtkaction.c:256 gtk/gtkcellrendererpixbuf.c:172 gtk/gtkimage.c:231
+-#: gtk/gtkstatusicon.c:211
++#: ../gtk/gtkaction.c:256
++#: ../gtk/gtkcellrendererpixbuf.c:172
++#: ../gtk/gtkimage.c:231
++#: ../gtk/gtkstatusicon.c:211
+ msgid "The name of the icon from the icon theme"
+ msgstr "Ime ikone iz ikonske teme"
+
+-#: gtk/gtkaction.c:262 gtk/gtktoolitem.c:156
++#: ../gtk/gtkaction.c:262
++#: ../gtk/gtktoolitem.c:156
+ msgid "Visible when horizontal"
+ msgstr "Viden, ko je vodoravna"
+
+-#: gtk/gtkaction.c:263 gtk/gtktoolitem.c:157
+-msgid ""
+-"Whether the toolbar item is visible when the toolbar is in a horizontal "
+-"orientation."
+-msgstr ""
+-"Ali naj bo element orodne vrstice viden, ko je orodna vrstica postavljena "
+-"vodoravno."
++#: ../gtk/gtkaction.c:263
++#: ../gtk/gtktoolitem.c:157
++msgid "Whether the toolbar item is visible when the toolbar is in a horizontal orientation."
++msgstr "Ali naj bo element orodne vrstice viden, ko je orodna vrstica postavljena vodoravno."
+
+-#: gtk/gtkaction.c:278
++#: ../gtk/gtkaction.c:278
+ msgid "Visible when overflown"
+ msgstr "Viden ob preletu"
+
+-#: gtk/gtkaction.c:279
+-msgid ""
+-"When TRUE, toolitem proxies for this action are represented in the toolbar "
+-"overflow menu."
+-msgstr ""
+-"Izbrana možnost omogoča, da so orodni predmeti dejanj prikazani v prekrivnem "
+-"meniju orodne vrstice"
++#: ../gtk/gtkaction.c:279
++msgid "When TRUE, toolitem proxies for this action are represented in the toolbar overflow menu."
++msgstr "Izbrana možnost omogoča, da so orodni predmeti dejanj prikazani v prekrivnem meniju orodne vrstice"
+
+-#: gtk/gtkaction.c:286 gtk/gtktoolitem.c:163
++#: ../gtk/gtkaction.c:286
++#: ../gtk/gtktoolitem.c:163
+ msgid "Visible when vertical"
+ msgstr "Viden, ko je navpična"
+
+-#: gtk/gtkaction.c:287 gtk/gtktoolitem.c:164
+-msgid ""
+-"Whether the toolbar item is visible when the toolbar is in a vertical "
+-"orientation."
+-msgstr ""
+-"Ali naj bo element orodne vrstice viden, ko je orodna vrstica postavljena "
+-"navpično."
++#: ../gtk/gtkaction.c:287
++#: ../gtk/gtktoolitem.c:164
++msgid "Whether the toolbar item is visible when the toolbar is in a vertical orientation."
++msgstr "Ali naj bo element orodne vrstice viden, ko je orodna vrstica postavljena navpično."
+
+-#: gtk/gtkaction.c:294 gtk/gtktoolitem.c:170
++#: ../gtk/gtkaction.c:294
++#: ../gtk/gtktoolitem.c:170
+ msgid "Is important"
+ msgstr "Je pomembno"
+
+-#: gtk/gtkaction.c:295
+-msgid ""
+-"Whether the action is considered important. When TRUE, toolitem proxies for "
+-"this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
+-msgstr ""
+-"Ali je dejanje določeno kot pomembno. Izbrana možnost omogoča da orodni "
+-"predmeti kažejo besedilo v načinu GTK_TOOLBAR_BOTH_HORIZ."
++#: ../gtk/gtkaction.c:295
++msgid "Whether the action is considered important. When TRUE, toolitem proxies for this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
++msgstr "Ali je dejanje določeno kot pomembno. Izbrana možnost omogoča da orodni predmeti kažejo besedilo v načinu GTK_TOOLBAR_BOTH_HORIZ."
+
+-#: gtk/gtkaction.c:303
++#: ../gtk/gtkaction.c:303
+ msgid "Hide if empty"
+ msgstr "Skrij, če je prazno"
+
+-#: gtk/gtkaction.c:304
++#: ../gtk/gtkaction.c:304
+ msgid "When TRUE, empty menu proxies for this action are hidden."
+ msgstr "Izbrana možnost omogoča, da so prazne enote menija skrite."
+
+-#: gtk/gtkaction.c:310 gtk/gtkactiongroup.c:177 gtk/gtkcellrenderer.c:193
+-#: gtk/gtkwidget.c:523
++#: ../gtk/gtkaction.c:310
++#: ../gtk/gtkactiongroup.c:177
++#: ../gtk/gtkcellrenderer.c:193
++#: ../gtk/gtkwidget.c:523
+ msgid "Sensitive"
+ msgstr "Občutljiv"
+
+-#: gtk/gtkaction.c:311
++#: ../gtk/gtkaction.c:311
+ msgid "Whether the action is enabled."
+ msgstr "Ali je dejanje omogočeno."
+
+-#: gtk/gtkaction.c:317 gtk/gtkactiongroup.c:184 gtk/gtkstatusicon.c:269
+-#: gtk/gtktreeviewcolumn.c:191 gtk/gtkwidget.c:516
++#: ../gtk/gtkaction.c:317
++#: ../gtk/gtkactiongroup.c:184
++#: ../gtk/gtkstatusicon.c:269
++#: ../gtk/gtktreeviewcolumn.c:191
++#: ../gtk/gtkwidget.c:516
+ msgid "Visible"
+ msgstr "Viden"
+
+-#: gtk/gtkaction.c:318
++#: ../gtk/gtkaction.c:318
+ msgid "Whether the action is visible."
+ msgstr "Ali je dejanje vidno."
+
+-#: gtk/gtkaction.c:324
++#: ../gtk/gtkaction.c:324
+ msgid "Action Group"
+ msgstr "Skupina dejanj"
+
+-#: gtk/gtkaction.c:325
+-msgid ""
+-"The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
+-"use)."
+-msgstr ""
+-"GtkActionGroup, s katero je povezan ta GtkAction ali NULL (za notranjo "
+-"uporabo)."
++#: ../gtk/gtkaction.c:325
++msgid "The GtkActionGroup this GtkAction is associated with, or NULL (for internal use)."
++msgstr "GtkActionGroup, s katero je povezan ta GtkAction ali NULL (za notranjo uporabo)."
+
+-#: gtk/gtkactiongroup.c:171
++#: ../gtk/gtkactiongroup.c:171
+ msgid "A name for the action group."
+ msgstr "Ime za skupino dejanj."
+
+-#: gtk/gtkactiongroup.c:178
++#: ../gtk/gtkactiongroup.c:178
+ msgid "Whether the action group is enabled."
+ msgstr "Ali je skupina dejanj omogočena."
+
+-#: gtk/gtkactiongroup.c:185
++#: ../gtk/gtkactiongroup.c:185
+ msgid "Whether the action group is visible."
+ msgstr "Ali je skupina dejanj vidna."
+
+-#: gtk/gtkadjustment.c:93 gtk/gtkcellrendererprogress.c:128
+-#: gtk/gtkscalebutton.c:202 gtk/gtkspinbutton.c:269
++#: ../gtk/gtkadjustment.c:93
++#: ../gtk/gtkcellrendererprogress.c:128
++#: ../gtk/gtkscalebutton.c:202
++#: ../gtk/gtkspinbutton.c:269
+ msgid "Value"
+ msgstr "Vrednost"
+
+-#: gtk/gtkadjustment.c:94
++#: ../gtk/gtkadjustment.c:94
+ msgid "The value of the adjustment"
+ msgstr "Vrednost prilagoditve"
+
+-#: gtk/gtkadjustment.c:110
++#: ../gtk/gtkadjustment.c:110
+ msgid "Minimum Value"
+ msgstr "Najmanjša vrednost"
+
+-#: gtk/gtkadjustment.c:111
++#: ../gtk/gtkadjustment.c:111
+ msgid "The minimum value of the adjustment"
+ msgstr "Najmanjša vrednost prilagoditve"
+
+-#: gtk/gtkadjustment.c:130
++#: ../gtk/gtkadjustment.c:130
+ msgid "Maximum Value"
+ msgstr "Največja vrednost"
+
+-#: gtk/gtkadjustment.c:131
++#: ../gtk/gtkadjustment.c:131
+ msgid "The maximum value of the adjustment"
+ msgstr "Največja vrednost prilagoditve"
+
+-#: gtk/gtkadjustment.c:147
++#: ../gtk/gtkadjustment.c:147
+ msgid "Step Increment"
+ msgstr "Povečanje koraka"
+
+-#: gtk/gtkadjustment.c:148
++#: ../gtk/gtkadjustment.c:148
+ msgid "The step increment of the adjustment"
+ msgstr "Korak povečave med prilagajanjem"
+
+-#: gtk/gtkadjustment.c:164
++#: ../gtk/gtkadjustment.c:164
+ msgid "Page Increment"
+ msgstr "Povečanje številke strani"
+
+-#: gtk/gtkadjustment.c:165
++#: ../gtk/gtkadjustment.c:165
+ msgid "The page increment of the adjustment"
+ msgstr "Stran povečave med prilagajanjem"
+
+-#: gtk/gtkadjustment.c:184
++#: ../gtk/gtkadjustment.c:184
+ msgid "Page Size"
+ msgstr "Velikost strani"
+
+-#: gtk/gtkadjustment.c:185
++#: ../gtk/gtkadjustment.c:185
+ msgid "The page size of the adjustment"
+ msgstr "Velikost strani prilagoditve"
+
+-#: gtk/gtkalignment.c:90
++#: ../gtk/gtkalignment.c:90
+ msgid "Horizontal alignment"
+ msgstr "Vodoravna poravnava"
+
+-#: gtk/gtkalignment.c:91 gtk/gtkbutton.c:250
+-msgid ""
+-"Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
+-"right aligned"
+-msgstr ""
+-"Vodoravna lega podrejenega predmeta v danem prostoru. 0,0 je levo poravnan, "
+-"1,0 je desno poravnan."
++#: ../gtk/gtkalignment.c:91
++#: ../gtk/gtkbutton.c:250
++msgid "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"
++msgstr "Vodoravna lega podrejenega predmeta v danem prostoru. 0,0 je levo poravnan, 1,0 je desno poravnan."
+
+-#: gtk/gtkalignment.c:100
++#: ../gtk/gtkalignment.c:100
+ msgid "Vertical alignment"
+ msgstr "Navpična poravnava"
+
+-#: gtk/gtkalignment.c:101 gtk/gtkbutton.c:269
+-msgid ""
+-"Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
+-"bottom aligned"
+-msgstr ""
+-"Navpična lega podrejenega predmeta v danem prostoru. 0,0 je poravnan na vrh, "
+-"1,0 je poravnan na dno."
++#: ../gtk/gtkalignment.c:101
++#: ../gtk/gtkbutton.c:269
++msgid "Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"
++msgstr "Navpična lega podrejenega predmeta v danem prostoru. 0,0 je poravnan na vrh, 1,0 je poravnan na dno."
+
+-#: gtk/gtkalignment.c:109
++#: ../gtk/gtkalignment.c:109
+ msgid "Horizontal scale"
+ msgstr "Vodoraven faktor povečave"
+
+-#: gtk/gtkalignment.c:110
+-msgid ""
+-"If available horizontal space is bigger than needed for the child, how much "
+-"of it to use for the child. 0.0 means none, 1.0 means all"
+-msgstr ""
+-"Če je na voljo več vodoravnega prostora kot je treba, koliko naj se ga "
+-"porabi za podrejeni predmet. 0,0 pomeni nič, 1,0 pomeni vsega."
++#: ../gtk/gtkalignment.c:110
++msgid "If available horizontal space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"
++msgstr "Če je na voljo več vodoravnega prostora kot je treba, koliko naj se ga porabi za podrejeni predmet. 0,0 pomeni nič, 1,0 pomeni vsega."
+
+-#: gtk/gtkalignment.c:118
++#: ../gtk/gtkalignment.c:118
+ msgid "Vertical scale"
+ msgstr "Navpična povečava"
+
+-#: gtk/gtkalignment.c:119
+-msgid ""
+-"If available vertical space is bigger than needed for the child, how much of "
+-"it to use for the child. 0.0 means none, 1.0 means all"
+-msgstr ""
+-"Če je na voljo več navpičnega prostora kot je potrebno, koliko naj se ga "
+-"porabi za podrejeni predmet. 0,0 pomeni nič, 1,0 pomeni vsega."
++#: ../gtk/gtkalignment.c:119
++msgid "If available vertical space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"
++msgstr "Če je na voljo več navpičnega prostora kot je potrebno, koliko naj se ga porabi za podrejeni predmet. 0,0 pomeni nič, 1,0 pomeni vsega."
+
+-#: gtk/gtkalignment.c:136
++#: ../gtk/gtkalignment.c:136
+ msgid "Top Padding"
+ msgstr "Blazinjenje na vrhu"
+
+-#: gtk/gtkalignment.c:137
++#: ../gtk/gtkalignment.c:137
+ msgid "The padding to insert at the top of the widget."
+ msgstr "Širina prostora, ki naj bo dodan zgornji strani gradnika."
+
+-#: gtk/gtkalignment.c:153
++#: ../gtk/gtkalignment.c:153
+ msgid "Bottom Padding"
+ msgstr "Blazinjenje na dnu"
+
+-#: gtk/gtkalignment.c:154
++#: ../gtk/gtkalignment.c:154
+ msgid "The padding to insert at the bottom of the widget."
+ msgstr "Širina prostora, ki naj bo dodan spodnji strani gradnika."
+
+-#: gtk/gtkalignment.c:170
++#: ../gtk/gtkalignment.c:170
+ msgid "Left Padding"
+ msgstr "Levo blazinjenje"
+
+-#: gtk/gtkalignment.c:171
++#: ../gtk/gtkalignment.c:171
+ msgid "The padding to insert at the left of the widget."
+ msgstr "Širina prostora, ki naj bo dodan levi strani gradnika."
+
+-#: gtk/gtkalignment.c:187
++#: ../gtk/gtkalignment.c:187
+ msgid "Right Padding"
+ msgstr "Desno blazinjenje"
+
+-#: gtk/gtkalignment.c:188
++#: ../gtk/gtkalignment.c:188
+ msgid "The padding to insert at the right of the widget."
+ msgstr "Širina prostora, ki naj bo dodan desni strani gradnika."
+
+-#: gtk/gtkarrow.c:75
++#: ../gtk/gtkarrow.c:75
+ msgid "Arrow direction"
+ msgstr "Smer puščice"
+
+-#: gtk/gtkarrow.c:76
++#: ../gtk/gtkarrow.c:76
+ msgid "The direction the arrow should point"
+ msgstr "Smer, v katero naj kaže puščica"
+
+-#: gtk/gtkarrow.c:84
++#: ../gtk/gtkarrow.c:84
+ msgid "Arrow shadow"
+ msgstr "Senca puščice"
+
+-#: gtk/gtkarrow.c:85
++#: ../gtk/gtkarrow.c:85
+ msgid "Appearance of the shadow surrounding the arrow"
+ msgstr "Videz sence, ki obkroža puščico"
+
+-#: gtk/gtkarrow.c:92 gtk/gtkmenuitem.c:276
++#: ../gtk/gtkarrow.c:92
++#: ../gtk/gtkmenuitem.c:276
+ msgid "Arrow Scaling"
+ msgstr "Prilagajanje velikosti puščice"
+
+-#: gtk/gtkarrow.c:93
++#: ../gtk/gtkarrow.c:93
+ msgid "Amount of space used up by arrow"
+ msgstr "Velikost prostora, ki ga porabi puščica."
+
+-#: gtk/gtkaspectframe.c:79
++#: ../gtk/gtkaspectframe.c:79
+ msgid "Horizontal Alignment"
+ msgstr "Vodoravna poravnava"
+
+-#: gtk/gtkaspectframe.c:80
++#: ../gtk/gtkaspectframe.c:80
+ msgid "X alignment of the child"
+ msgstr "Poravnava podrejenega predmeta na osi X"
+
+-#: gtk/gtkaspectframe.c:86
++#: ../gtk/gtkaspectframe.c:86
+ msgid "Vertical Alignment"
+ msgstr "Navpična poravnava"
+
+-#: gtk/gtkaspectframe.c:87
++#: ../gtk/gtkaspectframe.c:87
+ msgid "Y alignment of the child"
+ msgstr "Poravnava podrejenega predmeta na osi Y"
+
+-#: gtk/gtkaspectframe.c:93
++#: ../gtk/gtkaspectframe.c:93
+ msgid "Ratio"
+ msgstr "Razmerje"
+
+-#: gtk/gtkaspectframe.c:94
++#: ../gtk/gtkaspectframe.c:94
+ msgid "Aspect ratio if obey_child is FALSE"
+-msgstr ""
+-"Razmerje velikosti, kadar je možnost upoštevanja podrejenega procesa "
+-"nedejavna."
++msgstr "Razmerje velikosti, kadar je možnost upoštevanja podrejenega procesa nedejavna."
+
+-#: gtk/gtkaspectframe.c:100
++#: ../gtk/gtkaspectframe.c:100
+ msgid "Obey child"
+ msgstr "Upoštevaj podrejen proces"
+
+-#: gtk/gtkaspectframe.c:101
++#: ../gtk/gtkaspectframe.c:101
+ msgid "Force aspect ratio to match that of the frame's child"
+ msgstr "Vsili razmerje, ki ustreza podrejenemu predmetu okna"
+
+-#: gtk/gtkassistant.c:261
++#: ../gtk/gtkassistant.c:261
+ msgid "Header Padding"
+ msgstr "Blazinjenje glave"
+
+-#: gtk/gtkassistant.c:262
++#: ../gtk/gtkassistant.c:262
+ msgid "Number of pixels around the header."
+ msgstr "Število slikovnih točk okoli glave."
+
+-#: gtk/gtkassistant.c:269
++#: ../gtk/gtkassistant.c:269
+ msgid "Content Padding"
+ msgstr "Blazinjenje vsebine"
+
+-#: gtk/gtkassistant.c:270
++#: ../gtk/gtkassistant.c:270
+ msgid "Number of pixels around the content pages."
+ msgstr "Število slikovnih točk okoli vsebine strani."
+
+-#: gtk/gtkassistant.c:286
++#: ../gtk/gtkassistant.c:286
+ msgid "Page type"
+ msgstr "Vrsta strani"
+
+-#: gtk/gtkassistant.c:287
++#: ../gtk/gtkassistant.c:287
+ msgid "The type of the assistant page"
+ msgstr "Vrsta pomožne strani"
+
+-#: gtk/gtkassistant.c:304
++#: ../gtk/gtkassistant.c:304
+ msgid "Page title"
+ msgstr "Naslov strani"
+
+-#: gtk/gtkassistant.c:305
++#: ../gtk/gtkassistant.c:305
+ msgid "The title of the assistant page"
+ msgstr "Naziv pomožne strani"
+
+-#: gtk/gtkassistant.c:321
++#: ../gtk/gtkassistant.c:321
+ msgid "Header image"
+ msgstr "Slika glave"
+
+-#: gtk/gtkassistant.c:322
++#: ../gtk/gtkassistant.c:322
+ msgid "Header image for the assistant page"
+ msgstr "Slika glave pomožne strani"
+
+-#: gtk/gtkassistant.c:338
++#: ../gtk/gtkassistant.c:338
+ msgid "Sidebar image"
+ msgstr "Slika stranske vrstice"
+
+-#: gtk/gtkassistant.c:339
++#: ../gtk/gtkassistant.c:339
+ msgid "Sidebar image for the assistant page"
+ msgstr "Slika stranske vrstice pomožne strani"
+
+-#: gtk/gtkassistant.c:354
++#: ../gtk/gtkassistant.c:354
+ msgid "Page complete"
+ msgstr "Stran je dokončana"
+
+-#: gtk/gtkassistant.c:355
++#: ../gtk/gtkassistant.c:355
+ msgid "Whether all required fields on the page have been filled out"
+ msgstr "Ali so bili vsa zahtevana polja na strani izpolnjena"
+
+-#: gtk/gtkbbox.c:91
++#: ../gtk/gtkbbox.c:91
+ msgid "Minimum child width"
+ msgstr "Najmanjša širina podrejenega predmeta"
+
+-#: gtk/gtkbbox.c:92
++#: ../gtk/gtkbbox.c:92
+ msgid "Minimum width of buttons inside the box"
+ msgstr "Najmanjša širina gumbov znotraj škatle"
+
+-#: gtk/gtkbbox.c:100
++#: ../gtk/gtkbbox.c:100
+ msgid "Minimum child height"
+ msgstr "Najmanjša višina podrejenega predmeta"
+
+-#: gtk/gtkbbox.c:101
++#: ../gtk/gtkbbox.c:101
+ msgid "Minimum height of buttons inside the box"
+ msgstr "Najmanjša višina gumbov znotraj škatle"
+
+-#: gtk/gtkbbox.c:109
++#: ../gtk/gtkbbox.c:109
+ msgid "Child internal width padding"
+ msgstr "Notranje polnjenje širine podrejenega predmeta"
+
+-#: gtk/gtkbbox.c:110
++#: ../gtk/gtkbbox.c:110
+ msgid "Amount to increase child's size on either side"
+ msgstr "Koliko naj se poveča velikost podrejenega predmeta na obeh straneh"
+
+-#: gtk/gtkbbox.c:118
++#: ../gtk/gtkbbox.c:118
+ msgid "Child internal height padding"
+ msgstr "Notranje polnjenje višine podrejenega predmeta"
+
+-#: gtk/gtkbbox.c:119
++#: ../gtk/gtkbbox.c:119
+ msgid "Amount to increase child's size on the top and bottom"
+ msgstr "Koliko naj se poveča velikost podrejenega predmeta na vrhu in dnu"
+
+-#: gtk/gtkbbox.c:127
++#: ../gtk/gtkbbox.c:127
+ msgid "Layout style"
+ msgstr "Slog postavitve"
+
+-#: gtk/gtkbbox.c:128
+-msgid ""
+-"How to layout the buttons in the box. Possible values are default, spread, "
+-"edge, start and end"
+-msgstr ""
+-"Kako naj se postavi gumbe znotraj škatle. Možne vrednosti so privzeto, "
+-"razprostri, rob, začetek in konec"
++#: ../gtk/gtkbbox.c:128
++msgid "How to layout the buttons in the box. Possible values are default, spread, edge, start and end"
++msgstr "Kako naj se postavi gumbe znotraj škatle. Možne vrednosti so privzeto, razprostri, rob, začetek in konec"
+
+-#: gtk/gtkbbox.c:136
++#: ../gtk/gtkbbox.c:136
+ msgid "Secondary"
+ msgstr "Druga"
+
+-#: gtk/gtkbbox.c:137
+-msgid ""
+-"If TRUE, the child appears in a secondary group of children, suitable for, e."
+-"g., help buttons"
+-msgstr ""
+-"Izbrana možnost omogoča, da se podrejeni predmet pojavlja v drugi skupini "
+-"podrejenih predmetov, kar je primerno za npr. gumbe pomoči"
++#: ../gtk/gtkbbox.c:137
++msgid "If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons"
++msgstr "Izbrana možnost omogoča, da se podrejeni predmet pojavlja v drugi skupini podrejenih predmetov, kar je primerno za npr. gumbe pomoči"
+
+-#: gtk/gtkbox.c:98 gtk/gtkexpander.c:219 gtk/gtkiconview.c:666
+-#: gtk/gtktreeviewcolumn.c:216
++#: ../gtk/gtkbox.c:98
++#: ../gtk/gtkexpander.c:219
++#: ../gtk/gtkiconview.c:666
++#: ../gtk/gtktreeviewcolumn.c:216
+ msgid "Spacing"
+ msgstr "Razmik"
+
+-#: gtk/gtkbox.c:99
++#: ../gtk/gtkbox.c:99
+ msgid "The amount of space between children"
+ msgstr "Količina prostora med podrejenimi predmeti"
+
+-#: gtk/gtkbox.c:108 gtk/gtknotebook.c:649 gtk/gtktable.c:165
+-#: gtk/gtktoolbar.c:580
++#: ../gtk/gtkbox.c:108
++#: ../gtk/gtknotebook.c:649
++#: ../gtk/gtktable.c:165
++#: ../gtk/gtktoolbar.c:580
+ msgid "Homogeneous"
+ msgstr "Homogenost"
+
+-#: gtk/gtkbox.c:109
++#: ../gtk/gtkbox.c:109
+ msgid "Whether the children should all be the same size"
+ msgstr "Ali naj bodo otroci vsi enake velikosti"
+
+-#: gtk/gtkbox.c:116 gtk/gtkpreview.c:101 gtk/gtktoolbar.c:572
+-#: gtk/gtktreeviewcolumn.c:272
++#: ../gtk/gtkbox.c:116
++#: ../gtk/gtkpreview.c:101
++#: ../gtk/gtktoolbar.c:572
++#: ../gtk/gtktreeviewcolumn.c:272
+ msgid "Expand"
+ msgstr "Razširi"
+
+-#: gtk/gtkbox.c:117
++#: ../gtk/gtkbox.c:117
+ msgid "Whether the child should receive extra space when the parent grows"
+-msgstr ""
+-"Ali naj podrejeni predmet dobi dodaten prostor, ko se nadrejeni predmet "
+-"poveča"
++msgstr "Ali naj podrejeni predmet dobi dodaten prostor, ko se nadrejeni predmet poveča"
+
+-#: gtk/gtkbox.c:123
++#: ../gtk/gtkbox.c:123
+ msgid "Fill"
+ msgstr "Zapolni"
+
+-#: gtk/gtkbox.c:124
+-msgid ""
+-"Whether extra space given to the child should be allocated to the child or "
+-"used as padding"
+-msgstr ""
+-"Ali naj bo dodaten prostor dan podrejenemu predmetu rezerviran zanj ali "
+-"uporabljen za polnjenje"
++#: ../gtk/gtkbox.c:124
++msgid "Whether extra space given to the child should be allocated to the child or used as padding"
++msgstr "Ali naj bo dodaten prostor dan podrejenemu predmetu rezerviran zanj ali uporabljen za polnjenje"
+
+-#: gtk/gtkbox.c:130
++#: ../gtk/gtkbox.c:130
+ msgid "Padding"
+ msgstr "Polnenje"
+
+-#: gtk/gtkbox.c:131
++#: ../gtk/gtkbox.c:131
+ msgid "Extra space to put between the child and its neighbors, in pixels"
+-msgstr ""
+-"Dodaten prostor med podrejenim predmetom in njegovimi sosedi, v slikovnih "
+-"točkah"
++msgstr "Dodaten prostor med podrejenim predmetom in njegovimi sosedi, v slikovnih točkah"
+
+-#: gtk/gtkbox.c:137
++#: ../gtk/gtkbox.c:137
+ msgid "Pack type"
+ msgstr "Vrsta zlaganja"
+
+-#: gtk/gtkbox.c:138 gtk/gtknotebook.c:716
+-msgid ""
+-"A GtkPackType indicating whether the child is packed with reference to the "
+-"start or end of the parent"
+-msgstr ""
+-"GtkPackType, ki pove ali naj bo podrejeni predmet zložen z referenco na "
+-"začetek ali na konec nadrejenega predmeta"
++#: ../gtk/gtkbox.c:138
++#: ../gtk/gtknotebook.c:716
++msgid "A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"
++msgstr "GtkPackType, ki pove ali naj bo podrejeni predmet zložen z referenco na začetek ali na konec nadrejenega predmeta"
+
+-#: gtk/gtkbox.c:144 gtk/gtknotebook.c:694 gtk/gtkpaned.c:218
+-#: gtk/gtkruler.c:110
++#: ../gtk/gtkbox.c:144
++#: ../gtk/gtknotebook.c:694
++#: ../gtk/gtkpaned.c:218
++#: ../gtk/gtkruler.c:110
+ msgid "Position"
+ msgstr "Položaj"
+
+-#: gtk/gtkbox.c:145 gtk/gtknotebook.c:695
++#: ../gtk/gtkbox.c:145
++#: ../gtk/gtknotebook.c:695
+ msgid "The index of the child in the parent"
+ msgstr "Indeks podrejenega predmeta v nadrejenem predmetu"
+
+-#: gtk/gtkbuilder.c:96
++#: ../gtk/gtkbuilder.c:96
+ msgid "Translation Domain"
+ msgstr "Domena prevajanja"
+
+-#: gtk/gtkbuilder.c:97
++#: ../gtk/gtkbuilder.c:97
+ msgid "The translation domain used by gettext"
+ msgstr "Domena prevajanja, ki jo uporablja gettext"
+
+-#: gtk/gtkbutton.c:200
+-msgid ""
+-"Text of the label widget inside the button, if the button contains a label "
+-"widget"
++#: ../gtk/gtkbutton.c:200
++msgid "Text of the label widget inside the button, if the button contains a label widget"
+ msgstr "Besedilo gradnika oznake v gumbu, če gumb vsebuje gradnik oznake"
+
+-#: gtk/gtkbutton.c:207 gtk/gtkexpander.c:203 gtk/gtklabel.c:337
+-#: gtk/gtktoolbutton.c:187
++#: ../gtk/gtkbutton.c:207
++#: ../gtk/gtkexpander.c:203
++#: ../gtk/gtklabel.c:337
++#: ../gtk/gtktoolbutton.c:187
+ msgid "Use underline"
+ msgstr "Uporabi podčrtaj"
+
+-#: gtk/gtkbutton.c:208 gtk/gtkexpander.c:204 gtk/gtklabel.c:338
+-msgid ""
+-"If set, an underline in the text indicates the next character should be used "
+-"for the mnemonic accelerator key"
+-msgstr ""
+-"Izbrana možnost omogoča določitev podčrtaja v besedilu kot naslednji znak "
+-"uporabljen kot pospeševalna tipka"
++#: ../gtk/gtkbutton.c:208
++#: ../gtk/gtkexpander.c:204
++#: ../gtk/gtklabel.c:338
++msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
++msgstr "Izbrana možnost omogoča določitev podčrtaja v besedilu kot naslednji znak uporabljen kot pospeševalna tipka"
+
+-#: gtk/gtkbutton.c:215
++#: ../gtk/gtkbutton.c:215
+ msgid "Use stock"
+ msgstr "Uporabi zalogo"
+
+-#: gtk/gtkbutton.c:216
+-msgid ""
+-"If set, the label is used to pick a stock item instead of being displayed"
+-msgstr ""
+-"Če je nastavljen, se oznaka uporabi za izbiro predmeta na zalogi, namesto, "
+-"da bi se prikazala"
++#: ../gtk/gtkbutton.c:216
++msgid "If set, the label is used to pick a stock item instead of being displayed"
++msgstr "Če je nastavljen, se oznaka uporabi za izbiro predmeta na zalogi, namesto, da bi se prikazala"
+
+-#: gtk/gtkbutton.c:223 gtk/gtkcombobox.c:789 gtk/gtkfilechooserbutton.c:393
++#: ../gtk/gtkbutton.c:223
++#: ../gtk/gtkcombobox.c:789
++#: ../gtk/gtkfilechooserbutton.c:393
+ msgid "Focus on click"
+ msgstr "Dejavnost ob kliku"
+
+-#: gtk/gtkbutton.c:224 gtk/gtkfilechooserbutton.c:394
++#: ../gtk/gtkbutton.c:224
++#: ../gtk/gtkfilechooserbutton.c:394
+ msgid "Whether the button grabs focus when it is clicked with the mouse"
+ msgstr "Ali lahko gumb prevzame dejavnost ob kliku z miško"
+
+-#: gtk/gtkbutton.c:231
++#: ../gtk/gtkbutton.c:231
+ msgid "Border relief"
+ msgstr "Spust roba"
+
+-#: gtk/gtkbutton.c:232
++#: ../gtk/gtkbutton.c:232
+ msgid "The border relief style"
+ msgstr "Slog reliefa robu"
+
+-#: gtk/gtkbutton.c:249
++#: ../gtk/gtkbutton.c:249
+ msgid "Horizontal alignment for child"
+ msgstr "Vodoravna poravnava podrejenega predmeta"
+
+-#: gtk/gtkbutton.c:268
++#: ../gtk/gtkbutton.c:268
+ msgid "Vertical alignment for child"
+ msgstr "Navpična poravnava podrejenega predmeta"
+
+-#: gtk/gtkbutton.c:285 gtk/gtkimagemenuitem.c:100
++#: ../gtk/gtkbutton.c:285
++#: ../gtk/gtkimagemenuitem.c:100
+ msgid "Image widget"
+ msgstr "Gradnik slike"
+
+-#: gtk/gtkbutton.c:286
++#: ../gtk/gtkbutton.c:286
+ msgid "Child widget to appear next to the button text"
+ msgstr "Podrejeni gradnik, ki naj se pojavi poleg besedila menija"
+
+-#: gtk/gtkbutton.c:300
++#: ../gtk/gtkbutton.c:300
+ msgid "Image position"
+ msgstr "Lega slike"
+
+-#: gtk/gtkbutton.c:301
++#: ../gtk/gtkbutton.c:301
+ msgid "The position of the image relative to the text"
+ msgstr "Lega slike glede na besedilo"
+
+-#: gtk/gtkbutton.c:410
++#: ../gtk/gtkbutton.c:410
+ msgid "Default Spacing"
+ msgstr "Privzet razmik"
+
+-#: gtk/gtkbutton.c:411
++#: ../gtk/gtkbutton.c:411
+ msgid "Extra space to add for CAN_DEFAULT buttons"
+ msgstr "Dodaten prostor, ki se doda gumbom CAN_DEFAULT"
+
+-#: gtk/gtkbutton.c:417
++#: ../gtk/gtkbutton.c:417
+ msgid "Default Outside Spacing"
+ msgstr "Privzet zunanji odmik"
+
+-#: gtk/gtkbutton.c:418
+-msgid ""
+-"Extra space to add for CAN_DEFAULT buttons that is always drawn outside the "
+-"border"
+-msgstr ""
+-"Dodaten odmik, ki se doda za gumbe CAN_DEFAULT, ki je vedno narisan zunaj "
+-"robu"
++#: ../gtk/gtkbutton.c:418
++msgid "Extra space to add for CAN_DEFAULT buttons that is always drawn outside the border"
++msgstr "Dodaten odmik, ki se doda za gumbe CAN_DEFAULT, ki je vedno narisan zunaj robu"
+
+-#: gtk/gtkbutton.c:423
++#: ../gtk/gtkbutton.c:423
+ msgid "Child X Displacement"
+ msgstr "Premik podrejenega predmeta na osi X"
+
+-#: gtk/gtkbutton.c:424
+-msgid ""
+-"How far in the x direction to move the child when the button is depressed"
+-msgstr ""
+-"Kako daleč v smeri X naj se premakne podrejeni predmet, ko je gumb spuščen"
++#: ../gtk/gtkbutton.c:424
++msgid "How far in the x direction to move the child when the button is depressed"
++msgstr "Kako daleč v smeri X naj se premakne podrejeni predmet, ko je gumb spuščen"
+
+-#: gtk/gtkbutton.c:431
++#: ../gtk/gtkbutton.c:431
+ msgid "Child Y Displacement"
+ msgstr "Premik podrejenega predmeta na osi Y"
+
+-#: gtk/gtkbutton.c:432
+-msgid ""
+-"How far in the y direction to move the child when the button is depressed"
+-msgstr ""
+-"Kako daleč v smeri Y naj se premakne podrejeni predmet, ko je gumb spuščen"
++#: ../gtk/gtkbutton.c:432
++msgid "How far in the y direction to move the child when the button is depressed"
++msgstr "Kako daleč v smeri Y naj se premakne podrejeni predmet, ko je gumb spuščen"
+
+-#: gtk/gtkbutton.c:448
++#: ../gtk/gtkbutton.c:448
+ msgid "Displace focus"
+ msgstr "Premakni dejavnost"
+
+-#: gtk/gtkbutton.c:449
+-msgid ""
+-"Whether the child_displacement_x/_y properties should also affect the focus "
+-"rectangle"
++#: ../gtk/gtkbutton.c:449
++msgid "Whether the child_displacement_x/_y properties should also affect the focus rectangle"
+ msgstr "Ali lastnost child_displacement_x/_y vpliva na dejavnost pravokotnika"
+
+-#: gtk/gtkbutton.c:462 gtk/gtkentry.c:539 gtk/gtkentry.c:932
++#: ../gtk/gtkbutton.c:462
++#: ../gtk/gtkentry.c:539
++#: ../gtk/gtkentry.c:932
+ msgid "Inner Border"
+ msgstr "Notranji rob"
+
+-#: gtk/gtkbutton.c:463
++#: ../gtk/gtkbutton.c:463
+ msgid "Border between button edges and child."
+ msgstr "Rob med robovi gumba in podrejenim predmetom."
+
+-#: gtk/gtkbutton.c:476
++#: ../gtk/gtkbutton.c:476
+ msgid "Image spacing"
+ msgstr "Razmik slike"
+
+-#: gtk/gtkbutton.c:477
++#: ../gtk/gtkbutton.c:477
+ msgid "Spacing in pixels between the image and label"
+ msgstr "Razmik med sliko in oznako, v slikovnih točkah"
+
+-#: gtk/gtkbutton.c:491
++#: ../gtk/gtkbutton.c:491
+ msgid "Show button images"
+ msgstr "Pokaži slike gumbov"
+
+-#: gtk/gtkbutton.c:492
++#: ../gtk/gtkbutton.c:492
+ msgid "Whether images should be shown on buttons"
+ msgstr "Ali naj bodo slike prikazane na gumbih"
+
+-#: gtk/gtkcalendar.c:440
++#: ../gtk/gtkcalendar.c:440
+ msgid "Year"
+ msgstr "Leto"
+
+-#: gtk/gtkcalendar.c:441
++#: ../gtk/gtkcalendar.c:441
+ msgid "The selected year"
+ msgstr "Izbrano leto"
+
+-#: gtk/gtkcalendar.c:454
++#: ../gtk/gtkcalendar.c:454
+ msgid "Month"
+ msgstr "Mesec"
+
+-#: gtk/gtkcalendar.c:455
++#: ../gtk/gtkcalendar.c:455
+ msgid "The selected month (as a number between 0 and 11)"
+ msgstr "Izbrani mesec (kot številka med 0 in 11)"
+
+-#: gtk/gtkcalendar.c:469
++#: ../gtk/gtkcalendar.c:469
+ msgid "Day"
+ msgstr "Dan"
+
+-#: gtk/gtkcalendar.c:470
+-msgid ""
+-"The selected day (as a number between 1 and 31, or 0 to unselect the "
+-"currently selected day)"
+-msgstr ""
+-"Izbrani dan (kot številka med 1 in 31 oziroma 0 za preklic izbire trenutno "
+-"izbranega dneva)"
++#: ../gtk/gtkcalendar.c:470
++msgid "The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"
++msgstr "Izbrani dan (kot številka med 1 in 31 oziroma 0 za preklic izbire trenutno izbranega dneva)"
+
+-#: gtk/gtkcalendar.c:484
++#: ../gtk/gtkcalendar.c:484
+ msgid "Show Heading"
+ msgstr "Pokaži naslov"
+
+-#: gtk/gtkcalendar.c:485
++#: ../gtk/gtkcalendar.c:485
+ msgid "If TRUE, a heading is displayed"
+ msgstr "Izbrana možnost omogoča, da je prikazana glava."
+
+-#: gtk/gtkcalendar.c:499
++#: ../gtk/gtkcalendar.c:499
+ msgid "Show Day Names"
+ msgstr "Pokaži imena dni"
+
+-#: gtk/gtkcalendar.c:500
++#: ../gtk/gtkcalendar.c:500
+ msgid "If TRUE, day names are displayed"
+ msgstr "Izbrana možnost omogoča, da so prikazana imena dni."
+
+-#: gtk/gtkcalendar.c:513
++#: ../gtk/gtkcalendar.c:513
+ msgid "No Month Change"
+ msgstr "Brez spremembe meseca"
+
+-#: gtk/gtkcalendar.c:514
++#: ../gtk/gtkcalendar.c:514
+ msgid "If TRUE, the selected month cannot be changed"
+ msgstr "Izbrana možnost omogoča, da izbrani mesec ne more biti spremenjen"
+
+-#: gtk/gtkcalendar.c:528
++#: ../gtk/gtkcalendar.c:528
+ msgid "Show Week Numbers"
+ msgstr "Prikaži številke tednov"
+
+-#: gtk/gtkcalendar.c:529
++#: ../gtk/gtkcalendar.c:529
+ msgid "If TRUE, week numbers are displayed"
+ msgstr "Izbrana možnost omogoča, da so prikazane številke tednov"
+
+-#: gtk/gtkcalendar.c:544
++#: ../gtk/gtkcalendar.c:544
+ msgid "Details Width"
+ msgstr "Širina podrobnosti"
+
+-#: gtk/gtkcalendar.c:545
++#: ../gtk/gtkcalendar.c:545
+ msgid "Details width in characters"
+ msgstr "Širina podrobnosti v znakih"
+
+-#: gtk/gtkcalendar.c:560
++#: ../gtk/gtkcalendar.c:560
+ msgid "Details Height"
+ msgstr "Višina podrobnosti"
+
+-#: gtk/gtkcalendar.c:561
++#: ../gtk/gtkcalendar.c:561
+ msgid "Details height in rows"
+ msgstr "Višina podrobnosti v vrsticah"
+
+-#: gtk/gtkcalendar.c:577
++#: ../gtk/gtkcalendar.c:577
+ msgid "Show Details"
+ msgstr "Prikaži podrobnosti"
+
+-#: gtk/gtkcalendar.c:578
++#: ../gtk/gtkcalendar.c:578
+ msgid "If TRUE, details are shown"
+ msgstr "Izbrana možnost omogoča, da so prikazane podrobnosti"
+
+-#: gtk/gtkcellrenderer.c:177
++#: ../gtk/gtkcellrenderer.c:177
+ msgid "mode"
+ msgstr "način"
+
+-#: gtk/gtkcellrenderer.c:178
++#: ../gtk/gtkcellrenderer.c:178
+ msgid "Editable mode of the CellRenderer"
+ msgstr "Uredljiv način CellRendererja"
+
+-#: gtk/gtkcellrenderer.c:186
++#: ../gtk/gtkcellrenderer.c:186
+ msgid "visible"
+ msgstr "viden"
+
+-#: gtk/gtkcellrenderer.c:187
++#: ../gtk/gtkcellrenderer.c:187
+ msgid "Display the cell"
+ msgstr "Pokaži celico"
+
+-#: gtk/gtkcellrenderer.c:194
++#: ../gtk/gtkcellrenderer.c:194
+ msgid "Display the cell sensitive"
+ msgstr "Pokaži občutljivost celice"
+
+-#: gtk/gtkcellrenderer.c:201
++#: ../gtk/gtkcellrenderer.c:201
+ msgid "xalign"
+ msgstr "xalign"
+
+-#: gtk/gtkcellrenderer.c:202
++#: ../gtk/gtkcellrenderer.c:202
+ msgid "The x-align"
+ msgstr "X-poravnava."
+
+-#: gtk/gtkcellrenderer.c:211
++#: ../gtk/gtkcellrenderer.c:211
+ msgid "yalign"
+ msgstr "yporavnava"
+
+-#: gtk/gtkcellrenderer.c:212
++#: ../gtk/gtkcellrenderer.c:212
+ msgid "The y-align"
+ msgstr "Y-poravnava"
+
+-#: gtk/gtkcellrenderer.c:221
++#: ../gtk/gtkcellrenderer.c:221
+ msgid "xpad"
+ msgstr "xpolnj"
+
+-#: gtk/gtkcellrenderer.c:222
++#: ../gtk/gtkcellrenderer.c:222
+ msgid "The xpad"
+ msgstr "X polnj."
+
+-#: gtk/gtkcellrenderer.c:231
++#: ../gtk/gtkcellrenderer.c:231
+ msgid "ypad"
+ msgstr "ypolnj"
+
+-#: gtk/gtkcellrenderer.c:232
++#: ../gtk/gtkcellrenderer.c:232
+ msgid "The ypad"
+ msgstr "Y polnj."
+
+-#: gtk/gtkcellrenderer.c:241
++#: ../gtk/gtkcellrenderer.c:241
+ msgid "width"
+ msgstr "širina"
+
+-#: gtk/gtkcellrenderer.c:242
++#: ../gtk/gtkcellrenderer.c:242
+ msgid "The fixed width"
+ msgstr "Nespremenljiva širina"
+
+-#: gtk/gtkcellrenderer.c:251
++#: ../gtk/gtkcellrenderer.c:251
+ msgid "height"
+ msgstr "višina"
+
+-#: gtk/gtkcellrenderer.c:252
++#: ../gtk/gtkcellrenderer.c:252
+ msgid "The fixed height"
+ msgstr "Nespremenljiva višina"
+
+-#: gtk/gtkcellrenderer.c:261
++#: ../gtk/gtkcellrenderer.c:261
+ msgid "Is Expander"
+ msgstr "Je razširljiv"
+
+-#: gtk/gtkcellrenderer.c:262
++#: ../gtk/gtkcellrenderer.c:262
+ msgid "Row has children"
+ msgstr "Vrstica ima podrejene predmete"
+
+-#: gtk/gtkcellrenderer.c:270
++#: ../gtk/gtkcellrenderer.c:270
+ msgid "Is Expanded"
+ msgstr "Je razširjen"
+
+-#: gtk/gtkcellrenderer.c:271
++#: ../gtk/gtkcellrenderer.c:271
+ msgid "Row is an expander row, and is expanded"
+ msgstr "Vrstica ima podrejene predmete in je razširjena"
+
+-#: gtk/gtkcellrenderer.c:278
++#: ../gtk/gtkcellrenderer.c:278
+ msgid "Cell background color name"
+ msgstr "Ime barve ozadja celice"
+
+-#: gtk/gtkcellrenderer.c:279
++#: ../gtk/gtkcellrenderer.c:279
+ msgid "Cell background color as a string"
+ msgstr "Barva ozadja celice kot niz"
+
+-#: gtk/gtkcellrenderer.c:286
++#: ../gtk/gtkcellrenderer.c:286
+ msgid "Cell background color"
+ msgstr "Barva ozadja celice"
+
+-#: gtk/gtkcellrenderer.c:287
++#: ../gtk/gtkcellrenderer.c:287
+ msgid "Cell background color as a GdkColor"
+ msgstr "Barva ozadja celice kot GdkColor"
+
+-#: gtk/gtkcellrenderer.c:294
++#: ../gtk/gtkcellrenderer.c:294
+ msgid "Editing"
+ msgstr "Urejanje"
+
+-#: gtk/gtkcellrenderer.c:295
++#: ../gtk/gtkcellrenderer.c:295
+ msgid "Whether the cell renderer is currently in editing mode"
+ msgstr "Ali je izrisevalec celice trenutno v načinu urejanja"
+
+-#: gtk/gtkcellrenderer.c:303
++#: ../gtk/gtkcellrenderer.c:303
+ msgid "Cell background set"
+ msgstr "Nastavi barvo ozadja celice"
+
+-#: gtk/gtkcellrenderer.c:304
++#: ../gtk/gtkcellrenderer.c:304
+ msgid "Whether this tag affects the cell background color"
+ msgstr "Ali ta značka vpliva na barvo ozadja celice"
+
+-#: gtk/gtkcellrendereraccel.c:104
++#: ../gtk/gtkcellrendereraccel.c:104
+ msgid "Accelerator key"
+ msgstr "Tipka za bližnjico"
+
+-#: gtk/gtkcellrendereraccel.c:105
++#: ../gtk/gtkcellrendereraccel.c:105
+ msgid "The keyval of the accelerator"
+ msgstr "Vrednost tipke za bližnjico"
+
+-#: gtk/gtkcellrendereraccel.c:121
++#: ../gtk/gtkcellrendereraccel.c:121
+ msgid "Accelerator modifiers"
+ msgstr "Bližnjična spremenilna tipka"
+
+-#: gtk/gtkcellrendereraccel.c:122
++#: ../gtk/gtkcellrendereraccel.c:122
+ msgid "The modifier mask of the accelerator"
+ msgstr "Maska spremenilnika za pospeševalnik"
+
+-#: gtk/gtkcellrendereraccel.c:139
++#: ../gtk/gtkcellrendereraccel.c:139
+ msgid "Accelerator keycode"
+ msgstr "Koda tipkovne bližnjice"
+
+-#: gtk/gtkcellrendereraccel.c:140
++#: ../gtk/gtkcellrendereraccel.c:140
+ msgid "The hardware keycode of the accelerator"
+ msgstr "Koda strojne opreme tipke za bližnjico"
+
+-#: gtk/gtkcellrendereraccel.c:159
++#: ../gtk/gtkcellrendereraccel.c:159
+ msgid "Accelerator Mode"
+ msgstr "Način bližnjice"
+
+-#: gtk/gtkcellrendereraccel.c:160
++#: ../gtk/gtkcellrendereraccel.c:160
+ msgid "The type of accelerators"
+ msgstr "Vrsta bližnjic"
+
+-#: gtk/gtkcellrenderercombo.c:107
++#: ../gtk/gtkcellrenderercombo.c:107
+ msgid "Model"
+ msgstr "Model"
+
+-#: gtk/gtkcellrenderercombo.c:108
++#: ../gtk/gtkcellrenderercombo.c:108
+ msgid "The model containing the possible values for the combo box"
+ msgstr "Model, ki vsebuje mogoče vrednosti spustnega polja"
+
+-#: gtk/gtkcellrenderercombo.c:130 gtk/gtkcomboboxentry.c:106
++#: ../gtk/gtkcellrenderercombo.c:130
++#: ../gtk/gtkcomboboxentry.c:106
+ msgid "Text Column"
+ msgstr "Stolpec z besedilom"
+
+-#: gtk/gtkcellrenderercombo.c:131 gtk/gtkcomboboxentry.c:107
++#: ../gtk/gtkcellrenderercombo.c:131
++#: ../gtk/gtkcomboboxentry.c:107
+ msgid "A column in the data source model to get the strings from"
+ msgstr "Stolpec podatkovnega vira, iz katerega naj bodo pridobljeni nizi"
+
+-#: gtk/gtkcellrenderercombo.c:148
++#: ../gtk/gtkcellrenderercombo.c:148
+ msgid "Has Entry"
+ msgstr "Ima vnos"
+
+-#: gtk/gtkcellrenderercombo.c:149
++#: ../gtk/gtkcellrenderercombo.c:149
+ msgid "If FALSE, don't allow to enter strings other than the chosen ones"
+ msgstr "Če je NERESNIČNO, ne dovoli vnosa nizov, ki so drugačni od izbranih"
+
+-#: gtk/gtkcellrendererpixbuf.c:111
++#: ../gtk/gtkcellrendererpixbuf.c:111
+ msgid "Pixbuf Object"
+ msgstr "Predmet sličice"
+
+-#: gtk/gtkcellrendererpixbuf.c:112
++#: ../gtk/gtkcellrendererpixbuf.c:112
+ msgid "The pixbuf to render"
+ msgstr "Sličica, ki naj se izriše"
+
+-#: gtk/gtkcellrendererpixbuf.c:119
++#: ../gtk/gtkcellrendererpixbuf.c:119
+ msgid "Pixbuf Expander Open"
+ msgstr "Sličica odprte razširitve"
+
+-#: gtk/gtkcellrendererpixbuf.c:120
++#: ../gtk/gtkcellrendererpixbuf.c:120
+ msgid "Pixbuf for open expander"
+ msgstr "Sličica za odprto razširitev"
+
+-#: gtk/gtkcellrendererpixbuf.c:127
++#: ../gtk/gtkcellrendererpixbuf.c:127
+ msgid "Pixbuf Expander Closed"
+ msgstr "Sličica zaprte razširitve"
+
+-#: gtk/gtkcellrendererpixbuf.c:128
++#: ../gtk/gtkcellrendererpixbuf.c:128
+ msgid "Pixbuf for closed expander"
+ msgstr "Sličica za zaprto razširitev"
+
+-#: gtk/gtkcellrendererpixbuf.c:135 gtk/gtkimage.c:172 gtk/gtkstatusicon.c:202
++#: ../gtk/gtkcellrendererpixbuf.c:135
++#: ../gtk/gtkimage.c:172
++#: ../gtk/gtkstatusicon.c:202
+ msgid "Stock ID"
+ msgstr "Osnovni ID"
+
+-#: gtk/gtkcellrendererpixbuf.c:136
++#: ../gtk/gtkcellrendererpixbuf.c:136
+ msgid "The stock ID of the stock icon to render"
+ msgstr "Osnovni ID osnovne ikone za izris"
+
+-#: gtk/gtkcellrendererpixbuf.c:143 gtk/gtkrecentmanager.c:245
+-#: gtk/gtkstatusicon.c:243
++#: ../gtk/gtkcellrendererpixbuf.c:143
++#: ../gtk/gtkrecentmanager.c:245
++#: ../gtk/gtkstatusicon.c:243
+ msgid "Size"
+ msgstr "Velikost"
+
+-#: gtk/gtkcellrendererpixbuf.c:144
++#: ../gtk/gtkcellrendererpixbuf.c:144
+ msgid "The GtkIconSize value that specifies the size of the rendered icon"
+ msgstr "Vrednost velikosti GtkIconSize izrisane ikone"
+
+-#: gtk/gtkcellrendererpixbuf.c:153
++#: ../gtk/gtkcellrendererpixbuf.c:153
+ msgid "Detail"
+ msgstr "Podrobnost"
+
+-#: gtk/gtkcellrendererpixbuf.c:154
++#: ../gtk/gtkcellrendererpixbuf.c:154
+ msgid "Render detail to pass to the theme engine"
+ msgstr "Izriši podrobnosti za podajo gonilu teme"
+
+-#: gtk/gtkcellrendererpixbuf.c:187
++#: ../gtk/gtkcellrendererpixbuf.c:187
+ msgid "Follow State"
+ msgstr "Sledi stanju"
+
+-#: gtk/gtkcellrendererpixbuf.c:188
++#: ../gtk/gtkcellrendererpixbuf.c:188
+ msgid "Whether the rendered pixbuf should be colorized according to the state"
+ msgstr "Ali naj bo sličica obarvana glede na stanje dejavnosti"
+
+-#: gtk/gtkcellrendererpixbuf.c:205 gtk/gtkimage.c:247 gtk/gtkwindow.c:576
++#: ../gtk/gtkcellrendererpixbuf.c:205
++#: ../gtk/gtkimage.c:247
++#: ../gtk/gtkwindow.c:576
+ msgid "Icon"
+ msgstr "Ikona"
+
+-#: gtk/gtkcellrendererpixbuf.c:206 gtk/gtkimage.c:248 gtk/gtkstatusicon.c:227
++#: ../gtk/gtkcellrendererpixbuf.c:206
++#: ../gtk/gtkimage.c:248
++#: ../gtk/gtkstatusicon.c:227
+ msgid "The GIcon being displayed"
+ msgstr "Prikazana GIcon"
+
+-#: gtk/gtkcellrendererprogress.c:129
++#: ../gtk/gtkcellrendererprogress.c:129
+ msgid "Value of the progress bar"
+ msgstr "Vrednost vrstice napredka"
+
+-#: gtk/gtkcellrendererprogress.c:146 gtk/gtkcellrenderertext.c:195
+-#: gtk/gtkentry.c:582 gtk/gtkmessagedialog.c:153 gtk/gtkprogressbar.c:184
+-#: gtk/gtktextbuffer.c:197
++#: ../gtk/gtkcellrendererprogress.c:146
++#: ../gtk/gtkcellrenderertext.c:195
++#: ../gtk/gtkentry.c:582
++#: ../gtk/gtkmessagedialog.c:153
++#: ../gtk/gtkprogressbar.c:184
++#: ../gtk/gtktextbuffer.c:197
+ msgid "Text"
+ msgstr "Besedilo"
+
+-#: gtk/gtkcellrendererprogress.c:147
++#: ../gtk/gtkcellrendererprogress.c:147
+ msgid "Text on the progress bar"
+ msgstr "Besedilo, ki bo prikazano v prikazovalniku napredka"
+
+-#: gtk/gtkcellrendererprogress.c:170
++#: ../gtk/gtkcellrendererprogress.c:170
+ msgid "Pulse"
+ msgstr "Pulz"
+
+-#: gtk/gtkcellrendererprogress.c:171
+-msgid ""
+-"Set this to positive values to indicate that some progress is made, but you "
+-"don't know how much."
+-msgstr ""
+-"Določite pozitivno vrednost, da označite, da je nekaj napredka, vendar ne "
+-"veste koliko."
++#: ../gtk/gtkcellrendererprogress.c:171
++msgid "Set this to positive values to indicate that some progress is made, but you don't know how much."
++msgstr "Določite pozitivno vrednost, da označite, da je nekaj napredka, vendar ne veste koliko."
+
+-#: gtk/gtkcellrendererprogress.c:187 gtk/gtkprogress.c:118
++#: ../gtk/gtkcellrendererprogress.c:187
++#: ../gtk/gtkprogress.c:118
+ msgid "Text x alignment"
+ msgstr "Poravnava besedila po x osi"
+
+-#: gtk/gtkcellrendererprogress.c:188 gtk/gtkprogress.c:119
+-msgid ""
+-"The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
+-"layouts."
+-msgstr ""
+-"Vodoravna poravnava, od 0 (levo) do 1 (desno). Obrnjeno pri RTL postavitvi."
++#: ../gtk/gtkcellrendererprogress.c:188
++#: ../gtk/gtkprogress.c:119
++msgid "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
++msgstr "Vodoravna poravnava, od 0 (levo) do 1 (desno). Obrnjeno pri RTL postavitvi."
+
+-#: gtk/gtkcellrendererprogress.c:204 gtk/gtkprogress.c:125
++#: ../gtk/gtkcellrendererprogress.c:204
++#: ../gtk/gtkprogress.c:125
+ msgid "Text y alignment"
+ msgstr "Poravnava besedila po y osi"
+
+-#: gtk/gtkcellrendererprogress.c:205 gtk/gtkprogress.c:126
++#: ../gtk/gtkcellrendererprogress.c:205
++#: ../gtk/gtkprogress.c:126
+ msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
+ msgstr "Navpična poravnava, od 0 (zgoraj) do 1 (spodaj)"
+
+-#: gtk/gtkcellrendererprogress.c:221 gtk/gtkiconview.c:731
+-#: gtk/gtkprogressbar.c:126 gtk/gtkscalebutton.c:193 gtk/gtkstatusicon.c:301
+-#: gtk/gtktoolbar.c:492 gtk/gtktrayicon-x11.c:95
++#: ../gtk/gtkcellrendererprogress.c:221
++#: ../gtk/gtkiconview.c:731
++#: ../gtk/gtkprogressbar.c:126
++#: ../gtk/gtkscalebutton.c:193
++#: ../gtk/gtkstatusicon.c:301
++#: ../gtk/gtktoolbar.c:492
++#: ../gtk/gtktrayicon-x11.c:95
+ msgid "Orientation"
+ msgstr "Usmerjenost"
+
+-#: gtk/gtkcellrendererprogress.c:222 gtk/gtkprogressbar.c:127
++#: ../gtk/gtkcellrendererprogress.c:222
++#: ../gtk/gtkprogressbar.c:127
+ msgid "Orientation and growth direction of the progress bar"
+ msgstr "Usmerjenost in rast merilnika napredka"
+
+-#: gtk/gtkcellrendererspin.c:93 gtk/gtkprogressbar.c:118 gtk/gtkrange.c:346
+-#: gtk/gtkscalebutton.c:221 gtk/gtkspinbutton.c:208
++#: ../gtk/gtkcellrendererspin.c:93
++#: ../gtk/gtkprogressbar.c:118
++#: ../gtk/gtkrange.c:346
++#: ../gtk/gtkscalebutton.c:221
++#: ../gtk/gtkspinbutton.c:208
+ msgid "Adjustment"
+ msgstr "Prilagoditev"
+
+-#: gtk/gtkcellrendererspin.c:94
++#: ../gtk/gtkcellrendererspin.c:94
+ msgid "The adjustment that holds the value of the spinbutton."
+ msgstr "Prilagoditev, ki hrani vrednost vrtilnega gumba."
+
+-#: gtk/gtkcellrendererspin.c:109
++#: ../gtk/gtkcellrendererspin.c:109
+ msgid "Climb rate"
+ msgstr "Pospešek"
+
+-#: gtk/gtkcellrendererspin.c:110 gtk/gtkspinbutton.c:217
++#: ../gtk/gtkcellrendererspin.c:110
++#: ../gtk/gtkspinbutton.c:217
+ msgid "The acceleration rate when you hold down a button"
+ msgstr "Pospešek, ko držite gumb pritisnjen"
+
+-#: gtk/gtkcellrendererspin.c:123 gtk/gtkscale.c:142 gtk/gtkspinbutton.c:226
++#: ../gtk/gtkcellrendererspin.c:123
++#: ../gtk/gtkscale.c:142
++#: ../gtk/gtkspinbutton.c:226
+ msgid "Digits"
+ msgstr "Števke"
+
+-#: gtk/gtkcellrendererspin.c:124 gtk/gtkspinbutton.c:227
++#: ../gtk/gtkcellrendererspin.c:124
++#: ../gtk/gtkspinbutton.c:227
+ msgid "The number of decimal places to display"
+ msgstr "Število števk, ki naj se pokažejo"
+
+-#: gtk/gtkcellrenderertext.c:196
++#: ../gtk/gtkcellrenderertext.c:196
+ msgid "Text to render"
+ msgstr "Besedilo za izris"
+
+-#: gtk/gtkcellrenderertext.c:203
++#: ../gtk/gtkcellrenderertext.c:203
+ msgid "Markup"
+ msgstr "Označevanje"
+
+-#: gtk/gtkcellrenderertext.c:204
++#: ../gtk/gtkcellrenderertext.c:204
+ msgid "Marked up text to render"
+ msgstr "Označeno besedilo za izris"
+
+-#: gtk/gtkcellrenderertext.c:211 gtk/gtklabel.c:323
++#: ../gtk/gtkcellrenderertext.c:211
++#: ../gtk/gtklabel.c:323
+ msgid "Attributes"
+ msgstr "Atributi"
+
+-#: gtk/gtkcellrenderertext.c:212
++#: ../gtk/gtkcellrenderertext.c:212
+ msgid "A list of style attributes to apply to the text of the renderer"
+ msgstr "Seznam atributov sloga, ki naj se uveljavijo na besedilu izrisovalca"
+
+-#: gtk/gtkcellrenderertext.c:219
++#: ../gtk/gtkcellrenderertext.c:219
+ msgid "Single Paragraph Mode"
+ msgstr "Enoodstavčni način"
+
+-#: gtk/gtkcellrenderertext.c:220
++#: ../gtk/gtkcellrenderertext.c:220
+ msgid "Whether or not to keep all text in a single paragraph"
+ msgstr "Ali naj bo vse besedilo v enem samem odstavku."
+
+-#: gtk/gtkcellrenderertext.c:228 gtk/gtkcellview.c:160 gtk/gtktexttag.c:183
++#: ../gtk/gtkcellrenderertext.c:228
++#: ../gtk/gtkcellview.c:160
++#: ../gtk/gtktexttag.c:183
+ msgid "Background color name"
+ msgstr "Ime barve ozadja"
+
+-#: gtk/gtkcellrenderertext.c:229 gtk/gtkcellview.c:161 gtk/gtktexttag.c:184
++#: ../gtk/gtkcellrenderertext.c:229
++#: ../gtk/gtkcellview.c:161
++#: ../gtk/gtktexttag.c:184
+ msgid "Background color as a string"
+ msgstr "Barva ozadja kot niz"
+
+-#: gtk/gtkcellrenderertext.c:236 gtk/gtkcellview.c:167 gtk/gtktexttag.c:191
++#: ../gtk/gtkcellrenderertext.c:236
++#: ../gtk/gtkcellview.c:167
++#: ../gtk/gtktexttag.c:191
+ msgid "Background color"
+ msgstr "Barva ozadja"
+
+-#: gtk/gtkcellrenderertext.c:237 gtk/gtkcellview.c:168
++#: ../gtk/gtkcellrenderertext.c:237
++#: ../gtk/gtkcellview.c:168
+ msgid "Background color as a GdkColor"
+ msgstr "Barva ozadja kot GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:244 gtk/gtktexttag.c:217
++#: ../gtk/gtkcellrenderertext.c:244
++#: ../gtk/gtktexttag.c:217
+ msgid "Foreground color name"
+ msgstr "Ime barve ospredja"
+
+-#: gtk/gtkcellrenderertext.c:245 gtk/gtktexttag.c:218
++#: ../gtk/gtkcellrenderertext.c:245
++#: ../gtk/gtktexttag.c:218
+ msgid "Foreground color as a string"
+ msgstr "Barva ospredja kot niz"
+
+-#: gtk/gtkcellrenderertext.c:252 gtk/gtktexttag.c:225
++#: ../gtk/gtkcellrenderertext.c:252
++#: ../gtk/gtktexttag.c:225
+ msgid "Foreground color"
+ msgstr "Barva ospredja"
+
+-#: gtk/gtkcellrenderertext.c:253
++#: ../gtk/gtkcellrenderertext.c:253
+ msgid "Foreground color as a GdkColor"
+ msgstr "Barva ospredja kot GdkColor"
+
+-#: gtk/gtkcellrenderertext.c:261 gtk/gtkentry.c:506 gtk/gtktexttag.c:251
+-#: gtk/gtktextview.c:568
++#: ../gtk/gtkcellrenderertext.c:261
++#: ../gtk/gtkentry.c:506
++#: ../gtk/gtktexttag.c:251
++#: ../gtk/gtktextview.c:568
+ msgid "Editable"
+ msgstr "Uredljiv"
+
+-#: gtk/gtkcellrenderertext.c:262 gtk/gtktexttag.c:252 gtk/gtktextview.c:569
++#: ../gtk/gtkcellrenderertext.c:262
++#: ../gtk/gtktexttag.c:252
++#: ../gtk/gtktextview.c:569
+ msgid "Whether the text can be modified by the user"
+ msgstr "Ali lahko uporabnik spremeni besedilo"
+
+-#: gtk/gtkcellrenderertext.c:269 gtk/gtkcellrenderertext.c:277
+-#: gtk/gtkfontsel.c:188 gtk/gtktexttag.c:267 gtk/gtktexttag.c:275
++#: ../gtk/gtkcellrenderertext.c:269
++#: ../gtk/gtkcellrenderertext.c:277
++#: ../gtk/gtkfontsel.c:188
++#: ../gtk/gtktexttag.c:267
++#: ../gtk/gtktexttag.c:275
+ msgid "Font"
+ msgstr "Pisava"
+
+-#: gtk/gtkcellrenderertext.c:270 gtk/gtktexttag.c:268
++#: ../gtk/gtkcellrenderertext.c:270
++#: ../gtk/gtktexttag.c:268
+ msgid "Font description as a string, e.g. \"Sans Italic 12\""
+ msgstr "Opis pisave kot niz, npr.: \"Sans Italic 12\""
+
+-#: gtk/gtkcellrenderertext.c:278 gtk/gtktexttag.c:276
++#: ../gtk/gtkcellrenderertext.c:278
++#: ../gtk/gtktexttag.c:276
+ msgid "Font description as a PangoFontDescription struct"
+ msgstr "Opis pisave kot struktura PangoFontDescription"
+
+-#: gtk/gtkcellrenderertext.c:286 gtk/gtktexttag.c:283
++#: ../gtk/gtkcellrenderertext.c:286
++#: ../gtk/gtktexttag.c:283
+ msgid "Font family"
+ msgstr "Družina pisav"
+
+-#: gtk/gtkcellrenderertext.c:287 gtk/gtktexttag.c:284
++#: ../gtk/gtkcellrenderertext.c:287
++#: ../gtk/gtktexttag.c:284
+ msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
+ msgstr "Ime družine pisav, npr.: Sans, Helvetica, Times, Monospace"
+
+-#: gtk/gtkcellrenderertext.c:294 gtk/gtkcellrenderertext.c:295
+-#: gtk/gtktexttag.c:291
++#: ../gtk/gtkcellrenderertext.c:294
++#: ../gtk/gtkcellrenderertext.c:295
++#: ../gtk/gtktexttag.c:291
+ msgid "Font style"
+ msgstr "Slog pisave"
+
+-#: gtk/gtkcellrenderertext.c:303 gtk/gtkcellrenderertext.c:304
+-#: gtk/gtktexttag.c:300
++#: ../gtk/gtkcellrenderertext.c:303
++#: ../gtk/gtkcellrenderertext.c:304
++#: ../gtk/gtktexttag.c:300
+ msgid "Font variant"
+ msgstr "Različica pisave"
+
+-#: gtk/gtkcellrenderertext.c:312 gtk/gtkcellrenderertext.c:313
+-#: gtk/gtktexttag.c:309
++#: ../gtk/gtkcellrenderertext.c:312
++#: ../gtk/gtkcellrenderertext.c:313
++#: ../gtk/gtktexttag.c:309
+ msgid "Font weight"
+ msgstr "Teža pisave"
+
+-#: gtk/gtkcellrenderertext.c:322 gtk/gtkcellrenderertext.c:323
+-#: gtk/gtktexttag.c:320
++#: ../gtk/gtkcellrenderertext.c:322
++#: ../gtk/gtkcellrenderertext.c:323
++#: ../gtk/gtktexttag.c:320
+ msgid "Font stretch"
+ msgstr "Razteg pisave"
+
+-#: gtk/gtkcellrenderertext.c:331 gtk/gtkcellrenderertext.c:332
+-#: gtk/gtktexttag.c:329
++#: ../gtk/gtkcellrenderertext.c:331
++#: ../gtk/gtkcellrenderertext.c:332
++#: ../gtk/gtktexttag.c:329
+ msgid "Font size"
+ msgstr "Velikost pisave"
+
+-#: gtk/gtkcellrenderertext.c:341 gtk/gtktexttag.c:349
++#: ../gtk/gtkcellrenderertext.c:341
++#: ../gtk/gtktexttag.c:349
+ msgid "Font points"
+ msgstr "Točke pisave"
+
+-#: gtk/gtkcellrenderertext.c:342 gtk/gtktexttag.c:350
++#: ../gtk/gtkcellrenderertext.c:342
++#: ../gtk/gtktexttag.c:350
+ msgid "Font size in points"
+ msgstr "Velikost pisave v točkah"
+
+-#: gtk/gtkcellrenderertext.c:351 gtk/gtktexttag.c:339
++#: ../gtk/gtkcellrenderertext.c:351
++#: ../gtk/gtktexttag.c:339
+ msgid "Font scale"
+ msgstr "Povečava pisave"
+
+-#: gtk/gtkcellrenderertext.c:352
++#: ../gtk/gtkcellrenderertext.c:352
+ msgid "Font scaling factor"
+ msgstr "Faktor povečave pisave"
+
+-#: gtk/gtkcellrenderertext.c:361 gtk/gtktexttag.c:418
++#: ../gtk/gtkcellrenderertext.c:361
++#: ../gtk/gtktexttag.c:418
+ msgid "Rise"
+ msgstr "Dvigni"
+
+-#: gtk/gtkcellrenderertext.c:362
+-msgid ""
+-"Offset of text above the baseline (below the baseline if rise is negative)"
+-msgstr ""
+-"Odmik besedila nad osnovno črto (pod osnovno črto, je če dvig negativen)"
++#: ../gtk/gtkcellrenderertext.c:362
++msgid "Offset of text above the baseline (below the baseline if rise is negative)"
++msgstr "Odmik besedila nad osnovno črto (pod osnovno črto, je če dvig negativen)"
+
+-#: gtk/gtkcellrenderertext.c:373 gtk/gtktexttag.c:458
++#: ../gtk/gtkcellrenderertext.c:373
++#: ../gtk/gtktexttag.c:458
+ msgid "Strikethrough"
+ msgstr "Prečrtaj"
+
+-#: gtk/gtkcellrenderertext.c:374 gtk/gtktexttag.c:459
++#: ../gtk/gtkcellrenderertext.c:374
++#: ../gtk/gtktexttag.c:459
+ msgid "Whether to strike through the text"
+ msgstr "Ali naj bo besedilo prečrtano"
+
+-#: gtk/gtkcellrenderertext.c:381 gtk/gtktexttag.c:466
++#: ../gtk/gtkcellrenderertext.c:381
++#: ../gtk/gtktexttag.c:466
+ msgid "Underline"
+ msgstr "Podčrtaj"
+
+-#: gtk/gtkcellrenderertext.c:382 gtk/gtktexttag.c:467
++#: ../gtk/gtkcellrenderertext.c:382
++#: ../gtk/gtktexttag.c:467
+ msgid "Style of underline for this text"
+ msgstr "Slog podčrtave za to besedilo"
+
+-#: gtk/gtkcellrenderertext.c:390 gtk/gtktexttag.c:378
++#: ../gtk/gtkcellrenderertext.c:390
++#: ../gtk/gtktexttag.c:378
+ msgid "Language"
+ msgstr "Jezik"
+
+-#: gtk/gtkcellrenderertext.c:391
+-msgid ""
+-"The language this text is in, as an ISO code. Pango can use this as a hint "
+-"when rendering the text. If you don't understand this parameter, you "
+-"probably don't need it"
+-msgstr ""
+-"Jezik v katerem je to besedilo napisano, v obliki kode ISO. Pango lahko "
+-"uporabi to kot namig ob izrisovanju besedila. Če ne razumete tega parametra, "
+-"ga verjetno ne potrebujete"
++#: ../gtk/gtkcellrenderertext.c:391
++msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it"
++msgstr "Jezik v katerem je to besedilo napisano, v obliki kode ISO. Pango lahko uporabi to kot namig ob izrisovanju besedila. Če ne razumete tega parametra, ga verjetno ne potrebujete"
+
+-#: gtk/gtkcellrenderertext.c:411 gtk/gtklabel.c:448 gtk/gtkprogressbar.c:206
++#: ../gtk/gtkcellrenderertext.c:411
++#: ../gtk/gtklabel.c:448
++#: ../gtk/gtkprogressbar.c:206
+ msgid "Ellipsize"
+ msgstr "Okrajšanje"
+
+-#: gtk/gtkcellrenderertext.c:412
+-msgid ""
+-"The preferred place to ellipsize the string, if the cell renderer does not "
+-"have enough room to display the entire string"
+-msgstr ""
+-"Prednostno mesto okrajšanja niza, kadar preoblikovalnik celice nima dovolj "
+-"prostora za prikaz celotnega niza."
++#: ../gtk/gtkcellrenderertext.c:412
++msgid "The preferred place to ellipsize the string, if the cell renderer does not have enough room to display the entire string"
++msgstr "Prednostno mesto okrajšanja niza, kadar preoblikovalnik celice nima dovolj prostora za prikaz celotnega niza."
+
+-#: gtk/gtkcellrenderertext.c:431 gtk/gtkfilechooserbutton.c:421
+-#: gtk/gtklabel.c:468
++#: ../gtk/gtkcellrenderertext.c:431
++#: ../gtk/gtkfilechooserbutton.c:421
++#: ../gtk/gtklabel.c:468
+ msgid "Width In Characters"
+ msgstr "Širina v znakih"
+
+-#: gtk/gtkcellrenderertext.c:432 gtk/gtklabel.c:469
++#: ../gtk/gtkcellrenderertext.c:432
++#: ../gtk/gtklabel.c:469
+ msgid "The desired width of the label, in characters"
+ msgstr "Želena širina oznake, v znakih"
+
+-#: gtk/gtkcellrenderertext.c:450 gtk/gtktexttag.c:475
++#: ../gtk/gtkcellrenderertext.c:450
++#: ../gtk/gtktexttag.c:475
+ msgid "Wrap mode"
+ msgstr "Način lomljenja"
+
+-#: gtk/gtkcellrenderertext.c:451
+-msgid ""
+-"How to break the string into multiple lines, if the cell renderer does not "
+-"have enough room to display the entire string"
+-msgstr ""
+-"Kako prelomiti niz v več vrstic, kadar preoblikovalnik celice nima dovolj "
+-"prostora za prikaz celotnega niza."
++#: ../gtk/gtkcellrenderertext.c:451
++msgid "How to break the string into multiple lines, if the cell renderer does not have enough room to display the entire string"
++msgstr "Kako prelomiti niz v več vrstic, kadar preoblikovalnik celice nima dovolj prostora za prikaz celotnega niza."
+
+-#: gtk/gtkcellrenderertext.c:470 gtk/gtkcombobox.c:678
++#: ../gtk/gtkcellrenderertext.c:470
++#: ../gtk/gtkcombobox.c:678
+ msgid "Wrap width"
+ msgstr "Širina preloma"
+
+-#: gtk/gtkcellrenderertext.c:471
++#: ../gtk/gtkcellrenderertext.c:471
+ msgid "The width at which the text is wrapped"
+ msgstr "Širina, pri kateri naj bodo vrstice besedila prelomljene"
+
+-#: gtk/gtkcellrenderertext.c:491 gtk/gtktreeviewcolumn.c:297
++#: ../gtk/gtkcellrenderertext.c:491
++#: ../gtk/gtktreeviewcolumn.c:297
+ msgid "Alignment"
+ msgstr "Poravnava"
+
+-#: gtk/gtkcellrenderertext.c:492
++#: ../gtk/gtkcellrenderertext.c:492
+ msgid "How to align the lines"
+ msgstr "Kako naj bodo poravnane črte"
+
+-#: gtk/gtkcellrenderertext.c:502 gtk/gtkcellview.c:190 gtk/gtktexttag.c:564
++#: ../gtk/gtkcellrenderertext.c:502
++#: ../gtk/gtkcellview.c:190
++#: ../gtk/gtktexttag.c:564
+ msgid "Background set"
+ msgstr "Nastavi ozadje"
+
+-#: gtk/gtkcellrenderertext.c:503 gtk/gtkcellview.c:191 gtk/gtktexttag.c:565
++#: ../gtk/gtkcellrenderertext.c:503
++#: ../gtk/gtkcellview.c:191
++#: ../gtk/gtktexttag.c:565
+ msgid "Whether this tag affects the background color"
+ msgstr "Ali ta značka vpliva na barvo ozadja"
+
+-#: gtk/gtkcellrenderertext.c:506 gtk/gtktexttag.c:576
++#: ../gtk/gtkcellrenderertext.c:506
++#: ../gtk/gtktexttag.c:576
+ msgid "Foreground set"
+ msgstr "Nastavi ospredje"
+
+-#: gtk/gtkcellrenderertext.c:507 gtk/gtktexttag.c:577
++#: ../gtk/gtkcellrenderertext.c:507
++#: ../gtk/gtktexttag.c:577
+ msgid "Whether this tag affects the foreground color"
+ msgstr "Ali ta značka vpliva na barvo ospredja"
+
+-#: gtk/gtkcellrenderertext.c:510 gtk/gtktexttag.c:584
++#: ../gtk/gtkcellrenderertext.c:510
++#: ../gtk/gtktexttag.c:584
+ msgid "Editability set"
+ msgstr "Nastavi uredljivost"
+
+-#: gtk/gtkcellrenderertext.c:511 gtk/gtktexttag.c:585
++#: ../gtk/gtkcellrenderertext.c:511
++#: ../gtk/gtktexttag.c:585
+ msgid "Whether this tag affects text editability"
+ msgstr "Ali ta značka vpliva na možnost spremembe besedila"
+
+-#: gtk/gtkcellrenderertext.c:514 gtk/gtktexttag.c:588
++#: ../gtk/gtkcellrenderertext.c:514
++#: ../gtk/gtktexttag.c:588
+ msgid "Font family set"
+ msgstr "Nastavi družino pisave"
+
+-#: gtk/gtkcellrenderertext.c:515 gtk/gtktexttag.c:589
++#: ../gtk/gtkcellrenderertext.c:515
++#: ../gtk/gtktexttag.c:589
+ msgid "Whether this tag affects the font family"
+ msgstr "Ali ta značka vpliva na družino pisave"
+
+-#: gtk/gtkcellrenderertext.c:518 gtk/gtktexttag.c:592
++#: ../gtk/gtkcellrenderertext.c:518
++#: ../gtk/gtktexttag.c:592
+ msgid "Font style set"
+ msgstr "Nastavi slog pisave:"
+
+-#: gtk/gtkcellrenderertext.c:519 gtk/gtktexttag.c:593
++#: ../gtk/gtkcellrenderertext.c:519
++#: ../gtk/gtktexttag.c:593
+ msgid "Whether this tag affects the font style"
+ msgstr "Ali ta značka vpliva na slog pisave"
+
+-#: gtk/gtkcellrenderertext.c:522 gtk/gtktexttag.c:596
++#: ../gtk/gtkcellrenderertext.c:522
++#: ../gtk/gtktexttag.c:596
+ msgid "Font variant set"
+ msgstr "Nastavi različico pisave"
+
+-#: gtk/gtkcellrenderertext.c:523 gtk/gtktexttag.c:597
++#: ../gtk/gtkcellrenderertext.c:523
++#: ../gtk/gtktexttag.c:597
+ msgid "Whether this tag affects the font variant"
+ msgstr "Ali naj ta značka vpliva na različico pisave"
+
+-#: gtk/gtkcellrenderertext.c:526 gtk/gtktexttag.c:600
++#: ../gtk/gtkcellrenderertext.c:526
++#: ../gtk/gtktexttag.c:600
+ msgid "Font weight set"
+ msgstr "Nastavi težo pisave"
+
+-#: gtk/gtkcellrenderertext.c:527 gtk/gtktexttag.c:601
++#: ../gtk/gtkcellrenderertext.c:527
++#: ../gtk/gtktexttag.c:601
+ msgid "Whether this tag affects the font weight"
+ msgstr "Ali naj ta značka vpliva na težo pisave"
+
+-#: gtk/gtkcellrenderertext.c:530 gtk/gtktexttag.c:604
++#: ../gtk/gtkcellrenderertext.c:530
++#: ../gtk/gtktexttag.c:604
+ msgid "Font stretch set"
+ msgstr "Nastavi raztegnjenost pisave"
+
+-#: gtk/gtkcellrenderertext.c:531 gtk/gtktexttag.c:605
++#: ../gtk/gtkcellrenderertext.c:531
++#: ../gtk/gtktexttag.c:605
+ msgid "Whether this tag affects the font stretch"
+ msgstr "Ali naj ta značka vpliva na raztegnjenost pisave"
+
+-#: gtk/gtkcellrenderertext.c:534 gtk/gtktexttag.c:608
++#: ../gtk/gtkcellrenderertext.c:534
++#: ../gtk/gtktexttag.c:608
+ msgid "Font size set"
+ msgstr "Nastavi velikost pisave"
+
+-#: gtk/gtkcellrenderertext.c:535 gtk/gtktexttag.c:609
++#: ../gtk/gtkcellrenderertext.c:535
++#: ../gtk/gtktexttag.c:609
+ msgid "Whether this tag affects the font size"
+ msgstr "Ali naj ta značka vpliva na velikost pisave"
+
+-#: gtk/gtkcellrenderertext.c:538 gtk/gtktexttag.c:612
++#: ../gtk/gtkcellrenderertext.c:538
++#: ../gtk/gtktexttag.c:612
+ msgid "Font scale set"
+ msgstr "Nastavi povečavo pisave"
+
+-#: gtk/gtkcellrenderertext.c:539 gtk/gtktexttag.c:613
++#: ../gtk/gtkcellrenderertext.c:539
++#: ../gtk/gtktexttag.c:613
+ msgid "Whether this tag scales the font size by a factor"
+ msgstr "Ali naj ta značka vpliva na faktor povečave velikosti pisave"
+
+-#: gtk/gtkcellrenderertext.c:542 gtk/gtktexttag.c:632
++#: ../gtk/gtkcellrenderertext.c:542
++#: ../gtk/gtktexttag.c:632
+ msgid "Rise set"
+ msgstr "Nastavi dvig"
+
+-#: gtk/gtkcellrenderertext.c:543 gtk/gtktexttag.c:633
++#: ../gtk/gtkcellrenderertext.c:543
++#: ../gtk/gtktexttag.c:633
+ msgid "Whether this tag affects the rise"
+ msgstr "Ali naj ta značka vpliva na dvig"
+
+-#: gtk/gtkcellrenderertext.c:546 gtk/gtktexttag.c:648
++#: ../gtk/gtkcellrenderertext.c:546
++#: ../gtk/gtktexttag.c:648
+ msgid "Strikethrough set"
+ msgstr "Nastavi prečrtanost"
+
+-#: gtk/gtkcellrenderertext.c:547 gtk/gtktexttag.c:649
++#: ../gtk/gtkcellrenderertext.c:547
++#: ../gtk/gtktexttag.c:649
+ msgid "Whether this tag affects strikethrough"
+ msgstr "Ali naj ta značka vpliva na prečrtanost"
+
+-#: gtk/gtkcellrenderertext.c:550 gtk/gtktexttag.c:656
++#: ../gtk/gtkcellrenderertext.c:550
++#: ../gtk/gtktexttag.c:656
+ msgid "Underline set"
+ msgstr "Nastavi podčrtavo"
+
+-#: gtk/gtkcellrenderertext.c:551 gtk/gtktexttag.c:657
++#: ../gtk/gtkcellrenderertext.c:551
++#: ../gtk/gtktexttag.c:657
+ msgid "Whether this tag affects underlining"
+ msgstr "Ali naj ta značka vpliva na podčrtanost"
+
+-#: gtk/gtkcellrenderertext.c:554 gtk/gtktexttag.c:620
++#: ../gtk/gtkcellrenderertext.c:554
++#: ../gtk/gtktexttag.c:620
+ msgid "Language set"
+ msgstr "Nastavi jezik"
+
+-#: gtk/gtkcellrenderertext.c:555 gtk/gtktexttag.c:621
++#: ../gtk/gtkcellrenderertext.c:555
++#: ../gtk/gtktexttag.c:621
+ msgid "Whether this tag affects the language the text is rendered as"
+ msgstr "Ali naj ta značka vpliva na to, v katerem jeziku je izrisano besedilo"
+
+-#: gtk/gtkcellrenderertext.c:558
++#: ../gtk/gtkcellrenderertext.c:558
+ msgid "Ellipsize set"
+ msgstr "Okrajšanje"
+
+-#: gtk/gtkcellrenderertext.c:559
++#: ../gtk/gtkcellrenderertext.c:559
+ msgid "Whether this tag affects the ellipsize mode"
+ msgstr "Ali oznaka okrajšanja vpliva na način prilagajanja vsebine celici"
+
+-#: gtk/gtkcellrenderertext.c:562
++#: ../gtk/gtkcellrenderertext.c:562
+ msgid "Align set"
+ msgstr "Align set"
+
+-#: gtk/gtkcellrenderertext.c:563
++#: ../gtk/gtkcellrenderertext.c:563
+ msgid "Whether this tag affects the alignment mode"
+ msgstr "Ali značka align vpliva na način poravnave vsebine celici"
+
+-#: gtk/gtkcellrenderertoggle.c:126
++#: ../gtk/gtkcellrenderertoggle.c:126
+ msgid "Toggle state"
+ msgstr "Preklop stanja"
+
+-#: gtk/gtkcellrenderertoggle.c:127
++#: ../gtk/gtkcellrenderertoggle.c:127
+ msgid "The toggle state of the button"
+ msgstr "Preklop stanja gumba"
+
+-#: gtk/gtkcellrenderertoggle.c:134
++#: ../gtk/gtkcellrenderertoggle.c:134
+ msgid "Inconsistent state"
+ msgstr "Nekonsistentno stanje"
+
+-#: gtk/gtkcellrenderertoggle.c:135
++#: ../gtk/gtkcellrenderertoggle.c:135
+ msgid "The inconsistent state of the button"
+ msgstr "Nekonsistentno stanje gumba"
+
+-#: gtk/gtkcellrenderertoggle.c:142
++#: ../gtk/gtkcellrenderertoggle.c:142
+ msgid "Activatable"
+ msgstr "Aktivacija omogočena"
+
+-#: gtk/gtkcellrenderertoggle.c:143
++#: ../gtk/gtkcellrenderertoggle.c:143
+ msgid "The toggle button can be activated"
+ msgstr "Preklopni gumb je lahko dejaven"
+
+-#: gtk/gtkcellrenderertoggle.c:150
++#: ../gtk/gtkcellrenderertoggle.c:150
+ msgid "Radio state"
+ msgstr "Stanje radio gumba"
+
+-#: gtk/gtkcellrenderertoggle.c:151
++#: ../gtk/gtkcellrenderertoggle.c:151
+ msgid "Draw the toggle button as a radio button"
+ msgstr "Riši preklopni gumb kot radio gumb"
+
+-#: gtk/gtkcellrenderertoggle.c:158
++#: ../gtk/gtkcellrenderertoggle.c:158
+ msgid "Indicator size"
+ msgstr "Velikost indikatorja"
+
+-#: gtk/gtkcellrenderertoggle.c:159 gtk/gtkcheckbutton.c:70
+-#: gtk/gtkcheckmenuitem.c:112
++#: ../gtk/gtkcellrenderertoggle.c:159
++#: ../gtk/gtkcheckbutton.c:70
++#: ../gtk/gtkcheckmenuitem.c:112
+ msgid "Size of check or radio indicator"
+ msgstr "Velikost indikatorja kljukice ali radia"
+
+-#: gtk/gtkcellview.c:182
++#: ../gtk/gtkcellview.c:182
+ msgid "CellView model"
+ msgstr "Model CellView"
+
+-#: gtk/gtkcellview.c:183
++#: ../gtk/gtkcellview.c:183
+ msgid "The model for cell view"
+ msgstr "Model za celični pogled"
+
+-#: gtk/gtkcheckbutton.c:69 gtk/gtkcheckmenuitem.c:110 gtk/gtkoptionmenu.c:168
++#: ../gtk/gtkcheckbutton.c:69
++#: ../gtk/gtkcheckmenuitem.c:110
++#: ../gtk/gtkoptionmenu.c:168
+ msgid "Indicator Size"
+ msgstr "Velikost indikatorja"
+
+-#: gtk/gtkcheckbutton.c:77 gtk/gtkexpander.c:245 gtk/gtkoptionmenu.c:174
++#: ../gtk/gtkcheckbutton.c:77
++#: ../gtk/gtkexpander.c:245
++#: ../gtk/gtkoptionmenu.c:174
+ msgid "Indicator Spacing"
+ msgstr "Prostor okoli indikatorja"
+
+-#: gtk/gtkcheckbutton.c:78
++#: ../gtk/gtkcheckbutton.c:78
+ msgid "Spacing around check or radio indicator"
+ msgstr "Prostor okoli indikatorja za kljukico ali radio"
+
+-#: gtk/gtkcheckmenuitem.c:87 gtk/gtkmenu.c:498 gtk/gtktoggleaction.c:118
+-#: gtk/gtktogglebutton.c:102 gtk/gtktoggletoolbutton.c:101
++#: ../gtk/gtkcheckmenuitem.c:87
++#: ../gtk/gtkmenu.c:498
++#: ../gtk/gtktoggleaction.c:118
++#: ../gtk/gtktogglebutton.c:102
++#: ../gtk/gtktoggletoolbutton.c:101
+ msgid "Active"
+ msgstr "Aktiven"
+
+-#: gtk/gtkcheckmenuitem.c:88
++#: ../gtk/gtkcheckmenuitem.c:88
+ msgid "Whether the menu item is checked"
+ msgstr "Ali je predmet menija izbran"
+
+-#: gtk/gtkcheckmenuitem.c:95 gtk/gtktogglebutton.c:110
++#: ../gtk/gtkcheckmenuitem.c:95
++#: ../gtk/gtktogglebutton.c:110
+ msgid "Inconsistent"
+ msgstr "Nekonsistenten"
+
+-#: gtk/gtkcheckmenuitem.c:96
++#: ../gtk/gtkcheckmenuitem.c:96
+ msgid "Whether to display an \"inconsistent\" state"
+ msgstr "Ali naj se prikaže \"nekonsistentno\" stanje"
+
+-#: gtk/gtkcheckmenuitem.c:103
++#: ../gtk/gtkcheckmenuitem.c:103
+ msgid "Draw as radio menu item"
+ msgstr "Prikaži kot radijski gumb"
+
+-#: gtk/gtkcheckmenuitem.c:104
++#: ../gtk/gtkcheckmenuitem.c:104
+ msgid "Whether the menu item looks like a radio menu item"
+ msgstr "Ali naj ima menijska izbira možnost, da je odkljukana"
+
+-#: gtk/gtkcolorbutton.c:171
++#: ../gtk/gtkcolorbutton.c:171
+ msgid "Use alpha"
+ msgstr "Uporabi kanal alfa"
+
+-#: gtk/gtkcolorbutton.c:172
++#: ../gtk/gtkcolorbutton.c:172
+ msgid "Whether or not to give the color an alpha value"
+ msgstr "Ali naj ima barva vrednost alfa"
+
+-#: gtk/gtkcolorbutton.c:186 gtk/gtkfilechooserbutton.c:407
+-#: gtk/gtkfontbutton.c:142 gtk/gtkprintjob.c:116 gtk/gtktreeviewcolumn.c:264
++#: ../gtk/gtkcolorbutton.c:186
++#: ../gtk/gtkfilechooserbutton.c:407
++#: ../gtk/gtkfontbutton.c:142
++#: ../gtk/gtkprintjob.c:116
++#: ../gtk/gtktreeviewcolumn.c:264
+ msgid "Title"
+ msgstr "Naziv"
+
+-#: gtk/gtkcolorbutton.c:187
++#: ../gtk/gtkcolorbutton.c:187
+ msgid "The title of the color selection dialog"
+ msgstr "Naziv pogovornega okna izbirnika barv"
+
+-#: gtk/gtkcolorbutton.c:201 gtk/gtkcolorsel.c:293
++#: ../gtk/gtkcolorbutton.c:201
++#: ../gtk/gtkcolorsel.c:293
+ msgid "Current Color"
+ msgstr "Trenutna barva"
+
+-#: gtk/gtkcolorbutton.c:202
++#: ../gtk/gtkcolorbutton.c:202
+ msgid "The selected color"
+ msgstr "Izbrana barva"
+
+-#: gtk/gtkcolorbutton.c:216 gtk/gtkcolorsel.c:300
++#: ../gtk/gtkcolorbutton.c:216
++#: ../gtk/gtkcolorsel.c:300
+ msgid "Current Alpha"
+ msgstr "Trenutni alpha"
+
+-#: gtk/gtkcolorbutton.c:217
++#: ../gtk/gtkcolorbutton.c:217
+ msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
+-msgstr ""
+-"Izbrana vrednost prekrivnosti (0 popolnoma prosojno, 65535 popolnoma "
+-"neprosojno)"
++msgstr "Izbrana vrednost prekrivnosti (0 popolnoma prosojno, 65535 popolnoma neprosojno)"
+
+-#: gtk/gtkcolorsel.c:279
++#: ../gtk/gtkcolorsel.c:279
+ msgid "Has Opacity Control"
+ msgstr "Ima nadzor neprozornosti"
+
+-#: gtk/gtkcolorsel.c:280
++#: ../gtk/gtkcolorsel.c:280
+ msgid "Whether the color selector should allow setting opacity"
+ msgstr "Ali izbirnik barv omogoča nastavljanje prosojnosti"
+
+-#: gtk/gtkcolorsel.c:286
++#: ../gtk/gtkcolorsel.c:286
+ msgid "Has palette"
+ msgstr "Ima paleto"
+
+-#: gtk/gtkcolorsel.c:287
++#: ../gtk/gtkcolorsel.c:287
+ msgid "Whether a palette should be used"
+ msgstr "Ali ima izbirnik barv paleto"
+
+-#: gtk/gtkcolorsel.c:294
++#: ../gtk/gtkcolorsel.c:294
+ msgid "The current color"
+ msgstr "Trenutna barva"
+
+-#: gtk/gtkcolorsel.c:301
++#: ../gtk/gtkcolorsel.c:301
+ msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
+-msgstr ""
+-"Trenutna vrednost prosojnosti (0 popolnoma prosojno, 65535 popolnoma "
+-"neprosojno)"
++msgstr "Trenutna vrednost prosojnosti (0 popolnoma prosojno, 65535 popolnoma neprosojno)"
+
+-#: gtk/gtkcolorsel.c:315
++#: ../gtk/gtkcolorsel.c:315
+ msgid "Custom palette"
+ msgstr "Poljubna paleta"
+
+-#: gtk/gtkcolorsel.c:316
++#: ../gtk/gtkcolorsel.c:316
+ msgid "Palette to use in the color selector"
+ msgstr "Paleta, ki naj se uporabi v izbirniku barv"
+
+-#: gtk/gtkcolorseldialog.c:102
++#: ../gtk/gtkcolorseldialog.c:102
+ msgid "Color Selection"
+ msgstr "Izbira barve"
+
+-#: gtk/gtkcolorseldialog.c:103
++#: ../gtk/gtkcolorseldialog.c:103
+ msgid "The color selection embedded in the dialog."
+ msgstr "Izbira barve, ki je del pogovornega okna."
+
+-#: gtk/gtkcolorseldialog.c:109
++#: ../gtk/gtkcolorseldialog.c:109
+ msgid "OK Button"
+ msgstr "Gumb V redu"
+
+-#: gtk/gtkcolorseldialog.c:110
++#: ../gtk/gtkcolorseldialog.c:110
+ msgid "The OK button of the dialog."
+ msgstr "Gumb v redu pogovornega okna"
+
+-#: gtk/gtkcolorseldialog.c:116
++#: ../gtk/gtkcolorseldialog.c:116
+ msgid "Cancel Button"
+ msgstr "Gumb prekliči"
+
+-#: gtk/gtkcolorseldialog.c:117
++#: ../gtk/gtkcolorseldialog.c:117
+ msgid "The cancel button of the dialog."
+ msgstr "Gumb prekliči pogovornega okna"
+
+-#: gtk/gtkcolorseldialog.c:123
++#: ../gtk/gtkcolorseldialog.c:123
+ msgid "Help Button"
+ msgstr "Gumb Pomoč"
+
+-#: gtk/gtkcolorseldialog.c:124
++#: ../gtk/gtkcolorseldialog.c:124
+ msgid "The help button of the dialog."
+ msgstr "Gumb pomoči pogovornega okna"
+
+-#: gtk/gtkcombo.c:145
++#: ../gtk/gtkcombo.c:145
+ msgid "Enable arrow keys"
+ msgstr "Vključi smerne tipke"
+
+-#: gtk/gtkcombo.c:146
++#: ../gtk/gtkcombo.c:146
+ msgid "Whether the arrow keys move through the list of items"
+ msgstr "Ali naj bo mogoče premikanje skozi seznam predmetov s smernimi tipkami"
+
+-#: gtk/gtkcombo.c:152
++#: ../gtk/gtkcombo.c:152
+ msgid "Always enable arrows"
+ msgstr "Vedno vključi smerne tipke"
+
+-#: gtk/gtkcombo.c:153
++#: ../gtk/gtkcombo.c:153
+ msgid "Obsolete property, ignored"
+ msgstr "Opuščena lastnost, prezrta"
+
+-#: gtk/gtkcombo.c:159
++#: ../gtk/gtkcombo.c:159
+ msgid "Case sensitive"
+ msgstr "Razlikuj velike in male črke"
+
+-#: gtk/gtkcombo.c:160
++#: ../gtk/gtkcombo.c:160
+ msgid "Whether list item matching is case sensitive"
+ msgstr "Ali naj bo ustrezanje seznama predmetov občutljivo na velikost črk"
+
+-#: gtk/gtkcombo.c:167
++#: ../gtk/gtkcombo.c:167
+ msgid "Allow empty"
+ msgstr "Dovoli prazen"
+
+-#: gtk/gtkcombo.c:168
++#: ../gtk/gtkcombo.c:168
+ msgid "Whether an empty value may be entered in this field"
+ msgstr "Ali je lahko v to polje vpisana prazna vrednost"
+
+-#: gtk/gtkcombo.c:175
++#: ../gtk/gtkcombo.c:175
+ msgid "Value in list"
+ msgstr "Vrednost v seznamu"
+
+-#: gtk/gtkcombo.c:176
++#: ../gtk/gtkcombo.c:176
+ msgid "Whether entered values must already be present in the list"
+ msgstr "Ali morajo biti vnešene vrednosti že prisotne v seznamu"
+
+-#: gtk/gtkcombobox.c:661
++#: ../gtk/gtkcombobox.c:661
+ msgid "ComboBox model"
+ msgstr "Model kombiniranega polja"
+
+-#: gtk/gtkcombobox.c:662
++#: ../gtk/gtkcombobox.c:662
+ msgid "The model for the combo box"
+ msgstr "Vrsta spustnega polja"
+
+-#: gtk/gtkcombobox.c:679
++#: ../gtk/gtkcombobox.c:679
+ msgid "Wrap width for laying out the items in a grid"
+ msgstr "Prelomi širino za razporeditev predmetov v mreži"
+
+-#: gtk/gtkcombobox.c:701
++#: ../gtk/gtkcombobox.c:701
+ msgid "Row span column"
+ msgstr "Širina stolpca preko vrstic"
+
+-#: gtk/gtkcombobox.c:702
++#: ../gtk/gtkcombobox.c:702
+ msgid "TreeModel column containing the row span values"
+ msgstr "TreeModel stolpec, ki vsebuje vrednosti širine preko vrstic"
+
+-#: gtk/gtkcombobox.c:723
++#: ../gtk/gtkcombobox.c:723
+ msgid "Column span column"
+ msgstr "Širina stolpca preko stolpca"
+
+-#: gtk/gtkcombobox.c:724
++#: ../gtk/gtkcombobox.c:724
+ msgid "TreeModel column containing the column span values"
+ msgstr "TreeModel stolpec, ki vsebuje vrednosti širine preko stolpcev"
+
+-#: gtk/gtkcombobox.c:745
++#: ../gtk/gtkcombobox.c:745
+ msgid "Active item"
+ msgstr "Dejavni element"
+
+-#: gtk/gtkcombobox.c:746
++#: ../gtk/gtkcombobox.c:746
+ msgid "The item which is currently active"
+ msgstr "Element, ki je trenutno izbran"
+
+-#: gtk/gtkcombobox.c:765 gtk/gtkuimanager.c:220
++#: ../gtk/gtkcombobox.c:765
++#: ../gtk/gtkuimanager.c:220
+ msgid "Add tearoffs to menus"
+ msgstr "Dodaj menijem mesta za odpenjanje"
+
+-#: gtk/gtkcombobox.c:766
++#: ../gtk/gtkcombobox.c:766
+ msgid "Whether dropdowns should have a tearoff menu item"
+ msgstr "Ali naj imajo vsa spustna polja mesta za odpenjanje menija"
+
+-#: gtk/gtkcombobox.c:781 gtk/gtkentry.c:531
++#: ../gtk/gtkcombobox.c:781
++#: ../gtk/gtkentry.c:531
+ msgid "Has Frame"
+ msgstr "Ima okvir"
+
+-#: gtk/gtkcombobox.c:782
++#: ../gtk/gtkcombobox.c:782
+ msgid "Whether the combo box draws a frame around the child"
+ msgstr "Ali lahko spustno polje obdaja okvir okoli podrejenega procesa"
+
+-#: gtk/gtkcombobox.c:790
++#: ../gtk/gtkcombobox.c:790
+ msgid "Whether the combo box grabs focus when it is clicked with the mouse"
+ msgstr "Ali lahko spustno polje postane dejavno, kadar je izbrano z miško"
+
+-#: gtk/gtkcombobox.c:805 gtk/gtkmenu.c:553
++#: ../gtk/gtkcombobox.c:805
++#: ../gtk/gtkmenu.c:553
+ msgid "Tearoff Title"
+ msgstr "Odtrgajoč naziv"
+
+-#: gtk/gtkcombobox.c:806
+-msgid ""
+-"A title that may be displayed by the window manager when the popup is torn-"
+-"off"
++#: ../gtk/gtkcombobox.c:806
++msgid "A title that may be displayed by the window manager when the popup is torn-off"
+ msgstr "Naziv, ki ga lahko prikaže upravljalnik oken, kadar je meni odtrgan"
+
+-#: gtk/gtkcombobox.c:823
++#: ../gtk/gtkcombobox.c:823
+ msgid "Popup shown"
+ msgstr "Prikazano pojavno okno"
+
+-#: gtk/gtkcombobox.c:824
++#: ../gtk/gtkcombobox.c:824
+ msgid "Whether the combo's dropdown is shown"
+ msgstr "Ali naj prikazano spustno polje"
+
+-#: gtk/gtkcombobox.c:840
++#: ../gtk/gtkcombobox.c:840
+ msgid "Button Sensitivity"
+ msgstr "Občutljivost gumba"
+
+-#: gtk/gtkcombobox.c:841
++#: ../gtk/gtkcombobox.c:841
+ msgid "Whether the dropdown button is sensitive when the model is empty"
+ msgstr "Ali je gumb pojavnega menija občutljiv, ko je vsebina menija prazna."
+
+-#: gtk/gtkcombobox.c:848
++#: ../gtk/gtkcombobox.c:848
+ msgid "Appears as list"
+ msgstr "Se pojavi na seznamu"
+
+-#: gtk/gtkcombobox.c:849
++#: ../gtk/gtkcombobox.c:849
+ msgid "Whether dropdowns should look like lists rather than menus"
+ msgstr "Ali naj bo spustno polje videti kot seznam in ne kot meni."
+
+-#: gtk/gtkcombobox.c:865
++#: ../gtk/gtkcombobox.c:865
+ msgid "Arrow Size"
+ msgstr "Velikost puščice"
+
+-#: gtk/gtkcombobox.c:866
++#: ../gtk/gtkcombobox.c:866
+ msgid "The minimum size of the arrow in the combo box"
+ msgstr "Najmanjša velikost puščice spustnega polja"
+
+-#: gtk/gtkcombobox.c:881 gtk/gtkentry.c:631 gtk/gtkhandlebox.c:174
+-#: gtk/gtkmenubar.c:194 gtk/gtkstatusbar.c:186 gtk/gtktoolbar.c:630
+-#: gtk/gtkviewport.c:122
++#: ../gtk/gtkcombobox.c:881
++#: ../gtk/gtkentry.c:631
++#: ../gtk/gtkhandlebox.c:174
++#: ../gtk/gtkmenubar.c:194
++#: ../gtk/gtkstatusbar.c:186
++#: ../gtk/gtktoolbar.c:630
++#: ../gtk/gtkviewport.c:122
+ msgid "Shadow type"
+ msgstr "Vrsta sence"
+
+-#: gtk/gtkcombobox.c:882
++#: ../gtk/gtkcombobox.c:882
+ msgid "Which kind of shadow to draw around the combo box"
+ msgstr "Vrsta sence, ki se izriše okoli spustnega polja"
+
+-#: gtk/gtkcontainer.c:237
++#: ../gtk/gtkcontainer.c:237
+ msgid "Resize mode"
+ msgstr "Način spremembe velikosti"
+
+-#: gtk/gtkcontainer.c:238
++#: ../gtk/gtkcontainer.c:238
+ msgid "Specify how resize events are handled"
+ msgstr "Doličilo obravnave sprememb velikosti"
+
+-#: gtk/gtkcontainer.c:245
++#: ../gtk/gtkcontainer.c:245
+ msgid "Border width"
+ msgstr "Širina robu"
+
+-#: gtk/gtkcontainer.c:246
++#: ../gtk/gtkcontainer.c:246
+ msgid "The width of the empty border outside the containers children"
+ msgstr "Širina praznega robu zunaj vsebovalnika podrejenega predmeta"
+
+-#: gtk/gtkcontainer.c:254
++#: ../gtk/gtkcontainer.c:254
+ msgid "Child"
+ msgstr "Podrejeni predmet"
+
+-#: gtk/gtkcontainer.c:255
++#: ../gtk/gtkcontainer.c:255
+ msgid "Can be used to add a new child to the container"
+-msgstr ""
+-"Je lahko uporabljen za dodajanje novega podrejenega predmeta vsebovalniku"
++msgstr "Je lahko uporabljen za dodajanje novega podrejenega predmeta vsebovalniku"
+
+-#: gtk/gtkcurve.c:124
++#: ../gtk/gtkcurve.c:124
+ msgid "Curve type"
+ msgstr "Vrsta krivulje"
+
+-#: gtk/gtkcurve.c:125
++#: ../gtk/gtkcurve.c:125
+ msgid "Is this curve linear, spline interpolated, or free-form"
+ msgstr "Je ta krivulja linearna, interpolirana z splinei ali prosta"
+
+-#: gtk/gtkcurve.c:132
++#: ../gtk/gtkcurve.c:132
+ msgid "Minimum X"
+ msgstr "Najmanjši X"
+
+-#: gtk/gtkcurve.c:133
++#: ../gtk/gtkcurve.c:133
+ msgid "Minimum possible value for X"
+ msgstr "Najmanjša možna vrednost za X."
+
+-#: gtk/gtkcurve.c:141
++#: ../gtk/gtkcurve.c:141
+ msgid "Maximum X"
+ msgstr "Največji X"
+
+-#: gtk/gtkcurve.c:142
++#: ../gtk/gtkcurve.c:142
+ msgid "Maximum possible X value"
+ msgstr "Največja možna vrednost za X"
+
+-#: gtk/gtkcurve.c:150
++#: ../gtk/gtkcurve.c:150
+ msgid "Minimum Y"
+ msgstr "Najmanjši Y"
+
+-#: gtk/gtkcurve.c:151
++#: ../gtk/gtkcurve.c:151
+ msgid "Minimum possible value for Y"
+ msgstr "Najmanjša možna vrednost za Y"
+
+-#: gtk/gtkcurve.c:159
++#: ../gtk/gtkcurve.c:159
+ msgid "Maximum Y"
+ msgstr "Največji Y"
+
+-#: gtk/gtkcurve.c:160
++#: ../gtk/gtkcurve.c:160
+ msgid "Maximum possible value for Y"
+ msgstr "Največja možna vrednost za Y"
+
+-#: gtk/gtkdialog.c:145
++#: ../gtk/gtkdialog.c:145
+ msgid "Has separator"
+ msgstr "Ima ločnik"
+
+-#: gtk/gtkdialog.c:146
++#: ../gtk/gtkdialog.c:146
+ msgid "The dialog has a separator bar above its buttons"
+ msgstr "Dialog ima ločniško črto nad njegovimi gumbi"
+
+-#: gtk/gtkdialog.c:191
++#: ../gtk/gtkdialog.c:191
+ msgid "Content area border"
+ msgstr "Rob področja vsebine"
+
+-#: gtk/gtkdialog.c:192
++#: ../gtk/gtkdialog.c:192
+ msgid "Width of border around the main dialog area"
+ msgstr "Širina robu okoli glavnega območja dialoga"
+
+-#: gtk/gtkdialog.c:199
++#: ../gtk/gtkdialog.c:199
+ msgid "Button spacing"
+ msgstr "Prostor okoli gumbov"
+
+-#: gtk/gtkdialog.c:200
++#: ../gtk/gtkdialog.c:200
+ msgid "Spacing between buttons"
+ msgstr "Prostor med gumbi"
+
+-#: gtk/gtkdialog.c:208
++#: ../gtk/gtkdialog.c:208
+ msgid "Action area border"
+ msgstr "Rob okoli področja dejavnosti"
+
+-#: gtk/gtkdialog.c:209
++#: ../gtk/gtkdialog.c:209
+ msgid "Width of border around the button area at the bottom of the dialog"
+ msgstr "Širina robu okoli področja gumbov na dnu dialoga"
+
+-#: gtk/gtkentry.c:486 gtk/gtklabel.c:411
++#: ../gtk/gtkentry.c:486
++#: ../gtk/gtklabel.c:411
+ msgid "Cursor Position"
+ msgstr "Položaj kazalca"
+
+-#: gtk/gtkentry.c:487 gtk/gtklabel.c:412
++#: ../gtk/gtkentry.c:487
++#: ../gtk/gtklabel.c:412
+ msgid "The current position of the insertion cursor in chars"
+ msgstr "Trenutni položaj kazalca vstavljanja v znakih"
+
+-#: gtk/gtkentry.c:496 gtk/gtklabel.c:421
++#: ../gtk/gtkentry.c:496
++#: ../gtk/gtklabel.c:421
+ msgid "Selection Bound"
+ msgstr "Meja izbire"
+
+-#: gtk/gtkentry.c:497 gtk/gtklabel.c:422
+-msgid ""
+-"The position of the opposite end of the selection from the cursor in chars"
++#: ../gtk/gtkentry.c:497
++#: ../gtk/gtklabel.c:422
++msgid "The position of the opposite end of the selection from the cursor in chars"
+ msgstr "Lega drugega konca izbire od kazalca (v znakih)"
+
+-#: gtk/gtkentry.c:507
++#: ../gtk/gtkentry.c:507
+ msgid "Whether the entry contents can be edited"
+ msgstr "Ali je mogoče spremeniti vsebino vnosa"
+
+-#: gtk/gtkentry.c:514
++#: ../gtk/gtkentry.c:514
+ msgid "Maximum length"
+ msgstr "Največja dolžina"
+
+-#: gtk/gtkentry.c:515
++#: ../gtk/gtkentry.c:515
+ msgid "Maximum number of characters for this entry. Zero if no maximum"
+ msgstr "Največje število znakov v tem vnosu. Nič, če ni omejitve."
+
+-#: gtk/gtkentry.c:523
++#: ../gtk/gtkentry.c:523
+ msgid "Visibility"
+ msgstr "Vidnost"
+
+-#: gtk/gtkentry.c:524
+-msgid ""
+-"FALSE displays the \"invisible char\" instead of the actual text (password "
+-"mode)"
+-msgstr ""
+-"NERESNIČNO prikaže \"nevidni znak\" namesto resničnega besedila (geselski "
+-"način)"
++#: ../gtk/gtkentry.c:524
++msgid "FALSE displays the \"invisible char\" instead of the actual text (password mode)"
++msgstr "NERESNIČNO prikaže \"nevidni znak\" namesto resničnega besedila (geselski način)"
+
+-#: gtk/gtkentry.c:532
++#: ../gtk/gtkentry.c:532
+ msgid "FALSE removes outside bevel from entry"
+ msgstr "NERESNIČNO odstrani zunanjo obrobo vnosa"
+
+-#: gtk/gtkentry.c:540
+-msgid ""
+-"Border between text and frame. Overrides the inner-border style property"
+-msgstr ""
+-"Rob med besedilom in okvirjem. Preglasi lastnost sloga notranjega roba."
++#: ../gtk/gtkentry.c:540
++msgid "Border between text and frame. Overrides the inner-border style property"
++msgstr "Rob med besedilom in okvirjem. Preglasi lastnost sloga notranjega roba."
+
+-#: gtk/gtkentry.c:547
++#: ../gtk/gtkentry.c:547
+ msgid "Invisible character"
+ msgstr "Nevidni znak"
+
+-#: gtk/gtkentry.c:548
++#: ../gtk/gtkentry.c:548
+ msgid "The character to use when masking entry contents (in \"password mode\")"
+-msgstr ""
+-"Znak, ki naj se uporabi za maskiranje vsebine vnosa (za geselski način)"
++msgstr "Znak, ki naj se uporabi za maskiranje vsebine vnosa (za geselski način)"
+
+-#: gtk/gtkentry.c:555
++#: ../gtk/gtkentry.c:555
+ msgid "Activates default"
+ msgstr "Aktiviraj privzetega"
+
+-#: gtk/gtkentry.c:556
+-msgid ""
+-"Whether to activate the default widget (such as the default button in a "
+-"dialog) when Enter is pressed"
+-msgstr ""
+-"Ali se zažene privzet gradnik (na primer privzet gumb dialoga), ko je "
+-"pritisnjen Enter."
++#: ../gtk/gtkentry.c:556
++msgid "Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed"
++msgstr "Ali se zažene privzet gradnik (na primer privzet gumb dialoga), ko je pritisnjen Enter."
+
+-#: gtk/gtkentry.c:562
++#: ../gtk/gtkentry.c:562
+ msgid "Width in chars"
+ msgstr "Širina v znakih"
+
+-#: gtk/gtkentry.c:563
++#: ../gtk/gtkentry.c:563
+ msgid "Number of characters to leave space for in the entry"
+ msgstr "Število znakov vnosnega prostora za katere naj se pusti prostor"
+
+-#: gtk/gtkentry.c:572
++#: ../gtk/gtkentry.c:572
+ msgid "Scroll offset"
+ msgstr "Drsni odmik"
+
+-#: gtk/gtkentry.c:573
++#: ../gtk/gtkentry.c:573
+ msgid "Number of pixels of the entry scrolled off the screen to the left"
+ msgstr "Število točk vnosa, ki drsijo mimo zaslona na levo"
+
+-#: gtk/gtkentry.c:583
++#: ../gtk/gtkentry.c:583
+ msgid "The contents of the entry"
+ msgstr "Vsebina vnosa"
+
+-#: gtk/gtkentry.c:598 gtk/gtkmisc.c:73
++#: ../gtk/gtkentry.c:598
++#: ../gtk/gtkmisc.c:73
+ msgid "X align"
+ msgstr "Poravnava X"
+
+-#: gtk/gtkentry.c:599 gtk/gtkmisc.c:74
+-msgid ""
+-"The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
+-"layouts."
+-msgstr ""
+-"Vodoravna poravnava, od 0 (levo) do 1 (desno). Obrazno za postavitev RTL "
+-"(desno-levo)."
++#: ../gtk/gtkentry.c:599
++#: ../gtk/gtkmisc.c:74
++msgid "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
++msgstr "Vodoravna poravnava, od 0 (levo) do 1 (desno). Obrazno za postavitev RTL (desno-levo)."
+
+-#: gtk/gtkentry.c:615
++#: ../gtk/gtkentry.c:615
+ msgid "Truncate multiline"
+ msgstr "Obreži več vrstični vnos"
+
+-#: gtk/gtkentry.c:616
++#: ../gtk/gtkentry.c:616
+ msgid "Whether to truncate multiline pastes to one line."
+ msgstr "Ali naj se več vrstični vnos obreže v eno vrstico"
+
+-#: gtk/gtkentry.c:632
++#: ../gtk/gtkentry.c:632
+ msgid "Which kind of shadow to draw around the entry when has-frame is set"
+ msgstr "Kakšna vrsta sence naj se izriše kadar je določena možnost has-frame"
+
+-#: gtk/gtkentry.c:647 gtk/gtktextview.c:648
++#: ../gtk/gtkentry.c:647
++#: ../gtk/gtktextview.c:648
+ msgid "Overwrite mode"
+ msgstr "Način prepisovanja"
+
+-#: gtk/gtkentry.c:648
++#: ../gtk/gtkentry.c:648
+ msgid "Whether new text overwrites existing text"
+ msgstr "Ali naj vneseno besedilo prepiše obstoječo"
+
+-#: gtk/gtkentry.c:661
++#: ../gtk/gtkentry.c:661
+ msgid "Text length"
+ msgstr "Dolžina besedila"
+
+-#: gtk/gtkentry.c:662
++#: ../gtk/gtkentry.c:662
+ msgid "Length of the text currently in the entry"
+ msgstr "Dolžina trenutno vnesenega besedila "
+
+-#: gtk/gtkentry.c:933
++#: ../gtk/gtkentry.c:933
+ msgid "Border between text and frame."
+ msgstr "Rob med besedilom in okvirjem."
+
+-#: gtk/gtkentry.c:938 gtk/gtklabel.c:644
++#: ../gtk/gtkentry.c:938
++#: ../gtk/gtklabel.c:644
+ msgid "Select on focus"
+ msgstr "Izbira ob dejavnosti"
+
+-#: gtk/gtkentry.c:939
++#: ../gtk/gtkentry.c:939
+ msgid "Whether to select the contents of an entry when it is focused"
+ msgstr "Ali naj bo izbrana vsebina vnosa, kadar je vnos dejaven"
+
+-#: gtk/gtkentry.c:953
++#: ../gtk/gtkentry.c:953
+ msgid "Password Hint Timeout"
+ msgstr "Časovna omejitev namiga za geslo"
+
+-#: gtk/gtkentry.c:954
++#: ../gtk/gtkentry.c:954
+ msgid "How long to show the last input character in hidden entries"
+ msgstr "Kako dolgo naj bo prikazan zadnji vneseni znak v skritih vnosih."
+
+-#: gtk/gtkentrycompletion.c:279
++#: ../gtk/gtkentrycompletion.c:279
+ msgid "Completion Model"
+ msgstr "Način zaključevanja"
+
+-#: gtk/gtkentrycompletion.c:280
++#: ../gtk/gtkentrycompletion.c:280
+ msgid "The model to find matches in"
+ msgstr "Način za iskanje zadetkov"
+
+-#: gtk/gtkentrycompletion.c:286
++#: ../gtk/gtkentrycompletion.c:286
+ msgid "Minimum Key Length"
+ msgstr "Najmanjša dolžina tipke"
+
+-#: gtk/gtkentrycompletion.c:287
++#: ../gtk/gtkentrycompletion.c:287
+ msgid "Minimum length of the search key in order to look up matches"
+ msgstr "Najmanjša dolžina iskalnega niza za iskanje zadetkov"
+
+-#: gtk/gtkentrycompletion.c:303 gtk/gtkiconview.c:587
++#: ../gtk/gtkentrycompletion.c:303
++#: ../gtk/gtkiconview.c:587
+ msgid "Text column"
+ msgstr "Stolpec besedila"
+
+-#: gtk/gtkentrycompletion.c:304
++#: ../gtk/gtkentrycompletion.c:304
+ msgid "The column of the model containing the strings."
+ msgstr "Stolpec modela, ki vsebuje nize."
+
+-#: gtk/gtkentrycompletion.c:323
++#: ../gtk/gtkentrycompletion.c:323
+ msgid "Inline completion"
+ msgstr "Vrstično zaključevanje"
+
+-#: gtk/gtkentrycompletion.c:324
++#: ../gtk/gtkentrycompletion.c:324
+ msgid "Whether the common prefix should be inserted automatically"
+ msgstr "Ali naj se običajna predpona vstavi samodejno"
+
+-#: gtk/gtkentrycompletion.c:338
++#: ../gtk/gtkentrycompletion.c:338
+ msgid "Popup completion"
+ msgstr "Zaključevanje pojavnega okna"
+
+-#: gtk/gtkentrycompletion.c:339
++#: ../gtk/gtkentrycompletion.c:339
+ msgid "Whether the completions should be shown in a popup window"
+ msgstr "Ali naj bo zaključevanje prikazano v pojavnem oknu"
+
+-#: gtk/gtkentrycompletion.c:354
++#: ../gtk/gtkentrycompletion.c:354
+ msgid "Popup set width"
+ msgstr "Širina pojavnega okna"
+
+-#: gtk/gtkentrycompletion.c:355
++#: ../gtk/gtkentrycompletion.c:355
+ msgid "If TRUE, the popup window will have the same size as the entry"
+ msgstr "Izbrana možnost omogoča, da ima pojavno okno enako velikost kot vnos."
+
+-#: gtk/gtkentrycompletion.c:373
++#: ../gtk/gtkentrycompletion.c:373
+ msgid "Popup single match"
+ msgstr "Enojno pojavno okno"
+
+-#: gtk/gtkentrycompletion.c:374
++#: ../gtk/gtkentrycompletion.c:374
+ msgid "If TRUE, the popup window will appear for a single match."
+ msgstr "Izbrana možnost omogoča, da je pojavno okno prikazano kot enojno."
+
+-#: gtk/gtkentrycompletion.c:388
++#: ../gtk/gtkentrycompletion.c:388
+ msgid "Inline selection"
+ msgstr "Enovrstična izbira"
+
+-#: gtk/gtkentrycompletion.c:389
++#: ../gtk/gtkentrycompletion.c:389
+ msgid "Your description here"
+ msgstr "Vnesite vaš opis"
+
+-#: gtk/gtkeventbox.c:91
++#: ../gtk/gtkeventbox.c:91
+ msgid "Visible Window"
+ msgstr "Vidno okno"
+
+-#: gtk/gtkeventbox.c:92
+-msgid ""
+-"Whether the event box is visible, as opposed to invisible and only used to "
+-"trap events."
+-msgstr ""
+-"Ali je okno dogodka vidno v nasprotju z nevidnim, ki le zajema dogodke."
++#: ../gtk/gtkeventbox.c:92
++msgid "Whether the event box is visible, as opposed to invisible and only used to trap events."
++msgstr "Ali je okno dogodka vidno v nasprotju z nevidnim, ki le zajema dogodke."
+
+-#: gtk/gtkeventbox.c:98
++#: ../gtk/gtkeventbox.c:98
+ msgid "Above child"
+ msgstr "Nad podrejenim predmetom"
+
+-#: gtk/gtkeventbox.c:99
+-msgid ""
+-"Whether the event-trapping window of the eventbox is above the window of the "
+-"child widget as opposed to below it."
+-msgstr ""
+-"Ali je okno zaznavanja dogodkov nad oknom odrejenega gradnika ali je spodaj."
++#: ../gtk/gtkeventbox.c:99
++msgid "Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it."
++msgstr "Ali je okno zaznavanja dogodkov nad oknom odrejenega gradnika ali je spodaj."
+
+-#: gtk/gtkexpander.c:187
++#: ../gtk/gtkexpander.c:187
+ msgid "Expanded"
+ msgstr "Razširjeno"
+
+-#: gtk/gtkexpander.c:188
++#: ../gtk/gtkexpander.c:188
+ msgid "Whether the expander has been opened to reveal the child widget"
+ msgstr "Ali je razširitev odprta za prikaz gradnika podrejenega procesa"
+
+-#: gtk/gtkexpander.c:196
++#: ../gtk/gtkexpander.c:196
+ msgid "Text of the expander's label"
+ msgstr "Besedilo oznake razširitvenega gumba"
+
+-#: gtk/gtkexpander.c:211 gtk/gtklabel.c:330
++#: ../gtk/gtkexpander.c:211
++#: ../gtk/gtklabel.c:330
+ msgid "Use markup"
+ msgstr "Uporabi označevanje"
+
+-#: gtk/gtkexpander.c:212 gtk/gtklabel.c:331
++#: ../gtk/gtkexpander.c:212
++#: ../gtk/gtklabel.c:331
+ msgid "The text of the label includes XML markup. See pango_parse_markup()"
+ msgstr "Besedilo oznake vključuje oznake XML. Poglejte pango_parse_markup()"
+
+-#: gtk/gtkexpander.c:220
++#: ../gtk/gtkexpander.c:220
+ msgid "Space to put between the label and the child"
+ msgstr "Vstavljeni prostor med napisom in podrejenim predmetom"
+
+-#: gtk/gtkexpander.c:229 gtk/gtkframe.c:147 gtk/gtktoolbutton.c:194
++#: ../gtk/gtkexpander.c:229
++#: ../gtk/gtkframe.c:147
++#: ../gtk/gtktoolbutton.c:194
+ msgid "Label widget"
+ msgstr "Gradnik oznake"
+
+-#: gtk/gtkexpander.c:230
++#: ../gtk/gtkexpander.c:230
+ msgid "A widget to display in place of the usual expander label"
+ msgstr "Gradnik za prikaz namesto običajnega napisa razširitvenega gumba"
+
+-#: gtk/gtkexpander.c:236 gtk/gtktreeview.c:783
++#: ../gtk/gtkexpander.c:236
++#: ../gtk/gtktreeview.c:783
+ msgid "Expander Size"
+ msgstr "Velikost razširitvene puščice"
+
+-#: gtk/gtkexpander.c:237 gtk/gtktreeview.c:784
++#: ../gtk/gtkexpander.c:237
++#: ../gtk/gtktreeview.c:784
+ msgid "Size of the expander arrow"
+ msgstr "Velikost razširitvene puščice"
+
+-#: gtk/gtkexpander.c:246
++#: ../gtk/gtkexpander.c:246
+ msgid "Spacing around expander arrow"
+ msgstr "Razmik okoli puščice razširitvenega gumba"
+
+-#: gtk/gtkfilechooser.c:194
++#: ../gtk/gtkfilechooser.c:194
+ msgid "Action"
+ msgstr "Dejanje"
+
+-#: gtk/gtkfilechooser.c:195
++#: ../gtk/gtkfilechooser.c:195
+ msgid "The type of operation that the file selector is performing"
+ msgstr "Vrsta operacije, ki jo izvaja izbirnik datotek"
+
+-#: gtk/gtkfilechooser.c:201
++#: ../gtk/gtkfilechooser.c:201
+ msgid "File System Backend"
+ msgstr "Hrbtenica datotečnega sistema"
+
+-#: gtk/gtkfilechooser.c:202
++#: ../gtk/gtkfilechooser.c:202
+ msgid "Name of file system backend to use"
+ msgstr "Ime uporabljene hrbtenice datotečnega sistema"
+
+-#: gtk/gtkfilechooser.c:207 gtk/gtkrecentchooser.c:252
++#: ../gtk/gtkfilechooser.c:207
++#: ../gtk/gtkrecentchooser.c:252
+ msgid "Filter"
+ msgstr "Filtriraj"
+
+-#: gtk/gtkfilechooser.c:208
++#: ../gtk/gtkfilechooser.c:208
+ msgid "The current filter for selecting which files are displayed"
+ msgstr "Trenutni filter izbora datotek za prikaz"
+
+-#: gtk/gtkfilechooser.c:213
++#: ../gtk/gtkfilechooser.c:213
+ msgid "Local Only"
+ msgstr "Samo krajevno"
+
+-#: gtk/gtkfilechooser.c:214
++#: ../gtk/gtkfilechooser.c:214
+ msgid "Whether the selected file(s) should be limited to local file: URLs"
+ msgstr "Ali naj bodo izbrane datoteke omejen na krajevno datoteko: URL-ji"
+
+-#: gtk/gtkfilechooser.c:219
++#: ../gtk/gtkfilechooser.c:219
+ msgid "Preview widget"
+ msgstr "Predogled gradnika"
+
+-#: gtk/gtkfilechooser.c:220
++#: ../gtk/gtkfilechooser.c:220
+ msgid "Application supplied widget for custom previews."
+ msgstr "Gradnik s strani aplikacije za predoglede po meri."
+
+-#: gtk/gtkfilechooser.c:225
++#: ../gtk/gtkfilechooser.c:225
+ msgid "Preview Widget Active"
+ msgstr "Predogled gradnika je zagnan"
+
+-#: gtk/gtkfilechooser.c:226
+-msgid ""
+-"Whether the application supplied widget for custom previews should be shown."
++#: ../gtk/gtkfilechooser.c:226
++msgid "Whether the application supplied widget for custom previews should be shown."
+ msgstr "Ali naj bo gradnik programa za predogled po meri prikazan."
+
+-#: gtk/gtkfilechooser.c:231
++#: ../gtk/gtkfilechooser.c:231
+ msgid "Use Preview Label"
+ msgstr "Uporabi predogledno oznako"
+
+-#: gtk/gtkfilechooser.c:232
++#: ../gtk/gtkfilechooser.c:232
+ msgid "Whether to display a stock label with the name of the previewed file."
+ msgstr "Ali naj bo prikazana oznaka sklada z imenom predogledane datoteke."
+
+-#: gtk/gtkfilechooser.c:237
++#: ../gtk/gtkfilechooser.c:237
+ msgid "Extra widget"
+ msgstr "Posebni gradnik"
+
+-#: gtk/gtkfilechooser.c:238
++#: ../gtk/gtkfilechooser.c:238
+ msgid "Application supplied widget for extra options."
+ msgstr "S strani aplikacije ponujeni gradnik za dodatne možnosti."
+
+-#: gtk/gtkfilechooser.c:243 gtk/gtkfilesel.c:540 gtk/gtkrecentchooser.c:191
++#: ../gtk/gtkfilechooser.c:243
++#: ../gtk/gtkfilesel.c:540
++#: ../gtk/gtkrecentchooser.c:191
+ msgid "Select Multiple"
+ msgstr "Izberi več"
+
+-#: gtk/gtkfilechooser.c:244 gtk/gtkfilesel.c:541
++#: ../gtk/gtkfilechooser.c:244
++#: ../gtk/gtkfilesel.c:541
+ msgid "Whether to allow multiple files to be selected"
+ msgstr "Ali naj bo mogoče izbrati več datotek hkrati"
+
+-#: gtk/gtkfilechooser.c:250
++#: ../gtk/gtkfilechooser.c:250
+ msgid "Show Hidden"
+ msgstr "Pokaži skrito"
+
+-#: gtk/gtkfilechooser.c:251
++#: ../gtk/gtkfilechooser.c:251
+ msgid "Whether the hidden files and folders should be displayed"
+ msgstr "Ali naj bodo skrite datoteke in mape prikazane."
+
+-#: gtk/gtkfilechooser.c:266
++#: ../gtk/gtkfilechooser.c:266
+ msgid "Do overwrite confirmation"
+ msgstr "Izvedi potrditev prepisovanja"
+
+-#: gtk/gtkfilechooser.c:267
+-msgid ""
+-"Whether a file chooser in save mode will present an overwrite confirmation "
+-"dialog if necessary."
+-msgstr ""
+-"Ali naj izbirnik datotek v načinu shranjevanja predstavi pregledno "
+-"potrditveno pojavno okno."
++#: ../gtk/gtkfilechooser.c:267
++msgid "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary."
++msgstr "Ali naj izbirnik datotek v načinu shranjevanja predstavi pregledno potrditveno pojavno okno."
+
+-#: gtk/gtkfilechooserbutton.c:376
++#: ../gtk/gtkfilechooserbutton.c:376
+ msgid "Dialog"
+ msgstr "Pogovorno okno"
+
+-#: gtk/gtkfilechooserbutton.c:377
++#: ../gtk/gtkfilechooserbutton.c:377
+ msgid "The file chooser dialog to use."
+ msgstr "Pogovorno okno izbire datotek, ki naj bo uporabljeno."
+
+-#: gtk/gtkfilechooserbutton.c:408
++#: ../gtk/gtkfilechooserbutton.c:408
+ msgid "The title of the file chooser dialog."
+ msgstr "Naziv pogovornega okna za izbor datoteke."
+
+-#: gtk/gtkfilechooserbutton.c:422
++#: ../gtk/gtkfilechooserbutton.c:422
+ msgid "The desired width of the button widget, in characters."
+ msgstr "Želena širina gradnika gumba, v znakih."
+
+-#: gtk/gtkfilesel.c:526 gtk/gtkimage.c:163 gtk/gtkrecentmanager.c:214
+-#: gtk/gtkstatusicon.c:194
++#: ../gtk/gtkfilesel.c:526
++#: ../gtk/gtkimage.c:163
++#: ../gtk/gtkrecentmanager.c:214
++#: ../gtk/gtkstatusicon.c:194
+ msgid "Filename"
+ msgstr "Ime datoteke"
+
+-#: gtk/gtkfilesel.c:527
++#: ../gtk/gtkfilesel.c:527
+ msgid "The currently selected filename"
+ msgstr "Ime trenutno izbrane datoteke"
+
+-#: gtk/gtkfilesel.c:533
++#: ../gtk/gtkfilesel.c:533
+ msgid "Show file operations"
+ msgstr "Pokaži operacije datotek"
+
+-#: gtk/gtkfilesel.c:534
++#: ../gtk/gtkfilesel.c:534
+ msgid "Whether buttons for creating/manipulating files should be displayed"
+ msgstr "Ali naj bodo prikazani gumbi za ustvarjanje/upravljanje datotek."
+
+-#: gtk/gtkfixed.c:90 gtk/gtklayout.c:596
++#: ../gtk/gtkfixed.c:90
++#: ../gtk/gtklayout.c:596
+ msgid "X position"
+ msgstr "Položaj X"
+
+-#: gtk/gtkfixed.c:91 gtk/gtklayout.c:597
++#: ../gtk/gtkfixed.c:91
++#: ../gtk/gtklayout.c:597
+ msgid "X position of child widget"
+ msgstr "Položaj X podrejenega gradnika"
+
+-#: gtk/gtkfixed.c:100 gtk/gtklayout.c:606
++#: ../gtk/gtkfixed.c:100
++#: ../gtk/gtklayout.c:606
+ msgid "Y position"
+ msgstr "Položaj Y"
+
+-#: gtk/gtkfixed.c:101 gtk/gtklayout.c:607
++#: ../gtk/gtkfixed.c:101
++#: ../gtk/gtklayout.c:607
+ msgid "Y position of child widget"
+ msgstr "Položaj Y podrejenega gradnika"
+
+-#: gtk/gtkfontbutton.c:143
++#: ../gtk/gtkfontbutton.c:143
+ msgid "The title of the font selection dialog"
+ msgstr "Naziv pogovornega okna za izbor pisave."
+
+-#: gtk/gtkfontbutton.c:158 gtk/gtkfontsel.c:181
++#: ../gtk/gtkfontbutton.c:158
++#: ../gtk/gtkfontsel.c:181
+ msgid "Font name"
+ msgstr "Ime pisave"
+
+-#: gtk/gtkfontbutton.c:159
++#: ../gtk/gtkfontbutton.c:159
+ msgid "The name of the selected font"
+ msgstr "Ime izbrane pisave"
+
+-#: gtk/gtkfontbutton.c:160
++#: ../gtk/gtkfontbutton.c:160
+ msgid "Sans 12"
+ msgstr "Sans 12"
+
+-#: gtk/gtkfontbutton.c:175
++#: ../gtk/gtkfontbutton.c:175
+ msgid "Use font in label"
+ msgstr "Uporabi pisavo v oznaki"
+
+-#: gtk/gtkfontbutton.c:176
++#: ../gtk/gtkfontbutton.c:176
+ msgid "Whether the label is drawn in the selected font"
+ msgstr "Ali naj bo oznaka izrisana z izbrano pisavo"
+
+-#: gtk/gtkfontbutton.c:191
++#: ../gtk/gtkfontbutton.c:191
+ msgid "Use size in label"
+ msgstr "Uporabi velikost v oznaki"
+
+-#: gtk/gtkfontbutton.c:192
++#: ../gtk/gtkfontbutton.c:192
+ msgid "Whether the label is drawn with the selected font size"
+ msgstr "Ali naj bo oznaka izrisana z izbrano velikostjo pisave"
+
+-#: gtk/gtkfontbutton.c:208
++#: ../gtk/gtkfontbutton.c:208
+ msgid "Show style"
+ msgstr "Pokaži slog"
+
+-#: gtk/gtkfontbutton.c:209
++#: ../gtk/gtkfontbutton.c:209
+ msgid "Whether the selected font style is shown in the label"
+ msgstr "Ali naj bo izbrani slog pisave prikazan v oznaki"
+
+-#: gtk/gtkfontbutton.c:224
++#: ../gtk/gtkfontbutton.c:224
+ msgid "Show size"
+ msgstr "Prikaži velikost"
+
+-#: gtk/gtkfontbutton.c:225
++#: ../gtk/gtkfontbutton.c:225
+ msgid "Whether selected font size is shown in the label"
+ msgstr "Ali naj bo velikost izbrane pisave prikazana v oznaki"
+
+-#: gtk/gtkfontsel.c:182
++#: ../gtk/gtkfontsel.c:182
+ msgid "The string that represents this font"
+ msgstr "Niz, ki predstavlja izbrano pisavo"
+
+-#: gtk/gtkfontsel.c:189
++#: ../gtk/gtkfontsel.c:189
+ msgid "The GdkFont that is currently selected"
+ msgstr "GdkFont (GdkPisava), ki je trenutno izbrana"
+
+-#: gtk/gtkfontsel.c:195
++#: ../gtk/gtkfontsel.c:195
+ msgid "Preview text"
+ msgstr "Predogled besedila"
+
+-#: gtk/gtkfontsel.c:196
++#: ../gtk/gtkfontsel.c:196
+ msgid "The text to display in order to demonstrate the selected font"
+ msgstr "Besedilo, ki naj se prikaže za predstavitev izbrane pisave"
+
+-#: gtk/gtkframe.c:106
++#: ../gtk/gtkframe.c:106
+ msgid "Text of the frame's label"
+ msgstr "Besedilo oznake okvirja"
+
+-#: gtk/gtkframe.c:113
++#: ../gtk/gtkframe.c:113
+ msgid "Label xalign"
+ msgstr "xalign oznake"
+
+-#: gtk/gtkframe.c:114
++#: ../gtk/gtkframe.c:114
+ msgid "The horizontal alignment of the label"
+ msgstr "Vodoravna poravnava oznake"
+
+-#: gtk/gtkframe.c:122
++#: ../gtk/gtkframe.c:122
+ msgid "Label yalign"
+ msgstr "yalign oznake"
+
+-#: gtk/gtkframe.c:123
++#: ../gtk/gtkframe.c:123
+ msgid "The vertical alignment of the label"
+ msgstr "Navpična poravnava oznake"
+
+-#: gtk/gtkframe.c:131 gtk/gtkhandlebox.c:167
++#: ../gtk/gtkframe.c:131
++#: ../gtk/gtkhandlebox.c:167
+ msgid "Deprecated property, use shadow_type instead"
+ msgstr "Lastnost ni več v uporabi, namesto nje uporabite shadow_type"
+
+-#: gtk/gtkframe.c:138
++#: ../gtk/gtkframe.c:138
+ msgid "Frame shadow"
+ msgstr "Senca okvirja"
+
+-#: gtk/gtkframe.c:139
++#: ../gtk/gtkframe.c:139
+ msgid "Appearance of the frame border"
+ msgstr "Videz roba okvirja"
+
+-#: gtk/gtkframe.c:148
++#: ../gtk/gtkframe.c:148
+ msgid "A widget to display in place of the usual frame label"
+ msgstr "Gradnik, ki naj se prikaže na mestu običajne oznake okvirja."
+
+-#: gtk/gtkhandlebox.c:175
++#: ../gtk/gtkhandlebox.c:175
+ msgid "Appearance of the shadow that surrounds the container"
+ msgstr "Videz sence, ki obkroža vsebovalnik."
+
+-#: gtk/gtkhandlebox.c:183
++#: ../gtk/gtkhandlebox.c:183
+ msgid "Handle position"
+ msgstr "Lega ročice"
+
+-#: gtk/gtkhandlebox.c:184
++#: ../gtk/gtkhandlebox.c:184
+ msgid "Position of the handle relative to the child widget"
+ msgstr "Lega ročice glede na podrejeni gradnik"
+
+-#: gtk/gtkhandlebox.c:192
++#: ../gtk/gtkhandlebox.c:192
+ msgid "Snap edge"
+ msgstr "Skači do robov"
+
+-#: gtk/gtkhandlebox.c:193
+-msgid ""
+-"Side of the handlebox that's lined up with the docking point to dock the "
+-"handlebox"
++#: ../gtk/gtkhandlebox.c:193
++msgid "Side of the handlebox that's lined up with the docking point to dock the handlebox"
+ msgstr "Stran škatle z ročico, ki je poravnana s točko doka"
+
+-#: gtk/gtkhandlebox.c:201
++#: ../gtk/gtkhandlebox.c:201
+ msgid "Snap edge set"
+ msgstr "Skakanje do robov je nastavljeno"
+
+-#: gtk/gtkhandlebox.c:202
+-msgid ""
+-"Whether to use the value from the snap_edge property or a value derived from "
+-"handle_position"
+-msgstr ""
+-"Ali naj se uporabi vrednost iz snap_edge ali vrednost izvedena iz "
+-"handle_position"
++#: ../gtk/gtkhandlebox.c:202
++msgid "Whether to use the value from the snap_edge property or a value derived from handle_position"
++msgstr "Ali naj se uporabi vrednost iz snap_edge ali vrednost izvedena iz handle_position"
+
+-#: gtk/gtkhandlebox.c:209
++#: ../gtk/gtkhandlebox.c:209
+ msgid "Child Detached"
+ msgstr "Podrejeno okno odsidrano"
+
+-#: gtk/gtkhandlebox.c:210
+-msgid ""
+-"A boolean value indicating whether the handlebox's child is attached or "
+-"detached."
+-msgstr ""
+-"Logična vrednost, ki določa ali je podrejeni upravljalni predmet priklopljen "
+-"ali ne."
++#: ../gtk/gtkhandlebox.c:210
++msgid "A boolean value indicating whether the handlebox's child is attached or detached."
++msgstr "Logična vrednost, ki določa ali je podrejeni upravljalni predmet priklopljen ali ne."
+
+-#: gtk/gtkiconview.c:550
++#: ../gtk/gtkiconview.c:550
+ msgid "Selection mode"
+ msgstr "Način izbire"
+
+-#: gtk/gtkiconview.c:551
++#: ../gtk/gtkiconview.c:551
+ msgid "The selection mode"
+ msgstr "Način izbiranja"
+
+-#: gtk/gtkiconview.c:569
++#: ../gtk/gtkiconview.c:569
+ msgid "Pixbuf column"
+ msgstr "Stolpec slikovnega medpomnilnika"
+
+-#: gtk/gtkiconview.c:570
++#: ../gtk/gtkiconview.c:570
+ msgid "Model column used to retrieve the icon pixbuf from"
+ msgstr "Stolpec modela iz katerega se pridobijo slike ikon"
+
+-#: gtk/gtkiconview.c:588
++#: ../gtk/gtkiconview.c:588
+ msgid "Model column used to retrieve the text from"
+ msgstr "Stolpec modela iz katerega se pridobi besedilo"
+
+-#: gtk/gtkiconview.c:607
++#: ../gtk/gtkiconview.c:607
+ msgid "Markup column"
+ msgstr "Stolpec označevanja"
+
+-#: gtk/gtkiconview.c:608
++#: ../gtk/gtkiconview.c:608
+ msgid "Model column used to retrieve the text if using Pango markup"
+ msgstr "Stolpec modela iz katerega se pridobi besedilo z Pango označevanjem"
+
+-#: gtk/gtkiconview.c:615
++#: ../gtk/gtkiconview.c:615
+ msgid "Icon View Model"
+ msgstr "Način pogleda ikon"
+
+-#: gtk/gtkiconview.c:616
++#: ../gtk/gtkiconview.c:616
+ msgid "The model for the icon view"
+ msgstr "Način za pogled ikon"
+
+-#: gtk/gtkiconview.c:632
++#: ../gtk/gtkiconview.c:632
+ msgid "Number of columns"
+ msgstr "Število stolpcev"
+
+-#: gtk/gtkiconview.c:633
++#: ../gtk/gtkiconview.c:633
+ msgid "Number of columns to display"
+ msgstr "Število stolpcev, ki naj bodo prikazani"
+
+-#: gtk/gtkiconview.c:650
++#: ../gtk/gtkiconview.c:650
+ msgid "Width for each item"
+ msgstr "Širina vsakega predmeta"
+
+-#: gtk/gtkiconview.c:651
++#: ../gtk/gtkiconview.c:651
+ msgid "The width used for each item"
+ msgstr "Širina, uporabljena za vsak element"
+
+-#: gtk/gtkiconview.c:667
++#: ../gtk/gtkiconview.c:667
+ msgid "Space which is inserted between cells of an item"
+ msgstr "Prostor, vstavljen med celice elementa"
+
+-#: gtk/gtkiconview.c:682
++#: ../gtk/gtkiconview.c:682
+ msgid "Row Spacing"
+ msgstr "Prostor med vrsticami"
+
+-#: gtk/gtkiconview.c:683
++#: ../gtk/gtkiconview.c:683
+ msgid "Space which is inserted between grid rows"
+ msgstr "Prostor, vstavljen med vrstice mreže"
+
+-#: gtk/gtkiconview.c:698
++#: ../gtk/gtkiconview.c:698
+ msgid "Column Spacing"
+ msgstr "Prostor med stolpci"
+
+-#: gtk/gtkiconview.c:699
++#: ../gtk/gtkiconview.c:699
+ msgid "Space which is inserted between grid columns"
+ msgstr "Prostor, vstavljen med stolpce mreže"
+
+-#: gtk/gtkiconview.c:714
++#: ../gtk/gtkiconview.c:714
+ msgid "Margin"
+ msgstr "Rob"
+
+-#: gtk/gtkiconview.c:715
++#: ../gtk/gtkiconview.c:715
+ msgid "Space which is inserted at the edges of the icon view"
+ msgstr "Prostor, vstavljen na robovih ikonskega pogleda"
+
+-#: gtk/gtkiconview.c:732
+-msgid ""
+-"How the text and icon of each item are positioned relative to each other"
++#: ../gtk/gtkiconview.c:732
++msgid "How the text and icon of each item are positioned relative to each other"
+ msgstr "Kako sta med seboj razporejena besedilo in ikona vsakega elementa"
+
+-#: gtk/gtkiconview.c:748 gtk/gtktreeview.c:618 gtk/gtktreeviewcolumn.c:307
++#: ../gtk/gtkiconview.c:748
++#: ../gtk/gtktreeview.c:618
++#: ../gtk/gtktreeviewcolumn.c:307
+ msgid "Reorderable"
+ msgstr "Vnovič uredljiv"
+
+-#: gtk/gtkiconview.c:749 gtk/gtktreeview.c:619
++#: ../gtk/gtkiconview.c:749
++#: ../gtk/gtktreeview.c:619
+ msgid "View is reorderable"
+ msgstr "Pogled je vnovič uredljiv"
+
+-#: gtk/gtkiconview.c:756 gtk/gtktreeview.c:769
++#: ../gtk/gtkiconview.c:756
++#: ../gtk/gtktreeview.c:769
+ msgid "Tooltip Column"
+ msgstr "Stolpec z namigi"
+
+-#: gtk/gtkiconview.c:757
++#: ../gtk/gtkiconview.c:757
+ msgid "The column in the model containing the tooltip texts for the items"
+ msgstr "Stolpec modela, ki vsebuje besedilo namigov za dejavne predmete."
+
+-#: gtk/gtkiconview.c:768
++#: ../gtk/gtkiconview.c:768
+ msgid "Selection Box Color"
+ msgstr "Barva izbirnega polja"
+
+-#: gtk/gtkiconview.c:769
++#: ../gtk/gtkiconview.c:769
+ msgid "Color of the selection box"
+ msgstr "Barva izbirnega polja"
+
+-#: gtk/gtkiconview.c:775
++#: ../gtk/gtkiconview.c:775
+ msgid "Selection Box Alpha"
+ msgstr "Alfa izbirnega polja"
+
+-#: gtk/gtkiconview.c:776
++#: ../gtk/gtkiconview.c:776
+ msgid "Opacity of the selection box"
+ msgstr "Prekrivnost izbirnega polja"
+
+-#: gtk/gtkimage.c:131 gtk/gtkstatusicon.c:186
++#: ../gtk/gtkimage.c:131
++#: ../gtk/gtkstatusicon.c:186
+ msgid "Pixbuf"
+ msgstr "Pixbuf"
+
+-#: gtk/gtkimage.c:132 gtk/gtkstatusicon.c:187
++#: ../gtk/gtkimage.c:132
++#: ../gtk/gtkstatusicon.c:187
+ msgid "A GdkPixbuf to display"
+ msgstr "GdkPixbuf, ki naj se prikaže"
+
+-#: gtk/gtkimage.c:139
++#: ../gtk/gtkimage.c:139
+ msgid "Pixmap"
+ msgstr "Rastrska slika"
+
+-#: gtk/gtkimage.c:140
++#: ../gtk/gtkimage.c:140
+ msgid "A GdkPixmap to display"
+ msgstr "GdkPixmap, ki naj se prikaže"
+
+-#: gtk/gtkimage.c:147 gtk/gtkmessagedialog.c:215
++#: ../gtk/gtkimage.c:147
++#: ../gtk/gtkmessagedialog.c:215
+ msgid "Image"
+ msgstr "Slika"
+
+-#: gtk/gtkimage.c:148
++#: ../gtk/gtkimage.c:148
+ msgid "A GdkImage to display"
+ msgstr "GdkImage, ki naj se prikaže"
+
+-#: gtk/gtkimage.c:155
++#: ../gtk/gtkimage.c:155
+ msgid "Mask"
+ msgstr "Maska"
+
+-#: gtk/gtkimage.c:156
++#: ../gtk/gtkimage.c:156
+ msgid "Mask bitmap to use with GdkImage or GdkPixmap"
+ msgstr "Slika maske, ki naj se uporabi z GdkImage ali GdkPixmap"
+
+-#: gtk/gtkimage.c:164 gtk/gtkstatusicon.c:195
++#: ../gtk/gtkimage.c:164
++#: ../gtk/gtkstatusicon.c:195
+ msgid "Filename to load and display"
+ msgstr "Ime datoteke, ki naj se naloži in prikaže"
+
+-#: gtk/gtkimage.c:173 gtk/gtkstatusicon.c:203
++#: ../gtk/gtkimage.c:173
++#: ../gtk/gtkstatusicon.c:203
+ msgid "Stock ID for a stock image to display"
+ msgstr "Osnovni ID slike, ki naj se prikaže"
+
+-#: gtk/gtkimage.c:180
++#: ../gtk/gtkimage.c:180
+ msgid "Icon set"
+ msgstr "Komplet ikon"
+
+-#: gtk/gtkimage.c:181
++#: ../gtk/gtkimage.c:181
+ msgid "Icon set to display"
+ msgstr "Komplet ikon, ki naj se prikaže"
+
+-#: gtk/gtkimage.c:188 gtk/gtkscalebutton.c:212 gtk/gtktoolbar.c:547
++#: ../gtk/gtkimage.c:188
++#: ../gtk/gtkscalebutton.c:212
++#: ../gtk/gtktoolbar.c:547
+ msgid "Icon size"
+ msgstr "Velikost ikone"
+
+-#: gtk/gtkimage.c:189
++#: ../gtk/gtkimage.c:189
+ msgid "Symbolic size to use for stock icon, icon set or named icon"
+-msgstr ""
+-"Simbolna velikost, ki naj velja za osnovno ikono, za paket ikon ali "
+-"imenovano ikono"
++msgstr "Simbolna velikost, ki naj velja za osnovno ikono, za paket ikon ali imenovano ikono"
+
+-#: gtk/gtkimage.c:205
++#: ../gtk/gtkimage.c:205
+ msgid "Pixel size"
+ msgstr "Velikost slikovne točke"
+
+-#: gtk/gtkimage.c:206
++#: ../gtk/gtkimage.c:206
+ msgid "Pixel size to use for named icon"
+ msgstr "Velikost slikovne točke, ki naj bo uporabljena za imenovano ikono"
+
+-#: gtk/gtkimage.c:214
++#: ../gtk/gtkimage.c:214
+ msgid "Animation"
+ msgstr "Animacija"
+
+-#: gtk/gtkimage.c:215
++#: ../gtk/gtkimage.c:215
+ msgid "GdkPixbufAnimation to display"
+ msgstr "GdkPixbufAnimation, ki naj se prikaže"
+
+-#: gtk/gtkimage.c:255 gtk/gtkstatusicon.c:234
++#: ../gtk/gtkimage.c:255
++#: ../gtk/gtkstatusicon.c:234
+ msgid "Storage type"
+ msgstr "Vrsta hrambe"
+
+-#: gtk/gtkimage.c:256 gtk/gtkstatusicon.c:235
++#: ../gtk/gtkimage.c:256
++#: ../gtk/gtkstatusicon.c:235
+ msgid "The representation being used for image data"
+ msgstr "Način prezentacije, ki se uporablja za slikovne podatke"
+
+-#: gtk/gtkimagemenuitem.c:101
++#: ../gtk/gtkimagemenuitem.c:101
+ msgid "Child widget to appear next to the menu text"
+ msgstr "podrejeni gradink, ki naj se pojavi poleg besedila menija"
+
+-#: gtk/gtkimagemenuitem.c:106
++#: ../gtk/gtkimagemenuitem.c:106
+ msgid "Show menu images"
+ msgstr "Pokaži slike v menijih"
+
+-#: gtk/gtkimagemenuitem.c:107
++#: ../gtk/gtkimagemenuitem.c:107
+ msgid "Whether images should be shown in menus"
+ msgstr "Ali naj bodo v menijih prikazane slike ali ne"
+
+-#: gtk/gtkinvisible.c:87 gtk/gtkwindow.c:601
++#: ../gtk/gtkinvisible.c:87
++#: ../gtk/gtkwindow.c:601
+ msgid "The screen where this window will be displayed"
+ msgstr "Zaslon, na katerem bo prikazano okno"
+
+-#: gtk/gtklabel.c:317
++#: ../gtk/gtklabel.c:317
+ msgid "The text of the label"
+ msgstr "Besedilo oznake"
+
+-#: gtk/gtklabel.c:324
++#: ../gtk/gtklabel.c:324
+ msgid "A list of style attributes to apply to the text of the label"
+ msgstr "Seznam atributov sloga, ki naj se uveljavijo na besedilu te oznake"
+
+-#: gtk/gtklabel.c:345 gtk/gtktexttag.c:359 gtk/gtktextview.c:585
++#: ../gtk/gtklabel.c:345
++#: ../gtk/gtktexttag.c:359
++#: ../gtk/gtktextview.c:585
+ msgid "Justification"
+ msgstr "Poravnava"
+
+-#: gtk/gtklabel.c:346
+-msgid ""
+-"The alignment of the lines in the text of the label relative to each other. "
+-"This does NOT affect the alignment of the label within its allocation. See "
+-"GtkMisc::xalign for that"
+-msgstr ""
+-"Poravnava vrstic besedila v oznaki relativno druga na drugo. To NE vpliva na "
+-"poravnavo oznake znotraj njenega položaja. Za to poglejte GtkMisc::xalign"
++#: ../gtk/gtklabel.c:346
++msgid "The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that"
++msgstr "Poravnava vrstic besedila v oznaki relativno druga na drugo. To NE vpliva na poravnavo oznake znotraj njenega položaja. Za to poglejte GtkMisc::xalign"
+
+-#: gtk/gtklabel.c:354
++#: ../gtk/gtklabel.c:354
+ msgid "Pattern"
+ msgstr "Vzorec"
+
+-#: gtk/gtklabel.c:355
+-msgid ""
+-"A string with _ characters in positions correspond to characters in the text "
+-"to underline"
+-msgstr ""
+-"Niz s podčrtaji ('_') na mestih, kjer naj bodo znaki v besedilu podčrtani"
++#: ../gtk/gtklabel.c:355
++msgid "A string with _ characters in positions correspond to characters in the text to underline"
++msgstr "Niz s podčrtaji ('_') na mestih, kjer naj bodo znaki v besedilu podčrtani"
+
+-#: gtk/gtklabel.c:362
++#: ../gtk/gtklabel.c:362
+ msgid "Line wrap"
+ msgstr "Prelom vrstic"
+
+-#: gtk/gtklabel.c:363
++#: ../gtk/gtklabel.c:363
+ msgid "If set, wrap lines if the text becomes too wide"
+-msgstr ""
+-"Če je nastavljen, se vrstice začnejo lomiti, če besedilo postane preširoko"
++msgstr "Če je nastavljen, se vrstice začnejo lomiti, če besedilo postane preširoko"
+
+-#: gtk/gtklabel.c:378
++#: ../gtk/gtklabel.c:378
+ msgid "Line wrap mode"
+ msgstr "Način preloma vrstic"
+
+-#: gtk/gtklabel.c:379
++#: ../gtk/gtklabel.c:379
+ msgid "If wrap is set, controls how linewrapping is done"
+-msgstr ""
+-"Možnost določa način preloma, kadar je izbrana možnost preloma besedila"
++msgstr "Možnost določa način preloma, kadar je izbrana možnost preloma besedila"
+
+-#: gtk/gtklabel.c:386
++#: ../gtk/gtklabel.c:386
+ msgid "Selectable"
+ msgstr "Izberljiva"
+
+-#: gtk/gtklabel.c:387
++#: ../gtk/gtklabel.c:387
+ msgid "Whether the label text can be selected with the mouse"
+ msgstr "Ali se lahko besedilo oznake izbere z miško"
+
+-#: gtk/gtklabel.c:393
++#: ../gtk/gtklabel.c:393
+ msgid "Mnemonic key"
+ msgstr "Pospeševalna tipka"
+
+-#: gtk/gtklabel.c:394
++#: ../gtk/gtklabel.c:394
+ msgid "The mnemonic accelerator key for this label"
+ msgstr "Pospeševalna tipka za to oznako"
+
+-#: gtk/gtklabel.c:402
++#: ../gtk/gtklabel.c:402
+ msgid "Mnemonic widget"
+ msgstr "Pospeševalni gradnik"
+
+-#: gtk/gtklabel.c:403
++#: ../gtk/gtklabel.c:403
+ msgid "The widget to be activated when the label's mnemonic key is pressed"
+-msgstr ""
+-"Gradnik, ki naj se zažene, ko je pritisnjena pospeševalna tipka za oznako"
++msgstr "Gradnik, ki naj se zažene, ko je pritisnjena pospeševalna tipka za oznako"
+
+-#: gtk/gtklabel.c:449
+-msgid ""
+-"The preferred place to ellipsize the string, if the label does not have "
+-"enough room to display the entire string"
+-msgstr ""
+-"Prednostno mesto okrajšanja niti, če predmet nima dovolj prostora za prikaz "
+-"celotnega niza."
++#: ../gtk/gtklabel.c:449
++msgid "The preferred place to ellipsize the string, if the label does not have enough room to display the entire string"
++msgstr "Prednostno mesto okrajšanja niti, če predmet nima dovolj prostora za prikaz celotnega niza."
+
+-#: gtk/gtklabel.c:489
++#: ../gtk/gtklabel.c:489
+ msgid "Single Line Mode"
+ msgstr "Enovrstični način"
+
+-#: gtk/gtklabel.c:490
++#: ../gtk/gtklabel.c:490
+ msgid "Whether the label is in single line mode"
+ msgstr "Ali naj bo besedilo oznake v enovrstičnem načinu"
+
+-#: gtk/gtklabel.c:507
++#: ../gtk/gtklabel.c:507
+ msgid "Angle"
+ msgstr "Kot"
+
+-#: gtk/gtklabel.c:508
++#: ../gtk/gtklabel.c:508
+ msgid "Angle at which the label is rotated"
+ msgstr "Kot, pod katerim naj bo zasukana oznaka"
+
+-#: gtk/gtklabel.c:528
++#: ../gtk/gtklabel.c:528
+ msgid "Maximum Width In Characters"
+ msgstr "Največja širina v znakih"
+
+-#: gtk/gtklabel.c:529
++#: ../gtk/gtklabel.c:529
+ msgid "The desired maximum width of the label, in characters"
+ msgstr "Želena največja širina oznake, v znakih"
+
+-#: gtk/gtklabel.c:645
++#: ../gtk/gtklabel.c:645
+ msgid "Whether to select the contents of a selectable label when it is focused"
+ msgstr "Ali naj bo izbrana vsebina izbirne oznake, kadar je ta dejavna"
+
+-#: gtk/gtklayout.c:616 gtk/gtkviewport.c:106
++#: ../gtk/gtklayout.c:616
++#: ../gtk/gtkviewport.c:106
+ msgid "Horizontal adjustment"
+ msgstr "Vodoravna poravnava"
+
+-#: gtk/gtklayout.c:617 gtk/gtkscrolledwindow.c:219
++#: ../gtk/gtklayout.c:617
++#: ../gtk/gtkscrolledwindow.c:219
+ msgid "The GtkAdjustment for the horizontal position"
+ msgstr "GtkAdjustment za vodoravno poravnavo"
+
+-#: gtk/gtklayout.c:624 gtk/gtkviewport.c:114
++#: ../gtk/gtklayout.c:624
++#: ../gtk/gtkviewport.c:114
+ msgid "Vertical adjustment"
+ msgstr "Navpična poravnava"
+
+-#: gtk/gtklayout.c:625 gtk/gtkscrolledwindow.c:226
++#: ../gtk/gtklayout.c:625
++#: ../gtk/gtkscrolledwindow.c:226
+ msgid "The GtkAdjustment for the vertical position"
+ msgstr "GtkAdjustment za navpično poravnavo"
+
+-#: gtk/gtklayout.c:633
++#: ../gtk/gtklayout.c:633
+ msgid "The width of the layout"
+ msgstr "Širina postavitve"
+
+-#: gtk/gtklayout.c:642
++#: ../gtk/gtklayout.c:642
+ msgid "The height of the layout"
+ msgstr "Višina postavitve"
+
+-#: gtk/gtklinkbutton.c:144
++#: ../gtk/gtklinkbutton.c:144
+ msgid "URI"
+ msgstr "URI"
+
+-#: gtk/gtklinkbutton.c:145
++#: ../gtk/gtklinkbutton.c:145
+ msgid "The URI bound to this button"
+ msgstr "URI vezan na ta gumb"
+
+-#: gtk/gtklinkbutton.c:159
++#: ../gtk/gtklinkbutton.c:159
+ msgid "Visited"
+ msgstr "Obiskano"
+
+-#: gtk/gtklinkbutton.c:160
++#: ../gtk/gtklinkbutton.c:160
+ msgid "Whether this link has been visited."
+ msgstr "Ali je bila povezava obiskana."
+
+-#: gtk/gtkmenu.c:499
++#: ../gtk/gtkmenu.c:499
+ msgid "The currently selected menu item"
+ msgstr "Trenutno izbran predmet menija"
+
+-#: gtk/gtkmenu.c:513
++#: ../gtk/gtkmenu.c:513
+ msgid "Accel Group"
+ msgstr "Accel skupina"
+
+-#: gtk/gtkmenu.c:514
++#: ../gtk/gtkmenu.c:514
+ msgid "The accel group holding accelerators for the menu"
+ msgstr "Pospeševalna skupina, ki drži pospeševalce v meniju"
+
+-#: gtk/gtkmenu.c:528 gtk/gtkmenuitem.c:233
++#: ../gtk/gtkmenu.c:528
++#: ../gtk/gtkmenuitem.c:233
+ msgid "Accel Path"
+ msgstr "Accel pot"
+
+-#: gtk/gtkmenu.c:529
++#: ../gtk/gtkmenu.c:529
+ msgid "An accel path used to conveniently construct accel paths of child items"
+ msgstr "Accel pot uporabljena za izgradnjo accel poti podrejenih predmetov"
+
+-#: gtk/gtkmenu.c:545
++#: ../gtk/gtkmenu.c:545
+ msgid "Attach Widget"
+ msgstr "Zasidraj gradnik"
+
+-#: gtk/gtkmenu.c:546
++#: ../gtk/gtkmenu.c:546
+ msgid "The widget the menu is attached to"
+ msgstr "Gradnik na katerega je vezan meni"
+
+-#: gtk/gtkmenu.c:554
+-msgid ""
+-"A title that may be displayed by the window manager when this menu is torn-"
+-"off"
++#: ../gtk/gtkmenu.c:554
++msgid "A title that may be displayed by the window manager when this menu is torn-off"
+ msgstr "Naziv, ki ga lahko prikaže upravljalnik oken, kadar je meni odtrgan"
+
+-#: gtk/gtkmenu.c:568
++#: ../gtk/gtkmenu.c:568
+ msgid "Tearoff State"
+ msgstr "Stanje odtrganosti"
+
+-#: gtk/gtkmenu.c:569
++#: ../gtk/gtkmenu.c:569
+ msgid "A boolean that indicates whether the menu is torn-off"
+ msgstr "Dvojiška spremenljivka, ki pove, ali je meni odtrgan"
+
+-#: gtk/gtkmenu.c:583
++#: ../gtk/gtkmenu.c:583
+ msgid "Monitor"
+ msgstr "Zaslon"
+
+-#: gtk/gtkmenu.c:584
++#: ../gtk/gtkmenu.c:584
+ msgid "The monitor the menu will be popped up on"
+ msgstr "Zaslon na katerem se bo pojavil meni"
+
+-#: gtk/gtkmenu.c:590
++#: ../gtk/gtkmenu.c:590
+ msgid "Vertical Padding"
+ msgstr "Navpično blazinjenje"
+
+-#: gtk/gtkmenu.c:591
++#: ../gtk/gtkmenu.c:591
+ msgid "Extra space at the top and bottom of the menu"
+ msgstr "Dodaten, dodan prostor na vrhu in na dnu menija"
+
+-#: gtk/gtkmenu.c:599
++#: ../gtk/gtkmenu.c:599
+ msgid "Horizontal Padding"
+ msgstr "Vodoravno blazinjenje"
+
+-#: gtk/gtkmenu.c:600
++#: ../gtk/gtkmenu.c:600
+ msgid "Extra space at the left and right edges of the menu"
+ msgstr "Dodaten, dodan prostor na levi in desni strani menija"
+
+-#: gtk/gtkmenu.c:608
++#: ../gtk/gtkmenu.c:608
+ msgid "Vertical Offset"
+ msgstr "Navpični zamik"
+
+-#: gtk/gtkmenu.c:609
+-msgid ""
+-"When the menu is a submenu, position it this number of pixels offset "
+-"vertically"
++#: ../gtk/gtkmenu.c:609
++msgid "When the menu is a submenu, position it this number of pixels offset vertically"
+ msgstr "Kadar je meni podmeni, naj bo zamaknjen za toliko točk navpično"
+
+-#: gtk/gtkmenu.c:617
++#: ../gtk/gtkmenu.c:617
+ msgid "Horizontal Offset"
+ msgstr "Vodoravn zamik"
+
+-#: gtk/gtkmenu.c:618
+-msgid ""
+-"When the menu is a submenu, position it this number of pixels offset "
+-"horizontally"
++#: ../gtk/gtkmenu.c:618
++msgid "When the menu is a submenu, position it this number of pixels offset horizontally"
+ msgstr "Kadar je meni podmeni, naj bo zamaknjen za toliko točk vodoravno"
+
+-#: gtk/gtkmenu.c:626
++#: ../gtk/gtkmenu.c:626
+ msgid "Double Arrows"
+ msgstr "Dvojne puščice"
+
+-#: gtk/gtkmenu.c:627
++#: ../gtk/gtkmenu.c:627
+ msgid "When scrolling, always show both arrows."
+ msgstr "Pri drsenju vedno pokaži obe puščici."
+
+-#: gtk/gtkmenu.c:635
++#: ../gtk/gtkmenu.c:635
+ msgid "Left Attach"
+ msgstr "Leva priloga"
+
+-#: gtk/gtkmenu.c:636 gtk/gtktable.c:174
++#: ../gtk/gtkmenu.c:636
++#: ../gtk/gtktable.c:174
+ msgid "The column number to attach the left side of the child to"
+ msgstr "Številka stolpca, ki naj se pripoji levi strani podrejenega gradnika"
+
+-#: gtk/gtkmenu.c:643
++#: ../gtk/gtkmenu.c:643
+ msgid "Right Attach"
+ msgstr "Desna priloga"
+
+-#: gtk/gtkmenu.c:644
++#: ../gtk/gtkmenu.c:644
+ msgid "The column number to attach the right side of the child to"
+ msgstr "Številka stolpca, ki naj se pripoji levi strani podrejenega gradnika"
+
+-#: gtk/gtkmenu.c:651
++#: ../gtk/gtkmenu.c:651
+ msgid "Top Attach"
+ msgstr "Vrhnja priloga"
+
+-#: gtk/gtkmenu.c:652
++#: ../gtk/gtkmenu.c:652
+ msgid "The row number to attach the top of the child to"
+-msgstr ""
+-"Številka vrstice, ki naj se pripoji spodnji strani podrejenega gradnika"
++msgstr "Številka vrstice, ki naj se pripoji spodnji strani podrejenega gradnika"
+
+-#: gtk/gtkmenu.c:659
++#: ../gtk/gtkmenu.c:659
+ msgid "Bottom Attach"
+ msgstr "Spodnja priloga"
+
+-#: gtk/gtkmenu.c:660 gtk/gtktable.c:195
++#: ../gtk/gtkmenu.c:660
++#: ../gtk/gtktable.c:195
+ msgid "The row number to attach the bottom of the child to"
+-msgstr ""
+-"Številka vrstice, ki naj se pripoji spodnji strani podrejenega gradnika"
++msgstr "Številka vrstice, ki naj se pripoji spodnji strani podrejenega gradnika"
+
+-#: gtk/gtkmenu.c:747
++#: ../gtk/gtkmenu.c:747
+ msgid "Can change accelerators"
+ msgstr "Lahko spremeni pospeševalnike"
+
+-#: gtk/gtkmenu.c:748
+-msgid ""
+-"Whether menu accelerators can be changed by pressing a key over the menu item"
+-msgstr ""
+-"Ali se lahko pospeševalniki menijev spremenijo s pritiskom tipke nad "
+-"predmetom menija."
++#: ../gtk/gtkmenu.c:748
++msgid "Whether menu accelerators can be changed by pressing a key over the menu item"
++msgstr "Ali se lahko pospeševalniki menijev spremenijo s pritiskom tipke nad predmetom menija."
+
+-#: gtk/gtkmenu.c:753
++#: ../gtk/gtkmenu.c:753
+ msgid "Delay before submenus appear"
+ msgstr "Premor preden se pokažejo podmeniji"
+
+-#: gtk/gtkmenu.c:754
+-msgid ""
+-"Minimum time the pointer must stay over a menu item before the submenu appear"
+-msgstr ""
+-"Najmanjši čas, kolikor mora kazalec stati nad menijem, preden se prikaže "
+-"podmeni"
++#: ../gtk/gtkmenu.c:754
++msgid "Minimum time the pointer must stay over a menu item before the submenu appear"
++msgstr "Najmanjši čas, kolikor mora kazalec stati nad menijem, preden se prikaže podmeni"
+
+-#: gtk/gtkmenu.c:761
++#: ../gtk/gtkmenu.c:761
+ msgid "Delay before hiding a submenu"
+ msgstr "Premor pred zakrivanjem podmenija"
+
+-#: gtk/gtkmenu.c:762
+-msgid ""
+-"The time before hiding a submenu when the pointer is moving towards the "
+-"submenu"
++#: ../gtk/gtkmenu.c:762
++msgid "The time before hiding a submenu when the pointer is moving towards the submenu"
+ msgstr "Čas, preden se podmeni skrije, ko se kazalec premika proti njemu"
+
+-#: gtk/gtkmenubar.c:168
++#: ../gtk/gtkmenubar.c:168
+ msgid "Pack direction"
+ msgstr "Smer krčenja"
+
+-#: gtk/gtkmenubar.c:169
++#: ../gtk/gtkmenubar.c:169
+ msgid "The pack direction of the menubar"
+ msgstr "Smer krčenja menijske vrstice"
+
+-#: gtk/gtkmenubar.c:185
++#: ../gtk/gtkmenubar.c:185
+ msgid "Child Pack direction"
+ msgstr "Smer krčenja podrejenega predmeta"
+
+-#: gtk/gtkmenubar.c:186
++#: ../gtk/gtkmenubar.c:186
+ msgid "The child pack direction of the menubar"
+ msgstr "Smer krčenja podrejenega predmeta menijske vrstice"
+
+-#: gtk/gtkmenubar.c:195
++#: ../gtk/gtkmenubar.c:195
+ msgid "Style of bevel around the menubar"
+ msgstr "Slog obrobe okoli menija"
+
+-#: gtk/gtkmenubar.c:202 gtk/gtktoolbar.c:597
++#: ../gtk/gtkmenubar.c:202
++#: ../gtk/gtktoolbar.c:597
+ msgid "Internal padding"
+ msgstr "Notranje polnjenje"
+
+-#: gtk/gtkmenubar.c:203
++#: ../gtk/gtkmenubar.c:203
+ msgid "Amount of border space between the menubar shadow and the menu items"
+ msgstr "Količina robnega prostora med senco menija in premeti menija"
+
+-#: gtk/gtkmenubar.c:210
++#: ../gtk/gtkmenubar.c:210
+ msgid "Delay before drop down menus appear"
+ msgstr "Zakasnitev, preden se pojavi padajoči meni"
+
+-#: gtk/gtkmenubar.c:211
++#: ../gtk/gtkmenubar.c:211
+ msgid "Delay before the submenus of a menu bar appear"
+ msgstr "Zakasnitev, preden se pojavijo podmeniji menijske vrstice"
+
+-#: gtk/gtkmenuitem.c:201
++#: ../gtk/gtkmenuitem.c:201
+ msgid "Right Justified"
+ msgstr "Desna poravnava"
+
+-#: gtk/gtkmenuitem.c:202
+-msgid ""
+-"Sets whether the menu item appears justified at the right side of a menu bar"
++#: ../gtk/gtkmenuitem.c:202
++msgid "Sets whether the menu item appears justified at the right side of a menu bar"
+ msgstr "Določilo omogoča, da je meni poravnan na desni strani menijske vrstice"
+
+-#: gtk/gtkmenuitem.c:216
++#: ../gtk/gtkmenuitem.c:216
+ msgid "Submenu"
+ msgstr "Podmeni"
+
+-#: gtk/gtkmenuitem.c:217
++#: ../gtk/gtkmenuitem.c:217
+ msgid "The submenu attached to the menu item, or NULL if it has none"
+ msgstr "Podmeni pripet glavnemu meniju, ali NULL, če ga ni"
+
+-#: gtk/gtkmenuitem.c:234
++#: ../gtk/gtkmenuitem.c:234
+ msgid "Sets the accelerator path of the menu item"
+ msgstr "Določi tipkovno pot predmetov menija"
+
+-#: gtk/gtkmenuitem.c:277
++#: ../gtk/gtkmenuitem.c:277
+ msgid "Amount of space used up by arrow, relative to the menu item's font size"
+-msgstr ""
+-"Velikost prostora, ki ga porabi puščica v razmerju z velikostjo pisave."
++msgstr "Velikost prostora, ki ga porabi puščica v razmerju z velikostjo pisave."
+
+-#: gtk/gtkmenuitem.c:290
++#: ../gtk/gtkmenuitem.c:290
+ msgid "Width in Characters"
+ msgstr "Širina v znakih"
+
+-#: gtk/gtkmenuitem.c:291
++#: ../gtk/gtkmenuitem.c:291
+ msgid "The minimum desired width of the menu item in characters"
+ msgstr "Najmanjša želena širina predmeta menija v znakih"
+
+-#: gtk/gtkmenushell.c:374
++#: ../gtk/gtkmenushell.c:374
+ msgid "Take Focus"
+ msgstr "Prevzemi dejavnost"
+
+-#: gtk/gtkmenushell.c:375
++#: ../gtk/gtkmenushell.c:375
+ msgid "A boolean that determines whether the menu grabs the keyboard focus"
+-msgstr ""
+-"Logična spremenljivka, ki določa, ali meni prevzame dejavnost tipkovnice"
++msgstr "Logična spremenljivka, ki določa, ali meni prevzame dejavnost tipkovnice"
+
+-#: gtk/gtkmenutoolbutton.c:232 gtk/gtkoptionmenu.c:161
++#: ../gtk/gtkmenutoolbutton.c:232
++#: ../gtk/gtkoptionmenu.c:161
+ msgid "Menu"
+ msgstr "Meni"
+
+-#: gtk/gtkmenutoolbutton.c:233
++#: ../gtk/gtkmenutoolbutton.c:233
+ msgid "The dropdown menu"
+ msgstr "Spustni meni"
+
+-#: gtk/gtkmessagedialog.c:98
++#: ../gtk/gtkmessagedialog.c:98
+ msgid "Image/label border"
+ msgstr "Rob slike/oznake"
+
+-#: gtk/gtkmessagedialog.c:99
++#: ../gtk/gtkmessagedialog.c:99
+ msgid "Width of border around the label and image in the message dialog"
+ msgstr "Širina robu okoli oznake in slike v pogovornem oknu"
+
+-#: gtk/gtkmessagedialog.c:114
++#: ../gtk/gtkmessagedialog.c:114
+ msgid "Use separator"
+ msgstr "Uporabi ločilnik"
+
+-#: gtk/gtkmessagedialog.c:115
+-msgid ""
+-"Whether to put a separator between the message dialog's text and the buttons"
++#: ../gtk/gtkmessagedialog.c:115
++msgid "Whether to put a separator between the message dialog's text and the buttons"
+ msgstr "Ali naj bo vstavljen ločilnik med sporočilo besedila okna in gumbi"
+
+-#: gtk/gtkmessagedialog.c:128
++#: ../gtk/gtkmessagedialog.c:128
+ msgid "Message Type"
+ msgstr "Vrsta sporočila"
+
+-#: gtk/gtkmessagedialog.c:129
++#: ../gtk/gtkmessagedialog.c:129
+ msgid "The type of message"
+ msgstr "Vrsta sporočila"
+
+-#: gtk/gtkmessagedialog.c:136
++#: ../gtk/gtkmessagedialog.c:136
+ msgid "Message Buttons"
+ msgstr "Gumbi sporočila"
+
+-#: gtk/gtkmessagedialog.c:137
++#: ../gtk/gtkmessagedialog.c:137
+ msgid "The buttons shown in the message dialog"
+ msgstr "Gumbi, ki se pokažejo v oknu sporočila"
+
+-#: gtk/gtkmessagedialog.c:154
++#: ../gtk/gtkmessagedialog.c:154
+ msgid "The primary text of the message dialog"
+ msgstr "Primarno besedilo pogovornega okna sporočila"
+
+-#: gtk/gtkmessagedialog.c:169
++#: ../gtk/gtkmessagedialog.c:169
+ msgid "Use Markup"
+ msgstr "Uporabi označevanje"
+
+-#: gtk/gtkmessagedialog.c:170
++#: ../gtk/gtkmessagedialog.c:170
+ msgid "The primary text of the title includes Pango markup."
+ msgstr "Osnovno besedilo naslova vsebuje oznake Pango."
+
+-#: gtk/gtkmessagedialog.c:184
++#: ../gtk/gtkmessagedialog.c:184
+ msgid "Secondary Text"
+ msgstr "Dodatno besedilo"
+
+-#: gtk/gtkmessagedialog.c:185
++#: ../gtk/gtkmessagedialog.c:185
+ msgid "The secondary text of the message dialog"
+ msgstr "Dodatno besedilo okna s sporočilom"
+
+-#: gtk/gtkmessagedialog.c:200
++#: ../gtk/gtkmessagedialog.c:200
+ msgid "Use Markup in secondary"
+ msgstr "Uporabi označevanje v dodatnem besedilu"
+
+-#: gtk/gtkmessagedialog.c:201
++#: ../gtk/gtkmessagedialog.c:201
+ msgid "The secondary text includes Pango markup."
+ msgstr "Dodatno besedilo naslova vsebuje oznake Pango."
+
+-#: gtk/gtkmessagedialog.c:216
++#: ../gtk/gtkmessagedialog.c:216
+ msgid "The image"
+ msgstr "Slika"
+
+-#: gtk/gtkmisc.c:83
++#: ../gtk/gtkmisc.c:83
+ msgid "Y align"
+ msgstr "Poravnava Y"
+
+-#: gtk/gtkmisc.c:84
++#: ../gtk/gtkmisc.c:84
+ msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
+ msgstr "Navpična poravnava, od 0 (zgoraj) do 1 (spodaj)"
+
+-#: gtk/gtkmisc.c:93
++#: ../gtk/gtkmisc.c:93
+ msgid "X pad"
+ msgstr "Polnenje X"
+
+-#: gtk/gtkmisc.c:94
+-msgid ""
+-"The amount of space to add on the left and right of the widget, in pixels"
+-msgstr ""
+-"Količina prostora, ki naj se doda na levo in desno stran gradnika, v "
+-"slikovnih točkah"
++#: ../gtk/gtkmisc.c:94
++msgid "The amount of space to add on the left and right of the widget, in pixels"
++msgstr "Količina prostora, ki naj se doda na levo in desno stran gradnika, v slikovnih točkah"
+
+-#: gtk/gtkmisc.c:103
++#: ../gtk/gtkmisc.c:103
+ msgid "Y pad"
+ msgstr "Polnenje Y"
+
+-#: gtk/gtkmisc.c:104
+-msgid ""
+-"The amount of space to add on the top and bottom of the widget, in pixels"
+-msgstr ""
+-"Količina prostora, ki naj se doda na zgornjo in spodnjo stran gradnika, v "
+-"slikovnih točkah"
++#: ../gtk/gtkmisc.c:104
++msgid "The amount of space to add on the top and bottom of the widget, in pixels"
++msgstr "Količina prostora, ki naj se doda na zgornjo in spodnjo stran gradnika, v slikovnih točkah"
+
+-#: gtk/gtkmountoperation.c:160
++#: ../gtk/gtkmountoperation.c:160
+ msgid "Parent"
+ msgstr "Nadrejeni"
+
+-#: gtk/gtkmountoperation.c:161
++#: ../gtk/gtkmountoperation.c:161
+ msgid "The parent window"
+ msgstr "Nadrejeno okno"
+
+-#: gtk/gtkmountoperation.c:168
++#: ../gtk/gtkmountoperation.c:168
+ msgid "Is Showing"
+ msgstr "Je prikazan"
+
+-#: gtk/gtkmountoperation.c:169
++#: ../gtk/gtkmountoperation.c:169
+ msgid "Are we showing a dialog"
+ msgstr "Ali je prikazano pogovorno okno"
+
+-#: gtk/gtkmountoperation.c:177
++#: ../gtk/gtkmountoperation.c:177
+ msgid "The screen where this window will be displayed."
+ msgstr "Zaslon na katerem bo prikazano to okno."
+
+-#: gtk/gtknotebook.c:577
++#: ../gtk/gtknotebook.c:577
+ msgid "Page"
+ msgstr "Stran"
+
+-#: gtk/gtknotebook.c:578
++#: ../gtk/gtknotebook.c:578
+ msgid "The index of the current page"
+ msgstr "Kazalo trenutne strani"
+
+-#: gtk/gtknotebook.c:586
++#: ../gtk/gtknotebook.c:586
+ msgid "Tab Position"
+ msgstr "Položaj zavihka"
+
+-#: gtk/gtknotebook.c:587
++#: ../gtk/gtknotebook.c:587
+ msgid "Which side of the notebook holds the tabs"
+ msgstr "Na kateri strani notesa so zavihki"
+
+-#: gtk/gtknotebook.c:594
++#: ../gtk/gtknotebook.c:594
+ msgid "Tab Border"
+ msgstr "Rob zavihka"
+
+-#: gtk/gtknotebook.c:595
++#: ../gtk/gtknotebook.c:595
+ msgid "Width of the border around the tab labels"
+ msgstr "Širina robu okoli oznake zavihka"
+
+-#: gtk/gtknotebook.c:603
++#: ../gtk/gtknotebook.c:603
+ msgid "Horizontal Tab Border"
+ msgstr "Vodoravni rob okoli zavihka"
+
+-#: gtk/gtknotebook.c:604
++#: ../gtk/gtknotebook.c:604
+ msgid "Width of the horizontal border of tab labels"
+ msgstr "Širina vodoravnega robu okoli zavihka"
+
+-#: gtk/gtknotebook.c:612
++#: ../gtk/gtknotebook.c:612
+ msgid "Vertical Tab Border"
+ msgstr "Navpični rob okoli zavihka"
+
+-#: gtk/gtknotebook.c:613
++#: ../gtk/gtknotebook.c:613
+ msgid "Width of the vertical border of tab labels"
+ msgstr "Širina navpičnega robu okoli zavihka"
+
+-#: gtk/gtknotebook.c:621
++#: ../gtk/gtknotebook.c:621
+ msgid "Show Tabs"
+ msgstr "Pokaži zavihke"
+
+-#: gtk/gtknotebook.c:622
++#: ../gtk/gtknotebook.c:622
+ msgid "Whether tabs should be shown or not"
+ msgstr "Ali naj bodo zavihki prikazani ali ne"
+
+-#: gtk/gtknotebook.c:628
++#: ../gtk/gtknotebook.c:628
+ msgid "Show Border"
+ msgstr "Pokaži rob"
+
+-#: gtk/gtknotebook.c:629
++#: ../gtk/gtknotebook.c:629
+ msgid "Whether the border should be shown or not"
+ msgstr "Ali naj bo rob prikazan ali ne"
+
+-#: gtk/gtknotebook.c:635
++#: ../gtk/gtknotebook.c:635
+ msgid "Scrollable"
+ msgstr "Drsljivo"
+
+-#: gtk/gtknotebook.c:636
++#: ../gtk/gtknotebook.c:636
+ msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
+-msgstr ""
+-"Izbrana možnost omogoča, da se ob prevelikem številu zavihkov za prikaz "
+-"dodajo drsne puščice"
++msgstr "Izbrana možnost omogoča, da se ob prevelikem številu zavihkov za prikaz dodajo drsne puščice"
+
+-#: gtk/gtknotebook.c:642
++#: ../gtk/gtknotebook.c:642
+ msgid "Enable Popup"
+ msgstr "Vključi pojavni meni"
+
+-#: gtk/gtknotebook.c:643
+-msgid ""
+-"If TRUE, pressing the right mouse button on the notebook pops up a menu that "
+-"you can use to go to a page"
+-msgstr ""
+-"Izbrana možnost omogoča, da se ob pritisku na desni miškin gumb nad "
+-"beležnico prikaže meni, ki se lahko uporabi za dostop do strani"
++#: ../gtk/gtknotebook.c:643
++msgid "If TRUE, pressing the right mouse button on the notebook pops up a menu that you can use to go to a page"
++msgstr "Izbrana možnost omogoča, da se ob pritisku na desni miškin gumb nad beležnico prikaže meni, ki se lahko uporabi za dostop do strani"
+
+-#: gtk/gtknotebook.c:650
++#: ../gtk/gtknotebook.c:650
+ msgid "Whether tabs should have homogeneous sizes"
+ msgstr "Ali naj imajo vsi zavihki enako velikost"
+
+-#: gtk/gtknotebook.c:656
++#: ../gtk/gtknotebook.c:656
+ msgid "Group ID"
+ msgstr "ID skupine"
+
+-#: gtk/gtknotebook.c:657
++#: ../gtk/gtknotebook.c:657
+ msgid "Group ID for tabs drag and drop"
+ msgstr "Skupinski ID za povleci-in-spusti zavihkov"
+
+-#: gtk/gtknotebook.c:673 gtk/gtkradioaction.c:128 gtk/gtkradiobutton.c:82
+-#: gtk/gtkradiomenuitem.c:342 gtk/gtkradiotoolbutton.c:65
++#: ../gtk/gtknotebook.c:673
++#: ../gtk/gtkradioaction.c:128
++#: ../gtk/gtkradiobutton.c:82
++#: ../gtk/gtkradiomenuitem.c:342
++#: ../gtk/gtkradiotoolbutton.c:65
+ msgid "Group"
+ msgstr "Skupina"
+
+-#: gtk/gtknotebook.c:674
++#: ../gtk/gtknotebook.c:674
+ msgid "Group for tabs drag and drop"
+ msgstr "Skupina za povleci-in-spusti zavihkov"
+
+-#: gtk/gtknotebook.c:680
++#: ../gtk/gtknotebook.c:680
+ msgid "Tab label"
+ msgstr "Oznaka zavihka"
+
+-#: gtk/gtknotebook.c:681
++#: ../gtk/gtknotebook.c:681
+ msgid "The string displayed on the child's tab label"
+ msgstr "Niz prikazan v oznaki zavihka podrejenega predmeta"
+
+-#: gtk/gtknotebook.c:687
++#: ../gtk/gtknotebook.c:687
+ msgid "Menu label"
+ msgstr "Oznaka menija"
+
+-#: gtk/gtknotebook.c:688
++#: ../gtk/gtknotebook.c:688
+ msgid "The string displayed in the child's menu entry"
+ msgstr "Niz prikazan v meniju podrejenega predmeta"
+
+-#: gtk/gtknotebook.c:701
++#: ../gtk/gtknotebook.c:701
+ msgid "Tab expand"
+ msgstr "Razširitev zavihkov"
+
+-#: gtk/gtknotebook.c:702
++#: ../gtk/gtknotebook.c:702
+ msgid "Whether to expand the child's tab or not"
+ msgstr "Ali naj se razširi zavihek podrejenega predmeta"
+
+-#: gtk/gtknotebook.c:708
++#: ../gtk/gtknotebook.c:708
+ msgid "Tab fill"
+ msgstr "Polnjenje zavihka"
+
+-#: gtk/gtknotebook.c:709
++#: ../gtk/gtknotebook.c:709
+ msgid "Whether the child's tab should fill the allocated area or not"
+-msgstr ""
+-"Ali naj zavihek podrejenega predmeta napolni celotno rezervirano površino"
++msgstr "Ali naj zavihek podrejenega predmeta napolni celotno rezervirano površino"
+
+-#: gtk/gtknotebook.c:715
++#: ../gtk/gtknotebook.c:715
+ msgid "Tab pack type"
+ msgstr "Način zlaganja zavihkov"
+
+-#: gtk/gtknotebook.c:722
++#: ../gtk/gtknotebook.c:722
+ msgid "Tab reorderable"
+ msgstr "Razvrstljiv zavihek"
+
+-#: gtk/gtknotebook.c:723
++#: ../gtk/gtknotebook.c:723
+ msgid "Whether the tab is reorderable by user action or not"
+ msgstr "Ali naj bo zavihek mogoče prerazvrstiti z dejanjem uporabnika."
+
+-#: gtk/gtknotebook.c:729
++#: ../gtk/gtknotebook.c:729
+ msgid "Tab detachable"
+ msgstr "Odstranljiv zavihek"
+
+-#: gtk/gtknotebook.c:730
++#: ../gtk/gtknotebook.c:730
+ msgid "Whether the tab is detachable"
+ msgstr "Ali je zavihek mogoče odstraniti"
+
+-#: gtk/gtknotebook.c:745 gtk/gtkscrollbar.c:83
++#: ../gtk/gtknotebook.c:745
++#: ../gtk/gtkscrollbar.c:83
+ msgid "Secondary backward stepper"
+ msgstr "Drugotni koračnik nazaj"
+
+-#: gtk/gtknotebook.c:746
+-msgid ""
+-"Display a second backward arrow button on the opposite end of the tab area"
++#: ../gtk/gtknotebook.c:746
++msgid "Display a second backward arrow button on the opposite end of the tab area"
+ msgstr "Pokaži gumb za drugi korak nazaj na nasprotnem koncu zavihka"
+
+-#: gtk/gtknotebook.c:761 gtk/gtkscrollbar.c:91
++#: ../gtk/gtknotebook.c:761
++#: ../gtk/gtkscrollbar.c:91
+ msgid "Secondary forward stepper"
+ msgstr "Drugotnii koračnik naprej"
+
+-#: gtk/gtknotebook.c:762
+-msgid ""
+-"Display a second forward arrow button on the opposite end of the tab area"
++#: ../gtk/gtknotebook.c:762
++msgid "Display a second forward arrow button on the opposite end of the tab area"
+ msgstr "Pokaži gumb za drugi korak naprej na nasprotnem koncu zavihka"
+
+-#: gtk/gtknotebook.c:776 gtk/gtkscrollbar.c:67
++#: ../gtk/gtknotebook.c:776
++#: ../gtk/gtkscrollbar.c:67
+ msgid "Backward stepper"
+ msgstr "Koračnik nazaj"
+
+-#: gtk/gtknotebook.c:777 gtk/gtkscrollbar.c:68
++#: ../gtk/gtknotebook.c:777
++#: ../gtk/gtkscrollbar.c:68
+ msgid "Display the standard backward arrow button"
+ msgstr "Pokaži običajni gumb z puščico za nazaj"
+
+-#: gtk/gtknotebook.c:791 gtk/gtkscrollbar.c:75
++#: ../gtk/gtknotebook.c:791
++#: ../gtk/gtkscrollbar.c:75
+ msgid "Forward stepper"
+ msgstr "Koračnik naprej"
+
+-#: gtk/gtknotebook.c:792 gtk/gtkscrollbar.c:76
++#: ../gtk/gtknotebook.c:792
++#: ../gtk/gtkscrollbar.c:76
+ msgid "Display the standard forward arrow button"
+ msgstr "Pokaži običajni gumb s puščico za naprej"
+
+-#: gtk/gtknotebook.c:806
++#: ../gtk/gtknotebook.c:806
+ msgid "Tab overlap"
+ msgstr "Prekrivanje zavihkov"
+
+-#: gtk/gtknotebook.c:807
++#: ../gtk/gtknotebook.c:807
+ msgid "Size of tab overlap area"
+ msgstr "Velikost področja prekrivanja zavihkov"
+
+-#: gtk/gtknotebook.c:822
++#: ../gtk/gtknotebook.c:822
+ msgid "Tab curvature"
+ msgstr "Ukrivljenost zavihka"
+
+-#: gtk/gtknotebook.c:823
++#: ../gtk/gtknotebook.c:823
+ msgid "Size of tab curvature"
+ msgstr "Velikost ukrivljenosti zavihka"
+
+-#: gtk/gtknotebook.c:839
++#: ../gtk/gtknotebook.c:839
+ msgid "Arrow spacing"
+ msgstr "Razmik puščic"
+
+-#: gtk/gtknotebook.c:840
++#: ../gtk/gtknotebook.c:840
+ msgid "Scroll arrow spacing"
+ msgstr "Razmik drsne puščice"
+
+-#: gtk/gtkobject.c:370
++#: ../gtk/gtkobject.c:370
+ msgid "User Data"
+ msgstr "Uporabniški podatki"
+
+-#: gtk/gtkobject.c:371
++#: ../gtk/gtkobject.c:371
+ msgid "Anonymous User Data Pointer"
+ msgstr "Podatkovni kazalec anonimnega uporabnika"
+
+-#: gtk/gtkoptionmenu.c:162
++#: ../gtk/gtkoptionmenu.c:162
+ msgid "The menu of options"
+ msgstr "Meni možnosti"
+
+-#: gtk/gtkoptionmenu.c:169
++#: ../gtk/gtkoptionmenu.c:169
+ msgid "Size of dropdown indicator"
+ msgstr "Velikost kazalca za spusitev"
+
+-#: gtk/gtkoptionmenu.c:175
++#: ../gtk/gtkoptionmenu.c:175
+ msgid "Spacing around indicator"
+ msgstr "Prostor okoli kazalca"
+
+-#: gtk/gtkpaned.c:219
+-msgid ""
+-"Position of paned separator in pixels (0 means all the way to the left/top)"
++#: ../gtk/gtkpaned.c:219
++msgid "Position of paned separator in pixels (0 means all the way to the left/top)"
+ msgstr "Položaj ločnice v točkah (0 pomeni popolnoma na levi/na vrhu)"
+
+-#: gtk/gtkpaned.c:227
++#: ../gtk/gtkpaned.c:227
+ msgid "Position Set"
+ msgstr "Nastavi položaj"
+
+-#: gtk/gtkpaned.c:228
++#: ../gtk/gtkpaned.c:228
+ msgid "TRUE if the Position property should be used"
+ msgstr "Izbrana možnost omogoča, da se uporabi lastnost lege."
+
+-#: gtk/gtkpaned.c:234
++#: ../gtk/gtkpaned.c:234
+ msgid "Handle Size"
+ msgstr "Velikost ročice"
+
+-#: gtk/gtkpaned.c:235
++#: ../gtk/gtkpaned.c:235
+ msgid "Width of handle"
+ msgstr "Širina ročice"
+
+-#: gtk/gtkpaned.c:251
++#: ../gtk/gtkpaned.c:251
+ msgid "Minimal Position"
+ msgstr "Najmanjši položaj"
+
+-#: gtk/gtkpaned.c:252
++#: ../gtk/gtkpaned.c:252
+ msgid "Smallest possible value for the \"position\" property"
+ msgstr "Najnižja možna vrednost za lastnost \"položaj\" (\"position\")"
+
+-#: gtk/gtkpaned.c:269
++#: ../gtk/gtkpaned.c:269
+ msgid "Maximal Position"
+ msgstr "Največji položaj"
+
+-#: gtk/gtkpaned.c:270
++#: ../gtk/gtkpaned.c:270
+ msgid "Largest possible value for the \"position\" property"
+ msgstr "Najvišja možna vrednost za lastnost \"položaj\" (\"position\")"
+
+-#: gtk/gtkpaned.c:287
++#: ../gtk/gtkpaned.c:287
+ msgid "Resize"
+ msgstr "Spremeni velikost"
+
+-#: gtk/gtkpaned.c:288
++#: ../gtk/gtkpaned.c:288
+ msgid "If TRUE, the child expands and shrinks along with the paned widget"
+-msgstr ""
+-"Izbrana možnost omogoča, da se podrejeni proces širi skupaj z gradnikom"
++msgstr "Izbrana možnost omogoča, da se podrejeni proces širi skupaj z gradnikom"
+
+-#: gtk/gtkpaned.c:303
++#: ../gtk/gtkpaned.c:303
+ msgid "Shrink"
+ msgstr "Skrči"
+
+-#: gtk/gtkpaned.c:304
++#: ../gtk/gtkpaned.c:304
+ msgid "If TRUE, the child can be made smaller than its requisition"
+ msgstr "Izbrana možnost omogoča, da je podrejeni proces manjši kot nujno"
+
+-#: gtk/gtkplug.c:150 gtk/gtkstatusicon.c:285
++#: ../gtk/gtkplug.c:150
++#: ../gtk/gtkstatusicon.c:285
+ msgid "Embedded"
+ msgstr "Vstavljeno"
+
+-#: gtk/gtkplug.c:151
++#: ../gtk/gtkplug.c:151
+ msgid "Whether or not the plug is embedded"
+ msgstr "Ali je priklop vstavljen"
+
+-#: gtk/gtkplug.c:165
++#: ../gtk/gtkplug.c:165
+ msgid "Socket Window"
+ msgstr "Okno vtiča"
+
+-#: gtk/gtkplug.c:166
++#: ../gtk/gtkplug.c:166
+ msgid "The window of the socket the plug is embedded in"
+ msgstr "Okno vtiča v katerega je vstavljen vtič"
+
+-#: gtk/gtkpreview.c:102
+-msgid ""
+-"Whether the preview widget should take up the entire space it is allocated"
++#: ../gtk/gtkpreview.c:102
++msgid "Whether the preview widget should take up the entire space it is allocated"
+ msgstr "Ali naj gradnik predogleda zavzame celoten prostor, ko je ustvarjen"
+
+-#: gtk/gtkprinter.c:124
++#: ../gtk/gtkprinter.c:124
+ msgid "Name of the printer"
+ msgstr "Ime tiskalnika"
+
+-#: gtk/gtkprinter.c:130
++#: ../gtk/gtkprinter.c:130
+ msgid "Backend"
+ msgstr "Hrbtenica"
+
+-#: gtk/gtkprinter.c:131
++#: ../gtk/gtkprinter.c:131
+ msgid "Backend for the printer"
+ msgstr "Hrbtenica za tiskalnik"
+
+-#: gtk/gtkprinter.c:137
++#: ../gtk/gtkprinter.c:137
+ msgid "Is Virtual"
+ msgstr "Je navidezna"
+
+-#: gtk/gtkprinter.c:138
++#: ../gtk/gtkprinter.c:138
+ msgid "FALSE if this represents a real hardware printer"
+ msgstr "NERESNIČNO (FALSE), če predstavlja resnični fizični tiskalnik"
+
+-#: gtk/gtkprinter.c:144
++#: ../gtk/gtkprinter.c:144
+ msgid "Accepts PDF"
+ msgstr "Sprejema PDF"
+
+-#: gtk/gtkprinter.c:145
++#: ../gtk/gtkprinter.c:145
+ msgid "TRUE if this printer can accept PDF"
+ msgstr "RESNIČNO (TRUE), če ta tiskalnik lahko sprejme PDF"
+
+-#: gtk/gtkprinter.c:151
++#: ../gtk/gtkprinter.c:151
+ msgid "Accepts PostScript"
+ msgstr "Sprejema PostScript"
+
+-#: gtk/gtkprinter.c:152
++#: ../gtk/gtkprinter.c:152
+ msgid "TRUE if this printer can accept PostScript"
+ msgstr "RESNIČNO (TRUE), če ta tiskalnik lahko sprejme PostScript"
+
+-#: gtk/gtkprinter.c:158
++#: ../gtk/gtkprinter.c:158
+ msgid "State Message"
+ msgstr "Sporočilo stanja"
+
+-#: gtk/gtkprinter.c:159
++#: ../gtk/gtkprinter.c:159
+ msgid "String giving the current state of the printer"
+ msgstr "Niz, ki podaja trenutno stanje tiskalnika"
+
+-#: gtk/gtkprinter.c:165
++#: ../gtk/gtkprinter.c:165
+ msgid "Location"
+ msgstr "Mesto"
+
+-#: gtk/gtkprinter.c:166
++#: ../gtk/gtkprinter.c:166
+ msgid "The location of the printer"
+ msgstr "Mesto tiskalnika"
+
+-#: gtk/gtkprinter.c:173
++#: ../gtk/gtkprinter.c:173
+ msgid "The icon name to use for the printer"
+ msgstr "Ime ikone, ki naj se uporabi za tiskalnik"
+
+-#: gtk/gtkprinter.c:179
++#: ../gtk/gtkprinter.c:179
+ msgid "Job Count"
+ msgstr "Štetje opravil"
+
+-#: gtk/gtkprinter.c:180
++#: ../gtk/gtkprinter.c:180
+ msgid "Number of jobs queued in the printer"
+ msgstr "Število opravil, ki čakajo na tiskalnik"
+
+-#: gtk/gtkprinter.c:198
++#: ../gtk/gtkprinter.c:198
+ msgid "Paused Printer"
+ msgstr "Zaustavljen tiskalnik"
+
+-#: gtk/gtkprinter.c:199
++#: ../gtk/gtkprinter.c:199
+ msgid "TRUE if this printer is paused"
+ msgstr "Drži, če je tiskalnik nedejaven"
+
+-#: gtk/gtkprinter.c:212
++#: ../gtk/gtkprinter.c:212
+ msgid "Accepting Jobs"
+ msgstr "Sprejemanje opravil"
+
+-#: gtk/gtkprinter.c:213
++#: ../gtk/gtkprinter.c:213
+ msgid "TRUE if this printer is accepting new jobs"
+ msgstr "Drži, če tiskalnik lahko sprejme nove naloge"
+
+-#: gtk/gtkprinteroptionwidget.c:123
++#: ../gtk/gtkprinteroptionwidget.c:123
+ msgid "Source option"
+ msgstr "Izvorne možnosti"
+
+-#: gtk/gtkprinteroptionwidget.c:124
++#: ../gtk/gtkprinteroptionwidget.c:124
+ msgid "The PrinterOption backing this widget"
+ msgstr "PrinterOption, ki podpira ta gradnik"
+
+-#: gtk/gtkprintjob.c:117
++#: ../gtk/gtkprintjob.c:117
+ msgid "Title of the print job"
+ msgstr "Naziv tiskalniškega opravila"
+
+-#: gtk/gtkprintjob.c:125
++#: ../gtk/gtkprintjob.c:125
+ msgid "Printer"
+ msgstr "Tiskalnik"
+
+-#: gtk/gtkprintjob.c:126
++#: ../gtk/gtkprintjob.c:126
+ msgid "Printer to print the job to"
+ msgstr "Tiskalnik za tiskanje opravila"
+
+-#: gtk/gtkprintjob.c:134
++#: ../gtk/gtkprintjob.c:134
+ msgid "Settings"
+ msgstr "Nastavitve"
+
+-#: gtk/gtkprintjob.c:135
++#: ../gtk/gtkprintjob.c:135
+ msgid "Printer settings"
+ msgstr "Nastavitve tiskalnika"
+
+-#: gtk/gtkprintjob.c:143 gtk/gtkprintjob.c:144 gtk/gtkprintunixdialog.c:258
++#: ../gtk/gtkprintjob.c:143
++#: ../gtk/gtkprintjob.c:144
++#: ../gtk/gtkprintunixdialog.c:258
+ msgid "Page Setup"
+ msgstr "Nastavitev strani"
+
+-#: gtk/gtkprintjob.c:152 gtk/gtkprintoperation.c:1013
++#: ../gtk/gtkprintjob.c:152
++#: ../gtk/gtkprintoperation.c:1013
+ msgid "Track Print Status"
+ msgstr "Spremljaj stanje tiskalnika"
+
+-#: gtk/gtkprintjob.c:153
+-msgid ""
+-"TRUE if the print job will continue to emit status-changed signals after the "
+-"print data has been sent to the printer or print server."
+-msgstr ""
+-"Izbrana možnost omogoča, da se bodo naloge tiskanja nadaljevale po tem, ko "
+-"so bili podatki poslani na strežnik tiskanja ali na tiskalnik."
++#: ../gtk/gtkprintjob.c:153
++msgid "TRUE if the print job will continue to emit status-changed signals after the print data has been sent to the printer or print server."
++msgstr "Izbrana možnost omogoča, da se bodo naloge tiskanja nadaljevale po tem, ko so bili podatki poslani na strežnik tiskanja ali na tiskalnik."
+
+-#: gtk/gtkprintoperation.c:885
++#: ../gtk/gtkprintoperation.c:885
+ msgid "Default Page Setup"
+ msgstr "Privzeta nastavitev strani"
+
+-#: gtk/gtkprintoperation.c:886
++#: ../gtk/gtkprintoperation.c:886
+ msgid "The GtkPageSetup used by default"
+ msgstr "Privzeto uporabljeni GtkPageSetup"
+
+-#: gtk/gtkprintoperation.c:904 gtk/gtkprintunixdialog.c:276
++#: ../gtk/gtkprintoperation.c:904
++#: ../gtk/gtkprintunixdialog.c:276
+ msgid "Print Settings"
+ msgstr "Nastavitve tiskanja"
+
+-#: gtk/gtkprintoperation.c:905 gtk/gtkprintunixdialog.c:277
++#: ../gtk/gtkprintoperation.c:905
++#: ../gtk/gtkprintunixdialog.c:277
+ msgid "The GtkPrintSettings used for initializing the dialog"
+ msgstr "GtkPrintSettings za zagon okna"
+
+-#: gtk/gtkprintoperation.c:923
++#: ../gtk/gtkprintoperation.c:923
+ msgid "Job Name"
+ msgstr "Ime opravila"
+
+-#: gtk/gtkprintoperation.c:924
++#: ../gtk/gtkprintoperation.c:924
+ msgid "A string used for identifying the print job."
+ msgstr "Niz, uporabljen za določevanje opravila tiskanja."
+
+-#: gtk/gtkprintoperation.c:948
++#: ../gtk/gtkprintoperation.c:948
+ msgid "Number of Pages"
+ msgstr "Število strani"
+
+-#: gtk/gtkprintoperation.c:949
++#: ../gtk/gtkprintoperation.c:949
+ msgid "The number of pages in the document."
+ msgstr "Število strani v dokumentu."
+
+-#: gtk/gtkprintoperation.c:970 gtk/gtkprintunixdialog.c:266
++#: ../gtk/gtkprintoperation.c:970
++#: ../gtk/gtkprintunixdialog.c:266
+ msgid "Current Page"
+ msgstr "Trenutna stran"
+
+-#: gtk/gtkprintoperation.c:971 gtk/gtkprintunixdialog.c:267
++#: ../gtk/gtkprintoperation.c:971
++#: ../gtk/gtkprintunixdialog.c:267
+ msgid "The current page in the document"
+ msgstr "Trenutna stran v dokumentu"
+
+-#: gtk/gtkprintoperation.c:992
++#: ../gtk/gtkprintoperation.c:992
+ msgid "Use full page"
+ msgstr "Uporabi celo stran"
+
+-#: gtk/gtkprintoperation.c:993
+-msgid ""
+-"TRUE if the origin of the context should be at the corner of the page and "
+-"not the corner of the imageable area"
+-msgstr ""
+-"Izbrana možnost omogoča, da je vir vsebine na robu strani in ne na robu "
+-"slikovnega območja."
++#: ../gtk/gtkprintoperation.c:993
++msgid "TRUE if the origin of the context should be at the corner of the page and not the corner of the imageable area"
++msgstr "Izbrana možnost omogoča, da je vir vsebine na robu strani in ne na robu slikovnega območja."
+
+-#: gtk/gtkprintoperation.c:1014
+-msgid ""
+-"TRUE if the print operation will continue to report on the print job status "
+-"after the print data has been sent to the printer or print server."
+-msgstr ""
+-"Izbrana možnost omogoča, da naloge tiskanja poročajo o stanju po tem, ko so "
+-"bili podatki poslani na strežnik tiskanja ali na tiskalnik."
++#: ../gtk/gtkprintoperation.c:1014
++msgid "TRUE if the print operation will continue to report on the print job status after the print data has been sent to the printer or print server."
++msgstr "Izbrana možnost omogoča, da naloge tiskanja poročajo o stanju po tem, ko so bili podatki poslani na strežnik tiskanja ali na tiskalnik."
+
+-#: gtk/gtkprintoperation.c:1031
++#: ../gtk/gtkprintoperation.c:1031
+ msgid "Unit"
+ msgstr "Enota"
+
+-#: gtk/gtkprintoperation.c:1032
++#: ../gtk/gtkprintoperation.c:1032
+ msgid "The unit in which distances can be measured in the context"
+ msgstr "Enote, v katerih so izmerjene razdalje vsebine"
+
+-#: gtk/gtkprintoperation.c:1049
++#: ../gtk/gtkprintoperation.c:1049
+ msgid "Show Dialog"
+ msgstr "Pokaži pogovorno okno"
+
+-#: gtk/gtkprintoperation.c:1050
++#: ../gtk/gtkprintoperation.c:1050
+ msgid "TRUE if a progress dialog is shown while printing."
+ msgstr "RESNIČNO (TRUE), če naj bo med tiskanjem prikazano okno napredka."
+
+-#: gtk/gtkprintoperation.c:1073
++#: ../gtk/gtkprintoperation.c:1073
+ msgid "Allow Async"
+ msgstr "Dovoli asinhronost"
+
+-#: gtk/gtkprintoperation.c:1074
++#: ../gtk/gtkprintoperation.c:1074
+ msgid "TRUE if print process may run asynchronous."
+ msgstr "RESNIČNO (TRUE), če lahko proces tiskanja poteka asinhrono."
+
+-#: gtk/gtkprintoperation.c:1096 gtk/gtkprintoperation.c:1097
++#: ../gtk/gtkprintoperation.c:1096
++#: ../gtk/gtkprintoperation.c:1097
+ msgid "Export filename"
+ msgstr "Izvozi ime datoteke"
+
+-#: gtk/gtkprintoperation.c:1111
++#: ../gtk/gtkprintoperation.c:1111
+ msgid "Status"
+ msgstr "Stanje"
+
+-#: gtk/gtkprintoperation.c:1112
++#: ../gtk/gtkprintoperation.c:1112
+ msgid "The status of the print operation"
+ msgstr "Stanje operacije tiskanja"
+
+-#: gtk/gtkprintoperation.c:1132
++#: ../gtk/gtkprintoperation.c:1132
+ msgid "Status String"
+ msgstr "Niz stanja"
+
+-#: gtk/gtkprintoperation.c:1133
++#: ../gtk/gtkprintoperation.c:1133
+ msgid "A human-readable description of the status"
+ msgstr "Berljiv opis stanja"
+
+-#: gtk/gtkprintoperation.c:1151
++#: ../gtk/gtkprintoperation.c:1151
+ msgid "Custom tab label"
+ msgstr "Poljubna oznaka zavihka"
+
+-#: gtk/gtkprintoperation.c:1152
++#: ../gtk/gtkprintoperation.c:1152
+ msgid "Label for the tab containing custom widgets."
+ msgstr "Oznaka za zavihek, ki vsebuje gradnike po meri"
+
+-#: gtk/gtkprintunixdialog.c:259
++#: ../gtk/gtkprintunixdialog.c:259
+ msgid "The GtkPageSetup to use"
+ msgstr "GtkPageSetup, ki naj bo uporabljen"
+
+-#: gtk/gtkprintunixdialog.c:284
++#: ../gtk/gtkprintunixdialog.c:284
+ msgid "Selected Printer"
+ msgstr "Izbrani tiskalnik"
+
+-#: gtk/gtkprintunixdialog.c:285
++#: ../gtk/gtkprintunixdialog.c:285
+ msgid "The GtkPrinter which is selected"
+ msgstr "GtkPrinter, ki je izbran"
+
+-#: gtk/gtkprogress.c:102
++#: ../gtk/gtkprogress.c:102
+ msgid "Activity mode"
+ msgstr "Aktivni način"
+
+-#: gtk/gtkprogress.c:103
+-msgid ""
+-"If TRUE, the GtkProgress is in activity mode, meaning that it signals "
+-"something is happening, but not how much of the activity is finished. This "
+-"is used when you're doing something but don't know how long it will take."
+-msgstr ""
+-"Izbrana možnost omogoča, da je GtkProgress v dejavnem načinu, kar pomeni, da "
+-"obvešča o tem, da se nekaj dogaja, vendar ne pove koliko opravila je "
+-"dokončanega. To je uporabno, ko počnete nekaj za kar ne veste kako dolgo bo "
+-"trajalo."
++#: ../gtk/gtkprogress.c:103
++msgid "If TRUE, the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something but don't know how long it will take."
++msgstr "Izbrana možnost omogoča, da je GtkProgress v dejavnem načinu, kar pomeni, da obvešča o tem, da se nekaj dogaja, vendar ne pove koliko opravila je dokončanega. To je uporabno, ko počnete nekaj za kar ne veste kako dolgo bo trajalo."
+
+-#: gtk/gtkprogress.c:111
++#: ../gtk/gtkprogress.c:111
+ msgid "Show text"
+ msgstr "Pokaži besedilo"
+
+-#: gtk/gtkprogress.c:112
++#: ../gtk/gtkprogress.c:112
+ msgid "Whether the progress is shown as text."
+ msgstr "Ali je napredek prikazan kot besedilo"
+
+-#: gtk/gtkprogressbar.c:119
++#: ../gtk/gtkprogressbar.c:119
+ msgid "The GtkAdjustment connected to the progress bar (Deprecated)"
+ msgstr "GtkAdjustment povezana z merilnikom napredka (ni več v uporabi)"
+
+-#: gtk/gtkprogressbar.c:135
++#: ../gtk/gtkprogressbar.c:135
+ msgid "Bar style"
+ msgstr "Slog merilnika"
+
+-#: gtk/gtkprogressbar.c:136
++#: ../gtk/gtkprogressbar.c:136
+ msgid "Specifies the visual style of the bar in percentage mode (Deprecated)"
+ msgstr "Določi vizualni slog merilnika v odstotnem načinu (ni več v uporabi)"
+
+-#: gtk/gtkprogressbar.c:144
++#: ../gtk/gtkprogressbar.c:144
+ msgid "Activity Step"
+ msgstr "Korak napredka"
+
+-#: gtk/gtkprogressbar.c:145
++#: ../gtk/gtkprogressbar.c:145
+ msgid "The increment used for each iteration in activity mode (Deprecated)"
+-msgstr ""
+-"Korak povečave, ki se uporabi za vsako ponovitev v dejavnem načinu (ni več v "
+-"uporabi)"
++msgstr "Korak povečave, ki se uporabi za vsako ponovitev v dejavnem načinu (ni več v uporabi)"
+
+-#: gtk/gtkprogressbar.c:152
++#: ../gtk/gtkprogressbar.c:152
+ msgid "Activity Blocks"
+ msgstr "Bloki dejavnosti"
+
+-#: gtk/gtkprogressbar.c:153
+-msgid ""
+-"The number of blocks which can fit in the progress bar area in activity mode "
+-"(Deprecated)"
+-msgstr ""
+-"Število blokov, ki gredo na merilnik napredka v dejavnem načinu (ni več v "
+-"uporabi)"
++#: ../gtk/gtkprogressbar.c:153
++msgid "The number of blocks which can fit in the progress bar area in activity mode (Deprecated)"
++msgstr "Število blokov, ki gredo na merilnik napredka v dejavnem načinu (ni več v uporabi)"
+
+-#: gtk/gtkprogressbar.c:160
++#: ../gtk/gtkprogressbar.c:160
+ msgid "Discrete Blocks"
+ msgstr "Diskretni bloki"
+
+-#: gtk/gtkprogressbar.c:161
+-msgid ""
+-"The number of discrete blocks in a progress bar (when shown in the discrete "
+-"style)"
+-msgstr ""
+-"Število diskretnih blokov v merilniku napredka (kadar je prikaz v diskretnem "
+-"načinu)"
++#: ../gtk/gtkprogressbar.c:161
++msgid "The number of discrete blocks in a progress bar (when shown in the discrete style)"
++msgstr "Število diskretnih blokov v merilniku napredka (kadar je prikaz v diskretnem načinu)"
+
+-#: gtk/gtkprogressbar.c:168
++#: ../gtk/gtkprogressbar.c:168
+ msgid "Fraction"
+ msgstr "Delež"
+
+-#: gtk/gtkprogressbar.c:169
++#: ../gtk/gtkprogressbar.c:169
+ msgid "The fraction of total work that has been completed"
+ msgstr "Delež celotnega dela, ki je bil opravljen"
+
+-#: gtk/gtkprogressbar.c:176
++#: ../gtk/gtkprogressbar.c:176
+ msgid "Pulse Step"
+ msgstr "Korak pulza"
+
+-#: gtk/gtkprogressbar.c:177
++#: ../gtk/gtkprogressbar.c:177
+ msgid "The fraction of total progress to move the bouncing block when pulsed"
+ msgstr "Del celotnega napredka, ki naj premakne poskakujoč blok, ko je izzvan"
+
+-#: gtk/gtkprogressbar.c:185
++#: ../gtk/gtkprogressbar.c:185
+ msgid "Text to be displayed in the progress bar"
+ msgstr "Besedilo, ki bo prikazano v merilniku napredka"
+
+-#: gtk/gtkprogressbar.c:207
+-msgid ""
+-"The preferred place to ellipsize the string, if the progress bar does not "
+-"have enough room to display the entire string, if at all."
+-msgstr ""
+-"Prednostno mesto okrajšanja niza kadar vrstica napredka nima dovolj "
+-"prostora za prikaz celotne niti."
++#: ../gtk/gtkprogressbar.c:207
++msgid "The preferred place to ellipsize the string, if the progress bar does not have enough room to display the entire string, if at all."
++msgstr "Prednostno mesto okrajšanja niza kadar vrstica napredka nima dovolj prostora za prikaz celotne niti."
+
+-#: gtk/gtkprogressbar.c:214
++#: ../gtk/gtkprogressbar.c:214
+ msgid "XSpacing"
+ msgstr "Razmik X"
+
+-#: gtk/gtkprogressbar.c:215
++#: ../gtk/gtkprogressbar.c:215
+ msgid "Extra spacing applied to the width of a progress bar."
+ msgstr "Dodaten razmik določen širini merilnika napredka."
+
+-#: gtk/gtkprogressbar.c:220
++#: ../gtk/gtkprogressbar.c:220
+ msgid "YSpacing"
+ msgstr "Y Razmik"
+
+-#: gtk/gtkprogressbar.c:221
++#: ../gtk/gtkprogressbar.c:221
+ msgid "Extra spacing applied to the height of a progress bar."
+ msgstr "Dodaten razmik določen višini merilnika napredka."
+
+-#: gtk/gtkprogressbar.c:234
++#: ../gtk/gtkprogressbar.c:234
+ msgid "Min horizontal bar width"
+ msgstr "Najmanjša vodoravna širina vrstice"
+
+-#: gtk/gtkprogressbar.c:235
++#: ../gtk/gtkprogressbar.c:235
+ msgid "The minimum horizontal width of the progress bar"
+ msgstr "Najmanjša vodoravna širina vrstice merilnika napredka dejanja."
+
+-#: gtk/gtkprogressbar.c:247
++#: ../gtk/gtkprogressbar.c:247
+ msgid "Min horizontal bar height"
+ msgstr "Najmanjša vodoravna višina vrstice"
+
+-#: gtk/gtkprogressbar.c:248
++#: ../gtk/gtkprogressbar.c:248
+ msgid "Minimum horizontal height of the progress bar"
+ msgstr "Najmanjša vodoravna višina vrstice merilnika napredka dejanja."
+
+-#: gtk/gtkprogressbar.c:260
++#: ../gtk/gtkprogressbar.c:260
+ msgid "Min vertical bar width"
+ msgstr "Najmanjša navpična širina vrstice"
+
+-#: gtk/gtkprogressbar.c:261
++#: ../gtk/gtkprogressbar.c:261
+ msgid "The minimum vertical width of the progress bar"
+ msgstr "Najmanjša navpična širina vrstice merilnika napredka dejanja."
+
+-#: gtk/gtkprogressbar.c:273
++#: ../gtk/gtkprogressbar.c:273
+ msgid "Min vertical bar height"
+ msgstr "Najmanjša navpična širina vrstice"
+
+-#: gtk/gtkprogressbar.c:274
++#: ../gtk/gtkprogressbar.c:274
+ msgid "The minimum vertical height of the progress bar"
+ msgstr "Najmanjša navpična višina vrstice merilnika napredka dejanja."
+
+-#: gtk/gtkradioaction.c:111
++#: ../gtk/gtkradioaction.c:111
+ msgid "The value"
+ msgstr "Vrednost"
+
+-#: gtk/gtkradioaction.c:112
+-msgid ""
+-"The value returned by gtk_radio_action_get_current_value() when this action "
+-"is the current action of its group."
+-msgstr ""
+-"Vrnjena vrednost gtk_radio_action_get_current_value() kadar je dejanje del "
+-"trenutnega dejanja izbrane skupine."
++#: ../gtk/gtkradioaction.c:112
++msgid "The value returned by gtk_radio_action_get_current_value() when this action is the current action of its group."
++msgstr "Vrnjena vrednost gtk_radio_action_get_current_value() kadar je dejanje del trenutnega dejanja izbrane skupine."
+
+-#: gtk/gtkradioaction.c:129
++#: ../gtk/gtkradioaction.c:129
+ msgid "The radio action whose group this action belongs to."
+ msgstr "Skupina dejanj radio gumbov, ki jim pripada to dejanje."
+
+-#: gtk/gtkradioaction.c:144
++#: ../gtk/gtkradioaction.c:144
+ msgid "The current value"
+ msgstr "Trenutna vrednost"
+
+-#: gtk/gtkradioaction.c:145
+-msgid ""
+-"The value property of the currently active member of the group to which this "
+-"action belongs."
+-msgstr ""
+-"Lastnosti vrednosti trenutno dejavnega predmeta skupine kateri dejanje "
+-"pripada."
++#: ../gtk/gtkradioaction.c:145
++msgid "The value property of the currently active member of the group to which this action belongs."
++msgstr "Lastnosti vrednosti trenutno dejavnega predmeta skupine kateri dejanje pripada."
+
+-#: gtk/gtkradiobutton.c:83
++#: ../gtk/gtkradiobutton.c:83
+ msgid "The radio button whose group this widget belongs to."
+ msgstr "Skupina radio gumbov, ki ji pripada ta gradnik."
+
+-#: gtk/gtkradiomenuitem.c:343
++#: ../gtk/gtkradiomenuitem.c:343
+ msgid "The radio menu item whose group this widget belongs to."
+ msgstr "Skupina predmetov radio gumbov, ki ji pripada ta gradnik."
+
+-#: gtk/gtkradiotoolbutton.c:66
++#: ../gtk/gtkradiotoolbutton.c:66
+ msgid "The radio tool button whose group this button belongs to."
+ msgstr "Radijski gumb, čigar skupini pripada ta gumb."
+
+-#: gtk/gtkrange.c:337
++#: ../gtk/gtkrange.c:337
+ msgid "Update policy"
+ msgstr "Način osveževanja"
+
+-#: gtk/gtkrange.c:338
++#: ../gtk/gtkrange.c:338
+ msgid "How the range should be updated on the screen"
+ msgstr "Kako naj se osveži območje na zaslonu"
+
+-#: gtk/gtkrange.c:347
++#: ../gtk/gtkrange.c:347
+ msgid "The GtkAdjustment that contains the current value of this range object"
+ msgstr "GtkAdjustment, ki vsebuje trenutno vrednost tega predmeta"
+
+-#: gtk/gtkrange.c:354
++#: ../gtk/gtkrange.c:354
+ msgid "Inverted"
+ msgstr "Obrnjen"
+
+-#: gtk/gtkrange.c:355
++#: ../gtk/gtkrange.c:355
+ msgid "Invert direction slider moves to increase range value"
+ msgstr "Obrni smeri v katerih drsniki povečujejo rang"
+
+-#: gtk/gtkrange.c:362
++#: ../gtk/gtkrange.c:362
+ msgid "Lower stepper sensitivity"
+ msgstr "Občutljivost spodnjega koračnika"
+
+-#: gtk/gtkrange.c:363
+-msgid ""
+-"The sensitivity policy for the stepper that points to the adjustment's lower "
+-"side"
++#: ../gtk/gtkrange.c:363
++msgid "The sensitivity policy for the stepper that points to the adjustment's lower side"
+ msgstr "Občutljivost koračnika, ki kaže na prilagojeno spodnjo stran"
+
+-#: gtk/gtkrange.c:371
++#: ../gtk/gtkrange.c:371
+ msgid "Upper stepper sensitivity"
+ msgstr "Občutljivost zgornjega koračnika"
+
+-#: gtk/gtkrange.c:372
+-msgid ""
+-"The sensitivity policy for the stepper that points to the adjustment's upper "
+-"side"
++#: ../gtk/gtkrange.c:372
++msgid "The sensitivity policy for the stepper that points to the adjustment's upper side"
+ msgstr "Občutljivost koračnika, ki kaže na prilagojeno zgornjo stran"
+
+-#: gtk/gtkrange.c:389
++#: ../gtk/gtkrange.c:389
+ msgid "Show Fill Level"
+ msgstr "Prikaži raven polnjenja"
+
+-#: gtk/gtkrange.c:390
++#: ../gtk/gtkrange.c:390
+ msgid "Whether to display a fill level indicator graphics on trough."
+ msgstr "Ali naj bo prikazana raven polnjenja zareze."
+
+-#: gtk/gtkrange.c:406
++#: ../gtk/gtkrange.c:406
+ msgid "Restrict to Fill Level"
+ msgstr "Omejitev ravni polnjenja"
+
+-#: gtk/gtkrange.c:407
++#: ../gtk/gtkrange.c:407
+ msgid "Whether to restrict the upper boundary to the fill level."
+ msgstr "Ali naj bo omejeni zgornji rob ravni polnjenja"
+
+-#: gtk/gtkrange.c:422
++#: ../gtk/gtkrange.c:422
+ msgid "Fill Level"
+ msgstr "Raven polnjenja"
+
+-#: gtk/gtkrange.c:423
++#: ../gtk/gtkrange.c:423
+ msgid "The fill level."
+ msgstr "Raven polnjenja"
+
+-#: gtk/gtkrange.c:431
++#: ../gtk/gtkrange.c:431
+ msgid "Slider Width"
+ msgstr "Širina drsnika"
+
+-#: gtk/gtkrange.c:432
++#: ../gtk/gtkrange.c:432
+ msgid "Width of scrollbar or scale thumb"
+ msgstr "Širina drsnika ali gumba za povečavo"
+
+-#: gtk/gtkrange.c:439
++#: ../gtk/gtkrange.c:439
+ msgid "Trough Border"
+ msgstr "Zarezan rob"
+
+-#: gtk/gtkrange.c:440
++#: ../gtk/gtkrange.c:440
+ msgid "Spacing between thumb/steppers and outer trough bevel"
+ msgstr "Razmik med sličico/koračnikom in zarezo obrobe"
+
+-#: gtk/gtkrange.c:447
++#: ../gtk/gtkrange.c:447
+ msgid "Stepper Size"
+ msgstr "Velikost koračnika"
+
+-#: gtk/gtkrange.c:448
++#: ../gtk/gtkrange.c:448
+ msgid "Length of step buttons at ends"
+ msgstr "Dolžina koračnih gumbov na koncih"
+
+-#: gtk/gtkrange.c:463
++#: ../gtk/gtkrange.c:463
+ msgid "Stepper Spacing"
+ msgstr "Razmik koračnika"
+
+-#: gtk/gtkrange.c:464
++#: ../gtk/gtkrange.c:464
+ msgid "Spacing between step buttons and thumb"
+ msgstr "Razmik med gumbi korakov in sličico"
+
+-#: gtk/gtkrange.c:471
++#: ../gtk/gtkrange.c:471
+ msgid "Arrow X Displacement"
+ msgstr "Premik puščice po X"
+
+-#: gtk/gtkrange.c:472
+-msgid ""
+-"How far in the x direction to move the arrow when the button is depressed"
++#: ../gtk/gtkrange.c:472
++msgid "How far in the x direction to move the arrow when the button is depressed"
+ msgstr "Kako daleč v smeri X naj se premakne puščica, ko je gumb spuščen"
+
+-#: gtk/gtkrange.c:479
++#: ../gtk/gtkrange.c:479
+ msgid "Arrow Y Displacement"
+ msgstr "Premik puščice po Y"
+
+-#: gtk/gtkrange.c:480
+-msgid ""
+-"How far in the y direction to move the arrow when the button is depressed"
++#: ../gtk/gtkrange.c:480
++msgid "How far in the y direction to move the arrow when the button is depressed"
+ msgstr "Kako daleč v smeri Y naj se premakne puščica, ko je gumb spuščen"
+
+-#: gtk/gtkrange.c:488
++#: ../gtk/gtkrange.c:488
+ msgid "Draw slider ACTIVE during drag"
+ msgstr "Izriši drsnik kot dejaven med vlečenjem"
+
+-#: gtk/gtkrange.c:489
+-msgid ""
+-"With this option set to TRUE, sliders will be drawn ACTIVE and with shadow "
+-"IN while they are dragged"
+-msgstr ""
+-"Izbrana možnost omogoča, da so drsniki izrisani dejavni in z senco, kadar se "
+-"jih vleče."
++#: ../gtk/gtkrange.c:489
++msgid "With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged"
++msgstr "Izbrana možnost omogoča, da so drsniki izrisani dejavni in z senco, kadar se jih vleče."
+
+-#: gtk/gtkrange.c:503
++#: ../gtk/gtkrange.c:503
+ msgid "Trough Side Details"
+ msgstr "Podrobnosti strani zarez"
+
+-#: gtk/gtkrange.c:504
+-msgid ""
+-"When TRUE, the parts of the trough on the two sides of the slider are drawn "
+-"with different details"
+-msgstr ""
+-"Izbrana možnost omogoča, da so deli zareze na obeh straneh drsnika narisani "
+-"z drugimi podrobnostmi."
++#: ../gtk/gtkrange.c:504
++msgid "When TRUE, the parts of the trough on the two sides of the slider are drawn with different details"
++msgstr "Izbrana možnost omogoča, da so deli zareze na obeh straneh drsnika narisani z drugimi podrobnostmi."
+
+-#: gtk/gtkrange.c:520
++#: ../gtk/gtkrange.c:520
+ msgid "Trough Under Steppers"
+ msgstr "Zareza pod koračniki"
+
+-#: gtk/gtkrange.c:521
+-msgid ""
+-"Whether to draw trough for full length of range or exclude the steppers and "
+-"spacing"
+-msgstr ""
+-"Ali naj se izriše zareza skozi celotno dolžino območja oziroma se izloči "
+-"koračnike in presledke"
++#: ../gtk/gtkrange.c:521
++msgid "Whether to draw trough for full length of range or exclude the steppers and spacing"
++msgstr "Ali naj se izriše zareza skozi celotno dolžino območja oziroma se izloči koračnike in presledke"
+
+-#: gtk/gtkrange.c:534
++#: ../gtk/gtkrange.c:534
+ msgid "Arrow scaling"
+ msgstr "Prilagajanje velikosti puščice"
+
+-#: gtk/gtkrange.c:535
++#: ../gtk/gtkrange.c:535
+ msgid "Arrow scaling with regard to scroll button size"
+ msgstr "Prilagajanje puščic v povezavi z velikostjo drsnih gumbov"
+
+-#: gtk/gtkrecentaction.c:679 gtk/gtkrecentchoosermenu.c:206
++#: ../gtk/gtkrecentaction.c:679
++#: ../gtk/gtkrecentchoosermenu.c:206
+ msgid "Show Numbers"
+ msgstr "Pokaži številke"
+
+-#: gtk/gtkrecentaction.c:680 gtk/gtkrecentchoosermenu.c:207
++#: ../gtk/gtkrecentaction.c:680
++#: ../gtk/gtkrecentchoosermenu.c:207
+ msgid "Whether the items should be displayed with a number"
+ msgstr "Ali naj bodo elementi prikazani s številkami"
+
+-#: gtk/gtkrecentchooser.c:120
++#: ../gtk/gtkrecentchooser.c:120
+ msgid "Recent Manager"
+ msgstr "Nedavni upravljavec"
+
+-#: gtk/gtkrecentchooser.c:121
++#: ../gtk/gtkrecentchooser.c:121
+ msgid "The RecentManager object to use"
+ msgstr "RecentManager predmet za uporabo"
+
+-#: gtk/gtkrecentchooser.c:135
++#: ../gtk/gtkrecentchooser.c:135
+ msgid "Show Private"
+ msgstr "Pokaži zasebno"
+
+-#: gtk/gtkrecentchooser.c:136
++#: ../gtk/gtkrecentchooser.c:136
+ msgid "Whether the private items should be displayed"
+ msgstr "Ali naj bodo prikazani zasebni elementi."
+
+-#: gtk/gtkrecentchooser.c:149
++#: ../gtk/gtkrecentchooser.c:149
+ msgid "Show Tooltips"
+ msgstr "Pokaži namige"
+
+-#: gtk/gtkrecentchooser.c:150
++#: ../gtk/gtkrecentchooser.c:150
+ msgid "Whether there should be a tooltip on the item"
+ msgstr "Ali naj bo nad elementom prikazan namig za uporabo ali ne"
+
+-#: gtk/gtkrecentchooser.c:162
++#: ../gtk/gtkrecentchooser.c:162
+ msgid "Show Icons"
+ msgstr "Pokaži ikone"
+
+-#: gtk/gtkrecentchooser.c:163
++#: ../gtk/gtkrecentchooser.c:163
+ msgid "Whether there should be an icon near the item"
+ msgstr "Ali naj bo ob elementu prikazana ikona ali ne"
+
+-#: gtk/gtkrecentchooser.c:178
++#: ../gtk/gtkrecentchooser.c:178
+ msgid "Show Not Found"
+ msgstr "Prikaza ni mogoče najti"
+
+-#: gtk/gtkrecentchooser.c:179
++#: ../gtk/gtkrecentchooser.c:179
+ msgid "Whether the items pointing to unavailable resources should be displayed"
+ msgstr "Ali naj bodo prikazani gumbi, ki so povezani z neobstoječimi viri."
+
+-#: gtk/gtkrecentchooser.c:192
++#: ../gtk/gtkrecentchooser.c:192
+ msgid "Whether to allow multiple items to be selected"
+ msgstr "Ali naj bo mogoče izbrati več predmetov hkrati"
+
+-#: gtk/gtkrecentchooser.c:205
++#: ../gtk/gtkrecentchooser.c:205
+ msgid "Local only"
+ msgstr "Samo krajevno"
+
+-#: gtk/gtkrecentchooser.c:206
++#: ../gtk/gtkrecentchooser.c:206
+ msgid "Whether the selected resource(s) should be limited to local file: URIs"
+ msgstr "Ali naj bodo izbrani viri omejeni na krajevno datoteko: URI."
+
+-#: gtk/gtkrecentchooser.c:222 gtk/gtkrecentmanager.c:229
++#: ../gtk/gtkrecentchooser.c:222
++#: ../gtk/gtkrecentmanager.c:229
+ msgid "Limit"
+ msgstr "Omejitev"
+
+-#: gtk/gtkrecentchooser.c:223
++#: ../gtk/gtkrecentchooser.c:223
+ msgid "The maximum number of items to be displayed"
+ msgstr "Največje število prikazanih elementov"
+
+-#: gtk/gtkrecentchooser.c:237
++#: ../gtk/gtkrecentchooser.c:237
+ msgid "Sort Type"
+ msgstr "Vrsta razvrščanja"
+
+-#: gtk/gtkrecentchooser.c:238
++#: ../gtk/gtkrecentchooser.c:238
+ msgid "The sorting order of the items displayed"
+ msgstr "Načelo razvrščanja prikazanih elementov"
+
+-#: gtk/gtkrecentchooser.c:253
++#: ../gtk/gtkrecentchooser.c:253
+ msgid "The current filter for selecting which resources are displayed"
+ msgstr "Trenutni filter za izbiranje virov, ki naj bodo prikazani"
+
+-#: gtk/gtkrecentmanager.c:215
++#: ../gtk/gtkrecentmanager.c:215
+ msgid "The full path to the file to be used to store and read the list"
+ msgstr "Polna pot do datoteke uporabljene za shranjevanje in branje seznama"
+
+-#: gtk/gtkrecentmanager.c:230
+-msgid ""
+-"The maximum number of items to be returned by gtk_recent_manager_get_items()"
+-msgstr ""
+-"Največje število predmetov, ki jih izpiše gtk_recent_manager_get_items()"
++#: ../gtk/gtkrecentmanager.c:230
++msgid "The maximum number of items to be returned by gtk_recent_manager_get_items()"
++msgstr "Največje število predmetov, ki jih izpiše gtk_recent_manager_get_items()"
+
+-#: gtk/gtkrecentmanager.c:246
++#: ../gtk/gtkrecentmanager.c:246
+ msgid "The size of the recently used resources list"
+ msgstr "Velikost nedavno uporabljenega seznama virov"
+
+-#: gtk/gtkruler.c:90
++#: ../gtk/gtkruler.c:90
+ msgid "Lower"
+ msgstr "Spodaj"
+
+-#: gtk/gtkruler.c:91
++#: ../gtk/gtkruler.c:91
+ msgid "Lower limit of ruler"
+ msgstr "Spodnja meja ravnila"
+
+-#: gtk/gtkruler.c:100
++#: ../gtk/gtkruler.c:100
+ msgid "Upper"
+ msgstr "Zgoraj"
+
+-#: gtk/gtkruler.c:101
++#: ../gtk/gtkruler.c:101
+ msgid "Upper limit of ruler"
+ msgstr "Zgornja meja ravnila"
+
+-#: gtk/gtkruler.c:111
++#: ../gtk/gtkruler.c:111
+ msgid "Position of mark on the ruler"
+ msgstr "Položaj oznake na ravnilu"
+
+-#: gtk/gtkruler.c:120
++#: ../gtk/gtkruler.c:120
+ msgid "Max Size"
+ msgstr "Največja velikost"
+
+-#: gtk/gtkruler.c:121
++#: ../gtk/gtkruler.c:121
+ msgid "Maximum size of the ruler"
+ msgstr "Največja velikost ravnila"
+
+-#: gtk/gtkruler.c:136
++#: ../gtk/gtkruler.c:136
+ msgid "Metric"
+ msgstr "Merilo"
+
+-#: gtk/gtkruler.c:137
++#: ../gtk/gtkruler.c:137
+ msgid "The metric used for the ruler"
+ msgstr "Mere za ravnilo"
+
+-#: gtk/gtkscale.c:143
++#: ../gtk/gtkscale.c:143
+ msgid "The number of decimal places that are displayed in the value"
+ msgstr "Število decimalnih mest prikaza vrednosti"
+
+-#: gtk/gtkscale.c:152
++#: ../gtk/gtkscale.c:152
+ msgid "Draw Value"
+ msgstr "Riši vrednost"
+
+-#: gtk/gtkscale.c:153
++#: ../gtk/gtkscale.c:153
+ msgid "Whether the current value is displayed as a string next to the slider"
+ msgstr "Ali se trenutna vrednost izpisuje kot niz poleg drsnika"
+
+-#: gtk/gtkscale.c:160
++#: ../gtk/gtkscale.c:160
+ msgid "Value Position"
+ msgstr "Lega vrednosti"
+
+-#: gtk/gtkscale.c:161
++#: ../gtk/gtkscale.c:161
+ msgid "The position in which the current value is displayed"
+ msgstr "Položaj, kjer se prikaže trenutna vrednost"
+
+-#: gtk/gtkscale.c:168
++#: ../gtk/gtkscale.c:168
+ msgid "Slider Length"
+ msgstr "Dolžina drsnika"
+
+-#: gtk/gtkscale.c:169
++#: ../gtk/gtkscale.c:169
+ msgid "Length of scale's slider"
+ msgstr "Dolžina skale drsnika"
+
+-#: gtk/gtkscale.c:177
++#: ../gtk/gtkscale.c:177
+ msgid "Value spacing"
+ msgstr "Presledek vrednosti"
+
+-#: gtk/gtkscale.c:178
++#: ../gtk/gtkscale.c:178
+ msgid "Space between value text and the slider/trough area"
+ msgstr "Prostor med besedilom vrednosti in območjem drsnika in zareze"
+
+-#: gtk/gtkscalebutton.c:194
++#: ../gtk/gtkscalebutton.c:194
+ msgid "The orientation of the scale"
+ msgstr "Usmeritev merila"
+
+-#: gtk/gtkscalebutton.c:203
++#: ../gtk/gtkscalebutton.c:203
+ msgid "The value of the scale"
+ msgstr "Vrednost prilagoditve velikosti"
+
+-#: gtk/gtkscalebutton.c:213
++#: ../gtk/gtkscalebutton.c:213
+ msgid "The icon size"
+ msgstr "Velikost ikon"
+
+-#: gtk/gtkscalebutton.c:222
+-msgid ""
+-"The GtkAdjustment that contains the current value of this scale button object"
++#: ../gtk/gtkscalebutton.c:222
++msgid "The GtkAdjustment that contains the current value of this scale button object"
+ msgstr "GtkAdjustment, ki vsebuje trenutno vrednost velikosti predmeta gumba."
+
+-#: gtk/gtkscalebutton.c:250
++#: ../gtk/gtkscalebutton.c:250
+ msgid "Icons"
+ msgstr "Ikone"
+
+-#: gtk/gtkscalebutton.c:251
++#: ../gtk/gtkscalebutton.c:251
+ msgid "List of icon names"
+ msgstr "Seznam imen ikon"
+
+-#: gtk/gtkscrollbar.c:50
++#: ../gtk/gtkscrollbar.c:50
+ msgid "Minimum Slider Length"
+ msgstr "Najmanjša dolžina drsnika"
+
+-#: gtk/gtkscrollbar.c:51
++#: ../gtk/gtkscrollbar.c:51
+ msgid "Minimum length of scrollbar slider"
+ msgstr "Najmanjša dolžina drsnika"
+
+-#: gtk/gtkscrollbar.c:59
++#: ../gtk/gtkscrollbar.c:59
+ msgid "Fixed slider size"
+ msgstr "Nespremenljiva velikost drsnika"
+
+-#: gtk/gtkscrollbar.c:60
++#: ../gtk/gtkscrollbar.c:60
+ msgid "Don't change slider size, just lock it to the minimum length"
+ msgstr "Ne spreminjaj velikosti drsnika, le zakleni jo na najmanjšo vrednost"
+
+-#: gtk/gtkscrollbar.c:84
+-msgid ""
+-"Display a second backward arrow button on the opposite end of the scrollbar"
++#: ../gtk/gtkscrollbar.c:84
++msgid "Display a second backward arrow button on the opposite end of the scrollbar"
+ msgstr "Pokaži gumb za drugotni korak nazaj na drugem koncu drsnika"
+
+-#: gtk/gtkscrollbar.c:92
+-msgid ""
+-"Display a second forward arrow button on the opposite end of the scrollbar"
++#: ../gtk/gtkscrollbar.c:92
++msgid "Display a second forward arrow button on the opposite end of the scrollbar"
+ msgstr "Pokaži drugo puščico na drugem koncu drsnika"
+
+-#: gtk/gtkscrolledwindow.c:218 gtk/gtktext.c:545 gtk/gtktreeview.c:578
++#: ../gtk/gtkscrolledwindow.c:218
++#: ../gtk/gtktext.c:545
++#: ../gtk/gtktreeview.c:578
+ msgid "Horizontal Adjustment"
+ msgstr "Vodoravna prilagoditev"
+
+-#: gtk/gtkscrolledwindow.c:225 gtk/gtktext.c:553 gtk/gtktreeview.c:586
++#: ../gtk/gtkscrolledwindow.c:225
++#: ../gtk/gtktext.c:553
++#: ../gtk/gtktreeview.c:586
+ msgid "Vertical Adjustment"
+ msgstr "Navpična prilagoditev"
+
+-#: gtk/gtkscrolledwindow.c:232
++#: ../gtk/gtkscrolledwindow.c:232
+ msgid "Horizontal Scrollbar Policy"
+ msgstr "Obnašanje vodoravnega drsnika"
+
+-#: gtk/gtkscrolledwindow.c:233
++#: ../gtk/gtkscrolledwindow.c:233
+ msgid "When the horizontal scrollbar is displayed"
+ msgstr "Kdaj je prikazan vodoravni drsnik"
+
+-#: gtk/gtkscrolledwindow.c:240
++#: ../gtk/gtkscrolledwindow.c:240
+ msgid "Vertical Scrollbar Policy"
+ msgstr "Vedenje navpičnega drsnika"
+
+-#: gtk/gtkscrolledwindow.c:241
++#: ../gtk/gtkscrolledwindow.c:241
+ msgid "When the vertical scrollbar is displayed"
+ msgstr "Kdaj je prikazan navpični drsnik"
+
+-#: gtk/gtkscrolledwindow.c:249
++#: ../gtk/gtkscrolledwindow.c:249
+ msgid "Window Placement"
+ msgstr "Postavitev okna"
+
+-#: gtk/gtkscrolledwindow.c:250
+-msgid ""
+-"Where the contents are located with respect to the scrollbars. This property "
+-"only takes effect if \"window-placement-set\" is TRUE."
+-msgstr ""
+-"Kje leži vsebina glede na drsnike. Možnost je dejavna le, če je izbrana tudi "
+-"možnost \"window-placement-set\"."
++#: ../gtk/gtkscrolledwindow.c:250
++msgid "Where the contents are located with respect to the scrollbars. This property only takes effect if \"window-placement-set\" is TRUE."
++msgstr "Kje leži vsebina glede na drsnike. Možnost je dejavna le, če je izbrana tudi možnost \"window-placement-set\"."
+
+-#: gtk/gtkscrolledwindow.c:267
++#: ../gtk/gtkscrolledwindow.c:267
+ msgid "Window Placement Set"
+ msgstr "Postavitev okna"
+
+-#: gtk/gtkscrolledwindow.c:268
+-msgid ""
+-"Whether \"window-placement\" should be used to determine the location of the "
+-"contents with respect to the scrollbars."
+-msgstr ""
+-"Ali naj bo uporabljena možnost \"window-placement\" pri določevanju vsebine "
+-"glede na drsnike"
++#: ../gtk/gtkscrolledwindow.c:268
++msgid "Whether \"window-placement\" should be used to determine the location of the contents with respect to the scrollbars."
++msgstr "Ali naj bo uporabljena možnost \"window-placement\" pri določevanju vsebine glede na drsnike"
+
+-#: gtk/gtkscrolledwindow.c:274
++#: ../gtk/gtkscrolledwindow.c:274
+ msgid "Shadow Type"
+ msgstr "Vrsta sence"
+
+-#: gtk/gtkscrolledwindow.c:275
++#: ../gtk/gtkscrolledwindow.c:275
+ msgid "Style of bevel around the contents"
+ msgstr "Vrsta obrobe okoli vsebine"
+
+-#: gtk/gtkscrolledwindow.c:289
++#: ../gtk/gtkscrolledwindow.c:289
+ msgid "Scrollbars within bevel"
+ msgstr "Drsniki znotraj vogalnice"
+
+-#: gtk/gtkscrolledwindow.c:290
++#: ../gtk/gtkscrolledwindow.c:290
+ msgid "Place scrollbars within the scrolled window's bevel"
+ msgstr "Postavi drsnike znotraj vogalnice drsečega okna"
+
+-#: gtk/gtkscrolledwindow.c:296
++#: ../gtk/gtkscrolledwindow.c:296
+ msgid "Scrollbar spacing"
+ msgstr "Prostor do drsnika"
+
+-#: gtk/gtkscrolledwindow.c:297
++#: ../gtk/gtkscrolledwindow.c:297
+ msgid "Number of pixels between the scrollbars and the scrolled window"
+ msgstr "Število slikovnih točk med drsnikom in drsenim oknom"
+
+-#: gtk/gtkscrolledwindow.c:312
++#: ../gtk/gtkscrolledwindow.c:312
+ msgid "Scrolled Window Placement"
+ msgstr "Postavitev drsečega okna"
+
+-#: gtk/gtkscrolledwindow.c:313
+-msgid ""
+-"Where the contents of scrolled windows are located with respect to the "
+-"scrollbars, if not overridden by the scrolled window's own placement."
+-msgstr ""
+-"Kje leži vsebina glede okna glede na drsnike, kadar ni prevzeto preko lege "
+-"drsnega okna."
++#: ../gtk/gtkscrolledwindow.c:313
++msgid "Where the contents of scrolled windows are located with respect to the scrollbars, if not overridden by the scrolled window's own placement."
++msgstr "Kje leži vsebina glede okna glede na drsnike, kadar ni prevzeto preko lege drsnega okna."
+
+-#: gtk/gtkseparatortoolitem.c:105
++#: ../gtk/gtkseparatortoolitem.c:105
+ msgid "Draw"
+ msgstr "Nariši"
+
+-#: gtk/gtkseparatortoolitem.c:106
++#: ../gtk/gtkseparatortoolitem.c:106
+ msgid "Whether the separator is drawn, or just blank"
+ msgstr "Ali so ločnice narisane ali le prazne"
+
+-#: gtk/gtksettings.c:215
++#: ../gtk/gtksettings.c:215
+ msgid "Double Click Time"
+ msgstr "Čas dvojnega klika"
+
+-#: gtk/gtksettings.c:216
+-msgid ""
+-"Maximum time allowed between two clicks for them to be considered a double "
+-"click (in milliseconds)"
+-msgstr ""
+-"Največji dovoljen čas med dvema klikoma, da se smatrata za dvoklik (v "
+-"milisekundah)"
++#: ../gtk/gtksettings.c:216
++msgid "Maximum time allowed between two clicks for them to be considered a double click (in milliseconds)"
++msgstr "Največji dovoljen čas med dvema klikoma, da se smatrata za dvoklik (v milisekundah)"
+
+-#: gtk/gtksettings.c:223
++#: ../gtk/gtksettings.c:223
+ msgid "Double Click Distance"
+ msgstr "Razdalja dvojnega klika"
+
+-#: gtk/gtksettings.c:224
+-msgid ""
+-"Maximum distance allowed between two clicks for them to be considered a "
+-"double click (in pixels)"
+-msgstr ""
+-"Največji dovoljena razdalja med dvema klikoma, da se dejanje obravnava kot "
+-"dvoklik (v točkah)"
++#: ../gtk/gtksettings.c:224
++msgid "Maximum distance allowed between two clicks for them to be considered a double click (in pixels)"
++msgstr "Največji dovoljena razdalja med dvema klikoma, da se dejanje obravnava kot dvoklik (v točkah)"
+
+-#: gtk/gtksettings.c:240
++#: ../gtk/gtksettings.c:240
+ msgid "Cursor Blink"
+ msgstr "Utripanje kazalca"
+
+-#: gtk/gtksettings.c:241
++#: ../gtk/gtksettings.c:241
+ msgid "Whether the cursor should blink"
+ msgstr "Ali naj kazalec utripa"
+
+-#: gtk/gtksettings.c:248
++#: ../gtk/gtksettings.c:248
+ msgid "Cursor Blink Time"
+ msgstr "Čas utripanja kazalca"
+
+-#: gtk/gtksettings.c:249
++#: ../gtk/gtksettings.c:249
+ msgid "Length of the cursor blink cycle, in milliseconds"
+ msgstr "Dolžina cikla utripanja kazalca, v milisekundah"
+
+-#: gtk/gtksettings.c:268
++#: ../gtk/gtksettings.c:268
+ msgid "Cursor Blink Timeout"
+ msgstr "Časovni zamik utripanja kazalca"
+
+-#: gtk/gtksettings.c:269
++#: ../gtk/gtksettings.c:269
+ msgid "Time after which the cursor stops blinking, in seconds"
+ msgstr "Čas po katerem kazalec preheha utripati, v milisekundah"
+
+-#: gtk/gtksettings.c:276
++#: ../gtk/gtksettings.c:276
+ msgid "Split Cursor"
+ msgstr "Razdeljeni kazalec"
+
+-#: gtk/gtksettings.c:277
+-msgid ""
+-"Whether two cursors should be displayed for mixed left-to-right and right-to-"
+-"left text"
+-msgstr ""
+-"Ali naj bosta pri mešanem besedilu prikazana dva kazalca ločeno za besedilo "
+-"od leve-proti-desni in od desne-proti-levi."
++#: ../gtk/gtksettings.c:277
++msgid "Whether two cursors should be displayed for mixed left-to-right and right-to-left text"
++msgstr "Ali naj bosta pri mešanem besedilu prikazana dva kazalca ločeno za besedilo od leve-proti-desni in od desne-proti-levi."
+
+-#: gtk/gtksettings.c:284
++#: ../gtk/gtksettings.c:284
+ msgid "Theme Name"
+ msgstr "Ime teme"
+
+-#: gtk/gtksettings.c:285
++#: ../gtk/gtksettings.c:285
+ msgid "Name of theme RC file to load"
+ msgstr "Ime datoteke teme RC, ki naj se naloži"
+
+-#: gtk/gtksettings.c:293
++#: ../gtk/gtksettings.c:293
+ msgid "Icon Theme Name"
+ msgstr "Ime teme ikon"
+
+-#: gtk/gtksettings.c:294
++#: ../gtk/gtksettings.c:294
+ msgid "Name of icon theme to use"
+ msgstr "Ime uporabljene teme ikon"
+
+-#: gtk/gtksettings.c:302
++#: ../gtk/gtksettings.c:302
+ msgid "Fallback Icon Theme Name"
+ msgstr "Povrnitveno ime ikone teme"
+
+-#: gtk/gtksettings.c:303
++#: ../gtk/gtksettings.c:303
+ msgid "Name of a icon theme to fall back to"
+ msgstr "Ime povrnitvene ikone teme"
+
+-#: gtk/gtksettings.c:311
++#: ../gtk/gtksettings.c:311
+ msgid "Key Theme Name"
+ msgstr "Ime tipkovne teme"
+
+-#: gtk/gtksettings.c:312
++#: ../gtk/gtksettings.c:312
+ msgid "Name of key theme RC file to load"
+ msgstr "Ime datoteke tipkovne teme RC, ki naj se naloži"
+
+-#: gtk/gtksettings.c:320
++#: ../gtk/gtksettings.c:320
+ msgid "Menu bar accelerator"
+ msgstr "Pospeševalnik menijev"
+
+-#: gtk/gtksettings.c:321
++#: ../gtk/gtksettings.c:321
+ msgid "Keybinding to activate the menu bar"
+ msgstr "Tipkovna bližnjica, ki zažene menijsko vrstico"
+
+-#: gtk/gtksettings.c:329
++#: ../gtk/gtksettings.c:329
+ msgid "Drag threshold"
+ msgstr "Prag vlečenja"
+
+-#: gtk/gtksettings.c:330
++#: ../gtk/gtksettings.c:330
+ msgid "Number of pixels the cursor can move before dragging"
+-msgstr ""
+-"Koliko slikovnih točk se lahko premakne kazalec, preden je to obravnavano "
+-"kot vleka"
++msgstr "Koliko slikovnih točk se lahko premakne kazalec, preden je to obravnavano kot vleka"
+
+-#: gtk/gtksettings.c:338
++#: ../gtk/gtksettings.c:338
+ msgid "Font Name"
+ msgstr "Ime pisave"
+
+-#: gtk/gtksettings.c:339
++#: ../gtk/gtksettings.c:339
+ msgid "Name of default font to use"
+ msgstr "Ime privzete pisave"
+
+-#: gtk/gtksettings.c:361
++#: ../gtk/gtksettings.c:361
+ msgid "Icon Sizes"
+ msgstr "Velikosti ikon"
+
+-#: gtk/gtksettings.c:362
++#: ../gtk/gtksettings.c:362
+ msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
+ msgstr "Seznam velikosti ikon (gtk-menu=16,16;gtk-button=20,20..."
+
+-#: gtk/gtksettings.c:370
++#: ../gtk/gtksettings.c:370
+ msgid "GTK Modules"
+ msgstr "Moduli GTK"
+
+-#: gtk/gtksettings.c:371
++#: ../gtk/gtksettings.c:371
+ msgid "List of currently active GTK modules"
+ msgstr "Seznam trenutno dejavnih modulov GTK"
+
+-#: gtk/gtksettings.c:380
++#: ../gtk/gtksettings.c:380
+ msgid "Xft Antialias"
+ msgstr "Glajenje robov Xft"
+
+-#: gtk/gtksettings.c:381
++#: ../gtk/gtksettings.c:381
+ msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr "Ali se gladijo tudi Xft pisave; 0=ne, 1=da, -1=privzeto"
+
+-#: gtk/gtksettings.c:390
++#: ../gtk/gtksettings.c:390
+ msgid "Xft Hinting"
+ msgstr "Xft prilagoditev"
+
+-#: gtk/gtksettings.c:391
++#: ../gtk/gtksettings.c:391
+ msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
+ msgstr "Ali se prilagodijo tudi Xft pisave; 0=ne, 1=da, -1=privzeto"
+
+-#: gtk/gtksettings.c:400
++#: ../gtk/gtksettings.c:400
+ msgid "Xft Hint Style"
+ msgstr "Slog prilagajanja Xft"
+
+-#: gtk/gtksettings.c:401
+-msgid ""
+-"What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
+-msgstr ""
+-"Raven prilagajanja pivave; hintnone, hintslight, hintmedium, or hintfull"
++#: ../gtk/gtksettings.c:401
++msgid "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
++msgstr "Raven prilagajanja pivave; hintnone, hintslight, hintmedium, or hintfull"
+
+-#: gtk/gtksettings.c:410
++#: ../gtk/gtksettings.c:410
+ msgid "Xft RGBA"
+ msgstr "RGBA Xft"
+
+-#: gtk/gtksettings.c:411
++#: ../gtk/gtksettings.c:411
+ msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
+ msgstr "Vrsta podtočkovnega glajenja robov; brez, rgb, bgr, vrgb, vbgr"
+
+-#: gtk/gtksettings.c:420
++#: ../gtk/gtksettings.c:420
+ msgid "Xft DPI"
+ msgstr "DPI Xft"
+
+-#: gtk/gtksettings.c:421
++#: ../gtk/gtksettings.c:421
+ msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
+-msgstr ""
+-"Ločljivost Xft pisave, v 1024 * točk/palec. -1 za uporabo privzete vrednosti."
++msgstr "Ločljivost Xft pisave, v 1024 * točk/palec. -1 za uporabo privzete vrednosti."
+
+-#: gtk/gtksettings.c:430
++#: ../gtk/gtksettings.c:430
+ msgid "Cursor theme name"
+ msgstr "Ime teme kazalcev"
+
+-#: gtk/gtksettings.c:431
++#: ../gtk/gtksettings.c:431
+ msgid "Name of the cursor theme to use, or NULL to use the default theme"
+-msgstr ""
+-"Ime privzeto uporabljene teme kazalnika; vrednost NULL za privzeto temo"
++msgstr "Ime privzeto uporabljene teme kazalnika; vrednost NULL za privzeto temo"
+
+-#: gtk/gtksettings.c:439
++#: ../gtk/gtksettings.c:439
+ msgid "Cursor theme size"
+ msgstr "Velikost teme kazalcev"
+
+-#: gtk/gtksettings.c:440
++#: ../gtk/gtksettings.c:440
+ msgid "Size to use for cursors, or 0 to use the default size"
+ msgstr "Določitev velikosti kazalnika, vrednost 0 je privzeta vrednost"
+
+-#: gtk/gtksettings.c:450
++#: ../gtk/gtksettings.c:450
+ msgid "Alternative button order"
+ msgstr "Alternativni razpored gumbov"
+
+-#: gtk/gtksettings.c:451
++#: ../gtk/gtksettings.c:451
+ msgid "Whether buttons in dialogs should use the alternative button order"
+-msgstr ""
+-"Ali naj gumbi v pogovornih oknih uporabljajo drugačen način razvrstitve "
+-"gumbov"
++msgstr "Ali naj gumbi v pogovornih oknih uporabljajo drugačen način razvrstitve gumbov"
+
+-#: gtk/gtksettings.c:468
++#: ../gtk/gtksettings.c:468
+ msgid "Alternative sort indicator direction"
+ msgstr "Alternativna razporeditev smeri razvrščanja"
+
+-#: gtk/gtksettings.c:469
+-msgid ""
+-"Whether the direction of the sort indicators in list and tree views is "
+-"inverted compared to the default (where down means ascending)"
+-msgstr ""
+-"Ali je smer določeval razvrščanja v seznamu in drevesnih pogledih obrnjena v "
+-"primerjavi s privzeto vrednostjo (navzdol pomeni naraščajoče)"
++#: ../gtk/gtksettings.c:469
++msgid "Whether the direction of the sort indicators in list and tree views is inverted compared to the default (where down means ascending)"
++msgstr "Ali je smer določeval razvrščanja v seznamu in drevesnih pogledih obrnjena v primerjavi s privzeto vrednostjo (navzdol pomeni naraščajoče)"
+
+-#: gtk/gtksettings.c:477
++#: ../gtk/gtksettings.c:477
+ msgid "Show the 'Input Methods' menu"
+ msgstr "Prikaži meni 'Vhodni načini'"
+
+-#: gtk/gtksettings.c:478
+-msgid ""
+-"Whether the context menus of entries and text views should offer to change "
+-"the input method"
+-msgstr ""
+-"Ali naj vsebinski meniji vnosov in pogledov besedila ponudijo možnost "
+-"spreminjanja vhodnega načina"
++#: ../gtk/gtksettings.c:478
++msgid "Whether the context menus of entries and text views should offer to change the input method"
++msgstr "Ali naj vsebinski meniji vnosov in pogledov besedila ponudijo možnost spreminjanja vhodnega načina"
+
+-#: gtk/gtksettings.c:486
++#: ../gtk/gtksettings.c:486
+ msgid "Show the 'Insert Unicode Control Character' menu"
+ msgstr "Prikaži 'Vstavi Unicode nadzorni znak' meni"
+
+-#: gtk/gtksettings.c:487
+-msgid ""
+-"Whether the context menus of entries and text views should offer to insert "
+-"control characters"
+-msgstr ""
+-"Ali naj vsebinski meniji vnosov in pogledov besedila ponudijo možnost "
+-"vstavljanja nadzornih znakov"
++#: ../gtk/gtksettings.c:487
++msgid "Whether the context menus of entries and text views should offer to insert control characters"
++msgstr "Ali naj vsebinski meniji vnosov in pogledov besedila ponudijo možnost vstavljanja nadzornih znakov"
+
+-#: gtk/gtksettings.c:495
++#: ../gtk/gtksettings.c:495
+ msgid "Start timeout"
+ msgstr "Zagonska zakasnitev"
+
+-#: gtk/gtksettings.c:496
++#: ../gtk/gtksettings.c:496
+ msgid "Starting value for timeouts, when button is pressed"
+ msgstr "Začetna vrednost za časovni zamik, kadar je gumb pritisnjen."
+
+-#: gtk/gtksettings.c:505
++#: ../gtk/gtksettings.c:505
+ msgid "Repeat timeout"
+ msgstr "Ponovi zakasnitev"
+
+-#: gtk/gtksettings.c:506
++#: ../gtk/gtksettings.c:506
+ msgid "Repeat value for timeouts, when button is pressed"
+ msgstr "Ponovi vrednost časovnih zamikov, kadar je pritisnjen gumb"
+
+-#: gtk/gtksettings.c:515
++#: ../gtk/gtksettings.c:515
+ msgid "Expand timeout"
+ msgstr "Časovni zamik razširitve"
+
+-#: gtk/gtksettings.c:516
++#: ../gtk/gtksettings.c:516
+ msgid "Expand value for timeouts, when a widget is expanding a new region"
+ msgstr "Časovni zamik za razširitve kadar gradnik razširi novo območje"
+
+-#: gtk/gtksettings.c:551
++#: ../gtk/gtksettings.c:551
+ msgid "Color scheme"
+ msgstr "Barvna shema"
+
+-#: gtk/gtksettings.c:552
++#: ../gtk/gtksettings.c:552
+ msgid "A palette of named colors for use in themes"
+ msgstr "Paleta imenovanih barv za uporabo v temah"
+
+-#: gtk/gtksettings.c:561
++#: ../gtk/gtksettings.c:561
+ msgid "Enable Animations"
+ msgstr "Omogoči animacije"
+
+-#: gtk/gtksettings.c:562
++#: ../gtk/gtksettings.c:562
+ msgid "Whether to enable toolkit-wide animations."
+ msgstr "Ali naj bodo omogočene toolkit-wide animacije."
+
+-#: gtk/gtksettings.c:580
++#: ../gtk/gtksettings.c:580
+ msgid "Enable Touchscreen Mode"
+ msgstr "Omogoči na dotik občutljivi zaslonski način"
+
+-#: gtk/gtksettings.c:581
++#: ../gtk/gtksettings.c:581
+ msgid "When TRUE, there are no motion notify events delivered on this screen"
+ msgstr "Izbrana možnost omogoča, da ni obvestil o dogodkih gibanja."
+
+-#: gtk/gtksettings.c:598
++#: ../gtk/gtksettings.c:598
+ msgid "Tooltip timeout"
+ msgstr "Časovni zamik namigov"
+
+-#: gtk/gtksettings.c:599
++#: ../gtk/gtksettings.c:599
+ msgid "Timeout before tooltip is shown"
+ msgstr "Časovni zamik preden se pokaže namig orodja"
+
+-#: gtk/gtksettings.c:624
++#: ../gtk/gtksettings.c:624
+ msgid "Tooltip browse timeout"
+ msgstr "Časovni zamik brskanja namigov"
+
+-#: gtk/gtksettings.c:625
++#: ../gtk/gtksettings.c:625
+ msgid "Timeout before tooltip is shown when browse mode is enabled"
+ msgstr "Časovni zamik namigov preden se omogoči brskalni način"
+
+-#: gtk/gtksettings.c:646
++#: ../gtk/gtksettings.c:646
+ msgid "Tooltip browse mode timeout"
+ msgstr "Časovni zamik načina brskanja namigov"
+
+-#: gtk/gtksettings.c:647
++#: ../gtk/gtksettings.c:647
+ msgid "Timeout after which browse mode is disabled"
+ msgstr "Časovni zamik preden se onemogoči brskalni način"
+
+-#: gtk/gtksettings.c:666
++#: ../gtk/gtksettings.c:666
+ msgid "Keynav Cursor Only"
+ msgstr "Le tipkovno krmiljenje"
+
+-#: gtk/gtksettings.c:667
++#: ../gtk/gtksettings.c:667
+ msgid "When TRUE, there are only cursor keys available to navigate widgets"
+-msgstr ""
+-"Izbrana možnost omogoča, da so na voljo le krmilne tipke za upravljanje z "
+-"gradniki"
++msgstr "Izbrana možnost omogoča, da so na voljo le krmilne tipke za upravljanje z gradniki"
+
+-#: gtk/gtksettings.c:684
++#: ../gtk/gtksettings.c:684
+ msgid "Keynav Wrap Around"
+ msgstr "Zavijanje tipkovnice"
+
+-#: gtk/gtksettings.c:685
++#: ../gtk/gtksettings.c:685
+ msgid "Whether to wrap around when keyboard-navigating widgets"
+ msgstr "Ali naj se zavije pri gradnikih krmiljenja tipkovnice"
+
+-#: gtk/gtksettings.c:705
++#: ../gtk/gtksettings.c:705
+ msgid "Error Bell"
+ msgstr "Pisk napake"
+
+-#: gtk/gtksettings.c:706
++#: ../gtk/gtksettings.c:706
+ msgid "When TRUE, keyboard navigation and other errors will cause a beep"
+ msgstr "Izbrana možnost omogoča, da napako sistem javi tudi s piskom"
+
+-#: gtk/gtksettings.c:723
++#: ../gtk/gtksettings.c:723
+ msgid "Color Hash"
+ msgstr "Barvno razršilo"
+
+-#: gtk/gtksettings.c:724
++#: ../gtk/gtksettings.c:724
+ msgid "A hash table representation of the color scheme."
+ msgstr "Preglednica razpršil barvne sheme"
+
+-#: gtk/gtksettings.c:732
++#: ../gtk/gtksettings.c:732
+ msgid "Default file chooser backend"
+ msgstr "Privzeta hrbtenica izbirnika datotek"
+
+-#: gtk/gtksettings.c:733
++#: ../gtk/gtksettings.c:733
+ msgid "Name of the GtkFileChooser backend to use by default"
+ msgstr "Ime privzeto uporabljene GtkFileChooser hrbtenice"
+
+-#: gtk/gtksettings.c:750
++#: ../gtk/gtksettings.c:750
+ msgid "Default print backend"
+ msgstr "Privzeta hrbtenica tiskanja"
+
+-#: gtk/gtksettings.c:751
++#: ../gtk/gtksettings.c:751
+ msgid "List of the GtkPrintBackend backends to use by default"
+ msgstr "Seznam privzeto uporabljene GtkPrintBackend hrbtenice"
+
+-#: gtk/gtksettings.c:774
++#: ../gtk/gtksettings.c:774
+ msgid "Default command to run when displaying a print preview"
+ msgstr "Privzeti ukaz, ki naj se izvede ob prikazu predogleda tiskanja"
+
+-#: gtk/gtksettings.c:775
++#: ../gtk/gtksettings.c:775
+ msgid "Command to run when displaying a print preview"
+ msgstr "Ukaz, ki naj se izvede, ko se prikaže predogled tiskanja"
+
+-#: gtk/gtksettings.c:791
++#: ../gtk/gtksettings.c:791
+ msgid "Enable Mnemonics"
+ msgstr "Omogoči pospeševalne tipke"
+
+-#: gtk/gtksettings.c:792
++#: ../gtk/gtksettings.c:792
+ msgid "Whether labels should have mnemonics"
+ msgstr "Ali naj oznake vsebujejo pospeševalne tipke menija"
+
+-#: gtk/gtksettings.c:808
++#: ../gtk/gtksettings.c:808
+ msgid "Enable Accelerators"
+ msgstr "Omogoči pospeševalnike"
+
+-#: gtk/gtksettings.c:809
++#: ../gtk/gtksettings.c:809
+ msgid "Whether menu items should have accelerators"
+ msgstr "Ali naj imajo predmeti menija pospeševalnike"
+
+-#: gtk/gtksettings.c:826
++#: ../gtk/gtksettings.c:826
+ msgid "Recent Files Limit"
+ msgstr "Omejitev nedavnih datotek"
+
+-#: gtk/gtksettings.c:827
++#: ../gtk/gtksettings.c:827
+ msgid "Number of recently used files"
+ msgstr "Število nazadnje uporabljenih datotek"
+
+-#: gtk/gtksettings.c:841
++#: ../gtk/gtksettings.c:841
+ msgid "Default IM module"
+ msgstr "Privzeta IM enota"
+
+-#: gtk/gtksettings.c:842
++#: ../gtk/gtksettings.c:842
+ msgid "Which IM module should be used by default"
+ msgstr "Katera IM enota naj bo privzeto uporabljena"
+
+-#: gtk/gtksettings.c:860
++#: ../gtk/gtksettings.c:860
+ msgid "Recent Files Max Age"
+ msgstr "Nedavna največja starost datotek"
+
+-#: gtk/gtksettings.c:861
++#: ../gtk/gtksettings.c:861
+ msgid "Maximum age of recently used files, in days"
+ msgstr "Največja starost nedavno uporabljenih datotek v dneh"
+
+-#: gtk/gtksettings.c:870
++#: ../gtk/gtksettings.c:870
+ msgid "Fontconfig configuration timestamp"
+ msgstr "Časovni žig nastavitev Fontconfig"
+
+-#: gtk/gtksettings.c:871
++#: ../gtk/gtksettings.c:871
+ msgid "Timestamp of current fontconfig configuration"
+ msgstr "Časovni žig trenutne nastavitve fontconfig"
+
+-#: gtk/gtksettings.c:893
++#: ../gtk/gtksettings.c:893
+ msgid "Sound Theme Name"
+ msgstr "Ime zvočne teme"
+
+-#: gtk/gtksettings.c:894
++#: ../gtk/gtksettings.c:894
+ msgid "XDG sound theme name"
+ msgstr "Ime XDG zvočne teme"
+
+ #. Translators: this means sounds that are played as feedback to user input
+-#: gtk/gtksettings.c:916
++#: ../gtk/gtksettings.c:916
+ msgid "Audible Input Feedback"
+ msgstr "Dovod zvočnega odziva"
+
+-#: gtk/gtksettings.c:917
++#: ../gtk/gtksettings.c:917
+ msgid "Whether to play event sounds as feedback to user input"
+ msgstr "Ali se predvajajo zvočni odzivi na uporabnikove vnose"
+
+-#: gtk/gtksettings.c:938
++#: ../gtk/gtksettings.c:938
+ msgid "Enable Event Sounds"
+ msgstr "Omogoči zvočno javljanje dogodkov"
+
+-#: gtk/gtksettings.c:939
++#: ../gtk/gtksettings.c:939
+ msgid "Whether to play any event sounds at all"
+ msgstr "Ali naj se predvajajo zvoki dogodkov"
+
+-#: gtk/gtksettings.c:954
++#: ../gtk/gtksettings.c:954
+ msgid "Enable Tooltips"
+ msgstr "Omogoči namige"
+
+-#: gtk/gtksettings.c:955
++#: ../gtk/gtksettings.c:955
+ msgid "Whether tooltips should be shown on widgets"
+ msgstr "Ali naj se prikažejo namigi na gradnikih"
+
+-#: gtk/gtksizegroup.c:293
++#: ../gtk/gtksizegroup.c:293
+ msgid "Mode"
+ msgstr "Način"
+
+-#: gtk/gtksizegroup.c:294
+-msgid ""
+-"The directions in which the size group affects the requested sizes of its "
+-"component widgets"
+-msgstr ""
+-"Smeri v katerih velikostna skupina vpliva na želene velikosti njenih "
+-"gradnikov"
++#: ../gtk/gtksizegroup.c:294
++msgid "The directions in which the size group affects the requested sizes of its component widgets"
++msgstr "Smeri v katerih velikostna skupina vpliva na želene velikosti njenih gradnikov"
+
+-#: gtk/gtksizegroup.c:310
++#: ../gtk/gtksizegroup.c:310
+ msgid "Ignore hidden"
+ msgstr "Prezri skrite"
+
+-#: gtk/gtksizegroup.c:311
+-msgid ""
+-"If TRUE, unmapped widgets are ignored when determining the size of the group"
+-msgstr ""
+-"Izbrana možnost omogoča, da so pri določanju velikosti skupine gradniki, ki "
+-"niso preslikani, prezrti."
++#: ../gtk/gtksizegroup.c:311
++msgid "If TRUE, unmapped widgets are ignored when determining the size of the group"
++msgstr "Izbrana možnost omogoča, da so pri določanju velikosti skupine gradniki, ki niso preslikani, prezrti."
+
+-#: gtk/gtkspinbutton.c:209
++#: ../gtk/gtkspinbutton.c:209
+ msgid "The adjustment that holds the value of the spinbutton"
+ msgstr "Prilagoditev, ki drži vrednost vrtilnega gumba"
+
+-#: gtk/gtkspinbutton.c:216
++#: ../gtk/gtkspinbutton.c:216
+ msgid "Climb Rate"
+ msgstr "Pospešek"
+
+-#: gtk/gtkspinbutton.c:236
++#: ../gtk/gtkspinbutton.c:236
+ msgid "Snap to Ticks"
+ msgstr "Preskoči na vrednosti"
+
+-#: gtk/gtkspinbutton.c:237
+-msgid ""
+-"Whether erroneous values are automatically changed to a spin button's "
+-"nearest step increment"
+-msgstr ""
+-"Ali nepravilne vrednosti samodejno preskočijo na najbližje povečave korakov "
+-"vrtilnega gumba"
++#: ../gtk/gtkspinbutton.c:237
++msgid "Whether erroneous values are automatically changed to a spin button's nearest step increment"
++msgstr "Ali nepravilne vrednosti samodejno preskočijo na najbližje povečave korakov vrtilnega gumba"
+
+-#: gtk/gtkspinbutton.c:244
++#: ../gtk/gtkspinbutton.c:244
+ msgid "Numeric"
+ msgstr "Številke"
+
+-#: gtk/gtkspinbutton.c:245
++#: ../gtk/gtkspinbutton.c:245
+ msgid "Whether non-numeric characters should be ignored"
+ msgstr "Ali so neštevilčne vrednosti prezrte"
+
+-#: gtk/gtkspinbutton.c:252
++#: ../gtk/gtkspinbutton.c:252
+ msgid "Wrap"
+ msgstr "Prelomi"
+
+-#: gtk/gtkspinbutton.c:253
++#: ../gtk/gtkspinbutton.c:253
+ msgid "Whether a spin button should wrap upon reaching its limits"
+ msgstr "Ali naj vrtilni gumb naredi prelom, ko doseže svojo mejo"
+
+-#: gtk/gtkspinbutton.c:260
++#: ../gtk/gtkspinbutton.c:260
+ msgid "Update Policy"
+ msgstr "Način posodabljanja"
+
+-#: gtk/gtkspinbutton.c:261
+-msgid ""
+-"Whether the spin button should update always, or only when the value is legal"
+-msgstr ""
+-"Ali naj se vrtilni gumb posodablja vedno, ali le takrat kadar je vrednost "
+-"dovoljena"
++#: ../gtk/gtkspinbutton.c:261
++msgid "Whether the spin button should update always, or only when the value is legal"
++msgstr "Ali naj se vrtilni gumb posodablja vedno, ali le takrat kadar je vrednost dovoljena"
+
+-#: gtk/gtkspinbutton.c:270
++#: ../gtk/gtkspinbutton.c:270
+ msgid "Reads the current value, or sets a new value"
+ msgstr "Prebere trenutno vrednost ali nastavi novo"
+
+-#: gtk/gtkspinbutton.c:279
++#: ../gtk/gtkspinbutton.c:279
+ msgid "Style of bevel around the spin button"
+ msgstr "Slog vogalnice okoli krožnih gumbov"
+
+-#: gtk/gtkstatusbar.c:141
++#: ../gtk/gtkstatusbar.c:141
+ msgid "Has Resize Grip"
+ msgstr "Vsebuje oprijemalnik velikosti"
+
+-#: gtk/gtkstatusbar.c:142
++#: ../gtk/gtkstatusbar.c:142
+ msgid "Whether the statusbar has a grip for resizing the toplevel"
+ msgstr "Ali ima vrstica stanja oprijemalnik za spreminjanje velikosti okna"
+
+-#: gtk/gtkstatusbar.c:187
++#: ../gtk/gtkstatusbar.c:187
+ msgid "Style of bevel around the statusbar text"
+ msgstr "Slog vogalnice okoli besedila vrstice stanja"
+
+-#: gtk/gtkstatusicon.c:226
++#: ../gtk/gtkstatusicon.c:226
+ msgid "GIcon"
+ msgstr "GIcon"
+
+-#: gtk/gtkstatusicon.c:244
++#: ../gtk/gtkstatusicon.c:244
+ msgid "The size of the icon"
+ msgstr "Velikost ikone"
+
+-#: gtk/gtkstatusicon.c:254
++#: ../gtk/gtkstatusicon.c:254
+ msgid "The screen where this status icon will be displayed"
+ msgstr "Zaslon, na katerem bo prikazana ikona stanja"
+
+-#: gtk/gtkstatusicon.c:261
++#: ../gtk/gtkstatusicon.c:261
+ msgid "Blinking"
+ msgstr "Utripanje"
+
+-#: gtk/gtkstatusicon.c:262
++#: ../gtk/gtkstatusicon.c:262
+ msgid "Whether or not the status icon is blinking"
+ msgstr "Ali naj ikona stanja utripa"
+
+-#: gtk/gtkstatusicon.c:270
++#: ../gtk/gtkstatusicon.c:270
+ msgid "Whether or not the status icon is visible"
+ msgstr "Ali naj bo ikona stanja vidna"
+
+-#: gtk/gtkstatusicon.c:286
++#: ../gtk/gtkstatusicon.c:286
+ msgid "Whether or not the status icon is embedded"
+ msgstr "Ali naj bo ikona stanja vstavljena"
+
+-#: gtk/gtkstatusicon.c:302 gtk/gtktrayicon-x11.c:96
++#: ../gtk/gtkstatusicon.c:302
++#: ../gtk/gtktrayicon-x11.c:96
+ msgid "The orientation of the tray"
+ msgstr "Usmeritev pladnja."
+
+-#: gtk/gtktable.c:129
++#: ../gtk/gtktable.c:129
+ msgid "Rows"
+ msgstr "Vrstice"
+
+-#: gtk/gtktable.c:130
++#: ../gtk/gtktable.c:130
+ msgid "The number of rows in the table"
+ msgstr "Število vrstic v razpredelnici"
+
+-#: gtk/gtktable.c:138
++#: ../gtk/gtktable.c:138
+ msgid "Columns"
+ msgstr "Stolpci"
+
+-#: gtk/gtktable.c:139
++#: ../gtk/gtktable.c:139
+ msgid "The number of columns in the table"
+ msgstr "Število stolpcev v razpredelnici"
+
+-#: gtk/gtktable.c:147
++#: ../gtk/gtktable.c:147
+ msgid "Row spacing"
+ msgstr "Prostor med vrsticami"
+
+-#: gtk/gtktable.c:148
++#: ../gtk/gtktable.c:148
+ msgid "The amount of space between two consecutive rows"
+ msgstr "Količina prostora med zaporednima vrsticama"
+
+-#: gtk/gtktable.c:156
++#: ../gtk/gtktable.c:156
+ msgid "Column spacing"
+ msgstr "Prostor med stolpci"
+
+-#: gtk/gtktable.c:157
++#: ../gtk/gtktable.c:157
+ msgid "The amount of space between two consecutive columns"
+ msgstr "Količina prostora med zaporednima stolpcema"
+
+-#: gtk/gtktable.c:166
++#: ../gtk/gtktable.c:166
+ msgid "If TRUE, the table cells are all the same width/height"
+ msgstr "Izbrana možnost omogoča, da imajo vse celice enako višino in širino"
+
+-#: gtk/gtktable.c:173
++#: ../gtk/gtktable.c:173
+ msgid "Left attachment"
+ msgstr "Leva priponka"
+
+-#: gtk/gtktable.c:180
++#: ../gtk/gtktable.c:180
+ msgid "Right attachment"
+ msgstr "Desna priloga"
+
+-#: gtk/gtktable.c:181
++#: ../gtk/gtktable.c:181
+ msgid "The column number to attach the right side of a child widget to"
+ msgstr "Številka stolpca, ki naj se pripoji desni strani podrejenega gradnika"
+
+-#: gtk/gtktable.c:187
++#: ../gtk/gtktable.c:187
+ msgid "Top attachment"
+ msgstr "Vrhnja priloga"
+
+-#: gtk/gtktable.c:188
++#: ../gtk/gtktable.c:188
+ msgid "The row number to attach the top of a child widget to"
+-msgstr ""
+-"Številka vrstice, ki naj se pripoji zgornji strani podrejenega gradnika"
++msgstr "Številka vrstice, ki naj se pripoji zgornji strani podrejenega gradnika"
+
+-#: gtk/gtktable.c:194
++#: ../gtk/gtktable.c:194
+ msgid "Bottom attachment"
+ msgstr "Spodnja priloga"
+
+-#: gtk/gtktable.c:201
++#: ../gtk/gtktable.c:201
+ msgid "Horizontal options"
+ msgstr "Vodoravne možnosti"
+
+-#: gtk/gtktable.c:202
++#: ../gtk/gtktable.c:202
+ msgid "Options specifying the horizontal behaviour of the child"
+ msgstr "Možnosti, ki določajo vodoravno obnašanje podrejenega predmeta"
+
+-#: gtk/gtktable.c:208
++#: ../gtk/gtktable.c:208
+ msgid "Vertical options"
+ msgstr "Navpične možnosti"
+
+-#: gtk/gtktable.c:209
++#: ../gtk/gtktable.c:209
+ msgid "Options specifying the vertical behaviour of the child"
+ msgstr "Možnosti, ki določajo navpično obnašanje podrejenega predmeta"
+
+-#: gtk/gtktable.c:215
++#: ../gtk/gtktable.c:215
+ msgid "Horizontal padding"
+ msgstr "Vodoravno polnjenje"
+
+-#: gtk/gtktable.c:216
+-msgid ""
+-"Extra space to put between the child and its left and right neighbors, in "
+-"pixels"
+-msgstr ""
+-"Količina prostora, ki naj se doda med podrejeni predmeta in njegove leve in "
+-"desne sosede, v točkah"
++#: ../gtk/gtktable.c:216
++msgid "Extra space to put between the child and its left and right neighbors, in pixels"
++msgstr "Količina prostora, ki naj se doda med podrejeni predmeta in njegove leve in desne sosede, v točkah"
+
+-#: gtk/gtktable.c:222
++#: ../gtk/gtktable.c:222
+ msgid "Vertical padding"
+ msgstr "Navpično polnjenje"
+
+-#: gtk/gtktable.c:223
+-msgid ""
+-"Extra space to put between the child and its upper and lower neighbors, in "
+-"pixels"
+-msgstr ""
+-"Količina prostora, ki naj se doda med podrejeni predmet in njegove zgornje "
+-"in spodnje sosede, v točkah"
++#: ../gtk/gtktable.c:223
++msgid "Extra space to put between the child and its upper and lower neighbors, in pixels"
++msgstr "Količina prostora, ki naj se doda med podrejeni predmet in njegove zgornje in spodnje sosede, v točkah"
+
+-#: gtk/gtktext.c:546
++#: ../gtk/gtktext.c:546
+ msgid "Horizontal adjustment for the text widget"
+ msgstr "Vodoravna prilagoditev za gradnik besedila"
+
+-#: gtk/gtktext.c:554
++#: ../gtk/gtktext.c:554
+ msgid "Vertical adjustment for the text widget"
+ msgstr "Navpična prilagoditev za gradnik besedila"
+
+-#: gtk/gtktext.c:561
++#: ../gtk/gtktext.c:561
+ msgid "Line Wrap"
+ msgstr "Prelomi vrstice"
+
+-#: gtk/gtktext.c:562
++#: ../gtk/gtktext.c:562
+ msgid "Whether lines are wrapped at widget edges"
+ msgstr "Ali se na robu gradnika vrstice lomijo"
+
+-#: gtk/gtktext.c:569
++#: ../gtk/gtktext.c:569
+ msgid "Word Wrap"
+ msgstr "Prelomi besede"
+
+-#: gtk/gtktext.c:570
++#: ../gtk/gtktext.c:570
+ msgid "Whether words are wrapped at widget edges"
+ msgstr "Ali se besede lomijo na koncu gradnika"
+
+-#: gtk/gtktextbuffer.c:179
++#: ../gtk/gtktextbuffer.c:179
+ msgid "Tag Table"
+ msgstr "Razpredelnica oznak"
+
+-#: gtk/gtktextbuffer.c:180
++#: ../gtk/gtktextbuffer.c:180
+ msgid "Text Tag Table"
+ msgstr "Besedilo razpredelnice oznak"
+
+-#: gtk/gtktextbuffer.c:198
++#: ../gtk/gtktextbuffer.c:198
+ msgid "Current text of the buffer"
+ msgstr "Trenutno besedilo medpomnilnika"
+
+-#: gtk/gtktextbuffer.c:212
++#: ../gtk/gtktextbuffer.c:212
+ msgid "Has selection"
+ msgstr "Vsebuje izbrano"
+
+-#: gtk/gtktextbuffer.c:213
++#: ../gtk/gtktextbuffer.c:213
+ msgid "Whether the buffer has some text currently selected"
+ msgstr "Ali vsebuje medpomnilnik trenutno izbrano besedilo"
+
+-#: gtk/gtktextbuffer.c:229
++#: ../gtk/gtktextbuffer.c:229
+ msgid "Cursor position"
+ msgstr "Lega kazalca"
+
+-#: gtk/gtktextbuffer.c:230
+-msgid ""
+-"The position of the insert mark (as offset from the beginning of the buffer)"
++#: ../gtk/gtktextbuffer.c:230
++msgid "The position of the insert mark (as offset from the beginning of the buffer)"
+ msgstr "Lega oznake vstavljanja (kot zamik od začetka medpomnilnika)"
+
+-#: gtk/gtktextbuffer.c:245
++#: ../gtk/gtktextbuffer.c:245
+ msgid "Copy target list"
+ msgstr "Kopiraj seznam ciljev"
+
+-#: gtk/gtktextbuffer.c:246
+-msgid ""
+-"The list of targets this buffer supports for clipboard copying and DND source"
+-msgstr ""
+-"Seznam ciljev katerih medpomnilnik podpira možnost kopiraj v odložišče in "
+-"DND vire."
++#: ../gtk/gtktextbuffer.c:246
++msgid "The list of targets this buffer supports for clipboard copying and DND source"
++msgstr "Seznam ciljev katerih medpomnilnik podpira možnost kopiraj v odložišče in DND vire."
+
+-#: gtk/gtktextbuffer.c:261
++#: ../gtk/gtktextbuffer.c:261
+ msgid "Paste target list"
+ msgstr "Prilepi seznam ciljev"
+
+-#: gtk/gtktextbuffer.c:262
+-msgid ""
+-"The list of targets this buffer supports for clipboard pasting and DND "
+-"destination"
+-msgstr ""
+-"Seznam ciljev katerih medpomnilnik podpira možnost prilepi v odložišče in "
+-"DND cilje."
++#: ../gtk/gtktextbuffer.c:262
++msgid "The list of targets this buffer supports for clipboard pasting and DND destination"
++msgstr "Seznam ciljev katerih medpomnilnik podpira možnost prilepi v odložišče in DND cilje."
+
+-#: gtk/gtktextmark.c:90
++#: ../gtk/gtktextmark.c:90
+ msgid "Mark name"
+ msgstr "Ime oznake"
+
+-#: gtk/gtktextmark.c:97
++#: ../gtk/gtktextmark.c:97
+ msgid "Left gravity"
+ msgstr "Leva težnost"
+
+-#: gtk/gtktextmark.c:98
++#: ../gtk/gtktextmark.c:98
+ msgid "Whether the mark has left gravity"
+ msgstr "Ali ima oznaka levo težnost"
+
+-#: gtk/gtktexttag.c:173
++#: ../gtk/gtktexttag.c:173
+ msgid "Tag name"
+ msgstr "Ime značke"
+
+-#: gtk/gtktexttag.c:174
++#: ../gtk/gtktexttag.c:174
+ msgid "Name used to refer to the text tag. NULL for anonymous tags"
+ msgstr "Ime za značke besedila. NULL za neimenovane značke"
+
+-#: gtk/gtktexttag.c:192
++#: ../gtk/gtktexttag.c:192
+ msgid "Background color as a (possibly unallocated) GdkColor"
+ msgstr "Barva ozadja kot (po možnosti ni rezerviran) GdkColor"
+
+-#: gtk/gtktexttag.c:199
++#: ../gtk/gtktexttag.c:199
+ msgid "Background full height"
+ msgstr "Polna višina ozadja"
+
+-#: gtk/gtktexttag.c:200
+-msgid ""
+-"Whether the background color fills the entire line height or only the height "
+-"of the tagged characters"
+-msgstr ""
+-"Ali barva ozadja napolni celotno višino vrstice ali le višino označenih "
+-"znakov"
++#: ../gtk/gtktexttag.c:200
++msgid "Whether the background color fills the entire line height or only the height of the tagged characters"
++msgstr "Ali barva ozadja napolni celotno višino vrstice ali le višino označenih znakov"
+
+-#: gtk/gtktexttag.c:208
++#: ../gtk/gtktexttag.c:208
+ msgid "Background stipple mask"
+ msgstr "Maska ozadja"
+
+-#: gtk/gtktexttag.c:209
++#: ../gtk/gtktexttag.c:209
+ msgid "Bitmap to use as a mask when drawing the text background"
+ msgstr "Maska, ki naj se uporabi ob risanju besedila na ozadje"
+
+-#: gtk/gtktexttag.c:226
++#: ../gtk/gtktexttag.c:226
+ msgid "Foreground color as a (possibly unallocated) GdkColor"
+ msgstr "Barva ospredja kot (po možnosti ni rezerviran) GdkColor"
+
+-#: gtk/gtktexttag.c:234
++#: ../gtk/gtktexttag.c:234
+ msgid "Foreground stipple mask"
+ msgstr "Maska ospredja"
+
+-#: gtk/gtktexttag.c:235
++#: ../gtk/gtktexttag.c:235
+ msgid "Bitmap to use as a mask when drawing the text foreground"
+ msgstr "Maska, ki naj se uporabi ob risanju besedila na ospredje"
+
+-#: gtk/gtktexttag.c:242
++#: ../gtk/gtktexttag.c:242
+ msgid "Text direction"
+ msgstr "Smer besedila"
+
+-#: gtk/gtktexttag.c:243
++#: ../gtk/gtktexttag.c:243
+ msgid "Text direction, e.g. right-to-left or left-to-right"
+ msgstr "Smer besedila, npr. desna-proti-levi ali leva-proti-desni"
+
+-#: gtk/gtktexttag.c:292
++#: ../gtk/gtktexttag.c:292
+ msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
+ msgstr "Slog pisave kot PangoStyle, npr: PANGO_STYLE_ITALIC"
+
+-#: gtk/gtktexttag.c:301
++#: ../gtk/gtktexttag.c:301
+ msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
+ msgstr "Različica pisave kot PangoVariant, npr.: PANGO_VArIANT_SMALL_CAPS"
+
+-#: gtk/gtktexttag.c:310
+-msgid ""
+-"Font weight as an integer, see predefined values in PangoWeight; for "
+-"example, PANGO_WEIGHT_BOLD"
+-msgstr ""
+-"Teža pisave kot številka, poglejte preddefinirane vrednosti v PangoWeight; "
+-"npr.: PANGO_WEIGHT_BOLD"
++#: ../gtk/gtktexttag.c:310
++msgid "Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD"
++msgstr "Teža pisave kot številka, poglejte preddefinirane vrednosti v PangoWeight; npr.: PANGO_WEIGHT_BOLD"
+
+-#: gtk/gtktexttag.c:321
++#: ../gtk/gtktexttag.c:321
+ msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
+ msgstr "Razteg pisave kot PangoStretch, npr.: PAnGO_STRECTH_CONDENSED"
+
+-#: gtk/gtktexttag.c:330
++#: ../gtk/gtktexttag.c:330
+ msgid "Font size in Pango units"
+ msgstr "Velikost pisave v enotah Pango"
+
+-#: gtk/gtktexttag.c:340
+-msgid ""
+-"Font size as a scale factor relative to the default font size. This properly "
+-"adapts to theme changes etc. so is recommended. Pango predefines some scales "
+-"such as PANGO_SCALE_X_LARGE"
+-msgstr ""
+-"Velikost pisave kot faktor povečave relativen na privzeto velikost pisave. "
+-"Ta lastnost se prilagaja na nastavitve teme, zato je priporočena. Pango v "
+-"naprej navede nekatere faktorje, npr.: PANGO_SCALE_X_LARGE"
++#: ../gtk/gtktexttag.c:340
++msgid "Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE"
++msgstr "Velikost pisave kot faktor povečave relativen na privzeto velikost pisave. Ta lastnost se prilagaja na nastavitve teme, zato je priporočena. Pango v naprej navede nekatere faktorje, npr.: PANGO_SCALE_X_LARGE"
+
+-#: gtk/gtktexttag.c:360 gtk/gtktextview.c:586
++#: ../gtk/gtktexttag.c:360
++#: ../gtk/gtktextview.c:586
+ msgid "Left, right, or center justification"
+ msgstr "Poravnava levo, desno ali po sredini"
+
+-#: gtk/gtktexttag.c:379
+-msgid ""
+-"The language this text is in, as an ISO code. Pango can use this as a hint "
+-"when rendering the text. If not set, an appropriate default will be used."
+-msgstr ""
+-"Jezik v katerem je to besedilo napisano, v obliki kode ISO. Pango lahko "
+-"uporabi to kot namig ob upodabljanju besedila. Če parameter ni nastavljen, "
+-"bo uporabljena privzeta vrednost."
++#: ../gtk/gtktexttag.c:379
++msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If not set, an appropriate default will be used."
++msgstr "Jezik v katerem je to besedilo napisano, v obliki kode ISO. Pango lahko uporabi to kot namig ob upodabljanju besedila. Če parameter ni nastavljen, bo uporabljena privzeta vrednost."
+
+-#: gtk/gtktexttag.c:386
++#: ../gtk/gtktexttag.c:386
+ msgid "Left margin"
+ msgstr "Levi odmik"
+
+-#: gtk/gtktexttag.c:387 gtk/gtktextview.c:595
++#: ../gtk/gtktexttag.c:387
++#: ../gtk/gtktextview.c:595
+ msgid "Width of the left margin in pixels"
+ msgstr "Širina levega odmika v slikovnih točkah"
+
+-#: gtk/gtktexttag.c:396
++#: ../gtk/gtktexttag.c:396
+ msgid "Right margin"
+ msgstr "Desni odmik"
+
+-#: gtk/gtktexttag.c:397 gtk/gtktextview.c:605
++#: ../gtk/gtktexttag.c:397
++#: ../gtk/gtktextview.c:605
+ msgid "Width of the right margin in pixels"
+ msgstr "Širina desnega odmika v slikovnih točkah"
+
+-#: gtk/gtktexttag.c:407 gtk/gtktextview.c:614
++#: ../gtk/gtktexttag.c:407
++#: ../gtk/gtktextview.c:614
+ msgid "Indent"
+ msgstr "Zamik"
+
+-#: gtk/gtktexttag.c:408 gtk/gtktextview.c:615
++#: ../gtk/gtktexttag.c:408
++#: ../gtk/gtktextview.c:615
+ msgid "Amount to indent the paragraph, in pixels"
+ msgstr "Za koliko točk naj bo zamaknjen odstavek"
+
+-#: gtk/gtktexttag.c:419
+-msgid ""
+-"Offset of text above the baseline (below the baseline if rise is negative) "
+-"in Pango units"
+-msgstr ""
+-"Odmik besedila nad osnovno črto (pod osnovno črto, je če dvig negativen) v "
+-"enotah Panga"
++#: ../gtk/gtktexttag.c:419
++msgid "Offset of text above the baseline (below the baseline if rise is negative) in Pango units"
++msgstr "Odmik besedila nad osnovno črto (pod osnovno črto, je če dvig negativen) v enotah Panga"
+
+-#: gtk/gtktexttag.c:428
++#: ../gtk/gtktexttag.c:428
+ msgid "Pixels above lines"
+ msgstr "Točke nad črtami"
+
+-#: gtk/gtktexttag.c:429 gtk/gtktextview.c:539
++#: ../gtk/gtktexttag.c:429
++#: ../gtk/gtktextview.c:539
+ msgid "Pixels of blank space above paragraphs"
+ msgstr "Število točk praznega prostora nad odstavki"
+
+-#: gtk/gtktexttag.c:438
++#: ../gtk/gtktexttag.c:438
+ msgid "Pixels below lines"
+ msgstr "Točke pod črtami"
+
+-#: gtk/gtktexttag.c:439 gtk/gtktextview.c:549
++#: ../gtk/gtktexttag.c:439
++#: ../gtk/gtktextview.c:549
+ msgid "Pixels of blank space below paragraphs"
+ msgstr "Število točk praznega prostora pod odstavki"
+
+-#: gtk/gtktexttag.c:448
++#: ../gtk/gtktexttag.c:448
+ msgid "Pixels inside wrap"
+ msgstr "Točke znotraj odstavkov"
+
+-#: gtk/gtktexttag.c:449 gtk/gtktextview.c:559
++#: ../gtk/gtktexttag.c:449
++#: ../gtk/gtktextview.c:559
+ msgid "Pixels of blank space between wrapped lines in a paragraph"
+ msgstr "Število točk praznega prostora med prelomi vrstic znotraj odstavkov"
+
+-#: gtk/gtktexttag.c:476 gtk/gtktextview.c:577
+-msgid ""
+-"Whether to wrap lines never, at word boundaries, or at character boundaries"
++#: ../gtk/gtktexttag.c:476
++#: ../gtk/gtktextview.c:577
++msgid "Whether to wrap lines never, at word boundaries, or at character boundaries"
+ msgstr "Ali naj se vrstice lomi nikoli, na meji besed ali na meji znakov"
+
+-#: gtk/gtktexttag.c:485 gtk/gtktextview.c:624
++#: ../gtk/gtktexttag.c:485
++#: ../gtk/gtktextview.c:624
+ msgid "Tabs"
+ msgstr "Zavihki"
+
+-#: gtk/gtktexttag.c:486 gtk/gtktextview.c:625
++#: ../gtk/gtktexttag.c:486
++#: ../gtk/gtktextview.c:625
+ msgid "Custom tabs for this text"
+ msgstr "Poljubni zavihki za to besedilo"
+
+-#: gtk/gtktexttag.c:504
++#: ../gtk/gtktexttag.c:504
+ msgid "Invisible"
+ msgstr "Nevidno"
+
+-#: gtk/gtktexttag.c:505
++#: ../gtk/gtktexttag.c:505
+ msgid "Whether this text is hidden."
+ msgstr "Ali naj bo to besedilo skrito."
+
+-#: gtk/gtktexttag.c:519
++#: ../gtk/gtktexttag.c:519
+ msgid "Paragraph background color name"
+ msgstr "Ime barve ozadja odstavka"
+
+-#: gtk/gtktexttag.c:520
++#: ../gtk/gtktexttag.c:520
+ msgid "Paragraph background color as a string"
+ msgstr "Barva ozadja odstavka kot niz"
+
+-#: gtk/gtktexttag.c:535
++#: ../gtk/gtktexttag.c:535
+ msgid "Paragraph background color"
+ msgstr "Barva ozadja odstavka"
+
+-#: gtk/gtktexttag.c:536
++#: ../gtk/gtktexttag.c:536
+ msgid "Paragraph background color as a (possibly unallocated) GdkColor"
+ msgstr "Barva ozadja odstavka kot (po možnosti ni rezerviran) GdkColor"
+
+-#: gtk/gtktexttag.c:554
++#: ../gtk/gtktexttag.c:554
+ msgid "Margin Accumulates"
+ msgstr "Združeni rob"
+
+-#: gtk/gtktexttag.c:555
++#: ../gtk/gtktexttag.c:555
+ msgid "Whether left and right margins accumulate."
+ msgstr "Ali se levi in desni robovi združujejo."
+
+-#: gtk/gtktexttag.c:568
++#: ../gtk/gtktexttag.c:568
+ msgid "Background full height set"
+ msgstr "Nastavi polno višino ozadja"
+
+-#: gtk/gtktexttag.c:569
++#: ../gtk/gtktexttag.c:569
+ msgid "Whether this tag affects background height"
+ msgstr "Ali ta značka vpliva na višino ozadja"
+
+-#: gtk/gtktexttag.c:572
++#: ../gtk/gtktexttag.c:572
+ msgid "Background stipple set"
+ msgstr "Nastavi masko ozadja"
+
+-#: gtk/gtktexttag.c:573
++#: ../gtk/gtktexttag.c:573
+ msgid "Whether this tag affects the background stipple"
+ msgstr "Ali ta značka vpliva na masko ozadja"
+
+-#: gtk/gtktexttag.c:580
++#: ../gtk/gtktexttag.c:580
+ msgid "Foreground stipple set"
+ msgstr "Maska ospredja"
+
+-#: gtk/gtktexttag.c:581
++#: ../gtk/gtktexttag.c:581
+ msgid "Whether this tag affects the foreground stipple"
+ msgstr "Ali ta značka vpliva na masko ospredja"
+
+-#: gtk/gtktexttag.c:616
++#: ../gtk/gtktexttag.c:616
+ msgid "Justification set"
+ msgstr "Nastavi poravnavo"
+
+-#: gtk/gtktexttag.c:617
++#: ../gtk/gtktexttag.c:617
+ msgid "Whether this tag affects paragraph justification"
+ msgstr "Ali ta značka vpliva na poravnavo"
+
+-#: gtk/gtktexttag.c:624
++#: ../gtk/gtktexttag.c:624
+ msgid "Left margin set"
+ msgstr "Nastavi levi odmik"
+
+-#: gtk/gtktexttag.c:625
++#: ../gtk/gtktexttag.c:625
+ msgid "Whether this tag affects the left margin"
+ msgstr "Ali ta značka vpliva na levi odmik"
+
+-#: gtk/gtktexttag.c:628
++#: ../gtk/gtktexttag.c:628
+ msgid "Indent set"
+ msgstr "Nastavi zamik"
+
+-#: gtk/gtktexttag.c:629
++#: ../gtk/gtktexttag.c:629
+ msgid "Whether this tag affects indentation"
+ msgstr "Ali ta značka vpliva na odmik"
+
+-#: gtk/gtktexttag.c:636
++#: ../gtk/gtktexttag.c:636
+ msgid "Pixels above lines set"
+ msgstr "Nastavi točke nad črtami"
+
+-#: gtk/gtktexttag.c:637 gtk/gtktexttag.c:641
++#: ../gtk/gtktexttag.c:637
++#: ../gtk/gtktexttag.c:641
+ msgid "Whether this tag affects the number of pixels above lines"
+ msgstr "Ali ta značka vpliva na točke nad črtami"
+
+-#: gtk/gtktexttag.c:640
++#: ../gtk/gtktexttag.c:640
+ msgid "Pixels below lines set"
+ msgstr "Nastavi točke pod črtami"
+
+-#: gtk/gtktexttag.c:644
++#: ../gtk/gtktexttag.c:644
+ msgid "Pixels inside wrap set"
+ msgstr "Nastavi točke v odstavkih"
+
+-#: gtk/gtktexttag.c:645
++#: ../gtk/gtktexttag.c:645
+ msgid "Whether this tag affects the number of pixels between wrapped lines"
+ msgstr "Ali ta značka vpliva na število točk med prelomi vrstic v odstavkih"
+
+-#: gtk/gtktexttag.c:652
++#: ../gtk/gtktexttag.c:652
+ msgid "Right margin set"
+ msgstr "Nastavi desni odmik"
+
+-#: gtk/gtktexttag.c:653
++#: ../gtk/gtktexttag.c:653
+ msgid "Whether this tag affects the right margin"
+ msgstr "Ali ta značka vpliva na desni odmik"
+
+-#: gtk/gtktexttag.c:660
++#: ../gtk/gtktexttag.c:660
+ msgid "Wrap mode set"
+ msgstr "Nastavi način lomljenja"
+
+-#: gtk/gtktexttag.c:661
++#: ../gtk/gtktexttag.c:661
+ msgid "Whether this tag affects line wrap mode"
+ msgstr "Ali ta značka vpliva na način lomljenja"
+
+-#: gtk/gtktexttag.c:664
++#: ../gtk/gtktexttag.c:664
+ msgid "Tabs set"
+ msgstr "Nastavi zavihke"
+
+-#: gtk/gtktexttag.c:665
++#: ../gtk/gtktexttag.c:665
+ msgid "Whether this tag affects tabs"
+ msgstr "Ali ta značka vpliva na zavihke"
+
+-#: gtk/gtktexttag.c:668
++#: ../gtk/gtktexttag.c:668
+ msgid "Invisible set"
+ msgstr "Nastavi nevidnost"
+
+-#: gtk/gtktexttag.c:669
++#: ../gtk/gtktexttag.c:669
+ msgid "Whether this tag affects text visibility"
+ msgstr "Ali ta značka vpliva na nevidnost"
+
+-#: gtk/gtktexttag.c:672
++#: ../gtk/gtktexttag.c:672
+ msgid "Paragraph background set"
+ msgstr "Nastavi barvo ozadja odstavka"
+
+-#: gtk/gtktexttag.c:673
++#: ../gtk/gtktexttag.c:673
+ msgid "Whether this tag affects the paragraph background color"
+ msgstr "Ali ta značka vpliva na barvo ozadja odstavka"
+
+-#: gtk/gtktextview.c:538
++#: ../gtk/gtktextview.c:538
+ msgid "Pixels Above Lines"
+ msgstr "Slikovne točke nad črtami"
+
+-#: gtk/gtktextview.c:548
++#: ../gtk/gtktextview.c:548
+ msgid "Pixels Below Lines"
+ msgstr "Slikovne točke pod črtami"
+
+-#: gtk/gtktextview.c:558
++#: ../gtk/gtktextview.c:558
+ msgid "Pixels Inside Wrap"
+ msgstr "Slikovne točke znotraj odstavkov"
+
+-#: gtk/gtktextview.c:576
++#: ../gtk/gtktextview.c:576
+ msgid "Wrap Mode"
+ msgstr "Način preloma"
+
+-#: gtk/gtktextview.c:594
++#: ../gtk/gtktextview.c:594
+ msgid "Left Margin"
+ msgstr "Levi odmik"
+
+-#: gtk/gtktextview.c:604
++#: ../gtk/gtktextview.c:604
+ msgid "Right Margin"
+ msgstr "Desni odmik"
+
+-#: gtk/gtktextview.c:632
++#: ../gtk/gtktextview.c:632
+ msgid "Cursor Visible"
+ msgstr "Viden kazalec"
+
+-#: gtk/gtktextview.c:633
++#: ../gtk/gtktextview.c:633
+ msgid "If the insertion cursor is shown"
+ msgstr "Ali je vstavitveni kazalec viden"
+
+-#: gtk/gtktextview.c:640
++#: ../gtk/gtktextview.c:640
+ msgid "Buffer"
+ msgstr "Medpomnilnik"
+
+-#: gtk/gtktextview.c:641
++#: ../gtk/gtktextview.c:641
+ msgid "The buffer which is displayed"
+ msgstr "Medpomnilnik, ki je prikazan"
+
+-#: gtk/gtktextview.c:649
++#: ../gtk/gtktextview.c:649
+ msgid "Whether entered text overwrites existing contents"
+ msgstr "Ali naj vneseno besedilo prepiše obstoječo vsebino"
+
+-#: gtk/gtktextview.c:656
++#: ../gtk/gtktextview.c:656
+ msgid "Accepts tab"
+ msgstr "Sprejme tabulator"
+
+-#: gtk/gtktextview.c:657
++#: ../gtk/gtktextview.c:657
+ msgid "Whether Tab will result in a tab character being entered"
+ msgstr "Ali naj pritisk na tipko Tab povzroči vnos tabulatorja"
+
+-#: gtk/gtktextview.c:666
++#: ../gtk/gtktextview.c:666
+ msgid "Error underline color"
+ msgstr "Barva podčrtovanja napak"
+
+-#: gtk/gtktextview.c:667
++#: ../gtk/gtktextview.c:667
+ msgid "Color with which to draw error-indication underlines"
+ msgstr "Barva, s katero naj bodo podčrtane nakazane napake"
+
+-#: gtk/gtktoggleaction.c:103
++#: ../gtk/gtktoggleaction.c:103
+ msgid "Create the same proxies as a radio action"
+ msgstr "Ustvari posrednike enake kot radijskim dejanjem"
+
+-#: gtk/gtktoggleaction.c:104
++#: ../gtk/gtktoggleaction.c:104
+ msgid "Whether the proxies for this action look like radio action proxies"
+ msgstr "Ali so posredniki videti kot radijski gumbi"
+
+-#: gtk/gtktoggleaction.c:119
++#: ../gtk/gtktoggleaction.c:119
+ msgid "If the toggle action should be active in or not"
+ msgstr "Ali naj bo preklopni gumb pritisnjen ali ne"
+
+-#: gtk/gtktogglebutton.c:103 gtk/gtktoggletoolbutton.c:102
++#: ../gtk/gtktogglebutton.c:103
++#: ../gtk/gtktoggletoolbutton.c:102
+ msgid "If the toggle button should be pressed in or not"
+ msgstr "Ali naj bo preklopni gumb pritisnjen ali ne"
+
+-#: gtk/gtktogglebutton.c:111
++#: ../gtk/gtktogglebutton.c:111
+ msgid "If the toggle button is in an \"in between\" state"
+ msgstr "Ali je preklopni gumb v \"vmesnem\" stanju"
+
+-#: gtk/gtktogglebutton.c:118
++#: ../gtk/gtktogglebutton.c:118
+ msgid "Draw Indicator"
+ msgstr "Nariši pokazatelja"
+
+-#: gtk/gtktogglebutton.c:119
++#: ../gtk/gtktogglebutton.c:119
+ msgid "If the toggle part of the button is displayed"
+ msgstr "Ali je preklopni del gumba prikazan"
+
+-#: gtk/gtktoolbar.c:493
++#: ../gtk/gtktoolbar.c:493
+ msgid "The orientation of the toolbar"
+ msgstr "Usmerjenost orodjarne"
+
+-#: gtk/gtktoolbar.c:501
++#: ../gtk/gtktoolbar.c:501
+ msgid "Toolbar Style"
+ msgstr "Slog orodjarne"
+
+-#: gtk/gtktoolbar.c:502
++#: ../gtk/gtktoolbar.c:502
+ msgid "How to draw the toolbar"
+ msgstr "Kako naj se nariše orodjarna"
+
+-#: gtk/gtktoolbar.c:509
++#: ../gtk/gtktoolbar.c:509
+ msgid "Show Arrow"
+ msgstr "Pokaži puščico"
+
+-#: gtk/gtktoolbar.c:510
++#: ../gtk/gtktoolbar.c:510
+ msgid "If an arrow should be shown if the toolbar doesn't fit"
+ msgstr "Ali naj bo puščica prikazana, če orodna vrstica ni pravih mer"
+
+-#: gtk/gtktoolbar.c:525
++#: ../gtk/gtktoolbar.c:525
+ msgid "Tooltips"
+ msgstr "Orodni nasveti"
+
+-#: gtk/gtktoolbar.c:526
++#: ../gtk/gtktoolbar.c:526
+ msgid "If the tooltips of the toolbar should be active or not"
+ msgstr "Ali naj bodo orodni namigi omogočeni"
+
+-#: gtk/gtktoolbar.c:548
++#: ../gtk/gtktoolbar.c:548
+ msgid "Size of icons in this toolbar"
+ msgstr "Velikost ikon v tej orodni vrstici"
+
+-#: gtk/gtktoolbar.c:563
++#: ../gtk/gtktoolbar.c:563
+ msgid "Icon size set"
+ msgstr "Nastavitev velikosti ikone"
+
+-#: gtk/gtktoolbar.c:564
++#: ../gtk/gtktoolbar.c:564
+ msgid "Whether the icon-size property has been set"
+ msgstr "Ali je določena lastnost velikosti ikone"
+
+-#: gtk/gtktoolbar.c:573
++#: ../gtk/gtktoolbar.c:573
+ msgid "Whether the item should receive extra space when the toolbar grows"
+ msgstr "Ali naj predmet dobi dodaten prostor, ko se orodna vrstica poveča"
+
+-#: gtk/gtktoolbar.c:581
++#: ../gtk/gtktoolbar.c:581
+ msgid "Whether the item should be the same size as other homogeneous items"
+ msgstr "Ali naj bo predmet enake velikosti kot ostali predmeti"
+
+-#: gtk/gtktoolbar.c:588
++#: ../gtk/gtktoolbar.c:588
+ msgid "Spacer size"
+ msgstr "Velikost ločnice"
+
+-#: gtk/gtktoolbar.c:589
++#: ../gtk/gtktoolbar.c:589
+ msgid "Size of spacers"
+ msgstr "Velikost ločnic"
+
+-#: gtk/gtktoolbar.c:598
++#: ../gtk/gtktoolbar.c:598
+ msgid "Amount of border space between the toolbar shadow and the buttons"
+ msgstr "Količina robnega prostora med senco orodjarne in gumbi"
+
+-#: gtk/gtktoolbar.c:606
++#: ../gtk/gtktoolbar.c:606
+ msgid "Maximum child expand"
+ msgstr "Največja razširitev podrejenega predmeta"
+
+-#: gtk/gtktoolbar.c:607
++#: ../gtk/gtktoolbar.c:607
+ msgid "Maximum amount of space an expandable item will be given"
+ msgstr "Največja količina prostora, ki jo ima na voljo raztegljivi element"
+
+-#: gtk/gtktoolbar.c:615
++#: ../gtk/gtktoolbar.c:615
+ msgid "Space style"
+ msgstr "Slog ločnice"
+
+-#: gtk/gtktoolbar.c:616
++#: ../gtk/gtktoolbar.c:616
+ msgid "Whether spacers are vertical lines or just blank"
+ msgstr "Ali so ločnice navpične črte ali le prazen prostor"
+
+-#: gtk/gtktoolbar.c:623
++#: ../gtk/gtktoolbar.c:623
+ msgid "Button relief"
+ msgstr "Spust gumba"
+
+-#: gtk/gtktoolbar.c:624
++#: ../gtk/gtktoolbar.c:624
+ msgid "Type of bevel around toolbar buttons"
+ msgstr "Vrsta obrobe okoli gumbov orodjarne"
+
+-#: gtk/gtktoolbar.c:631
++#: ../gtk/gtktoolbar.c:631
+ msgid "Style of bevel around the toolbar"
+ msgstr "Slog obrobe okoli orodjarne"
+
+-#: gtk/gtktoolbar.c:637
++#: ../gtk/gtktoolbar.c:637
+ msgid "Toolbar style"
+ msgstr "Slog orodne vrstice"
+
+-#: gtk/gtktoolbar.c:638
+-msgid ""
+-"Whether default toolbars have text only, text and icons, icons only, etc."
+-msgstr ""
+-"Ali imajo privzete orodjarne le besedilo, besedilo in ikone, ikone, itd."
++#: ../gtk/gtktoolbar.c:638
++msgid "Whether default toolbars have text only, text and icons, icons only, etc."
++msgstr "Ali imajo privzete orodjarne le besedilo, besedilo in ikone, ikone, itd."
+
+-#: gtk/gtktoolbar.c:644
++#: ../gtk/gtktoolbar.c:644
+ msgid "Toolbar icon size"
+ msgstr "Velikost ikon orodjarne"
+
+-#: gtk/gtktoolbar.c:645
++#: ../gtk/gtktoolbar.c:645
+ msgid "Size of icons in default toolbars"
+ msgstr "Velikost ikon v privzetih orodjarnah"
+
+-#: gtk/gtktoolbutton.c:181
++#: ../gtk/gtktoolbutton.c:181
+ msgid "Text to show in the item."
+ msgstr "Prikazano besedilo v elementu"
+
+-#: gtk/gtktoolbutton.c:188
+-msgid ""
+-"If set, an underline in the label property indicates that the next character "
+-"should be used for the mnemonic accelerator key in the overflow menu"
+-msgstr ""
+-"Izbrana možnost omogoča, da podčrtaj v besedilu pove, da naj bo naslednji "
+-"znak uporabljen kot pospeševalna tipka"
++#: ../gtk/gtktoolbutton.c:188
++msgid "If set, an underline in the label property indicates that the next character should be used for the mnemonic accelerator key in the overflow menu"
++msgstr "Izbrana možnost omogoča, da podčrtaj v besedilu pove, da naj bo naslednji znak uporabljen kot pospeševalna tipka"
+
+-#: gtk/gtktoolbutton.c:195
++#: ../gtk/gtktoolbutton.c:195
+ msgid "Widget to use as the item label"
+ msgstr "Gradnik uporabljen kot oznaka predmeta"
+
+-#: gtk/gtktoolbutton.c:201
++#: ../gtk/gtktoolbutton.c:201
+ msgid "Stock Id"
+ msgstr "ID sklada"
+
+-#: gtk/gtktoolbutton.c:202
++#: ../gtk/gtktoolbutton.c:202
+ msgid "The stock icon displayed on the item"
+ msgstr "Ikona sklada prikazana na predmetu"
+
+-#: gtk/gtktoolbutton.c:218
++#: ../gtk/gtktoolbutton.c:218
+ msgid "Icon name"
+ msgstr "Ime ikone"
+
+-#: gtk/gtktoolbutton.c:219
++#: ../gtk/gtktoolbutton.c:219
+ msgid "The name of the themed icon displayed on the item"
+ msgstr "Ime tematske ikone prikazane na predmetu"
+
+-#: gtk/gtktoolbutton.c:225
++#: ../gtk/gtktoolbutton.c:225
+ msgid "Icon widget"
+ msgstr "Ikonski gradnik"
+
+-#: gtk/gtktoolbutton.c:226
++#: ../gtk/gtktoolbutton.c:226
+ msgid "Icon widget to display in the item"
+ msgstr "Ikonski gradnik, ki naj se prikaže v elementu"
+
+-#: gtk/gtktoolbutton.c:239
++#: ../gtk/gtktoolbutton.c:239
+ msgid "Icon spacing"
+ msgstr "Razmik med ikonami"
+
+-#: gtk/gtktoolbutton.c:240
++#: ../gtk/gtktoolbutton.c:240
+ msgid "Spacing in pixels between the icon and label"
+ msgstr "Razmik v slikovnih točkah med ikono in oznako"
+
+-#: gtk/gtktoolitem.c:171
+-msgid ""
+-"Whether the toolbar item is considered important. When TRUE, toolbar buttons "
+-"show text in GTK_TOOLBAR_BOTH_HORIZ mode"
+-msgstr ""
+-"Ali je predmet orodne vrstice pomemben. Izbrana možnost omogoča, da gumbi "
+-"orodne vrstice prikažejo besedilo v GTK_TOOLBAR_BOTH_HORIZ načinu"
++#: ../gtk/gtktoolitem.c:171
++msgid "Whether the toolbar item is considered important. When TRUE, toolbar buttons show text in GTK_TOOLBAR_BOTH_HORIZ mode"
++msgstr "Ali je predmet orodne vrstice pomemben. Izbrana možnost omogoča, da gumbi orodne vrstice prikažejo besedilo v GTK_TOOLBAR_BOTH_HORIZ načinu"
+
+-#: gtk/gtktreemodelsort.c:274
++#: ../gtk/gtktreemodelsort.c:274
+ msgid "TreeModelSort Model"
+ msgstr "Način TreeModelSort"
+
+-#: gtk/gtktreemodelsort.c:275
++#: ../gtk/gtktreemodelsort.c:275
+ msgid "The model for the TreeModelSort to sort"
+ msgstr "Način po katerem naj ureja TreeModelSort"
+
+-#: gtk/gtktreeview.c:570
++#: ../gtk/gtktreeview.c:570
+ msgid "TreeView Model"
+ msgstr "Način TreeView"
+
+-#: gtk/gtktreeview.c:571
++#: ../gtk/gtktreeview.c:571
+ msgid "The model for the tree view"
+ msgstr "Način za drevesni pogled"
+
+-#: gtk/gtktreeview.c:579
++#: ../gtk/gtktreeview.c:579
+ msgid "Horizontal Adjustment for the widget"
+ msgstr "Vodoravna prilagoditev za gradnik"
+
+-#: gtk/gtktreeview.c:587
++#: ../gtk/gtktreeview.c:587
+ msgid "Vertical Adjustment for the widget"
+ msgstr "Navpična prilagoditev za gradnik"
+
+-#: gtk/gtktreeview.c:594
++#: ../gtk/gtktreeview.c:594
+ msgid "Headers Visible"
+ msgstr "Vidne glave"
+
+-#: gtk/gtktreeview.c:595
++#: ../gtk/gtktreeview.c:595
+ msgid "Show the column header buttons"
+ msgstr "Pokaži gumbe glave stolpca"
+
+-#: gtk/gtktreeview.c:602
++#: ../gtk/gtktreeview.c:602
+ msgid "Headers Clickable"
+ msgstr "Klikljive glave"
+
+-#: gtk/gtktreeview.c:603
++#: ../gtk/gtktreeview.c:603
+ msgid "Column headers respond to click events"
+ msgstr "Glave stolpcev se odzivajo na dogodke klikov"
+
+-#: gtk/gtktreeview.c:610
++#: ../gtk/gtktreeview.c:610
+ msgid "Expander Column"
+ msgstr "Stolpec razširitve"
+
+-#: gtk/gtktreeview.c:611
++#: ../gtk/gtktreeview.c:611
+ msgid "Set the column for the expander column"
+ msgstr "Nastavi stolpec razširitvenega stolpca"
+
+-#: gtk/gtktreeview.c:626
++#: ../gtk/gtktreeview.c:626
+ msgid "Rules Hint"
+ msgstr "Namig ravnil"
+
+-#: gtk/gtktreeview.c:627
++#: ../gtk/gtktreeview.c:627
+ msgid "Set a hint to the theme engine to draw rows in alternating colors"
+ msgstr "Nastavi namig stroju tem, da riše vrstice izmenljivih barv"
+
+-#: gtk/gtktreeview.c:634
++#: ../gtk/gtktreeview.c:634
+ msgid "Enable Search"
+ msgstr "Vključi iskanje"
+
+-#: gtk/gtktreeview.c:635
++#: ../gtk/gtktreeview.c:635
+ msgid "View allows user to search through columns interactively"
+ msgstr "Pogled dovoli uporabniku, da interaktivno išče po stolpcih"
+
+-#: gtk/gtktreeview.c:642
++#: ../gtk/gtktreeview.c:642
+ msgid "Search Column"
+ msgstr "Stolpec iskanja"
+
+-#: gtk/gtktreeview.c:643
+-msgid "Model column to search through when searching through code"
+-msgstr "Stolpec, prek katerega naj poteka iskanje ob iskanju skozi kodo"
++#: ../gtk/gtktreeview.c:643
++msgid "Model column to search through during interactive search"
++msgstr "Stolpec, prek katerega naj poteka interaktivno iskanje"
+
+-#: gtk/gtktreeview.c:663
++#: ../gtk/gtktreeview.c:663
+ msgid "Fixed Height Mode"
+ msgstr "Način fiksne višine"
+
+-#: gtk/gtktreeview.c:664
++#: ../gtk/gtktreeview.c:664
+ msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
+-msgstr ""
+-"Pospeši delovanje GtkTreeView s predvidevanjem, da so vse vrstice enake "
+-"višine"
++msgstr "Pospeši delovanje GtkTreeView s predvidevanjem, da so vse vrstice enake višine"
+
+-#: gtk/gtktreeview.c:684
++#: ../gtk/gtktreeview.c:684
+ msgid "Hover Selection"
+ msgstr "Lebdenje izbora"
+
+-#: gtk/gtktreeview.c:685
++#: ../gtk/gtktreeview.c:685
+ msgid "Whether the selection should follow the pointer"
+ msgstr "Ali naj izbor sledi kazalcu."
+
+-#: gtk/gtktreeview.c:704
++#: ../gtk/gtktreeview.c:704
+ msgid "Hover Expand"
+ msgstr "Razširi pod kazalcem"
+
+-#: gtk/gtktreeview.c:705
+-msgid ""
+-"Whether rows should be expanded/collapsed when the pointer moves over them"
++#: ../gtk/gtktreeview.c:705
++msgid "Whether rows should be expanded/collapsed when the pointer moves over them"
+ msgstr "Ali naj se vrstice razširijo/zložijo, ko se kazalec premakne čeznje."
+
+-#: gtk/gtktreeview.c:719
++#: ../gtk/gtktreeview.c:719
+ msgid "Show Expanders"
+ msgstr "Pokaži razširljivce"
+
+-#: gtk/gtktreeview.c:720
++#: ../gtk/gtktreeview.c:720
+ msgid "View has expanders"
+ msgstr "Pogled ima razširljivce"
+
+-#: gtk/gtktreeview.c:734
++#: ../gtk/gtktreeview.c:734
+ msgid "Level Indentation"
+ msgstr "Zamik ravni"
+
+-#: gtk/gtktreeview.c:735
++#: ../gtk/gtktreeview.c:735
+ msgid "Extra indentation for each level"
+ msgstr "Dodaten zamik za vsako raven"
+
+-#: gtk/gtktreeview.c:744
++#: ../gtk/gtktreeview.c:744
+ msgid "Rubber Banding"
+ msgstr "Gumijasti ovoj"
+
+-#: gtk/gtktreeview.c:745
+-msgid ""
+-"Whether to enable selection of multiple items by dragging the mouse pointer"
+-msgstr ""
+-"Ali naj bo z vleko miškinega kazalca omogočena izbira več datotek hkrati"
++#: ../gtk/gtktreeview.c:745
++msgid "Whether to enable selection of multiple items by dragging the mouse pointer"
++msgstr "Ali naj bo z vleko miškinega kazalca omogočena izbira več datotek hkrati"
+
+-#: gtk/gtktreeview.c:752
++#: ../gtk/gtktreeview.c:752
+ msgid "Enable Grid Lines"
+ msgstr "Vključi mrežne črte"
+
+-#: gtk/gtktreeview.c:753
++#: ../gtk/gtktreeview.c:753
+ msgid "Whether grid lines should be drawn in the tree view"
+ msgstr "Ali naj bodo v drevesnem pogledu prikazane mrežne črte"
+
+-#: gtk/gtktreeview.c:761
++#: ../gtk/gtktreeview.c:761
+ msgid "Enable Tree Lines"
+ msgstr "Vključi drevesne črte"
+
+-#: gtk/gtktreeview.c:762
++#: ../gtk/gtktreeview.c:762
+ msgid "Whether tree lines should be drawn in the tree view"
+ msgstr "Ali naj bodo v drevesnem pogledu prikazane drevesne črte"
+
+-#: gtk/gtktreeview.c:770
++#: ../gtk/gtktreeview.c:770
+ msgid "The column in the model containing the tooltip texts for the rows"
+ msgstr "Stolpec modela, ki vsebuje besedilo namigov vrstic."
+
+-#: gtk/gtktreeview.c:792
++#: ../gtk/gtktreeview.c:792
+ msgid "Vertical Separator Width"
+ msgstr "Širina navpične ločnice"
+
+-#: gtk/gtktreeview.c:793
++#: ../gtk/gtktreeview.c:793
+ msgid "Vertical space between cells. Must be an even number"
+ msgstr "Navpični prostor med celicami. Mora biti sodo število"
+
+-#: gtk/gtktreeview.c:801
++#: ../gtk/gtktreeview.c:801
+ msgid "Horizontal Separator Width"
+ msgstr "Širina vodoravne ločnice"
+
+-#: gtk/gtktreeview.c:802
++#: ../gtk/gtktreeview.c:802
+ msgid "Horizontal space between cells. Must be an even number"
+ msgstr "Vodoravni prostor med celicami. Mora biti sodo število"
+
+-#: gtk/gtktreeview.c:810
++#: ../gtk/gtktreeview.c:810
+ msgid "Allow Rules"
+ msgstr "Dovoli ravnila"
+
+-#: gtk/gtktreeview.c:811
++#: ../gtk/gtktreeview.c:811
+ msgid "Allow drawing of alternating color rows"
+ msgstr "Dovoli risanje izmenično obarvanih vrstic"
+
+-#: gtk/gtktreeview.c:817
++#: ../gtk/gtktreeview.c:817
+ msgid "Indent Expanders"
+ msgstr "Zamakni razširilnike"
+
+-#: gtk/gtktreeview.c:818
++#: ../gtk/gtktreeview.c:818
+ msgid "Make the expanders indented"
+ msgstr "Naredi razširilnike zamaknjene"
+
+-#: gtk/gtktreeview.c:824
++#: ../gtk/gtktreeview.c:824
+ msgid "Even Row Color"
+ msgstr "Barva sode vrstice"
+
+-#: gtk/gtktreeview.c:825
++#: ../gtk/gtktreeview.c:825
+ msgid "Color to use for even rows"
+ msgstr "Barva za uporabo v sodih vrsticah"
+
+-#: gtk/gtktreeview.c:831
++#: ../gtk/gtktreeview.c:831
+ msgid "Odd Row Color"
+ msgstr "Barva lihe vrstice"
+
+-#: gtk/gtktreeview.c:832
++#: ../gtk/gtktreeview.c:832
+ msgid "Color to use for odd rows"
+ msgstr "Barva za uporabo v lihih vrsticah"
+
+-#: gtk/gtktreeview.c:838
++#: ../gtk/gtktreeview.c:838
+ msgid "Row Ending details"
+ msgstr "Podrobnosti o zaključevanju vrstic"
+
+-#: gtk/gtktreeview.c:839
++#: ../gtk/gtktreeview.c:839
+ msgid "Enable extended row background theming"
+ msgstr "Omogoči razširjeno oblikovanje ozadja vrstice"
+
+-#: gtk/gtktreeview.c:845
++#: ../gtk/gtktreeview.c:845
+ msgid "Grid line width"
+ msgstr "Širina mrežne črte"
+
+-#: gtk/gtktreeview.c:846
++#: ../gtk/gtktreeview.c:846
+ msgid "Width, in pixels, of the tree view grid lines"
+ msgstr "Širina (v slikovnih točkah) mrežnih črt v drevesnem pogledu"
+
+-#: gtk/gtktreeview.c:852
++#: ../gtk/gtktreeview.c:852
+ msgid "Tree line width"
+ msgstr "Širina drevesne črte"
+
+-#: gtk/gtktreeview.c:853
++#: ../gtk/gtktreeview.c:853
+ msgid "Width, in pixels, of the tree view lines"
+ msgstr "Širina (v slikovnih točkah) črt v drevesnem pogledu"
+
+-#: gtk/gtktreeview.c:859
++#: ../gtk/gtktreeview.c:859
+ msgid "Grid line pattern"
+ msgstr "Vzorec mrežne črte"
+
+-#: gtk/gtktreeview.c:860
++#: ../gtk/gtktreeview.c:860
+ msgid "Dash pattern used to draw the tree view grid lines"
+ msgstr "Črtkan vzorec, uporabljen za izris mrežnih črt drevesnega pogleda"
+
+-#: gtk/gtktreeview.c:866
++#: ../gtk/gtktreeview.c:866
+ msgid "Tree line pattern"
+ msgstr "Vzorec drevesne črte"
+
+-#: gtk/gtktreeview.c:867
++#: ../gtk/gtktreeview.c:867
+ msgid "Dash pattern used to draw the tree view lines"
+ msgstr "Črtkan vzorec, uporabljen za izris črt drevesnega pogleda"
+
+-#: gtk/gtktreeviewcolumn.c:192
++#: ../gtk/gtktreeviewcolumn.c:192
+ msgid "Whether to display the column"
+ msgstr "Ali naj se stolpec prikaže"
+
+-#: gtk/gtktreeviewcolumn.c:199 gtk/gtkwindow.c:523
++#: ../gtk/gtktreeviewcolumn.c:199
++#: ../gtk/gtkwindow.c:523
+ msgid "Resizable"
+ msgstr "Spremenljive velikosti"
+
+-#: gtk/gtktreeviewcolumn.c:200
++#: ../gtk/gtktreeviewcolumn.c:200
+ msgid "Column is user-resizable"
+ msgstr "Stolpec je spremenljive velikosti"
+
+-#: gtk/gtktreeviewcolumn.c:208
++#: ../gtk/gtktreeviewcolumn.c:208
+ msgid "Current width of the column"
+ msgstr "Trenutna širina stolpca"
+
+-#: gtk/gtktreeviewcolumn.c:217
++#: ../gtk/gtktreeviewcolumn.c:217
+ msgid "Space which is inserted between cells"
+ msgstr "Prostor, vstavljen med celice"
+
+-#: gtk/gtktreeviewcolumn.c:225
++#: ../gtk/gtktreeviewcolumn.c:225
+ msgid "Sizing"
+ msgstr "Spreminjanje velikosti"
+
+-#: gtk/gtktreeviewcolumn.c:226
++#: ../gtk/gtktreeviewcolumn.c:226
+ msgid "Resize mode of the column"
+ msgstr "Način spreminjanja velikosti stolpca"
+
+-#: gtk/gtktreeviewcolumn.c:234
++#: ../gtk/gtktreeviewcolumn.c:234
+ msgid "Fixed Width"
+ msgstr "Nespremenljiva širina"
+
+-#: gtk/gtktreeviewcolumn.c:235
++#: ../gtk/gtktreeviewcolumn.c:235
+ msgid "Current fixed width of the column"
+ msgstr "Trenutna nespremenljiva širina stolpca"
+
+-#: gtk/gtktreeviewcolumn.c:244
++#: ../gtk/gtktreeviewcolumn.c:244
+ msgid "Minimum Width"
+ msgstr "Najmanjša širina"
+
+-#: gtk/gtktreeviewcolumn.c:245
++#: ../gtk/gtktreeviewcolumn.c:245
+ msgid "Minimum allowed width of the column"
+ msgstr "Najmanjša dovoljena širina stolpca"
+
+-#: gtk/gtktreeviewcolumn.c:254
++#: ../gtk/gtktreeviewcolumn.c:254
+ msgid "Maximum Width"
+ msgstr "Največja širina"
+
+-#: gtk/gtktreeviewcolumn.c:255
++#: ../gtk/gtktreeviewcolumn.c:255
+ msgid "Maximum allowed width of the column"
+ msgstr "Največja dovoljena širina stolpca"
+
+-#: gtk/gtktreeviewcolumn.c:265
++#: ../gtk/gtktreeviewcolumn.c:265
+ msgid "Title to appear in column header"
+ msgstr "Naziv, ki naj se pojavi v glavi stolpca"
+
+-#: gtk/gtktreeviewcolumn.c:273
++#: ../gtk/gtktreeviewcolumn.c:273
+ msgid "Column gets share of extra width allocated to the widget"
+ msgstr "Stolpec dobi del dodatne širine določene z gradnikom"
+
+-#: gtk/gtktreeviewcolumn.c:280
++#: ../gtk/gtktreeviewcolumn.c:280
+ msgid "Clickable"
+ msgstr "Klikljivo"
+
+-#: gtk/gtktreeviewcolumn.c:281
++#: ../gtk/gtktreeviewcolumn.c:281
+ msgid "Whether the header can be clicked"
+ msgstr "Ali je mogoče glavo klikniti"
+
+-#: gtk/gtktreeviewcolumn.c:289
++#: ../gtk/gtktreeviewcolumn.c:289
+ msgid "Widget"
+ msgstr "Gradnik"
+
+-#: gtk/gtktreeviewcolumn.c:290
++#: ../gtk/gtktreeviewcolumn.c:290
+ msgid "Widget to put in column header button instead of column title"
+ msgstr "Gradnik, ki naj bo v glavi stolpca namesto naziva stolpca"
+
+-#: gtk/gtktreeviewcolumn.c:298
++#: ../gtk/gtktreeviewcolumn.c:298
+ msgid "X Alignment of the column header text or widget"
+ msgstr "Poravnava besedila glave stolpca ali gradnika po X"
+
+-#: gtk/gtktreeviewcolumn.c:308
++#: ../gtk/gtktreeviewcolumn.c:308
+ msgid "Whether the column can be reordered around the headers"
+ msgstr "Ali je lahko stolpec pri glavah drugače urejen"
+
+-#: gtk/gtktreeviewcolumn.c:315
++#: ../gtk/gtktreeviewcolumn.c:315
+ msgid "Sort indicator"
+ msgstr "Pokazatelj urejanja"
+
+-#: gtk/gtktreeviewcolumn.c:316
++#: ../gtk/gtktreeviewcolumn.c:316
+ msgid "Whether to show a sort indicator"
+ msgstr "Ali naj se pokaže določilo razvrščanja"
+
+-#: gtk/gtktreeviewcolumn.c:323
++#: ../gtk/gtktreeviewcolumn.c:323
+ msgid "Sort order"
+ msgstr "Vrstni red"
+
+-#: gtk/gtktreeviewcolumn.c:324
++#: ../gtk/gtktreeviewcolumn.c:324
+ msgid "Sort direction the sort indicator should indicate"
+ msgstr "Smer urejanja, ki naj jo pokaže pokazatelj"
+
+-#: gtk/gtkuimanager.c:221
++#: ../gtk/gtkuimanager.c:221
+ msgid "Whether tearoff menu items should be added to menus"
+ msgstr "Ali naj predmeti menija vsebujejo mesta za odpenjanje"
+
+-#: gtk/gtkuimanager.c:228
++#: ../gtk/gtkuimanager.c:228
+ msgid "Merged UI definition"
+ msgstr "Definicija spojenega up. vmesnika (UI)"
+
+-#: gtk/gtkuimanager.c:229
++#: ../gtk/gtkuimanager.c:229
+ msgid "An XML string describing the merged UI"
+ msgstr "Niz XML, ki opisuje spojeni uporabniški vmesnik"
+
+-#: gtk/gtkviewport.c:107
+-msgid ""
+-"The GtkAdjustment that determines the values of the horizontal position for "
+-"this viewport"
++#: ../gtk/gtkviewport.c:107
++msgid "The GtkAdjustment that determines the values of the horizontal position for this viewport"
+ msgstr "GtkAdjustment, ki določi vrednost vodoravne lege tega pogleda"
+
+-#: gtk/gtkviewport.c:115
+-msgid ""
+-"The GtkAdjustment that determines the values of the vertical position for "
+-"this viewport"
++#: ../gtk/gtkviewport.c:115
++msgid "The GtkAdjustment that determines the values of the vertical position for this viewport"
+ msgstr "GtkAdjustment, ki določi vrednost navpične lege tega pogleda"
+
+-#: gtk/gtkviewport.c:123
++#: ../gtk/gtkviewport.c:123
+ msgid "Determines how the shadowed box around the viewport is drawn"
+ msgstr "Določi kako je narisana senčena škatla okoli pogleda"
+
+-#: gtk/gtkwidget.c:483
++#: ../gtk/gtkwidget.c:483
+ msgid "Widget name"
+ msgstr "Ime gradnika"
+
+-#: gtk/gtkwidget.c:484
++#: ../gtk/gtkwidget.c:484
+ msgid "The name of the widget"
+ msgstr "Ime gradnika"
+
+-#: gtk/gtkwidget.c:490
++#: ../gtk/gtkwidget.c:490
+ msgid "Parent widget"
+ msgstr "Gradnik nadrejenega predmeta"
+
+-#: gtk/gtkwidget.c:491
++#: ../gtk/gtkwidget.c:491
+ msgid "The parent widget of this widget. Must be a Container widget"
+-msgstr ""
+-"Nadrejeni gradnik tega gradnika. Mora biti gradnik vrste Container "
+-"(vsebovalnik)"
++msgstr "Nadrejeni gradnik tega gradnika. Mora biti gradnik vrste Container (vsebovalnik)"
+
+-#: gtk/gtkwidget.c:498
++#: ../gtk/gtkwidget.c:498
+ msgid "Width request"
+ msgstr "Zahtevek po širini"
+
+-#: gtk/gtkwidget.c:499
+-msgid ""
+-"Override for width request of the widget, or -1 if natural request should be "
+-"used"
+-msgstr ""
+-"Prezri gradnikov zahtevek po širini, ali -1, če naj bo uporabljen običajni "
+-"zahtevek"
++#: ../gtk/gtkwidget.c:499
++msgid "Override for width request of the widget, or -1 if natural request should be used"
++msgstr "Prezri gradnikov zahtevek po širini, ali -1, če naj bo uporabljen običajni zahtevek"
+
+-#: gtk/gtkwidget.c:507
++#: ../gtk/gtkwidget.c:507
+ msgid "Height request"
+ msgstr "Zahtevek po širini"
+
+-#: gtk/gtkwidget.c:508
+-msgid ""
+-"Override for height request of the widget, or -1 if natural request should "
+-"be used"
+-msgstr ""
+-"Prezri gradnikov zahtevek po širini, ali -1, če naj bo uporabljen običajni "
+-"zahtevek -1"
++#: ../gtk/gtkwidget.c:508
++msgid "Override for height request of the widget, or -1 if natural request should be used"
++msgstr "Prezri gradnikov zahtevek po širini, ali -1, če naj bo uporabljen običajni zahtevek -1"
+
+-#: gtk/gtkwidget.c:517
++#: ../gtk/gtkwidget.c:517
+ msgid "Whether the widget is visible"
+ msgstr "Ali je gradnik viden"
+
+-#: gtk/gtkwidget.c:524
++#: ../gtk/gtkwidget.c:524
+ msgid "Whether the widget responds to input"
+ msgstr "Ali se gradnik odziva na vnose"
+
+-#: gtk/gtkwidget.c:530
++#: ../gtk/gtkwidget.c:530
+ msgid "Application paintable"
+ msgstr "Program izrisljiv"
+
+-#: gtk/gtkwidget.c:531
++#: ../gtk/gtkwidget.c:531
+ msgid "Whether the application will paint directly on the widget"
+ msgstr "Ali se bo program risal neposredno na gradnik"
+
+-#: gtk/gtkwidget.c:537
++#: ../gtk/gtkwidget.c:537
+ msgid "Can focus"
+ msgstr "Lahko prevzame dejavnost"
+
+-#: gtk/gtkwidget.c:538
++#: ../gtk/gtkwidget.c:538
+ msgid "Whether the widget can accept the input focus"
+ msgstr "Ali lahko gradnik sprejme vnosno dejavnost"
+
+-#: gtk/gtkwidget.c:544
++#: ../gtk/gtkwidget.c:544
+ msgid "Has focus"
+ msgstr "Vključuje dejavnost"
+
+-#: gtk/gtkwidget.c:545
++#: ../gtk/gtkwidget.c:545
+ msgid "Whether the widget has the input focus"
+ msgstr "Ali vključuje gradnik vnosno dejavnost"
+
+-#: gtk/gtkwidget.c:551
++#: ../gtk/gtkwidget.c:551
+ msgid "Is focus"
+ msgstr "Je dejaven"
+
+-#: gtk/gtkwidget.c:552
++#: ../gtk/gtkwidget.c:552
+ msgid "Whether the widget is the focus widget within the toplevel"
+ msgstr "Ali je gradnik dejaven znotraj vrhnje ravni"
+
+-#: gtk/gtkwidget.c:558
++#: ../gtk/gtkwidget.c:558
+ msgid "Can default"
+ msgstr "Je lahko privzet"
+
+-#: gtk/gtkwidget.c:559
++#: ../gtk/gtkwidget.c:559
+ msgid "Whether the widget can be the default widget"
+ msgstr "Ali je gradnik lahko privzet gradnik"
+
+-#: gtk/gtkwidget.c:565
++#: ../gtk/gtkwidget.c:565
+ msgid "Has default"
+ msgstr "Je privzet"
+
+-#: gtk/gtkwidget.c:566
++#: ../gtk/gtkwidget.c:566
+ msgid "Whether the widget is the default widget"
+ msgstr "Ali je gradnik privzet gradnik"
+
+-#: gtk/gtkwidget.c:572
++#: ../gtk/gtkwidget.c:572
+ msgid "Receives default"
+ msgstr "Sprejema privzeto"
+
+-#: gtk/gtkwidget.c:573
++#: ../gtk/gtkwidget.c:573
+ msgid "If TRUE, the widget will receive the default action when it is focused"
+-msgstr ""
+-"Izbrana možnost omogoča, da bo gradnik sprejemal privzeta dejanja, kadar bo "
+-"dejaven"
++msgstr "Izbrana možnost omogoča, da bo gradnik sprejemal privzeta dejanja, kadar bo dejaven"
+
+-#: gtk/gtkwidget.c:579
++#: ../gtk/gtkwidget.c:579
+ msgid "Composite child"
+ msgstr "Sestavljen podrejeni predmet"
+
+-#: gtk/gtkwidget.c:580
++#: ../gtk/gtkwidget.c:580
+ msgid "Whether the widget is part of a composite widget"
+ msgstr "Ali je gradnik del sestavljenega gradnika"
+
+-#: gtk/gtkwidget.c:586
++#: ../gtk/gtkwidget.c:586
+ msgid "Style"
+ msgstr "Slog"
+
+-#: gtk/gtkwidget.c:587
+-msgid ""
+-"The style of the widget, which contains information about how it will look "
+-"(colors etc)"
++#: ../gtk/gtkwidget.c:587
++msgid "The style of the widget, which contains information about how it will look (colors etc)"
+ msgstr "Slog gradnika, ki vsebuje podatke o tem kako bo videti (barve, itn.)"
+
+-#: gtk/gtkwidget.c:593
++#: ../gtk/gtkwidget.c:593
+ msgid "Events"
+ msgstr "Dogodki"
+
+-#: gtk/gtkwidget.c:594
++#: ../gtk/gtkwidget.c:594
+ msgid "The event mask that decides what kind of GdkEvents this widget gets"
+ msgstr "Maska dogodkov, ki določa katere vrste GdkEvents bo dobival ta gradnik"
+
+-#: gtk/gtkwidget.c:601
++#: ../gtk/gtkwidget.c:601
+ msgid "Extension events"
+ msgstr "Razširjeni dogodki"
+
+-#: gtk/gtkwidget.c:602
++#: ../gtk/gtkwidget.c:602
+ msgid "The mask that decides what kind of extension events this widget gets"
+-msgstr ""
+-"Maska, ki določa vrste razširjenih dogodkov, ki jih bo prejemal gradnik"
++msgstr "Maska, ki določa vrste razširjenih dogodkov, ki jih bo prejemal gradnik"
+
+-#: gtk/gtkwidget.c:609
++#: ../gtk/gtkwidget.c:609
+ msgid "No show all"
+ msgstr "Brez prikazovanja vseh"
+
+-#: gtk/gtkwidget.c:610
++#: ../gtk/gtkwidget.c:610
+ msgid "Whether gtk_widget_show_all() should not affect this widget"
+ msgstr "Ali možnost gtk_widget_show_all() ne vpliva na gradnik"
+
+-#: gtk/gtkwidget.c:632
++#: ../gtk/gtkwidget.c:632
+ msgid "Has tooltip"
+ msgstr "Vsebuje namig"
+
+-#: gtk/gtkwidget.c:633
++#: ../gtk/gtkwidget.c:633
+ msgid "Whether this widget has a tooltip"
+ msgstr "Ali lahko gradniku določimo namig"
+
+-#: gtk/gtkwidget.c:653
++#: ../gtk/gtkwidget.c:653
+ msgid "Tooltip Text"
+ msgstr "Besedilo namiga"
+
+-#: gtk/gtkwidget.c:654 gtk/gtkwidget.c:675
++#: ../gtk/gtkwidget.c:654
++#: ../gtk/gtkwidget.c:675
+ msgid "The contents of the tooltip for this widget"
+ msgstr "Vsebina namiga gradnika"
+
+-#: gtk/gtkwidget.c:674
++#: ../gtk/gtkwidget.c:674
+ msgid "Tooltip markup"
+ msgstr "Oblika namiga"
+
+-#: gtk/gtkwidget.c:689
++#: ../gtk/gtkwidget.c:689
+ msgid "Window"
+ msgstr "Okno"
+
+-#: gtk/gtkwidget.c:690
++#: ../gtk/gtkwidget.c:690
+ msgid "The widget's window if it is realized"
+ msgstr "Udejanjeno okno gradnika"
+
+-#: gtk/gtkwidget.c:2208
++#: ../gtk/gtkwidget.c:2208
+ msgid "Interior Focus"
+ msgstr "Notranja dejavnost"
+
+-#: gtk/gtkwidget.c:2209
++#: ../gtk/gtkwidget.c:2209
+ msgid "Whether to draw the focus indicator inside widgets"
+ msgstr "Ali naj se nariše pokazatelj dejavnosti znotraj gradnika"
+
+-#: gtk/gtkwidget.c:2215
++#: ../gtk/gtkwidget.c:2215
+ msgid "Focus linewidth"
+ msgstr "Širina črte prikaza dejavnosti"
+
+-#: gtk/gtkwidget.c:2216
++#: ../gtk/gtkwidget.c:2216
+ msgid "Width, in pixels, of the focus indicator line"
+ msgstr "Širina v točkah za črto kazalca dejavnosti"
+
+-#: gtk/gtkwidget.c:2222
++#: ../gtk/gtkwidget.c:2222
+ msgid "Focus line dash pattern"
+ msgstr "Vzorec črtkane črte oznake dejavnosti"
+
+-#: gtk/gtkwidget.c:2223
++#: ../gtk/gtkwidget.c:2223
+ msgid "Dash pattern used to draw the focus indicator"
+ msgstr "Črtkan vzorec, ki se uporabi za prikaz oznake dejavnosti predmeta"
+
+-#: gtk/gtkwidget.c:2228
++#: ../gtk/gtkwidget.c:2228
+ msgid "Focus padding"
+ msgstr "Blazinjenje oznake dejavnosti"
+
+-#: gtk/gtkwidget.c:2229
++#: ../gtk/gtkwidget.c:2229
+ msgid "Width, in pixels, between focus indicator and the widget 'box'"
+ msgstr "Širina v točkah med pokazateljem dejavnosti in okvirjem gradnika"
+
+-#: gtk/gtkwidget.c:2234
++#: ../gtk/gtkwidget.c:2234
+ msgid "Cursor color"
+ msgstr "Barva kazalke"
+
+-#: gtk/gtkwidget.c:2235
++#: ../gtk/gtkwidget.c:2235
+ msgid "Color with which to draw insertion cursor"
+ msgstr "Barva, s katero naj bo izrisana vnosna kazalka"
+
+-#: gtk/gtkwidget.c:2240
++#: ../gtk/gtkwidget.c:2240
+ msgid "Secondary cursor color"
+ msgstr "Barva drugotne kazalke"
+
+-#: gtk/gtkwidget.c:2241
+-msgid ""
+-"Color with which to draw the secondary insertion cursor when editing mixed "
+-"right-to-left and left-to-right text"
+-msgstr ""
+-"Barva, s katero bo izrisan drugotna kazalka vstavljanja, kadar se ureja "
+-"mešano besedilo desno-proti-levi in levo-proti-desni."
++#: ../gtk/gtkwidget.c:2241
++msgid "Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text"
++msgstr "Barva, s katero bo izrisan drugotna kazalka vstavljanja, kadar se ureja mešano besedilo desno-proti-levi in levo-proti-desni."
+
+-#: gtk/gtkwidget.c:2246
++#: ../gtk/gtkwidget.c:2246
+ msgid "Cursor line aspect ratio"
+ msgstr "Razmerje vrstice kazalke"
+
+-#: gtk/gtkwidget.c:2247
++#: ../gtk/gtkwidget.c:2247
+ msgid "Aspect ratio with which to draw insertion cursor"
+ msgstr "Razmerje, v katerem naj se izriše vnosna kazalka"
+
+-#: gtk/gtkwidget.c:2261
++#: ../gtk/gtkwidget.c:2261
+ msgid "Draw Border"
+ msgstr "Nariši rob"
+
+-#: gtk/gtkwidget.c:2262
++#: ../gtk/gtkwidget.c:2262
+ msgid "Size of areas outside the widget's allocation to draw"
+ msgstr "Velikost območja izven izrisa gradnika"
+
+-#: gtk/gtkwidget.c:2275
++#: ../gtk/gtkwidget.c:2275
+ msgid "Unvisited Link Color"
+ msgstr "Barva še ne obiskane povezave"
+
+-#: gtk/gtkwidget.c:2276
++#: ../gtk/gtkwidget.c:2276
+ msgid "Color of unvisited links"
+ msgstr "Barva ne obiskanih povezav"
+
+-#: gtk/gtkwidget.c:2289
++#: ../gtk/gtkwidget.c:2289
+ msgid "Visited Link Color"
+ msgstr "Barva obiskane povezave"
+
+-#: gtk/gtkwidget.c:2290
++#: ../gtk/gtkwidget.c:2290
+ msgid "Color of visited links"
+ msgstr "Barva obiskanih povezav"
+
+-#: gtk/gtkwidget.c:2304
++#: ../gtk/gtkwidget.c:2304
+ msgid "Wide Separators"
+ msgstr "Široke ločnice"
+
+-#: gtk/gtkwidget.c:2305
+-msgid ""
+-"Whether separators have configurable width and should be drawn using a box "
+-"instead of a line"
++#: ../gtk/gtkwidget.c:2305
++msgid "Whether separators have configurable width and should be drawn using a box instead of a line"
+ msgstr "Ali je mogoče nastaviti širino ločnice z izrisom okvirja namesto črte"
+
+-#: gtk/gtkwidget.c:2319
++#: ../gtk/gtkwidget.c:2319
+ msgid "Separator Width"
+ msgstr "Širina ločnice"
+
+-#: gtk/gtkwidget.c:2320
++#: ../gtk/gtkwidget.c:2320
+ msgid "The width of separators if wide-separators is TRUE"
+ msgstr "Širina ločnice, kadar je izbrana možnost široke ločnice"
+
+-#: gtk/gtkwidget.c:2334
++#: ../gtk/gtkwidget.c:2334
+ msgid "Separator Height"
+ msgstr "Višina ločnice"
+
+-#: gtk/gtkwidget.c:2335
++#: ../gtk/gtkwidget.c:2335
+ msgid "The height of separators if \"wide-separators\" is TRUE"
+ msgstr "Višina ločnice, kadar je izbrana možnost široke ločnice"
+
+-#: gtk/gtkwidget.c:2349
++#: ../gtk/gtkwidget.c:2349
+ msgid "Horizontal Scroll Arrow Length"
+ msgstr "Dolžina puščic vodoravnega drsnika"
+
+-#: gtk/gtkwidget.c:2350
++#: ../gtk/gtkwidget.c:2350
+ msgid "The length of horizontal scroll arrows"
+ msgstr "Dolžina puščic vodoravnega drsnika"
+
+-#: gtk/gtkwidget.c:2364
++#: ../gtk/gtkwidget.c:2364
+ msgid "Vertical Scroll Arrow Length"
+ msgstr "Dolžina puščic navpičnega drsnika"
+
+-#: gtk/gtkwidget.c:2365
++#: ../gtk/gtkwidget.c:2365
+ msgid "The length of vertical scroll arrows"
+ msgstr "Dolžina puščic navpičnega drsnika"
+
+-#: gtk/gtkwindow.c:464
++#: ../gtk/gtkwindow.c:464
+ msgid "Window Type"
+ msgstr "Vrsta okna"
+
+-#: gtk/gtkwindow.c:465
++#: ../gtk/gtkwindow.c:465
+ msgid "The type of the window"
+ msgstr "Vrsta okna"
+
+-#: gtk/gtkwindow.c:473
++#: ../gtk/gtkwindow.c:473
+ msgid "Window Title"
+ msgstr "Ime okna"
+
+-#: gtk/gtkwindow.c:474
++#: ../gtk/gtkwindow.c:474
+ msgid "The title of the window"
+ msgstr "Naziv okna"
+
+-#: gtk/gtkwindow.c:481
++#: ../gtk/gtkwindow.c:481
+ msgid "Window Role"
+ msgstr "Vloga okna"
+
+-#: gtk/gtkwindow.c:482
++#: ../gtk/gtkwindow.c:482
+ msgid "Unique identifier for the window to be used when restoring a session"
+ msgstr "Enoznačno določilo za okno pri ponovnem zagonu seje."
+
+-#: gtk/gtkwindow.c:498
++#: ../gtk/gtkwindow.c:498
+ msgid "Startup ID"
+ msgstr "ID zagona"
+
+-#: gtk/gtkwindow.c:499
++#: ../gtk/gtkwindow.c:499
+ msgid "Unique startup identifier for the window used by startup-notification"
+-msgstr ""
+-"Enoznačno določilo zagona za okno, ki ga uporablja program obveščanja med "
+-"zagonom."
++msgstr "Enoznačno določilo zagona za okno, ki ga uporablja program obveščanja med zagonom."
+
+-#: gtk/gtkwindow.c:506
++#: ../gtk/gtkwindow.c:506
+ msgid "Allow Shrink"
+ msgstr "Dovoli krčenje"
+
+-#: gtk/gtkwindow.c:508
++#: ../gtk/gtkwindow.c:508
+ #, no-c-format
+-msgid ""
+-"If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the "
+-"time a bad idea"
+-msgstr ""
+-"Izbrana možnost omogoča, da okno nima določene najmanjše velikosti. V 99% je "
+-"to slaba zamisel"
++msgid "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"
++msgstr "Izbrana možnost omogoča, da okno nima določene najmanjše velikosti. V 99% je to slaba zamisel"
+
+-#: gtk/gtkwindow.c:515
++#: ../gtk/gtkwindow.c:515
+ msgid "Allow Grow"
+ msgstr "Dovoli rast"
+
+-#: gtk/gtkwindow.c:516
++#: ../gtk/gtkwindow.c:516
+ msgid "If TRUE, users can expand the window beyond its minimum size"
+-msgstr ""
+-"Izbrana možnost omogoča, da lahko uporabnik poveča okno preko njegove "
+-"najmanjše velikosti"
++msgstr "Izbrana možnost omogoča, da lahko uporabnik poveča okno preko njegove najmanjše velikosti"
+
+-#: gtk/gtkwindow.c:524
++#: ../gtk/gtkwindow.c:524
+ msgid "If TRUE, users can resize the window"
+ msgstr "Izbrana možnost omogoča, da lahko uporabniki spreminjajo velikost okna"
+
+-#: gtk/gtkwindow.c:531
++#: ../gtk/gtkwindow.c:531
+ msgid "Modal"
+ msgstr "Modalni"
+
+-#: gtk/gtkwindow.c:532
+-msgid ""
+-"If TRUE, the window is modal (other windows are not usable while this one is "
+-"up)"
+-msgstr ""
+-"Izbrana možnost omogoča, da je okno modalno (medtem, ko je to okno dejavno, "
+-"drugih ni mogoče uporabljati)"
++#: ../gtk/gtkwindow.c:532
++msgid "If TRUE, the window is modal (other windows are not usable while this one is up)"
++msgstr "Izbrana možnost omogoča, da je okno modalno (medtem, ko je to okno dejavno, drugih ni mogoče uporabljati)"
+
+-#: gtk/gtkwindow.c:539
++#: ../gtk/gtkwindow.c:539
+ msgid "Window Position"
+ msgstr "Položaj okna"
+
+-#: gtk/gtkwindow.c:540
++#: ../gtk/gtkwindow.c:540
+ msgid "The initial position of the window"
+ msgstr "Začetni položaj okna"
+
+-#: gtk/gtkwindow.c:548
++#: ../gtk/gtkwindow.c:548
+ msgid "Default Width"
+ msgstr "Privzeta širina"
+
+-#: gtk/gtkwindow.c:549
++#: ../gtk/gtkwindow.c:549
+ msgid "The default width of the window, used when initially showing the window"
+ msgstr "Uporabljena privzeta širina okna, kadar se okno pokaže prvič"
+
+-#: gtk/gtkwindow.c:558
++#: ../gtk/gtkwindow.c:558
+ msgid "Default Height"
+ msgstr "Privzeta višina"
+
+-#: gtk/gtkwindow.c:559
+-msgid ""
+-"The default height of the window, used when initially showing the window"
++#: ../gtk/gtkwindow.c:559
++msgid "The default height of the window, used when initially showing the window"
+ msgstr "Uporabljena privzeta višina okna, kadar se okno prikaže prvič"
+
+-#: gtk/gtkwindow.c:568
++#: ../gtk/gtkwindow.c:568
+ msgid "Destroy with Parent"
+ msgstr "Zapri skupaj z nadrejenim predmetom"
+
+-#: gtk/gtkwindow.c:569
++#: ../gtk/gtkwindow.c:569
+ msgid "If this window should be destroyed when the parent is destroyed"
+ msgstr "Ali naj se to okno zapre skupaj z nadrejenim predmetom"
+
+-#: gtk/gtkwindow.c:577
++#: ../gtk/gtkwindow.c:577
+ msgid "Icon for this window"
+ msgstr "Ikona za to okno"
+
+-#: gtk/gtkwindow.c:593
++#: ../gtk/gtkwindow.c:593
+ msgid "Name of the themed icon for this window"
+ msgstr "Ime tematske ikone tega okna"
+
+-#: gtk/gtkwindow.c:608
++#: ../gtk/gtkwindow.c:608
+ msgid "Is Active"
+ msgstr "Je dejavno"
+
+-#: gtk/gtkwindow.c:609
++#: ../gtk/gtkwindow.c:609
+ msgid "Whether the toplevel is the current active window"
+ msgstr "Ali je na vrhu trenutno dejavno okno"
+
+-#: gtk/gtkwindow.c:616
++#: ../gtk/gtkwindow.c:616
+ msgid "Focus in Toplevel"
+ msgstr "Dejavnost vrhnje ravni"
+
+-#: gtk/gtkwindow.c:617
++#: ../gtk/gtkwindow.c:617
+ msgid "Whether the input focus is within this GtkWindow"
+ msgstr "Ali je dejavnost predmeta znotraj GtkWindow okna"
+
+-#: gtk/gtkwindow.c:624
++#: ../gtk/gtkwindow.c:624
+ msgid "Type hint"
+ msgstr "Namig vrste"
+
+-#: gtk/gtkwindow.c:625
+-msgid ""
+-"Hint to help the desktop environment understand what kind of window this is "
+-"and how to treat it."
+-msgstr ""
+-"Namig, ki pomaga uporavljalniku namizja razumeti, kakšna vrsta okna je to in "
+-"kako naj z njo upravlja."
++#: ../gtk/gtkwindow.c:625
++msgid "Hint to help the desktop environment understand what kind of window this is and how to treat it."
++msgstr "Namig, ki pomaga uporavljalniku namizja razumeti, kakšna vrsta okna je to in kako naj z njo upravlja."
+
+-#: gtk/gtkwindow.c:633
++#: ../gtk/gtkwindow.c:633
+ msgid "Skip taskbar"
+ msgstr "Preskoči opravilno vrstico"
+
+-#: gtk/gtkwindow.c:634
++#: ../gtk/gtkwindow.c:634
+ msgid "TRUE if the window should not be in the task bar."
+ msgstr "Izbrana možnost onemogoči prikaz predmeta v opravilni vrstici"
+
+-#: gtk/gtkwindow.c:641
++#: ../gtk/gtkwindow.c:641
+ msgid "Skip pager"
+ msgstr "Preskoči preklopnik"
+
+-#: gtk/gtkwindow.c:642
++#: ../gtk/gtkwindow.c:642
+ msgid "TRUE if the window should not be in the pager."
+ msgstr "Izbrana možnost omogoča, da okno ne bi smelo biti v preklopniku."
+
+-#: gtk/gtkwindow.c:649
++#: ../gtk/gtkwindow.c:649
+ msgid "Urgent"
+ msgstr "Nujno"
+
+-#: gtk/gtkwindow.c:650
++#: ../gtk/gtkwindow.c:650
+ msgid "TRUE if the window should be brought to the user's attention."
+ msgstr "Izbrana možnost omogoča, da okno zahteva uporabnikovo pozornost."
+
+-#: gtk/gtkwindow.c:664
++#: ../gtk/gtkwindow.c:664
+ msgid "Accept focus"
+ msgstr "Sprejmi dejavnost"
+
+-#: gtk/gtkwindow.c:665
++#: ../gtk/gtkwindow.c:665
+ msgid "TRUE if the window should receive the input focus."
+ msgstr "Izbrana možnost omogoča, da okno postane dejavno."
+
+-#: gtk/gtkwindow.c:679
++#: ../gtk/gtkwindow.c:679
+ msgid "Focus on map"
+ msgstr "Dejavnost med preslikavo"
+
+-#: gtk/gtkwindow.c:680
++#: ../gtk/gtkwindow.c:680
+ msgid "TRUE if the window should receive the input focus when mapped."
+ msgstr "Izbrana možnost omogoča, da okno postane dejavno med preslikavo."
+
+-#: gtk/gtkwindow.c:694
++#: ../gtk/gtkwindow.c:694
+ msgid "Decorated"
+ msgstr "Okrašeno"
+
+-#: gtk/gtkwindow.c:695
++#: ../gtk/gtkwindow.c:695
+ msgid "Whether the window should be decorated by the window manager"
+ msgstr "Ali naj bo okno izrisano v slogu upravljalnika oken."
+
+-#: gtk/gtkwindow.c:709
++#: ../gtk/gtkwindow.c:709
+ msgid "Deletable"
+ msgstr "Izbrisljivo"
+
+-#: gtk/gtkwindow.c:710
++#: ../gtk/gtkwindow.c:710
+ msgid "Whether the window frame should have a close button"
+ msgstr "Ali naj ima okvir okna gumb za zapiranje."
+
+-#: gtk/gtkwindow.c:726
++#: ../gtk/gtkwindow.c:726
+ msgid "Gravity"
+ msgstr "Težnost"
+
+-#: gtk/gtkwindow.c:727
++#: ../gtk/gtkwindow.c:727
+ msgid "The window gravity of the window"
+ msgstr "Težnost okna"
+
+-#: gtk/gtkwindow.c:744
++#: ../gtk/gtkwindow.c:744
+ msgid "Transient for Window"
+ msgstr "Začasen proces okna"
+
+-#: gtk/gtkwindow.c:745
++#: ../gtk/gtkwindow.c:745
+ msgid "The transient parent of the dialog"
+ msgstr "Začasen nadrejen proces sporočila"
+
+-#: gtk/gtkwindow.c:759
++#: ../gtk/gtkwindow.c:759
+ msgid "Opacity for Window"
+ msgstr "Prosojnost okna"
+
+-#: gtk/gtkwindow.c:760
++#: ../gtk/gtkwindow.c:760
+ msgid "The opacity of the window, from 0 to 1"
+ msgstr "Prosojnost okna določena med 0 in 1"
+
+-#: modules/input/gtkimcontextxim.c:334
++#: ../modules/input/gtkimcontextxim.c:334
+ msgid "IM Preedit style"
+ msgstr "Predhodno urejevalni slog vhodne metod (IM)"
+
+-#: modules/input/gtkimcontextxim.c:335
++#: ../modules/input/gtkimcontextxim.c:335
+ msgid "How to draw the input method preedit string"
+ msgstr "Kako naj se nariše predhodno urejevalni niz vhodne metode"
+
+-#: modules/input/gtkimcontextxim.c:343
++#: ../modules/input/gtkimcontextxim.c:343
+ msgid "IM Status style"
+ msgstr "Slog stanja vhodne metode (IM)"
+
+-#: modules/input/gtkimcontextxim.c:344
++#: ../modules/input/gtkimcontextxim.c:344
+ msgid "How to draw the input method statusbar"
+ msgstr "Kako naj se nariše vrstica stanja vhodne metode (IM)"
+
+ #~ msgid "Whether stock icons should be shown in buttons"
+ #~ msgstr "Ali naj bodo skladne ikone prikazane v gumbih"
+-
+ #~ msgid "Cancelled"
+ #~ msgstr "Preklicano"
+-
+ #~ msgid "Whether or not the operation has been successfully cancelled"
+ #~ msgstr "Ali je bilo dejanje uspešno preklicano"
++
+Index: po-properties/ast.po
+===================================================================
+--- po-properties/ast.po (revision 22076)
++++ po-properties/ast.po (revision 22450)
+@@ -5,12 +5,12 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
++"Project-Id-Version: ast\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2009-01-07 12:13-0500\n"
+-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"PO-Revision-Date: 2009-01-26 11:17+0200\n"
++"Last-Translator: Esbardu <esguil@terra.es>\n"
++"Language-Team: Asturian <xspuente@gmail.com>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+Index: modules/other/gail/ChangeLog
+===================================================================
+--- modules/other/gail/ChangeLog (revision 22076)
++++ modules/other/gail/ChangeLog (revision 22450)
+@@ -1,3 +1,13 @@
++2009-02-04 Tor Lillqvist <tml@novell.com>
++
++ Bug 570406 - gailutil.def is in srcdir, but used from builddir
++
++ * libgail-util/Makefile.am: Use gailutil.def from srcdir. Drop
++ useless rules to install/uninstall import libraries, libtool knows
++ to install / uninstall them itself when installing / uninstalling
++ a .la file. Add rules to install / uninstall the def file like for
++ consistency, like with the other libraries in GTK+.
++
+ 2009-01-07 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.14.7 ===
+Index: modules/other/gail/libgail-util/Makefile.am
+===================================================================
+--- modules/other/gail/libgail-util/Makefile.am (revision 22076)
++++ modules/other/gail/libgail-util/Makefile.am (revision 22450)
+@@ -2,15 +2,15 @@
+
+ EXTRA_DIST += gailutil.def
+ if OS_WIN32
+-export_symbols = -export-symbols gailutil.def
++export_symbols = -export-symbols $(srcdir)/gailutil.def
+ no_undefined = -no-undefined
+-install-libtool-import-lib:
+- $(INSTALL) .libs/libgailutil.dll.a $(DESTDIR)$(libdir)
+-uninstall-libtool-import-lib:
+- -rm $(DESTDIR)$(libdir)/libgailutil.dll.a
++install-def-file: gailutil.def
++ $(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir)
++uninstall-def-file:
++ -rm $(DESTDIR)$(libdir)/gailutil.def
+ else
+-install-libtool-import-lib:
+-uninstall-libtool-import-lib:
++install-def-file:
++uninstall-def-file:
+ endif
+
+ if MS_LIB_AVAILABLE
+@@ -75,7 +75,6 @@
+ gailutil.lib: libgailutil.la gailutil.def
+ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
+
+-install-data-local: install-ms-lib install-libtool-import-lib
++install-data-local: install-ms-lib install-def-file
+
+-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+-
++uninstall-local: uninstall-ms-lib uninstall-def-file
+Index: modules/other/gail/gailtextcell.c
+===================================================================
+--- modules/other/gail/gailtextcell.c (revision 22076)
++++ modules/other/gail/gailtextcell.c (revision 22450)
+@@ -128,7 +128,8 @@
+ };
+
+ G_DEFINE_TYPE_WITH_CODE (GailTextCell, gail_text_cell, GAIL_TYPE_RENDERER_CELL,
+- G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
++ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)
++ gail_cell_type_add_action_interface (g_define_type_id))
+
+ static void
+ gail_text_cell_class_init (GailTextCellClass *klass)
+Index: modules/engines/ms-windows/msw_style.c
+===================================================================
+--- modules/engines/ms-windows/msw_style.c (revision 22076)
++++ modules/engines/ms-windows/msw_style.c (revision 22450)
+@@ -2897,8 +2897,17 @@
+ {
+ if (detail)
+ {
+- if (!strcmp (detail, "checkbutton"))
++ if (state_type == GTK_STATE_SELECTED &&
++ (!strncmp ("cell_even", detail, 9) || !strncmp ("cell_odd", detail, 8)))
+ {
++ GdkGC *gc = GTK_WIDGET_HAS_FOCUS (widget) ? style->base_gc[state_type] : style->base_gc[GTK_STATE_ACTIVE];
++
++ gdk_draw_rectangle (window, gc, TRUE, x, y, width, height);
++
++ return;
++ }
++ else if (!strcmp (detail, "checkbutton"))
++ {
+ if (state_type == GTK_STATE_PRELIGHT)
+ {
+ return;
+Index: po/ChangeLog
+===================================================================
+--- po/ChangeLog (revision 22076)
++++ po/ChangeLog (revision 22450)
+@@ -1,3 +1,10 @@
++2009-02-18 Sven Neumann <sven@gimp.org>
++
++ Debian Bug report #508371
++ Wrong German translation for "Color Selection"
++
++ * de.po: merged fix from trunk.
++
+ 2009-01-07 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.14.7 ===
+Index: po/de.po
+===================================================================
+--- po/de.po (revision 22076)
++++ po/de.po (revision 22450)
+@@ -16,7 +16,7 @@
+ "Project-Id-Version: GTK+ HEAD\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2009-01-07 12:12-0500\n"
+-"PO-Revision-Date: 2008-10-16 14:23+0200\n"
++"PO-Revision-Date: 2009-02-18 16:54+0100\n"
+ "Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
+ "Language-Team: German <gnome-de@gnome.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -1528,7 +1528,7 @@
+
+ #: gtk/gtkcolorseldialog.c:170
+ msgid "Color Selection"
+-msgstr "Schriftwahl"
++msgstr "Farbwahl"
+
+ #: gtk/gtkentry.c:5384 gtk/gtktextview.c:7686
+ msgid "Input _Methods"
+Index: configure.in
+===================================================================
+--- configure.in (revision 22076)
++++ configure.in (revision 22450)
+@@ -12,8 +12,8 @@
+
+ m4_define([gtk_major_version], [2])
+ m4_define([gtk_minor_version], [14])
+-m4_define([gtk_micro_version], [7])
+-m4_define([gtk_interface_age], [7])
++m4_define([gtk_micro_version], [8])
++m4_define([gtk_interface_age], [8])
+ m4_define([gtk_binary_age],
+ [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
+ m4_define([gtk_version],
+@@ -1619,7 +1619,7 @@
+ AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
+
+ if test "x$gdktarget" = "xdirectfb"; then
+- DIRECTFB_REQUIRED_VERSION=0.9.24
++ DIRECTFB_REQUIRED_VERSION=1.0.0
+ AC_MSG_CHECKING(for DirectFB)
+
+ if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
+Index: ChangeLog
+===================================================================
+--- ChangeLog (revision 22076)
++++ ChangeLog (revision 22450)
+@@ -1,5 +1,333 @@
++2009-02-19 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ * gdk/directfb/gdkwindow-directfb.c
++ (gdk_directfb_window_move_resize): looks like being called with
++ negative width and height should be interpreted as a move. Fixes
++ scrolling and makes popups work to some extent.
++
++ (_gdk_directfb_move_resize_child): formatting.
++
++2009-02-19 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ * gdk/directfb/gdkdisplay-directfb.c (gdk_display_open): move the
++ call to _gdk_windowing_window_init() up a little. Fixes a crash
++ when running on pseudo-color visuals. Thanks to Masse Nicolas for
++ pointing this out.
++
++2009-02-19 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ * gdk/directfb/gdkwindow-directfb.c
++ (gdk_window_foreign_new_for_display, gdk_directfb_window_new):
++ initialize private->impl. Thanks to Masse Nicolas for pointing
++ this out.
++
++2009-02-18 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ Bug 533456 – Memory leak when window is destroyed
++
++ * gdk/directfb/gdkdirectfb.h
++ * gdk/directfb/gdkprivate-directfb.h
++ * gdk/directfb/gdkcursor-directfb.c
++ * gdk/directfb/gdkevents-directfb.c
++ * gdk/directfb/gdkwindow-directfb.c: removed all #ifdef checks for
++ DIRECTFB_MAJOR_VERSION >= 1. We depend on DirectFB >= 1.0.0 now.
++ Fixes a potential build issue that would lead to a memory leak as
++ described in bug #533456.
++
++2009-02-18 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ Bug 513422 – Unknown meaning of translatable messages
++
++ * gdk/directfb/gdkdisplay-directfb.c: removed broken and commented
++ code and the translatable messages that belonged to it.
++
++2009-02-18 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ Bug 560671 – the client_message API doesn't work in DirectFB
++
++ * gdk/directfb/gdkevents-directfb.c: applied a slightly cleaned up
++ patch from Steve Lhomme that adds this functionality using
++ DirectFB's DFBUserEvent.
++
++2009-02-18 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ Bug 543710 – Dead keys do not work anymore with DirectFB
++
++ * gdk/directfb/gdkkeys-directfb.c (gdk_directfb_translate_key):
++ applied patch from Josselin Mouette that removes special handling
++ of dead keys as that is done by DirectFB for a long time already.
++
++2009-02-18 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ * configure.in: depend on DirectFB >= 1.0.0. There's no point in
++ using an earlier development version.
++
++2009-02-18 Sven Neumann <sven@gimp.org>
++
++ Merged from trunk:
++
++ Bug 554407 – directfb backend does not implement GdkWindowImpl
++
++ * gdk/directfb/gdkgeometry-directfb.c
++ * gdk/directfb/gdkprivate-directfb.h
++ * gdk/directfb/gdkwindow-directfb.c: fix the build of the DirectFB
++ backend and resurrect basic functionality. Based on a patch from
++ the Ubuntu bug-tracker and work by Masse Nicolas.
++
++2009-02-16 Tor Lillqvist <tml@novell.com>
++
++ Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c
++
++ * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Cast
++ gpointer to char * before pointer arithmetic to avoid compilation
++ error with MSVC.
++
++ (_gdk_selection_property_delete): Remove unused variable.
++
++2009-02-13 Matthias Clasen <mclasen@redhat.com>
++
++ Merged from trunk
++
++ * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Don't forget to
++ register randr events. Found by Søren Sandmann
++
++2009-02-12 Cody Russell <bratsche@gnome.org>
++
++ Bug 571576 – gdk_pixbuf_save_to_stream() broken
++
++ * gdk-pixbuf/gdk-pixbuf-io.c: Fix gdk_pixbuf_save_to_stream() so that
++ it does not always return FALSE (even when it succeeds), and also so
++ that it does not set error to NULL when something goes wrong.
++
++2009-01-29 Tor Lillqvist <tml@novell.com>
++
++ Bug 559408 - Transparency lost when images are copied between GTK+
++ and the clipboard on Windows
++
++ The code in gdkselection-win32.c is simplified quite a lot. When
++ an image is stored on the clipboard from GTK+, only the "PNG" and
++ CF_DIB formats are advertised. PNG is our preferred format because
++ it can losslessly represent any image that gdk-pixbuf can handle,
++ even with alpha, unambiguously. CF_DIB is also advertised because
++ of its ubiquitous support in Windows software.
++
++ Delayed rendering is used as before, so for other data than text
++ nothing is actually stored on the clipboard until some app asks
++ for it.
++
++ It's pointless to advertise images formats like "image/png" or
++ "image/x-MS-bmp" that no other Windows application is going to
++ look for anyway. Likewise it's pointless to store text under
++ formats like "text/plain" or "UTF8_STRING". Just store
++ CF_UNICODETEXT. CF_TEXT will be available as a synthesized format
++ anyways.
++
++ Office 2007 offers and asks for images in PNG format using the
++ registered clipboard format name "PNG", so we do likewise. If the
++ "PNG" format is available that is preferred when copying to GTK+
++ from the clipboard.
++
++ Unfortunately Word 2007 still uses CF_DIB without handling
++ alpha. But PowerPoint 2007 uses PNG if available and handles alpha
++ correctly. Both Word and Powerpoint offer PNG with alpha nicely.
++
++ Firefox and IE7 offer images that contain alpha as 32-bit version
++ 3 BI_RGB DIBs with the undocumented "extra" bytes actually being
++ alpha. Also, alpha is premultiplied into the RGB bytes, presumably
++ because that is how AlphaBlend() wants such DIBs. That is also
++ taken care of. At least for Firefox it easy to be sure that a
++ CF_DIB on the clipboard is from Firefox.
++
++ Also some general stylistic cleanup, comment improvements, and
++ improvements of debugging printout especially in the clipboard
++ handling. Those are not detailled below.
++
++ * gdk/win32/gdkprivate-win32.h
++ * gdk/win32/gdkglobals-win32.c
++ * gdk/win32/gdkgmain-win32.c: Move some globals that were used
++ only in gdkselection-win32.c to be local to that file.
++
++ * gdk/win32/gdkproperty-win32.c (gdk_property_change): Don't
++ bother checking if text to be placed on the clipboard consists of
++ only ASCII.
++
++ * gdk/win32/gdkselection-win32.c: Add static variables for a list
++ of GdkPixbuf-supported formats, well-known registered clipboard
++ formats for images, and for GdkAtoms for well-known image and text
++ formats.
++
++ (_gdk_win32_selection_init): Initialize above static variables.
++
++ (selection_property_store) (gdk_selection_property_get)
++ (_gdk_selection_property_delete): Don't use a FIFO of GdkSelProps
++ for a window after all, it breaks testtext. See bug #163844.
++
++ (gdk_selection_convert): When converting to the TARGETS format,
++ i.e. when the caller wants to know what clipboard formats are
++ available, if PNG is available we report just that and skip
++ CF_DIB, JPEG and GIF even if advertised.
++
++ If CF_UNICODETEXT is available, report only UTF8_STRING.
++
++ When converting to the UTF8_STRING format, i.e. when the caller
++ wants text from the clipboard, try just CF_UNICODETEXT. There is
++ no point in trying CF_TEXT as Windows will synthesize
++ CF_UNICODETEXT from CF_TEXT anyway, if some app has stored just
++ CF_TEXT.
++
++ When converting to the image/bmp format, i.e. when the caller
++ wants an CF_DIB image from the clipboard, we check if the DIB is a
++ version 3 32-bit BI_RGB one that is likely to actually contain
++ alpha in the "extra" bytes. Such a DIB is likely to have
++ premultiplied alpha even, at least in the case of Firefox 3 and
++ IE7. We then edit the DIB in-place into a version 5 one in
++ BI_BITFIELDS format and undo the alpha premultiplication.
++
++ In any case, prepend a BMP file header before letting go of the
++ data which will be fed to the gdk-pixbuf bmp loader by upper
++ levels.
++
++ (gdk_win32_selection_add_targets): If some kind of pixmap image
++ format is being added, actually advertise just PNG and
++ CF_DIB. Note that alpha won't be stored on the clipboard through
++ CF_DIB. This is because gdk-pixbuf's bmp loader doesn't save
++ alpha. Furthermore, few if any non-GTK+ Windows apps seem to
++ understand a version 5 DIB with proper alpha anyway.
++
++ (_gdk_win32_selection_convert_to_dib): Simplified muchly.
++
++2009-01-29 Tor Lillqvist <tml@novell.com>
++
++ Bug 145058 - Inputting "^^" requires four keystrokes on Win32,
++ differs from platform default behaviour
++
++ * gtk/gtkimcontextsimple.c
++ (check_win32_special_case_after_compact_match): New
++ function. Called from check_compact_table() after a table-based
++ match has committed a character. In case there was two identical
++ dead accents in the input, another copy of the spacing accent that
++ was already committed is committed. This fixes #145058.
++
++ (check_win32_special_cases): New function. Called first from
++ gtk_im_context_simple_filter_keypress(). This fixes another
++ problem: a dead accent followed by a space should commit the
++ corresponding spacing accent. The compose tables from X commit
++ another character in two cases and we want to override that on
++ Windows.
++
++ Add GTK_NOTE (MISC) debugging output to this code.
++
++2009-01-29 Claudio Saavedra <csaavedra@igalia.com>
++
++ Merged from trunk:
++
++ Bug 569435 – make maintainer-clean removes non-generated sources
++
++ * gdk/Makefile.am: Do not remove gdkprivate.h and gdkwindowimpl.h
++ during make maintainer-clean, as these files are not generated.
++
++2009-01-26 Claudio Saavedra <csaavedra@igalia.com>
++
++ Merged from trunk:
++
++ * gtk/gtktreeview.c: Use gtk-doc syntax to refer to properties in
++ the docstrings.
++
++2009-01-26 Claudio Saavedra <csaavedra@igalia.com>
++
++ Merged from trunk:
++
++ Bug 559420 – gtk_icon_view_enable_model_drag_[source|dest] docs
++ wrt. reorderable property
++
++ * gtk/gtkiconview.c: Improve docstrings regarding reorderable
++ property. Based on a patch by Björn Lindqvist.
++
++2009-01-26 Claudio Saavedra <csaavedra@igalia.com>
++
++ Merged from trunk:
++
++ * gtk/gtktreeview.c: (gtk_tree_view_class_init): Slightly
++ improve ::search-column property description.
++
++2009-01-21 Cody Russell <bratsche@gnome.org>
++
++ Bug 568592 – GailTextCell no longer implements AtkAction interface
++
++ * modules/other/gail/gailtextcell.c: Fix a regression in GailTextCell
++ from revision 19227 where G_DEFINE_TYPE_WITH_CODE was used to replace
++ hard-coded type definition but accidentally removed the registration
++ of the AtkAction interface. Patch from Peter Johanson.
++
++2009-01-16 Cody Russell <bratsche@gnome.org>
++
++ Bug 567944 – [Win32] Sorted treeview columns can be unreadable
++
++ * modules/engines/ms-windows/msw_style.c: Draw selected treeview
++ cells according to treeview focus, but ignore whether it is in
++ a sorted column or not. Otherwise the intersection of a selected
++ row and a sorted column looks very strange if the treeview does
++ not have focus.
++
++2009-01-12 Tor Lillqvist <tml@iki.fi>
++
++ Bug 164002 - query scripts don't work uninstalled on windows
++
++ * gtk/gtkmain.c (_gtk_get_libdir): If the gtk DLL is in a ".libs"
++ folder, assume we are running uninstalled, and use the
++ configure-time GTK_LIBDIR.
++
++2009-01-12 Tor Lillqvist <tml@iki.fi>
++
++ * gdk/gdk.c (gdk_arg_debug_cb) (gdk_arg_no_debug_cb): A
++ GOptionArgFunc should return gboolean and take also a GError
++ pointer parameter, so make these two functions do that. Return
++ FALSE (and set the GError) if the parsing of the debug string
++ failed completely. Note that g_parse_debug_string() doesn't really
++ have any way to return parsing status, and accepts partially
++ incorrect strings, though.
++
++2009-01-12 Claudio Saavedra <csaavedra@igalia.com>
++
++ Bug 567468 – no check for trailing != NULL in
++ gtk_text_layout_get_iter_at_position()
++
++ * gtk/gtktextlayout.c: (gtk_text_layout_get_iter_at_position):
++ Check for trailing to be non-NULL.
++ * gtk/gtktextview.c: (gtk_text_view_get_iter_at_position): document
++ that trailing may be NULL.
++
++2009-01-11 Tor Lillqvist <tml@iki.fi>
++
++ Bug 523554 - Copy from GIMP to Word broken
++
++ * gdk/win32/gdkselection-win32.c
++ (_gdk_win32_selection_convert_to_dib): The DIB stored in the
++ Windows Clipboard was for some unknown reason truncated by one
++ byte. Don't do that.
++
+ 2009-01-07 Matthias Clasen <mclasen@redhat.com>
+
++ * configure.in: Bump version
++
++2009-01-07 Matthias Clasen <mclasen@redhat.com>
++
+ * === Released 2.14.7 ===
+
+ * NEWS: Updates
+Index: gdk/directfb/gdkevents-directfb.c
+===================================================================
+--- gdk/directfb/gdkevents-directfb.c (revision 22076)
++++ gdk/directfb/gdkevents-directfb.c (revision 22450)
+@@ -162,24 +162,22 @@
+
+ static gboolean
+ gdk_event_send_client_message_by_window (GdkEvent *event,
+- GdkWindow *window)
++ GdkWindow *window)
+ {
+- GdkEvent *new_event;
++ DFBUserEvent evt;
+
+ g_return_val_if_fail(event != NULL, FALSE);
+ g_return_val_if_fail(GDK_IS_WINDOW(window), FALSE);
+
+- new_event = gdk_directfb_event_make (window, GDK_CLIENT_EVENT);
+- new_event->client.message_type = event->client.message_type;
+- new_event->client.data_format = event->client.data_format;
+- memcpy(&new_event->client.data,
+- &event->client.data,
+- sizeof(event->client.data));
++ evt.clazz = DFEC_USER;
++ evt.type = GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (event->client.message_type));
++ evt.data = (void *) event->client.data.l[0];
+
++ _gdk_display->buffer->PostEvent(_gdk_display->buffer, DFB_EVENT (&evt));
++
+ return TRUE;
+ }
+
+-
+ static void
+ dfb_events_dispatch (void)
+ {
+@@ -230,6 +228,32 @@
+ else
+ dfb_events_process_window_event (&event->window);
+ break;
++
++ case DFEC_USER:
++ {
++ GList *list;
++
++ GDK_NOTE (EVENTS, g_print (" client_message"));
++
++ for (list = client_filters; list; list = list->next)
++ {
++ GdkClientFilter *filter = list->data;
++ DFBUserEvent *user_event = (DFBUserEvent *) event;
++ GdkAtom type;
++
++ type = GDK_POINTER_TO_ATOM (GUINT_TO_POINTER (user_event->type));
++
++ if (filter->type == type)
++ {
++ if (filter->function (user_event,
++ NULL,
++ filter->data) != GDK_FILTER_CONTINUE)
++ break;
++ }
++ }
++ }
++ break;
++
+ default:
+ break;
+ }
+@@ -395,7 +419,6 @@
+ impl->window->CreateEventBuffer (impl->window, &EventBuffer);
+ }
+
+-#if (DIRECTFB_MAJOR_VERSION >= 1)
+ void
+ gdk_directfb_event_windows_remove (GdkWindow *window)
+ {
+@@ -412,7 +435,6 @@
+ impl->window->DetachEventBuffer (impl->window, EventBuffer);
+ /* FIXME: should we warn if (! EventBuffer) ? */
+ }
+-#endif
+
+ GdkWindow *
+ gdk_directfb_child_at (GdkWindow *window,
+Index: gdk/directfb/gdkdisplay-directfb.c
+===================================================================
+--- gdk/directfb/gdkdisplay-directfb.c (revision 22076)
++++ gdk/directfb/gdkdisplay-directfb.c (revision 22450)
+@@ -21,7 +21,7 @@
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
++ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+ #include "config.h"
+@@ -32,28 +32,23 @@
+ #include "gdkprivate-directfb.h"
+ #include "gdkscreen.h"
+ #include "gdkdisplaymanager.h"
+-#include "gdkintl.h"
+ #include "gdkalias.h"
+
+
++extern void _gdk_visual_init (void);
++extern void _gdk_events_init (void);
++extern void _gdk_input_init (void);
++extern void _gdk_dnd_init (void);
++extern void _gdk_windowing_window_init (void);
++extern void _gdk_windowing_image_init (void);
++extern void _gdk_directfb_keyboard_init (void);
+
+-extern void _gdk_visual_init (void);
+-extern void _gdk_events_init (void);
+-extern void _gdk_input_init (void);
+-extern void _gdk_dnd_init (void);
+-extern void _gdk_windowing_window_init (void);
+-extern void _gdk_windowing_image_init (void);
+-extern void _gdk_directfb_keyboard_init (void);
+-
+ static gboolean gdk_directfb_argb_font = FALSE;
+ static gint gdk_directfb_glyph_surface_cache = 8;
+-static gchar *directfb_args;
+
+
+ const GOptionEntry _gdk_windowing_args[] =
+ {
+- { "dfb",0,0,G_OPTION_ARG_STRING,&directfb_args,N_("directfb arg"),N_("sdl|system")},
+- { "dfb-help",0,0,G_OPTION_ARG_NONE, NULL,NULL},
+ { "disable-aa-fonts",0,0,G_OPTION_ARG_INT,&gdk_directfb_monochrome_fonts,NULL,NULL },
+ { "argb-font",0,0, G_OPTION_ARG_INT, &gdk_directfb_argb_font,NULL,NULL},
+ { "transparent-unfocused",0,0, G_OPTION_ARG_INT, &gdk_directfb_apply_focus_opacity,NULL,NULL },
+@@ -67,44 +62,36 @@
+ **/
+ GdkDisplay * gdk_display_open (const gchar *display_name)
+ {
+-
+- if (_gdk_display) {
+- return GDK_DISPLAY_OBJECT(_gdk_display); /* single display only */
+- }
+- DFBResult ret;
+ IDirectFB *directfb;
+ IDirectFBDisplayLayer *layer;
+ IDirectFBInputDevice *keyboard;
++ DFBResult ret;
+
+- int argc=0;
+- char **argv=NULL;
++ int argc = 0;
++ char **argv = NULL;
+
+-#if 0 /* arg hack arg support broken*/
+- if(directfb_args ) {
+- argc=2;
+- argv = (char **)g_malloc(sizeof(char *)*argc);
+- argv[0] = "simple";
+- argv[1] = "--dfb:system=SDL";
+- }
+-#endif
++ if (_gdk_display)
++ {
++ return GDK_DISPLAY_OBJECT(_gdk_display); /* single display only */
++ }
+
+ ret = DirectFBInit (&argc,&argv);
+ if (ret != DFB_OK)
+-{
++ {
+ DirectFBError ("gdk_display_open: DirectFBInit", ret);
+ return NULL;
+ }
+
+- ret = DirectFBCreate (&directfb);
+-
++ ret = DirectFBCreate (&directfb);
+ if (ret != DFB_OK)
+ {
+ DirectFBError ("gdk_display_open: DirectFBCreate", ret);
+ return NULL;
+ }
+- _gdk_display = g_object_new(GDK_TYPE_DISPLAY_DFB,NULL);
+- _gdk_display->directfb=directfb;
+
++ _gdk_display = g_object_new (GDK_TYPE_DISPLAY_DFB, NULL);
++ _gdk_display->directfb = directfb;
++
+ ret = directfb->GetDisplayLayer (directfb, DLID_PRIMARY, &layer);
+ if (ret != DFB_OK)
+ {
+@@ -130,11 +117,10 @@
+ _gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL);
+
+ _gdk_visual_init ();
++ _gdk_windowing_window_init ();
+
+ gdk_screen_set_default_colormap (_gdk_screen,
+- gdk_screen_get_system_colormap (_gdk_screen));
+- _gdk_windowing_window_init ();
+- _gdk_windowing_image_init ();
++ gdk_screen_get_system_colormap (_gdk_screen)); _gdk_windowing_image_init ();
+
+ _gdk_input_init ();
+ _gdk_dnd_init ();
+Index: gdk/directfb/gdkkeys-directfb.c
+===================================================================
+--- gdk/directfb/gdkkeys-directfb.c (revision 22076)
++++ gdk/directfb/gdkkeys-directfb.c (revision 22450)
+@@ -1629,28 +1629,7 @@
+ break;
+
+ case DIKT_DEAD:
+- switch (key_symbol)
+- {
+- case DIKS_DEAD_ABOVEDOT: keyval = GDK_dead_abovedot; break;
+- case DIKS_DEAD_ABOVERING: keyval = GDK_dead_abovering; break;
+- case DIKS_DEAD_ACUTE: keyval = GDK_dead_acute; break;
+- case DIKS_DEAD_BREVE: keyval = GDK_dead_breve; break;
+- case DIKS_DEAD_CARON: keyval = GDK_dead_caron; break;
+- case DIKS_DEAD_CEDILLA: keyval = GDK_dead_cedilla; break;
+- case DIKS_DEAD_CIRCUMFLEX: keyval = GDK_dead_circumflex; break;
+- case DIKS_DEAD_DIAERESIS: keyval = GDK_dead_diaeresis; break;
+- case DIKS_DEAD_DOUBLEACUTE: keyval = GDK_dead_doubleacute; break;
+- case DIKS_DEAD_GRAVE: keyval = GDK_dead_grave; break;
+- case DIKS_DEAD_IOTA: keyval = GDK_dead_iota; break;
+- case DIKS_DEAD_MACRON: keyval = GDK_dead_macron; break;
+- case DIKS_DEAD_OGONEK: keyval = GDK_dead_ogonek; break;
+- case DIKS_DEAD_SEMIVOICED_SOUND:
+- keyval = GDK_dead_semivoiced_sound; break;
+- case DIKS_DEAD_TILDE: keyval = GDK_dead_tilde; break;
+- case DIKS_DEAD_VOICED_SOUND: keyval = GDK_dead_voiced_sound; break;
+- default:
+- break;
+- }
++ /* dead keys are handled directly by directfb */
+ break;
+
+ case DIKT_CUSTOM:
+Index: gdk/directfb/gdkgeometry-directfb.c
+===================================================================
+--- gdk/directfb/gdkgeometry-directfb.c (revision 22076)
++++ gdk/directfb/gdkgeometry-directfb.c (revision 22450)
+@@ -41,9 +41,9 @@
+
+
+ void
+-_gdk_windowing_window_get_offsets (GdkWindow *window,
+- gint *x_offset,
+- gint *y_offset)
++_gdk_directfb_window_get_offsets (GdkWindow *window,
++ gint *x_offset,
++ gint *y_offset)
+ {
+ if (x_offset)
+ *x_offset = 0;
+@@ -69,9 +69,9 @@
+ * brings in from offscreen areas are invalidated.
+ **/
+ void
+-gdk_window_scroll (GdkWindow *window,
+- gint dx,
+- gint dy)
++_gdk_directfb_window_scroll (GdkWindow *window,
++ gint dx,
++ gint dy)
+ {
+ GdkWindowObject *private;
+ GdkDrawableImplDirectFB *impl;
+@@ -161,10 +161,10 @@
+ * Since: 2.8
+ **/
+ void
+-gdk_window_move_region (GdkWindow *window,
+- const GdkRegion *region,
+- gint dx,
+- gint dy)
++_gdk_directfb_window_move_region (GdkWindow *window,
++ const GdkRegion *region,
++ gint dx,
++ gint dy)
+ {
+ GdkWindowObject *private;
+ GdkDrawableImplDirectFB *impl;
+Index: gdk/directfb/gdkdirectfb.h
+===================================================================
+--- gdk/directfb/gdkdirectfb.h (revision 22076)
++++ gdk/directfb/gdkdirectfb.h (revision 22450)
+@@ -80,10 +80,8 @@
+ IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window);
+ IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window);
+
+-#if (DIRECTFB_MAJOR_VERSION >= 1)
+ GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
+- IDirectFBSurface *subsurface);
+-#endif
++ IDirectFBSurface *subsurface);
+
+
+ G_END_DECLS
+Index: gdk/directfb/gdkwindow-directfb.c
+===================================================================
+--- gdk/directfb/gdkwindow-directfb.c (revision 22076)
++++ gdk/directfb/gdkwindow-directfb.c (revision 22450)
+@@ -33,6 +33,7 @@
+
+ #include "config.h"
+ #include "gdk.h"
++#include "gdkwindowimpl.h"
+ #include "gdkwindow.h"
+
+ #include "gdkdirectfb.h"
+@@ -67,6 +68,9 @@
+ static void gdk_window_impl_directfb_class_init (GdkWindowImplDirectFBClass *klass);
+ static void gdk_window_impl_directfb_finalize (GObject *object);
+
++static void gdk_window_impl_iface_init (GdkWindowImplIface *iface);
++
++
+ typedef struct
+ {
+ GdkWindowChildChanged changed;
+@@ -98,9 +102,8 @@
+ tmp_list = old_update_windows;
+ while (tmp_list)
+ {
+- GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data );
+- GdkWindowImplDirectFB *wimpl = GDK_WINDOW_IMPL_DIRECTFB( private->impl );
+-
++ GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data );
++
+ if (private->update_freeze_count)
+ {
+ D_DEBUG_AT( GDKDFB_Updates, " -> %p frozen [%4d,%4d-%4dx%4d] (%d boxes)\n",
+@@ -115,7 +118,7 @@
+ wimpl->flips.num_regions );
+ gdk_window_process_updates(tmp_list->data,TRUE);
+ }
+-
++
+ g_object_unref (tmp_list->data);
+ tmp_list = tmp_list->next;
+ }
+@@ -186,13 +189,10 @@
+ static GdkWindow *gdk_directfb_focused_window = NULL;
+ static gpointer parent_class = NULL;
+ GdkWindow * _gdk_parent_root = NULL;
+-static void
+-gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface);
+
++static void gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface);
+
+
+-
+-
+ GType
+ gdk_window_impl_directfb_get_type (void)
+ {
+@@ -213,20 +213,30 @@
+ (GInstanceInitFunc) gdk_window_impl_directfb_init,
+ };
+
+- static const GInterfaceInfo paintable_info =
+- {
+- (GInterfaceInitFunc) gdk_window_impl_directfb_paintable_init,
+- NULL,
+- NULL
+- };
++ static const GInterfaceInfo paintable_info =
++ {
++ (GInterfaceInitFunc) gdk_window_impl_directfb_paintable_init,
++ NULL,
++ NULL
++ };
+
++ static const GInterfaceInfo window_impl_info =
++ {
++ (GInterfaceInitFunc) gdk_window_impl_iface_init,
++ NULL,
++ NULL
++ };
++
+ object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_DIRECTFB,
+ "GdkWindowImplDirectFB",
+ &object_info, 0);
+- g_type_add_interface_static (object_type,
+- GDK_TYPE_PAINTABLE,
+- &paintable_info);
++ g_type_add_interface_static (object_type,
++ GDK_TYPE_PAINTABLE,
++ &paintable_info);
+
++ g_type_add_interface_static (object_type,
++ GDK_TYPE_WINDOW_IMPL,
++ &window_impl_info);
+ }
+
+ return object_type;
+@@ -401,11 +411,11 @@
+
+ g_assert (_gdk_parent_root == NULL);
+
+- _gdk_display->layer->GetConfiguration(
+- _gdk_display->layer, &dlc );
++ _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
+
+ _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
+ private = GDK_WINDOW_OBJECT (_gdk_parent_root);
++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+
+ private->window_type = GDK_WINDOW_ROOT;
+@@ -475,6 +485,7 @@
+
+ window = g_object_new (GDK_TYPE_WINDOW, NULL);
+ private = GDK_WINDOW_OBJECT (window);
++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
+
+ parent_private = GDK_WINDOW_OBJECT (parent);
+ parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
+@@ -647,8 +658,8 @@
+
+ GdkWindow *
+ _gdk_window_new (GdkWindow *parent,
+- GdkWindowAttr *attributes,
+- gint attributes_mask)
++ GdkWindowAttr *attributes,
++ gint attributes_mask)
+ {
+ g_return_val_if_fail (attributes != NULL, NULL);
+
+@@ -685,9 +696,8 @@
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+
+ _gdk_selection_window_destroyed (window);
+-#if (DIRECTFB_MAJOR_VERSION >= 1)
+ gdk_directfb_event_windows_remove (window);
+-#endif
++
+ if (window == _gdk_directfb_pointer_grab_window)
+ gdk_pointer_ungrab (GDK_CURRENT_TIME);
+ if (window == _gdk_directfb_keyboard_grab_window)
+@@ -1230,29 +1240,20 @@
+ }
+ }
+
+-void
+-gdk_window_show_unraised (GdkWindow *window)
++static void
++gdk_directfb_window_show (GdkWindow *window,
++ gboolean raise)
+ {
+ g_return_if_fail (GDK_IS_WINDOW (window));
+
+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
+
+- show_window_internal (window, FALSE);
++ show_window_internal (window, raise);
+ }
+
+-void
+-gdk_window_show (GdkWindow *window)
++static void
++gdk_directfb_window_hide (GdkWindow *window)
+ {
+- g_return_if_fail (GDK_IS_WINDOW (window));
+-
+- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
+-
+- show_window_internal (window, TRUE);
+-}
+-
+-void
+-gdk_window_hide (GdkWindow *window)
+-{
+ GdkWindowObject *private;
+ GdkWindowImplDirectFB *impl;
+ GdkWindow *mousewin;
+@@ -1276,11 +1277,11 @@
+
+ if (!private->input_only && private->parent)
+ {
+- _gdk_windowing_window_clear_area (GDK_WINDOW (private->parent),
+- private->x,
+- private->y,
+- impl->drawable.width,
+- impl->drawable.height);
++ gdk_window_clear_area (GDK_WINDOW (private->parent),
++ private->x,
++ private->y,
++ impl->drawable.width,
++ impl->drawable.height);
+ }
+
+ event_win = gdk_directfb_other_event_window (window, GDK_UNMAP);
+@@ -1299,8 +1300,8 @@
+ }
+ }
+
+-void
+-gdk_window_withdraw (GdkWindow *window)
++static void
++gdk_directfb_window_withdraw (GdkWindow *window)
+ {
+ g_return_if_fail (GDK_IS_WINDOW (window));
+
+@@ -1309,80 +1310,6 @@
+ }
+
+ void
+-gdk_window_move (GdkWindow *window,
+- gint x,
+- gint y)
+-{
+- GdkWindowObject *private;
+- GdkWindowImplDirectFB *impl;
+-
+- g_return_if_fail (GDK_IS_WINDOW (window));
+-
+- private = GDK_WINDOW_OBJECT (window);
+- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+-
+- if (impl->window)
+- {
+- private->x = x;
+- private->y = y;
+- impl->window->MoveTo (impl->window, x, y);
+- }
+- else
+- {
+- gint width=impl->drawable.width;
+- gint height=impl->drawable.height;
+- GdkRectangle old =
+- { private->x, private->y,width,height };
+-
+- _gdk_directfb_move_resize_child (window, x, y, width, height);
+- _gdk_directfb_calc_abs (window);
+-
+- if (GDK_WINDOW_IS_MAPPED (private))
+- {
+- GdkWindow *mousewin;
+- GdkRectangle new = { x, y, width, height };
+-
+- gdk_rectangle_union (&new, &old, &new);
+- gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
+-
+- /* The window the pointer is in might have changed */
+- mousewin = gdk_window_at_pointer (NULL, NULL);
+- gdk_directfb_window_send_crossing_events (NULL, mousewin,
+- GDK_CROSSING_NORMAL);
+- }
+- }
+-}
+-
+-void
+-gdk_window_resize (GdkWindow *window,
+- gint width,
+- gint height)
+-{
+- GdkWindowObject *private;
+- gint x, y;
+-
+- g_return_if_fail (GDK_IS_WINDOW (window));
+-
+- private = GDK_WINDOW_OBJECT (window);
+-
+- x = private->x;
+- y = private->y;
+-
+- if (private->parent && (private->parent->window_type != GDK_WINDOW_CHILD))
+- {
+- GdkWindowChildHandlerData *data;
+-
+- data = g_object_get_data (G_OBJECT (private->parent),
+- "gdk-window-child-handler");
+-
+- if (data)
+- (*data->get_pos) (window, &x, &y, data->user_data);
+- }
+-
+- gdk_window_move_resize (window, x, y, width, height);
+-}
+-
+-void
+ _gdk_directfb_move_resize_child (GdkWindow *window,
+ gint x,
+ gint y,
+@@ -1407,16 +1334,18 @@
+
+ if (!private->input_only)
+ {
+- if (impl->drawable.surface) {
+- GdkDrawableImplDirectFB *dimpl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
+- if(dimpl->cairo_surface) {
+- cairo_surface_destroy(dimpl->cairo_surface);
+- dimpl->cairo_surface= NULL;
+- }
+- impl->drawable.surface->Release (impl->drawable.surface);
+- impl->drawable.surface = NULL;
+- }
++ if (impl->drawable.surface)
++ {
++ if (impl->drawable.cairo_surface)
++ {
++ cairo_surface_destroy (impl->drawable.cairo_surface);
++ impl->drawable.cairo_surface = NULL;
++ }
+
++ impl->drawable.surface->Release (impl->drawable.surface);
++ impl->drawable.surface = NULL;
++ }
++
+ parent_impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (private->parent)->impl);
+
+ if (parent_impl->drawable.surface)
+@@ -1432,19 +1361,18 @@
+ for (list = private->children; list; list = list->next)
+ {
+ private = GDK_WINDOW_OBJECT (list->data);
+- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
++ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
++
+ _gdk_directfb_move_resize_child (list->data,
+ private->x, private->y,
+ impl->drawable.width, impl->drawable.height);
+ }
+ }
+
+-void
+-gdk_window_move_resize (GdkWindow *window,
+- gint x,
+- gint y,
+- gint width,
+- gint height)
++static void
++gdk_directfb_window_move (GdkWindow *window,
++ gint x,
++ gint y)
+ {
+ GdkWindowObject *private;
+ GdkWindowImplDirectFB *impl;
+@@ -1452,10 +1380,64 @@
+ g_return_if_fail (GDK_IS_WINDOW (window));
+
+ private = GDK_WINDOW_OBJECT (window);
++ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
++
++ if (impl->window)
++ {
++ private->x = x;
++ private->y = y;
++ impl->window->MoveTo (impl->window, x, y);
++ }
++ else
++ {
++ gint width=impl->drawable.width;
++ gint height=impl->drawable.height;
++ GdkRectangle old =
++ { private->x, private->y,width,height };
++
++ _gdk_directfb_move_resize_child (window, x, y, width, height);
++ _gdk_directfb_calc_abs (window);
++
++ if (GDK_WINDOW_IS_MAPPED (private))
++ {
++ GdkWindow *mousewin;
++ GdkRectangle new = { x, y, width, height };
++
++ gdk_rectangle_union (&new, &old, &new);
++ gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
++
++ /* The window the pointer is in might have changed */
++ mousewin = gdk_window_at_pointer (NULL, NULL);
++ gdk_directfb_window_send_crossing_events (NULL, mousewin,
++ GDK_CROSSING_NORMAL);
++ }
++ }
++}
++
++static void
++gdk_directfb_window_move_resize (GdkWindow *window,
++ gboolean with_move,
++ gint x,
++ gint y,
++ gint width,
++ gint height)
++{
++ GdkWindowObject *private;
++ GdkWindowImplDirectFB *impl;
++
++ g_return_if_fail (GDK_IS_WINDOW (window));
++
++ private = GDK_WINDOW_OBJECT (window);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+
++ if (with_move && (width < 0 && height < 0))
++ {
++ gdk_directfb_window_move (window, x, y);
++ return;
++ }
++
+ if (width < 1)
+- width = 1;
++ width = 1;
+ if (height < 1)
+ height = 1;
+
+@@ -1478,26 +1460,39 @@
+
+ if (impl->drawable.width == width && impl->drawable.height == height)
+ {
+- gdk_window_move (window, x, y);
++ if (with_move)
++ gdk_directfb_window_move (window, x, y);
+ }
+ else if (impl->window)
+ {
+- private->x = x;
+- private->y = y;
+- impl->window->MoveTo (impl->window, x, y);
++ private->x = x;
++ private->y = y;
++ impl->drawable.width = width;
++ impl->drawable.height = height;
++
++ if (with_move)
++ impl->window->MoveTo (impl->window, x, y);
+ impl->window->Resize (impl->window, width, height);
+ }
+ else
+ {
+- GdkRectangle old =
+- { private->x, private->y, impl->drawable.width, impl->drawable.height };
+- _gdk_directfb_move_resize_child (window, x, y, width, height);
++ GdkRectangle old = { private->x, private->y,
++ impl->drawable.width, impl->drawable.height };
++ GdkRectangle new = { x, y, width, height };
++
++ if (! with_move)
++ {
++ new.x = private->x;
++ new.y = private->y;
++ }
++
++ _gdk_directfb_move_resize_child (window,
++ new.x, new.y, new.width, new.height);
+ _gdk_directfb_calc_abs (window);
+
+ if (GDK_WINDOW_IS_MAPPED (private))
+ {
+- GdkWindow *mousewin;
+- GdkRectangle new = { x, y, width, height };
++ GdkWindow *mousewin;
+
+ gdk_rectangle_union (&new, &old, &new);
+ gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
+@@ -1510,11 +1505,11 @@
+ }
+ }
+
+-void
+-_gdk_window_reparent (GdkWindow *window,
+- GdkWindow *new_parent,
+- gint x,
+- gint y)
++static gboolean
++gdk_directfb_window_reparent (GdkWindow *window,
++ GdkWindow *new_parent,
++ gint x,
++ gint y)
+ {
+ GdkWindowObject *window_private;
+ GdkWindowObject *parent_private;
+@@ -1523,10 +1518,10 @@
+ GdkWindowImplDirectFB *parent_impl;
+ GdkVisual *visual;
+
+- g_return_if_fail (GDK_IS_WINDOW (window));
++ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
+
+ if (GDK_WINDOW_DESTROYED (window))
+- return;
++ return FALSE;
+
+ if (!new_parent)
+ new_parent = _gdk_parent_root;
+@@ -1539,7 +1534,7 @@
+
+ /* already parented */
+ if( window_private->parent == (GdkWindowObject *)new_parent )
+- return;
++ return FALSE;
+
+ window_private->parent = (GdkWindowObject *) new_parent;
+
+@@ -1593,7 +1588,7 @@
+ {
+ g_assert(0);
+ _gdk_window_destroy (window, FALSE);
+- return;
++ return FALSE;
+ }
+ /* we hold a reference count on ourselves */
+ g_object_ref (window);
+@@ -1609,14 +1604,17 @@
+ &rect,
+ &impl->drawable.surface);
+ }
++
++ return TRUE;
+ }
+
+-void
+-_gdk_windowing_window_clear_area (GdkWindow *window,
+- gint x,
+- gint y,
+- gint width,
+- gint height)
++static void
++gdk_directfb_window_clear_area (GdkWindow *window,
++ gint x,
++ gint y,
++ gint width,
++ gint height,
++ gboolean send_expose)
+ {
+ GdkWindowObject *private;
+ GdkDrawableImplDirectFB *impl;
+@@ -1700,54 +1698,11 @@
+ g_object_unref (gc);
+ }
+
+-void
+-_gdk_windowing_window_clear_area_e (GdkWindow *window,
+- gint x,
+- gint y,
+- gint width,
+- gint height)
++static void
++gdk_window_directfb_raise (GdkWindow *window)
+ {
+- GdkRectangle rect;
+- GdkWindowObject *private;
+ GdkWindowImplDirectFB *impl;
+
+- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d )\n", __FUNCTION__, window, x, y, width, height );
+-
+- g_return_if_fail (GDK_IS_WINDOW (window));
+-
+- private = GDK_WINDOW_OBJECT (window);
+- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+-
+- /**
+- Follow XClearArea definition for zero height width
+- **/
+- if( width == 0 )
+- width = impl->drawable.width-x;
+- if( height == 0 )
+- height = impl->drawable.height-y;
+-
+- rect.x = x;
+- rect.y = y;
+- rect.width = width;
+- rect.height = height;
+-
+- g_return_if_fail (GDK_IS_WINDOW (window));
+-
+- if (GDK_WINDOW_DESTROYED (window)) {
+- D_DEBUG_AT( GDKDFB_Window, " -> DESTROYED!\n" );
+- return;
+- }
+-
+- _gdk_windowing_window_clear_area (window, x, y, width, height);
+-
+- gdk_window_invalidate_rect (window, &rect, TRUE);
+-}
+-
+-void
+-gdk_window_raise (GdkWindow *window)
+-{
+- GdkWindowImplDirectFB *impl;
+-
+ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
+
+ g_return_if_fail (GDK_IS_WINDOW (window));
+@@ -1774,8 +1729,8 @@
+ }
+ }
+
+-void
+-gdk_window_lower (GdkWindow *window)
++static void
++gdk_window_directfb_lower (GdkWindow *window)
+ {
+ GdkWindowImplDirectFB *impl;
+
+@@ -1875,9 +1830,9 @@
+ * Since: 2.12
+ *
+ **/
+-void
++void
+ gdk_window_set_startup_id (GdkWindow *window,
+- const gchar *startup_id)
++ const gchar *startup_id)
+ {
+ }
+
+@@ -1907,9 +1862,9 @@
+ root->children = g_list_insert (root->children, window, i);
+ }
+
+-void
+-gdk_window_set_background (GdkWindow *window,
+- const GdkColor *color)
++static void
++gdk_directfb_window_set_background (GdkWindow *window,
++ const GdkColor *color)
+ {
+ GdkWindowObject *private;
+
+@@ -1930,10 +1885,10 @@
+ private->bg_pixmap = NULL;
+ }
+
+-void
+-gdk_window_set_back_pixmap (GdkWindow *window,
+- GdkPixmap *pixmap,
+- gint parent_relative)
++static void
++gdk_directfb_window_set_back_pixmap (GdkWindow *window,
++ GdkPixmap *pixmap,
++ gboolean parent_relative)
+ {
+ GdkWindowObject *private;
+ GdkPixmap *old_pixmap;
+@@ -1972,9 +1927,9 @@
+ }
+ }
+
+-void
+-gdk_window_set_cursor (GdkWindow *window,
+- GdkCursor *cursor)
++static void
++gdk_directfb_window_set_cursor (GdkWindow *window,
++ GdkCursor *cursor)
+ {
+ GdkWindowImplDirectFB *impl;
+ GdkCursor *old_cursor;
+@@ -2011,13 +1966,13 @@
+ gdk_cursor_unref (old_cursor);
+ }
+
+-void
+-gdk_window_get_geometry (GdkWindow *window,
+- gint *x,
+- gint *y,
+- gint *width,
+- gint *height,
+- gint *depth)
++static void
++gdk_directfb_window_get_geometry (GdkWindow *window,
++ gint *x,
++ gint *y,
++ gint *width,
++ gint *height,
++ gint *depth)
+ {
+ GdkWindowObject *private;
+ GdkDrawableImplDirectFB *impl;
+@@ -2078,10 +2033,10 @@
+ }
+ }
+
+-gboolean
+-gdk_window_get_origin (GdkWindow *window,
+- gint *x,
+- gint *y)
++static gboolean
++gdk_directfb_window_get_origin (GdkWindow *window,
++ gint *x,
++ gint *y)
+ {
+ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
+
+@@ -2215,8 +2170,8 @@
+
+ }
+
+-GdkEventMask
+-gdk_window_get_events (GdkWindow *window)
++static GdkEventMask
++gdk_directfb_window_get_events (GdkWindow *window)
+ {
+ g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
+
+@@ -2226,9 +2181,9 @@
+ return GDK_WINDOW_OBJECT (window)->event_mask;
+ }
+
+-void
+-gdk_window_set_events (GdkWindow *window,
+- GdkEventMask event_mask)
++static void
++gdk_directfb_window_set_events (GdkWindow *window,
++ GdkEventMask event_mask)
+ {
+ g_return_if_fail (GDK_IS_WINDOW (window));
+
+@@ -2240,27 +2195,27 @@
+ GDK_WINDOW_OBJECT (window)->event_mask = event_mask;
+ }
+
+-void
+-gdk_window_shape_combine_mask (GdkWindow *window,
+- GdkBitmap *mask,
+- gint x,
+- gint y)
++static void
++gdk_directfb_window_shape_combine_mask (GdkWindow *window,
++ GdkBitmap *mask,
++ gint x,
++ gint y)
+ {
+ }
+
+ void
+ gdk_window_input_shape_combine_mask (GdkWindow *window,
+- GdkBitmap *mask,
+- gint x,
+- gint y)
++ GdkBitmap *mask,
++ gint x,
++ gint y)
+ {
+ }
+
+-void
+-gdk_window_shape_combine_region (GdkWindow *window,
+- const GdkRegion *shape_region,
+- gint offset_x,
+- gint offset_y)
++static void
++gdk_directfb_window_shape_combine_region (GdkWindow *window,
++ const GdkRegion *shape_region,
++ gint offset_x,
++ gint offset_y)
+ {
+ }
+
+@@ -2584,13 +2539,13 @@
+ g_message("unimplemented %s", __FUNCTION__);
+ }
+
+-void
+-gdk_window_set_child_shapes (GdkWindow *window)
++static void
++gdk_directfb_window_set_child_shapes (GdkWindow *window)
+ {
+ }
+
+-void
+-gdk_window_merge_child_shapes (GdkWindow *window)
++static void
++gdk_directfb_window_merge_child_shapes (GdkWindow *window)
+ {
+ }
+
+@@ -2604,9 +2559,9 @@
+ {
+ }
+
+-gboolean
+-gdk_window_set_static_gravities (GdkWindow *window,
+- gboolean use_static)
++static gboolean
++gdk_directfb_window_set_static_gravities (GdkWindow *window,
++ gboolean use_static)
+ {
+ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
+
+@@ -2693,9 +2648,8 @@
+ * Given a directfb window and a subsurface of that window
+ * create a gdkwindow child wrapper
+ */
+-#if (DIRECTFB_MAJOR_VERSION >= 1)
+ GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
+- IDirectFBSurface *subsurface)
++ IDirectFBSurface *subsurface)
+ {
+ GdkWindow *window;
+ GdkWindowObject *private;
+@@ -2708,6 +2662,7 @@
+
+ window = g_object_new (GDK_TYPE_WINDOW, NULL);
+ private = GDK_WINDOW_OBJECT (window);
++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
+ parent_private = GDK_WINDOW_OBJECT (parent);
+ parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
+ private->parent = parent_private;
+@@ -2739,7 +2694,6 @@
+ return window;
+
+ }
+-#endif
+
+ /*
+ * The wrapping is not perfect since directfb does not give full access
+@@ -2787,6 +2741,7 @@
+ /* we hold a reference count on ourselves */
+ g_object_ref (window);
+ private = GDK_WINDOW_OBJECT (window);
++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
+ private->parent = parent_private;
+ private->window_type = GDK_WINDOW_TOPLEVEL;
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+@@ -3153,11 +3108,11 @@
+
+ D_DEBUG_AT( GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) );
+
+- _gdk_windowing_window_clear_area (GDK_WINDOW(wimpl->gdkWindow),
+- box->x1,
+- box->y1,
+- box->x2 - box->x1,
+- box->y2 - box->y1);
++ gdk_window_clear_area (GDK_WINDOW(wimpl->gdkWindow),
++ box->x1,
++ box->y1,
++ box->x2 - box->x1,
++ box->y2 - box->y1);
+ }
+ }
+
+@@ -3259,7 +3214,7 @@
+ {
+ GdkDisplay *display;
+ guint8 cardinal;
+-
++
+ g_return_if_fail (GDK_IS_WINDOW (window));
+
+ if (GDK_WINDOW_DESTROYED (window))
+@@ -3281,6 +3236,33 @@
+ {
+ }
+
++static void
++gdk_window_impl_iface_init (GdkWindowImplIface *iface)
++{
++ iface->show = gdk_directfb_window_show;
++ iface->hide = gdk_directfb_window_hide;
++ iface->withdraw = gdk_directfb_window_withdraw;
++ iface->raise = gdk_window_directfb_raise;
++ iface->lower = gdk_window_directfb_lower;
++ iface->move_resize = gdk_directfb_window_move_resize;
++ iface->move_region = _gdk_directfb_window_move_region;
++ iface->scroll = _gdk_directfb_window_scroll;
++ iface->clear_area = gdk_directfb_window_clear_area;
++ iface->set_background = gdk_directfb_window_set_background;
++ iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap;
++ iface->get_events = gdk_directfb_window_get_events;
++ iface->set_events = gdk_directfb_window_set_events;
++ iface->reparent = gdk_directfb_window_reparent;
++ iface->set_cursor = gdk_directfb_window_set_cursor;
++ iface->get_geometry = gdk_directfb_window_get_geometry;
++ iface->get_origin = gdk_directfb_window_get_origin;
++ iface->get_offsets = _gdk_directfb_window_get_offsets;
++ iface->shape_combine_mask = gdk_directfb_window_shape_combine_mask;
++ iface->shape_combine_region = gdk_directfb_window_shape_combine_region;
++ iface->set_child_shapes = gdk_directfb_window_set_child_shapes;
++ iface->merge_child_shapes = gdk_directfb_window_merge_child_shapes;
++ iface->set_static_gravities = gdk_directfb_window_set_static_gravities;
++}
+
+ #define __GDK_WINDOW_X11_C__
+ #include "gdkaliasdef.c"
+Index: gdk/directfb/gdkcursor-directfb.c
+===================================================================
+--- gdk/directfb/gdkcursor-directfb.c (revision 22076)
++++ gdk/directfb/gdkcursor-directfb.c (revision 22450)
+@@ -41,10 +41,6 @@
+
+ #include <directfb_version.h>
+
+-#if DIRECTFB_MAJOR_VERSION < 1
+-#define u32 __u32
+-#define u8 __u8
+-#endif
+
+ static struct {
+ const guchar *bits;
+Index: gdk/directfb/gdkprivate-directfb.h
+===================================================================
+--- gdk/directfb/gdkprivate-directfb.h (revision 22076)
++++ gdk/directfb/gdkprivate-directfb.h (revision 22450)
+@@ -172,7 +172,18 @@
+ void gdk_directfb_window_id_table_remove (DFBWindowID dfb_id);
+ GdkWindow * gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id);
+
++void _gdk_directfb_window_get_offsets (GdkWindow *window,
++ gint *x_offset,
++ gint *y_offset);
++void _gdk_directfb_window_scroll (GdkWindow *window,
++ gint dx,
++ gint dy);
++void _gdk_directfb_window_move_region (GdkWindow *window,
++ const GdkRegion *region,
++ gint dx,
++ gint dy);
+
++
+ typedef struct
+ {
+ GdkCursor cursor;
+@@ -228,10 +239,8 @@
+ gint width,
+ gint height);
+
+-void gdk_directfb_event_windows_add (GdkWindow *window);
+-#if (DIRECTFB_MAJOR_VERSION >= 1)
++void gdk_directfb_event_windows_add (GdkWindow *window);
+ void gdk_directfb_event_windows_remove (GdkWindow *window);
+-#endif
+
+ GdkGrabStatus gdk_directfb_keyboard_grab (GdkDisplay *display,
+ GdkWindow *window,
+Index: gdk/gdk.c
+===================================================================
+--- gdk/gdk.c (revision 22076)
++++ gdk/gdk.c (revision 22450)
+@@ -88,20 +88,44 @@
+ #endif /* G_ENABLE_DEBUG */
+
+ #ifdef G_ENABLE_DEBUG
+-static void
+-gdk_arg_debug_cb (const char *key, const char *value, gpointer user_data)
++static gboolean
++gdk_arg_debug_cb (const char *key, const char *value, gpointer user_data, GError **error)
+ {
+- _gdk_debug_flags |= g_parse_debug_string (value,
++ guint debug_value = g_parse_debug_string (value,
+ (GDebugKey *) gdk_debug_keys,
+ gdk_ndebug_keys);
++
++ if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
++ {
++ g_set_error (error,
++ G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
++ "Error parsing option --gdk-debug");
++ return FALSE;
++ }
++
++ _gdk_debug_flags |= debug_value;
++
++ return TRUE;
+ }
+
+-static void
+-gdk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data)
++static gboolean
++gdk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data, GError **error)
+ {
+- _gdk_debug_flags &= ~g_parse_debug_string (value,
+- (GDebugKey *) gdk_debug_keys,
+- gdk_ndebug_keys);
++ guint debug_value = g_parse_debug_string (value,
++ (GDebugKey *) gdk_debug_keys,
++ gdk_ndebug_keys);
++
++ if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
++ {
++ g_set_error (error,
++ G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
++ "Error parsing option --gdk-no-debug");
++ return FALSE;
++ }
++
++ _gdk_debug_flags &= ~debug_value;
++
++ return TRUE;
+ }
+ #endif /* G_ENABLE_DEBUG */
+
+Index: gdk/win32/gdkprivate-win32.h
+===================================================================
+--- gdk/win32/gdkprivate-win32.h (revision 22076)
++++ gdk/win32/gdkprivate-win32.h (revision 22450)
+@@ -93,6 +93,11 @@
+ #define WM_APPCOMMAND 0x319
+ #endif
+
++#ifndef CF_DIBV5
++#define CF_DIBV5 17
++#endif
++
++
+ /* Define some combinations of GdkDebugFlags */
+ #define GDK_DEBUG_EVENTS_OR_COLORMAP (GDK_DEBUG_EVENTS|GDK_DEBUG_COLORMAP)
+ #define GDK_DEBUG_EVENTS_OR_INPUT (GDK_DEBUG_EVENTS|GDK_DEBUG_INPUT)
+@@ -400,12 +405,8 @@
+ extern gboolean _gdk_keyboard_has_altgr;
+ extern guint _scancode_rshift;
+
+-/* Registered clipboard formats */
+-extern WORD _cf_utf8_string;
+-extern WORD _cf_image_bmp;
+-
+ /* GdkAtoms: properties, targets and types */
+-extern GdkAtom _gdk_selection_property;
++extern GdkAtom _gdk_selection;
+ extern GdkAtom _wm_transient_for;
+ extern GdkAtom _targets;
+ extern GdkAtom _save_targets;
+@@ -413,7 +414,6 @@
+ extern GdkAtom _text;
+ extern GdkAtom _compound_text;
+ extern GdkAtom _text_uri_list;
+-extern GdkAtom _image_bmp;
+
+ /* DND selections */
+ extern GdkAtom _local_dnd;
+Index: gdk/win32/gdkproperty-win32.c
+===================================================================
+--- gdk/win32/gdkproperty-win32.c (revision 22076)
++++ gdk/win32/gdkproperty-win32.c (revision 22450)
+@@ -99,7 +99,8 @@
+ ATOM win32_atom;
+ gchar name[256];
+
+- if (GDK_SELECTION_PRIMARY == atom) return g_strdup ("PRIMARY");
++ if (GDK_NONE == atom) return g_strdup ("<none>");
++ else if (GDK_SELECTION_PRIMARY == atom) return g_strdup ("PRIMARY");
+ else if (GDK_SELECTION_SECONDARY == atom) return g_strdup ("SECONDARY");
+ else if (GDK_SELECTION_CLIPBOARD == atom) return g_strdup ("CLIPBOARD");
+ else if (GDK_SELECTION_TYPE_ATOM == atom) return g_strdup ("ATOM");
+@@ -153,14 +154,10 @@
+ gint nelements)
+ {
+ HGLOBAL hdata;
+- UINT cf = 0;
+- gint i, size, nchars;
+- gchar *prop_name, *type_name;
++ gint i, size;
+ guchar *ucptr, *buf = NULL;
+- wchar_t *wcptr;
++ wchar_t *wcptr, *p;
+ glong wclen;
+- enum { SYSTEM_CODEPAGE, UNICODE_TEXT } method;
+- gboolean ok = TRUE;
+
+ g_return_if_fail (window != NULL);
+ g_return_if_fail (GDK_IS_WINDOW (window));
+@@ -168,21 +165,23 @@
+ if (GDK_WINDOW_DESTROYED (window))
+ return;
+
+- GDK_NOTE (DND,
+- (prop_name = gdk_atom_name (property),
+- type_name = gdk_atom_name (type),
+- g_print ("gdk_property_change: %p %p (%s) %p (%s) %s %d*%d bytes: %s\n",
+- GDK_WINDOW_HWND (window),
+- property, prop_name,
+- type, type_name,
+- (mode == GDK_PROP_MODE_REPLACE ? "REPLACE" :
+- (mode == GDK_PROP_MODE_PREPEND ? "PREPEND" :
+- (mode == GDK_PROP_MODE_APPEND ? "APPEND" :
+- "???"))),
+- format, nelements,
+- _gdk_win32_data_to_string (data, MIN (10, format*nelements/8))),
+- g_free (prop_name),
+- g_free (type_name)));
++ GDK_NOTE (DND, {
++ gchar *prop_name = gdk_atom_name (property);
++ gchar *type_name = gdk_atom_name (type);
++
++ g_print ("gdk_property_change: %p %s %s %s %d*%d bits: %s\n",
++ GDK_WINDOW_HWND (window),
++ prop_name,
++ type_name,
++ (mode == GDK_PROP_MODE_REPLACE ? "REPLACE" :
++ (mode == GDK_PROP_MODE_PREPEND ? "PREPEND" :
++ (mode == GDK_PROP_MODE_APPEND ? "APPEND" :
++ "???"))),
++ format, nelements,
++ _gdk_win32_data_to_string (data, MIN (10, format*nelements/8)));
++ g_free (prop_name);
++ g_free (type_name);
++ });
+
+ /* We should never come here for these types */
+ g_return_if_fail (type != GDK_TARGET_STRING);
+@@ -190,9 +189,9 @@
+ g_return_if_fail (type != _compound_text);
+ g_return_if_fail (type != _save_targets);
+
+- if (property == _gdk_selection_property
+- && format == 8
+- && mode == GDK_PROP_MODE_REPLACE)
++ if (property == _gdk_selection &&
++ format == 8 &&
++ mode == GDK_PROP_MODE_REPLACE)
+ {
+ if (type == _utf8_string)
+ {
+@@ -202,38 +201,13 @@
+ return;
+ }
+
+- nchars = g_utf8_strlen ((char*) data, nelements);
++ wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, NULL);
+
+- /* Check if only ASCII */
+- for (i = 0; i < nelements; i++)
+- if (data[i] >= 0200)
+- break;
+-
+- if (i == nelements)
+- {
+- /* If only ASCII, use CF_TEXT and the data as such */
+- method = SYSTEM_CODEPAGE;
+- size = nelements;
+- for (i = 0; i < nelements; i++)
+- if (data[i] == '\n')
+- size++;
+- size++;
+- GDK_NOTE (DND, g_print ("... as text: %.40s\n", data));
+- }
+- else
+- {
+- /* Use CF_UNICODETEXT */
+- method = UNICODE_TEXT;
+-
+- wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, NULL);
+-
+- wclen++; /* Terminating 0 */
+- size = wclen * 2;
+- for (i = 0; i < wclen; i++)
+- if (wcptr[i] == '\n')
+- size += 2;
+- GDK_NOTE (DND, g_print ("... as Unicode\n"));
+- }
++ wclen++; /* Terminating 0 */
++ size = wclen * 2;
++ for (i = 0; i < wclen; i++)
++ if (wcptr[i] == '\n')
++ size += 2;
+
+ if (!(hdata = GlobalAlloc (GMEM_MOVEABLE, size)))
+ {
+@@ -246,53 +220,32 @@
+
+ ucptr = GlobalLock (hdata);
+
+- switch (method)
++ p = (wchar_t *) ucptr;
++ for (i = 0; i < wclen; i++)
+ {
+- case SYSTEM_CODEPAGE:
+- cf = CF_TEXT;
+- for (i = 0; i < nelements; i++)
+- {
+- if (data[i] == '\n')
+- *ucptr++ = '\r';
+- *ucptr++ = data[i];
+- }
+- *ucptr++ = '\0';
+- break;
+-
+- case UNICODE_TEXT:
+- {
+- wchar_t *p = (wchar_t *) ucptr;
+- cf = CF_UNICODETEXT;
+- for (i = 0; i < wclen; i++)
+- {
+- if (wcptr[i] == '\n')
+- *p++ = '\r';
+- *p++ = wcptr[i];
+- }
+- g_free (wcptr);
+- }
+- break;
+-
+- default:
+- g_assert_not_reached ();
++ if (wcptr[i] == '\n')
++ *p++ = '\r';
++ *p++ = wcptr[i];
+ }
++ g_free (wcptr);
+
+ GlobalUnlock (hdata);
+- GDK_NOTE (DND, g_print ("... SetClipboardData(%s,%p)\n",
+- _gdk_win32_cf_to_string (cf), hdata));
+- if (ok && !SetClipboardData (cf, hdata))
+- WIN32_API_FAILED ("SetClipboardData"), ok = FALSE;
++ GDK_NOTE (DND, g_print ("... SetClipboardData(CF_UNICODETEXT,%p)\n",
++ hdata));
++ if (!SetClipboardData (CF_UNICODETEXT, hdata))
++ WIN32_API_FAILED ("SetClipboardData");
+
+ if (!CloseClipboard ())
+ WIN32_API_FAILED ("CloseClipboard");
+ }
+ else
+ {
+- GDK_NOTE (DND, g_print ("... delayed rendering\n"));
+- /* Delayed Rendering. We can't assign hdata to the clipboard
+- * here as type may be "image/png", "image/jpg", etc. In
+- * this case there's a further conversion afterwards.
++ /* We use delayed rendering for everything else than
++ * text. We can't assign hdata to the clipboard here as type
++ * may be "image/png", "image/jpg", etc. In this case
++ * there's a further conversion afterwards.
+ */
++ GDK_NOTE (DND, g_print ("... delayed rendering\n"));
+ _delayed_rendering_data = NULL;
+ if (!(hdata = GlobalAlloc (GMEM_MOVEABLE, nelements > 0 ? nelements : 1)))
+ {
+@@ -318,14 +271,16 @@
+ g_return_if_fail (window != NULL);
+ g_return_if_fail (GDK_IS_WINDOW (window));
+
+- GDK_NOTE (DND,
+- (prop_name = gdk_atom_name (property),
+- g_print ("gdk_property_delete: %p %p (%s)\n",
+- GDK_WINDOW_HWND (window),
+- property, prop_name),
+- g_free (prop_name)));
++ GDK_NOTE (DND, {
++ prop_name = gdk_atom_name (property);
+
+- if (property == _gdk_selection_property)
++ g_print ("gdk_property_delete: %p %s\n",
++ GDK_WINDOW_HWND (window),
++ prop_name);
++ g_free (prop_name);
++ });
++
++ if (property == _gdk_selection)
+ _gdk_selection_property_delete (window);
+ else if (property == _wm_transient_for)
+ gdk_window_set_transient_for (window, _gdk_root);
+@@ -339,37 +294,56 @@
+ }
+
+ /*
+- for reference copied from gdk/x11/gdkevents-x11.c
++ For reference, from gdk/x11/gdksettings.c:
+
+- { "Net/DoubleClickTime", "gtk-double-click-time" },
+- { "Net/DoubleClickDistance", "gtk-double-click-distance" },
+- { "Net/DndDragThreshold", "gtk-dnd-drag-threshold" },
+- { "Gtk/CanChangeAccels", "gtk-can-change-accels" },
+- { "Gtk/ColorPalette", "gtk-color-palette" },
+- { "Gtk/FontName", "gtk-font-name" },
+- { "Gtk/IconSizes", "gtk-icon-sizes" },
+- { "Gtk/KeyThemeName", "gtk-key-theme-name" },
+- { "Gtk/ToolbarStyle", "gtk-toolbar-style" },
+- { "Gtk/ToolbarIconSize", "gtk-toolbar-icon-size" },
+- { "Gtk/IMPreeditStyle", "gtk-im-preedit-style" },
+- { "Gtk/IMStatusStyle", "gtk-im-status-style" },
+- { "Gtk/IMModule", "gtk-im-module" },
+- { "Net/CursorBlink", "gtk-cursor-blink" },
+- { "Net/CursorBlinkTime", "gtk-cursor-blink-time" },
+- { "Net/ThemeName", "gtk-theme-name" },
+- { "Net/IconThemeName", "gtk-icon-theme-name" },
+- { "Gtk/ButtonImages", "gtk-button-images" },
+- { "Gtk/MenuImages", "gtk-menu-images" },
+- { "Xft/Antialias", "gtk-xft-antialias" },
+- { "Xft/Hinting", "gtk-xft-hinting" },
+- { "Xft/HintStyle", "gtk-xft-hintstyle" },
+- { "Xft/RGBA", "gtk-xft-rgba" },
+- { "Xft/DPI", "gtk-xft-dpi" },
++ "Net/DoubleClickTime\0" "gtk-double-click-time\0"
++ "Net/DoubleClickDistance\0" "gtk-double-click-distance\0"
++ "Net/DndDragThreshold\0" "gtk-dnd-drag-threshold\0"
++ "Net/CursorBlink\0" "gtk-cursor-blink\0"
++ "Net/CursorBlinkTime\0" "gtk-cursor-blink-time\0"
++ "Net/ThemeName\0" "gtk-theme-name\0"
++ "Net/IconThemeName\0" "gtk-icon-theme-name\0"
++ "Gtk/CanChangeAccels\0" "gtk-can-change-accels\0"
++ "Gtk/ColorPalette\0" "gtk-color-palette\0"
++ "Gtk/FontName\0" "gtk-font-name\0"
++ "Gtk/IconSizes\0" "gtk-icon-sizes\0"
++ "Gtk/KeyThemeName\0" "gtk-key-theme-name\0"
++ "Gtk/ToolbarStyle\0" "gtk-toolbar-style\0"
++ "Gtk/ToolbarIconSize\0" "gtk-toolbar-icon-size\0"
++ "Gtk/IMPreeditStyle\0" "gtk-im-preedit-style\0"
++ "Gtk/IMStatusStyle\0" "gtk-im-status-style\0"
++ "Gtk/Modules\0" "gtk-modules\0"
++ "Gtk/FileChooserBackend\0" "gtk-file-chooser-backend\0"
++ "Gtk/ButtonImages\0" "gtk-button-images\0"
++ "Gtk/MenuImages\0" "gtk-menu-images\0"
++ "Gtk/MenuBarAccel\0" "gtk-menu-bar-accel\0"
++ "Gtk/CursorThemeName\0" "gtk-cursor-theme-name\0"
++ "Gtk/CursorThemeSize\0" "gtk-cursor-theme-size\0"
++ "Gtk/ShowInputMethodMenu\0" "gtk-show-input-method-menu\0"
++ "Gtk/ShowUnicodeMenu\0" "gtk-show-unicode-menu\0"
++ "Gtk/TimeoutInitial\0" "gtk-timeout-initial\0"
++ "Gtk/TimeoutRepeat\0" "gtk-timeout-repeat\0"
++ "Gtk/ColorScheme\0" "gtk-color-scheme\0"
++ "Gtk/EnableAnimations\0" "gtk-enable-animations\0"
++ "Xft/Antialias\0" "gtk-xft-antialias\0"
++ "Xft/Hinting\0" "gtk-xft-hinting\0"
++ "Xft/HintStyle\0" "gtk-xft-hintstyle\0"
++ "Xft/RGBA\0" "gtk-xft-rgba\0"
++ "Xft/DPI\0" "gtk-xft-dpi\0"
++ "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0"
++ "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0"
++ "Gtk/EnableAccels\0" "gtk-enable-accels\0"
++ "Gtk/EnableMnemonics\0" "gtk-enable-mnemonics\0"
++ "Gtk/ScrolledWindowPlacement\0" "gtk-scrolled-window-placement\0"
++ "Gtk/IMModule\0" "gtk-im-module\0"
++ "Fontconfig/Timestamp\0" "gtk-fontconfig-timestamp\0"
++ "Net/SoundThemeName\0" "gtk-sound-theme-name\0"
++ "Net/EnableInputFeedbackSounds\0" "gtk-enable-input-feedback-sounds\0"
++ "Net/EnableEventSounds\0" "gtk-enable-event-sounds\0";
+
+- // more spread in gtk sources
++ More, from various places in gtk sources:
++
+ gtk-entry-select-on-focus
+- gtk-cursor-blink
+- gtk-cursor-blink-time
+ gtk-split-cursor
+
+ */
+@@ -463,6 +437,5 @@
+ }
+ #endif
+
+- GDK_NOTE(MISC, g_print("gdk_screen_get_setting(%s) not handled\n", name));
+ return FALSE;
+ }
+Index: gdk/win32/gdkevents-win32.c
+===================================================================
+--- gdk/win32/gdkevents-win32.c (revision 22076)
++++ gdk/win32/gdkevents-win32.c (revision 22450)
+@@ -746,7 +746,7 @@
+
+ g_return_if_fail (display == _gdk_display);
+
+- GDK_NOTE (EVENTS, g_print ("gdk_keyboard_ungrab\n"));
++ GDK_NOTE (EVENTS, g_print ("gdk_display_keyboard_ungrab\n"));
+
+ if (k_grab_window && !k_grab_owner_events)
+ {
+@@ -955,6 +955,7 @@
+ print_event (GdkEvent *event)
+ {
+ gchar *escaped, *kvname;
++ gchar *selection_name, *target_name, *property_name;
+
+ g_print ("%s%*s===> ", (debug_indent > 0 ? "\n" : ""), debug_indent, "");
+ switch (event->any.type)
+@@ -1065,6 +1066,18 @@
+ case GDK_FOCUS_CHANGE:
+ g_print ("%s", (event->focus_change.in ? "IN" : "OUT"));
+ break;
++ case GDK_SELECTION_REQUEST:
++ case GDK_SELECTION_NOTIFY:
++ case GDK_SELECTION_CLEAR:
++ selection_name = gdk_atom_name (event->selection.selection);
++ target_name = gdk_atom_name (event->selection.target);
++ property_name = gdk_atom_name (event->selection.property);
++ g_print ("sel:%s tgt:%s prop:%s",
++ selection_name, target_name, property_name);
++ g_free (selection_name);
++ g_free (target_name);
++ g_free (property_name);
++ break;
+ case GDK_CONFIGURE:
+ g_print ("x:%d y:%d w:%d h:%d",
+ event->configure.x, event->configure.y,
+@@ -1682,7 +1695,8 @@
+
+ /* The check_extended flag controls whether to check if the windows want
+ * events from extended input devices and if the message should be skipped
+- * because an extended input device is active */
++ * because an extended input device is active
++ */
+ static gboolean
+ propagate (GdkWindow **window,
+ MSG *msg,
+@@ -1699,8 +1713,9 @@
+ {
+ /* Event source is grabbed with owner_events FALSE */
+
+- /* See if the event should be ignored because an extended input device
+- * is used */
++ /* See if the event should be ignored because an extended input
++ * device is used
++ */
+ if (check_extended &&
+ ((GdkWindowObject *) grab_window)->extension_events != 0 &&
+ _gdk_input_ignore_core)
+@@ -1720,10 +1735,12 @@
+ return TRUE;
+ }
+ }
++
++ /* If we come here, we know that if grab_window != NULL then
++ * grab_owner_events is TRUE
++ */
+ while (TRUE)
+ {
+- /* See if the event should be ignored because an extended input device
+- * is used */
+ if (check_extended &&
+ ((GdkWindowObject *) *window)->extension_events != 0 &&
+ _gdk_input_ignore_core)
+@@ -1742,8 +1759,6 @@
+ {
+ /* Event source is grabbed with owner_events TRUE */
+
+- /* See if the event should be ignored because an extended
+- * input device is used */
+ if (check_extended &&
+ ((GdkWindowObject *) grab_window)->extension_events != 0 &&
+ _gdk_input_ignore_core)
+@@ -2867,7 +2882,7 @@
+ break;
+
+ case WM_MOUSEWHEEL:
+- GDK_NOTE (EVENTS, g_print (" %d", HIWORD (msg->wParam)));
++ GDK_NOTE (EVENTS, g_print (" %d", (short) HIWORD (msg->wParam)));
+
+ /* WM_MOUSEWHEEL is delivered to the focus window. Work around
+ * that. Also, the position is in screen coordinates, not client
+@@ -2917,6 +2932,42 @@
+ return_val = TRUE;
+ break;
+
++ case WM_HSCROLL:
++ GDK_NOTE (EVENTS,
++ (g_print (" %s",
++ (LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
++ (LOWORD (msg->wParam) == SB_LEFT ? "LEFT" :
++ (LOWORD (msg->wParam) == SB_RIGHT ? "RIGHT" :
++ (LOWORD (msg->wParam) == SB_LINELEFT ? "LINELEFT" :
++ (LOWORD (msg->wParam) == SB_LINERIGHT ? "LINERIGHT" :
++ (LOWORD (msg->wParam) == SB_PAGELEFT ? "PAGELEFT" :
++ (LOWORD (msg->wParam) == SB_PAGERIGHT ? "PAGERIGHT" :
++ (LOWORD (msg->wParam) == SB_THUMBPOSITION ? "THUMBPOSITION" :
++ (LOWORD (msg->wParam) == SB_THUMBTRACK ? "THUMBTRACK" :
++ "???")))))))))),
++ (LOWORD (msg->wParam) == SB_THUMBPOSITION ||
++ LOWORD (msg->wParam) == SB_THUMBTRACK) ?
++ g_print (" %d", HIWORD (msg->wParam)) : 0));
++ break;
++
++ case WM_VSCROLL:
++ GDK_NOTE (EVENTS,
++ (g_print (" %s",
++ (LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
++ (LOWORD (msg->wParam) == SB_BOTTOM ? "BOTTOM" :
++ (LOWORD (msg->wParam) == SB_TOP ? "TOP" :
++ (LOWORD (msg->wParam) == SB_LINEDOWN ? "LINDOWN" :
++ (LOWORD (msg->wParam) == SB_LINEUP ? "LINEIP" :
++ (LOWORD (msg->wParam) == SB_PAGEDOWN ? "PAGEDOWN" :
++ (LOWORD (msg->wParam) == SB_PAGEUP ? "PAGEUP" :
++ (LOWORD (msg->wParam) == SB_THUMBPOSITION ? "THUMBPOSITION" :
++ (LOWORD (msg->wParam) == SB_THUMBTRACK ? "THUMBTRACK" :
++ "???")))))))))),
++ (LOWORD (msg->wParam) == SB_THUMBPOSITION ||
++ LOWORD (msg->wParam) == SB_THUMBTRACK) ?
++ g_print (" %d", HIWORD (msg->wParam)) : 0));
++ break;
++
+ case WM_QUERYNEWPALETTE:
+ if (gdk_visual_get_system ()->type == GDK_VISUAL_PSEUDO_COLOR)
+ {
+@@ -3608,7 +3659,7 @@
+ event->selection.send_event = FALSE;
+ event->selection.selection = GDK_SELECTION_CLIPBOARD;
+ event->selection.target = target;
+- event->selection.property = _gdk_selection_property;
++ event->selection.property = _gdk_selection;
+ event->selection.requestor = msg->hwnd;
+ event->selection.time = msg->time;
+
+@@ -3640,6 +3691,11 @@
+ /* The requestor is holding the clipboard, no
+ * OpenClipboard() is required/possible
+ */
++ GDK_NOTE (DND,
++ g_print (" SetClipboardData(%s,%p)",
++ _gdk_win32_cf_to_string (msg->wParam),
++ _delayed_rendering_data));
++
+ API_CALL (SetClipboardData, (msg->wParam, _delayed_rendering_data));
+ _delayed_rendering_data = NULL;
+ }
+Index: gdk/win32/gdkglobals-win32.c
+===================================================================
+--- gdk/win32/gdkglobals-win32.c (revision 22076)
++++ gdk/win32/gdkglobals-win32.c (revision 22450)
+@@ -46,10 +46,7 @@
+ gboolean _gdk_input_locale_is_ime;
+ UINT _gdk_input_codepage;
+
+-WORD _cf_utf8_string;
+-WORD _cf_image_bmp;
+-
+-GdkAtom _gdk_selection_property;
++GdkAtom _gdk_selection;
+ GdkAtom _wm_transient_for;
+ GdkAtom _targets;
+ GdkAtom _save_targets;
+@@ -57,7 +54,6 @@
+ GdkAtom _text;
+ GdkAtom _compound_text;
+ GdkAtom _text_uri_list;
+-GdkAtom _image_bmp;
+
+ GdkAtom _local_dnd;
+ GdkAtom _gdk_win32_dropfiles;
+Index: gdk/win32/gdkmain-win32.c
+===================================================================
+--- gdk/win32/gdkmain-win32.c (revision 22076)
++++ gdk/win32/gdkmain-win32.c (revision 22450)
+@@ -100,10 +100,7 @@
+
+ CoInitialize (NULL);
+
+- _cf_utf8_string = RegisterClipboardFormat ("UTF8_STRING");
+- _cf_image_bmp = RegisterClipboardFormat ("image/bmp");
+-
+- _gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE);
++ _gdk_selection = gdk_atom_intern ("GDK_SELECTION", FALSE);
+ _wm_transient_for = gdk_atom_intern ("WM_TRANSIENT_FOR", FALSE);
+ _targets = gdk_atom_intern ("TARGETS", FALSE);
+ _save_targets = gdk_atom_intern ("SAVE_TARGETS", FALSE);
+@@ -111,7 +108,6 @@
+ _text = gdk_atom_intern ("TEXT", FALSE);
+ _compound_text = gdk_atom_intern ("COMPOUND_TEXT", FALSE);
+ _text_uri_list = gdk_atom_intern ("text/uri-list", FALSE);
+- _image_bmp = gdk_atom_intern ("image/bmp", FALSE);
+
+ _local_dnd = gdk_atom_intern ("LocalDndSelection", FALSE);
+ _gdk_win32_dropfiles = gdk_atom_intern ("DROPFILES_DND", FALSE);
+@@ -1039,9 +1035,7 @@
+ #define CASE(x) case CF_##x: return "CF_" #x
+ CASE (BITMAP);
+ CASE (DIB);
+-#ifdef CF_DIBV5
+ CASE (DIBV5);
+-#endif
+ CASE (DIF);
+ CASE (DSPBITMAP);
+ CASE (DSPENHMETAFILE);
+Index: gdk/win32/gdkselection-win32.c
+===================================================================
+--- gdk/win32/gdkselection-win32.c (revision 22076)
++++ gdk/win32/gdkselection-win32.c (revision 22450)
+@@ -35,7 +35,7 @@
+ #include "gdkprivate-win32.h"
+
+ /* We emulate the GDK_SELECTION window properties of windows (as used
+- * in the X11 backend) by using a hash table from GdkWindows to
++ * in the X11 backend) by using a hash table from window handles to
+ * GdkSelProp structs.
+ */
+
+@@ -55,12 +55,89 @@
+ */
+ static GHashTable *sel_owner_table = NULL;
+
++/* Well-known registered clipboard image formats */
++static UINT cf_png;
++static UINT cf_jfif;
++static UINT cf_gif;
++
++/* GdkAtoms for well-known image formats */
++static GdkAtom *known_pixbuf_formats;
++static int n_known_pixbuf_formats;
++static GdkAtom image_png;
++static GdkAtom image_jpeg;
++static GdkAtom image_bmp;
++static GdkAtom image_gif;
++
++/* GdkAtoms for well-known text formats */
++static GdkAtom text_plain;
++static GdkAtom text_plain_charset_utf_8;
++static GdkAtom text_plain_charset_CP1252;
++
+ void
+ _gdk_win32_selection_init (void)
+ {
++ GSList *pixbuf_formats;
++ GSList *rover;
++
+ sel_prop_table = g_hash_table_new (NULL, NULL);
+ sel_owner_table = g_hash_table_new (NULL, NULL);
+ _format_atom_table = g_hash_table_new (NULL, NULL);
++
++ /* MS Office 2007, at least, offers images in common file formats
++ * using clipboard format names like "PNG" and "JFIF". So we follow
++ * the lead and map the GDK target name "image/png" to the clipboard
++ * format name "PNG" etc.
++ */
++ cf_png = RegisterClipboardFormat ("PNG");
++ cf_jfif = RegisterClipboardFormat ("JFIF");
++ cf_gif = RegisterClipboardFormat ("GIF");
++
++ pixbuf_formats = gdk_pixbuf_get_formats ();
++
++ n_known_pixbuf_formats = 0;
++ for (rover = pixbuf_formats; rover != NULL; rover = rover->next)
++ {
++ gchar **mime_types =
++ gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) rover->data);
++
++ gchar **mime_type;
++
++ for (mime_type = mime_types; *mime_type != NULL; mime_type++)
++ n_known_pixbuf_formats++;
++ }
++
++ known_pixbuf_formats = g_new (GdkAtom, n_known_pixbuf_formats);
++
++ n_known_pixbuf_formats = 0;
++ for (rover = pixbuf_formats; rover != NULL; rover = rover->next)
++ {
++ gchar **mime_types =
++ gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) rover->data);
++
++ gchar **mime_type;
++
++ for (mime_type = mime_types; *mime_type != NULL; mime_type++)
++ known_pixbuf_formats[n_known_pixbuf_formats++] = gdk_atom_intern (*mime_type, FALSE);
++ }
++
++ g_slist_free (pixbuf_formats);
++
++ image_png = gdk_atom_intern ("image/png", FALSE);
++ image_jpeg = gdk_atom_intern ("image/jpeg", FALSE);
++ image_bmp = gdk_atom_intern ("image/bmp", FALSE);
++ image_gif = gdk_atom_intern ("image/gif", FALSE);
++
++ text_plain = gdk_atom_intern ("text/plain", FALSE);
++ text_plain_charset_utf_8= gdk_atom_intern ("text/plain;charset=utf-8", FALSE);
++ text_plain_charset_CP1252 = gdk_atom_intern ("text/plain;charset=CP1252", FALSE);
++
++ g_hash_table_replace (_format_atom_table,
++ GINT_TO_POINTER (cf_png),
++ image_png);
++
++ g_hash_table_replace (_format_atom_table,
++ GINT_TO_POINTER (CF_DIB),
++ image_bmp);
+ }
+
+ /* The specifications for COMPOUND_TEXT and STRING specify that C0 and
+@@ -130,42 +207,33 @@
+ }
+
+ static void
+-_gdk_selection_property_store (GdkWindow *owner,
+- GdkAtom type,
+- gint format,
+- guchar *data,
+- gint length)
++selection_property_store (GdkWindow *owner,
++ GdkAtom type,
++ gint format,
++ guchar *data,
++ gint length)
+ {
+ GdkSelProp *prop;
+- GSList *prop_list;
+
+- prop = g_new (GdkSelProp, 1);
++ g_return_if_fail (type != GDK_TARGET_STRING);
+
+- if (type == GDK_TARGET_STRING)
++ prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (owner));
++
++ if (prop != NULL)
+ {
+- /* We know that data is UTF-8 */
+- prop->data = (guchar *) _gdk_utf8_to_string_target_internal ((char*) data, length);
+- g_free (data);
++ g_free (prop->data);
++ g_free (prop);
++ g_hash_table_remove (sel_prop_table, GDK_WINDOW_HWND (owner));
++ }
+
+- if (!prop->data)
+- {
+- g_free (prop);
++ prop = g_new (GdkSelProp, 1);
+
+- return;
+- }
+- else
+- prop->length = strlen ((char*) prop->data) + 1;
+- }
+- else
+- {
+- prop->data = data;
+- prop->length = length;
+- }
++ prop->data = data;
++ prop->length = length;
+ prop->format = format;
+ prop->type = type;
+- prop_list = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (owner));
+- prop_list = g_slist_append (prop_list, prop);
+- g_hash_table_insert (sel_prop_table, GDK_WINDOW_HWND (owner), prop_list);
++
++ g_hash_table_insert (sel_prop_table, GDK_WINDOW_HWND (owner), prop);
+ }
+
+ void
+@@ -192,6 +260,21 @@
+ }
+ }
+
++static gchar *
++get_mapped_gdk_atom_name (GdkAtom gdk_target)
++{
++ if (gdk_target == image_png)
++ return g_strdup ("PNG");
++
++ if (gdk_target == image_jpeg)
++ return g_strdup ("JFIF");
++
++ if (gdk_target == image_gif)
++ return g_strdup ("GIF");
++
++ return gdk_atom_name (gdk_target);
++}
++
+ gboolean
+ gdk_selection_owner_set_for_display (GdkDisplay *display,
+ GdkWindow *owner,
+@@ -205,18 +288,14 @@
+ g_return_val_if_fail (display == _gdk_display, FALSE);
+ g_return_val_if_fail (selection != GDK_NONE, FALSE);
+
+-#ifdef G_ENABLE_DEBUG
+- {
+- gchar *sel_name;
++ GDK_NOTE (DND, {
++ gchar *sel_name = gdk_atom_name (selection);
+
+- GDK_NOTE (DND,
+- (sel_name = gdk_atom_name (selection),
+- g_print ("gdk_selection_owner_set_for_display: %p %p (%s)\n",
+- (owner ? GDK_WINDOW_HWND (owner) : NULL),
+- selection, sel_name),
+- g_free (sel_name)));
+- }
+-#endif
++ g_print ("gdk_selection_owner_set_for_display: %p %s\n",
++ (owner ? GDK_WINDOW_HWND (owner) : NULL),
++ sel_name);
++ g_free (sel_name);
++ });
+
+ if (selection != GDK_SELECTION_CLIPBOARD)
+ {
+@@ -266,7 +345,7 @@
+ tmp_event.selection.send_event = FALSE;
+ tmp_event.selection.selection = selection;
+ tmp_event.selection.target = _utf8_string;
+- tmp_event.selection.property = _gdk_selection_property;
++ tmp_event.selection.property = _gdk_selection;
+ tmp_event.selection.requestor = hwnd;
+ tmp_event.selection.time = time;
+
+@@ -297,18 +376,14 @@
+
+ window = gdk_window_lookup ((GdkNativeWindow) g_hash_table_lookup (sel_owner_table, selection));
+
+-#ifdef G_ENABLE_DEBUG
+- {
+- gchar *sel_name;
+-
+- GDK_NOTE (DND,
+- (sel_name = gdk_atom_name (selection),
+- g_print ("gdk_selection_owner_get: %p (%s) = %p\n",
+- selection, sel_name,
+- (window ? GDK_WINDOW_HWND (window) : NULL)),
+- g_free (sel_name)));
+- }
+-#endif
++ GDK_NOTE (DND, {
++ gchar *sel_name = gdk_atom_name (selection);
++
++ g_print ("gdk_selection_owner_get: %s = %p\n",
++ sel_name,
++ (window ? GDK_WINDOW_HWND (window) : NULL));
++ g_free (sel_name);
++ });
+
+ return window;
+ }
+@@ -341,7 +416,7 @@
+ guint32 time)
+ {
+ HGLOBAL hdata;
+- GdkAtom property = _gdk_selection_property;
++ GdkAtom property = _gdk_selection;
+
+ g_return_if_fail (selection != GDK_NONE);
+ g_return_if_fail (requestor != NULL);
+@@ -349,76 +424,119 @@
+ if (GDK_WINDOW_DESTROYED (requestor))
+ return;
+
+-#ifdef G_ENABLE_DEBUG
+- {
+- gchar *sel_name, *tgt_name;
+-
+- GDK_NOTE (DND,
+- (sel_name = gdk_atom_name (selection),
+- tgt_name = gdk_atom_name (target),
+- g_print ("gdk_selection_convert: %p %p (%s) %p (%s)\n",
+- GDK_WINDOW_HWND (requestor),
+- selection, sel_name,
+- target, tgt_name),
+- g_free (sel_name),
+- g_free (tgt_name)));
+- }
+-#endif
++ GDK_NOTE (DND, {
++ gchar *sel_name = gdk_atom_name (selection);
++ gchar *tgt_name = gdk_atom_name (target);
++
++ g_print ("gdk_selection_convert: %p %s %s\n",
++ GDK_WINDOW_HWND (requestor),
++ sel_name, tgt_name);
++ g_free (sel_name);
++ g_free (tgt_name);
++ });
+
+ if (selection == GDK_SELECTION_CLIPBOARD && target == _targets)
+ {
+- gint formats_cnt, i, fmt;
+- GdkAtom *data;
++ gint ntargets, fmt;
++ GdkAtom *targets;
++ gboolean has_text = FALSE;
++ gboolean has_png = FALSE;
+ gboolean has_bmp = FALSE;
+
+- /* He wants to know what formats are on the clipboard. If there
+- * is some kind of text, tell him so.
+- */
+ if (!API_CALL (OpenClipboard, (GDK_WINDOW_HWND (requestor))))
+ return;
+
+- formats_cnt = CountClipboardFormats ();
+- data = g_new (GdkAtom, formats_cnt + 2);
+- i = 0;
++ targets = g_new (GdkAtom, CountClipboardFormats ());
++ ntargets = 0;
+
+- if (IsClipboardFormatAvailable (CF_UNICODETEXT) ||
+- IsClipboardFormatAvailable (_cf_utf8_string) ||
+- IsClipboardFormatAvailable (CF_TEXT))
++ for (fmt = 0; 0 != (fmt = EnumClipboardFormats (fmt)); )
+ {
+- data[i++] = _utf8_string;
++ if (fmt == cf_png)
++ {
++ targets[ntargets++] = image_png;
++ has_png = TRUE;
++ }
+ }
+- if (formats_cnt > 0)
+- {
+- /* If there is anything else in the clipboard, enum it all
+- * although we don't offer special conversion services.
+- */
+- for (fmt = 0; 0 != (fmt = EnumClipboardFormats (fmt)); )
+- {
+- gchar sFormat[80];
+
+- if (GetClipboardFormatName (fmt, sFormat, 80) > 0 &&
+- strcmp (sFormat, "UTF8_STRING"))
+- {
+- GdkAtom atom;
++ for (fmt = 0; 0 != (fmt = EnumClipboardFormats (fmt)); )
++ {
++ gchar sFormat[80];
+
+- if (!has_bmp &&
+- (!strcmp (sFormat, "image/bmp") ||
+- !strcmp (sFormat, "image/x-bmp") ||
+- !strcmp (sFormat, "image/x-MS-bmp")))
+- has_bmp = TRUE;
+- atom = gdk_atom_intern (sFormat, FALSE);
+- data[i++] = atom;
+- }
++ if (fmt == CF_UNICODETEXT || fmt == CF_TEXT)
++ {
++ /* Advertise text to GDK always as UTF8_STRING */
++ if (!has_text)
++ targets[ntargets++] = _utf8_string;
++ has_text = TRUE;
++ }
++ else if (fmt == cf_png)
++ {
++ /* Already handled above */
++ }
++ else if (fmt == CF_DIB ||
++ fmt == CF_DIBV5)
++ {
++ /* Don't bother telling that a bitmap is present if there is
++ * also PNG, which is much more reliable in transferring
++ * transparency.
++ */
++ if (!has_bmp && !has_png)
++ targets[ntargets++] = image_bmp;
++ has_bmp = TRUE;
++ }
++ else if (fmt == cf_jfif)
++ {
++ /* Ditto for JPEG */
++ if (!has_png)
++ targets[ntargets++] = image_jpeg;
++ }
++ else if (fmt == cf_gif)
++ {
++ /* Ditto for GIF.
++ */
++ if (!has_png)
++ targets[ntargets++] = image_gif;
++ }
++ else if (GetClipboardFormatName (fmt, sFormat, 80) > 0)
++ {
++ if (strcmp (sFormat, "image/bmp") == 0 ||
++ strcmp (sFormat, "image/x-bmp") == 0 ||
++ strcmp (sFormat, "image/x-MS-bmp") == 0 ||
++ strcmp (sFormat, "image/x-icon") == 0 ||
++ strcmp (sFormat, "image/x-ico") == 0 ||
++ strcmp (sFormat, "image/x-win-bitmap") == 0)
++ {
++ /* Ignore these (from older GTK+ versions
++ * presumably), as the same image in the CF_DIB
++ * format will also be on the clipboard anyway.
++ */
++ }
++ else
++ targets[ntargets++] = gdk_atom_intern (sFormat, FALSE);
+ }
+ }
+- if (!has_bmp && (IsClipboardFormatAvailable (CF_BITMAP) ||
+- IsClipboardFormatAvailable (CF_DIB)))
+- data[i++] = _image_bmp;
+
+- if (i > 0)
+- _gdk_selection_property_store (requestor, GDK_SELECTION_TYPE_ATOM,
+- 32, (guchar *) data, i * sizeof (GdkAtom));
+- else
++ GDK_NOTE (DND, {
++ int i;
++
++ g_print ("... ");
++ for (i = 0; i < ntargets; i++)
++ {
++ gchar *atom_name = gdk_atom_name (targets[i]);
++
++ g_print ("%s", atom_name);
++ g_free (atom_name);
++ if (i < ntargets - 1)
++ g_print (", ");
++ }
++ g_print ("\n");
++ });
++
++ if (ntargets > 0)
++ selection_property_store (requestor, GDK_SELECTION_TYPE_ATOM,
++ 32, (guchar *) targets,
++ ntargets * sizeof (GdkAtom));
++ else
+ property = GDK_NONE;
+
+ API_CALL (CloseClipboard, ());
+@@ -432,7 +550,6 @@
+ if (!API_CALL (OpenClipboard, (GDK_WINDOW_HWND (requestor))))
+ return;
+
+- /* Try various formats. First the simplest, CF_UNICODETEXT. */
+ if ((hdata = GetClipboardData (CF_UNICODETEXT)) != NULL)
+ {
+ wchar_t *ptr, *wcs, *p, *q;
+@@ -465,170 +582,190 @@
+ g_free (wcs);
+
+ if (data)
+- _gdk_selection_property_store (requestor, target, 8,
+- data, strlen (data) + 1);
++ selection_property_store (requestor, _utf8_string, 8,
++ data, strlen (data) + 1);
+ GlobalUnlock (hdata);
+ }
+ }
+- else if ((hdata = GetClipboardData (_cf_utf8_string)) != NULL)
+- {
+- /* UTF8_STRING is a format we store ourselves when necessary */
+- guchar *ptr;
+- gint length;
+-
+- if ((ptr = GlobalLock (hdata)) != NULL)
+- {
+- length = GlobalSize (hdata);
+-
+- GDK_NOTE (DND, g_print ("... UTF8_STRING: %d bytes: %.10s\n",
+- length, ptr));
+-
+- _gdk_selection_property_store (requestor, target, 8,
+- g_memdup (ptr, length), length);
+- GlobalUnlock (hdata);
+- }
+- }
+- else if ((hdata = GetClipboardData (CF_TEXT)) != NULL)
+- {
+- /* We must always assume the data can contain non-ASCII
+- * in either the current code page, or if there is CF_LOCALE
+- * data, in that locale's default code page.
+- */
+- HGLOBAL hlcid;
+- UINT cp = CP_ACP;
+- wchar_t *wcs, *wcs2, *p, *q;
+- guchar *ptr, *data;
+- glong length, wclen, wclen2;
+-
+- if ((ptr = GlobalLock (hdata)) != NULL)
+- {
+- length = GlobalSize (hdata);
+-
+- GDK_NOTE (DND, g_print ("... CF_TEXT: %ld bytes: %.10s\n",
+- length, ptr));
+-
+- if ((hlcid = GetClipboardData (CF_LOCALE)) != NULL)
+- {
+- gchar buf[10];
+- LCID *lcidptr = GlobalLock (hlcid);
+- if (GetLocaleInfo (*lcidptr, LOCALE_IDEFAULTANSICODEPAGE,
+- buf, sizeof (buf)))
+- {
+- cp = atoi (buf);
+- GDK_NOTE (DND, g_print ("... CF_LOCALE: %#lx cp:%d\n",
+- *lcidptr, cp));
+- }
+- GlobalUnlock (hlcid);
+- }
+-
+- wcs = g_new (wchar_t, length + 1);
+- wclen = MultiByteToWideChar (cp, 0, ptr, length,
+- wcs, length + 1);
+-
+- /* Strip out \r */
+- wcs2 = g_new (wchar_t, wclen);
+- p = wcs;
+- q = wcs2;
+- wclen2 = 0;
+- while (p < wcs + wclen)
+- {
+- if (*p != '\r')
+- {
+- *q++ = *p;
+- wclen2++;
+- }
+- p++;
+- }
+- g_free (wcs);
+-
+- data = g_utf16_to_utf8 (wcs2, wclen2, NULL, &length, NULL);
+- g_free (wcs2);
+-
+- if (data)
+- _gdk_selection_property_store (requestor, target, 8,
+- data, length + 1);
+- GlobalUnlock (hdata);
+- }
+- }
+ else
+ property = GDK_NONE;
+
+ API_CALL (CloseClipboard, ());
+ }
+- else if (selection == GDK_SELECTION_CLIPBOARD && target == _image_bmp)
++ else if (selection == GDK_SELECTION_CLIPBOARD && target == image_bmp)
+ {
+- guchar *data;
+-
+ if (!API_CALL (OpenClipboard, (GDK_WINDOW_HWND (requestor))))
+ return;
+- if ((hdata = GetClipboardData (_cf_image_bmp)) != NULL)
+- {
+- /* "image/bmp" is the first choice. */
+- guchar *ptr;
+
+- if ((ptr = GlobalLock (hdata)) != NULL)
+- {
+- gint length = GlobalSize (hdata);
+-
+- GDK_NOTE (DND, g_print ("...BITMAP (from \"image/bmp\": %d bytes\n",
+- length));
+-
+- _gdk_selection_property_store (requestor, target, 8,
+- g_memdup (ptr, length), length);
+- GlobalUnlock (hdata);
+- }
+- }
+- else if ((hdata = GetClipboardData (CF_DIB)) != NULL)
++ if ((hdata = GetClipboardData (CF_DIB)) != NULL)
+ {
+- /* If there's CF_DIB but not "image/bmp", the clipboard
+- * owner is probably a native Win32 application.
+- */
+- BITMAPINFOHEADER *ptr;
++ BITMAPINFOHEADER *bi;
+
+- if ((ptr = GlobalLock (hdata)) != NULL)
++ if ((bi = GlobalLock (hdata)) != NULL)
+ {
+- BITMAPFILEHEADER *hdr; /* Need to add a file header so gdk-pixbuf can load it */
+- gint length = GlobalSize (hdata) + sizeof (BITMAPFILEHEADER);
++ /* Need to add a BMP file header so gdk-pixbuf can load
++ * it.
++ *
++ * If the data is from Mozilla Firefox or IE7, and
++ * starts with an "oldfashioned" BITMAPINFOHEADER,
++ * i.e. with biSize==40, and biCompression == BI_RGB and
++ * biBitCount==32, we assume that the "extra" byte in
++ * each pixel in fact is alpha.
++ *
++ * The gdk-pixbuf bmp loader doesn't trust 32-bit BI_RGB
++ * nitmaps to in fact have alpha, so we have to convince
++ * it by changint the bitmap header to a version 5
++ * BI_BITFIELDS one with explicit alpha mask indicated.
++ *
++ * The RGB bytes that are in bitmaps on the clipboard
++ * originating from Firefox or IE7 seem to be
++ * premultiplied with alpha. The gdk-pixbuf bmp loader
++ * of course doesn't expect that, so we have to undo the
++ * premultiplication before feeding the bitmap to the
++ * bmp loader.
++ *
++ * Note that for some reason the bmp loader used to want
++ * the alpha bytes in its input to actually be
++ * 255-alpha, but here we assume that this has been
++ * fixed before this is committed.
++ */
++ BITMAPFILEHEADER *bf;
++ gpointer data;
++ gint data_length = GlobalSize (hdata);
++ gint new_length;
++ gboolean make_dibv5 = FALSE;
++
++ GDK_NOTE (DND, g_print ("... CF_DIB: %d bytes\n", data_length));
++
++ if (bi->biSize == sizeof (BITMAPINFOHEADER) &&
++ bi->biPlanes == 1 &&
++ bi->biBitCount == 32 &&
++ bi->biCompression == BI_RGB &&
++#if 0
++ /* Maybe check explicitly for Mozilla or IE7?
++ *
++ * If the clipboard format
++ * application/x-moz-nativeimage is present, that is
++ * a reliable indicator that the data is offered by
++ * Mozilla one would think. For IE7,
++ * UniformResourceLocatorW is presumably not that
++ * uniqie, so probably need to do some
++ * GetClipboardOwner(), GetWindowThreadProcessId(),
++ * OpenProcess(), GetModuleFileNameEx() dance to
++ * check?
++ */
++ (IsClipboardFormatAvailable
++ (RegisterClipboardFormat ("application/x-moz-nativeimage")) ||
++ IsClipboardFormatAvailable
++ (RegisterClipboardFormat ("UniformResourceLocatorW"))) &&
++#endif
++ TRUE)
++ {
++ /* We turn the BITMAPINFOHEADER into a
++ * BITMAPV5HEADER before feeding it to gdk-pixbuf.
++ */
++ new_length = (data_length +
++ sizeof (BITMAPFILEHEADER) +
++ (sizeof (BITMAPV5HEADER) - sizeof (BITMAPINFOHEADER)));
++ make_dibv5 = TRUE;
++ }
++ else
++ {
++ new_length = data_length + sizeof (BITMAPFILEHEADER);
++ }
+
+- GDK_NOTE (DND, g_print ("... BITMAP (from CF_DIB): %d bytes\n", length));
+-
+- data = g_try_malloc (length);
++ data = g_try_malloc (new_length);
++
+ if (data)
+ {
+- hdr = (BITMAPFILEHEADER *)data;
+- hdr->bfType = 0x4d42; /* 0x42 = "B" 0x4d = "M" */
+- /* Compute the size of the entire file. */
+- hdr->bfSize = (DWORD) (sizeof (BITMAPFILEHEADER)
+- + ptr->biSize + ptr->biClrUsed
+- * sizeof (RGBQUAD) + ptr->biSizeImage);
+- hdr->bfReserved1 = 0;
+- hdr->bfReserved2 = 0;
+- /* Compute the offset to the array of color indices. */
+- hdr->bfOffBits = (DWORD) sizeof (BITMAPFILEHEADER)
+- + ptr->biSize + ptr->biClrUsed * sizeof (RGBQUAD);
+- /* Copy the data behind it */
+- memcpy (data + sizeof (BITMAPFILEHEADER), ptr, length - sizeof (BITMAPFILEHEADER));
+- _gdk_selection_property_store (requestor, target, 8,
+- data, length);
++ bf = (BITMAPFILEHEADER *)data;
++ bf->bfType = 0x4d42; /* "BM" */
++ bf->bfSize = new_length;
++ bf->bfReserved1 = 0;
++ bf->bfReserved2 = 0;
++
++ if (make_dibv5)
++ {
++ BITMAPV5HEADER *bV5 = (BITMAPV5HEADER *) ((char *) data + sizeof (BITMAPFILEHEADER));
++ guchar *p;
++ int i;
++
++ bV5->bV5Size = sizeof (BITMAPV5HEADER);
++ bV5->bV5Width = bi->biWidth;
++ bV5->bV5Height = bi->biHeight;
++ bV5->bV5Planes = 1;
++ bV5->bV5BitCount = 32;
++ bV5->bV5Compression = BI_BITFIELDS;
++ bV5->bV5SizeImage = 4 * bV5->bV5Width * ABS (bV5->bV5Height);
++ bV5->bV5XPelsPerMeter = bi->biXPelsPerMeter;
++ bV5->bV5YPelsPerMeter = bi->biYPelsPerMeter;
++ bV5->bV5ClrUsed = 0;
++ bV5->bV5ClrImportant = 0;
++ /* Now the added mask fields */
++ bV5->bV5RedMask = 0x00ff0000;
++ bV5->bV5GreenMask = 0x0000ff00;
++ bV5->bV5BlueMask = 0x000000ff;
++ bV5->bV5AlphaMask = 0xff000000;
++ ((char *) &bV5->bV5CSType)[3] = 's';
++ ((char *) &bV5->bV5CSType)[2] = 'R';
++ ((char *) &bV5->bV5CSType)[1] = 'G';
++ ((char *) &bV5->bV5CSType)[0] = 'B';
++ /* Ignore colorspace and profile fields */
++ bV5->bV5Intent = LCS_GM_GRAPHICS;
++ bV5->bV5Reserved = 0;
++
++ bf->bfOffBits = (sizeof (BITMAPFILEHEADER) +
++ bV5->bV5Size);
++
++ p = ((guchar *) data) + sizeof (BITMAPFILEHEADER) + sizeof (BITMAPV5HEADER);
++ memcpy (p, ((char *) bi) + bi->biSize,
++ data_length - sizeof (BITMAPINFOHEADER));
++
++ for (i = 0; i < bV5->bV5SizeImage/4; i++)
++ {
++ if (p[3] != 0)
++ {
++ gdouble inverse_alpha = 255./p[3];
++
++ p[0] = p[0] * inverse_alpha + 0.5;
++ p[1] = p[1] * inverse_alpha + 0.5;
++ p[2] = p[2] * inverse_alpha + 0.5;
++ }
++
++ p += 4;
++ }
++ }
++ else
++ {
++ bf->bfOffBits = (sizeof (BITMAPFILEHEADER) +
++ bi->biSize +
++ bi->biClrUsed * sizeof (RGBQUAD));
++
++ memcpy ((char *) data + sizeof (BITMAPFILEHEADER),
++ bi,
++ data_length);
++ }
++
++ selection_property_store (requestor, image_bmp, 8,
++ data, new_length);
+ }
+ GlobalUnlock (hdata);
+ }
+-
+ }
+
+ API_CALL (CloseClipboard, ());
+ }
+ else if (selection == GDK_SELECTION_CLIPBOARD)
+ {
+- char *target_name;
++ gchar *mapped_target_name;
+ UINT fmt = 0;
+
+ if (!API_CALL (OpenClipboard, (GDK_WINDOW_HWND (requestor))))
+ return;
+
+- target_name = gdk_atom_name (target);
++ mapped_target_name = get_mapped_gdk_atom_name (target);
+
+- /* Check if it's available. In fact, we can simply call
++ /* Check if it's available. We could simply call
+ * GetClipboardData (RegisterClipboardFormat (targetname)), but
+ * the global custom format ID space is limited,
+ * (0xC000~0xFFFF), and we better not waste an format ID if we
+@@ -639,7 +776,7 @@
+ char sFormat[80];
+
+ if (GetClipboardFormatName (fmt, sFormat, 80) > 0 &&
+- strcmp (sFormat, target_name) == 0)
++ strcmp (sFormat, mapped_target_name) == 0)
+ {
+ if ((hdata = GetClipboardData (fmt)) != NULL)
+ {
+@@ -651,17 +788,17 @@
+ {
+ length = GlobalSize (hdata);
+
+- GDK_NOTE (DND, g_print ("... %s: %d bytes\n", target_name, length));
++ GDK_NOTE (DND, g_print ("... %s: %d bytes\n", mapped_target_name, length));
+
+- _gdk_selection_property_store (requestor, target, 8,
+- g_memdup (ptr, length), length);
++ selection_property_store (requestor, target, 8,
++ g_memdup (ptr, length), length);
+ GlobalUnlock (hdata);
+ break;
+ }
+ }
+ }
+ }
+- g_free (target_name);
++ g_free (mapped_target_name);
+ API_CALL (CloseClipboard, ());
+ }
+ else if (selection == _gdk_win32_dropfiles)
+@@ -672,7 +809,7 @@
+ */
+ if (dropfiles_prop != NULL)
+ {
+- _gdk_selection_property_store
++ selection_property_store
+ (requestor, selection, dropfiles_prop->format,
+ dropfiles_prop->data, dropfiles_prop->length);
+ g_free (dropfiles_prop);
+@@ -682,9 +819,9 @@
+ else
+ property = GDK_NONE;
+
+- /* Generate a selection notify message so that we actually fetch
+- * the data (if property == _gdk_selection_property) or indicating failure
+- * (if property == GDK_NONE).
++ /* Generate a selection notify message so that we actually fetch the
++ * data (if property == _gdk_selection) or indicating failure (if
++ * property == GDK_NONE).
+ */
+ generate_selection_notify (requestor, selection, target, property, time);
+ }
+@@ -696,7 +833,6 @@
+ gint *ret_format)
+ {
+ GdkSelProp *prop;
+- GSList *prop_list;
+
+ g_return_val_if_fail (requestor != NULL, 0);
+ g_return_val_if_fail (GDK_IS_WINDOW (requestor), 0);
+@@ -704,15 +840,16 @@
+ if (GDK_WINDOW_DESTROYED (requestor))
+ return 0;
+
+- GDK_NOTE (DND, g_print ("gdk_selection_property_get: %p\n",
++ GDK_NOTE (DND, g_print ("gdk_selection_property_get: %p",
+ GDK_WINDOW_HWND (requestor)));
+
+- prop_list = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (requestor));
+- prop = prop_list ? (GdkSelProp *) prop_list->data : NULL;
++ prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (requestor));
+
+ if (prop == NULL)
+ {
++ GDK_NOTE (DND, g_print (" (nothing)\n"));
+ *data = NULL;
++
+ return 0;
+ }
+
+@@ -721,6 +858,13 @@
+ if (prop->length > 0)
+ memmove (*data, prop->data, prop->length);
+
++ GDK_NOTE (DND, {
++ gchar *type_name = gdk_atom_name (prop->type);
++
++ g_print (" %s format:%d length:%d\n", type_name, prop->format, prop->length);
++ g_free (type_name);
++ });
++
+ if (ret_type)
+ *ret_type = prop->type;
+
+@@ -733,20 +877,18 @@
+ void
+ _gdk_selection_property_delete (GdkWindow *window)
+ {
+- GdkSelProp *prop;
+- GSList *prop_list;
+-
+- GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p\n",
++ GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p (no-op)\n",
+ GDK_WINDOW_HWND (window)));
+
+- prop_list = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (window));
+- if (prop_list && (prop = (GdkSelProp *) prop_list->data) != NULL)
++#if 0
++ prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (window));
++ if (prop != NULL)
+ {
+ g_free (prop->data);
+- prop_list = g_slist_remove (prop_list, prop);
+ g_free (prop);
+- g_hash_table_insert (sel_prop_table, GDK_WINDOW_HWND (window), prop_list);
++ g_hash_table_remove (sel_prop_table, GDK_WINDOW_HWND (window));
+ }
++#endif
+ }
+
+ void
+@@ -759,24 +901,17 @@
+ {
+ g_return_if_fail (display == _gdk_display);
+
+-#ifdef G_ENABLE_DEBUG
+- {
+- gchar *sel_name, *tgt_name, *prop_name;
+-
+- GDK_NOTE (DND,
+- (sel_name = gdk_atom_name (selection),
+- tgt_name = gdk_atom_name (target),
+- prop_name = gdk_atom_name (property),
+- g_print ("gdk_selection_send_notify_for_display: %p %p (%s) %p (%s) %p (%s)\n",
+- requestor,
+- selection, sel_name,
+- target, tgt_name,
+- property, prop_name),
+- g_free (sel_name),
+- g_free (tgt_name),
+- g_free (prop_name)));
+- }
+-#endif
++ GDK_NOTE (DND, {
++ gchar *sel_name = gdk_atom_name (selection);
++ gchar *tgt_name = gdk_atom_name (target);
++ gchar *prop_name = gdk_atom_name (property);
++
++ g_print ("gdk_selection_send_notify_for_display: %p %s %s %s (no-op)\n",
++ requestor, sel_name, tgt_name, prop_name);
++ g_free (sel_name);
++ g_free (tgt_name);
++ g_free (prop_name);
++ });
+ }
+
+ /* It's hard to say whether implementing this actually is of any use
+@@ -797,16 +932,13 @@
+
+ g_return_val_if_fail (display == _gdk_display, 0);
+
+-#ifdef G_ENABLE_DEBUG
+- {
+- gchar *enc_name;
+-
+- GDK_NOTE (DND, (enc_name = gdk_atom_name (encoding),
+- g_print ("gdk_text_property_to_text_list_for_display: %s %d %.20s %d\n",
+- enc_name, format, text, length),
+- g_free (enc_name)));
+- }
+-#endif
++ GDK_NOTE (DND, {
++ gchar *enc_name = gdk_atom_name (encoding);
++
++ g_print ("gdk_text_property_to_text_list_for_display: %s %d %.20s %d\n",
++ enc_name, format, text, length);
++ g_free (enc_name);
++ });
+
+ if (!list)
+ return 0;
+@@ -1022,6 +1154,13 @@
+ g_return_if_fail (ctext == NULL);
+ }
+
++/* This function is called from gtk_selection_add_target() and
++ * gtk_selection_add_targets() in gtkselection.c. It is this function
++ * that takes care of setting those clipboard formats for which we use
++ * delayed rendering. Formats copied directly to the clipboard are
++ * handled in gdk_property_change() in gdkproperty-win32.c.
++ */
++
+ void
+ gdk_win32_selection_add_targets (GdkWindow *owner,
+ GdkAtom selection,
+@@ -1029,14 +1168,10 @@
+ GdkAtom *targets)
+ {
+ HWND hwnd = NULL;
+- guint formatid;
++ gboolean has_image = FALSE;
+ gint i;
+- GSList *convertable_formats, *format;
+- gboolean has_set_dib = FALSE, has_real_dib = FALSE;
+
+-#ifdef G_ENABLE_DEBUG
+- if (_gdk_debug_flags & GDK_DEBUG_DND)
+- {
++ GDK_NOTE (DND, {
+ gchar *sel_name = gdk_atom_name (selection);
+
+ g_print ("gdk_win32_selection_add_targets: %p: %s: ",
+@@ -1048,12 +1183,13 @@
+ {
+ gchar *tgt_name = gdk_atom_name (targets[i]);
+
+- g_print ("%s ", tgt_name);
++ g_print ("%s", tgt_name);
+ g_free (tgt_name);
++ if (i < n_targets - 1)
++ g_print (", ");
+ }
+ g_print ("\n");
+- }
+-#endif
++ });
+
+ if (selection != GDK_SELECTION_CLIPBOARD)
+ return;
+@@ -1068,80 +1204,77 @@
+ if (!API_CALL (OpenClipboard, (hwnd)))
+ return;
+
+- convertable_formats = gdk_pixbuf_get_formats ();
+- for (i = 0; i < n_targets; ++i)
++ /* We have a very simple strategy: If some kind of pixmap image
++ * format is being added, actually advertise just PNG and DIB. PNG
++ * is our preferred format because it can losslessly represent any
++ * image that gdk-pixbuf formats in general can, even with alpha,
++ * unambiguously. CF_DIB is also advertised because of the general
++ * support for it in Windows software, but note that alpha won't be
++ * handled.
++ */
++ for (i = 0; !has_image && i < n_targets; ++i)
+ {
++ UINT cf;
+ gchar *target_name;
++ int j;
++
++ for (j = 0; j < n_known_pixbuf_formats; j++)
++ if (targets[i] == known_pixbuf_formats[j])
++ {
++ if (!has_image)
++ {
++ GDK_NOTE (DND, g_print ("... SetClipboardData(PNG,NULL)\n"));
++ SetClipboardData (cf_png, NULL);
+
+- if (targets[i] == _utf8_string ||
++ GDK_NOTE (DND, g_print ("... SetClipboardData(CF_DIB,NULL)\n"));
++ SetClipboardData (CF_DIB, NULL);
++
++ has_image = TRUE;
++ }
++ break;
++ }
++
++ /* If it is one of the pixmap formats, already handled or not
++ * needed.
++ */
++ if (j < n_known_pixbuf_formats)
++ continue;
++
++ /* We don't bother registering and advertising clipboard formats
++ * that are X11 specific or no non-GTK+ apps will have ever
++ * heard of, and when there are equivalent clipboard formats
++ * that are commonly used.
++ */
++ if (targets[i] == _save_targets ||
++ targets[i] == _utf8_string ||
+ targets[i] == GDK_TARGET_STRING ||
++ targets[i] == _compound_text ||
+ targets[i] == _text ||
+- targets[i] == _compound_text ||
+- targets[i] == _save_targets)
++ targets[i] == text_plain_charset_utf_8 ||
++ targets[i] == text_plain_charset_CP1252 ||
++ targets[i] == text_plain)
+ continue;
+
+ target_name = gdk_atom_name (targets[i]);
+- if (!(formatid = RegisterClipboardFormat (target_name)))
+- {
+- WIN32_API_FAILED ("RegisterClipboardFormat");
+- API_CALL (CloseClipboard, ());
+- g_free (target_name);
+- return;
+- }
+- g_hash_table_replace (_format_atom_table, GINT_TO_POINTER (formatid), targets[i]);
+
+- GDK_NOTE (DND, g_print ("... SetClipboardData(%s,NULL)\n",
+- _gdk_win32_cf_to_string (formatid)));
+- SetClipboardData (formatid, NULL);
+-
+- /* We should replace the previous image format associated with
+- * CF_DIB with "image/bmp" if we find "image/bmp", "image/x-bmp"
+- * or "image/x-MS-bmp" is available.
+- */
+- if (!has_real_dib &&
+- (!strcmp (target_name, "image/bmp") ||
+- !strcmp (target_name, "image/x-bmp") ||
+- !strcmp (target_name, "image/x-MS-bmp")))
++ if (g_str_has_prefix (target_name, "text/plain;charset="))
+ {
+- g_hash_table_replace (_format_atom_table,
+- GINT_TO_POINTER (CF_DIB),
+- targets[i]);
+- if (!has_set_dib)
+- {
+- GDK_NOTE (DND, g_print ("... SetClipboardData(CF_DIB,NULL)\n"));
+- SetClipboardData (CF_DIB, NULL);
+- has_set_dib = TRUE;
+- }
+- has_real_dib = TRUE;
+ g_free (target_name);
+ continue;
+ }
+
+- for (format = convertable_formats; !has_set_dib && format; format = format->next)
+- {
+- gchar **mime_types =
+- gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) format->data);
+- gchar **mime_type;
++ cf = RegisterClipboardFormat (target_name);
+
+- for (mime_type = mime_types; *mime_type; ++mime_type)
+- {
+- if (!strcmp (target_name, *mime_type))
+- {
+- g_hash_table_replace (_format_atom_table,
+- GINT_TO_POINTER (CF_DIB),
+- targets[i]);
+- GDK_NOTE (DND, g_print ("... SetClipboardData(CF_DIB,NULL)\n"));
+- SetClipboardData (CF_DIB, NULL);
+- has_set_dib = TRUE;
+- break;
+- }
+- }
+- g_strfreev(mime_types);
+- }
++ g_hash_table_replace (_format_atom_table,
++ GINT_TO_POINTER (cf),
++ targets[i]);
++
++ GDK_NOTE (DND, g_print ("... SetClipboardData(%s,NULL)\n",
++ _gdk_win32_cf_to_string (cf)));
++ SetClipboardData (cf, NULL);
++
+ g_free (target_name);
+ }
+- g_slist_free (convertable_formats);
+-
+ API_CALL (CloseClipboard, ());
+ }
+
+@@ -1153,84 +1286,33 @@
+ _gdk_win32_selection_convert_to_dib (HGLOBAL hdata,
+ GdkAtom target)
+ {
+- GdkPixbufLoader *loader;
+- GdkPixbuf *pixbuf;
+- gchar *target_name;
+- guchar *ptr;
+- gchar *bmp_buf;
+- gsize size;
+- gboolean ok;
++ GDK_NOTE (DND, {
++ gchar *target_name = gdk_atom_name (target);
+
+- if (!(target_name = gdk_atom_name (target)))
+- {
+- GlobalFree (hdata);
+- return NULL;
+- }
++ g_print ("_gdk_win32_selection_convert_to_dib: %p %s\n",
++ hdata, target_name);
++ g_free (target_name);
++ });
+
+- if (!strcmp (target_name, "image/bmp") ||
+- !strcmp (target_name, "image/x-bmp") ||
+- !strcmp (target_name, "image/x-MS-bmp"))
++ if (target == image_bmp)
+ {
+ /* No conversion is needed, just strip the BITMAPFILEHEADER */
+ HGLOBAL hdatanew;
++ SIZE_T size = GlobalSize (hdata) - sizeof (BITMAPFILEHEADER);
++ guchar *ptr = GlobalLock (hdata);
+
+- g_free (target_name);
+- size = GlobalSize (hdata) - 1 - sizeof (BITMAPFILEHEADER);
+- ptr = GlobalLock (hdata);
+ memmove (ptr, ptr + sizeof (BITMAPFILEHEADER), size);
+ GlobalUnlock (hdata);
+- if (!(hdatanew = GlobalReAlloc (hdata, size, 0)))
++
++ if ((hdatanew = GlobalReAlloc (hdata, size, GMEM_MOVEABLE)) == NULL)
+ {
+ WIN32_API_FAILED ("GlobalReAlloc");
+- GlobalFree (hdata); /* the old hdata is not freed if error */
++ GlobalFree (hdata); /* The old hdata is not freed if error */
+ }
+ return hdatanew;
+ }
+
+- /* We actually provide image formats -other than- "image/bmp" etc
+- * and the requestor is either a native Win32 application or a GTK+
+- * client that requested "image/bmp".
+- */
+- if (!(loader = gdk_pixbuf_loader_new_with_mime_type (target_name, NULL)))
+- {
+- GlobalFree (hdata);
+- g_free (target_name);
+- return NULL;
+- }
+- g_free (target_name);
++ g_warning ("Should not happen: We provide some image format but not CF_DIB and CF_DIB is requested.");
+
+- ptr = GlobalLock (hdata);
+- ok = gdk_pixbuf_loader_write (loader, ptr, GlobalSize (hdata) - 1, NULL) &&
+- gdk_pixbuf_loader_close (loader, NULL);
+-
+- GlobalUnlock (hdata);
+- GlobalFree (hdata);
+- hdata = NULL;
+-
+- if (ok && (pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)) != NULL)
+- g_object_ref (pixbuf);
+-
+- g_object_unref (loader);
+-
+- if (ok && gdk_pixbuf_save_to_buffer (pixbuf, &bmp_buf, &size, "bmp", NULL, NULL))
+- {
+- size -= sizeof (BITMAPFILEHEADER);
+- if (!(hdata = GlobalAlloc (GMEM_MOVEABLE, size)))
+- {
+- WIN32_API_FAILED ("GlobalAlloc");
+- ok = FALSE;
+- }
+-
+- if (ok)
+- {
+- ptr = GlobalLock (hdata);
+- memcpy (ptr, bmp_buf + sizeof (BITMAPFILEHEADER), size);
+- GlobalUnlock (hdata);
+- }
+-
+- g_free (bmp_buf);
+- g_object_unref (pixbuf);
+- }
+-
+- return hdata;
++ return NULL;
+ }
+Index: gdk/Makefile.am
+===================================================================
+--- gdk/Makefile.am (revision 22076)
++++ gdk/Makefile.am (revision 22450)
+@@ -13,6 +13,7 @@
+ gdk.def \
+ gdkmarshalers.list \
+ gdkmedialib.h \
++ gdkwindowimpl.h \
+ makeenums.pl \
+ makefile.msc \
+ gdk.symbols \
+@@ -97,8 +98,6 @@
+ gdkenumtypes.h
+
+ gdk_built_private_headers = \
+- gdkprivate.h \
+- gdkwindowimpl.h \
+ gdkalias.h
+
+ gdk_c_sources = \
+Index: gdk/x11/gdkdisplay-x11.c
+===================================================================
+--- gdk/x11/gdkdisplay-x11.c (revision 22076)
++++ gdk/x11/gdkdisplay-x11.c (revision 22450)
+@@ -195,6 +195,8 @@
+
+ if ((major == 1 && minor >= 2) || major > 1)
+ display_x11->have_randr12 = TRUE;
++
++ gdk_x11_register_standard_event_type (display, display_x11->xrandr_event_base, RRNumberEvents);
+ }
+ #endif
+
diff --git a/patches/gtk+-2.14.7/generic/series b/patches/gtk+-2.14.7/generic/series
new file mode 100644
index 000000000..b04cf6f73
--- /dev/null
+++ b/patches/gtk+-2.14.7/generic/series
@@ -0,0 +1,2 @@
+gtk+-2.14.7-update-to-r22400.diff -p0
+gtk+-2.14.7-autogen.diff -p1
diff --git a/rules/atk.make b/rules/atk.make
index 1a6c4db2c..b4eccb112 100644
--- a/rules/atk.make
+++ b/rules/atk.make
@@ -19,10 +19,10 @@ PACKAGES-$(PTXCONF_ATK) += atk
#
# Paths and names
#
-ATK_VERSION := 1.20.0
+ATK_VERSION := 1.24.0
ATK := atk-$(ATK_VERSION)
ATK_SUFFIX := tar.bz2
-ATK_URL := http://ftp.gnome.org/pub/gnome/sources/atk/1.20/$(ATK).$(ATK_SUFFIX)
+ATK_URL := http://ftp.gnome.org/pub/gnome/sources/atk/1.24/$(ATK).$(ATK_SUFFIX)
ATK_SOURCE := $(SRCDIR)/$(ATK).$(ATK_SUFFIX)
ATK_DIR := $(BUILDDIR)/$(ATK)
@@ -119,10 +119,10 @@ $(STATEDIR)/atk.targetinstall:
@$(call install_fixup,atk,DESCRIPTION,missing)
@$(call install_copy, atk, 0, 0, 0644, \
- $(ATK_DIR)/atk/.libs/libatk-1.0.so.0.2009.1, \
- /usr/lib/libatk-1.0.so.0.2009.1)
- @$(call install_link, atk, libatk-1.0.so.0.2009.1, /usr/lib/libatk-1.0.so.0)
- @$(call install_link, atk, libatk-1.0.so.0.2009.1, /usr/lib/libatk-1.0.so)
+ $(ATK_DIR)/atk/.libs/libatk-1.0.so.0.2409.1, \
+ /usr/lib/libatk-1.0.so.0.2409.1)
+ @$(call install_link, atk, libatk-1.0.so.0.2409.1, /usr/lib/libatk-1.0.so.0)
+ @$(call install_link, atk, libatk-1.0.so.0.2409.1, /usr/lib/libatk-1.0.so)
@$(call install_finish,atk)
diff --git a/rules/glib.in b/rules/glib.in
index e9feccd63..133fb2a16 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -21,11 +21,11 @@ choice
config GLIB__VERSION_2_19
bool
- prompt "2.19"
+ prompt "2.19 (devel)"
- config GLIB__VERSION_2_14
+ config GLIB__VERSION_2_18
bool
- prompt "2.14"
+ prompt "2.18 (stable)"
endchoice
diff --git a/rules/glib.make b/rules/glib.make
index 4b69cf10f..ef37242ea 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -18,11 +18,11 @@ PACKAGES-$(PTXCONF_GLIB) += glib
#
# Paths and names
#
-ifdef PTXCONF_GLIB__VERSION_2_14
-GLIB_VERSION := 2.14.5
+ifdef PTXCONF_GLIB__VERSION_2_18
+GLIB_VERSION := 2.18.4
endif
ifdef PTXCONF_GLIB__VERSION_2_19
-GLIB_VERSION := 2.19.5
+GLIB_VERSION := 2.19.10
endif
GLIB := glib-$(GLIB_VERSION)
@@ -31,7 +31,7 @@ GLIB_SOURCE := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
GLIB_DIR := $(BUILDDIR)/$(GLIB)
GLIB_URL := \
- http://ftp.gtk.org/pub/glib/2.14/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) \
+ http://ftp.gtk.org/pub/glib/2.18/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) \
http://ftp.gtk.org/pub/glib/2.19/glib-$(GLIB_VERSION).$(GLIB_SUFFIX)
# ----------------------------------------------------------------------------
@@ -51,14 +51,29 @@ GLIB_PATH := PATH=$(CROSS_PATH)
GLIB_ENV := \
$(CROSS_ENV) \
glib_cv_uscore=no \
- glib_cv_stack_grows=no
+ glib_cv_stack_grows=no \
+ ac_cv_func_posix_getgrgid_r=yes
#
# autoconf
#
GLIB_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
- --enable-static
+ --enable-threads \
+ --with-threads=posix \
+ --enable-static \
+ --enable-shared \
+ --disable-selinux \
+ --disable-gtk-doc \
+ --disable-man \
+ --disable-gc-friendly \
+ --disable-fast-install \
+ --disable-libtool-lock \
+ --disable-included-printf \
+ --disable-fam \
+ --disable-xattr \
+ --with-gnu-ld \
+ --with-pcre=internal
ifdef PTXCONF_GLIB__LIBICONV_GNU
GLIB_AUTOCONF += --with-libiconv=gnu
@@ -67,12 +82,28 @@ ifdef PTXCONF_GLIB__LIBICONV_NATIVE
GLIB_AUTOCONF += --with-libiconv=native
endif
+# --enable-debug=[no/minimum/yes]
+# turn on debugging [default=minimum]
+# --disable-mem-pools disable all glib memory pools
+# --disable-rebuilds disable all source autogeneration rules
+# --disable-visibility don't use ELF visibility attributes
+# --disable-largefile omit support for large files
+# --enable-iconv-cache=[yes/no/auto]
+# cache iconv descriptors [default=auto]
+# --disable-regex disable the compilation of GRegex
+#
+# --with-pic try to use only PIC/non-PIC objects [default=use
+# both]
+# --with-gio-module-dir=PATH
+# Load gio modules from this directory
+# [LIBDIR/gio/modules]
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
-ifdef PTXCONF_GLIB__VERSION_2_14
-GLIB_LIB_VERSION := 0.1400.5
+ifdef PTXCONF_GLIB__VERSION_2_18
+GLIB_LIB_VERSION := 0.1800.4
endif
ifdef PTXCONF_GLIB__VERSION_2_19
GLIB_LIB_VERSION := 0.1905.0
diff --git a/rules/glibmm.make b/rules/glibmm.make
index c3bcd7de6..c01680306 100644
--- a/rules/glibmm.make
+++ b/rules/glibmm.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_GLIBMM) += glibmm
#
# Paths and names
#
-GLIBMM_VERSION := 2.14.1
+GLIBMM_VERSION := 2.18.1
GLIBMM := glibmm-$(GLIBMM_VERSION)
GLIBMM_SUFFIX := tar.bz2
-GLIBMM_URL := http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.14/$(GLIBMM).$(GLIBMM_SUFFIX)
+GLIBMM_URL := http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/$(GLIBMM).$(GLIBMM_SUFFIX)
GLIBMM_SOURCE := $(SRCDIR)/$(GLIBMM).$(GLIBMM_SUFFIX)
GLIBMM_DIR := $(BUILDDIR)/$(GLIBMM)
@@ -61,14 +61,14 @@ $(STATEDIR)/glibmm.targetinstall:
@$(call install_fixup, glibmm,DESCRIPTION,missing)
@$(call install_copy, glibmm, 0, 0, 0644, \
- $(GLIBMM_DIR)/glib/glibmm/.libs/libglibmm-2.4.so.1.0.24, \
- /usr/lib/libglibmm-2.4.so.1.0.24)
+ $(GLIBMM_DIR)/glib/glibmm/.libs/libglibmm-2.4.so.1.2.0, \
+ /usr/lib/libglibmm-2.4.so.1.2.0)
@$(call install_link, glibmm, \
- libglibmm-2.4.so.1.0.24, /usr/lib/libglibmm-2.4.so.1)
+ libglibmm-2.4.so.1.2.0, /usr/lib/libglibmm-2.4.so.1)
@$(call install_link, glibmm, \
- libglibmm-2.4.so.1.0.24, /usr/lib/libglibmm-2.4.so)
+ libglibmm-2.4.so.1.2.0, /usr/lib/libglibmm-2.4.so)
@$(call install_finish, glibmm)
diff --git a/rules/gtk.in b/rules/gtk.in
index df7f00ff9..111522f86 100644
--- a/rules/gtk.in
+++ b/rules/gtk.in
@@ -1,6 +1,8 @@
## SECTION=multimedia_gtk
-menuconfig GTK
+menu "gtk+ "
+
+config GTK
tristate
prompt "gtk+ "
select GLIB
@@ -57,6 +59,10 @@ config GTK_LOADER_JPEG
bool
prompt "jpeg"
+config GTK_LOADER_JPEG2000
+ bool
+ prompt "jpeg 2000"
+
config GTK_LOADER_PNM
bool
prompt "pnm"
@@ -124,3 +130,4 @@ config GTK_DEMO
endif
+endmenu
diff --git a/rules/gtk.make b/rules/gtk.make
index eb4cafef6..b89529a51 100644
--- a/rules/gtk.make
+++ b/rules/gtk.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_GTK) += gtk
#
# Paths and names
#
-GTK_VERSION := 2.12.12
+GTK_VERSION := 2.14.7
GTK := gtk+-$(GTK_VERSION)
GTK_SUFFIX := tar.bz2
-GTK_URL := http://ftp.gtk.org/pub/gtk/2.12/$(GTK).$(GTK_SUFFIX)
+GTK_URL := http://ftp.gtk.org/pub/gtk/2.14/$(GTK).$(GTK_SUFFIX)
GTK_SOURCE := $(SRCDIR)/$(GTK).$(GTK_SUFFIX)
GTK_DIR := $(BUILDDIR)/$(GTK)
@@ -66,7 +66,8 @@ GTK_AUTOCONF := \
--enable-explicit-deps=yes \
--disable-glibtest \
--disable-modules \
- --with-included-loaders=$(subst $(space),$(comma),$(GTK_LOADER-y))
+ --with-included-loaders=$(subst $(space),$(comma),$(GTK_LOADER-y)) \
+ gio_can_sniff=yes
ifndef PTXCONF_GTK_LOADER_PNG
GTK_AUTOCONF += --without-libpng
@@ -80,6 +81,10 @@ ifndef PTXCONF_GTK_LOADER_JPEG
GTK_AUTOCONF += --without-libjpeg
endif
+ifndef PTXCONF_GTK_LOADER_JPEG2000
+GTK_AUTOCONF += --without-libjasper
+endif
+
ifdef PTXCONF_GTK_TARGET_X11
GTK_AUTOCONF += --with-gdktarget=x11
endif
@@ -92,6 +97,18 @@ ifdef PTXCONF_GTK_TARGET_WIN32
GTK_AUTOCONF += --with-gdktarget=win32
endif
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+gtk_compile: $(STATEDIR)/gtk.compile
+
+$(STATEDIR)/gtk.compile: $(gtk_compile_deps_default)
+ @$(call targetinfo, $@)
+ cd $(GTK_DIR) && $(GTK_ENV) $(GTK_PATH) make $(PARALLELMFLAGS)
+ @$(call touch, $@)
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -110,37 +127,37 @@ $(STATEDIR)/gtk.targetinstall:
ifdef PTXCONF_GTK_TARGET_DIRECTFB
@$(call install_copy, gtk, 0, 0, 0644, \
- $(GTK_DIR)/gdk/.libs/libgdk-directfb-2.0.so.0.1200.12, \
- /usr/lib/libgdk-directfb-2.0.so.0.1200.12)
- @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1200.12, /usr/lib/libgdk-directfb-2.0.so.0)
- @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1200.12, /usr/lib/libgdk-directfb-2.0.so)
+ $(GTK_DIR)/gdk/.libs/libgdk-directfb-2.0.so.0.1400.8, \
+ /usr/lib/libgdk-directfb-2.0.so.0.1400.8)
+ @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1400.8, /usr/lib/libgdk-directfb-2.0.so.0)
+ @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1400.8, /usr/lib/libgdk-directfb-2.0.so)
@$(call install_copy, gtk, 0, 0, 0644, \
- $(GTK_DIR)/gtk/.libs/libgtk-directfb-2.0.so.0.1200.12, \
- /usr/lib/libgtk-directfb-2.0.so.0.1200.12)
- @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1200.12, /usr/lib/libgtk-directfb-2.0.so.0)
- @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1200.12, /usr/lib/libgtk-directfb-2.0.so)
+ $(GTK_DIR)/gtk/.libs/libgtk-directfb-2.0.so.0.1400.8, \
+ /usr/lib/libgtk-directfb-2.0.so.0.1400.8)
+ @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1400.8, /usr/lib/libgtk-directfb-2.0.so.0)
+ @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1400.8, /usr/lib/libgtk-directfb-2.0.so)
endif
ifdef PTXCONF_GTK_TARGET_X11
@$(call install_copy, gtk, 0, 0, 0644, \
- $(GTK_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.1200.12, \
- /usr/lib/libgdk-x11-2.0.so.0.1200.12)
- @$(call install_link, gtk, libgdk-x11-2.0.so.0.1200.12, /usr/lib/libgdk-x11-2.0.so.0)
- @$(call install_link, gtk, libgdk-x11-2.0.so.0.1200.12, /usr/lib/libgdk-x11-2.0.so)
+ $(GTK_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.1400.8, \
+ /usr/lib/libgdk-x11-2.0.so.0.1400.8)
+ @$(call install_link, gtk, libgdk-x11-2.0.so.0.1400.8, /usr/lib/libgdk-x11-2.0.so.0)
+ @$(call install_link, gtk, libgdk-x11-2.0.so.0.1400.8, /usr/lib/libgdk-x11-2.0.so)
@$(call install_copy, gtk, 0, 0, 0644, \
- $(GTK_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.1200.12, \
- /usr/lib/libgtk-x11-2.0.so.0.1200.12)
- @$(call install_link, gtk, libgtk-x11-2.0.so.0.1200.12, /usr/lib/libgtk-x11-2.0.so.0)
- @$(call install_link, gtk, libgtk-x11-2.0.so.0.1200.12, /usr/lib/libgtk-x11-2.0.so)
+ $(GTK_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.1400.8, \
+ /usr/lib/libgtk-x11-2.0.so.0.1400.8)
+ @$(call install_link, gtk, libgtk-x11-2.0.so.0.1400.8, /usr/lib/libgtk-x11-2.0.so.0)
+ @$(call install_link, gtk, libgtk-x11-2.0.so.0.1400.8, /usr/lib/libgtk-x11-2.0.so)
endif
@$(call install_copy, gtk, 0, 0, 0644, \
- $(GTK_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.1200.12, \
- /usr/lib/libgdk_pixbuf-2.0.so.0.1200.12)
- @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1200.12, /usr/lib/libgdk_pixbuf-2.0.so.0)
- @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1200.12, /usr/lib/libgdk_pixbuf-2.0.so)
+ $(GTK_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.1400.8, \
+ /usr/lib/libgdk_pixbuf-2.0.so.0.1400.8)
+ @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1400.8, /usr/lib/libgdk_pixbuf-2.0.so.0)
+ @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1400.8, /usr/lib/libgdk_pixbuf-2.0.so)
ifdef PTXCONF_GTK_DEMO
@$(call install_copy, gtk, 0, 0, 0755, \
diff --git a/rules/gtkmm.in b/rules/gtkmm.in
index df419db52..73f61a7d5 100644
--- a/rules/gtkmm.in
+++ b/rules/gtkmm.in
@@ -3,6 +3,7 @@
config GTKMM
tristate
select GLIBMM
+ select PANGOMM
select ATK
select CAIROMM
select PANGO
diff --git a/rules/gtkmm.make b/rules/gtkmm.make
index b6ac05fe3..00aad5d04 100644
--- a/rules/gtkmm.make
+++ b/rules/gtkmm.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_GTKMM) += gtkmm
#
# Paths and names
#
-GTKMM_VERSION := 2.12.1
+GTKMM_VERSION := 2.14.3
GTKMM := gtkmm-$(GTKMM_VERSION)
GTKMM_SUFFIX := tar.bz2
-GTKMM_URL := http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.12/$(GTKMM).$(GTKMM_SUFFIX)
+GTKMM_URL := http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/$(GTKMM).$(GTKMM_SUFFIX)
GTKMM_SOURCE := $(SRCDIR)/$(GTKMM).$(GTKMM_SUFFIX)
GTKMM_DIR := $(BUILDDIR)/$(GTKMM)
@@ -90,10 +90,6 @@ $(STATEDIR)/gtkmm.targetinstall:
@$(call install_link, gtkmm, \
libatkmm-1.6.so.1.0.30, /usr/lib/libatkmm-1.6.so)
- @$(call install_copy, gtkmm, 0, 0, 0644, \
- $(GTKMM_DIR)/pango/pangomm/.libs/libpangomm-1.4.so.1.0.30, \
- /usr/lib/libpangomm-1.4.so.1.0.30)
-
@$(call install_link, gtkmm, \
libpangomm-1.4.so.1.0.30, /usr/lib/libpangomm-1.4.so.1)
diff --git a/rules/pango.make b/rules/pango.make
index 54934373c..bffec21f6 100644
--- a/rules/pango.make
+++ b/rules/pango.make
@@ -19,10 +19,10 @@ PACKAGES-$(PTXCONF_PANGO) += pango
#
# Paths and names
#
-PANGO_VERSION := 1.17.5
+PANGO_VERSION := 1.22.4
PANGO := pango-$(PANGO_VERSION)
PANGO_SUFFIX := tar.bz2
-PANGO_URL := http://ftp.gnome.org/pub/GNOME/sources/pango/1.17/$(PANGO).$(PANGO_SUFFIX)
+PANGO_URL := http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/$(PANGO).$(PANGO_SUFFIX)
PANGO_SOURCE := $(SRCDIR)/$(PANGO).$(PANGO_SUFFIX)
PANGO_DIR := $(BUILDDIR)/$(PANGO)
@@ -163,22 +163,22 @@ $(STATEDIR)/pango.targetinstall:
@$(call install_fixup,pango,DESCRIPTION,missing)
@$(call install_copy, pango, 0, 0, 0644, \
- $(PANGO_DIR)/pango/.libs/libpango-1.0.so.0.1705.0, \
- /usr/lib/libpango-1.0.so.0.1705.0)
- @$(call install_link, pango, libpango-1.0.so.0.1705.0, /usr/lib/libpango-1.0.so.0)
- @$(call install_link, pango, libpango-1.0.so.0.1705.0, /usr/lib/libpango-1.0.so)
+ $(PANGO_DIR)/pango/.libs/libpango-1.0.so.0.2203.1, \
+ /usr/lib/libpango-1.0.so.0.2203.1)
+ @$(call install_link, pango, libpango-1.0.so.0.2203.1, /usr/lib/libpango-1.0.so.0)
+ @$(call install_link, pango, libpango-1.0.so.0.2203.1, /usr/lib/libpango-1.0.so)
@$(call install_copy, pango, 0, 0, 0644, \
- $(PANGO_DIR)/pango/.libs/libpangoft2-1.0.so.0.1705.0, \
- /usr/lib/libpangoft2-1.0.so.0.1705.0)
- @$(call install_link, pango, libpangoft2-1.0.so.0.1705.0, /usr/lib/libpangoft2-1.0.so.0)
- @$(call install_link, pango, libpangoft2-1.0.so.0.1705.0, /usr/lib/libpangoft2-1.0.so)
+ $(PANGO_DIR)/pango/.libs/libpangoft2-1.0.so.0.2203.1, \
+ /usr/lib/libpangoft2-1.0.so.0.2203.1)
+ @$(call install_link, pango, libpangoft2-1.0.so.0.2203.1, /usr/lib/libpangoft2-1.0.so.0)
+ @$(call install_link, pango, libpangoft2-1.0.so.0.2203.1, /usr/lib/libpangoft2-1.0.so)
@$(call install_copy, pango, 0, 0, 0644, \
- $(PANGO_DIR)/pango/.libs/libpangocairo-1.0.so.0.1705.0, \
- /usr/lib/libpangocairo-1.0.so.0.1705.0)
- @$(call install_link, pango, libpangocairo-1.0.so.0.1705.0, /usr/lib/libpangocairo-1.0.so.0)
- @$(call install_link, pango, libpangocairo-1.0.so.0.1705.0, /usr/lib/libpangocairo-1.0.so)
+ $(PANGO_DIR)/pango/.libs/libpangocairo-1.0.so.0.2203.1, \
+ /usr/lib/libpangocairo-1.0.so.0.2203.1)
+ @$(call install_link, pango, libpangocairo-1.0.so.0.2203.1, /usr/lib/libpangocairo-1.0.so.0)
+ @$(call install_link, pango, libpangocairo-1.0.so.0.2203.1, /usr/lib/libpangocairo-1.0.so)
@$(call install_finish,pango)
diff --git a/rules/pangomm.in b/rules/pangomm.in
new file mode 100644
index 000000000..e57817769
--- /dev/null
+++ b/rules/pangomm.in
@@ -0,0 +1,7 @@
+## SECTION=multimedia_gtk
+
+config PANGOMM
+ tristate
+ prompt "pangomm"
+ help
+ c++ bindings for pango
diff --git a/rules/pangomm.make b/rules/pangomm.make
new file mode 100644
index 000000000..eda7d8569
--- /dev/null
+++ b/rules/pangomm.make
@@ -0,0 +1,117 @@
+# -*-makefile-*-
+# $Id: template-make 9053 2008-11-03 10:58:48Z wsa $
+#
+# Copyright (C) 2009 by Robert Schwebel <r.schwebel@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PANGOMM) += pangomm
+
+#
+# Paths and names
+#
+PANGOMM_VERSION := 2.14.1
+PANGOMM := pangomm-$(PANGOMM_VERSION)
+PANGOMM_SUFFIX := tar.bz2
+PANGOMM_URL := http://ftp.acc.umu.se/pub/GNOME/sources/pangomm/2.14/$(PANGOMM).$(PANGOMM_SUFFIX)
+PANGOMM_SOURCE := $(SRCDIR)/$(PANGOMM).$(PANGOMM_SUFFIX)
+PANGOMM_DIR := $(BUILDDIR)/$(PANGOMM)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(PANGOMM_SOURCE):
+ @$(call targetinfo)
+ @$(call get, PANGOMM)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pangomm.extract:
+ @$(call targetinfo)
+ @$(call clean, $(PANGOMM_DIR))
+ @$(call extract, PANGOMM)
+ @$(call patchin, PANGOMM)
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PANGOMM_PATH := PATH=$(CROSS_PATH)
+PANGOMM_ENV := $(CROSS_ENV)
+
+#
+# autoconf
+#
+PANGOMM_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/pangomm.prepare:
+ @$(call targetinfo)
+ @$(call clean, $(PANGOMM_DIR)/config.cache)
+ cd $(PANGOMM_DIR) && \
+ $(PANGOMM_PATH) $(PANGOMM_ENV) \
+ ./configure $(PANGOMM_AUTOCONF)
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pangomm.compile:
+ @$(call targetinfo)
+ cd $(PANGOMM_DIR) && $(PANGOMM_PATH) $(MAKE) $(PARALLELMFLAGS)
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pangomm.install:
+ @$(call targetinfo)
+ @$(call install, PANGOMM)
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/pangomm.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, pangomm)
+ @$(call install_fixup, pangomm,PACKAGE,pangomm)
+ @$(call install_fixup, pangomm,PRIORITY,optional)
+ @$(call install_fixup, pangomm,VERSION,$(PANGOMM_VERSION))
+ @$(call install_fixup, pangomm,SECTION,base)
+ @$(call install_fixup, pangomm,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
+ @$(call install_fixup, pangomm,DEPENDS,)
+ @$(call install_fixup, pangomm,DESCRIPTION,missing)
+
+ @$(call install_copy, pangomm, 0, 0, 0644, -, /usr/lib/libpangomm-1.4.so.1.0.30)
+ @$(call install_link, pangomm, libpangomm-1.4.so.1.0.30, /usr/lib/libpangomm-1.4.so.1)
+ @$(call install_link, pangomm, libpangomm-1.4.so.1.0.30, /usr/lib/libpangomm-1.4.so)
+
+ @$(call install_finish, pangomm)
+
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+pangomm_clean:
+ rm -rf $(STATEDIR)/pangomm.*
+ rm -rf $(PKGDIR)/pangomm_*
+ rm -rf $(PANGOMM_DIR)
+
+# vim: syntax=make
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-09 14:54:15 +0000