diff --git a/NEWS b/NEWS index 9fe44fb3ae..c9bec87b7e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,45 @@ +Overview of Changes from GTK+ 2.91.5 to 2.91.6 +============================================== + +* Deprecations, cleanups and API changes: + - GdkDrawable and some X11-specific APIs have been removed + - GtkStyle and GtkRcStyle have been deprecated + - The GdkWindowClass enumeration is now GdkWindowWindowClass + - gdk_window_get_geometry lost its depth argument + - The old, unused gtk_decorated_window_... functions have + been removed. + +* GtkComboBox has gained an 'active id' property that is + intended for easy binding to settings + +* GtkAppChooser: A new family of widgets that allow choosing + an application to open a file. This is strongly based on + the corresponding nautilus dialog, which it is replacing. + +* The GtkStyleContext branch has been merged, changing the APIs + that are used to do themed drawing, and the theme engine interfaces. + Among the new classes are GtkStyleContext (replacing GtkStyle) and + GtkCssProvider (replacing the gtkrc parser). The migration guide + contains a chapter about porting from GtkStyle to GtkStyleContext. + +* Bugs fixed: + 549720 Add a way to hide GtkScale's slider + 582557 need open with dialog box to use with IBM's Lotus Notes... + 619148 "active ID" properties (GtkComboBox) + 636060 use ATK_DEFINE_TYPE where possible + 636129 invalid uninstantiatable type `(null)' in cast to `GtkSpinner' + 636388 gtk3-demo craches (segfault) when pressing a key in the textarea... + 636511 New style override functions do not work on textview + +* Updated translations: + Estonian + Galician + Hebrew + Persian + Slovenian + Spanish + + Overview of Changes from GTK+ 2.91.4 to 2.91.5 ============================================== diff --git a/configure.ac b/configure.ac index 477aa7cda8..40402924f7 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ m4_define([gtk_major_version], [2]) m4_define([gtk_minor_version], [91]) -m4_define([gtk_micro_version], [6]) +m4_define([gtk_micro_version], [7]) m4_define([gtk_interface_age], [0]) m4_define([gtk_binary_age], [m4_eval(100 * gtk_minor_version + gtk_micro_version)]) @@ -19,7 +19,7 @@ m4_define([gtk_version], # This is the X.Y used in -lgtk-FOO-X.Y m4_define([gtk_api_version], [3.0]) -AC_PREREQ([2.64]) +AC_PREREQ([2.62]) AC_INIT([gtk+], [gtk_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B], [gtk+]) diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 42d23fc1c1..94231fed3e 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -328,7 +328,7 @@ HTML_IMAGES = \ $(srcdir)/images/layout-tbrl.png \ $(srcdir)/images/window-default.png \ $(srcdir)/images/hello-world.png \ - $(srcdir)/images/switch.png + $(srcdir)/images/switch.png \ $(srcdir)/images/linear.png \ $(srcdir)/images/ease.png \ $(srcdir)/images/ease-in-out.png \ diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index a7b316964d..c433f7b51c 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -5406,6 +5406,12 @@ gtk_widget_path_iter_set_widget_type gtk_widget_path_length gtk_widget_path_new gtk_widget_path_prepend_type + + +GTK_TYPE_WIDGET_PATH + + +gtk_widget_path_get_type
diff --git a/docs/reference/gtk/migrating-2to3.xml b/docs/reference/gtk/migrating-2to3.xml index fc39ff1e24..ad0919b9a8 100644 --- a/docs/reference/gtk/migrating-2to3.xml +++ b/docs/reference/gtk/migrating-2to3.xml @@ -1,6 +1,7 @@ ]> Migrating from GTK+ 2.x to GTK+ 3 @@ -954,6 +955,8 @@ gtk_arrow_draw (GtkWidget *widget,
+ + diff --git a/docs/reference/gtk/migrating-GtkStyleContext.xml b/docs/reference/gtk/migrating-GtkStyleContext.xml index 775fee0545..ef87ab5afc 100644 --- a/docs/reference/gtk/migrating-GtkStyleContext.xml +++ b/docs/reference/gtk/migrating-GtkStyleContext.xml @@ -1,9 +1,9 @@ - - - Migrating from GtkStyle to GtkStyleContext +
+ Theming changes In GTK+ 3.0, #GtkStyleContext was added to replace #GtkStyle and @@ -14,7 +14,7 @@ porting applications, libraries and widgets. - +
Migrating themes @@ -27,9 +27,9 @@ with possible variants such as the dark theme being named gtk-dark.css in the same directory. - +
- +
Migrating theme engines @@ -141,9 +141,9 @@ attempt to handle. - +
- +
Extending the CSS parser @@ -175,9 +175,9 @@ style property can be modified in CSS as -GtkWidget-focus-line-width. - +
- +
Using the CSS file format @@ -358,6 +358,15 @@ independently. + + In the same vein, the light, dark and mid color variants that + were available in GtkStyle should be replaced by a combination of + symbolic colors and custom CSS, where necessary. text_aa should + really not be used anywhere, anyway, and the white and black colors + that were available in GtkStyle can just be replaced by literal + GdkRGBA structs. + + Access to colors has also changed a bit. With #GtkStyle, the common way to access colors is: @@ -393,9 +402,9 @@ It is worth mentioning that the new file format does not support custom keybindings nor stock icon mappings as the RC format did. - +
- +
A checklist for widgets @@ -486,15 +495,34 @@ - Replace all gtk_paint_*() calls with corresponding - gtk_render_*() calls. The most distinctive changes - are the use of #GtkStateFlags to represent the widget state and the - lack of #GtkShadowType. For gtk_render_check() and gtk_render_option(), - the @shadow_type parameter is replaced by the #GTK_STATE_FLAG_ACTIVE - and #GTK_STATE_FLAG_INCONSISTENT state flags. For things such as - pressed/unpressed button states, #GTK_STATE_FLAG_ACTIVE is used, and - the CSS may style normal/active states differently to render - outset/inset borders, respectively. + + Replace all gtk_paint_*() calls with corresponding + gtk_render_*() calls. + + + The most distinctive changes are the use of #GtkStateFlags to + represent the widget state and the lack of #GtkShadowType. Note + that widget state is now passed implicitly via the context, so + to render in a certain state, you have to temporarily set the + state on the context, as in the following example: + + + Rendering with a specific state + + gtk_style_context_save (context); + gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE); + gtk_render_check (context, cr, x, y, width, height); + gtk_style_context_restore (context); + + + + For gtk_render_check() and gtk_render_option(), the @shadow_type + parameter is replaced by the #GTK_STATE_FLAG_ACTIVE and + #GTK_STATE_FLAG_INCONSISTENT state flags. For things such as + pressed/unpressed button states, #GTK_STATE_FLAG_ACTIVE is used, + and the CSS may style normal/active states differently to render + outset/inset borders, respectively. + @@ -515,9 +543,9 @@ of this is merely a guideline. Widgets may choose to follow it or not. - +
- +
Parsing of custom resources As a consequence of the RC format going away, calling gtk_rc_parse() or @@ -534,9 +562,9 @@ by implementing the #GtkStyleProvider interface yourself. This is an advanced feature that should be rarely used. - +
- +
Bonus points @@ -627,5 +655,5 @@ - - +
+
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index d5c01fdc02..5ef630d7bb 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -764,10 +764,11 @@ _gdk_display_enable_motion_hints (GdkDisplay *display, * gdk_display_get_device_state: * @display: a #GdkDisplay. * @device: device to query status to. - * @screen: location to store the #GdkScreen the @device is on, or %NULL. - * @x: location to store root window X coordinate of @device, or %NULL. - * @y: location to store root window Y coordinate of @device, or %NULL. - * @mask: location to store current modifier mask for @device, or %NULL. + * @screen: (out) (transfer none) (allow-none): location to store the #GdkScreen + * the @device is on, or %NULL. + * @x: (out) (allow-none): location to store root window X coordinate of @device, or %NULL. + * @y: (out) (allow-none): location to store root window Y coordinate of @device, or %NULL. + * @mask: (out) (allow-none): location to store current modifier mask for @device, or %NULL. * * Gets the current location and state of @device for a given display. * @@ -804,8 +805,10 @@ gdk_display_get_device_state (GdkDisplay *display, * gdk_display_get_window_at_device_position: * @display: a #GdkDisplay. * @device: #GdkDevice to query info to. - * @win_x: return location for the X coordinate of the device location, relative to the window origin, or %NULL. - * @win_y: return location for the Y coordinate of the device location, relative to the window origin, or %NULL. + * @win_x: (out) (allow-none): return location for the X coordinate of the device location, + * relative to the window origin, or %NULL. + * @win_y: (out) (allow-none): return location for the Y coordinate of the device location, + * relative to the window origin, or %NULL. * * Obtains the window underneath @device, returning the location of the device in @win_x and @win_y. Returns * %NULL if the window tree under @device is not known to GDK (for example, belongs to another application). @@ -839,8 +842,8 @@ gdk_display_get_window_at_device_position (GdkDisplay *display, /** * gdk_display_set_device_hooks: * @display: a #GdkDisplay. - * @new_hooks: a table of pointers to functions for getting quantities related to all - * devices position, or %NULL to restore the default table. + * @new_hooks: (allow-none): a table of pointers to functions for getting quantities related + * to all devices position, or %NULL to restore the default table. * * This function allows for hooking into the operation of getting the current location of any * #GdkDevice on a particular #GdkDisplay. This is only useful for such low-level tools as @@ -1054,7 +1057,7 @@ multihead_default_window_at_pointer (GdkDisplay *display, /** * gdk_display_set_pointer_hooks: * @display: a #GdkDisplay - * @new_hooks: a table of pointers to functions for getting + * @new_hooks: (allow-none): a table of pointers to functions for getting * quantities related to the current pointer position, * or %NULL to restore the default table. * @@ -1155,7 +1158,7 @@ singlehead_default_window_at_pointer (GdkScreen *screen, /** * gdk_set_pointer_hooks: - * @new_hooks: a table of pointers to functions for getting + * @new_hooks: (allow-none): a table of pointers to functions for getting * quantities related to the current pointer position, * or %NULL to restore the default table. * @@ -1745,8 +1748,8 @@ _gdk_display_pointer_info_foreach (GdkDisplay *display, * gdk_device_grab_info_libgtk_only: * @display: the display for which to get the grab information * @device: device to get the grab information from - * @grab_window: location to store current grab window - * @owner_events: location to store boolean indicating whether + * @grab_window: (out) (transfer none): location to store current grab window + * @owner_events: (out): location to store boolean indicating whether * the @owner_events flag to gdk_keyboard_grab() or * gdk_pointer_grab() was %TRUE. * diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index a0063cdc97..b5f5a57fa3 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -385,10 +385,6 @@ void _gdk_windowing_window_process_updates_recurse (GdkWindow *window, void _gdk_windowing_before_process_all_updates (void); void _gdk_windowing_after_process_all_updates (void); -/* Return the number of bits-per-pixel for images of the specified depth. */ -gint _gdk_windowing_get_bits_for_depth (GdkDisplay *display, - gint depth); - #define GDK_WINDOW_IS_MAPPED(window) (((window)->state & GDK_WINDOW_STATE_WITHDRAWN) == 0) diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c index 9ade91bee1..1731f45dad 100644 --- a/gdk/gdkoffscreenwindow.c +++ b/gdk/gdkoffscreenwindow.c @@ -549,8 +549,7 @@ gdk_offscreen_window_get_geometry (GdkWindow *window, gint *x, gint *y, gint *width, - gint *height, - gint *depth) + gint *height) { if (!GDK_WINDOW_DESTROYED (window)) { @@ -562,8 +561,6 @@ gdk_offscreen_window_get_geometry (GdkWindow *window, *width = window->width; if (height) *height = window->height; - if (depth) - *depth = window->depth; } } diff --git a/gdk/gdkrgba.c b/gdk/gdkrgba.c index c2cf2fca31..97c4071119 100644 --- a/gdk/gdkrgba.c +++ b/gdk/gdkrgba.c @@ -32,11 +32,31 @@ * SECTION:rgba_colors * @Short_description: RGBA colors * @Title: RGBA Colors + * + * The #GdkRGBA struct is a convenient way to pass rgba colors around. + * It's based on cairo's way to deal with colors and mirros its behavior. + * All values are in the range from 0.0 to 1.0 inclusive. So the color + * (0.0, 0.0, 0.0, 0.0) represents transparent black and + * (1.0, 1.0, 1.0, 1.0) is opaque white. Other values will be clamped + * to this range when drawing. */ G_DEFINE_BOXED_TYPE (GdkRGBA, gdk_rgba, gdk_rgba_copy, gdk_rgba_free) +/** + * GdkRGBA: + * @red: The intensity of the red channel from 0.0 to 1.0 inclusive. + * @green: The intensity of the green channel from 0.0 to 1.0 inclusive. + * @blue: The intensity of the blue channel from 0.0 to 1.0 inclusive. + * @alpha: The opacity of the color from 0.0 for completely translucent to + * 1.0 for opaque. + * + * The GdkRGBA structure is used to pass around color data. When using it + * as struct members or on the stack, you want to use the struct directly + * and not allocate it. + */ + /** * gdk_rgba_copy: * @rgba: a #GdkRGBA @@ -49,7 +69,7 @@ G_DEFINE_BOXED_TYPE (GdkRGBA, gdk_rgba, * Since: 3.0 **/ GdkRGBA * -gdk_rgba_copy (GdkRGBA *rgba) +gdk_rgba_copy (const GdkRGBA *rgba) { GdkRGBA *copy; diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h index 2b7670477a..d0d1286c7b 100644 --- a/gdk/gdkrgba.h +++ b/gdk/gdkrgba.h @@ -45,7 +45,7 @@ struct _GdkRGBA #define GDK_TYPE_RGBA (gdk_rgba_get_type ()) -GdkRGBA * gdk_rgba_copy (GdkRGBA *rgba); +GdkRGBA * gdk_rgba_copy (const GdkRGBA *rgba); void gdk_rgba_free (GdkRGBA *rgba); gboolean gdk_rgba_parse (GdkRGBA *rgba, diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index 57b17ff880..71cabf57f7 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -304,7 +304,7 @@ gdk_screen_get_monitor_at_window (GdkScreen *screen, g_return_val_if_fail (GDK_IS_SCREEN (screen), -1); gdk_window_get_geometry (window, &win_rect.x, &win_rect.y, &win_rect.width, - &win_rect.height, NULL); + &win_rect.height); gdk_window_get_origin (window, &win_rect.x, &win_rect.y); num_monitors = gdk_screen_get_n_monitors (screen); diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 71959ee973..7ac839640f 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -6809,7 +6809,6 @@ gdk_window_set_device_cursor (GdkWindow *window, * @y: (out) (allow-none): return location for Y coordinate of window (relative to its parent) * @width: (out) (allow-none): return location for width of window * @height: (out) (allow-none): return location for height of window - * @depth: (out) (allow-none): return location for bit depth of window * * Any of the return location arguments to this function may be %NULL, * if you aren't interested in getting the value of that field. @@ -6839,8 +6838,7 @@ gdk_window_get_geometry (GdkWindow *window, gint *x, gint *y, gint *width, - gint *height, - gint *depth) + gint *height) { GdkWindow *parent; GdkWindowImplClass *impl_class; @@ -6861,8 +6859,7 @@ gdk_window_get_geometry (GdkWindow *window, { impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl); impl_class->get_geometry (window, x, y, - width, height, - depth); + width, height); /* This reports the position wrt to the native parent, we need to convert it to be relative to the client side parent */ parent = window->parent; @@ -6884,8 +6881,6 @@ gdk_window_get_geometry (GdkWindow *window, *width = window->width; if (height) *height = window->height; - if (depth) - *depth = window->depth; } } } diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index 936e69af20..69fee5ad09 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -474,7 +474,6 @@ struct _GdkPointerHooks gint *win_y); }; -typedef struct _GdkWindowObject GdkWindowObject; typedef struct _GdkWindowClass GdkWindowClass; #define GDK_TYPE_WINDOW (gdk_window_get_type ()) @@ -720,8 +719,7 @@ void gdk_window_get_geometry (GdkWindow *window, gint *x, gint *y, gint *width, - gint *height, - gint *depth); + gint *height); int gdk_window_get_width (GdkWindow *window); int gdk_window_get_height (GdkWindow *window); void gdk_window_get_position (GdkWindow *window, diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h index 0332a31b71..af2d922c42 100644 --- a/gdk/gdkwindowimpl.h +++ b/gdk/gdkwindowimpl.h @@ -91,8 +91,7 @@ struct _GdkWindowImplClass gint *x, gint *y, gint *width, - gint *height, - gint *depth); + gint *height); gint (* get_root_coords) (GdkWindow *window, gint x, gint y, diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c index 8c6132b2ab..cf34e8302a 100644 --- a/gdk/quartz/GdkQuartzView.c +++ b/gdk/quartz/GdkQuartzView.c @@ -68,8 +68,7 @@ -(void)drawRect:(NSRect)rect { GdkRectangle gdk_rect; - GdkWindowObject *private = GDK_WINDOW_OBJECT (gdk_window); - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl); const NSRect *drawn_rects; NSInteger count; int i; @@ -78,7 +77,7 @@ if (GDK_WINDOW_DESTROYED (gdk_window)) return; - if (!(private->event_mask & GDK_EXPOSURE_MASK)) + if (!(gdk_window->event_mask & GDK_EXPOSURE_MASK)) return; if (NSEqualRects (rect, NSZeroRect)) @@ -127,8 +126,7 @@ */ -(void)updateTrackingRect { - GdkWindowObject *private = GDK_WINDOW_OBJECT (gdk_window); - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl); NSRect rect; if (!impl->toplevel) diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c index eb3cce8947..6fd0c9b75e 100644 --- a/gdk/quartz/GdkQuartzWindow.c +++ b/gdk/quartz/GdkQuartzWindow.c @@ -140,7 +140,6 @@ -(void)windowDidMove:(NSNotification *)aNotification { GdkWindow *window = [[self contentView] gdkWindow]; - GdkWindowObject *private = (GdkWindowObject *)window; GdkEvent *event; _gdk_quartz_window_update_position (window); @@ -148,10 +147,10 @@ /* Synthesize a configure event */ event = gdk_event_new (GDK_CONFIGURE); event->configure.window = g_object_ref (window); - event->configure.x = private->x; - event->configure.y = private->y; - event->configure.width = private->width; - event->configure.height = private->height; + event->configure.x = window->x; + event->configure.y = window->y; + event->configure.width = window->width; + event->configure.height = window->height; _gdk_event_queue_append (gdk_display_get_default (), event); } @@ -160,23 +159,22 @@ { NSRect content_rect = [self contentRectForFrameRect:[self frame]]; GdkWindow *window = [[self contentView] gdkWindow]; - GdkWindowObject *private = (GdkWindowObject *)window; GdkEvent *event; - private->width = content_rect.size.width; - private->height = content_rect.size.height; + window->width = content_rect.size.width; + window->height = content_rect.size.height; - [[self contentView] setFrame:NSMakeRect (0, 0, private->width, private->height)]; + [[self contentView] setFrame:NSMakeRect (0, 0, window->width, window->height)]; _gdk_window_update_size (window); /* Synthesize a configure event */ event = gdk_event_new (GDK_CONFIGURE); event->configure.window = g_object_ref (window); - event->configure.x = private->x; - event->configure.y = private->y; - event->configure.width = private->width; - event->configure.height = private->height; + event->configure.x = window->x; + event->configure.y = window->y; + event->configure.width = window->width; + event->configure.height = window->height; _gdk_event_queue_append (gdk_display_get_default (), event); } @@ -199,8 +197,7 @@ -(BOOL)canBecomeMainWindow { GdkWindow *window = [[self contentView] gdkWindow]; - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); switch (impl->type_hint) { @@ -229,16 +226,15 @@ -(BOOL)canBecomeKeyWindow { GdkWindow *window = [[self contentView] gdkWindow]; - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); - if (!private->accept_focus) + if (!window->accept_focus) return NO; /* Popup windows should not be able to get focused in the window * manager sense, it's only handled through grabs. */ - if (private->window_type == GDK_WINDOW_TEMP) + if (window->window_type == GDK_WINDOW_TEMP) return NO; switch (impl->type_hint) @@ -268,8 +264,7 @@ - (void)showAndMakeKey:(BOOL)makeKey { GdkWindow *window = [[self contentView] gdkWindow]; - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); inShowOrHide = YES; @@ -284,8 +279,7 @@ - (void)hide { GdkWindow *window = [[self contentView] gdkWindow]; - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); inShowOrHide = YES; [impl->toplevel orderOut:nil]; diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am index b0a967d1e8..f7ffd5a326 100644 --- a/gdk/quartz/Makefile.am +++ b/gdk/quartz/Makefile.am @@ -27,8 +27,6 @@ libgdk_quartz_la_SOURCES = \ gdkdevicemanager-core.c \ gdkdisplay-quartz.c \ gdkdnd-quartz.c \ - gdkdrawable-quartz.c \ - gdkdrawable-quartz.h \ gdkevents-quartz.c \ gdkeventloop-quartz.c \ gdkgeometry-quartz.c \ diff --git a/gdk/quartz/gdkdevice-core.c b/gdk/quartz/gdkdevice-core.c index 57dc3de728..25f9a1e479 100644 --- a/gdk/quartz/gdkdevice-core.c +++ b/gdk/quartz/gdkdevice-core.c @@ -188,8 +188,7 @@ gdk_device_core_query_state_helper (GdkWindow *window, gint *y, GdkModifierType *mask) { - GdkWindowObject *toplevel; - GdkWindowObject *private; + GdkWindow *toplevel; NSPoint point; gint x_tmp, y_tmp; GdkWindow *found_window; @@ -204,7 +203,7 @@ gdk_device_core_query_state_helper (GdkWindow *window, return NULL; } - toplevel = GDK_WINDOW_OBJECT (gdk_window_get_effective_toplevel (window)); + toplevel = gdk_window_get_effective_toplevel (window); *mask = _gdk_quartz_events_get_current_event_mask (); @@ -220,15 +219,14 @@ gdk_device_core_query_state_helper (GdkWindow *window, NSWindow *nswindow; impl = GDK_WINDOW_IMPL_QUARTZ (toplevel->impl); - private = GDK_WINDOW_OBJECT (toplevel); nswindow = impl->toplevel; point = [nswindow mouseLocationOutsideOfEventStream]; x_tmp = point.x; - y_tmp = private->height - point.y; + y_tmp = toplevel->height - point.y; - window = (GdkWindow *)toplevel; + window = toplevel; } found_window = _gdk_quartz_window_find_child (window, x_tmp, y_tmp, diff --git a/gdk/quartz/gdkdrawable-quartz.c b/gdk/quartz/gdkdrawable-quartz.c deleted file mode 100644 index 632f0cd009..0000000000 --- a/gdk/quartz/gdkdrawable-quartz.c +++ /dev/null @@ -1,232 +0,0 @@ -/* gdkdrawable-quartz.c - * - * Copyright (C) 2005-2007 Imendio AB - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include -#include -#include "gdkprivate-quartz.h" - -static gpointer parent_class; - -static cairo_user_data_key_t gdk_quartz_cairo_key; - -typedef struct { - GdkDrawable *drawable; - CGContextRef cg_context; -} GdkQuartzCairoSurfaceData; - -static void -gdk_quartz_cairo_surface_destroy (void *data) -{ - GdkQuartzCairoSurfaceData *surface_data = data; - GdkDrawableImplQuartz *impl = GDK_DRAWABLE_IMPL_QUARTZ (surface_data->drawable); - - impl->cairo_surface = NULL; - - gdk_quartz_drawable_release_context (surface_data->drawable, - surface_data->cg_context); - - g_free (surface_data); -} - -static cairo_surface_t * -gdk_quartz_create_cairo_surface (GdkDrawable *drawable, - int width, - int height) -{ - CGContextRef cg_context; - GdkQuartzCairoSurfaceData *surface_data; - cairo_surface_t *surface; - - cg_context = gdk_quartz_drawable_get_context (drawable, TRUE); - - if (!cg_context) - return NULL; - - surface_data = g_new (GdkQuartzCairoSurfaceData, 1); - surface_data->drawable = drawable; - surface_data->cg_context = cg_context; - - surface = cairo_quartz_surface_create_for_cg_context (cg_context, - width, height); - - cairo_surface_set_user_data (surface, &gdk_quartz_cairo_key, - surface_data, - gdk_quartz_cairo_surface_destroy); - - return surface; -} - -static cairo_surface_t * -gdk_quartz_ref_cairo_surface (GdkDrawable *drawable) -{ - GdkDrawableImplQuartz *impl = GDK_DRAWABLE_IMPL_QUARTZ (drawable); - - if (GDK_IS_WINDOW_IMPL_QUARTZ (drawable) && - GDK_WINDOW_DESTROYED (impl->wrapper)) - return NULL; - - if (!impl->cairo_surface) - { - impl->cairo_surface = - gdk_quartz_create_cairo_surface (drawable, - gdk_window_get_width (impl->wrapper), - gdk_window_get_height (impl->wrapper)); - } - else - cairo_surface_reference (impl->cairo_surface); - - return impl->cairo_surface; -} - -static void -gdk_drawable_impl_quartz_finalize (GObject *object) -{ - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -static void -gdk_drawable_impl_quartz_class_init (GdkDrawableImplQuartzClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass); - - parent_class = g_type_class_peek_parent (klass); - - object_class->finalize = gdk_drawable_impl_quartz_finalize; - - drawable_class->ref_cairo_surface = gdk_quartz_ref_cairo_surface; - drawable_class->create_cairo_surface = gdk_quartz_create_cairo_surface; -} - -GType -gdk_drawable_impl_quartz_get_type (void) -{ - static GType object_type = 0; - - if (!object_type) - { - const GTypeInfo object_info = - { - sizeof (GdkDrawableImplQuartzClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gdk_drawable_impl_quartz_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GdkDrawableImplQuartz), - 0, /* n_preallocs */ - (GInstanceInitFunc) NULL, - }; - - object_type = g_type_register_static (GDK_TYPE_DRAWABLE, - "GdkDrawableImplQuartz", - &object_info, 0); - } - - return object_type; -} - -CGContextRef -gdk_quartz_drawable_get_context (GdkDrawable *drawable, - gboolean antialias) -{ - if (!GDK_DRAWABLE_IMPL_QUARTZ_GET_CLASS (drawable)->get_context) - { - g_warning ("%s doesn't implement GdkDrawableImplQuartzClass::get_context()", - G_OBJECT_TYPE_NAME (drawable)); - return NULL; - } - - return GDK_DRAWABLE_IMPL_QUARTZ_GET_CLASS (drawable)->get_context (drawable, antialias); -} - -void -gdk_quartz_drawable_release_context (GdkDrawable *drawable, - CGContextRef cg_context) -{ - if (!GDK_DRAWABLE_IMPL_QUARTZ_GET_CLASS (drawable)->release_context) - { - g_warning ("%s doesn't implement GdkDrawableImplQuartzClass::release_context()", - G_OBJECT_TYPE_NAME (drawable)); - return; - } - - GDK_DRAWABLE_IMPL_QUARTZ_GET_CLASS (drawable)->release_context (drawable, cg_context); -} - -/* Help preventing "beam sync penalty" where CG makes all graphics code - * block until the next vsync if we try to flush (including call display on - * a view) too often. We do this by limiting the manual flushing done - * outside of expose calls to less than some frequency when measured over - * the last 4 flushes. This is a bit arbitray, but seems to make it possible - * for some quick manual flushes (such as gtkruler or gimp's marching ants) - * without hitting the max flush frequency. - * - * If drawable NULL, no flushing is done, only registering that a flush was - * done externally. - */ -void -_gdk_quartz_drawable_flush (GdkDrawable *drawable) -{ - static struct timeval prev_tv; - static gint intervals[4]; - static gint index; - struct timeval tv; - gint ms; - - gettimeofday (&tv, NULL); - ms = (tv.tv_sec - prev_tv.tv_sec) * 1000 + (tv.tv_usec - prev_tv.tv_usec) / 1000; - intervals[index++ % 4] = ms; - - if (drawable) - { - ms = intervals[0] + intervals[1] + intervals[2] + intervals[3]; - - /* ~25Hz on average. */ - if (ms > 4*40) - { - if (GDK_IS_WINDOW_IMPL_QUARTZ (drawable)) - { - GdkWindowImplQuartz *window_impl = GDK_WINDOW_IMPL_QUARTZ (drawable); - - [window_impl->toplevel flushWindow]; - } - - prev_tv = tv; - } - } - else - prev_tv = tv; -} - -void -_gdk_quartz_drawable_finish (GdkDrawable *drawable) -{ - GdkDrawableImplQuartz *impl = GDK_DRAWABLE_IMPL_QUARTZ (drawable); - - if (impl->cairo_surface) - { - cairo_surface_finish (impl->cairo_surface); - cairo_surface_set_user_data (impl->cairo_surface, &gdk_quartz_cairo_key, - NULL, NULL); - impl->cairo_surface = NULL; - } -} diff --git a/gdk/quartz/gdkdrawable-quartz.h b/gdk/quartz/gdkdrawable-quartz.h deleted file mode 100644 index 24d17d83ea..0000000000 --- a/gdk/quartz/gdkdrawable-quartz.h +++ /dev/null @@ -1,71 +0,0 @@ -/* gdkdrawable-quartz.h - * - * Copyright (C) 2005 Imendio AB - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GDK_DRAWABLE_QUARTZ_H__ -#define __GDK_DRAWABLE_QUARTZ_H__ - -#include - -#include - -G_BEGIN_DECLS - -/* Drawable implementation for Quartz - */ - -typedef struct _GdkDrawableImplQuartz GdkDrawableImplQuartz; -typedef struct _GdkDrawableImplQuartzClass GdkDrawableImplQuartzClass; - -#define GDK_TYPE_DRAWABLE_IMPL_QUARTZ (gdk_drawable_impl_quartz_get_type ()) -#define GDK_DRAWABLE_IMPL_QUARTZ(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE_IMPL_QUARTZ, GdkDrawableImplQuartz)) -#define GDK_DRAWABLE_IMPL_QUARTZ_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAWABLE_IMPL_QUARTZ, GdkDrawableImplQuartzClass)) -#define GDK_IS_DRAWABLE_IMPL_QUARTZ(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE_IMPL_QUARTZ)) -#define GDK_IS_DRAWABLE_IMPL_QUARTZ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE_IMPL_QUARTZ)) -#define GDK_DRAWABLE_IMPL_QUARTZ_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE_IMPL_QUARTZ, GdkDrawableImplQuartzClass)) - -struct _GdkDrawableImplQuartz -{ - GdkDrawable parent_instance; - - GdkDrawable *wrapper; - - cairo_surface_t *cairo_surface; -}; - -struct _GdkDrawableImplQuartzClass -{ - GdkDrawableClass parent_class; - - /* vtable */ - CGContextRef (*get_context) (GdkDrawable* drawable, - gboolean antialias); - void (*release_context) (GdkDrawable *drawable, - CGContextRef cg_context); -}; - -GType gdk_drawable_impl_quartz_get_type (void); -CGContextRef gdk_quartz_drawable_get_context (GdkDrawable *drawable, - gboolean antialias); -void gdk_quartz_drawable_release_context (GdkDrawable *drawable, - CGContextRef context); - -G_END_DECLS - -#endif /* __GDK_DRAWABLE_QUARTZ_H__ */ diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 44f10cbbf4..9cbfdda8e6 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -374,7 +374,6 @@ generate_motion_event (GdkWindow *window) NSPoint screen_point; NSWindow *nswindow; GdkQuartzView *view; - GdkWindowObject *private; GdkEvent *event; gint x, y, x_root, y_root; GdkDisplay *display; @@ -383,8 +382,7 @@ generate_motion_event (GdkWindow *window) event->any.window = NULL; event->any.send_event = TRUE; - private = (GdkWindowObject *)window; - nswindow = ((GdkWindowImplQuartz *)private->impl)->toplevel; + nswindow = ((GdkWindowImplQuartz *)window->impl)->toplevel; view = (GdkQuartzView *)[nswindow contentView]; display = gdk_window_get_display (window); @@ -396,7 +394,7 @@ generate_motion_event (GdkWindow *window) point = [nswindow convertScreenToBase:screen_point]; x = point.x; - y = private->height - point.y; + y = window->height - point.y; event->any.type = GDK_MOTION_NOTIFY; event->motion.window = window; @@ -464,7 +462,6 @@ _gdk_quartz_events_send_enter_notify_event (GdkWindow *window) NSPoint point; NSPoint screen_point; NSWindow *nswindow; - GdkWindowObject *private; GdkEvent *event; gint x, y, x_root, y_root; @@ -472,8 +469,7 @@ _gdk_quartz_events_send_enter_notify_event (GdkWindow *window) event->any.window = NULL; event->any.send_event = FALSE; - private = (GdkWindowObject *)window; - nswindow = ((GdkWindowImplQuartz *)private->impl)->toplevel; + nswindow = ((GdkWindowImplQuartz *)window->impl)->toplevel; screen_point = [NSEvent mouseLocation]; @@ -482,7 +478,7 @@ _gdk_quartz_events_send_enter_notify_event (GdkWindow *window) point = [nswindow convertScreenToBase:screen_point]; x = point.x; - y = private->height - point.y; + y = window->height - point.y; event->crossing.window = window; event->crossing.subwindow = NULL; @@ -503,13 +499,12 @@ _gdk_quartz_events_send_enter_notify_event (GdkWindow *window) void _gdk_quartz_events_send_map_event (GdkWindow *window) { - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (!impl->toplevel) return; - if (private->event_mask & GDK_STRUCTURE_MASK) + if (window->event_mask & GDK_STRUCTURE_MASK) { GdkEvent event; @@ -533,17 +528,15 @@ find_toplevel_under_pointer (GdkDisplay *display, toplevel = info->toplevel_under_pointer; if (toplevel && WINDOW_IS_TOPLEVEL (toplevel)) { - GdkWindowObject *private; NSWindow *nswindow; NSPoint point; - private = (GdkWindowObject *)toplevel; - nswindow = ((GdkWindowImplQuartz *)private->impl)->toplevel; + nswindow = ((GdkWindowImplQuartz *)toplevel->impl)->toplevel; point = [nswindow convertScreenToBase:screen_point]; *x = point.x; - *y = private->height - point.y; + *y = toplevel->height - point.y; } return toplevel; @@ -599,13 +592,11 @@ find_toplevel_for_mouse_event (NSEvent *nsevent, GdkQuartzView *view; GdkDisplay *display; GdkDeviceGrabInfo *grab; - GdkWindowObject *private; view = (GdkQuartzView *)[[nsevent window] contentView]; toplevel = [view gdkWindow]; display = gdk_window_get_display (toplevel); - private = GDK_WINDOW_OBJECT (toplevel); event_type = [nsevent type]; point = [nsevent locationInWindow]; @@ -657,18 +648,16 @@ find_toplevel_for_mouse_event (NSEvent *nsevent, { /* Finally check the grab window. */ GdkWindow *grab_toplevel; - GdkWindowObject *grab_private; NSWindow *grab_nswindow; grab_toplevel = gdk_window_get_effective_toplevel (grab->window); - grab_private = (GdkWindowObject *)grab_toplevel; - grab_nswindow = ((GdkWindowImplQuartz *)grab_private->impl)->toplevel; + grab_nswindow = ((GdkWindowImplQuartz *)grab_toplevel->impl)->toplevel; point = [grab_nswindow convertScreenToBase:screen_point]; /* Note: x_root and y_root are already right. */ *x = point.x; - *y = grab_private->height - point.y; + *y = grab_toplevel->height - point.y; return grab_toplevel; } @@ -699,13 +688,11 @@ find_toplevel_for_mouse_event (NSEvent *nsevent, if (toplevel_under_pointer && WINDOW_IS_TOPLEVEL (toplevel_under_pointer)) { - GdkWindowObject *toplevel_private; GdkWindowImplQuartz *toplevel_impl; toplevel = toplevel_under_pointer; - toplevel_private = (GdkWindowObject *)toplevel; - toplevel_impl = (GdkWindowImplQuartz *)toplevel_private->impl; + toplevel_impl = (GdkWindowImplQuartz *)toplevel->impl; if ([toplevel_impl->toplevel showsResizeIndicator]) { @@ -756,17 +743,15 @@ find_window_for_ns_event (NSEvent *nsevent, NSPoint screen_point; NSEventType event_type; GdkWindow *toplevel; - GdkWindowObject *private; view = (GdkQuartzView *)[[nsevent window] contentView]; toplevel = [view gdkWindow]; - private = GDK_WINDOW_OBJECT (toplevel); point = [nsevent locationInWindow]; screen_point = [[nsevent window] convertBaseToScreen:point]; *x = point.x; - *y = private->height - point.y; + *y = toplevel->height - point.y; _gdk_quartz_window_nspoint_to_gdk_xy (screen_point, x_root, y_root); @@ -934,11 +919,8 @@ fill_scroll_event (GdkWindow *window, gint y_root, GdkScrollDirection direction) { - GdkWindowObject *private; NSPoint point; - private = GDK_WINDOW_OBJECT (window); - point = [nsevent locationInWindow]; event->any.type = GDK_SCROLL; @@ -1083,17 +1065,13 @@ synthesize_crossing_event (GdkWindow *window, gint x_root, gint y_root) { - GdkWindowObject *private; - - private = GDK_WINDOW_OBJECT (window); - switch ([nsevent type]) { case NSMouseEntered: /* Enter events are considered always to be from the root window as we * can't know for sure from what window we enter. */ - if (!(private->event_mask & GDK_ENTER_NOTIFY_MASK)) + if (!(window->event_mask & GDK_ENTER_NOTIFY_MASK)) return FALSE; fill_crossing_event (window, event, nsevent, @@ -1109,7 +1087,7 @@ synthesize_crossing_event (GdkWindow *window, * since there is no way to reliably get information about what new * window is entered when exiting one. */ - if (!(private->event_mask & GDK_LEAVE_NOTIFY_MASK)) + if (!(window->event_mask & GDK_LEAVE_NOTIFY_MASK)) return FALSE; fill_crossing_event (window, event, nsevent, @@ -1220,14 +1198,13 @@ gdk_event_translate (GdkEvent *event, /* Apply any window filters. */ if (GDK_IS_WINDOW (window)) { - GdkWindowObject *filter_private = (GdkWindowObject *) window; GdkFilterReturn result; - if (filter_private->filters) + if (window->filters) { g_object_ref (window); - result = gdk_event_apply_filters (nsevent, event, &filter_private->filters); + result = gdk_event_apply_filters (nsevent, event, &window->filters); g_object_unref (window); @@ -1248,8 +1225,7 @@ gdk_event_translate (GdkEvent *event, event_type == NSOtherMouseDown || event_type == NSLeftMouseDown)) { - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (![NSApp isActive]) { diff --git a/gdk/quartz/gdkgeometry-quartz.c b/gdk/quartz/gdkgeometry-quartz.c index bd602e33df..8434151405 100644 --- a/gdk/quartz/gdkgeometry-quartz.c +++ b/gdk/quartz/gdkgeometry-quartz.c @@ -29,8 +29,7 @@ _gdk_quartz_window_translate (GdkWindow *window, gint dy) { cairo_region_t *invalidate, *scrolled; - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = (GdkWindowImplQuartz *)private->impl; + GdkWindowImplQuartz *impl = (GdkWindowImplQuartz *)window->impl; GdkRectangle extents; cairo_region_get_extents (area, &extents); diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c index 31d1bd2c18..3677d8a4c3 100644 --- a/gdk/quartz/gdkinput.c +++ b/gdk/quartz/gdkinput.c @@ -65,7 +65,7 @@ _gdk_input_select_device_events (GdkWindow *impl_window, GdkDevice *device) { guint event_mask; - GdkWindowObject *w; + GdkWindow *w; GdkInputWindow *iw; GdkInputMode mode; gboolean has_cursor; @@ -73,7 +73,7 @@ _gdk_input_select_device_events (GdkWindow *impl_window, GList *l; event_mask = 0; - iw = ((GdkWindowObject *)impl_window)->input_window; + iw = impl_window->input_window; g_object_get (device, "type", &type, @@ -140,16 +140,14 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask, GdkExtensionMode mode) { - GdkWindowObject *window_private; - GdkWindowObject *impl_window; GList *tmp_list; GdkInputWindow *iw; + GdkWindow *impl_window; g_return_if_fail (window != NULL); g_return_if_fail (GDK_WINDOW_IS_QUARTZ (window)); - window_private = (GdkWindowObject*) window; - impl_window = (GdkWindowObject *)_gdk_window_get_impl_window (window); + impl_window = (GdkWindow *)_gdk_window_get_impl_window (window); if (mode == GDK_EXTENSION_EVENTS_NONE) mask = 0; @@ -166,7 +164,7 @@ gdk_input_set_extension_events (GdkWindow *window, iw->grabbed = FALSE; _gdk_input_windows = g_list_append (_gdk_input_windows, iw); - window_private->extension_events = mask; + window->extension_events = mask; /* Add enter window events to the event mask */ /* FIXME, this is not needed for XINPUT_NONE */ @@ -183,7 +181,7 @@ gdk_input_set_extension_events (GdkWindow *window, g_free (iw); } - window_private->extension_events = 0; + window->extension_events = 0; } for (tmp_list = _gdk_input_devices; tmp_list; tmp_list = tmp_list->next) diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h index ca9eae30b1..9a70054746 100644 --- a/gdk/quartz/gdkprivate-quartz.h +++ b/gdk/quartz/gdkprivate-quartz.h @@ -62,7 +62,7 @@ extern GdkWindow *_gdk_root; extern GdkDragContext *_gdk_quartz_drag_source_context; -#define GDK_WINDOW_IS_QUARTZ(win) (GDK_IS_WINDOW_IMPL_QUARTZ (((GdkWindowObject *)win)->impl)) +#define GDK_WINDOW_IS_QUARTZ(win) (GDK_IS_WINDOW_IMPL_QUARTZ (((GdkWindow *)win)->impl)) /* Initialization */ void _gdk_windowing_update_window_sizes (GdkScreen *screen); @@ -130,10 +130,6 @@ void _gdk_quartz_event_loop_release_event (NSEvent *event); GdkEventType _gdk_quartz_keys_event_type (NSEvent *event); gboolean _gdk_quartz_keys_is_modifier (guint keycode); -/* Drawable */ -void _gdk_quartz_drawable_finish (GdkDrawable *drawable); -void _gdk_quartz_drawable_flush (GdkDrawable *drawable); - /* Geometry */ void _gdk_quartz_window_scroll (GdkWindow *window, gint dx, diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 40b9dbb854..c912e26b4d 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -29,6 +29,9 @@ #include "gdkscreen-quartz.h" #include "gdkinputprivate.h" +#include +#include + static gpointer parent_class; static gpointer root_window_parent_class; @@ -37,6 +40,8 @@ static gboolean in_process_all_updates = FALSE; static GSList *main_window_stack; +void _gdk_quartz_window_flush (GdkWindowImplQuartz *window_impl); + #define FULLSCREEN_DATA "fullscreen-data" typedef struct @@ -57,39 +62,31 @@ static FullscreenSavedGeometry *get_fullscreen_geometry (GdkWindow *window); GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \ GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN) -static void gdk_window_impl_iface_init (GdkWindowImplIface *iface); - NSView * gdk_quartz_window_get_nsview (GdkWindow *window) { - GdkWindowObject *private = (GdkWindowObject *)window; - if (GDK_WINDOW_DESTROYED (window)) return NULL; - return ((GdkWindowImplQuartz *)private->impl)->view; + return ((GdkWindowImplQuartz *)window->impl)->view; } NSWindow * gdk_quartz_window_get_nswindow (GdkWindow *window) { - GdkWindowObject *private = (GdkWindowObject *)window; - if (GDK_WINDOW_DESTROYED (window)) return NULL; - return ((GdkWindowImplQuartz *)private->impl)->toplevel; + return ((GdkWindowImplQuartz *)window->impl)->toplevel; } static CGContextRef -gdk_window_impl_quartz_get_context (GdkDrawable *drawable, - gboolean antialias) +gdk_window_impl_quartz_get_context (GdkWindowImplQuartz *window_impl, + gboolean antialias) { - GdkDrawableImplQuartz *drawable_impl = GDK_DRAWABLE_IMPL_QUARTZ (drawable); - GdkWindowImplQuartz *window_impl = GDK_WINDOW_IMPL_QUARTZ (drawable); CGContextRef cg_context; - if (GDK_WINDOW_DESTROYED (drawable_impl->wrapper)) + if (GDK_WINDOW_DESTROYED (window_impl->wrapper)) return NULL; /* Lock focus when not called as part of a drawRect call. This @@ -143,18 +140,16 @@ gdk_window_impl_quartz_get_context (GdkDrawable *drawable, } static void -gdk_window_impl_quartz_release_context (GdkDrawable *drawable, - CGContextRef cg_context) +gdk_window_impl_quartz_release_context (GdkWindowImplQuartz *window_impl, + CGContextRef cg_context) { - GdkWindowImplQuartz *window_impl = GDK_WINDOW_IMPL_QUARTZ (drawable); - CGContextRestoreGState (cg_context); CGContextSetAllowsAntialiasing (cg_context, TRUE); - /* See comment in gdk_quartz_drawable_get_context(). */ + /* See comment in gdk_quartz_window_get_context(). */ if (window_impl->in_paint_rect_count == 0) { - _gdk_quartz_drawable_flush (drawable); + _gdk_quartz_window_flush (window_impl); [window_impl->view unlockFocus]; } } @@ -210,7 +205,7 @@ gdk_window_impl_quartz_finalize (GObject *object) { GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (object); - check_grab_destroy (GDK_DRAWABLE_IMPL_QUARTZ (object)->wrapper); + check_grab_destroy (GDK_WINDOW_IMPL_QUARTZ (object)->wrapper); if (impl->paint_clip_region) cairo_region_destroy (impl->paint_clip_region); @@ -221,18 +216,114 @@ gdk_window_impl_quartz_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } -static void -gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass) +/* Help preventing "beam sync penalty" where CG makes all graphics code + * block until the next vsync if we try to flush (including call display on + * a view) too often. We do this by limiting the manual flushing done + * outside of expose calls to less than some frequency when measured over + * the last 4 flushes. This is a bit arbitray, but seems to make it possible + * for some quick manual flushes (such as gtkruler or gimp's marching ants) + * without hitting the max flush frequency. + * + * If drawable NULL, no flushing is done, only registering that a flush was + * done externally. + */ +void +_gdk_quartz_window_flush (GdkWindowImplQuartz *window_impl) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GdkDrawableImplQuartzClass *drawable_quartz_class = GDK_DRAWABLE_IMPL_QUARTZ_CLASS (klass); + static struct timeval prev_tv; + static gint intervals[4]; + static gint index; + struct timeval tv; + gint ms; - parent_class = g_type_class_peek_parent (klass); + gettimeofday (&tv, NULL); + ms = (tv.tv_sec - prev_tv.tv_sec) * 1000 + (tv.tv_usec - prev_tv.tv_usec) / 1000; + intervals[index++ % 4] = ms; - object_class->finalize = gdk_window_impl_quartz_finalize; + if (window_impl) + { + ms = intervals[0] + intervals[1] + intervals[2] + intervals[3]; - drawable_quartz_class->get_context = gdk_window_impl_quartz_get_context; - drawable_quartz_class->release_context = gdk_window_impl_quartz_release_context; + /* ~25Hz on average. */ + if (ms > 4*40) + { + if (window_impl) + [window_impl->toplevel flushWindow]; + + prev_tv = tv; + } + } + else + prev_tv = tv; +} + +static cairo_user_data_key_t gdk_quartz_cairo_key; + +typedef struct { + GdkWindowImplQuartz *window_impl; + CGContextRef cg_context; +} GdkQuartzCairoSurfaceData; + +static void +gdk_quartz_cairo_surface_destroy (void *data) +{ + GdkQuartzCairoSurfaceData *surface_data = data; + + surface_data->window_impl->cairo_surface = NULL; + + gdk_quartz_window_release_context (surface_data->window_impl, + surface_data->cg_context); + + g_free (surface_data); +} + +static cairo_surface_t * +gdk_quartz_create_cairo_surface (GdkWindowImplQuartz *impl, + int width, + int height) +{ + CGContextRef cg_context; + GdkQuartzCairoSurfaceData *surface_data; + cairo_surface_t *surface; + + cg_context = gdk_quartz_window_get_context (impl, TRUE); + + if (!cg_context) + return NULL; + + surface_data = g_new (GdkQuartzCairoSurfaceData, 1); + surface_data->window_impl = impl; + surface_data->cg_context = cg_context; + + surface = cairo_quartz_surface_create_for_cg_context (cg_context, + width, height); + + cairo_surface_set_user_data (surface, &gdk_quartz_cairo_key, + surface_data, + gdk_quartz_cairo_surface_destroy); + + return surface; +} + +static cairo_surface_t * +gdk_quartz_ref_cairo_surface (GdkWindow *window) +{ + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); + + if (GDK_WINDOW_DESTROYED (window)) + return NULL; + + if (!impl->cairo_surface) + { + impl->cairo_surface = + gdk_quartz_create_cairo_surface (impl, + gdk_window_get_width (impl->wrapper), + gdk_window_get_height (impl->wrapper)); + } + else + cairo_surface_reference (impl->cairo_surface); + + return impl->cairo_surface; } static void @@ -247,16 +338,15 @@ gdk_window_impl_quartz_begin_paint_region (GdkPaintable *paintable, const cairo_region_t *region) { GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (paintable); - GdkWindowObject *private = (GdkWindowObject*) window; cairo_region_t *clipped_and_offset_region; cairo_t *cr; clipped_and_offset_region = cairo_region_copy (region); cairo_region_intersect (clipped_and_offset_region, - private->clip_region_with_children); + window->clip_region_with_children); cairo_region_translate (clipped_and_offset_region, - private->abs_x, private->abs_y); + window->abs_x, window->abs_y); if (impl->begin_paint_count == 0) impl->paint_clip_region = cairo_region_reference (clipped_and_offset_region); @@ -270,19 +360,19 @@ gdk_window_impl_quartz_begin_paint_region (GdkPaintable *paintable, cr = gdk_cairo_create (window); - cairo_translate (cr, -private->abs_x, -private->abs_y); + cairo_translate (cr, -window->abs_x, -window->abs_y); gdk_cairo_region (cr, clipped_and_offset_region); cairo_clip (cr); - while (private->background == NULL && private->parent) + while (window->background == NULL && window->parent) { - cairo_translate (cr, -private->x, private->y); - private = private->parent; + cairo_translate (cr, -window->x, window->y); + window = window->parent; } - if (private->background) - cairo_set_source (cr, private->background); + if (window->background) + cairo_set_source (cr, window->background); else cairo_set_source_rgba (cr, 0, 0, 0, 0); @@ -313,12 +403,10 @@ void _gdk_quartz_window_set_needs_display_in_region (GdkWindow *window, cairo_region_t *region) { - GdkWindowObject *private; GdkWindowImplQuartz *impl; int i, n_rects; - private = GDK_WINDOW_OBJECT (window); - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (!impl->needs_display_region) impl->needs_display_region = cairo_region_create (); @@ -349,12 +437,10 @@ _gdk_windowing_window_process_updates_recurse (GdkWindow *window, toplevel = gdk_window_get_effective_toplevel (window); if (toplevel && WINDOW_IS_TOPLEVEL (toplevel)) { - GdkWindowObject *toplevel_private; GdkWindowImplQuartz *toplevel_impl; NSWindow *nswindow; - toplevel_private = (GdkWindowObject *)toplevel; - toplevel_impl = (GdkWindowImplQuartz *)toplevel_private->impl; + toplevel_impl = (GdkWindowImplQuartz *)toplevel->impl; nswindow = toplevel_impl->toplevel; /* In theory, we could skip the flush disabling, since we only @@ -402,7 +488,7 @@ _gdk_windowing_after_process_all_updates (void) [[nswindow contentView] displayIfNeeded]; - _gdk_quartz_drawable_flush (NULL); + _gdk_quartz_window_flush (NULL); [nswindow enableFlushWindow]; [nswindow flushWindow]; @@ -425,54 +511,6 @@ gdk_window_impl_quartz_paintable_init (GdkPaintableIface *iface) iface->end_paint = gdk_window_impl_quartz_end_paint; } -GType -_gdk_window_impl_quartz_get_type (void) -{ - static GType object_type = 0; - - if (!object_type) - { - const GTypeInfo object_info = - { - sizeof (GdkWindowImplQuartzClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gdk_window_impl_quartz_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GdkWindowImplQuartz), - 0, /* n_preallocs */ - (GInstanceInitFunc) gdk_window_impl_quartz_init, - }; - - const GInterfaceInfo paintable_info = - { - (GInterfaceInitFunc) gdk_window_impl_quartz_paintable_init, - NULL, - NULL - }; - - const GInterfaceInfo window_impl_info = - { - (GInterfaceInitFunc) gdk_window_impl_iface_init, - NULL, - NULL - }; - - object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_QUARTZ, - "GdkWindowImplQuartz", - &object_info, 0); - 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; -} - static const gchar * get_default_title (void) { @@ -493,15 +531,12 @@ get_ancestor_coordinates_from_child (GdkWindow *child_window, gint *ancestor_x, gint *ancestor_y) { - GdkWindowObject *child_private = GDK_WINDOW_OBJECT (child_window); - GdkWindowObject *ancestor_private = GDK_WINDOW_OBJECT (ancestor_window); - - while (child_private != ancestor_private) + while (child_window != ancestor_window) { - child_x += child_private->x; - child_y += child_private->y; + child_x += child_window->x; + child_y += child_window->y; - child_private = child_private->parent; + child_window = child_window->parent; } *ancestor_x = child_x; @@ -511,7 +546,6 @@ get_ancestor_coordinates_from_child (GdkWindow *child_window, void _gdk_quartz_window_debug_highlight (GdkWindow *window, gint number) { - GdkWindowObject *private = GDK_WINDOW_OBJECT (window); gint x, y; gint gx, gy; GdkWindow *toplevel; @@ -542,10 +576,10 @@ _gdk_quartz_window_debug_highlight (GdkWindow *window, gint number) x += tx; y += ty; - _gdk_quartz_window_gdk_xy_to_xy (x, y + private->height, + _gdk_quartz_window_gdk_xy_to_xy (x, y + window->height, &gx, &gy); - rect = NSMakeRect (gx, gy, private->width, private->height); + rect = NSMakeRect (gx, gy, window->width, window->height); if (debug_window[number] && NSEqualRects (rect, old_rect[number])) return; @@ -659,22 +693,22 @@ find_child_window_helper (GdkWindow *window, GdkWindowImplQuartz *impl; GList *l; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (window == _gdk_root) update_toplevel_order (); for (l = impl->sorted_children; l; l = l->next) { - GdkWindowObject *child_private = l->data; - GdkWindowImplQuartz *child_impl = GDK_WINDOW_IMPL_QUARTZ (child_private->impl); + GdkWindow *child = l->data; + GdkWindowImplQuartz *child_impl = GDK_WINDOW_IMPL_QUARTZ (child->impl); int temp_x, temp_y; - if (!GDK_WINDOW_IS_MAPPED (child_private)) + if (!GDK_WINDOW_IS_MAPPED (child)) continue; - temp_x = x_offset + child_private->x; - temp_y = y_offset + child_private->y; + temp_x = x_offset + child->x; + temp_y = y_offset + child->y; /* Special-case the root window. We have to include the title * bar in the checks, otherwise the window below the title bar @@ -698,7 +732,7 @@ find_child_window_helper (GdkWindow *window, if (titlebar_height > 0 && x >= temp_x && y >= temp_y - titlebar_height && - x < temp_x + child_private->width && y < temp_y) + x < temp_x + child->width && y < temp_y) { /* The root means "unknown" i.e. a window not managed by * GDK. @@ -709,7 +743,7 @@ find_child_window_helper (GdkWindow *window, if ((!get_toplevel || (get_toplevel && window == _gdk_root)) && x >= temp_x && y >= temp_y && - x < temp_x + child_private->width && y < temp_y + child_private->height) + x < temp_x + child->width && y < temp_y + child->height) { /* Look for child windows. */ return find_child_window_helper (l->data, @@ -732,9 +766,7 @@ _gdk_quartz_window_find_child (GdkWindow *window, gint y, gboolean get_toplevel) { - GdkWindowObject *private = GDK_WINDOW_OBJECT (window); - - if (x >= 0 && y >= 0 && x < private->width && y < private->height) + if (x >= 0 && y >= 0 && x < window->width && y < window->height) return find_child_window_helper (window, x, y, 0, 0, get_toplevel); return NULL; @@ -746,7 +778,7 @@ _gdk_quartz_window_did_become_main (GdkWindow *window) { main_window_stack = g_slist_remove (main_window_stack, window); - if (GDK_WINDOW_OBJECT (window)->window_type != GDK_WINDOW_TEMP) + if (window->window_type != GDK_WINDOW_TEMP) main_window_stack = g_slist_prepend (main_window_stack, window); clear_toplevel_order (); @@ -774,8 +806,7 @@ _gdk_quartz_window_did_resign_main (GdkWindow *window) GDK_WINDOW_IS_MAPPED (new_window) && WINDOW_IS_TOPLEVEL (new_window)) { - GdkWindowObject *private = (GdkWindowObject *) new_window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (new_window->impl); [impl->toplevel makeKeyAndOrderFront:impl->toplevel]; } @@ -819,35 +850,30 @@ _gdk_window_impl_new (GdkWindow *window, GdkWindowAttr *attributes, gint attributes_mask) { - GdkWindowObject *private; GdkWindowImplQuartz *impl; - GdkDrawableImplQuartz *draw_impl; GdkWindowImplQuartz *parent_impl; GDK_QUARTZ_ALLOC_POOL; - private = (GdkWindowObject *)window; - impl = g_object_new (GDK_TYPE_WINDOW_IMPL_QUARTZ, NULL); - private->impl = (GdkDrawable *)impl; - draw_impl = GDK_DRAWABLE_IMPL_QUARTZ (impl); - draw_impl->wrapper = GDK_DRAWABLE (window); + window->impl = GDK_WINDOW_IMPL (impl); + impl->wrapper = window; - parent_impl = GDK_WINDOW_IMPL_QUARTZ (private->parent->impl); + parent_impl = GDK_WINDOW_IMPL_QUARTZ (window->parent->impl); - switch (private->window_type) + switch (window->window_type) { case GDK_WINDOW_TOPLEVEL: case GDK_WINDOW_TEMP: - if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT) + if (GDK_WINDOW_TYPE (window->parent) != GDK_WINDOW_ROOT) { /* The common code warns for this case */ - parent_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (_gdk_root)->impl); + parent_impl = GDK_WINDOW_IMPL_QUARTZ (_gdk_root->impl); } } /* Maintain the z-ordered list of children. */ - if (private->parent != (GdkWindowObject *)_gdk_root) + if (window->parent != _gdk_root) parent_impl->sorted_children = g_list_prepend (parent_impl->sorted_children, window); else clear_toplevel_order (); @@ -875,16 +901,16 @@ _gdk_window_impl_new (GdkWindow *window, * to find the screen the window will be on and correct the * content_rect coordinates to be relative to that screen. */ - _gdk_quartz_window_gdk_xy_to_xy (private->x, private->y, &nx, &ny); + _gdk_quartz_window_gdk_xy_to_xy (window->x, window->y, &nx, &ny); screen = get_nsscreen_for_point (nx, ny); screen_rect = [screen frame]; nx -= screen_rect.origin.x; ny -= screen_rect.origin.y; - content_rect = NSMakeRect (nx, ny - private->height, - private->width, - private->height); + content_rect = NSMakeRect (nx, ny - window->height, + window->width, + window->height); if (attributes->window_type == GDK_WINDOW_TEMP || attributes->type_hint == GDK_WINDOW_TYPE_HINT_SPLASHSCREEN) @@ -930,14 +956,14 @@ _gdk_window_impl_new (GdkWindow *window, case GDK_WINDOW_CHILD: { - GdkWindowImplQuartz *parent_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (private->parent)->impl); + GdkWindowImplQuartz *parent_impl = GDK_WINDOW_IMPL_QUARTZ (window->parent->impl); - if (!private->input_only) + if (!window->input_only) { - NSRect frame_rect = NSMakeRect (private->x + private->parent->abs_x, - private->y + private->parent->abs_y, - private->width, - private->height); + NSRect frame_rect = NSMakeRect (window->x + window->parent->abs_x, + window->y + window->parent->abs_y, + window->width, + window->height); impl->view = [[GdkQuartzView alloc] initWithFrame:frame_rect]; @@ -966,8 +992,7 @@ _gdk_quartz_window_update_position (GdkWindow *window) { NSRect frame_rect; NSRect content_rect; - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); GDK_QUARTZ_ALLOC_POOL; @@ -976,7 +1001,7 @@ _gdk_quartz_window_update_position (GdkWindow *window) _gdk_quartz_window_xy_to_gdk_xy (content_rect.origin.x, content_rect.origin.y + content_rect.size.height, - &private->x, &private->y); + &window->x, &window->y); GDK_QUARTZ_RELEASE_POOL; @@ -986,7 +1011,6 @@ void _gdk_windowing_update_window_sizes (GdkScreen *screen) { GList *windows, *list; - GdkWindowObject *private = (GdkWindowObject *)_gdk_root; /* The size of the root window is so that it can contain all * monitors attached to this machine. The monitors are laid out @@ -995,12 +1019,12 @@ _gdk_windowing_update_window_sizes (GdkScreen *screen) * * This data is updated when the monitor configuration is changed. */ - private->x = 0; - private->y = 0; - private->abs_x = 0; - private->abs_y = 0; - private->width = gdk_screen_get_width (screen); - private->height = gdk_screen_get_height (screen); + _gdk_root->x = 0; + _gdk_root->y = 0; + _gdk_root->abs_x = 0; + _gdk_root->abs_y = 0; + _gdk_root->width = gdk_screen_get_width (screen); + _gdk_root->height = gdk_screen_get_height (screen); windows = gdk_screen_get_toplevel_windows (screen); @@ -1013,31 +1037,26 @@ _gdk_windowing_update_window_sizes (GdkScreen *screen) void _gdk_windowing_window_init (void) { - GdkWindowObject *private; GdkWindowImplQuartz *impl; - GdkDrawableImplQuartz *drawable_impl; g_assert (_gdk_root == NULL); _gdk_root = g_object_new (GDK_TYPE_WINDOW, NULL); - private = (GdkWindowObject *)_gdk_root; - private->impl = g_object_new (_gdk_root_window_impl_quartz_get_type (), NULL); - private->impl_window = private; - private->visual = gdk_screen_get_system_visual (_gdk_screen); + _gdk_root->impl = g_object_new (_gdk_root_window_impl_quartz_get_type (), NULL); + _gdk_root->impl_window = _gdk_root; + _gdk_root->visual = gdk_screen_get_system_visual (_gdk_screen); - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (_gdk_root)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (_gdk_root->impl); _gdk_windowing_update_window_sizes (_gdk_screen); - private->state = 0; /* We don't want GDK_WINDOW_STATE_WITHDRAWN here */ - private->window_type = GDK_WINDOW_ROOT; - private->depth = 24; - private->viewable = TRUE; + _gdk_root->state = 0; /* We don't want GDK_WINDOW_STATE_WITHDRAWN here */ + _gdk_root->window_type = GDK_WINDOW_ROOT; + _gdk_root->depth = 24; + _gdk_root->viewable = TRUE; - drawable_impl = GDK_DRAWABLE_IMPL_QUARTZ (private->impl); - - drawable_impl->wrapper = GDK_DRAWABLE (private); + impl->wrapper = _gdk_root; } static void @@ -1045,19 +1064,17 @@ _gdk_quartz_window_destroy (GdkWindow *window, gboolean recursing, gboolean foreign_destroy) { - GdkWindowObject *private; GdkWindowImplQuartz *impl; - GdkWindowObject *parent; + GdkWindow *parent; - private = GDK_WINDOW_OBJECT (window); - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); main_window_stack = g_slist_remove (main_window_stack, window); g_list_free (impl->sorted_children); impl->sorted_children = NULL; - parent = private->parent; + parent = window->parent; if (parent) { GdkWindowImplQuartz *parent_impl = GDK_WINDOW_IMPL_QUARTZ (parent->impl); @@ -1065,7 +1082,13 @@ _gdk_quartz_window_destroy (GdkWindow *window, parent_impl->sorted_children = g_list_remove (parent_impl->sorted_children, window); } - _gdk_quartz_drawable_finish (GDK_DRAWABLE (impl)); + if (impl->cairo_surface) + { + cairo_surface_finish (impl->cairo_surface); + cairo_surface_set_user_data (impl->cairo_surface, &gdk_quartz_cairo_key, + NULL, NULL); + impl->cairo_surface = NULL; + } if (!recursing && !foreign_destroy) { @@ -1104,14 +1127,13 @@ _gdk_windowing_window_destroy_foreign (GdkWindow *window) static void gdk_window_quartz_show (GdkWindow *window, gboolean already_mapped) { - GdkWindowObject *private = (GdkWindowObject *)window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); gboolean focus_on_map; GDK_QUARTZ_ALLOC_POOL; if (!GDK_WINDOW_IS_MAPPED (window)) - focus_on_map = private->focus_on_map; + focus_on_map = window->focus_on_map; else focus_on_map = TRUE; @@ -1119,8 +1141,8 @@ gdk_window_quartz_show (GdkWindow *window, gboolean already_mapped) { gboolean make_key; - make_key = (private->accept_focus && focus_on_map && - private->window_type != GDK_WINDOW_TEMP); + make_key = (window->accept_focus && focus_on_map && + window->window_type != GDK_WINDOW_TEMP); [(GdkQuartzWindow*)impl->toplevel showAndMakeKey:make_key]; clear_toplevel_order (); @@ -1136,10 +1158,10 @@ gdk_window_quartz_show (GdkWindow *window, gboolean already_mapped) gdk_synthesize_window_state (window, GDK_WINDOW_STATE_WITHDRAWN, 0); - if (private->state & GDK_WINDOW_STATE_MAXIMIZED) + if (window->state & GDK_WINDOW_STATE_MAXIMIZED) gdk_window_maximize (window); - if (private->state & GDK_WINDOW_STATE_ICONIFIED) + if (window->state & GDK_WINDOW_STATE_ICONIFIED) gdk_window_iconify (window); if (impl->transient_for && !GDK_WINDOW_DESTROYED (impl->transient_for)) @@ -1158,7 +1180,7 @@ _gdk_quartz_window_detach_from_parent (GdkWindow *window) g_return_if_fail (GDK_IS_WINDOW (window)); - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); g_return_if_fail (impl->toplevel != NULL); @@ -1166,7 +1188,7 @@ _gdk_quartz_window_detach_from_parent (GdkWindow *window) { GdkWindowImplQuartz *parent_impl; - parent_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (impl->transient_for)->impl); + parent_impl = GDK_WINDOW_IMPL_QUARTZ (impl->transient_for->impl); [parent_impl->toplevel removeChildWindow:impl->toplevel]; clear_toplevel_order (); } @@ -1180,7 +1202,7 @@ _gdk_quartz_window_attach_to_parent (GdkWindow *window) g_return_if_fail (GDK_IS_WINDOW (window)); - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); g_return_if_fail (impl->toplevel != NULL); @@ -1188,7 +1210,7 @@ _gdk_quartz_window_attach_to_parent (GdkWindow *window) { GdkWindowImplQuartz *parent_impl; - parent_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (impl->transient_for)->impl); + parent_impl = GDK_WINDOW_IMPL_QUARTZ (impl->transient_for->impl); [parent_impl->toplevel addChildWindow:impl->toplevel ordered:NSWindowAbove]; clear_toplevel_order (); } @@ -1197,7 +1219,6 @@ _gdk_quartz_window_attach_to_parent (GdkWindow *window) void gdk_window_quartz_hide (GdkWindow *window) { - GdkWindowObject *private = (GdkWindowObject *)window; GdkWindowImplQuartz *impl; /* Make sure we're not stuck in fullscreen mode. */ @@ -1208,7 +1229,7 @@ gdk_window_quartz_hide (GdkWindow *window) _gdk_window_clear_update_area (window); - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (WINDOW_IS_TOPLEVEL (window)) { @@ -1241,7 +1262,6 @@ move_resize_window_internal (GdkWindow *window, gint width, gint height) { - GdkWindowObject *private = (GdkWindowObject *)window; GdkWindowImplQuartz *impl; GdkRectangle old_visible; GdkRectangle new_visible; @@ -1253,12 +1273,12 @@ move_resize_window_internal (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); - if ((x == -1 || (x == private->x)) && - (y == -1 || (y == private->y)) && - (width == -1 || (width == private->width)) && - (height == -1 || (height == private->height))) + if ((x == -1 || (x == window->x)) && + (y == -1 || (y == window->y)) && + (width == -1 || (width == window->width)) && + (height == -1 || (height == window->height))) { return; } @@ -1268,17 +1288,17 @@ move_resize_window_internal (GdkWindow *window, /* The previously visible area of this window in a coordinate * system rooted at the origin of this window. */ - old_visible.x = -private->x; - old_visible.y = -private->y; + old_visible.x = -window->x; + old_visible.y = -window->y; - old_visible.width = private->width; - old_visible.height = private->height; + old_visible.width = window->width; + old_visible.height = window->height; } if (x != -1) { - delta.width = x - private->x; - private->x = x; + delta.width = x - window->x; + window->x = x; } else { @@ -1287,8 +1307,8 @@ move_resize_window_internal (GdkWindow *window, if (y != -1) { - delta.height = y - private->y; - private->y = y; + delta.height = y - window->y; + window->y = y; } else { @@ -1296,10 +1316,10 @@ move_resize_window_internal (GdkWindow *window, } if (width != -1) - private->width = width; + window->width = width; if (height != -1) - private->height = height; + window->height = height; GDK_QUARTZ_ALLOC_POOL; @@ -1309,27 +1329,27 @@ move_resize_window_internal (GdkWindow *window, NSRect frame_rect; gint gx, gy; - _gdk_quartz_window_gdk_xy_to_xy (private->x, private->y + private->height, + _gdk_quartz_window_gdk_xy_to_xy (window->x, window->y + window->height, &gx, &gy); - content_rect = NSMakeRect (gx, gy, private->width, private->height); + content_rect = NSMakeRect (gx, gy, window->width, window->height); frame_rect = [impl->toplevel frameRectForContentRect:content_rect]; [impl->toplevel setFrame:frame_rect display:YES]; } else { - if (!private->input_only) + if (!window->input_only) { NSRect nsrect; - nsrect = NSMakeRect (private->x, private->y, private->width, private->height); + nsrect = NSMakeRect (window->x, window->y, window->width, window->height); /* The newly visible area of this window in a coordinate * system rooted at the origin of this window. */ - new_visible.x = -private->x; - new_visible.y = -private->y; + new_visible.x = -window->x; + new_visible.y = -window->y; new_visible.width = old_visible.width; /* parent has not changed size */ new_visible.height = old_visible.height; /* parent has not changed size */ @@ -1381,7 +1401,7 @@ window_quartz_move (GdkWindow *window, { g_return_if_fail (GDK_IS_WINDOW (window)); - if (((GdkWindowObject *)window)->state & GDK_WINDOW_STATE_FULLSCREEN) + if (window->state & GDK_WINDOW_STATE_FULLSCREEN) return; move_resize_window_internal (window, x, y, -1, -1); @@ -1394,7 +1414,7 @@ window_quartz_resize (GdkWindow *window, { g_return_if_fail (GDK_IS_WINDOW (window)); - if (((GdkWindowObject *)window)->state & GDK_WINDOW_STATE_FULLSCREEN) + if (window->state & GDK_WINDOW_STATE_FULLSCREEN) return; if (width < 1) @@ -1448,7 +1468,7 @@ gdk_window_quartz_reparent (GdkWindow *window, gint x, gint y) { - GdkWindowObject *private, *old_parent_private, *new_parent_private; + GdkWindow *old_parent; GdkWindowImplQuartz *impl, *old_parent_impl, *new_parent_impl; NSView *view, *new_parent_view; @@ -1459,16 +1479,14 @@ gdk_window_quartz_reparent (GdkWindow *window, return FALSE; } - private = GDK_WINDOW_OBJECT (window); - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); view = impl->view; - new_parent_private = GDK_WINDOW_OBJECT (new_parent); - new_parent_impl = GDK_WINDOW_IMPL_QUARTZ (new_parent_private->impl); + new_parent_impl = GDK_WINDOW_IMPL_QUARTZ (new_parent->impl); new_parent_view = new_parent_impl->view; - old_parent_private = GDK_WINDOW_OBJECT (private->parent); - old_parent_impl = GDK_WINDOW_IMPL_QUARTZ (old_parent_private->impl); + old_parent = window->parent; + old_parent_impl = GDK_WINDOW_IMPL_QUARTZ (old_parent->impl); [view retain]; @@ -1477,9 +1495,9 @@ gdk_window_quartz_reparent (GdkWindow *window, [view release]; - private->parent = new_parent_private; + window->parent = new_parent; - if (old_parent_private) + if (old_parent) { old_parent_impl->sorted_children = g_list_remove (old_parent_impl->sorted_children, window); } @@ -1496,14 +1514,12 @@ gdk_window_quartz_reparent (GdkWindow *window, static void update_toplevel_order (void) { - GdkWindowObject *root; GdkWindowImplQuartz *root_impl; NSEnumerator *enumerator; id nswindow; GList *toplevels = NULL; - root = GDK_WINDOW_OBJECT (_gdk_root); - root_impl = GDK_WINDOW_IMPL_QUARTZ (root->impl); + root_impl = GDK_WINDOW_IMPL_QUARTZ (_gdk_root->impl); if (root_impl->sorted_children) return; @@ -1530,11 +1546,9 @@ update_toplevel_order (void) static void clear_toplevel_order (void) { - GdkWindowObject *root; GdkWindowImplQuartz *root_impl; - root = GDK_WINDOW_OBJECT (_gdk_root); - root_impl = GDK_WINDOW_IMPL_QUARTZ (root->impl); + root_impl = GDK_WINDOW_IMPL_QUARTZ (_gdk_root->impl); g_list_free (root_impl->sorted_children); root_impl->sorted_children = NULL; @@ -1550,14 +1564,14 @@ gdk_window_quartz_raise (GdkWindow *window) { GdkWindowImplQuartz *impl; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); [impl->toplevel orderFront:impl->toplevel]; clear_toplevel_order (); } else { - GdkWindowObject *parent = GDK_WINDOW_OBJECT (window)->parent; + GdkWindow *parent = window->parent; if (parent) { @@ -1581,14 +1595,14 @@ gdk_window_quartz_lower (GdkWindow *window) { GdkWindowImplQuartz *impl; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); [impl->toplevel orderBack:impl->toplevel]; clear_toplevel_order (); } else { - GdkWindowObject *parent = GDK_WINDOW_OBJECT (window)->parent; + GdkWindow *parent = window->parent; if (parent) { @@ -1645,18 +1659,15 @@ gdk_window_quartz_get_geometry (GdkWindow *window, gint *x, gint *y, gint *width, - gint *height, - gint *depth) + gint *height) { GdkWindowImplQuartz *impl; - GdkWindowObject *private; NSRect ns_rect; if (GDK_WINDOW_DESTROYED (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); - private = GDK_WINDOW_OBJECT (window); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (window == _gdk_root) { if (x) @@ -1665,9 +1676,9 @@ gdk_window_quartz_get_geometry (GdkWindow *window, *y = 0; if (width) - *width = private->width; + *width = window->width; if (height) - *height = private->height; + *height = window->height; } else if (WINDOW_IS_TOPLEVEL (window)) { @@ -1713,9 +1724,6 @@ gdk_window_quartz_get_geometry (GdkWindow *window, if (height) *height = ns_rect.size.height; } - - if (depth) - *depth = gdk_visual_get_depth (gdk_window_get_visual (window)); } static gint @@ -1725,7 +1733,6 @@ gdk_window_quartz_get_root_coords (GdkWindow *window, gint *root_x, gint *root_y) { - GdkWindowObject *private; int tmp_x = 0, tmp_y = 0; GdkWindow *toplevel; NSRect content_rect; @@ -1751,10 +1758,8 @@ gdk_window_quartz_get_root_coords (GdkWindow *window, return 1; } - private = GDK_WINDOW_OBJECT (window); - toplevel = gdk_window_get_toplevel (window); - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (toplevel)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (toplevel->impl); content_rect = [impl->toplevel contentRectForFrameRect:[impl->toplevel frame]]; @@ -1765,15 +1770,15 @@ gdk_window_quartz_get_root_coords (GdkWindow *window, tmp_x += x; tmp_y += y; - while (private != GDK_WINDOW_OBJECT (toplevel)) + while (window != toplevel) { - if (_gdk_window_has_impl ((GdkWindow *)private)) + if (_gdk_window_has_impl ((GdkWindow *)window)) { - tmp_x += private->x; - tmp_y += private->y; + tmp_x += window->x; + tmp_y += window->y; } - private = private->parent; + window = window->parent; } if (root_x) @@ -1811,10 +1816,9 @@ gdk_window_quartz_get_device_state_helper (GdkWindow *window, gint *y, GdkModifierType *mask) { - GdkWindowObject *toplevel; - GdkWindowObject *private; NSPoint point; gint x_tmp, y_tmp; + GdkWindow *toplevel; GdkWindow *found_window; g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL); @@ -1827,7 +1831,7 @@ gdk_window_quartz_get_device_state_helper (GdkWindow *window, return NULL; } - toplevel = GDK_WINDOW_OBJECT (gdk_window_get_toplevel (window)); + toplevel = gdk_window_get_toplevel (window); *mask = _gdk_quartz_events_get_current_event_mask (); @@ -1843,13 +1847,12 @@ gdk_window_quartz_get_device_state_helper (GdkWindow *window, NSWindow *nswindow; impl = GDK_WINDOW_IMPL_QUARTZ (toplevel->impl); - private = GDK_WINDOW_OBJECT (toplevel); nswindow = impl->toplevel; point = [nswindow mouseLocationOutsideOfEventStream]; x_tmp = point.x; - y_tmp = private->height - point.y; + y_tmp = toplevel->height - point.y; window = (GdkWindow *)toplevel; } @@ -1921,18 +1924,15 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display, &tmp_mask); if (found_window) { - GdkWindowObject *private; - /* The coordinates returned above are relative the root, we want * coordinates relative the window here. */ - private = GDK_WINDOW_OBJECT (found_window); - while (private != GDK_WINDOW_OBJECT (_gdk_root)) + while (found_window != _gdk_root) { - x -= private->x; - y -= private->y; + x -= found_window->x; + y -= found_window->y; - private = private->parent; + found_window = found_window->parent; } *win_x = x; @@ -1950,21 +1950,19 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display, if (get_toplevel) { - GdkWindowObject *w = (GdkWindowObject *)found_window; /* Requested toplevel, find it. */ /* TODO: This can be implemented more efficient by never recursing into children in the first place */ - if (w) + if (found_window) { /* Convert to toplevel */ - while (w->parent != NULL && - w->parent->window_type != GDK_WINDOW_ROOT) + while (found_window->parent != NULL && + found_window->parent->window_type != GDK_WINDOW_ROOT) { - *win_x += w->x; - *win_y += w->y; - w = w->parent; + *win_x += found_window->x; + *win_y += found_window->y; + found_window = found_window->parent; } - found_window = (GdkWindow *)w; } } @@ -1992,7 +1990,7 @@ gdk_window_quartz_get_events (GdkWindow *window) if (GDK_WINDOW_DESTROYED (window)) return 0; else - return GDK_WINDOW_OBJECT (window)->event_mask; + return window->event_mask; } static void @@ -2026,7 +2024,7 @@ gdk_window_set_geometry_hints (GdkWindow *window, !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (((GdkWindowObject *) window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (!impl->toplevel) return; @@ -2103,7 +2101,7 @@ gdk_window_set_title (GdkWindow *window, !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (((GdkWindowObject *)window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (impl->toplevel) { @@ -2135,7 +2133,7 @@ gdk_window_set_transient_for (GdkWindow *window, !WINDOW_IS_TOPLEVEL (window)) return; - window_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + window_impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (!window_impl->toplevel) return; @@ -2149,7 +2147,7 @@ gdk_window_set_transient_for (GdkWindow *window, window_impl->transient_for = NULL; } - parent_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (parent)->impl); + parent_impl = GDK_WINDOW_IMPL_QUARTZ (parent->impl); if (parent_impl->toplevel) { /* We save the parent because it needs to be unset/reset when @@ -2169,7 +2167,7 @@ gdk_window_set_transient_for (GdkWindow *window, * be shown unconditionally here. If it is not shown, the * window will be added in show() instead. */ - if (!(GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_WITHDRAWN)) + if (!(window->state & GDK_WINDOW_STATE_WITHDRAWN)) _gdk_quartz_window_attach_to_parent (window); } } @@ -2206,11 +2204,7 @@ void gdk_window_set_accept_focus (GdkWindow *window, gboolean accept_focus) { - GdkWindowObject *private; - - private = (GdkWindowObject *)window; - - private->accept_focus = accept_focus != FALSE; + window->accept_focus = accept_focus != FALSE; } static gboolean @@ -2229,11 +2223,7 @@ void gdk_window_set_focus_on_map (GdkWindow *window, gboolean focus_on_map) { - GdkWindowObject *private; - - private = (GdkWindowObject *)window; - - private->focus_on_map = focus_on_map != FALSE; + window->focus_on_map = focus_on_map != FALSE; } void @@ -2247,17 +2237,15 @@ void gdk_window_focus (GdkWindow *window, guint32 timestamp) { - GdkWindowObject *private; GdkWindowImplQuartz *impl; - private = (GdkWindowObject*) window; - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (GDK_WINDOW_DESTROYED (window) || !WINDOW_IS_TOPLEVEL (window)) return; - if (private->accept_focus && private->window_type != GDK_WINDOW_TEMP) + if (window->accept_focus && window->window_type != GDK_WINDOW_TEMP) { GDK_QUARTZ_ALLOC_POOL; [impl->toplevel makeKeyAndOrderFront:impl->toplevel]; @@ -2343,7 +2331,7 @@ gdk_window_set_type_hint (GdkWindow *window, !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (((GdkWindowObject *) window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); impl->type_hint = hint; @@ -2362,7 +2350,7 @@ gdk_window_get_type_hint (GdkWindow *window) !WINDOW_IS_TOPLEVEL (window)) return GDK_WINDOW_TYPE_HINT_NORMAL; - return GDK_WINDOW_IMPL_QUARTZ (((GdkWindowObject *) window)->impl)->type_hint; + return GDK_WINDOW_IMPL_QUARTZ (window->impl)->type_hint; } void @@ -2406,7 +2394,6 @@ gdk_window_begin_resize_drag (GdkWindow *window, gint root_y, guint32 timestamp) { - GdkWindowObject *private; GdkWindowImplQuartz *impl; g_return_if_fail (GDK_IS_WINDOW (window)); @@ -2420,8 +2407,7 @@ gdk_window_begin_resize_drag (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; - private = GDK_WINDOW_OBJECT (window); - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (!impl->toplevel) { @@ -2439,15 +2425,13 @@ gdk_window_begin_move_drag (GdkWindow *window, gint root_y, guint32 timestamp) { - GdkWindowObject *private; GdkWindowImplQuartz *impl; if (GDK_WINDOW_DESTROYED (window) || !WINDOW_IS_TOPLEVEL (window)) return; - private = GDK_WINDOW_OBJECT (window); - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (!impl->toplevel) { @@ -2469,14 +2453,12 @@ void gdk_window_get_frame_extents (GdkWindow *window, GdkRectangle *rect) { - GdkWindowObject *private; GdkWindow *toplevel; GdkWindowImplQuartz *impl; NSRect ns_rect; g_return_if_fail (rect != NULL); - private = GDK_WINDOW_OBJECT (window); rect->x = 0; rect->y = 0; @@ -2484,7 +2466,7 @@ gdk_window_get_frame_extents (GdkWindow *window, rect->height = 1; toplevel = gdk_window_get_effective_toplevel (window); - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (toplevel)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (toplevel->impl); ns_rect = [impl->toplevel frame]; @@ -2508,7 +2490,7 @@ gdk_window_set_decorations (GdkWindow *window, !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (decorations == 0 || GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP || impl->type_hint == GDK_WINDOW_TYPE_HINT_SPLASHSCREEN ) @@ -2584,7 +2566,7 @@ gdk_window_get_decorations (GdkWindow *window, !WINDOW_IS_TOPLEVEL (window)) return FALSE; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (decorations) { @@ -2644,7 +2626,7 @@ gdk_window_maximize (GdkWindow *window) !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (GDK_WINDOW_IS_MAPPED (window)) { @@ -2672,7 +2654,7 @@ gdk_window_unmaximize (GdkWindow *window) !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (GDK_WINDOW_IS_MAPPED (window)) { @@ -2700,7 +2682,7 @@ gdk_window_iconify (GdkWindow *window) !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (GDK_WINDOW_IS_MAPPED (window)) { @@ -2728,7 +2710,7 @@ gdk_window_deiconify (GdkWindow *window) !WINDOW_IS_TOPLEVEL (window)) return; - impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); if (GDK_WINDOW_IS_MAPPED (window)) { @@ -2757,7 +2739,6 @@ void gdk_window_fullscreen (GdkWindow *window) { FullscreenSavedGeometry *geometry; - GdkWindowObject *private = (GdkWindowObject *) window; NSRect frame; if (GDK_WINDOW_DESTROYED (window) || @@ -2769,10 +2750,10 @@ gdk_window_fullscreen (GdkWindow *window) { geometry = g_new (FullscreenSavedGeometry, 1); - geometry->x = private->x; - geometry->y = private->y; - geometry->width = private->width; - geometry->height = private->height; + geometry->x = window->x; + geometry->y = window->y; + geometry->width = window->width; + geometry->height = window->height; if (!gdk_window_get_decorations (window, &geometry->decor)) geometry->decor = GDK_DECOR_ALL; @@ -2825,8 +2806,7 @@ gdk_window_unfullscreen (GdkWindow *window) void gdk_window_set_keep_above (GdkWindow *window, gboolean setting) { - GdkWindowObject *private = (GdkWindowObject *) window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); gint level; g_return_if_fail (GDK_IS_WINDOW (window)); @@ -2844,8 +2824,7 @@ gdk_window_set_keep_above (GdkWindow *window, gboolean setting) void gdk_window_set_keep_below (GdkWindow *window, gboolean setting) { - GdkWindowObject *private = (GdkWindowObject *) window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); gint level; g_return_if_fail (GDK_IS_WINDOW (window)); @@ -2923,8 +2902,7 @@ void gdk_window_set_opacity (GdkWindow *window, gdouble opacity) { - GdkWindowObject *private = (GdkWindowObject *) window; - GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (WINDOW_IS_TOPLEVEL (window)); @@ -2960,45 +2938,125 @@ gdk_quartz_window_get_input_shape (GdkWindow *window) return NULL; } + static void -gdk_window_impl_iface_init (GdkWindowImplIface *iface) +gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass) { - iface->show = gdk_window_quartz_show; - iface->hide = gdk_window_quartz_hide; - iface->withdraw = gdk_window_quartz_withdraw; - iface->set_events = gdk_window_quartz_set_events; - iface->get_events = gdk_window_quartz_get_events; - iface->raise = gdk_window_quartz_raise; - iface->lower = gdk_window_quartz_lower; - iface->restack_toplevel = gdk_window_quartz_restack_toplevel; - iface->move_resize = gdk_window_quartz_move_resize; - iface->set_background = gdk_window_quartz_set_background; - iface->reparent = gdk_window_quartz_reparent; - iface->set_device_cursor = gdk_window_quartz_set_device_cursor; - iface->get_geometry = gdk_window_quartz_get_geometry; - iface->get_root_coords = gdk_window_quartz_get_root_coords; - iface->get_device_state = gdk_window_quartz_get_device_state; - iface->shape_combine_region = gdk_window_quartz_shape_combine_region; - iface->input_shape_combine_region = gdk_window_quartz_input_shape_combine_region; - iface->set_static_gravities = gdk_window_quartz_set_static_gravities; - iface->queue_antiexpose = _gdk_quartz_window_queue_antiexpose; - iface->translate = _gdk_quartz_window_translate; - iface->destroy = _gdk_quartz_window_destroy; - iface->resize_cairo_surface = gdk_window_quartz_resize_cairo_surface; - iface->get_shape = gdk_quartz_window_get_shape; - iface->get_input_shape = gdk_quartz_window_get_input_shape; + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GdkWindowImplClass *impl_class = GDK_WINDOW_IMPL_CLASS (klass); + GdkWindowImplQuartzClass *impl_quartz_class = GDK_WINDOW_IMPL_QUARTZ_CLASS (klass); + + parent_class = g_type_class_peek_parent (klass); + + object_class->finalize = gdk_window_impl_quartz_finalize; + + impl_class->ref_cairo_surface = gdk_quartz_ref_cairo_surface; + impl_class->show = gdk_window_quartz_show; + impl_class->hide = gdk_window_quartz_hide; + impl_class->withdraw = gdk_window_quartz_withdraw; + impl_class->set_events = gdk_window_quartz_set_events; + impl_class->get_events = gdk_window_quartz_get_events; + impl_class->raise = gdk_window_quartz_raise; + impl_class->lower = gdk_window_quartz_lower; + impl_class->restack_toplevel = gdk_window_quartz_restack_toplevel; + impl_class->move_resize = gdk_window_quartz_move_resize; + impl_class->set_background = gdk_window_quartz_set_background; + impl_class->reparent = gdk_window_quartz_reparent; + impl_class->set_device_cursor = gdk_window_quartz_set_device_cursor; + impl_class->get_geometry = gdk_window_quartz_get_geometry; + impl_class->get_root_coords = gdk_window_quartz_get_root_coords; + impl_class->get_device_state = gdk_window_quartz_get_device_state; + impl_class->shape_combine_region = gdk_window_quartz_shape_combine_region; + impl_class->input_shape_combine_region = gdk_window_quartz_input_shape_combine_region; + impl_class->set_static_gravities = gdk_window_quartz_set_static_gravities; + impl_class->queue_antiexpose = _gdk_quartz_window_queue_antiexpose; + impl_class->translate = _gdk_quartz_window_translate; + impl_class->destroy = _gdk_quartz_window_destroy; + impl_class->resize_cairo_surface = gdk_window_quartz_resize_cairo_surface; + impl_class->get_shape = gdk_quartz_window_get_shape; + impl_class->get_input_shape = gdk_quartz_window_get_input_shape; + + impl_quartz_class->get_context = gdk_window_impl_quartz_get_context; + impl_quartz_class->release_context = gdk_window_impl_quartz_release_context; +} + +GType +_gdk_window_impl_quartz_get_type (void) +{ + static GType object_type = 0; + + if (!object_type) + { + const GTypeInfo object_info = + { + sizeof (GdkWindowImplQuartzClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) gdk_window_impl_quartz_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GdkWindowImplQuartz), + 0, /* n_preallocs */ + (GInstanceInitFunc) gdk_window_impl_quartz_init, + }; + + const GInterfaceInfo paintable_info = + { + (GInterfaceInitFunc) gdk_window_impl_quartz_paintable_init, + NULL, + NULL + }; + + object_type = g_type_register_static (GDK_TYPE_WINDOW_IMPL, + "GdkWindowImplQuartz", + &object_info, 0); + g_type_add_interface_static (object_type, + GDK_TYPE_PAINTABLE, + &paintable_info); + } + + return object_type; +} + +CGContextRef +gdk_quartz_window_get_context (GdkWindowImplQuartz *window, + gboolean antialias) +{ + if (!GDK_WINDOW_IMPL_QUARTZ_GET_CLASS (window)->get_context) + { + g_warning ("%s doesn't implement GdkWindowImplQuartzClass::get_context()", + G_OBJECT_TYPE_NAME (window)); + return NULL; + } + + return GDK_WINDOW_IMPL_QUARTZ_GET_CLASS (window)->get_context (window, antialias); +} + +void +gdk_quartz_window_release_context (GdkWindowImplQuartz *window, + CGContextRef cg_context) +{ + if (!GDK_WINDOW_IMPL_QUARTZ_GET_CLASS (window)->release_context) + { + g_warning ("%s doesn't implement GdkWindowImplQuartzClass::release_context()", + G_OBJECT_TYPE_NAME (window)); + return; + } + + GDK_WINDOW_IMPL_QUARTZ_GET_CLASS (window)->release_context (window, cg_context); } + static CGContextRef -gdk_root_window_impl_quartz_get_context (GdkDrawable *drawable, - gboolean antialias) +gdk_root_window_impl_quartz_get_context (GdkWindowImplQuartz *window, + gboolean antialias) { - GdkDrawableImplQuartz *drawable_impl = GDK_DRAWABLE_IMPL_QUARTZ (drawable); CGColorSpaceRef colorspace; CGContextRef cg_context; + GdkWindowImplQuartz *window_impl = GDK_WINDOW_IMPL_QUARTZ (window); - if (GDK_WINDOW_DESTROYED (drawable_impl->wrapper)) + if (GDK_WINDOW_DESTROYED (window_impl->wrapper)) return NULL; /* We do not have the notion of a root window on OS X. We fake this @@ -3014,8 +3072,8 @@ gdk_root_window_impl_quartz_get_context (GdkDrawable *drawable, } static void -gdk_root_window_impl_quartz_release_context (GdkDrawable *drawable, - CGContextRef cg_context) +gdk_root_window_impl_quartz_release_context (GdkWindowImplQuartz *window, + CGContextRef cg_context) { CGContextRelease (cg_context); } @@ -3023,12 +3081,12 @@ gdk_root_window_impl_quartz_release_context (GdkDrawable *drawable, static void gdk_root_window_impl_quartz_class_init (GdkRootWindowImplQuartzClass *klass) { - GdkDrawableImplQuartzClass *drawable_quartz_class = GDK_DRAWABLE_IMPL_QUARTZ_CLASS (klass); + GdkWindowImplQuartzClass *window_quartz_class = GDK_WINDOW_IMPL_QUARTZ_CLASS (klass); root_window_parent_class = g_type_class_peek_parent (klass); - drawable_quartz_class->get_context = gdk_root_window_impl_quartz_get_context; - drawable_quartz_class->release_context = gdk_root_window_impl_quartz_release_context; + window_quartz_class->get_context = gdk_root_window_impl_quartz_get_context; + window_quartz_class->release_context = gdk_root_window_impl_quartz_release_context; } static void diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h index b591eebc81..f55bbb33e9 100644 --- a/gdk/quartz/gdkwindow-quartz.h +++ b/gdk/quartz/gdkwindow-quartz.h @@ -21,9 +21,9 @@ #ifndef __GDK_WINDOW_QUARTZ_H__ #define __GDK_WINDOW_QUARTZ_H__ -#include #import #import +#include "gdk/gdkwindowimpl.h" G_BEGIN_DECLS @@ -42,7 +42,9 @@ typedef struct _GdkWindowImplQuartzClass GdkWindowImplQuartzClass; struct _GdkWindowImplQuartz { - GdkDrawableImplQuartz parent_instance; + GdkWindowImpl parent_instance; + + GdkWindow *wrapper; NSWindow *toplevel; NSTrackingRectTag tracking_rect; @@ -60,15 +62,26 @@ struct _GdkWindowImplQuartz GList *sorted_children; cairo_region_t *needs_display_region; + + cairo_surface_t *cairo_surface; }; struct _GdkWindowImplQuartzClass { - GdkDrawableImplQuartzClass parent_class; + GdkWindowImplClass parent_class; + + CGContextRef (* get_context) (GdkWindowImplQuartz *window, + gboolean antialias); + void (* release_context) (GdkWindowImplQuartz *window, + CGContextRef cg_context); }; GType _gdk_window_impl_quartz_get_type (void); +CGContextRef gdk_quartz_window_get_context (GdkWindowImplQuartz *window, + gboolean antialias); +void gdk_quartz_window_release_context (GdkWindowImplQuartz *window, + CGContextRef context); /* Root window implementation for Quartz */ diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index bcbdca33a1..549f7a38ac 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -1800,8 +1800,7 @@ gdk_win32_window_get_geometry (GdkWindow *window, gint *x, gint *y, gint *width, - gint *height, - gint *depth) + gint *height) { if (!window) window = _gdk_root; @@ -1848,8 +1847,6 @@ gdk_win32_window_get_geometry (GdkWindow *window, *width = rect.right - rect.left; if (height) *height = rect.bottom - rect.top; - if (depth) - *depth = gdk_window_get_visual (window)->depth; GDK_NOTE (MISC, g_print ("gdk_win32_window_get_geometry: %p: %ldx%ldx%d@%+ld%+ld\n", GDK_WINDOW_HWND (window), diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 0c94a6456b..f8f2e139af 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -559,7 +559,7 @@ gdk_window_cache_new (GdkScreen *screen) toplevel_windows = gdk_screen_get_toplevel_windows (screen); for (list = toplevel_windows; list; list = list->next) { window = GDK_WINDOW (list->data); - gdk_window_get_geometry (window, &x, &y, &width, &height, NULL); + gdk_window_get_geometry (window, &x, &y, &width, &height); gdk_window_cache_add (result, GDK_WINDOW_XID (window), x, y, width, height, gdk_window_is_visible (window)); diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 5927378839..362ec485a6 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -450,7 +450,7 @@ gdk_x11_screen_get_monitor_output (GdkScreen *screen, * gdk_screen_get_monitor_geometry: * @screen: a #GdkScreen * @monitor_num: the monitor number, between 0 and gdk_screen_get_n_monitors (screen) - * @dest: (out) (allow-none): a #GdkRectangle to be filled with the monitor geometry + * @dest: (out caller-allocates) (allow-none): a #GdkRectangle to be filled with the monitor geometry * * Retrieves the #GdkRectangle representing the size and position of * the individual monitor within the entire screen area. diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 725f77a61b..d3b1992855 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -2739,8 +2739,7 @@ gdk_window_x11_get_geometry (GdkWindow *window, gint *x, gint *y, gint *width, - gint *height, - gint *depth) + gint *height) { Window root; gint tx; @@ -2764,8 +2763,6 @@ gdk_window_x11_get_geometry (GdkWindow *window, *width = twidth; if (height) *height = theight; - if (depth) - *depth = tdepth; } } @@ -3229,7 +3226,7 @@ _gdk_windowing_window_at_device_position (GdkDisplay *display, pointer_window = child; break; } - gdk_window_get_geometry (window, NULL, NULL, &width, &height, NULL); + gdk_window_get_geometry (window, NULL, NULL, &width, &height); if (winx >= 0 && winy >= 0 && winx < width && winy < height) { /* A childless toplevel, or below another window? */ @@ -5096,7 +5093,7 @@ calculate_unmoving_origin (MoveResizeData *mv_resize) { gdk_window_get_frame_extents (mv_resize->moveresize_window, &rect); gdk_window_get_geometry (mv_resize->moveresize_window, - NULL, NULL, &width, &height, NULL); + NULL, NULL, &width, &height); switch (mv_resize->moveresize_geometry.win_gravity) { diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 75fe3fbca4..cbf8b3d89e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -432,7 +432,6 @@ gtk_private_h_sources = \ gtktoolpaletteprivate.h \ gtktreedatalist.h \ gtktreeprivate.h \ - gtkwindow-decorate.h \ gtkwidgetprivate.h \ $(gtk_clipboard_dnd_h_sources) \ $(gtk_appchooser_impl_h_sources) @@ -674,7 +673,6 @@ gtk_base_c_sources = \ gtkvseparator.c \ gtkwidget.c \ gtkwidgetpath.c \ - gtkwindow-decorate.c \ gtkwindow.c \ $(gtk_clipboard_dnd_c_sources) \ $(gtk_appchooser_impl_c_sources) diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 2761dee8ef..8489ee1399 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -265,6 +265,7 @@ gtk_border_copy gtk_border_free gtk_border_get_type G_GNUC_CONST gtk_border_new G_GNUC_MALLOC +gtk_border_style_get_type G_GNUC_CONST gtk_box_get_homogeneous gtk_box_get_spacing gtk_box_get_type G_GNUC_CONST @@ -656,6 +657,7 @@ gtk_container_get_focus_chain gtk_container_get_focus_child gtk_container_get_focus_hadjustment gtk_container_get_focus_vadjustment +gtk_container_get_path_for_child gtk_container_get_resize_mode gtk_container_get_type G_GNUC_CONST gtk_container_propagate_draw @@ -670,16 +672,28 @@ gtk_container_set_reallocate_redraws gtk_container_set_resize_mode gtk_container_unset_focus_chain gtk_corner_type_get_type G_GNUC_CONST +gtk_css_provider_error_get_type +gtk_css_provider_error_quark +gtk_css_provider_get_default +gtk_css_provider_get_named +gtk_css_provider_get_type +gtk_css_provider_load_from_data +gtk_css_provider_load_from_file +gtk_css_provider_load_from_path +gtk_css_provider_new gtk_custom_paper_unix_dialog_get_type G_GNUC_CONST gtk_debug_flag_get_type G_GNUC_CONST -gtk_decorated_window_calculate_frame_size -gtk_decorated_window_init -gtk_decorated_window_move_resize_window -gtk_decorated_window_set_title gtk_delete_type_get_type G_GNUC_CONST gtk_dest_defaults_get_type G_GNUC_CONST gtk_device_grab_add gtk_device_grab_remove +gtk_gradient_add_color_stop +gtk_gradient_get_type +gtk_gradient_new_linear +gtk_gradient_new_radial +gtk_gradient_ref +gtk_gradient_resolve +gtk_gradient_unref gtk_dialog_add_action_widget gtk_dialog_add_button gtk_dialog_add_buttons G_GNUC_NULL_TERMINATED @@ -1097,6 +1111,7 @@ gtk_icon_info_get_filename gtk_icon_info_get_type G_GNUC_CONST gtk_icon_info_load_icon gtk_icon_info_load_symbolic +gtk_icon_info_load_symbolic_for_context gtk_icon_info_load_symbolic_for_style gtk_icon_info_new_for_pixbuf gtk_icon_info_set_raw_coordinates @@ -1312,6 +1327,7 @@ gtk_invisible_get_type G_GNUC_CONST gtk_invisible_new gtk_invisible_new_for_screen gtk_invisible_set_screen +gtk_junction_sides_get_type G_GNUC_CONST gtk_justification_get_type G_GNUC_CONST gtk_key_snooper_install gtk_key_snooper_remove @@ -1494,6 +1510,13 @@ gtk_misc_get_padding gtk_misc_get_type G_GNUC_CONST gtk_misc_set_alignment gtk_misc_set_padding +gtk_modifier_style_get_type +gtk_modifier_style_map_color +gtk_modifier_style_new +gtk_modifier_style_set_background_color +gtk_modifier_style_set_color +gtk_modifier_style_set_color_property +gtk_modifier_style_set_font gtk_mount_operation_get_parent gtk_mount_operation_get_screen gtk_mount_operation_get_type G_GNUC_CONST @@ -2121,7 +2144,23 @@ gtk_recent_manager_new gtk_recent_manager_purge_items gtk_recent_manager_remove_item gtk_recent_sort_type_get_type G_GNUC_CONST +gtk_region_flags_get_type G_GNUC_CONST gtk_relief_style_get_type G_GNUC_CONST +gtk_render_activity +gtk_render_arrow +gtk_render_background +gtk_render_check +gtk_render_expander +gtk_render_extension +gtk_render_focus +gtk_render_frame +gtk_render_frame_gap +gtk_render_handle +gtk_render_icon_pixbuf +gtk_render_layout +gtk_render_line +gtk_render_option +gtk_render_slider gtk_requisition_copy gtk_requisition_free gtk_requisition_get_type G_GNUC_CONST @@ -2287,6 +2326,7 @@ gtk_spinner_new gtk_spinner_start gtk_spinner_stop gtk_spin_type_get_type G_GNUC_CONST +gtk_state_flags_get_type G_GNUC_CONST gtk_state_type_get_type G_GNUC_CONST gtk_statusbar_get_context_id gtk_statusbar_get_message_area @@ -2344,17 +2384,94 @@ gtk_switch_new gtk_switch_set_active gtk_style_apply_default_background gtk_style_attach +gtk_style_context_add_class +gtk_style_context_add_provider +gtk_style_context_add_provider_for_screen +gtk_style_context_add_region +gtk_style_context_get +gtk_style_context_get_background_color +gtk_style_context_get_border +gtk_style_context_get_border_color +gtk_style_context_get_color +gtk_style_context_get_direction +gtk_style_context_get_junction_sides +gtk_style_context_get_margin +gtk_style_context_get_padding +gtk_style_context_get_path +gtk_style_context_get_property +gtk_style_context_get_screen +gtk_style_context_get_state +gtk_style_context_get_style +gtk_style_context_get_style_property +gtk_style_context_get_style_valist +gtk_style_context_get_type +gtk_style_context_get_valist +gtk_style_context_has_class +gtk_style_context_has_region +gtk_style_context_invalidate +gtk_style_context_list_classes +gtk_style_context_list_regions +gtk_style_context_lookup_color +gtk_style_context_lookup_icon_set +gtk_style_context_new +gtk_style_context_notify_state_change +gtk_style_context_pop_animatable_region +gtk_style_context_push_animatable_region +gtk_style_context_remove_class +gtk_style_context_remove_provider +gtk_style_context_remove_provider_for_screen +gtk_style_context_remove_region +gtk_style_context_reset_widgets +gtk_style_context_restore +gtk_style_context_save +gtk_style_context_set_background +gtk_style_context_set_direction +gtk_style_context_set_junction_sides +gtk_style_context_set_path +gtk_style_context_set_screen +gtk_style_context_set_state +gtk_style_context_state_is_running gtk_style_copy gtk_style_detach gtk_style_get gtk_style_get_style_property gtk_style_get_type G_GNUC_CONST gtk_style_get_valist +gtk_style_has_context gtk_style_lookup_color gtk_style_lookup_icon_set gtk_style_new +gtk_style_properties_clear +gtk_style_properties_get +gtk_style_properties_get_property +gtk_style_properties_get_style +gtk_style_properties_get_type +gtk_style_properties_get_valist +gtk_style_properties_lookup_color +gtk_style_properties_lookup_property +gtk_style_properties_map_color +gtk_style_properties_merge +gtk_style_properties_new +gtk_style_properties_register_property +gtk_style_properties_set +gtk_style_properties_set_property +gtk_style_properties_set_valist +gtk_style_properties_unset_property +gtk_style_provider_get_icon_factory +gtk_style_provider_get_style +gtk_style_provider_get_style_property +gtk_style_provider_get_type gtk_style_render_icon gtk_style_set_background +gtk_symbolic_color_get_type +gtk_symbolic_color_new_alpha +gtk_symbolic_color_new_literal +gtk_symbolic_color_new_mix +gtk_symbolic_color_new_name +gtk_symbolic_color_new_shade +gtk_symbolic_color_ref +gtk_symbolic_color_resolve +gtk_symbolic_color_unref gtk_table_attach gtk_table_attach_defaults gtk_table_get_col_spacing @@ -2728,6 +2845,31 @@ gtk_text_window_type_get_type G_GNUC_CONST gtk_theme_engine_create_rc_style gtk_theme_engine_get gtk_theme_engine_get_type G_GNUC_CONST +gtk_theming_engine_get +gtk_theming_engine_get_background_color +gtk_theming_engine_get_border +gtk_theming_engine_get_border_color +gtk_theming_engine_get_color +gtk_theming_engine_get_direction +gtk_theming_engine_get_junction_sides +gtk_theming_engine_get_margin +gtk_theming_engine_get_padding +gtk_theming_engine_get_path +gtk_theming_engine_get_property +gtk_theming_engine_get_screen +gtk_theming_engine_get_state +gtk_theming_engine_get_style +gtk_theming_engine_get_style_property +gtk_theming_engine_get_style_valist +gtk_theming_engine_get_type +gtk_theming_engine_get_valist +gtk_theming_engine_has_class +gtk_theming_engine_has_region +gtk_theming_engine_load +gtk_theming_engine_lookup_color +gtk_theming_engine_register_property +gtk_theming_engine_state_is_running +gtk_theming_module_get_type gtk_toggle_action_get_active gtk_toggle_action_get_draw_as_radio gtk_toggle_action_get_type G_GNUC_CONST @@ -3279,6 +3421,7 @@ gtk_widget_get_no_show_all gtk_widget_get_pango_context gtk_widget_get_parent gtk_widget_get_parent_window +gtk_widget_get_path gtk_widget_get_pointer gtk_widget_get_preferred_height gtk_widget_get_preferred_height_for_width @@ -3295,7 +3438,9 @@ gtk_widget_get_sensitive gtk_widget_get_settings gtk_widget_get_size_request gtk_widget_get_state +gtk_widget_get_state_flags gtk_widget_get_style +gtk_widget_get_style_context gtk_widget_get_support_multidevice gtk_widget_get_tooltip_markup gtk_widget_get_tooltip_text @@ -3342,9 +3487,38 @@ gtk_widget_modify_text gtk_widget_new gtk_widget_override_background_color gtk_widget_override_color +gtk_widget_override_cursor gtk_widget_override_font gtk_widget_override_symbolic_color gtk_widget_path +gtk_widget_path_append_type +gtk_widget_path_copy +gtk_widget_path_free +gtk_widget_path_get_type G_GNUC_CONST +gtk_widget_path_get_widget_type +gtk_widget_path_has_parent +gtk_widget_path_is_type +gtk_widget_path_iter_add_class +gtk_widget_path_iter_add_region +gtk_widget_path_iter_clear_classes +gtk_widget_path_iter_clear_regions +gtk_widget_path_iter_get_name +gtk_widget_path_iter_get_widget_type +gtk_widget_path_iter_has_class +gtk_widget_path_iter_has_name +gtk_widget_path_iter_has_qclass +gtk_widget_path_iter_has_qname +gtk_widget_path_iter_has_qregion +gtk_widget_path_iter_has_region +gtk_widget_path_iter_list_classes +gtk_widget_path_iter_list_regions +gtk_widget_path_iter_remove_class +gtk_widget_path_iter_remove_region +gtk_widget_path_iter_set_name +gtk_widget_path_iter_set_widget_type +gtk_widget_path_length +gtk_widget_path_new +gtk_widget_path_prepend_type gtk_widget_pop_composite_child gtk_widget_push_composite_child gtk_widget_queue_compute_expand @@ -3362,6 +3536,7 @@ gtk_widget_render_icon_pixbuf gtk_widget_reparent gtk_widget_reset_rc_styles gtk_widget_reset_shapes +gtk_widget_reset_style gtk_widget_send_expose gtk_widget_send_focus_change gtk_widget_set_accel_path @@ -3397,6 +3572,7 @@ gtk_widget_set_redraw_on_allocate gtk_widget_set_sensitive gtk_widget_set_size_request gtk_widget_set_state +gtk_widget_set_state_flags gtk_widget_set_style gtk_widget_set_support_multidevice gtk_widget_set_tooltip_markup @@ -3424,6 +3600,7 @@ gtk_widget_trigger_tooltip_query gtk_widget_unmap gtk_widget_unparent gtk_widget_unrealize +gtk_widget_unset_state_flags #ifdef GDK_WINDOWING_WIN32 gtk_win32_embed_widget_get_type G_GNUC_CONST #endif diff --git a/gtk/gtk9slice.c b/gtk/gtk9slice.c index c3e824b4d5..1f2e517131 100644 --- a/gtk/gtk9slice.c +++ b/gtk/gtk9slice.c @@ -44,18 +44,18 @@ struct Gtk9Slice gint ref_count; }; -G_DEFINE_BOXED_TYPE (Gtk9Slice, gtk_9slice, - gtk_9slice_ref, gtk_9slice_unref) +G_DEFINE_BOXED_TYPE (Gtk9Slice, _gtk_9slice, + _gtk_9slice_ref, _gtk_9slice_unref) Gtk9Slice * -gtk_9slice_new (GdkPixbuf *pixbuf, - gdouble distance_top, - gdouble distance_bottom, - gdouble distance_left, - gdouble distance_right, - GtkSliceSideModifier horizontal_modifier, - GtkSliceSideModifier vertical_modifier) +_gtk_9slice_new (GdkPixbuf *pixbuf, + gdouble distance_top, + gdouble distance_bottom, + gdouble distance_left, + gdouble distance_right, + GtkSliceSideModifier horizontal_modifier, + GtkSliceSideModifier vertical_modifier) { Gtk9Slice *slice; cairo_surface_t *surface; @@ -264,12 +264,12 @@ render_corner (cairo_t *cr, } void -gtk_9slice_render (Gtk9Slice *slice, - cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height) +_gtk_9slice_render (Gtk9Slice *slice, + cairo_t *cr, + gdouble x, + gdouble y, + gdouble width, + gdouble height) { int img_width, img_height; cairo_surface_t *surface; @@ -347,7 +347,7 @@ gtk_9slice_render (Gtk9Slice *slice, } Gtk9Slice * -gtk_9slice_ref (Gtk9Slice *slice) +_gtk_9slice_ref (Gtk9Slice *slice) { g_return_val_if_fail (slice != NULL, NULL); @@ -356,7 +356,7 @@ gtk_9slice_ref (Gtk9Slice *slice) } void -gtk_9slice_unref (Gtk9Slice *slice) +_gtk_9slice_unref (Gtk9Slice *slice) { g_return_if_fail (slice != NULL); diff --git a/gtk/gtk9slice.h b/gtk/gtk9slice.h index 10e3df079d..72b5efd435 100644 --- a/gtk/gtk9slice.h +++ b/gtk/gtk9slice.h @@ -27,32 +27,32 @@ G_BEGIN_DECLS /* Dummy typedefs */ typedef struct Gtk9Slice Gtk9Slice; -#define GTK_TYPE_9SLICE (gtk_9slice_get_type ()) +#define GTK_TYPE_9SLICE (_gtk_9slice_get_type ()) typedef enum { GTK_SLICE_REPEAT, GTK_SLICE_STRETCH } GtkSliceSideModifier; -GType gtk_9slice_get_type (void) G_GNUC_CONST; +GType _gtk_9slice_get_type (void) G_GNUC_CONST; -Gtk9Slice * gtk_9slice_new (GdkPixbuf *pixbuf, - gdouble distance_top, - gdouble distance_bottom, - gdouble distance_left, - gdouble distance_right, - GtkSliceSideModifier horizontal_modifier, - GtkSliceSideModifier vertical_modifier); +Gtk9Slice * _gtk_9slice_new (GdkPixbuf *pixbuf, + gdouble distance_top, + gdouble distance_bottom, + gdouble distance_left, + gdouble distance_right, + GtkSliceSideModifier horizontal_modifier, + GtkSliceSideModifier vertical_modifier); -Gtk9Slice * gtk_9slice_ref (Gtk9Slice *slice); -void gtk_9slice_unref (Gtk9Slice *slice); +Gtk9Slice * _gtk_9slice_ref (Gtk9Slice *slice); +void _gtk_9slice_unref (Gtk9Slice *slice); -void gtk_9slice_render (Gtk9Slice *slice, - cairo_t *cr, - gdouble x, - gdouble y, - gdouble width, - gdouble height); +void _gtk_9slice_render (Gtk9Slice *slice, + cairo_t *cr, + gdouble x, + gdouble y, + gdouble width, + gdouble height); G_END_DECLS diff --git a/gtk/gtkanimationdescription.c b/gtk/gtkanimationdescription.c index 785018ad37..f46ab4bef3 100644 --- a/gtk/gtkanimationdescription.c +++ b/gtk/gtkanimationdescription.c @@ -30,9 +30,9 @@ struct GtkAnimationDescription }; GtkAnimationDescription * -gtk_animation_description_new (gdouble duration, - GtkTimelineProgressType progress_type, - gboolean loop) +_gtk_animation_description_new (gdouble duration, + GtkTimelineProgressType progress_type, + gboolean loop) { GtkAnimationDescription *desc; @@ -46,32 +46,32 @@ gtk_animation_description_new (gdouble duration, } gdouble -gtk_animation_description_get_duration (GtkAnimationDescription *desc) +_gtk_animation_description_get_duration (GtkAnimationDescription *desc) { return desc->duration; } GtkTimelineProgressType -gtk_animation_description_get_progress_type (GtkAnimationDescription *desc) +_gtk_animation_description_get_progress_type (GtkAnimationDescription *desc) { return desc->progress_type; } gboolean -gtk_animation_description_get_loop (GtkAnimationDescription *desc) +_gtk_animation_description_get_loop (GtkAnimationDescription *desc) { return (desc->loop != 0); } GtkAnimationDescription * -gtk_animation_description_ref (GtkAnimationDescription *desc) +_gtk_animation_description_ref (GtkAnimationDescription *desc) { desc->ref_count++; return desc; } void -gtk_animation_description_unref (GtkAnimationDescription *desc) +_gtk_animation_description_unref (GtkAnimationDescription *desc) { desc->ref_count--; @@ -80,7 +80,7 @@ gtk_animation_description_unref (GtkAnimationDescription *desc) } GtkAnimationDescription * -gtk_animation_description_from_string (const gchar *str) +_gtk_animation_description_from_string (const gchar *str) { gchar timing_function[16] = { 0, }; gchar duration_unit[3] = { 0, }; @@ -120,18 +120,18 @@ gtk_animation_description_from_string (const gchar *str) return NULL; } - return gtk_animation_description_new ((gdouble) duration, progress_type, loop); + return _gtk_animation_description_new ((gdouble) duration, progress_type, loop); } GType -gtk_animation_description_get_type (void) +_gtk_animation_description_get_type (void) { static GType type = 0; if (G_UNLIKELY (!type)) type = g_boxed_type_register_static (I_("GtkAnimationDescription"), - (GBoxedCopyFunc) gtk_animation_description_ref, - (GBoxedFreeFunc) gtk_animation_description_unref); + (GBoxedCopyFunc) _gtk_animation_description_ref, + (GBoxedFreeFunc) _gtk_animation_description_unref); return type; } diff --git a/gtk/gtkanimationdescription.h b/gtk/gtkanimationdescription.h index 34fc8fcb95..7bff674cc1 100644 --- a/gtk/gtkanimationdescription.h +++ b/gtk/gtkanimationdescription.h @@ -27,22 +27,22 @@ G_BEGIN_DECLS /* Dummy typedefs */ typedef struct GtkAnimationDescription GtkAnimationDescription; -#define GTK_TYPE_ANIMATION_DESCRIPTION (gtk_animation_description_get_type ()) +#define GTK_TYPE_ANIMATION_DESCRIPTION (_gtk_animation_description_get_type ()) -GType gtk_animation_description_get_type (void) G_GNUC_CONST; +GType _gtk_animation_description_get_type (void) G_GNUC_CONST; -GtkAnimationDescription * gtk_animation_description_new (gdouble duration, - GtkTimelineProgressType progress_type, - gboolean loop); +GtkAnimationDescription * _gtk_animation_description_new (gdouble duration, + GtkTimelineProgressType progress_type, + gboolean loop); -gdouble gtk_animation_description_get_duration (GtkAnimationDescription *desc); -GtkTimelineProgressType gtk_animation_description_get_progress_type (GtkAnimationDescription *desc); -gboolean gtk_animation_description_get_loop (GtkAnimationDescription *desc); +gdouble _gtk_animation_description_get_duration (GtkAnimationDescription *desc); +GtkTimelineProgressType _gtk_animation_description_get_progress_type (GtkAnimationDescription *desc); +gboolean _gtk_animation_description_get_loop (GtkAnimationDescription *desc); -GtkAnimationDescription * gtk_animation_description_ref (GtkAnimationDescription *desc); -void gtk_animation_description_unref (GtkAnimationDescription *desc); +GtkAnimationDescription * _gtk_animation_description_ref (GtkAnimationDescription *desc); +void _gtk_animation_description_unref (GtkAnimationDescription *desc); -GtkAnimationDescription * gtk_animation_description_from_string (const gchar *str); +GtkAnimationDescription * _gtk_animation_description_from_string (const gchar *str); G_END_DECLS diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index 83cf7e00e4..60532bb278 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -108,7 +108,7 @@ search_for_mimetype_ready_cb (GObject *source, GtkAppChooserDialog *self = user_data; GError *error = NULL; - gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error); + _gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error); if (error != NULL) { @@ -128,11 +128,11 @@ online_button_clicked_cb (GtkButton *b, { GtkAppChooserDialog *self = user_data; - gtk_app_chooser_online_search_for_mimetype_async (self->priv->online, - self->priv->content_type, - GTK_WINDOW (self), - search_for_mimetype_ready_cb, - self); + _gtk_app_chooser_online_search_for_mimetype_async (self->priv->online, + self->priv->content_type, + GTK_WINDOW (self), + search_for_mimetype_ready_cb, + self); } static void @@ -142,7 +142,7 @@ app_chooser_online_get_default_ready_cb (GObject *source, { GtkAppChooserDialog *self = user_data; - self->priv->online = gtk_app_chooser_online_get_default_finish (source, res); + self->priv->online = _gtk_app_chooser_online_get_default_finish (source, res); if (self->priv->online != NULL) { @@ -164,7 +164,7 @@ app_chooser_online_get_default_ready_cb (GObject *source, static void ensure_online_button (GtkAppChooserDialog *self) { - gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb, self); + _gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb, self); } /* An application is valid if: diff --git a/gtk/gtkappchooseronline.c b/gtk/gtkappchooseronline.c index 71267ca7f5..99454cd5ee 100644 --- a/gtk/gtkappchooseronline.c +++ b/gtk/gtkappchooseronline.c @@ -30,20 +30,18 @@ #include -#define gtk_app_chooser_online_get_type _gtk_app_chooser_online_get_type -static void gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface); -G_DEFINE_INTERFACE_WITH_CODE (GtkAppChooserOnline, gtk_app_chooser_online, G_TYPE_OBJECT, +G_DEFINE_INTERFACE_WITH_CODE (GtkAppChooserOnline, _gtk_app_chooser_online, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_ASYNC_INITABLE);) static void -gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface) +_gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface) { /* do nothing */ } GtkAppChooserOnline * -gtk_app_chooser_online_get_default_finish (GObject *source, - GAsyncResult *result) +_gtk_app_chooser_online_get_default_finish (GObject *source, + GAsyncResult *result) { GtkAppChooserOnline *retval; @@ -51,11 +49,11 @@ gtk_app_chooser_online_get_default_finish (GObject *source, result, NULL)); return retval; -} +} void -gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback, - gpointer user_data) +_gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback, + gpointer user_data) { GIOExtensionPoint *ep; GIOExtension *extension; @@ -76,11 +74,11 @@ gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback, } void -gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, - const gchar *content_type, - GtkWindow *parent, - GAsyncReadyCallback callback, - gpointer user_data) +_gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, + const gchar *content_type, + GtkWindow *parent, + GAsyncReadyCallback callback, + gpointer user_data) { GtkAppChooserOnlineInterface *iface; @@ -92,9 +90,9 @@ gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, } gboolean -gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, - GAsyncResult *res, - GError **error) +_gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, + GAsyncResult *res, + GError **error) { GtkAppChooserOnlineInterface *iface; diff --git a/gtk/gtkappchooseronline.h b/gtk/gtkappchooseronline.h index d0eca3b9e0..a8316c1e1e 100644 --- a/gtk/gtkappchooseronline.h +++ b/gtk/gtkappchooseronline.h @@ -54,20 +54,20 @@ struct _GtkAppChooserOnlineInterface { GError **error); }; -GType _gtk_app_chooser_online_get_type (void) G_GNUC_CONST; +GType _gtk_app_chooser_online_get_type (void) G_GNUC_CONST; -void gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback, - gpointer user_data); -GtkAppChooserOnline * gtk_app_chooser_online_get_default_finish (GObject *source, +void _gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback, + gpointer user_data); +GtkAppChooserOnline * _gtk_app_chooser_online_get_default_finish (GObject *source, GAsyncResult *result); -void gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, - const gchar *content_type, - GtkWindow *parent, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, - GAsyncResult *res, - GError **error); +void _gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, + const gchar *content_type, + GtkWindow *parent, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean _gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, + GAsyncResult *res, + GError **error); #endif /* __GTK_APP_CHOOSER_ONLINE_H__ */ diff --git a/gtk/gtkappchooseronlinepk.c b/gtk/gtkappchooseronlinepk.c index c498546890..4b6df0ec22 100644 --- a/gtk/gtkappchooseronlinepk.c +++ b/gtk/gtkappchooseronlinepk.c @@ -134,7 +134,7 @@ pk_search_mime_async (GtkAppChooserOnline *obj, self->priv->result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - gtk_app_chooser_online_search_for_mimetype_async); + _gtk_app_chooser_online_search_for_mimetype_async); #ifdef GDK_WINDOWING_X11 window = gtk_widget_get_window (GTK_WIDGET (parent)); @@ -243,7 +243,7 @@ app_chooser_online_pk_init_async (GAsyncInitable *init, self->priv->init_result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - gtk_app_chooser_online_get_default_async); + _gtk_app_chooser_online_get_default_async); self->priv->watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c index 95510e9a35..5de7c3e7e0 100644 --- a/gtk/gtkappchooserwidget.c +++ b/gtk/gtkappchooserwidget.c @@ -402,13 +402,13 @@ gtk_app_chooser_sort_func (GtkTreeModel *model, /* they're both recommended/falback or not, so if one is a heading, wins */ if (a_heading) { - return -1; + retval = -1; goto out; } if (b_heading) { - return 1; + retval = 1; goto out; } diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index c3baf9cf16..2b0ac71f8c 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -2478,7 +2478,7 @@ gtk_assistant_get_accessible (GtkWidget *widget) typedef struct _GtkAssistantAccessible GtkAssistantAccessible; typedef struct _GtkAssistantAccessibleClass GtkAssistantAccessibleClass; -ATK_DEFINE_TYPE (GtkAssistantAccessible, gtk_assistant_accessible, GTK_TYPE_ASSISTANT); +ATK_DEFINE_TYPE (GtkAssistantAccessible, _gtk_assistant_accessible, GTK_TYPE_ASSISTANT); static gint gtk_assistant_accessible_get_n_children (AtkObject *accessible) @@ -2537,7 +2537,7 @@ gtk_assistant_accessible_ref_child (AtkObject *accessible, } static void -gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass) +_gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass) { AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); @@ -2546,7 +2546,7 @@ gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass) } static void -gtk_assistant_accessible_init (GtkAssistantAccessible *self) +_gtk_assistant_accessible_init (GtkAssistantAccessible *self) { } @@ -2561,7 +2561,7 @@ G_DEFINE_TYPE (GtkAssistantAccessibleFactory, static GType gtk_assistant_accessible_factory_get_accessible_type (void) { - return gtk_assistant_accessible_get_type (); + return _gtk_assistant_accessible_get_type (); } static AtkObject* @@ -2569,7 +2569,7 @@ gtk_assistant_accessible_factory_create_accessible (GObject *obj) { AtkObject *accessible; - accessible = g_object_new (gtk_assistant_accessible_get_type (), NULL); + accessible = g_object_new (_gtk_assistant_accessible_get_type (), NULL); atk_object_initialize (accessible, obj); return accessible; diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index f0e00dadef..40b93c1b04 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -971,6 +971,7 @@ static void gtk_button_construct_child (GtkButton *button) { GtkButtonPrivate *priv = button->priv; + GtkStyleContext *context; GtkStockItem item; GtkWidget *child; GtkWidget *label; @@ -986,9 +987,11 @@ gtk_button_construct_child (GtkButton *button) if (!priv->label_text && !priv->image) return; - gtk_widget_style_get (GTK_WIDGET (button), - "image-spacing", &image_spacing, - NULL); + context = gtk_widget_get_style_context (GTK_WIDGET (button)); + + gtk_style_context_get_style (context, + "image-spacing", &image_spacing, + NULL); if (priv->image && !priv->image_is_stock) { @@ -1302,8 +1305,6 @@ gtk_button_realize (GtkWidget *widget) priv->event_window = gdk_window_new (window, &attributes, attributes_mask); gdk_window_set_user_data (priv->event_window, button); - - gtk_widget_style_attach (widget); } static void @@ -1350,7 +1351,8 @@ gtk_button_unmap (GtkWidget *widget) } static void -gtk_button_update_image_spacing (GtkButton *button) +gtk_button_update_image_spacing (GtkButton *button, + GtkStyleContext *context) { GtkButtonPrivate *priv = button->priv; GtkWidget *child; @@ -1369,19 +1371,23 @@ gtk_button_update_image_spacing (GtkButton *button) child = gtk_bin_get_child (GTK_BIN (child)); if (GTK_IS_BOX (child)) { - gtk_widget_style_get (GTK_WIDGET (button), - "image-spacing", &spacing, - NULL); + gtk_style_context_get_style (context, + "image-spacing", &spacing, + NULL); gtk_box_set_spacing (GTK_BOX (child), spacing); } - } + } } static void gtk_button_style_updated (GtkWidget *widget) { - gtk_button_update_image_spacing (GTK_BUTTON (widget)); + GtkStyleContext *context; + + context = gtk_widget_get_style_context (widget); + + gtk_button_update_image_spacing (GTK_BUTTON (widget), context); } static void @@ -1391,12 +1397,16 @@ gtk_button_get_props (GtkButton *button, GtkBorder *inner_border, gboolean *interior_focus) { - GtkWidget *widget = GTK_WIDGET (button); + GtkStyleContext *context; GtkBorder *tmp_border; + context = gtk_widget_get_style_context (GTK_WIDGET (button)); + if (default_border) { - gtk_widget_style_get (widget, "default-border", &tmp_border, NULL); + gtk_style_context_get_style (context, + "default-border", &tmp_border, + NULL); if (tmp_border) { @@ -1409,7 +1419,9 @@ gtk_button_get_props (GtkButton *button, if (default_outside_border) { - gtk_widget_style_get (widget, "default-outside-border", &tmp_border, NULL); + gtk_style_context_get_style (context, + "default-outside-border", &tmp_border, + NULL); if (tmp_border) { @@ -1422,7 +1434,9 @@ gtk_button_get_props (GtkButton *button, if (inner_border) { - gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL); + gtk_style_context_get_style (context, + "inner-border", &tmp_border, + NULL); if (tmp_border) { @@ -1434,7 +1448,11 @@ gtk_button_get_props (GtkButton *button, } if (interior_focus) - gtk_widget_style_get (widget, "interior-focus", interior_focus, NULL); + { + gtk_style_context_get_style (context, + "interior-focus", interior_focus, + NULL); + } } static void @@ -1447,25 +1465,25 @@ gtk_button_size_allocate (GtkWidget *widget, GtkStyleContext *context; GtkStateFlags state; GtkWidget *child; - GtkBorder default_border; - GtkBorder inner_border, *border; + GtkBorder inner_border; + GtkBorder *border; gint focus_width; gint focus_pad; context = gtk_widget_get_style_context (widget); state = gtk_widget_get_state_flags (widget); + gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL); + gtk_style_context_get_style (context, + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); + gtk_style_context_get (context, state, "border-width", &border, NULL); - gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL); - gtk_widget_style_get (GTK_WIDGET (widget), - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - NULL); - gtk_widget_set_allocation (widget, allocation); if (gtk_widget_get_realized (widget)) @@ -1513,11 +1531,11 @@ gtk_button_size_allocate (GtkWidget *widget, { gint child_displacement_x; gint child_displacement_y; - - gtk_widget_style_get (widget, - "child-displacement-x", &child_displacement_x, - "child-displacement-y", &child_displacement_y, - NULL); + + gtk_style_context_get_style (context, + "child-displacement-x", &child_displacement_x, + "child-displacement-y", &child_displacement_y, + NULL); child_allocation.x += child_displacement_x; child_allocation.y += child_displacement_y; } @@ -1556,14 +1574,16 @@ _gtk_button_paint (GtkButton *button, widget = GTK_WIDGET (button); + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); + gtk_button_get_props (button, &default_border, &default_outside_border, NULL, &interior_focus); - gtk_widget_style_get (widget, - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - NULL); + gtk_style_context_get_style (context, + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); gtk_widget_get_allocation (widget, &allocation); - context = gtk_widget_get_style_context (widget); window = gtk_widget_get_window (widget); x = 0; @@ -1614,15 +1634,15 @@ _gtk_button_paint (GtkButton *button, gboolean displace_focus; GtkBorder *border; - gtk_widget_style_get (widget, - "child-displacement-y", &child_displacement_y, - "child-displacement-x", &child_displacement_x, - "displace-focus", &displace_focus, - NULL); + gtk_style_context_get_style (context, + "child-displacement-y", &child_displacement_y, + "child-displacement-x", &child_displacement_x, + "displace-focus", &displace_focus, + NULL); gtk_style_context_get (context, state, - "border-width", &border, - NULL); + "border-width", &border, + NULL); if (interior_focus) { @@ -1906,23 +1926,23 @@ gtk_button_get_size (GtkWidget *widget, { GtkButton *button = GTK_BUTTON (widget); GtkStyleContext *context; + GtkStateFlags state; GtkWidget *child; GtkBorder default_border; GtkBorder inner_border; - GtkStateFlags state; GtkBorder *border; gint focus_width; gint focus_pad; gint minimum, natural; - gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL); - gtk_widget_style_get (GTK_WIDGET (widget), - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - NULL); + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); - context = gtk_widget_get_style_context (GTK_WIDGET (widget)); - state = gtk_widget_get_state_flags (GTK_WIDGET (widget)); + gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL); + gtk_style_context_get_style (context, + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); gtk_style_context_get (context, state, "border-width", &border, diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c index 20abba0fcd..f226eb7c22 100644 --- a/gtk/gtkcellrendererprogress.c +++ b/gtk/gtkcellrendererprogress.c @@ -604,12 +604,13 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell, clip.y = bar_position; } - gtk_paint_box (style, - cr, - GTK_STATE_SELECTED, GTK_SHADOW_OUT, - widget, "bar", - clip.x, clip.y, - clip.width, clip.height); + if (bar_size > 0) + gtk_paint_box (style, + cr, + GTK_STATE_SELECTED, GTK_SHADOW_OUT, + widget, "bar", + clip.x, clip.y, + clip.width, clip.height); if (priv->label) { diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 5433766c25..a5120377cf 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -144,32 +144,6 @@ * } * ]]> * - * Furthermore, in order to ensure correct height-for-width requests it is important - * to check the input width against the real required minimum width. This can - * easily be achieved as follows: - * - * get_preferred_width (widget, &min_width, NULL); - * - * for_width = MAX (min_width, for_width); - * - * execute_real_height_for_width_request_code (widget, for_width, min_height, nat_height); - * } - * else - * { - * ... fall back on virtual results as mentioned in the previous example ... - * } - * } - * ]]> - * * Height for width requests are generally implemented in terms of a virtual allocation * of widgets in the input orientation. Assuming an height-for-width request mode, a container * would implement the get_preferred_height_for_width() virtual function by first calling @@ -327,6 +301,7 @@ static void gtk_container_adjust_size_request (GtkWidget *widget, gint *natural_size); static void gtk_container_adjust_size_allocation (GtkWidget *widget, GtkOrientation orientation, + gint *minimum_size, gint *natural_size, gint *allocated_pos, gint *allocated_size); @@ -1809,6 +1784,7 @@ gtk_container_adjust_size_request (GtkWidget *widget, static void gtk_container_adjust_size_allocation (GtkWidget *widget, GtkOrientation orientation, + gint *minimum_size, gint *natural_size, gint *allocated_pos, gint *allocated_size) @@ -1821,7 +1797,7 @@ gtk_container_adjust_size_allocation (GtkWidget *widget, if (!GTK_CONTAINER_GET_CLASS (widget)->handle_border_width) { parent_class->adjust_size_allocation (widget, orientation, - natural_size, allocated_pos, + minimum_size, natural_size, allocated_pos, allocated_size); return; } @@ -1845,6 +1821,7 @@ gtk_container_adjust_size_allocation (GtkWidget *widget, else { *allocated_pos += border_width; + *minimum_size -= border_width * 2; *natural_size -= border_width * 2; } @@ -1856,7 +1833,7 @@ gtk_container_adjust_size_allocation (GtkWidget *widget, * and padding values. */ parent_class->adjust_size_allocation (widget, orientation, - natural_size, allocated_pos, + minimum_size, natural_size, allocated_pos, allocated_size); } diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 5ab102a85e..5faa07666c 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -791,11 +791,6 @@ static gboolean gtk_css_provider_load_from_path_internal (GtkCssProvider *css_p gboolean reset, GError **error); -enum { - CSS_PROVIDER_PARSE_ERROR -}; - - GQuark gtk_css_provider_error_quark (void) { @@ -1375,7 +1370,7 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider, (info->state == 0 || info->state == state || ((info->state & state) != 0 && - (info->state & ~(state)) == 0))) + (info->state & ~(state)) == 0))) { const gchar *val_str; @@ -1456,7 +1451,7 @@ scanner_apply_scope (GScanner *scanner, if (scope == SCOPE_VALUE) { scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_"; - scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_ (),.%\t\n'/\""; + scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_ +(),.%\t\n'/\""; scanner->config->scan_identifier_1char = TRUE; } else if (scope == SCOPE_SELECTOR) @@ -1880,7 +1875,7 @@ parse_selector (GtkCssProvider *css_provider, static GtkSymbolicColor * symbolic_color_parse_str (const gchar *string, - gchar **end_ptr) + gchar **end_ptr) { GtkSymbolicColor *symbolic_color = NULL; gchar *str; @@ -2073,7 +2068,7 @@ symbolic_color_parse_str (const gchar *string, *end_ptr = (gchar *) str; if (str[0] != ')') - { + { gtk_symbolic_color_unref (color1); gtk_symbolic_color_unref (color2); return NULL; @@ -2142,8 +2137,8 @@ symbolic_color_parse (const gchar *str, if (*end != '\0') { g_set_error_literal (error, - gtk_css_provider_error_quark (), - CSS_PROVIDER_PARSE_ERROR, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, "Could not parse symbolic color"); if (color) @@ -2412,7 +2407,6 @@ path_parse_str (GtkCssProvider *css_provider, { gchar *path, *chr; const gchar *start, *end; - start = str; if (g_str_has_prefix (str, "url")) @@ -2519,8 +2513,8 @@ path_parse (GtkCssProvider *css_provider, if (*end != '\0') { g_set_error_literal (error, - gtk_css_provider_error_quark (), - CSS_PROVIDER_PARSE_ERROR, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, "Error parsing path"); g_free (path); path = NULL; @@ -2621,10 +2615,10 @@ slice_parse_str (GtkCssProvider *css_provider, return NULL; } - slice = gtk_9slice_new (pixbuf, - distance_top, distance_bottom, - distance_left, distance_right, - mods[0], mods[1]); + slice = _gtk_9slice_new (pixbuf, + distance_top, distance_bottom, + distance_left, distance_right, + mods[0], mods[1]); g_object_unref (pixbuf); return slice; @@ -2739,27 +2733,29 @@ css_provider_parse_value (GtkCssProvider *css_provider, if (type == GDK_TYPE_RGBA || type == GDK_TYPE_COLOR) { - GdkRGBA color; - GdkColor rgb; + GdkRGBA rgba; + GdkColor color; if (type == GDK_TYPE_RGBA && - gdk_rgba_parse (&color, value_str)) - g_value_set_boxed (value, &color); + gdk_rgba_parse (&rgba, value_str)) + g_value_set_boxed (value, &rgba); else if (type == GDK_TYPE_COLOR && - gdk_color_parse (value_str, &rgb)) - g_value_set_boxed (value, &rgb); + gdk_color_parse (value_str, &color)) + g_value_set_boxed (value, &color); else { GtkSymbolicColor *symbolic_color; symbolic_color = symbolic_color_parse_str (value_str, &end); - if (!symbolic_color) - return FALSE; - - g_value_unset (value); - g_value_init (value, GTK_TYPE_SYMBOLIC_COLOR); - g_value_take_boxed (value, symbolic_color); + if (symbolic_color) + { + g_value_unset (value); + g_value_init (value, GTK_TYPE_SYMBOLIC_COLOR); + g_value_take_boxed (value, symbolic_color); + } + else + parsed = FALSE; } } else if (type == PANGO_TYPE_FONT_DESCRIPTION) @@ -2790,13 +2786,16 @@ css_provider_parse_value (GtkCssProvider *css_provider, GtkThemingEngine *engine; engine = gtk_theming_engine_load (value_str); - g_value_set_object (value, engine); + if (engine) + g_value_set_object (value, engine); + else + parsed = FALSE; } else if (type == GTK_TYPE_ANIMATION_DESCRIPTION) { GtkAnimationDescription *desc; - desc = gtk_animation_description_from_string (value_str); + desc = _gtk_animation_description_from_string (value_str); if (desc) g_value_take_boxed (value, desc); @@ -2878,8 +2877,11 @@ css_provider_parse_value (GtkCssProvider *css_provider, if (!enum_value) { - g_warning ("Unknown value '%s' for enum type '%s'", - value_str, g_type_name (type)); + g_set_error (error, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, + "Unknown value '%s' for enum type '%s'", + value_str, g_type_name (type)); parsed = FALSE; } else @@ -2912,8 +2914,11 @@ css_provider_parse_value (GtkCssProvider *css_provider, if (!flag_value) { - g_warning ("Unknown flag '%s' for type '%s'", - value_str, g_type_name (type)); + g_set_error (error, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, + "Unknown flag '%s' for type '%s'", + value_str, g_type_name (type)); parsed = FALSE; } else @@ -2928,8 +2933,11 @@ css_provider_parse_value (GtkCssProvider *css_provider, if (!flag_value) { - g_warning ("Unknown flag '%s' for type '%s'", - value_str, g_type_name (type)); + g_set_error (error, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, + "Unknown flag '%s' for type '%s'", + value_str, g_type_name (type)); parsed = FALSE; } else @@ -2953,7 +2961,11 @@ css_provider_parse_value (GtkCssProvider *css_provider, } else { - g_warning ("Cannot parse string '%s' for type %s", value_str, g_type_name (type)); + g_set_error (error, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, + "Cannot parse string '%s' for type %s", + value_str, g_type_name (type)); parsed = FALSE; } @@ -2966,8 +2978,8 @@ css_provider_parse_value (GtkCssProvider *css_provider, if (error && !*error) g_set_error_literal (error, - gtk_css_provider_error_quark (), - CSS_PROVIDER_PARSE_ERROR, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, "Failed to parse value"); } @@ -3320,6 +3332,9 @@ parse_stylesheet (GtkCssProvider *css_provider, GError **error) { GtkCssProviderPrivate *priv; + gboolean result; + + result = TRUE; priv = css_provider->priv; g_scanner_get_next_token (priv->scanner); @@ -3334,7 +3349,26 @@ parse_stylesheet (GtkCssProvider *css_provider, if (expected_token != G_TOKEN_NONE) { - scanner_report_warning (css_provider, expected_token, err); + /* If a GError was passed in, propagate the error and bail out, + * else report a warning and keep going + */ + if (error != NULL) + { + result = FALSE; + if (err) + g_propagate_error (error, err); + else + g_set_error_literal (error, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, + "Error parsing stylesheet"); + break; + } + else + { + scanner_report_warning (css_provider, expected_token, err); + g_clear_error (&err); + } while (!g_scanner_eof (priv->scanner) && priv->scanner->token != G_TOKEN_RIGHT_CURLY) @@ -3343,11 +3377,10 @@ parse_stylesheet (GtkCssProvider *css_provider, else css_provider_commit (css_provider); - g_clear_error (&err); g_scanner_get_next_token (priv->scanner); } - return TRUE; + return result; } /** @@ -3650,7 +3683,7 @@ gtk_css_provider_get_default (void) ".check:hover, .radio:hover {\n" " background-color: @base_color;\n" " border-color: @fg_color;\n" - " color: @text_color;\n" + " color: @text_color;\n" " border-style: solid;\n" " border-width: 1;\n" "}\n" diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 17ce6af25b..243106e9fd 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -6704,7 +6704,7 @@ gtk_icon_view_autoscroll (GtkIconView *icon_view) window = gtk_widget_get_window (GTK_WIDGET (icon_view)); gdk_window_get_pointer (window, &px, &py, NULL); - gdk_window_get_geometry (window, &x, &y, &width, &height, NULL); + gdk_window_get_geometry (window, &x, &y, &width, &height); /* see if we are near the edge. */ voffset = py - (y + 2 * SCROLL_EDGE_SIZE); diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 55bc6c335e..53b2df7eae 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2273,11 +2273,13 @@ gtk_label_get_link_colors (GtkWidget *widget, GdkColor **link_color, GdkColor **visited_link_color) { - gtk_widget_ensure_style (widget); - gtk_widget_style_get (widget, - "link-color", link_color, - "visited-link-color", visited_link_color, - NULL); + GtkStyleContext *context; + + context = gtk_widget_get_style_context (widget); + gtk_style_context_get_style (context, + "link-color", link_color, + "visited-link-color", visited_link_color, + NULL); if (!*link_color) *link_color = gdk_color_copy (&default_link_color); if (!*visited_link_color) @@ -3007,13 +3009,31 @@ gtk_label_clear_layout (GtkLabel *label) } } +static PangoFontMetrics * +get_font_metrics (PangoContext *context, GtkWidget *widget) +{ + GtkStyleContext *style_context; + PangoFontDescription *font; + PangoFontMetrics *retval; + + style_context = gtk_widget_get_style_context (widget); + gtk_style_context_get (style_context, 0, "font", &font, NULL); + + retval = pango_context_get_metrics (context, + font, + pango_context_get_language (context)); + + if (font != NULL) + pango_font_description_free (font); + + return retval; +} static void get_label_width (GtkLabel *label, gint *minimum, gint *natural) { - GtkWidgetAuxInfo *aux_info; GtkLabelPrivate *priv; PangoLayout *layout; PangoContext *context; @@ -3022,14 +3042,10 @@ get_label_width (GtkLabel *label, gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, guess_width; priv = label->priv; - aux_info = _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE); layout = pango_layout_copy (priv->layout); context = pango_layout_get_context (layout); - metrics = pango_context_get_metrics (context, - gtk_widget_get_style (GTK_WIDGET (label))->font_desc, - pango_context_get_language (context)); - + metrics = get_font_metrics (context, GTK_WIDGET (label)); char_width = pango_font_metrics_get_approximate_char_width (metrics); digit_width = pango_font_metrics_get_approximate_digit_width (metrics); char_pixels = MAX (char_width, digit_width); @@ -3108,11 +3124,16 @@ get_label_width (GtkLabel *label, } /* if a width-request is set, use that as the requested label width */ - if ((priv->wrap || priv->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0) && - aux_info && aux_info->width > 0) + if (priv->wrap || priv->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0) { - *minimum = aux_info->width * PANGO_SCALE; - *natural = MAX (*natural, *minimum); + GtkWidgetAuxInfo *aux_info; + + aux_info = _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE); + if (aux_info && aux_info->width > 0) + { + *minimum = aux_info->width * PANGO_SCALE; + *natural = MAX (*natural, *minimum); + } } g_object_unref (layout); @@ -3143,10 +3164,7 @@ get_label_wrap_width (GtkLabel *label) layout = pango_layout_copy (priv->layout); context = pango_layout_get_context (layout); - metrics = pango_context_get_metrics (context, - gtk_widget_get_style (GTK_WIDGET (label))->font_desc, - pango_context_get_language (context)); - + metrics = get_font_metrics (context, GTK_WIDGET (label)); char_width = pango_font_metrics_get_approximate_char_width (metrics); digit_width = pango_font_metrics_get_approximate_digit_width (metrics); char_pixels = MAX (char_width, digit_width); @@ -3353,9 +3371,7 @@ get_single_line_height (GtkWidget *widget, gint ascent, descent; context = pango_layout_get_context (layout); - metrics = pango_context_get_metrics (context, gtk_widget_get_style (widget)->font_desc, - pango_context_get_language (context)); - + metrics = get_font_metrics (context, widget); ascent = pango_font_metrics_get_ascent (metrics); descent = pango_font_metrics_get_descent (metrics); pango_font_metrics_unref (metrics); diff --git a/gtk/gtkmodifierstyle.c b/gtk/gtkmodifierstyle.c index 48a4f21f6e..2cbee61b39 100644 --- a/gtk/gtkmodifierstyle.c +++ b/gtk/gtkmodifierstyle.c @@ -282,11 +282,15 @@ gtk_modifier_style_set_color_property (GtkModifierStyle *style, } if (color) - g_hash_table_insert (priv->color_properties, str, - gdk_rgba_copy (color)); + { + g_hash_table_insert (priv->color_properties, str, + gdk_rgba_copy (color)); + } else - g_hash_table_remove (priv->color_properties, str); + { + g_hash_table_remove (priv->color_properties, str); + g_free (str); + } g_signal_emit (style, signals[CHANGED], 0); - g_free (str); } diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index ab249484ea..c5e49e7db3 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -217,23 +217,26 @@ compute_size_for_orientation (GtkWidget *widget, } else { - int ignored_position = 0; - int natural_height; + gint ignored_position = 0; + gint minimum_height; + gint natural_height; /* Pull the base natural height from the cache as it's needed to adjust * the proposed 'for_size' */ - gtk_widget_get_preferred_height (widget, NULL, &natural_height); + gtk_widget_get_preferred_height (widget, &minimum_height, &natural_height); /* convert for_size to unadjusted height (for_size is a proposed allocation) */ GTK_WIDGET_GET_CLASS (widget)->adjust_size_allocation (widget, GTK_ORIENTATION_VERTICAL, - &natural_height, + &minimum_height, + &natural_height, &ignored_position, &for_size); push_recursion_check (widget, orientation, for_size); - GTK_WIDGET_GET_CLASS (widget)->get_preferred_width_for_height (widget, for_size, - &min_size, &nat_size); + GTK_WIDGET_GET_CLASS (widget)->get_preferred_width_for_height (widget, + MAX (for_size, minimum_height), + &min_size, &nat_size); pop_recursion_check (widget, orientation); } } @@ -248,22 +251,25 @@ compute_size_for_orientation (GtkWidget *widget, else { int ignored_position = 0; + int minimum_width; int natural_width; /* Pull the base natural width from the cache as it's needed to adjust * the proposed 'for_size' */ - gtk_widget_get_preferred_width (widget, NULL, &natural_width); + gtk_widget_get_preferred_width (widget, &minimum_width, &natural_width); /* convert for_size to unadjusted width (for_size is a proposed allocation) */ GTK_WIDGET_GET_CLASS (widget)->adjust_size_allocation (widget, GTK_ORIENTATION_HORIZONTAL, + &minimum_width, &natural_width, &ignored_position, &for_size); push_recursion_check (widget, orientation, for_size); - GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget, for_size, - &min_size, &nat_size); + GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget, + MAX (for_size, minimum_width), + &min_size, &nat_size); pop_recursion_check (widget, orientation); } } diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c index 65bf7e2353..78c6b994df 100644 --- a/gtk/gtkspinner.c +++ b/gtk/gtkspinner.c @@ -345,7 +345,7 @@ typedef AtkObjectFactory GtkSpinnerAccessibleFactory; typedef AtkObjectFactoryClass GtkSpinnerAccessibleFactoryClass; G_DEFINE_TYPE (GtkSpinnerAccessibleFactory, - gtk_spinner_accessible_factory, + _gtk_spinner_accessible_factory, ATK_TYPE_OBJECT_FACTORY); static GType @@ -366,14 +366,14 @@ gtk_spinner_accessible_factory_create_accessible (GObject *obj) } static void -gtk_spinner_accessible_factory_class_init (AtkObjectFactoryClass *klass) +_gtk_spinner_accessible_factory_class_init (AtkObjectFactoryClass *klass) { klass->create_accessible = gtk_spinner_accessible_factory_create_accessible; klass->get_accessible_type = gtk_spinner_accessible_factory_get_accessible_type; } static void -gtk_spinner_accessible_factory_init (AtkObjectFactory *factory) +_gtk_spinner_accessible_factory_init (AtkObjectFactory *factory) { } @@ -402,7 +402,7 @@ gtk_spinner_get_accessible (GtkWidget *widget) if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) atk_registry_set_factory_type (registry, GTK_TYPE_SPINNER, - gtk_spinner_accessible_factory_get_type ()); + _gtk_spinner_accessible_factory_get_type ()); first_time = FALSE; } diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index ff7686a6ab..fab8607225 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -1753,40 +1753,6 @@ _cairo_draw_line (cairo_t *cr, cairo_restore (cr); } -static void -_cairo_draw_rectangle (cairo_t *cr, - GdkColor *color, - gboolean filled, - gint x, - gint y, - gint width, - gint height) -{ - gdk_cairo_set_source_color (cr, color); - - if (filled) - { - cairo_rectangle (cr, x, y, width, height); - cairo_fill (cr); - } - else - { - cairo_rectangle (cr, x + 0.5, y + 0.5, width, height); - cairo_stroke (cr); - } -} - -static void -_cairo_draw_point (cairo_t *cr, - GdkColor *color, - gint x, - gint y) -{ - gdk_cairo_set_source_color (cr, color); - cairo_rectangle (cr, x, y, 1, 1); - cairo_fill (cr); -} - static void transform_detail_string (const gchar *detail, GtkStyleContext *context) @@ -2020,153 +1986,6 @@ gtk_default_draw_vline (GtkStyle *style, gtk_style_context_restore (context); } -static void -draw_thin_shadow (GtkStyle *style, - cairo_t *cr, - GtkStateType state, - gint x, - gint y, - gint width, - gint height) -{ - GdkColor *gc1, *gc2; - - gc1 = &style->light[state]; - gc2 = &style->dark[state]; - - _cairo_draw_line (cr, gc1, - x, y + height - 1, x + width - 1, y + height - 1); - _cairo_draw_line (cr, gc1, - x + width - 1, y, x + width - 1, y + height - 1); - - _cairo_draw_line (cr, gc2, - x, y, x + width - 2, y); - _cairo_draw_line (cr, gc2, - x, y, x, y + height - 2); -} - -static void -draw_spinbutton_shadow (GtkStyle *style, - cairo_t *cr, - GtkStateType state, - GtkTextDirection direction, - gint x, - gint y, - gint width, - gint height) -{ - - if (direction == GTK_TEXT_DIR_LTR) - { - _cairo_draw_line (cr, &style->dark[state], - x, y, x + width - 1, y); - _cairo_draw_line (cr, &style->black, - x, y + 1, x + width - 2, y + 1); - _cairo_draw_line (cr, &style->black, - x + width - 2, y + 2, x + width - 2, y + height - 3); - _cairo_draw_line (cr, &style->light[state], - x + width - 1, y + 1, x + width - 1, y + height - 2); - _cairo_draw_line (cr, &style->light[state], - x, y + height - 1, x + width - 1, y + height - 1); - _cairo_draw_line (cr, &style->bg[state], - x, y + height - 2, x + width - 2, y + height - 2); - _cairo_draw_line (cr, &style->black, - x, y + 2, x, y + height - 3); - } - else - { - _cairo_draw_line (cr, &style->dark[state], - x, y, x + width - 1, y); - _cairo_draw_line (cr, &style->dark[state], - x, y + 1, x, y + height - 1); - _cairo_draw_line (cr, &style->black, - x + 1, y + 1, x + width - 1, y + 1); - _cairo_draw_line (cr, &style->black, - x + 1, y + 2, x + 1, y + height - 2); - _cairo_draw_line (cr, &style->black, - x + width - 1, y + 2, x + width - 1, y + height - 3); - _cairo_draw_line (cr, &style->light[state], - x + 1, y + height - 1, x + width - 1, y + height - 1); - _cairo_draw_line (cr, &style->bg[state], - x + 2, y + height - 2, x + width - 1, y + height - 2); - } -} - -static void -draw_menu_shadow (GtkStyle *style, - cairo_t *cr, - GtkStateType state, - gint x, - gint y, - gint width, - gint height) -{ - if (style->ythickness > 0) - { - if (style->ythickness > 1) - { - _cairo_draw_line (cr, &style->dark[state], - x + 1, y + height - 2, - x + width - 2, y + height - 2); - _cairo_draw_line (cr, &style->black, - x, y + height - 1, x + width - 1, y + height - 1); - } - else - { - _cairo_draw_line (cr, &style->dark[state], - x + 1, y + height - 1, x + width - 1, y + height - 1); - } - } - - if (style->xthickness > 0) - { - if (style->xthickness > 1) - { - _cairo_draw_line (cr, &style->dark[state], - x + width - 2, y + 1, - x + width - 2, y + height - 2); - - _cairo_draw_line (cr, &style->black, - x + width - 1, y, x + width - 1, y + height - 1); - } - else - { - _cairo_draw_line (cr, &style->dark[state], - x + width - 1, y + 1, x + width - 1, y + height - 1); - } - } - - /* Light around top and left */ - - if (style->ythickness > 0) - _cairo_draw_line (cr, &style->black, - x, y, x + width - 2, y); - if (style->xthickness > 0) - _cairo_draw_line (cr, &style->black, - x, y, x, y + height - 2); - - if (style->ythickness > 1) - _cairo_draw_line (cr, &style->light[state], - x + 1, y + 1, x + width - 3, y + 1); - if (style->xthickness > 1) - _cairo_draw_line (cr, &style->light[state], - x + 1, y + 1, x + 1, y + height - 3); -} - -static GtkTextDirection -get_direction (GtkWidget *widget) -{ - GtkTextDirection dir; - - if (widget) - dir = gtk_widget_get_direction (widget); - else - dir = GTK_TEXT_DIR_LTR; - - return dir; -} - - static void gtk_default_draw_shadow (GtkStyle *style, cairo_t *cr, @@ -2250,75 +2069,6 @@ draw_arrow (cairo_t *cr, cairo_restore (cr); } -static void -calculate_arrow_geometry (GtkArrowType arrow_type, - gint *x, - gint *y, - gint *width, - gint *height) -{ - gint w = *width; - gint h = *height; - - switch (arrow_type) - { - case GTK_ARROW_UP: - case GTK_ARROW_DOWN: - w += (w % 2) - 1; - h = (w / 2 + 1); - - if (h > *height) - { - h = *height; - w = 2 * h - 1; - } - - if (arrow_type == GTK_ARROW_DOWN) - { - if (*height % 2 == 1 || h % 2 == 0) - *height += 1; - } - else - { - if (*height % 2 == 0 || h % 2 == 0) - *height -= 1; - } - break; - - case GTK_ARROW_RIGHT: - case GTK_ARROW_LEFT: - h += (h % 2) - 1; - w = (h / 2 + 1); - - if (w > *width) - { - w = *width; - h = 2 * w - 1; - } - - if (arrow_type == GTK_ARROW_RIGHT) - { - if (*width % 2 == 1 || w % 2 == 0) - *width += 1; - } - else - { - if (*width % 2 == 0 || w % 2 == 0) - *width -= 1; - } - break; - - default: - /* should not be reached */ - break; - } - - *x += (*width - w) / 2; - *y += (*height - h) / 2; - *height = h; - *width = w; -} - static void gtk_default_draw_arrow (GtkStyle *style, cairo_t *cr, @@ -2548,16 +2298,6 @@ option_menu_get_props (GtkWidget *widget, *indicator_spacing = default_option_indicator_spacing; } -static gboolean -background_is_solid (GtkStyle *style, - GtkStateType type) -{ - if (style->background[type] == NULL) - return FALSE; - - return cairo_pattern_get_type (style->background[type]) == CAIRO_PATTERN_TYPE_SOLID; -} - static void gtk_default_draw_box (GtkStyle *style, cairo_t *cr, @@ -2624,23 +2364,6 @@ gtk_default_draw_box (GtkStyle *style, gtk_style_context_restore (context); } -static GdkColor * -get_darkened (const GdkColor *color, - gint darken_count) -{ - GdkColor src = *color; - GdkColor shaded = *color; - - while (darken_count) - { - _gtk_style_shade (&src, &shaded, 0.93); - src = shaded; - --darken_count; - } - - return gdk_color_copy (&shaded); -} - static void gtk_default_draw_flat_box (GtkStyle *style, cairo_t *cr, @@ -3170,32 +2893,6 @@ gtk_default_draw_slider (GtkStyle *style, gtk_style_context_restore (context); } -static void -draw_dot (cairo_t *cr, - GdkColor *light, - GdkColor *dark, - gint x, - gint y, - gushort size) -{ - size = CLAMP (size, 2, 3); - - if (size == 2) - { - _cairo_draw_point (cr, light, x, y); - _cairo_draw_point (cr, light, x+1, y+1); - } - else if (size == 3) - { - _cairo_draw_point (cr, light, x, y); - _cairo_draw_point (cr, light, x+1, y); - _cairo_draw_point (cr, light, x, y+1); - _cairo_draw_point (cr, dark, x+1, y+2); - _cairo_draw_point (cr, dark, x+2, y+1); - _cairo_draw_point (cr, dark, x+2, y+2); - } -} - static void gtk_default_draw_handle (GtkStyle *style, cairo_t *cr, diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index b8d8c992e7..2aee8b2992 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -495,7 +495,7 @@ enum { LAST_SIGNAL }; -guint signals[LAST_SIGNAL] = { 0 }; +static guint signals[LAST_SIGNAL] = { 0 }; static GQuark provider_list_quark = 0; @@ -842,19 +842,19 @@ animation_info_new (GtkStyleContext *context, info = g_slice_new0 (AnimationInfo); info->rectangles = g_array_new (FALSE, FALSE, sizeof (cairo_rectangle_int_t)); - info->timeline = gtk_timeline_new (duration); + info->timeline = _gtk_timeline_new (duration); info->window = g_object_ref (window); info->state = state; info->target_value = target_value; info->region_id = region_id; - gtk_timeline_set_progress_type (info->timeline, progress_type); - gtk_timeline_set_loop (info->timeline, loop); + _gtk_timeline_set_progress_type (info->timeline, progress_type); + _gtk_timeline_set_loop (info->timeline, loop); if (!loop && !target_value) { - gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD); - gtk_timeline_rewind (info->timeline); + _gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD); + _gtk_timeline_rewind (info->timeline); } g_signal_connect (info->timeline, "frame", @@ -862,7 +862,7 @@ animation_info_new (GtkStyleContext *context, g_signal_connect (info->timeline, "finished", G_CALLBACK (timeline_finished_cb), context); - gtk_timeline_start (info->timeline); + _gtk_timeline_start (info->timeline); return info; } @@ -1076,7 +1076,7 @@ build_icon_factories (GtkStyleContext *context, } } -GtkWidgetPath * +static GtkWidgetPath * create_query_path (GtkStyleContext *context) { GtkStyleContextPrivate *priv; @@ -1628,7 +1628,7 @@ gtk_style_context_state_is_running (GtkStyleContext *context, context_has_animatable_region (context, info->region_id)) { if (progress) - *progress = gtk_timeline_get_progress (info->timeline); + *progress = _gtk_timeline_get_progress (info->timeline); return TRUE; } @@ -2855,9 +2855,9 @@ gtk_style_context_notify_state_change (GtkStyleContext *context, if (!desc) return; - if (gtk_animation_description_get_duration (desc) == 0) + if (_gtk_animation_description_get_duration (desc) == 0) { - gtk_animation_description_unref (desc); + _gtk_animation_description_unref (desc); return; } @@ -2867,37 +2867,37 @@ gtk_style_context_notify_state_change (GtkStyleContext *context, info->target_value != state_value) { /* Target values are the opposite */ - if (!gtk_timeline_get_loop (info->timeline)) + if (!_gtk_timeline_get_loop (info->timeline)) { /* Reverse the animation */ - if (gtk_timeline_get_direction (info->timeline) == GTK_TIMELINE_DIRECTION_FORWARD) - gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD); + if (_gtk_timeline_get_direction (info->timeline) == GTK_TIMELINE_DIRECTION_FORWARD) + _gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD); else - gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_FORWARD); + _gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_FORWARD); info->target_value = state_value; } else { /* Take it out of its looping state */ - gtk_timeline_set_loop (info->timeline, FALSE); + _gtk_timeline_set_loop (info->timeline, FALSE); } } else if (!info && - (!gtk_animation_description_get_loop (desc) || + (!_gtk_animation_description_get_loop (desc) || state_value)) { info = animation_info_new (context, region_id, - gtk_animation_description_get_duration (desc), - gtk_animation_description_get_progress_type (desc), - gtk_animation_description_get_loop (desc), + _gtk_animation_description_get_duration (desc), + _gtk_animation_description_get_progress_type (desc), + _gtk_animation_description_get_loop (desc), state, state_value, window); priv->animations = g_slist_prepend (priv->animations, info); priv->animations_invalidated = TRUE; } - gtk_animation_description_unref (desc); + _gtk_animation_description_unref (desc); } /** @@ -3383,6 +3383,8 @@ gtk_render_check (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3427,6 +3429,8 @@ gtk_render_option (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3469,6 +3473,7 @@ gtk_render_arrow (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (size > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3514,6 +3519,8 @@ gtk_render_background (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3560,6 +3567,8 @@ gtk_render_frame (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3603,6 +3612,8 @@ gtk_render_expander (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3643,6 +3654,8 @@ gtk_render_focus (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3677,6 +3690,7 @@ gtk_render_layout (GtkStyleContext *context, PangoRectangle extents; g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); + g_return_if_fail (PANGO_IS_LAYOUT (layout)); g_return_if_fail (cr != NULL); priv = context->priv; @@ -3763,6 +3777,8 @@ gtk_render_slider (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3813,6 +3829,16 @@ gtk_render_frame_gap (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); + g_return_if_fail (xy0_gap < xy1_gap); + g_return_if_fail (xy0_gap >= 0); + + if (gap_side == GTK_POS_LEFT || + gap_side == GTK_POS_RIGHT) + g_return_if_fail (xy1_gap <= height); + else + g_return_if_fail (xy1_gap <= width); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3860,6 +3886,8 @@ gtk_render_extension (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3903,6 +3931,8 @@ gtk_render_handle (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); @@ -3941,6 +3971,8 @@ gtk_render_activity (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); + g_return_if_fail (width > 0); + g_return_if_fail (height > 0); priv = context->priv; engine_class = GTK_THEMING_ENGINE_GET_CLASS (priv->theming_engine); diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c index e254161141..1c77dbce6d 100644 --- a/gtk/gtkthemingengine.c +++ b/gtk/gtkthemingengine.c @@ -889,19 +889,13 @@ gtk_theming_module_load (GTypeModule *type_module) module_path = _gtk_find_module (name, "theming-engines"); if (!module_path) - { - g_warning (_("Unable to locate theme engine in module path: \"%s\","), name); - return FALSE; - } + return FALSE; module = g_module_open (module_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); g_free (module_path); if (!module) - { - g_warning ("%s", g_module_error ()); - return FALSE; - } + return FALSE; if (!g_module_symbol (module, "theme_init", (gpointer *) &theming_module->init) || @@ -910,7 +904,6 @@ gtk_theming_module_load (GTypeModule *type_module) !g_module_symbol (module, "create_engine", (gpointer *) &theming_module->create_engine)) { - g_warning ("%s", g_module_error ()); g_module_close (module); return FALSE; @@ -1971,8 +1964,8 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine, if (slice) { - gtk_9slice_render (slice, cr, x, y, width, height); - gtk_9slice_unref (slice); + _gtk_9slice_render (slice, cr, x, y, width, height); + _gtk_9slice_unref (slice); } else if (border_style != GTK_BORDER_STYLE_NONE) render_frame_internal (engine, cr, diff --git a/gtk/gtktimeline.c b/gtk/gtktimeline.c index 348011c768..5550e7d47c 100644 --- a/gtk/gtktimeline.c +++ b/gtk/gtktimeline.c @@ -76,94 +76,94 @@ static void gtk_timeline_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gtk_timeline_finalize (GObject *object); +static void _gtk_timeline_finalize (GObject *object); -G_DEFINE_TYPE (GtkTimeline, gtk_timeline, G_TYPE_OBJECT) +G_DEFINE_TYPE (GtkTimeline, _gtk_timeline, G_TYPE_OBJECT) static void -gtk_timeline_class_init (GtkTimelineClass *klass) +_gtk_timeline_class_init (GtkTimelineClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->set_property = gtk_timeline_set_property; object_class->get_property = gtk_timeline_get_property; - object_class->finalize = gtk_timeline_finalize; + object_class->finalize = _gtk_timeline_finalize; g_object_class_install_property (object_class, - PROP_FPS, - g_param_spec_uint ("fps", - "FPS", - "Frames per second for the timeline", - 1, G_MAXUINT, - DEFAULT_FPS, - G_PARAM_READWRITE)); + PROP_FPS, + g_param_spec_uint ("fps", + "FPS", + "Frames per second for the timeline", + 1, G_MAXUINT, + DEFAULT_FPS, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_DURATION, - g_param_spec_uint ("duration", - "Animation Duration", - "Animation Duration", - 0, G_MAXUINT, - 0, - G_PARAM_READWRITE)); + PROP_DURATION, + g_param_spec_uint ("duration", + "Animation Duration", + "Animation Duration", + 0, G_MAXUINT, + 0, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_LOOP, - g_param_spec_boolean ("loop", - "Loop", - "Whether the timeline loops or not", - FALSE, - G_PARAM_READWRITE)); + PROP_LOOP, + g_param_spec_boolean ("loop", + "Loop", + "Whether the timeline loops or not", + FALSE, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_SCREEN, - g_param_spec_object ("screen", - "Screen", - "Screen to get the settings from", - GDK_TYPE_SCREEN, - G_PARAM_READWRITE)); + PROP_SCREEN, + g_param_spec_object ("screen", + "Screen", + "Screen to get the settings from", + GDK_TYPE_SCREEN, + G_PARAM_READWRITE)); signals[STARTED] = g_signal_new ("started", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTimelineClass, started), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTimelineClass, started), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); signals[PAUSED] = g_signal_new ("paused", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTimelineClass, paused), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTimelineClass, paused), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); signals[FINISHED] = g_signal_new ("finished", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTimelineClass, finished), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTimelineClass, finished), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); signals[FRAME] = g_signal_new ("frame", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTimelineClass, frame), - NULL, NULL, - g_cclosure_marshal_VOID__DOUBLE, - G_TYPE_NONE, 1, - G_TYPE_DOUBLE); + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTimelineClass, frame), + NULL, NULL, + g_cclosure_marshal_VOID__DOUBLE, + G_TYPE_NONE, 1, + G_TYPE_DOUBLE); g_type_class_add_private (klass, sizeof (GtkTimelinePriv)); } static void -gtk_timeline_init (GtkTimeline *timeline) +_gtk_timeline_init (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -194,20 +194,20 @@ gtk_timeline_set_property (GObject *object, switch (prop_id) { case PROP_FPS: - gtk_timeline_set_fps (timeline, g_value_get_uint (value)); + _gtk_timeline_set_fps (timeline, g_value_get_uint (value)); break; case PROP_DURATION: - gtk_timeline_set_duration (timeline, g_value_get_uint (value)); + _gtk_timeline_set_duration (timeline, g_value_get_uint (value)); break; case PROP_LOOP: - gtk_timeline_set_loop (timeline, g_value_get_boolean (value)); + _gtk_timeline_set_loop (timeline, g_value_get_boolean (value)); break; case PROP_DIRECTION: - gtk_timeline_set_direction (timeline, g_value_get_enum (value)); + _gtk_timeline_set_direction (timeline, g_value_get_enum (value)); break; case PROP_SCREEN: - gtk_timeline_set_screen (timeline, - GDK_SCREEN (g_value_get_object (value))); + _gtk_timeline_set_screen (timeline, + GDK_SCREEN (g_value_get_object (value))); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -249,7 +249,7 @@ gtk_timeline_get_property (GObject *object, } static void -gtk_timeline_finalize (GObject *object) +_gtk_timeline_finalize (GObject *object) { GtkTimelinePriv *priv; GtkTimeline *timeline; @@ -266,10 +266,10 @@ gtk_timeline_finalize (GObject *object) if (priv->timer) g_timer_destroy (priv->timer); - G_OBJECT_CLASS (gtk_timeline_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_timeline_parent_class)->finalize (object); } -gdouble +static gdouble calculate_progress (gdouble linear_progress, GtkTimelineProgressType progress_type) { @@ -324,9 +324,9 @@ gtk_timeline_run_frame (GtkTimeline *timeline) progress = priv->last_progress; if (priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD) - progress -= delta_progress; + progress -= delta_progress; else - progress += delta_progress; + progress += delta_progress; priv->last_progress = progress; @@ -343,18 +343,18 @@ gtk_timeline_run_frame (GtkTimeline *timeline) (priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD && progress == 0.0)) { if (!priv->loop) - { - if (priv->source_id) - { - g_source_remove (priv->source_id); - priv->source_id = 0; - } + { + if (priv->source_id) + { + g_source_remove (priv->source_id); + priv->source_id = 0; + } g_timer_stop (priv->timer); - g_signal_emit (timeline, signals [FINISHED], 0); - return FALSE; - } + g_signal_emit (timeline, signals [FINISHED], 0); + return FALSE; + } else - gtk_timeline_rewind (timeline); + _gtk_timeline_rewind (timeline); } return TRUE; @@ -369,21 +369,21 @@ gtk_timeline_run_frame (GtkTimeline *timeline) * Return Value: the newly created #GtkTimeline **/ GtkTimeline * -gtk_timeline_new (guint duration) +_gtk_timeline_new (guint duration) { return g_object_new (GTK_TYPE_TIMELINE, - "duration", duration, - NULL); + "duration", duration, + NULL); } GtkTimeline * -gtk_timeline_new_for_screen (guint duration, - GdkScreen *screen) +_gtk_timeline_new_for_screen (guint duration, + GdkScreen *screen) { return g_object_new (GTK_TYPE_TIMELINE, - "duration", duration, - "screen", screen, - NULL); + "duration", duration, + "screen", screen, + NULL); } /** @@ -393,7 +393,7 @@ gtk_timeline_new_for_screen (guint duration, * Runs the timeline from the current frame. **/ void -gtk_timeline_start (GtkTimeline *timeline) +_gtk_timeline_start (GtkTimeline *timeline) { GtkTimelinePriv *priv; GtkSettings *settings; @@ -440,7 +440,7 @@ gtk_timeline_start (GtkTimeline *timeline) * Pauses the timeline. **/ void -gtk_timeline_pause (GtkTimeline *timeline) +_gtk_timeline_pause (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -464,7 +464,7 @@ gtk_timeline_pause (GtkTimeline *timeline) * Rewinds the timeline. **/ void -gtk_timeline_rewind (GtkTimeline *timeline) +_gtk_timeline_rewind (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -472,7 +472,7 @@ gtk_timeline_rewind (GtkTimeline *timeline) priv = timeline->priv; - if (gtk_timeline_get_direction(timeline) != GTK_TIMELINE_DIRECTION_FORWARD) + if (_gtk_timeline_get_direction (timeline) != GTK_TIMELINE_DIRECTION_FORWARD) priv->progress = priv->last_progress = 1.; else priv->progress = priv->last_progress = 0.; @@ -496,7 +496,7 @@ gtk_timeline_rewind (GtkTimeline *timeline) * Return Value: %TRUE if the timeline is running **/ gboolean -gtk_timeline_is_running (GtkTimeline *timeline) +_gtk_timeline_is_running (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -516,7 +516,7 @@ gtk_timeline_is_running (GtkTimeline *timeline) * Return Value: frames per second **/ guint -gtk_timeline_get_fps (GtkTimeline *timeline) +_gtk_timeline_get_fps (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -535,7 +535,7 @@ gtk_timeline_get_fps (GtkTimeline *timeline) * the timeline will play. **/ void -gtk_timeline_set_fps (GtkTimeline *timeline, +_gtk_timeline_set_fps (GtkTimeline *timeline, guint fps) { GtkTimelinePriv *priv; @@ -547,12 +547,12 @@ gtk_timeline_set_fps (GtkTimeline *timeline, priv->fps = fps; - if (gtk_timeline_is_running (timeline)) + if (_gtk_timeline_is_running (timeline)) { g_source_remove (priv->source_id); priv->source_id = gdk_threads_add_timeout (FRAME_INTERVAL (priv->fps), - (GSourceFunc) gtk_timeline_run_frame, - timeline); + (GSourceFunc) gtk_timeline_run_frame, + timeline); } g_object_notify (G_OBJECT (timeline), "fps"); @@ -568,7 +568,7 @@ gtk_timeline_set_fps (GtkTimeline *timeline, * Return Value: %TRUE if the timeline loops **/ gboolean -gtk_timeline_get_loop (GtkTimeline *timeline) +_gtk_timeline_get_loop (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -587,8 +587,8 @@ gtk_timeline_get_loop (GtkTimeline *timeline) * when it has reached the end. **/ void -gtk_timeline_set_loop (GtkTimeline *timeline, - gboolean loop) +_gtk_timeline_set_loop (GtkTimeline *timeline, + gboolean loop) { GtkTimelinePriv *priv; @@ -604,8 +604,8 @@ gtk_timeline_set_loop (GtkTimeline *timeline, } void -gtk_timeline_set_duration (GtkTimeline *timeline, - guint duration) +_gtk_timeline_set_duration (GtkTimeline *timeline, + guint duration) { GtkTimelinePriv *priv; @@ -621,7 +621,7 @@ gtk_timeline_set_duration (GtkTimeline *timeline, } guint -gtk_timeline_get_duration (GtkTimeline *timeline) +_gtk_timeline_get_duration (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -640,8 +640,8 @@ gtk_timeline_get_duration (GtkTimeline *timeline) * Sets the direction of the timeline. **/ void -gtk_timeline_set_direction (GtkTimeline *timeline, - GtkTimelineDirection direction) +_gtk_timeline_set_direction (GtkTimeline *timeline, + GtkTimelineDirection direction) { GtkTimelinePriv *priv; @@ -660,7 +660,7 @@ gtk_timeline_set_direction (GtkTimeline *timeline, * Return Value: direction **/ GtkTimelineDirection -gtk_timeline_get_direction (GtkTimeline *timeline) +_gtk_timeline_get_direction (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -671,8 +671,8 @@ gtk_timeline_get_direction (GtkTimeline *timeline) } void -gtk_timeline_set_screen (GtkTimeline *timeline, - GdkScreen *screen) +_gtk_timeline_set_screen (GtkTimeline *timeline, + GdkScreen *screen) { GtkTimelinePriv *priv; @@ -690,7 +690,7 @@ gtk_timeline_set_screen (GtkTimeline *timeline, } GdkScreen * -gtk_timeline_get_screen (GtkTimeline *timeline) +_gtk_timeline_get_screen (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -701,7 +701,7 @@ gtk_timeline_get_screen (GtkTimeline *timeline) } gdouble -gtk_timeline_get_progress (GtkTimeline *timeline) +_gtk_timeline_get_progress (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -712,7 +712,7 @@ gtk_timeline_get_progress (GtkTimeline *timeline) } GtkTimelineProgressType -gtk_timeline_get_progress_type (GtkTimeline *timeline) +_gtk_timeline_get_progress_type (GtkTimeline *timeline) { GtkTimelinePriv *priv; @@ -723,8 +723,8 @@ gtk_timeline_get_progress_type (GtkTimeline *timeline) } void -gtk_timeline_set_progress_type (GtkTimeline *timeline, - GtkTimelineProgressType progress_type) +_gtk_timeline_set_progress_type (GtkTimeline *timeline, + GtkTimelineProgressType progress_type) { GtkTimelinePriv *priv; diff --git a/gtk/gtktimeline.h b/gtk/gtktimeline.h index d9a6ae5d2c..0b0aee16d0 100644 --- a/gtk/gtktimeline.h +++ b/gtk/gtktimeline.h @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TIMELINE (gtk_timeline_get_type ()) +#define GTK_TYPE_TIMELINE (_gtk_timeline_get_type ()) #define GTK_TIMELINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TIMELINE, GtkTimeline)) #define GTK_TIMELINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TIMELINE, GtkTimelineClass)) #define GTK_IS_TIMELINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TIMELINE)) @@ -73,43 +73,43 @@ struct GtkTimelineClass }; -GType gtk_timeline_get_type (void) G_GNUC_CONST; +GType _gtk_timeline_get_type (void) G_GNUC_CONST; -GtkTimeline *gtk_timeline_new (guint duration); -GtkTimeline *gtk_timeline_new_for_screen (guint duration, - GdkScreen *screen); +GtkTimeline * _gtk_timeline_new (guint duration); +GtkTimeline * _gtk_timeline_new_for_screen (guint duration, + GdkScreen *screen); -void gtk_timeline_start (GtkTimeline *timeline); -void gtk_timeline_pause (GtkTimeline *timeline); -void gtk_timeline_rewind (GtkTimeline *timeline); +void _gtk_timeline_start (GtkTimeline *timeline); +void _gtk_timeline_pause (GtkTimeline *timeline); +void _gtk_timeline_rewind (GtkTimeline *timeline); -gboolean gtk_timeline_is_running (GtkTimeline *timeline); +gboolean _gtk_timeline_is_running (GtkTimeline *timeline); -guint gtk_timeline_get_fps (GtkTimeline *timeline); -void gtk_timeline_set_fps (GtkTimeline *timeline, - guint fps); +guint _gtk_timeline_get_fps (GtkTimeline *timeline); +void _gtk_timeline_set_fps (GtkTimeline *timeline, + guint fps); -gboolean gtk_timeline_get_loop (GtkTimeline *timeline); -void gtk_timeline_set_loop (GtkTimeline *timeline, - gboolean loop); +gboolean _gtk_timeline_get_loop (GtkTimeline *timeline); +void _gtk_timeline_set_loop (GtkTimeline *timeline, + gboolean loop); -guint gtk_timeline_get_duration (GtkTimeline *timeline); -void gtk_timeline_set_duration (GtkTimeline *timeline, - guint duration); +guint _gtk_timeline_get_duration (GtkTimeline *timeline); +void _gtk_timeline_set_duration (GtkTimeline *timeline, + guint duration); -GdkScreen *gtk_timeline_get_screen (GtkTimeline *timeline); -void gtk_timeline_set_screen (GtkTimeline *timeline, - GdkScreen *screen); +GdkScreen * _gtk_timeline_get_screen (GtkTimeline *timeline); +void _gtk_timeline_set_screen (GtkTimeline *timeline, + GdkScreen *screen); -GtkTimelineDirection gtk_timeline_get_direction (GtkTimeline *timeline); -void gtk_timeline_set_direction (GtkTimeline *timeline, - GtkTimelineDirection direction); +GtkTimelineDirection _gtk_timeline_get_direction (GtkTimeline *timeline); +void _gtk_timeline_set_direction (GtkTimeline *timeline, + GtkTimelineDirection direction); -gdouble gtk_timeline_get_progress (GtkTimeline *timeline); +gdouble _gtk_timeline_get_progress (GtkTimeline *timeline); -GtkTimelineProgressType gtk_timeline_get_progress_type (GtkTimeline *timeline); -void gtk_timeline_set_progress_type (GtkTimeline *timeline, - GtkTimelineProgressType progress_type); +GtkTimelineProgressType _gtk_timeline_get_progress_type (GtkTimeline *timeline); +void _gtk_timeline_set_progress_type (GtkTimeline *timeline, + GtkTimelineProgressType progress_type); G_END_DECLS diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 196a2c59dd..214c3913b5 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -641,6 +641,7 @@ static void gtk_widget_real_adjust_size_request (GtkWidget gint *natural_size); static void gtk_widget_real_adjust_size_allocation (GtkWidget *widget, GtkOrientation orientation, + gint *minimum_size, gint *natural_size, gint *allocated_pos, gint *allocated_size); @@ -1519,6 +1520,12 @@ gtk_widget_class_init (GtkWidgetClass *klass) * The ::style-set signal is emitted when a new style has been set * on a widget. Note that style-modifying functions like * gtk_widget_modify_base() also cause this signal to be emitted. + * + * Note that this signal is emitted for changes to the deprecated + * #GtkStyle. To track changes to the #GtkStyleContext associated + * with a widget, use the #GtkWidget::style-updated signal. + * + * Deprecated:3.0: Use the #GtkWidget::style-updated signal */ widget_signals[STYLE_SET] = g_signal_new (I_("style-set"), @@ -1530,6 +1537,16 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GTK_TYPE_STYLE); + /** + * GtkWidget::style-updated: + * @widget: the object on which the signal is emitted + * + * The ::style-updated signal is emitted when the #GtkStyleContext + * of a widget is changed. Note that style-modifying functions like + * gtk_widget_override_color() also cause this signal to be emitted. + * + * Since: 3.0 + */ widget_signals[STYLE_UPDATED] = g_signal_new (I_("style-updated"), G_TYPE_FROM_CLASS (gobject_class), @@ -4097,10 +4114,10 @@ _gtk_widget_start_state_transitions (GtkWidget *widget) if (animation_desc) { - if (gtk_animation_description_get_loop (animation_desc)) + if (_gtk_animation_description_get_loop (animation_desc)) _gtk_widget_notify_state_change (widget, flag, TRUE); - gtk_animation_description_unref (animation_desc); + _gtk_animation_description_unref (animation_desc); } flag >>= 1; @@ -4636,7 +4653,7 @@ gtk_widget_size_allocate (GtkWidget *widget, gboolean alloc_needed; gboolean size_changed; gboolean position_changed; - gint natural_width, natural_height; + gint natural_width, natural_height, dummy; gint min_width, min_height; priv = widget->priv; @@ -4681,7 +4698,7 @@ gtk_widget_size_allocate (GtkWidget *widget, * when aligning implicitly. */ gtk_widget_get_preferred_width (widget, &min_width, &natural_width); - gtk_widget_get_preferred_height_for_width (widget, real_allocation.width, NULL, &natural_height); + gtk_widget_get_preferred_height_for_width (widget, real_allocation.width, &dummy, &natural_height); } else { @@ -4690,18 +4707,20 @@ gtk_widget_size_allocate (GtkWidget *widget, * when aligning implicitly. */ gtk_widget_get_preferred_height (widget, &min_height, &natural_height); - gtk_widget_get_preferred_width_for_height (widget, real_allocation.height, NULL, &natural_width); + gtk_widget_get_preferred_width_for_height (widget, real_allocation.height, &dummy, &natural_width); } /* Now that we have the right natural height and width, go ahead and remove any margins from the * allocated sizes and possibly limit them to the natural sizes */ GTK_WIDGET_GET_CLASS (widget)->adjust_size_allocation (widget, GTK_ORIENTATION_HORIZONTAL, + &dummy, &natural_width, &adjusted_allocation.x, &adjusted_allocation.width); GTK_WIDGET_GET_CLASS (widget)->adjust_size_allocation (widget, GTK_ORIENTATION_VERTICAL, + &dummy, &natural_height, &adjusted_allocation.y, &adjusted_allocation.height); @@ -5026,10 +5045,12 @@ adjust_for_align(GtkAlign align, static void adjust_for_margin(gint start_margin, gint end_margin, + gint *minimum_size, gint *natural_size, gint *allocated_pos, gint *allocated_size) { + *minimum_size -= (start_margin + end_margin); *natural_size -= (start_margin + end_margin); *allocated_pos += start_margin; *allocated_size -= (start_margin + end_margin); @@ -5038,6 +5059,7 @@ adjust_for_margin(gint start_margin, static void gtk_widget_real_adjust_size_allocation (GtkWidget *widget, GtkOrientation orientation, + gint *minimum_size, gint *natural_size, gint *allocated_pos, gint *allocated_size) @@ -5050,7 +5072,8 @@ gtk_widget_real_adjust_size_allocation (GtkWidget *widget, { adjust_for_margin (aux_info->margin.left, aux_info->margin.right, - natural_size, allocated_pos, allocated_size); + minimum_size, natural_size, + allocated_pos, allocated_size); adjust_for_align (aux_info->halign, natural_size, allocated_pos, allocated_size); } @@ -5058,7 +5081,8 @@ gtk_widget_real_adjust_size_allocation (GtkWidget *widget, { adjust_for_margin (aux_info->margin.top, aux_info->margin.bottom, - natural_size, allocated_pos, allocated_size); + minimum_size, natural_size, + allocated_pos, allocated_size); adjust_for_align (aux_info->valign, natural_size, allocated_pos, allocated_size); } @@ -7935,6 +7959,11 @@ modifier_style_changed (GtkModifierStyle *style, context = gtk_widget_get_style_context (widget); gtk_style_context_invalidate (context); + + g_signal_emit (widget, + widget_signals[STYLE_SET], + 0, + widget->priv->style); } static GtkModifierStyle * @@ -8188,11 +8217,6 @@ gtk_widget_modify_fg (GtkWidget *widget, } else gtk_widget_override_color (widget, state, NULL); - - g_signal_emit (widget, - widget_signals[STYLE_SET], - 0, - widget->priv->style); } /** @@ -8258,11 +8282,6 @@ gtk_widget_modify_bg (GtkWidget *widget, } else gtk_widget_override_background_color (widget, state, NULL); - - g_signal_emit (widget, - widget_signals[STYLE_SET], - 0, - widget->priv->style); } /** @@ -8327,36 +8346,6 @@ gtk_widget_modify_base (GtkWidget *widget, gtk_widget_modify_color_component (widget, GTK_RC_BASE, state, color); } -static void -modify_color_property (GtkWidget *widget, - GtkRcStyle *rc_style, - const char *name, - const GdkColor *color) -{ - GQuark type_name = g_type_qname (G_OBJECT_TYPE (widget)); - GQuark property_name = g_quark_from_string (name); - - if (color) - { - GtkRcProperty rc_property = {0}; - char *color_name; - - rc_property.type_name = type_name; - rc_property.property_name = property_name; - rc_property.origin = NULL; - - color_name = gdk_color_to_string (color); - g_value_init (&rc_property.value, G_TYPE_STRING); - g_value_take_string (&rc_property.value, color_name); - - _gtk_rc_style_set_rc_property (rc_style, &rc_property); - - g_value_unset (&rc_property.value); - } - else - _gtk_rc_style_unset_rc_property (rc_style, type_name, property_name); -} - /** * gtk_widget_modify_cursor: * @widget: a #GtkWidget @@ -8396,11 +8385,6 @@ gtk_widget_modify_cursor (GtkWidget *widget, secondary_rgba.alpha = 1; gtk_widget_override_cursor (widget, &primary_rgba, &secondary_rgba); - - g_signal_emit (widget, - widget_signals[STYLE_SET], - 0, - widget->priv->style); } /** @@ -8421,11 +8405,6 @@ gtk_widget_modify_font (GtkWidget *widget, g_return_if_fail (GTK_IS_WIDGET (widget)); gtk_widget_override_font (widget, font_desc); - - g_signal_emit (widget, - widget_signals[STYLE_SET], - 0, - widget->priv->style); } static void @@ -8707,6 +8686,15 @@ reset_style_recurse (GtkWidget *widget, gpointer data) NULL); } +/** + * gtk_widget_reset_style: + * @widget: a #GtkWidget + * + * Updates the style context of @widget and all descendents + * by updating its widget path. + * + * Since: 3.0 + */ void gtk_widget_reset_style (GtkWidget *widget) { @@ -8776,7 +8764,7 @@ gtk_widget_peek_pango_context (GtkWidget *widget) * * If you create and keep a #PangoLayout using this context, you must * deal with changes to the context by calling pango_layout_context_changed() - * on the layout in response to the #GtkWidget::style-set and + * on the layout in response to the #GtkWidget::style-updated and * #GtkWidget::direction-changed signals for the widget. * * Return value: (transfer none): the #PangoContext for the widget. @@ -8892,7 +8880,7 @@ gtk_widget_create_pango_context (GtkWidget *widget) * If you keep a #PangoLayout created in this way around, in order to * notify the layout of changes to the base direction or font of this * widget, you must call pango_layout_context_changed() in response to - * the #GtkWidget::style-set and #GtkWidget::direction-changed signals + * the #GtkWidget::style-updated and #GtkWidget::direction-changed signals * for the widget. * * Return value: (transfer full): the new #PangoLayout diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 04f7772daf..2a079ea0b6 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -415,6 +415,7 @@ struct _GtkWidgetClass gint *natural_size); void (* adjust_size_allocation) (GtkWidget *widget, GtkOrientation orientation, + gint *minimum_size, gint *natural_size, gint *allocated_pos, gint *allocated_size); diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h index 801906c68f..87b44b8ef9 100644 --- a/gtk/gtkwidgetpath.h +++ b/gtk/gtkwidgetpath.h @@ -31,8 +31,10 @@ G_BEGIN_DECLS typedef struct _GtkWidgetPath GtkWidgetPath; +#define GTK_TYPE_WIDGET_PATH (gtk_widget_path_get_type ()) -GtkWidgetPath * gtk_widget_path_new (void); +GType gtk_widget_path_get_type (void) G_GNUC_CONST; +GtkWidgetPath * gtk_widget_path_new (void); GtkWidgetPath * gtk_widget_path_copy (const GtkWidgetPath *path); void gtk_widget_path_free (GtkWidgetPath *path); diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c deleted file mode 100644 index 1a276f85b4..0000000000 --- a/gtk/gtkwindow-decorate.c +++ /dev/null @@ -1,808 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2001 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * Authors: Alexander Larsson - */ - -#include "config.h" -#include "gtkprivate.h" -#include "gtkwindow.h" -#include "gtkmain.h" -#include "gtkwindow-decorate.h" -#include "gtkintl.h" - - -#ifdef DECORATE_WINDOWS - -typedef enum -{ - GTK_WINDOW_REGION_TITLE, - GTK_WINDOW_REGION_MAXIMIZE, - GTK_WINDOW_REGION_CLOSE, - GTK_WINDOW_REGION_BR_RESIZE -} GtkWindowRegionType; - -typedef struct _GtkWindowRegion GtkWindowRegion; -typedef struct _GtkWindowDecoration GtkWindowDecoration; - -struct _GtkWindowRegion -{ - GdkRectangle rect; - GtkWindowRegionType type; -}; - -typedef enum -{ - RESIZE_TOP_LEFT, - RESIZE_TOP, - RESIZE_TOP_RIGHT, - RESIZE_RIGHT, - RESIZE_BOTTOM_RIGHT, - RESIZE_BOTTOM, - RESIZE_BOTTOM_LEFT, - RESIZE_LEFT, - RESIZE_NONE, -} GtkWindowResizeType; - -struct _GtkWindowDecoration -{ - gint n_regions; - GtkWindowRegion *regions; - - gint last_x, last_y; - gint last_w, last_h; - - PangoLayout *title_layout; - - GtkWindowResizeType resize; - - guint moving : 1; - guint closing : 1; - guint maximizing : 1; - guint maximized : 1; - guint maximizable : 1; - guint decorated : 1; - guint real_inner_move : 1; - guint focused : 1; -}; - -#define DECORATION_BORDER_TOP 15 -#define DECORATION_BORDER_LEFT 3 -#define DECORATION_BORDER_RIGHT 3 -#define DECORATION_BORDER_BOTTOM 3 -#define DECORATION_BORDER_TOT_X (DECORATION_BORDER_LEFT + DECORATION_BORDER_RIGHT) -#define DECORATION_BORDER_TOT_Y (DECORATION_BORDER_TOP + DECORATION_BORDER_BOTTOM) -#define DECORATION_BUTTON_SIZE 9 -#define DECORATION_BUTTON_Y_OFFSET 2 -#define DECORATION_TITLE_FONT "Sans 9" - -static void gtk_decorated_window_recalculate_regions (GtkWindow *window); -static GtkWindowRegionType gtk_decorated_window_region_type (GtkWindow *window, - gint x, - gint y); -static gint gtk_decorated_window_frame_event (GtkWindow *window, - GdkEvent *event); -static gint gtk_decorated_window_button_press (GtkWidget *widget, - GdkEventButton *event); -static gint gtk_decorated_window_button_release (GtkWidget *widget, - GdkEventButton *event); -static gint gtk_decorated_window_motion_notify (GtkWidget *widget, - GdkEventMotion *event); -static gint gtk_decorated_window_window_state (GtkWidget *widget, - GdkEventWindowState *event); -static void gtk_decorated_window_paint (GtkWidget *widget, - GdkRectangle *area); -static gint gtk_decorated_window_focus_change (GtkWidget *widget, - GdkEventFocus *event); -static void gtk_decorated_window_realize (GtkWindow *window); -static void gtk_decorated_window_unrealize (GtkWindow *window); - -static void -gtk_decoration_free (GtkWindowDecoration *deco) -{ - g_free (deco->regions); - deco->regions = NULL; - deco->n_regions = 0; - - g_free (deco); -} - -void -gtk_decorated_window_init (GtkWindow *window) -{ - GtkWindowDecoration *deco; - - deco = g_new (GtkWindowDecoration, 1); - - deco->n_regions = 0; - deco->regions = NULL; - deco->title_layout = NULL; - deco->resize = RESIZE_NONE; - deco->moving = FALSE; - deco->decorated = TRUE; - deco->closing = FALSE; - deco->maximizing = FALSE; - deco->maximized = FALSE; - deco->maximizable = FALSE; - deco->real_inner_move = FALSE; - - g_object_set_data_full (G_OBJECT (window), I_("gtk-window-decoration"), deco, - (GDestroyNotify) gtk_decoration_free); - - gtk_window_set_has_frame (window, TRUE); - - g_signal_connect (window, - "frame-event", - G_CALLBACK (gtk_decorated_window_frame_event), - window); - g_signal_connect (window, - "focus-in-event", - G_CALLBACK (gtk_decorated_window_focus_change), - window); - g_signal_connect (window, - "focus-out-event", - G_CALLBACK (gtk_decorated_window_focus_change), - window); - g_signal_connect (window, - "realize", - G_CALLBACK (gtk_decorated_window_realize), - window); - g_signal_connect (window, - "unrealize", - G_CALLBACK (gtk_decorated_window_unrealize), - window); -} - -static inline GtkWindowDecoration * -get_decoration (GtkWindow *window) -{ - return (GtkWindowDecoration *)g_object_get_data (G_OBJECT (window), "gtk-window-decoration"); -} - -void -gtk_decorated_window_set_title (GtkWindow *window, - const gchar *title) -{ - GtkWindowDecoration *deco = get_decoration (window); - - if (deco->title_layout) - pango_layout_set_text (deco->title_layout, title, -1); -} - -void -gtk_decorated_window_calculate_frame_size (GtkWindow *window) -{ - GdkWMDecoration decorations; - GtkWindowDecoration *deco = get_decoration (window); - - if (gdk_window_get_decorations (GTK_WIDGET (window)->window, - &decorations)) - { - if ((decorations & GDK_DECOR_BORDER) && - (decorations & GDK_DECOR_TITLE)) - { - deco->decorated = TRUE; - if ((decorations & GDK_DECOR_MAXIMIZE) && - (gtk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_NORMAL)) - deco->maximizable = TRUE; - } - else - deco->decorated = FALSE; - } - else - { - deco->decorated = (window->type != GTK_WINDOW_POPUP); - deco->maximizable = (gtk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_NORMAL); - } - - if (deco->decorated) - gtk_window_set_frame_dimensions (window, - DECORATION_BORDER_LEFT, - DECORATION_BORDER_TOP, - DECORATION_BORDER_RIGHT, - DECORATION_BORDER_BOTTOM); - else - gtk_window_set_frame_dimensions (window, 0, 0, 0, 0); - - gtk_decorated_window_recalculate_regions (window); -} - -static gboolean -gtk_decorated_window_inner_change (GdkWindow *win, - gint x, gint y, - gint width, gint height, - gpointer user_data) -{ - GtkWindow *window = (GtkWindow *)user_data; - GtkWidget *widget = GTK_WIDGET (window); - GtkWindowDecoration *deco = get_decoration (window); - - if (deco->real_inner_move) - { - deco->real_inner_move = FALSE; - return FALSE; - } - - deco->real_inner_move = TRUE; - gdk_window_move_resize (widget->window, - window->frame_left, window->frame_top, - width, height); - - gdk_window_move_resize (window->frame, - x - window->frame_left, y - window->frame_top, - width + window->frame_left + window->frame_right, - height + window->frame_top + window->frame_bottom); - return TRUE; -} - -static void -gtk_decorated_window_inner_get_pos (GdkWindow *win, - gint *x, gint *y, - gpointer user_data) -{ - GtkWindow *window = (GtkWindow *)user_data; - - gdk_window_get_position (window->frame, x, y); - - *x += window->frame_left; - *y += window->frame_top; -} - -static void -gtk_decorated_window_realize (GtkWindow *window) -{ - GtkWindowDecoration *deco = get_decoration (window); - GtkWidget *widget = GTK_WIDGET (window); - PangoFontDescription *font_desc; - - deco->title_layout = gtk_widget_create_pango_layout (widget, - (window->title)?window->title:""); - - font_desc = pango_font_description_from_string(DECORATION_TITLE_FONT); - pango_layout_set_font_description (deco->title_layout, font_desc); - pango_font_description_free (font_desc); -} - - -static void -gtk_decorated_window_unrealize (GtkWindow *window) -{ - GtkWindowDecoration *deco = get_decoration (window); - - if (deco->title_layout) - { - g_object_unref (deco->title_layout); - deco->title_layout = NULL; - } -} - -static gint -gtk_decorated_window_frame_event (GtkWindow *window, GdkEvent *event) -{ - GtkWindowDecoration *deco = get_decoration (window); - GtkWidget *widget = GTK_WIDGET (window); - GdkEventExpose *expose_event; - - switch (event->type) - { - case GDK_EXPOSE: - expose_event = (GdkEventExpose *)event; - if (deco->decorated) - gtk_decorated_window_paint (widget, &expose_event->area); - return TRUE; - break; - case GDK_CONFIGURE: - gtk_decorated_window_recalculate_regions (window); - break; - case GDK_MOTION_NOTIFY: - return gtk_decorated_window_motion_notify (widget, (GdkEventMotion *)event); - break; - case GDK_BUTTON_PRESS: - return gtk_decorated_window_button_press (widget, (GdkEventButton *)event); - break; - case GDK_BUTTON_RELEASE: - return gtk_decorated_window_button_release (widget, (GdkEventButton *)event); - case GDK_WINDOW_STATE: - return gtk_decorated_window_window_state (widget, (GdkEventWindowState *)event); - default: - break; - } - return FALSE; -} - -static gint -gtk_decorated_window_focus_change (GtkWidget *widget, - GdkEventFocus *event) -{ - GtkWindow *window = GTK_WINDOW(widget); - GtkWindowDecoration *deco = get_decoration (window); - deco->focused = event->in; - gdk_window_invalidate_rect (window->frame, NULL, FALSE); - return FALSE; -} - -static gint -gtk_decorated_window_motion_notify (GtkWidget *widget, - GdkEventMotion *event) -{ - GtkWindow *window; - GtkWindowDecoration *deco; - GdkModifierType mask; - GdkWindow *win; - gint x, y; - gint win_x, win_y, win_w, win_h; - - window = GTK_WINDOW (widget); - deco = get_decoration (window); - - if (!deco->decorated) - return TRUE; - - win = widget->window; - gdk_window_get_pointer (window->frame, &x, &y, &mask); - - gdk_window_get_position (window->frame, &win_x, &win_y); - win_x += DECORATION_BORDER_LEFT; - win_y += DECORATION_BORDER_TOP; - - gdk_window_get_geometry (win, NULL, NULL, &win_w, &win_h, NULL); - - if (deco->moving) - { - int dx, dy; - dx = x - deco->last_x; - dy = y - deco->last_y; - - gtk_window_move (window, win_x + dx, win_y + dy); - } - - if (deco->resize != RESIZE_NONE) - { - int w, h; - - w = win_w; - h = win_h; - - switch(deco->resize) { - case RESIZE_BOTTOM_RIGHT: - w = x - DECORATION_BORDER_TOT_X; - h = y - DECORATION_BORDER_TOT_Y; - break; - case RESIZE_RIGHT: - w = x - DECORATION_BORDER_TOT_X; - break; - case RESIZE_BOTTOM: - h = y - DECORATION_BORDER_TOT_Y; - break; - case RESIZE_TOP_LEFT: - case RESIZE_TOP: - case RESIZE_TOP_RIGHT: - case RESIZE_BOTTOM_LEFT: - case RESIZE_LEFT: - default: - g_warning ("Resize mode %d not handled yet.\n", deco->resize); - break; - } - - if ((w > 0) && (h > 0)) - { - _gtk_window_constrain_size (window, w,h, &w, &h); - - if ((w != win_w) || (h != win_h)) - gdk_window_resize (widget->window, w, h); - } - } - - return TRUE; -} - -static GtkWindowRegionType -gtk_decorated_window_region_type (GtkWindow *window, gint x, gint y) -{ - GtkWindowDecoration *deco = get_decoration (window); - int i; - - for (i=0;in_regions;i++) - { - if ((x > deco->regions[i].rect.x) && - (x - deco->regions[i].rect.x < deco->regions[i].rect.width) && - (y > deco->regions[i].rect.y) && - (y - deco->regions[i].rect.y < deco->regions[i].rect.height)) - return deco->regions[i].type; - } - return -1; -} - -static gint -gtk_decorated_window_button_press (GtkWidget *widget, - GdkEventButton *event) -{ - GtkWindow *window; - GtkWindowRegionType type; - GtkWindowDecoration *deco; - gint x, y; - - window = GTK_WINDOW (widget); - deco = get_decoration (window); - - if (!deco->decorated) - return TRUE; - - x = event->x; - y = event->y; - - type = gtk_decorated_window_region_type (window, x, y); - - switch (type) - { - case GTK_WINDOW_REGION_TITLE: - if (!deco->maximized && event->state & GDK_BUTTON1_MASK) - { - deco->last_x = x; - deco->last_y = y; - deco->moving = TRUE; - } - break; - case GTK_WINDOW_REGION_MAXIMIZE: - if (event->state & GDK_BUTTON1_MASK) - deco->maximizing = TRUE; - break; - case GTK_WINDOW_REGION_CLOSE: - if (event->state & GDK_BUTTON1_MASK) - deco->closing = TRUE; - break; - case GTK_WINDOW_REGION_BR_RESIZE: - if (!deco->maximized) - { - if (event->state & GDK_BUTTON1_MASK) - deco->resize = RESIZE_BOTTOM_RIGHT; - deco->last_x = x; - deco->last_y = y; - } - break; - default: - break; - } - - return TRUE; -} - -static gint -gtk_decorated_window_button_release (GtkWidget *widget, - GdkEventButton *event) -{ - GtkWindow *window; - GtkWindowRegionType type; - GtkWindowDecoration *deco; - - window = GTK_WINDOW (widget); - deco = get_decoration (window); - - if (deco->closing) - { - type = gtk_decorated_window_region_type (window, event->x, event->y); - if (type == GTK_WINDOW_REGION_CLOSE) - { - GdkEvent *event = gdk_event_new (GDK_DELETE); - - event->any.type = GDK_DELETE; - event->any.window = g_object_ref (widget->window); - event->any.send_event = TRUE; - - gtk_main_do_event (event); - gdk_event_free (event); - } - } - else if (deco->maximizing) - { - type = gtk_decorated_window_region_type (window, event->x, event->y); - if (type == GTK_WINDOW_REGION_MAXIMIZE) - { - if (deco->maximized) - gtk_window_unmaximize (window); - else - gtk_window_maximize (window); - } - } - - deco->closing = FALSE; - deco->maximizing = FALSE; - deco->moving = FALSE; - deco->resize = RESIZE_NONE; - return TRUE; -} - -static gint -gtk_decorated_window_window_state (GtkWidget *widget, - GdkEventWindowState *event) -{ - GtkWindow *window; - GtkWindowDecoration *deco; - GdkWindowObject *priv; - - window = GTK_WINDOW (widget); - deco = get_decoration (window); - priv = GDK_WINDOW_OBJECT (window->frame); - - if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) - { - if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) - { - int w, h; - gdk_window_get_geometry (widget->window, NULL, NULL, - &deco->last_w, &deco->last_h, NULL); - gdk_window_get_origin (widget->window, &deco->last_x, &deco->last_y); - w = gdk_screen_get_width(gdk_screen_get_default()) - DECORATION_BORDER_TOT_X; - h = gdk_screen_get_height(gdk_screen_get_default()) - DECORATION_BORDER_TOT_Y; - _gtk_window_constrain_size (window, w, h, &w, &h); - if (w != deco->last_w || h != deco->last_h) - { - gtk_window_move (window, DECORATION_BORDER_LEFT, DECORATION_BORDER_TOP); - gdk_window_resize (widget->window, w, h); - deco->maximized = TRUE; - } - } - else - { - gtk_window_move (window, deco->last_x, deco->last_y); - _gtk_window_constrain_size (window, deco->last_w, deco->last_h, - &deco->last_w, &deco->last_h); - gdk_window_resize (widget->window, deco->last_w, deco->last_h); - deco->maximized = FALSE; - } - } - return TRUE; -} - -static void -gtk_decorated_window_paint (GtkWidget *widget, - GdkRectangle *area) -{ - GtkWindow *window = GTK_WINDOW (widget); - GtkWindowDecoration *deco = get_decoration (window); - gint x1, y1, x2, y2; - GtkStateType border_state; - cairo_t *cr; - - if (deco->decorated) - { - GdkWindow *frame; - gint width, height; - - frame = window->frame; - gdk_drawable_get_size (frame, &width, &height); - - /* Top */ - gtk_paint_flat_box (widget->style, frame, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, area, widget, "base", - 0, 0, - width, DECORATION_BORDER_TOP); - /* Bottom */ - gtk_paint_flat_box (widget->style, frame, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, area, widget, "base", - 0, height - DECORATION_BORDER_BOTTOM, - width, DECORATION_BORDER_BOTTOM); - /* Left */ - gtk_paint_flat_box (widget->style, frame, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, area, widget, "base", - 0, DECORATION_BORDER_TOP, - DECORATION_BORDER_LEFT, height - DECORATION_BORDER_TOT_Y); - /* Right */ - gtk_paint_flat_box (widget->style, frame, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, area, widget, "base", - width - DECORATION_BORDER_RIGHT, DECORATION_BORDER_TOP, - DECORATION_BORDER_RIGHT, height - DECORATION_BORDER_TOT_Y); - - /* Border: */ - if (deco->focused) - border_state = GTK_STATE_SELECTED; - else - border_state = GTK_STATE_PRELIGHT; - - gtk_paint_box (widget->style, frame, border_state, - GTK_SHADOW_OUT, area, widget, "base", - 0, 0, width, height); - - gtk_paint_box (widget->style, frame, border_state, - GTK_SHADOW_IN, area, widget, "base", - DECORATION_BORDER_LEFT - 2, DECORATION_BORDER_TOP - 2, - width - (DECORATION_BORDER_LEFT + DECORATION_BORDER_RIGHT) + 3, - height - (DECORATION_BORDER_TOP + DECORATION_BORDER_BOTTOM) + 3); - - cr = gdk_cairo_create (frame); - cairo_set_line_width (cr, 1.0); - cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE); - - if (area) - { - gdk_cairo_rectangle (cr, &area); - cairo_clip (cr); - } - - if (deco->maximizable) - { - /* Maximize button: */ - - x1 = width - (DECORATION_BORDER_LEFT * 2) - (DECORATION_BUTTON_SIZE * 2); - y1 = DECORATION_BUTTON_Y_OFFSET; - x2 = x1 + DECORATION_BUTTON_SIZE; - y2 = y1 + DECORATION_BUTTON_SIZE; - - gdk_cairo_set_source_color (cr, &widget->style->bg[widget->state]); - cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1); - cairo_fill (cr); - - gdk_cairo_set_source_rgb (cr, 0, 0, 0); - cairo_rectangle (cr, x1 + 1, y1 + 1, x2 - x1 - 3, 1); - cairo_move_to (cr, x1 + 1.5, y1 + 1.5); - cairo_line_to (cr, x2 - 1.5, y1 + 1.5); - cairo_rectangle (cr, x1 + 1.5, y1 + 2.5, DECORATION_BUTTON_SIZE - 3, DECORATION_BUTTON_SIZE - 4); - cairo_stroke (cr); - } - - /* Close button: */ - - x1 = width - DECORATION_BORDER_LEFT - DECORATION_BUTTON_SIZE; - y1 = DECORATION_BUTTON_Y_OFFSET; - x2 = width - DECORATION_BORDER_LEFT; - y2 = DECORATION_BUTTON_Y_OFFSET + DECORATION_BUTTON_SIZE; - - gdk_cairo_set_source_color (cr, &widget->style->bg[widget->state]); - cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1); - cairo_fill (cr); - - /* draw an X */ - cairo_move_to (cr, x1 + 0.5, y1 + 0.5); - cairo_line_to (cr, x2 - 0.5, y2 - 0.5); - cairo_move_to (cr, x1 + 0.5, y2 - 0.5); - cairo_line_to (cr, x2 - 0.5, y1 + 0.5); - cairo_stroke (cr); - - /* Title */ - if (deco->title_layout) - { - gdk_cairo_set_source_color (cr, widget->style->fg [border_state]); - pango_cairo_show_layout (cr, deco->title_layout); - } - - cairo_destroy (cr); - } -} - - -static void -gtk_decorated_window_recalculate_regions (GtkWindow *window) -{ - gint n_regions; - gint width, height; - GtkWindowRegion *region; - GtkWindowDecoration *deco = get_decoration (window); - - n_regions = 0; - - if (!deco->decorated) - return; - - n_regions += 2; /* close, Title */ - if (deco->maximizable) - n_regions += 1; - if (gtk_window_get_resizable (window)) - n_regions += 2; - - if (deco->n_regions != n_regions) - { - g_free (deco->regions); - deco->regions = g_new (GtkWindowRegion, n_regions); - deco->n_regions = n_regions; - } - - width = GTK_WIDGET (window)->allocation.width + DECORATION_BORDER_TOT_X; - height = GTK_WIDGET (window)->allocation.height + DECORATION_BORDER_TOT_Y; - - region = deco->regions; - - /* Maximize button */ - if (deco->maximizable) - { - region->rect.x = width - (DECORATION_BORDER_LEFT * 2) - (DECORATION_BUTTON_SIZE * 2); - region->rect.y = DECORATION_BUTTON_Y_OFFSET; - region->rect.width = DECORATION_BUTTON_SIZE; - region->rect.height = DECORATION_BUTTON_SIZE; - region->type = GTK_WINDOW_REGION_MAXIMIZE; - region++; - } - - /* Close button */ - region->rect.x = width - DECORATION_BORDER_LEFT - DECORATION_BUTTON_SIZE; - region->rect.y = DECORATION_BUTTON_Y_OFFSET; - region->rect.width = DECORATION_BUTTON_SIZE; - region->rect.height = DECORATION_BUTTON_SIZE; - region->type = GTK_WINDOW_REGION_CLOSE; - region++; - - /* title bar */ - region->rect.x = 0; - region->rect.y = 0; - region->rect.width = width; - region->rect.height = DECORATION_BORDER_TOP; - region->type = GTK_WINDOW_REGION_TITLE; - region++; - - if (gtk_window_get_resizable (window)) - { - region->rect.x = width - (DECORATION_BORDER_RIGHT + 10); - region->rect.y = height - DECORATION_BORDER_BOTTOM; - region->rect.width = DECORATION_BORDER_RIGHT + 10; - region->rect.height = DECORATION_BORDER_BOTTOM; - region->type = GTK_WINDOW_REGION_BR_RESIZE; - region++; - - region->rect.x = width - DECORATION_BORDER_RIGHT; - region->rect.y = height - (DECORATION_BORDER_BOTTOM + 10); - region->rect.width = DECORATION_BORDER_RIGHT; - region->rect.height = DECORATION_BORDER_BOTTOM + 10; - region->type = GTK_WINDOW_REGION_BR_RESIZE; - region++; - } -} - -void -gtk_decorated_window_move_resize_window (GtkWindow *window, - gint x, - gint y, - gint width, - gint height) -{ - GtkWidget *widget = GTK_WIDGET (window); - GtkWindowDecoration *deco = get_decoration (window); - - deco->real_inner_move = TRUE; - gdk_window_move_resize (widget->window, - x, y, width, height); -} -#else - -void -gtk_decorated_window_init (GtkWindow *window) -{ -} - -void -gtk_decorated_window_calculate_frame_size (GtkWindow *window) -{ -} - -void -gtk_decorated_window_set_title (GtkWindow *window, - const gchar *title) -{ -} - -void -gtk_decorated_window_move_resize_window (GtkWindow *window, - gint x, - gint y, - gint width, - gint height) -{ - gdk_window_move_resize (gtk_widget_get_window (GTK_WIDGET (window)), - x, y, width, height); -} -#endif diff --git a/gtk/gtkwindow-decorate.h b/gtk/gtkwindow-decorate.h deleted file mode 100644 index 9f182f457b..0000000000 --- a/gtk/gtkwindow-decorate.h +++ /dev/null @@ -1,41 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2001 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * Authors: Alexander Larsson - */ - -#ifndef __GTK_WINDOW_DECORATE_H__ -#define __GTK_WINDOW_DECORATE_H__ - -G_BEGIN_DECLS - -void gtk_decorated_window_init (GtkWindow *window); -void gtk_decorated_window_calculate_frame_size (GtkWindow *window); -void gtk_decorated_window_set_title (GtkWindow *window, - const gchar *title); -void gtk_decorated_window_move_resize_window (GtkWindow *window, - gint x, - gint y, - gint width, - gint height); - -G_END_DECLS - -#endif /* __GTK_WINDOW_DECORATE_H__ */ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 31f46a56cd..b42f68dc87 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -37,7 +37,6 @@ #include "gtkprivate.h" #include "gtkrc.h" #include "gtkwindow.h" -#include "gtkwindow-decorate.h" #include "gtkbindings.h" #include "gtkkeyhash.h" #include "gtkmain.h" @@ -1135,8 +1134,6 @@ gtk_window_init (GtkWindow *window) priv->has_user_ref_count = TRUE; toplevel_list = g_slist_prepend (toplevel_list, window); - gtk_decorated_window_init (window); - g_signal_connect (priv->screen, "composited-changed", G_CALLBACK (gtk_window_on_composited_changed), window); } @@ -1584,8 +1581,6 @@ gtk_window_set_title (GtkWindow *window, { gdk_window_set_title (gtk_widget_get_window (widget), priv->title); - - gtk_decorated_window_set_title (window, title); } g_object_notify (G_OBJECT (window), "title"); @@ -4671,11 +4666,6 @@ gtk_window_show (GtkWidget *widget) was_realized = TRUE; } - /* Must be done after the windows are realized, - * so that the decorations can be read - */ - gtk_decorated_window_calculate_frame_size (window); - /* We only send configure request if we didn't just finish * creating the window; if we just created the window * then we created it with widget->allocation anyhow. @@ -7583,10 +7573,10 @@ gtk_window_set_frame_dimensions (GtkWindow *window, width = allocation.width + left + right; height = allocation.height + top + bottom; gdk_window_resize (priv->frame, width, height); - gtk_decorated_window_move_resize_window (window, - left, top, - allocation.width, - allocation.height); + gdk_window_move_resize (gtk_widget_get_window (GTK_WIDGET (window)), + left, top, + allocation.width, + allocation.height); } } diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am index dda9727d49..186880b11c 100644 --- a/gtk/tests/Makefile.am +++ b/gtk/tests/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/gdk \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ + -DSRCDIR=\""$(abs_srcdir)"\" \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) diff --git a/gtk/tests/stylecontext.c b/gtk/tests/stylecontext.c index 20b7dadfc9..69b9510bfd 100644 --- a/gtk/tests/stylecontext.c +++ b/gtk/tests/stylecontext.c @@ -26,11 +26,11 @@ test_parse_at (void) gboolean res; gint i; const gchar *valid[] = { - "@import \"test.css\";", - "@import 'test.css';", - "@import url(\"test.css\");", - "@import url('test.css');", - "@import\nurl (\t\"test.css\" ) ;", + "@import \"" SRCDIR "/test.css\";", + "@import '" SRCDIR "/test.css';", + "@import url(\"" SRCDIR "/test.css\");", + "@import url('" SRCDIR "/test.css');", + "@import\nurl (\t\"" SRCDIR "/test.css\" ) ;", "@define-color bg_color #f9a039;", "@define-color color @bg_color;", "@define-color color rgb(100, 99, 88);", @@ -48,8 +48,8 @@ test_parse_at (void) }; const gchar *invalid[] = { - "@import test.css ;", - "@import url ( \"test.css\" xyz );", + "@import " SRCDIR "/test.css ;", + "@import url ( \"" SRCDIR "/test.css\" xyz );", "@import url(\");", "@import url(');", "@import url(\"abc');", @@ -77,6 +77,8 @@ test_parse_at (void) { provider = gtk_css_provider_new (); res = gtk_css_provider_load_from_data (provider, valid[i], -1, &error); + if (error) + g_print ("parsing '%s': got unexpected error: %s\n", valid[i], error->message); g_assert_no_error (error); g_assert (res); @@ -217,8 +219,8 @@ test_parse_declarations (void) " center center, 0.8, \n" " color-stop (0.0,#fff),\n" " color-stop (1.0,#000))}\n", - "* { border-image: url (\"test.png\") 3 4 3 4 stretch }", - "* { border-image: url (\"test.png\") 3 4 3 4 repeat stretch}", + "* { border-image: url (\"" SRCDIR "/test.png\") 3 4 3 4 stretch }", + "* { border-image: url (\"" SRCDIR "/test.png\") 3 4 3 4 repeat stretch}", "* { transition: 150ms ease-in-out }", "* { transition: 1s linear loop }", NULL diff --git a/modules/engines/Makefile.am b/modules/engines/Makefile.am index 7f65239551..5af553f16e 100644 --- a/modules/engines/Makefile.am +++ b/modules/engines/Makefile.am @@ -4,6 +4,10 @@ if USE_WIN32 wimp = ms-windows endif -SUBDIRS = $(wimp) pixbuf +# the theme engines need to be ported to GtkThemingEngine +# SUBDIRS = $(wimp) pixbuf + +DIST_SUBDIRS = ms-windows pixbuf + -include $(top_srcdir)/git.mk diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in index 4ea635ed5e..da8ed2bd9b 100644 --- a/po-properties/POTFILES.in +++ b/po-properties/POTFILES.in @@ -209,7 +209,6 @@ gtk/gtkvscrollbar.c gtk/gtkvseparator.c gtk/gtkwidget.c gtk/gtkwindow.c -gtk/gtkwindow-decorate.c gtk/paper_names.c gtk/paper_names_offsets.c gtk/updateiconcache.c diff --git a/po-properties/es.po b/po-properties/es.po index be287b4698..866a43d207 100644 --- a/po-properties/es.po +++ b/po-properties/es.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: gtk+-properties.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk" "%2b&component=general\n" -"POT-Creation-Date: 2010-11-30 05:33+0000\n" -"PO-Revision-Date: 2010-12-02 19:09+0100\n" +"POT-Creation-Date: 2010-12-05 03:20+0000\n" +"PO-Revision-Date: 2010-12-05 18:32+0100\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -121,7 +121,7 @@ msgstr "Resolución de la tipografía" msgid "The resolution for fonts on the screen" msgstr "La resolución para las tipografías en la pantalla" -#: ../gdk/gdkwindow.c:410 ../gdk/gdkwindow.c:411 +#: ../gdk/gdkwindow.c:393 ../gdk/gdkwindow.c:394 msgid "Cursor" msgstr "Cursor" @@ -295,7 +295,7 @@ msgid "A unique name for the action." msgstr "Un nombre único para la acción." #: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:226 ../gtk/gtkexpander.c:209 -#: ../gtk/gtkframe.c:130 ../gtk/gtklabel.c:567 ../gtk/gtkmenuitem.c:331 +#: ../gtk/gtkframe.c:130 ../gtk/gtklabel.c:566 ../gtk/gtkmenuitem.c:331 #: ../gtk/gtktoolbutton.c:202 ../gtk/gtktoolitemgroup.c:1588 msgid "Label" msgstr "Etiqueta" @@ -344,7 +344,7 @@ msgstr "El icono mostrado" #: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:180 #: ../gtk/gtkimage.c:308 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:236 -#: ../gtk/gtkwindow.c:733 +#: ../gtk/gtkwindow.c:732 msgid "Icon Name" msgstr "Nombre del icono" @@ -413,7 +413,7 @@ msgstr "" "acción se ocultan." #: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235 -#: ../gtk/gtkcellrenderer.c:282 ../gtk/gtkwidget.c:916 +#: ../gtk/gtkcellrenderer.c:282 ../gtk/gtkwidget.c:927 msgid "Sensitive" msgstr "Sensible" @@ -423,7 +423,7 @@ msgstr "Indica si la acción está activada." #: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242 #: ../gtk/gtkstatusicon.c:287 ../gtk/gtktreeviewcolumn.c:213 -#: ../gtk/gtkwidget.c:909 +#: ../gtk/gtkwidget.c:920 msgid "Visible" msgstr "Visible" @@ -627,7 +627,7 @@ msgstr "Sombra de la flecha" msgid "Appearance of the shadow surrounding the arrow" msgstr "Apariencia de la sombra que rodea la flecha" -#: ../gtk/gtkarrow.c:127 ../gtk/gtkmenu.c:731 ../gtk/gtkmenuitem.c:394 +#: ../gtk/gtkarrow.c:127 ../gtk/gtkmenu.c:730 ../gtk/gtkmenuitem.c:394 msgid "Arrow Scaling" msgstr "Escalado de flechas" @@ -635,7 +635,7 @@ msgstr "Escalado de flechas" msgid "Amount of space used up by arrow" msgstr "Cantidad de espacio ocupado por flecha" -#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1112 +#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1123 msgid "Horizontal Alignment" msgstr "Alineación horizontal" @@ -643,7 +643,7 @@ msgstr "Alineación horizontal" msgid "X alignment of the child" msgstr "Alineación X del hijo" -#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1128 +#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1139 msgid "Vertical Alignment" msgstr "Alineación vertical" @@ -831,7 +831,7 @@ msgstr "Espacio extra para colocar entre el hijo y sus vecinos, en píxeles" msgid "Pack type" msgstr "Tipo de empaquetado" -#: ../gtk/gtkbox.c:297 ../gtk/gtknotebook.c:793 +#: ../gtk/gtkbox.c:297 ../gtk/gtknotebook.c:795 msgid "" "A GtkPackType indicating whether the child is packed with reference to the " "start or end of the parent" @@ -839,12 +839,12 @@ msgstr "" "Un GtkPackType que indica si el hijo está empaquetado con referencia al " "inicio o el final del padre" -#: ../gtk/gtkbox.c:303 ../gtk/gtknotebook.c:764 ../gtk/gtkpaned.c:327 +#: ../gtk/gtkbox.c:303 ../gtk/gtknotebook.c:766 ../gtk/gtkpaned.c:327 #: ../gtk/gtktoolitemgroup.c:1669 msgid "Position" msgstr "Posición" -#: ../gtk/gtkbox.c:304 ../gtk/gtknotebook.c:765 +#: ../gtk/gtkbox.c:304 ../gtk/gtknotebook.c:767 msgid "The index of the child in the parent" msgstr "El índice del hijo en el padre" @@ -864,12 +864,12 @@ msgstr "" "Texto del etiqueta del widget dentro del botón, si el botón contiene una " "etiqueta del widget" -#: ../gtk/gtkbutton.c:234 ../gtk/gtkexpander.c:217 ../gtk/gtklabel.c:588 +#: ../gtk/gtkbutton.c:234 ../gtk/gtkexpander.c:217 ../gtk/gtklabel.c:587 #: ../gtk/gtkmenuitem.c:346 ../gtk/gtktoolbutton.c:209 msgid "Use underline" msgstr "Utilizar subrayado" -#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:218 ../gtk/gtklabel.c:589 +#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:218 ../gtk/gtklabel.c:588 #: ../gtk/gtkmenuitem.c:347 msgid "" "If set, an underline in the text indicates the next character should be used " @@ -1355,7 +1355,7 @@ 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:214 ../gtk/gtkimage.c:325 -#: ../gtk/gtkwindow.c:710 +#: ../gtk/gtkwindow.c:709 msgid "Icon" msgstr "Icono" @@ -1432,7 +1432,7 @@ msgstr "Tasa de subida" 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:121 ../gtk/gtkscale.c:249 +#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:254 #: ../gtk/gtkspinbutton.c:248 msgid "Digits" msgstr "Dígitos" @@ -1442,7 +1442,7 @@ msgid "The number of decimal places to display" msgstr "El número de lugares decimales que mostrar" #: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:105 -#: ../gtk/gtkmenu.c:521 ../gtk/gtkspinner.c:131 ../gtk/gtkswitch.c:739 +#: ../gtk/gtkmenu.c:520 ../gtk/gtkspinner.c:118 ../gtk/gtkswitch.c:738 #: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:125 #: ../gtk/gtktoggletoolbutton.c:112 msgid "Active" @@ -1475,7 +1475,7 @@ msgstr "Marcado" msgid "Marked up text to render" msgstr "Texto resaltado a renderizar" -#: ../gtk/gtkcellrenderertext.c:263 ../gtk/gtklabel.c:574 +#: ../gtk/gtkcellrenderertext.c:263 ../gtk/gtklabel.c:573 msgid "Attributes" msgstr "Atributos" @@ -1659,7 +1659,7 @@ msgstr "" "como una ayuda cuando está renderizando el texto. Si no comprende este " "parámetro probablemente no lo necesite" -#: ../gtk/gtkcellrenderertext.c:492 ../gtk/gtklabel.c:699 +#: ../gtk/gtkcellrenderertext.c:492 ../gtk/gtklabel.c:698 #: ../gtk/gtkprogressbar.c:207 msgid "Ellipsize" msgstr "Elipsis" @@ -1673,15 +1673,15 @@ msgstr "" "celda no tiene espacio suficiente para mostrar la cadena completa" #: ../gtk/gtkcellrenderertext.c:512 ../gtk/gtkfilechooserbutton.c:411 -#: ../gtk/gtklabel.c:720 +#: ../gtk/gtklabel.c:719 msgid "Width In Characters" msgstr "Anchura en caracteres" -#: ../gtk/gtkcellrenderertext.c:513 ../gtk/gtklabel.c:721 +#: ../gtk/gtkcellrenderertext.c:513 ../gtk/gtklabel.c:720 msgid "The desired width of the label, in characters" msgstr "La anchura deseada de la etiqueta, en caracteres" -#: ../gtk/gtkcellrenderertext.c:537 ../gtk/gtklabel.c:781 +#: ../gtk/gtkcellrenderertext.c:537 ../gtk/gtklabel.c:780 msgid "Maximum Width In Characters" msgstr "Anchura máxima en caracteres" @@ -2102,7 +2102,7 @@ msgstr "Indica si el ComboBox dibuja un marco alrededor del hijo" 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:881 ../gtk/gtkmenu.c:576 +#: ../gtk/gtkcombobox.c:881 ../gtk/gtkmenu.c:575 msgid "Tearoff Title" msgstr "Título del tirador" @@ -2146,14 +2146,10 @@ msgstr "" "entrada si la caja combinada se creó con #GtkComboBox:has-entry = %TRUE" #: ../gtk/gtkcombobox.c:966 -#| msgid "Columns" msgid "ID Column" msgstr "ID de la columna" #: ../gtk/gtkcombobox.c:967 -#| msgid "" -#| "The column in the combo box's model to associate with strings from the " -#| "entry if the combo was created with #GtkComboBox:has-entry = %TRUE" msgid "" "The column in the combo box's model that provides string IDs for the values " "in the model" @@ -2162,12 +2158,10 @@ msgstr "" "para los valores en el modelo" #: ../gtk/gtkcombobox.c:982 -#| msgid "Active" msgid "Active id" msgstr "ID activo" #: ../gtk/gtkcombobox.c:983 -#| msgid "The name of the icon from the icon theme" msgid "The value of the id column for the active row" msgstr "El valor del ID de la columna para la fila activa" @@ -2209,27 +2203,27 @@ msgstr "Tipo de sombra" 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:472 +#: ../gtk/gtkcontainer.c:476 msgid "Resize mode" msgstr "Modo de redimensión" -#: ../gtk/gtkcontainer.c:473 +#: ../gtk/gtkcontainer.c:477 msgid "Specify how resize events are handled" msgstr "Especifica cómo se manipulan los eventos de redimensionado" -#: ../gtk/gtkcontainer.c:480 +#: ../gtk/gtkcontainer.c:484 msgid "Border width" msgstr "Anchura del borde" -#: ../gtk/gtkcontainer.c:481 +#: ../gtk/gtkcontainer.c:485 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:489 +#: ../gtk/gtkcontainer.c:493 msgid "Child" msgstr "Hijo" -#: ../gtk/gtkcontainer.c:490 +#: ../gtk/gtkcontainer.c:494 msgid "Can be used to add a new child to the container" msgstr "Puede usarse para añadir un hijo nuevo al contenedor" @@ -2275,19 +2269,19 @@ msgstr "Búfer de texto" msgid "Text buffer object which actually stores entry text" msgstr "Objeto de búfer de texto que realmente almacena la entrada de texto" -#: ../gtk/gtkentry.c:733 ../gtk/gtklabel.c:662 +#: ../gtk/gtkentry.c:733 ../gtk/gtklabel.c:661 msgid "Cursor Position" msgstr "Posición del cursor" -#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:663 +#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:662 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:743 ../gtk/gtklabel.c:672 +#: ../gtk/gtkentry.c:743 ../gtk/gtklabel.c:671 msgid "Selection Bound" msgstr "Límite de selección" -#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:673 +#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:672 msgid "" "The position of the opposite end of the selection from the cursor in chars" msgstr "" @@ -2728,11 +2722,11 @@ msgstr "Indica si el expansor ha sido abierto para revelar el widget hijo" msgid "Text of the expander's label" msgstr "Texto de la etiqueta del expansor" -#: ../gtk/gtkexpander.c:225 ../gtk/gtklabel.c:581 +#: ../gtk/gtkexpander.c:225 ../gtk/gtklabel.c:580 msgid "Use markup" msgstr "Usar marcado" -#: ../gtk/gtkexpander.c:226 ../gtk/gtklabel.c:582 +#: ../gtk/gtkexpander.c:226 ../gtk/gtklabel.c:581 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()" @@ -3256,7 +3250,7 @@ msgstr "" "Indica si se debe usar el texto de la etiqueta para crear un elemento del " "menú de stock" -#: ../gtk/gtkimagemenuitem.c:197 ../gtk/gtkmenu.c:536 +#: ../gtk/gtkimagemenuitem.c:197 ../gtk/gtkmenu.c:535 msgid "Accel Group" msgstr "Grupo de aceleración" @@ -3286,27 +3280,27 @@ msgid "Width of border around the action area" msgstr "Anchura del borde alrededor del área de acción" #: ../gtk/gtkinvisible.c:90 ../gtk/gtkmountoperation.c:175 -#: ../gtk/gtkstatusicon.c:279 ../gtk/gtkwindow.c:741 +#: ../gtk/gtkstatusicon.c:279 ../gtk/gtkwindow.c:740 msgid "Screen" msgstr "Pantalla" -#: ../gtk/gtkinvisible.c:91 ../gtk/gtkwindow.c:742 +#: ../gtk/gtkinvisible.c:91 ../gtk/gtkwindow.c:741 msgid "The screen where this window will be displayed" msgstr "La pantalla donde se mostrará esta ventana" -#: ../gtk/gtklabel.c:568 +#: ../gtk/gtklabel.c:567 msgid "The text of the label" msgstr "El texto de la etiqueta" -#: ../gtk/gtklabel.c:575 +#: ../gtk/gtklabel.c:574 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:596 ../gtk/gtktexttag.c:335 ../gtk/gtktextview.c:703 +#: ../gtk/gtklabel.c:595 ../gtk/gtktexttag.c:335 ../gtk/gtktextview.c:703 msgid "Justification" msgstr "Justificación" -#: ../gtk/gtklabel.c:597 +#: ../gtk/gtklabel.c:596 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 " @@ -3316,11 +3310,11 @@ msgstr "" "Esto NO afecta la alineación de la etiqueta dentro de su ubicación. Ver " "GtkMisc::xalign para ello" -#: ../gtk/gtklabel.c:605 +#: ../gtk/gtklabel.c:604 msgid "Pattern" msgstr "Patrón" -#: ../gtk/gtklabel.c:606 +#: ../gtk/gtklabel.c:605 msgid "" "A string with _ characters in positions correspond to characters in the text " "to underline" @@ -3328,50 +3322,50 @@ msgstr "" "Un cadena con caracteres _ en posiciones correspondientes a caracteres en el " "texto a subrayar" -#: ../gtk/gtklabel.c:613 +#: ../gtk/gtklabel.c:612 msgid "Line wrap" msgstr "Ajuste de línea" -#: ../gtk/gtklabel.c:614 +#: ../gtk/gtklabel.c:613 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:629 +#: ../gtk/gtklabel.c:628 msgid "Line wrap mode" msgstr "Modo de ajuste de línea" -#: ../gtk/gtklabel.c:630 +#: ../gtk/gtklabel.c:629 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:637 +#: ../gtk/gtklabel.c:636 msgid "Selectable" msgstr "Seleccionable" -#: ../gtk/gtklabel.c:638 +#: ../gtk/gtklabel.c:637 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:644 +#: ../gtk/gtklabel.c:643 msgid "Mnemonic key" msgstr "Tecla nemónica" -#: ../gtk/gtklabel.c:645 +#: ../gtk/gtklabel.c:644 msgid "The mnemonic accelerator key for this label" msgstr "La tecla nemotécnica del acelerador para esta etiqueta" -#: ../gtk/gtklabel.c:653 +#: ../gtk/gtklabel.c:652 msgid "Mnemonic widget" msgstr "Widget nemónico" -#: ../gtk/gtklabel.c:654 +#: ../gtk/gtklabel.c:653 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:700 +#: ../gtk/gtklabel.c:699 msgid "" "The preferred place to ellipsize the string, if the label does not have " "enough room to display the entire string" @@ -3379,31 +3373,31 @@ msgstr "" "El lugar preferido para la elipsis de la cadena, si la etiqueta no tiene " "suficiente espacio para mostrar la cadena completa" -#: ../gtk/gtklabel.c:741 +#: ../gtk/gtklabel.c:740 msgid "Single Line Mode" msgstr "Modo de línea única" -#: ../gtk/gtklabel.c:742 +#: ../gtk/gtklabel.c:741 msgid "Whether the label is in single line mode" msgstr "Indica si la etiqueta está en modo de línea única" -#: ../gtk/gtklabel.c:759 +#: ../gtk/gtklabel.c:758 msgid "Angle" msgstr "Ángulo" -#: ../gtk/gtklabel.c:760 +#: ../gtk/gtklabel.c:759 msgid "Angle at which the label is rotated" msgstr "Ángulo al cual la etiqueta se rota" -#: ../gtk/gtklabel.c:782 +#: ../gtk/gtklabel.c:781 msgid "The desired maximum width of the label, in characters" msgstr "La anchura máxima deseada de la etiqueta, en caracteres" -#: ../gtk/gtklabel.c:800 +#: ../gtk/gtklabel.c:799 msgid "Track visited links" msgstr "Seguir los enlaces visitados" -#: ../gtk/gtklabel.c:801 +#: ../gtk/gtklabel.c:800 msgid "Whether visited links should be tracked" msgstr "Indica si deben seguir los enlaces visitados" @@ -3469,33 +3463,33 @@ msgstr "" "Número de espacios del borde entre la sombra de la barra de menús y los " "elementos del menú" -#: ../gtk/gtkmenu.c:522 +#: ../gtk/gtkmenu.c:521 msgid "The currently selected menu item" msgstr "El elemento del menú actualmente seleccionado" -#: ../gtk/gtkmenu.c:537 +#: ../gtk/gtkmenu.c:536 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:551 ../gtk/gtkmenuitem.c:316 +#: ../gtk/gtkmenu.c:550 ../gtk/gtkmenuitem.c:316 msgid "Accel Path" msgstr "Ruta del acelerador" -#: ../gtk/gtkmenu.c:552 +#: ../gtk/gtkmenu.c:551 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:568 +#: ../gtk/gtkmenu.c:567 msgid "Attach Widget" msgstr "Acoplar widget" -#: ../gtk/gtkmenu.c:569 +#: ../gtk/gtkmenu.c:568 msgid "The widget the menu is attached to" msgstr "El menú al que está acoplado el widget" -#: ../gtk/gtkmenu.c:577 +#: ../gtk/gtkmenu.c:576 msgid "" "A title that may be displayed by the window manager when this menu is torn-" "off" @@ -3503,54 +3497,54 @@ msgstr "" "Un título que podría mostrarse por el administrador de ventanas cuando este " "menú se desprenda" -#: ../gtk/gtkmenu.c:591 +#: ../gtk/gtkmenu.c:590 msgid "Tearoff State" msgstr "Estado de desprendimiento" -#: ../gtk/gtkmenu.c:592 +#: ../gtk/gtkmenu.c:591 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:606 +#: ../gtk/gtkmenu.c:605 msgid "Monitor" msgstr "Monitor" -#: ../gtk/gtkmenu.c:607 +#: ../gtk/gtkmenu.c:606 msgid "The monitor the menu will be popped up on" msgstr "El monitor en el que se mostrará el menú" -#: ../gtk/gtkmenu.c:613 +#: ../gtk/gtkmenu.c:612 msgid "Vertical Padding" msgstr "Separación vertical" -#: ../gtk/gtkmenu.c:614 +#: ../gtk/gtkmenu.c:613 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:636 +#: ../gtk/gtkmenu.c:635 msgid "Reserve Toggle Size" msgstr "Reservar tamaño para conmutar" -#: ../gtk/gtkmenu.c:637 +#: ../gtk/gtkmenu.c:636 msgid "" "A boolean that indicates whether the menu reserves space for toggles and " "icons" msgstr "" "Un booleano que indica si el menú reserva espacio para conmutadores e iconos" -#: ../gtk/gtkmenu.c:643 +#: ../gtk/gtkmenu.c:642 msgid "Horizontal Padding" msgstr "Separación horizontal" -#: ../gtk/gtkmenu.c:644 +#: ../gtk/gtkmenu.c:643 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:652 +#: ../gtk/gtkmenu.c:651 msgid "Vertical Offset" msgstr "Desplazamiento vertical" -#: ../gtk/gtkmenu.c:653 +#: ../gtk/gtkmenu.c:652 msgid "" "When the menu is a submenu, position it this number of pixels offset " "vertically" @@ -3558,11 +3552,11 @@ msgstr "" "Cuando el menú es un submenú, colocarlo este número de píxeles de " "desplazamiento vertical" -#: ../gtk/gtkmenu.c:661 +#: ../gtk/gtkmenu.c:660 msgid "Horizontal Offset" msgstr "Desplazamiento horizontal" -#: ../gtk/gtkmenu.c:662 +#: ../gtk/gtkmenu.c:661 msgid "" "When the menu is a submenu, position it this number of pixels offset " "horizontally" @@ -3570,55 +3564,55 @@ msgstr "" "Cuando el menú es un submenú, colocarlo este número de píxeles de " "desplazamiento horizontal" -#: ../gtk/gtkmenu.c:670 +#: ../gtk/gtkmenu.c:669 msgid "Double Arrows" msgstr "Dobles flechas" -#: ../gtk/gtkmenu.c:671 +#: ../gtk/gtkmenu.c:670 msgid "When scrolling, always show both arrows." msgstr "Al desplazar, siempre mostrar ambas flechas." -#: ../gtk/gtkmenu.c:684 +#: ../gtk/gtkmenu.c:683 msgid "Arrow Placement" msgstr "Colocación de flecha" -#: ../gtk/gtkmenu.c:685 +#: ../gtk/gtkmenu.c:684 msgid "Indicates where scroll arrows should be placed" msgstr "Indica si las flechas de desplazamiento se deben colocar" -#: ../gtk/gtkmenu.c:693 +#: ../gtk/gtkmenu.c:692 msgid "Left Attach" msgstr "Acoplar a la izquierda" -#: ../gtk/gtkmenu.c:694 ../gtk/gtktable.c:202 +#: ../gtk/gtkmenu.c:693 ../gtk/gtktable.c:202 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:701 +#: ../gtk/gtkmenu.c:700 msgid "Right Attach" msgstr "Acoplar a la derecha" -#: ../gtk/gtkmenu.c:702 +#: ../gtk/gtkmenu.c:701 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:709 +#: ../gtk/gtkmenu.c:708 msgid "Top Attach" msgstr "Acoplamiento superior" -#: ../gtk/gtkmenu.c:710 +#: ../gtk/gtkmenu.c:709 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:717 +#: ../gtk/gtkmenu.c:716 msgid "Bottom Attach" msgstr "Acoplamiento inferior" -#: ../gtk/gtkmenu.c:718 ../gtk/gtktable.c:223 +#: ../gtk/gtkmenu.c:717 ../gtk/gtktable.c:223 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:732 +#: ../gtk/gtkmenu.c:731 msgid "Arbitrary constant to scale down the size of the scroll arrow" msgstr "" "Constante arbitraria para reducir el escalado del tamaño de la flecha de " @@ -3793,52 +3787,52 @@ msgstr "Estamos mostrando un diálogo" msgid "The screen where this window will be displayed." msgstr "La pantalla donde se mostrará esta ventana." -#: ../gtk/gtknotebook.c:689 +#: ../gtk/gtknotebook.c:691 msgid "Page" msgstr "Página" -#: ../gtk/gtknotebook.c:690 +#: ../gtk/gtknotebook.c:692 msgid "The index of the current page" msgstr "El índice de la página actual" -#: ../gtk/gtknotebook.c:698 +#: ../gtk/gtknotebook.c:700 msgid "Tab Position" msgstr "Posición del tabulador" -#: ../gtk/gtknotebook.c:699 +#: ../gtk/gtknotebook.c:701 msgid "Which side of the notebook holds the tabs" msgstr "Qué lado del cuaderno contiene las solapas" -#: ../gtk/gtknotebook.c:706 +#: ../gtk/gtknotebook.c:708 msgid "Show Tabs" msgstr "Mostrar solapas" -#: ../gtk/gtknotebook.c:707 +#: ../gtk/gtknotebook.c:709 msgid "Whether tabs should be shown" msgstr "Indica si se deben mostrar las solapas" -#: ../gtk/gtknotebook.c:713 +#: ../gtk/gtknotebook.c:715 msgid "Show Border" msgstr "Mostrar borde" -#: ../gtk/gtknotebook.c:714 +#: ../gtk/gtknotebook.c:716 msgid "Whether the border should be shown" msgstr "Indica si se debe mostrar el borde" -#: ../gtk/gtknotebook.c:720 +#: ../gtk/gtknotebook.c:722 msgid "Scrollable" msgstr "Desplazable" -#: ../gtk/gtknotebook.c:721 +#: ../gtk/gtknotebook.c:723 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:727 +#: ../gtk/gtknotebook.c:729 msgid "Enable Popup" msgstr "Activar emergente" -#: ../gtk/gtknotebook.c:728 +#: ../gtk/gtknotebook.c:730 msgid "" "If TRUE, pressing the right mouse button on the notebook pops up a menu that " "you can use to go to a page" @@ -3846,125 +3840,125 @@ msgstr "" "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:742 +#: ../gtk/gtknotebook.c:744 msgid "Group Name" msgstr "Nombre del grupo" -#: ../gtk/gtknotebook.c:743 +#: ../gtk/gtknotebook.c:745 msgid "Group name for tab drag and drop" msgstr "Nombre del grupo para el arrastre y suelte de solapas" -#: ../gtk/gtknotebook.c:750 +#: ../gtk/gtknotebook.c:752 msgid "Tab label" msgstr "Etiqueta de la solapa" -#: ../gtk/gtknotebook.c:751 +#: ../gtk/gtknotebook.c:753 msgid "The string displayed on the child's tab label" msgstr "La cadena mostrada en la etiqueta de la solapa hija" -#: ../gtk/gtknotebook.c:757 +#: ../gtk/gtknotebook.c:759 msgid "Menu label" msgstr "Etiqueta de menú" -#: ../gtk/gtknotebook.c:758 +#: ../gtk/gtknotebook.c:760 msgid "The string displayed in the child's menu entry" msgstr "La cadena mostrada en la entrada de menú hija" -#: ../gtk/gtknotebook.c:771 +#: ../gtk/gtknotebook.c:773 msgid "Tab expand" msgstr "Expansión de la solapa" -#: ../gtk/gtknotebook.c:772 +#: ../gtk/gtknotebook.c:774 msgid "Whether to expand the child's tab" msgstr "Indica si se deben expandir la solapas del hijo" -#: ../gtk/gtknotebook.c:778 +#: ../gtk/gtknotebook.c:780 msgid "Tab fill" msgstr "Relleno de la solapa" -#: ../gtk/gtknotebook.c:779 +#: ../gtk/gtknotebook.c:781 msgid "Whether the child's tab should fill the allocated area" msgstr "Indica si se debe rellenar el área asignada de las solapas hijas " -#: ../gtk/gtknotebook.c:792 +#: ../gtk/gtknotebook.c:794 msgid "Tab pack type" msgstr "Tipo de empaquetado de la solapa" -#: ../gtk/gtknotebook.c:799 +#: ../gtk/gtknotebook.c:801 msgid "Tab reorderable" msgstr "Solapa reordenable" -#: ../gtk/gtknotebook.c:800 +#: ../gtk/gtknotebook.c:802 msgid "Whether the tab is reorderable by user action" msgstr "Indica si la solapa se puede reordenar por una acción del usuario" -#: ../gtk/gtknotebook.c:806 +#: ../gtk/gtknotebook.c:808 msgid "Tab detachable" msgstr "Solapa desprendible" -#: ../gtk/gtknotebook.c:807 +#: ../gtk/gtknotebook.c:809 msgid "Whether the tab is detachable" msgstr "Indica si la solapa es desprendible" -#: ../gtk/gtknotebook.c:822 ../gtk/gtkscrollbar.c:105 +#: ../gtk/gtknotebook.c:824 ../gtk/gtkscrollbar.c:105 msgid "Secondary backward stepper" msgstr "Flecha de retroceso secundaria" -#: ../gtk/gtknotebook.c:823 +#: ../gtk/gtknotebook.c:825 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:838 ../gtk/gtkscrollbar.c:112 +#: ../gtk/gtknotebook.c:840 ../gtk/gtkscrollbar.c:112 msgid "Secondary forward stepper" msgstr "Flecha de adelanto secundaria" -#: ../gtk/gtknotebook.c:839 +#: ../gtk/gtknotebook.c:841 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:853 ../gtk/gtkscrollbar.c:91 +#: ../gtk/gtknotebook.c:855 ../gtk/gtkscrollbar.c:91 msgid "Backward stepper" msgstr "Flecha de retroceso" -#: ../gtk/gtknotebook.c:854 ../gtk/gtkscrollbar.c:92 +#: ../gtk/gtknotebook.c:856 ../gtk/gtkscrollbar.c:92 msgid "Display the standard backward arrow button" msgstr "Mostrar el botón estándar de flecha de retroceso" -#: ../gtk/gtknotebook.c:868 ../gtk/gtkscrollbar.c:98 +#: ../gtk/gtknotebook.c:870 ../gtk/gtkscrollbar.c:98 msgid "Forward stepper" msgstr "Flecha de avance" -#: ../gtk/gtknotebook.c:869 ../gtk/gtkscrollbar.c:99 +#: ../gtk/gtknotebook.c:871 ../gtk/gtkscrollbar.c:99 msgid "Display the standard forward arrow button" msgstr "Mostrar el botón estándar de flecha de avance" -#: ../gtk/gtknotebook.c:883 +#: ../gtk/gtknotebook.c:885 msgid "Tab overlap" msgstr "Solapamiento de la solapa" -#: ../gtk/gtknotebook.c:884 +#: ../gtk/gtknotebook.c:886 msgid "Size of tab overlap area" msgstr "Tamaño del área de solapamiento de la solapa" -#: ../gtk/gtknotebook.c:899 +#: ../gtk/gtknotebook.c:901 msgid "Tab curvature" msgstr "Curvatura de la solapa" -#: ../gtk/gtknotebook.c:900 +#: ../gtk/gtknotebook.c:902 msgid "Size of tab curvature" msgstr "Tamaño de la curvatura de la solapa" -#: ../gtk/gtknotebook.c:916 +#: ../gtk/gtknotebook.c:918 msgid "Arrow spacing" msgstr "Espaciado de las flechas" -#: ../gtk/gtknotebook.c:917 +#: ../gtk/gtknotebook.c:919 msgid "Scroll arrow spacing" msgstr "Espaciado del desplazamiento de las flechas" @@ -4553,7 +4547,7 @@ msgstr "Nivel de llenado" msgid "The fill level." msgstr "El nivel de llenado." -#: ../gtk/gtkrange.c:517 ../gtk/gtkswitch.c:773 +#: ../gtk/gtkrange.c:517 ../gtk/gtkswitch.c:772 msgid "Slider Width" msgstr "Anchura del deslizador" @@ -4742,40 +4736,40 @@ msgstr "Iconos" msgid "List of icon names" msgstr "Lista de nombres de iconos" -#: ../gtk/gtkscale.c:250 +#: ../gtk/gtkscale.c:255 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:259 +#: ../gtk/gtkscale.c:264 msgid "Draw Value" msgstr "Dibujar valor" -#: ../gtk/gtkscale.c:260 +#: ../gtk/gtkscale.c:265 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:267 +#: ../gtk/gtkscale.c:272 msgid "Value Position" msgstr "Posición del valor" -#: ../gtk/gtkscale.c:268 +#: ../gtk/gtkscale.c:273 msgid "The position in which the current value is displayed" msgstr "La posición en que se muestra el valor actual" -#: ../gtk/gtkscale.c:275 +#: ../gtk/gtkscale.c:280 msgid "Slider Length" msgstr "Longitud del deslizador" -#: ../gtk/gtkscale.c:276 +#: ../gtk/gtkscale.c:281 msgid "Length of scale's slider" msgstr "Longitud de la escala del deslizador" -#: ../gtk/gtkscale.c:284 +#: ../gtk/gtkscale.c:289 msgid "Value spacing" msgstr "Espaciado del valor" -#: ../gtk/gtkscale.c:285 +#: ../gtk/gtkscale.c:290 msgid "Space between value text and the slider/trough area" msgstr "Espacio entre el texto del valor y el área del deslizador/carril" @@ -4918,11 +4912,11 @@ msgstr "Dibujar" 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:277 +#: ../gtk/gtksettings.c:285 msgid "Double Click Time" msgstr "Tiempo del doble pulsación" -#: ../gtk/gtksettings.c:278 +#: ../gtk/gtksettings.c:286 msgid "" "Maximum time allowed between two clicks for them to be considered a double " "click (in milliseconds)" @@ -4930,11 +4924,11 @@ msgstr "" "Tiempo máximo permitido entre dos pulsaciones para ser considerados como una " "pulsación doble (en milisegundos)" -#: ../gtk/gtksettings.c:285 +#: ../gtk/gtksettings.c:293 msgid "Double Click Distance" msgstr "Distancia de la pulsación doble" -#: ../gtk/gtksettings.c:286 +#: ../gtk/gtksettings.c:294 msgid "" "Maximum distance allowed between two clicks for them to be considered a " "double click (in pixels)" @@ -4942,35 +4936,35 @@ msgstr "" "Distancia máxima permitida entre dos pulsaciones para ser considerados como " "una pulsación doble (en píxeles)" -#: ../gtk/gtksettings.c:302 +#: ../gtk/gtksettings.c:310 msgid "Cursor Blink" msgstr "Parpadeo del cursor" -#: ../gtk/gtksettings.c:303 +#: ../gtk/gtksettings.c:311 msgid "Whether the cursor should blink" msgstr "Indica si el cursor debe parpadear" -#: ../gtk/gtksettings.c:310 +#: ../gtk/gtksettings.c:318 msgid "Cursor Blink Time" msgstr "Tiempo de parpadeo del cursor" -#: ../gtk/gtksettings.c:311 +#: ../gtk/gtksettings.c:319 msgid "Length of the cursor blink cycle, in milliseconds" msgstr "Longitud del ciclo de parpadeo del cursor, en milisegundos" -#: ../gtk/gtksettings.c:330 +#: ../gtk/gtksettings.c:338 msgid "Cursor Blink Timeout" msgstr "Intervalo de parpadeo del cursor" -#: ../gtk/gtksettings.c:331 +#: ../gtk/gtksettings.c:339 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:338 +#: ../gtk/gtksettings.c:346 msgid "Split Cursor" msgstr "Dividir cursor" -#: ../gtk/gtksettings.c:339 +#: ../gtk/gtksettings.c:347 msgid "" "Whether two cursors should be displayed for mixed left-to-right and right-to-" "left text" @@ -4978,161 +4972,161 @@ msgstr "" "Indica si deben mostrarse dos cursores para el texto mezclado de izquierda-a-" "derecha y derecha-a-izquierda" -#: ../gtk/gtksettings.c:346 +#: ../gtk/gtksettings.c:354 msgid "Theme Name" msgstr "Nombre del tema" -#: ../gtk/gtksettings.c:347 +#: ../gtk/gtksettings.c:355 msgid "Name of theme RC file to load" msgstr "Nombre del archivo RC de tema que cargar" -#: ../gtk/gtksettings.c:355 +#: ../gtk/gtksettings.c:363 msgid "Icon Theme Name" msgstr "Nombre del tema de iconos" -#: ../gtk/gtksettings.c:356 +#: ../gtk/gtksettings.c:364 msgid "Name of icon theme to use" msgstr "Nombre del tema de iconos que utilizar" -#: ../gtk/gtksettings.c:364 +#: ../gtk/gtksettings.c:372 msgid "Fallback Icon Theme Name" msgstr "Nombre del tema de iconos de resguardo" -#: ../gtk/gtksettings.c:365 +#: ../gtk/gtksettings.c:373 msgid "Name of a icon theme to fall back to" msgstr "Nombre del tema de iconos que utilizar como resguardo" -#: ../gtk/gtksettings.c:373 +#: ../gtk/gtksettings.c:381 msgid "Key Theme Name" msgstr "Nombre del tema de teclas" -#: ../gtk/gtksettings.c:374 +#: ../gtk/gtksettings.c:382 msgid "Name of key theme RC file to load" msgstr "Nombre del archivo RC de tema de teclas que cargar" -#: ../gtk/gtksettings.c:382 +#: ../gtk/gtksettings.c:390 msgid "Menu bar accelerator" msgstr "Acelerador de la barra de menús" -#: ../gtk/gtksettings.c:383 +#: ../gtk/gtksettings.c:391 msgid "Keybinding to activate the menu bar" msgstr "Combinación de teclas para activar la barra de menús" -#: ../gtk/gtksettings.c:391 +#: ../gtk/gtksettings.c:399 msgid "Drag threshold" msgstr "Umbral del arrastre" -#: ../gtk/gtksettings.c:392 +#: ../gtk/gtksettings.c:400 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:400 +#: ../gtk/gtksettings.c:408 msgid "Font Name" msgstr "Nombre de la tipografía" -#: ../gtk/gtksettings.c:401 +#: ../gtk/gtksettings.c:409 msgid "Name of default font to use" msgstr "Nombre de la tipografía predeterminada a utilizar" -#: ../gtk/gtksettings.c:423 +#: ../gtk/gtksettings.c:431 msgid "Icon Sizes" msgstr "Tamaños de los iconos" -#: ../gtk/gtksettings.c:424 +#: ../gtk/gtksettings.c:432 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:432 +#: ../gtk/gtksettings.c:440 msgid "GTK Modules" msgstr "Módulos GTK" -#: ../gtk/gtksettings.c:433 +#: ../gtk/gtksettings.c:441 msgid "List of currently active GTK modules" msgstr "Lista de módulos GTK activos actualmente" -#: ../gtk/gtksettings.c:442 +#: ../gtk/gtksettings.c:450 msgid "Xft Antialias" msgstr "Suavizado Xft" -#: ../gtk/gtksettings.c:443 +#: ../gtk/gtksettings.c:451 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:452 +#: ../gtk/gtksettings.c:460 msgid "Xft Hinting" msgstr "Sugerencias Xft" -#: ../gtk/gtksettings.c:453 +#: ../gtk/gtksettings.c:461 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default" msgstr "" "Indica si se deben usar las sugerencias de las tipografías Xft; 0=no, 1 =sí, " "-1=predeterminado" -#: ../gtk/gtksettings.c:462 +#: ../gtk/gtksettings.c:470 msgid "Xft Hint Style" msgstr "Estilo de sugerencias Xft" -#: ../gtk/gtksettings.c:463 +#: ../gtk/gtksettings.c:471 msgid "" "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull" msgstr "Qué grado de sugerencias usar: ninguno, ligero, medio o completo" -#: ../gtk/gtksettings.c:472 +#: ../gtk/gtksettings.c:480 msgid "Xft RGBA" msgstr "Xft RGBA" -#: ../gtk/gtksettings.c:473 +#: ../gtk/gtksettings.c:481 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:482 +#: ../gtk/gtksettings.c:490 msgid "Xft DPI" msgstr "PPP Xft (DPI)" -#: ../gtk/gtksettings.c:483 +#: ../gtk/gtksettings.c:491 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:492 +#: ../gtk/gtksettings.c:500 msgid "Cursor theme name" msgstr "Nombre del tema del cursor" -#: ../gtk/gtksettings.c:493 +#: ../gtk/gtksettings.c:501 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:501 +#: ../gtk/gtksettings.c:509 msgid "Cursor theme size" msgstr "Tamaño del tema del cursor" -#: ../gtk/gtksettings.c:502 +#: ../gtk/gtksettings.c:510 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:512 +#: ../gtk/gtksettings.c:520 msgid "Alternative button order" msgstr "Orden de los botones alternativo" -#: ../gtk/gtksettings.c:513 +#: ../gtk/gtksettings.c:521 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:530 +#: ../gtk/gtksettings.c:538 msgid "Alternative sort indicator direction" msgstr "Dirección alternativa del indicador de ordenamiento" -#: ../gtk/gtksettings.c:531 +#: ../gtk/gtksettings.c:539 msgid "" "Whether the direction of the sort indicators in list and tree views is " "inverted compared to the default (where down means ascending)" @@ -5141,11 +5135,11 @@ msgstr "" "vista de árbol está invertida en comparación con la predeterminada (donde " "abajo significa ascendente)" -#: ../gtk/gtksettings.c:539 +#: ../gtk/gtksettings.c:547 msgid "Show the 'Input Methods' menu" msgstr "Mostrar el menú de métodos de entrada" -#: ../gtk/gtksettings.c:540 +#: ../gtk/gtksettings.c:548 msgid "" "Whether the context menus of entries and text views should offer to change " "the input method" @@ -5153,11 +5147,11 @@ msgstr "" "Indica si los menús de contexto y las vistas de texto deben ofrecer cambiar " "el método de entrada" -#: ../gtk/gtksettings.c:548 +#: ../gtk/gtksettings.c:556 msgid "Show the 'Insert Unicode Control Character' menu" msgstr "Mostrar el menú «Insertar carácter de control Unicode»" -#: ../gtk/gtksettings.c:549 +#: ../gtk/gtksettings.c:557 msgid "" "Whether the context menus of entries and text views should offer to insert " "control characters" @@ -5165,254 +5159,254 @@ msgstr "" "Indica si los menús de contexto de las estradas y las vistas de texto deben " "ofrecer insertar caracteres de control" -#: ../gtk/gtksettings.c:557 +#: ../gtk/gtksettings.c:565 msgid "Start timeout" msgstr "Tiempo de expiración de inicio" -#: ../gtk/gtksettings.c:558 +#: ../gtk/gtksettings.c:566 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:567 +#: ../gtk/gtksettings.c:575 msgid "Repeat timeout" msgstr "Expiración de repetición" -#: ../gtk/gtksettings.c:568 +#: ../gtk/gtksettings.c:576 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:577 +#: ../gtk/gtksettings.c:585 msgid "Expand timeout" msgstr "Expiración del expansor" -#: ../gtk/gtksettings.c:578 +#: ../gtk/gtksettings.c:586 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:613 +#: ../gtk/gtksettings.c:621 msgid "Color scheme" msgstr "Esquema de color" -#: ../gtk/gtksettings.c:614 +#: ../gtk/gtksettings.c:622 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:623 +#: ../gtk/gtksettings.c:631 msgid "Enable Animations" msgstr "Activar animaciones" -#: ../gtk/gtksettings.c:624 +#: ../gtk/gtksettings.c:632 msgid "Whether to enable toolkit-wide animations." msgstr "Indica si se activan las animaciones para todo el toolkit." -#: ../gtk/gtksettings.c:642 +#: ../gtk/gtksettings.c:650 msgid "Enable Touchscreen Mode" msgstr "Activar modo pantalla táctil" -#: ../gtk/gtksettings.c:643 +#: ../gtk/gtksettings.c:651 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:660 +#: ../gtk/gtksettings.c:668 msgid "Tooltip timeout" msgstr "Tiempo de expiración del consejo" -#: ../gtk/gtksettings.c:661 +#: ../gtk/gtksettings.c:669 msgid "Timeout before tooltip is shown" msgstr "Tiempo de expiración antes de que se muestre el consejo" -#: ../gtk/gtksettings.c:686 +#: ../gtk/gtksettings.c:694 msgid "Tooltip browse timeout" msgstr "Tiempo de los consejos de navegación" -#: ../gtk/gtksettings.c:687 +#: ../gtk/gtksettings.c:695 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:708 +#: ../gtk/gtksettings.c:716 msgid "Tooltip browse mode timeout" msgstr "Tiempo de los consejos en modo navegación" -#: ../gtk/gtksettings.c:709 +#: ../gtk/gtksettings.c:717 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:728 +#: ../gtk/gtksettings.c:736 msgid "Keynav Cursor Only" msgstr "Sólo cursor para navegar con teclas" -#: ../gtk/gtksettings.c:729 +#: ../gtk/gtksettings.c:737 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:746 +#: ../gtk/gtksettings.c:754 msgid "Keynav Wrap Around" msgstr "Saltar al navegar con el teclado" -#: ../gtk/gtksettings.c:747 +#: ../gtk/gtksettings.c:755 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:767 +#: ../gtk/gtksettings.c:775 msgid "Error Bell" msgstr "Campana de error" -#: ../gtk/gtksettings.c:768 +#: ../gtk/gtksettings.c:776 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:785 +#: ../gtk/gtksettings.c:793 msgid "Color Hash" msgstr "Hash del color" -#: ../gtk/gtksettings.c:786 +#: ../gtk/gtksettings.c:794 msgid "A hash table representation of the color scheme." msgstr "Una representación en tabla hash del esquema de color." -#: ../gtk/gtksettings.c:794 +#: ../gtk/gtksettings.c:802 msgid "Default file chooser backend" msgstr "Backend predeterminado del selector de archivos" -#: ../gtk/gtksettings.c:795 +#: ../gtk/gtksettings.c:803 msgid "Name of the GtkFileChooser backend to use by default" msgstr "Nombre del backend predeterminado del GtkFileChooser" -#: ../gtk/gtksettings.c:812 +#: ../gtk/gtksettings.c:820 msgid "Default print backend" msgstr "Backend predeterminado de impresión" -#: ../gtk/gtksettings.c:813 +#: ../gtk/gtksettings.c:821 msgid "List of the GtkPrintBackend backends to use by default" msgstr "Lista de backends GtkPrintBackend para usar por omisión" -#: ../gtk/gtksettings.c:836 +#: ../gtk/gtksettings.c:844 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:837 +#: ../gtk/gtksettings.c:845 msgid "Command to run when displaying a print preview" msgstr "Comando que ejecutar al mostrar una vista previa de impresión" -#: ../gtk/gtksettings.c:853 +#: ../gtk/gtksettings.c:861 msgid "Enable Mnemonics" msgstr "Activar mnemónicos" -#: ../gtk/gtksettings.c:854 +#: ../gtk/gtksettings.c:862 msgid "Whether labels should have mnemonics" msgstr "Indica si las etiquetas deben tener mnemónicos" -#: ../gtk/gtksettings.c:870 +#: ../gtk/gtksettings.c:878 msgid "Enable Accelerators" msgstr "Activar aceleradores" -#: ../gtk/gtksettings.c:871 +#: ../gtk/gtksettings.c:879 msgid "Whether menu items should have accelerators" msgstr "Indica si los elementos del menú deben tener aceleradores" -#: ../gtk/gtksettings.c:888 +#: ../gtk/gtksettings.c:896 msgid "Recent Files Limit" msgstr "Límite de archivos recientes" -#: ../gtk/gtksettings.c:889 +#: ../gtk/gtksettings.c:897 msgid "Number of recently used files" msgstr "Número de archivos usados recientemente" -#: ../gtk/gtksettings.c:907 +#: ../gtk/gtksettings.c:915 msgid "Default IM module" msgstr "Módulo de método de entrada predeterminado" -#: ../gtk/gtksettings.c:908 +#: ../gtk/gtksettings.c:916 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:926 +#: ../gtk/gtksettings.c:934 msgid "Recent Files Max Age" msgstr "Antigüedad máxima de los archivos recientes" -#: ../gtk/gtksettings.c:927 +#: ../gtk/gtksettings.c:935 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:936 +#: ../gtk/gtksettings.c:944 msgid "Fontconfig configuration timestamp" msgstr "Configuración de la marca de tiempo de fontconfig" -#: ../gtk/gtksettings.c:937 +#: ../gtk/gtksettings.c:945 msgid "Timestamp of current fontconfig configuration" msgstr "Marca de tiempo de la configuración actual de fontconfig" -#: ../gtk/gtksettings.c:959 +#: ../gtk/gtksettings.c:967 msgid "Sound Theme Name" msgstr "Nombre del tema de sonido" -#: ../gtk/gtksettings.c:960 +#: ../gtk/gtksettings.c:968 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:982 +#: ../gtk/gtksettings.c:990 msgid "Audible Input Feedback" msgstr "Contexto de entrada audible" -#: ../gtk/gtksettings.c:983 +#: ../gtk/gtksettings.c:991 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:1004 +#: ../gtk/gtksettings.c:1012 msgid "Enable Event Sounds" msgstr "Activar eventos de sonido" -#: ../gtk/gtksettings.c:1005 +#: ../gtk/gtksettings.c:1013 msgid "Whether to play any event sounds at all" msgstr "Indica si se debe reproducir cualquier evento de sonido" -#: ../gtk/gtksettings.c:1020 +#: ../gtk/gtksettings.c:1028 msgid "Enable Tooltips" msgstr "Activar consejos" -#: ../gtk/gtksettings.c:1021 +#: ../gtk/gtksettings.c:1029 msgid "Whether tooltips should be shown on widgets" msgstr "Indica si se deben mostrar los consejos en los widgets" -#: ../gtk/gtksettings.c:1034 +#: ../gtk/gtksettings.c:1042 msgid "Toolbar style" msgstr "Estilo de la barra de herramientas" -#: ../gtk/gtksettings.c:1035 +#: ../gtk/gtksettings.c:1043 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/gtksettings.c:1049 +#: ../gtk/gtksettings.c:1057 msgid "Toolbar Icon Size" msgstr "Tamaño del icono de la barra de herramientas" -#: ../gtk/gtksettings.c:1050 +#: ../gtk/gtksettings.c:1058 msgid "The size of icons in default toolbars." msgstr "El tamaño de los iconos el las barras de herramientas." -#: ../gtk/gtksettings.c:1067 +#: ../gtk/gtksettings.c:1075 msgid "Auto Mnemonics" msgstr "Mnemónicos automáticos" -#: ../gtk/gtksettings.c:1068 +#: ../gtk/gtksettings.c:1076 msgid "" "Whether mnemonics should be automatically shown and hidden when the user " "presses the mnemonic activator." @@ -5420,63 +5414,63 @@ msgstr "" "Indica si se deben mostrar y ocultar automáticamente los mnemónicos cuando " "el usuario pulsa el activador de mnemónicos." -#: ../gtk/gtksettings.c:1093 +#: ../gtk/gtksettings.c:1101 msgid "Application prefers a dark theme" msgstr "La aplicación prefiere un tema oscuro" -#: ../gtk/gtksettings.c:1094 +#: ../gtk/gtksettings.c:1102 msgid "Whether the application prefers to have a dark theme." msgstr "Indica si la aplicación prefiere un tema oscuro." -#: ../gtk/gtksettings.c:1109 +#: ../gtk/gtksettings.c:1117 msgid "Show button images" msgstr "Mostrar imágenes en los botones" -#: ../gtk/gtksettings.c:1110 +#: ../gtk/gtksettings.c:1118 msgid "Whether images should be shown on buttons" msgstr "Indica si se deben mostrar las imágenes en los botones" -#: ../gtk/gtksettings.c:1118 ../gtk/gtksettings.c:1212 +#: ../gtk/gtksettings.c:1126 ../gtk/gtksettings.c:1220 msgid "Select on focus" msgstr "Seleccionar al enfocar" -#: ../gtk/gtksettings.c:1119 +#: ../gtk/gtksettings.c:1127 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/gtksettings.c:1136 +#: ../gtk/gtksettings.c:1144 msgid "Password Hint Timeout" msgstr "Tiempo de expiración del hint de contraseña" -#: ../gtk/gtksettings.c:1137 +#: ../gtk/gtksettings.c:1145 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/gtksettings.c:1146 +#: ../gtk/gtksettings.c:1154 msgid "Show menu images" msgstr "Mostrar imágenes del menú" -#: ../gtk/gtksettings.c:1147 +#: ../gtk/gtksettings.c:1155 msgid "Whether images should be shown in menus" msgstr "Indica si deben mostrarse o no las imágenes en los menús" -#: ../gtk/gtksettings.c:1155 +#: ../gtk/gtksettings.c:1163 msgid "Delay before drop down menus appear" msgstr "Retardo antes de que aparezcan los menús desplegables" -#: ../gtk/gtksettings.c:1156 +#: ../gtk/gtksettings.c:1164 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/gtksettings.c:1173 +#: ../gtk/gtksettings.c:1181 msgid "Scrolled Window Placement" msgstr "Colocación de la ventana donde se ha desplazado" -#: ../gtk/gtksettings.c:1174 +#: ../gtk/gtksettings.c:1182 msgid "" "Where the contents of scrolled windows are located with respect to the " "scrollbars, if not overridden by the scrolled window's own placement." @@ -5485,33 +5479,33 @@ msgstr "" "respecto a las barras de desplazamiento, si no toma precedencia por el " "propio emplazamiento de la ventana donde se hizo scroll." -#: ../gtk/gtksettings.c:1183 +#: ../gtk/gtksettings.c:1191 msgid "Can change accelerators" msgstr "Puede cambiar aceleradores" -#: ../gtk/gtksettings.c:1184 +#: ../gtk/gtksettings.c:1192 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/gtksettings.c:1192 +#: ../gtk/gtksettings.c:1200 msgid "Delay before submenus appear" msgstr "Retraso antes de que aparezcan los submenús" -#: ../gtk/gtksettings.c:1193 +#: ../gtk/gtksettings.c:1201 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/gtksettings.c:1202 +#: ../gtk/gtksettings.c:1210 msgid "Delay before hiding a submenu" msgstr "Retraso antes de ocultar un submenú" -#: ../gtk/gtksettings.c:1203 +#: ../gtk/gtksettings.c:1211 msgid "" "The time before hiding a submenu when the pointer is moving towards the " "submenu" @@ -5519,33 +5513,33 @@ msgstr "" "El tiempo antes de ocultar un submenú cuando el puntero se este moviendo " "hacia el submenú" -#: ../gtk/gtksettings.c:1213 +#: ../gtk/gtksettings.c:1221 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/gtksettings.c:1221 +#: ../gtk/gtksettings.c:1229 msgid "Custom palette" msgstr "Paleta personalizada" -#: ../gtk/gtksettings.c:1222 +#: ../gtk/gtksettings.c:1230 msgid "Palette to use in the color selector" msgstr "Paleta que se usará en el selector de colores" -#: ../gtk/gtksettings.c:1230 +#: ../gtk/gtksettings.c:1238 msgid "IM Preedit style" msgstr "Estilo de preedición del ME" -#: ../gtk/gtksettings.c:1231 +#: ../gtk/gtksettings.c:1239 msgid "How to draw the input method preedit string" msgstr "Cómo dibujar la cadena del método de entrada de preedición" -#: ../gtk/gtksettings.c:1240 +#: ../gtk/gtksettings.c:1248 msgid "IM Status style" msgstr "Estilo del estado ME" -#: ../gtk/gtksettings.c:1241 +#: ../gtk/gtksettings.c:1249 msgid "How to draw the input method statusbar" msgstr "Cómo dibujar el método de entrada de la barra de estado" @@ -5624,15 +5618,15 @@ msgstr "Lee el valor actual, o establece un valor nuevo" msgid "Style of bevel around the spin button" msgstr "Estilo de bisel alrededor del botón giratorio" -#: ../gtk/gtkspinner.c:132 +#: ../gtk/gtkspinner.c:119 msgid "Whether the spinner is active" msgstr "Indica si el marcador incrementable está activo" -#: ../gtk/gtkspinner.c:146 +#: ../gtk/gtkspinner.c:135 msgid "Number of steps" msgstr "Número de pasos" -#: ../gtk/gtkspinner.c:147 +#: ../gtk/gtkspinner.c:136 msgid "" "The number of steps for the spinner to complete a full loop. The animation " "will complete a full cycle in one second by default (see #GtkSpinner:cycle-" @@ -5642,11 +5636,11 @@ msgstr "" "completa. La animación completará de forma predeterminada un ciclo completo " "en un segundo (consulte #GtkSpinner:cycle-duration)." -#: ../gtk/gtkspinner.c:162 +#: ../gtk/gtkspinner.c:153 msgid "Animation duration" msgstr "Duración de la animación" -#: ../gtk/gtkspinner.c:163 +#: ../gtk/gtkspinner.c:154 msgid "" "The length of time in milliseconds for the spinner to complete a full loop" msgstr "" @@ -5677,7 +5671,7 @@ msgstr "Indica si el icono de estado está empotrado" msgid "The orientation of the tray" msgstr "La orientación de la bandeja" -#: ../gtk/gtkstatusicon.c:347 ../gtk/gtkwidget.c:1025 +#: ../gtk/gtkstatusicon.c:347 ../gtk/gtkwidget.c:1036 msgid "Has tooltip" msgstr "Tiene consejo" @@ -5685,15 +5679,15 @@ msgstr "Tiene consejo" msgid "Whether this tray icon has a tooltip" msgstr "Indica si el icono de la bandeja tiene un consejo" -#: ../gtk/gtkstatusicon.c:373 ../gtk/gtkwidget.c:1046 +#: ../gtk/gtkstatusicon.c:373 ../gtk/gtkwidget.c:1057 msgid "Tooltip Text" msgstr "Texto del consejo" -#: ../gtk/gtkstatusicon.c:374 ../gtk/gtkwidget.c:1047 ../gtk/gtkwidget.c:1068 +#: ../gtk/gtkstatusicon.c:374 ../gtk/gtkwidget.c:1058 ../gtk/gtkwidget.c:1079 msgid "The contents of the tooltip for this widget" msgstr "El contenido de los consejos para este widget" -#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1067 +#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1078 msgid "Tooltip markup" msgstr "Marcado de consejos" @@ -5705,13 +5699,19 @@ msgstr "El contenido de los consejos para este icono de la bandeja" msgid "The title of this tray icon" msgstr "El título de este icono de la bandeja" -#: ../gtk/gtkswitch.c:740 -#| msgid "Whether the widget is double buffered" +#: ../gtk/gtkstyle.c:516 +msgid "Style context" +msgstr "Estilo del contexto" + +#: ../gtk/gtkstyle.c:517 +msgid "GtkStyleContext to get style from" +msgstr "GtkStyleContext del que obtener el estilo" + +#: ../gtk/gtkswitch.c:739 msgid "Whether the switch is on or off" msgstr "Indica si el interruptor está encendido o apagado" -#: ../gtk/gtkswitch.c:774 -#| msgid "The minimum value of the adjustment" +#: ../gtk/gtkswitch.c:773 msgid "The minimum width of the handle" msgstr "La anchura mínima del tirador" @@ -6753,7 +6753,7 @@ msgstr "" msgid "Whether to display the column" msgstr "Indica si se debe mostrar la columna" -#: ../gtk/gtktreeviewcolumn.c:221 ../gtk/gtkwindow.c:657 +#: ../gtk/gtktreeviewcolumn.c:221 ../gtk/gtkwindow.c:656 msgid "Resizable" msgstr "Redimensionable" @@ -6879,27 +6879,27 @@ 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:876 +#: ../gtk/gtkwidget.c:887 msgid "Widget name" msgstr "Nombre del widget" -#: ../gtk/gtkwidget.c:877 +#: ../gtk/gtkwidget.c:888 msgid "The name of the widget" msgstr "El nombre del widget" -#: ../gtk/gtkwidget.c:883 +#: ../gtk/gtkwidget.c:894 msgid "Parent widget" msgstr "Widget padre" -#: ../gtk/gtkwidget.c:884 +#: ../gtk/gtkwidget.c:895 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:891 +#: ../gtk/gtkwidget.c:902 msgid "Width request" msgstr "Petición de anchura" -#: ../gtk/gtkwidget.c:892 +#: ../gtk/gtkwidget.c:903 msgid "" "Override for width request of the widget, or -1 if natural request should be " "used" @@ -6907,11 +6907,11 @@ msgstr "" "Sobreescribir el ancho solicitado del widget, o -1 si deber ser utilizado la " "solicitud natural" -#: ../gtk/gtkwidget.c:900 +#: ../gtk/gtkwidget.c:911 msgid "Height request" msgstr "Petición de altura" -#: ../gtk/gtkwidget.c:901 +#: ../gtk/gtkwidget.c:912 msgid "" "Override for height request of the widget, or -1 if natural request should " "be used" @@ -6919,84 +6919,84 @@ msgstr "" "Sobreescribir la altura solicitada del widget, o -1 si deber ser utilizada " "la solicitud natural" -#: ../gtk/gtkwidget.c:910 +#: ../gtk/gtkwidget.c:921 msgid "Whether the widget is visible" msgstr "Indica si el widget es visible" -#: ../gtk/gtkwidget.c:917 +#: ../gtk/gtkwidget.c:928 msgid "Whether the widget responds to input" msgstr "Indica si el widget responde al ingreso" -#: ../gtk/gtkwidget.c:923 +#: ../gtk/gtkwidget.c:934 msgid "Application paintable" msgstr "Pintable por la aplicación" -#: ../gtk/gtkwidget.c:924 +#: ../gtk/gtkwidget.c:935 msgid "Whether the application will paint directly on the widget" msgstr "Indica si la aplicación pintará directamente sobre el widget" -#: ../gtk/gtkwidget.c:930 +#: ../gtk/gtkwidget.c:941 msgid "Can focus" msgstr "Puede enfocar" -#: ../gtk/gtkwidget.c:931 +#: ../gtk/gtkwidget.c:942 msgid "Whether the widget can accept the input focus" msgstr "Indica si el widget puede aceptar el foco de entrada" -#: ../gtk/gtkwidget.c:937 +#: ../gtk/gtkwidget.c:948 msgid "Has focus" msgstr "Tiene foco" -#: ../gtk/gtkwidget.c:938 +#: ../gtk/gtkwidget.c:949 msgid "Whether the widget has the input focus" msgstr "Indica si el widget tiene el foco de entrada" -#: ../gtk/gtkwidget.c:944 +#: ../gtk/gtkwidget.c:955 msgid "Is focus" msgstr "Tiene el foco" -#: ../gtk/gtkwidget.c:945 +#: ../gtk/gtkwidget.c:956 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:951 +#: ../gtk/gtkwidget.c:962 msgid "Can default" msgstr "Puede por omisión" -#: ../gtk/gtkwidget.c:952 +#: ../gtk/gtkwidget.c:963 msgid "Whether the widget can be the default widget" msgstr "Indica si el widget puede ser el widget predeterminado" -#: ../gtk/gtkwidget.c:958 +#: ../gtk/gtkwidget.c:969 msgid "Has default" msgstr "Tiene por omisión" -#: ../gtk/gtkwidget.c:959 +#: ../gtk/gtkwidget.c:970 msgid "Whether the widget is the default widget" msgstr "Indica si el widget es el widget predeterminado" -#: ../gtk/gtkwidget.c:965 +#: ../gtk/gtkwidget.c:976 msgid "Receives default" msgstr "Recibe por omisión" -#: ../gtk/gtkwidget.c:966 +#: ../gtk/gtkwidget.c:977 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:972 +#: ../gtk/gtkwidget.c:983 msgid "Composite child" msgstr "Hijo compuesto" -#: ../gtk/gtkwidget.c:973 +#: ../gtk/gtkwidget.c:984 msgid "Whether the widget is part of a composite widget" msgstr "Indica si el widget es parte de un widget compuesto" -#: ../gtk/gtkwidget.c:979 +#: ../gtk/gtkwidget.c:990 msgid "Style" msgstr "Estilo" -#: ../gtk/gtkwidget.c:980 +#: ../gtk/gtkwidget.c:991 msgid "" "The style of the widget, which contains information about how it will look " "(colors etc)" @@ -7004,186 +7004,186 @@ msgstr "" "El estilo del widget, que contiene información sobre la apariencia (colores, " "etc)" -#: ../gtk/gtkwidget.c:986 +#: ../gtk/gtkwidget.c:997 msgid "Events" msgstr "Eventos" -#: ../gtk/gtkwidget.c:987 +#: ../gtk/gtkwidget.c:998 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:994 +#: ../gtk/gtkwidget.c:1005 msgid "Extension events" msgstr "Eventos de extensión" -#: ../gtk/gtkwidget.c:995 +#: ../gtk/gtkwidget.c:1006 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:1002 +#: ../gtk/gtkwidget.c:1013 msgid "No show all" msgstr "No mostrar todo" -#: ../gtk/gtkwidget.c:1003 +#: ../gtk/gtkwidget.c:1014 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:1026 +#: ../gtk/gtkwidget.c:1037 msgid "Whether this widget has a tooltip" msgstr "Indica si el widget tiene un consejo" -#: ../gtk/gtkwidget.c:1082 +#: ../gtk/gtkwidget.c:1093 msgid "Window" msgstr "Ventana" -#: ../gtk/gtkwidget.c:1083 +#: ../gtk/gtkwidget.c:1094 msgid "The widget's window if it is realized" msgstr "La ventana del widget si se realiza" -#: ../gtk/gtkwidget.c:1097 +#: ../gtk/gtkwidget.c:1108 msgid "Double Buffered" msgstr "Búfer doble" -#: ../gtk/gtkwidget.c:1098 +#: ../gtk/gtkwidget.c:1109 msgid "Whether the widget is double buffered" msgstr "Indica si el widget tiene búfer doble" -#: ../gtk/gtkwidget.c:1113 +#: ../gtk/gtkwidget.c:1124 msgid "How to position in extra horizontal space" msgstr "Cómo posicionar en el espacio horizontal adicional" -#: ../gtk/gtkwidget.c:1129 +#: ../gtk/gtkwidget.c:1140 msgid "How to position in extra vertical space" msgstr "Cómo posicionar en el espacio vertical adicional" -#: ../gtk/gtkwidget.c:1148 +#: ../gtk/gtkwidget.c:1159 msgid "Margin on Left" msgstr "Margen a la izquierda" -#: ../gtk/gtkwidget.c:1149 +#: ../gtk/gtkwidget.c:1160 msgid "Pixels of extra space on the left side" msgstr "Píxeles de espacio adicional en la parte izquierda" -#: ../gtk/gtkwidget.c:1169 +#: ../gtk/gtkwidget.c:1180 msgid "Margin on Right" msgstr "Margen a la derecha" -#: ../gtk/gtkwidget.c:1170 +#: ../gtk/gtkwidget.c:1181 msgid "Pixels of extra space on the right side" msgstr "Píxeles de espacio adicional en la parte derecha" -#: ../gtk/gtkwidget.c:1190 +#: ../gtk/gtkwidget.c:1201 msgid "Margin on Top" msgstr "Margen arriba" -#: ../gtk/gtkwidget.c:1191 +#: ../gtk/gtkwidget.c:1202 msgid "Pixels of extra space on the top side" msgstr "Píxeles de espacio adicional en la parte superior" -#: ../gtk/gtkwidget.c:1211 +#: ../gtk/gtkwidget.c:1222 msgid "Margin on Bottom" msgstr "Margen abajo" -#: ../gtk/gtkwidget.c:1212 +#: ../gtk/gtkwidget.c:1223 msgid "Pixels of extra space on the bottom side" msgstr "Píxeles de espacio adicional en la parte inferior" -#: ../gtk/gtkwidget.c:1229 +#: ../gtk/gtkwidget.c:1240 msgid "All Margins" msgstr "Todos los márgenes" -#: ../gtk/gtkwidget.c:1230 +#: ../gtk/gtkwidget.c:1241 msgid "Pixels of extra space on all four sides" msgstr "Píxeles de espacio adicionales en las cuatro partes" -#: ../gtk/gtkwidget.c:1263 +#: ../gtk/gtkwidget.c:1274 msgid "Horizontal Expand" msgstr "Expansión horizontal" -#: ../gtk/gtkwidget.c:1264 +#: ../gtk/gtkwidget.c:1275 msgid "Whether widget wants more horizontal space" msgstr "Indica si el widget quiere usar más espacio horizontal" -#: ../gtk/gtkwidget.c:1278 +#: ../gtk/gtkwidget.c:1289 msgid "Horizontal Expand Set" msgstr "Ajuste de expansión horizontal" -#: ../gtk/gtkwidget.c:1279 +#: ../gtk/gtkwidget.c:1290 msgid "Whether to use the hexpand property" msgstr "Indica si se debe usar la propiedad hexpand" -#: ../gtk/gtkwidget.c:1293 +#: ../gtk/gtkwidget.c:1304 msgid "Vertical Expand" msgstr "Expansión vertial" -#: ../gtk/gtkwidget.c:1294 +#: ../gtk/gtkwidget.c:1305 msgid "Whether widget wants more vertical space" msgstr "Indica si el widget quiere usar más espacio vertical" -#: ../gtk/gtkwidget.c:1308 +#: ../gtk/gtkwidget.c:1319 msgid "Vertical Expand Set" msgstr "Ajuste de expansión vertical" -#: ../gtk/gtkwidget.c:1309 +#: ../gtk/gtkwidget.c:1320 msgid "Whether to use the vexpand property" msgstr "Indica si se debe usar la propiedad vexpand" -#: ../gtk/gtkwidget.c:1323 +#: ../gtk/gtkwidget.c:1334 msgid "Expand Both" msgstr "Expandir en ambas" -#: ../gtk/gtkwidget.c:1324 +#: ../gtk/gtkwidget.c:1335 msgid "Whether widget wants to expand in both directions" msgstr "Indica si el widget quiere expandirse en ambas direcciones" -#: ../gtk/gtkwidget.c:2963 +#: ../gtk/gtkwidget.c:2981 msgid "Interior Focus" msgstr "Foco interior" -#: ../gtk/gtkwidget.c:2964 +#: ../gtk/gtkwidget.c:2982 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:2970 +#: ../gtk/gtkwidget.c:2988 msgid "Focus linewidth" msgstr "Dar foco al ancho de línea" -#: ../gtk/gtkwidget.c:2971 +#: ../gtk/gtkwidget.c:2989 msgid "Width, in pixels, of the focus indicator line" msgstr "Anchura, en píxeles, de la línea indicadora del foco" -#: ../gtk/gtkwidget.c:2977 +#: ../gtk/gtkwidget.c:2995 msgid "Focus line dash pattern" msgstr "Dar foco a la línea con patrón punteado" -#: ../gtk/gtkwidget.c:2978 +#: ../gtk/gtkwidget.c:2996 msgid "Dash pattern used to draw the focus indicator" msgstr "Patrón punteado utilizado para dibujar el indicador de foco" -#: ../gtk/gtkwidget.c:2983 +#: ../gtk/gtkwidget.c:3001 msgid "Focus padding" msgstr "Relleno del foco" -#: ../gtk/gtkwidget.c:2984 +#: ../gtk/gtkwidget.c:3002 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:2989 +#: ../gtk/gtkwidget.c:3007 msgid "Cursor color" msgstr "Color del cursor" -#: ../gtk/gtkwidget.c:2990 +#: ../gtk/gtkwidget.c:3008 msgid "Color with which to draw insertion cursor" msgstr "Color con el cual dibujar el cursor de inserción" -#: ../gtk/gtkwidget.c:2995 +#: ../gtk/gtkwidget.c:3013 msgid "Secondary cursor color" msgstr "Color secundario del cursor" -#: ../gtk/gtkwidget.c:2996 +#: ../gtk/gtkwidget.c:3014 msgid "" "Color with which to draw the secondary insertion cursor when editing mixed " "right-to-left and left-to-right text" @@ -7191,43 +7191,43 @@ msgstr "" "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:3001 +#: ../gtk/gtkwidget.c:3019 msgid "Cursor line aspect ratio" msgstr "Proporción de la línea del cursor" -#: ../gtk/gtkwidget.c:3002 +#: ../gtk/gtkwidget.c:3020 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:3008 +#: ../gtk/gtkwidget.c:3026 msgid "Window dragging" msgstr "Arrastre de ventana" -#: ../gtk/gtkwidget.c:3009 +#: ../gtk/gtkwidget.c:3027 msgid "Whether windows can be dragged by clicking on empty areas" msgstr "Indica si las ventanas se pueden arrastrar pulsando en áreas vacías" -#: ../gtk/gtkwidget.c:3022 +#: ../gtk/gtkwidget.c:3040 msgid "Unvisited Link Color" msgstr "Color del enlace no visitado" -#: ../gtk/gtkwidget.c:3023 +#: ../gtk/gtkwidget.c:3041 msgid "Color of unvisited links" msgstr "Color de los enlaces no visitados" -#: ../gtk/gtkwidget.c:3036 +#: ../gtk/gtkwidget.c:3054 msgid "Visited Link Color" msgstr "Color del enlace visitado" -#: ../gtk/gtkwidget.c:3037 +#: ../gtk/gtkwidget.c:3055 msgid "Color of visited links" msgstr "Color de los enlaces visitados" -#: ../gtk/gtkwidget.c:3051 +#: ../gtk/gtkwidget.c:3069 msgid "Wide Separators" msgstr "Separadores anchos" -#: ../gtk/gtkwidget.c:3052 +#: ../gtk/gtkwidget.c:3070 msgid "" "Whether separators have configurable width and should be drawn using a box " "instead of a line" @@ -7235,81 +7235,81 @@ msgstr "" "Indica si los separadores tienen anchura configurable y deben dibujarse " "usando una caja en lugar de una línea" -#: ../gtk/gtkwidget.c:3066 +#: ../gtk/gtkwidget.c:3084 msgid "Separator Width" msgstr "Anchura del separador" -#: ../gtk/gtkwidget.c:3067 +#: ../gtk/gtkwidget.c:3085 msgid "The width of separators if wide-separators is TRUE" msgstr "La anchura de los separadores si «wide-separators« es TRUE" -#: ../gtk/gtkwidget.c:3081 +#: ../gtk/gtkwidget.c:3099 msgid "Separator Height" msgstr "Altura del separador" -#: ../gtk/gtkwidget.c:3082 +#: ../gtk/gtkwidget.c:3100 msgid "The height of separators if \"wide-separators\" is TRUE" msgstr "La altura de los separadores si «wide-separators» es TRUE" -#: ../gtk/gtkwidget.c:3096 +#: ../gtk/gtkwidget.c:3114 msgid "Horizontal Scroll Arrow Length" msgstr "Longitud de la flecha de desplazamiento horizontal" -#: ../gtk/gtkwidget.c:3097 +#: ../gtk/gtkwidget.c:3115 msgid "The length of horizontal scroll arrows" msgstr "La longitud de las flechas de desplazamiento horizontal" -#: ../gtk/gtkwidget.c:3111 +#: ../gtk/gtkwidget.c:3129 msgid "Vertical Scroll Arrow Length" msgstr "Longitud de las flechas de desplazamiento vertical" -#: ../gtk/gtkwidget.c:3112 +#: ../gtk/gtkwidget.c:3130 msgid "The length of vertical scroll arrows" msgstr "La longitud de las flechas de desplazamiento vertical" -#: ../gtk/gtkwindow.c:615 +#: ../gtk/gtkwindow.c:614 msgid "Window Type" msgstr "Tipo de ventana" -#: ../gtk/gtkwindow.c:616 +#: ../gtk/gtkwindow.c:615 msgid "The type of the window" msgstr "El tipo de la ventana" -#: ../gtk/gtkwindow.c:624 +#: ../gtk/gtkwindow.c:623 msgid "Window Title" msgstr "Título de la ventana" -#: ../gtk/gtkwindow.c:625 +#: ../gtk/gtkwindow.c:624 msgid "The title of the window" msgstr "El título de la ventana" -#: ../gtk/gtkwindow.c:632 +#: ../gtk/gtkwindow.c:631 msgid "Window Role" msgstr "Rol de la ventana" -#: ../gtk/gtkwindow.c:633 +#: ../gtk/gtkwindow.c:632 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:649 +#: ../gtk/gtkwindow.c:648 msgid "Startup ID" msgstr "ID de inicio" -#: ../gtk/gtkwindow.c:650 +#: ../gtk/gtkwindow.c:649 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:658 +#: ../gtk/gtkwindow.c:657 msgid "If TRUE, users can resize the window" msgstr "Si es TRUE los usuario pueden redimensionar la ventana" -#: ../gtk/gtkwindow.c:665 +#: ../gtk/gtkwindow.c:664 msgid "Modal" msgstr "Modal" -#: ../gtk/gtkwindow.c:666 +#: ../gtk/gtkwindow.c:665 msgid "" "If TRUE, the window is modal (other windows are not usable while this one is " "up)" @@ -7317,80 +7317,80 @@ msgstr "" "Si es TRUE, esta ventana es modal (no se pueden utilizar otras ventanas " "mientras ésta este encima)" -#: ../gtk/gtkwindow.c:673 +#: ../gtk/gtkwindow.c:672 msgid "Window Position" msgstr "Posición de la ventana" -#: ../gtk/gtkwindow.c:674 +#: ../gtk/gtkwindow.c:673 msgid "The initial position of the window" msgstr "La posición inicial de la ventana" -#: ../gtk/gtkwindow.c:682 +#: ../gtk/gtkwindow.c:681 msgid "Default Width" msgstr "Anchura predeterminada" -#: ../gtk/gtkwindow.c:683 +#: ../gtk/gtkwindow.c:682 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:692 +#: ../gtk/gtkwindow.c:691 msgid "Default Height" msgstr "Altura predeterminada" -#: ../gtk/gtkwindow.c:693 +#: ../gtk/gtkwindow.c:692 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:702 +#: ../gtk/gtkwindow.c:701 msgid "Destroy with Parent" msgstr "Destruir con el padre" -#: ../gtk/gtkwindow.c:703 +#: ../gtk/gtkwindow.c:702 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:711 +#: ../gtk/gtkwindow.c:710 msgid "Icon for this window" msgstr "Icono para esta ventana" -#: ../gtk/gtkwindow.c:717 +#: ../gtk/gtkwindow.c:716 msgid "Mnemonics Visible" msgstr "Mnemónicos visibles" -#: ../gtk/gtkwindow.c:718 +#: ../gtk/gtkwindow.c:717 msgid "Whether mnemonics are currently visible in this window" msgstr "Indica si los mnemónicos son visibles actualmente en esta ventana" -#: ../gtk/gtkwindow.c:734 +#: ../gtk/gtkwindow.c:733 msgid "Name of the themed icon for this window" msgstr "Nombre del icono del tema para esta ventana" -#: ../gtk/gtkwindow.c:749 +#: ../gtk/gtkwindow.c:748 msgid "Is Active" msgstr "Está activo" -#: ../gtk/gtkwindow.c:750 +#: ../gtk/gtkwindow.c:749 msgid "Whether the toplevel is the current active window" msgstr "Indica si el nivel superior es la ventana activa actual" -#: ../gtk/gtkwindow.c:757 +#: ../gtk/gtkwindow.c:756 msgid "Focus in Toplevel" msgstr "Foco en el nivel superior" -#: ../gtk/gtkwindow.c:758 +#: ../gtk/gtkwindow.c:757 msgid "Whether the input focus is within this GtkWindow" msgstr "Indica si el foco de entrada esta dentro de este GtkWindow" -#: ../gtk/gtkwindow.c:765 +#: ../gtk/gtkwindow.c:764 msgid "Type hint" msgstr "Pista de tipo" -#: ../gtk/gtkwindow.c:766 +#: ../gtk/gtkwindow.c:765 msgid "" "Hint to help the desktop environment understand what kind of window this is " "and how to treat it." @@ -7398,115 +7398,115 @@ msgstr "" "Pista para ayudar al entorno de escritorio a entender qué clase de ventana " "es ésta y cómo tratar con ella." -#: ../gtk/gtkwindow.c:774 +#: ../gtk/gtkwindow.c:773 msgid "Skip taskbar" msgstr "Ignorar barra de tareas" -#: ../gtk/gtkwindow.c:775 +#: ../gtk/gtkwindow.c:774 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:782 +#: ../gtk/gtkwindow.c:781 msgid "Skip pager" msgstr "Ignorar paginador" -#: ../gtk/gtkwindow.c:783 +#: ../gtk/gtkwindow.c:782 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:790 +#: ../gtk/gtkwindow.c:789 msgid "Urgent" msgstr "Urgente" -#: ../gtk/gtkwindow.c:791 +#: ../gtk/gtkwindow.c:790 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:805 +#: ../gtk/gtkwindow.c:804 msgid "Accept focus" msgstr "Aceptar foco" -#: ../gtk/gtkwindow.c:806 +#: ../gtk/gtkwindow.c:805 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:820 +#: ../gtk/gtkwindow.c:819 msgid "Focus on map" msgstr "Foco en el mapa" -#: ../gtk/gtkwindow.c:821 +#: ../gtk/gtkwindow.c:820 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:835 +#: ../gtk/gtkwindow.c:834 msgid "Decorated" msgstr "Decorado" -#: ../gtk/gtkwindow.c:836 +#: ../gtk/gtkwindow.c:835 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:850 +#: ../gtk/gtkwindow.c:849 msgid "Deletable" msgstr "Borrable" -#: ../gtk/gtkwindow.c:851 +#: ../gtk/gtkwindow.c:850 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:870 +#: ../gtk/gtkwindow.c:869 msgid "Resize grip" msgstr "Redimensionar tirador" -#: ../gtk/gtkwindow.c:871 +#: ../gtk/gtkwindow.c:870 msgid "Specifies whether the window should have a resize grip" msgstr "Especifica si la ventana debe tener un tirador de redimensión" -#: ../gtk/gtkwindow.c:885 +#: ../gtk/gtkwindow.c:884 msgid "Resize grip is visible" msgstr "El tirador de redimensión es visible" -#: ../gtk/gtkwindow.c:886 +#: ../gtk/gtkwindow.c:885 msgid "Specifies whether the window's resize grip is visible." msgstr "Indica si el tirador de redimensión de la ventana es visible." -#: ../gtk/gtkwindow.c:902 +#: ../gtk/gtkwindow.c:901 msgid "Gravity" msgstr "Gravedad" -#: ../gtk/gtkwindow.c:903 +#: ../gtk/gtkwindow.c:902 msgid "The window gravity of the window" msgstr "La gravedad de la ventana" -#: ../gtk/gtkwindow.c:920 +#: ../gtk/gtkwindow.c:919 msgid "Transient for Window" msgstr "Transitorio para la ventana" -#: ../gtk/gtkwindow.c:921 +#: ../gtk/gtkwindow.c:920 msgid "The transient parent of the dialog" msgstr "El padre transitorio del diálogo" -#: ../gtk/gtkwindow.c:936 +#: ../gtk/gtkwindow.c:935 msgid "Opacity for Window" msgstr "Opacidad para la ventana" -#: ../gtk/gtkwindow.c:937 +#: ../gtk/gtkwindow.c:936 msgid "The opacity of the window, from 0 to 1" msgstr "La opacidad de la ventana, desde 0 hasta 1" -#: ../gtk/gtkwindow.c:947 ../gtk/gtkwindow.c:948 +#: ../gtk/gtkwindow.c:946 ../gtk/gtkwindow.c:947 msgid "Width of resize grip" msgstr "Anchura del tirador de redimensión" -#: ../gtk/gtkwindow.c:953 ../gtk/gtkwindow.c:954 +#: ../gtk/gtkwindow.c:952 ../gtk/gtkwindow.c:953 msgid "Height of resize grip" msgstr "Altura del tirador de redimensión" -#: ../gtk/gtkwindow.c:973 +#: ../gtk/gtkwindow.c:972 msgid "GtkApplication" msgstr "GtkApplication" -#: ../gtk/gtkwindow.c:974 +#: ../gtk/gtkwindow.c:973 msgid "The GtkApplication for the window" msgstr "El GtkApplication para la ventana" diff --git a/po-properties/gl.po b/po-properties/gl.po index 6c54be2cf2..fa261040b5 100644 --- a/po-properties/gl.po +++ b/po-properties/gl.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: gtk+-master-po-properties-gl-77816____.merged\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-26 16:52+0200\n" -"PO-Revision-Date: 2010-10-26 16:58+0200\n" +"POT-Creation-Date: 2010-12-05 14:51+0100\n" +"PO-Revision-Date: 2010-12-05 14:55+0100\n" "Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" "Language: gl\n" @@ -35,63 +35,63 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../gdk/gdkdevice.c:99 +#: ../gdk/gdkdevice.c:113 msgid "Device Display" msgstr "Pantalla do dispositivo" -#: ../gdk/gdkdevice.c:100 +#: ../gdk/gdkdevice.c:114 msgid "Display which the device belongs to" msgstr "Pantalla á que pertence o dispositivo" -#: ../gdk/gdkdevice.c:114 +#: ../gdk/gdkdevice.c:128 msgid "Device manager" msgstr "Xestor de dispositivos" -#: ../gdk/gdkdevice.c:115 +#: ../gdk/gdkdevice.c:129 msgid "Device manager which the device belongs to" msgstr "Xestor de dispositivos ao que pertence o dispositivos" -#: ../gdk/gdkdevice.c:129 ../gdk/gdkdevice.c:130 +#: ../gdk/gdkdevice.c:143 ../gdk/gdkdevice.c:144 msgid "Device name" msgstr "Nome do dispositivo" -#: ../gdk/gdkdevice.c:144 +#: ../gdk/gdkdevice.c:158 msgid "Device type" msgstr "Tipo de dispositivo" -#: ../gdk/gdkdevice.c:145 +#: ../gdk/gdkdevice.c:159 msgid "Device role in the device manager" msgstr "Rol do dispositivo no xestor de dispositivos" -#: ../gdk/gdkdevice.c:161 +#: ../gdk/gdkdevice.c:175 msgid "Associated device" msgstr "Dispositivo asociado" -#: ../gdk/gdkdevice.c:162 +#: ../gdk/gdkdevice.c:176 msgid "Associated pointer or keyboard with this device" msgstr "Punteiro ou teclado asociado a este dispositivo" -#: ../gdk/gdkdevice.c:175 +#: ../gdk/gdkdevice.c:189 msgid "Input source" msgstr "Orixe de entrada" -#: ../gdk/gdkdevice.c:176 +#: ../gdk/gdkdevice.c:190 msgid "Source type for the device" msgstr "Tipo de orixe para o dispositivo" -#: ../gdk/gdkdevice.c:191 ../gdk/gdkdevice.c:192 +#: ../gdk/gdkdevice.c:205 ../gdk/gdkdevice.c:206 msgid "Input mode for the device" msgstr "Modo de entrada para o dispositivo" -#: ../gdk/gdkdevice.c:207 +#: ../gdk/gdkdevice.c:221 msgid "Whether the device has a cursor" msgstr "Indica se o dispositivo ten un cursor" -#: ../gdk/gdkdevice.c:208 +#: ../gdk/gdkdevice.c:222 msgid "Whether there is a visible cursor following device motion" msgstr "Indica se hai un cursor visíbel seguindo o movemento do dispositivo" -#: ../gdk/gdkdevice.c:222 ../gdk/gdkdevice.c:223 +#: ../gdk/gdkdevice.c:236 ../gdk/gdkdevice.c:237 msgid "Number of axes in the device" msgstr "Número de eixos no dispositivo" @@ -103,31 +103,31 @@ msgstr "Pantalla" msgid "Display for the device manager" msgstr "Pantalla para o xestor de dispositivos" -#: ../gdk/gdkdisplaymanager.c:101 +#: ../gdk/gdkdisplaymanager.c:106 msgid "Default Display" msgstr "Pantalla predefinida" -#: ../gdk/gdkdisplaymanager.c:102 +#: ../gdk/gdkdisplaymanager.c:107 msgid "The default display for GDK" msgstr "Pantalla predefinida para o GDK" -#: ../gdk/gdkscreen.c:74 +#: ../gdk/gdkscreen.c:90 msgid "Font options" msgstr "Opcións de tipo de letra" -#: ../gdk/gdkscreen.c:75 +#: ../gdk/gdkscreen.c:91 msgid "The default font options for the screen" msgstr "As opcións predefinidas do tipo de letra para a pantalla" -#: ../gdk/gdkscreen.c:82 +#: ../gdk/gdkscreen.c:98 msgid "Font resolution" msgstr "Resolución do tipo de letra" -#: ../gdk/gdkscreen.c:83 +#: ../gdk/gdkscreen.c:99 msgid "The resolution for fonts on the screen" msgstr "A resolución para os tipos de letra na pantalla" -#: ../gdk/gdkwindow.c:410 ../gdk/gdkwindow.c:411 +#: ../gdk/gdkwindow.c:393 ../gdk/gdkwindow.c:394 msgid "Cursor" msgstr "Cursor" @@ -298,9 +298,9 @@ msgstr "Nome" msgid "A unique name for the action." msgstr "Un nome único para a acción." -#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:238 ../gtk/gtkexpander.c:209 -#: ../gtk/gtkframe.c:130 ../gtk/gtklabel.c:549 ../gtk/gtkmenuitem.c:331 -#: ../gtk/gtktoolbutton.c:202 ../gtk/gtktoolitemgroup.c:1571 +#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:226 ../gtk/gtkexpander.c:209 +#: ../gtk/gtkframe.c:130 ../gtk/gtklabel.c:566 ../gtk/gtkmenuitem.c:331 +#: ../gtk/gtktoolbutton.c:202 ../gtk/gtktoolitemgroup.c:1588 msgid "Label" msgstr "Etiqueta" @@ -341,26 +341,26 @@ msgid "GIcon" msgstr "GIcon" #: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:215 -#: ../gtk/gtkimage.c:320 ../gtk/gtkstatusicon.c:253 +#: ../gtk/gtkimage.c:326 ../gtk/gtkstatusicon.c:253 msgid "The GIcon being displayed" msgstr "A GIcon que se mostra" #: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:180 -#: ../gtk/gtkimage.c:302 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:236 -#: ../gtk/gtkwindow.c:733 +#: ../gtk/gtkimage.c:308 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:236 +#: ../gtk/gtkwindow.c:732 msgid "Icon Name" msgstr "Nome da icona" #: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:181 -#: ../gtk/gtkimage.c:303 ../gtk/gtkstatusicon.c:237 +#: ../gtk/gtkimage.c:309 ../gtk/gtkstatusicon.c:237 msgid "The name of the icon from the icon theme" msgstr "O nome da icona do tema de iconas" -#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:186 +#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:195 msgid "Visible when horizontal" msgstr "Visíbel cando é horizontal" -#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:187 +#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:196 msgid "" "Whether the toolbar item is visible when the toolbar is in a horizontal " "orientation." @@ -380,11 +380,11 @@ msgstr "" "Cando é TRUE, os proxies toolitem para esta acción represéntanse no menú de " "desbordamento da barra de tarefas." -#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:193 +#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:202 msgid "Visible when vertical" msgstr "Visíbel cando é vertical" -#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:194 +#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:203 msgid "" "Whether the toolbar item is visible when the toolbar is in a vertical " "orientation." @@ -392,7 +392,7 @@ msgstr "" "Indica se o elemento da barra de ferramentas é visíbel cando a barra de " "ferramentas está en orientación vertical." -#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:200 +#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:209 msgid "Is important" msgstr "É importante" @@ -414,7 +414,7 @@ msgstr "" "Cando é TRUE, ocúltanse os proxies de menú baleiro para este aplicativo." #: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235 -#: ../gtk/gtkcellrenderer.c:243 ../gtk/gtkwidget.c:975 +#: ../gtk/gtkcellrenderer.c:282 ../gtk/gtkwidget.c:927 msgid "Sensitive" msgstr "Sensíbel" @@ -424,7 +424,7 @@ msgstr "Indica se a acción está activada." #: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242 #: ../gtk/gtkstatusicon.c:287 ../gtk/gtktreeviewcolumn.c:213 -#: ../gtk/gtkwidget.c:968 +#: ../gtk/gtkwidget.c:920 msgid "Visible" msgstr "Visíbel" @@ -444,11 +444,11 @@ msgstr "" "O GtkActionGroup co que esta GtkAction está asociada ou NULL (para uso " "interno)." -#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:172 +#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:182 msgid "Always show image" msgstr "Mostrar sempre a imaxe" -#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:173 +#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:183 msgid "Whether the image will always be shown" msgstr "Indica se hai que mostrar a imaxe sempre" @@ -481,7 +481,7 @@ msgid "Whether to use the related actions appearance properties" msgstr "Cando usar as accións relacionadas coas propiedades da aparencia" #: ../gtk/gtkadjustment.c:114 ../gtk/gtkcellrendererprogress.c:126 -#: ../gtk/gtkscalebutton.c:220 ../gtk/gtkspinbutton.c:289 +#: ../gtk/gtkscalebutton.c:220 ../gtk/gtkspinbutton.c:291 msgid "Value" msgstr "Valor" @@ -533,7 +533,7 @@ msgstr "O tamaño de páxina do axuste" msgid "Horizontal alignment" msgstr "Aliñamento horizontal" -#: ../gtk/gtkalignment.c:128 ../gtk/gtkbutton.c:289 +#: ../gtk/gtkalignment.c:128 ../gtk/gtkbutton.c:277 msgid "" "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is " "right aligned" @@ -545,7 +545,7 @@ msgstr "" msgid "Vertical alignment" msgstr "Aliñamento vertical" -#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:308 +#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:296 msgid "" "Vertical position of child in available space. 0.0 is top aligned, 1.0 is " "bottom aligned" @@ -633,7 +633,7 @@ msgstr "Escalado de frecha" msgid "Amount of space used up by arrow" msgstr "Cantidade de espazo ocupado por frecha" -#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1171 +#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1123 msgid "Horizontal Alignment" msgstr "Aliñamento horizontal" @@ -641,7 +641,7 @@ msgstr "Aliñamento horizontal" msgid "X alignment of the child" msgstr "Aliñamento X do fillo" -#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1187 +#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1139 msgid "Vertical Alignment" msgstr "Aliñamento vertical" @@ -665,99 +665,99 @@ msgstr "Obedecer ao fillo" msgid "Force aspect ratio to match that of the frame's child" msgstr "Forzar a proporción de aspecto para que coincida coa do marco do fillo" -#: ../gtk/gtkassistant.c:310 +#: ../gtk/gtkassistant.c:327 msgid "Header Padding" msgstr "Recheo da cabeceira" -#: ../gtk/gtkassistant.c:311 +#: ../gtk/gtkassistant.c:328 msgid "Number of pixels around the header." msgstr "Número de píxeles ao redor da cabeceira." -#: ../gtk/gtkassistant.c:318 +#: ../gtk/gtkassistant.c:335 msgid "Content Padding" msgstr "Recheo do contido" -#: ../gtk/gtkassistant.c:319 +#: ../gtk/gtkassistant.c:336 msgid "Number of pixels around the content pages." msgstr "Número de píxeles ao redor das páxinas de contidos." -#: ../gtk/gtkassistant.c:335 +#: ../gtk/gtkassistant.c:352 msgid "Page type" msgstr "Tipo de páxina" -#: ../gtk/gtkassistant.c:336 +#: ../gtk/gtkassistant.c:353 msgid "The type of the assistant page" msgstr "O tipo da páxina do asistente" -#: ../gtk/gtkassistant.c:353 +#: ../gtk/gtkassistant.c:370 msgid "Page title" msgstr "Título da páxina" -#: ../gtk/gtkassistant.c:354 +#: ../gtk/gtkassistant.c:371 msgid "The title of the assistant page" msgstr "O título da páxina do asistente" -#: ../gtk/gtkassistant.c:370 +#: ../gtk/gtkassistant.c:387 msgid "Header image" msgstr "Imaxe de cabeceira" -#: ../gtk/gtkassistant.c:371 +#: ../gtk/gtkassistant.c:388 msgid "Header image for the assistant page" msgstr "Imaxe de cabeceira para a páxina do asistente" -#: ../gtk/gtkassistant.c:387 +#: ../gtk/gtkassistant.c:404 msgid "Sidebar image" msgstr "Imaxe da barra lateral" -#: ../gtk/gtkassistant.c:388 +#: ../gtk/gtkassistant.c:405 msgid "Sidebar image for the assistant page" msgstr "Imaxe da barra lateral da páxina do asistente" -#: ../gtk/gtkassistant.c:403 +#: ../gtk/gtkassistant.c:420 msgid "Page complete" msgstr "Páxina completa" -#: ../gtk/gtkassistant.c:404 +#: ../gtk/gtkassistant.c:421 msgid "Whether all required fields on the page have been filled out" msgstr "Indica se todos os campos requiridos na páxina foron cubertos" -#: ../gtk/gtkbbox.c:135 +#: ../gtk/gtkbbox.c:152 msgid "Minimum child width" msgstr "Largura mínima do fillo" -#: ../gtk/gtkbbox.c:136 +#: ../gtk/gtkbbox.c:153 msgid "Minimum width of buttons inside the box" msgstr "A largura mínima dos botóns dentro da caixa" -#: ../gtk/gtkbbox.c:144 +#: ../gtk/gtkbbox.c:161 msgid "Minimum child height" msgstr "Altura mínima do fillo" -#: ../gtk/gtkbbox.c:145 +#: ../gtk/gtkbbox.c:162 msgid "Minimum height of buttons inside the box" msgstr "A altura mínima dos botóns dentro da caixa" -#: ../gtk/gtkbbox.c:153 +#: ../gtk/gtkbbox.c:170 msgid "Child internal width padding" msgstr "Largura interna de recheo do fillo" -#: ../gtk/gtkbbox.c:154 +#: ../gtk/gtkbbox.c:171 msgid "Amount to increase child's size on either side" msgstr "Cantidade na que se aumenta o tamaño do fillo por cada lado" -#: ../gtk/gtkbbox.c:162 +#: ../gtk/gtkbbox.c:179 msgid "Child internal height padding" msgstr "Altura interna de recheo do fillo" -#: ../gtk/gtkbbox.c:163 +#: ../gtk/gtkbbox.c:180 msgid "Amount to increase child's size on the top and bottom" msgstr "Cantidade en que se aumenta o tamaño do fillo por encima e por debaixo" -#: ../gtk/gtkbbox.c:171 +#: ../gtk/gtkbbox.c:188 msgid "Layout style" msgstr "Estilo de disposición" -#: ../gtk/gtkbbox.c:172 +#: ../gtk/gtkbbox.c:189 msgid "" "How to lay out the buttons in the box. Possible values are: spread, edge, " "start and end" @@ -765,11 +765,11 @@ msgstr "" "Como dispor os botóns na caixa. Os valores posíbeis son: " "«spread» (afastados), «edge» (bordos), «start» (inicio) e «end» (final)" -#: ../gtk/gtkbbox.c:180 +#: ../gtk/gtkbbox.c:197 msgid "Secondary" msgstr "Secundario" -#: ../gtk/gtkbbox.c:181 +#: ../gtk/gtkbbox.c:198 msgid "" "If TRUE, the child appears in a secondary group of children, suitable for, e." "g., help buttons" @@ -777,34 +777,34 @@ msgstr "" "Se é TRUE, o fillo aparece nun grupo secundario de fillos; é útil, por " "exemplo, para botóns de axuda" -#: ../gtk/gtkbox.c:237 ../gtk/gtkexpander.c:233 ../gtk/gtkiconview.c:691 +#: ../gtk/gtkbox.c:241 ../gtk/gtkexpander.c:233 ../gtk/gtkiconview.c:696 #: ../gtk/gtktreeviewcolumn.c:238 msgid "Spacing" msgstr "Espazamento" -#: ../gtk/gtkbox.c:238 +#: ../gtk/gtkbox.c:242 msgid "The amount of space between children" msgstr "A cantidade de espazo entre os fillos" -#: ../gtk/gtkbox.c:247 ../gtk/gtktable.c:188 ../gtk/gtktoolbar.c:547 -#: ../gtk/gtktoolitemgroup.c:1624 +#: ../gtk/gtkbox.c:251 ../gtk/gtktable.c:193 ../gtk/gtktoolbar.c:553 +#: ../gtk/gtktoolitemgroup.c:1641 msgid "Homogeneous" msgstr "Homoxéneo" -#: ../gtk/gtkbox.c:248 +#: ../gtk/gtkbox.c:252 msgid "Whether the children should all be the same size" msgstr "Indica se todos os fillos deben ser do mesmo tamaño" -#: ../gtk/gtkbox.c:264 ../gtk/gtktoolbar.c:539 ../gtk/gtktoolitemgroup.c:1631 -#: ../gtk/gtktoolpalette.c:1065 ../gtk/gtktreeviewcolumn.c:294 +#: ../gtk/gtkbox.c:268 ../gtk/gtktoolbar.c:545 ../gtk/gtktoolitemgroup.c:1648 +#: ../gtk/gtktoolpalette.c:1092 ../gtk/gtktreeviewcolumn.c:294 msgid "Expand" msgstr "Expandir" -#: ../gtk/gtkbox.c:265 +#: ../gtk/gtkbox.c:269 msgid "Whether the child should receive extra space when the parent grows" msgstr "Indica se o fillo debe recibir espazo adicional cando o pai crece" -#: ../gtk/gtkbox.c:281 ../gtk/gtktoolitemgroup.c:1638 +#: ../gtk/gtkbox.c:281 ../gtk/gtktoolitemgroup.c:1655 msgid "Fill" msgstr "Encher" @@ -829,7 +829,7 @@ msgstr "" msgid "Pack type" msgstr "Tipo de empaquetado" -#: ../gtk/gtkbox.c:297 ../gtk/gtknotebook.c:786 +#: ../gtk/gtkbox.c:297 ../gtk/gtknotebook.c:795 msgid "" "A GtkPackType indicating whether the child is packed with reference to the " "start or end of the parent" @@ -837,12 +837,12 @@ msgstr "" "Un GtkPackType que indica se o fillo está empaquetado en relación ao inicio " "ou ao final do pai" -#: ../gtk/gtkbox.c:303 ../gtk/gtknotebook.c:757 ../gtk/gtkpaned.c:271 -#: ../gtk/gtkruler.c:158 ../gtk/gtktoolitemgroup.c:1652 +#: ../gtk/gtkbox.c:303 ../gtk/gtknotebook.c:766 ../gtk/gtkpaned.c:327 +#: ../gtk/gtktoolitemgroup.c:1669 msgid "Position" msgstr "Posición" -#: ../gtk/gtkbox.c:304 ../gtk/gtknotebook.c:758 +#: ../gtk/gtkbox.c:304 ../gtk/gtknotebook.c:767 msgid "The index of the child in the parent" msgstr "O índice do fillo no pai" @@ -854,7 +854,7 @@ msgstr "Dominio de tradución" msgid "The translation domain used by gettext" msgstr "O dominio de tradución usado por gettext" -#: ../gtk/gtkbutton.c:239 +#: ../gtk/gtkbutton.c:227 msgid "" "Text of the label widget inside the button, if the button contains a label " "widget" @@ -862,12 +862,12 @@ msgstr "" "Texto da etiqueta do widget dentro do botón, se o botón contén unha etiqueta " "widget" -#: ../gtk/gtkbutton.c:246 ../gtk/gtkexpander.c:217 ../gtk/gtklabel.c:570 +#: ../gtk/gtkbutton.c:234 ../gtk/gtkexpander.c:217 ../gtk/gtklabel.c:587 #: ../gtk/gtkmenuitem.c:346 ../gtk/gtktoolbutton.c:209 msgid "Use underline" msgstr "Usar subliñado" -#: ../gtk/gtkbutton.c:247 ../gtk/gtkexpander.c:218 ../gtk/gtklabel.c:571 +#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:218 ../gtk/gtklabel.c:588 #: ../gtk/gtkmenuitem.c:347 msgid "" "If set, an underline in the text indicates the next character should be used " @@ -876,71 +876,71 @@ msgstr "" "Se se define, un subliñado no texto indica que o seguinte carácter debería " "usarse para a tecla rápida mnemónica" -#: ../gtk/gtkbutton.c:254 ../gtk/gtkimagemenuitem.c:153 +#: ../gtk/gtkbutton.c:242 ../gtk/gtkimagemenuitem.c:163 msgid "Use stock" msgstr "Usar inventario" -#: ../gtk/gtkbutton.c:255 +#: ../gtk/gtkbutton.c:243 msgid "" "If set, the label is used to pick a stock item instead of being displayed" msgstr "" "Se se estabelece, a etiqueta úsase para seleccionar un elemento do " "inventario en vez de ser mostrado" -#: ../gtk/gtkbutton.c:262 ../gtk/gtkcombobox.c:861 +#: ../gtk/gtkbutton.c:250 ../gtk/gtkcombobox.c:865 #: ../gtk/gtkfilechooserbutton.c:383 msgid "Focus on click" msgstr "Enfocar ao premer" -#: ../gtk/gtkbutton.c:263 ../gtk/gtkfilechooserbutton.c:384 +#: ../gtk/gtkbutton.c:251 ../gtk/gtkfilechooserbutton.c:384 msgid "Whether the button grabs focus when it is clicked with the mouse" msgstr "Indica se o botón captura o foco cando se preme co rato" -#: ../gtk/gtkbutton.c:270 +#: ../gtk/gtkbutton.c:258 msgid "Border relief" msgstr "Relevo do bordo" -#: ../gtk/gtkbutton.c:271 +#: ../gtk/gtkbutton.c:259 msgid "The border relief style" msgstr "Estilo de relevo do bordo" -#: ../gtk/gtkbutton.c:288 +#: ../gtk/gtkbutton.c:276 msgid "Horizontal alignment for child" msgstr "Aliñamento horizontal para o fillo" -#: ../gtk/gtkbutton.c:307 +#: ../gtk/gtkbutton.c:295 msgid "Vertical alignment for child" msgstr "Aliñamento vertical para o fillo" -#: ../gtk/gtkbutton.c:324 ../gtk/gtkimagemenuitem.c:138 +#: ../gtk/gtkbutton.c:312 ../gtk/gtkimagemenuitem.c:148 msgid "Image widget" msgstr "Widget de imaxe" -#: ../gtk/gtkbutton.c:325 +#: ../gtk/gtkbutton.c:313 msgid "Child widget to appear next to the button text" msgstr "Widget fillo que aparecerá ao lado do texto do botón" -#: ../gtk/gtkbutton.c:339 +#: ../gtk/gtkbutton.c:327 msgid "Image position" msgstr "Posición da imaxe" -#: ../gtk/gtkbutton.c:340 +#: ../gtk/gtkbutton.c:328 msgid "The position of the image relative to the text" msgstr "A posición da imaxe en relación ao texto" -#: ../gtk/gtkbutton.c:460 +#: ../gtk/gtkbutton.c:448 msgid "Default Spacing" msgstr "Espazamento predefinido" -#: ../gtk/gtkbutton.c:461 +#: ../gtk/gtkbutton.c:449 msgid "Extra space to add for GTK_CAN_DEFAULT buttons" msgstr "Espazo adicional que engadir para os botóns GTK_CAN_DEFAULT" -#: ../gtk/gtkbutton.c:475 +#: ../gtk/gtkbutton.c:463 msgid "Default Outside Spacing" msgstr "Espazamento exterior predefinido" -#: ../gtk/gtkbutton.c:476 +#: ../gtk/gtkbutton.c:464 msgid "" "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside " "the border" @@ -948,31 +948,31 @@ msgstr "" "Espazo adicional que engadir para os botóns GTK_CAN_DEFAULT que son sempre " "debuxados fóra do bordo" -#: ../gtk/gtkbutton.c:481 +#: ../gtk/gtkbutton.c:469 msgid "Child X Displacement" msgstr "Desprazamento X do fillo" -#: ../gtk/gtkbutton.c:482 +#: ../gtk/gtkbutton.c:470 msgid "" "How far in the x direction to move the child when the button is depressed" msgstr "" "Distancia na dirección X que debe moverse o fillo cando se solta o botón" -#: ../gtk/gtkbutton.c:489 +#: ../gtk/gtkbutton.c:477 msgid "Child Y Displacement" msgstr "Desprazamento Y do fillo" -#: ../gtk/gtkbutton.c:490 +#: ../gtk/gtkbutton.c:478 msgid "" "How far in the y direction to move the child when the button is depressed" msgstr "" "Distancia na dirección Y que debe moverse o fillo cando se solta o botón" -#: ../gtk/gtkbutton.c:506 +#: ../gtk/gtkbutton.c:494 msgid "Displace focus" msgstr "Desprazar o foco" -#: ../gtk/gtkbutton.c:507 +#: ../gtk/gtkbutton.c:495 msgid "" "Whether the child_displacement_x/_y properties should also affect the focus " "rectangle" @@ -980,43 +980,43 @@ msgstr "" "Indica se as propiedades child_displacement_x/_y deberían afectar tamén ao " "rectángulo do foco" -#: ../gtk/gtkbutton.c:520 ../gtk/gtkentry.c:695 ../gtk/gtkentry.c:1740 +#: ../gtk/gtkbutton.c:508 ../gtk/gtkentry.c:786 ../gtk/gtkentry.c:1831 msgid "Inner Border" msgstr "Bordo interior" -#: ../gtk/gtkbutton.c:521 +#: ../gtk/gtkbutton.c:509 msgid "Border between button edges and child." msgstr "Bordo entre os bordos do botón e o fillo." -#: ../gtk/gtkbutton.c:534 +#: ../gtk/gtkbutton.c:522 msgid "Image spacing" msgstr "Espazamento da imaxe" -#: ../gtk/gtkbutton.c:535 +#: ../gtk/gtkbutton.c:523 msgid "Spacing in pixels between the image and label" msgstr "Espazamento en píxeles entre a imaxe e a etiqueta" -#: ../gtk/gtkcalendar.c:470 +#: ../gtk/gtkcalendar.c:475 msgid "Year" msgstr "Ano" -#: ../gtk/gtkcalendar.c:471 +#: ../gtk/gtkcalendar.c:476 msgid "The selected year" msgstr "O ano seleccionado" -#: ../gtk/gtkcalendar.c:484 +#: ../gtk/gtkcalendar.c:489 msgid "Month" msgstr "Mes" -#: ../gtk/gtkcalendar.c:485 +#: ../gtk/gtkcalendar.c:490 msgid "The selected month (as a number between 0 and 11)" msgstr "O mes seleccionado (como número entre 0 e 11)" -#: ../gtk/gtkcalendar.c:499 +#: ../gtk/gtkcalendar.c:504 msgid "Day" msgstr "Día" -#: ../gtk/gtkcalendar.c:500 +#: ../gtk/gtkcalendar.c:505 msgid "" "The selected day (as a number between 1 and 31, or 0 to unselect the " "currently selected day)" @@ -1024,83 +1024,83 @@ msgstr "" "O día seleccionado (como un número entre 1 e 31 ou 0 para anular a selección " "do día seleccionado actualmente)" -#: ../gtk/gtkcalendar.c:514 +#: ../gtk/gtkcalendar.c:519 msgid "Show Heading" msgstr "Mostrar a cabeceira" -#: ../gtk/gtkcalendar.c:515 +#: ../gtk/gtkcalendar.c:520 msgid "If TRUE, a heading is displayed" msgstr "Se é TRUE, móstrase unha cabeceira" -#: ../gtk/gtkcalendar.c:529 +#: ../gtk/gtkcalendar.c:534 msgid "Show Day Names" msgstr "Mostrar os nomes dos días" -#: ../gtk/gtkcalendar.c:530 +#: ../gtk/gtkcalendar.c:535 msgid "If TRUE, day names are displayed" msgstr "Se é TRUE, móstranse os nomes dos días" -#: ../gtk/gtkcalendar.c:543 +#: ../gtk/gtkcalendar.c:548 msgid "No Month Change" msgstr "Sen cambio de mes" -#: ../gtk/gtkcalendar.c:544 +#: ../gtk/gtkcalendar.c:549 msgid "If TRUE, the selected month cannot be changed" msgstr "Se é TRUE, non será posíbel cambiar o mes seleccionado" -#: ../gtk/gtkcalendar.c:558 +#: ../gtk/gtkcalendar.c:563 msgid "Show Week Numbers" msgstr "Mostrar os números de semana" -#: ../gtk/gtkcalendar.c:559 +#: ../gtk/gtkcalendar.c:564 msgid "If TRUE, week numbers are displayed" msgstr "Se é TRUE, móstranse os números de semana" -#: ../gtk/gtkcalendar.c:574 +#: ../gtk/gtkcalendar.c:579 msgid "Details Width" msgstr "Largura dos detalles" -#: ../gtk/gtkcalendar.c:575 +#: ../gtk/gtkcalendar.c:580 msgid "Details width in characters" msgstr "A largura dos detalles en caracteres" -#: ../gtk/gtkcalendar.c:590 +#: ../gtk/gtkcalendar.c:595 msgid "Details Height" msgstr "Altura dos detalles" -#: ../gtk/gtkcalendar.c:591 +#: ../gtk/gtkcalendar.c:596 msgid "Details height in rows" msgstr "A altura dos detalles en caracteres" -#: ../gtk/gtkcalendar.c:607 +#: ../gtk/gtkcalendar.c:612 msgid "Show Details" msgstr "Mostrar os detalles" -#: ../gtk/gtkcalendar.c:608 +#: ../gtk/gtkcalendar.c:613 msgid "If TRUE, details are shown" msgstr "Se é TRUE móstranse os detalles" -#: ../gtk/gtkcalendar.c:620 +#: ../gtk/gtkcalendar.c:625 msgid "Inner border" msgstr "Bordo interior" -#: ../gtk/gtkcalendar.c:621 +#: ../gtk/gtkcalendar.c:626 msgid "Inner border space" msgstr "Espacio do bordo interior" -#: ../gtk/gtkcalendar.c:632 +#: ../gtk/gtkcalendar.c:637 msgid "Vertical separation" msgstr "Separación vertical" -#: ../gtk/gtkcalendar.c:633 +#: ../gtk/gtkcalendar.c:638 msgid "Space between day headers and main area" msgstr "Espazo entre as cabeceiras de día e o área principal" -#: ../gtk/gtkcalendar.c:644 +#: ../gtk/gtkcalendar.c:649 msgid "Horizontal separation" msgstr "Separación horizontal" -#: ../gtk/gtkcalendar.c:645 +#: ../gtk/gtkcalendar.c:650 msgid "Space between week headers and main area" msgstr "Espazo entre as cabeceiras de semana e o área principal" @@ -1144,127 +1144,127 @@ msgstr "Modo de teclas rápidas" msgid "The type of accelerators" msgstr "O tipo de teclas rápidas" -#: ../gtk/gtkcellrenderer.c:227 +#: ../gtk/gtkcellrenderer.c:266 msgid "mode" msgstr "modo" -#: ../gtk/gtkcellrenderer.c:228 +#: ../gtk/gtkcellrenderer.c:267 msgid "Editable mode of the CellRenderer" msgstr "Modo editábel do CellRenderer" -#: ../gtk/gtkcellrenderer.c:236 +#: ../gtk/gtkcellrenderer.c:275 msgid "visible" msgstr "visíbel" -#: ../gtk/gtkcellrenderer.c:237 +#: ../gtk/gtkcellrenderer.c:276 msgid "Display the cell" msgstr "Mostrar a cela" -#: ../gtk/gtkcellrenderer.c:244 +#: ../gtk/gtkcellrenderer.c:283 msgid "Display the cell sensitive" msgstr "Mostrar a cela sensíbel" -#: ../gtk/gtkcellrenderer.c:251 +#: ../gtk/gtkcellrenderer.c:290 msgid "xalign" msgstr "xalign" -#: ../gtk/gtkcellrenderer.c:252 +#: ../gtk/gtkcellrenderer.c:291 msgid "The x-align" msgstr "O aliñamento x" -#: ../gtk/gtkcellrenderer.c:261 +#: ../gtk/gtkcellrenderer.c:300 msgid "yalign" msgstr "yalign" -#: ../gtk/gtkcellrenderer.c:262 +#: ../gtk/gtkcellrenderer.c:301 msgid "The y-align" msgstr "O aliñamento y" -#: ../gtk/gtkcellrenderer.c:271 +#: ../gtk/gtkcellrenderer.c:310 msgid "xpad" msgstr "xpad" -#: ../gtk/gtkcellrenderer.c:272 +#: ../gtk/gtkcellrenderer.c:311 msgid "The xpad" msgstr "O xpad" -#: ../gtk/gtkcellrenderer.c:281 +#: ../gtk/gtkcellrenderer.c:320 msgid "ypad" msgstr "ypad" -#: ../gtk/gtkcellrenderer.c:282 +#: ../gtk/gtkcellrenderer.c:321 msgid "The ypad" msgstr "O ypad" -#: ../gtk/gtkcellrenderer.c:291 +#: ../gtk/gtkcellrenderer.c:330 msgid "width" msgstr "largura" -#: ../gtk/gtkcellrenderer.c:292 +#: ../gtk/gtkcellrenderer.c:331 msgid "The fixed width" msgstr "A largura fixa" -#: ../gtk/gtkcellrenderer.c:301 +#: ../gtk/gtkcellrenderer.c:340 msgid "height" msgstr "altura" -#: ../gtk/gtkcellrenderer.c:302 +#: ../gtk/gtkcellrenderer.c:341 msgid "The fixed height" msgstr "A altura fixa" -#: ../gtk/gtkcellrenderer.c:311 +#: ../gtk/gtkcellrenderer.c:350 msgid "Is Expander" msgstr "É expansor" -#: ../gtk/gtkcellrenderer.c:312 +#: ../gtk/gtkcellrenderer.c:351 msgid "Row has children" msgstr "A fila ten fillos" -#: ../gtk/gtkcellrenderer.c:320 +#: ../gtk/gtkcellrenderer.c:359 msgid "Is Expanded" msgstr "Está expandido" -#: ../gtk/gtkcellrenderer.c:321 +#: ../gtk/gtkcellrenderer.c:360 msgid "Row is an expander row, and is expanded" msgstr "A fila é unha fila de expansor e está expandida" -#: ../gtk/gtkcellrenderer.c:328 +#: ../gtk/gtkcellrenderer.c:367 msgid "Cell background color name" msgstr "Nome da cor de fondo da cela" -#: ../gtk/gtkcellrenderer.c:329 +#: ../gtk/gtkcellrenderer.c:368 msgid "Cell background color as a string" msgstr "Cor de fondo da cela como unha cadea" -#: ../gtk/gtkcellrenderer.c:336 +#: ../gtk/gtkcellrenderer.c:375 msgid "Cell background color" msgstr "Cor de fondo da cela" -#: ../gtk/gtkcellrenderer.c:337 +#: ../gtk/gtkcellrenderer.c:376 msgid "Cell background color as a GdkColor" msgstr "Cor de fondo da cela como unha GdkColor" -#: ../gtk/gtkcellrenderer.c:350 +#: ../gtk/gtkcellrenderer.c:389 msgid "Cell background RGBA color" msgstr "Cor de fondo RGBA da cela" -#: ../gtk/gtkcellrenderer.c:351 +#: ../gtk/gtkcellrenderer.c:390 msgid "Cell background color as a GdkRGBA" msgstr "Cor de fondo da cela como GdkRGBA" -#: ../gtk/gtkcellrenderer.c:358 +#: ../gtk/gtkcellrenderer.c:397 msgid "Editing" msgstr "Editando" -#: ../gtk/gtkcellrenderer.c:359 +#: ../gtk/gtkcellrenderer.c:398 msgid "Whether the cell renderer is currently in editing mode" msgstr "Indica se o renderizador de cela está actualmente no modo de edición" -#: ../gtk/gtkcellrenderer.c:367 +#: ../gtk/gtkcellrenderer.c:406 msgid "Cell background set" msgstr "Definición do fondo da cela" -#: ../gtk/gtkcellrenderer.c:368 +#: ../gtk/gtkcellrenderer.c:407 msgid "Whether this tag affects the cell background color" msgstr "Indica se esta etiqueta afecta á cor de fondo da cela" @@ -1284,7 +1284,7 @@ msgstr "Columna de texto" msgid "A column in the data source model to get the strings from" msgstr "Unha columna no modelo de orixe de datos da que se obteñen as cadeas" -#: ../gtk/gtkcellrenderercombo.c:150 ../gtk/gtkcombobox.c:928 +#: ../gtk/gtkcellrenderercombo.c:150 ../gtk/gtkcombobox.c:932 msgid "Has Entry" msgstr "Ten entrada" @@ -1316,7 +1316,7 @@ msgstr "O pixbuf do expansor pechado" msgid "Pixbuf for closed expander" msgstr "O pixbuf para o expansor pechado" -#: ../gtk/gtkcellrendererpixbuf.c:144 ../gtk/gtkimage.c:244 +#: ../gtk/gtkcellrendererpixbuf.c:144 ../gtk/gtkimage.c:250 #: ../gtk/gtkstatusicon.c:228 msgid "Stock ID" msgstr "ID de inventario" @@ -1350,8 +1350,8 @@ msgstr "Seguir o estado" msgid "Whether the rendered pixbuf should be colorized according to the state" msgstr "Indica se o pixbuf renderizado debería colorearse de acordo co estado" -#: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:319 -#: ../gtk/gtkwindow.c:710 +#: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:325 +#: ../gtk/gtkwindow.c:709 msgid "Icon" msgstr "Icona" @@ -1359,10 +1359,10 @@ msgstr "Icona" msgid "Value of the progress bar" msgstr "Valor da barra de progreso" -#: ../gtk/gtkcellrendererprogress.c:144 ../gtk/gtkcellrenderertext.c:233 -#: ../gtk/gtkentry.c:738 ../gtk/gtkentrybuffer.c:352 -#: ../gtk/gtkmessagedialog.c:226 ../gtk/gtkprogressbar.c:145 -#: ../gtk/gtktextbuffer.c:210 +#: ../gtk/gtkcellrendererprogress.c:144 ../gtk/gtkcellrenderertext.c:247 +#: ../gtk/gtkentry.c:829 ../gtk/gtkentrybuffer.c:352 +#: ../gtk/gtkmessagedialog.c:226 ../gtk/gtkprogressbar.c:177 +#: ../gtk/gtktextbuffer.c:209 msgid "Text" msgstr "Texto" @@ -1402,21 +1402,21 @@ msgstr "Aliñamento y do texto" msgid "The vertical text alignment, from 0 (top) to 1 (bottom)." msgstr "O aliñamento vertical do texto, desde 0 (superior) até 1 (inferior)." -#: ../gtk/gtkcellrendererprogress.c:214 ../gtk/gtkprogressbar.c:121 -#: ../gtk/gtkrange.c:433 +#: ../gtk/gtkcellrendererprogress.c:214 ../gtk/gtkprogressbar.c:153 +#: ../gtk/gtkrange.c:440 msgid "Inverted" msgstr "Invertido" -#: ../gtk/gtkcellrendererprogress.c:215 ../gtk/gtkprogressbar.c:122 +#: ../gtk/gtkcellrendererprogress.c:215 ../gtk/gtkprogressbar.c:154 msgid "Invert the direction in which the progress bar grows" msgstr "Inverter a dirección na que crece a barra de progreso" -#: ../gtk/gtkcellrendererspin.c:91 ../gtk/gtkrange.c:425 -#: ../gtk/gtkscalebutton.c:239 ../gtk/gtkspinbutton.c:228 +#: ../gtk/gtkcellrendererspin.c:91 ../gtk/gtkrange.c:432 +#: ../gtk/gtkscalebutton.c:239 ../gtk/gtkspinbutton.c:230 msgid "Adjustment" msgstr "Axuste" -#: ../gtk/gtkcellrendererspin.c:92 ../gtk/gtkspinbutton.c:229 +#: ../gtk/gtkcellrendererspin.c:92 ../gtk/gtkspinbutton.c:231 msgid "The adjustment that holds the value of the spin button" msgstr "O axuste que mantén o valor do botón de axuste" @@ -1424,22 +1424,23 @@ msgstr "O axuste que mantén o valor do botón de axuste" msgid "Climb rate" msgstr "Taxa de incremento" -#: ../gtk/gtkcellrendererspin.c:108 ../gtk/gtkspinbutton.c:237 +#: ../gtk/gtkcellrendererspin.c:108 ../gtk/gtkspinbutton.c:239 msgid "The acceleration rate when you hold down a button" msgstr "A taxa de aceleración cando mantén premido un botón" -#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:244 -#: ../gtk/gtkspinbutton.c:246 +#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:254 +#: ../gtk/gtkspinbutton.c:248 msgid "Digits" msgstr "Díxitos" -#: ../gtk/gtkcellrendererspin.c:122 ../gtk/gtkspinbutton.c:247 +#: ../gtk/gtkcellrendererspin.c:122 ../gtk/gtkspinbutton.c:249 msgid "The number of decimal places to display" msgstr "O número de lugares decimais que se vai mostrar" #: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:105 -#: ../gtk/gtkmenu.c:520 ../gtk/gtkspinner.c:131 ../gtk/gtktoggleaction.c:133 -#: ../gtk/gtktogglebutton.c:122 ../gtk/gtktoggletoolbutton.c:112 +#: ../gtk/gtkmenu.c:520 ../gtk/gtkspinner.c:118 ../gtk/gtkswitch.c:738 +#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:125 +#: ../gtk/gtktoggletoolbutton.c:112 msgid "Active" msgstr "Activo" @@ -1455,194 +1456,194 @@ msgstr "Pulso do spinner" msgid "The GtkIconSize value that specifies the size of the rendered spinner" msgstr "O valor do GtkIconSize que especifica o tamaño do spinner renderizado" -#: ../gtk/gtkcellrenderertext.c:234 +#: ../gtk/gtkcellrenderertext.c:248 msgid "Text to render" msgstr "Texto para renderizar" -#: ../gtk/gtkcellrenderertext.c:241 +#: ../gtk/gtkcellrenderertext.c:255 msgid "Markup" msgstr "Marcación" -#: ../gtk/gtkcellrenderertext.c:242 +#: ../gtk/gtkcellrenderertext.c:256 msgid "Marked up text to render" msgstr "Texto marcado para renderizar" -#: ../gtk/gtkcellrenderertext.c:249 ../gtk/gtklabel.c:556 +#: ../gtk/gtkcellrenderertext.c:263 ../gtk/gtklabel.c:573 msgid "Attributes" msgstr "Atributos" -#: ../gtk/gtkcellrenderertext.c:250 +#: ../gtk/gtkcellrenderertext.c:264 msgid "A list of style attributes to apply to the text of the renderer" msgstr "" "Unha lista de atributos de estilo para aplicar ao texto do renderizador" -#: ../gtk/gtkcellrenderertext.c:257 +#: ../gtk/gtkcellrenderertext.c:271 msgid "Single Paragraph Mode" msgstr "Modo de parágrafo único" -#: ../gtk/gtkcellrenderertext.c:258 +#: ../gtk/gtkcellrenderertext.c:272 msgid "Whether to keep all text in a single paragraph" msgstr "Indica se debe manterse ou non todo o texto nun só parágrafo" -#: ../gtk/gtkcellrenderertext.c:266 ../gtk/gtkcellview.c:179 +#: ../gtk/gtkcellrenderertext.c:280 ../gtk/gtkcellview.c:192 #: ../gtk/gtktexttag.c:178 msgid "Background color name" msgstr "Nome da cor de fondo" -#: ../gtk/gtkcellrenderertext.c:267 ../gtk/gtkcellview.c:180 +#: ../gtk/gtkcellrenderertext.c:281 ../gtk/gtkcellview.c:193 #: ../gtk/gtktexttag.c:179 msgid "Background color as a string" msgstr "Cor de fondo como unha cadea" -#: ../gtk/gtkcellrenderertext.c:274 ../gtk/gtkcellview.c:186 +#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:199 #: ../gtk/gtktexttag.c:186 msgid "Background color" msgstr "Cor de fondo" -#: ../gtk/gtkcellrenderertext.c:275 ../gtk/gtkcellview.c:187 +#: ../gtk/gtkcellrenderertext.c:289 ../gtk/gtkcellview.c:200 msgid "Background color as a GdkColor" msgstr "Cor de fondo como unha GdkColor" -#: ../gtk/gtkcellrenderertext.c:289 +#: ../gtk/gtkcellrenderertext.c:303 msgid "Background color as RGBA" msgstr "Nome do cor de fondo como RGBA" -#: ../gtk/gtkcellrenderertext.c:290 ../gtk/gtkcellview.c:201 +#: ../gtk/gtkcellrenderertext.c:304 ../gtk/gtkcellview.c:214 msgid "Background color as a GdkRGBA" msgstr "Cor de fondo como GdkRBGA" -#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtktexttag.c:202 +#: ../gtk/gtkcellrenderertext.c:310 ../gtk/gtktexttag.c:202 msgid "Foreground color name" msgstr "Nome da cor de primeiro plano" -#: ../gtk/gtkcellrenderertext.c:297 ../gtk/gtktexttag.c:203 +#: ../gtk/gtkcellrenderertext.c:311 ../gtk/gtktexttag.c:203 msgid "Foreground color as a string" msgstr "Cor de primeiro plano como unha cadea" -#: ../gtk/gtkcellrenderertext.c:304 ../gtk/gtktexttag.c:210 +#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:210 #: ../gtk/gtktrayicon-x11.c:133 msgid "Foreground color" msgstr "Cor de primeiro plano" -#: ../gtk/gtkcellrenderertext.c:305 +#: ../gtk/gtkcellrenderertext.c:319 msgid "Foreground color as a GdkColor" msgstr "Cor de primeiro plano como unha GdkColor" -#: ../gtk/gtkcellrenderertext.c:319 +#: ../gtk/gtkcellrenderertext.c:333 msgid "Foreground color as RGBA" msgstr "Cor de primeiro plano como RGBA" -#: ../gtk/gtkcellrenderertext.c:320 +#: ../gtk/gtkcellrenderertext.c:334 msgid "Foreground color as a GdkRGBA" msgstr "Cor de primeiro plano como GdkRGBA" -#: ../gtk/gtkcellrenderertext.c:328 ../gtk/gtkentry.c:662 -#: ../gtk/gtktexttag.c:227 ../gtk/gtktextview.c:667 +#: ../gtk/gtkcellrenderertext.c:342 ../gtk/gtkentry.c:753 +#: ../gtk/gtktexttag.c:227 ../gtk/gtktextview.c:686 msgid "Editable" msgstr "Editábel" -#: ../gtk/gtkcellrenderertext.c:329 ../gtk/gtktexttag.c:228 -#: ../gtk/gtktextview.c:668 +#: ../gtk/gtkcellrenderertext.c:343 ../gtk/gtktexttag.c:228 +#: ../gtk/gtktextview.c:687 msgid "Whether the text can be modified by the user" msgstr "Indica se o usuario pode modificar o texto" -#: ../gtk/gtkcellrenderertext.c:336 ../gtk/gtkcellrenderertext.c:344 +#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtkcellrenderertext.c:358 #: ../gtk/gtktexttag.c:243 ../gtk/gtktexttag.c:251 msgid "Font" msgstr "Tipo de letra" -#: ../gtk/gtkcellrenderertext.c:337 ../gtk/gtktexttag.c:244 +#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:244 msgid "Font description as a string, e.g. \"Sans Italic 12\"" msgstr "" "Descrición do tipo de letra como unha cadea, por exemplo \"Sans Italic 12\"" -#: ../gtk/gtkcellrenderertext.c:345 ../gtk/gtktexttag.c:252 +#: ../gtk/gtkcellrenderertext.c:359 ../gtk/gtktexttag.c:252 msgid "Font description as a PangoFontDescription struct" msgstr "Descrición do tipo de letra como unha estrutura PangoFontDescription" -#: ../gtk/gtkcellrenderertext.c:353 ../gtk/gtktexttag.c:259 +#: ../gtk/gtkcellrenderertext.c:367 ../gtk/gtktexttag.c:259 msgid "Font family" msgstr "Familia do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:354 ../gtk/gtktexttag.c:260 +#: ../gtk/gtkcellrenderertext.c:368 ../gtk/gtktexttag.c:260 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace" msgstr "" "Nome da familia do tipo de letra, por exemplo Sans, Helvética, Times ou " "Monospace" -#: ../gtk/gtkcellrenderertext.c:361 ../gtk/gtkcellrenderertext.c:362 +#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtkcellrenderertext.c:376 #: ../gtk/gtktexttag.c:267 msgid "Font style" msgstr "Estilo do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:370 ../gtk/gtkcellrenderertext.c:371 +#: ../gtk/gtkcellrenderertext.c:384 ../gtk/gtkcellrenderertext.c:385 #: ../gtk/gtktexttag.c:276 msgid "Font variant" msgstr "Variante do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:379 ../gtk/gtkcellrenderertext.c:380 +#: ../gtk/gtkcellrenderertext.c:393 ../gtk/gtkcellrenderertext.c:394 #: ../gtk/gtktexttag.c:285 msgid "Font weight" msgstr "Grosor do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:389 ../gtk/gtkcellrenderertext.c:390 +#: ../gtk/gtkcellrenderertext.c:403 ../gtk/gtkcellrenderertext.c:404 #: ../gtk/gtktexttag.c:296 msgid "Font stretch" msgstr "Expandir o tipo de letra" -#: ../gtk/gtkcellrenderertext.c:398 ../gtk/gtkcellrenderertext.c:399 +#: ../gtk/gtkcellrenderertext.c:412 ../gtk/gtkcellrenderertext.c:413 #: ../gtk/gtktexttag.c:305 msgid "Font size" msgstr "Tamaño do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:408 ../gtk/gtktexttag.c:325 +#: ../gtk/gtkcellrenderertext.c:422 ../gtk/gtktexttag.c:325 msgid "Font points" msgstr "Puntos do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:409 ../gtk/gtktexttag.c:326 +#: ../gtk/gtkcellrenderertext.c:423 ../gtk/gtktexttag.c:326 msgid "Font size in points" msgstr "Tamaño do tipo de letra en puntos" -#: ../gtk/gtkcellrenderertext.c:418 ../gtk/gtktexttag.c:315 +#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtktexttag.c:315 msgid "Font scale" msgstr "Escala do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:419 +#: ../gtk/gtkcellrenderertext.c:433 msgid "Font scaling factor" msgstr "Factor de escalado do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:428 ../gtk/gtktexttag.c:394 +#: ../gtk/gtkcellrenderertext.c:442 ../gtk/gtktexttag.c:394 msgid "Rise" msgstr "Elevación" -#: ../gtk/gtkcellrenderertext.c:429 +#: ../gtk/gtkcellrenderertext.c:443 msgid "" "Offset of text above the baseline (below the baseline if rise is negative)" msgstr "" "Desprazamento do texto sobre a liña base (por debaixo da liña base se a " "elevación é negativa)" -#: ../gtk/gtkcellrenderertext.c:440 ../gtk/gtktexttag.c:434 +#: ../gtk/gtkcellrenderertext.c:454 ../gtk/gtktexttag.c:434 msgid "Strikethrough" msgstr "Riscado" -#: ../gtk/gtkcellrenderertext.c:441 ../gtk/gtktexttag.c:435 +#: ../gtk/gtkcellrenderertext.c:455 ../gtk/gtktexttag.c:435 msgid "Whether to strike through the text" msgstr "Indica se se risca o texto" -#: ../gtk/gtkcellrenderertext.c:448 ../gtk/gtktexttag.c:442 +#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:442 msgid "Underline" msgstr "Subliñado" -#: ../gtk/gtkcellrenderertext.c:449 ../gtk/gtktexttag.c:443 +#: ../gtk/gtkcellrenderertext.c:463 ../gtk/gtktexttag.c:443 msgid "Style of underline for this text" msgstr "Estilo de subliñado para este texto" -#: ../gtk/gtkcellrenderertext.c:457 ../gtk/gtktexttag.c:354 +#: ../gtk/gtkcellrenderertext.c:471 ../gtk/gtktexttag.c:354 msgid "Language" msgstr "Idioma" -#: ../gtk/gtkcellrenderertext.c:458 +#: ../gtk/gtkcellrenderertext.c:472 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 " @@ -1652,12 +1653,12 @@ msgstr "" "isto como unha axuda cando está renderizando o texto. Se non comprende este " "parámetro probabelmente non o necesite" -#: ../gtk/gtkcellrenderertext.c:478 ../gtk/gtklabel.c:681 -#: ../gtk/gtkprogressbar.c:175 +#: ../gtk/gtkcellrenderertext.c:492 ../gtk/gtklabel.c:698 +#: ../gtk/gtkprogressbar.c:207 msgid "Ellipsize" msgstr "Elipsis" -#: ../gtk/gtkcellrenderertext.c:479 +#: ../gtk/gtkcellrenderertext.c:493 msgid "" "The preferred place to ellipsize the string, if the cell renderer does not " "have enough room to display the entire string" @@ -1665,28 +1666,28 @@ msgstr "" "O lugar preferido para a elipse a cadea, se o renderizador da cela non ten " "espazo suficiente para mostrar a cadea completa" -#: ../gtk/gtkcellrenderertext.c:498 ../gtk/gtkfilechooserbutton.c:411 -#: ../gtk/gtklabel.c:702 +#: ../gtk/gtkcellrenderertext.c:512 ../gtk/gtkfilechooserbutton.c:411 +#: ../gtk/gtklabel.c:719 msgid "Width In Characters" msgstr "Largura en caracteres" -#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:703 +#: ../gtk/gtkcellrenderertext.c:513 ../gtk/gtklabel.c:720 msgid "The desired width of the label, in characters" msgstr "A largura desexada da etiqueta, en caracteres" -#: ../gtk/gtkcellrenderertext.c:523 ../gtk/gtklabel.c:763 +#: ../gtk/gtkcellrenderertext.c:537 ../gtk/gtklabel.c:780 msgid "Maximum Width In Characters" msgstr "Largura máxima en caracteres" -#: ../gtk/gtkcellrenderertext.c:524 +#: ../gtk/gtkcellrenderertext.c:538 msgid "The maximum width of the cell, in characters" msgstr "A largura máxima da cela, en caracteres" -#: ../gtk/gtkcellrenderertext.c:542 ../gtk/gtktexttag.c:451 +#: ../gtk/gtkcellrenderertext.c:556 ../gtk/gtktexttag.c:451 msgid "Wrap mode" msgstr "Modo de axuste" -#: ../gtk/gtkcellrenderertext.c:543 +#: ../gtk/gtkcellrenderertext.c:557 msgid "" "How to break the string into multiple lines, if the cell renderer does not " "have enough room to display the entire string" @@ -1694,149 +1695,149 @@ msgstr "" "Como romper a cadea en liñas múltiples, se o renderizador da cela non ten " "suficiente espazo para mostrar a cadea completa" -#: ../gtk/gtkcellrenderertext.c:562 ../gtk/gtkcombobox.c:750 +#: ../gtk/gtkcellrenderertext.c:576 ../gtk/gtkcombobox.c:754 msgid "Wrap width" msgstr "Largura de axuste" -#: ../gtk/gtkcellrenderertext.c:563 +#: ../gtk/gtkcellrenderertext.c:577 msgid "The width at which the text is wrapped" msgstr "A largura á que o texto se axustará" -#: ../gtk/gtkcellrenderertext.c:583 ../gtk/gtktreeviewcolumn.c:319 +#: ../gtk/gtkcellrenderertext.c:597 ../gtk/gtktreeviewcolumn.c:319 msgid "Alignment" msgstr "Aliñamento" -#: ../gtk/gtkcellrenderertext.c:584 +#: ../gtk/gtkcellrenderertext.c:598 msgid "How to align the lines" msgstr "Como aliñar as liñas" -#: ../gtk/gtkcellrenderertext.c:596 ../gtk/gtkcellview.c:223 +#: ../gtk/gtkcellrenderertext.c:610 ../gtk/gtkcellview.c:236 #: ../gtk/gtktexttag.c:540 msgid "Background set" msgstr "Definición do fondo" -#: ../gtk/gtkcellrenderertext.c:597 ../gtk/gtkcellview.c:224 +#: ../gtk/gtkcellrenderertext.c:611 ../gtk/gtkcellview.c:237 #: ../gtk/gtktexttag.c:541 msgid "Whether this tag affects the background color" msgstr "Indica se esta marca afecta á cor de fondo" -#: ../gtk/gtkcellrenderertext.c:600 ../gtk/gtktexttag.c:548 +#: ../gtk/gtkcellrenderertext.c:614 ../gtk/gtktexttag.c:548 msgid "Foreground set" msgstr "Definición do primeiro plano" -#: ../gtk/gtkcellrenderertext.c:601 ../gtk/gtktexttag.c:549 +#: ../gtk/gtkcellrenderertext.c:615 ../gtk/gtktexttag.c:549 msgid "Whether this tag affects the foreground color" msgstr "Indica se esta marca afecta á cor de primeiro plano" -#: ../gtk/gtkcellrenderertext.c:604 ../gtk/gtktexttag.c:552 +#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtktexttag.c:552 msgid "Editability set" msgstr "Definición da editabilidade" -#: ../gtk/gtkcellrenderertext.c:605 ../gtk/gtktexttag.c:553 +#: ../gtk/gtkcellrenderertext.c:619 ../gtk/gtktexttag.c:553 msgid "Whether this tag affects text editability" msgstr "Indica se esta marca afecta á editabilidade do texto" -#: ../gtk/gtkcellrenderertext.c:608 ../gtk/gtktexttag.c:556 +#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:556 msgid "Font family set" msgstr "Definición da familia do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:609 ../gtk/gtktexttag.c:557 +#: ../gtk/gtkcellrenderertext.c:623 ../gtk/gtktexttag.c:557 msgid "Whether this tag affects the font family" msgstr "Indica se esta marca afecta á familia do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:612 ../gtk/gtktexttag.c:560 +#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:560 msgid "Font style set" msgstr "Definición do estilo do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:613 ../gtk/gtktexttag.c:561 +#: ../gtk/gtkcellrenderertext.c:627 ../gtk/gtktexttag.c:561 msgid "Whether this tag affects the font style" msgstr "Indica se esta marca afecta ao estilo do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:616 ../gtk/gtktexttag.c:564 +#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:564 msgid "Font variant set" msgstr "Definición da variante do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:617 ../gtk/gtktexttag.c:565 +#: ../gtk/gtkcellrenderertext.c:631 ../gtk/gtktexttag.c:565 msgid "Whether this tag affects the font variant" msgstr "Indica se esta marca afecta á variante do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:620 ../gtk/gtktexttag.c:568 +#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:568 msgid "Font weight set" msgstr "Definición do grosor do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:621 ../gtk/gtktexttag.c:569 +#: ../gtk/gtkcellrenderertext.c:635 ../gtk/gtktexttag.c:569 msgid "Whether this tag affects the font weight" msgstr "Indica se esta marca afecta ao grosor do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:624 ../gtk/gtktexttag.c:572 +#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:572 msgid "Font stretch set" msgstr "Definición da expansión do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:625 ../gtk/gtktexttag.c:573 +#: ../gtk/gtkcellrenderertext.c:639 ../gtk/gtktexttag.c:573 msgid "Whether this tag affects the font stretch" msgstr "Indica se esta marca afecta á expansión do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:628 ../gtk/gtktexttag.c:576 +#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:576 msgid "Font size set" msgstr "Definición do tamaño do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:629 ../gtk/gtktexttag.c:577 +#: ../gtk/gtkcellrenderertext.c:643 ../gtk/gtktexttag.c:577 msgid "Whether this tag affects the font size" msgstr "Indica se esta marca afecta ao tamaño do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:632 ../gtk/gtktexttag.c:580 +#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:580 msgid "Font scale set" msgstr "Definición da escala do tipo de letra" -#: ../gtk/gtkcellrenderertext.c:633 ../gtk/gtktexttag.c:581 +#: ../gtk/gtkcellrenderertext.c:647 ../gtk/gtktexttag.c:581 msgid "Whether this tag scales the font size by a factor" msgstr "Indica se esta etiqueta escala o tamaño do tipo de letra por un factor" -#: ../gtk/gtkcellrenderertext.c:636 ../gtk/gtktexttag.c:600 +#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:600 msgid "Rise set" msgstr "Definición da elevación" -#: ../gtk/gtkcellrenderertext.c:637 ../gtk/gtktexttag.c:601 +#: ../gtk/gtkcellrenderertext.c:651 ../gtk/gtktexttag.c:601 msgid "Whether this tag affects the rise" msgstr "Indica se esta marca afecta á elevación" -#: ../gtk/gtkcellrenderertext.c:640 ../gtk/gtktexttag.c:616 +#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:616 msgid "Strikethrough set" msgstr "Definición do riscado" -#: ../gtk/gtkcellrenderertext.c:641 ../gtk/gtktexttag.c:617 +#: ../gtk/gtkcellrenderertext.c:655 ../gtk/gtktexttag.c:617 msgid "Whether this tag affects strikethrough" msgstr "Indica se esta marca afecta ao riscado" -#: ../gtk/gtkcellrenderertext.c:644 ../gtk/gtktexttag.c:624 +#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:624 msgid "Underline set" msgstr "Definición do subliñado" -#: ../gtk/gtkcellrenderertext.c:645 ../gtk/gtktexttag.c:625 +#: ../gtk/gtkcellrenderertext.c:659 ../gtk/gtktexttag.c:625 msgid "Whether this tag affects underlining" msgstr "Indica se esta marca afecta ao subliñado" -#: ../gtk/gtkcellrenderertext.c:648 ../gtk/gtktexttag.c:588 +#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:588 msgid "Language set" msgstr "Definición do idioma" -#: ../gtk/gtkcellrenderertext.c:649 ../gtk/gtktexttag.c:589 +#: ../gtk/gtkcellrenderertext.c:663 ../gtk/gtktexttag.c:589 msgid "Whether this tag affects the language the text is rendered as" msgstr "Indica se esta marca afecta ao idioma en que se renderiza o texto" -#: ../gtk/gtkcellrenderertext.c:652 +#: ../gtk/gtkcellrenderertext.c:666 msgid "Ellipsize set" msgstr "Definición da elipse" -#: ../gtk/gtkcellrenderertext.c:653 +#: ../gtk/gtkcellrenderertext.c:667 msgid "Whether this tag affects the ellipsize mode" msgstr "Indica se esta marca afecta ao modo de elipse" -#: ../gtk/gtkcellrenderertext.c:656 +#: ../gtk/gtkcellrenderertext.c:670 msgid "Align set" msgstr "Definición de aliñamento" -#: ../gtk/gtkcellrenderertext.c:657 +#: ../gtk/gtkcellrenderertext.c:671 msgid "Whether this tag affects the alignment mode" msgstr "Indica se esta marca afecta ao modo de aliñamento" @@ -1876,32 +1877,32 @@ msgstr "Debuxar o botón de estado como un botón de opción" msgid "Indicator size" msgstr "Tamaño do indicador" -#: ../gtk/gtkcellrenderertoggle.c:161 ../gtk/gtkcheckbutton.c:72 +#: ../gtk/gtkcellrenderertoggle.c:161 ../gtk/gtkcheckbutton.c:78 #: ../gtk/gtkcheckmenuitem.c:129 msgid "Size of check or radio indicator" msgstr "Tamaño do indicador de opción ou de verificación" -#: ../gtk/gtkcellview.c:200 +#: ../gtk/gtkcellview.c:213 msgid "Background RGBA color" msgstr "Cor de fondo RGBA" -#: ../gtk/gtkcellview.c:215 +#: ../gtk/gtkcellview.c:228 msgid "CellView model" msgstr "Modelo CellView" -#: ../gtk/gtkcellview.c:216 +#: ../gtk/gtkcellview.c:229 msgid "The model for cell view" msgstr "O modelo para a visualización de cela" -#: ../gtk/gtkcheckbutton.c:71 ../gtk/gtkcheckmenuitem.c:128 +#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkcheckmenuitem.c:128 msgid "Indicator Size" msgstr "Tamaño do indicador" -#: ../gtk/gtkcheckbutton.c:79 ../gtk/gtkexpander.c:267 +#: ../gtk/gtkcheckbutton.c:85 ../gtk/gtkexpander.c:267 msgid "Indicator Spacing" msgstr "Espazamento do indicador" -#: ../gtk/gtkcheckbutton.c:80 +#: ../gtk/gtkcheckbutton.c:86 msgid "Spacing around check or radio indicator" msgstr "Espazamento ao redor do indicador de opción ou de verificación" @@ -1909,7 +1910,7 @@ msgstr "Espazamento ao redor do indicador de opción ou de verificación" msgid "Whether the menu item is checked" msgstr "Indica se o elemento de menú está seleccionado" -#: ../gtk/gtkcheckmenuitem.c:113 ../gtk/gtktogglebutton.c:130 +#: ../gtk/gtkcheckmenuitem.c:113 ../gtk/gtktogglebutton.c:133 msgid "Inconsistent" msgstr "Inconsistente" @@ -1927,81 +1928,81 @@ msgstr "" "Indica se a aparencia do elemento de menú é como un elemento do menú de " "opción" -#: ../gtk/gtkcolorbutton.c:158 +#: ../gtk/gtkcolorbutton.c:171 msgid "Use alpha" msgstr "Usar alfa" -#: ../gtk/gtkcolorbutton.c:159 +#: ../gtk/gtkcolorbutton.c:172 msgid "Whether to give the color an alpha value" msgstr "Indica se debe dárselle ou non un valor alfa á cor" -#: ../gtk/gtkcolorbutton.c:173 ../gtk/gtkfilechooserbutton.c:397 +#: ../gtk/gtkcolorbutton.c:186 ../gtk/gtkfilechooserbutton.c:397 #: ../gtk/gtkfontbutton.c:140 ../gtk/gtkprintjob.c:115 #: ../gtk/gtkstatusicon.c:415 ../gtk/gtktreeviewcolumn.c:286 msgid "Title" msgstr "Título" -#: ../gtk/gtkcolorbutton.c:174 +#: ../gtk/gtkcolorbutton.c:187 msgid "The title of the color selection dialog" msgstr "O título do diálogo de selección da cor" -#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorsel.c:325 +#: ../gtk/gtkcolorbutton.c:201 ../gtk/gtkcolorsel.c:339 msgid "Current Color" msgstr "Cor actual" -#: ../gtk/gtkcolorbutton.c:189 +#: ../gtk/gtkcolorbutton.c:202 msgid "The selected color" msgstr "A cor seleccionada" -#: ../gtk/gtkcolorbutton.c:203 ../gtk/gtkcolorsel.c:332 +#: ../gtk/gtkcolorbutton.c:216 ../gtk/gtkcolorsel.c:346 msgid "Current Alpha" msgstr "Alfa actual" -#: ../gtk/gtkcolorbutton.c:204 +#: ../gtk/gtkcolorbutton.c:217 msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)" msgstr "" "O valor de opacidade actual (0 é completamente transparente; 65535 é " "completamente opaco)" -#: ../gtk/gtkcolorbutton.c:218 +#: ../gtk/gtkcolorbutton.c:231 msgid "Current RGBA Color" msgstr "Cor RGBA actual" -#: ../gtk/gtkcolorbutton.c:219 +#: ../gtk/gtkcolorbutton.c:232 msgid "The selected RGBA color" msgstr "A cor RGBA seleccionada" -#: ../gtk/gtkcolorsel.c:311 +#: ../gtk/gtkcolorsel.c:325 msgid "Has Opacity Control" msgstr "Ten un control de opacidade" -#: ../gtk/gtkcolorsel.c:312 +#: ../gtk/gtkcolorsel.c:326 msgid "Whether the color selector should allow setting opacity" msgstr "Indica se o selector de cor pode permitir seleccionar a opacidade" -#: ../gtk/gtkcolorsel.c:318 +#: ../gtk/gtkcolorsel.c:332 msgid "Has palette" msgstr "Ten unha paleta" -#: ../gtk/gtkcolorsel.c:319 +#: ../gtk/gtkcolorsel.c:333 msgid "Whether a palette should be used" msgstr "Indica se se pode usar unha paleta" -#: ../gtk/gtkcolorsel.c:326 +#: ../gtk/gtkcolorsel.c:340 msgid "The current color" msgstr "A cor actual" -#: ../gtk/gtkcolorsel.c:333 +#: ../gtk/gtkcolorsel.c:347 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)" msgstr "" "O valor de opacidade actual (0 é completamente transparente, 65535 é " "completamente opaco)" -#: ../gtk/gtkcolorsel.c:347 +#: ../gtk/gtkcolorsel.c:361 msgid "Current RGBA" msgstr "RGBA actual" -#: ../gtk/gtkcolorsel.c:348 +#: ../gtk/gtkcolorsel.c:362 msgid "The current RGBA color" msgstr "A cor RGBA actual" @@ -2037,68 +2038,68 @@ msgstr "Botón Axuda" msgid "The help button of the dialog." msgstr "O botón Axuda do diálogo." -#: ../gtk/gtkcombobox.c:733 +#: ../gtk/gtkcombobox.c:737 msgid "ComboBox model" msgstr "Modelo de caixa de combinación" -#: ../gtk/gtkcombobox.c:734 +#: ../gtk/gtkcombobox.c:738 msgid "The model for the combo box" msgstr "O modelo para a caixa de combinación" -#: ../gtk/gtkcombobox.c:751 +#: ../gtk/gtkcombobox.c:755 msgid "Wrap width for laying out the items in a grid" msgstr "Largura de axuste para distribuír os elementos nunha grade" -#: ../gtk/gtkcombobox.c:773 +#: ../gtk/gtkcombobox.c:777 msgid "Row span column" msgstr "Columna de expansión da fila" -#: ../gtk/gtkcombobox.c:774 +#: ../gtk/gtkcombobox.c:778 msgid "TreeModel column containing the row span values" msgstr "Columna TreeModel que contén os valores de expansión da fila" -#: ../gtk/gtkcombobox.c:795 +#: ../gtk/gtkcombobox.c:799 msgid "Column span column" msgstr "Columna de expansión da columna" -#: ../gtk/gtkcombobox.c:796 +#: ../gtk/gtkcombobox.c:800 msgid "TreeModel column containing the column span values" msgstr "Columna TreeModel que contén os valores de expansión da columna" -#: ../gtk/gtkcombobox.c:817 +#: ../gtk/gtkcombobox.c:821 msgid "Active item" msgstr "Elemento activo" -#: ../gtk/gtkcombobox.c:818 +#: ../gtk/gtkcombobox.c:822 msgid "The item which is currently active" msgstr "O elemento que está activo actualmente" -#: ../gtk/gtkcombobox.c:837 ../gtk/gtkuimanager.c:224 +#: ../gtk/gtkcombobox.c:841 ../gtk/gtkuimanager.c:224 msgid "Add tearoffs to menus" msgstr "Engadir tiradores aos menús" -#: ../gtk/gtkcombobox.c:838 +#: ../gtk/gtkcombobox.c:842 msgid "Whether dropdowns should have a tearoff menu item" msgstr "" "Indica se os menús despregábeis deben ter un elemento de menú desprazábel" -#: ../gtk/gtkcombobox.c:853 ../gtk/gtkentry.c:687 +#: ../gtk/gtkcombobox.c:857 ../gtk/gtkentry.c:778 msgid "Has Frame" msgstr "Ten marco" -#: ../gtk/gtkcombobox.c:854 +#: ../gtk/gtkcombobox.c:858 msgid "Whether the combo box draws a frame around the child" msgstr "Indica se a caixa de combinación debuxa un marco ao redor do fillo" -#: ../gtk/gtkcombobox.c:862 +#: ../gtk/gtkcombobox.c:866 msgid "Whether the combo box grabs focus when it is clicked with the mouse" msgstr "Indica se a caixa de combinación captura o foco cando se preme co rato" -#: ../gtk/gtkcombobox.c:877 ../gtk/gtkmenu.c:575 +#: ../gtk/gtkcombobox.c:881 ../gtk/gtkmenu.c:575 msgid "Tearoff Title" msgstr "Título do tirador" -#: ../gtk/gtkcombobox.c:878 +#: ../gtk/gtkcombobox.c:882 msgid "" "A title that may be displayed by the window manager when the popup is torn-" "off" @@ -2106,31 +2107,31 @@ msgstr "" "Un título que o xestor de xanelas pode mostrar cando o menú emerxente se " "separa" -#: ../gtk/gtkcombobox.c:895 +#: ../gtk/gtkcombobox.c:899 msgid "Popup shown" msgstr "Menú emerxente mostrado" -#: ../gtk/gtkcombobox.c:896 +#: ../gtk/gtkcombobox.c:900 msgid "Whether the combo's dropdown is shown" msgstr "Indica se se mostra o despregábel da caixa de combinación" -#: ../gtk/gtkcombobox.c:912 +#: ../gtk/gtkcombobox.c:916 msgid "Button Sensitivity" msgstr "Sensibilidade do botón" -#: ../gtk/gtkcombobox.c:913 +#: ../gtk/gtkcombobox.c:917 msgid "Whether the dropdown button is sensitive when the model is empty" msgstr "Indica se o botón despregábel é sensíbel cando o modelo está baleiro" -#: ../gtk/gtkcombobox.c:929 +#: ../gtk/gtkcombobox.c:933 msgid "Whether combo box has an entry" msgstr "Indica se o ComboBox ten unha entrada" -#: ../gtk/gtkcombobox.c:944 +#: ../gtk/gtkcombobox.c:948 msgid "Entry Text Column" msgstr "Columna de entrada de texto" -#: ../gtk/gtkcombobox.c:945 +#: ../gtk/gtkcombobox.c:949 msgid "" "The column in the combo box's model to associate with strings from the entry " "if the combo was created with #GtkComboBox:has-entry = %TRUE" @@ -2138,11 +2139,31 @@ msgstr "" "A columna no modelo de caixa de combinación para asociar con cadeas da " "entrada se a caixa combinada creouse con #GtkComboBox:has-entry = %TRUE" -#: ../gtk/gtkcombobox.c:962 +#: ../gtk/gtkcombobox.c:966 +msgid "ID Column" +msgstr "ID da columna" + +#: ../gtk/gtkcombobox.c:967 +msgid "" +"The column in the combo box's model that provides string IDs for the values " +"in the model" +msgstr "" +"A columna no modelo de caixa de combinación que fornece os ID de cadeas para " +"os valores no modelo" + +#: ../gtk/gtkcombobox.c:982 +msgid "Active id" +msgstr "ID activo" + +#: ../gtk/gtkcombobox.c:983 +msgid "The value of the id column for the active row" +msgstr "O valor do ID da columna para a fila activa" + +#: ../gtk/gtkcombobox.c:998 msgid "Popup Fixed Width" msgstr "Anchura fixa de emerxente" -#: ../gtk/gtkcombobox.c:963 +#: ../gtk/gtkcombobox.c:999 msgid "" "Whether the popup's width should be a fixed width matching the allocated " "width of the combo box" @@ -2150,53 +2171,53 @@ msgstr "" "Indica se a anchura do emerxente debería ser fixa coincidindo coa anchura " "reservada para a caixa de combinación" -#: ../gtk/gtkcombobox.c:971 +#: ../gtk/gtkcombobox.c:1007 msgid "Appears as list" msgstr "Móstrase como unha lista" -#: ../gtk/gtkcombobox.c:972 +#: ../gtk/gtkcombobox.c:1008 msgid "Whether dropdowns should look like lists rather than menus" msgstr "Indica se os despregábeis deben parecerse a listas en vez de a menús" -#: ../gtk/gtkcombobox.c:988 +#: ../gtk/gtkcombobox.c:1024 msgid "Arrow Size" msgstr "Tamaño da frecha" -#: ../gtk/gtkcombobox.c:989 +#: ../gtk/gtkcombobox.c:1025 msgid "The minimum size of the arrow in the combo box" msgstr "O tamaño mínimo da frecha no caixa de combinación" -#: ../gtk/gtkcombobox.c:1004 ../gtk/gtkentry.c:787 ../gtk/gtkhandlebox.c:182 -#: ../gtk/gtkmenubar.c:189 ../gtk/gtkstatusbar.c:178 ../gtk/gtktoolbar.c:597 -#: ../gtk/gtkviewport.c:155 +#: ../gtk/gtkcombobox.c:1040 ../gtk/gtkentry.c:878 ../gtk/gtkhandlebox.c:188 +#: ../gtk/gtkmenubar.c:196 ../gtk/gtkstatusbar.c:180 ../gtk/gtktoolbar.c:603 +#: ../gtk/gtkviewport.c:154 msgid "Shadow type" msgstr "Tipo de sombra" -#: ../gtk/gtkcombobox.c:1005 +#: ../gtk/gtkcombobox.c:1041 msgid "Which kind of shadow to draw around the combo box" msgstr "A clase de sombra que se debuxa ao redor da caixa de combinación" -#: ../gtk/gtkcontainer.c:472 +#: ../gtk/gtkcontainer.c:476 msgid "Resize mode" msgstr "Modo de redimensionamento" -#: ../gtk/gtkcontainer.c:473 +#: ../gtk/gtkcontainer.c:477 msgid "Specify how resize events are handled" msgstr "Especifica como se manipulan os eventos de redimensionamento" -#: ../gtk/gtkcontainer.c:480 +#: ../gtk/gtkcontainer.c:484 msgid "Border width" msgstr "Largura do bordo" -#: ../gtk/gtkcontainer.c:481 +#: ../gtk/gtkcontainer.c:485 msgid "The width of the empty border outside the containers children" msgstr "A largura do bordo baleiro fóra dos contedores fillos" -#: ../gtk/gtkcontainer.c:489 +#: ../gtk/gtkcontainer.c:493 msgid "Child" msgstr "Fillo" -#: ../gtk/gtkcontainer.c:490 +#: ../gtk/gtkcontainer.c:494 msgid "Can be used to add a new child to the container" msgstr "Pode usarse para engadir un fillo novo ao contedor" @@ -2234,48 +2255,48 @@ msgstr "" "Largura do bordo ao redor da área do botón na parte inferior da caixa de " "diálogo" -#: ../gtk/gtkentry.c:634 +#: ../gtk/gtkentry.c:725 msgid "Text Buffer" msgstr "Búfer de texto" -#: ../gtk/gtkentry.c:635 +#: ../gtk/gtkentry.c:726 msgid "Text buffer object which actually stores entry text" msgstr "Obxecto de búfer de texto que almacena actualmente a entrada de texto" -#: ../gtk/gtkentry.c:642 ../gtk/gtklabel.c:644 +#: ../gtk/gtkentry.c:733 ../gtk/gtklabel.c:661 msgid "Cursor Position" msgstr "Posición do cursor" -#: ../gtk/gtkentry.c:643 ../gtk/gtklabel.c:645 +#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:662 msgid "The current position of the insertion cursor in chars" msgstr "A posición actual do cursor de inserción en caracteres" -#: ../gtk/gtkentry.c:652 ../gtk/gtklabel.c:654 +#: ../gtk/gtkentry.c:743 ../gtk/gtklabel.c:671 msgid "Selection Bound" msgstr "Límite da selección" -#: ../gtk/gtkentry.c:653 ../gtk/gtklabel.c:655 +#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:672 msgid "" "The position of the opposite end of the selection from the cursor in chars" msgstr "A posición en caracteres do extremo oposto da selección desde o cursor" -#: ../gtk/gtkentry.c:663 +#: ../gtk/gtkentry.c:754 msgid "Whether the entry contents can be edited" msgstr "Indica se os contidos da entrada se poden editar" -#: ../gtk/gtkentry.c:670 ../gtk/gtkentrybuffer.c:382 +#: ../gtk/gtkentry.c:761 ../gtk/gtkentrybuffer.c:382 msgid "Maximum length" msgstr "Lonxitude máxima" -#: ../gtk/gtkentry.c:671 ../gtk/gtkentrybuffer.c:383 +#: ../gtk/gtkentry.c:762 ../gtk/gtkentrybuffer.c:383 msgid "Maximum number of characters for this entry. Zero if no maximum" msgstr "Número máximo de caracteres nesta entrada. É cero se non hai un máximo" -#: ../gtk/gtkentry.c:679 +#: ../gtk/gtkentry.c:770 msgid "Visibility" msgstr "Visibilidade" -#: ../gtk/gtkentry.c:680 +#: ../gtk/gtkentry.c:771 msgid "" "FALSE displays the \"invisible char\" instead of the actual text (password " "mode)" @@ -2283,32 +2304,32 @@ msgstr "" "FALSE mostra o \"carácter invisíbel\" en lugar do texto actual (no modo " "contrasinal)" -#: ../gtk/gtkentry.c:688 +#: ../gtk/gtkentry.c:779 msgid "FALSE removes outside bevel from entry" msgstr "FALSE elimina o bisel exterior da entrada" -#: ../gtk/gtkentry.c:696 +#: ../gtk/gtkentry.c:787 msgid "" "Border between text and frame. Overrides the inner-border style property" msgstr "" "Bordo entre o texto e o marco. Sobreponse á propiedade de estilo do bordo " "interno" -#: ../gtk/gtkentry.c:703 ../gtk/gtkentry.c:1269 +#: ../gtk/gtkentry.c:794 ../gtk/gtkentry.c:1360 msgid "Invisible character" msgstr "Carácter invisíbel" -#: ../gtk/gtkentry.c:704 ../gtk/gtkentry.c:1270 +#: ../gtk/gtkentry.c:795 ../gtk/gtkentry.c:1361 msgid "The character to use when masking entry contents (in \"password mode\")" msgstr "" "O carácter que usar cando se oculten os contidos da entrada (no \"modo de " "contrasinal\")" -#: ../gtk/gtkentry.c:711 +#: ../gtk/gtkentry.c:802 msgid "Activates default" msgstr "Activa o predefinido" -#: ../gtk/gtkentry.c:712 +#: ../gtk/gtkentry.c:803 msgid "" "Whether to activate the default widget (such as the default button in a " "dialog) when Enter is pressed" @@ -2316,32 +2337,32 @@ msgstr "" "Indica se se debe activar o widget predefinido (como o botón predefinido " "nunha caixa de diálogo) cando se prema a tecla Intro" -#: ../gtk/gtkentry.c:718 +#: ../gtk/gtkentry.c:809 msgid "Width in chars" msgstr "Largura en caracteres" -#: ../gtk/gtkentry.c:719 +#: ../gtk/gtkentry.c:810 msgid "Number of characters to leave space for in the entry" msgstr "Número de caracteres para os que deixar espazo na entrada" -#: ../gtk/gtkentry.c:728 +#: ../gtk/gtkentry.c:819 msgid "Scroll offset" msgstr "Compensación do desprazamento" -#: ../gtk/gtkentry.c:729 +#: ../gtk/gtkentry.c:820 msgid "Number of pixels of the entry scrolled off the screen to the left" msgstr "" "Número de píxeles da entrada desprazados fóra da pantalla e cara á esquerda" -#: ../gtk/gtkentry.c:739 +#: ../gtk/gtkentry.c:830 msgid "The contents of the entry" msgstr "Os contidos da entrada" -#: ../gtk/gtkentry.c:754 ../gtk/gtkmisc.c:81 +#: ../gtk/gtkentry.c:845 ../gtk/gtkmisc.c:81 msgid "X align" msgstr "Aliñamento X" -#: ../gtk/gtkentry.c:755 ../gtk/gtkmisc.c:82 +#: ../gtk/gtkentry.c:846 ../gtk/gtkmisc.c:82 msgid "" "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL " "layouts." @@ -2349,66 +2370,66 @@ msgstr "" "O aliñamento horizontal, desde 0 (esquerda) até 1 (dereita). Ao revés para " "disposicións DAE." -#: ../gtk/gtkentry.c:771 +#: ../gtk/gtkentry.c:862 msgid "Truncate multiline" msgstr "Truncar multiliña" -#: ../gtk/gtkentry.c:772 +#: ../gtk/gtkentry.c:863 msgid "Whether to truncate multiline pastes to one line." msgstr "Indica se se truncan as accións de pegar multiliñas nunha liña." -#: ../gtk/gtkentry.c:788 +#: ../gtk/gtkentry.c:879 msgid "Which kind of shadow to draw around the entry when has-frame is set" msgstr "" "Que tipo de sombra debuxar ao redor da entrada cando has-frame está activado" -#: ../gtk/gtkentry.c:803 ../gtk/gtktextview.c:747 +#: ../gtk/gtkentry.c:894 ../gtk/gtktextview.c:766 msgid "Overwrite mode" msgstr "Modo de sobrescritura" -#: ../gtk/gtkentry.c:804 +#: ../gtk/gtkentry.c:895 msgid "Whether new text overwrites existing text" msgstr "Indica se o texto novo sobrescribe o texto existente" -#: ../gtk/gtkentry.c:818 ../gtk/gtkentrybuffer.c:367 +#: ../gtk/gtkentry.c:909 ../gtk/gtkentrybuffer.c:367 msgid "Text length" msgstr "Lonxitude de texto" -#: ../gtk/gtkentry.c:819 +#: ../gtk/gtkentry.c:910 msgid "Length of the text currently in the entry" msgstr "A lonxitude do texto que está actualmente na entrada" -#: ../gtk/gtkentry.c:834 +#: ../gtk/gtkentry.c:925 msgid "Invisible character set" msgstr "Conxunto de caracteres invisíbel" -#: ../gtk/gtkentry.c:835 +#: ../gtk/gtkentry.c:926 msgid "Whether the invisible character has been set" msgstr "Indica se o carácter invisíbel foi definido" -#: ../gtk/gtkentry.c:853 +#: ../gtk/gtkentry.c:944 msgid "Caps Lock warning" msgstr "Aviso de Bloq Maiús" -#: ../gtk/gtkentry.c:854 +#: ../gtk/gtkentry.c:945 msgid "Whether password entries will show a warning when Caps Lock is on" msgstr "" "Indica se as entradas de contrasinal mostrarán un aviso cando Bloq Maiús " "estea activado" -#: ../gtk/gtkentry.c:868 +#: ../gtk/gtkentry.c:959 msgid "Progress Fraction" msgstr "Fracción de progreso" -#: ../gtk/gtkentry.c:869 +#: ../gtk/gtkentry.c:960 msgid "The current fraction of the task that's been completed" msgstr "A fracción actual da tarefa que está terminada" -#: ../gtk/gtkentry.c:886 +#: ../gtk/gtkentry.c:977 msgid "Progress Pulse Step" msgstr "Paso de pulso de progreso" -#: ../gtk/gtkentry.c:887 +#: ../gtk/gtkentry.c:978 msgid "" "The fraction of total entry width to move the progress bouncing block for " "each call to gtk_entry_progress_pulse()" @@ -2416,169 +2437,169 @@ msgstr "" "A fracción total da largura da entrada para mover o bloque de rebote de " "progreso para cada chamada a gtk_entry_progress_pulse()" -#: ../gtk/gtkentry.c:903 +#: ../gtk/gtkentry.c:994 msgid "Primary pixbuf" msgstr "Pixbuf primario" -#: ../gtk/gtkentry.c:904 +#: ../gtk/gtkentry.c:995 msgid "Primary pixbuf for the entry" msgstr "O pixbuf primario para a entrada" -#: ../gtk/gtkentry.c:918 +#: ../gtk/gtkentry.c:1009 msgid "Secondary pixbuf" msgstr "Pixbuf secundario" -#: ../gtk/gtkentry.c:919 +#: ../gtk/gtkentry.c:1010 msgid "Secondary pixbuf for the entry" msgstr "O pixbuf secundario para a entrada" -#: ../gtk/gtkentry.c:933 +#: ../gtk/gtkentry.c:1024 msgid "Primary stock ID" msgstr "ID de inventario primario" -#: ../gtk/gtkentry.c:934 +#: ../gtk/gtkentry.c:1025 msgid "Stock ID for primary icon" msgstr "O ID de inventario para a icona primaria" -#: ../gtk/gtkentry.c:948 +#: ../gtk/gtkentry.c:1039 msgid "Secondary stock ID" msgstr "ID de inventario secundario" -#: ../gtk/gtkentry.c:949 +#: ../gtk/gtkentry.c:1040 msgid "Stock ID for secondary icon" msgstr "O ID de inventario para a icona secundaria" -#: ../gtk/gtkentry.c:963 +#: ../gtk/gtkentry.c:1054 msgid "Primary icon name" msgstr "Nome de icona primaria" -#: ../gtk/gtkentry.c:964 +#: ../gtk/gtkentry.c:1055 msgid "Icon name for primary icon" msgstr "O nome de icona para a icona primaria" -#: ../gtk/gtkentry.c:978 +#: ../gtk/gtkentry.c:1069 msgid "Secondary icon name" msgstr "Nome de icona secundaria" -#: ../gtk/gtkentry.c:979 +#: ../gtk/gtkentry.c:1070 msgid "Icon name for secondary icon" msgstr "O nome de icona para a icona secundaria" -#: ../gtk/gtkentry.c:993 +#: ../gtk/gtkentry.c:1084 msgid "Primary GIcon" msgstr "GIcon primaria" -#: ../gtk/gtkentry.c:994 +#: ../gtk/gtkentry.c:1085 msgid "GIcon for primary icon" msgstr "O nome para a GIcon primaria" -#: ../gtk/gtkentry.c:1008 +#: ../gtk/gtkentry.c:1099 msgid "Secondary GIcon" msgstr "GIcon secundaria" -#: ../gtk/gtkentry.c:1009 +#: ../gtk/gtkentry.c:1100 msgid "GIcon for secondary icon" msgstr "O nome para a GIcon secundaria" -#: ../gtk/gtkentry.c:1023 +#: ../gtk/gtkentry.c:1114 msgid "Primary storage type" msgstr "Tipo de almacenamento primario" -#: ../gtk/gtkentry.c:1024 +#: ../gtk/gtkentry.c:1115 msgid "The representation being used for primary icon" msgstr "A representación usada para a icona primaria" -#: ../gtk/gtkentry.c:1039 +#: ../gtk/gtkentry.c:1130 msgid "Secondary storage type" msgstr "Tipo de almacenamento secundario" -#: ../gtk/gtkentry.c:1040 +#: ../gtk/gtkentry.c:1131 msgid "The representation being used for secondary icon" msgstr "A representación usada para a icona secundaria" -#: ../gtk/gtkentry.c:1061 +#: ../gtk/gtkentry.c:1152 msgid "Primary icon activatable" msgstr "Icona primaria activábel" -#: ../gtk/gtkentry.c:1062 +#: ../gtk/gtkentry.c:1153 msgid "Whether the primary icon is activatable" msgstr "Indica se a icona primaria é activábel" -#: ../gtk/gtkentry.c:1082 +#: ../gtk/gtkentry.c:1173 msgid "Secondary icon activatable" msgstr "Icona secundaria activábel" -#: ../gtk/gtkentry.c:1083 +#: ../gtk/gtkentry.c:1174 msgid "Whether the secondary icon is activatable" msgstr "Indica se a icona secundaria é activábel" -#: ../gtk/gtkentry.c:1105 +#: ../gtk/gtkentry.c:1196 msgid "Primary icon sensitive" msgstr "Sensibilidade da icona primaria" -#: ../gtk/gtkentry.c:1106 +#: ../gtk/gtkentry.c:1197 msgid "Whether the primary icon is sensitive" msgstr "Indica se a icona primaria é sensíbel" -#: ../gtk/gtkentry.c:1127 +#: ../gtk/gtkentry.c:1218 msgid "Secondary icon sensitive" msgstr "Sensibilidade da icona secundaria" -#: ../gtk/gtkentry.c:1128 +#: ../gtk/gtkentry.c:1219 msgid "Whether the secondary icon is sensitive" msgstr "Indica se a icona secundaria é sensíbel" -#: ../gtk/gtkentry.c:1144 +#: ../gtk/gtkentry.c:1235 msgid "Primary icon tooltip text" msgstr "Texto da indicación da icona primaria" -#: ../gtk/gtkentry.c:1145 ../gtk/gtkentry.c:1181 +#: ../gtk/gtkentry.c:1236 ../gtk/gtkentry.c:1272 msgid "The contents of the tooltip on the primary icon" msgstr "O contido da indicación da icona primaria" -#: ../gtk/gtkentry.c:1161 +#: ../gtk/gtkentry.c:1252 msgid "Secondary icon tooltip text" msgstr "Texto da indicación da icona secundaria" -#: ../gtk/gtkentry.c:1162 ../gtk/gtkentry.c:1200 +#: ../gtk/gtkentry.c:1253 ../gtk/gtkentry.c:1291 msgid "The contents of the tooltip on the secondary icon" msgstr "O contido da indicación da icona secundaria" -#: ../gtk/gtkentry.c:1180 +#: ../gtk/gtkentry.c:1271 msgid "Primary icon tooltip markup" msgstr "Marcación da indicación da icona primaria" -#: ../gtk/gtkentry.c:1199 +#: ../gtk/gtkentry.c:1290 msgid "Secondary icon tooltip markup" msgstr "Marcación da indicación da icona secundaria" -#: ../gtk/gtkentry.c:1219 ../gtk/gtktextview.c:775 +#: ../gtk/gtkentry.c:1310 ../gtk/gtktextview.c:794 msgid "IM module" msgstr "Módulo MI" -#: ../gtk/gtkentry.c:1220 ../gtk/gtktextview.c:776 +#: ../gtk/gtkentry.c:1311 ../gtk/gtktextview.c:795 msgid "Which IM module should be used" msgstr "O módulo de MI que se debería usar" -#: ../gtk/gtkentry.c:1234 +#: ../gtk/gtkentry.c:1325 msgid "Icon Prelight" msgstr "Iluminación previa da icona" -#: ../gtk/gtkentry.c:1235 +#: ../gtk/gtkentry.c:1326 msgid "Whether activatable icons should prelight when hovered" msgstr "" "Indica se as iconas activábeis se deberían iluminar previamente ao pasar o " "rato por encima" -#: ../gtk/gtkentry.c:1248 +#: ../gtk/gtkentry.c:1339 msgid "Progress Border" msgstr "Bordo do progreso" -#: ../gtk/gtkentry.c:1249 +#: ../gtk/gtkentry.c:1340 msgid "Border around the progress bar" msgstr "O bordo ao redor da barra de progreso" -#: ../gtk/gtkentry.c:1741 +#: ../gtk/gtkentry.c:1832 msgid "Border between text and frame." msgstr "Bordo entre o texto e o marco." @@ -2606,7 +2627,7 @@ msgstr "Lonxitude mínima da chave" msgid "Minimum length of the search key in order to look up matches" msgstr "Lonxitude mínima da chave de busca para encontrar coincidencias" -#: ../gtk/gtkentrycompletion.c:304 ../gtk/gtkiconview.c:612 +#: ../gtk/gtkentrycompletion.c:304 ../gtk/gtkiconview.c:617 msgid "Text column" msgstr "Columna de texto" @@ -2690,11 +2711,11 @@ msgstr "Indica se o expansor foi aberto para deixar ver o widget fillo" msgid "Text of the expander's label" msgstr "Texto da etiqueta do expansor" -#: ../gtk/gtkexpander.c:225 ../gtk/gtklabel.c:563 +#: ../gtk/gtkexpander.c:225 ../gtk/gtklabel.c:580 msgid "Use markup" msgstr "Usar a marcación" -#: ../gtk/gtkexpander.c:226 ../gtk/gtklabel.c:564 +#: ../gtk/gtkexpander.c:226 ../gtk/gtklabel.c:581 msgid "The text of the label includes XML markup. See pango_parse_markup()" msgstr "O texto da etiqueta inclúe marcación XML. Vexa pango_parse_markup()" @@ -2703,7 +2724,7 @@ msgid "Space to put between the label and the child" msgstr "Espazo para pór entre a etiqueta e o fillo" #: ../gtk/gtkexpander.c:243 ../gtk/gtkframe.c:165 ../gtk/gtktoolbutton.c:216 -#: ../gtk/gtktoolitemgroup.c:1578 +#: ../gtk/gtktoolitemgroup.c:1595 msgid "Label widget" msgstr "Widget etiqueta" @@ -2720,13 +2741,13 @@ msgid "Whether the label widget should fill all available horizontal space" msgstr "" "Indica se o widget etiqueta deben encher todo o espazo horizontal dispoñíbel" -#: ../gtk/gtkexpander.c:258 ../gtk/gtktoolitemgroup.c:1606 -#: ../gtk/gtktreeview.c:770 +#: ../gtk/gtkexpander.c:258 ../gtk/gtktoolitemgroup.c:1623 +#: ../gtk/gtktreeview.c:863 msgid "Expander Size" msgstr "Tamaño do expansor" -#: ../gtk/gtkexpander.c:259 ../gtk/gtktoolitemgroup.c:1607 -#: ../gtk/gtktreeview.c:771 +#: ../gtk/gtkexpander.c:259 ../gtk/gtktoolitemgroup.c:1624 +#: ../gtk/gtktreeview.c:864 msgid "Size of the expander arrow" msgstr "Tamaño da frecha do expansor" @@ -2852,19 +2873,19 @@ msgstr "" "Indica se un selector de ficheiros sen estar en modo aberto lle ofrecerá ao " "usuario crear cartafoles novos." -#: ../gtk/gtkfixed.c:98 ../gtk/gtklayout.c:610 +#: ../gtk/gtkfixed.c:103 ../gtk/gtklayout.c:633 msgid "X position" msgstr "Posición X" -#: ../gtk/gtkfixed.c:99 ../gtk/gtklayout.c:611 +#: ../gtk/gtkfixed.c:104 ../gtk/gtklayout.c:634 msgid "X position of child widget" msgstr "Posición X do widget fillo" -#: ../gtk/gtkfixed.c:108 ../gtk/gtklayout.c:620 +#: ../gtk/gtkfixed.c:111 ../gtk/gtklayout.c:643 msgid "Y position" msgstr "Posición Y" -#: ../gtk/gtkfixed.c:109 ../gtk/gtklayout.c:621 +#: ../gtk/gtkfixed.c:112 ../gtk/gtklayout.c:644 msgid "Y position of child widget" msgstr "Posición Y do widget fillo" @@ -2961,23 +2982,23 @@ msgstr "Aparencia do bordo do marco" msgid "A widget to display in place of the usual frame label" msgstr "Un widget para mostrar en lugar da etiqueta de marco habitual" -#: ../gtk/gtkhandlebox.c:183 +#: ../gtk/gtkhandlebox.c:189 msgid "Appearance of the shadow that surrounds the container" msgstr "Aparencia da sombra que rodea o contedor" -#: ../gtk/gtkhandlebox.c:191 +#: ../gtk/gtkhandlebox.c:197 msgid "Handle position" msgstr "Posición do manipulador" -#: ../gtk/gtkhandlebox.c:192 +#: ../gtk/gtkhandlebox.c:198 msgid "Position of the handle relative to the child widget" msgstr "Posición do manipulador en relación ao widget fillo" -#: ../gtk/gtkhandlebox.c:200 +#: ../gtk/gtkhandlebox.c:206 msgid "Snap edge" msgstr "Axustar ao bordo" -#: ../gtk/gtkhandlebox.c:201 +#: ../gtk/gtkhandlebox.c:207 msgid "" "Side of the handlebox that's lined up with the docking point to dock the " "handlebox" @@ -2985,11 +3006,11 @@ msgstr "" "Lado da caixa manipuladora que está aliñado co punto de ancoraxe, para " "ancorar a caixa manipuladora" -#: ../gtk/gtkhandlebox.c:209 +#: ../gtk/gtkhandlebox.c:215 msgid "Snap edge set" msgstr "Definición do axuste de bordo" -#: ../gtk/gtkhandlebox.c:210 +#: ../gtk/gtkhandlebox.c:216 msgid "" "Whether to use the value from the snap_edge property or a value derived from " "handle_position" @@ -2997,11 +3018,11 @@ msgstr "" "Indica se se usa o valor da propiedade snap_edge ou un valor derivado de " "handle_position" -#: ../gtk/gtkhandlebox.c:217 +#: ../gtk/gtkhandlebox.c:223 msgid "Child Detached" msgstr "Fillo separado" -#: ../gtk/gtkhandlebox.c:218 +#: ../gtk/gtkhandlebox.c:224 msgid "" "A boolean value indicating whether the handlebox's child is attached or " "detached." @@ -3009,218 +3030,218 @@ msgstr "" "Un valor booleano que indica se a caixa de manipulación do fillo está " "separada ou anexada." -#: ../gtk/gtkiconview.c:575 +#: ../gtk/gtkiconview.c:580 msgid "Selection mode" msgstr "Modo de selección" -#: ../gtk/gtkiconview.c:576 +#: ../gtk/gtkiconview.c:581 msgid "The selection mode" msgstr "O modo de selección" -#: ../gtk/gtkiconview.c:594 +#: ../gtk/gtkiconview.c:599 msgid "Pixbuf column" msgstr "Columna de pixbuf" -#: ../gtk/gtkiconview.c:595 +#: ../gtk/gtkiconview.c:600 msgid "Model column used to retrieve the icon pixbuf from" msgstr "Columna modelo usada para recuperar o pixbuf da icona" -#: ../gtk/gtkiconview.c:613 +#: ../gtk/gtkiconview.c:618 msgid "Model column used to retrieve the text from" msgstr "Columna modelo usada para recuperar o texto" -#: ../gtk/gtkiconview.c:632 +#: ../gtk/gtkiconview.c:637 msgid "Markup column" msgstr "Columna de marcación" -#: ../gtk/gtkiconview.c:633 +#: ../gtk/gtkiconview.c:638 msgid "Model column used to retrieve the text if using Pango markup" msgstr "" "Columna modelo usada para recuperar o texto se se emprega a marcación Pango" -#: ../gtk/gtkiconview.c:640 +#: ../gtk/gtkiconview.c:645 msgid "Icon View Model" msgstr "Modelo de visualización de icona" -#: ../gtk/gtkiconview.c:641 +#: ../gtk/gtkiconview.c:646 msgid "The model for the icon view" msgstr "O modelo para a visualización de icona" -#: ../gtk/gtkiconview.c:657 +#: ../gtk/gtkiconview.c:662 msgid "Number of columns" msgstr "Número de columnas" -#: ../gtk/gtkiconview.c:658 +#: ../gtk/gtkiconview.c:663 msgid "Number of columns to display" msgstr "O número de columnas que se mostran" -#: ../gtk/gtkiconview.c:675 +#: ../gtk/gtkiconview.c:680 msgid "Width for each item" msgstr "Largura de cada elemento" -#: ../gtk/gtkiconview.c:676 +#: ../gtk/gtkiconview.c:681 msgid "The width used for each item" msgstr "A largura usada para cada elemento" -#: ../gtk/gtkiconview.c:692 +#: ../gtk/gtkiconview.c:697 msgid "Space which is inserted between cells of an item" msgstr "Espazo que se introduce entre as celas dun elemento" -#: ../gtk/gtkiconview.c:707 +#: ../gtk/gtkiconview.c:712 msgid "Row Spacing" msgstr "Espazamento de fila" -#: ../gtk/gtkiconview.c:708 +#: ../gtk/gtkiconview.c:713 msgid "Space which is inserted between grid rows" msgstr "Espazo que se introduce entre as filas da grade" -#: ../gtk/gtkiconview.c:723 +#: ../gtk/gtkiconview.c:728 msgid "Column Spacing" msgstr "Espazamento de columna" -#: ../gtk/gtkiconview.c:724 +#: ../gtk/gtkiconview.c:729 msgid "Space which is inserted between grid columns" msgstr "Espazo que se introduce entre as columnas da grade" -#: ../gtk/gtkiconview.c:739 +#: ../gtk/gtkiconview.c:744 msgid "Margin" msgstr "Marxe" -#: ../gtk/gtkiconview.c:740 +#: ../gtk/gtkiconview.c:745 msgid "Space which is inserted at the edges of the icon view" msgstr "Espazo que se insire nos bordos da visualización de icona" -#: ../gtk/gtkiconview.c:755 +#: ../gtk/gtkiconview.c:760 msgid "Item Orientation" msgstr "Orientación do elemento" -#: ../gtk/gtkiconview.c:756 +#: ../gtk/gtkiconview.c:761 msgid "" "How the text and icon of each item are positioned relative to each other" msgstr "" "Como se sitúan o texto e a icona de cada elemento en relación un ao outro" -#: ../gtk/gtkiconview.c:772 ../gtk/gtktreeview.c:605 +#: ../gtk/gtkiconview.c:777 ../gtk/gtktreeview.c:698 #: ../gtk/gtktreeviewcolumn.c:329 msgid "Reorderable" msgstr "Reordenábel" -#: ../gtk/gtkiconview.c:773 ../gtk/gtktreeview.c:606 +#: ../gtk/gtkiconview.c:778 ../gtk/gtktreeview.c:699 msgid "View is reorderable" msgstr "A visualización é reordenábel" -#: ../gtk/gtkiconview.c:780 ../gtk/gtktreeview.c:756 +#: ../gtk/gtkiconview.c:785 ../gtk/gtktreeview.c:849 msgid "Tooltip Column" msgstr "Columna de indicación" -#: ../gtk/gtkiconview.c:781 +#: ../gtk/gtkiconview.c:786 msgid "The column in the model containing the tooltip texts for the items" msgstr "" "A columna do modelo que contén os textos de indicación para os elementos" -#: ../gtk/gtkiconview.c:798 +#: ../gtk/gtkiconview.c:803 msgid "Item Padding" msgstr "Recheo de ítem" -#: ../gtk/gtkiconview.c:799 +#: ../gtk/gtkiconview.c:804 msgid "Padding around icon view items" msgstr "Recheo arredor dos ítems de iconas" -#: ../gtk/gtkiconview.c:812 +#: ../gtk/gtkiconview.c:817 msgid "Selection Box Color" msgstr "Cor da caixa de selección" -#: ../gtk/gtkiconview.c:813 +#: ../gtk/gtkiconview.c:818 msgid "Color of the selection box" msgstr "Cor da caixa de selección" -#: ../gtk/gtkiconview.c:819 +#: ../gtk/gtkiconview.c:824 msgid "Selection Box Alpha" msgstr "Alfa da caixa de selección" -#: ../gtk/gtkiconview.c:820 +#: ../gtk/gtkiconview.c:825 msgid "Opacity of the selection box" msgstr "Opacidade da caixa de selección" -#: ../gtk/gtkimage.c:227 ../gtk/gtkstatusicon.c:212 +#: ../gtk/gtkimage.c:233 ../gtk/gtkstatusicon.c:212 msgid "Pixbuf" msgstr "Pixbuf" -#: ../gtk/gtkimage.c:228 ../gtk/gtkstatusicon.c:213 +#: ../gtk/gtkimage.c:234 ../gtk/gtkstatusicon.c:213 msgid "A GdkPixbuf to display" msgstr "Un GdkPixbuf para mostrar" -#: ../gtk/gtkimage.c:235 ../gtk/gtkrecentmanager.c:294 +#: ../gtk/gtkimage.c:241 ../gtk/gtkrecentmanager.c:294 #: ../gtk/gtkstatusicon.c:220 msgid "Filename" msgstr "Nome do ficheiro" -#: ../gtk/gtkimage.c:236 ../gtk/gtkstatusicon.c:221 +#: ../gtk/gtkimage.c:242 ../gtk/gtkstatusicon.c:221 msgid "Filename to load and display" msgstr "Nome de ficheiro para cargar e mostrar" -#: ../gtk/gtkimage.c:245 ../gtk/gtkstatusicon.c:229 +#: ../gtk/gtkimage.c:251 ../gtk/gtkstatusicon.c:229 msgid "Stock ID for a stock image to display" msgstr "ID de inventario para unha imaxe de inventario para mostrar" -#: ../gtk/gtkimage.c:252 +#: ../gtk/gtkimage.c:258 msgid "Icon set" msgstr "Definición da icona" -#: ../gtk/gtkimage.c:253 +#: ../gtk/gtkimage.c:259 msgid "Icon set to display" msgstr "Definición da icona para mostrar" -#: ../gtk/gtkimage.c:260 ../gtk/gtkscalebutton.c:230 ../gtk/gtktoolbar.c:514 -#: ../gtk/gtktoolpalette.c:1003 +#: ../gtk/gtkimage.c:266 ../gtk/gtkscalebutton.c:230 ../gtk/gtktoolbar.c:520 +#: ../gtk/gtktoolpalette.c:1030 msgid "Icon size" msgstr "Tamaño da icona" -#: ../gtk/gtkimage.c:261 +#: ../gtk/gtkimage.c:267 msgid "Symbolic size to use for stock icon, icon set or named icon" msgstr "" "Tamaño simbólico que usar para a icona de inventario, conxunto de iconas ou " "icona con nome" -#: ../gtk/gtkimage.c:277 +#: ../gtk/gtkimage.c:283 msgid "Pixel size" msgstr "Tamaño do píxel" -#: ../gtk/gtkimage.c:278 +#: ../gtk/gtkimage.c:284 msgid "Pixel size to use for named icon" msgstr "Tamaño do píxel que usar para a icona con nome" -#: ../gtk/gtkimage.c:286 +#: ../gtk/gtkimage.c:292 msgid "Animation" msgstr "Animación" -#: ../gtk/gtkimage.c:287 +#: ../gtk/gtkimage.c:293 msgid "GdkPixbufAnimation to display" msgstr "GdkPixbufAnimation para mostrar" -#: ../gtk/gtkimage.c:327 ../gtk/gtkstatusicon.c:260 +#: ../gtk/gtkimage.c:333 ../gtk/gtkstatusicon.c:260 msgid "Storage type" msgstr "Tipo de almacenamento" -#: ../gtk/gtkimage.c:328 ../gtk/gtkstatusicon.c:261 +#: ../gtk/gtkimage.c:334 ../gtk/gtkstatusicon.c:261 msgid "The representation being used for image data" msgstr "A representación empregada para as informacións de imaxe" -#: ../gtk/gtkimagemenuitem.c:139 +#: ../gtk/gtkimagemenuitem.c:149 msgid "Child widget to appear next to the menu text" msgstr "Widget fillo que aparecerá ao lado do texto de menú" -#: ../gtk/gtkimagemenuitem.c:154 +#: ../gtk/gtkimagemenuitem.c:164 msgid "Whether to use the label text to create a stock menu item" msgstr "" "Indica se hai que usar a etiqueta de texto para crear un elemento de menú de " "inventario" -#: ../gtk/gtkimagemenuitem.c:187 ../gtk/gtkmenu.c:535 +#: ../gtk/gtkimagemenuitem.c:197 ../gtk/gtkmenu.c:535 msgid "Accel Group" msgstr "Grupo de teclas rápidas" -#: ../gtk/gtkimagemenuitem.c:188 +#: ../gtk/gtkimagemenuitem.c:198 msgid "The Accel Group to use for stock accelerator keys" msgstr "O grupo de teclas rápidas para usar nas teclas rápidas de inventario" @@ -3245,27 +3266,27 @@ msgid "Width of border around the action area" msgstr "Largura do bordo arredor da área de acción" #: ../gtk/gtkinvisible.c:90 ../gtk/gtkmountoperation.c:175 -#: ../gtk/gtkstatusicon.c:279 ../gtk/gtkwindow.c:741 +#: ../gtk/gtkstatusicon.c:279 ../gtk/gtkwindow.c:740 msgid "Screen" msgstr "Pantalla" -#: ../gtk/gtkinvisible.c:91 ../gtk/gtkwindow.c:742 +#: ../gtk/gtkinvisible.c:91 ../gtk/gtkwindow.c:741 msgid "The screen where this window will be displayed" msgstr "A pantalla onde se mostrará esta xanela" -#: ../gtk/gtklabel.c:550 +#: ../gtk/gtklabel.c:567 msgid "The text of the label" msgstr "O texto da etiqueta" -#: ../gtk/gtklabel.c:557 +#: ../gtk/gtklabel.c:574 msgid "A list of style attributes to apply to the text of the label" msgstr "Unha lista de atributos de estilos para aplicar ao texto da etiqueta" -#: ../gtk/gtklabel.c:578 ../gtk/gtktexttag.c:335 ../gtk/gtktextview.c:684 +#: ../gtk/gtklabel.c:595 ../gtk/gtktexttag.c:335 ../gtk/gtktextview.c:703 msgid "Justification" msgstr "Xustificación" -#: ../gtk/gtklabel.c:579 +#: ../gtk/gtklabel.c:596 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 " @@ -3275,11 +3296,11 @@ msgstr "" "NON afecta ao aliñamento da etiqueta dentro da súa asignación Ver GtkMisc::" "xalign para iso" -#: ../gtk/gtklabel.c:587 +#: ../gtk/gtklabel.c:604 msgid "Pattern" msgstr "Patrón" -#: ../gtk/gtklabel.c:588 +#: ../gtk/gtklabel.c:605 msgid "" "A string with _ characters in positions correspond to characters in the text " "to underline" @@ -3287,47 +3308,47 @@ msgstr "" "Unha cadea con caracteres _ en posicións correspondentes a caracteres no " "texto para subliñar" -#: ../gtk/gtklabel.c:595 +#: ../gtk/gtklabel.c:612 msgid "Line wrap" msgstr "Axuste de liña" -#: ../gtk/gtklabel.c:596 +#: ../gtk/gtklabel.c:613 msgid "If set, wrap lines if the text becomes too wide" msgstr "Se se define, axusta a liña se o texto se volve demasiado largo" -#: ../gtk/gtklabel.c:611 +#: ../gtk/gtklabel.c:628 msgid "Line wrap mode" msgstr "Modo de axuste de liña" -#: ../gtk/gtklabel.c:612 +#: ../gtk/gtklabel.c:629 msgid "If wrap is set, controls how linewrapping is done" msgstr "Se se estabelece o axuste, controla como se fai o axuste de liña" -#: ../gtk/gtklabel.c:619 +#: ../gtk/gtklabel.c:636 msgid "Selectable" msgstr "Seleccionábel" -#: ../gtk/gtklabel.c:620 +#: ../gtk/gtklabel.c:637 msgid "Whether the label text can be selected with the mouse" msgstr "Indica se o texto da etiqueta pode ser seleccionado co rato" -#: ../gtk/gtklabel.c:626 +#: ../gtk/gtklabel.c:643 msgid "Mnemonic key" msgstr "Tecla mnemónica" -#: ../gtk/gtklabel.c:627 +#: ../gtk/gtklabel.c:644 msgid "The mnemonic accelerator key for this label" msgstr "A tecla rápida mnemónica para esta etiqueta" -#: ../gtk/gtklabel.c:635 +#: ../gtk/gtklabel.c:652 msgid "Mnemonic widget" msgstr "Widget mnemónico" -#: ../gtk/gtklabel.c:636 +#: ../gtk/gtklabel.c:653 msgid "The widget to be activated when the label's mnemonic key is pressed" msgstr "O widget que se activará cando se prema a tecla mnemónica da etiqueta" -#: ../gtk/gtklabel.c:682 +#: ../gtk/gtklabel.c:699 msgid "" "The preferred place to ellipsize the string, if the label does not have " "enough room to display the entire string" @@ -3335,47 +3356,47 @@ msgstr "" "O lugar preferido para a elipse da cadea, se a etiqueta non ten suficiente " "espazo para mostrar a cadea completa" -#: ../gtk/gtklabel.c:723 +#: ../gtk/gtklabel.c:740 msgid "Single Line Mode" msgstr "Modo de liña única" -#: ../gtk/gtklabel.c:724 +#: ../gtk/gtklabel.c:741 msgid "Whether the label is in single line mode" msgstr "Indica se a etiqueta está no modo de liña única" -#: ../gtk/gtklabel.c:741 +#: ../gtk/gtklabel.c:758 msgid "Angle" msgstr "Ángulo" -#: ../gtk/gtklabel.c:742 +#: ../gtk/gtklabel.c:759 msgid "Angle at which the label is rotated" msgstr "Ángulo sobre o que se rota a etiqueta" -#: ../gtk/gtklabel.c:764 +#: ../gtk/gtklabel.c:781 msgid "The desired maximum width of the label, in characters" msgstr "A largura máxima desexada da etiqueta, en caracteres" -#: ../gtk/gtklabel.c:782 +#: ../gtk/gtklabel.c:799 msgid "Track visited links" msgstr "Rexistrar as ligazóns visitadas" -#: ../gtk/gtklabel.c:783 +#: ../gtk/gtklabel.c:800 msgid "Whether visited links should be tracked" msgstr "Indica se as ligazóns visitadas deberían ser rexistradas" -#: ../gtk/gtklayout.c:636 ../gtk/gtktreeviewcolumn.c:229 +#: ../gtk/gtklayout.c:659 ../gtk/gtktreeviewcolumn.c:229 msgid "Width" msgstr "Largura" -#: ../gtk/gtklayout.c:637 +#: ../gtk/gtklayout.c:660 msgid "The width of the layout" msgstr "A largura da disposición" -#: ../gtk/gtklayout.c:645 +#: ../gtk/gtklayout.c:668 msgid "Height" msgstr "Altura" -#: ../gtk/gtklayout.c:646 +#: ../gtk/gtklayout.c:669 msgid "The height of the layout" msgstr "A altura da disposición" @@ -3395,31 +3416,31 @@ msgstr "Visitada" msgid "Whether this link has been visited." msgstr "Indica se esta ligazón foi visitada." -#: ../gtk/gtkmenubar.c:163 +#: ../gtk/gtkmenubar.c:170 msgid "Pack direction" msgstr "Dirección do empaquetado" -#: ../gtk/gtkmenubar.c:164 +#: ../gtk/gtkmenubar.c:171 msgid "The pack direction of the menubar" msgstr "A dirección do empaquetado da barra de menú" -#: ../gtk/gtkmenubar.c:180 +#: ../gtk/gtkmenubar.c:187 msgid "Child Pack direction" msgstr "Dirección do empaquetado fillo" -#: ../gtk/gtkmenubar.c:181 +#: ../gtk/gtkmenubar.c:188 msgid "The child pack direction of the menubar" msgstr "A dirección do empaquetado fillo da barra de menú" -#: ../gtk/gtkmenubar.c:190 +#: ../gtk/gtkmenubar.c:197 msgid "Style of bevel around the menubar" msgstr "Estilo do bisel ao redor da barra de menús" -#: ../gtk/gtkmenubar.c:197 ../gtk/gtktoolbar.c:564 +#: ../gtk/gtkmenubar.c:204 ../gtk/gtktoolbar.c:570 msgid "Internal padding" msgstr "Recheo interno" -#: ../gtk/gtkmenubar.c:198 +#: ../gtk/gtkmenubar.c:205 msgid "Amount of border space between the menubar shadow and the menu items" msgstr "" "Cantidade de espazo do bordo entre a sombra da barra de menús e os elementos " @@ -3546,7 +3567,7 @@ msgstr "Indica onde se deberían colocar as frechas de desprazamento" msgid "Left Attach" msgstr "Anexar á esquerda" -#: ../gtk/gtkmenu.c:693 ../gtk/gtktable.c:197 +#: ../gtk/gtkmenu.c:693 ../gtk/gtktable.c:202 msgid "The column number to attach the left side of the child to" msgstr "A cantidade de columnas para anexar ao lado esquerdo do fillo" @@ -3570,7 +3591,7 @@ msgstr "O número de filas para anexar encima do fillo" msgid "Bottom Attach" msgstr "Anexar abaixo" -#: ../gtk/gtkmenu.c:717 ../gtk/gtktable.c:218 +#: ../gtk/gtkmenu.c:717 ../gtk/gtktable.c:223 msgid "The row number to attach the bottom of the child to" msgstr "O número de filas para anexar debaixo do fillo" @@ -3621,11 +3642,11 @@ msgstr "Largura en caracteres" msgid "The minimum desired width of the menu item in characters" msgstr "A largura mínima desexada do elemento de menú en caracteres" -#: ../gtk/gtkmenushell.c:379 +#: ../gtk/gtkmenushell.c:381 msgid "Take Focus" msgstr "Obtén o foco" -#: ../gtk/gtkmenushell.c:380 +#: ../gtk/gtkmenushell.c:382 msgid "A boolean that determines whether the menu grabs the keyboard focus" msgstr "Un booleano que determina se o menú captura o foco do teclado" @@ -3747,53 +3768,53 @@ msgstr "Se estamos mostrando un diálogo" msgid "The screen where this window will be displayed." msgstr "A pantalla onde esta xanela se mostrará." -#: ../gtk/gtknotebook.c:682 +#: ../gtk/gtknotebook.c:691 msgid "Page" msgstr "Páxina" -#: ../gtk/gtknotebook.c:683 +#: ../gtk/gtknotebook.c:692 msgid "The index of the current page" msgstr "O índice da páxina actual" -#: ../gtk/gtknotebook.c:691 +#: ../gtk/gtknotebook.c:700 msgid "Tab Position" msgstr "Posición do separador" -#: ../gtk/gtknotebook.c:692 +#: ../gtk/gtknotebook.c:701 msgid "Which side of the notebook holds the tabs" msgstr "Que lado do caderno contén os separadores" -#: ../gtk/gtknotebook.c:699 +#: ../gtk/gtknotebook.c:708 msgid "Show Tabs" msgstr "Mostrar separadores" -#: ../gtk/gtknotebook.c:700 +#: ../gtk/gtknotebook.c:709 msgid "Whether tabs should be shown" msgstr "Indica se os separadores deben mostrarse ou non" -#: ../gtk/gtknotebook.c:706 +#: ../gtk/gtknotebook.c:715 msgid "Show Border" msgstr "Mostrar bordo" -#: ../gtk/gtknotebook.c:707 +#: ../gtk/gtknotebook.c:716 msgid "Whether the border should be shown" msgstr "Indica se o bordo debe mostrarse ou non" -#: ../gtk/gtknotebook.c:713 +#: ../gtk/gtknotebook.c:722 msgid "Scrollable" msgstr "Desprazábel" -#: ../gtk/gtknotebook.c:714 +#: ../gtk/gtknotebook.c:723 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit" msgstr "" "Se é TRUE, engádense frechas de desprazamento se hai demasiados separadores " "para encaixar" -#: ../gtk/gtknotebook.c:720 +#: ../gtk/gtknotebook.c:729 msgid "Enable Popup" msgstr "Activar o menú emerxente" -#: ../gtk/gtknotebook.c:721 +#: ../gtk/gtknotebook.c:730 msgid "" "If TRUE, pressing the right mouse button on the notebook pops up a menu that " "you can use to go to a page" @@ -3801,126 +3822,126 @@ msgstr "" "Se é TRUE, premendo o botón dereito do rato no caderno emerxe un menú que " "pode usar para ir a unha páxina" -#: ../gtk/gtknotebook.c:735 +#: ../gtk/gtknotebook.c:744 msgid "Group Name" msgstr "Nome do grupo" -#: ../gtk/gtknotebook.c:736 +#: ../gtk/gtknotebook.c:745 msgid "Group name for tab drag and drop" msgstr "Nome do grupo para o arrastre e solte dos separadores" -#: ../gtk/gtknotebook.c:743 +#: ../gtk/gtknotebook.c:752 msgid "Tab label" msgstr "Etiqueta de separador" -#: ../gtk/gtknotebook.c:744 +#: ../gtk/gtknotebook.c:753 msgid "The string displayed on the child's tab label" msgstr "A cadea mostrada na etiqueta do separador fillo" -#: ../gtk/gtknotebook.c:750 +#: ../gtk/gtknotebook.c:759 msgid "Menu label" msgstr "Etiqueta de menú" -#: ../gtk/gtknotebook.c:751 +#: ../gtk/gtknotebook.c:760 msgid "The string displayed in the child's menu entry" msgstr "A cadea mostrada na entrada de menú filla" -#: ../gtk/gtknotebook.c:764 +#: ../gtk/gtknotebook.c:773 msgid "Tab expand" msgstr "Expansión do separador" -#: ../gtk/gtknotebook.c:765 +#: ../gtk/gtknotebook.c:774 msgid "Whether to expand the child's tab" msgstr "Indica se se expanden os separadores fillos ou non" -#: ../gtk/gtknotebook.c:771 +#: ../gtk/gtknotebook.c:780 msgid "Tab fill" msgstr "Recheo de separador" -#: ../gtk/gtknotebook.c:772 +#: ../gtk/gtknotebook.c:781 msgid "Whether the child's tab should fill the allocated area" msgstr "Indica se os separadores fillos deberían encher a área asignada ou non" -#: ../gtk/gtknotebook.c:785 +#: ../gtk/gtknotebook.c:794 msgid "Tab pack type" msgstr "Tipo de empaquetado de separador" -#: ../gtk/gtknotebook.c:792 +#: ../gtk/gtknotebook.c:801 msgid "Tab reorderable" msgstr "Separador reordenábel" -#: ../gtk/gtknotebook.c:793 +#: ../gtk/gtknotebook.c:802 msgid "Whether the tab is reorderable by user action" msgstr "" "Indica se o separador se pode ou non reordenar por unha acción do usuario" -#: ../gtk/gtknotebook.c:799 +#: ../gtk/gtknotebook.c:808 msgid "Tab detachable" msgstr "Separador desprazábel" -#: ../gtk/gtknotebook.c:800 +#: ../gtk/gtknotebook.c:809 msgid "Whether the tab is detachable" msgstr "Indica se o separador é desprazábel" -#: ../gtk/gtknotebook.c:815 ../gtk/gtkscrollbar.c:105 +#: ../gtk/gtknotebook.c:824 ../gtk/gtkscrollbar.c:105 msgid "Secondary backward stepper" msgstr "Paso de retroceso secundario" -#: ../gtk/gtknotebook.c:816 +#: ../gtk/gtknotebook.c:825 msgid "" "Display a second backward arrow button on the opposite end of the tab area" msgstr "" "Mostra un segundo botón de frecha de retroceso no extremo oposto da área de " "tabulación" -#: ../gtk/gtknotebook.c:831 ../gtk/gtkscrollbar.c:112 +#: ../gtk/gtknotebook.c:840 ../gtk/gtkscrollbar.c:112 msgid "Secondary forward stepper" msgstr "Paso de avance secundario" -#: ../gtk/gtknotebook.c:832 +#: ../gtk/gtknotebook.c:841 msgid "" "Display a second forward arrow button on the opposite end of the tab area" msgstr "" "Mostra un segundo botón de frecha de avance no extremo oposto da área de " "tabulación" -#: ../gtk/gtknotebook.c:846 ../gtk/gtkscrollbar.c:91 +#: ../gtk/gtknotebook.c:855 ../gtk/gtkscrollbar.c:91 msgid "Backward stepper" msgstr "Paso de retroceso" -#: ../gtk/gtknotebook.c:847 ../gtk/gtkscrollbar.c:92 +#: ../gtk/gtknotebook.c:856 ../gtk/gtkscrollbar.c:92 msgid "Display the standard backward arrow button" msgstr "Mostrar o botón estándar de frecha de retroceso" -#: ../gtk/gtknotebook.c:861 ../gtk/gtkscrollbar.c:98 +#: ../gtk/gtknotebook.c:870 ../gtk/gtkscrollbar.c:98 msgid "Forward stepper" msgstr "Paso de avance" -#: ../gtk/gtknotebook.c:862 ../gtk/gtkscrollbar.c:99 +#: ../gtk/gtknotebook.c:871 ../gtk/gtkscrollbar.c:99 msgid "Display the standard forward arrow button" msgstr "Mostrar o botón estándar de frecha de avance" -#: ../gtk/gtknotebook.c:876 +#: ../gtk/gtknotebook.c:885 msgid "Tab overlap" msgstr "Superposición de separador" -#: ../gtk/gtknotebook.c:877 +#: ../gtk/gtknotebook.c:886 msgid "Size of tab overlap area" msgstr "Tamaño da área de superposición do separador" -#: ../gtk/gtknotebook.c:892 +#: ../gtk/gtknotebook.c:901 msgid "Tab curvature" msgstr "Curvatura do separador" -#: ../gtk/gtknotebook.c:893 +#: ../gtk/gtknotebook.c:902 msgid "Size of tab curvature" msgstr "Tamaño da curvatura do separador" -#: ../gtk/gtknotebook.c:909 +#: ../gtk/gtknotebook.c:918 msgid "Arrow spacing" msgstr "Espazamento de frechas" -#: ../gtk/gtknotebook.c:910 +#: ../gtk/gtknotebook.c:919 msgid "Scroll arrow spacing" msgstr "Espazamento das frechas de desprazamento" @@ -3933,58 +3954,58 @@ msgstr "Orientación" msgid "The orientation of the orientable" msgstr "A orientación do orientábel" -#: ../gtk/gtkpaned.c:272 +#: ../gtk/gtkpaned.c:328 msgid "" "Position of paned separator in pixels (0 means all the way to the left/top)" msgstr "" "Posición do separador de sección en píxeles (0 significa todo o traxecto " "cara á esquerda ou arriba)" -#: ../gtk/gtkpaned.c:281 +#: ../gtk/gtkpaned.c:337 msgid "Position Set" msgstr "Definición de posición" -#: ../gtk/gtkpaned.c:282 +#: ../gtk/gtkpaned.c:338 msgid "TRUE if the Position property should be used" msgstr "É TRUE se a propiedade de posición debe ser usada" -#: ../gtk/gtkpaned.c:288 +#: ../gtk/gtkpaned.c:344 msgid "Handle Size" msgstr "Tamaño do manipulador" -#: ../gtk/gtkpaned.c:289 +#: ../gtk/gtkpaned.c:345 msgid "Width of handle" msgstr "Largura do manipulador" -#: ../gtk/gtkpaned.c:305 +#: ../gtk/gtkpaned.c:361 msgid "Minimal Position" msgstr "Posición mínima" -#: ../gtk/gtkpaned.c:306 +#: ../gtk/gtkpaned.c:362 msgid "Smallest possible value for the \"position\" property" msgstr "O valor máis pequeno posíbel para a propiedade \"posición\"" -#: ../gtk/gtkpaned.c:323 +#: ../gtk/gtkpaned.c:379 msgid "Maximal Position" msgstr "Posición máxima" -#: ../gtk/gtkpaned.c:324 +#: ../gtk/gtkpaned.c:380 msgid "Largest possible value for the \"position\" property" msgstr "O valor máis grande posíbel para a propiedade \"posición\"" -#: ../gtk/gtkpaned.c:341 +#: ../gtk/gtkpaned.c:397 msgid "Resize" msgstr "Redimensionar" -#: ../gtk/gtkpaned.c:342 +#: ../gtk/gtkpaned.c:398 msgid "If TRUE, the child expands and shrinks along with the paned widget" msgstr "Se é TRUE, o fillo expándese e redúcese xunto coa sección do widget" -#: ../gtk/gtkpaned.c:357 +#: ../gtk/gtkpaned.c:413 msgid "Shrink" msgstr "Reducir" -#: ../gtk/gtkpaned.c:358 +#: ../gtk/gtkpaned.c:414 msgid "If TRUE, the child can be made smaller than its requisition" msgstr "Se é TRUE, o fillo pode facerse máis pequeno que a súa solicitude" @@ -4311,36 +4332,36 @@ msgstr "" "TRUE se as caixas de combinación da configuración de páxina están " "incorporadas no GtkPrintUnixDialog" -#: ../gtk/gtkprogressbar.c:129 +#: ../gtk/gtkprogressbar.c:161 msgid "Fraction" msgstr "Fracción" -#: ../gtk/gtkprogressbar.c:130 +#: ../gtk/gtkprogressbar.c:162 msgid "The fraction of total work that has been completed" msgstr "A fracción do traballo total que se completou" -#: ../gtk/gtkprogressbar.c:137 +#: ../gtk/gtkprogressbar.c:169 msgid "Pulse Step" msgstr "Paso de pulso" -#: ../gtk/gtkprogressbar.c:138 +#: ../gtk/gtkprogressbar.c:170 msgid "The fraction of total progress to move the bouncing block when pulsed" msgstr "" "A fracción do progreso total para mover o bloque rebotador cando se preme" -#: ../gtk/gtkprogressbar.c:146 +#: ../gtk/gtkprogressbar.c:178 msgid "Text to be displayed in the progress bar" msgstr "Texto que se mostrará na barra de progreso" -#: ../gtk/gtkprogressbar.c:153 +#: ../gtk/gtkprogressbar.c:185 msgid "Show text" msgstr "Mostrar texto" -#: ../gtk/gtkprogressbar.c:154 +#: ../gtk/gtkprogressbar.c:186 msgid "Whether the progress is shown as text." msgstr "Indica se o progreso se mostra como texto." -#: ../gtk/gtkprogressbar.c:176 +#: ../gtk/gtkprogressbar.c:208 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." @@ -4348,51 +4369,51 @@ msgstr "" "O lugar preferido para a elipse da cadea, se a barra de progreso non ten " "espazo suficiente para mostrar a cadea completa." -#: ../gtk/gtkprogressbar.c:183 +#: ../gtk/gtkprogressbar.c:215 msgid "X spacing" msgstr "Espazamento X" -#: ../gtk/gtkprogressbar.c:184 +#: ../gtk/gtkprogressbar.c:216 msgid "Extra spacing applied to the width of a progress bar." msgstr "Espazo extra aplicado á largura dunha barra de progreso." -#: ../gtk/gtkprogressbar.c:189 +#: ../gtk/gtkprogressbar.c:221 msgid "Y spacing" msgstr "Espazamento Y" -#: ../gtk/gtkprogressbar.c:190 +#: ../gtk/gtkprogressbar.c:222 msgid "Extra spacing applied to the height of a progress bar." msgstr "Un espazamento extra aplicado á altura dunha barra de progreso." -#: ../gtk/gtkprogressbar.c:203 +#: ../gtk/gtkprogressbar.c:235 msgid "Minimum horizontal bar width" msgstr "Largura horizontal mínima da barra" -#: ../gtk/gtkprogressbar.c:204 +#: ../gtk/gtkprogressbar.c:236 msgid "The minimum horizontal width of the progress bar" msgstr "A largura horizontal mínima da barra de progreso" -#: ../gtk/gtkprogressbar.c:216 +#: ../gtk/gtkprogressbar.c:248 msgid "Minimum horizontal bar height" msgstr "Altura horizontal mínima da barra" -#: ../gtk/gtkprogressbar.c:217 +#: ../gtk/gtkprogressbar.c:249 msgid "Minimum horizontal height of the progress bar" msgstr "A altura horizontal mínima da barra de progreso" -#: ../gtk/gtkprogressbar.c:229 +#: ../gtk/gtkprogressbar.c:261 msgid "Minimum vertical bar width" msgstr "Largura vertical mínima da barra" -#: ../gtk/gtkprogressbar.c:230 +#: ../gtk/gtkprogressbar.c:262 msgid "The minimum vertical width of the progress bar" msgstr "A largura vertical mínima da barra de progreso" -#: ../gtk/gtkprogressbar.c:242 +#: ../gtk/gtkprogressbar.c:274 msgid "Minimum vertical bar height" msgstr "Altura vertical mínima da barra" -#: ../gtk/gtkprogressbar.c:243 +#: ../gtk/gtkprogressbar.c:275 msgid "The minimum vertical height of the progress bar" msgstr "A altura vertical mínima da barra de progreso" @@ -4408,7 +4429,7 @@ msgstr "" "O valor devolto por gtk_radio_action_get_current_value() cando esta acción é " "a acción actual do seu grupo." -#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:160 +#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:163 #: ../gtk/gtkradiomenuitem.c:373 ../gtk/gtkradiotoolbutton.c:65 msgid "Group" msgstr "Grupo" @@ -4429,7 +4450,7 @@ msgstr "" "A propiedade do valor do membro actualmente activo do grupo ao que esta " "acción pertence." -#: ../gtk/gtkradiobutton.c:161 +#: ../gtk/gtkradiobutton.c:164 msgid "The radio button whose group this widget belongs to." msgstr "O botón de opción a cuxo grupo pertence este widget." @@ -4441,29 +4462,29 @@ msgstr "O elemento do menú de opción a cuxo grupo pertence este widget." msgid "The radio tool button whose group this button belongs to." msgstr "O botón de ferramenta de opción a cuxo grupo pertence este botón." -#: ../gtk/gtkrange.c:416 +#: ../gtk/gtkrange.c:423 msgid "Update policy" msgstr "Política de actualización" -#: ../gtk/gtkrange.c:417 +#: ../gtk/gtkrange.c:424 msgid "How the range should be updated on the screen" msgstr "Como se debe actualizar o intervalo na pantalla" -#: ../gtk/gtkrange.c:426 +#: ../gtk/gtkrange.c:433 msgid "The GtkAdjustment that contains the current value of this range object" msgstr "O GtkAdjustment que contén o valor actual deste intervalo de obxectos" -#: ../gtk/gtkrange.c:434 +#: ../gtk/gtkrange.c:441 msgid "Invert direction slider moves to increase range value" msgstr "" "Inverter a dirección en que se move o control desprazábel para incrementar o " "valor do intervalo" -#: ../gtk/gtkrange.c:441 +#: ../gtk/gtkrange.c:448 msgid "Lower stepper sensitivity" msgstr "Sensibilidade de paso inferior" -#: ../gtk/gtkrange.c:442 +#: ../gtk/gtkrange.c:449 msgid "" "The sensitivity policy for the stepper that points to the adjustment's lower " "side" @@ -4471,11 +4492,11 @@ msgstr "" "A política de sensibilidade para o paso que apunta ao lado máis baixo do " "axuste" -#: ../gtk/gtkrange.c:450 +#: ../gtk/gtkrange.c:457 msgid "Upper stepper sensitivity" msgstr "Sensibilidade do paso superior" -#: ../gtk/gtkrange.c:451 +#: ../gtk/gtkrange.c:458 msgid "" "The sensitivity policy for the stepper that points to the adjustment's upper " "side" @@ -4483,89 +4504,89 @@ msgstr "" "A política de sensibilidade para o paso que apunta ao lado máis alto do " "axuste" -#: ../gtk/gtkrange.c:468 +#: ../gtk/gtkrange.c:475 msgid "Show Fill Level" msgstr "Mostrar nivel de recheo" -#: ../gtk/gtkrange.c:469 +#: ../gtk/gtkrange.c:476 msgid "Whether to display a fill level indicator graphics on trough." msgstr "" "Indica se se debe mostrar o indicador gráfico de nivel de recheo mentres se " "enche." -#: ../gtk/gtkrange.c:485 +#: ../gtk/gtkrange.c:492 msgid "Restrict to Fill Level" msgstr "Restrinxir ao nivel de recheo" -#: ../gtk/gtkrange.c:486 +#: ../gtk/gtkrange.c:493 msgid "Whether to restrict the upper boundary to the fill level." msgstr "Indica se se debe restrinxir o bordo superior ao nivel de recheo." -#: ../gtk/gtkrange.c:501 +#: ../gtk/gtkrange.c:508 msgid "Fill Level" msgstr "Nivel de recheo" -#: ../gtk/gtkrange.c:502 +#: ../gtk/gtkrange.c:509 msgid "The fill level." msgstr "O nivel de recheo." -#: ../gtk/gtkrange.c:510 +#: ../gtk/gtkrange.c:517 ../gtk/gtkswitch.c:772 msgid "Slider Width" msgstr "Largura do control desprazábel" -#: ../gtk/gtkrange.c:511 +#: ../gtk/gtkrange.c:518 msgid "Width of scrollbar or scale thumb" msgstr "Largura da barra de desprazamento ou do indicador de escala" -#: ../gtk/gtkrange.c:518 +#: ../gtk/gtkrange.c:525 msgid "Trough Border" msgstr "Bordo do canal" -#: ../gtk/gtkrange.c:519 +#: ../gtk/gtkrange.c:526 msgid "Spacing between thumb/steppers and outer trough bevel" msgstr "" "Espazamento entre o indicador de escala ou os pasos e o bisel do canal " "exterior" -#: ../gtk/gtkrange.c:526 +#: ../gtk/gtkrange.c:533 msgid "Stepper Size" msgstr "Tamaño do paso" -#: ../gtk/gtkrange.c:527 +#: ../gtk/gtkrange.c:534 msgid "Length of step buttons at ends" msgstr "Lonxitude dos botóns de paso nos extremos" -#: ../gtk/gtkrange.c:542 +#: ../gtk/gtkrange.c:549 msgid "Stepper Spacing" msgstr "Espazamento do paso" -#: ../gtk/gtkrange.c:543 +#: ../gtk/gtkrange.c:550 msgid "Spacing between step buttons and thumb" msgstr "Espazamento entre os botóns de paso e o indicador de escala" -#: ../gtk/gtkrange.c:550 +#: ../gtk/gtkrange.c:557 msgid "Arrow X Displacement" msgstr "Desprazamento X da frecha" -#: ../gtk/gtkrange.c:551 +#: ../gtk/gtkrange.c:558 msgid "" "How far in the x direction to move the arrow when the button is depressed" msgstr "Até onde se move a frecha na dirección X cando se solta o botón" -#: ../gtk/gtkrange.c:558 +#: ../gtk/gtkrange.c:565 msgid "Arrow Y Displacement" msgstr "Desprazamento Y da frecha" -#: ../gtk/gtkrange.c:559 +#: ../gtk/gtkrange.c:566 msgid "" "How far in the y direction to move the arrow when the button is depressed" msgstr "Até onde se move a frecha na dirección Y cando se solta o botón" -#: ../gtk/gtkrange.c:577 +#: ../gtk/gtkrange.c:584 msgid "Trough Under Steppers" msgstr "Canal baixo os pasos" -#: ../gtk/gtkrange.c:578 +#: ../gtk/gtkrange.c:585 msgid "" "Whether to draw trough for full length of range or exclude the steppers and " "spacing" @@ -4573,11 +4594,11 @@ msgstr "" "Indica se se debuxa para toda a lonxitude do intervalo ou se exclúe os pasos " "e o espazamento" -#: ../gtk/gtkrange.c:591 +#: ../gtk/gtkrange.c:598 msgid "Arrow scaling" msgstr "Escalado de frecha" -#: ../gtk/gtkrange.c:592 +#: ../gtk/gtkrange.c:599 msgid "Arrow scaling with regard to scroll button size" msgstr "O escalado da frecha con atención ao tamaño do botón de desprazamento" @@ -4674,43 +4695,6 @@ msgstr "" msgid "The size of the recently used resources list" msgstr "O tamaño da lista de recursos usados recentemente" -# verificar: High= alta e low= baixa -#: ../gtk/gtkruler.c:138 -msgid "Lower" -msgstr "Inferior" - -#: ../gtk/gtkruler.c:139 -msgid "Lower limit of ruler" -msgstr "Límite inferior da regra" - -#: ../gtk/gtkruler.c:148 -msgid "Upper" -msgstr "Superior" - -#: ../gtk/gtkruler.c:149 -msgid "Upper limit of ruler" -msgstr "Límite superior da regra" - -#: ../gtk/gtkruler.c:159 -msgid "Position of mark on the ruler" -msgstr "Posición da marca na regra" - -#: ../gtk/gtkruler.c:168 -msgid "Max Size" -msgstr "Tamaño máximo" - -#: ../gtk/gtkruler.c:169 -msgid "Maximum size of the ruler" -msgstr "Tamaño máximo da regra" - -#: ../gtk/gtkruler.c:184 -msgid "Metric" -msgstr "Métrica" - -#: ../gtk/gtkruler.c:185 -msgid "The metric used for the ruler" -msgstr "A métrica que se usa na regra" - #: ../gtk/gtkscalebutton.c:221 msgid "The value of the scale" msgstr "O valor da escala" @@ -4733,41 +4717,41 @@ msgstr "Iconas" msgid "List of icon names" msgstr "Lista dos nomes de iconas" -#: ../gtk/gtkscale.c:245 +#: ../gtk/gtkscale.c:255 msgid "The number of decimal places that are displayed in the value" msgstr "O número de lugares decimais que se mostran no valor" -#: ../gtk/gtkscale.c:254 +#: ../gtk/gtkscale.c:264 msgid "Draw Value" msgstr "Valor de debuxo" -#: ../gtk/gtkscale.c:255 +#: ../gtk/gtkscale.c:265 msgid "Whether the current value is displayed as a string next to the slider" msgstr "" "Indica se o valor actual se mostra como unha cadea contigua ao control " "desprazábel" -#: ../gtk/gtkscale.c:262 +#: ../gtk/gtkscale.c:272 msgid "Value Position" msgstr "Posición do valor" -#: ../gtk/gtkscale.c:263 +#: ../gtk/gtkscale.c:273 msgid "The position in which the current value is displayed" msgstr "A posición na que se mostra o valor actual" -#: ../gtk/gtkscale.c:270 +#: ../gtk/gtkscale.c:280 msgid "Slider Length" msgstr "Lonxitude do control desprazábel" -#: ../gtk/gtkscale.c:271 +#: ../gtk/gtkscale.c:281 msgid "Length of scale's slider" msgstr "Lonxitude da escala do control desprazábel" -#: ../gtk/gtkscale.c:279 +#: ../gtk/gtkscale.c:289 msgid "Value spacing" msgstr "Espazamento do valor" -#: ../gtk/gtkscale.c:280 +#: ../gtk/gtkscale.c:290 msgid "Space between value text and the slider/trough area" msgstr "" "Espazo entre os valores de texto e a área do control desprazábel ou o canal" @@ -4903,19 +4887,19 @@ msgid "" "The minimum height that the scrolled window will allocate to its content" msgstr "A altura mínima que a xanela desprazada reservará para o seu contido" -#: ../gtk/gtkseparatortoolitem.c:138 +#: ../gtk/gtkseparatortoolitem.c:143 msgid "Draw" msgstr "Debuxar" -#: ../gtk/gtkseparatortoolitem.c:139 +#: ../gtk/gtkseparatortoolitem.c:144 msgid "Whether the separator is drawn, or just blank" msgstr "Indica se se debuxa o separador ou se se deixa en branco" -#: ../gtk/gtksettings.c:241 +#: ../gtk/gtksettings.c:285 msgid "Double Click Time" msgstr "Tempo do dobre clic" -#: ../gtk/gtksettings.c:242 +#: ../gtk/gtksettings.c:286 msgid "" "Maximum time allowed between two clicks for them to be considered a double " "click (in milliseconds)" @@ -4923,11 +4907,11 @@ msgstr "" "Tempo máximo permitido entre dous clics para ser considerados como un clic " "dobre (en milisegundos)" -#: ../gtk/gtksettings.c:249 +#: ../gtk/gtksettings.c:293 msgid "Double Click Distance" msgstr "Distancia do dobre clic" -#: ../gtk/gtksettings.c:250 +#: ../gtk/gtksettings.c:294 msgid "" "Maximum distance allowed between two clicks for them to be considered a " "double click (in pixels)" @@ -4935,36 +4919,36 @@ msgstr "" "Distancia máxima permitida entre dous clics para ser considerados como un " "dobre clic (en píxeles)" -#: ../gtk/gtksettings.c:266 +#: ../gtk/gtksettings.c:310 msgid "Cursor Blink" msgstr "Intermitencia do cursor" -#: ../gtk/gtksettings.c:267 +#: ../gtk/gtksettings.c:311 msgid "Whether the cursor should blink" msgstr "Indica se o cursor debe pestanexar" -#: ../gtk/gtksettings.c:274 +#: ../gtk/gtksettings.c:318 msgid "Cursor Blink Time" msgstr "Tempo de intermitencia do cursor" -#: ../gtk/gtksettings.c:275 +#: ../gtk/gtksettings.c:319 msgid "Length of the cursor blink cycle, in milliseconds" msgstr "Duración do ciclo de intermitencia do cursor, en milisegundos" -#: ../gtk/gtksettings.c:294 +#: ../gtk/gtksettings.c:338 msgid "Cursor Blink Timeout" msgstr "Tempo de intermitencia do cursor" -#: ../gtk/gtksettings.c:295 +#: ../gtk/gtksettings.c:339 msgid "Time after which the cursor stops blinking, in seconds" msgstr "" "Duración a partir de que se detén a intermitencia do cursor, en segundos" -#: ../gtk/gtksettings.c:302 +#: ../gtk/gtksettings.c:346 msgid "Split Cursor" msgstr "Cursor dividido" -#: ../gtk/gtksettings.c:303 +#: ../gtk/gtksettings.c:347 msgid "" "Whether two cursors should be displayed for mixed left-to-right and right-to-" "left text" @@ -4972,157 +4956,157 @@ msgstr "" "Indica se se deben mostrar dous cursores para o texto mesturado de esquerda " "a dereita e de dereita a esquerda" -#: ../gtk/gtksettings.c:310 +#: ../gtk/gtksettings.c:354 msgid "Theme Name" msgstr "Nome do tema" -#: ../gtk/gtksettings.c:311 +#: ../gtk/gtksettings.c:355 msgid "Name of theme RC file to load" msgstr "Nome do ficheiro de tema RC para cargar" -#: ../gtk/gtksettings.c:319 +#: ../gtk/gtksettings.c:363 msgid "Icon Theme Name" msgstr "Nome do tema de iconas" -#: ../gtk/gtksettings.c:320 +#: ../gtk/gtksettings.c:364 msgid "Name of icon theme to use" msgstr "Nome do tema de iconas para usar" -#: ../gtk/gtksettings.c:328 +#: ../gtk/gtksettings.c:372 msgid "Fallback Icon Theme Name" msgstr "Nome do tema de iconas do modo de emerxencia" -#: ../gtk/gtksettings.c:329 +#: ../gtk/gtksettings.c:373 msgid "Name of a icon theme to fall back to" msgstr "Nome do tema de iconas que usar cando o escollido falle" -#: ../gtk/gtksettings.c:337 +#: ../gtk/gtksettings.c:381 msgid "Key Theme Name" msgstr "Nome do tema principal" -#: ../gtk/gtksettings.c:338 +#: ../gtk/gtksettings.c:382 msgid "Name of key theme RC file to load" msgstr "Nome do ficheiro de tema RC principal para cargar" -#: ../gtk/gtksettings.c:346 +#: ../gtk/gtksettings.c:390 msgid "Menu bar accelerator" msgstr "Tecla rápida da barra de menús" -#: ../gtk/gtksettings.c:347 +#: ../gtk/gtksettings.c:391 msgid "Keybinding to activate the menu bar" msgstr "Combinación de teclas para activar a barra de menús" -#: ../gtk/gtksettings.c:355 +#: ../gtk/gtksettings.c:399 msgid "Drag threshold" msgstr "Límite de arrastre" -#: ../gtk/gtksettings.c:356 +#: ../gtk/gtksettings.c:400 msgid "Number of pixels the cursor can move before dragging" msgstr "Número de píxeles que o cursor pode mover antes de iniciar o arrastre" -#: ../gtk/gtksettings.c:364 +#: ../gtk/gtksettings.c:408 msgid "Font Name" msgstr "Nome do tipo de letra" -#: ../gtk/gtksettings.c:365 +#: ../gtk/gtksettings.c:409 msgid "Name of default font to use" msgstr "Nome do tipo de letra predefinido que usar" -#: ../gtk/gtksettings.c:387 +#: ../gtk/gtksettings.c:431 msgid "Icon Sizes" msgstr "Tamaño das iconas" -#: ../gtk/gtksettings.c:388 +#: ../gtk/gtksettings.c:432 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..." msgstr "Lista dos tamaños das iconas (gtk-menu=16,16:gtk-button=20,20..." -#: ../gtk/gtksettings.c:396 +#: ../gtk/gtksettings.c:440 msgid "GTK Modules" msgstr "Módulos GTK" -#: ../gtk/gtksettings.c:397 +#: ../gtk/gtksettings.c:441 msgid "List of currently active GTK modules" msgstr "Lista dos módulos GTK actualmente activos" -#: ../gtk/gtksettings.c:406 +#: ../gtk/gtksettings.c:450 msgid "Xft Antialias" msgstr "Suavizado Xft" -#: ../gtk/gtksettings.c:407 +#: ../gtk/gtksettings.c:451 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default" msgstr "" "Indica se se suavizan os bordos dos tipo de letra Xft, 0=non, 1=si, " "-1=predefinido" -#: ../gtk/gtksettings.c:416 +#: ../gtk/gtksettings.c:460 msgid "Xft Hinting" msgstr "Contorno Xft" -#: ../gtk/gtksettings.c:417 +#: ../gtk/gtksettings.c:461 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default" msgstr "" "Indica se se usa o contorno dos tipo de letra Xft; 0=non, 1=si, " "-1=predefinido" -#: ../gtk/gtksettings.c:426 +#: ../gtk/gtksettings.c:470 msgid "Xft Hint Style" msgstr "Estilo de contorno Xft" -#: ../gtk/gtksettings.c:427 +#: ../gtk/gtksettings.c:471 msgid "" "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull" msgstr "" "Que grao de contorno hai que usar: ningunha, lixeira, media ou completa" -#: ../gtk/gtksettings.c:436 +#: ../gtk/gtksettings.c:480 msgid "Xft RGBA" msgstr "Xft RGBA" -#: ../gtk/gtksettings.c:437 +#: ../gtk/gtksettings.c:481 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr" msgstr "Tipo de suavizado de subpíxel: ningún, rgb, vrgb, vbgr" -#: ../gtk/gtksettings.c:446 +#: ../gtk/gtksettings.c:490 msgid "Xft DPI" msgstr "PPP Xft" -#: ../gtk/gtksettings.c:447 +#: ../gtk/gtksettings.c:491 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value" msgstr "" "Resolución para Xft, en 1024 * puntos por polgada. -1 para usar o valor " "predefinido" -#: ../gtk/gtksettings.c:456 +#: ../gtk/gtksettings.c:500 msgid "Cursor theme name" msgstr "Nome do tema de cursor" -#: ../gtk/gtksettings.c:457 +#: ../gtk/gtksettings.c:501 msgid "Name of the cursor theme to use, or NULL to use the default theme" msgstr "Nome do tema de cursor que usar ou NULL para usar o tema predefinido" -#: ../gtk/gtksettings.c:465 +#: ../gtk/gtksettings.c:509 msgid "Cursor theme size" msgstr "Tamaño do tema de cursor" -#: ../gtk/gtksettings.c:466 +#: ../gtk/gtksettings.c:510 msgid "Size to use for cursors, or 0 to use the default size" msgstr "" "Tamaño que se vai usar para os cursores ou 0 para usar o tamaño predefinido" -#: ../gtk/gtksettings.c:476 +#: ../gtk/gtksettings.c:520 msgid "Alternative button order" msgstr "Orde alternativa dos botóns" -#: ../gtk/gtksettings.c:477 +#: ../gtk/gtksettings.c:521 msgid "Whether buttons in dialogs should use the alternative button order" msgstr "" "Indica se os botóns nos diálogos deben usar a orde alternativa de botóns" -#: ../gtk/gtksettings.c:494 +#: ../gtk/gtksettings.c:538 msgid "Alternative sort indicator direction" msgstr "Dirección alternativa do indicador de orde" -#: ../gtk/gtksettings.c:495 +#: ../gtk/gtksettings.c:539 msgid "" "Whether the direction of the sort indicators in list and tree views is " "inverted compared to the default (where down means ascending)" @@ -5131,11 +5115,11 @@ msgstr "" "en árbore está invertida en comparación coa predefinida (onde abaixo " "significa ascendente)" -#: ../gtk/gtksettings.c:503 +#: ../gtk/gtksettings.c:547 msgid "Show the 'Input Methods' menu" msgstr "Mostrar o menú Métodos de entrada" -#: ../gtk/gtksettings.c:504 +#: ../gtk/gtksettings.c:548 msgid "" "Whether the context menus of entries and text views should offer to change " "the input method" @@ -5143,11 +5127,11 @@ msgstr "" "Indica se os menús de contexto das entradas e as visualizacións de texto " "deben ofrecer modificar o método de entrada" -#: ../gtk/gtksettings.c:512 +#: ../gtk/gtksettings.c:556 msgid "Show the 'Insert Unicode Control Character' menu" msgstr "Mostrar o menú Inserir carácter de control Unicode" -#: ../gtk/gtksettings.c:513 +#: ../gtk/gtksettings.c:557 msgid "" "Whether the context menus of entries and text views should offer to insert " "control characters" @@ -5155,253 +5139,253 @@ msgstr "" "Indica se os menús de contexto das entradas e as visualizacións de texto " "deben ofrecer inserir caracteres de control" -#: ../gtk/gtksettings.c:521 +#: ../gtk/gtksettings.c:565 msgid "Start timeout" msgstr "Comezar o tempo de espera" -#: ../gtk/gtksettings.c:522 +#: ../gtk/gtksettings.c:566 msgid "Starting value for timeouts, when button is pressed" msgstr "Valor de inicio para o tempo de espera, cando se prema o botón" -#: ../gtk/gtksettings.c:531 +#: ../gtk/gtksettings.c:575 msgid "Repeat timeout" msgstr "Repetir o tempo de espera" -#: ../gtk/gtksettings.c:532 +#: ../gtk/gtksettings.c:576 msgid "Repeat value for timeouts, when button is pressed" msgstr "Valor de repetición para o tempo de espera, cando o botón se prema" -#: ../gtk/gtksettings.c:541 +#: ../gtk/gtksettings.c:585 msgid "Expand timeout" msgstr "Ampliar o tempo de espera" -#: ../gtk/gtksettings.c:542 +#: ../gtk/gtksettings.c:586 msgid "Expand value for timeouts, when a widget is expanding a new region" msgstr "" "Valor de ampliación para os tempos de espera, cando un widget está " "expandindo unha nova rexión" -#: ../gtk/gtksettings.c:577 +#: ../gtk/gtksettings.c:621 msgid "Color scheme" msgstr "Esquema de cor" -#: ../gtk/gtksettings.c:578 +#: ../gtk/gtksettings.c:622 msgid "A palette of named colors for use in themes" msgstr "Unha paleta de cores con nome para usar nos temas" -#: ../gtk/gtksettings.c:587 +#: ../gtk/gtksettings.c:631 msgid "Enable Animations" msgstr "Activar animacións" -#: ../gtk/gtksettings.c:588 +#: ../gtk/gtksettings.c:632 msgid "Whether to enable toolkit-wide animations." msgstr "Indica se se activan as animacións para todo o toolkit." -#: ../gtk/gtksettings.c:606 +#: ../gtk/gtksettings.c:650 msgid "Enable Touchscreen Mode" msgstr "Activar o modo de pantalla táctil" -#: ../gtk/gtksettings.c:607 +#: ../gtk/gtksettings.c:651 msgid "When TRUE, there are no motion notify events delivered on this screen" msgstr "" "Cando é TRUE, non se envían eventos de notificación de movemento a esta " "pantalla" -#: ../gtk/gtksettings.c:624 +#: ../gtk/gtksettings.c:668 msgid "Tooltip timeout" msgstr "Tempo de espera da indicación" -#: ../gtk/gtksettings.c:625 +#: ../gtk/gtksettings.c:669 msgid "Timeout before tooltip is shown" msgstr "Tempo de espera antes de que se mostre a indicación" -#: ../gtk/gtksettings.c:650 +#: ../gtk/gtksettings.c:694 msgid "Tooltip browse timeout" msgstr "Tempo de espera da indicación de navegación" -#: ../gtk/gtksettings.c:651 +#: ../gtk/gtksettings.c:695 msgid "Timeout before tooltip is shown when browse mode is enabled" msgstr "" "Tempo de espera antes de que se mostre a indicación cando o modo de " "navegación está activo" -#: ../gtk/gtksettings.c:672 +#: ../gtk/gtksettings.c:716 msgid "Tooltip browse mode timeout" msgstr "Tempo de espera da indicación en modo de navegación" -#: ../gtk/gtksettings.c:673 +#: ../gtk/gtksettings.c:717 msgid "Timeout after which browse mode is disabled" msgstr "Tempo de espera despois do que se desactiva o modo de navegación" -#: ../gtk/gtksettings.c:692 +#: ../gtk/gtksettings.c:736 msgid "Keynav Cursor Only" msgstr "Só cursor para navegar con teclas" -#: ../gtk/gtksettings.c:693 +#: ../gtk/gtksettings.c:737 msgid "When TRUE, there are only cursor keys available to navigate widgets" msgstr "" "Cando sexa TRUE, só hai teclas de cursor dispoñíbeis para navegar polos " "widgets" -#: ../gtk/gtksettings.c:710 +#: ../gtk/gtksettings.c:754 msgid "Keynav Wrap Around" msgstr "Dar a volta coa navegación con teclas" -#: ../gtk/gtksettings.c:711 +#: ../gtk/gtksettings.c:755 msgid "Whether to wrap around when keyboard-navigating widgets" msgstr "Indica se se dá a volta cando se navegue cos widgets co teclado" -#: ../gtk/gtksettings.c:731 +#: ../gtk/gtksettings.c:775 msgid "Error Bell" msgstr "Campá de erro" -#: ../gtk/gtksettings.c:732 +#: ../gtk/gtksettings.c:776 msgid "When TRUE, keyboard navigation and other errors will cause a beep" msgstr "" "Cando sexa TRUE, a navegación co teclado e outros erros emitirán un ton de " "aviso" -#: ../gtk/gtksettings.c:749 +#: ../gtk/gtksettings.c:793 msgid "Color Hash" msgstr "Hash da cor" -#: ../gtk/gtksettings.c:750 +#: ../gtk/gtksettings.c:794 msgid "A hash table representation of the color scheme." msgstr "Unha representación en táboa hash do esquema de cor." -#: ../gtk/gtksettings.c:758 +#: ../gtk/gtksettings.c:802 msgid "Default file chooser backend" msgstr "Backend predefinido do selector de ficheiros" -#: ../gtk/gtksettings.c:759 +#: ../gtk/gtksettings.c:803 msgid "Name of the GtkFileChooser backend to use by default" msgstr "Nome do backend do GtkFileChooser para usar por defecto" -#: ../gtk/gtksettings.c:776 +#: ../gtk/gtksettings.c:820 msgid "Default print backend" msgstr "Backend de impresión predefinido" -#: ../gtk/gtksettings.c:777 +#: ../gtk/gtksettings.c:821 msgid "List of the GtkPrintBackend backends to use by default" msgstr "Lista dos backends do GtkPrintBackend para usar por defecto" -#: ../gtk/gtksettings.c:800 +#: ../gtk/gtksettings.c:844 msgid "Default command to run when displaying a print preview" msgstr "" "Orde predefinida para executar ao mostrar unha visualización previa de " "impresión" -#: ../gtk/gtksettings.c:801 +#: ../gtk/gtksettings.c:845 msgid "Command to run when displaying a print preview" msgstr "Orde para executar ao mostrar unha visualización previa de impresión" -#: ../gtk/gtksettings.c:817 +#: ../gtk/gtksettings.c:861 msgid "Enable Mnemonics" msgstr "Activar mnemónicos" -#: ../gtk/gtksettings.c:818 +#: ../gtk/gtksettings.c:862 msgid "Whether labels should have mnemonics" msgstr "Indica se as etiquetas deben ser mnemónicas" -#: ../gtk/gtksettings.c:834 +#: ../gtk/gtksettings.c:878 msgid "Enable Accelerators" msgstr "Activar teclas rápidas" -#: ../gtk/gtksettings.c:835 +#: ../gtk/gtksettings.c:879 msgid "Whether menu items should have accelerators" msgstr "Indica se os elementos de menús deben ter teclas rápidas" -#: ../gtk/gtksettings.c:852 +#: ../gtk/gtksettings.c:896 msgid "Recent Files Limit" msgstr "Límite de ficheiros recentes" -#: ../gtk/gtksettings.c:853 +#: ../gtk/gtksettings.c:897 msgid "Number of recently used files" msgstr "Número de ficheiros usados recentemente" -#: ../gtk/gtksettings.c:871 +#: ../gtk/gtksettings.c:915 msgid "Default IM module" msgstr "Módulo de MI predefinido" -#: ../gtk/gtksettings.c:872 +#: ../gtk/gtksettings.c:916 msgid "Which IM module should be used by default" msgstr "O módulo de MI que se debería usar por defecto" -#: ../gtk/gtksettings.c:890 +#: ../gtk/gtksettings.c:934 msgid "Recent Files Max Age" msgstr "Antigüidade máxima dos ficheiros recentes" -#: ../gtk/gtksettings.c:891 +#: ../gtk/gtksettings.c:935 msgid "Maximum age of recently used files, in days" msgstr "A antigüidade máxima dos ficheiros usados recentemente, en días" -#: ../gtk/gtksettings.c:900 +#: ../gtk/gtksettings.c:944 msgid "Fontconfig configuration timestamp" msgstr "Marca temporal de configuración do Fontconfig" -#: ../gtk/gtksettings.c:901 +#: ../gtk/gtksettings.c:945 msgid "Timestamp of current fontconfig configuration" msgstr "A marca temporal da configuración actual do Fontconfig" -#: ../gtk/gtksettings.c:923 +#: ../gtk/gtksettings.c:967 msgid "Sound Theme Name" msgstr "Nome do tema de son" -#: ../gtk/gtksettings.c:924 +#: ../gtk/gtksettings.c:968 msgid "XDG sound theme name" msgstr "Nome do tema de son XDG" #. Translators: this means sounds that are played as feedback to user input -#: ../gtk/gtksettings.c:946 +#: ../gtk/gtksettings.c:990 msgid "Audible Input Feedback" msgstr "Retroacción audíbel á entrada" -#: ../gtk/gtksettings.c:947 +#: ../gtk/gtksettings.c:991 msgid "Whether to play event sounds as feedback to user input" msgstr "" "Indica se hai que reproducir eventos de son como retroacción á entrada do " "usuario" -#: ../gtk/gtksettings.c:968 +#: ../gtk/gtksettings.c:1012 msgid "Enable Event Sounds" msgstr "Activar os eventos de son" -#: ../gtk/gtksettings.c:969 +#: ../gtk/gtksettings.c:1013 msgid "Whether to play any event sounds at all" msgstr "Indica se hai que activar todos os eventos de son" -#: ../gtk/gtksettings.c:984 +#: ../gtk/gtksettings.c:1028 msgid "Enable Tooltips" msgstr "Activar indicacións" -#: ../gtk/gtksettings.c:985 +#: ../gtk/gtksettings.c:1029 msgid "Whether tooltips should be shown on widgets" msgstr "Indica se se deberían mostrar as indicacións nos widgets" -#: ../gtk/gtksettings.c:998 +#: ../gtk/gtksettings.c:1042 msgid "Toolbar style" msgstr "Estilo da barra de ferramentas" -#: ../gtk/gtksettings.c:999 +#: ../gtk/gtksettings.c:1043 msgid "" "Whether default toolbars have text only, text and icons, icons only, etc." msgstr "" "Indica se as barras de ferramentas predefinidas teñen só texto, texto e " "iconas, só iconas etc." -#: ../gtk/gtksettings.c:1013 +#: ../gtk/gtksettings.c:1057 msgid "Toolbar Icon Size" msgstr "Tamaño da icona da barra de ferramentas" -#: ../gtk/gtksettings.c:1014 +#: ../gtk/gtksettings.c:1058 msgid "The size of icons in default toolbars." msgstr "Tamaño das iconas das barras de ferramentas predefinidas." -#: ../gtk/gtksettings.c:1031 +#: ../gtk/gtksettings.c:1075 msgid "Auto Mnemonics" msgstr "Mnemónicos automáticos" -#: ../gtk/gtksettings.c:1032 +#: ../gtk/gtksettings.c:1076 msgid "" "Whether mnemonics should be automatically shown and hidden when the user " "presses the mnemonic activator." @@ -5409,62 +5393,62 @@ msgstr "" "Indica se os mnemónicos deberían mostrarse e agocharse automáticamente cando " "o usuario prema un activador de mnemónico." -#: ../gtk/gtksettings.c:1057 +#: ../gtk/gtksettings.c:1101 msgid "Application prefers a dark theme" msgstr "O aplicativo prefire un tema escuro" -#: ../gtk/gtksettings.c:1058 +#: ../gtk/gtksettings.c:1102 msgid "Whether the application prefers to have a dark theme." msgstr "Indica se o aplicativo prefire un tema escuro." -#: ../gtk/gtksettings.c:1073 +#: ../gtk/gtksettings.c:1117 msgid "Show button images" msgstr "Mostrar imaxes no botón" -#: ../gtk/gtksettings.c:1074 +#: ../gtk/gtksettings.c:1118 msgid "Whether images should be shown on buttons" msgstr "Indica se se deberían mostrar as imaxes nos botóns" -#: ../gtk/gtksettings.c:1082 ../gtk/gtksettings.c:1176 +#: ../gtk/gtksettings.c:1126 ../gtk/gtksettings.c:1220 msgid "Select on focus" msgstr "Seleccionar ao enfocar" -#: ../gtk/gtksettings.c:1083 +#: ../gtk/gtksettings.c:1127 msgid "Whether to select the contents of an entry when it is focused" msgstr "" "Indica se se deben seleccionar os contidos dunha entrada cando está enfocada" -#: ../gtk/gtksettings.c:1100 +#: ../gtk/gtksettings.c:1144 msgid "Password Hint Timeout" msgstr "Tempo de espera para a suxestión de contrasinal" -#: ../gtk/gtksettings.c:1101 +#: ../gtk/gtksettings.c:1145 msgid "How long to show the last input character in hidden entries" msgstr "" "Durante canto tempo hai que mostrar o último carácter introducido nas " "entradas ocultas" -#: ../gtk/gtksettings.c:1110 +#: ../gtk/gtksettings.c:1154 msgid "Show menu images" msgstr "Mostrar as imaxes de menú" -#: ../gtk/gtksettings.c:1111 +#: ../gtk/gtksettings.c:1155 msgid "Whether images should be shown in menus" msgstr "Indica se se deben mostrar ou non as imaxes nos menús" -#: ../gtk/gtksettings.c:1119 +#: ../gtk/gtksettings.c:1163 msgid "Delay before drop down menus appear" msgstr "Atraso antes de que os menús despregábeis aparezan" -#: ../gtk/gtksettings.c:1120 +#: ../gtk/gtksettings.c:1164 msgid "Delay before the submenus of a menu bar appear" msgstr "Atraso antes de que os submenús dunha barra de menú aparezan" -#: ../gtk/gtksettings.c:1137 +#: ../gtk/gtksettings.c:1181 msgid "Scrolled Window Placement" msgstr "Colocación da xanela con desprazamento" -#: ../gtk/gtksettings.c:1138 +#: ../gtk/gtksettings.c:1182 msgid "" "Where the contents of scrolled windows are located with respect to the " "scrollbars, if not overridden by the scrolled window's own placement." @@ -5473,33 +5457,33 @@ msgstr "" "barras de desprazamento, se non toma precedencia a colocación da propia " "xanela con desprazamento." -#: ../gtk/gtksettings.c:1147 +#: ../gtk/gtksettings.c:1191 msgid "Can change accelerators" msgstr "Pode cambiar as teclas rápidas" -#: ../gtk/gtksettings.c:1148 +#: ../gtk/gtksettings.c:1192 msgid "" "Whether menu accelerators can be changed by pressing a key over the menu item" msgstr "" "Indica se as teclas rápidas do menú poden ser cambiadas premendo unha tecla " "sobre o elemento de menú" -#: ../gtk/gtksettings.c:1156 +#: ../gtk/gtksettings.c:1200 msgid "Delay before submenus appear" msgstr "Atraso antes de que os submenús aparezan" -#: ../gtk/gtksettings.c:1157 +#: ../gtk/gtksettings.c:1201 msgid "" "Minimum time the pointer must stay over a menu item before the submenu appear" msgstr "" "Tempo mínimo no que o punteiro debe permanecer sobre un elemento de menú " "antes de que o submenú apareza" -#: ../gtk/gtksettings.c:1166 +#: ../gtk/gtksettings.c:1210 msgid "Delay before hiding a submenu" msgstr "Atraso antes de ocultar un submenú" -#: ../gtk/gtksettings.c:1167 +#: ../gtk/gtksettings.c:1211 msgid "" "The time before hiding a submenu when the pointer is moving towards the " "submenu" @@ -5507,33 +5491,33 @@ msgstr "" "Tempo antes de ocultar un submenú cando o punteiro se estea a mover cara ao " "submenú" -#: ../gtk/gtksettings.c:1177 +#: ../gtk/gtksettings.c:1221 msgid "Whether to select the contents of a selectable label when it is focused" msgstr "" "Indica se se seleccionan os contidos dunha etiqueta seleccionábel cando está " "enfocada" -#: ../gtk/gtksettings.c:1185 +#: ../gtk/gtksettings.c:1229 msgid "Custom palette" msgstr "Paleta personalizada" -#: ../gtk/gtksettings.c:1186 +#: ../gtk/gtksettings.c:1230 msgid "Palette to use in the color selector" msgstr "A paleta que se usará no selector de cores" -#: ../gtk/gtksettings.c:1194 +#: ../gtk/gtksettings.c:1238 msgid "IM Preedit style" msgstr "Estilo preedit IM" -#: ../gtk/gtksettings.c:1195 +#: ../gtk/gtksettings.c:1239 msgid "How to draw the input method preedit string" msgstr "Como debuxar a cadea do método de entrada de preedit" -#: ../gtk/gtksettings.c:1204 +#: ../gtk/gtksettings.c:1248 msgid "IM Status style" msgstr "Estilo do estado IM" -#: ../gtk/gtksettings.c:1205 +#: ../gtk/gtksettings.c:1249 msgid "How to draw the input method statusbar" msgstr "Como debuxar o método de entrada da barra de estado" @@ -5560,15 +5544,15 @@ msgstr "" "Se é TRUE, os widgets non mapeados ignoraranse ao determinar o tamaño do " "grupo" -#: ../gtk/gtkspinbutton.c:236 +#: ../gtk/gtkspinbutton.c:238 msgid "Climb Rate" msgstr "Taxa de incremento" -#: ../gtk/gtkspinbutton.c:256 +#: ../gtk/gtkspinbutton.c:258 msgid "Snap to Ticks" msgstr "Axustar aos pasos" -#: ../gtk/gtkspinbutton.c:257 +#: ../gtk/gtkspinbutton.c:259 msgid "" "Whether erroneous values are automatically changed to a spin button's " "nearest step increment" @@ -5576,52 +5560,52 @@ msgstr "" "Indica se os valores errados se cambian automaticamente polo incremento de " "paso máis próximo dun botón de axuste" -#: ../gtk/gtkspinbutton.c:264 +#: ../gtk/gtkspinbutton.c:266 msgid "Numeric" msgstr "Numérico" -#: ../gtk/gtkspinbutton.c:265 +#: ../gtk/gtkspinbutton.c:267 msgid "Whether non-numeric characters should be ignored" msgstr "Indica se se deben ignorar os caracteres non numéricos" -#: ../gtk/gtkspinbutton.c:272 +#: ../gtk/gtkspinbutton.c:274 msgid "Wrap" msgstr "Axustar" -#: ../gtk/gtkspinbutton.c:273 +#: ../gtk/gtkspinbutton.c:275 msgid "Whether a spin button should wrap upon reaching its limits" msgstr "" "Indica se un botón de axuste debe axustarse cara a arriba até alcanzar os " "seus límites" -#: ../gtk/gtkspinbutton.c:280 +#: ../gtk/gtkspinbutton.c:282 msgid "Update Policy" msgstr "Política de actualización" -#: ../gtk/gtkspinbutton.c:281 +#: ../gtk/gtkspinbutton.c:283 msgid "" "Whether the spin button should update always, or only when the value is legal" msgstr "" "Indica se o botón de axuste debe actualizarse sempre ou só cando o valor é " "correcto" -#: ../gtk/gtkspinbutton.c:290 +#: ../gtk/gtkspinbutton.c:292 msgid "Reads the current value, or sets a new value" msgstr "Le o valor actual ou define un valor novo" -#: ../gtk/gtkspinbutton.c:299 +#: ../gtk/gtkspinbutton.c:301 msgid "Style of bevel around the spin button" msgstr "Estilo de bisel ao redor do botón de axuste" -#: ../gtk/gtkspinner.c:132 +#: ../gtk/gtkspinner.c:119 msgid "Whether the spinner is active" msgstr "Indica se o spinner é activábel" -#: ../gtk/gtkspinner.c:146 +#: ../gtk/gtkspinner.c:135 msgid "Number of steps" msgstr "Número de pasos" -#: ../gtk/gtkspinner.c:147 +#: ../gtk/gtkspinner.c:136 msgid "" "The number of steps for the spinner to complete a full loop. The animation " "will complete a full cycle in one second by default (see #GtkSpinner:cycle-" @@ -5631,16 +5615,16 @@ msgstr "" "un ciclo completo nun segundo de forma predefinida (vexa #GtkSpinner:cicyle-" "duration)." -#: ../gtk/gtkspinner.c:162 +#: ../gtk/gtkspinner.c:153 msgid "Animation duration" msgstr "Duración da animación" -#: ../gtk/gtkspinner.c:163 +#: ../gtk/gtkspinner.c:154 msgid "" "The length of time in milliseconds for the spinner to complete a full loop" msgstr "O tempo en milisegundos para que o spinner complete un bucle completo" -#: ../gtk/gtkstatusbar.c:179 +#: ../gtk/gtkstatusbar.c:181 msgid "Style of bevel around the statusbar text" msgstr "Estilo do bisel ao redor do texto da barra de estado" @@ -5664,7 +5648,7 @@ msgstr "Indica se a icona de estado está incrustada" msgid "The orientation of the tray" msgstr "A orientación da bandexa" -#: ../gtk/gtkstatusicon.c:347 ../gtk/gtkwidget.c:1084 +#: ../gtk/gtkstatusicon.c:347 ../gtk/gtkwidget.c:1036 msgid "Has tooltip" msgstr "Ten indicación" @@ -5672,15 +5656,15 @@ msgstr "Ten indicación" msgid "Whether this tray icon has a tooltip" msgstr "Indica se esta icona de bandexa ten unha indicación" -#: ../gtk/gtkstatusicon.c:373 ../gtk/gtkwidget.c:1105 +#: ../gtk/gtkstatusicon.c:373 ../gtk/gtkwidget.c:1057 msgid "Tooltip Text" msgstr "Texto da indicación" -#: ../gtk/gtkstatusicon.c:374 ../gtk/gtkwidget.c:1106 ../gtk/gtkwidget.c:1127 +#: ../gtk/gtkstatusicon.c:374 ../gtk/gtkwidget.c:1058 ../gtk/gtkwidget.c:1079 msgid "The contents of the tooltip for this widget" msgstr "Os contidos da indicación para este widget" -#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1126 +#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1078 msgid "Tooltip markup" msgstr "Marcado das indicacións" @@ -5692,87 +5676,103 @@ msgstr "O contido da indicación para esta icona de bandexa" msgid "The title of this tray icon" msgstr "O título desta icona na barra de tarefas" -#: ../gtk/gtktable.c:152 +#: ../gtk/gtkstyle.c:516 +msgid "Style context" +msgstr "Contexto do estilo" + +#: ../gtk/gtkstyle.c:517 +msgid "GtkStyleContext to get style from" +msgstr "GtkStyleContext de onde obter o estilo" + +#: ../gtk/gtkswitch.c:739 +msgid "Whether the switch is on or off" +msgstr "Indica se o interruptor está acendido ou apagado" + +#: ../gtk/gtkswitch.c:773 +msgid "The minimum width of the handle" +msgstr "O ancho mínimo do tirador" + +#: ../gtk/gtktable.c:157 msgid "Rows" msgstr "Filas" -#: ../gtk/gtktable.c:153 +#: ../gtk/gtktable.c:158 msgid "The number of rows in the table" msgstr "O número de filas na táboa" -#: ../gtk/gtktable.c:161 +#: ../gtk/gtktable.c:166 msgid "Columns" msgstr "Columnas" -#: ../gtk/gtktable.c:162 +#: ../gtk/gtktable.c:167 msgid "The number of columns in the table" msgstr "O número de columnas na táboa" -#: ../gtk/gtktable.c:170 +#: ../gtk/gtktable.c:175 msgid "Row spacing" msgstr "Espazamento de fila" -#: ../gtk/gtktable.c:171 +#: ../gtk/gtktable.c:176 msgid "The amount of space between two consecutive rows" msgstr "A cantidade de espazo entre dúas filas consecutivas" -#: ../gtk/gtktable.c:179 +#: ../gtk/gtktable.c:184 msgid "Column spacing" msgstr "Espazamento de columna" -#: ../gtk/gtktable.c:180 +#: ../gtk/gtktable.c:185 msgid "The amount of space between two consecutive columns" msgstr "A cantidade de espazo entre dúas columnas consecutivas" -#: ../gtk/gtktable.c:189 +#: ../gtk/gtktable.c:194 msgid "If TRUE, the table cells are all the same width/height" msgstr "Se é TRUE, as celas da táboa teñen todas a mesma largura ou altura" -#: ../gtk/gtktable.c:196 +#: ../gtk/gtktable.c:201 msgid "Left attachment" msgstr "Anexo á esquerda" -#: ../gtk/gtktable.c:203 +#: ../gtk/gtktable.c:208 msgid "Right attachment" msgstr "Anexo á dereita" -#: ../gtk/gtktable.c:204 +#: ../gtk/gtktable.c:209 msgid "The column number to attach the right side of a child widget to" msgstr "O número de columnas para anexar ao lado dereito dun widget fillo" -#: ../gtk/gtktable.c:210 +#: ../gtk/gtktable.c:215 msgid "Top attachment" msgstr "Anexo superior" -#: ../gtk/gtktable.c:211 +#: ../gtk/gtktable.c:216 msgid "The row number to attach the top of a child widget to" msgstr "O número de filas para anexar encima do widget fillo" -#: ../gtk/gtktable.c:217 +#: ../gtk/gtktable.c:222 msgid "Bottom attachment" msgstr "Anexo inferior" -#: ../gtk/gtktable.c:224 +#: ../gtk/gtktable.c:229 msgid "Horizontal options" msgstr "Opcións horizontais" -#: ../gtk/gtktable.c:225 +#: ../gtk/gtktable.c:230 msgid "Options specifying the horizontal behaviour of the child" msgstr "Opcións que especifican o comportamento horizontal do fillo" -#: ../gtk/gtktable.c:231 +#: ../gtk/gtktable.c:236 msgid "Vertical options" msgstr "Opcións verticais" -#: ../gtk/gtktable.c:232 +#: ../gtk/gtktable.c:237 msgid "Options specifying the vertical behaviour of the child" msgstr "Opcións que especifican o comportamento vertical do fillo" -#: ../gtk/gtktable.c:238 +#: ../gtk/gtktable.c:243 msgid "Horizontal padding" msgstr "Recheo horizontal" -#: ../gtk/gtktable.c:239 +#: ../gtk/gtktable.c:244 msgid "" "Extra space to put between the child and its left and right neighbors, in " "pixels" @@ -5780,11 +5780,11 @@ msgstr "" "Espazo adicional en píxeles para colocar entre o fillo e os seus veciños á " "esquerda e á dereita" -#: ../gtk/gtktable.c:245 +#: ../gtk/gtktable.c:250 msgid "Vertical padding" msgstr "Recheo vertical" -#: ../gtk/gtktable.c:246 +#: ../gtk/gtktable.c:251 msgid "" "Extra space to put between the child and its upper and lower neighbors, in " "pixels" @@ -5792,53 +5792,53 @@ msgstr "" "Espazo adicional en píxeles para colocar entre o fillo e os seus veciños " "superiores e inferiores" -#: ../gtk/gtktextbuffer.c:192 +#: ../gtk/gtktextbuffer.c:191 msgid "Tag Table" msgstr "Táboa de etiquetas" -#: ../gtk/gtktextbuffer.c:193 +#: ../gtk/gtktextbuffer.c:192 msgid "Text Tag Table" msgstr "Táboa de etiquetas de texto" -#: ../gtk/gtktextbuffer.c:211 +#: ../gtk/gtktextbuffer.c:210 msgid "Current text of the buffer" msgstr "Texto actual do búfer" -#: ../gtk/gtktextbuffer.c:225 +#: ../gtk/gtktextbuffer.c:224 msgid "Has selection" msgstr "Está selecccionado" -#: ../gtk/gtktextbuffer.c:226 +#: ../gtk/gtktextbuffer.c:225 msgid "Whether the buffer has some text currently selected" msgstr "Indica se o búfer ten actualmente algún texto seleccionado" -#: ../gtk/gtktextbuffer.c:242 +#: ../gtk/gtktextbuffer.c:241 msgid "Cursor position" msgstr "Posición do cursor" -#: ../gtk/gtktextbuffer.c:243 +#: ../gtk/gtktextbuffer.c:242 msgid "" "The position of the insert mark (as offset from the beginning of the buffer)" msgstr "" "A posición da marca de inserción (como desprazamento desde o principio do " "búfer)" -#: ../gtk/gtktextbuffer.c:258 +#: ../gtk/gtktextbuffer.c:257 msgid "Copy target list" msgstr "Lista de destinos da copia" -#: ../gtk/gtktextbuffer.c:259 +#: ../gtk/gtktextbuffer.c:258 msgid "" "The list of targets this buffer supports for clipboard copying and DND source" msgstr "" "A lista de destinos que admite este búfer para copiar desde o portapapeis e " "a orixe do DND" -#: ../gtk/gtktextbuffer.c:274 +#: ../gtk/gtktextbuffer.c:273 msgid "Paste target list" msgstr "Lista de destinos para pegar" -#: ../gtk/gtktextbuffer.c:275 +#: ../gtk/gtktextbuffer.c:274 msgid "" "The list of targets this buffer supports for clipboard pasting and DND " "destination" @@ -5937,7 +5937,7 @@ msgstr "" "etc., polo que é recomendábel. O Pango define previamente algunhas escalas " "tales como PANGO_SCALE_X_LARGE" -#: ../gtk/gtktexttag.c:336 ../gtk/gtktextview.c:685 +#: ../gtk/gtktexttag.c:336 ../gtk/gtktextview.c:704 msgid "Left, right, or center justification" msgstr "Xustificación á esquerda, á dereita ou ao centro" @@ -5954,7 +5954,7 @@ msgstr "" msgid "Left margin" msgstr "Marxe esquerda" -#: ../gtk/gtktexttag.c:363 ../gtk/gtktextview.c:694 +#: ../gtk/gtktexttag.c:363 ../gtk/gtktextview.c:713 msgid "Width of the left margin in pixels" msgstr "Largura da marxe esquerda en píxeles" @@ -5962,15 +5962,15 @@ msgstr "Largura da marxe esquerda en píxeles" msgid "Right margin" msgstr "Marxe dereita" -#: ../gtk/gtktexttag.c:373 ../gtk/gtktextview.c:704 +#: ../gtk/gtktexttag.c:373 ../gtk/gtktextview.c:723 msgid "Width of the right margin in pixels" msgstr "Largura da marxe dereita en píxeles" -#: ../gtk/gtktexttag.c:383 ../gtk/gtktextview.c:713 +#: ../gtk/gtktexttag.c:383 ../gtk/gtktextview.c:732 msgid "Indent" msgstr "Sangría" -#: ../gtk/gtktexttag.c:384 ../gtk/gtktextview.c:714 +#: ../gtk/gtktexttag.c:384 ../gtk/gtktextview.c:733 msgid "Amount to indent the paragraph, in pixels" msgstr "Cantidade en píxeles para a sangría de parágrafo" @@ -5986,7 +5986,7 @@ msgstr "" msgid "Pixels above lines" msgstr "Píxeles encima das liñas" -#: ../gtk/gtktexttag.c:405 ../gtk/gtktextview.c:638 +#: ../gtk/gtktexttag.c:405 ../gtk/gtktextview.c:657 msgid "Pixels of blank space above paragraphs" msgstr "Píxeles de espazo en branco encima do parágrafos" @@ -5994,7 +5994,7 @@ msgstr "Píxeles de espazo en branco encima do parágrafos" msgid "Pixels below lines" msgstr "Píxeles debaixo das liñas" -#: ../gtk/gtktexttag.c:415 ../gtk/gtktextview.c:648 +#: ../gtk/gtktexttag.c:415 ../gtk/gtktextview.c:667 msgid "Pixels of blank space below paragraphs" msgstr "Píxeles de espazo en branco debaixo dos parágrafos" @@ -6002,22 +6002,22 @@ msgstr "Píxeles de espazo en branco debaixo dos parágrafos" msgid "Pixels inside wrap" msgstr "Píxeles dentro do axuste" -#: ../gtk/gtktexttag.c:425 ../gtk/gtktextview.c:658 +#: ../gtk/gtktexttag.c:425 ../gtk/gtktextview.c:677 msgid "Pixels of blank space between wrapped lines in a paragraph" msgstr "Píxeles de espazo en branco entre as liñas axustadas nun parágrafo" -#: ../gtk/gtktexttag.c:452 ../gtk/gtktextview.c:676 +#: ../gtk/gtktexttag.c:452 ../gtk/gtktextview.c:695 msgid "" "Whether to wrap lines never, at word boundaries, or at character boundaries" msgstr "" "Indica se nunca se axustan as liñas aos límites de palabra ou aos límites de " "carácter" -#: ../gtk/gtktexttag.c:461 ../gtk/gtktextview.c:723 +#: ../gtk/gtktexttag.c:461 ../gtk/gtktextview.c:742 msgid "Tabs" msgstr "Separadores" -#: ../gtk/gtktexttag.c:462 ../gtk/gtktextview.c:724 +#: ../gtk/gtktexttag.c:462 ../gtk/gtktextview.c:743 msgid "Custom tabs for this text" msgstr "Separadores personalizados para este texto" @@ -6147,63 +6147,63 @@ msgstr "Definición do fondo de parágrafo" msgid "Whether this tag affects the paragraph background color" msgstr "Indica se esta etiqueta afecta á cor de fondo de parágrafo" -#: ../gtk/gtktextview.c:637 +#: ../gtk/gtktextview.c:656 msgid "Pixels Above Lines" msgstr "Píxeles encima das liñas" -#: ../gtk/gtktextview.c:647 +#: ../gtk/gtktextview.c:666 msgid "Pixels Below Lines" msgstr "Píxeles debaixo das liñas" -#: ../gtk/gtktextview.c:657 +#: ../gtk/gtktextview.c:676 msgid "Pixels Inside Wrap" msgstr "Píxeles dentro do axuste" -#: ../gtk/gtktextview.c:675 +#: ../gtk/gtktextview.c:694 msgid "Wrap Mode" msgstr "Modo de axuste" -#: ../gtk/gtktextview.c:693 +#: ../gtk/gtktextview.c:712 msgid "Left Margin" msgstr "Marxe esquerda" -#: ../gtk/gtktextview.c:703 +#: ../gtk/gtktextview.c:722 msgid "Right Margin" msgstr "Marxe dereita" -#: ../gtk/gtktextview.c:731 +#: ../gtk/gtktextview.c:750 msgid "Cursor Visible" msgstr "Cursor visíbel" -#: ../gtk/gtktextview.c:732 +#: ../gtk/gtktextview.c:751 msgid "If the insertion cursor is shown" msgstr "Se se mostra o cursor de inserción" -#: ../gtk/gtktextview.c:739 +#: ../gtk/gtktextview.c:758 msgid "Buffer" msgstr "Búfer" -#: ../gtk/gtktextview.c:740 +#: ../gtk/gtktextview.c:759 msgid "The buffer which is displayed" msgstr "O búfer que se mostra" -#: ../gtk/gtktextview.c:748 +#: ../gtk/gtktextview.c:767 msgid "Whether entered text overwrites existing contents" msgstr "Indica se o texto introducido sobrescribe os contidos existentes" -#: ../gtk/gtktextview.c:755 +#: ../gtk/gtktextview.c:774 msgid "Accepts tab" msgstr "Acepta tabulación" -#: ../gtk/gtktextview.c:756 +#: ../gtk/gtktextview.c:775 msgid "Whether Tab will result in a tab character being entered" msgstr "Indica se o tabulador resultará nun carácter de tabulación introducido" -#: ../gtk/gtktextview.c:791 +#: ../gtk/gtktextview.c:810 msgid "Error underline color" msgstr "Cor de subliñado de erros" -#: ../gtk/gtktextview.c:792 +#: ../gtk/gtktextview.c:811 msgid "Color with which to draw error-indication underlines" msgstr "Cor coa que debuxar o subliñado de indicación de erros" @@ -6221,101 +6221,101 @@ msgstr "" msgid "Whether the toggle action should be active" msgstr "Se a acción de conmutación debe estar activa ou non" -#: ../gtk/gtktogglebutton.c:123 ../gtk/gtktoggletoolbutton.c:113 +#: ../gtk/gtktogglebutton.c:126 ../gtk/gtktoggletoolbutton.c:113 msgid "If the toggle button should be pressed in" msgstr "Se o botón de estado debe estar premido ou non" -#: ../gtk/gtktogglebutton.c:131 +#: ../gtk/gtktogglebutton.c:134 msgid "If the toggle button is in an \"in between\" state" msgstr "Se o botón de estado está en estado \"intermedio\"" -#: ../gtk/gtktogglebutton.c:138 +#: ../gtk/gtktogglebutton.c:141 msgid "Draw Indicator" msgstr "Debuxar o indicador" -#: ../gtk/gtktogglebutton.c:139 +#: ../gtk/gtktogglebutton.c:142 msgid "If the toggle part of the button is displayed" msgstr "Se se mostra a parte de activación do botón" -#: ../gtk/gtktoolbar.c:485 ../gtk/gtktoolpalette.c:1033 +#: ../gtk/gtktoolbar.c:491 ../gtk/gtktoolpalette.c:1060 msgid "Toolbar Style" msgstr "Estilo da barra de ferramentas" -#: ../gtk/gtktoolbar.c:486 +#: ../gtk/gtktoolbar.c:492 msgid "How to draw the toolbar" msgstr "Como debuxar a barra de ferramentas" -#: ../gtk/gtktoolbar.c:493 +#: ../gtk/gtktoolbar.c:499 msgid "Show Arrow" msgstr "Mostrar frecha" -#: ../gtk/gtktoolbar.c:494 +#: ../gtk/gtktoolbar.c:500 msgid "If an arrow should be shown if the toolbar doesn't fit" msgstr "Se debe mostrar unha frecha se a barra de ferramentas non encaixa" -#: ../gtk/gtktoolbar.c:515 +#: ../gtk/gtktoolbar.c:521 msgid "Size of icons in this toolbar" msgstr "Tamaño das iconas nesta barra de ferramentas" -#: ../gtk/gtktoolbar.c:530 ../gtk/gtktoolpalette.c:1019 +#: ../gtk/gtktoolbar.c:536 ../gtk/gtktoolpalette.c:1046 msgid "Icon size set" msgstr "Definición do tamaño da icona" -#: ../gtk/gtktoolbar.c:531 ../gtk/gtktoolpalette.c:1020 +#: ../gtk/gtktoolbar.c:537 ../gtk/gtktoolpalette.c:1047 msgid "Whether the icon-size property has been set" msgstr "Indica se se estabeleceu a propiedade de tamaño da icona" -#: ../gtk/gtktoolbar.c:540 +#: ../gtk/gtktoolbar.c:546 msgid "Whether the item should receive extra space when the toolbar grows" msgstr "" "Indica se o elemento debe recibir espazo adicional cando a barra de " "ferramentas medre" -#: ../gtk/gtktoolbar.c:548 ../gtk/gtktoolitemgroup.c:1625 +#: ../gtk/gtktoolbar.c:554 ../gtk/gtktoolitemgroup.c:1642 msgid "Whether the item should be the same size as other homogeneous items" msgstr "" "Indica se o elemento debería ser do mesmo tamaño que outros elementos " "homoxéneos" -#: ../gtk/gtktoolbar.c:555 +#: ../gtk/gtktoolbar.c:561 msgid "Spacer size" msgstr "Tamaño do espazador" -#: ../gtk/gtktoolbar.c:556 +#: ../gtk/gtktoolbar.c:562 msgid "Size of spacers" msgstr "Tamaño dos espazadores" -#: ../gtk/gtktoolbar.c:565 +#: ../gtk/gtktoolbar.c:571 msgid "Amount of border space between the toolbar shadow and the buttons" msgstr "" "Cantidade de espazo do bordo entre a sombra da barra de ferramentas e os " "botóns" -#: ../gtk/gtktoolbar.c:573 +#: ../gtk/gtktoolbar.c:579 msgid "Maximum child expand" msgstr "Expansión de fillos máxima" -#: ../gtk/gtktoolbar.c:574 +#: ../gtk/gtktoolbar.c:580 msgid "Maximum amount of space an expandable item will be given" msgstr "Cantidade máxima de espazo que se lle dará a un elemento expandíbel" -#: ../gtk/gtktoolbar.c:582 +#: ../gtk/gtktoolbar.c:588 msgid "Space style" msgstr "Estilo do espazo" -#: ../gtk/gtktoolbar.c:583 +#: ../gtk/gtktoolbar.c:589 msgid "Whether spacers are vertical lines or just blank" msgstr "Indica se os espazadores son liñas verticais ou só espazos en branco" -#: ../gtk/gtktoolbar.c:590 +#: ../gtk/gtktoolbar.c:596 msgid "Button relief" msgstr "Relevo do botón" -#: ../gtk/gtktoolbar.c:591 +#: ../gtk/gtktoolbar.c:597 msgid "Type of bevel around toolbar buttons" msgstr "Tipo de bisel ao redor dos botóns da barra de ferramentas" -#: ../gtk/gtktoolbar.c:598 +#: ../gtk/gtktoolbar.c:604 msgid "Style of bevel around the toolbar" msgstr "Estilo do bisel ao redor da barra de ferramentas" @@ -6368,7 +6368,7 @@ msgstr "Espazamento da icona" msgid "Spacing in pixels between the icon and label" msgstr "Espazamento en píxeles entre a icona e a etiqueta" -#: ../gtk/gtktoolitem.c:201 +#: ../gtk/gtktoolitem.c:210 msgid "" "Whether the toolbar item is considered important. When TRUE, toolbar buttons " "show text in GTK_TOOLBAR_BOTH_HORIZ mode" @@ -6377,84 +6377,84 @@ msgstr "" "é TRUE, os botóns da barra de ferramentas mostran o texto no modo " "GTK_TOOLBAR_BOTH_HORIZ" -#: ../gtk/gtktoolitemgroup.c:1572 +#: ../gtk/gtktoolitemgroup.c:1589 msgid "The human-readable title of this item group" msgstr "Unha descrición lexíbel por humanos do elemento de grupo" -#: ../gtk/gtktoolitemgroup.c:1579 +#: ../gtk/gtktoolitemgroup.c:1596 msgid "A widget to display in place of the usual label" msgstr "Un widget para mostrar no lugar da etiqueta habitual" -#: ../gtk/gtktoolitemgroup.c:1585 +#: ../gtk/gtktoolitemgroup.c:1602 msgid "Collapsed" msgstr "Recollido" -#: ../gtk/gtktoolitemgroup.c:1586 +#: ../gtk/gtktoolitemgroup.c:1603 msgid "Whether the group has been collapsed and items are hidden" msgstr "Indica se grupo foi contraído e os elementos agochados" -#: ../gtk/gtktoolitemgroup.c:1592 +#: ../gtk/gtktoolitemgroup.c:1609 msgid "ellipsize" msgstr "Elipse" -#: ../gtk/gtktoolitemgroup.c:1593 +#: ../gtk/gtktoolitemgroup.c:1610 msgid "Ellipsize for item group headers" msgstr "Elipse para as cabeceiras de grupo do elemento" -#: ../gtk/gtktoolitemgroup.c:1599 +#: ../gtk/gtktoolitemgroup.c:1616 msgid "Header Relief" msgstr "Relieve da cabeceira" -#: ../gtk/gtktoolitemgroup.c:1600 +#: ../gtk/gtktoolitemgroup.c:1617 msgid "Relief of the group header button" msgstr "Relieve do botón de cabeceira de grupo" -#: ../gtk/gtktoolitemgroup.c:1615 +#: ../gtk/gtktoolitemgroup.c:1632 msgid "Header Spacing" msgstr "Espazamento da cabeceira" -#: ../gtk/gtktoolitemgroup.c:1616 +#: ../gtk/gtktoolitemgroup.c:1633 msgid "Spacing between expander arrow and caption" msgstr "Espazamento entre a frecha expansora e o título" -#: ../gtk/gtktoolitemgroup.c:1632 +#: ../gtk/gtktoolitemgroup.c:1649 msgid "Whether the item should receive extra space when the group grows" msgstr "Indica se o elemento debe recibir espazo adicional cando o grupo medre" -#: ../gtk/gtktoolitemgroup.c:1639 +#: ../gtk/gtktoolitemgroup.c:1656 msgid "Whether the item should fill the available space" msgstr "Indica se o elemento deben encher o espazo dispoñíbel" -#: ../gtk/gtktoolitemgroup.c:1645 +#: ../gtk/gtktoolitemgroup.c:1662 msgid "New Row" msgstr "Nova fila" -#: ../gtk/gtktoolitemgroup.c:1646 +#: ../gtk/gtktoolitemgroup.c:1663 msgid "Whether the item should start a new row" msgstr "Indica se os elementos deberían mostrarse nunha nova fila" -#: ../gtk/gtktoolitemgroup.c:1653 +#: ../gtk/gtktoolitemgroup.c:1670 msgid "Position of the item within this group" msgstr "Posición do elemento neste grupo" -#: ../gtk/gtktoolpalette.c:1004 +#: ../gtk/gtktoolpalette.c:1031 msgid "Size of icons in this tool palette" msgstr "Tamaño das iconas nesta paleta de ferramentas" -#: ../gtk/gtktoolpalette.c:1034 +#: ../gtk/gtktoolpalette.c:1061 msgid "Style of items in the tool palette" msgstr "Estilo dos elementos na paleta de ferramentas" -#: ../gtk/gtktoolpalette.c:1050 +#: ../gtk/gtktoolpalette.c:1077 msgid "Exclusive" msgstr "Exclusivo" -#: ../gtk/gtktoolpalette.c:1051 +#: ../gtk/gtktoolpalette.c:1078 msgid "Whether the item group should be the only expanded at a given time" msgstr "" "Indica se o grupo de elementos deberían expandirse só nun momento determinado" -#: ../gtk/gtktoolpalette.c:1066 +#: ../gtk/gtktoolpalette.c:1093 msgid "" "Whether the item group should receive extra space when the palette grows" msgstr "" @@ -6501,220 +6501,220 @@ msgstr "Modelo TreeModelSort" msgid "The model for the TreeModelSort to sort" msgstr "O modelo para o TreeModelSort que ordenar" -#: ../gtk/gtktreeview.c:568 +#: ../gtk/gtktreeview.c:661 msgid "TreeView Model" msgstr "Modelo TreeView" -#: ../gtk/gtktreeview.c:569 +#: ../gtk/gtktreeview.c:662 msgid "The model for the tree view" msgstr "O modelo para a visualización en árbore" -#: ../gtk/gtktreeview.c:581 +#: ../gtk/gtktreeview.c:674 msgid "Headers Visible" msgstr "Cabeceiras visíbeis" -#: ../gtk/gtktreeview.c:582 +#: ../gtk/gtktreeview.c:675 msgid "Show the column header buttons" msgstr "Mostrar botóns nas cabeceiras de columna" -#: ../gtk/gtktreeview.c:589 +#: ../gtk/gtktreeview.c:682 msgid "Headers Clickable" msgstr "Cabeceiras premíbeis" -#: ../gtk/gtktreeview.c:590 +#: ../gtk/gtktreeview.c:683 msgid "Column headers respond to click events" msgstr "As cabeceiras de columna responden aos eventos de clic" -#: ../gtk/gtktreeview.c:597 +#: ../gtk/gtktreeview.c:690 msgid "Expander Column" msgstr "Columna expansora" -#: ../gtk/gtktreeview.c:598 +#: ../gtk/gtktreeview.c:691 msgid "Set the column for the expander column" msgstr "Estabelecer a columna para a columna expansora" -#: ../gtk/gtktreeview.c:613 +#: ../gtk/gtktreeview.c:706 msgid "Rules Hint" msgstr "Suxestión das regras" -#: ../gtk/gtktreeview.c:614 +#: ../gtk/gtktreeview.c:707 msgid "Set a hint to the theme engine to draw rows in alternating colors" msgstr "" "Define unha suxestión para o motor de tema para debuxar as filas con cores " "alternas" -#: ../gtk/gtktreeview.c:621 +#: ../gtk/gtktreeview.c:714 msgid "Enable Search" msgstr "Activar a busca" -#: ../gtk/gtktreeview.c:622 +#: ../gtk/gtktreeview.c:715 msgid "View allows user to search through columns interactively" msgstr "" "A visualización permite aos usuarios buscar de modo interactivo a través das " "columnas" -#: ../gtk/gtktreeview.c:629 +#: ../gtk/gtktreeview.c:722 msgid "Search Column" msgstr "Columna de busca" -#: ../gtk/gtktreeview.c:630 +#: ../gtk/gtktreeview.c:723 msgid "Model column to search through during interactive search" msgstr "A columna de modelo na que buscar durante a busca interactiva" -#: ../gtk/gtktreeview.c:650 +#: ../gtk/gtktreeview.c:743 msgid "Fixed Height Mode" msgstr "Modo de altura fixa" -#: ../gtk/gtktreeview.c:651 +#: ../gtk/gtktreeview.c:744 msgid "Speeds up GtkTreeView by assuming that all rows have the same height" msgstr "Acelera GtkTreeView asumindo que todas as filas teñen a mesma altura" -#: ../gtk/gtktreeview.c:671 +#: ../gtk/gtktreeview.c:764 msgid "Hover Selection" msgstr "Seleccionar ao pasar por encima" -#: ../gtk/gtktreeview.c:672 +#: ../gtk/gtktreeview.c:765 msgid "Whether the selection should follow the pointer" msgstr "Indica se a selección debería seguir o punteiro" -#: ../gtk/gtktreeview.c:691 +#: ../gtk/gtktreeview.c:784 msgid "Hover Expand" msgstr "Expandir ao pasar por encima" -#: ../gtk/gtktreeview.c:692 +#: ../gtk/gtktreeview.c:785 msgid "" "Whether rows should be expanded/collapsed when the pointer moves over them" msgstr "" "Indica se as filas deben expandirse ou contraerse cando se move o punteiro " "sobre elas" -#: ../gtk/gtktreeview.c:706 +#: ../gtk/gtktreeview.c:799 msgid "Show Expanders" msgstr "Mostrar expansores" -#: ../gtk/gtktreeview.c:707 +#: ../gtk/gtktreeview.c:800 msgid "View has expanders" msgstr "A visualización ten expansores" -#: ../gtk/gtktreeview.c:721 +#: ../gtk/gtktreeview.c:814 msgid "Level Indentation" msgstr "Nivel de sangría" -#: ../gtk/gtktreeview.c:722 +#: ../gtk/gtktreeview.c:815 msgid "Extra indentation for each level" msgstr "Sangría adicional para cada nivel" -#: ../gtk/gtktreeview.c:731 +#: ../gtk/gtktreeview.c:824 msgid "Rubber Banding" msgstr "Tiras de goma" -#: ../gtk/gtktreeview.c:732 +#: ../gtk/gtktreeview.c:825 msgid "" "Whether to enable selection of multiple items by dragging the mouse pointer" msgstr "" "Indica se se activa a selección de múltiples elementos arrastrando o " "punteiro do rato" -#: ../gtk/gtktreeview.c:739 +#: ../gtk/gtktreeview.c:832 msgid "Enable Grid Lines" msgstr "Activar as liñas da grade" -#: ../gtk/gtktreeview.c:740 +#: ../gtk/gtktreeview.c:833 msgid "Whether grid lines should be drawn in the tree view" msgstr "" "Indica se as liñas da grade se deben debuxar na visualización en árbore" -#: ../gtk/gtktreeview.c:748 +#: ../gtk/gtktreeview.c:841 msgid "Enable Tree Lines" msgstr "Activar as liñas da árbore" -#: ../gtk/gtktreeview.c:749 +#: ../gtk/gtktreeview.c:842 msgid "Whether tree lines should be drawn in the tree view" msgstr "Indica se se deben debuxar as liñas na visualización en árbore" -#: ../gtk/gtktreeview.c:757 +#: ../gtk/gtktreeview.c:850 msgid "The column in the model containing the tooltip texts for the rows" msgstr "A columna do modelo que contén os textos de indicación para as filas" -#: ../gtk/gtktreeview.c:779 +#: ../gtk/gtktreeview.c:872 msgid "Vertical Separator Width" msgstr "Largura do separador vertical" -#: ../gtk/gtktreeview.c:780 +#: ../gtk/gtktreeview.c:873 msgid "Vertical space between cells. Must be an even number" msgstr "Espazo vertical entre celas. Debe ser un número par" -#: ../gtk/gtktreeview.c:788 +#: ../gtk/gtktreeview.c:881 msgid "Horizontal Separator Width" msgstr "Largura do separador horizontal" -#: ../gtk/gtktreeview.c:789 +#: ../gtk/gtktreeview.c:882 msgid "Horizontal space between cells. Must be an even number" msgstr "Espazo horizontal entre celas. Debe ser un número par" -#: ../gtk/gtktreeview.c:797 +#: ../gtk/gtktreeview.c:890 msgid "Allow Rules" msgstr "Permitir regras" -#: ../gtk/gtktreeview.c:798 +#: ../gtk/gtktreeview.c:891 msgid "Allow drawing of alternating color rows" msgstr "Permitir debuxar filas con cores alternas" -#: ../gtk/gtktreeview.c:804 +#: ../gtk/gtktreeview.c:897 msgid "Indent Expanders" msgstr "Sangrar os expansores" -#: ../gtk/gtktreeview.c:805 +#: ../gtk/gtktreeview.c:898 msgid "Make the expanders indented" msgstr "Crear os expansores sangrados" -#: ../gtk/gtktreeview.c:811 +#: ../gtk/gtktreeview.c:904 msgid "Even Row Color" msgstr "Cor da fila par" -#: ../gtk/gtktreeview.c:812 +#: ../gtk/gtktreeview.c:905 msgid "Color to use for even rows" msgstr "Cor que usar para as filas pares" -#: ../gtk/gtktreeview.c:818 +#: ../gtk/gtktreeview.c:911 msgid "Odd Row Color" msgstr "Cor da fila impar" -#: ../gtk/gtktreeview.c:819 +#: ../gtk/gtktreeview.c:912 msgid "Color to use for odd rows" msgstr "Cor que usar para as filas impares" -#: ../gtk/gtktreeview.c:825 +#: ../gtk/gtktreeview.c:918 msgid "Grid line width" msgstr "Largura da liña da grade" -#: ../gtk/gtktreeview.c:826 +#: ../gtk/gtktreeview.c:919 msgid "Width, in pixels, of the tree view grid lines" -msgstr "Largura en píxeles das liñas da grade da visualización en árbore" +msgstr "Largura, en píxeles, das liñas da grade da visualización en árbore" -#: ../gtk/gtktreeview.c:832 +#: ../gtk/gtktreeview.c:925 msgid "Tree line width" msgstr "Largura da liña da árbore" -#: ../gtk/gtktreeview.c:833 +#: ../gtk/gtktreeview.c:926 msgid "Width, in pixels, of the tree view lines" msgstr "Largura en píxeles das liñas da visualización en árbore" -#: ../gtk/gtktreeview.c:839 +#: ../gtk/gtktreeview.c:932 msgid "Grid line pattern" msgstr "Patrón da liña da grade" -#: ../gtk/gtktreeview.c:840 +#: ../gtk/gtktreeview.c:933 msgid "Dash pattern used to draw the tree view grid lines" msgstr "" "Patrón de trazos usado para debuxar as liñas da grade da visualización en " "árbore" -#: ../gtk/gtktreeview.c:846 +#: ../gtk/gtktreeview.c:939 msgid "Tree line pattern" msgstr "Patrón da liña da árbore" -#: ../gtk/gtktreeview.c:847 +#: ../gtk/gtktreeview.c:940 msgid "Dash pattern used to draw the tree view lines" msgstr "" "Patrón de trazos usado para debuxar as liñas da visualización en árbore" @@ -6723,7 +6723,7 @@ msgstr "" msgid "Whether to display the column" msgstr "Indica se se mostra a columna" -#: ../gtk/gtktreeviewcolumn.c:221 ../gtk/gtkwindow.c:657 +#: ../gtk/gtktreeviewcolumn.c:221 ../gtk/gtkwindow.c:656 msgid "Resizable" msgstr "Redimensionábel" @@ -6843,32 +6843,32 @@ msgstr "Definición de IU combinado" msgid "An XML string describing the merged UI" msgstr "Unha cadea XML que describe o IU combinado" -#: ../gtk/gtkviewport.c:156 +#: ../gtk/gtkviewport.c:155 msgid "Determines how the shadowed box around the viewport is drawn" msgstr "" "Determina como se debuxa a caixa sombreada ao redor da área de visualización" -#: ../gtk/gtkwidget.c:935 +#: ../gtk/gtkwidget.c:887 msgid "Widget name" msgstr "Nome do widget" -#: ../gtk/gtkwidget.c:936 +#: ../gtk/gtkwidget.c:888 msgid "The name of the widget" msgstr "O nome do widget" -#: ../gtk/gtkwidget.c:942 +#: ../gtk/gtkwidget.c:894 msgid "Parent widget" msgstr "Widget pai" -#: ../gtk/gtkwidget.c:943 +#: ../gtk/gtkwidget.c:895 msgid "The parent widget of this widget. Must be a Container widget" msgstr "O widget pai deste widget. Debe ser un widget contedor" -#: ../gtk/gtkwidget.c:950 +#: ../gtk/gtkwidget.c:902 msgid "Width request" msgstr "Solicitude de largura" -#: ../gtk/gtkwidget.c:951 +#: ../gtk/gtkwidget.c:903 msgid "" "Override for width request of the widget, or -1 if natural request should be " "used" @@ -6876,11 +6876,11 @@ msgstr "" "Sobrepor a solicitude de largura do widget ou -1 se se debe empregar a " "solicitude normal" -#: ../gtk/gtkwidget.c:959 +#: ../gtk/gtkwidget.c:911 msgid "Height request" msgstr "Solicitude de altura" -#: ../gtk/gtkwidget.c:960 +#: ../gtk/gtkwidget.c:912 msgid "" "Override for height request of the widget, or -1 if natural request should " "be used" @@ -6888,268 +6888,268 @@ msgstr "" "Sobrepor a solicitude de altura do widget ou -1 se se debe empregar a " "solicitude normal" -#: ../gtk/gtkwidget.c:969 +#: ../gtk/gtkwidget.c:921 msgid "Whether the widget is visible" msgstr "Indica se o widget é visíbel" -#: ../gtk/gtkwidget.c:976 +#: ../gtk/gtkwidget.c:928 msgid "Whether the widget responds to input" msgstr "Indica se o widget responde á entrada de datos" -#: ../gtk/gtkwidget.c:982 +#: ../gtk/gtkwidget.c:934 msgid "Application paintable" msgstr "Aplicativo pintábel" -#: ../gtk/gtkwidget.c:983 +#: ../gtk/gtkwidget.c:935 msgid "Whether the application will paint directly on the widget" msgstr "Indica se o aplicativo pintará directamente sobre o widget" -#: ../gtk/gtkwidget.c:989 +#: ../gtk/gtkwidget.c:941 msgid "Can focus" msgstr "Pode enfocar" -#: ../gtk/gtkwidget.c:990 +#: ../gtk/gtkwidget.c:942 msgid "Whether the widget can accept the input focus" msgstr "Indica se o widget pode aceptar o foco de entrada" -#: ../gtk/gtkwidget.c:996 +#: ../gtk/gtkwidget.c:948 msgid "Has focus" msgstr "Ten foco" -#: ../gtk/gtkwidget.c:997 +#: ../gtk/gtkwidget.c:949 msgid "Whether the widget has the input focus" msgstr "Indica se o widget ten o foco de entrada" -#: ../gtk/gtkwidget.c:1003 +#: ../gtk/gtkwidget.c:955 msgid "Is focus" msgstr "É o foco" -#: ../gtk/gtkwidget.c:1004 +#: ../gtk/gtkwidget.c:956 msgid "Whether the widget is the focus widget within the toplevel" msgstr "Indica se o widget é o widget co foco, dentro do nivel superior" -#: ../gtk/gtkwidget.c:1010 +#: ../gtk/gtkwidget.c:962 msgid "Can default" msgstr "Pode ser o predefinido" -#: ../gtk/gtkwidget.c:1011 +#: ../gtk/gtkwidget.c:963 msgid "Whether the widget can be the default widget" msgstr "Indica se o widget pode ser o widget predefinido" -#: ../gtk/gtkwidget.c:1017 +#: ../gtk/gtkwidget.c:969 msgid "Has default" msgstr "É o predefinido" -#: ../gtk/gtkwidget.c:1018 +#: ../gtk/gtkwidget.c:970 msgid "Whether the widget is the default widget" msgstr "Indica se o widget é o widget predefinido" -#: ../gtk/gtkwidget.c:1024 +#: ../gtk/gtkwidget.c:976 msgid "Receives default" msgstr "Recibe o predefinido" -#: ../gtk/gtkwidget.c:1025 +#: ../gtk/gtkwidget.c:977 msgid "If TRUE, the widget will receive the default action when it is focused" msgstr "Se é TRUE, o widget recibirá a acción predefinida cando estea enfocado" -#: ../gtk/gtkwidget.c:1031 +#: ../gtk/gtkwidget.c:983 msgid "Composite child" msgstr "Fillo composto" -#: ../gtk/gtkwidget.c:1032 +#: ../gtk/gtkwidget.c:984 msgid "Whether the widget is part of a composite widget" msgstr "Indica se o widget é parte dun widget composto" -#: ../gtk/gtkwidget.c:1038 +#: ../gtk/gtkwidget.c:990 msgid "Style" msgstr "Estilo" -#: ../gtk/gtkwidget.c:1039 +#: ../gtk/gtkwidget.c:991 msgid "" "The style of the widget, which contains information about how it will look " "(colors etc)" msgstr "" -"O estilo do widget, que contén información sobre a aparencia (cores etc.)" +"O estilo do widget, que contén información sobre a aparencia (cores, etc)" -#: ../gtk/gtkwidget.c:1045 +#: ../gtk/gtkwidget.c:997 msgid "Events" msgstr "Eventos" -#: ../gtk/gtkwidget.c:1046 +#: ../gtk/gtkwidget.c:998 msgid "The event mask that decides what kind of GdkEvents this widget gets" msgstr "" "A máscara de eventos que decide que tipo de GdkEvents recibe este widget" -#: ../gtk/gtkwidget.c:1053 +#: ../gtk/gtkwidget.c:1005 msgid "Extension events" msgstr "Eventos de extensión" -#: ../gtk/gtkwidget.c:1054 +#: ../gtk/gtkwidget.c:1006 msgid "The mask that decides what kind of extension events this widget gets" msgstr "" "A máscara que decide que clase de eventos de extensión consegue este widget" -#: ../gtk/gtkwidget.c:1061 +#: ../gtk/gtkwidget.c:1013 msgid "No show all" msgstr "Non mostrar todo" -#: ../gtk/gtkwidget.c:1062 +#: ../gtk/gtkwidget.c:1014 msgid "Whether gtk_widget_show_all() should not affect this widget" msgstr "Indica se o gtk_widget_show_all() non debe afectar a este widget" -#: ../gtk/gtkwidget.c:1085 +#: ../gtk/gtkwidget.c:1037 msgid "Whether this widget has a tooltip" msgstr "Indica se este widget ten unha indicación" -#: ../gtk/gtkwidget.c:1141 +#: ../gtk/gtkwidget.c:1093 msgid "Window" msgstr "Xanela" -#: ../gtk/gtkwidget.c:1142 +#: ../gtk/gtkwidget.c:1094 msgid "The widget's window if it is realized" msgstr "A xanela do widget, se se crea" -#: ../gtk/gtkwidget.c:1156 +#: ../gtk/gtkwidget.c:1108 msgid "Double Buffered" msgstr "Con búfer dobre" -#: ../gtk/gtkwidget.c:1157 +#: ../gtk/gtkwidget.c:1109 msgid "Whether the widget is double buffered" msgstr "Indica se o widget conta ou non con búfer dobre" -#: ../gtk/gtkwidget.c:1172 +#: ../gtk/gtkwidget.c:1124 msgid "How to position in extra horizontal space" msgstr "Como posicionar no espazo horizontal adicional" -#: ../gtk/gtkwidget.c:1188 +#: ../gtk/gtkwidget.c:1140 msgid "How to position in extra vertical space" msgstr "Como posicionar no espazo vertical adicional" -#: ../gtk/gtkwidget.c:1207 +#: ../gtk/gtkwidget.c:1159 msgid "Margin on Left" msgstr "Marxe á esquerda" -#: ../gtk/gtkwidget.c:1208 +#: ../gtk/gtkwidget.c:1160 msgid "Pixels of extra space on the left side" msgstr "Píxeles de espacio adicional na lado esquerda" -#: ../gtk/gtkwidget.c:1228 +#: ../gtk/gtkwidget.c:1180 msgid "Margin on Right" msgstr "Marxe á dereita" -#: ../gtk/gtkwidget.c:1229 +#: ../gtk/gtkwidget.c:1181 msgid "Pixels of extra space on the right side" msgstr "Píxeles de espacio adicional na lado dereita" -#: ../gtk/gtkwidget.c:1249 +#: ../gtk/gtkwidget.c:1201 msgid "Margin on Top" msgstr "Marxe superior" -#: ../gtk/gtkwidget.c:1250 +#: ../gtk/gtkwidget.c:1202 msgid "Pixels of extra space on the top side" msgstr "Píxeles de espacio adicional na lado superior" -#: ../gtk/gtkwidget.c:1270 +#: ../gtk/gtkwidget.c:1222 msgid "Margin on Bottom" msgstr "Marxe inferior" -#: ../gtk/gtkwidget.c:1271 +#: ../gtk/gtkwidget.c:1223 msgid "Pixels of extra space on the bottom side" msgstr "Píxeles de espacio adicional na lado inferior" -#: ../gtk/gtkwidget.c:1288 +#: ../gtk/gtkwidget.c:1240 msgid "All Margins" msgstr "Todos os marxes" -#: ../gtk/gtkwidget.c:1289 +#: ../gtk/gtkwidget.c:1241 msgid "Pixels of extra space on all four sides" msgstr "Píxeles de espacio adicional nos catro lados" -#: ../gtk/gtkwidget.c:1322 +#: ../gtk/gtkwidget.c:1274 msgid "Horizontal Expand" msgstr "Expansión horizontal" -#: ../gtk/gtkwidget.c:1323 +#: ../gtk/gtkwidget.c:1275 msgid "Whether widget wants more horizontal space" msgstr "Indica se o widget quere usar máis espazo horizontal" -#: ../gtk/gtkwidget.c:1337 +#: ../gtk/gtkwidget.c:1289 msgid "Horizontal Expand Set" msgstr "Axuste de expansión horizontal" -#: ../gtk/gtkwidget.c:1338 +#: ../gtk/gtkwidget.c:1290 msgid "Whether to use the hexpand property" msgstr "Indica se se debe usar a propiedade hexpand" -#: ../gtk/gtkwidget.c:1352 +#: ../gtk/gtkwidget.c:1304 msgid "Vertical Expand" msgstr "Expansión vertical" -#: ../gtk/gtkwidget.c:1353 +#: ../gtk/gtkwidget.c:1305 msgid "Whether widget wants more vertical space" msgstr "Indica se o widget quere usar máis espazo vertical" -#: ../gtk/gtkwidget.c:1367 +#: ../gtk/gtkwidget.c:1319 msgid "Vertical Expand Set" msgstr "Axuste de expansión vertical" -#: ../gtk/gtkwidget.c:1368 +#: ../gtk/gtkwidget.c:1320 msgid "Whether to use the vexpand property" msgstr "Indica se se debe usar a propiedade vexpand" -#: ../gtk/gtkwidget.c:1382 +#: ../gtk/gtkwidget.c:1334 msgid "Expand Both" msgstr "Expandir en ambas" -#: ../gtk/gtkwidget.c:1383 +#: ../gtk/gtkwidget.c:1335 msgid "Whether widget wants to expand in both directions" msgstr "Indica se o widget quere expandirse en ámbalas dúas direccións" -#: ../gtk/gtkwidget.c:3037 +#: ../gtk/gtkwidget.c:2981 msgid "Interior Focus" msgstr "Foco interior" -#: ../gtk/gtkwidget.c:3038 +#: ../gtk/gtkwidget.c:2982 msgid "Whether to draw the focus indicator inside widgets" msgstr "Indica se se debuxa o foco indicador dentro dos widgets" -#: ../gtk/gtkwidget.c:3044 +#: ../gtk/gtkwidget.c:2988 msgid "Focus linewidth" msgstr "Enfocar a largura da liña" -#: ../gtk/gtkwidget.c:3045 +#: ../gtk/gtkwidget.c:2989 msgid "Width, in pixels, of the focus indicator line" msgstr "Largura en píxeles da liña indicadora do foco" -#: ../gtk/gtkwidget.c:3051 +#: ../gtk/gtkwidget.c:2995 msgid "Focus line dash pattern" msgstr "Patrón de trazos da liña de foco" -#: ../gtk/gtkwidget.c:3052 +#: ../gtk/gtkwidget.c:2996 msgid "Dash pattern used to draw the focus indicator" msgstr "Patrón de trazos empregado para debuxar o indicador de foco" -#: ../gtk/gtkwidget.c:3057 +#: ../gtk/gtkwidget.c:3001 msgid "Focus padding" msgstr "Recheo do foco" -#: ../gtk/gtkwidget.c:3058 +#: ../gtk/gtkwidget.c:3002 msgid "Width, in pixels, between focus indicator and the widget 'box'" msgstr "Largura en píxeles entre o indicador de foco e a 'caixa' do widget" -#: ../gtk/gtkwidget.c:3063 +#: ../gtk/gtkwidget.c:3007 msgid "Cursor color" msgstr "Cor do cursor" -#: ../gtk/gtkwidget.c:3064 +#: ../gtk/gtkwidget.c:3008 msgid "Color with which to draw insertion cursor" msgstr "Cor coa que debuxar o cursor de inserción" -#: ../gtk/gtkwidget.c:3069 +#: ../gtk/gtkwidget.c:3013 msgid "Secondary cursor color" msgstr "Cor secundaria do cursor" -#: ../gtk/gtkwidget.c:3070 +#: ../gtk/gtkwidget.c:3014 msgid "" "Color with which to draw the secondary insertion cursor when editing mixed " "right-to-left and left-to-right text" @@ -7157,43 +7157,43 @@ msgstr "" "Cor coa que debuxar o cursor de inserción secundario cando se edita unha " "mestura de texto de dereita a esquerda e de esquerda a dereita" -#: ../gtk/gtkwidget.c:3075 +#: ../gtk/gtkwidget.c:3019 msgid "Cursor line aspect ratio" msgstr "Proporción de aspecto da liña do cursor" -#: ../gtk/gtkwidget.c:3076 +#: ../gtk/gtkwidget.c:3020 msgid "Aspect ratio with which to draw insertion cursor" msgstr "Proporción de aspecto coa que debuxar o cursor de inserción" -#: ../gtk/gtkwidget.c:3082 +#: ../gtk/gtkwidget.c:3026 msgid "Window dragging" msgstr "Arrastre da xanela" -#: ../gtk/gtkwidget.c:3083 +#: ../gtk/gtkwidget.c:3027 msgid "Whether windows can be dragged by clicking on empty areas" msgstr "Indica se as xanelas se poden arrastrar premendo nas áreas baleiras" -#: ../gtk/gtkwidget.c:3096 +#: ../gtk/gtkwidget.c:3040 msgid "Unvisited Link Color" msgstr "Cor de ligazón non visitada" -#: ../gtk/gtkwidget.c:3097 +#: ../gtk/gtkwidget.c:3041 msgid "Color of unvisited links" msgstr "Cor de ligazóns non visitadas" -#: ../gtk/gtkwidget.c:3110 +#: ../gtk/gtkwidget.c:3054 msgid "Visited Link Color" msgstr "Cor de ligazón visitada" -#: ../gtk/gtkwidget.c:3111 +#: ../gtk/gtkwidget.c:3055 msgid "Color of visited links" msgstr "Cor de ligazóns visitadas" -#: ../gtk/gtkwidget.c:3125 +#: ../gtk/gtkwidget.c:3069 msgid "Wide Separators" msgstr "Separadores largos" -#: ../gtk/gtkwidget.c:3126 +#: ../gtk/gtkwidget.c:3070 msgid "" "Whether separators have configurable width and should be drawn using a box " "instead of a line" @@ -7201,81 +7201,81 @@ msgstr "" "Indica se os separadores teñen unha largura configurábel e se deberían " "debuxarse usando unha caixa en vez dunha liña" -#: ../gtk/gtkwidget.c:3140 +#: ../gtk/gtkwidget.c:3084 msgid "Separator Width" msgstr "Largura do separador" -#: ../gtk/gtkwidget.c:3141 +#: ../gtk/gtkwidget.c:3085 msgid "The width of separators if wide-separators is TRUE" -msgstr "A largura dos separadores se \"wide-separators\" é TRUE" +msgstr "A largura dos separadores se «wide-separators» é TRUE" -#: ../gtk/gtkwidget.c:3155 +#: ../gtk/gtkwidget.c:3099 msgid "Separator Height" msgstr "Altura do separador" -#: ../gtk/gtkwidget.c:3156 +#: ../gtk/gtkwidget.c:3100 msgid "The height of separators if \"wide-separators\" is TRUE" -msgstr "A altura dos separadores se \"wide-separators\" é TRUE" +msgstr "A altura dos separadores se «wide-separators» é TRUE" -#: ../gtk/gtkwidget.c:3170 +#: ../gtk/gtkwidget.c:3114 msgid "Horizontal Scroll Arrow Length" msgstr "Lonxitude da frecha de desprazamento horizontal" -#: ../gtk/gtkwidget.c:3171 +#: ../gtk/gtkwidget.c:3115 msgid "The length of horizontal scroll arrows" msgstr "A lonxitude das frechas de desprazamento horizontal" -#: ../gtk/gtkwidget.c:3185 +#: ../gtk/gtkwidget.c:3129 msgid "Vertical Scroll Arrow Length" msgstr "Lonxitude das frechas de desprazamento vertical" -#: ../gtk/gtkwidget.c:3186 +#: ../gtk/gtkwidget.c:3130 msgid "The length of vertical scroll arrows" msgstr "A lonxitude das frechas de desprazamento vertical" -#: ../gtk/gtkwindow.c:615 +#: ../gtk/gtkwindow.c:614 msgid "Window Type" msgstr "Tipo de xanela" -#: ../gtk/gtkwindow.c:616 +#: ../gtk/gtkwindow.c:615 msgid "The type of the window" msgstr "O tipo da xanela" -#: ../gtk/gtkwindow.c:624 +#: ../gtk/gtkwindow.c:623 msgid "Window Title" msgstr "Título da xanela" -#: ../gtk/gtkwindow.c:625 +#: ../gtk/gtkwindow.c:624 msgid "The title of the window" msgstr "O título da xanela" -#: ../gtk/gtkwindow.c:632 +#: ../gtk/gtkwindow.c:631 msgid "Window Role" msgstr "Rol da xanela" -#: ../gtk/gtkwindow.c:633 +#: ../gtk/gtkwindow.c:632 msgid "Unique identifier for the window to be used when restoring a session" msgstr "" "Identificador único para a xanela que se usará ao restaurar unha sesión" -#: ../gtk/gtkwindow.c:649 +#: ../gtk/gtkwindow.c:648 msgid "Startup ID" msgstr "ID de inicio" -#: ../gtk/gtkwindow.c:650 +#: ../gtk/gtkwindow.c:649 msgid "Unique startup identifier for the window used by startup-notification" msgstr "" "Identificador único para a xanela que se usará para a notificación de inicio" -#: ../gtk/gtkwindow.c:658 +#: ../gtk/gtkwindow.c:657 msgid "If TRUE, users can resize the window" msgstr "Se é TRUE, os usuarios poden redimensionar a xanela" -#: ../gtk/gtkwindow.c:665 +#: ../gtk/gtkwindow.c:664 msgid "Modal" msgstr "Modal" -#: ../gtk/gtkwindow.c:666 +#: ../gtk/gtkwindow.c:665 msgid "" "If TRUE, the window is modal (other windows are not usable while this one is " "up)" @@ -7283,78 +7283,78 @@ msgstr "" "Se é TRUE, a xanela é modal (non é posíbel usar outras xanelas mentres esta " "está encima)" -#: ../gtk/gtkwindow.c:673 +#: ../gtk/gtkwindow.c:672 msgid "Window Position" msgstr "Posición da xanela" -#: ../gtk/gtkwindow.c:674 +#: ../gtk/gtkwindow.c:673 msgid "The initial position of the window" msgstr "A posición inicial da xanela" -#: ../gtk/gtkwindow.c:682 +#: ../gtk/gtkwindow.c:681 msgid "Default Width" msgstr "Largura predefinida" -#: ../gtk/gtkwindow.c:683 +#: ../gtk/gtkwindow.c:682 msgid "The default width of the window, used when initially showing the window" msgstr "" "A largura predefinida da xanela, usada cando se mostra inicialmente a xanela" -#: ../gtk/gtkwindow.c:692 +#: ../gtk/gtkwindow.c:691 msgid "Default Height" msgstr "Altura predefinida" -#: ../gtk/gtkwindow.c:693 +#: ../gtk/gtkwindow.c:692 msgid "" "The default height of the window, used when initially showing the window" msgstr "" "A altura predefinida da xanela, usada cando se mostra inicialmente a xanela" -#: ../gtk/gtkwindow.c:702 +#: ../gtk/gtkwindow.c:701 msgid "Destroy with Parent" msgstr "Destruír co pai" -#: ../gtk/gtkwindow.c:703 +#: ../gtk/gtkwindow.c:702 msgid "If this window should be destroyed when the parent is destroyed" msgstr "Se esta xanela debería ser destruída cando se destrúe o pai" -#: ../gtk/gtkwindow.c:711 +#: ../gtk/gtkwindow.c:710 msgid "Icon for this window" msgstr "Icona para esta xanela" -#: ../gtk/gtkwindow.c:717 +#: ../gtk/gtkwindow.c:716 msgid "Mnemonics Visible" msgstr "Mnemónicos visíbeis" -#: ../gtk/gtkwindow.c:718 +#: ../gtk/gtkwindow.c:717 msgid "Whether mnemonics are currently visible in this window" msgstr "Indica se os mnemónicos están visíbeis actualmente nesta xanela" -#: ../gtk/gtkwindow.c:734 +#: ../gtk/gtkwindow.c:733 msgid "Name of the themed icon for this window" msgstr "Nome da icona de tema para esta xanela" -#: ../gtk/gtkwindow.c:749 +#: ../gtk/gtkwindow.c:748 msgid "Is Active" msgstr "Está activo" -#: ../gtk/gtkwindow.c:750 +#: ../gtk/gtkwindow.c:749 msgid "Whether the toplevel is the current active window" msgstr "Indica se o nivel superior é a xanela activa actual" -#: ../gtk/gtkwindow.c:757 +#: ../gtk/gtkwindow.c:756 msgid "Focus in Toplevel" msgstr "Foco no nivel superior" -#: ../gtk/gtkwindow.c:758 +#: ../gtk/gtkwindow.c:757 msgid "Whether the input focus is within this GtkWindow" msgstr "Indica se o foco de entrada está dentro desta GtkWindow" -#: ../gtk/gtkwindow.c:765 +#: ../gtk/gtkwindow.c:764 msgid "Type hint" msgstr "Suxestión de tipo" -#: ../gtk/gtkwindow.c:766 +#: ../gtk/gtkwindow.c:765 msgid "" "Hint to help the desktop environment understand what kind of window this is " "and how to treat it." @@ -7362,118 +7362,146 @@ msgstr "" "Suxestión para axudar ao contorno de escritorio a entender que clase de " "xanela é e como tratar con ela." -#: ../gtk/gtkwindow.c:774 +#: ../gtk/gtkwindow.c:773 msgid "Skip taskbar" msgstr "Omitir a barra de tarefas" -#: ../gtk/gtkwindow.c:775 +#: ../gtk/gtkwindow.c:774 msgid "TRUE if the window should not be in the task bar." msgstr "É TRUE se a xanela non debe estar na barra de tarefas." -#: ../gtk/gtkwindow.c:782 +#: ../gtk/gtkwindow.c:781 msgid "Skip pager" msgstr "Omitir o paxinador" -#: ../gtk/gtkwindow.c:783 +#: ../gtk/gtkwindow.c:782 msgid "TRUE if the window should not be in the pager." msgstr "É TRUE se a xanela non debe estar no paxinador." -#: ../gtk/gtkwindow.c:790 +#: ../gtk/gtkwindow.c:789 msgid "Urgent" msgstr "Urxente" -#: ../gtk/gtkwindow.c:791 +#: ../gtk/gtkwindow.c:790 msgid "TRUE if the window should be brought to the user's attention." msgstr "É TRUE se a xanela debe chamar a atención do usuario." -#: ../gtk/gtkwindow.c:805 +#: ../gtk/gtkwindow.c:804 msgid "Accept focus" msgstr "Aceptar o foco" -#: ../gtk/gtkwindow.c:806 +#: ../gtk/gtkwindow.c:805 msgid "TRUE if the window should receive the input focus." msgstr "É TRUE se a xanela non debe recibir o foco de entrada." -#: ../gtk/gtkwindow.c:820 +#: ../gtk/gtkwindow.c:819 msgid "Focus on map" msgstr "Foco no mapa" -#: ../gtk/gtkwindow.c:821 +#: ../gtk/gtkwindow.c:820 msgid "TRUE if the window should receive the input focus when mapped." msgstr "É TRUE se a xanela debería recibir o foco de entrada cando se mapee." -#: ../gtk/gtkwindow.c:835 +#: ../gtk/gtkwindow.c:834 msgid "Decorated" msgstr "Decorado" -#: ../gtk/gtkwindow.c:836 +#: ../gtk/gtkwindow.c:835 msgid "Whether the window should be decorated by the window manager" msgstr "Indica se o xestor de xanelas debe decorar a xanela" -#: ../gtk/gtkwindow.c:850 +#: ../gtk/gtkwindow.c:849 msgid "Deletable" msgstr "Eliminábel" -#: ../gtk/gtkwindow.c:851 +#: ../gtk/gtkwindow.c:850 msgid "Whether the window frame should have a close button" msgstr "Indica se o marco da xanela debería ter un botón de pechar" -#: ../gtk/gtkwindow.c:870 +#: ../gtk/gtkwindow.c:869 msgid "Resize grip" msgstr "Tirador de redimensión" -#: ../gtk/gtkwindow.c:871 +#: ../gtk/gtkwindow.c:870 msgid "Specifies whether the window should have a resize grip" msgstr "Indica se a xanela debe ter un tirador de redimensión" -#: ../gtk/gtkwindow.c:885 +#: ../gtk/gtkwindow.c:884 msgid "Resize grip is visible" msgstr "O tirador de redimensión é visíbel" -#: ../gtk/gtkwindow.c:886 +#: ../gtk/gtkwindow.c:885 msgid "Specifies whether the window's resize grip is visible." msgstr "Indica se o tirador de redimensión da xanela é visíbel." -#: ../gtk/gtkwindow.c:902 +#: ../gtk/gtkwindow.c:901 msgid "Gravity" msgstr "Gravidade" -#: ../gtk/gtkwindow.c:903 +#: ../gtk/gtkwindow.c:902 msgid "The window gravity of the window" msgstr "O tipo de gravidade da xanela" -#: ../gtk/gtkwindow.c:920 +#: ../gtk/gtkwindow.c:919 msgid "Transient for Window" msgstr "Transición para a xanela" -#: ../gtk/gtkwindow.c:921 +#: ../gtk/gtkwindow.c:920 msgid "The transient parent of the dialog" msgstr "O pai transicional do diálogo" -#: ../gtk/gtkwindow.c:936 +#: ../gtk/gtkwindow.c:935 msgid "Opacity for Window" msgstr "Opacidade para a xanela" -#: ../gtk/gtkwindow.c:937 +#: ../gtk/gtkwindow.c:936 msgid "The opacity of the window, from 0 to 1" msgstr "A opacidade da xanela; de 0 até 1" -#: ../gtk/gtkwindow.c:947 ../gtk/gtkwindow.c:948 +#: ../gtk/gtkwindow.c:946 ../gtk/gtkwindow.c:947 msgid "Width of resize grip" msgstr "Anchura do tirador de redimensión" -#: ../gtk/gtkwindow.c:953 ../gtk/gtkwindow.c:954 +#: ../gtk/gtkwindow.c:952 ../gtk/gtkwindow.c:953 msgid "Height of resize grip" msgstr "Altura do tirador de redimensión" -#: ../gtk/gtkwindow.c:973 +#: ../gtk/gtkwindow.c:972 msgid "GtkApplication" msgstr "GtkApplication" -#: ../gtk/gtkwindow.c:974 +#: ../gtk/gtkwindow.c:973 msgid "The GtkApplication for the window" msgstr "O GtkApplication para a xanela" +# verificar: High= alta e low= baixa +#~ msgid "Lower" +#~ msgstr "Inferior" + +#~ msgid "Lower limit of ruler" +#~ msgstr "Límite inferior da regra" + +#~ msgid "Upper" +#~ msgstr "Superior" + +#~ msgid "Upper limit of ruler" +#~ msgstr "Límite superior da regra" + +#~ msgid "Position of mark on the ruler" +#~ msgstr "Posición da marca na regra" + +#~ msgid "Max Size" +#~ msgstr "Tamaño máximo" + +#~ msgid "Maximum size of the ruler" +#~ msgstr "Tamaño máximo da regra" + +#~ msgid "Metric" +#~ msgstr "Métrica" + +#~ msgid "The metric used for the ruler" +#~ msgstr "A métrica que se usa na regra" + #~ msgid "Horizontal adjustment" #~ msgstr "Axuste horizontal" diff --git a/po-properties/he.po b/po-properties/he.po index 2bc6dc6ce6..ebfcd04761 100644 --- a/po-properties/he.po +++ b/po-properties/he.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gtk+.HEAD.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-04 15:26+0200\n" -"PO-Revision-Date: 2010-12-04 15:27+0200\n" +"POT-Creation-Date: 2010-12-05 14:13+0200\n" +"PO-Revision-Date: 2010-12-05 14:13+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -281,7 +281,7 @@ msgid "A unique name for the action." msgstr "A unique name for the action." #: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:226 ../gtk/gtkexpander.c:209 -#: ../gtk/gtkframe.c:130 ../gtk/gtklabel.c:567 ../gtk/gtkmenuitem.c:331 +#: ../gtk/gtkframe.c:130 ../gtk/gtklabel.c:566 ../gtk/gtkmenuitem.c:331 #: ../gtk/gtktoolbutton.c:202 ../gtk/gtktoolitemgroup.c:1588 msgid "Label" msgstr "Label" @@ -325,7 +325,7 @@ msgstr "The GIcon being displayed" #: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:180 #: ../gtk/gtkimage.c:308 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:236 -#: ../gtk/gtkwindow.c:733 +#: ../gtk/gtkwindow.c:732 msgid "Icon Name" msgstr "Icon Name" @@ -391,7 +391,7 @@ msgid "When TRUE, empty menu proxies for this action are hidden." msgstr "When TRUE, empty menu proxies for this action are hidden." #: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235 -#: ../gtk/gtkcellrenderer.c:282 ../gtk/gtkwidget.c:913 +#: ../gtk/gtkcellrenderer.c:282 ../gtk/gtkwidget.c:927 msgid "Sensitive" msgstr "Sensitive" @@ -401,7 +401,7 @@ msgstr "Whether the action is enabled." #: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242 #: ../gtk/gtkstatusicon.c:287 ../gtk/gtktreeviewcolumn.c:213 -#: ../gtk/gtkwidget.c:906 +#: ../gtk/gtkwidget.c:920 msgid "Visible" msgstr "Visible" @@ -602,7 +602,7 @@ msgstr "Arrow shadow" msgid "Appearance of the shadow surrounding the arrow" msgstr "Appearance of the shadow surrounding the arrow" -#: ../gtk/gtkarrow.c:127 ../gtk/gtkmenu.c:731 ../gtk/gtkmenuitem.c:394 +#: ../gtk/gtkarrow.c:127 ../gtk/gtkmenu.c:730 ../gtk/gtkmenuitem.c:394 msgid "Arrow Scaling" msgstr "Arrow Scaling" @@ -610,7 +610,7 @@ msgstr "Arrow Scaling" msgid "Amount of space used up by arrow" msgstr "Amount of space used up by arrow" -#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1109 +#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1123 msgid "Horizontal Alignment" msgstr "Horizontal Alignment" @@ -618,7 +618,7 @@ msgstr "Horizontal Alignment" msgid "X alignment of the child" msgstr "X alignment of the child" -#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1125 +#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1139 msgid "Vertical Alignment" msgstr "Vertical Alignment" @@ -805,7 +805,7 @@ msgstr "Extra space to put between the child and its neighbors, in pixels" msgid "Pack type" msgstr "Pack type" -#: ../gtk/gtkbox.c:297 ../gtk/gtknotebook.c:793 +#: ../gtk/gtkbox.c:297 ../gtk/gtknotebook.c:795 msgid "" "A GtkPackType indicating whether the child is packed with reference to the " "start or end of the parent" @@ -813,12 +813,12 @@ msgstr "" "A GtkPackType indicating whether the child is packed with reference to the " "start or end of the parent" -#: ../gtk/gtkbox.c:303 ../gtk/gtknotebook.c:764 ../gtk/gtkpaned.c:327 +#: ../gtk/gtkbox.c:303 ../gtk/gtknotebook.c:766 ../gtk/gtkpaned.c:327 #: ../gtk/gtktoolitemgroup.c:1669 msgid "Position" msgstr "Position" -#: ../gtk/gtkbox.c:304 ../gtk/gtknotebook.c:765 +#: ../gtk/gtkbox.c:304 ../gtk/gtknotebook.c:767 msgid "The index of the child in the parent" msgstr "The index of the child in the parent" @@ -838,12 +838,12 @@ msgstr "" "Text of the label widget inside the button, if the button contains a label " "widget" -#: ../gtk/gtkbutton.c:234 ../gtk/gtkexpander.c:217 ../gtk/gtklabel.c:588 +#: ../gtk/gtkbutton.c:234 ../gtk/gtkexpander.c:217 ../gtk/gtklabel.c:587 #: ../gtk/gtkmenuitem.c:346 ../gtk/gtktoolbutton.c:209 msgid "Use underline" msgstr "Use underline" -#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:218 ../gtk/gtklabel.c:589 +#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:218 ../gtk/gtklabel.c:588 #: ../gtk/gtkmenuitem.c:347 msgid "" "If set, an underline in the text indicates the next character should be used " @@ -1326,7 +1326,7 @@ msgid "Whether the rendered pixbuf should be colorized according to the state" msgstr "Whether the rendered pixbuf should be colorized according to the state" #: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:325 -#: ../gtk/gtkwindow.c:710 +#: ../gtk/gtkwindow.c:709 msgid "Icon" msgstr "Icon" @@ -1413,7 +1413,7 @@ msgid "The number of decimal places to display" msgstr "The number of decimal places to display" #: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:105 -#: ../gtk/gtkmenu.c:521 ../gtk/gtkspinner.c:131 ../gtk/gtkswitch.c:738 +#: ../gtk/gtkmenu.c:520 ../gtk/gtkspinner.c:118 ../gtk/gtkswitch.c:738 #: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:125 #: ../gtk/gtktoggletoolbutton.c:112 msgid "Active" @@ -1443,7 +1443,7 @@ msgstr "Markup" msgid "Marked up text to render" msgstr "Marked up text to render" -#: ../gtk/gtkcellrenderertext.c:263 ../gtk/gtklabel.c:574 +#: ../gtk/gtkcellrenderertext.c:263 ../gtk/gtklabel.c:573 msgid "Attributes" msgstr "Attributes" @@ -1623,7 +1623,7 @@ msgstr "" "when rendering the text. If you don't understand this parameter, you " "probably don't need it" -#: ../gtk/gtkcellrenderertext.c:492 ../gtk/gtklabel.c:699 +#: ../gtk/gtkcellrenderertext.c:492 ../gtk/gtklabel.c:698 #: ../gtk/gtkprogressbar.c:207 msgid "Ellipsize" msgstr "Ellipsize" @@ -1637,15 +1637,15 @@ msgstr "" "have enough room to display the entire string" #: ../gtk/gtkcellrenderertext.c:512 ../gtk/gtkfilechooserbutton.c:411 -#: ../gtk/gtklabel.c:720 +#: ../gtk/gtklabel.c:719 msgid "Width In Characters" msgstr "Width In Characters" -#: ../gtk/gtkcellrenderertext.c:513 ../gtk/gtklabel.c:721 +#: ../gtk/gtkcellrenderertext.c:513 ../gtk/gtklabel.c:720 msgid "The desired width of the label, in characters" msgstr "The desired width of the label, in characters" -#: ../gtk/gtkcellrenderertext.c:537 ../gtk/gtklabel.c:781 +#: ../gtk/gtkcellrenderertext.c:537 ../gtk/gtklabel.c:780 msgid "Maximum Width In Characters" msgstr "Maximum Width In Characters" @@ -2058,7 +2058,7 @@ msgstr "Whether the combo box draws a frame around the child" msgid "Whether the combo box grabs focus when it is clicked with the mouse" msgstr "Whether the combo box grabs focus when it is clicked with the mouse" -#: ../gtk/gtkcombobox.c:881 ../gtk/gtkmenu.c:576 +#: ../gtk/gtkcombobox.c:881 ../gtk/gtkmenu.c:575 msgid "Tearoff Title" msgstr "Tearoff Title" @@ -2160,27 +2160,27 @@ msgstr "Shadow type" msgid "Which kind of shadow to draw around the combo box" msgstr "Which kind of shadow to draw around the combo box" -#: ../gtk/gtkcontainer.c:472 +#: ../gtk/gtkcontainer.c:476 msgid "Resize mode" msgstr "Resize mode" -#: ../gtk/gtkcontainer.c:473 +#: ../gtk/gtkcontainer.c:477 msgid "Specify how resize events are handled" msgstr "Specify how resize events are handled" -#: ../gtk/gtkcontainer.c:480 +#: ../gtk/gtkcontainer.c:484 msgid "Border width" msgstr "Border width" -#: ../gtk/gtkcontainer.c:481 +#: ../gtk/gtkcontainer.c:485 msgid "The width of the empty border outside the containers children" msgstr "The width of the empty border outside the containers children" -#: ../gtk/gtkcontainer.c:489 +#: ../gtk/gtkcontainer.c:493 msgid "Child" msgstr "Child" -#: ../gtk/gtkcontainer.c:490 +#: ../gtk/gtkcontainer.c:494 msgid "Can be used to add a new child to the container" msgstr "Can be used to add a new child to the container" @@ -2224,19 +2224,19 @@ msgstr "Text Buffer" msgid "Text buffer object which actually stores entry text" msgstr "Text buffer object which actually stores entry text" -#: ../gtk/gtkentry.c:733 ../gtk/gtklabel.c:662 +#: ../gtk/gtkentry.c:733 ../gtk/gtklabel.c:661 msgid "Cursor Position" msgstr "Cursor Position" -#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:663 +#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:662 msgid "The current position of the insertion cursor in chars" msgstr "The current position of the insertion cursor in chars" -#: ../gtk/gtkentry.c:743 ../gtk/gtklabel.c:672 +#: ../gtk/gtkentry.c:743 ../gtk/gtklabel.c:671 msgid "Selection Bound" msgstr "Selection Bound" -#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:673 +#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:672 msgid "" "The position of the opposite end of the selection from the cursor in chars" msgstr "" @@ -2665,11 +2665,11 @@ msgstr "Whether the expander has been opened to reveal the child widget" msgid "Text of the expander's label" msgstr "Text of the expander's label" -#: ../gtk/gtkexpander.c:225 ../gtk/gtklabel.c:581 +#: ../gtk/gtkexpander.c:225 ../gtk/gtklabel.c:580 msgid "Use markup" msgstr "Use markup" -#: ../gtk/gtkexpander.c:226 ../gtk/gtklabel.c:582 +#: ../gtk/gtkexpander.c:226 ../gtk/gtklabel.c:581 msgid "The text of the label includes XML markup. See pango_parse_markup()" msgstr "The text of the label includes XML markup. See pango_parse_markup()" @@ -3179,7 +3179,7 @@ msgstr "Child widget to appear next to the menu text" msgid "Whether to use the label text to create a stock menu item" msgstr "Whether to use the label text to create a stock menu item" -#: ../gtk/gtkimagemenuitem.c:197 ../gtk/gtkmenu.c:536 +#: ../gtk/gtkimagemenuitem.c:197 ../gtk/gtkmenu.c:535 msgid "Accel Group" msgstr "Accel Group" @@ -3208,27 +3208,27 @@ msgid "Width of border around the action area" msgstr "Width of border around the action area" #: ../gtk/gtkinvisible.c:90 ../gtk/gtkmountoperation.c:175 -#: ../gtk/gtkstatusicon.c:279 ../gtk/gtkwindow.c:741 +#: ../gtk/gtkstatusicon.c:279 ../gtk/gtkwindow.c:740 msgid "Screen" msgstr "Screen" -#: ../gtk/gtkinvisible.c:91 ../gtk/gtkwindow.c:742 +#: ../gtk/gtkinvisible.c:91 ../gtk/gtkwindow.c:741 msgid "The screen where this window will be displayed" msgstr "The screen where this window will be displayed" -#: ../gtk/gtklabel.c:568 +#: ../gtk/gtklabel.c:567 msgid "The text of the label" msgstr "The text of the label" -#: ../gtk/gtklabel.c:575 +#: ../gtk/gtklabel.c:574 msgid "A list of style attributes to apply to the text of the label" msgstr "A list of style attributes to apply to the text of the label" -#: ../gtk/gtklabel.c:596 ../gtk/gtktexttag.c:335 ../gtk/gtktextview.c:703 +#: ../gtk/gtklabel.c:595 ../gtk/gtktexttag.c:335 ../gtk/gtktextview.c:703 msgid "Justification" msgstr "Justification" -#: ../gtk/gtklabel.c:597 +#: ../gtk/gtklabel.c:596 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 " @@ -3238,11 +3238,11 @@ msgstr "" "This does NOT affect the alignment of the label within its allocation. See " "GtkMisc::xalign for that" -#: ../gtk/gtklabel.c:605 +#: ../gtk/gtklabel.c:604 msgid "Pattern" msgstr "Pattern" -#: ../gtk/gtklabel.c:606 +#: ../gtk/gtklabel.c:605 msgid "" "A string with _ characters in positions correspond to characters in the text " "to underline" @@ -3250,47 +3250,47 @@ msgstr "" "A string with _ characters in positions correspond to characters in the text " "to underline" -#: ../gtk/gtklabel.c:613 +#: ../gtk/gtklabel.c:612 msgid "Line wrap" msgstr "Line wrap" -#: ../gtk/gtklabel.c:614 +#: ../gtk/gtklabel.c:613 msgid "If set, wrap lines if the text becomes too wide" msgstr "If set, wrap lines if the text becomes too wide" -#: ../gtk/gtklabel.c:629 +#: ../gtk/gtklabel.c:628 msgid "Line wrap mode" msgstr "Line wrap mode" -#: ../gtk/gtklabel.c:630 +#: ../gtk/gtklabel.c:629 msgid "If wrap is set, controls how linewrapping is done" msgstr "If wrap is set, controls how linewrapping is done" -#: ../gtk/gtklabel.c:637 +#: ../gtk/gtklabel.c:636 msgid "Selectable" msgstr "Selectable" -#: ../gtk/gtklabel.c:638 +#: ../gtk/gtklabel.c:637 msgid "Whether the label text can be selected with the mouse" msgstr "Whether the label text can be selected with the mouse" -#: ../gtk/gtklabel.c:644 +#: ../gtk/gtklabel.c:643 msgid "Mnemonic key" msgstr "Mnemonic key" -#: ../gtk/gtklabel.c:645 +#: ../gtk/gtklabel.c:644 msgid "The mnemonic accelerator key for this label" msgstr "The mnemonic accelerator key for this label" -#: ../gtk/gtklabel.c:653 +#: ../gtk/gtklabel.c:652 msgid "Mnemonic widget" msgstr "Mnemonic widget" -#: ../gtk/gtklabel.c:654 +#: ../gtk/gtklabel.c:653 msgid "The widget to be activated when the label's mnemonic key is pressed" msgstr "The widget to be activated when the label's mnemonic key is pressed" -#: ../gtk/gtklabel.c:700 +#: ../gtk/gtklabel.c:699 msgid "" "The preferred place to ellipsize the string, if the label does not have " "enough room to display the entire string" @@ -3298,31 +3298,31 @@ msgstr "" "The preferred place to ellipsize the string, if the label does not have " "enough room to display the entire string" -#: ../gtk/gtklabel.c:741 +#: ../gtk/gtklabel.c:740 msgid "Single Line Mode" msgstr "Single Line Mode" -#: ../gtk/gtklabel.c:742 +#: ../gtk/gtklabel.c:741 msgid "Whether the label is in single line mode" msgstr "Whether the label is in single line mode" -#: ../gtk/gtklabel.c:759 +#: ../gtk/gtklabel.c:758 msgid "Angle" msgstr "Angle" -#: ../gtk/gtklabel.c:760 +#: ../gtk/gtklabel.c:759 msgid "Angle at which the label is rotated" msgstr "Angle at which the label is rotated" -#: ../gtk/gtklabel.c:782 +#: ../gtk/gtklabel.c:781 msgid "The desired maximum width of the label, in characters" msgstr "The desired maximum width of the label, in characters" -#: ../gtk/gtklabel.c:800 +#: ../gtk/gtklabel.c:799 msgid "Track visited links" msgstr "Track visited links" -#: ../gtk/gtklabel.c:801 +#: ../gtk/gtklabel.c:800 msgid "Whether visited links should be tracked" msgstr "Whether visited links should be tracked" @@ -3386,32 +3386,32 @@ msgstr "Internal padding" msgid "Amount of border space between the menubar shadow and the menu items" msgstr "Amount of border space between the menubar shadow and the menu items" -#: ../gtk/gtkmenu.c:522 +#: ../gtk/gtkmenu.c:521 msgid "The currently selected menu item" msgstr "The currently selected menu item" -#: ../gtk/gtkmenu.c:537 +#: ../gtk/gtkmenu.c:536 msgid "The accel group holding accelerators for the menu" msgstr "The accel group holding accelerators for the menu" -#: ../gtk/gtkmenu.c:551 ../gtk/gtkmenuitem.c:316 +#: ../gtk/gtkmenu.c:550 ../gtk/gtkmenuitem.c:316 msgid "Accel Path" msgstr "Accel Path" -#: ../gtk/gtkmenu.c:552 +#: ../gtk/gtkmenu.c:551 msgid "An accel path used to conveniently construct accel paths of child items" msgstr "" "An accel path used to conveniently construct accel paths of child items" -#: ../gtk/gtkmenu.c:568 +#: ../gtk/gtkmenu.c:567 msgid "Attach Widget" msgstr "Attach Widget" -#: ../gtk/gtkmenu.c:569 +#: ../gtk/gtkmenu.c:568 msgid "The widget the menu is attached to" msgstr "The widget the menu is attached to" -#: ../gtk/gtkmenu.c:577 +#: ../gtk/gtkmenu.c:576 msgid "" "A title that may be displayed by the window manager when this menu is torn-" "off" @@ -3419,35 +3419,35 @@ msgstr "" "A title that may be displayed by the window manager when this menu is torn-" "off" -#: ../gtk/gtkmenu.c:591 +#: ../gtk/gtkmenu.c:590 msgid "Tearoff State" msgstr "Tearoff State" -#: ../gtk/gtkmenu.c:592 +#: ../gtk/gtkmenu.c:591 msgid "A boolean that indicates whether the menu is torn-off" msgstr "A boolean that indicates whether the menu is torn-off" -#: ../gtk/gtkmenu.c:606 +#: ../gtk/gtkmenu.c:605 msgid "Monitor" msgstr "Monitor" -#: ../gtk/gtkmenu.c:607 +#: ../gtk/gtkmenu.c:606 msgid "The monitor the menu will be popped up on" msgstr "The monitor the menu will be popped up on" -#: ../gtk/gtkmenu.c:613 +#: ../gtk/gtkmenu.c:612 msgid "Vertical Padding" msgstr "Vertical Padding" -#: ../gtk/gtkmenu.c:614 +#: ../gtk/gtkmenu.c:613 msgid "Extra space at the top and bottom of the menu" msgstr "Extra space at the top and bottom of the menu" -#: ../gtk/gtkmenu.c:636 +#: ../gtk/gtkmenu.c:635 msgid "Reserve Toggle Size" msgstr "Reserve Toggle Size" -#: ../gtk/gtkmenu.c:637 +#: ../gtk/gtkmenu.c:636 msgid "" "A boolean that indicates whether the menu reserves space for toggles and " "icons" @@ -3455,19 +3455,19 @@ msgstr "" "A boolean that indicates whether the menu reserves space for toggles and " "icons" -#: ../gtk/gtkmenu.c:643 +#: ../gtk/gtkmenu.c:642 msgid "Horizontal Padding" msgstr "Horizontal Padding" -#: ../gtk/gtkmenu.c:644 +#: ../gtk/gtkmenu.c:643 msgid "Extra space at the left and right edges of the menu" msgstr "Extra space at the left and right edges of the menu" -#: ../gtk/gtkmenu.c:652 +#: ../gtk/gtkmenu.c:651 msgid "Vertical Offset" msgstr "Vertical Offset" -#: ../gtk/gtkmenu.c:653 +#: ../gtk/gtkmenu.c:652 msgid "" "When the menu is a submenu, position it this number of pixels offset " "vertically" @@ -3475,11 +3475,11 @@ msgstr "" "When the menu is a submenu, position it this number of pixels offset " "vertically" -#: ../gtk/gtkmenu.c:661 +#: ../gtk/gtkmenu.c:660 msgid "Horizontal Offset" msgstr "Horizontal Offset" -#: ../gtk/gtkmenu.c:662 +#: ../gtk/gtkmenu.c:661 msgid "" "When the menu is a submenu, position it this number of pixels offset " "horizontally" @@ -3487,55 +3487,55 @@ msgstr "" "When the menu is a submenu, position it this number of pixels offset " "horizontally" -#: ../gtk/gtkmenu.c:670 +#: ../gtk/gtkmenu.c:669 msgid "Double Arrows" msgstr "Double Arrows" -#: ../gtk/gtkmenu.c:671 +#: ../gtk/gtkmenu.c:670 msgid "When scrolling, always show both arrows." msgstr "When scrolling, always show both arrows." -#: ../gtk/gtkmenu.c:684 +#: ../gtk/gtkmenu.c:683 msgid "Arrow Placement" msgstr "Arrow Placement" -#: ../gtk/gtkmenu.c:685 +#: ../gtk/gtkmenu.c:684 msgid "Indicates where scroll arrows should be placed" msgstr "Indicates where scroll arrows should be placed" -#: ../gtk/gtkmenu.c:693 +#: ../gtk/gtkmenu.c:692 msgid "Left Attach" msgstr "Left Attach" -#: ../gtk/gtkmenu.c:694 ../gtk/gtktable.c:202 +#: ../gtk/gtkmenu.c:693 ../gtk/gtktable.c:202 msgid "The column number to attach the left side of the child to" msgstr "The column number to attach the left side of the child to" -#: ../gtk/gtkmenu.c:701 +#: ../gtk/gtkmenu.c:700 msgid "Right Attach" msgstr "Right Attach" -#: ../gtk/gtkmenu.c:702 +#: ../gtk/gtkmenu.c:701 msgid "The column number to attach the right side of the child to" msgstr "The column number to attach the right side of the child to" -#: ../gtk/gtkmenu.c:709 +#: ../gtk/gtkmenu.c:708 msgid "Top Attach" msgstr "Top Attach" -#: ../gtk/gtkmenu.c:710 +#: ../gtk/gtkmenu.c:709 msgid "The row number to attach the top of the child to" msgstr "The row number to attach the top of the child to" -#: ../gtk/gtkmenu.c:717 +#: ../gtk/gtkmenu.c:716 msgid "Bottom Attach" msgstr "Bottom Attach" -#: ../gtk/gtkmenu.c:718 ../gtk/gtktable.c:223 +#: ../gtk/gtkmenu.c:717 ../gtk/gtktable.c:223 msgid "The row number to attach the bottom of the child to" msgstr "The row number to attach the bottom of the child to" -#: ../gtk/gtkmenu.c:732 +#: ../gtk/gtkmenu.c:731 msgid "Arbitrary constant to scale down the size of the scroll arrow" msgstr "Arbitrary constant to scale down the size of the scroll arrow" @@ -3702,51 +3702,51 @@ msgstr "Are we showing a dialog" msgid "The screen where this window will be displayed." msgstr "The screen where this window will be displayed." -#: ../gtk/gtknotebook.c:689 +#: ../gtk/gtknotebook.c:691 msgid "Page" msgstr "Page" -#: ../gtk/gtknotebook.c:690 +#: ../gtk/gtknotebook.c:692 msgid "The index of the current page" msgstr "The index of the current page" -#: ../gtk/gtknotebook.c:698 +#: ../gtk/gtknotebook.c:700 msgid "Tab Position" msgstr "Tab Position" -#: ../gtk/gtknotebook.c:699 +#: ../gtk/gtknotebook.c:701 msgid "Which side of the notebook holds the tabs" msgstr "Which side of the notebook holds the tabs" -#: ../gtk/gtknotebook.c:706 +#: ../gtk/gtknotebook.c:708 msgid "Show Tabs" msgstr "Show Tabs" -#: ../gtk/gtknotebook.c:707 +#: ../gtk/gtknotebook.c:709 msgid "Whether tabs should be shown" msgstr "Whether tabs should be shown" -#: ../gtk/gtknotebook.c:713 +#: ../gtk/gtknotebook.c:715 msgid "Show Border" msgstr "Show Border" -#: ../gtk/gtknotebook.c:714 +#: ../gtk/gtknotebook.c:716 msgid "Whether the border should be shown" msgstr "Whether the border should be shown" -#: ../gtk/gtknotebook.c:720 +#: ../gtk/gtknotebook.c:722 msgid "Scrollable" msgstr "Scrollable" -#: ../gtk/gtknotebook.c:721 +#: ../gtk/gtknotebook.c:723 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit" msgstr "If TRUE, scroll arrows are added if there are too many tabs to fit" -#: ../gtk/gtknotebook.c:727 +#: ../gtk/gtknotebook.c:729 msgid "Enable Popup" msgstr "Enable Popup" -#: ../gtk/gtknotebook.c:728 +#: ../gtk/gtknotebook.c:730 msgid "" "If TRUE, pressing the right mouse button on the notebook pops up a menu that " "you can use to go to a page" @@ -3754,123 +3754,123 @@ msgstr "" "If TRUE, pressing the right mouse button on the notebook pops up a menu that " "you can use to go to a page" -#: ../gtk/gtknotebook.c:742 +#: ../gtk/gtknotebook.c:744 msgid "Group Name" msgstr "Group Name" -#: ../gtk/gtknotebook.c:743 +#: ../gtk/gtknotebook.c:745 msgid "Group name for tab drag and drop" msgstr "Group name for tab drag and drop" -#: ../gtk/gtknotebook.c:750 +#: ../gtk/gtknotebook.c:752 msgid "Tab label" msgstr "Tab label" -#: ../gtk/gtknotebook.c:751 +#: ../gtk/gtknotebook.c:753 msgid "The string displayed on the child's tab label" msgstr "The string displayed on the child's tab label" -#: ../gtk/gtknotebook.c:757 +#: ../gtk/gtknotebook.c:759 msgid "Menu label" msgstr "Menu label" -#: ../gtk/gtknotebook.c:758 +#: ../gtk/gtknotebook.c:760 msgid "The string displayed in the child's menu entry" msgstr "The string displayed in the child's menu entry" -#: ../gtk/gtknotebook.c:771 +#: ../gtk/gtknotebook.c:773 msgid "Tab expand" msgstr "Tab expand" -#: ../gtk/gtknotebook.c:772 +#: ../gtk/gtknotebook.c:774 msgid "Whether to expand the child's tab" msgstr "Whether to expand the child's tab" -#: ../gtk/gtknotebook.c:778 +#: ../gtk/gtknotebook.c:780 msgid "Tab fill" msgstr "Tab fill" -#: ../gtk/gtknotebook.c:779 +#: ../gtk/gtknotebook.c:781 msgid "Whether the child's tab should fill the allocated area" msgstr "Whether the child's tab should fill the allocated area" -#: ../gtk/gtknotebook.c:792 +#: ../gtk/gtknotebook.c:794 msgid "Tab pack type" msgstr "Tab pack type" -#: ../gtk/gtknotebook.c:799 +#: ../gtk/gtknotebook.c:801 msgid "Tab reorderable" msgstr "Tab reorderable" -#: ../gtk/gtknotebook.c:800 +#: ../gtk/gtknotebook.c:802 msgid "Whether the tab is reorderable by user action" msgstr "Whether the tab is reorderable by user action" -#: ../gtk/gtknotebook.c:806 +#: ../gtk/gtknotebook.c:808 msgid "Tab detachable" msgstr "Tab detachable" -#: ../gtk/gtknotebook.c:807 +#: ../gtk/gtknotebook.c:809 msgid "Whether the tab is detachable" msgstr "Whether the tab is detachable" -#: ../gtk/gtknotebook.c:822 ../gtk/gtkscrollbar.c:105 +#: ../gtk/gtknotebook.c:824 ../gtk/gtkscrollbar.c:105 msgid "Secondary backward stepper" msgstr "Secondary backward stepper" -#: ../gtk/gtknotebook.c:823 +#: ../gtk/gtknotebook.c:825 msgid "" "Display a second backward arrow button on the opposite end of the tab area" msgstr "" "Display a second backward arrow button on the opposite end of the tab area" -#: ../gtk/gtknotebook.c:838 ../gtk/gtkscrollbar.c:112 +#: ../gtk/gtknotebook.c:840 ../gtk/gtkscrollbar.c:112 msgid "Secondary forward stepper" msgstr "Secondary forward stepper" -#: ../gtk/gtknotebook.c:839 +#: ../gtk/gtknotebook.c:841 msgid "" "Display a second forward arrow button on the opposite end of the tab area" msgstr "" "Display a second forward arrow button on the opposite end of the tab area" -#: ../gtk/gtknotebook.c:853 ../gtk/gtkscrollbar.c:91 +#: ../gtk/gtknotebook.c:855 ../gtk/gtkscrollbar.c:91 msgid "Backward stepper" msgstr "Backward stepper" -#: ../gtk/gtknotebook.c:854 ../gtk/gtkscrollbar.c:92 +#: ../gtk/gtknotebook.c:856 ../gtk/gtkscrollbar.c:92 msgid "Display the standard backward arrow button" msgstr "Display the standard backward arrow button" -#: ../gtk/gtknotebook.c:868 ../gtk/gtkscrollbar.c:98 +#: ../gtk/gtknotebook.c:870 ../gtk/gtkscrollbar.c:98 msgid "Forward stepper" msgstr "Forward stepper" -#: ../gtk/gtknotebook.c:869 ../gtk/gtkscrollbar.c:99 +#: ../gtk/gtknotebook.c:871 ../gtk/gtkscrollbar.c:99 msgid "Display the standard forward arrow button" msgstr "Display the standard forward arrow button" -#: ../gtk/gtknotebook.c:883 +#: ../gtk/gtknotebook.c:885 msgid "Tab overlap" msgstr "Tab overlap" -#: ../gtk/gtknotebook.c:884 +#: ../gtk/gtknotebook.c:886 msgid "Size of tab overlap area" msgstr "Size of tab overlap area" -#: ../gtk/gtknotebook.c:899 +#: ../gtk/gtknotebook.c:901 msgid "Tab curvature" msgstr "Tab curvature" -#: ../gtk/gtknotebook.c:900 +#: ../gtk/gtknotebook.c:902 msgid "Size of tab curvature" msgstr "Size of tab curvature" -#: ../gtk/gtknotebook.c:916 +#: ../gtk/gtknotebook.c:918 msgid "Arrow spacing" msgstr "Arrow spacing" -#: ../gtk/gtknotebook.c:917 +#: ../gtk/gtknotebook.c:919 msgid "Scroll arrow spacing" msgstr "Scroll arrow spacing" @@ -4801,11 +4801,11 @@ msgstr "Draw" msgid "Whether the separator is drawn, or just blank" msgstr "Whether the separator is drawn, or just blank" -#: ../gtk/gtksettings.c:277 +#: ../gtk/gtksettings.c:285 msgid "Double Click Time" msgstr "Double Click Time" -#: ../gtk/gtksettings.c:278 +#: ../gtk/gtksettings.c:286 msgid "" "Maximum time allowed between two clicks for them to be considered a double " "click (in milliseconds)" @@ -4813,11 +4813,11 @@ msgstr "" "Maximum time allowed between two clicks for them to be considered a double " "click (in milliseconds)" -#: ../gtk/gtksettings.c:285 +#: ../gtk/gtksettings.c:293 msgid "Double Click Distance" msgstr "Double Click Distance" -#: ../gtk/gtksettings.c:286 +#: ../gtk/gtksettings.c:294 msgid "" "Maximum distance allowed between two clicks for them to be considered a " "double click (in pixels)" @@ -4825,35 +4825,35 @@ msgstr "" "Maximum distance allowed between two clicks for them to be considered a " "double click (in pixels)" -#: ../gtk/gtksettings.c:302 +#: ../gtk/gtksettings.c:310 msgid "Cursor Blink" msgstr "Cursor Blink" -#: ../gtk/gtksettings.c:303 +#: ../gtk/gtksettings.c:311 msgid "Whether the cursor should blink" msgstr "Whether the cursor should blink" -#: ../gtk/gtksettings.c:310 +#: ../gtk/gtksettings.c:318 msgid "Cursor Blink Time" msgstr "Cursor Blink Time" -#: ../gtk/gtksettings.c:311 +#: ../gtk/gtksettings.c:319 msgid "Length of the cursor blink cycle, in milliseconds" msgstr "Length of the cursor blink cycle, in milliseconds" -#: ../gtk/gtksettings.c:330 +#: ../gtk/gtksettings.c:338 msgid "Cursor Blink Timeout" msgstr "Cursor Blink Timeout" -#: ../gtk/gtksettings.c:331 +#: ../gtk/gtksettings.c:339 msgid "Time after which the cursor stops blinking, in seconds" msgstr "Time after which the cursor stops blinking, in seconds" -#: ../gtk/gtksettings.c:338 +#: ../gtk/gtksettings.c:346 msgid "Split Cursor" msgstr "Split Cursor" -#: ../gtk/gtksettings.c:339 +#: ../gtk/gtksettings.c:347 msgid "" "Whether two cursors should be displayed for mixed left-to-right and right-to-" "left text" @@ -4861,149 +4861,149 @@ msgstr "" "Whether two cursors should be displayed for mixed left-to-right and right-to-" "left text" -#: ../gtk/gtksettings.c:346 +#: ../gtk/gtksettings.c:354 msgid "Theme Name" msgstr "Theme Name" -#: ../gtk/gtksettings.c:347 +#: ../gtk/gtksettings.c:355 msgid "Name of theme RC file to load" msgstr "Name of theme RC file to load" -#: ../gtk/gtksettings.c:355 +#: ../gtk/gtksettings.c:363 msgid "Icon Theme Name" msgstr "Icon Theme Name" -#: ../gtk/gtksettings.c:356 +#: ../gtk/gtksettings.c:364 msgid "Name of icon theme to use" msgstr "Name of icon theme to use" -#: ../gtk/gtksettings.c:364 +#: ../gtk/gtksettings.c:372 msgid "Fallback Icon Theme Name" msgstr "Fallback Icon Theme Name" -#: ../gtk/gtksettings.c:365 +#: ../gtk/gtksettings.c:373 msgid "Name of a icon theme to fall back to" msgstr "Name of a icon theme to fall back to" -#: ../gtk/gtksettings.c:373 +#: ../gtk/gtksettings.c:381 msgid "Key Theme Name" msgstr "Key Theme Name" -#: ../gtk/gtksettings.c:374 +#: ../gtk/gtksettings.c:382 msgid "Name of key theme RC file to load" msgstr "Name of key theme RC file to load" -#: ../gtk/gtksettings.c:382 +#: ../gtk/gtksettings.c:390 msgid "Menu bar accelerator" msgstr "Menu bar accelerator" -#: ../gtk/gtksettings.c:383 +#: ../gtk/gtksettings.c:391 msgid "Keybinding to activate the menu bar" msgstr "Keybinding to activate the menu bar" -#: ../gtk/gtksettings.c:391 +#: ../gtk/gtksettings.c:399 msgid "Drag threshold" msgstr "Drag threshold" -#: ../gtk/gtksettings.c:392 +#: ../gtk/gtksettings.c:400 msgid "Number of pixels the cursor can move before dragging" msgstr "Number of pixels the cursor can move before dragging" -#: ../gtk/gtksettings.c:400 +#: ../gtk/gtksettings.c:408 msgid "Font Name" msgstr "Font Name" -#: ../gtk/gtksettings.c:401 +#: ../gtk/gtksettings.c:409 msgid "Name of default font to use" msgstr "Name of default font to use" -#: ../gtk/gtksettings.c:423 +#: ../gtk/gtksettings.c:431 msgid "Icon Sizes" msgstr "Icon Sizes" -#: ../gtk/gtksettings.c:424 +#: ../gtk/gtksettings.c:432 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..." msgstr "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..." -#: ../gtk/gtksettings.c:432 +#: ../gtk/gtksettings.c:440 msgid "GTK Modules" msgstr "GTK Modules" -#: ../gtk/gtksettings.c:433 +#: ../gtk/gtksettings.c:441 msgid "List of currently active GTK modules" msgstr "List of currently active GTK modules" -#: ../gtk/gtksettings.c:442 +#: ../gtk/gtksettings.c:450 msgid "Xft Antialias" msgstr "Xft Antialias" -#: ../gtk/gtksettings.c:443 +#: ../gtk/gtksettings.c:451 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default" msgstr "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default" -#: ../gtk/gtksettings.c:452 +#: ../gtk/gtksettings.c:460 msgid "Xft Hinting" msgstr "Xft Hinting" -#: ../gtk/gtksettings.c:453 +#: ../gtk/gtksettings.c:461 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default" msgstr "Whether to hint Xft fonts; 0=no, 1=yes, -1=default" -#: ../gtk/gtksettings.c:462 +#: ../gtk/gtksettings.c:470 msgid "Xft Hint Style" msgstr "Xft Hint Style" -#: ../gtk/gtksettings.c:463 +#: ../gtk/gtksettings.c:471 msgid "" "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull" msgstr "" "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull" -#: ../gtk/gtksettings.c:472 +#: ../gtk/gtksettings.c:480 msgid "Xft RGBA" msgstr "Xft RGBA" -#: ../gtk/gtksettings.c:473 +#: ../gtk/gtksettings.c:481 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr" msgstr "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr" -#: ../gtk/gtksettings.c:482 +#: ../gtk/gtksettings.c:490 msgid "Xft DPI" msgstr "Xft DPI" -#: ../gtk/gtksettings.c:483 +#: ../gtk/gtksettings.c:491 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value" msgstr "Resolution for Xft, in 1024 * dots/inch. -1 to use default value" -#: ../gtk/gtksettings.c:492 +#: ../gtk/gtksettings.c:500 msgid "Cursor theme name" msgstr "Cursor theme name" -#: ../gtk/gtksettings.c:493 +#: ../gtk/gtksettings.c:501 msgid "Name of the cursor theme to use, or NULL to use the default theme" msgstr "Name of the cursor theme to use, or NULL to use the default theme" -#: ../gtk/gtksettings.c:501 +#: ../gtk/gtksettings.c:509 msgid "Cursor theme size" msgstr "Cursor theme size" -#: ../gtk/gtksettings.c:502 +#: ../gtk/gtksettings.c:510 msgid "Size to use for cursors, or 0 to use the default size" msgstr "Size to use for cursors, or 0 to use the default size" -#: ../gtk/gtksettings.c:512 +#: ../gtk/gtksettings.c:520 msgid "Alternative button order" msgstr "Alternative button order" -#: ../gtk/gtksettings.c:513 +#: ../gtk/gtksettings.c:521 msgid "Whether buttons in dialogs should use the alternative button order" msgstr "Whether buttons in dialogs should use the alternative button order" -#: ../gtk/gtksettings.c:530 +#: ../gtk/gtksettings.c:538 msgid "Alternative sort indicator direction" msgstr "Alternative sort indicator direction" -#: ../gtk/gtksettings.c:531 +#: ../gtk/gtksettings.c:539 msgid "" "Whether the direction of the sort indicators in list and tree views is " "inverted compared to the default (where down means ascending)" @@ -5011,11 +5011,11 @@ msgstr "" "Whether the direction of the sort indicators in list and tree views is " "inverted compared to the default (where down means ascending)" -#: ../gtk/gtksettings.c:539 +#: ../gtk/gtksettings.c:547 msgid "Show the 'Input Methods' menu" msgstr "Show the 'Input Methods' menu" -#: ../gtk/gtksettings.c:540 +#: ../gtk/gtksettings.c:548 msgid "" "Whether the context menus of entries and text views should offer to change " "the input method" @@ -5023,11 +5023,11 @@ msgstr "" "Whether the context menus of entries and text views should offer to change " "the input method" -#: ../gtk/gtksettings.c:548 +#: ../gtk/gtksettings.c:556 msgid "Show the 'Insert Unicode Control Character' menu" msgstr "Show the 'Insert Unicode Control Character' menu" -#: ../gtk/gtksettings.c:549 +#: ../gtk/gtksettings.c:557 msgid "" "Whether the context menus of entries and text views should offer to insert " "control characters" @@ -5035,238 +5035,238 @@ msgstr "" "Whether the context menus of entries and text views should offer to insert " "control characters" -#: ../gtk/gtksettings.c:557 +#: ../gtk/gtksettings.c:565 msgid "Start timeout" msgstr "Start timeout" -#: ../gtk/gtksettings.c:558 +#: ../gtk/gtksettings.c:566 msgid "Starting value for timeouts, when button is pressed" msgstr "Starting value for timeouts, when button is pressed" -#: ../gtk/gtksettings.c:567 +#: ../gtk/gtksettings.c:575 msgid "Repeat timeout" msgstr "Repeat timeout" -#: ../gtk/gtksettings.c:568 +#: ../gtk/gtksettings.c:576 msgid "Repeat value for timeouts, when button is pressed" msgstr "Repeat value for timeouts, when button is pressed" -#: ../gtk/gtksettings.c:577 +#: ../gtk/gtksettings.c:585 msgid "Expand timeout" msgstr "Expand timeout" -#: ../gtk/gtksettings.c:578 +#: ../gtk/gtksettings.c:586 msgid "Expand value for timeouts, when a widget is expanding a new region" msgstr "Expand value for timeouts, when a widget is expanding a new region" -#: ../gtk/gtksettings.c:613 +#: ../gtk/gtksettings.c:621 msgid "Color scheme" msgstr "Color scheme" -#: ../gtk/gtksettings.c:614 +#: ../gtk/gtksettings.c:622 msgid "A palette of named colors for use in themes" msgstr "A palette of named colors for use in themes" -#: ../gtk/gtksettings.c:623 +#: ../gtk/gtksettings.c:631 msgid "Enable Animations" msgstr "Enable Animations" -#: ../gtk/gtksettings.c:624 +#: ../gtk/gtksettings.c:632 msgid "Whether to enable toolkit-wide animations." msgstr "Whether to enable toolkit-wide animations." -#: ../gtk/gtksettings.c:642 +#: ../gtk/gtksettings.c:650 msgid "Enable Touchscreen Mode" msgstr "Enable Touchscreen Mode" -#: ../gtk/gtksettings.c:643 +#: ../gtk/gtksettings.c:651 msgid "When TRUE, there are no motion notify events delivered on this screen" msgstr "When TRUE, there are no motion notify events delivered on this screen" -#: ../gtk/gtksettings.c:660 +#: ../gtk/gtksettings.c:668 msgid "Tooltip timeout" msgstr "Tooltip timeout" -#: ../gtk/gtksettings.c:661 +#: ../gtk/gtksettings.c:669 msgid "Timeout before tooltip is shown" msgstr "Timeout before tooltip is shown" -#: ../gtk/gtksettings.c:686 +#: ../gtk/gtksettings.c:694 msgid "Tooltip browse timeout" msgstr "Tooltip browse timeout" -#: ../gtk/gtksettings.c:687 +#: ../gtk/gtksettings.c:695 msgid "Timeout before tooltip is shown when browse mode is enabled" msgstr "Timeout before tooltip is shown when browse mode is enabled" -#: ../gtk/gtksettings.c:708 +#: ../gtk/gtksettings.c:716 msgid "Tooltip browse mode timeout" msgstr "Tooltip browse mode timeout" -#: ../gtk/gtksettings.c:709 +#: ../gtk/gtksettings.c:717 msgid "Timeout after which browse mode is disabled" msgstr "Timeout after which browse mode is disabled" -#: ../gtk/gtksettings.c:728 +#: ../gtk/gtksettings.c:736 msgid "Keynav Cursor Only" msgstr "Keynav Cursor Only" -#: ../gtk/gtksettings.c:729 +#: ../gtk/gtksettings.c:737 msgid "When TRUE, there are only cursor keys available to navigate widgets" msgstr "When TRUE, there are only cursor keys available to navigate widgets" -#: ../gtk/gtksettings.c:746 +#: ../gtk/gtksettings.c:754 msgid "Keynav Wrap Around" msgstr "Keynav Wrap Around" -#: ../gtk/gtksettings.c:747 +#: ../gtk/gtksettings.c:755 msgid "Whether to wrap around when keyboard-navigating widgets" msgstr "Whether to wrap around when keyboard-navigating widgets" -#: ../gtk/gtksettings.c:767 +#: ../gtk/gtksettings.c:775 msgid "Error Bell" msgstr "Error Bell" -#: ../gtk/gtksettings.c:768 +#: ../gtk/gtksettings.c:776 msgid "When TRUE, keyboard navigation and other errors will cause a beep" msgstr "When TRUE, keyboard navigation and other errors will cause a beep" -#: ../gtk/gtksettings.c:785 +#: ../gtk/gtksettings.c:793 msgid "Color Hash" msgstr "Color Hash" -#: ../gtk/gtksettings.c:786 +#: ../gtk/gtksettings.c:794 msgid "A hash table representation of the color scheme." msgstr "A hash table representation of the color scheme." -#: ../gtk/gtksettings.c:794 +#: ../gtk/gtksettings.c:802 msgid "Default file chooser backend" msgstr "Default file chooser backend" -#: ../gtk/gtksettings.c:795 +#: ../gtk/gtksettings.c:803 msgid "Name of the GtkFileChooser backend to use by default" msgstr "Name of the GtkFileChooser backend to use by default" -#: ../gtk/gtksettings.c:812 +#: ../gtk/gtksettings.c:820 msgid "Default print backend" msgstr "Default print backend" -#: ../gtk/gtksettings.c:813 +#: ../gtk/gtksettings.c:821 msgid "List of the GtkPrintBackend backends to use by default" msgstr "List of the GtkPrintBackend backends to use by default" -#: ../gtk/gtksettings.c:836 +#: ../gtk/gtksettings.c:844 msgid "Default command to run when displaying a print preview" msgstr "Default command to run when displaying a print preview" -#: ../gtk/gtksettings.c:837 +#: ../gtk/gtksettings.c:845 msgid "Command to run when displaying a print preview" msgstr "Command to run when displaying a print preview" -#: ../gtk/gtksettings.c:853 +#: ../gtk/gtksettings.c:861 msgid "Enable Mnemonics" msgstr "Enable Mnemonics" -#: ../gtk/gtksettings.c:854 +#: ../gtk/gtksettings.c:862 msgid "Whether labels should have mnemonics" msgstr "Whether labels should have mnemonics" -#: ../gtk/gtksettings.c:870 +#: ../gtk/gtksettings.c:878 msgid "Enable Accelerators" msgstr "Enable Accelerators" -#: ../gtk/gtksettings.c:871 +#: ../gtk/gtksettings.c:879 msgid "Whether menu items should have accelerators" msgstr "Whether menu items should have accelerators" -#: ../gtk/gtksettings.c:888 +#: ../gtk/gtksettings.c:896 msgid "Recent Files Limit" msgstr "Recent Files Limit" -#: ../gtk/gtksettings.c:889 +#: ../gtk/gtksettings.c:897 msgid "Number of recently used files" msgstr "Number of recently used files" -#: ../gtk/gtksettings.c:907 +#: ../gtk/gtksettings.c:915 msgid "Default IM module" msgstr "Default IM module" -#: ../gtk/gtksettings.c:908 +#: ../gtk/gtksettings.c:916 msgid "Which IM module should be used by default" msgstr "Which IM module should be used by default" -#: ../gtk/gtksettings.c:926 +#: ../gtk/gtksettings.c:934 msgid "Recent Files Max Age" msgstr "Recent Files Max Age" -#: ../gtk/gtksettings.c:927 +#: ../gtk/gtksettings.c:935 msgid "Maximum age of recently used files, in days" msgstr "Maximum age of recently used files, in days" -#: ../gtk/gtksettings.c:936 +#: ../gtk/gtksettings.c:944 msgid "Fontconfig configuration timestamp" msgstr "Fontconfig configuration timestamp" -#: ../gtk/gtksettings.c:937 +#: ../gtk/gtksettings.c:945 msgid "Timestamp of current fontconfig configuration" msgstr "Timestamp of current fontconfig configuration" -#: ../gtk/gtksettings.c:959 +#: ../gtk/gtksettings.c:967 msgid "Sound Theme Name" msgstr "Sound Theme Name" -#: ../gtk/gtksettings.c:960 +#: ../gtk/gtksettings.c:968 msgid "XDG sound theme name" msgstr "XDG sound theme name" #. Translators: this means sounds that are played as feedback to user input -#: ../gtk/gtksettings.c:982 +#: ../gtk/gtksettings.c:990 msgid "Audible Input Feedback" msgstr "Audible Input Feedback" -#: ../gtk/gtksettings.c:983 +#: ../gtk/gtksettings.c:991 msgid "Whether to play event sounds as feedback to user input" msgstr "Whether to play event sounds as feedback to user input" -#: ../gtk/gtksettings.c:1004 +#: ../gtk/gtksettings.c:1012 msgid "Enable Event Sounds" msgstr "Enable Event Sounds" -#: ../gtk/gtksettings.c:1005 +#: ../gtk/gtksettings.c:1013 msgid "Whether to play any event sounds at all" msgstr "Whether to play any event sounds at all" -#: ../gtk/gtksettings.c:1020 +#: ../gtk/gtksettings.c:1028 msgid "Enable Tooltips" msgstr "Enable Tooltips" -#: ../gtk/gtksettings.c:1021 +#: ../gtk/gtksettings.c:1029 msgid "Whether tooltips should be shown on widgets" msgstr "Whether tooltips should be shown on widgets" -#: ../gtk/gtksettings.c:1034 +#: ../gtk/gtksettings.c:1042 msgid "Toolbar style" msgstr "Toolbar style" -#: ../gtk/gtksettings.c:1035 +#: ../gtk/gtksettings.c:1043 msgid "" "Whether default toolbars have text only, text and icons, icons only, etc." msgstr "" "Whether default toolbars have text only, text and icons, icons only, etc." -#: ../gtk/gtksettings.c:1049 +#: ../gtk/gtksettings.c:1057 msgid "Toolbar Icon Size" msgstr "Toolbar Icon Size" -#: ../gtk/gtksettings.c:1050 +#: ../gtk/gtksettings.c:1058 msgid "The size of icons in default toolbars." msgstr "The size of icons in default toolbars." -#: ../gtk/gtksettings.c:1067 +#: ../gtk/gtksettings.c:1075 msgid "Auto Mnemonics" msgstr "Auto Mnemonics" -#: ../gtk/gtksettings.c:1068 +#: ../gtk/gtksettings.c:1076 msgid "" "Whether mnemonics should be automatically shown and hidden when the user " "presses the mnemonic activator." @@ -5274,59 +5274,59 @@ msgstr "" "Whether mnemonics should be automatically shown and hidden when the user " "presses the mnemonic activator." -#: ../gtk/gtksettings.c:1093 +#: ../gtk/gtksettings.c:1101 msgid "Application prefers a dark theme" msgstr "Application prefers a dark theme" -#: ../gtk/gtksettings.c:1094 +#: ../gtk/gtksettings.c:1102 msgid "Whether the application prefers to have a dark theme." msgstr "Whether the application prefers to have a dark theme." -#: ../gtk/gtksettings.c:1109 +#: ../gtk/gtksettings.c:1117 msgid "Show button images" msgstr "Show button images" -#: ../gtk/gtksettings.c:1110 +#: ../gtk/gtksettings.c:1118 msgid "Whether images should be shown on buttons" msgstr "Whether images should be shown on buttons" -#: ../gtk/gtksettings.c:1118 ../gtk/gtksettings.c:1212 +#: ../gtk/gtksettings.c:1126 ../gtk/gtksettings.c:1220 msgid "Select on focus" msgstr "Select on focus" -#: ../gtk/gtksettings.c:1119 +#: ../gtk/gtksettings.c:1127 msgid "Whether to select the contents of an entry when it is focused" msgstr "Whether to select the contents of an entry when it is focused" -#: ../gtk/gtksettings.c:1136 +#: ../gtk/gtksettings.c:1144 msgid "Password Hint Timeout" msgstr "Password Hint Timeout" -#: ../gtk/gtksettings.c:1137 +#: ../gtk/gtksettings.c:1145 msgid "How long to show the last input character in hidden entries" msgstr "How long to show the last input character in hidden entries" -#: ../gtk/gtksettings.c:1146 +#: ../gtk/gtksettings.c:1154 msgid "Show menu images" msgstr "Show menu images" -#: ../gtk/gtksettings.c:1147 +#: ../gtk/gtksettings.c:1155 msgid "Whether images should be shown in menus" msgstr "Whether images should be shown in menus" -#: ../gtk/gtksettings.c:1155 +#: ../gtk/gtksettings.c:1163 msgid "Delay before drop down menus appear" msgstr "Delay before drop down menus appear" -#: ../gtk/gtksettings.c:1156 +#: ../gtk/gtksettings.c:1164 msgid "Delay before the submenus of a menu bar appear" msgstr "Delay before the submenus of a menu bar appear" -#: ../gtk/gtksettings.c:1173 +#: ../gtk/gtksettings.c:1181 msgid "Scrolled Window Placement" msgstr "Scrolled Window Placement" -#: ../gtk/gtksettings.c:1174 +#: ../gtk/gtksettings.c:1182 msgid "" "Where the contents of scrolled windows are located with respect to the " "scrollbars, if not overridden by the scrolled window's own placement." @@ -5334,31 +5334,31 @@ msgstr "" "Where the contents of scrolled windows are located with respect to the " "scrollbars, if not overridden by the scrolled window's own placement." -#: ../gtk/gtksettings.c:1183 +#: ../gtk/gtksettings.c:1191 msgid "Can change accelerators" msgstr "Can change accelerators" -#: ../gtk/gtksettings.c:1184 +#: ../gtk/gtksettings.c:1192 msgid "" "Whether menu accelerators can be changed by pressing a key over the menu item" msgstr "" "Whether menu accelerators can be changed by pressing a key over the menu item" -#: ../gtk/gtksettings.c:1192 +#: ../gtk/gtksettings.c:1200 msgid "Delay before submenus appear" msgstr "Delay before submenus appear" -#: ../gtk/gtksettings.c:1193 +#: ../gtk/gtksettings.c:1201 msgid "" "Minimum time the pointer must stay over a menu item before the submenu appear" msgstr "" "Minimum time the pointer must stay over a menu item before the submenu appear" -#: ../gtk/gtksettings.c:1202 +#: ../gtk/gtksettings.c:1210 msgid "Delay before hiding a submenu" msgstr "Delay before hiding a submenu" -#: ../gtk/gtksettings.c:1203 +#: ../gtk/gtksettings.c:1211 msgid "" "The time before hiding a submenu when the pointer is moving towards the " "submenu" @@ -5366,32 +5366,32 @@ msgstr "" "The time before hiding a submenu when the pointer is moving towards the " "submenu" -#: ../gtk/gtksettings.c:1213 +#: ../gtk/gtksettings.c:1221 msgid "Whether to select the contents of a selectable label when it is focused" msgstr "" "Whether to select the contents of a selectable label when it is focused" -#: ../gtk/gtksettings.c:1221 +#: ../gtk/gtksettings.c:1229 msgid "Custom palette" msgstr "Custom palette" -#: ../gtk/gtksettings.c:1222 +#: ../gtk/gtksettings.c:1230 msgid "Palette to use in the color selector" msgstr "Palette to use in the color selector" -#: ../gtk/gtksettings.c:1230 +#: ../gtk/gtksettings.c:1238 msgid "IM Preedit style" msgstr "IM Preedit style" -#: ../gtk/gtksettings.c:1231 +#: ../gtk/gtksettings.c:1239 msgid "How to draw the input method preedit string" msgstr "How to draw the input method preedit string" -#: ../gtk/gtksettings.c:1240 +#: ../gtk/gtksettings.c:1248 msgid "IM Status style" msgstr "IM Status style" -#: ../gtk/gtksettings.c:1241 +#: ../gtk/gtksettings.c:1249 msgid "How to draw the input method statusbar" msgstr "How to draw the input method statusbar" @@ -5467,15 +5467,15 @@ msgstr "Reads the current value, or sets a new value" msgid "Style of bevel around the spin button" msgstr "Style of bevel around the spin button" -#: ../gtk/gtkspinner.c:132 +#: ../gtk/gtkspinner.c:119 msgid "Whether the spinner is active" msgstr "Whether the spinner is active" -#: ../gtk/gtkspinner.c:146 +#: ../gtk/gtkspinner.c:135 msgid "Number of steps" msgstr "Number of steps" -#: ../gtk/gtkspinner.c:147 +#: ../gtk/gtkspinner.c:136 msgid "" "The number of steps for the spinner to complete a full loop. The animation " "will complete a full cycle in one second by default (see #GtkSpinner:cycle-" @@ -5485,11 +5485,11 @@ msgstr "" "will complete a full cycle in one second by default (see #GtkSpinner:cycle-" "duration)." -#: ../gtk/gtkspinner.c:162 +#: ../gtk/gtkspinner.c:153 msgid "Animation duration" msgstr "Animation duration" -#: ../gtk/gtkspinner.c:163 +#: ../gtk/gtkspinner.c:154 msgid "" "The length of time in milliseconds for the spinner to complete a full loop" msgstr "" @@ -5519,7 +5519,7 @@ msgstr "Whether the status icon is embedded" msgid "The orientation of the tray" msgstr "The orientation of the tray" -#: ../gtk/gtkstatusicon.c:347 ../gtk/gtkwidget.c:1022 +#: ../gtk/gtkstatusicon.c:347 ../gtk/gtkwidget.c:1036 msgid "Has tooltip" msgstr "Has tooltip" @@ -5527,15 +5527,15 @@ msgstr "Has tooltip" msgid "Whether this tray icon has a tooltip" msgstr "Whether this tray icon has a tooltip" -#: ../gtk/gtkstatusicon.c:373 ../gtk/gtkwidget.c:1043 +#: ../gtk/gtkstatusicon.c:373 ../gtk/gtkwidget.c:1057 msgid "Tooltip Text" msgstr "Tooltip Text" -#: ../gtk/gtkstatusicon.c:374 ../gtk/gtkwidget.c:1044 ../gtk/gtkwidget.c:1065 +#: ../gtk/gtkstatusicon.c:374 ../gtk/gtkwidget.c:1058 ../gtk/gtkwidget.c:1079 msgid "The contents of the tooltip for this widget" msgstr "The contents of the tooltip for this widget" -#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1064 +#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1078 msgid "Tooltip markup" msgstr "Tooltip markup" @@ -5547,6 +5547,14 @@ msgstr "The contents of the tooltip for this tray icon" msgid "The title of this tray icon" msgstr "The title of this tray icon" +#: ../gtk/gtkstyle.c:516 +msgid "Style context" +msgstr "Style context" + +#: ../gtk/gtkstyle.c:517 +msgid "GtkStyleContext to get style from" +msgstr "GtkStyleContext to get style from" + #: ../gtk/gtkswitch.c:739 msgid "Whether the switch is on or off" msgstr "Whether the switch is on or off" @@ -6549,7 +6557,7 @@ msgstr "Dash pattern used to draw the tree view lines" msgid "Whether to display the column" msgstr "Whether to display the column" -#: ../gtk/gtktreeviewcolumn.c:221 ../gtk/gtkwindow.c:657 +#: ../gtk/gtktreeviewcolumn.c:221 ../gtk/gtkwindow.c:656 msgid "Resizable" msgstr "Resizable" @@ -6669,27 +6677,27 @@ msgstr "An XML string describing the merged UI" msgid "Determines how the shadowed box around the viewport is drawn" msgstr "Determines how the shadowed box around the viewport is drawn" -#: ../gtk/gtkwidget.c:873 +#: ../gtk/gtkwidget.c:887 msgid "Widget name" msgstr "Widget name" -#: ../gtk/gtkwidget.c:874 +#: ../gtk/gtkwidget.c:888 msgid "The name of the widget" msgstr "The name of the widget" -#: ../gtk/gtkwidget.c:880 +#: ../gtk/gtkwidget.c:894 msgid "Parent widget" msgstr "Parent widget" -#: ../gtk/gtkwidget.c:881 +#: ../gtk/gtkwidget.c:895 msgid "The parent widget of this widget. Must be a Container widget" msgstr "The parent widget of this widget. Must be a Container widget" -#: ../gtk/gtkwidget.c:888 +#: ../gtk/gtkwidget.c:902 msgid "Width request" msgstr "Width request" -#: ../gtk/gtkwidget.c:889 +#: ../gtk/gtkwidget.c:903 msgid "" "Override for width request of the widget, or -1 if natural request should be " "used" @@ -6697,11 +6705,11 @@ msgstr "" "Override for width request of the widget, or -1 if natural request should be " "used" -#: ../gtk/gtkwidget.c:897 +#: ../gtk/gtkwidget.c:911 msgid "Height request" msgstr "Height request" -#: ../gtk/gtkwidget.c:898 +#: ../gtk/gtkwidget.c:912 msgid "" "Override for height request of the widget, or -1 if natural request should " "be used" @@ -6709,83 +6717,83 @@ msgstr "" "Override for height request of the widget, or -1 if natural request should " "be used" -#: ../gtk/gtkwidget.c:907 +#: ../gtk/gtkwidget.c:921 msgid "Whether the widget is visible" msgstr "Whether the widget is visible" -#: ../gtk/gtkwidget.c:914 +#: ../gtk/gtkwidget.c:928 msgid "Whether the widget responds to input" msgstr "Whether the widget responds to input" -#: ../gtk/gtkwidget.c:920 +#: ../gtk/gtkwidget.c:934 msgid "Application paintable" msgstr "Application paintable" -#: ../gtk/gtkwidget.c:921 +#: ../gtk/gtkwidget.c:935 msgid "Whether the application will paint directly on the widget" msgstr "Whether the application will paint directly on the widget" -#: ../gtk/gtkwidget.c:927 +#: ../gtk/gtkwidget.c:941 msgid "Can focus" msgstr "Can focus" -#: ../gtk/gtkwidget.c:928 +#: ../gtk/gtkwidget.c:942 msgid "Whether the widget can accept the input focus" msgstr "Whether the widget can accept the input focus" -#: ../gtk/gtkwidget.c:934 +#: ../gtk/gtkwidget.c:948 msgid "Has focus" msgstr "Has focus" -#: ../gtk/gtkwidget.c:935 +#: ../gtk/gtkwidget.c:949 msgid "Whether the widget has the input focus" msgstr "Whether the widget has the input focus" -#: ../gtk/gtkwidget.c:941 +#: ../gtk/gtkwidget.c:955 msgid "Is focus" msgstr "Is focus" -#: ../gtk/gtkwidget.c:942 +#: ../gtk/gtkwidget.c:956 msgid "Whether the widget is the focus widget within the toplevel" msgstr "Whether the widget is the focus widget within the toplevel" -#: ../gtk/gtkwidget.c:948 +#: ../gtk/gtkwidget.c:962 msgid "Can default" msgstr "Can default" -#: ../gtk/gtkwidget.c:949 +#: ../gtk/gtkwidget.c:963 msgid "Whether the widget can be the default widget" msgstr "Whether the widget can be the default widget" -#: ../gtk/gtkwidget.c:955 +#: ../gtk/gtkwidget.c:969 msgid "Has default" msgstr "Has default" -#: ../gtk/gtkwidget.c:956 +#: ../gtk/gtkwidget.c:970 msgid "Whether the widget is the default widget" msgstr "Whether the widget is the default widget" -#: ../gtk/gtkwidget.c:962 +#: ../gtk/gtkwidget.c:976 msgid "Receives default" msgstr "Receives default" -#: ../gtk/gtkwidget.c:963 +#: ../gtk/gtkwidget.c:977 msgid "If TRUE, the widget will receive the default action when it is focused" msgstr "If TRUE, the widget will receive the default action when it is focused" -#: ../gtk/gtkwidget.c:969 +#: ../gtk/gtkwidget.c:983 msgid "Composite child" msgstr "Composite child" -#: ../gtk/gtkwidget.c:970 +#: ../gtk/gtkwidget.c:984 msgid "Whether the widget is part of a composite widget" msgstr "Whether the widget is part of a composite widget" -#: ../gtk/gtkwidget.c:976 +#: ../gtk/gtkwidget.c:990 msgid "Style" msgstr "Style" -#: ../gtk/gtkwidget.c:977 +#: ../gtk/gtkwidget.c:991 msgid "" "The style of the widget, which contains information about how it will look " "(colors etc)" @@ -6793,183 +6801,183 @@ msgstr "" "The style of the widget, which contains information about how it will look " "(colors etc)" -#: ../gtk/gtkwidget.c:983 +#: ../gtk/gtkwidget.c:997 msgid "Events" msgstr "Events" -#: ../gtk/gtkwidget.c:984 +#: ../gtk/gtkwidget.c:998 msgid "The event mask that decides what kind of GdkEvents this widget gets" msgstr "The event mask that decides what kind of GdkEvents this widget gets" -#: ../gtk/gtkwidget.c:991 +#: ../gtk/gtkwidget.c:1005 msgid "Extension events" msgstr "Extension events" -#: ../gtk/gtkwidget.c:992 +#: ../gtk/gtkwidget.c:1006 msgid "The mask that decides what kind of extension events this widget gets" msgstr "The mask that decides what kind of extension events this widget gets" -#: ../gtk/gtkwidget.c:999 +#: ../gtk/gtkwidget.c:1013 msgid "No show all" msgstr "No show all" -#: ../gtk/gtkwidget.c:1000 +#: ../gtk/gtkwidget.c:1014 msgid "Whether gtk_widget_show_all() should not affect this widget" msgstr "Whether gtk_widget_show_all() should not affect this widget" -#: ../gtk/gtkwidget.c:1023 +#: ../gtk/gtkwidget.c:1037 msgid "Whether this widget has a tooltip" msgstr "Whether this widget has a tooltip" -#: ../gtk/gtkwidget.c:1079 +#: ../gtk/gtkwidget.c:1093 msgid "Window" msgstr "Window" -#: ../gtk/gtkwidget.c:1080 +#: ../gtk/gtkwidget.c:1094 msgid "The widget's window if it is realized" msgstr "The widget's window if it is realized" -#: ../gtk/gtkwidget.c:1094 +#: ../gtk/gtkwidget.c:1108 msgid "Double Buffered" msgstr "Double Buffered" -#: ../gtk/gtkwidget.c:1095 +#: ../gtk/gtkwidget.c:1109 msgid "Whether the widget is double buffered" msgstr "Whether the widget is double buffered" -#: ../gtk/gtkwidget.c:1110 +#: ../gtk/gtkwidget.c:1124 msgid "How to position in extra horizontal space" msgstr "How to position in extra horizontal space" -#: ../gtk/gtkwidget.c:1126 +#: ../gtk/gtkwidget.c:1140 msgid "How to position in extra vertical space" msgstr "How to position in extra vertical space" -#: ../gtk/gtkwidget.c:1145 +#: ../gtk/gtkwidget.c:1159 msgid "Margin on Left" msgstr "Margin on Left" -#: ../gtk/gtkwidget.c:1146 +#: ../gtk/gtkwidget.c:1160 msgid "Pixels of extra space on the left side" msgstr "Pixels of extra space on the left side" -#: ../gtk/gtkwidget.c:1166 +#: ../gtk/gtkwidget.c:1180 msgid "Margin on Right" msgstr "Margin on Right" -#: ../gtk/gtkwidget.c:1167 +#: ../gtk/gtkwidget.c:1181 msgid "Pixels of extra space on the right side" msgstr "Pixels of extra space on the right side" -#: ../gtk/gtkwidget.c:1187 +#: ../gtk/gtkwidget.c:1201 msgid "Margin on Top" msgstr "Margin on Top" -#: ../gtk/gtkwidget.c:1188 +#: ../gtk/gtkwidget.c:1202 msgid "Pixels of extra space on the top side" msgstr "Pixels of extra space on the top side" -#: ../gtk/gtkwidget.c:1208 +#: ../gtk/gtkwidget.c:1222 msgid "Margin on Bottom" msgstr "Margin on Bottom" -#: ../gtk/gtkwidget.c:1209 +#: ../gtk/gtkwidget.c:1223 msgid "Pixels of extra space on the bottom side" msgstr "Pixels of extra space on the bottom side" -#: ../gtk/gtkwidget.c:1226 +#: ../gtk/gtkwidget.c:1240 msgid "All Margins" msgstr "All Margins" -#: ../gtk/gtkwidget.c:1227 +#: ../gtk/gtkwidget.c:1241 msgid "Pixels of extra space on all four sides" msgstr "Pixels of extra space on all four sides" -#: ../gtk/gtkwidget.c:1260 +#: ../gtk/gtkwidget.c:1274 msgid "Horizontal Expand" msgstr "Horizontal Expand" -#: ../gtk/gtkwidget.c:1261 +#: ../gtk/gtkwidget.c:1275 msgid "Whether widget wants more horizontal space" msgstr "Whether widget wants more horizontal space" -#: ../gtk/gtkwidget.c:1275 +#: ../gtk/gtkwidget.c:1289 msgid "Horizontal Expand Set" msgstr "Horizontal Expand Set" -#: ../gtk/gtkwidget.c:1276 +#: ../gtk/gtkwidget.c:1290 msgid "Whether to use the hexpand property" msgstr "Whether to use the hexpand property" -#: ../gtk/gtkwidget.c:1290 +#: ../gtk/gtkwidget.c:1304 msgid "Vertical Expand" msgstr "Vertical Expand" -#: ../gtk/gtkwidget.c:1291 +#: ../gtk/gtkwidget.c:1305 msgid "Whether widget wants more vertical space" msgstr "Whether widget wants more vertical space" -#: ../gtk/gtkwidget.c:1305 +#: ../gtk/gtkwidget.c:1319 msgid "Vertical Expand Set" msgstr "Vertical Expand Set" -#: ../gtk/gtkwidget.c:1306 +#: ../gtk/gtkwidget.c:1320 msgid "Whether to use the vexpand property" msgstr "Whether to use the vexpand property" -#: ../gtk/gtkwidget.c:1320 +#: ../gtk/gtkwidget.c:1334 msgid "Expand Both" msgstr "Expand Both" -#: ../gtk/gtkwidget.c:1321 +#: ../gtk/gtkwidget.c:1335 msgid "Whether widget wants to expand in both directions" msgstr "Whether widget wants to expand in both directions" -#: ../gtk/gtkwidget.c:2936 +#: ../gtk/gtkwidget.c:2981 msgid "Interior Focus" msgstr "Interior Focus" -#: ../gtk/gtkwidget.c:2937 +#: ../gtk/gtkwidget.c:2982 msgid "Whether to draw the focus indicator inside widgets" msgstr "Whether to draw the focus indicator inside widgets" -#: ../gtk/gtkwidget.c:2943 +#: ../gtk/gtkwidget.c:2988 msgid "Focus linewidth" msgstr "Focus linewidth" -#: ../gtk/gtkwidget.c:2944 +#: ../gtk/gtkwidget.c:2989 msgid "Width, in pixels, of the focus indicator line" msgstr "Width, in pixels, of the focus indicator line" -#: ../gtk/gtkwidget.c:2950 +#: ../gtk/gtkwidget.c:2995 msgid "Focus line dash pattern" msgstr "Focus line dash pattern" -#: ../gtk/gtkwidget.c:2951 +#: ../gtk/gtkwidget.c:2996 msgid "Dash pattern used to draw the focus indicator" msgstr "Dash pattern used to draw the focus indicator" -#: ../gtk/gtkwidget.c:2956 +#: ../gtk/gtkwidget.c:3001 msgid "Focus padding" msgstr "Focus padding" -#: ../gtk/gtkwidget.c:2957 +#: ../gtk/gtkwidget.c:3002 msgid "Width, in pixels, between focus indicator and the widget 'box'" msgstr "Width, in pixels, between focus indicator and the widget 'box'" -#: ../gtk/gtkwidget.c:2962 +#: ../gtk/gtkwidget.c:3007 msgid "Cursor color" msgstr "Cursor color" -#: ../gtk/gtkwidget.c:2963 +#: ../gtk/gtkwidget.c:3008 msgid "Color with which to draw insertion cursor" msgstr "Color with which to draw insertion cursor" -#: ../gtk/gtkwidget.c:2968 +#: ../gtk/gtkwidget.c:3013 msgid "Secondary cursor color" msgstr "Secondary cursor color" -#: ../gtk/gtkwidget.c:2969 +#: ../gtk/gtkwidget.c:3014 msgid "" "Color with which to draw the secondary insertion cursor when editing mixed " "right-to-left and left-to-right text" @@ -6977,43 +6985,43 @@ msgstr "" "Color with which to draw the secondary insertion cursor when editing mixed " "right-to-left and left-to-right text" -#: ../gtk/gtkwidget.c:2974 +#: ../gtk/gtkwidget.c:3019 msgid "Cursor line aspect ratio" msgstr "Cursor line aspect ratio" -#: ../gtk/gtkwidget.c:2975 +#: ../gtk/gtkwidget.c:3020 msgid "Aspect ratio with which to draw insertion cursor" msgstr "Aspect ratio with which to draw insertion cursor" -#: ../gtk/gtkwidget.c:2981 +#: ../gtk/gtkwidget.c:3026 msgid "Window dragging" msgstr "Window dragging" -#: ../gtk/gtkwidget.c:2982 +#: ../gtk/gtkwidget.c:3027 msgid "Whether windows can be dragged by clicking on empty areas" msgstr "Whether windows can be dragged by clicking on empty areas" -#: ../gtk/gtkwidget.c:2995 +#: ../gtk/gtkwidget.c:3040 msgid "Unvisited Link Color" msgstr "Unvisited Link Color" -#: ../gtk/gtkwidget.c:2996 +#: ../gtk/gtkwidget.c:3041 msgid "Color of unvisited links" msgstr "Color of unvisited links" -#: ../gtk/gtkwidget.c:3009 +#: ../gtk/gtkwidget.c:3054 msgid "Visited Link Color" msgstr "Visited Link Color" -#: ../gtk/gtkwidget.c:3010 +#: ../gtk/gtkwidget.c:3055 msgid "Color of visited links" msgstr "Color of visited links" -#: ../gtk/gtkwidget.c:3024 +#: ../gtk/gtkwidget.c:3069 msgid "Wide Separators" msgstr "Wide Separators" -#: ../gtk/gtkwidget.c:3025 +#: ../gtk/gtkwidget.c:3070 msgid "" "Whether separators have configurable width and should be drawn using a box " "instead of a line" @@ -7021,79 +7029,79 @@ msgstr "" "Whether separators have configurable width and should be drawn using a box " "instead of a line" -#: ../gtk/gtkwidget.c:3039 +#: ../gtk/gtkwidget.c:3084 msgid "Separator Width" msgstr "Separator Width" -#: ../gtk/gtkwidget.c:3040 +#: ../gtk/gtkwidget.c:3085 msgid "The width of separators if wide-separators is TRUE" msgstr "The width of separators if wide-separators is TRUE" -#: ../gtk/gtkwidget.c:3054 +#: ../gtk/gtkwidget.c:3099 msgid "Separator Height" msgstr "Separator Height" -#: ../gtk/gtkwidget.c:3055 +#: ../gtk/gtkwidget.c:3100 msgid "The height of separators if \"wide-separators\" is TRUE" msgstr "The height of separators if \"wide-separators\" is TRUE" -#: ../gtk/gtkwidget.c:3069 +#: ../gtk/gtkwidget.c:3114 msgid "Horizontal Scroll Arrow Length" msgstr "Horizontal Scroll Arrow Length" -#: ../gtk/gtkwidget.c:3070 +#: ../gtk/gtkwidget.c:3115 msgid "The length of horizontal scroll arrows" msgstr "The length of horizontal scroll arrows" -#: ../gtk/gtkwidget.c:3084 +#: ../gtk/gtkwidget.c:3129 msgid "Vertical Scroll Arrow Length" msgstr "Vertical Scroll Arrow Length" -#: ../gtk/gtkwidget.c:3085 +#: ../gtk/gtkwidget.c:3130 msgid "The length of vertical scroll arrows" msgstr "The length of vertical scroll arrows" -#: ../gtk/gtkwindow.c:615 +#: ../gtk/gtkwindow.c:614 msgid "Window Type" msgstr "Window Type" -#: ../gtk/gtkwindow.c:616 +#: ../gtk/gtkwindow.c:615 msgid "The type of the window" msgstr "The type of the window" -#: ../gtk/gtkwindow.c:624 +#: ../gtk/gtkwindow.c:623 msgid "Window Title" msgstr "Window Title" -#: ../gtk/gtkwindow.c:625 +#: ../gtk/gtkwindow.c:624 msgid "The title of the window" msgstr "The title of the window" -#: ../gtk/gtkwindow.c:632 +#: ../gtk/gtkwindow.c:631 msgid "Window Role" msgstr "Window Role" -#: ../gtk/gtkwindow.c:633 +#: ../gtk/gtkwindow.c:632 msgid "Unique identifier for the window to be used when restoring a session" msgstr "Unique identifier for the window to be used when restoring a session" -#: ../gtk/gtkwindow.c:649 +#: ../gtk/gtkwindow.c:648 msgid "Startup ID" msgstr "Startup ID" -#: ../gtk/gtkwindow.c:650 +#: ../gtk/gtkwindow.c:649 msgid "Unique startup identifier for the window used by startup-notification" msgstr "Unique startup identifier for the window used by startup-notification" -#: ../gtk/gtkwindow.c:658 +#: ../gtk/gtkwindow.c:657 msgid "If TRUE, users can resize the window" msgstr "If TRUE, users can resize the window" -#: ../gtk/gtkwindow.c:665 +#: ../gtk/gtkwindow.c:664 msgid "Modal" msgstr "Modal" -#: ../gtk/gtkwindow.c:666 +#: ../gtk/gtkwindow.c:665 msgid "" "If TRUE, the window is modal (other windows are not usable while this one is " "up)" @@ -7101,78 +7109,78 @@ msgstr "" "If TRUE, the window is modal (other windows are not usable while this one is " "up)" -#: ../gtk/gtkwindow.c:673 +#: ../gtk/gtkwindow.c:672 msgid "Window Position" msgstr "Window Position" -#: ../gtk/gtkwindow.c:674 +#: ../gtk/gtkwindow.c:673 msgid "The initial position of the window" msgstr "The initial position of the window" -#: ../gtk/gtkwindow.c:682 +#: ../gtk/gtkwindow.c:681 msgid "Default Width" msgstr "Default Width" -#: ../gtk/gtkwindow.c:683 +#: ../gtk/gtkwindow.c:682 msgid "The default width of the window, used when initially showing the window" msgstr "" "The default width of the window, used when initially showing the window" -#: ../gtk/gtkwindow.c:692 +#: ../gtk/gtkwindow.c:691 msgid "Default Height" msgstr "Default Height" -#: ../gtk/gtkwindow.c:693 +#: ../gtk/gtkwindow.c:692 msgid "" "The default height of the window, used when initially showing the window" msgstr "" "The default height of the window, used when initially showing the window" -#: ../gtk/gtkwindow.c:702 +#: ../gtk/gtkwindow.c:701 msgid "Destroy with Parent" msgstr "Destroy with Parent" -#: ../gtk/gtkwindow.c:703 +#: ../gtk/gtkwindow.c:702 msgid "If this window should be destroyed when the parent is destroyed" msgstr "If this window should be destroyed when the parent is destroyed" -#: ../gtk/gtkwindow.c:711 +#: ../gtk/gtkwindow.c:710 msgid "Icon for this window" msgstr "Icon for this window" -#: ../gtk/gtkwindow.c:717 +#: ../gtk/gtkwindow.c:716 msgid "Mnemonics Visible" msgstr "Mnemonics Visible" -#: ../gtk/gtkwindow.c:718 +#: ../gtk/gtkwindow.c:717 msgid "Whether mnemonics are currently visible in this window" msgstr "Whether mnemonics are currently visible in this window" -#: ../gtk/gtkwindow.c:734 +#: ../gtk/gtkwindow.c:733 msgid "Name of the themed icon for this window" msgstr "Name of the themed icon for this window" -#: ../gtk/gtkwindow.c:749 +#: ../gtk/gtkwindow.c:748 msgid "Is Active" msgstr "Is Active" -#: ../gtk/gtkwindow.c:750 +#: ../gtk/gtkwindow.c:749 msgid "Whether the toplevel is the current active window" msgstr "Whether the toplevel is the current active window" -#: ../gtk/gtkwindow.c:757 +#: ../gtk/gtkwindow.c:756 msgid "Focus in Toplevel" msgstr "Focus in Toplevel" -#: ../gtk/gtkwindow.c:758 +#: ../gtk/gtkwindow.c:757 msgid "Whether the input focus is within this GtkWindow" msgstr "Whether the input focus is within this GtkWindow" -#: ../gtk/gtkwindow.c:765 +#: ../gtk/gtkwindow.c:764 msgid "Type hint" msgstr "Type hint" -#: ../gtk/gtkwindow.c:766 +#: ../gtk/gtkwindow.c:765 msgid "" "Hint to help the desktop environment understand what kind of window this is " "and how to treat it." @@ -7180,115 +7188,115 @@ msgstr "" "Hint to help the desktop environment understand what kind of window this is " "and how to treat it." -#: ../gtk/gtkwindow.c:774 +#: ../gtk/gtkwindow.c:773 msgid "Skip taskbar" msgstr "Skip taskbar" -#: ../gtk/gtkwindow.c:775 +#: ../gtk/gtkwindow.c:774 msgid "TRUE if the window should not be in the task bar." msgstr "TRUE if the window should not be in the task bar." -#: ../gtk/gtkwindow.c:782 +#: ../gtk/gtkwindow.c:781 msgid "Skip pager" msgstr "Skip pager" -#: ../gtk/gtkwindow.c:783 +#: ../gtk/gtkwindow.c:782 msgid "TRUE if the window should not be in the pager." msgstr "TRUE if the window should not be in the pager." -#: ../gtk/gtkwindow.c:790 +#: ../gtk/gtkwindow.c:789 msgid "Urgent" msgstr "Urgent" -#: ../gtk/gtkwindow.c:791 +#: ../gtk/gtkwindow.c:790 msgid "TRUE if the window should be brought to the user's attention." msgstr "TRUE if the window should be brought to the user's attention." -#: ../gtk/gtkwindow.c:805 +#: ../gtk/gtkwindow.c:804 msgid "Accept focus" msgstr "Accept focus" -#: ../gtk/gtkwindow.c:806 +#: ../gtk/gtkwindow.c:805 msgid "TRUE if the window should receive the input focus." msgstr "TRUE if the window should receive the input focus." -#: ../gtk/gtkwindow.c:820 +#: ../gtk/gtkwindow.c:819 msgid "Focus on map" msgstr "Focus on map" -#: ../gtk/gtkwindow.c:821 +#: ../gtk/gtkwindow.c:820 msgid "TRUE if the window should receive the input focus when mapped." msgstr "TRUE if the window should receive the input focus when mapped." -#: ../gtk/gtkwindow.c:835 +#: ../gtk/gtkwindow.c:834 msgid "Decorated" msgstr "Decorated" -#: ../gtk/gtkwindow.c:836 +#: ../gtk/gtkwindow.c:835 msgid "Whether the window should be decorated by the window manager" msgstr "Whether the window should be decorated by the window manager" -#: ../gtk/gtkwindow.c:850 +#: ../gtk/gtkwindow.c:849 msgid "Deletable" msgstr "Deletable" -#: ../gtk/gtkwindow.c:851 +#: ../gtk/gtkwindow.c:850 msgid "Whether the window frame should have a close button" msgstr "Whether the window frame should have a close button" -#: ../gtk/gtkwindow.c:870 +#: ../gtk/gtkwindow.c:869 msgid "Resize grip" msgstr "Resize grip" -#: ../gtk/gtkwindow.c:871 +#: ../gtk/gtkwindow.c:870 msgid "Specifies whether the window should have a resize grip" msgstr "Specifies whether the window should have a resize grip" -#: ../gtk/gtkwindow.c:885 +#: ../gtk/gtkwindow.c:884 msgid "Resize grip is visible" msgstr "Resize grip is visible" -#: ../gtk/gtkwindow.c:886 +#: ../gtk/gtkwindow.c:885 msgid "Specifies whether the window's resize grip is visible." msgstr "Specifies whether the window's resize grip is visible." -#: ../gtk/gtkwindow.c:902 +#: ../gtk/gtkwindow.c:901 msgid "Gravity" msgstr "Gravity" -#: ../gtk/gtkwindow.c:903 +#: ../gtk/gtkwindow.c:902 msgid "The window gravity of the window" msgstr "The window gravity of the window" -#: ../gtk/gtkwindow.c:920 +#: ../gtk/gtkwindow.c:919 msgid "Transient for Window" msgstr "Transient for Window" -#: ../gtk/gtkwindow.c:921 +#: ../gtk/gtkwindow.c:920 msgid "The transient parent of the dialog" msgstr "The transient parent of the dialog" -#: ../gtk/gtkwindow.c:936 +#: ../gtk/gtkwindow.c:935 msgid "Opacity for Window" msgstr "Opacity for Window" -#: ../gtk/gtkwindow.c:937 +#: ../gtk/gtkwindow.c:936 msgid "The opacity of the window, from 0 to 1" msgstr "The opacity of the window, from 0 to 1" -#: ../gtk/gtkwindow.c:947 ../gtk/gtkwindow.c:948 +#: ../gtk/gtkwindow.c:946 ../gtk/gtkwindow.c:947 msgid "Width of resize grip" msgstr "Width of resize grip" -#: ../gtk/gtkwindow.c:953 ../gtk/gtkwindow.c:954 +#: ../gtk/gtkwindow.c:952 ../gtk/gtkwindow.c:953 msgid "Height of resize grip" msgstr "Height of resize grip" -#: ../gtk/gtkwindow.c:973 +#: ../gtk/gtkwindow.c:972 msgid "GtkApplication" msgstr "GtkApplication" -#: ../gtk/gtkwindow.c:974 +#: ../gtk/gtkwindow.c:973 msgid "The GtkApplication for the window" msgstr "The GtkApplication for the window" diff --git a/po/POTFILES.in b/po/POTFILES.in index 35783a698e..3bb4266da7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -210,7 +210,6 @@ gtk/gtkvscrollbar.c gtk/gtkvseparator.c gtk/gtkwidget.c gtk/gtkwindow.c -gtk/gtkwindow-decorate.c gtk/paper_names_offsets.c gtk/updateiconcache.c modules/input/gtkimcontextxim.c diff --git a/po/gl.po b/po/gl.po index 63272e3950..1e7d406110 100644 --- a/po/gl.po +++ b/po/gl.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: gtk+-master-po-gl-77922___.merged\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-26 16:52+0200\n" -"PO-Revision-Date: 2010-10-25 01:05+0200\n" +"POT-Creation-Date: 2010-12-05 14:56+0100\n" +"PO-Revision-Date: 2010-12-05 14:56+0100\n" "Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" "Language: gl\n" @@ -32,58 +32,58 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../gdk/gdk.c:104 +#: ../gdk/gdk.c:115 #, c-format msgid "Error parsing option --gdk-debug" msgstr "Produciuse un erro ao analizar a opción --gdk-debug" -#: ../gdk/gdk.c:124 +#: ../gdk/gdk.c:135 #, c-format msgid "Error parsing option --gdk-no-debug" msgstr "Produciuse un erro ao analizar a opción --gdk-no-debug" #. Description of --class=CLASS in --help output -#: ../gdk/gdk.c:152 +#: ../gdk/gdk.c:163 msgid "Program class as used by the window manager" msgstr "Clase de programa tal como a usa o xestor de xanelas" #. Placeholder in --class=CLASS in --help output -#: ../gdk/gdk.c:153 +#: ../gdk/gdk.c:164 msgid "CLASS" msgstr "CLASE" #. Description of --name=NAME in --help output -#: ../gdk/gdk.c:155 +#: ../gdk/gdk.c:166 msgid "Program name as used by the window manager" msgstr "Nome do programa tal como o usa o xestor de xanelas" #. Placeholder in --name=NAME in --help output -#: ../gdk/gdk.c:156 +#: ../gdk/gdk.c:167 msgid "NAME" msgstr "NOME" #. Description of --display=DISPLAY in --help output -#: ../gdk/gdk.c:158 +#: ../gdk/gdk.c:169 msgid "X display to use" msgstr "Pantalla de X que se vai usar" #. Placeholder in --display=DISPLAY in --help output -#: ../gdk/gdk.c:159 +#: ../gdk/gdk.c:170 msgid "DISPLAY" msgstr "PANTALLA" #. Description of --screen=SCREEN in --help output -#: ../gdk/gdk.c:161 +#: ../gdk/gdk.c:172 msgid "X screen to use" msgstr "Pantalla X que se vai usar" #. Placeholder in --screen=SCREEN in --help output -#: ../gdk/gdk.c:162 +#: ../gdk/gdk.c:173 msgid "SCREEN" msgstr "PANTALLA" #. Description of --gdk-debug=FLAGS in --help output -#: ../gdk/gdk.c:165 +#: ../gdk/gdk.c:176 msgid "GDK debugging flags to set" msgstr "Opcións de depuración GDK para estabelecer" @@ -91,12 +91,12 @@ msgstr "Opcións de depuración GDK para estabelecer" #. Placeholder in --gdk-no-debug=FLAGS in --help output #. Placeholder in --gtk-debug=FLAGS in --help output #. Placeholder in --gtk-no-debug=FLAGS in --help output -#: ../gdk/gdk.c:166 ../gdk/gdk.c:169 ../gtk/gtkmain.c:534 ../gtk/gtkmain.c:537 +#: ../gdk/gdk.c:177 ../gdk/gdk.c:180 ../gtk/gtkmain.c:523 ../gtk/gtkmain.c:526 msgid "FLAGS" msgstr "PARÁMETROS" #. Description of --gdk-no-debug=FLAGS in --help output -#: ../gdk/gdk.c:168 +#: ../gdk/gdk.c:179 msgid "GDK debugging flags to unset" msgstr "Opcións de depuración GDK para quitar" @@ -315,17 +315,17 @@ msgstr "Tamaño da paleta en modo 8 bits" msgid "COLORS" msgstr "CORES" -#: ../gdk/x11/gdkapplaunchcontext-x11.c:312 +#: ../gdk/x11/gdkapplaunchcontext-x11.c:305 #, c-format msgid "Starting %s" msgstr "Iniciando %s" -#: ../gdk/x11/gdkapplaunchcontext-x11.c:316 +#: ../gdk/x11/gdkapplaunchcontext-x11.c:318 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: ../gdk/x11/gdkapplaunchcontext-x11.c:321 +#: ../gdk/x11/gdkapplaunchcontext-x11.c:323 #, c-format msgid "Opening %d Item" msgid_plural "Opening %d Items" @@ -346,7 +346,7 @@ msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s" msgstr "" "Este programa non fornece NINGUNHA GARANTÍA, para máis información visite %s" -#: ../gtk/gtkaboutdialog.c:339 ../gtk/gtkaboutdialog.c:2232 +#: ../gtk/gtkaboutdialog.c:339 ../gtk/gtkaboutdialog.c:2233 msgid "License" msgstr "Licenza" @@ -355,41 +355,41 @@ msgid "The license of the program" msgstr "A licenza do programa" #. Add the credits button -#: ../gtk/gtkaboutdialog.c:621 +#: ../gtk/gtkaboutdialog.c:622 msgid "C_redits" msgstr "C_réditos" #. Add the license button -#: ../gtk/gtkaboutdialog.c:635 +#: ../gtk/gtkaboutdialog.c:636 msgid "_License" msgstr "_Licenza" -#: ../gtk/gtkaboutdialog.c:839 +#: ../gtk/gtkaboutdialog.c:840 msgid "Could not show link" msgstr "Non foi posíbel mostrar a ligazón" -#: ../gtk/gtkaboutdialog.c:932 +#: ../gtk/gtkaboutdialog.c:933 #, c-format msgid "About %s" msgstr "Sobre %s" -#: ../gtk/gtkaboutdialog.c:2150 +#: ../gtk/gtkaboutdialog.c:2151 msgid "Credits" msgstr "Créditos" -#: ../gtk/gtkaboutdialog.c:2182 +#: ../gtk/gtkaboutdialog.c:2183 msgid "Written by" msgstr "Escrito por" -#: ../gtk/gtkaboutdialog.c:2185 +#: ../gtk/gtkaboutdialog.c:2186 msgid "Documented by" msgstr "Documentado por" -#: ../gtk/gtkaboutdialog.c:2197 +#: ../gtk/gtkaboutdialog.c:2198 msgid "Translated by" msgstr "Traducido por" -#: ../gtk/gtkaboutdialog.c:2201 +#: ../gtk/gtkaboutdialog.c:2202 msgid "Artwork by" msgstr "Material gráfico por" @@ -495,7 +495,7 @@ msgstr "Etiqueta non compatíbel: «%s»" #. * text direction of RTL and specify "calendar:YM", then the year #. * will appear to the right of the month. #. -#: ../gtk/gtkcalendar.c:873 +#: ../gtk/gtkcalendar.c:878 msgid "calendar:MY" msgstr "calendar:MY" @@ -503,7 +503,7 @@ msgstr "calendar:MY" #. * first day of the week to calendar:week_start:1 if you want Monday #. * to be the first day of the week, and so on. #. -#: ../gtk/gtkcalendar.c:911 +#: ../gtk/gtkcalendar.c:916 msgid "calendar:week_start:0" msgstr "calendar:week_start:1" @@ -512,7 +512,7 @@ msgstr "calendar:week_start:1" #. * #. * If you don't understand this, leave it as "2000" #. -#: ../gtk/gtkcalendar.c:1843 +#: ../gtk/gtkcalendar.c:1848 msgctxt "year measurement template" msgid "2000" msgstr "2000" @@ -527,7 +527,7 @@ msgstr "2000" #. * digits. That needs support from your system and locale definition #. * too. #. -#: ../gtk/gtkcalendar.c:1874 ../gtk/gtkcalendar.c:2535 +#: ../gtk/gtkcalendar.c:1879 ../gtk/gtkcalendar.c:2564 #, c-format msgctxt "calendar:day:digits" msgid "%d" @@ -543,7 +543,7 @@ msgstr "%d" #. * digits. That needs support from your system and locale definition #. * too. #. -#: ../gtk/gtkcalendar.c:1906 ../gtk/gtkcalendar.c:2403 +#: ../gtk/gtkcalendar.c:1911 ../gtk/gtkcalendar.c:2432 #, c-format msgctxt "calendar:week:digits" msgid "%d" @@ -559,7 +559,7 @@ msgstr "%d" #. * #. * "%Y" is appropriate for most locales. #. -#: ../gtk/gtkcalendar.c:2168 +#: ../gtk/gtkcalendar.c:2197 msgctxt "calendar year format" msgid "%Y" msgstr "%Y" @@ -595,15 +595,15 @@ msgctxt "progress bar label" msgid "%d %%" msgstr "%d %%" -#: ../gtk/gtkcolorbutton.c:175 ../gtk/gtkcolorbutton.c:460 +#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorbutton.c:473 msgid "Pick a Color" msgstr "Seleccione unha cor" -#: ../gtk/gtkcolorbutton.c:350 +#: ../gtk/gtkcolorbutton.c:363 msgid "Received invalid color data\n" msgstr "Recibiuse un dato de cor incorrecto\n" -#: ../gtk/gtkcolorsel.c:395 +#: ../gtk/gtkcolorsel.c:416 msgid "" "Select the color you want from the outer ring. Select the darkness or " "lightness of that color using the inner triangle." @@ -611,7 +611,7 @@ msgstr "" "Seleccione a cor que quere desde o anel exterior. Seleccione a escuridade ou " "luminosidade usando o triángulo interior." -#: ../gtk/gtkcolorsel.c:419 +#: ../gtk/gtkcolorsel.c:440 msgid "" "Click the eyedropper, then click a color anywhere on your screen to select " "that color." @@ -619,67 +619,67 @@ msgstr "" "Seleccione o contagotas, despois prema sobre calquera cor que haxa na súa " "pantalla para seleccionala." -#: ../gtk/gtkcolorsel.c:428 +#: ../gtk/gtkcolorsel.c:449 msgid "_Hue:" msgstr "_Matiz:" -#: ../gtk/gtkcolorsel.c:429 +#: ../gtk/gtkcolorsel.c:450 msgid "Position on the color wheel." msgstr "Posición na roda de cores." -#: ../gtk/gtkcolorsel.c:431 +#: ../gtk/gtkcolorsel.c:452 msgid "_Saturation:" msgstr "_Saturación:" -#: ../gtk/gtkcolorsel.c:432 +#: ../gtk/gtkcolorsel.c:453 msgid "Intensity of the color." msgstr "Intensidade da cor." -#: ../gtk/gtkcolorsel.c:433 +#: ../gtk/gtkcolorsel.c:454 msgid "_Value:" msgstr "_Valor:" -#: ../gtk/gtkcolorsel.c:434 +#: ../gtk/gtkcolorsel.c:455 msgid "Brightness of the color." msgstr "Brillo da cor." -#: ../gtk/gtkcolorsel.c:435 +#: ../gtk/gtkcolorsel.c:456 msgid "_Red:" msgstr "_Vermello:" -#: ../gtk/gtkcolorsel.c:436 +#: ../gtk/gtkcolorsel.c:457 msgid "Amount of red light in the color." msgstr "Cantidade de luz vermella na cor." -#: ../gtk/gtkcolorsel.c:437 +#: ../gtk/gtkcolorsel.c:458 msgid "_Green:" msgstr "V_erde:" -#: ../gtk/gtkcolorsel.c:438 +#: ../gtk/gtkcolorsel.c:459 msgid "Amount of green light in the color." msgstr "Cantidade de luz verde na cor." -#: ../gtk/gtkcolorsel.c:439 +#: ../gtk/gtkcolorsel.c:460 msgid "_Blue:" msgstr "_Azul:" -#: ../gtk/gtkcolorsel.c:440 +#: ../gtk/gtkcolorsel.c:461 msgid "Amount of blue light in the color." msgstr "Cantidade de luz azul na cor." -#: ../gtk/gtkcolorsel.c:443 +#: ../gtk/gtkcolorsel.c:464 msgid "Op_acity:" msgstr "Op_acidade:" -#: ../gtk/gtkcolorsel.c:450 ../gtk/gtkcolorsel.c:460 +#: ../gtk/gtkcolorsel.c:471 ../gtk/gtkcolorsel.c:481 msgid "Transparency of the color." msgstr "Transparencia da cor." -#: ../gtk/gtkcolorsel.c:467 +#: ../gtk/gtkcolorsel.c:488 msgid "Color _name:" msgstr "_Nome da cor:" -#: ../gtk/gtkcolorsel.c:481 +#: ../gtk/gtkcolorsel.c:502 msgid "" "You can enter an HTML-style hexadecimal color value, or simply a color name " "such as 'orange' in this entry." @@ -687,15 +687,15 @@ msgstr "" "Nesta entrada pode introducir un valor de cor en estilo HTML hexadecimal ou " "simplemente un nome de cor como 'orange'." -#: ../gtk/gtkcolorsel.c:511 +#: ../gtk/gtkcolorsel.c:532 msgid "_Palette:" msgstr "_Paleta:" -#: ../gtk/gtkcolorsel.c:540 +#: ../gtk/gtkcolorsel.c:561 msgid "Color Wheel" msgstr "Roda de cor" -#: ../gtk/gtkcolorsel.c:1010 +#: ../gtk/gtkcolorsel.c:1031 msgid "" "The previously-selected color, for comparison to the color you're selecting " "now. You can drag this color to a palette entry, or select this color as " @@ -706,7 +706,7 @@ msgstr "" "seleccionar esta cor como actual arrastrándoa até a outra cor ao longo da " "mostra." -#: ../gtk/gtkcolorsel.c:1013 +#: ../gtk/gtkcolorsel.c:1034 msgid "" "The color you've chosen. You can drag this color to a palette entry to save " "it for use in the future." @@ -714,7 +714,7 @@ msgstr "" "A cor que escolleu. Pode arrastrar esta cor a unha entrada da paleta e " "gardala para usala no futuro." -#: ../gtk/gtkcolorsel.c:1018 +#: ../gtk/gtkcolorsel.c:1039 msgid "" "The previously-selected color, for comparison to the color you're selecting " "now." @@ -722,15 +722,15 @@ msgstr "" "A cor seleccionada anteriormente, para comparar coa cor que seleccionou " "agora." -#: ../gtk/gtkcolorsel.c:1021 +#: ../gtk/gtkcolorsel.c:1042 msgid "The color you've chosen." msgstr "A cor que seleccionou." -#: ../gtk/gtkcolorsel.c:1421 +#: ../gtk/gtkcolorsel.c:1442 msgid "_Save color here" msgstr "_Gardar a cor aquí" -#: ../gtk/gtkcolorsel.c:1626 +#: ../gtk/gtkcolorsel.c:1647 msgid "" "Click this palette entry to make it the current color. To change this entry, " "drag a color swatch here or right-click it and select \"Save color here.\"" @@ -807,23 +807,23 @@ msgstr "_Dereito:" msgid "Paper Margins" msgstr "Marxes do papel" -#: ../gtk/gtkentry.c:8570 ../gtk/gtktextview.c:8185 +#: ../gtk/gtkentry.c:8793 ../gtk/gtktextview.c:8229 msgid "Input _Methods" msgstr "_Métodos de entrada" -#: ../gtk/gtkentry.c:8584 ../gtk/gtktextview.c:8199 +#: ../gtk/gtkentry.c:8807 ../gtk/gtktextview.c:8243 msgid "_Insert Unicode Control Character" msgstr "_Inserir un carácter de control Unicode" -#: ../gtk/gtkentry.c:9984 +#: ../gtk/gtkentry.c:10207 msgid "Caps Lock and Num Lock are on" msgstr "Bloq Maiús e Bloq Num estás activados" -#: ../gtk/gtkentry.c:9986 +#: ../gtk/gtkentry.c:10209 msgid "Num Lock is on" msgstr "Bloq Num está activado" -#: ../gtk/gtkentry.c:9988 +#: ../gtk/gtkentry.c:10211 msgid "Caps Lock is on" msgstr "Bloq Maiús está activado" @@ -842,7 +842,7 @@ msgstr "Escritorio" msgid "(None)" msgstr "(Ningún)" -#: ../gtk/gtkfilechooserbutton.c:1997 +#: ../gtk/gtkfilechooserbutton.c:2001 msgid "Other..." msgstr "Outro..." @@ -903,192 +903,192 @@ msgstr "%1$s en %2$s" msgid "Search" msgstr "Buscar" -#: ../gtk/gtkfilechooserdefault.c:1776 ../gtk/gtkfilechooserdefault.c:9382 +#: ../gtk/gtkfilechooserdefault.c:1776 ../gtk/gtkfilechooserdefault.c:9417 msgid "Recently Used" msgstr "Usado recentemente" -#: ../gtk/gtkfilechooserdefault.c:2430 +#: ../gtk/gtkfilechooserdefault.c:2437 msgid "Select which types of files are shown" msgstr "Seleccione que tipos de ficheiros se mostran" -#: ../gtk/gtkfilechooserdefault.c:2789 +#: ../gtk/gtkfilechooserdefault.c:2796 #, c-format msgid "Add the folder '%s' to the bookmarks" msgstr "Engadirlle o cartafol «%s» aos marcadores" -#: ../gtk/gtkfilechooserdefault.c:2833 +#: ../gtk/gtkfilechooserdefault.c:2840 #, c-format msgid "Add the current folder to the bookmarks" msgstr "Engadirlle o cartafol actual aos marcadores" -#: ../gtk/gtkfilechooserdefault.c:2835 +#: ../gtk/gtkfilechooserdefault.c:2842 #, c-format msgid "Add the selected folders to the bookmarks" msgstr "Engadirlle os cartafoles seleccionados aos marcadores" -#: ../gtk/gtkfilechooserdefault.c:2873 +#: ../gtk/gtkfilechooserdefault.c:2880 #, c-format msgid "Remove the bookmark '%s'" msgstr "Eliminar o marcador «%s»" -#: ../gtk/gtkfilechooserdefault.c:2875 +#: ../gtk/gtkfilechooserdefault.c:2882 #, c-format msgid "Bookmark '%s' cannot be removed" msgstr "O marcador «%s» non pode ser eliminado" -#: ../gtk/gtkfilechooserdefault.c:2882 ../gtk/gtkfilechooserdefault.c:3746 +#: ../gtk/gtkfilechooserdefault.c:2889 ../gtk/gtkfilechooserdefault.c:3750 msgid "Remove the selected bookmark" msgstr "Eliminar o marcador seleccionado" -#: ../gtk/gtkfilechooserdefault.c:3442 +#: ../gtk/gtkfilechooserdefault.c:3445 msgid "Remove" msgstr "Eliminar" -#: ../gtk/gtkfilechooserdefault.c:3451 +#: ../gtk/gtkfilechooserdefault.c:3454 msgid "Rename..." msgstr "Renomear..." #. Accessible object name for the file chooser's shortcuts pane -#: ../gtk/gtkfilechooserdefault.c:3614 +#: ../gtk/gtkfilechooserdefault.c:3617 msgid "Places" msgstr "Lugares" #. Column header for the file chooser's shortcuts pane -#: ../gtk/gtkfilechooserdefault.c:3671 +#: ../gtk/gtkfilechooserdefault.c:3674 msgid "_Places" msgstr "_Lugares" -#: ../gtk/gtkfilechooserdefault.c:3727 +#: ../gtk/gtkfilechooserdefault.c:3731 msgid "_Add" msgstr "_Engadir" -#: ../gtk/gtkfilechooserdefault.c:3734 +#: ../gtk/gtkfilechooserdefault.c:3738 msgid "Add the selected folder to the Bookmarks" msgstr "Engadir o cartafol seleccionado aos marcadores" -#: ../gtk/gtkfilechooserdefault.c:3739 +#: ../gtk/gtkfilechooserdefault.c:3743 msgid "_Remove" msgstr "_Eliminar" -#: ../gtk/gtkfilechooserdefault.c:3881 +#: ../gtk/gtkfilechooserdefault.c:3885 msgid "Could not select file" msgstr "Non foi posíbel seleccionar o ficheiro" -#: ../gtk/gtkfilechooserdefault.c:4056 +#: ../gtk/gtkfilechooserdefault.c:4060 msgid "_Add to Bookmarks" msgstr "_Engadir aos marcadores" -#: ../gtk/gtkfilechooserdefault.c:4069 +#: ../gtk/gtkfilechooserdefault.c:4073 msgid "Show _Hidden Files" msgstr "Mostrar os ficheiros _ocultos" -#: ../gtk/gtkfilechooserdefault.c:4076 +#: ../gtk/gtkfilechooserdefault.c:4080 msgid "Show _Size Column" msgstr "Mostrar a columna de _tamaño" -#: ../gtk/gtkfilechooserdefault.c:4302 +#: ../gtk/gtkfilechooserdefault.c:4306 msgid "Files" msgstr "Ficheiros" -#: ../gtk/gtkfilechooserdefault.c:4353 +#: ../gtk/gtkfilechooserdefault.c:4357 msgid "Name" msgstr "Nome" -#: ../gtk/gtkfilechooserdefault.c:4376 +#: ../gtk/gtkfilechooserdefault.c:4380 msgid "Size" msgstr "Tamaño" -#: ../gtk/gtkfilechooserdefault.c:4390 +#: ../gtk/gtkfilechooserdefault.c:4394 msgid "Modified" msgstr "Modificado" #. Label -#: ../gtk/gtkfilechooserdefault.c:4645 ../gtk/gtkprinteroptionwidget.c:793 +#: ../gtk/gtkfilechooserdefault.c:4649 ../gtk/gtkprinteroptionwidget.c:793 msgid "_Name:" msgstr "_Nome:" -#: ../gtk/gtkfilechooserdefault.c:4688 +#: ../gtk/gtkfilechooserdefault.c:4692 msgid "_Browse for other folders" msgstr "_Buscar outros cartafoles" -#: ../gtk/gtkfilechooserdefault.c:4958 +#: ../gtk/gtkfilechooserdefault.c:4962 msgid "Type a file name" msgstr "Teclee un nome de ficheiro" #. Create Folder -#: ../gtk/gtkfilechooserdefault.c:5001 +#: ../gtk/gtkfilechooserdefault.c:5005 msgid "Create Fo_lder" msgstr "Crear car_tafol" -#: ../gtk/gtkfilechooserdefault.c:5011 +#: ../gtk/gtkfilechooserdefault.c:5015 msgid "_Location:" msgstr "_Localización:" -#: ../gtk/gtkfilechooserdefault.c:5215 +#: ../gtk/gtkfilechooserdefault.c:5219 msgid "Save in _folder:" msgstr "Gardar no _cartafol:" -#: ../gtk/gtkfilechooserdefault.c:5217 +#: ../gtk/gtkfilechooserdefault.c:5221 msgid "Create in _folder:" msgstr "Crear no _cartafol:" -#: ../gtk/gtkfilechooserdefault.c:6286 +#: ../gtk/gtkfilechooserdefault.c:6290 #, c-format msgid "Could not read the contents of %s" msgstr "Non foi posíbel ler os contidos do %s" -#: ../gtk/gtkfilechooserdefault.c:6290 +#: ../gtk/gtkfilechooserdefault.c:6294 msgid "Could not read the contents of the folder" msgstr "Non foi posíbel ler os contidos do cartafol" -#: ../gtk/gtkfilechooserdefault.c:6383 ../gtk/gtkfilechooserdefault.c:6451 -#: ../gtk/gtkfilechooserdefault.c:6596 +#: ../gtk/gtkfilechooserdefault.c:6387 ../gtk/gtkfilechooserdefault.c:6455 +#: ../gtk/gtkfilechooserdefault.c:6600 msgid "Unknown" msgstr "Descoñecido" -#: ../gtk/gtkfilechooserdefault.c:6398 +#: ../gtk/gtkfilechooserdefault.c:6402 msgid "%H:%M" msgstr "%H:%M" -#: ../gtk/gtkfilechooserdefault.c:6400 +#: ../gtk/gtkfilechooserdefault.c:6404 msgid "Yesterday at %H:%M" msgstr "Onte ás %H:%M" -#: ../gtk/gtkfilechooserdefault.c:7066 +#: ../gtk/gtkfilechooserdefault.c:7070 msgid "Cannot change to folder because it is not local" msgstr "Non é posíbel cambiar ao cartafol porque non é local" -#: ../gtk/gtkfilechooserdefault.c:7663 ../gtk/gtkfilechooserdefault.c:7684 +#: ../gtk/gtkfilechooserdefault.c:7667 ../gtk/gtkfilechooserdefault.c:7688 #, c-format msgid "Shortcut %s already exists" msgstr "O atallo %s xa existe" -#: ../gtk/gtkfilechooserdefault.c:7774 +#: ../gtk/gtkfilechooserdefault.c:7778 #, c-format msgid "Shortcut %s does not exist" msgstr "O atallo %s non existe" -#: ../gtk/gtkfilechooserdefault.c:8035 ../gtk/gtkprintunixdialog.c:480 +#: ../gtk/gtkfilechooserdefault.c:8039 ../gtk/gtkprintunixdialog.c:480 #, c-format msgid "A file named \"%s\" already exists. Do you want to replace it?" msgstr "Xa existe un ficheiro con nome «%s». Quere substituílo?" -#: ../gtk/gtkfilechooserdefault.c:8038 ../gtk/gtkprintunixdialog.c:484 +#: ../gtk/gtkfilechooserdefault.c:8042 ../gtk/gtkprintunixdialog.c:484 #, c-format msgid "" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" "O ficheiro xa existe en «%s». Se o substitúe sobrescribirá os seus contidos." -#: ../gtk/gtkfilechooserdefault.c:8043 ../gtk/gtkprintunixdialog.c:491 +#: ../gtk/gtkfilechooserdefault.c:8047 ../gtk/gtkprintunixdialog.c:491 msgid "_Replace" msgstr "_Substituír" -#: ../gtk/gtkfilechooserdefault.c:8751 +#: ../gtk/gtkfilechooserdefault.c:8755 msgid "Could not start the search process" msgstr "Non foi posíbel iniciar o proceso de busca" -#: ../gtk/gtkfilechooserdefault.c:8752 +#: ../gtk/gtkfilechooserdefault.c:8756 msgid "" "The program was not able to create a connection to the indexer daemon. " "Please make sure it is running." @@ -1096,15 +1096,15 @@ msgstr "" "O programa non puido crear unha conexión co deamon indexador. Asegúrese de " "que está en execución." -#: ../gtk/gtkfilechooserdefault.c:8766 +#: ../gtk/gtkfilechooserdefault.c:8770 msgid "Could not send the search request" msgstr "Non foi posíbel enviar a solicitude de busca" -#: ../gtk/gtkfilechooserdefault.c:8954 +#: ../gtk/gtkfilechooserdefault.c:8989 msgid "Search:" msgstr "Buscar:" -#: ../gtk/gtkfilechooserdefault.c:9559 +#: ../gtk/gtkfilechooserdefault.c:9594 #, c-format msgid "Could not mount %s" msgstr "Non foi posíbel montar %s" @@ -1207,11 +1207,11 @@ msgid "Si_ze:" msgstr "_Tamaño:" #. create the text entry widget -#: ../gtk/gtkfontsel.c:559 +#: ../gtk/gtkfontsel.c:558 msgid "_Preview:" msgstr "_Previsualización:" -#: ../gtk/gtkfontsel.c:1659 +#: ../gtk/gtkfontsel.c:1658 msgid "Font Selection" msgstr "Selección do tipo de letra" @@ -1223,7 +1223,7 @@ msgstr "Selección do tipo de letra" msgid "Error loading icon: %s" msgstr "Produciuse un erro ao cargar a icona: %s" -#: ../gtk/gtkicontheme.c:1354 +#: ../gtk/gtkicontheme.c:1352 #, c-format msgid "" "Could not find the icon '%s'. The '%s' theme\n" @@ -1236,12 +1236,12 @@ msgstr "" "Pode obter unha copia desde:\n" "\t%s" -#: ../gtk/gtkicontheme.c:1535 +#: ../gtk/gtkicontheme.c:1533 #, c-format msgid "Icon '%s' not present in theme" msgstr "A icona «%s» non está presente no tema" -#: ../gtk/gtkicontheme.c:3048 +#: ../gtk/gtkicontheme.c:3054 msgid "Failed to load icon" msgstr "Produciuse un fallo ao cargar a icona" @@ -1266,12 +1266,12 @@ msgid "System (%s)" msgstr "Sistema (%s)" #. Open Link -#: ../gtk/gtklabel.c:6196 +#: ../gtk/gtklabel.c:6233 msgid "_Open Link" msgstr "_Abrir a ligazón" #. Copy Link Address -#: ../gtk/gtklabel.c:6208 +#: ../gtk/gtklabel.c:6245 msgid "Copy _Link Address" msgstr "Copiar o enderezo da _ligazón" @@ -1284,27 +1284,27 @@ msgid "Invalid URI" msgstr "URI incorrecto" #. Description of --gtk-module=MODULES in --help output -#: ../gtk/gtkmain.c:527 +#: ../gtk/gtkmain.c:516 msgid "Load additional GTK+ modules" msgstr "Cargar os módulos adicionais GTK+" #. Placeholder in --gtk-module=MODULES in --help output -#: ../gtk/gtkmain.c:528 +#: ../gtk/gtkmain.c:517 msgid "MODULES" msgstr "MÓDULOS" #. Description of --g-fatal-warnings in --help output -#: ../gtk/gtkmain.c:530 +#: ../gtk/gtkmain.c:519 msgid "Make all warnings fatal" msgstr "Facer todos os avisos fatais" #. Description of --gtk-debug=FLAGS in --help output -#: ../gtk/gtkmain.c:533 +#: ../gtk/gtkmain.c:522 msgid "GTK+ debugging flags to set" msgstr "Marcas de depuración GTK+ para activar" #. Description of --gtk-no-debug=FLAGS in --help output -#: ../gtk/gtkmain.c:536 +#: ../gtk/gtkmain.c:525 msgid "GTK+ debugging flags to unset" msgstr "Marcas de depuración GTK+ para desconfigurar" @@ -1313,20 +1313,20 @@ msgstr "Marcas de depuración GTK+ para desconfigurar" #. * Do *not* translate it to "predefinito:LTR", if it #. * it isn't default:LTR or default:RTL it will not work #. -#: ../gtk/gtkmain.c:799 +#: ../gtk/gtkmain.c:788 msgid "default:LTR" msgstr "default:LTR" -#: ../gtk/gtkmain.c:864 +#: ../gtk/gtkmain.c:852 #, c-format msgid "Cannot open display: %s" msgstr "Non é posíbel abrir a pantalla: %s" -#: ../gtk/gtkmain.c:923 +#: ../gtk/gtkmain.c:911 msgid "GTK+ Options" msgstr "Opcións GTK+" -#: ../gtk/gtkmain.c:923 +#: ../gtk/gtkmain.c:911 msgid "Show GTK+ Options" msgstr "Mostrar opcións GTK+" @@ -1411,12 +1411,12 @@ msgstr "Intérprete de ordes Z" msgid "Cannot end process with PID %d: %s" msgstr "Non é posíbel finalizar o proceso co PID %d: %s" -#: ../gtk/gtknotebook.c:4724 ../gtk/gtknotebook.c:7287 +#: ../gtk/gtknotebook.c:4758 ../gtk/gtknotebook.c:7353 #, c-format msgid "Page %u" msgstr "Páxina %u" -#: ../gtk/gtkpagesetup.c:596 ../gtk/gtkpapersize.c:838 +#: ../gtk/gtkpagesetup.c:648 ../gtk/gtkpapersize.c:838 #: ../gtk/gtkpapersize.c:880 msgid "Not a valid page setup file" msgstr "Non é un ficheiro correcto de configuración de páxina" @@ -1464,15 +1464,15 @@ msgstr "_Orientación:" msgid "Page Setup" msgstr "Configuración de páxina" -#: ../gtk/gtkpathbar.c:154 +#: ../gtk/gtkpathbar.c:158 msgid "Up Path" msgstr "Camiño superior" -#: ../gtk/gtkpathbar.c:156 +#: ../gtk/gtkpathbar.c:160 msgid "Down Path" msgstr "Camiño inferior" -#: ../gtk/gtkpathbar.c:1490 +#: ../gtk/gtkpathbar.c:1523 msgid "File System Root" msgstr "Sistema de ficheiros raíz" @@ -1955,12 +1955,12 @@ msgstr "Algunhas das configuracións do diálogo están en conflito" msgid "Print" msgstr "Imprimir" -#: ../gtk/gtkrc.c:2834 +#: ../gtk/gtkrc.c:2855 #, c-format msgid "Unable to find include file: \"%s\"" msgstr "Non é posíbel localizar o ficheiro 'include': «%s»" -#: ../gtk/gtkrc.c:3470 ../gtk/gtkrc.c:3473 +#: ../gtk/gtkrc.c:3491 ../gtk/gtkrc.c:3494 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Non é posíbel localizar o ficheiro de imaxe no pixmap_path: «%s»" @@ -2071,12 +2071,12 @@ msgstr "" "Non foi posíbel encontrar ningún aplicativo rexistrado co nome «%s» para o " "elemento co URI «%s»" -#: ../gtk/gtkspinner.c:456 +#: ../gtk/gtkspinner.c:326 msgctxt "throbbing progress animation widget" msgid "Spinner" msgstr "Axustador" -#: ../gtk/gtkspinner.c:457 +#: ../gtk/gtkspinner.c:327 msgid "Provides visual indication of progress" msgstr "Fornece un indicador visual de progreso" @@ -2584,6 +2584,32 @@ msgctxt "Stock label" msgid "Zoom _Out" msgstr "Red_ucir" +#. Translators: if the "on" state label requires more than three +#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for +#. * the state +#. +#: ../gtk/gtkswitch.c:296 ../gtk/gtkswitch.c:339 ../gtk/gtkswitch.c:531 +msgctxt "switch" +msgid "ON" +msgstr "ACENDIDO" + +#. Translators: if the "off" state label requires more than three +#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state +#. +#: ../gtk/gtkswitch.c:304 ../gtk/gtkswitch.c:340 ../gtk/gtkswitch.c:552 +msgctxt "switch" +msgid "OFF" +msgstr "APAGADO" + +#: ../gtk/gtkswitch.c:943 +msgctxt "light switch widget" +msgid "Switch" +msgstr "Interruptor" + +#: ../gtk/gtkswitch.c:944 +msgid "Switches between on and off states" +msgstr "Cambia entre os estados acendido e apagado" + #: ../gtk/gtktextbufferrichtext.c:650 #, c-format msgid "Unknown error when trying to deserialize %s" @@ -2594,109 +2620,109 @@ msgstr "Erro descoñecido ao tentar deserializar %s" msgid "No deserialize function found for format %s" msgstr "Non se localizou a función de deserializar para o formato %s" -#: ../gtk/gtktextbufferserialize.c:803 ../gtk/gtktextbufferserialize.c:829 +#: ../gtk/gtktextbufferserialize.c:799 ../gtk/gtktextbufferserialize.c:825 #, c-format msgid "Both \"id\" and \"name\" were found on the <%s> element" msgstr "Localizáronse tanto \"id\" como \"name\" no elemento <%s>" -#: ../gtk/gtktextbufferserialize.c:813 ../gtk/gtktextbufferserialize.c:839 +#: ../gtk/gtktextbufferserialize.c:809 ../gtk/gtktextbufferserialize.c:835 #, c-format msgid "The attribute \"%s\" was found twice on the <%s> element" msgstr "O atributo «%s» localizouse dúas veces no elemento <%s>" -#: ../gtk/gtktextbufferserialize.c:855 +#: ../gtk/gtktextbufferserialize.c:851 #, c-format msgid "<%s> element has invalid ID \"%s\"" msgstr "O elemento <%s> ten un ID «%s» non válido" -#: ../gtk/gtktextbufferserialize.c:865 +#: ../gtk/gtktextbufferserialize.c:861 #, c-format msgid "<%s> element has neither a \"name\" nor an \"id\" attribute" msgstr "" "O elemento <%s> non ten nin un atributo \"name\" nin un atributo \"id\"" -#: ../gtk/gtktextbufferserialize.c:952 +#: ../gtk/gtktextbufferserialize.c:948 #, c-format msgid "Attribute \"%s\" repeated twice on the same <%s> element" msgstr "O atributo «%s» repítese dúas veces no mesmo elemento <%s>" -#: ../gtk/gtktextbufferserialize.c:970 ../gtk/gtktextbufferserialize.c:995 +#: ../gtk/gtktextbufferserialize.c:966 ../gtk/gtktextbufferserialize.c:991 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "O atributo «%s» non é válido no elemento <%s> neste contexto" -#: ../gtk/gtktextbufferserialize.c:1034 +#: ../gtk/gtktextbufferserialize.c:1030 #, c-format msgid "Tag \"%s\" has not been defined." msgstr "A etiqueta «%s» non foi definida." -#: ../gtk/gtktextbufferserialize.c:1046 +#: ../gtk/gtktextbufferserialize.c:1042 msgid "Anonymous tag found and tags can not be created." msgstr "Localizouse unha etiqueta anónima e non é posíbel crear as etiquetas." -#: ../gtk/gtktextbufferserialize.c:1057 +#: ../gtk/gtktextbufferserialize.c:1053 #, c-format msgid "Tag \"%s\" does not exist in buffer and tags can not be created." msgstr "" "A etiqueta «%s» non existe no búfer e non é posíbel crear as etiquetas." -#: ../gtk/gtktextbufferserialize.c:1156 ../gtk/gtktextbufferserialize.c:1231 -#: ../gtk/gtktextbufferserialize.c:1336 ../gtk/gtktextbufferserialize.c:1410 +#: ../gtk/gtktextbufferserialize.c:1152 ../gtk/gtktextbufferserialize.c:1227 +#: ../gtk/gtktextbufferserialize.c:1332 ../gtk/gtktextbufferserialize.c:1406 #, c-format msgid "Element <%s> is not allowed below <%s>" msgstr "Non se permite o elemento <%s> por baixo de <%s>" -#: ../gtk/gtktextbufferserialize.c:1187 +#: ../gtk/gtktextbufferserialize.c:1183 #, c-format msgid "\"%s\" is not a valid attribute type" msgstr "«%s» non é un tipo de atributo correcto" -#: ../gtk/gtktextbufferserialize.c:1195 +#: ../gtk/gtktextbufferserialize.c:1191 #, c-format msgid "\"%s\" is not a valid attribute name" msgstr "«%s» non é un nome de atributo correcto" -#: ../gtk/gtktextbufferserialize.c:1205 +#: ../gtk/gtktextbufferserialize.c:1201 #, c-format msgid "" "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\"" msgstr "" "Non foi posíbel converter «%s» nun valor de tipo «%s» para o atributo «%s»" -#: ../gtk/gtktextbufferserialize.c:1214 +#: ../gtk/gtktextbufferserialize.c:1210 #, c-format msgid "\"%s\" is not a valid value for attribute \"%s\"" msgstr "«%s» non é un valor correcto para o atributo «%s»" -#: ../gtk/gtktextbufferserialize.c:1299 +#: ../gtk/gtktextbufferserialize.c:1295 #, c-format msgid "Tag \"%s\" already defined" msgstr "A etiqueta «%s» xa está definida" -#: ../gtk/gtktextbufferserialize.c:1312 +#: ../gtk/gtktextbufferserialize.c:1308 #, c-format msgid "Tag \"%s\" has invalid priority \"%s\"" msgstr "A etiqueta «%s» ten a prioridade incorrecta«%s»" -#: ../gtk/gtktextbufferserialize.c:1365 +#: ../gtk/gtktextbufferserialize.c:1361 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "O elemento máis extremo no texto debe ser non <%s>" -#: ../gtk/gtktextbufferserialize.c:1374 ../gtk/gtktextbufferserialize.c:1390 +#: ../gtk/gtktextbufferserialize.c:1370 ../gtk/gtktextbufferserialize.c:1386 #, c-format msgid "A <%s> element has already been specified" msgstr "Xa se especificou un elemento <%s>" -#: ../gtk/gtktextbufferserialize.c:1396 +#: ../gtk/gtktextbufferserialize.c:1392 msgid "A element can't occur before a element" msgstr "Un elemento non pode aparecer antes dun elemento " -#: ../gtk/gtktextbufferserialize.c:1796 +#: ../gtk/gtktextbufferserialize.c:1792 msgid "Serialized data is malformed" msgstr "Os datos serializados están formados incorrectamente" -#: ../gtk/gtktextbufferserialize.c:1874 +#: ../gtk/gtktextbufferserialize.c:1870 msgid "" "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001" msgstr "" @@ -3655,81 +3681,81 @@ msgstr "Produciuse un fallo ao escribir o índice do cartafol\n" msgid "Failed to rewrite header\n" msgstr "Produciuse un fallo ao reescribir a cabeceira\n" -#: ../gtk/updateiconcache.c:1463 +#: ../gtk/updateiconcache.c:1488 #, c-format msgid "Failed to open file %s : %s\n" msgstr "Produciuse un fallo ao abrir o ficheiro %s : %s\n" -#: ../gtk/updateiconcache.c:1471 +#: ../gtk/updateiconcache.c:1496 ../gtk/updateiconcache.c:1526 #, c-format msgid "Failed to write cache file: %s\n" msgstr "Produciuse un fallo ao escribir o ficheiro da caché: %s\n" -#: ../gtk/updateiconcache.c:1507 +#: ../gtk/updateiconcache.c:1537 #, c-format msgid "The generated cache was invalid.\n" msgstr "A caché xerada non é correcta.\n" -#: ../gtk/updateiconcache.c:1521 +#: ../gtk/updateiconcache.c:1551 #, c-format msgid "Could not rename %s to %s: %s, removing %s then.\n" msgstr "Non foi posíbel renomear %s como %s: %s, ao eliminar %s despois.\n" -#: ../gtk/updateiconcache.c:1535 +#: ../gtk/updateiconcache.c:1565 #, c-format msgid "Could not rename %s to %s: %s\n" msgstr "Non foi posíbel renomear %s como %s: %s\n" -#: ../gtk/updateiconcache.c:1545 +#: ../gtk/updateiconcache.c:1575 #, c-format msgid "Could not rename %s back to %s: %s.\n" msgstr "Non foi posíbel volver a renomear %s como %s: %s.\n" -#: ../gtk/updateiconcache.c:1572 +#: ../gtk/updateiconcache.c:1602 #, c-format msgid "Cache file created successfully.\n" msgstr "O ficheiro da caché creouse correctamente.\n" -#: ../gtk/updateiconcache.c:1611 +#: ../gtk/updateiconcache.c:1641 msgid "Overwrite an existing cache, even if up to date" msgstr "Substituír unha caché existente, mesmo se está actualizada" -#: ../gtk/updateiconcache.c:1612 +#: ../gtk/updateiconcache.c:1642 msgid "Don't check for the existence of index.theme" msgstr "Non verificar a existencia de index.theme" -#: ../gtk/updateiconcache.c:1613 +#: ../gtk/updateiconcache.c:1643 msgid "Don't include image data in the cache" msgstr "Non incluír os datos da imaxe na caché" -#: ../gtk/updateiconcache.c:1614 +#: ../gtk/updateiconcache.c:1644 msgid "Output a C header file" msgstr "Xerar un ficheiro de cabeceira C" -#: ../gtk/updateiconcache.c:1615 +#: ../gtk/updateiconcache.c:1645 msgid "Turn off verbose output" msgstr "Desactivar a saída detallada" -#: ../gtk/updateiconcache.c:1616 +#: ../gtk/updateiconcache.c:1646 msgid "Validate existing icon cache" msgstr "Validar a caché de iconas existente" -#: ../gtk/updateiconcache.c:1683 +#: ../gtk/updateiconcache.c:1713 #, c-format msgid "File not found: %s\n" msgstr "O ficheiro non foi encontrado: %s\n" -#: ../gtk/updateiconcache.c:1689 +#: ../gtk/updateiconcache.c:1719 #, c-format msgid "Not a valid icon cache: %s\n" msgstr "Non é unha caché de iconas correcta: %s\n" -#: ../gtk/updateiconcache.c:1702 +#: ../gtk/updateiconcache.c:1732 #, c-format msgid "No theme index file.\n" msgstr "Non hai ficheiro de índice de tema.\n" -#: ../gtk/updateiconcache.c:1706 +#: ../gtk/updateiconcache.c:1736 #, c-format msgid "" "No theme index file in '%s'.\n" @@ -4147,32 +4173,32 @@ msgstr "Personalizado %sx%s" msgid "output.%s" msgstr "saída.%s" -#: ../modules/printbackends/file/gtkprintbackendfile.c:493 +#: ../modules/printbackends/file/gtkprintbackendfile.c:501 msgid "Print to File" msgstr "Imprimir a un ficheiro" -#: ../modules/printbackends/file/gtkprintbackendfile.c:570 +#: ../modules/printbackends/file/gtkprintbackendfile.c:578 msgid "PDF" msgstr "PDF" -#: ../modules/printbackends/file/gtkprintbackendfile.c:570 +#: ../modules/printbackends/file/gtkprintbackendfile.c:578 msgid "Postscript" msgstr "Postscript" -#: ../modules/printbackends/file/gtkprintbackendfile.c:570 +#: ../modules/printbackends/file/gtkprintbackendfile.c:578 msgid "SVG" msgstr "SVG" -#: ../modules/printbackends/file/gtkprintbackendfile.c:582 +#: ../modules/printbackends/file/gtkprintbackendfile.c:590 #: ../modules/printbackends/test/gtkprintbackendtest.c:503 msgid "Pages per _sheet:" msgstr "Pá_xinas por folla:" -#: ../modules/printbackends/file/gtkprintbackendfile.c:641 +#: ../modules/printbackends/file/gtkprintbackendfile.c:649 msgid "File" msgstr "Ficheiro" -#: ../modules/printbackends/file/gtkprintbackendfile.c:651 +#: ../modules/printbackends/file/gtkprintbackendfile.c:659 msgid "_Output format" msgstr "Formato de _saída" diff --git a/po/nb.po b/po/nb.po index 13efa46c7c..f9b2919b15 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 2.92.x\n" -"Report-Msgid-Bugs-To:\n" -"POT-Creation-Date: 2010-11-20 11:47+0100\n" -"PO-Revision-Date: 2010-11-20 11:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-12-06 18:12+0100\n" +"PO-Revision-Date: 2010-12-06 18:13+0100\n" "Last-Translator: Torstein Adolf Winterseth \n" "Language-Team: Norwegian Nynorsk \n" "Language: nn\n" @@ -77,7 +77,7 @@ msgstr "Feilsøkingsflagg som skal settes for GDK" #. Placeholder in --gdk-no-debug=FLAGS in --help output #. Placeholder in --gtk-debug=FLAGS in --help output #. Placeholder in --gtk-no-debug=FLAGS in --help output -#: ../gdk/gdk.c:177 ../gdk/gdk.c:180 ../gtk/gtkmain.c:525 ../gtk/gtkmain.c:528 +#: ../gdk/gdk.c:177 ../gdk/gdk.c:180 ../gtk/gtkmain.c:523 ../gtk/gtkmain.c:526 msgid "FLAGS" msgstr "FLAGG" @@ -301,17 +301,17 @@ msgstr "Størrelse på paletten i 8-bits modus" msgid "COLORS" msgstr "FARGER" -#: ../gdk/x11/gdkapplaunchcontext-x11.c:312 +#: ../gdk/x11/gdkapplaunchcontext-x11.c:305 #, c-format msgid "Starting %s" msgstr "Starter %s" -#: ../gdk/x11/gdkapplaunchcontext-x11.c:316 +#: ../gdk/x11/gdkapplaunchcontext-x11.c:318 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: ../gdk/x11/gdkapplaunchcontext-x11.c:321 +#: ../gdk/x11/gdkapplaunchcontext-x11.c:323 #, c-format msgid "Opening %d Item" msgid_plural "Opening %d Items" @@ -788,23 +788,23 @@ msgstr "Høy_re:" msgid "Paper Margins" msgstr "Papirmarger" -#: ../gtk/gtkentry.c:8630 ../gtk/gtktextview.c:8229 +#: ../gtk/gtkentry.c:8793 ../gtk/gtktextview.c:8229 msgid "Input _Methods" msgstr "Inndata_metoder" -#: ../gtk/gtkentry.c:8644 ../gtk/gtktextview.c:8243 +#: ../gtk/gtkentry.c:8807 ../gtk/gtktextview.c:8243 msgid "_Insert Unicode Control Character" msgstr "Sett _inn Unicode kontrolltegn" -#: ../gtk/gtkentry.c:10044 +#: ../gtk/gtkentry.c:10207 msgid "Caps Lock and Num Lock are on" msgstr "Caps Lock og Num Lock er på" -#: ../gtk/gtkentry.c:10046 +#: ../gtk/gtkentry.c:10209 msgid "Num Lock is on" msgstr "Num Lock er på" -#: ../gtk/gtkentry.c:10048 +#: ../gtk/gtkentry.c:10211 msgid "Caps Lock is on" msgstr "Caps Lock er på" @@ -1205,7 +1205,7 @@ msgstr "Valg av skrift" msgid "Error loading icon: %s" msgstr "Feil under lasting av ikon: %s" -#: ../gtk/gtkicontheme.c:1355 +#: ../gtk/gtkicontheme.c:1352 #, c-format msgid "" "Could not find the icon '%s'. The '%s' theme\n" @@ -1218,12 +1218,12 @@ msgstr "" "Du kan finne en kopi av det på:\n" "\t%s" -#: ../gtk/gtkicontheme.c:1536 +#: ../gtk/gtkicontheme.c:1533 #, c-format msgid "Icon '%s' not present in theme" msgstr "Ikon «%s» er ikke tilstede i tema" -#: ../gtk/gtkicontheme.c:3057 +#: ../gtk/gtkicontheme.c:3054 msgid "Failed to load icon" msgstr "Feil under lasting av ikon" @@ -1248,12 +1248,12 @@ msgid "System (%s)" msgstr "System (%s)" #. Open Link -#: ../gtk/gtklabel.c:6214 +#: ../gtk/gtklabel.c:6243 msgid "_Open Link" msgstr "_Åpne lenke" #. Copy Link Address -#: ../gtk/gtklabel.c:6226 +#: ../gtk/gtklabel.c:6255 msgid "Copy _Link Address" msgstr "Kopier _lenkas adresse" @@ -1266,27 +1266,27 @@ msgid "Invalid URI" msgstr "Ugyldig URI" #. Description of --gtk-module=MODULES in --help output -#: ../gtk/gtkmain.c:518 +#: ../gtk/gtkmain.c:516 msgid "Load additional GTK+ modules" msgstr "Last tilleggsmoduler for GTK+" #. Placeholder in --gtk-module=MODULES in --help output -#: ../gtk/gtkmain.c:519 +#: ../gtk/gtkmain.c:517 msgid "MODULES" msgstr "MODULER" #. Description of --g-fatal-warnings in --help output -#: ../gtk/gtkmain.c:521 +#: ../gtk/gtkmain.c:519 msgid "Make all warnings fatal" msgstr "La alle advarsler være fatale" #. Description of --gtk-debug=FLAGS in --help output -#: ../gtk/gtkmain.c:524 +#: ../gtk/gtkmain.c:522 msgid "GTK+ debugging flags to set" msgstr "Feilsøkingsflagg som skal settes for GTK+" #. Description of --gtk-no-debug=FLAGS in --help output -#: ../gtk/gtkmain.c:527 +#: ../gtk/gtkmain.c:525 msgid "GTK+ debugging flags to unset" msgstr "Feilsøkingsflagg som skal fjernes for GTK+" @@ -1295,20 +1295,20 @@ msgstr "Feilsøkingsflagg som skal fjernes for GTK+" #. * Do *not* translate it to "predefinito:LTR", if it #. * it isn't default:LTR or default:RTL it will not work #. -#: ../gtk/gtkmain.c:790 +#: ../gtk/gtkmain.c:788 msgid "default:LTR" msgstr "default:LTR" -#: ../gtk/gtkmain.c:855 +#: ../gtk/gtkmain.c:852 #, c-format msgid "Cannot open display: %s" msgstr "Kan ikke åpne skjerm: %s" -#: ../gtk/gtkmain.c:914 +#: ../gtk/gtkmain.c:911 msgid "GTK+ Options" msgstr "Alternativer for GTK+" -#: ../gtk/gtkmain.c:914 +#: ../gtk/gtkmain.c:911 msgid "Show GTK+ Options" msgstr "Vis alternativer for GTK+" @@ -1393,7 +1393,7 @@ msgstr "Z Shell" msgid "Cannot end process with PID %d: %s" msgstr "Kan ikke avslutte prosess med PID %d: %s" -#: ../gtk/gtknotebook.c:4756 ../gtk/gtknotebook.c:7319 +#: ../gtk/gtknotebook.c:4758 ../gtk/gtknotebook.c:7353 #, c-format msgid "Page %u" msgstr "Side %u" @@ -1937,12 +1937,12 @@ msgstr "Noen innstillinger i dialogen er i konflikt" msgid "Print" msgstr "Skriv ut" -#: ../gtk/gtkrc.c:2834 +#: ../gtk/gtkrc.c:2855 #, c-format msgid "Unable to find include file: \"%s\"" msgstr "Kan ikke finne include-fil: «%s»" -#: ../gtk/gtkrc.c:3470 ../gtk/gtkrc.c:3473 +#: ../gtk/gtkrc.c:3491 ../gtk/gtkrc.c:3494 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Klarte ikke å finne bildefil i pixmap_path: «%s»" @@ -2049,14 +2049,15 @@ msgstr "Kan ikke finne en oppføring med URI «%s»" #: ../gtk/gtkrecentmanager.c:2437 #, c-format msgid "No registered application with name '%s' for item with URI '%s' found" -msgstr "Ingen registrerte programmer med navn «%s» funnet for oppføring med URI «%s»" +msgstr "" +"Ingen registrerte programmer med navn «%s» funnet for oppføring med URI «%s»" -#: ../gtk/gtkspinner.c:456 +#: ../gtk/gtkspinner.c:326 msgctxt "throbbing progress animation widget" msgid "Spinner" msgstr "Spinner" -#: ../gtk/gtkspinner.c:457 +#: ../gtk/gtkspinner.c:327 msgid "Provides visual indication of progress" msgstr "Gir visuell indikasjon av framdrift" @@ -2564,6 +2565,32 @@ msgctxt "Stock label" msgid "Zoom _Out" msgstr "Zoom _ut" +#. Translators: if the "on" state label requires more than three +#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for +#. * the state +#. +#: ../gtk/gtkswitch.c:296 ../gtk/gtkswitch.c:339 ../gtk/gtkswitch.c:531 +msgctxt "switch" +msgid "ON" +msgstr "PÅ" + +#. Translators: if the "off" state label requires more than three +#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state +#. +#: ../gtk/gtkswitch.c:304 ../gtk/gtkswitch.c:340 ../gtk/gtkswitch.c:552 +msgctxt "switch" +msgid "OFF" +msgstr "AV" + +#: ../gtk/gtkswitch.c:943 +msgctxt "light switch widget" +msgid "Switch" +msgstr "Bryter" + +#: ../gtk/gtkswitch.c:944 +msgid "Switches between on and off states" +msgstr "Bytter mellom av/på tilstand" + #: ../gtk/gtktextbufferrichtext.c:650 #, c-format msgid "Unknown error when trying to deserialize %s" @@ -2574,107 +2601,107 @@ msgstr "Ukjent feil ved forsøk på å deserialisere %s" msgid "No deserialize function found for format %s" msgstr "Ingen de-serialiseringsfunksjon funnet for format %s" -#: ../gtk/gtktextbufferserialize.c:803 ../gtk/gtktextbufferserialize.c:829 +#: ../gtk/gtktextbufferserialize.c:799 ../gtk/gtktextbufferserialize.c:825 #, c-format msgid "Both \"id\" and \"name\" were found on the <%s> element" msgstr "Både «id» og «name» ble finnet i element <%s>" -#: ../gtk/gtktextbufferserialize.c:813 ../gtk/gtktextbufferserialize.c:839 +#: ../gtk/gtktextbufferserialize.c:809 ../gtk/gtktextbufferserialize.c:835 #, c-format msgid "The attribute \"%s\" was found twice on the <%s> element" msgstr "Attributten «%s» ble funnet to ganger på element <%s>" -#: ../gtk/gtktextbufferserialize.c:855 +#: ../gtk/gtktextbufferserialize.c:851 #, c-format msgid "<%s> element has invalid ID \"%s\"" msgstr "Element <%s> har ugyldig ID «%s»" -#: ../gtk/gtktextbufferserialize.c:865 +#: ../gtk/gtktextbufferserialize.c:861 #, c-format msgid "<%s> element has neither a \"name\" nor an \"id\" attribute" msgstr "Element <%s> har ikke et «name»- eller «id»-element" -#: ../gtk/gtktextbufferserialize.c:952 +#: ../gtk/gtktextbufferserialize.c:948 #, c-format msgid "Attribute \"%s\" repeated twice on the same <%s> element" msgstr "Attributt «%s» gjentatt to ganger på samme <%s>-element" -#: ../gtk/gtktextbufferserialize.c:970 ../gtk/gtktextbufferserialize.c:995 +#: ../gtk/gtktextbufferserialize.c:966 ../gtk/gtktextbufferserialize.c:991 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Attributt «%s» er ugyldig på <%s>-element i denne konteksten" -#: ../gtk/gtktextbufferserialize.c:1034 +#: ../gtk/gtktextbufferserialize.c:1030 #, c-format msgid "Tag \"%s\" has not been defined." msgstr "Tagg «%s» er ikke definert." -#: ../gtk/gtktextbufferserialize.c:1046 +#: ../gtk/gtktextbufferserialize.c:1042 msgid "Anonymous tag found and tags can not be created." msgstr "Anonym tagg funnet og tagger kan ikke opprettes." -#: ../gtk/gtktextbufferserialize.c:1057 +#: ../gtk/gtktextbufferserialize.c:1053 #, c-format msgid "Tag \"%s\" does not exist in buffer and tags can not be created." msgstr "Tagg «%s» eksisterer ikke i bufferen og tagger kan ikke opprettes." -#: ../gtk/gtktextbufferserialize.c:1156 ../gtk/gtktextbufferserialize.c:1231 -#: ../gtk/gtktextbufferserialize.c:1336 ../gtk/gtktextbufferserialize.c:1410 +#: ../gtk/gtktextbufferserialize.c:1152 ../gtk/gtktextbufferserialize.c:1227 +#: ../gtk/gtktextbufferserialize.c:1332 ../gtk/gtktextbufferserialize.c:1406 #, c-format msgid "Element <%s> is not allowed below <%s>" msgstr "Element <%s> er ikke tillatt under <%s>" -#: ../gtk/gtktextbufferserialize.c:1187 +#: ../gtk/gtktextbufferserialize.c:1183 #, c-format msgid "\"%s\" is not a valid attribute type" msgstr "«%s» er ikke en gyldig type attributt" -#: ../gtk/gtktextbufferserialize.c:1195 +#: ../gtk/gtktextbufferserialize.c:1191 #, c-format msgid "\"%s\" is not a valid attribute name" msgstr "«%s» er ikke et gyldig attributtnavn" -#: ../gtk/gtktextbufferserialize.c:1205 +#: ../gtk/gtktextbufferserialize.c:1201 #, c-format msgid "" "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\"" msgstr "" "«%s» kunne ikke konverteres til en verdi av type «%s» for attributt «%s»" -#: ../gtk/gtktextbufferserialize.c:1214 +#: ../gtk/gtktextbufferserialize.c:1210 #, c-format msgid "\"%s\" is not a valid value for attribute \"%s\"" msgstr "«%s» er ikke en gyldig verdi for attributt «%s»" -#: ../gtk/gtktextbufferserialize.c:1299 +#: ../gtk/gtktextbufferserialize.c:1295 #, c-format msgid "Tag \"%s\" already defined" msgstr "Tagg «%s» er allerede definert" -#: ../gtk/gtktextbufferserialize.c:1312 +#: ../gtk/gtktextbufferserialize.c:1308 #, c-format msgid "Tag \"%s\" has invalid priority \"%s\"" msgstr "Tagg «%s» har ugyldig prioritet «%s»" -#: ../gtk/gtktextbufferserialize.c:1365 +#: ../gtk/gtktextbufferserialize.c:1361 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Det ytterste elementet i en tekst må være ikke <%s>" -#: ../gtk/gtktextbufferserialize.c:1374 ../gtk/gtktextbufferserialize.c:1390 +#: ../gtk/gtktextbufferserialize.c:1370 ../gtk/gtktextbufferserialize.c:1386 #, c-format msgid "A <%s> element has already been specified" msgstr "Et element <%s> er allerede spesifisert" -#: ../gtk/gtktextbufferserialize.c:1396 +#: ../gtk/gtktextbufferserialize.c:1392 msgid "A element can't occur before a element" msgstr "Et -element kan ikke brukes før et -element" -#: ../gtk/gtktextbufferserialize.c:1796 +#: ../gtk/gtktextbufferserialize.c:1792 msgid "Serialized data is malformed" msgstr "Serialiserte data har feil utforming" -#: ../gtk/gtktextbufferserialize.c:1874 +#: ../gtk/gtktextbufferserialize.c:1870 msgid "" "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001" msgstr "" @@ -3632,81 +3659,81 @@ msgstr "Klarte ikke å skrive mappeindeks\n" msgid "Failed to rewrite header\n" msgstr "Klarte ikke skrive om hode\n" -#: ../gtk/updateiconcache.c:1463 +#: ../gtk/updateiconcache.c:1488 #, c-format msgid "Failed to open file %s : %s\n" msgstr "Klarte ikke å åpne fil %s: %s\n" -#: ../gtk/updateiconcache.c:1471 +#: ../gtk/updateiconcache.c:1496 ../gtk/updateiconcache.c:1526 #, c-format msgid "Failed to write cache file: %s\n" msgstr "Klarte ikke å skrive bufferfil: %s\n" -#: ../gtk/updateiconcache.c:1507 +#: ../gtk/updateiconcache.c:1537 #, c-format msgid "The generated cache was invalid.\n" msgstr "Generert buffer var ugyldig.\n" -#: ../gtk/updateiconcache.c:1521 +#: ../gtk/updateiconcache.c:1551 #, c-format msgid "Could not rename %s to %s: %s, removing %s then.\n" msgstr "Klarte ikke å endre navn på %s til %s: %s, fjerner %s.\n" -#: ../gtk/updateiconcache.c:1535 +#: ../gtk/updateiconcache.c:1565 #, c-format msgid "Could not rename %s to %s: %s\n" msgstr "Klarte ikke å endre navn på %s til %s: %s\n" -#: ../gtk/updateiconcache.c:1545 +#: ../gtk/updateiconcache.c:1575 #, c-format msgid "Could not rename %s back to %s: %s.\n" msgstr "Klarte ikke å endre navn på %s tilbake til %s: %s\n" -#: ../gtk/updateiconcache.c:1572 +#: ../gtk/updateiconcache.c:1602 #, c-format msgid "Cache file created successfully.\n" msgstr "Oppretting av bufferfil fullført.\n" -#: ../gtk/updateiconcache.c:1611 +#: ../gtk/updateiconcache.c:1641 msgid "Overwrite an existing cache, even if up to date" msgstr "Overskriv en eksisterende buffer, selv om den er oppdatert" -#: ../gtk/updateiconcache.c:1612 +#: ../gtk/updateiconcache.c:1642 msgid "Don't check for the existence of index.theme" msgstr "Ikke sjekk om index.theme eksisterer" -#: ../gtk/updateiconcache.c:1613 +#: ../gtk/updateiconcache.c:1643 msgid "Don't include image data in the cache" msgstr "Ikke ta med bildedata i bufferen" -#: ../gtk/updateiconcache.c:1614 +#: ../gtk/updateiconcache.c:1644 msgid "Output a C header file" msgstr "Skriv ut en C-headerfil" -#: ../gtk/updateiconcache.c:1615 +#: ../gtk/updateiconcache.c:1645 msgid "Turn off verbose output" msgstr "Slå av ekstra utdata" -#: ../gtk/updateiconcache.c:1616 +#: ../gtk/updateiconcache.c:1646 msgid "Validate existing icon cache" msgstr "Valider eksisterende ikonbuffer" -#: ../gtk/updateiconcache.c:1683 +#: ../gtk/updateiconcache.c:1713 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke funnet %s\n" -#: ../gtk/updateiconcache.c:1689 +#: ../gtk/updateiconcache.c:1719 #, c-format msgid "Not a valid icon cache: %s\n" msgstr "Ikke en gyldig ikonbuffer: %s\n" -#: ../gtk/updateiconcache.c:1702 +#: ../gtk/updateiconcache.c:1732 #, c-format msgid "No theme index file.\n" msgstr "Ingen indeksfil for tema.\n" -#: ../gtk/updateiconcache.c:1706 +#: ../gtk/updateiconcache.c:1736 #, c-format msgid "" "No theme index file in '%s'.\n"