s/maximal/maximum/g (#161195, David Lodge)

2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c: s/maximal/maximum/g  (#161195, David Lodge)

diff --git a/ChangeLog b/ChangeLog
index 631f4cbf433608d887d8549033e70d48699d16a6..f65e75d27a4b0736415aaabd0eea1d3bc8fa545a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c: s/maximal/maximum/g  (#161195, David Lodge)
+
        * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
        the reverted change, since it is necessary to prevent lost
        submenus. But make it work for torn-off menus as well.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 631f4cbf433608d887d8549033e70d48699d16a6..f65e75d27a4b0736415aaabd0eea1d3bc8fa545a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c: s/maximal/maximum/g  (#161195, David Lodge)
+
        * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
        the reverted change, since it is necessary to prevent lost
        submenus. But make it work for torn-off menus as well.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 631f4cbf433608d887d8549033e70d48699d16a6..f65e75d27a4b0736415aaabd0eea1d3bc8fa545a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,7 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c: s/maximal/maximum/g  (#161195, David Lodge)
+
        * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
        the reverted change, since it is necessary to prevent lost
        submenus. But make it work for torn-off menus as well.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 631f4cbf433608d887d8549033e70d48699d16a6..f65e75d27a4b0736415aaabd0eea1d3bc8fa545a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,7 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c: s/maximal/maximum/g  (#161195, David Lodge)
+
        * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
        the reverted change, since it is necessary to prevent lost
        submenus. But make it work for torn-off menus as well.

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 256fbe1e7499d31dd36470ab7b01552c4a04ea1e..b9048fd7a8160757d9ae1e57c49f3556f75b97f4 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -499,7 +499,7 @@ gtk_label_class_init (GtkLabelClass *class)
   /**
    * GtkLabel:max-width-chars:
    * 
-   * The desired width maximal of the label, in characters. If this property 
+   * The desired maximum width of the label, in characters. If this property 
    * is set to -1, the width will be calculated automatically, otherwise the 
    * label will request space for no more than the requested number of 
    * characters. If the width-chars property is set to a positive value,
@@ -510,8 +510,8 @@ gtk_label_class_init (GtkLabelClass *class)
   g_object_class_install_property (gobject_class,
                                    PROP_MAX_WIDTH_CHARS,
                                    g_param_spec_int ("max_width_chars",
-                                                     P_("Maximal Width In Characters"),
-                                                     P_("The desired maximal width of the label, in characters"),
+                                                     P_("Maximum Width In Characters"),
+                                                     P_("The desired maximum width of the label, in characters"),
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
@@ -1579,9 +1579,9 @@ gtk_label_get_width_chars (GtkLabel *label)
 /**
  * gtk_label_set_max_width_chars:
  * @label: a #GtkLabel
- * @n_chars: the new desired maximal width, in characters.
+ * @n_chars: the new desired maximum width, in characters.
  * 
- * Sets the desired maximal width in characters of @label to @n_chars.
+ * Sets the desired maximum width in characters of @label to @n_chars.
  * 
  * Since: 2.6
  **/
@@ -1608,10 +1608,10 @@ gtk_label_set_max_width_chars (GtkLabel *label,
  * gtk_label_get_max_width_chars:
  * @label: a #GtkLabel
  * 
- * Retrieves the desired maximal width of @label, in characters. See
+ * Retrieves the desired maximum width of @label, in characters. See
  * gtk_label_set_width_chars().
  * 
- * Return value: the maximal width of the label in characters.
+ * Return value: the maximum width of the label in characters.
  * 
  * Since: 2.6
  **/