Merge branch 'directfb-csw'

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 331157dfb43e219549b6c1ecc8fa96fef36bb3f5..24261f98dd50540669da2db0b93b15591866fcb8 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -2306,6 +2306,8 @@ gtk_label_set_use_underline
 gtk_label_set_single_line_mode
 gtk_label_set_angle
 gtk_label_get_current_uri
+gtk_label_set_track_visited_links
+gtk_label_get_track_visited_links
 <SUBSECTION Standard>
 GTK_LABEL
 GTK_IS_LABEL

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index d599ba73382fc37ac6afdb7817bd842ea3141b59..399d1939992f8b698ee55bbc44e31c49ed224fcc 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -856,26 +856,26 @@ synthesize_crossing_events (GdkDisplay *display,
       gdk_window_get_pointer (dest_toplevel,
                              &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
-                                     src_window,
-                                     dest_window,
-                                     crossing_mode,
-                                     x, y, state,
-                                     time,
-                                     NULL,
-                                     serial);
+                                      src_window,
+                                      dest_window,
+                                      crossing_mode,
+                                      x, y, state,
+                                      time,
+                                      NULL,
+                                      serial, FALSE);
     }
   else if (dest_toplevel == NULL)
     {
       gdk_window_get_pointer (src_toplevel,
                              &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
-                                     src_window,
-                                     NULL,
-                                     crossing_mode,
-                                     x, y, state,
-                                     time,
-                                     NULL,
-                                     serial);
+                                      src_window,
+                                      NULL,
+                                      crossing_mode,
+                                      x, y, state,
+                                      time,
+                                      NULL,
+                                      serial, FALSE);
     }
   else
     {
@@ -883,23 +883,23 @@ synthesize_crossing_events (GdkDisplay *display,
       gdk_window_get_pointer (src_toplevel,
                              &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
-                                     src_window,
-                                     NULL,
-                                     crossing_mode,
-                                     x, y, state,
-                                     time,
-                                     NULL,
-                                     serial);
+                                      src_window,
+                                      NULL,
+                                      crossing_mode,
+                                      x, y, state,
+                                      time,
+                                      NULL,
+                                      serial, FALSE);
       gdk_window_get_pointer (dest_toplevel,
                              &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
-                                     NULL,
-                                     dest_window,
-                                     crossing_mode,
-                                     x, y, state,
-                                     time,
-                                     NULL,
-                                     serial);
+                                      NULL,
+                                      dest_window,
+                                      crossing_mode,
+                                      x, y, state,
+                                      time,
+                                      NULL,
+                                      serial, FALSE);
     }
 }
 

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index c9843860b13442eb6071c46f3a5b770284e834c3..6d1a4d061329fe4b118dbc5c1c4baac95ea6dd6b 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -628,15 +628,16 @@ GdkEvent * _gdk_make_event (GdkWindow    *window,
                            gboolean      before_event);
 
 void _gdk_synthesize_crossing_events (GdkDisplay                 *display,
-                                    GdkWindow                  *src,
-                                    GdkWindow                  *dest,
-                                    GdkCrossingMode             mode,
-                                    gint                        toplevel_x,
-                                    gint                        toplevel_y,
-                                    GdkModifierType             mask,
-                                    guint32                     time_,
-                                    GdkEvent                   *event_in_queue,
-                                    gulong                      serial);
+                                     GdkWindow                  *src,
+                                     GdkWindow                  *dest,
+                                     GdkCrossingMode             mode,
+                                     gint                        toplevel_x,
+                                     gint                        toplevel_y,
+                                     GdkModifierType             mask,
+                                     guint32                     time_,
+                                     GdkEvent                   *event_in_queue,
+                                     gulong                      serial,
+                                     gboolean                    non_linear);
 void _gdk_display_set_window_under_pointer (GdkDisplay *display,
                                            GdkWindow *window);
 

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index bd253c716daa5ffb546aa76276e99407a12abf34..dd7df890f9e1dfc2f9d8a2a0ef3acc75e48fbac2 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -8494,20 +8494,20 @@ send_crossing_event (GdkDisplay                 *display,
  */
 void
 _gdk_synthesize_crossing_events (GdkDisplay                 *display,
-                               GdkWindow                  *src,
-                               GdkWindow                  *dest,
-                               GdkCrossingMode             mode,
-                               gint                        toplevel_x,
-                               gint                        toplevel_y,
-                               GdkModifierType             mask,
-                               guint32                     time_,
-                               GdkEvent                   *event_in_queue,
-                               gulong                      serial)
+                                GdkWindow                  *src,
+                                GdkWindow                  *dest,
+                                GdkCrossingMode             mode,
+                                gint                        toplevel_x,
+                                gint                        toplevel_y,
+                                GdkModifierType             mask,
+                                guint32                     time_,
+                                GdkEvent                   *event_in_queue,
+                                gulong                      serial,
+                                gboolean                    non_linear)
 {
   GdkWindowObject *c;
   GdkWindowObject *win, *last, *next;
   GList *path, *list;
-  gboolean non_linear;
   GdkWindowObject *a;
   GdkWindowObject *b;
   GdkWindowObject *toplevel;
@@ -8522,7 +8522,7 @@ _gdk_synthesize_crossing_events (GdkDisplay                 *display,
 
   c = find_common_ancestor (a, b);
 
-  non_linear = (c != a) && (c != b);
+  non_linear |= (c != a) && (c != b);
 
   if (a) /* There might not be a source (i.e. if no previous pointer_in_window) */
     {
@@ -8821,15 +8821,16 @@ do_synthesize_crossing_event (gpointer data)
          display->pointer_info.window_under_pointer)
        {
          _gdk_synthesize_crossing_events (display,
-                                         display->pointer_info.window_under_pointer,
-                                         new_window_under_pointer,
-                                         GDK_CROSSING_NORMAL,
-                                         display->pointer_info.toplevel_x,
-                                         display->pointer_info.toplevel_y,
-                                         display->pointer_info.state,
-                                         GDK_CURRENT_TIME,
-                                         NULL,
-                                         serial);
+                                          display->pointer_info.window_under_pointer,
+                                          new_window_under_pointer,
+                                          GDK_CROSSING_NORMAL,
+                                          display->pointer_info.toplevel_x,
+                                          display->pointer_info.toplevel_y,
+                                          display->pointer_info.state,
+                                          GDK_CURRENT_TIME,
+                                          NULL,
+                                          serial,
+                                          FALSE);
          _gdk_display_set_window_under_pointer (display, new_window_under_pointer);
        }
     }
@@ -8939,6 +8940,7 @@ proxy_pointer_event (GdkDisplay                 *display,
   guint state;
   gdouble toplevel_x, toplevel_y;
   guint32 time_;
+  gboolean non_linear;
 
   event_window = source_event->any.window;
   gdk_event_get_coords (source_event, &toplevel_x, &toplevel_y);
@@ -8948,6 +8950,12 @@ proxy_pointer_event (GdkDisplay                 *display,
                                                       toplevel_x, toplevel_y,
                                                       &toplevel_x, &toplevel_y);
 
+  non_linear = FALSE;
+  if ((source_event->type == GDK_LEAVE_NOTIFY ||
+       source_event->type == GDK_ENTER_NOTIFY) &&
+      (source_event->crossing.detail == GDK_NOTIFY_NONLINEAR ||
+       source_event->crossing.detail == GDK_NOTIFY_NONLINEAR_VIRTUAL))
+    non_linear = TRUE;
 
   /* If we get crossing events with subwindow unexpectedly being NULL
      that means there is a native subwindow that gdk doesn't know about.
@@ -8968,13 +8976,14 @@ proxy_pointer_event (GdkDisplay                 *display,
       /* Send leave events from window under pointer to event window
         that will get the subwindow == NULL window */
       _gdk_synthesize_crossing_events (display,
-                                     display->pointer_info.window_under_pointer,
-                                     event_window,
-                                     source_event->crossing.mode,
-                                     toplevel_x, toplevel_y,
-                                     state, time_,
-                                     source_event,
-                                     serial);
+                                      display->pointer_info.window_under_pointer,
+                                      event_window,
+                                      source_event->crossing.mode,
+                                      toplevel_x, toplevel_y,
+                                      state, time_,
+                                      source_event,
+                                      serial,
+                                      non_linear);
 
       /* Send subwindow == NULL event */
       send_crossing_event (display,
@@ -9020,13 +9029,13 @@ proxy_pointer_event (GdkDisplay                 *display,
 
       /* Send enter events from event window to pointer_window */
       _gdk_synthesize_crossing_events (display,
-                                     event_window,
-                                     pointer_window,
-                                     source_event->crossing.mode,
-                                     toplevel_x, toplevel_y,
-                                     state, time_,
-                                     source_event,
-                                     serial);
+                                      event_window,
+                                      pointer_window,
+                                      source_event->crossing.mode,
+                                      toplevel_x, toplevel_y,
+                                      state, time_,
+                                      source_event,
+                                      serial, non_linear);
       _gdk_display_set_window_under_pointer (display, pointer_window);
       return TRUE;
     }
@@ -9038,13 +9047,13 @@ proxy_pointer_event (GdkDisplay                 *display,
 
       /* Different than last time, send crossing events */
       _gdk_synthesize_crossing_events (display,
-                                     display->pointer_info.window_under_pointer,
-                                     pointer_window,
-                                     GDK_CROSSING_NORMAL,
-                                     toplevel_x, toplevel_y,
-                                     state, time_,
-                                     source_event,
-                                     serial);
+                                      display->pointer_info.window_under_pointer,
+                                      pointer_window,
+                                      GDK_CROSSING_NORMAL,
+                                      toplevel_x, toplevel_y,
+                                      state, time_,
+                                      source_event,
+                                      serial, non_linear);
       _gdk_display_set_window_under_pointer (display, pointer_window);
     }
   else if (source_event->type == GDK_MOTION_NOTIFY)

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index ad5107bdd6b78e2144af35de944f1056c3d99071..0b74841ce008149c16e96fe74fce2db3038d1fd9 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1265,11 +1265,12 @@ gdk_event_translate (GdkDisplay *display,
       
     case EnterNotify:
       GDK_NOTE (EVENTS,
-               g_message ("enter notify:\t\twindow: %ld  detail: %d subwin: %ld",
-                          xevent->xcrossing.window,
-                          xevent->xcrossing.detail,
-                          xevent->xcrossing.subwindow));
- 
+                g_message ("enter notify:\t\twindow: %ld  detail: %d subwin: %ld mode: %d",
+                           xevent->xcrossing.window,
+                           xevent->xcrossing.detail,
+                           xevent->xcrossing.subwindow,
+                           xevent->xcrossing.mode));
+
       if (window_private == NULL)
         {
           return_val = FALSE;
@@ -1361,9 +1362,11 @@ gdk_event_translate (GdkDisplay *display,
       
     case LeaveNotify:
       GDK_NOTE (EVENTS, 
-               g_message ("leave notify:\t\twindow: %ld  detail: %d subwin: %ld",
-                          xevent->xcrossing.window,
-                          xevent->xcrossing.detail, xevent->xcrossing.subwindow));
+                g_message ("leave notify:\t\twindow: %ld  detail: %d subwin: %ld mode: %d",
+                           xevent->xcrossing.window,
+                           xevent->xcrossing.detail,
+                           xevent->xcrossing.subwindow,
+                           xevent->xcrossing.mode));
 
       if (window_private == NULL)
         {

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 0449189a7008a701b0dac3d0d175f3c9eb978699..f523840006f0f626eca8c62bbbd59b1bb54b274f 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2215,6 +2215,8 @@ gtk_label_set_use_markup
 gtk_label_set_use_underline
 gtk_label_set_width_chars
 gtk_label_get_current_uri
+gtk_label_set_track_visited_links
+gtk_label_get_track_visited_links
 #endif
 #endif
 

diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index 275aaa1b3b1c330ac52f98217f84416bcbd76b04..cf2ddda90f60c359f9e190050f56498e6af79ec2 100644 (file)
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 

diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h
index cbc206a12076c9a44cfc6ccfeaa8fdf0d396b450..530ebfb9ceb1a3510678c79d236876f78f7deacc 100644 (file)
--- a/gtk/gtkinfobar.h
+++ b/gtk/gtkinfobar.h
@@ -28,6 +28,10 @@
  * Modified by the GTK+ Team, 2008-2009.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_INFO_BAR_H__
 #define __GTK_INFO_BAR_H__
 

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index ea963b185379f16c69eb1d453f78b6020535f95a..4577eec3b13fefb3bb65521e07404800f925fa4c 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -147,7 +147,8 @@ enum {
   PROP_WIDTH_CHARS,
   PROP_SINGLE_LINE_MODE,
   PROP_ANGLE,
-  PROP_MAX_WIDTH_CHARS
+  PROP_MAX_WIDTH_CHARS,
+  PROP_TRACK_VISITED_LINKS
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -710,6 +711,23 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      G_MAXINT,
                                                      -1,
                                                      GTK_PARAM_READWRITE));
+
+  /**
+   * GtkLabel:track-visited-links:
+   *
+   * Set this property to %TRUE to make the label track which links
+   * have been clicked. It will then apply the ::visited-link-color
+   * color, instead of ::link-color.
+   *
+   * Since: 2.18
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_TRACK_VISITED_LINKS,
+                                   g_param_spec_boolean ("track-visited-links",
+                                                         P_("Track visited links"),
+                                                         P_("Whether visited links should be tracked"),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));
   /*
    * Key bindings
    */
@@ -893,6 +911,9 @@ gtk_label_set_property (GObject      *object,
     case PROP_MAX_WIDTH_CHARS:
       gtk_label_set_max_width_chars (label, g_value_get_int (value));
       break;
+    case PROP_TRACK_VISITED_LINKS:
+      gtk_label_set_track_visited_links (label, g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -976,7 +997,9 @@ gtk_label_get_property (GObject     *object,
     case PROP_MAX_WIDTH_CHARS:
       g_value_set_int (value, gtk_label_get_max_width_chars (label));
       break;
-
+    case PROP_TRACK_VISITED_LINKS:
+      g_value_set_boolean (value, gtk_label_get_track_visited_links (label));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1004,7 +1027,8 @@ gtk_label_init (GtkLabel *label)
   label->use_underline = FALSE;
   label->use_markup = FALSE;
   label->pattern_set = FALSE;
-  
+  label->track_links = TRUE;
+
   label->mnemonic_keyval = GDK_VoidSymbol;
   label->layout = NULL;
   label->text = NULL;
@@ -1012,7 +1036,7 @@ gtk_label_init (GtkLabel *label)
 
   label->mnemonic_widget = NULL;
   label->mnemonic_window = NULL;
-  
+
   gtk_label_set_text (label, "");
 }
 
@@ -1987,7 +2011,8 @@ start_element_handler (GMarkupParseContext  *context,
           return;
         }
 
-      if (pdata->label->select_info)
+      visited = FALSE;
+      if (pdata->label->track_links && pdata->label->select_info)
         {
           GList *l;
           for (l = pdata->label->select_info->links; l; l = l->next)
@@ -5651,7 +5676,7 @@ emit_activate_link (GtkLabel     *label,
   gboolean handled;
 
   g_signal_emit (label, signals[ACTIVATE_LINK], 0, link->uri, &handled);
-  if (handled && !link->visited)
+  if (handled && label->track_links && !link->visited)
     {
       link->visited = TRUE;
       /* FIXME: shouldn't have to redo everything here */
@@ -5737,6 +5762,53 @@ gtk_label_get_current_uri (GtkLabel *label)
   return NULL;
 }
 
+/**
+ * gtk_label_set_track_visited_links:
+ * @label: a #GtkLabel
+ * @track_links: %TRUE to track visited links
+ *
+ * Sets whether the label should keep track of clicked
+ * links (and use a different color for them).
+ *
+ * Since: 2.18
+ */
+void
+gtk_label_set_track_visited_links (GtkLabel *label,
+                                   gboolean  track_links)
+{
+  g_return_if_fail (GTK_IS_LABEL (label));
+
+  track_links = track_links != FALSE;
+
+  if (label->track_links != track_links)
+    {
+      label->track_links = track_links;
+
+      /* FIXME: shouldn't have to redo everything here */
+      gtk_label_recalculate (label);
+
+      g_object_notify (G_OBJECT (label), "track-visited-links");
+    }
+}
+
+/**
+ * gtk_label_get_track_visited_links:
+ * @label: a #GtkLabel
+ *
+ * Returns whether the label is currently keeping track
+ * of clicked links.
+ *
+ * Returns: %TRUE if clicked links are remembered
+ *
+ * Since: 2.18
+ */
+gboolean
+gtk_label_get_track_visited_links (GtkLabel *label)
+{
+  g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
+
+  return label->track_links;
+}
 
 static gboolean
 gtk_label_query_tooltip (GtkWidget  *widget,

diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 3788108eda9b89fcc9e4b0a6c961d78ba1c909a7..d44b142fadbf4c2a7ccfe7e09aabdfe90a5e37c2 100644 (file)
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -67,6 +67,7 @@ struct _GtkLabel
   guint   GSEAL (in_click)         : 1;
   guint   GSEAL (wrap_mode)        : 3;
   guint   GSEAL (pattern_set)      : 1;
+  guint   GSEAL (track_links)      : 1;
 
   guint   GSEAL (mnemonic_keyval);
 
@@ -177,6 +178,9 @@ void         gtk_label_set_single_line_mode  (GtkLabel *label,
 gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
 
 G_CONST_RETURN gchar *gtk_label_get_current_uri (GtkLabel *label);
+void         gtk_label_set_track_visited_links  (GtkLabel *label,
+                                                 gboolean  track_links);
+gboolean     gtk_label_get_track_visited_links  (GtkLabel *label);
 
 #ifndef GTK_DISABLE_DEPRECATED
 

diff --git a/po-properties/es.po b/po-properties/es.po
index 571cf824e797fb5653eb03b72daef2faef3a911f..84fdf3b500e95817f9bbef46d4d1d0cbf90f7d2b 100644 (file)
--- a/po-properties/es.po
+++ b/po-properties/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: gtk+-properties.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
 "+&component=general\n"
-"POT-Creation-Date: 2009-07-09 01:49+0000\n"
-"PO-Revision-Date: 2009-07-09 07:35+0200\n"
+"POT-Creation-Date: 2009-07-09 18:00+0000\n"
+"PO-Revision-Date: 2009-07-09 20:54+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -272,7 +272,7 @@ msgid "A unique name for the action."
 msgstr "Un nombre único para la acción."
 
 #: ../gtk/gtkaction.c:198 ../gtk/gtkbutton.c:219 ../gtk/gtkexpander.c:195
-#: ../gtk/gtkframe.c:105 ../gtk/gtklabel.c:495 ../gtk/gtkmenuitem.c:305
+#: ../gtk/gtkframe.c:105 ../gtk/gtklabel.c:496 ../gtk/gtkmenuitem.c:305
 #: ../gtk/gtktoolbutton.c:202
 msgid "Label"
 msgstr "Etiqueta"
@@ -814,12 +814,12 @@ msgstr ""
 "Texto del etiqueta del widget dentro del botón, si el botón contiene una "
 "etiqueta del widget"
 
-#: ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:203 ../gtk/gtklabel.c:516
+#: ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:203 ../gtk/gtklabel.c:517
 #: ../gtk/gtkmenuitem.c:320 ../gtk/gtktoolbutton.c:209
 msgid "Use underline"
 msgstr "Utilizar subrayado"
 
-#: ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:204 ../gtk/gtklabel.c:517
+#: ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:204 ../gtk/gtklabel.c:518
 #: ../gtk/gtkmenuitem.c:321
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
@@ -1371,7 +1371,7 @@ msgstr "Marcado"
 msgid "Marked up text to render"
 msgstr "Texto resaltado a renderizar"
 
-#: ../gtk/gtkcellrenderertext.c:211 ../gtk/gtklabel.c:502
+#: ../gtk/gtkcellrenderertext.c:211 ../gtk/gtklabel.c:503
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -1537,7 +1537,7 @@ msgstr ""
 "como una ayuda cuando está renderizando el texto. Si no comprende este "
 "parámetro probablemente no lo necesite"
 
-#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtklabel.c:627
+#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtklabel.c:628
 #: ../gtk/gtkprogressbar.c:206
 msgid "Ellipsize"
 msgstr "Elipsis"
@@ -1551,11 +1551,11 @@ msgstr ""
 "celda no tiene espacio suficiente para mostrar la cadena completa"
 
 #: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtkfilechooserbutton.c:421
-#: ../gtk/gtklabel.c:647
+#: ../gtk/gtklabel.c:648
 msgid "Width In Characters"
 msgstr "Anchura en caracteres"
 
-#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtklabel.c:648
+#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtklabel.c:649
 msgid "The desired width of the label, in characters"
 msgstr "La anchura deseada de la etiqueta, en caracteres"
 
@@ -2172,7 +2172,6 @@ msgstr ""
 "diálogo"
 
 #: ../gtk/gtkentry.c:630
-#| msgid "Buffer"
 msgid "Text Buffer"
 msgstr "Búfer de texto"
 
@@ -2180,19 +2179,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:638 ../gtk/gtklabel.c:590
+#: ../gtk/gtkentry.c:638 ../gtk/gtklabel.c:591
 msgid "Cursor Position"
 msgstr "Posición del cursor"
 
-#: ../gtk/gtkentry.c:639 ../gtk/gtklabel.c:591
+#: ../gtk/gtkentry.c:639 ../gtk/gtklabel.c:592
 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:648 ../gtk/gtklabel.c:600
+#: ../gtk/gtkentry.c:648 ../gtk/gtklabel.c:601
 msgid "Selection Bound"
 msgstr "Límite de selección"
 
-#: ../gtk/gtkentry.c:649 ../gtk/gtklabel.c:601
+#: ../gtk/gtkentry.c:649 ../gtk/gtklabel.c:602
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr ""
@@ -2532,7 +2531,7 @@ msgid "Whether to pass a proper state when drawing shadow or background"
 msgstr ""
 "Indica si se debe pasar un estado apropiado al dibujar una sombra o fondo"
 
-#: ../gtk/gtkentry.c:1736 ../gtk/gtklabel.c:830
+#: ../gtk/gtkentry.c:1736 ../gtk/gtklabel.c:848
 msgid "Select on focus"
 msgstr "Seleccionar al enfocar"
 
@@ -2653,11 +2652,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:211 ../gtk/gtklabel.c:509
+#: ../gtk/gtkexpander.c:211 ../gtk/gtklabel.c:510
 msgid "Use markup"
 msgstr "Usar marcado"
 
-#: ../gtk/gtkexpander.c:212 ../gtk/gtklabel.c:510
+#: ../gtk/gtkexpander.c:212 ../gtk/gtklabel.c:511
 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()"
 
@@ -3225,19 +3224,19 @@ msgstr "Indica si deben mostrarse o no las imágenes en los menús"
 msgid "The screen where this window will be displayed"
 msgstr "La pantalla donde se mostrará esta ventana"
 
-#: ../gtk/gtklabel.c:496
+#: ../gtk/gtklabel.c:497
 msgid "The text of the label"
 msgstr "El texto de la etiqueta"
 
-#: ../gtk/gtklabel.c:503
+#: ../gtk/gtklabel.c:504
 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:524 ../gtk/gtktexttag.c:359 ../gtk/gtktextview.c:590
+#: ../gtk/gtklabel.c:525 ../gtk/gtktexttag.c:359 ../gtk/gtktextview.c:590
 msgid "Justification"
 msgstr "Justificación"
 
-#: ../gtk/gtklabel.c:525
+#: ../gtk/gtklabel.c:526
 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 "
@@ -3247,11 +3246,11 @@ msgstr ""
 "Esto NO afecta la alineación de la etiqueta dentro de su ubicación.  Ver "
 "GtkMisc::xalign para ello"
 
-#: ../gtk/gtklabel.c:533
+#: ../gtk/gtklabel.c:534
 msgid "Pattern"
 msgstr "Patrón"
 
-#: ../gtk/gtklabel.c:534
+#: ../gtk/gtklabel.c:535
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
@@ -3259,50 +3258,50 @@ msgstr ""
 "Un cadena con caracteres _ en posiciones correspondientes a caracteres en el "
 "texto a subrayar"
 
-#: ../gtk/gtklabel.c:541
+#: ../gtk/gtklabel.c:542
 msgid "Line wrap"
 msgstr "Ajuste de línea"
 
-#: ../gtk/gtklabel.c:542
+#: ../gtk/gtklabel.c:543
 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:557
+#: ../gtk/gtklabel.c:558
 msgid "Line wrap mode"
 msgstr "Modo de ajuste de línea"
 
-#: ../gtk/gtklabel.c:558
+#: ../gtk/gtklabel.c:559
 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:565
+#: ../gtk/gtklabel.c:566
 msgid "Selectable"
 msgstr "Seleccionable"
 
-#: ../gtk/gtklabel.c:566
+#: ../gtk/gtklabel.c:567
 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:572
+#: ../gtk/gtklabel.c:573
 msgid "Mnemonic key"
 msgstr "Tecla nemónica"
 
-#: ../gtk/gtklabel.c:573
+#: ../gtk/gtklabel.c:574
 msgid "The mnemonic accelerator key for this label"
 msgstr "La tecla nemotécnica del acelerador para esta etiqueta"
 
-#: ../gtk/gtklabel.c:581
+#: ../gtk/gtklabel.c:582
 msgid "Mnemonic widget"
 msgstr "Widget nemónico"
 
-#: ../gtk/gtklabel.c:582
+#: ../gtk/gtklabel.c:583
 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:628
+#: ../gtk/gtklabel.c:629
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
@@ -3310,31 +3309,41 @@ 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:668
+#: ../gtk/gtklabel.c:669
 msgid "Single Line Mode"
 msgstr "Modo de línea única"
 
-#: ../gtk/gtklabel.c:669
+#: ../gtk/gtklabel.c:670
 msgid "Whether the label is in single line mode"
 msgstr "Indica si la etiqueta está en modo de línea única"
 
-#: ../gtk/gtklabel.c:686
+#: ../gtk/gtklabel.c:687
 msgid "Angle"
 msgstr "Ángulo"
 
-#: ../gtk/gtklabel.c:687
+#: ../gtk/gtklabel.c:688
 msgid "Angle at which the label is rotated"
 msgstr "Ángulo al cual la etiqueta se rota"
 
-#: ../gtk/gtklabel.c:707
+#: ../gtk/gtklabel.c:708
 msgid "Maximum Width In Characters"
 msgstr "Anchura máxima en caracteres"
 
-#: ../gtk/gtklabel.c:708
+#: ../gtk/gtklabel.c:709
 msgid "The desired maximum width of the label, in characters"
 msgstr "La anchura máxima deseada de la etiqueta, en caracteres"
 
-#: ../gtk/gtklabel.c:831
+#: ../gtk/gtklabel.c:727
+#| msgid "Color of visited links"
+msgid "Track visited links"
+msgstr "Seguir los enlaces visitados"
+
+#: ../gtk/gtklabel.c:728
+#| msgid "Whether the private items should be displayed"
+msgid "Whether visited links should be tracked"
+msgstr "Indica si deben seguir los enlaces visitados"
+
+#: ../gtk/gtklabel.c:849
 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 "

diff --git a/po-properties/uk.po b/po-properties/uk.po
index d2b046fe55e5a80b038e9903be7dbde45f8d29f1..f4f9c02f5fd6c826afb096b0dacadb25045d421f 100644 (file)
--- a/po-properties/uk.po
+++ b/po-properties/uk.po
@@ -4,14 +4,14 @@
 # Maxim Dziumanenko <dziumanenko@gmail.com>, 2004-2009
 #
 # wanderlust <wanderlust@ukr.net>, 2009.
+# Wanderlust <wanderlust@ukr.net>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.4.0\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
-"+&component=general\n"
-"POT-Creation-Date: 2009-07-09 01:49+0000\n"
-"PO-Revision-Date: 2009-07-06 15:00+0300\n"
-"Last-Translator: wanderlust <wanderlust@ukr.net>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-09 23:55+0300\n"
+"PO-Revision-Date: 2009-07-09 15:39+0300\n"
+"Last-Translator: Wanderlust <wanderlust@ukr.net>\n"
 "Language-Team: ukrainian <Ukrainian <uk@li.org>>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -262,7 +262,7 @@ msgid "A unique name for the action."
 msgstr "Унікальна назва для дії."
 
 #: ../gtk/gtkaction.c:198 ../gtk/gtkbutton.c:219 ../gtk/gtkexpander.c:195
-#: ../gtk/gtkframe.c:105 ../gtk/gtklabel.c:495 ../gtk/gtkmenuitem.c:305
+#: ../gtk/gtkframe.c:105 ../gtk/gtklabel.c:496 ../gtk/gtkmenuitem.c:305
 #: ../gtk/gtktoolbutton.c:202
 msgid "Label"
 msgstr "Позначка"
@@ -806,12 +806,12 @@ msgid ""
 "widget"
 msgstr "Текст віджета позначки в кнопці, якщо кнопка містить віджет позначки"
 
-#: ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:203 ../gtk/gtklabel.c:516
+#: ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:203 ../gtk/gtklabel.c:517
 #: ../gtk/gtkmenuitem.c:320 ../gtk/gtktoolbutton.c:209
 msgid "Use underline"
 msgstr "Використовувати підкреслення"
 
-#: ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:204 ../gtk/gtklabel.c:517
+#: ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:204 ../gtk/gtklabel.c:518
 #: ../gtk/gtkmenuitem.c:321
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
@@ -1361,7 +1361,7 @@ msgstr "Розмітка"
 msgid "Marked up text to render"
 msgstr "Розмітка тексту до візуалізації"
 
-#: ../gtk/gtkcellrenderertext.c:211 ../gtk/gtklabel.c:502
+#: ../gtk/gtkcellrenderertext.c:211 ../gtk/gtklabel.c:503
 msgid "Attributes"
 msgstr "Атрибути"
 
@@ -1524,7 +1524,7 @@ msgstr ""
 "під час візуалізації тексту. Якщо ви не розумієте цей параметр, то, напевно, "
 "він вам не потрібний."
 
-#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtklabel.c:627
+#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtklabel.c:628
 #: ../gtk/gtkprogressbar.c:206
 msgid "Ellipsize"
 msgstr "Еліптизація"
@@ -1538,11 +1538,11 @@ msgstr ""
 "вистачає місця для відображення усього рядка"
 
 #: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtkfilechooserbutton.c:421
-#: ../gtk/gtklabel.c:647
+#: ../gtk/gtklabel.c:648
 msgid "Width In Characters"
 msgstr "Ширина у символах"
 
-#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtklabel.c:648
+#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtklabel.c:649
 msgid "The desired width of the label, in characters"
 msgstr "Бажана ширина, у символах"
 
@@ -2156,28 +2156,26 @@ msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "Ширина відступу навколо області кнопок діалогового вікна"
 
 #: ../gtk/gtkentry.c:630
-#, fuzzy
-#| msgid "Buffer"
 msgid "Text Buffer"
-msgstr "Буфер"
+msgstr "Буфер тексту"
 
 #: ../gtk/gtkentry.c:631
 msgid "Text buffer object which actually stores entry text"
-msgstr ""
+msgstr "Буфер тексту є об'єктом, який зберігає текст елементу"
 
-#: ../gtk/gtkentry.c:638 ../gtk/gtklabel.c:590
+#: ../gtk/gtkentry.c:638 ../gtk/gtklabel.c:591
 msgid "Cursor Position"
 msgstr "Позиція курсора"
 
-#: ../gtk/gtkentry.c:639 ../gtk/gtklabel.c:591
+#: ../gtk/gtkentry.c:639 ../gtk/gtklabel.c:592
 msgid "The current position of the insertion cursor in chars"
 msgstr "Поточна позиція точки вставки в символах"
 
-#: ../gtk/gtkentry.c:648 ../gtk/gtklabel.c:600
+#: ../gtk/gtkentry.c:648 ../gtk/gtklabel.c:601
 msgid "Selection Bound"
 msgstr "Границя виділення"
 
-#: ../gtk/gtkentry.c:649 ../gtk/gtklabel.c:601
+#: ../gtk/gtkentry.c:649 ../gtk/gtklabel.c:602
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr "Позиція протилежного кінця вибору від курсора в символах"
@@ -2510,7 +2508,7 @@ msgstr "Підказка стану"
 msgid "Whether to pass a proper state when drawing shadow or background"
 msgstr "Чи передавати стан поля вводу для виводу тіні або тла"
 
-#: ../gtk/gtkentry.c:1736 ../gtk/gtklabel.c:830
+#: ../gtk/gtkentry.c:1736 ../gtk/gtklabel.c:848
 msgid "Select on focus"
 msgstr "Вибір на фокусуванні"
 
@@ -2627,11 +2625,11 @@ msgstr "Чи розширювач був відкритий для показу
 msgid "Text of the expander's label"
 msgstr "Текст розгорнутої позначки"
 
-#: ../gtk/gtkexpander.c:211 ../gtk/gtklabel.c:509
+#: ../gtk/gtkexpander.c:211 ../gtk/gtklabel.c:510
 msgid "Use markup"
 msgstr "Використовувати розмітку"
 
-#: ../gtk/gtkexpander.c:212 ../gtk/gtklabel.c:510
+#: ../gtk/gtkexpander.c:212 ../gtk/gtklabel.c:511
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "Текст позначки включає розмітку XML. Див. pango_parse_markup()"
 
@@ -3195,19 +3193,19 @@ msgstr "Чи потрібно відображати зображення у м
 msgid "The screen where this window will be displayed"
 msgstr "Екран, на якому буде відображено це вікно"
 
-#: ../gtk/gtklabel.c:496
+#: ../gtk/gtklabel.c:497
 msgid "The text of the label"
 msgstr "Текст позначки"
 
-#: ../gtk/gtklabel.c:503
+#: ../gtk/gtklabel.c:504
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "Список стильових ознак для застосування до тексту позначки"
 
-#: ../gtk/gtklabel.c:524 ../gtk/gtktexttag.c:359 ../gtk/gtktextview.c:590
+#: ../gtk/gtklabel.c:525 ../gtk/gtktexttag.c:359 ../gtk/gtktextview.c:590
 msgid "Justification"
 msgstr "Вирівнювання"
 
-#: ../gtk/gtklabel.c:525
+#: ../gtk/gtklabel.c:526
 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 "
@@ -3217,11 +3215,11 @@ msgstr ""
 "вирівнювання позначки у вказаному для неї місці. Для цього дивіться GtkMisc::"
 "xalign"
 
-#: ../gtk/gtklabel.c:533
+#: ../gtk/gtklabel.c:534
 msgid "Pattern"
 msgstr "Шаблон"
 
-#: ../gtk/gtklabel.c:534
+#: ../gtk/gtklabel.c:535
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
@@ -3229,49 +3227,49 @@ msgstr ""
 "Рядок із символами підкреслення (_) в позиціях відповідних до позиції "
 "символів, які потрібно підкреслити в тексті"
 
-#: ../gtk/gtklabel.c:541
+#: ../gtk/gtklabel.c:542
 msgid "Line wrap"
 msgstr "Перенос рядків"
 
-#: ../gtk/gtklabel.c:542
+#: ../gtk/gtklabel.c:543
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "Якщо встановлено, занадто довгі рядки переносяться"
 
-#: ../gtk/gtklabel.c:557
+#: ../gtk/gtklabel.c:558
 msgid "Line wrap mode"
 msgstr "Режим переносу рядків"
 
-#: ../gtk/gtklabel.c:558
+#: ../gtk/gtklabel.c:559
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr ""
 "Якщо встановлено перенос рядків, контролює як виконувати перенос рядків"
 
-#: ../gtk/gtklabel.c:565
+#: ../gtk/gtklabel.c:566
 msgid "Selectable"
 msgstr "Вибирається"
 
-#: ../gtk/gtklabel.c:566
+#: ../gtk/gtklabel.c:567
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Чи може текст позначки бути виділений використовуючи мишу"
 
-#: ../gtk/gtklabel.c:572
+#: ../gtk/gtklabel.c:573
 msgid "Mnemonic key"
 msgstr "Мнемонічна клавіша"
 
-#: ../gtk/gtklabel.c:573
+#: ../gtk/gtklabel.c:574
 msgid "The mnemonic accelerator key for this label"
 msgstr "Мнемонічна клавіша-прискорювач для цієї позначки"
 
-#: ../gtk/gtklabel.c:581
+#: ../gtk/gtklabel.c:582
 msgid "Mnemonic widget"
 msgstr "Мнемонічний віджет"
 
-#: ../gtk/gtklabel.c:582
+#: ../gtk/gtklabel.c:583
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr ""
 "Віджет, який буде активовано під час натиснення мнемонічної клавіші позначки"
 
-#: ../gtk/gtklabel.c:628
+#: ../gtk/gtklabel.c:629
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
@@ -3279,31 +3277,39 @@ msgstr ""
 "Бажане місце для еліптизації рядка, якщо для відображення усього рядка не "
 "вистачає місця."
 
-#: ../gtk/gtklabel.c:668
+#: ../gtk/gtklabel.c:669
 msgid "Single Line Mode"
 msgstr "Режим одного рядка"
 
-#: ../gtk/gtklabel.c:669
+#: ../gtk/gtklabel.c:670
 msgid "Whether the label is in single line mode"
 msgstr "Чи знаходиться рядок у режимі одного рядка"
 
-#: ../gtk/gtklabel.c:686
+#: ../gtk/gtklabel.c:687
 msgid "Angle"
 msgstr "Кут"
 
-#: ../gtk/gtklabel.c:687
+#: ../gtk/gtklabel.c:688
 msgid "Angle at which the label is rotated"
 msgstr "Кут, на який повертається ярлик"
 
-#: ../gtk/gtklabel.c:707
+#: ../gtk/gtklabel.c:708
 msgid "Maximum Width In Characters"
 msgstr "Максимальна ширина в символах"
 
-#: ../gtk/gtklabel.c:708
+#: ../gtk/gtklabel.c:709
 msgid "The desired maximum width of the label, in characters"
 msgstr "Бажана максимальна ширина ярлика, у символах"
 
-#: ../gtk/gtklabel.c:831
+#: ../gtk/gtklabel.c:727
+msgid "Track visited links"
+msgstr "Колір відвіданого гіперпосилання"
+
+#: ../gtk/gtklabel.c:728
+msgid "Whether visited links should be tracked"
+msgstr "Чи показувати відвідані посилання"
+
+#: ../gtk/gtklabel.c:849
 msgid "Whether to select the contents of a selectable label when it is focused"
 msgstr "Чи буде виділятись вміст позначки, коли їх передається фокус "