Patch from Christian Neumair to make warning string more translator

Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkicontheme.c: Patch from Christian Neumair
        to make warning string more translator friendly.

        * gtk/gtktreemodelfilter.h gtkseparatortoolitem.[ch]
        gtk/gtktoolbar.c: Parameter name fixes to keep gtk-doc
        happy.

        * configure.in: Require GLib-2.3.2, version 2.3.2,
        interface age 0, binary age 302.

        * NEWS: Organized, added some names.

7 files changed, 67 insertions, 66 deletions

diff --git a/NEWS b/NEWS
index 62124238bc..1e957b8494 100644
--- a/NEWS
+++ b/NEWS
@@ -1,62 +1,63 @@
 Overview of Changes from GTK+ 2.3.1 to GTK+ 2.3.2
 =================================================
-* Add functions to save pixbufs to non-file locations.  [Tim Evans]
-* Add a function to determine the type and size of a file without
-  loading it completely.  [Matthias Clasen]
-* Turn pixbuf attributes into construct-only properties. [Matthias]
-* Fix building gdk-pixbuf with --disable-modules --with-included-loaders.
-  [Matthias, Owen Taylor]
-* Fix dynamic menus. [Matthias, Michael Meeks]
-* Split the translations into two domains: ui strings and
-  error messages go to gtk20, property nicks and blurbs to 
-  gtk20-properties.  [Matthias]
+* GdkPixbuf
+ - Add functions to save pixbufs to non-file locations.  [Tim Evans]
+ - Add a function to determine the type and size of a file without
+   loading it completely.  [Matthias Clasen]
+ - Turn pixbuf attributes into construct-only properties. [Matthias]
+ - Fix building gdk-pixbuf with --disable-modules --with-included-loaders.
+   [Matthias, Owen Taylor]
+* Fix the logic for changing the toplevelness of a window.  [Soeren Sandmann]
+* Do not interpret distant clicks as double clicks, using a
+  new double-click-distance setting.  [Matthias]
+* Improve the GDK API for dealing with group leaders. [Matthias]
+* Utility function for application launching in multi-screen scenarios.
+  [Mark McLoughlin]
+* Support big and small and alpha-blended icons under Win32. [Tim Evans]
+* Misc Win32 improvements [Tor Lillquist, Hans]
+* GtkFileChooser [Federico]
+ - Fix new filename entry in Save mode [Jan Arne Petersen]
+ - Improved the look of GtkFileChooserDefault. [Tuomas Kuosmanen]
+ - Added support for file system volumes such as CD-ROMs, 
+   floppies, and network shares.
+ - Add a "New Folder" button for Save mode in GtkFileChooser.
+ - Better support for Folder mode.
+* GtkTreeView
+ - Speed up by adding a fixed height mode.  [Kristian Rietveld]
+ - Add a single-paragraph mode and a language property to 
+   GtkCellRendererText [Kristian Rietveld]
+ - Add a editing-canceled signal to GtkCellRenderer [Federico Mena Quintero]
+ - Misc GtkTreeView bug fixes [Kristian, Soeren, Jonathan Blandford]
+* Add a way to list the supported targets of a clipboard. [Dom Lachowicz]
 * Add stock icons: harddisk, indent, unindent.  [Hans Breuer, Jody Goldberg]
-* Add a way to lock indivual accelerator paths  [Matthias]
-* Add a way to list the supported targets of a 
-  clipboard. [Dom Lachowicz]
 * Improve the GtkCalendar drawing code.  [Matthias]
 * GtkCalendar supports starting the week on any day [Matthias]
-* Make GtkToolbar compatible with 2.2 again [Soeren Sandmann]
+* Make GtkToolbar compatible with 2.2 again [Soeren]
 * Misc GtkToolbar fixes and API improvements [Christian Persch, 
   Olivar Avramchenko, Jody, Soeren]
 * Misc GtkUIManager fixes and API improvements.  [Jody, Matthias, Jeff Franks]
-* Fix the logic for changing the toplevelness of a 
-  window.  [Soeren]
+* Add a way to lock individual accelerator paths  [Matthias]
 * Add gtk_menu_shell_cancel() to emit the "cancel" signal on 
   a menu shell.  [Matthias]
-* Do not interpret distant clicks as double clicks, using a
-  new double-click-distance setting.  [Matthias]
-* Utility function for application launching in multi-screen 
-  scenarios.  [Mark McLoughlin]
-* Improve the GDK API for dealing with group leaders. [Matthias]
+* Fix dynamic menus. [Matthias, Michael Meeks]
 * Add xalign, yalign properties to GtkButton. [Jody]
-* Misc Win32 improvements [Tor Lillquist, Hans]
-* Support big and small and alpha-blended icons under Win32.
-* Speed up GtkTreeView, add a fixed height mode.  [Kristian Rietveld]
-* Add a single-paragraph mode and a language property to 
-  GtkCellRendererText [Kristian]
-* Add a editing-canceled signal to GtkCellRenderer [Federico Mena Quintero]
-* Misc GtkTreeView bug fixes [Kristian, Soeren, Jonathan Blandford]
 * Implement or improve RTL support in GtkComboBox, GtkCellView, 
-  GtkViewport [IBM L3 NLS Support Team, Matthias, Kristian]
+  GtkViewport [Semion Chichelnitsky, Matthias, Kristian]
 * Support for "no focus" windows. [Matthias]
-* Fix new filename entry in Save mode in GtkFileChooser. [Jan Arne Petersen]
-* Improved the look of GtkFileChooserDefault. [Federico, Tuomas Kuosmanen]
-* Added support for file system volumes such as CD-ROMs, floppies, and network
-  shares to GtkFileChooser. [Federico]
-* Add a "New Folder" button for Save mode in GtkFileChooser. [Federico]
-* Better support for Folder mode in GtkFileChooser. [Federico]
-* Documentation improvements [Matthias, Federico, Manish, 
-  Murray Cumming, Theppitak Karoonboonyanan]
+* Documentation improvements [Matthias, Federico, Manish, Murray Cumming, 
+  Theppitak Karoonboonyanan]
 * FAQ updates [Tony Gale]
-* New and updated translations (bn,ru,sr,sr@Latn,es,cs,sv,ja,no,de,
-  nl,sq,pt,pt_BR,nn,hr,lt,fa,it,et,cy,ko,mn,ar,ga,wa,br,af,ms)
-Other contributors: Marco Pesenti Gritti, Tim-Philipp Müller,
-  Noah Levitt, Sebastian Rittau, Bill Haneman, Herman Bloggs, 
-  Adam Wright, Manish Singh, Kjartan Maraas, Evan Martin, 
-  Alexander Larsson, Joshua N Pritikin, Torsten Schoenfeld, 
-  Christian Neumair, Daniel Rogers, Alexander Winston, Johannes 
-  Weißl, Anders Carlsson, Morten Welinder, Olivier Andrieu
+* Split the translations into two domains: ui strings and
+  error messages go to gtk20, property nicks and blurbs to 
+  gtk20-properties. [Matthias]
+* New and updated translations (af,ar,bn,br,cs,cy,da,de,es,et,fa,fr,ga,hr,
+  it,ja,ko,lt,mn,ms,nl,nn,no,pl,pt,pt_BR,ru,sr,sr@Latn,sv,sq,wa)
+Other contributors: Olivier Andrieu, Herman Bloggs, Anders Carlsson,
+  Marco Pesenti Gritti, Bill Haneman, Alexander Larsson, Noah Levitt, 
+  Kjartan Maraas, Evan Martin, Tim-Philipp Müller, Christian Neumair, 
+  Joshua N Pritikin, Sebastian Rittau, Daniel Rogers, Manish Singh, 
+  Torsten Schoenfeld, Alexander Winston, Johannes Weißl,  Morten Welinder, 
+  Adam Wright
 
 Overview of Changes in GTK+-2.3.1
 =================================
diff --git a/configure.in b/configure.in
index 379fe278dd..a52790b8bd 100644
--- a/configure.in
+++ b/configure.in
@@ -12,11 +12,11 @@ AC_PREREQ(2.54)
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [3])
-m4_define([gtk_micro_version], [1])
+m4_define([gtk_micro_version], [2])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
 m4_define([gtk_interface_age], [0])
-m4_define([gtk_binary_age], [301])
+m4_define([gtk_binary_age], [302])
 # This is the X.Y used in -lgtk-FOO-X.Y
 m4_define([gtk_api_version], [2.0])
 
@@ -28,7 +28,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.2.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.3.0])
+m4_define([glib_required_version], [2.3.2])
 m4_define([pango_required_version], [1.2.0])
 m4_define([atk_required_version], [1.0.1])
 
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 85752d7d74..93f09c7c58 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1179,11 +1179,11 @@ gtk_icon_theme_lookup_icon (GtkIconTheme       *icon_theme,
 	    }
 	  if (!found)
 	    {
-	      g_warning (_("Could not find the icon '%s'.  The '" DEFAULT_THEME_NAME "' theme\n"
+	      g_warning (_("Could not find the icon '%s'. The '%s' theme\n"
 			   "was not found either, perhaps you need to install it.\n"
-			   "You can get a copy from :\n"
-			   "\thttp://freedesktop.org/Software/icon-theme/releases"),
-			 icon_name);
+			   "You can get a copy from:\n"
+			   "\t%s"),
+			 icon_name, DEFAULT_THEME_NAME, "http://freedesktop.org/Software/icon-theme/releases");
 	    }
 	}
     }
diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index 9986a30573..cea119a8e3 100644
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -260,7 +260,7 @@ gtk_separator_tool_item_new (void)
 
 /**
  * gtk_separator_tool_item_get_draw:
- * @separator_tool_item: a #GtkSeparatorToolItem 
+ * @item: a #GtkSeparatorToolItem 
  * 
  * Returns whether @separator_tool_item is drawn as a
  * line, or just blank. See gtk_separator_tool_item_set_draw().
@@ -270,16 +270,16 @@ gtk_separator_tool_item_new (void)
  * Since: 2.4
  **/
 gboolean
-gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *separator_tool_item)
+gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *item)
 {
-  g_return_val_if_fail (GTK_IS_SEPARATOR_TOOL_ITEM (separator_tool_item), FALSE);
+  g_return_val_if_fail (GTK_IS_SEPARATOR_TOOL_ITEM (item), FALSE);
   
-  return separator_tool_item->priv->draw;
+  return item->priv->draw;
 }
 
 /**
  * gtk_separator_tool_item_set_draw:
- * @separator_tool_item: a #GtkSeparatorToolItem
+ * @item: a #GtkSeparatorToolItem
  * @draw: whether @separator_tool_item is drawn as a vertical iln
  * 
  * When @separator_tool_items is drawn as a vertical line, or just blank.
@@ -289,20 +289,20 @@ gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *separator_tool_item)
  * Since: 2.4
  **/
 void
-gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *separator_tool_item,
+gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
 				  gboolean              draw)
 {
-  g_return_if_fail (GTK_IS_SEPARATOR_TOOL_ITEM (separator_tool_item));
+  g_return_if_fail (GTK_IS_SEPARATOR_TOOL_ITEM (item));
 
   draw = draw != FALSE;
 
-  if (draw != separator_tool_item->priv->draw)
+  if (draw != item->priv->draw)
     {
-      separator_tool_item->priv->draw = draw;
+      item->priv->draw = draw;
 
-      gtk_widget_queue_draw (GTK_WIDGET (separator_tool_item));
+      gtk_widget_queue_draw (GTK_WIDGET (item));
 
-      g_object_notify (G_OBJECT (separator_tool_item), "draw");
+      g_object_notify (G_OBJECT (item), "draw");
     }
 }
 
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 4ba5dc9b8d..7e637f1bd4 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -60,7 +60,7 @@ GType        gtk_separator_tool_item_get_type (void) G_GNUC_CONST;
 GtkToolItem *gtk_separator_tool_item_new      (void);
 
 gboolean     gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *item);
-void         gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *tool_item,
+void         gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
 					       gboolean              draw);
 
 G_END_DECLS
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 39a4a0bb1a..b1b004092a 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1959,7 +1959,7 @@ logical_to_physical (GtkToolbar *toolbar,
 /**
  * gtk_toolbar_set_drop_highlight_item:
  * @toolbar: a #GtkToolbar
- * @item: a #GtkToolItem, or %NULL to turn of highlighting
+ * @tool_item: a #GtkToolItem, or %NULL to turn of highlighting
  * @index: a position on @toolbar
  * 
  * Highlights @toolbar to give an idea of what it would look like
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 3e17680518..2ca0d20795 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -92,7 +92,7 @@ void          gtk_tree_model_filter_convert_iter_to_child_iter (GtkTreeModelFilt
                                                                 GtkTreeIter                  *filter_iter);
 GtkTreePath  *gtk_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter           *filter,
                                                                 GtkTreePath                  *child_path);
-GtkTreePath  *gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter           *path,
+GtkTreePath  *gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter           *filter,
                                                                 GtkTreePath                  *filter_path);
 
 /* extras */