2.6.2

Work better when there is not enough space. This avoids a nasty size
2005-02-04 Matthias Clasen <mclasen@redhat.com> * gtk/gtkpaned.c (gtk_paned_compute_position): Work better when there is not enough space. This avoids a nasty size allocation loop in the file chooser. (#154007, reported by Milosz Derezynski, patch by Robert Ögren)
2005-02-04 19:08:27 +00:00 · 2005-02-04 17:45:05 +00:00 · 2005-02-04 15:36:02 +00:00 · 2005-02-04 10:11:14 +00:00 · 2005-02-03 20:49:33 +00:00 · 2005-02-03 18:10:49 +00:00
243 changed files with 17535 additions and 16569 deletions
@@ -1,3 +1,473 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
+	* NEWS: Updates
+
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+	when there is not enough space. This avoids a nasty size
+	allocation loop in the file chooser.  (#154007, reported 
+	by Milosz Derezynski, patch by Robert Ögren)
+	
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
+	selection of RTL direction if the widget does not have 
+	focus.  (#164125, Frederic Crozat)
+
+2005-02-03  Tor Lillqvist  <tml@novell.com>
+
+	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
+	wide character version of ImmGetCompositionString() here,
+	too. (#165278, Takuro Ashie)
+
+2005-02-03  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtkicontheme.c: (load_themes): remove debug spew.
+
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do
+	one roundtrip per motion event.  (#166173, pointed out
+	by Chris Lee, patch by Søren Sandmann)
+
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkkeynames.c: Make the gdk_key array const (#166075,
+	Tommi Komulainen)
+
+2005-02-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
+	Don't select the first row if the chooser is not mapped.  This
+	happens when it's acting on behalf of GtkFileChooserButton.  Also,
+	don't select the first row if we are in SAVE or CREATE_FOLDER
+	modes --- I had missed that (see the ChangeLog entry from
+	2005-01-18).  Fixes #165264.
+
+2005-02-02  Tor Lillqvist  <tml@novell.com>
+
+	Implement lazy extended input initialization on Win32, by Robert
+	Ögren. Fixes #163163, possibly #162334. Lazy initialization would
+	be a good idea in any case even if it didn't fix any visible
+	problems, though.
+
+	The Wacom tablet driver seems to get confused if Wintab is
+	initialized but no window is shown before the process exits. This
+	is the case for some GIMP plug-ins, for instance. 
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_wintab_init_check): Made
+	non-static (and renamed).
+	(_gdk_input_init): Don't call _gdk_input_wintab_init_check().
+
+	* gdk/win32/gdkinput-win32.h: Declare _gdk_input_wintab_init_check().
+
+	* gdk/win32/gdkinput.c (gdk_devices_list,
+	gdk_display_list_devices, gdk_input_set_extension_events): Call
+	_gdk_input_wintab_init_check() here instead.
+
+2005-02-02  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	* gdk/win32/gdkselection.c: Use a FIFO list for storing GdkSelProp
+	of a single window so that gtk_clipboard_request_contents() can be
+	called inside a GtkClipboardReceivedFunc(). (#163844)
+
+2005-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
+	in XDG_DATA_DIRS/pixmaps.  (#165950, Thomas Zajic)
+
+	* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
+	to NULL after freeing it.  (#165800, Damon Chaplin)
+	
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(browse_files_model_finished_loading_cb): Don't
+	g_assert_not_reached() if we are in any other state.  Another code
+	path may have triggered a folder reload.  Fixes #165556.
+
+2005-02-01  Michael Natterer  <mitch@gimp.org>
+
+	* configure.in: depend on stable pango-1.8, not unstable 1.7
+
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #165770:
+
+	* gtk/gtkfilechooserdefault.c (FALLBACK_ICON_SIZE): Make the
+	fallback size be 16, to be equal to the default for
+	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+	GTK_ICON_SIZE_SMALL_TOOLBAR.
+
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_adjustment_changed): 
+	Remove debug printf.  (#165877, Carlos Garnacho Parro)
+
+	* */*.c: Fix many instances of "the the" in docs and
+	comments.  (#165815, Masao Mutoh)
+
+	* gtk/updateiconcache.c (main): Add a --quiet option.
+
+2005-02-01  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (handle_special, set_shift_vks,
+	reset_after_dead, handle_dead): New functions, code blocks
+	refactored out of update_keymap(). No functionality change.
+
+	(update_keymap): Use ToUnicodeEx() when available (on NT-based
+	Windows) instead of ToAsciiEx(). Makes keyboard input work in
+	Unicode-only input locales that don't have any ANSI codepage, for
+	instance Hindi and Bengali. Use _gdk_input_codepage only on
+	Win9x. (#165723)
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
+	WM_INPUTLANGCHANGE, use GetLocaleInfo() instead of
+	TranslateCharsetInfo() to get the input locale's corresponding
+	codepage, if any.
+
+2005-01-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
+	NULL-terminated va lists.  (#165683)
+
+Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
+
+	* README.cvs-commits: update ancient IRC info.
+
+2005-01-27  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_select_path): Oops, don't assert that we
+	can't reach the end of the function; this happens if we are still
+	loading but don't need a path change.  Fixes #165213.
+
+2005-01-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
+	obey HIG spacing a bit more, add a hand cursor when over the
+	link button.  (#163979, Jorn Baayen)
+
+2005-01-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_class_init): 
+	Don't allow -1 as minimum-key-length.
+	(gtk_entry_completion_set_model): Add missing notification.
+	(gtk_entry_completion_set_minimum_key_length): Add missing
+	notification, allow setting minimum-key-length to 0.  (#165194,
+	Vincent Ladeuil)
+
+2005-01-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c (display_license_dialog): Make sure
+	the license dialog is initially displayed without a horizontal
+	scrollbar.  
+	(gtk_about_dialog_class_init): Document the fact that the 
+	license text is not wrapped.  (#165012, Christian Rose)
+
+2005-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkbutton.c (gtk_button_set_image): Fix docs.  (#165180,
+	Jeff Franks)
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Fix 
+	docs.  (#165163, Jeff Franks)
+
+	* gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
+	for a string GValue.  (#165203, Damon Chaplin)
+
+2005-01-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): 
+	Initialize user_time from DESKTOP_STARTUP_ID.  (#165131,
+	Elijah Newren)
+
+2005-01-24  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c: Removed leftover comments.
+
+2005-01-24  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #147785 and clean up the loading code:
+
+	* gtk/gtkfilechooserdefault.c (LoadState): Make the set of states
+	be EMPTY, PRELOAD, LOADING, FINISHED.
+	(gtk_file_chooser_default_init): Start in the LOAD_EMPTY state.
+	(struct _GtkFileChooserDefault): Added a pending_select_paths
+	field.
+	(load_remove_timer): Add the new states.
+	(load_setup_timer): Likewise.
+	(load_timeout_cb): Likewise.  Switch to the LOAD_LOADING state.
+	(browse_files_model_finished_loading_cb): Switch to the
+	LOAD_FINISHED state.
+	(enum PendingOp): Removed.
+	(struct _GtkFileChooserDefault): Removed the pending_op and
+	pending_select_path fields.
+	(pending_select_paths_free): New utility function.
+	(pending_select_paths_add): New utility function.
+	(gtk_file_chooser_default_finalize): Call
+	pending_select_paths_free().
+	(pending_op_queue): Removed.
+	(pending_op_process): Removed.
+	(pending_select_paths_process): New function.
+	(browse_files_model_finished_loading_cb): Call
+	pending_select_paths_process().
+	(center_selected_row_foreach_cb): Handle multiple selection by
+	only centering the first row.
+	(get_is_file_filtered): Constify.
+	(gtk_file_chooser_default_select_path): Queue into a list of paths
+	to select if we are not finished loading.
+	(show_and_select_paths): New utility function.
+	(up_folder_handler): Use pending_select_paths_add().
+	(gtk_file_chooser_default_should_respond): Do not call
+	pending_op_queue(); free the pending_selected_paths instead.
+	(gtk_file_chooser_default_initial_focus): Don't queue a pending
+	operation, and don't select the first row unconditionally --- this
+	will happen when the folder is done loading.
+	(shortcuts_row_activated_cb): Free the pending_select_paths.
+	(pending_select_paths_store_selection): New utility function.
+	(gtk_file_chooser_default_map): Call
+	pending_select_paths_store_selection() to save the selection
+	before reloading the folder.
+	(select_func): Umm?  Call gtk_tree_selection_select_iter().  Don't
+	move the cursor here; it will be done when processing the pending paths.
+
+	* tests/testfilechooser.c (main): Add a button to the command
+	window to unmap and remap the file chooser.
+
+2005-01-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_class_init): Document 
+	GtkWidget::style-set.  (#164222, Alex Graveley)
+
+2005-01-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkdisplay.h (gdk_display_add_client_message_filter_full): 
+	Remove the accidentally added prototype for this unimplemented 
+	function.  (#164893, Jeff Franks)
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
+	drags.  (#164884)
+
+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	Merged from HEAD:
+
+	Fix for #162790, by Iwan Wong:
+	
+	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
+	correctly. Simplify the interface to render_line_horizontal() and
+	render_line_vertical(). Need to draw lines "manually" also on
+	NT-based Windowses if we have a dash offset or are drawing
+	double-dashed lines.
+
+	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
+	double-dash flag, and a brush for the background colour (used by
+	the odd dashes in the double-dash line style) in the GdkGCWin32
+	struct.
+
+	* gdk/win32/gdkgc-win32.c: Set up above new fields.
+
+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
+	dead accent key. (#164859, reported and fix verified by Daniel
+	Atallah.)
+
+	* gtk/gtkimcontextsimple.c (gtk_compose_seqs): Handle
+	GDK_Greek_accentdieresis (tonos and dialytika) combining with iota
+	and upsilon.
+
+	* gtk/gtkfilesystemwin32.c (gtk_file_system_win32_volume_get_display_name): 
+	Don't call GetVolumeInformation() for network drives. They might
+	be disconnected, and calling GetVolumeInformation() will then
+	cause long delays. (#164448, reported by Dave Neary.) It seems to
+	be very hard to reliably find out whether a network drive is
+	connected or not, so it's easier to just not try getting the
+	volume name for them. See the bug report for discussion.
+
+	Fix for #163702, from Ivan Wong: 
+	
+	* gdk/win32/gdkprivate-win32.h 
+	* gdk/win32/gdkglobals-win32.c: New flag _ignore_destroy_clipboard.
+	
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle
+	WM_DESTROYCLIPBOARD. Unless _ignore_destroy_clipboard, generate a
+	GDK_SELECTION_CLEAR event.
+
+	* gdk/win32/gdkselection-win32.c
+	(gdk_selection_owner_set_for_display): Set _ignore_destroy_clipboard
+	when emptying the clipboard ourselves.
+
+	(gdk_selection_send_notify_for_display): Remove the artifical
+	GDK_SELECTION_CLEAR event generation.
+
+2005-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_map): Don't loop forever
+	here, even if the only focusable widgets are labels.
+
+	* gtk/gtkmodules.c (load_module): Don't reverse the order
+	of modules when putting them in gtk_modules.  (#162676, Dennis
+	Cranston, patch by Remus Draica)
+	
+	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
+	if the tree is empty.  (#164669, Priit Laes)
+
+Wed Jan 19 18:57:02 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call
+	GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the
+	function a bit too.
+
+Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash
+	strict aliasing warning in _NET_VIRTUAL_ROOTS code.
+
+2005-01-19  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap,
+	gdk_keymap_translate_keyboard_state): Handle keyboards with
+	ShiftLock (and not CapsLock) correctly. (#161814)
+
+2005-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
+	In save mode, don't return paths containing nonexisting 
+	directories.  (#162443, Jean Marie Favreau)
+
+	* gtk/gtkobject.c (gtk_object_add_arg_type): Use GLib limit 
+	macros to avoid sparse warnings. Pointed out by Kjartan Maraas.
+
+	* gdk/x11/gdkdisplay-x11.c: Precache the _NET_VIRTUAL_ROOTS
+	atom.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): 
+	Support _NET_VIRTUAL_ROOTS.  (#163910, Carsten Haitzler)
+
+Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign
+	PENDING_OP_NONE.
+
+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+	disambiguate nested if/else.
+
+2005-01-18  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
+	operation to select the first file if we are in SAVE or
+	CREATE_FOLDER modes.  Executing that operation would overwrite the
+	contents of the save-name entry.
+
+2005-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkstyle.c (gtk_default_draw_check) 
+	(gtk_default_draw_option, gtk_default_draw_handle): Add some
+	more NULL checks, patch by Michael Natterer.
+
+Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
+	and NULL widget.
+
+	* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
+	NULL widget.  (#164477, Michael Natterer)
+
+2005-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	Avoid X errors when running against servers which
+	implement XRender < 0.4.  (#164427, Albert Chin)
+	
+	* gdk/x11/gdkprivate-x11.h:
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+	New function to check for trapezoid support in XRender.
+	(gdk_x11_draw_trapezoids, _gdk_x11_drawable_draw_xtrapezoids): 
+	Use it here.
+	
+	* gdk/x11/gdkdisplay-x11.h (struct _GdkDisplayX11): Add a 
+	separate have_render_with_trapezoids field.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize it.
+
+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c: Remove debug output. (#164376, Jens Finke)
+
+2005-01-17  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from HEAD:
+
+	Fix #162617.
+
+	* gtk/gtkfilesystemunix.c (STAT_NEEDED_MASK): Take out
+	GTK_FILE_INFO_IS_HIDDEN; we don't need to stat() to know this.
+	(gtk_file_system_unix_get_folder): Make error reporting more
+	accurate.  Don't bail out if we can't read the directory.
+	(fill_in_stats): Don't return an error; just assume we don't have
+	stat info for this folder's files.
+	(fill_in_names): Don't create the hash table for the names if we
+	can't open the directory.
+	(gtk_file_folder_unix_list_children): Don't emit the
+	"finished-loading" signal --- we don't do asynchronous loads, so
+	we are always finished loading.
+	(gtk_file_folder_unix_get_info): Use helper functions; handle the
+	case where we can't stat '/'.
+	(get_icon_type_from_path): Don't call fill_in_stats() here; only
+	use the info we have.
+	(fill_in_mime_type): Don't return an error.  Don't do anything if
+	we don't have the stat info.
+
+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
+	and restore the selected row in the bookmark list and the
+	save folder combo.  (#164290)
+
+2005-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
+	Fix argument order in docs.  
+
+2005-01-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
+	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
+	if the keymap is neutral.  (#164125, Phil Blundell)
+
+2005-01-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* gdk/Makefile.am (TESTS):
+	* gdk-pixbuf/Makefile.am (TESTS):
+	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
+	Roger Leigh)
+
+2005-01-13  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
+	(gtk_tree_view_set_headers_clickable): Make the headers-visible
+	property readwrite instead of just writable, and remove the
+	g_return_if_fail check that there is a model when setting this
+	property.  (#163851, Richard Hult)
+
+2005-01-10  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Adding missing ChangeLog.pre*
+	to EXTRA_DIST.
+
 2005-01-10  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkaccelgroup.c (gtk_accel_group_class_init): Document
@@ -1,3 +1,473 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
+	* NEWS: Updates
+
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+	when there is not enough space. This avoids a nasty size
+	allocation loop in the file chooser.  (#154007, reported 
+	by Milosz Derezynski, patch by Robert Ögren)
+	
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
+	selection of RTL direction if the widget does not have 
+	focus.  (#164125, Frederic Crozat)
+
+2005-02-03  Tor Lillqvist  <tml@novell.com>
+
+	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
+	wide character version of ImmGetCompositionString() here,
+	too. (#165278, Takuro Ashie)
+
+2005-02-03  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtkicontheme.c: (load_themes): remove debug spew.
+
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do
+	one roundtrip per motion event.  (#166173, pointed out
+	by Chris Lee, patch by Søren Sandmann)
+
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkkeynames.c: Make the gdk_key array const (#166075,
+	Tommi Komulainen)
+
+2005-02-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
+	Don't select the first row if the chooser is not mapped.  This
+	happens when it's acting on behalf of GtkFileChooserButton.  Also,
+	don't select the first row if we are in SAVE or CREATE_FOLDER
+	modes --- I had missed that (see the ChangeLog entry from
+	2005-01-18).  Fixes #165264.
+
+2005-02-02  Tor Lillqvist  <tml@novell.com>
+
+	Implement lazy extended input initialization on Win32, by Robert
+	Ögren. Fixes #163163, possibly #162334. Lazy initialization would
+	be a good idea in any case even if it didn't fix any visible
+	problems, though.
+
+	The Wacom tablet driver seems to get confused if Wintab is
+	initialized but no window is shown before the process exits. This
+	is the case for some GIMP plug-ins, for instance. 
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_wintab_init_check): Made
+	non-static (and renamed).
+	(_gdk_input_init): Don't call _gdk_input_wintab_init_check().
+
+	* gdk/win32/gdkinput-win32.h: Declare _gdk_input_wintab_init_check().
+
+	* gdk/win32/gdkinput.c (gdk_devices_list,
+	gdk_display_list_devices, gdk_input_set_extension_events): Call
+	_gdk_input_wintab_init_check() here instead.
+
+2005-02-02  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	* gdk/win32/gdkselection.c: Use a FIFO list for storing GdkSelProp
+	of a single window so that gtk_clipboard_request_contents() can be
+	called inside a GtkClipboardReceivedFunc(). (#163844)
+
+2005-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
+	in XDG_DATA_DIRS/pixmaps.  (#165950, Thomas Zajic)
+
+	* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
+	to NULL after freeing it.  (#165800, Damon Chaplin)
+	
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(browse_files_model_finished_loading_cb): Don't
+	g_assert_not_reached() if we are in any other state.  Another code
+	path may have triggered a folder reload.  Fixes #165556.
+
+2005-02-01  Michael Natterer  <mitch@gimp.org>
+
+	* configure.in: depend on stable pango-1.8, not unstable 1.7
+
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #165770:
+
+	* gtk/gtkfilechooserdefault.c (FALLBACK_ICON_SIZE): Make the
+	fallback size be 16, to be equal to the default for
+	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+	GTK_ICON_SIZE_SMALL_TOOLBAR.
+
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_adjustment_changed): 
+	Remove debug printf.  (#165877, Carlos Garnacho Parro)
+
+	* */*.c: Fix many instances of "the the" in docs and
+	comments.  (#165815, Masao Mutoh)
+
+	* gtk/updateiconcache.c (main): Add a --quiet option.
+
+2005-02-01  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (handle_special, set_shift_vks,
+	reset_after_dead, handle_dead): New functions, code blocks
+	refactored out of update_keymap(). No functionality change.
+
+	(update_keymap): Use ToUnicodeEx() when available (on NT-based
+	Windows) instead of ToAsciiEx(). Makes keyboard input work in
+	Unicode-only input locales that don't have any ANSI codepage, for
+	instance Hindi and Bengali. Use _gdk_input_codepage only on
+	Win9x. (#165723)
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
+	WM_INPUTLANGCHANGE, use GetLocaleInfo() instead of
+	TranslateCharsetInfo() to get the input locale's corresponding
+	codepage, if any.
+
+2005-01-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
+	NULL-terminated va lists.  (#165683)
+
+Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
+
+	* README.cvs-commits: update ancient IRC info.
+
+2005-01-27  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_select_path): Oops, don't assert that we
+	can't reach the end of the function; this happens if we are still
+	loading but don't need a path change.  Fixes #165213.
+
+2005-01-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
+	obey HIG spacing a bit more, add a hand cursor when over the
+	link button.  (#163979, Jorn Baayen)
+
+2005-01-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_class_init): 
+	Don't allow -1 as minimum-key-length.
+	(gtk_entry_completion_set_model): Add missing notification.
+	(gtk_entry_completion_set_minimum_key_length): Add missing
+	notification, allow setting minimum-key-length to 0.  (#165194,
+	Vincent Ladeuil)
+
+2005-01-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c (display_license_dialog): Make sure
+	the license dialog is initially displayed without a horizontal
+	scrollbar.  
+	(gtk_about_dialog_class_init): Document the fact that the 
+	license text is not wrapped.  (#165012, Christian Rose)
+
+2005-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkbutton.c (gtk_button_set_image): Fix docs.  (#165180,
+	Jeff Franks)
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Fix 
+	docs.  (#165163, Jeff Franks)
+
+	* gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
+	for a string GValue.  (#165203, Damon Chaplin)
+
+2005-01-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): 
+	Initialize user_time from DESKTOP_STARTUP_ID.  (#165131,
+	Elijah Newren)
+
+2005-01-24  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c: Removed leftover comments.
+
+2005-01-24  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #147785 and clean up the loading code:
+
+	* gtk/gtkfilechooserdefault.c (LoadState): Make the set of states
+	be EMPTY, PRELOAD, LOADING, FINISHED.
+	(gtk_file_chooser_default_init): Start in the LOAD_EMPTY state.
+	(struct _GtkFileChooserDefault): Added a pending_select_paths
+	field.
+	(load_remove_timer): Add the new states.
+	(load_setup_timer): Likewise.
+	(load_timeout_cb): Likewise.  Switch to the LOAD_LOADING state.
+	(browse_files_model_finished_loading_cb): Switch to the
+	LOAD_FINISHED state.
+	(enum PendingOp): Removed.
+	(struct _GtkFileChooserDefault): Removed the pending_op and
+	pending_select_path fields.
+	(pending_select_paths_free): New utility function.
+	(pending_select_paths_add): New utility function.
+	(gtk_file_chooser_default_finalize): Call
+	pending_select_paths_free().
+	(pending_op_queue): Removed.
+	(pending_op_process): Removed.
+	(pending_select_paths_process): New function.
+	(browse_files_model_finished_loading_cb): Call
+	pending_select_paths_process().
+	(center_selected_row_foreach_cb): Handle multiple selection by
+	only centering the first row.
+	(get_is_file_filtered): Constify.
+	(gtk_file_chooser_default_select_path): Queue into a list of paths
+	to select if we are not finished loading.
+	(show_and_select_paths): New utility function.
+	(up_folder_handler): Use pending_select_paths_add().
+	(gtk_file_chooser_default_should_respond): Do not call
+	pending_op_queue(); free the pending_selected_paths instead.
+	(gtk_file_chooser_default_initial_focus): Don't queue a pending
+	operation, and don't select the first row unconditionally --- this
+	will happen when the folder is done loading.
+	(shortcuts_row_activated_cb): Free the pending_select_paths.
+	(pending_select_paths_store_selection): New utility function.
+	(gtk_file_chooser_default_map): Call
+	pending_select_paths_store_selection() to save the selection
+	before reloading the folder.
+	(select_func): Umm?  Call gtk_tree_selection_select_iter().  Don't
+	move the cursor here; it will be done when processing the pending paths.
+
+	* tests/testfilechooser.c (main): Add a button to the command
+	window to unmap and remap the file chooser.
+
+2005-01-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_class_init): Document 
+	GtkWidget::style-set.  (#164222, Alex Graveley)
+
+2005-01-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkdisplay.h (gdk_display_add_client_message_filter_full): 
+	Remove the accidentally added prototype for this unimplemented 
+	function.  (#164893, Jeff Franks)
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
+	drags.  (#164884)
+
+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	Merged from HEAD:
+
+	Fix for #162790, by Iwan Wong:
+	
+	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
+	correctly. Simplify the interface to render_line_horizontal() and
+	render_line_vertical(). Need to draw lines "manually" also on
+	NT-based Windowses if we have a dash offset or are drawing
+	double-dashed lines.
+
+	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
+	double-dash flag, and a brush for the background colour (used by
+	the odd dashes in the double-dash line style) in the GdkGCWin32
+	struct.
+
+	* gdk/win32/gdkgc-win32.c: Set up above new fields.
+
+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
+	dead accent key. (#164859, reported and fix verified by Daniel
+	Atallah.)
+
+	* gtk/gtkimcontextsimple.c (gtk_compose_seqs): Handle
+	GDK_Greek_accentdieresis (tonos and dialytika) combining with iota
+	and upsilon.
+
+	* gtk/gtkfilesystemwin32.c (gtk_file_system_win32_volume_get_display_name): 
+	Don't call GetVolumeInformation() for network drives. They might
+	be disconnected, and calling GetVolumeInformation() will then
+	cause long delays. (#164448, reported by Dave Neary.) It seems to
+	be very hard to reliably find out whether a network drive is
+	connected or not, so it's easier to just not try getting the
+	volume name for them. See the bug report for discussion.
+
+	Fix for #163702, from Ivan Wong: 
+	
+	* gdk/win32/gdkprivate-win32.h 
+	* gdk/win32/gdkglobals-win32.c: New flag _ignore_destroy_clipboard.
+	
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle
+	WM_DESTROYCLIPBOARD. Unless _ignore_destroy_clipboard, generate a
+	GDK_SELECTION_CLEAR event.
+
+	* gdk/win32/gdkselection-win32.c
+	(gdk_selection_owner_set_for_display): Set _ignore_destroy_clipboard
+	when emptying the clipboard ourselves.
+
+	(gdk_selection_send_notify_for_display): Remove the artifical
+	GDK_SELECTION_CLEAR event generation.
+
+2005-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_map): Don't loop forever
+	here, even if the only focusable widgets are labels.
+
+	* gtk/gtkmodules.c (load_module): Don't reverse the order
+	of modules when putting them in gtk_modules.  (#162676, Dennis
+	Cranston, patch by Remus Draica)
+	
+	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
+	if the tree is empty.  (#164669, Priit Laes)
+
+Wed Jan 19 18:57:02 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call
+	GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the
+	function a bit too.
+
+Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash
+	strict aliasing warning in _NET_VIRTUAL_ROOTS code.
+
+2005-01-19  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap,
+	gdk_keymap_translate_keyboard_state): Handle keyboards with
+	ShiftLock (and not CapsLock) correctly. (#161814)
+
+2005-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
+	In save mode, don't return paths containing nonexisting 
+	directories.  (#162443, Jean Marie Favreau)
+
+	* gtk/gtkobject.c (gtk_object_add_arg_type): Use GLib limit 
+	macros to avoid sparse warnings. Pointed out by Kjartan Maraas.
+
+	* gdk/x11/gdkdisplay-x11.c: Precache the _NET_VIRTUAL_ROOTS
+	atom.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): 
+	Support _NET_VIRTUAL_ROOTS.  (#163910, Carsten Haitzler)
+
+Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign
+	PENDING_OP_NONE.
+
+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+	disambiguate nested if/else.
+
+2005-01-18  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
+	operation to select the first file if we are in SAVE or
+	CREATE_FOLDER modes.  Executing that operation would overwrite the
+	contents of the save-name entry.
+
+2005-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkstyle.c (gtk_default_draw_check) 
+	(gtk_default_draw_option, gtk_default_draw_handle): Add some
+	more NULL checks, patch by Michael Natterer.
+
+Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
+	and NULL widget.
+
+	* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
+	NULL widget.  (#164477, Michael Natterer)
+
+2005-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	Avoid X errors when running against servers which
+	implement XRender < 0.4.  (#164427, Albert Chin)
+	
+	* gdk/x11/gdkprivate-x11.h:
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+	New function to check for trapezoid support in XRender.
+	(gdk_x11_draw_trapezoids, _gdk_x11_drawable_draw_xtrapezoids): 
+	Use it here.
+	
+	* gdk/x11/gdkdisplay-x11.h (struct _GdkDisplayX11): Add a 
+	separate have_render_with_trapezoids field.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize it.
+
+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c: Remove debug output. (#164376, Jens Finke)
+
+2005-01-17  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from HEAD:
+
+	Fix #162617.
+
+	* gtk/gtkfilesystemunix.c (STAT_NEEDED_MASK): Take out
+	GTK_FILE_INFO_IS_HIDDEN; we don't need to stat() to know this.
+	(gtk_file_system_unix_get_folder): Make error reporting more
+	accurate.  Don't bail out if we can't read the directory.
+	(fill_in_stats): Don't return an error; just assume we don't have
+	stat info for this folder's files.
+	(fill_in_names): Don't create the hash table for the names if we
+	can't open the directory.
+	(gtk_file_folder_unix_list_children): Don't emit the
+	"finished-loading" signal --- we don't do asynchronous loads, so
+	we are always finished loading.
+	(gtk_file_folder_unix_get_info): Use helper functions; handle the
+	case where we can't stat '/'.
+	(get_icon_type_from_path): Don't call fill_in_stats() here; only
+	use the info we have.
+	(fill_in_mime_type): Don't return an error.  Don't do anything if
+	we don't have the stat info.
+
+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
+	and restore the selected row in the bookmark list and the
+	save folder combo.  (#164290)
+
+2005-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
+	Fix argument order in docs.  
+
+2005-01-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
+	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
+	if the keymap is neutral.  (#164125, Phil Blundell)
+
+2005-01-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* gdk/Makefile.am (TESTS):
+	* gdk-pixbuf/Makefile.am (TESTS):
+	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
+	Roger Leigh)
+
+2005-01-13  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
+	(gtk_tree_view_set_headers_clickable): Make the headers-visible
+	property readwrite instead of just writable, and remove the
+	g_return_if_fail check that there is a model when setting this
+	property.  (#163851, Richard Hult)
+
+2005-01-10  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Adding missing ChangeLog.pre*
+	to EXTRA_DIST.
+
 2005-01-10  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkaccelgroup.c (gtk_accel_group_class_init): Document
@@ -1,3 +1,473 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
+	* NEWS: Updates
+
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+	when there is not enough space. This avoids a nasty size
+	allocation loop in the file chooser.  (#154007, reported 
+	by Milosz Derezynski, patch by Robert Ögren)
+	
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
+	selection of RTL direction if the widget does not have 
+	focus.  (#164125, Frederic Crozat)
+
+2005-02-03  Tor Lillqvist  <tml@novell.com>
+
+	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
+	wide character version of ImmGetCompositionString() here,
+	too. (#165278, Takuro Ashie)
+
+2005-02-03  Mark McLoughlin  <mark@skynet.ie>
+
+	* gtk/gtkicontheme.c: (load_themes): remove debug spew.
+
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do
+	one roundtrip per motion event.  (#166173, pointed out
+	by Chris Lee, patch by Søren Sandmann)
+
+2005-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkkeynames.c: Make the gdk_key array const (#166075,
+	Tommi Komulainen)
+
+2005-02-02  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
+	Don't select the first row if the chooser is not mapped.  This
+	happens when it's acting on behalf of GtkFileChooserButton.  Also,
+	don't select the first row if we are in SAVE or CREATE_FOLDER
+	modes --- I had missed that (see the ChangeLog entry from
+	2005-01-18).  Fixes #165264.
+
+2005-02-02  Tor Lillqvist  <tml@novell.com>
+
+	Implement lazy extended input initialization on Win32, by Robert
+	Ögren. Fixes #163163, possibly #162334. Lazy initialization would
+	be a good idea in any case even if it didn't fix any visible
+	problems, though.
+
+	The Wacom tablet driver seems to get confused if Wintab is
+	initialized but no window is shown before the process exits. This
+	is the case for some GIMP plug-ins, for instance. 
+
+	* gdk/win32/gdkinput-win32.c (_gdk_input_wintab_init_check): Made
+	non-static (and renamed).
+	(_gdk_input_init): Don't call _gdk_input_wintab_init_check().
+
+	* gdk/win32/gdkinput-win32.h: Declare _gdk_input_wintab_init_check().
+
+	* gdk/win32/gdkinput.c (gdk_devices_list,
+	gdk_display_list_devices, gdk_input_set_extension_events): Call
+	_gdk_input_wintab_init_check() here instead.
+
+2005-02-02  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	* gdk/win32/gdkselection.c: Use a FIFO list for storing GdkSelProp
+	of a single window so that gtk_clipboard_request_contents() can be
+	called inside a GtkClipboardReceivedFunc(). (#163844)
+
+2005-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
+	in XDG_DATA_DIRS/pixmaps.  (#165950, Thomas Zajic)
+
+	* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
+	to NULL after freeing it.  (#165800, Damon Chaplin)
+	
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(browse_files_model_finished_loading_cb): Don't
+	g_assert_not_reached() if we are in any other state.  Another code
+	path may have triggered a folder reload.  Fixes #165556.
+
+2005-02-01  Michael Natterer  <mitch@gimp.org>
+
+	* configure.in: depend on stable pango-1.8, not unstable 1.7
+
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #165770:
+
+	* gtk/gtkfilechooserdefault.c (FALLBACK_ICON_SIZE): Make the
+	fallback size be 16, to be equal to the default for
+	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+	GTK_ICON_SIZE_SMALL_TOOLBAR.
+
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_adjustment_changed): 
+	Remove debug printf.  (#165877, Carlos Garnacho Parro)
+
+	* */*.c: Fix many instances of "the the" in docs and
+	comments.  (#165815, Masao Mutoh)
+
+	* gtk/updateiconcache.c (main): Add a --quiet option.
+
+2005-02-01  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (handle_special, set_shift_vks,
+	reset_after_dead, handle_dead): New functions, code blocks
+	refactored out of update_keymap(). No functionality change.
+
+	(update_keymap): Use ToUnicodeEx() when available (on NT-based
+	Windows) instead of ToAsciiEx(). Makes keyboard input work in
+	Unicode-only input locales that don't have any ANSI codepage, for
+	instance Hindi and Bengali. Use _gdk_input_codepage only on
+	Win9x. (#165723)
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
+	WM_INPUTLANGCHANGE, use GetLocaleInfo() instead of
+	TranslateCharsetInfo() to get the input locale's corresponding
+	codepage, if any.
+
+2005-01-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c: Use NULL, not 0 to terminate 
+	NULL-terminated va lists.  (#165683)
+
+Thu Jan 27 14:25:45 2005  Manish Singh  <yosh@gimp.org>
+
+	* README.cvs-commits: update ancient IRC info.
+
+2005-01-27  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_select_path): Oops, don't assert that we
+	can't reach the end of the function; this happens if we are still
+	loading but don't need a path change.  Fixes #165213.
+
+2005-01-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
+	obey HIG spacing a bit more, add a hand cursor when over the
+	link button.  (#163979, Jorn Baayen)
+
+2005-01-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_class_init): 
+	Don't allow -1 as minimum-key-length.
+	(gtk_entry_completion_set_model): Add missing notification.
+	(gtk_entry_completion_set_minimum_key_length): Add missing
+	notification, allow setting minimum-key-length to 0.  (#165194,
+	Vincent Ladeuil)
+
+2005-01-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c (display_license_dialog): Make sure
+	the license dialog is initially displayed without a horizontal
+	scrollbar.  
+	(gtk_about_dialog_class_init): Document the fact that the 
+	license text is not wrapped.  (#165012, Christian Rose)
+
+2005-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkbutton.c (gtk_button_set_image): Fix docs.  (#165180,
+	Jeff Franks)
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Fix 
+	docs.  (#165163, Jeff Franks)
+
+	* gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
+	for a string GValue.  (#165203, Damon Chaplin)
+
+2005-01-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): 
+	Initialize user_time from DESKTOP_STARTUP_ID.  (#165131,
+	Elijah Newren)
+
+2005-01-24  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c: Removed leftover comments.
+
+2005-01-24  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix #147785 and clean up the loading code:
+
+	* gtk/gtkfilechooserdefault.c (LoadState): Make the set of states
+	be EMPTY, PRELOAD, LOADING, FINISHED.
+	(gtk_file_chooser_default_init): Start in the LOAD_EMPTY state.
+	(struct _GtkFileChooserDefault): Added a pending_select_paths
+	field.
+	(load_remove_timer): Add the new states.
+	(load_setup_timer): Likewise.
+	(load_timeout_cb): Likewise.  Switch to the LOAD_LOADING state.
+	(browse_files_model_finished_loading_cb): Switch to the
+	LOAD_FINISHED state.
+	(enum PendingOp): Removed.
+	(struct _GtkFileChooserDefault): Removed the pending_op and
+	pending_select_path fields.
+	(pending_select_paths_free): New utility function.
+	(pending_select_paths_add): New utility function.
+	(gtk_file_chooser_default_finalize): Call
+	pending_select_paths_free().
+	(pending_op_queue): Removed.
+	(pending_op_process): Removed.
+	(pending_select_paths_process): New function.
+	(browse_files_model_finished_loading_cb): Call
+	pending_select_paths_process().
+	(center_selected_row_foreach_cb): Handle multiple selection by
+	only centering the first row.
+	(get_is_file_filtered): Constify.
+	(gtk_file_chooser_default_select_path): Queue into a list of paths
+	to select if we are not finished loading.
+	(show_and_select_paths): New utility function.
+	(up_folder_handler): Use pending_select_paths_add().
+	(gtk_file_chooser_default_should_respond): Do not call
+	pending_op_queue(); free the pending_selected_paths instead.
+	(gtk_file_chooser_default_initial_focus): Don't queue a pending
+	operation, and don't select the first row unconditionally --- this
+	will happen when the folder is done loading.
+	(shortcuts_row_activated_cb): Free the pending_select_paths.
+	(pending_select_paths_store_selection): New utility function.
+	(gtk_file_chooser_default_map): Call
+	pending_select_paths_store_selection() to save the selection
+	before reloading the folder.
+	(select_func): Umm?  Call gtk_tree_selection_select_iter().  Don't
+	move the cursor here; it will be done when processing the pending paths.
+
+	* tests/testfilechooser.c (main): Add a button to the command
+	window to unmap and remap the file chooser.
+
+2005-01-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_class_init): Document 
+	GtkWidget::style-set.  (#164222, Alex Graveley)
+
+2005-01-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkdisplay.h (gdk_display_add_client_message_filter_full): 
+	Remove the accidentally added prototype for this unimplemented 
+	function.  (#164893, Jeff Franks)
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
+	drags.  (#164884)
+
+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	Merged from HEAD:
+
+	Fix for #162790, by Iwan Wong:
+	
+	* gdk/win32/gdkdrawable-win32.c: Implement dashed lines
+	correctly. Simplify the interface to render_line_horizontal() and
+	render_line_vertical(). Need to draw lines "manually" also on
+	NT-based Windowses if we have a dash offset or are drawing
+	double-dashed lines.
+
+	* gdk/win32/gdkprivate-win32.h: Keep also the dash offset,
+	double-dash flag, and a brush for the background colour (used by
+	the odd dashes in the double-dash line style) in the GdkGCWin32
+	struct.
+
+	* gdk/win32/gdkgc-win32.c: Set up above new fields.
+
+2005-01-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
+	dead accent key. (#164859, reported and fix verified by Daniel
+	Atallah.)
+
+	* gtk/gtkimcontextsimple.c (gtk_compose_seqs): Handle
+	GDK_Greek_accentdieresis (tonos and dialytika) combining with iota
+	and upsilon.
+
+	* gtk/gtkfilesystemwin32.c (gtk_file_system_win32_volume_get_display_name): 
+	Don't call GetVolumeInformation() for network drives. They might
+	be disconnected, and calling GetVolumeInformation() will then
+	cause long delays. (#164448, reported by Dave Neary.) It seems to
+	be very hard to reliably find out whether a network drive is
+	connected or not, so it's easier to just not try getting the
+	volume name for them. See the bug report for discussion.
+
+	Fix for #163702, from Ivan Wong: 
+	
+	* gdk/win32/gdkprivate-win32.h 
+	* gdk/win32/gdkglobals-win32.c: New flag _ignore_destroy_clipboard.
+	
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Handle
+	WM_DESTROYCLIPBOARD. Unless _ignore_destroy_clipboard, generate a
+	GDK_SELECTION_CLEAR event.
+
+	* gdk/win32/gdkselection-win32.c
+	(gdk_selection_owner_set_for_display): Set _ignore_destroy_clipboard
+	when emptying the clipboard ourselves.
+
+	(gdk_selection_send_notify_for_display): Remove the artifical
+	GDK_SELECTION_CLEAR event generation.
+
+2005-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_map): Don't loop forever
+	here, even if the only focusable widgets are labels.
+
+	* gtk/gtkmodules.c (load_module): Don't reverse the order
+	of modules when putting them in gtk_modules.  (#162676, Dennis
+	Cranston, patch by Remus Draica)
+	
+	* gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash 
+	if the tree is empty.  (#164669, Priit Laes)
+
+Wed Jan 19 18:57:02 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call
+	GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the
+	function a bit too.
+
+Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash
+	strict aliasing warning in _NET_VIRTUAL_ROOTS code.
+
+2005-01-19  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap,
+	gdk_keymap_translate_keyboard_state): Handle keyboards with
+	ShiftLock (and not CapsLock) correctly. (#161814)
+
+2005-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
+	In save mode, don't return paths containing nonexisting 
+	directories.  (#162443, Jean Marie Favreau)
+
+	* gtk/gtkobject.c (gtk_object_add_arg_type): Use GLib limit 
+	macros to avoid sparse warnings. Pointed out by Kjartan Maraas.
+
+	* gdk/x11/gdkdisplay-x11.c: Precache the _NET_VIRTUAL_ROOTS
+	atom.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): 
+	Support _NET_VIRTUAL_ROOTS.  (#163910, Carsten Haitzler)
+
+Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign
+	PENDING_OP_NONE.
+
+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+	disambiguate nested if/else.
+
+2005-01-18  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
+	operation to select the first file if we are in SAVE or
+	CREATE_FOLDER modes.  Executing that operation would overwrite the
+	contents of the save-name entry.
+
+2005-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkstyle.c (gtk_default_draw_check) 
+	(gtk_default_draw_option, gtk_default_draw_handle): Add some
+	more NULL checks, patch by Michael Natterer.
+
+Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
+	and NULL widget.
+
+	* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
+	NULL widget.  (#164477, Michael Natterer)
+
+2005-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	Avoid X errors when running against servers which
+	implement XRender < 0.4.  (#164427, Albert Chin)
+	
+	* gdk/x11/gdkprivate-x11.h:
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+	New function to check for trapezoid support in XRender.
+	(gdk_x11_draw_trapezoids, _gdk_x11_drawable_draw_xtrapezoids): 
+	Use it here.
+	
+	* gdk/x11/gdkdisplay-x11.h (struct _GdkDisplayX11): Add a 
+	separate have_render_with_trapezoids field.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize it.
+
+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c: Remove debug output. (#164376, Jens Finke)
+
+2005-01-17  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from HEAD:
+
+	Fix #162617.
+
+	* gtk/gtkfilesystemunix.c (STAT_NEEDED_MASK): Take out
+	GTK_FILE_INFO_IS_HIDDEN; we don't need to stat() to know this.
+	(gtk_file_system_unix_get_folder): Make error reporting more
+	accurate.  Don't bail out if we can't read the directory.
+	(fill_in_stats): Don't return an error; just assume we don't have
+	stat info for this folder's files.
+	(fill_in_names): Don't create the hash table for the names if we
+	can't open the directory.
+	(gtk_file_folder_unix_list_children): Don't emit the
+	"finished-loading" signal --- we don't do asynchronous loads, so
+	we are always finished loading.
+	(gtk_file_folder_unix_get_info): Use helper functions; handle the
+	case where we can't stat '/'.
+	(get_icon_type_from_path): Don't call fill_in_stats() here; only
+	use the info we have.
+	(fill_in_mime_type): Don't return an error.  Don't do anything if
+	we don't have the stat info.
+
+2005-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_add_bookmarks): Save
+	and restore the selected row in the bookmark list and the
+	save folder combo.  (#164290)
+
+2005-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_new_with_backend):
+	Fix argument order in docs.  
+
+2005-01-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_check_keymap_direction): 
+	* gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL 
+	if the keymap is neutral.  (#164125, Phil Blundell)
+
+2005-01-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* gdk/Makefile.am (TESTS):
+	* gdk-pixbuf/Makefile.am (TESTS):
+	* gtk/Makefile.am (TESTS): Only run abicheck on Linux.  (#163917,
+	Roger Leigh)
+
+2005-01-13  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
+	(gtk_tree_view_set_headers_clickable): Make the headers-visible
+	property readwrite instead of just writable, and remove the
+	g_return_if_fail check that there is a model when setting this
+	property.  (#163851, Richard Hult)
+
+2005-01-10  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Adding missing ChangeLog.pre*
+	to EXTRA_DIST.
+
 2005-01-10  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkaccelgroup.c (gtk_accel_group_class_init): Document
@@ -18,8 +18,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================

-  % gzip -cd gtk+-2.6.1.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.6.1			   # change to the toplevel directory
+  % gzip -cd gtk+-2.6.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.6.2			   # change to the toplevel directory
  % ./configure				   # run the `configure' script
  % make				   # build GTK
  [ Become root if necessary ]
@@ -13,6 +13,9 @@ EXTRA_DIST =			\
 	ChangeLog.pre-1-0	\
 	ChangeLog.pre-1-2	\
 	ChangeLog.pre-2-0	\
+	ChangeLog.pre-2-2	\
+	ChangeLog.pre-2-4	\
+	ChangeLog.pre-2-6	\
 	README.cvs-commits	\
 	README.win32		\
 	config.h.win32		\
@@ -1,3 +1,37 @@
+Overview of Changes from GTK+ 2.6.1 to GTK+ 2.6.2
+=================================================
+* Speed up size allocation of labels, progress bars and
+  text cell renderers [Anders Carlsson]
+* Add a --quiet option to gtk-update-icon-cache [Matthias]
+* GtkFileChooser
+ - Bug fixes [Federico Mena Quintero]
+ - Don't overwrite the contents of the name entry 
+   when changing folders in save mode.  [Federico]
+ - Don't return nonexisting folders in save mode [Jean Marie Favreau]
+ - Fix a size allocation loop [Milosz Derezynski, Robert Ögren]
+* GtkAboutDialog
+ - Better HIG compliance [Jorn Baayen]
+* GDK
+ - Work with Xservers implementing old versions
+   of the Render extension [Albert Chin]
+ - Respect _NET_VIRTUAL_ROOTS [Carsten Haitzler]
+* Win32
+ - Bug fixes [Tor Lillqvist, Ivan Wong, David Neary, Daniel Atallah,
+   Takuro Ashie]
+ - Make keyboard input work in Indic languages [Tor]
+ - Initialize extended input devices lazily  [Robert Ögren]
+* Other bug fixes [Owen Taylor, Richard Hult, Phil Blundell,
+  Jens Finke, Michael Natterer, Manish Singh, Kjartan Maraas,
+  Priit Laes, Dennis Cranston, Remus Draica, Matthias,
+  Jeff Franks, Elijah Newren, Damon Chaplin, Vincent Ladeuil,
+  Carlos Garnacho Parro, Thomas Zajic, Crispin Flowerday,
+  Tommi Komulainen, Søren Sandmann, Chris Lee, Mark McLoughlin]
+* Documentation improvements [Murray Cumming, Matthias, Alex Graveley,
+  Jeff Franks, Christian Rose, Masao Mutoh, Karel Kulhavy, Roger 
+  Light]
+* New and improved translations (bg,ca,cs,cy,da,de,el,en_CA,es,et,hu,it,
+  ja,ko,lt,nb,nl,nn,no,pl,pt,pt_BR,sk,sq,sv,zh_CN)
+
 Overview of Changes from GTK+ 2.6.0 to GTK+ 2.6.1
 =================================================
 * GtkFileChooser
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 2.6.1. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.6.2. GTK+ is a multi-platform toolkit for
 creating graphical user interfaces. Offering a complete set of widgets,
 GTK+ is suitable for projects ranging from small one-off projects to
 complete application suites.
@@ -18,10 +18,10 @@ to ask people commiting to GTK+ to follow a few rules:
   gtk-devel-list-request@gnome.org.) This is a good place to ask
   about intended changes. 

-   #gimp on byxnet (irc.gimp.org, irc2.gimp.org, irc3.gimp.org, 
-   irc.germany.gimp.org...)s also a good place to find GTK+ developers to
-   discuss changes with, however, email to gtk-devel-list is the most
-   certain and preferred method.
+   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
+   is also a good place to find GTK+ developers to discuss changes with,
+   however, email to gtk-devel-list is the most certain and preferred
+   method.

 1) Ask _first_.

@@ -30,7 +30,7 @@ m4_define([gtk_binary_version], [2.4.0])

 # required versions of other packages
 m4_define([glib_required_version], [2.6.0])
-m4_define([pango_required_version], [1.7.0])
+m4_define([pango_required_version], [1.8.0])
 m4_define([atk_required_version], [1.0.1])


@@ -123,6 +123,11 @@ case "$host" in
 esac
 AC_MSG_RESULT([$os_win32])

+case $host in
+  *-*-linux*)
+    os_linux=yes
+    ;;
+esac
 dnl Initialize libtool
 AC_PROG_CC
 AM_DISABLE_STATIC
@@ -162,6 +167,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")

 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
+AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")

 if test "$os_win32" = "yes"; then
  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
@@ -1,3 +1,7 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>

 	* === Released 2.6.1 ===
@@ -1,392 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <gtk/gtk.h>
-
-#include <demos.h>
-
-static GtkTextBuffer *info_buffer;
-static GtkTextBuffer *source_buffer;
-
-static gchar *current_file = NULL;
-
-enum {
-  TITLE_COLUMN,
-  FILENAME_COLUMN,
-  FUNC_COLUMN,
-  ITALIC_COLUMN,
-  NUM_COLUMNS
-};
-
-gboolean
-read_line (FILE *stream, GString *str)
-{
-  int n_read = 0;
-  
-  flockfile (stream);
-
-  g_string_truncate (str, 0);
-  
-  while (1)
-    {
-      int c;
-      
-      c = getc_unlocked (stream);
-
-      if (c == EOF)
-	goto done;
-      else
-	n_read++;
-
-      switch (c)
-	{
-	case '\r':
-	case '\n':
-	  {
-	    int next_c = getc_unlocked (stream);
-	    
-	    if (!(next_c == EOF ||
-		  (c == '\r' && next_c == '\n') ||
-		  (c == '\n' && next_c == '\r')))
-	      ungetc (next_c, stream);
-	    
-	    goto done;
-	  }
-	default:
-	  g_string_append_c (str, c);
-	}
-    }
-
- done:
-
-  funlockfile (stream);
-
-  return n_read > 0;
-}
-
-void
-load_file (const gchar *filename)
-{
-  FILE *file;
-  GtkTextIter start, end;
-  GString *buffer = g_string_new (NULL);
-  int state = 0;
-  gboolean in_para = 0;
-
-  if (current_file && !strcmp (current_file, filename))
-    return;
-
-  g_free (current_file);
-  current_file = g_strdup (filename);
-  
-  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
-  gtk_text_buffer_delete (info_buffer, &start, &end);
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_delete (source_buffer, &start, &end);
-
-  file = fopen (filename, "r");
-  if (!file)
-    {
-      g_warning ("Cannot open %s: %s\n", filename, g_strerror (errno));
-      return;
-    }
-
-  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  while (read_line (file, buffer))
-    {
-      gchar *p = buffer->str;
-      gchar *q;
-      
-      switch (state)
-	{
-	case 0:
-	  /* Reading title */
-	  while (*p == '/' || *p == '*' || isspace (*p))
-	    p++;
-	  q = p + strlen (p);
-	  while (q > p && isspace (*(q - 1)))
-	    q--;
-
-	  if (q > p)
-	    {
-	      int len_chars = g_utf8_pointer_to_offset (p, q);
-
-	      end = start;
-
-	      g_assert (strlen (p) >= q - p);
-	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
-	      start = end;
-
-	      gtk_text_iter_backward_chars (&start, len_chars);
-	      gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);
-
-	      start = end;
-	      
-	      state++;
-	    }
-	  break;
-	    
-	case 1:
-	  /* Reading body of info section */
-	  while (isspace (*p))
-	    p++;
-	  if (*p == '*' && *(p + 1) == '/')
-	    {
-	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-	      state++;
-	    }
-	  else
-	    {
-	      int len;
-	      
-	      while (*p == '*' || isspace (*p))
-		p++;
-
-	      len = strlen (p);
-	      while (isspace (*(p + len - 1)))
-		len--;
-	      
-	      if (len > 0)
-		{
-		  if (in_para)
-		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
-
-		  g_assert (strlen (p) >= len);
-		  gtk_text_buffer_insert (info_buffer, &start, p, len);
-		  in_para = 1;
-		}
-	      else
-		{
-		  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-		  in_para = 0;
-		}
-	    }
-	  break;
-
-	case 2:
-	  /* Skipping blank lines */
-	  while (isspace (*p))
-	    p++;
-	  if (*p)
-	    {
-	      p = buffer->str;
-	      state++;
-	      /* Fall through */
-	    }
-	  else
-	    break;
-	  
-	case 3:
-	  /* Reading program body */
-	  gtk_text_buffer_insert (source_buffer, &start, p, -1);
-	  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-	  break;
-	}
-    }
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
-}
-
-gboolean
-button_press_event_cb (GtkTreeView    *tree_view,
-		       GdkEventButton *event,
-		       GtkTreeModel   *model)
-{
-  if (event->type == GDK_2BUTTON_PRESS)
-    {
-      GtkTreePath *path = NULL;
-
-      gtk_tree_view_get_path_at_pos (tree_view,
-				     event->window,
-				     event->x,
-				     event->y,
-				     &path,
-				     NULL);
-
-      if (path)
-	{
-	  GtkTreeIter iter;
-	  gboolean italic;
-	  GVoidFunc func;
-
-	  gtk_tree_model_get_iter (model, &iter, path);
-	  gtk_tree_store_get (GTK_TREE_STORE (model),
-			      &iter,
-			      FUNC_COLUMN, &func,
-			      ITALIC_COLUMN, &italic,
-			      -1);
-	  (func) ();
-	  gtk_tree_store_set (GTK_TREE_STORE (model),
-			      &iter,
-			      ITALIC_COLUMN, !italic,
-			      -1);
-	  gtk_tree_path_free (path);
-	}
-
-      gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
-				    "button_press_event");
-      return TRUE;
-    }
-  
-  return FALSE;
-}
-
-static void
-selection_cb (GtkTreeSelection *selection,
-	      GtkTreeModel     *model)
-{
-  GtkTreeIter iter;
-  GValue value = {0, };
-
-  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
-    return;
-
-  gtk_tree_model_get_value (model, &iter,
-			    FILENAME_COLUMN,
-			    &value);
-  load_file (g_value_get_string (&value));
-  g_value_unset (&value);
-}
-
-static GtkWidget *
-create_text (GtkTextBuffer **buffer,
-	     gboolean        is_source)
-{
-  GtkWidget *scrolled_window;
-  GtkWidget *text_view;
-  PangoFontDescription *font_desc;
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-				       GTK_SHADOW_IN);
-  
-  text_view = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-  
-  *buffer = gtk_text_buffer_new (NULL);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), *buffer);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
-
-  if (is_source)
-    {
-      font_desc = pango_font_description_from_string ("Courier 10");
-      gtk_widget_modify_font (text_view, font_desc);
-      pango_font_description_free (font_desc);
-    }
-  
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), !is_source);
-  
-  return scrolled_window;
-}
-
-/* Technically a list, but if we do go to 80 demos, we may want to move to a tree */
-static GtkWidget *
-create_tree (void)
-{
-  GtkTreeSelection *selection;
-  GtkCellRenderer *cell;
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-  gint i;
-
-  model = gtk_tree_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
-  tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-
-  gtk_tree_selection_set_type (GTK_TREE_SELECTION (selection),
-			       GTK_TREE_SELECTION_SINGLE);
-  gtk_widget_set_usize (tree_view, 200, -1);
-
-  for (i=0; i < G_N_ELEMENTS (testgtk_demos); i++)
-    {
-      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  TITLE_COLUMN, testgtk_demos[i].title,
-			  FILENAME_COLUMN, testgtk_demos[i].filename,
-			  FUNC_COLUMN, testgtk_demos[i].func,
-			  ITALIC_COLUMN, FALSE,
-			  -1);
-    }
-
-  cell = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Widget",
-						     cell,
-						     "text", TITLE_COLUMN,
-						     "italic", ITALIC_COLUMN,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-			       GTK_TREE_VIEW_COLUMN (column));
-
-  gtk_signal_connect (GTK_OBJECT (selection), "selection_changed", selection_cb, model);
-  gtk_signal_connect (GTK_OBJECT (tree_view), "button_press_event", GTK_SIGNAL_FUNC (button_press_event_cb), model);
-
-  return tree_view;
-}
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *notebook;
-  GtkWidget *hbox;
-  GtkWidget *tree;
-  GtkTextTag *tag;
-
-  gtk_init (&argc, &argv);
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
-
-  tree = create_tree ();
-  gtk_box_pack_start (GTK_BOX (hbox), tree, FALSE, FALSE, 0);
-
-  notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&info_buffer, FALSE),
-			    gtk_label_new ("Info"));
-
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&source_buffer, TRUE),
-			    gtk_label_new ("Source"));
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  gtk_object_set (GTK_OBJECT (tag),
-		 "font", "Sans 18",
-		 NULL);
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  gtk_object_set (GTK_OBJECT (tag),
-		  "font", "Courier 10",
-		  "pixels_above_lines", 0,
-		  "pixels_below_lines", 0,
-		 NULL);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  gtk_widget_show_all (window);
-  
-
-  load_file (testgtk_demos[0].filename);
-  
-  gtk_main ();
-
-  return 0;
-}
@@ -1,3 +1,29 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
+2005-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/tmpl/event_structs.sgml: 
+	* gdk/tmpl/events.sgml: Mark GdkEventOwnerChange and
+	GdkOwnerChange as 2.6 additions.  (#165823, Masao Mutoh)
+
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-update-icon-cache.xml:
+	* gtk/gtk-update-icon-cache.1: Document the --quiet option.
+
+2005-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtksocket.sgml: 
+	* gtk/tmpl/gtkplug.sgml: Add note on limited
+	availability.  (#164347, Roger Light)
+	
+2005-01-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/building.sgml: Some updates.  (#164147, #164108, 
+	Karel Kulhavy)
+
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>

 	* === Released 2.6.1 ===
@@ -419,6 +419,7 @@ only available if the X server supports the XFIXES extension.
@selection: the atom identifying the selection
@time: the timestamp of the event
@selection_time: the time at which the selection ownership was taken over
+@Since: 2.6

 <!-- ##### ENUM GdkScrollDirection ##### -->
 <para>
@@ -84,7 +84,8 @@ when parts of a drawable were copied. This is not very useful.
@GDK_SCROLL: 
@GDK_WINDOW_STATE: 
@GDK_SETTING: 
-@GDK_OWNER_CHANGE: 
+@GDK_OWNER_CHANGE: the owner of a selection has changed. This event type
+  was added in 2.6

 <!-- ##### ENUM GdkEventMask ##### -->
 <para>
@@ -98,8 +98,8 @@ How to compile GTK+ itself
      a search path that <command>pkg-config</command> (see below)
      uses when looking for for file describing how to compile
      programs using different libraries. If you were installing GTK+
-      and it's dependencies into <filename>/opt/gtk</filename>, you might want to set
-      these variables as:
+      and it's dependencies into <filename>/opt/gtk</filename>, you 
+      might want to set these variables as:
    </para>
    <programlisting>
      CPPFLAGS="-I/opt/gtk/include"
@@ -137,12 +137,12 @@ How to compile GTK+ itself
 	  url="http://www.freedesktop.org/software/pkgconfig">pkg-config</ulink>
 	  is a tool for tracking the compilation flags needed for
 	  libraries that are used by the GTK+ libraries. (For each
-	  library, a small <literal>.pc</literal> text file is installed in a standard
-	  location that contains the compilation flags needed for that
-	  library along with version number information.)  The version
-	  of <command>pkg-config</command> needed to build GTK+ is
-	  mirrored in the <filename>dependencies</filename> directory
-	  on the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+ FTP
+	  library, a small <literal>.pc</literal> text file is installed 
+          in a standard location that contains the compilation flags 
+          needed for that library along with version number information.)  
+          The version of <command>pkg-config</command> needed to build 
+          GTK+ is mirrored in the <filename>dependencies</filename> directory
+	  on the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP
 	  site.</ulink>
 	</para>
      </listitem>
@@ -169,7 +169,7 @@ How to compile GTK+ itself
 	  The GLib library provides core non-graphical functionality
 	  such as high level data types, Unicode manipulation, and
 	  an object and type system to C programs. It is available
-	  from the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+
+	  from the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+
 	  FTP site.</ulink>
 	</para>
      </listitem>
@@ -177,9 +177,8 @@ How to compile GTK+ itself
 	<para>
 	  <ulink url="http://www.pango.org">Pango</ulink> is a library
 	  for internationalized text handling. It is available from
-	  the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+ FTP
-	  site.</ulink>. Either Pango-1.0 or Pango-1.2 can be used
-	  with GTK+-2.2, though Pango-1.2 is recommended.
+	  the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP
+	  site.</ulink>. GTK+ 2.6 requires Pango 1.8.
 	</para>
      </listitem>
      <listitem>
@@ -188,7 +187,7 @@ How to compile GTK+ itself
 	  interfaces allowing accessibility technologies such as
 	  screen readers to interact with a graphical user interface.
 	  It is available from the <ulink
-	  url="ftp://ftp.gtk.org/pub/gtk/v2.2/">GTK+ FTP site.</ulink>
+	  url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP site.</ulink>
 	</para>
      </listitem>
      <listitem>
@@ -215,11 +214,12 @@ How to compile GTK+ itself
 	  The <ulink
 	    url="ftp://ftp.uu.net/graphics/jpeg/">JPEG</ulink>,
 	  <ulink url="http://www.libpng.org">PNG</ulink>, and
-	  <ulink url="http://www.libtiff.org">TIFF</ulink> image loading libraries are needed to
-	  compile GTK+. You probably already have these libraries
-	  installed, but if not, the versions you need are available in
-	  the <filename>dependencies</filename> directory on the the
-	  <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.2/dependencies/">GTK+
+	  <ulink url="http://www.libtiff.org">TIFF</ulink> image 
+          loading libraries are needed to compile GTK+. You probably 
+          already have these libraries installed, but if not, the 
+          versions you need are available in the 
+           <filename>dependencies</filename> directory on the the
+	  <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/dependencies/">GTK+
 	    FTP site.</ulink>. (Before installing these libraries
 	  from source, you should check if your operating system
 	  vendor has prebuilt packages of these libraries that you
@@ -239,13 +239,14 @@ How to compile GTK+ itself
 	<para>
 	  The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
 	  library provides Pango with a standard way of locating
-	  fonts and matching them against font names. The Xft2
+	  fonts and matching them against font names. The 
+          <ulink url="http://www.freedesktop.org/wiki/Software/Xft">Xft2</ulink>
 	  library, distributed with fontconfig, provides support for
 	  scalable and antialiased fonts on X. Pango includes two
 	  backends that work on top of fontconfig: an Xft2 backend
 	  and a backend that uses fontconfig and the underlying
-	  <ulink url="http://www.freetype.org">FreeType
-	  library</ulink> directly. Neither backend is mandatory, but the
+	  <ulink url="http://www.freetype.org">FreeType</ulink>
+	  library directly. Neither backend is mandatory, but the
 	  Xft2 backend is the preferred backend for X and the FreeType
 	  backend is needed by many applications.
 	</para>
@@ -24,7 +24,7 @@ gtk-update-icon-cache \- Icon theme caching utility
 .ad l
 .hy 0
 .HP 22
-\fBgtk\-update\-icon\-cache\fR [\-\-force] {iconpath}
+\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-quiet] {iconpath}
 .ad
 .hy

@@ -39,8 +39,15 @@ If expects to be given the path to a icon theme directory, e\&.g\&. \fI/usr/shar
 .PP
 GTK+ can use the cache files created by \fBgtk\-update\-icon\-cache\fR to avoid a lot of system call and disk seek overhead when the application starts\&. Since the format of the cache files allows them to be mmap()ed shared between multiple applications, the overall memory consumption is reduced as well\&.

-.PP
-If called with the \-\-force argument, \fBgtk\-update\-icon\-cache\fR will overwrite an existing cache file even if it appears to be uptodate\&.
+.SH "OPTIONS"
+
+.TP
+\-\-force, \-f
+Overwrite an existing cache file even if it appears to be uptodate\&.
+
+.TP
+\-\-quiet, \-q
+Turn off verbose output\&.

 .SH "BUGS"

@@ -14,6 +14,7 @@
 <cmdsynopsis>
 <command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
+<arg choice="opt">--quiet</arg>
 <arg choice="req">iconpath</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -35,11 +36,23 @@ to avoid a lot of system call and disk seek overhead when the application starts
 Since the format of the cache files allows them to be mmap()ed shared between
 multiple applications, the overall memory consumption is reduced as well.
 </para>
-<para>
-If called with the --force argument, 
-<command>gtk-update-icon-cache</command> will overwrite an existing cache
-file even if it appears to be uptodate.
-</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--force</term>
+    <term>-f</term>
+    <listitem><para>Overwrite an existing cache file even if it appears to be uptodate.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>--quiet</term>
+    <term>-q</term>
+    <listitem><para>Turn off verbose output. 
+    </para></listitem>
+  </varlistentry>
+</variablelist>
 </refsect1>

 <refsect1><title>Bugs</title>
@@ -1466,6 +1466,30 @@ If the window shrinks automatically when widgets within it shrink.
 </para>


+<!-- ##### FUNCTION gtk_about_dialog_get_artists ##### -->
+<para>
+
+</para>
+
+@about: 
+@Returns: 
+
+<!-- ##### FUNCTION gtk_about_dialog_get_authors ##### -->
+<para>
+
+</para>
+
+@about: 
+@Returns: 
+
+<!-- ##### FUNCTION gtk_about_dialog_get_documenters ##### -->
+<para>
+
+</para>
+
+@about: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_accel_group_add ##### -->
 <para>

@@ -245,15 +245,6 @@ only private fields and should not be directly accessed.
@website_label: 


-<!-- ##### FUNCTION gtk_about_dialog_get_authors ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_about_dialog_set_authors ##### -->
 <para>

@@ -263,15 +254,6 @@ only private fields and should not be directly accessed.
@authors: 


-<!-- ##### FUNCTION gtk_about_dialog_get_artists ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_about_dialog_set_artists ##### -->
 <para>

@@ -281,15 +263,6 @@ only private fields and should not be directly accessed.
@artists: 


-<!-- ##### FUNCTION gtk_about_dialog_get_documenters ##### -->
-<para>
-
-</para>
-
-@about: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_about_dialog_set_documenters ##### -->
 <para>

@@ -15,6 +15,12 @@ which then creates a #GtkPlug with that window ID.
 Any widgets contained in the #GtkPlug then will appear
 inside the first applications window.
 </para>
+<note>
+<para>
+The #GtkPlug and #GtkSocket widgets are currently not available 
+on all platforms supported by GTK+.
+</para>
+</note>

 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -75,6 +75,13 @@ pre-existing top-level windows using gtk_socket_steal(),
 though the integration when this is done will not be as close
 as between a #GtkPlug and a #GtkSocket.</para>

+<note>
+<para>
+The #GtkPlug and #GtkSocket widgets are currently not available 
+on all platforms supported by GTK+.
+</para>
+</note>
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 <variablelist>
@@ -1,3 +1,14 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
+2005-01-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_type) 
+	(gdk_pixbuf_loader_new_with_mime_type): Close the loader
+	before unreffing it in the error case.  (#164915, Crispin 
+	Flowerday)
+
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>

 	* === Released 2.6.1 ===
@@ -52,7 +52,7 @@ gdk_pixbuf.def: gdk-pixbuf.symbols
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
 	 $(PERL) $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h

-if OS_UNIX
+if OS_LINUX
 TESTS = abicheck.sh
 endif

@@ -564,6 +564,7 @@ gdk_pixbuf_loader_new_with_type (const char *image_type,
        if (tmp != NULL)
                {
                        g_propagate_error (error, tmp);
+                        gdk_pixbuf_loader_close (retval, NULL);
                        g_object_unref (retval);
                        return NULL;
                }
@@ -619,10 +620,11 @@ gdk_pixbuf_loader_new_with_mime_type (const char *mime_type,
        retval = g_object_new (GDK_TYPE_PIXBUF_LOADER, NULL);

        tmp = NULL;
-        gdk_pixbuf_loader_load_module(retval, image_type, &tmp);
+        gdk_pixbuf_loader_load_module (retval, image_type, &tmp);
        if (tmp != NULL)
                {
                        g_propagate_error (error, tmp);
+                        gdk_pixbuf_loader_close (retval, NULL);
                        g_object_unref (retval);
                        return NULL;
                }
@@ -610,7 +610,7 @@ MODULE_ENTRY (tiff, fill_info) (GdkPixbufFormat *info)
 	info->description = N_("The TIFF image format");
 	info->mime_types = mime_types;
 	info->extensions = extensions;
-        /* not threadsafe, due the the error handler handling */
+        /* not threadsafe, due to the error handler handling */
 	info->flags = 0;
 	info->license = "LGPL";
 }
@@ -182,7 +182,7 @@ gdk.def: gdk.symbols
 gdkalias.h: gdk.symbols
 	 $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h

-if OS_UNIX
+if OS_LINUX
 TESTS = abicheck.sh
 endif

@@ -131,11 +131,6 @@ void gdk_display_add_client_message_filter (GdkDisplay   *display,
 					    GdkAtom       message_type,
 					    GdkFilterFunc func,
 					    gpointer      data);
-void gdk_display_add_client_message_filter_full (GdkDisplay    *display,
-						 GdkAtom        message_type,
-						 GdkFilterFunc  func,
-						 gpointer       data,
-						 GDestroyNotify destroy);

 void gdk_display_set_double_click_time     (GdkDisplay   *display,
 					    guint         msec);
@@ -873,7 +873,7 @@ gdk_event_set_screen (GdkEvent  *event,
 * Returns the screen for the event. The screen is
 * typically the screen for <literal>event->any.window</literal>, but
 * for events such as mouse events, it is the screen
- * where the the pointer was when the event occurs -
+ * where the pointer was when the event occurs -
 * that is, the screen which has the root window 
 * to which <literal>event->motion.x_root</literal> and
 * <literal>event->motion.y_root</literal> are relative.
@@ -35,7 +35,7 @@

 /* Key handling not part of the keymap */

-static struct gdk_key {
+static const struct gdk_key {
  guint keyval;
  const char *name;
 } gdk_keys_by_keyval[] = {
@@ -1312,7 +1312,7 @@ gdk_rgb_convert_gray8_gray (GdkRgbInfo *image_info, GdkImage *image,
 #ifdef HAIRY_CONVERT_565
 /* Render a 24-bit RGB image in buf into the GdkImage, without dithering.
   This assumes native byte ordering - what should really be done is to
-   check whether the the image byte_order is consistent with the _ENDIAN
+   check whether the image byte_order is consistent with the _ENDIAN
   config flag, and if not, use a different function.

   This one is even faster than the one below - its inner loop loads 3
@@ -239,20 +239,35 @@ gdk_win32_set_colormap (GdkDrawable *drawable,
 /* Drawing
 */

-/*
- * Render a dashed line 'by hand' cause the Win9x GDI is 
- * too limited to do so
+static DWORD default_double_dashes[] = { 3, 3 };
+
+/* Render a dashed line 'by hand'. Used for all dashes on Win9x (where
+ * GDI is way too limited), and for double dashes on all Windowses.
 */
 static inline gboolean
-render_line_horizontal (HDC    hdc,
+render_line_horizontal (GdkGCWin32 *gcwin32,
                        int    x1, 
                        int    x2,
-                        int    y,
-                        int    pen_width,
-                        DWORD *dashes,
-                        int    num_dashes)
+                        int    y)
 {
-  int n;
+  int	  n;
+  HDC	  hdc = gcwin32->hdc;
+  int	  pen_width = gcwin32->pen_width;
+  DWORD	  *dashes;
+  int	  num_dashes;
+  int	  _x1 = x1;
+
+  if (gcwin32->pen_dashes)
+    {
+      dashes = gcwin32->pen_dashes;
+      num_dashes = gcwin32->pen_num_dashes;
+      x1 += gcwin32->pen_dash_offset;
+    }
+  else
+    {
+      dashes = default_double_dashes;
+      num_dashes = G_N_ELEMENTS (default_double_dashes);
+    }

  for (n = 0; x1 < x2; n++)
    {
@@ -269,19 +284,60 @@ render_line_horizontal (HDC    hdc,
      x1 += dashes[n % num_dashes];
    }

+  if (gcwin32->pen_double_dash)
+    {
+      HBRUSH hbr;
+
+      if ((hbr = SelectObject (hdc, gcwin32->pen_hbrbg)) == HGDI_ERROR)
+	return FALSE;
+      x1 = _x1;
+      if (gcwin32->pen_dashes)
+	x1 += gcwin32->pen_dash_offset;
+      for (n = 0; x1 < x2; n++)
+	{
+	  int len = dashes[n % num_dashes];
+	  if (x1 + len > x2)
+	    len = x2 - x1;
+
+	  if (n % 2)
+	    if (!GDI_CALL (PatBlt, (hdc, x1, y - pen_width / 2,
+				    len, pen_width,
+				    PATCOPY)))
+	      return FALSE;
+
+	  x1 += dashes[n % num_dashes];
+	}
+      if (SelectObject (hdc, hbr) == HGDI_ERROR)
+	return FALSE;
+    }
+
  return TRUE;
 }

 static inline gboolean
-render_line_vertical (HDC    hdc,
+render_line_vertical (GdkGCWin32 *gcwin32,
 		      int    x, 
                      int    y1,
-                      int    y2,
-                      int    pen_width,
-                      DWORD *dashes,
-		      int    num_dashes)
+                      int    y2)
 {
-  int n;
+  int	  n;
+  HDC	  hdc = gcwin32->hdc;
+  int	  pen_width = gcwin32->pen_width;
+  DWORD	  *dashes;
+  int	  num_dashes;
+  int	  _y1 = y1;
+
+  if (gcwin32->pen_dashes)
+    {
+      dashes = gcwin32->pen_dashes;
+      num_dashes = gcwin32->pen_num_dashes;
+      y1 += gcwin32->pen_dash_offset;
+    }
+  else
+    {
+      dashes = default_double_dashes;
+      num_dashes = G_N_ELEMENTS (default_double_dashes);
+    }

  for (n = 0; y1 < y2; n++)
    {
@@ -297,6 +353,32 @@ render_line_vertical (HDC    hdc,
      y1 += dashes[n % num_dashes];
    }

+  if (gcwin32->pen_double_dash)
+    {
+      HBRUSH hbr;
+
+      if ((hbr = SelectObject (hdc, gcwin32->pen_hbrbg)) == HGDI_ERROR)
+	return FALSE;
+      y1 = _y1;
+      if (gcwin32->pen_dashes)
+	y1 += gcwin32->pen_dash_offset;
+      for (n = 0; y1 < y2; n++)
+	{
+	  int len = dashes[n % num_dashes];
+	  if (y1 + len > y2)
+	    len = y2 - y1;
+	  if (n % 2)
+	    if (!GDI_CALL (PatBlt, (hdc, x - pen_width / 2, y1,
+				    pen_width, len,
+				    PATCOPY)))
+	      return FALSE;
+
+	  y1 += dashes[n % num_dashes];
+	}
+      if (SelectObject (hdc, hbr) == HGDI_ERROR)
+	return FALSE;
+    }
+
  return TRUE;
 }

@@ -736,24 +818,14 @@ draw_rectangle (GdkGCWin32 *gcwin32,
  x -= x_offset;
  y -= y_offset;

-  if (!filled && gcwin32->pen_dashes && !G_WIN32_IS_NT_BASED ())
+  if (!filled && (gcwin32->pen_double_dash ||
+                  (gcwin32->pen_dashes && (gcwin32->pen_dash_offset ||
+					   !G_WIN32_IS_NT_BASED ()))))
    {
-      render_line_vertical (hdc, x, y, y+height+1,
-			    gcwin32->pen_width,
-			    gcwin32->pen_dashes,
-			    gcwin32->pen_num_dashes) &&
-      render_line_horizontal (hdc, x, x+width+1, y,
-			      gcwin32->pen_width,
-			      gcwin32->pen_dashes,
-			      gcwin32->pen_num_dashes) &&
-      render_line_vertical (hdc, x+width+1, y, y+height+1,
-			    gcwin32->pen_width,
-			    gcwin32->pen_dashes,
-			    gcwin32->pen_num_dashes) &&
-      render_line_horizontal (hdc, x, x+width+1, y+height+1,
-			      gcwin32->pen_width,
-			      gcwin32->pen_dashes,
-			      gcwin32->pen_num_dashes);
+      render_line_vertical (gcwin32, x, y, y+height+1) &&
+      render_line_horizontal (gcwin32, x, x+width+1, y) &&
+      render_line_vertical (gcwin32, x+width+1, y, y+height+1) &&
+      render_line_horizontal (gcwin32, x, x+width+1, y+height+1);
    }
  else
    {
@@ -796,7 +868,8 @@ gdk_win32_draw_rectangle (GdkDrawable *drawable,
  region = widen_bounds (&bounds, GDK_GC_WIN32 (gc)->pen_width);

  generic_draw (drawable, gc,
-		GDK_GC_FOREGROUND | (filled ? 0 : LINE_ATTRIBUTES),
+		GDK_GC_FOREGROUND | GDK_GC_BACKGROUND |
+		(filled ? 0 : LINE_ATTRIBUTES),
 		draw_rectangle, region, filled, x, y, width, height);

  gdk_region_destroy (region);
@@ -1196,7 +1269,9 @@ draw_segments (GdkGCWin32 *gcwin32,
        }
    }

-  if (gcwin32->pen_dashes && !G_WIN32_IS_NT_BASED ())
+  if (gcwin32->pen_double_dash ||
+      (gcwin32->pen_dashes && (gcwin32->pen_dash_offset ||
+			       !G_WIN32_IS_NT_BASED ())))
    {
      for (i = 0; i < nsegs; i++)
 	{
@@ -1209,11 +1284,7 @@ draw_segments (GdkGCWin32 *gcwin32,
 	      else
 		y1 = segs[i].y2, y2 = segs[i].y1;
 	      
-	      render_line_vertical (hdc,
-				    segs[i].x1, y1, y2,
-				    gcwin32->pen_width,
-				    gcwin32->pen_dashes,
-				    gcwin32->pen_num_dashes);
+	      render_line_vertical (gcwin32, segs[i].x1, y1, y2);
 	    }
 	  else if (segs[i].y1 == segs[i].y2)
 	    {
@@ -1224,11 +1295,7 @@ draw_segments (GdkGCWin32 *gcwin32,
 	      else
 		x1 = segs[i].x2, x2 = segs[i].x1;
 	      
-	      render_line_horizontal (hdc,
-				      x1, x2, segs[i].y1,
-				      gcwin32->pen_width,
-				      gcwin32->pen_dashes,
-				      gcwin32->pen_num_dashes);
+	      render_line_horizontal (gcwin32, x1, x2, segs[i].y1);
 	    }
 	  else
 	    GDI_CALL (MoveToEx, (hdc, segs[i].x1, segs[i].y1, NULL)) &&
@@ -1311,7 +1378,8 @@ gdk_win32_draw_segments (GdkDrawable *drawable,

  region = widen_bounds (&bounds, GDK_GC_WIN32 (gc)->pen_width);

-  generic_draw (drawable, gc, GDK_GC_FOREGROUND|LINE_ATTRIBUTES,
+  generic_draw (drawable, gc, GDK_GC_FOREGROUND | GDK_GC_FOREGROUND |
+			      LINE_ATTRIBUTES,
 		draw_segments, region, segs, nsegs);

  gdk_region_destroy (region);
@@ -1338,7 +1406,9 @@ draw_lines (GdkGCWin32 *gcwin32,
 	pts[i].y -= y_offset;
      }
  
-  if (gcwin32->pen_dashes && !G_WIN32_IS_NT_BASED ())
+  if (gcwin32->pen_double_dash ||
+      (gcwin32->pen_dashes && (gcwin32->pen_dash_offset ||
+			       !G_WIN32_IS_NT_BASED ())))
    {
      for (i = 0; i < npoints - 1; i++)
        {
@@ -1350,10 +1420,7 @@ draw_lines (GdkGCWin32 *gcwin32,
 	      else
 	        y1 = pts[i].y, y2 = pts[i+1].y;
 	      
-	      render_line_vertical (hdc, pts[i].x, y1, y2,
-	                            gcwin32->pen_width,
-	                            gcwin32->pen_dashes,
-	                            gcwin32->pen_num_dashes);
+	      render_line_vertical (gcwin32, pts[i].x, y1, y2);
 	    }
 	  else if (pts[i].y == pts[i+1].y)
 	    {
@@ -1363,10 +1430,7 @@ draw_lines (GdkGCWin32 *gcwin32,
 	      else
 	        x1 = pts[i].x, x2 = pts[i+1].x;

-	      render_line_horizontal (hdc, x1, x2, pts[i].y,
-	                              gcwin32->pen_width,
-	                              gcwin32->pen_dashes,
-	                              gcwin32->pen_num_dashes);
+	      render_line_horizontal (gcwin32, x1, x2, pts[i].y);
 	    }
 	  else
 	    GDI_CALL (MoveToEx, (hdc, pts[i].x, pts[i].y, NULL)) &&
@@ -1418,7 +1482,8 @@ gdk_win32_draw_lines (GdkDrawable *drawable,

  region = widen_bounds (&bounds, GDK_GC_WIN32 (gc)->pen_width);

-  generic_draw (drawable, gc, GDK_GC_FOREGROUND|LINE_ATTRIBUTES,
+  generic_draw (drawable, gc, GDK_GC_FOREGROUND | GDK_GC_BACKGROUND |
+			      LINE_ATTRIBUTES,
 		draw_lines, region, pts, npoints);

  gdk_region_destroy (region);
@@ -2359,10 +2359,10 @@ gdk_event_translate (GdkDisplay *display,
    case WM_INPUTLANGCHANGE:
      _gdk_input_locale = (HKL) msg->lParam;
      _gdk_input_locale_is_ime = ImmIsIME (_gdk_input_locale);
-      TranslateCharsetInfo ((DWORD FAR *) msg->wParam,
-			    &charset_info,
-			    TCI_SRCCHARSET);
-      _gdk_input_codepage = charset_info.ciACP;
+      GetLocaleInfo (MAKELCID (LOWORD (_gdk_input_locale), SORT_DEFAULT),
+		     LOCALE_IDEFAULTANSICODEPAGE,
+		     buf, sizeof (buf));
+      _gdk_input_codepage = atoi (buf);
      _gdk_keymap_serial++;
      GDK_NOTE (EVENTS,
 		g_print (" cs:%lu hkl:%lx%s cp:%d",
@@ -3353,7 +3353,19 @@ gdk_event_translate (GdkDisplay *display,
      handle_display_change ();
      break;
      
-
+    case WM_DESTROYCLIPBOARD:
+      if (!_ignore_destroy_clipboard)
+	{
+	  event = gdk_event_new (GDK_SELECTION_CLEAR);
+	  event->selection.window = window;
+	  event->selection.selection = GDK_SELECTION_CLIPBOARD;
+	  event->selection.time = _gdk_win32_get_next_tick (msg->time);
+          append_event (display, event);
+	}
+      else
+	return_val = TRUE;
+      break;
+ 
 #ifdef HAVE_WINTAB
      /* Handle WINTAB events here, as we know that gdkinput.c will
       * use the fixed WT_DEFBASE as lcMsgBase, and we thus can use the
@@ -366,6 +366,7 @@ gdk_win32_gc_values_to_win32values (GdkGCValues    *values,
 	    }
          win32_gc->pen_style &= ~(PS_STYLE_MASK);
 	  win32_gc->pen_style |= PS_SOLID;
+	  win32_gc->pen_double_dash = FALSE;
 	  break;
 	case GDK_LINE_ON_OFF_DASH:
 	case GDK_LINE_DOUBLE_DASH: 
@@ -378,6 +379,7 @@ gdk_win32_gc_values_to_win32values (GdkGCValues    *values,
            win32_gc->pen_style &= ~(PS_STYLE_MASK);
 	    win32_gc->pen_style |= PS_DASH;
          }
+	  win32_gc->pen_double_dash = values->line_style == GDK_LINE_DOUBLE_DASH;
 	  break;
 	}
      GDK_NOTE (GC, (g_print ("%sps|=PS_STYLE_%s", s, _gdk_win32_psstyle_to_string (win32_gc->pen_style)),
@@ -462,6 +464,9 @@ _gdk_win32_gc_new (GdkDrawable	  *drawable,
  win32_gc->pen_style = PS_GEOMETRIC|PS_ENDCAP_FLAT|PS_JOIN_MITER;
  win32_gc->pen_dashes = NULL;
  win32_gc->pen_num_dashes = 0;
+  win32_gc->pen_dash_offset = 0;
+  win32_gc->pen_double_dash = FALSE;
+  win32_gc->pen_hbrbg = NULL;

  win32_gc->values_mask = GDK_GC_FUNCTION | GDK_GC_FILL;

@@ -540,7 +545,8 @@ gdk_win32_gc_get_values (GdkGC       *gc,
  if (win32_gc->pen_style & PS_SOLID)
    values->line_style = GDK_LINE_SOLID;
  else if (win32_gc->pen_style & PS_DASH)
-    values->line_style = GDK_LINE_ON_OFF_DASH;
+    values->line_style = win32_gc->pen_double_dash ? GDK_LINE_DOUBLE_DASH :
+						     GDK_LINE_ON_OFF_DASH;
  else
    values->line_style = GDK_LINE_SOLID;

@@ -599,6 +605,7 @@ gdk_win32_gc_set_dashes (GdkGC *gc,
  win32_gc->pen_dashes = g_new (DWORD, n);
  for (i = 0; i < n; i++)
    win32_gc->pen_dashes[i] = dash_list[i];
+  win32_gc->pen_dash_offset = dash_offset;
 }

 void
@@ -751,12 +758,15 @@ gdk_gc_copy (GdkGC *dst_gc,
    dst_win32_gc->pen_dashes = g_memdup (src_win32_gc->pen_dashes, 
                                         sizeof (DWORD) * src_win32_gc->pen_num_dashes);
  dst_win32_gc->pen_num_dashes = src_win32_gc->pen_num_dashes;
+  dst_win32_gc->pen_dash_offset = src_win32_gc->pen_dash_offset;
+  dst_win32_gc->pen_double_dash = src_win32_gc->pen_double_dash;


  dst_win32_gc->hdc = NULL;
  dst_win32_gc->saved_dc = FALSE;
  dst_win32_gc->hwnd = NULL;
  dst_win32_gc->holdpal = NULL;
+  dst_win32_gc->pen_hbrbg = NULL;
 }

 GdkScreen *  
@@ -807,15 +817,14 @@ _gdk_win32_colormap_color (GdkColormap *colormap,
    }
 }

-static COLORREF
-predraw_set_foreground (GdkGC       *gc,
-			GdkColormap *colormap,
-			gboolean    *ok)
+gboolean
+predraw (GdkGC       *gc,
+	 GdkColormap *colormap)
 {
-  COLORREF fg;
  GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
  GdkColormapPrivateWin32 *colormap_private;
  gint k;
+  gboolean ok = TRUE;

  if (colormap &&
      (colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
@@ -826,18 +835,15 @@ predraw_set_foreground (GdkGC       *gc,
      g_assert (colormap_private != NULL);

      if (!(win32_gc->holdpal = SelectPalette (win32_gc->hdc, colormap_private->hpal, FALSE)))
-	WIN32_GDI_FAILED ("SelectPalette"), *ok = FALSE;
+	WIN32_GDI_FAILED ("SelectPalette"), ok = FALSE;
      else if ((k = RealizePalette (win32_gc->hdc)) == GDI_ERROR)
-	WIN32_GDI_FAILED ("RealizePalette"), *ok = FALSE;
+	WIN32_GDI_FAILED ("RealizePalette"), ok = FALSE;
      else if (k > 0)
-	GDK_NOTE (COLORMAP, g_print ("predraw_set_foreground: realized %p: %d colors\n",
+	GDK_NOTE (COLORMAP, g_print ("predraw: realized %p: %d colors\n",
 				     colormap_private->hpal, k));
    }

-  fg = _gdk_win32_colormap_color (colormap, win32_gc->foreground);
-
-  GDK_NOTE (GC, g_print ("predraw_set_foreground: fg=%06lx\n", fg));
-  return fg;
+  return ok;
 }

 /**
@@ -898,7 +904,7 @@ gdk_win32_hdc_get (GdkDrawable    *drawable,
  GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
  GdkDrawableImplWin32 *impl = NULL;
  gboolean ok = TRUE;
-  COLORREF fg = RGB (0, 0, 0);
+  COLORREF fg = RGB (0, 0, 0), bg = RGB (255, 255, 255);
  LOGBRUSH logbrush;
  HPEN hpen;
  HBRUSH hbr;
@@ -935,11 +941,14 @@ gdk_win32_hdc_get (GdkDrawable    *drawable,
      if (ok && (win32_gc->saved_dc = SaveDC (win32_gc->hdc)) == 0)
 	WIN32_GDI_FAILED ("SaveDC");
    }
-  
+
+  if (ok && (usage & (GDK_GC_FOREGROUND | GDK_GC_BACKGROUND)))
+      ok = predraw (gc, impl->colormap);
+
  if (ok && (usage & GDK_GC_FOREGROUND))
    {
-      fg = predraw_set_foreground (gc, impl->colormap, &ok);
-      if (ok && (hbr = CreateSolidBrush (fg)) == NULL)
+      fg = _gdk_win32_colormap_color (impl->colormap, win32_gc->foreground);
+      if ((hbr = CreateSolidBrush (fg)) == NULL)
 	WIN32_GDI_FAILED ("CreateSolidBrush"), ok = FALSE;

      if (ok && SelectObject (win32_gc->hdc, hbr) == NULL)
@@ -951,36 +960,47 @@ gdk_win32_hdc_get (GdkDrawable    *drawable,

  if (ok && (usage & LINE_ATTRIBUTES))
    {
-      /* Create and select pen */
-      logbrush.lbStyle = BS_SOLID;
-      logbrush.lbColor = fg;
-      logbrush.lbHatch = 0;
-      
-      if (win32_gc->pen_num_dashes > 0 && !G_WIN32_IS_NT_BASED ())
-	{
-	  /* The Win9x GDI is rather limited so we either draw dashed
-	   * lines ourselves (only horizontal and vertical) or let them be
-	   * drawn solid to avoid implementing a whole line renderer.
-	   */
-	  if ((hpen = ExtCreatePen (
-				    (win32_gc->pen_style & ~(PS_STYLE_MASK)) | PS_SOLID,
-				    MAX (win32_gc->pen_width, 1),
-				    &logbrush, 
-				    0, NULL)) == NULL)
-	    WIN32_GDI_FAILED ("ExtCreatePen"), ok = FALSE;
+      /* For drawing GDK_LINE_DOUBLE_DASH */
+      if ((usage & GDK_GC_BACKGROUND) && win32_gc->pen_double_dash)
+        {
+          bg = _gdk_win32_colormap_color (impl->colormap, win32_gc->background);
+          if ((win32_gc->pen_hbrbg = CreateSolidBrush (bg)) == NULL)
+	    WIN32_GDI_FAILED ("CreateSolidBrush"), ok = FALSE;
+        }
+
+      if (ok)
+        {
+	  /* Create and select pen */
+	  logbrush.lbStyle = BS_SOLID;
+	  logbrush.lbColor = fg;
+	  logbrush.lbHatch = 0;
+	  
+	  if (win32_gc->pen_num_dashes > 0 && !G_WIN32_IS_NT_BASED ())
+	    {
+	      /* The Win9x GDI is rather limited so we either draw dashed
+	       * lines ourselves (only horizontal and vertical) or let them be
+	       * drawn solid to avoid implementing a whole line renderer.
+	       */
+	      if ((hpen = ExtCreatePen (
+					(win32_gc->pen_style & ~(PS_STYLE_MASK)) | PS_SOLID,
+					MAX (win32_gc->pen_width, 1),
+					&logbrush, 
+					0, NULL)) == NULL)
+		WIN32_GDI_FAILED ("ExtCreatePen"), ok = FALSE;
+	    }
+	  else
+	    {
+	      if ((hpen = ExtCreatePen (win32_gc->pen_style,
+					MAX (win32_gc->pen_width, 1),
+					&logbrush, 
+					win32_gc->pen_num_dashes,
+					win32_gc->pen_dashes)) == NULL)
+		WIN32_GDI_FAILED ("ExtCreatePen"), ok = FALSE;
+	    }
+	  
+	  if (ok && SelectObject (win32_gc->hdc, hpen) == NULL)
+	    WIN32_GDI_FAILED ("SelectObject"), ok = FALSE;
 	}
-      else
-	{
-	  if ((hpen = ExtCreatePen (win32_gc->pen_style,
-				    MAX (win32_gc->pen_width, 1),
-				    &logbrush, 
-				    win32_gc->pen_num_dashes,
-				    win32_gc->pen_dashes)) == NULL)
-	    WIN32_GDI_FAILED ("ExtCreatePen"), ok = FALSE;
-	}
-      
-      if (ok && SelectObject (win32_gc->hdc, hpen) == NULL)
-	WIN32_GDI_FAILED ("SelectObject"), ok = FALSE;
    }

  if (ok && (usage & GDK_GC_FONT))
@@ -1085,6 +1105,9 @@ gdk_win32_hdc_release (GdkDrawable    *drawable,
  if (hbr != NULL)
    GDI_CALL (DeleteObject, (hbr));

+  if (win32_gc->pen_hbrbg != NULL)
+    GDI_CALL (DeleteObject, (win32_gc->pen_hbrbg));
+
  win32_gc->hdc = NULL;
 }

@@ -66,3 +66,4 @@ gint		  _gdk_input_ignore_wintab = FALSE;
 gint		  _gdk_max_colors = 0;

 gboolean	  _sizemove_in_progress = FALSE;
+gboolean	  _ignore_destroy_clipboard = FALSE;
@@ -71,9 +71,9 @@ static GdkInputWindow *gdk_input_window_find_within (GdkWindow *window);

 static GdkDevicePrivate *gdk_input_find_dev_from_ctx (HCTX hctx,
 						      UINT id);
-static GList     *wintab_contexts;
+static GList     *wintab_contexts = NULL;

-static GdkWindow *wintab_window;
+static GdkWindow *wintab_window = NULL;

 #endif /* HAVE_WINTAB */

@@ -204,9 +204,10 @@ print_lc(LOGCONTEXT *lc)

 #endif

-static void
-gdk_input_wintab_init (void)
+void
+_gdk_input_wintab_init_check (void)
 {
+  static gboolean wintab_initialized = FALSE;
  GdkDevicePrivate *gdkdev;
  GdkWindowAttr wa;
  WORD specversion;
@@ -219,7 +220,11 @@ gdk_input_wintab_init (void)
  int devix, cursorix;
  char devname[100], csrname[100];

-  _gdk_input_devices = NULL;
+  if (wintab_initialized)
+    return;
+  
+  wintab_initialized = TRUE;
+  
  wintab_contexts = NULL;

  if (!_gdk_input_ignore_wintab &&
@@ -1276,7 +1281,13 @@ _gdk_input_init (GdkDisplay *display)

  _gdk_init_input_core (display);
 #ifdef HAVE_WINTAB
-  gdk_input_wintab_init ();
+#ifdef WINTAB_NO_LAZY_INIT
+  /* Normally, Wintab is only initialized when the application performs
+   * an action that requires it, such as enabling extended input events
+   * for a window or enumerating the devices.
+   */
+  _gdk_input_wintab_init_check ();
+#endif /* WINTAB_NO_LAZY_INIT */
 #endif /* HAVE_WINTAB */

  _gdk_input_devices = g_list_append (_gdk_input_devices, display->core_pointer);
@@ -166,4 +166,8 @@ gboolean         _gdk_device_get_history     (GdkDevice         *device,
 					      GdkTimeCoord    ***events,
 					      gint              *n_events);

+#ifdef HAVE_WINTAB
+void		_gdk_input_wintab_init_check (void);
+#endif /* HAVE_WINTAB */
+
 #endif /* __GDK_INPUT_WIN32_H__ */
@@ -119,12 +119,18 @@ gdk_device_get_type (void)
 GList *
 gdk_devices_list (void)
 {
+#ifdef HAVE_WINTAB
+  _gdk_input_wintab_init_check ();
+#endif /* HAVE_WINTAB */
  return _gdk_input_devices;
 }

 GList *
 gdk_display_list_devices (GdkDisplay *dpy)
 {
+#ifdef HAVE_WINTAB
+  _gdk_input_wintab_init_check ();
+#endif /* HAVE_WINTAB */
  return _gdk_input_devices;
 }

@@ -270,6 +276,9 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,

  if (mask != 0)
    {
+#ifdef HAVE_WINTAB
+      _gdk_input_wintab_init_check ();
+#endif /* HAVE_WINTAB */
      iw = g_new(GdkInputWindow,1);

      iw->window = window;
@@ -40,18 +40,24 @@

 guint _gdk_keymap_serial = 0;
 gboolean _gdk_keyboard_has_altgr = FALSE;
+static GdkModifierType gdk_shift_modifiers = GDK_SHIFT_MASK;

 static GdkKeymap *default_keymap = NULL;

 static guint *keysym_tab = NULL;

+typedef int (WINAPI *t_ToUnicodeEx) (UINT,UINT,PBYTE,LPWSTR,int,UINT,HKL);
+static t_ToUnicodeEx p_ToUnicodeEx = NULL;
+
 #ifdef G_ENABLE_DEBUG
 static void
 print_keysym_tab (void)
 {
  gint vk;
  
-  g_print ("keymap:%s\n", _gdk_keyboard_has_altgr ? " (uses AltGr)" : "");
+  g_print ("keymap:%s%s\n",
+	   _gdk_keyboard_has_altgr ? " (uses AltGr)" : "",
+	   (gdk_shift_modifiers & GDK_LOCK_MASK) ? " (has ShiftLock)" : "");
  for (vk = 0; vk < 256; vk++)
    {
      gint state;
@@ -69,18 +75,266 @@ print_keysym_tab (void)
 }
 #endif

+static void
+handle_special (guint  vk,
+		guint *ksymp,
+		gint   shift)
+
+{
+  switch (vk)
+    {
+    case VK_CANCEL:
+      *ksymp = GDK_Cancel; break;
+    case VK_BACK:
+      *ksymp = GDK_BackSpace; break;
+    case VK_TAB:
+      if (shift & 0x1)
+	*ksymp = GDK_ISO_Left_Tab;
+      else
+	*ksymp = GDK_Tab;
+      break;
+    case VK_CLEAR:
+      *ksymp = GDK_Clear; break;
+    case VK_RETURN:
+      *ksymp = GDK_Return; break;
+    case VK_SHIFT:
+    case VK_LSHIFT:
+      *ksymp = GDK_Shift_L; break;
+    case VK_CONTROL:
+    case VK_LCONTROL:
+      *ksymp = GDK_Control_L; break;
+    case VK_MENU:
+    case VK_LMENU:
+      *ksymp = GDK_Alt_L; break;
+    case VK_PAUSE:
+      *ksymp = GDK_Pause; break;
+    case VK_ESCAPE:
+      *ksymp = GDK_Escape; break;
+    case VK_PRIOR:
+      *ksymp = GDK_Prior; break;
+    case VK_NEXT:
+      *ksymp = GDK_Next; break;
+    case VK_END:
+      *ksymp = GDK_End; break;
+    case VK_HOME:
+      *ksymp = GDK_Home; break;
+    case VK_LEFT:
+      *ksymp = GDK_Left; break;
+    case VK_UP:
+      *ksymp = GDK_Up; break;
+    case VK_RIGHT:
+      *ksymp = GDK_Right; break;
+    case VK_DOWN:
+      *ksymp = GDK_Down; break;
+    case VK_SELECT:
+      *ksymp = GDK_Select; break;
+    case VK_PRINT:
+      *ksymp = GDK_Print; break;
+    case VK_EXECUTE:
+      *ksymp = GDK_Execute; break;
+    case VK_INSERT:
+      *ksymp = GDK_Insert; break;
+    case VK_DELETE:
+      *ksymp = GDK_Delete; break;
+    case VK_HELP:
+      *ksymp = GDK_Help; break;
+    case VK_LWIN:
+      *ksymp = GDK_Meta_L; break;
+    case VK_RWIN:
+      *ksymp = GDK_Meta_R; break;
+    case VK_MULTIPLY:
+      *ksymp = GDK_KP_Multiply; break;
+    case VK_ADD:
+      *ksymp = GDK_KP_Add; break;
+    case VK_SEPARATOR:
+      *ksymp = GDK_KP_Separator; break;
+    case VK_SUBTRACT:
+      *ksymp = GDK_KP_Subtract; break;
+    case VK_DIVIDE:
+      *ksymp = GDK_KP_Divide; break;
+    case VK_F1:
+      *ksymp = GDK_F1; break;
+    case VK_F2:
+      *ksymp = GDK_F2; break;
+    case VK_F3:
+      *ksymp = GDK_F3; break;
+    case VK_F4:
+      *ksymp = GDK_F4; break;
+    case VK_F5:
+      *ksymp = GDK_F5; break;
+    case VK_F6:
+      *ksymp = GDK_F6; break;
+    case VK_F7:
+      *ksymp = GDK_F7; break;
+    case VK_F8:
+      *ksymp = GDK_F8; break;
+    case VK_F9:
+      *ksymp = GDK_F9; break;
+    case VK_F10:
+      *ksymp = GDK_F10; break;
+    case VK_F11:
+      *ksymp = GDK_F11; break;
+    case VK_F12:
+      *ksymp = GDK_F12; break;
+    case VK_F13:
+      *ksymp = GDK_F13; break;
+    case VK_F14:
+      *ksymp = GDK_F14; break;
+    case VK_F15:
+      *ksymp = GDK_F15; break;
+    case VK_F16:
+      *ksymp = GDK_F16; break;
+    case VK_F17:
+      *ksymp = GDK_F17; break;
+    case VK_F18:
+      *ksymp = GDK_F18; break;
+    case VK_F19:
+      *ksymp = GDK_F19; break;
+    case VK_F20:
+      *ksymp = GDK_F20; break;
+    case VK_F21:
+      *ksymp = GDK_F21; break;
+    case VK_F22:
+      *ksymp = GDK_F22; break;
+    case VK_F23:
+      *ksymp = GDK_F23; break;
+    case VK_F24:
+      *ksymp = GDK_F24; break;
+    case VK_NUMLOCK:
+      *ksymp = GDK_Num_Lock; break;
+    case VK_SCROLL:
+      *ksymp = GDK_Scroll_Lock; break;
+    case VK_RSHIFT:
+      *ksymp = GDK_Shift_R; break;
+    case VK_RCONTROL:
+      *ksymp = GDK_Control_R; break;
+    case VK_RMENU:
+      *ksymp = GDK_Alt_R; break;
+    }
+}
+
+static void
+set_shift_vks (guchar *key_state,
+	       gint    shift)
+{
+  switch (shift)
+    {
+    case 0:
+      key_state[VK_SHIFT] = 0;
+      key_state[VK_CONTROL] = key_state[VK_MENU] = 0;
+      break;
+    case 1:
+      key_state[VK_SHIFT] = 0x80;
+      key_state[VK_CONTROL] = key_state[VK_MENU] = 0;
+      break;
+    case 2:
+      key_state[VK_SHIFT] = 0;
+      key_state[VK_CONTROL] = key_state[VK_MENU] = 0x80;
+      break;
+    case 3:
+      key_state[VK_SHIFT] = 0x80;
+      key_state[VK_CONTROL] = key_state[VK_MENU] = 0x80;
+      break;
+    }
+}
+
+static void
+reset_after_dead (guchar key_state[256])
+{
+  guchar temp_key_state[256];
+
+  memmove (temp_key_state, key_state, sizeof (key_state));
+
+  temp_key_state[VK_SHIFT] =
+    temp_key_state[VK_CONTROL] =
+    temp_key_state[VK_MENU] = 0;
+
+  if (G_WIN32_HAVE_WIDECHAR_API ())
+    {
+      wchar_t wcs[2];
+      (*p_ToUnicodeEx) (VK_SPACE, MapVirtualKey (VK_SPACE, 0),
+			temp_key_state, wcs, G_N_ELEMENTS (wcs),
+			0, _gdk_input_locale);
+    }
+  else
+    {
+      char chars[2];
+      ToAsciiEx (VK_SPACE, MapVirtualKey (VK_SPACE, 0),
+		 temp_key_state, (LPWORD) chars, 0,
+		 _gdk_input_locale);
+    }
+}
+
+static gboolean
+handle_dead (guint  keysym,
+	     guint *ksymp)
+{
+  switch (keysym)
+    {
+    case '"': /* 0x022 */
+      *ksymp = GDK_dead_diaeresis; break;
+    case '\'': /* 0x027 */
+      *ksymp = GDK_dead_acute; break;
+    case GDK_asciicircum: /* 0x05e */
+      *ksymp = GDK_dead_circumflex; break;
+    case GDK_grave:	/* 0x060 */
+      *ksymp = GDK_dead_grave; break;
+    case GDK_asciitilde: /* 0x07e */
+      *ksymp = GDK_dead_tilde; break;
+    case GDK_diaeresis: /* 0x0a8 */
+      *ksymp = GDK_dead_diaeresis; break;
+    case GDK_degree: /* 0x0b0 */
+      *ksymp = GDK_dead_abovering; break;
+    case GDK_acute:	/* 0x0b4 */
+      *ksymp = GDK_dead_acute; break;
+    case GDK_periodcentered: /* 0x0b7 */
+      *ksymp = GDK_dead_abovedot; break;
+    case GDK_cedilla: /* 0x0b8 */
+      *ksymp = GDK_dead_cedilla; break;
+    case GDK_breve:	/* 0x1a2 */
+      *ksymp = GDK_dead_breve; break;
+    case GDK_ogonek: /* 0x1b2 */
+      *ksymp = GDK_dead_ogonek; break;
+    case GDK_caron:	/* 0x1b7 */
+      *ksymp = GDK_dead_caron; break;
+    case GDK_doubleacute: /* 0x1bd */
+      *ksymp = GDK_dead_doubleacute; break;
+    case GDK_abovedot: /* 0x1ff */
+      *ksymp = GDK_dead_abovedot; break;
+    case 0x1000384: /* Greek tonos */
+      *ksymp = GDK_dead_acute; break;
+    case GDK_Greek_accentdieresis: /* 0x7ae */
+      *ksymp = GDK_Greek_accentdieresis; break;
+    default:
+      return FALSE;
+    }
+  return TRUE;
+}
+
 static void
 update_keymap (void)
 {
  static guint current_serial = 0;
-  guchar key_state[256], temp_key_state[256];
-  wchar_t wcs[1];
+  guchar key_state[256];
  guint scancode;
  guint vk;
+  gboolean capslock_tested = FALSE;
+  static HMODULE user32 = NULL;

  if (keysym_tab != NULL && current_serial == _gdk_keymap_serial)
    return;

+  g_assert (G_WIN32_HAVE_WIDECHAR_API () || _gdk_input_codepage != 0);
+
+  if (G_WIN32_HAVE_WIDECHAR_API () && user32 == NULL)
+    {
+      user32 = GetModuleHandle ("user32.dll");
+
+      g_assert (user32 != NULL);
+
+      p_ToUnicodeEx = (t_ToUnicodeEx) GetProcAddress (user32, "ToUnicodeEx");
+    }
+
  current_serial = _gdk_keymap_serial;

  if (keysym_tab == NULL)
@@ -89,6 +343,7 @@ update_keymap (void)
  memset (key_state, 0, sizeof (key_state));

  _gdk_keyboard_has_altgr = FALSE;
+  gdk_shift_modifiers = GDK_SHIFT_MASK;

  for (vk = 0; vk < 256; vk++)
    {
@@ -107,25 +362,7 @@ update_keymap (void)
 	      guint *ksymp = keysym_tab + vk*4 + shift;
 	      guchar chars[2];
 	      
-	      switch (shift)
-		{
-		case 0:
-		  key_state[VK_SHIFT] = 0;
-		  key_state[VK_CONTROL] = key_state[VK_MENU] = 0;
-		  break;
-		case 1:
-		  key_state[VK_SHIFT] = 0x80;
-		  key_state[VK_CONTROL] = key_state[VK_MENU] = 0;
-		  break;
-		case 2:
-		  key_state[VK_SHIFT] = 0;
-		  key_state[VK_CONTROL] = key_state[VK_MENU] = 0x80;
-		  break;
-		case 3:
-		  key_state[VK_SHIFT] = 0x80;
-		  key_state[VK_CONTROL] = key_state[VK_MENU] = 0x80;
-		  break;
-		}
+	      set_shift_vks (key_state, shift);

 	      *ksymp = 0;

@@ -134,246 +371,107 @@ update_keymap (void)
 	       * turn some them into a ASCII character (like TAB and
 	       * ESC).
 	       */
-	      switch (vk)
-		{
-		case VK_CANCEL:
-		  *ksymp = GDK_Cancel; break;
-		case VK_BACK:
-		  *ksymp = GDK_BackSpace; break;
-		case VK_TAB:
-		  if (shift & 0x1)
-		    *ksymp = GDK_ISO_Left_Tab;
-		  else
-		    *ksymp = GDK_Tab;
-		  break;
-		case VK_CLEAR:
-		  *ksymp = GDK_Clear; break;
-		case VK_RETURN:
-		  *ksymp = GDK_Return; break;
-		case VK_SHIFT:
-		case VK_LSHIFT:
-		  *ksymp = GDK_Shift_L; break;
-		case VK_CONTROL:
-		case VK_LCONTROL:
-		  *ksymp = GDK_Control_L; break;
-		case VK_MENU:
-		case VK_LMENU:
-		  *ksymp = GDK_Alt_L; break;
-		case VK_PAUSE:
-		  *ksymp = GDK_Pause; break;
-		case VK_ESCAPE:
-		  *ksymp = GDK_Escape; break;
-		case VK_PRIOR:
-		  *ksymp = GDK_Prior; break;
-		case VK_NEXT:
-		  *ksymp = GDK_Next; break;
-		case VK_END:
-		  *ksymp = GDK_End; break;
-		case VK_HOME:
-		  *ksymp = GDK_Home; break;
-		case VK_LEFT:
-		  *ksymp = GDK_Left; break;
-		case VK_UP:
-		  *ksymp = GDK_Up; break;
-		case VK_RIGHT:
-		  *ksymp = GDK_Right; break;
-		case VK_DOWN:
-		  *ksymp = GDK_Down; break;
-		case VK_SELECT:
-		  *ksymp = GDK_Select; break;
-		case VK_PRINT:
-		  *ksymp = GDK_Print; break;
-		case VK_EXECUTE:
-		  *ksymp = GDK_Execute; break;
-		case VK_INSERT:
-		  *ksymp = GDK_Insert; break;
-		case VK_DELETE:
-		  *ksymp = GDK_Delete; break;
-		case VK_HELP:
-		  *ksymp = GDK_Help; break;
-		case VK_LWIN:
-		  *ksymp = GDK_Meta_L; break;
-		case VK_RWIN:
-		  *ksymp = GDK_Meta_R; break;
-		case VK_MULTIPLY:
-		  *ksymp = GDK_KP_Multiply; break;
-		case VK_ADD:
-		  *ksymp = GDK_KP_Add; break;
-		case VK_SEPARATOR:
-		  *ksymp = GDK_KP_Separator; break;
-		case VK_SUBTRACT:
-		  *ksymp = GDK_KP_Subtract; break;
-		case VK_DIVIDE:
-		  *ksymp = GDK_KP_Divide; break;
-		case VK_F1:
-		  *ksymp = GDK_F1; break;
-		case VK_F2:
-		  *ksymp = GDK_F2; break;
-		case VK_F3:
-		  *ksymp = GDK_F3; break;
-		case VK_F4:
-		  *ksymp = GDK_F4; break;
-		case VK_F5:
-		  *ksymp = GDK_F5; break;
-		case VK_F6:
-		  *ksymp = GDK_F6; break;
-		case VK_F7:
-		  *ksymp = GDK_F7; break;
-		case VK_F8:
-		  *ksymp = GDK_F8; break;
-		case VK_F9:
-		  *ksymp = GDK_F9; break;
-		case VK_F10:
-		  *ksymp = GDK_F10; break;
-		case VK_F11:
-		  *ksymp = GDK_F11; break;
-		case VK_F12:
-		  *ksymp = GDK_F12; break;
-		case VK_F13:
-		  *ksymp = GDK_F13; break;
-		case VK_F14:
-		  *ksymp = GDK_F14; break;
-		case VK_F15:
-		  *ksymp = GDK_F15; break;
-		case VK_F16:
-		  *ksymp = GDK_F16; break;
-		case VK_F17:
-		  *ksymp = GDK_F17; break;
-		case VK_F18:
-		  *ksymp = GDK_F18; break;
-		case VK_F19:
-		  *ksymp = GDK_F19; break;
-		case VK_F20:
-		  *ksymp = GDK_F20; break;
-		case VK_F21:
-		  *ksymp = GDK_F21; break;
-		case VK_F22:
-		  *ksymp = GDK_F22; break;
-		case VK_F23:
-		  *ksymp = GDK_F23; break;
-		case VK_F24:
-		  *ksymp = GDK_F24; break;
-		case VK_NUMLOCK:
-		  *ksymp = GDK_Num_Lock; break;
-		case VK_SCROLL:
-		  *ksymp = GDK_Scroll_Lock; break;
-		case VK_RSHIFT:
-		  *ksymp = GDK_Shift_R; break;
-		case VK_RCONTROL:
-		  *ksymp = GDK_Control_R; break;
-		case VK_RMENU:
-		  *ksymp = GDK_Alt_R; break;
-		}
+	      handle_special (vk, ksymp, shift);
+
 	      if (*ksymp == 0)
 		{
-		  gint k = ToAsciiEx (vk, scancode, key_state,
-				      (LPWORD) chars, 0, _gdk_input_locale);
+		  wchar_t wcs[10];
+		  gint k;
+
+		  if (G_WIN32_HAVE_WIDECHAR_API ())
+		    {
+		      k = (*p_ToUnicodeEx) (vk, scancode, key_state,
+					    wcs, G_N_ELEMENTS (wcs),
+					    0, _gdk_input_locale);
 #if 0
-		  g_print ("ToAsciiEx(%02x: %d: %d: %d, %02x%02x\n",
-			   vk, scancode, shift, k, chars[0], chars[1]);
+		      g_print ("ToUnicodeEx(%02x, %d: %d): %d, %04x %04x\n",
+			       vk, scancode, shift, k,
+			       (k != 0 ? wcs[0] : 0),
+			       (k >= 2 ? wcs[1] : 0));
 #endif
+		      if (k == 1)
+			*ksymp = gdk_unicode_to_keyval (wcs[0]);
+		    }
+		  else
+		    {
+		      k = ToAsciiEx (vk, scancode, key_state,
+				     (LPWORD) chars, 0, _gdk_input_locale);
+#if 0
+		      g_print ("ToAsciiEx(%02x, %d: %d): %d, %02x %02x\n",
+			       vk, scancode, shift, k,
+			       (k != 0 ? chars[0] : 0),
+			       (k == 2 ? chars[1] : 0));
+#endif
+		      if (k == 1)
+			{
+			  if (_gdk_input_codepage >= 1250 &&
+			      _gdk_input_codepage <= 1258 &&
+			      chars[0] >= GDK_space &&
+			      chars[0] <= GDK_asciitilde)
+			    *ksymp = chars[0];
+			  else
+			    {
+			      if (MultiByteToWideChar (_gdk_input_codepage, 0,
+						       chars, 1, wcs, 1) > 0)
+				*ksymp = gdk_unicode_to_keyval (wcs[0]);
+			    }
+			}
+		      else if (k == -1)
+			{
+			  MultiByteToWideChar (_gdk_input_codepage, 0,
+					       chars, 1, wcs, 1);
+			}
+		    }
+
 		  if (k == 1)
 		    {
-		      if (_gdk_input_codepage >= 1250 &&
-			  _gdk_input_codepage <= 1258 &&
-			  chars[0] >= GDK_space && chars[0] <= GDK_asciitilde)
-			*ksymp = chars[0];
-		      else
-			{
-			  if (MultiByteToWideChar (_gdk_input_codepage, 0,
-						   chars, 1, wcs, 1) > 0)
-			    *ksymp = gdk_unicode_to_keyval (wcs[0]);
-			}
+		      /* Keysym already stored above */
 		    }
 		  else if (k == -1)
 		    {
-		      MultiByteToWideChar (_gdk_input_codepage, 0,
-					   chars, 1, wcs, 1);
+		      guint keysym = gdk_unicode_to_keyval (wcs[0]);

 		      /* It is a dead key, and it's has been stored in
-		       * the keyboard layout's state by ToAsciiEx(). 
-		       * Yes, this is an incredibly silly API! Make
-		       * the keyboard layout forget it by calling
-		       * ToAsciiEx() once more, with the virtual key
-		       * code and scancode for the spacebar, without
-		       * shift or AltGr. Otherwise the next call to
-		       * ToAsciiEx() with a different key would try to
-		       * combine with the dead key.
+		       * the keyboard layout's state by
+		       * ToAsciiEx()/ToUnicodeEx(). Yes, this is an
+		       * incredibly silly API! Make the keyboard
+		       * layout forget it by calling
+		       * ToAsciiEx()/ToUnicodeEx() once more, with the
+		       * virtual key code and scancode for the
+		       * spacebar, without shift or AltGr. Otherwise
+		       * the next call to ToAsciiEx() with a different
+		       * key would try to combine with the dead key.
 		       */
+		      reset_after_dead (key_state);

-		      memmove (temp_key_state, key_state, sizeof (key_state));
-		      temp_key_state[VK_SHIFT] =
-			temp_key_state[VK_CONTROL] =
-			temp_key_state[VK_MENU] = 0;
-		      ToAsciiEx (VK_SPACE, MapVirtualKey (VK_SPACE, 0),
-				 temp_key_state, (LPWORD) chars, 0,
-				 _gdk_input_locale);
-		      
 		      /* Use dead keysyms instead of "undead" ones */
-		      switch (gdk_unicode_to_keyval (wcs[0]))
-			{
-			case '"': /* 0x022 */
-			  *ksymp = GDK_dead_diaeresis; break;
-			case '\'': /* 0x027 */
-			  *ksymp = GDK_dead_acute; break;
-			case GDK_asciicircum: /* 0x05e */
-			  *ksymp = GDK_dead_circumflex; break;
-			case GDK_grave:	/* 0x060 */
-			  *ksymp = GDK_dead_grave; break;
-			case GDK_asciitilde: /* 0x07e */
-			  *ksymp = GDK_dead_tilde; break;
-			case GDK_diaeresis: /* 0x0a8 */
-			  *ksymp = GDK_dead_diaeresis; break;
-			case GDK_degree: /* 0x0b0 */
-			  *ksymp = GDK_dead_abovering; break;
-			case GDK_acute:	/* 0x0b4 */
-			  *ksymp = GDK_dead_acute; break;
-			case GDK_periodcentered: /* 0x0b7 */
-			  *ksymp = GDK_dead_abovedot; break;
-			case GDK_cedilla: /* 0x0b8 */
-			  *ksymp = GDK_dead_cedilla; break;
-			case GDK_breve:	/* 0x1a2 */
-			  *ksymp = GDK_dead_breve; break;
-			case GDK_ogonek: /* 0x1b2 */
-			  *ksymp = GDK_dead_ogonek; break;
-			case GDK_caron:	/* 0x1b7 */
-			  *ksymp = GDK_dead_caron; break;
-			case GDK_doubleacute: /* 0x1bd */
-			  *ksymp = GDK_dead_doubleacute; break;
-			case GDK_abovedot: /* 0x1ff */
-			  *ksymp = GDK_dead_abovedot; break;
-			case GDK_Greek_accentdieresis: /* 0x7ae */
-			  *ksymp = GDK_Greek_accentdieresis; break;
-			default:
-			  GDK_NOTE (EVENTS,
-				    g_print ("Unhandled dead key cp:%d vk:%02x, sc:%x, ch:%02x%s%s\n",
-					     _gdk_input_codepage, vk,
-					     scancode, chars[0],
-					     (shift&0x1 ? " shift" : ""),
-					     (shift&0x2 ? " altgr" : "")));
-			}
+		      if (!handle_dead (keysym, ksymp))
+			GDK_NOTE (EVENTS,
+				  g_print ("Unhandled dead key cp:%d vk:%02x sc:%x ch:%02x wc:%04x keysym:%04x%s%s\n",
+					   _gdk_input_codepage, vk,
+					   scancode, chars[0],
+					   wcs[0], keysym,
+					   (shift&0x1 ? " shift" : ""),
+					   (shift&0x2 ? " altgr" : "")));
 		    }
 		  else if (k == 0)
 		    {
 		      /* Seems to be necessary to "reset" the keyboard layout
 		       * in this case, too. Otherwise problems on NT4.
 		       */
-		      memmove (temp_key_state, key_state, sizeof (key_state));
-		      temp_key_state[VK_SHIFT] =
-			temp_key_state[VK_CONTROL] =
-			temp_key_state[VK_MENU] = 0;
-		      ToAsciiEx (VK_SPACE, MapVirtualKey (VK_SPACE, 0),
-				 temp_key_state, (LPWORD) chars, 0,
-				 _gdk_input_locale);
+		      reset_after_dead (key_state);
 		    }
 		  else
 		    {
 #if 0
-		      GDK_NOTE (EVENTS, g_print ("ToAsciiEx returns %d "
-						 "for vk:%02x, sc:%02x%s%s\n",
-						 k, vk, scancode,
-						 (shift&0x1 ? " shift" : ""),
-						 (shift&0x2 ? " altgr" : "")));
+		      GDK_NOTE (EVENTS,
+				g_print ("%s returns %d "
+					 "for vk:%02x, sc:%02x%s%s\n",
+					 (G_WIN32_HAVE_WIDECHAR_API () ?
+					  "ToUnicodeEx" : "ToAsciiEx"),
+					 k, vk, scancode,
+					 (shift&0x1 ? " shift" : ""),
+					 (shift&0x2 ? " altgr" : "")));
 #endif
 		    }
 		}
@@ -381,12 +479,53 @@ update_keymap (void)
 		*ksymp = GDK_VoidSymbol;
 	    }
 	  key_state[vk] = 0;
+
+	  /* Check if keyboard has an AltGr key by checking if
+	   * the mapping with Control+Alt is different.
+	   */
+	  if (!_gdk_keyboard_has_altgr)
+	    if ((keysym_tab[vk*4 + 2] != GDK_VoidSymbol &&
+		 keysym_tab[vk*4] != keysym_tab[vk*4 + 2]) ||
+		(keysym_tab[vk*4 + 3] != GDK_VoidSymbol &&
+		 keysym_tab[vk*4 + 1] != keysym_tab[vk*4 + 3]))
+	      _gdk_keyboard_has_altgr = TRUE;
+	  
+	  if (!capslock_tested)
+	    {
+	      /* Can we use this virtual key to determine the CapsLock
+	       * key behaviour: CapsLock or ShiftLock? If it generates
+	       * keysyms for printable characters and has a shifted
+	       * keysym that isn't just the upperacase of the
+	       * unshifted keysym, check the behaviour of VK_CAPITAL.
+	       */
+	      if (g_unichar_isgraph (gdk_keyval_to_unicode (keysym_tab[vk*4 + 0])) &&
+		  keysym_tab[vk*4 + 1] != keysym_tab[vk*4 + 0] &&
+		  g_unichar_isgraph (gdk_keyval_to_unicode (keysym_tab[vk*4 + 1])) &&
+		  keysym_tab[vk*4 + 1] != gdk_keyval_to_upper (keysym_tab[vk*4 + 0]))
+		{
+		  guchar chars[2];
+		  
+		  capslock_tested = TRUE;
+		  
+		  key_state[VK_SHIFT] = 0;
+		  key_state[VK_CONTROL] = key_state[VK_MENU] = 0;
+		  key_state[VK_CAPITAL] = 1;
+
+		  if (ToAsciiEx (vk, scancode, key_state,
+				 (LPWORD) chars, 0, _gdk_input_locale) == 1)
+		    {
+		      if (chars[0] >= GDK_space &&
+			  chars[0] <= GDK_asciitilde &&
+			  chars[0] == keysym_tab[vk*4 + 1])
+			{
+			  /* CapsLock acts as ShiftLock */
+			  gdk_shift_modifiers |= GDK_LOCK_MASK;
+			}
+		    }
+		  key_state[VK_CAPITAL] = 0;
+		}    
+	    }
 	}
-      if ((keysym_tab[vk*4 + 2] != GDK_VoidSymbol &&
-	   keysym_tab[vk*4] != keysym_tab[vk*4 + 2]) ||
-	  (keysym_tab[vk*4 + 3] != GDK_VoidSymbol &&
-	   keysym_tab[vk*4 + 1] != keysym_tab[vk*4 + 3]))
-	_gdk_keyboard_has_altgr = TRUE;
    }
  GDK_NOTE (EVENTS, print_keysym_tab ());
 } 
@@ -633,7 +772,6 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
                                     GdkModifierType *consumed_modifiers)
 {
  guint tmp_keyval;
-  guint tmp_modifiers;
  guint *keyvals;
  gint shift_level;
  gboolean ignore_shift = FALSE;
@@ -669,12 +807,15 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,

  keyvals = keysym_tab + hardware_keycode*4;

-  if ((state & GDK_SHIFT_MASK) &&
-      (state & GDK_LOCK_MASK) &&
-      keyvals[group*2 + 1] == gdk_keyval_to_upper (keyvals[group*2 + 0]))
-    /* Shift disables caps lock */
-    shift_level = 0;		
-  else if (state & GDK_SHIFT_MASK)
+  if ((state & GDK_LOCK_MASK) &&
+      (state & GDK_SHIFT_MASK) &&
+      ((gdk_shift_modifiers & GDK_LOCK_MASK) ||
+       (keyvals[group*2 + 1] == gdk_keyval_to_upper (keyvals[group*2 + 0]))))
+    /* Shift always disables ShiftLock. Shift disables CapsLock for
+     * keys with lowercase/uppercase letter pairs.
+     */
+    shift_level = 0;
+  else if (state & gdk_shift_modifiers)
    shift_level = 1;
  else
    shift_level = 0;
@@ -720,28 +861,35 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,

  tmp_keyval = keyvals[group*2 + shift_level];

-  tmp_modifiers = ignore_group ? 0 : GDK_MOD2_MASK;
-  tmp_modifiers |= ignore_shift ? 0 : (GDK_SHIFT_MASK | GDK_LOCK_MASK);
+  /* If a true CapsLock is toggled, and Shift is not down,
+   * and the shifted keysym is the uppercase of the unshifted,
+   * use it.
+   */
+  if (!(gdk_shift_modifiers & GDK_LOCK_MASK) &&
+      !(state & GDK_SHIFT_MASK) &&
+      (state & GDK_LOCK_MASK))
+    {
+      guint upper = gdk_keyval_to_upper (tmp_keyval);
+      if (upper == keyvals[group*2 + 1])
+	tmp_keyval = upper;
+    }
+
+  if (keyval)
+    *keyval = tmp_keyval;

  if (effective_group)
    *effective_group = group;

-  if (!(state & GDK_SHIFT_MASK) && (state & GDK_LOCK_MASK))
-    {
-      guint upper = gdk_keyval_to_upper (tmp_keyval);
-      if (upper != tmp_keyval)
-	tmp_keyval = upper;
-    }
-
  if (level)
    *level = shift_level;

  if (consumed_modifiers)
-    *consumed_modifiers = tmp_modifiers;
+    {
+      *consumed_modifiers =
+	(ignore_group ? 0 : GDK_MOD2_MASK) |
+	(ignore_shift ? 0 : (GDK_SHIFT_MASK|GDK_LOCK_MASK));
+    }
 				
-  if (keyval)
-    *keyval = tmp_keyval;
-
 #if 0
  GDK_NOTE (EVENTS, g_print ("...group=%d level=%d cmods=%#x keyval=%s\n",
 			     group, shift_level, tmp_modifiers, gdk_keyval_name (tmp_keyval)));
@@ -282,6 +282,9 @@ struct _GdkGCWin32
  DWORD pen_style;
  DWORD *pen_dashes;		/* use for PS_USERSTYLE or step-by-step rendering */
  gint pen_num_dashes;
+  gint pen_dash_offset;
+  gboolean pen_double_dash;
+  HBRUSH pen_hbrbg;

  /* Following fields are valid while the GC exists as a Windows DC */
  HDC hdc;
@@ -497,6 +500,9 @@ extern gint		 _gdk_max_colors;
 /* TRUE while a user-initiated window move or resize operation is in progress */
 extern gboolean		 _sizemove_in_progress;

+/* TRUE when we are emptying the clipboard ourselves */
+extern gboolean		_ignore_destroy_clipboard;
+
 /* Initialization */
 void _gdk_windowing_window_init (void);
 void _gdk_root_window_size_init (void);
@@ -136,13 +136,8 @@ _gdk_selection_property_store (GdkWindow *owner,
                               gint       length)
 {
  GdkSelProp *prop;
+  GSList *prop_list;

-  prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (owner));
-  if (prop != NULL)
-    {
-      g_free (prop->data);
-      g_hash_table_remove (sel_prop_table, GDK_WINDOW_HWND (owner));
-    }
  prop = g_new (GdkSelProp, 1);

  if (type == GDK_TARGET_STRING)
@@ -167,7 +162,9 @@ _gdk_selection_property_store (GdkWindow *owner,
    }
  prop->format = format;
  prop->type = type;
-  g_hash_table_insert (sel_prop_table, GDK_WINDOW_HWND (owner), prop);
+  prop_list = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (owner));
+  prop_list = g_slist_append (prop_list, prop);
+  g_hash_table_insert (sel_prop_table, GDK_WINDOW_HWND (owner), prop_list);
 }

 void
@@ -238,16 +235,15 @@ gdk_selection_owner_set_for_display (GdkDisplay *display,
  if (!API_CALL (OpenClipboard, (hwnd)))
    return FALSE;

+  _ignore_destroy_clipboard = TRUE;
  if (!API_CALL (EmptyClipboard, ()))
    {
+      _ignore_destroy_clipboard = FALSE;
      API_CALL (CloseClipboard, ());
      return FALSE;
    }
-#if 0
-  /* No delayed rendering */
-  if (hwnd != NULL)
-    SetClipboardData (CF_TEXT, NULL);
-#endif
+  _ignore_destroy_clipboard = FALSE;
+
  if (!API_CALL (CloseClipboard, ()))
    return FALSE;

@@ -657,6 +653,7 @@ gdk_selection_property_get (GdkWindow  *requestor,
 			    gint       *ret_format)
 {
  GdkSelProp *prop;
+  GSList *prop_list;

  g_return_val_if_fail (requestor != NULL, 0);
  g_return_val_if_fail (GDK_IS_WINDOW (requestor), 0);
@@ -667,7 +664,8 @@ gdk_selection_property_get (GdkWindow  *requestor,
  GDK_NOTE (DND, g_print ("gdk_selection_property_get: %p\n",
 			   GDK_WINDOW_HWND (requestor)));

-  prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (requestor));
+  prop_list = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (requestor));
+  prop = prop_list ? (GdkSelProp *) prop_list->data : NULL;

  if (prop == NULL)
    {
@@ -692,15 +690,18 @@ void
 _gdk_selection_property_delete (GdkWindow *window)
 {
  GdkSelProp *prop;
+  GSList *prop_list;
  
  GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p\n",
 			   GDK_WINDOW_HWND (window)));

-  prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (window));
-  if (prop != NULL)
+  prop_list = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (window));
+  if (prop_list && (prop = (GdkSelProp *) prop_list->data) != NULL)
    {
      g_free (prop->data);
-      g_hash_table_remove (sel_prop_table, GDK_WINDOW_HWND (window));
+      prop_list = g_slist_remove (prop_list, prop);
+      g_free (prop);
+      g_hash_table_insert (sel_prop_table, GDK_WINDOW_HWND (window), prop_list);
    }
 }

@@ -729,32 +730,6 @@ gdk_selection_send_notify_for_display (GdkDisplay *display,
 	     g_free (sel_name),
 	     g_free (tgt_name),
 	     g_free (prop_name)));
-
-  /* Send ourselves a selection clear message so that gtk thinks we
-   * don't have the selection, and will claim it anew when needed, and
-   * we thus get a chance to store data in the Windows clipboard.
-   * Otherwise, if a gtkeditable does a copy to CLIPBOARD several
-   * times only the first one actually gets copied to the Windows
-   * clipboard, as only the first one causes a call to
-   * gdk_property_change().
-   *
-   * Hmm, there is something fishy with this. Cut and paste inside the
-   * same app didn't work, the gtkeditable immediately forgot the
-   * clipboard contents in gtk_editable_selection_clear() as a result
-   * of this message. OTOH, when I changed gdk_selection_owner_get to
-   * return NULL for CLIPBOARD, it works. Sigh.
-   */
-
-  tmp_event.selection.type = GDK_SELECTION_CLEAR;
-  tmp_event.selection.window = gdk_window_lookup (requestor);
-  tmp_event.selection.send_event = FALSE;
-  tmp_event.selection.selection = selection;
-  tmp_event.selection.target = 0;
-  tmp_event.selection.property = 0;
-  tmp_event.selection.requestor = 0;
-  tmp_event.selection.time = time;
-
-  gdk_event_put (&tmp_event);
 }

 /* It's hard to say whether implementing this actually is of any use
@@ -26,6 +26,7 @@

 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <unistd.h>

 #include <glib.h>
@@ -90,6 +91,7 @@ static const char *const precache_atoms[] = {
  "_NET_WM_WINDOW_TYPE",
  "_NET_WM_WINDOW_TYPE_NORMAL",
  "_NET_WM_USER_TIME",
+  "_NET_VIRTUAL_ROOTS"
 };

 GType
@@ -206,6 +208,7 @@ gdk_display_open (const gchar *display_name)
  display_x11->leader_window_title_set = FALSE;

  display_x11->have_render = GDK_UNKNOWN;
+  display_x11->have_render_with_trapezoids = GDK_UNKNOWN;

 #ifdef HAVE_XFIXES
  if (XFixesQueryExtension (display_x11->xdisplay, 
@@ -840,10 +843,30 @@ _gdk_windowing_set_default_display (GdkDisplay *display)
  startup_id = g_getenv ("DESKTOP_STARTUP_ID");
  if (startup_id && *startup_id != '\0')
    {
+      gchar *time_str;
+
      if (!g_utf8_validate (startup_id, -1, NULL))
 	g_warning ("DESKTOP_STARTUP_ID contains invalid UTF-8");
      else
 	display_x11->startup_notification_id = g_strdup (startup_id);
+
+      /* Find the launch time from the startup_id, if it's there.  Newer spec
+       * states that the startup_id is of the form <unique>_TIME<timestamp>
+       */
+      time_str = g_strrstr (startup_id, "_TIME");
+      if (time_str != NULL)
+        {
+	  gulong retval;
+          gchar *end;
+          errno = 0;
+
+          /* Skip past the "_TIME" part */
+          time_str += 5;
+
+          retval = strtoul (time_str, &end, 0);
+          if (end != time_str && errno == 0)
+            display_x11->user_time = retval;
+        }
      
      /* Clear the environment variable so it won't be inherited by
       * child processes and confuse things.  
@@ -1109,7 +1132,7 @@ gdk_display_supports_clipboard_persistence (GdkDisplay *display)
 *                    if all available targets should be saved.
 * @n_targets:        length of the @targets array
 *
- * Issues a request to the the clipboard manager to store the
+ * Issues a request to the clipboard manager to store the
 * clipboard data. On X11, this is a special program that works
 * according to the freedesktop clipboard specification, available at
 * <ulink url="http://www.freedesktop.org/Standards/clipboard-manager-spec">
@@ -78,6 +78,7 @@ struct _GdkDisplayX11
  gboolean use_xshm;
  gboolean have_shm_pixmaps;
  GdkTristate have_render;
+  GdkTristate have_render_with_trapezoids;
  gboolean have_xfixes;
  gint xfixes_event_base;

@@ -321,6 +321,38 @@ _gdk_x11_have_render (GdkDisplay *display)
  return x11display->have_render == GDK_YES;
 }

+gboolean
+_gdk_x11_have_render_with_trapezoids (GdkDisplay *display)
+{
+  Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+  GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display);
+
+  if (x11display->have_render_with_trapezoids == GDK_UNKNOWN)
+    {
+      if (!_gdk_x11_have_render (display))
+	x11display->have_render_with_trapezoids = GDK_NO;
+      else
+	{
+	  /*
+	   * Require protocol >= 0.4 for CompositeTrapezoids support.
+	   */
+	  int major_version, minor_version;
+	
+#define XRENDER_TETRAPEZOIDS_MAJOR 0
+#define XRENDER_TETRAPEZOIDS_MINOR 4
+	
+	  if (XRenderQueryVersion (xdisplay, &major_version,
+				   &minor_version))
+	    if ((major_version < XRENDER_TETRAPEZOIDS_MAJOR) ||
+		((major_version == XRENDER_TETRAPEZOIDS_MAJOR) &&
+		   (minor_version < XRENDER_TETRAPEZOIDS_MINOR)))
+	      x11display->have_render_with_trapezoids = GDK_NO;
+	}
+    }
+
+  return x11display->have_render_with_trapezoids == GDK_YES;
+}
+
 static XftDraw *
 gdk_x11_drawable_get_xft_draw (GdkDrawable *drawable)
 {
@@ -1496,7 +1528,7 @@ gdk_x11_draw_trapezoids (GdkDrawable  *drawable,
  XTrapezoid *xtrapezoids;
  gint i;

-  if (!_gdk_x11_have_render (display))
+  if (!_gdk_x11_have_render_with_trapezoids (display))
    {
      GdkDrawable *wrapper = GDK_DRAWABLE_IMPL_X11 (drawable)->wrapper;
      GDK_DRAWABLE_CLASS (parent_class)->draw_trapezoids (wrapper, gc,
@@ -1603,7 +1635,7 @@ _gdk_x11_drawable_draw_xtrapezoids (GdkDrawable      *drawable,
   
  XftDraw *draw;

-  if (!_gdk_x11_have_render (display))
+  if (!_gdk_x11_have_render_with_trapezoids (display))
    {
      /* This is the case of drawing the borders of the unknown glyph box
       * without render on the display, we need to feed it back to
@@ -1170,7 +1170,7 @@ translate_keysym (GdkKeymapX11   *keymap_x11,
    }
  else
    {
-      /* Fall back to the the first level if no symbol for the level
+      /* Fall back to the first level if no symbol for the level
       * we were passed.
       */
      shift_level = (state & shift_modifiers) ? 1 : 0;
@@ -108,7 +108,9 @@ gint _gdk_send_xevent      (GdkDisplay *display,

 GType _gdk_gc_x11_get_type (void);

-gboolean _gdk_x11_have_render         (GdkDisplay *display);
+gboolean _gdk_x11_have_render                 (GdkDisplay *display);
+gboolean _gdk_x11_have_render_with_trapezoids (GdkDisplay *display);
+
 Picture  _gdk_x11_gc_get_fg_picture   (GdkGC      *gc);
 void     _gdk_gc_x11_get_fg_xft_color (GdkGC      *gc,
 				       XftColor   *xftcolor);
@@ -352,7 +352,7 @@ gdk_screen_get_n_monitors (GdkScreen *screen)
 * @dest : a #GdkRectangle to be filled with the monitor geometry
 *
 * Retrieves the #GdkRectangle representing the size and position of 
- * the individual monitor within the the entire screen area.
+ * the individual monitor within the entire screen area.
 * 
 * Note that the size of the entire screen area can be retrieved via 
 * gdk_screen_get_width() and gdk_screen_get_height().
@@ -104,7 +104,7 @@ _gdk_selection_filter_clear_event (XSelectionClearEvent *event)
 /**
 * gdk_selection_owner_set_for_display:
 * @display: the #GdkDisplay.
- * @owner: a #GdkWindow or %NULL to indicate that the the owner for
+ * @owner: a #GdkWindow or %NULL to indicate that the owner for
 *         the given should be unset.
 * @selection: an atom identifying a selection.
 * @time_: timestamp to use when setting the selection. 
@@ -250,7 +250,7 @@ gdk_selection_convert (GdkWindow *requestor,
       If the retrieval failed, %NULL we be stored here, otherwise, it
       will be non-%NULL and the returned data should be freed with g_free()
       when you are finished using it. The length of the
-       allocated memory is one more than the the length
+       allocated memory is one more than the length
       of the returned data, and the final byte will always
       be zero, to ensure nul-termination of strings.
 * @prop_type: location to store the type of the property.
@@ -3128,12 +3128,23 @@ void
 gdk_window_get_frame_extents (GdkWindow    *window,
                              GdkRectangle *rect)
 {
+  GdkDisplay *display;
  GdkWindowObject *private;
  Window xwindow;
  Window xparent;
  Window root;
  Window *children;
-  unsigned int nchildren;
+  guchar *data;
+  Window *vroots;
+  Atom type_return;
+  guint nchildren;
+  guint nvroots;
+  gulong nitems_return;
+  gulong bytes_after_return;
+  gint format_return;
+  gint i;
+  guint ww, wh, wb, wd;
+  gint wx, wy;
  
  g_return_if_fail (GDK_IS_WINDOW (window));
  g_return_if_fail (rect != NULL);
@@ -3161,35 +3172,67 @@ gdk_window_get_frame_extents (GdkWindow    *window,

  gdk_error_trap_push();
  
+  /* use NETWM_VIRTUAL_ROOTS if available */
+  display = gdk_drawable_get_display (window);
+  root = GDK_WINDOW_XROOTWIN (window);
+
+  nvroots = 0;
+  vroots = NULL;
+
+  if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), root,
+			  gdk_x11_get_xatom_by_name_for_display (display, 
+								 "_NET_VIRTUAL_ROOTS"),
+			  0, G_MAXLONG, False, XA_WINDOW, &type_return,
+			  &format_return, &nitems_return, &bytes_after_return,
+			  &data)
+      == Success)
+    {
+      if ((type_return == XA_WINDOW) && (format_return == 32) && (data))
+	{
+	  nvroots = nitems_return;
+	  vroots = (Window *)data;
+	}
+    }
+
  xparent = GDK_WINDOW_XID (window);
+
  do
    {
      xwindow = xparent;
-      if (!XQueryTree (GDK_WINDOW_XDISPLAY (window), xwindow,
+
+      if (!XQueryTree (GDK_DISPLAY_XDISPLAY (display), xwindow,
 		       &root, &xparent,
 		       &children, &nchildren))
 	goto fail;
      
      if (children)
 	XFree (children);
+
+      /* check virtual roots */
+      for (i = 0; i < nvroots; i++)
+	{
+	  if (xparent == vroots[i])
+	    {
+	      root = xparent;
+	      break;
+           }
+	}
    }
  while (xparent != root);
  
-  if (xparent == root)
+  if (XGetGeometry (GDK_DISPLAY_XDISPLAY (display), xwindow, 
+		    &root, &wx, &wy, &ww, &wh, &wb, &wd))
    {
-      unsigned int ww, wh, wb, wd;
-      int wx, wy;
-      
-      if (XGetGeometry (GDK_WINDOW_XDISPLAY (window), xwindow, &root, &wx, &wy, &ww, &wh, &wb, &wd))
-	{
-          rect->x = wx;
-          rect->y = wy;
-          rect->width = ww;
-          rect->height = wh;
-	}
+      rect->x = wx;
+      rect->y = wy;
+      rect->width = ww;
+      rect->height = wh;
    }

 fail:
+  if (vroots)
+    XFree (vroots);
+
  gdk_error_trap_pop ();
 }

@@ -5776,7 +5819,7 @@ gdk_window_enable_synchronized_configure (GdkWindow *window)
 * application. GTK+ applications will automatically call this
 * function when appropriate.
 *
- * This function can only be called if gdk_window_use_configure()
+ * This function can only be called if gdk_window_enable_synchronized_configure()
 * was called previously.
 *
 * Since: 2.6
@@ -80,7 +80,7 @@ gtk.def: gtk.symbols
 gtkalias.h: gtk.symbols
 	  $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h

-if OS_UNIX
+if OS_LINUX
 TESTS = abicheck.sh
 endif

@@ -1,7 +1,7 @@
 /* GTK - The GIMP Toolkit
 * Copyright (C) 2001 CodeFactory AB
 * Copyright (C) 2001, 2002 Anders Carlsson
- * Copyright (C) 2003, 2004 Matthias Clasen <mclasen@redhat.com>
+ * Copyright (C) 2003, 2004, 2005 Matthias Clasen <mclasen@redhat.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public 
@@ -115,6 +115,11 @@ static void                 gtk_about_dialog_set_property   (GObject
 							     guint               prop_id,
 							     const GValue       *value,
 							     GParamSpec         *pspec);
+static void                 gtk_about_dialog_style_set      (GtkWidget          *widget,
+			                                     GtkStyle           *previous_style);
+static void                 dialog_style_set                (GtkWidget          *widget,
+		                                             GtkStyle           *previous_style,
+		                                             gpointer            data);
 static void                 update_name_version             (GtkAboutDialog     *about);
 static GtkIconSet *         icon_set_new_from_pixbufs       (GList              *pixbufs);
 static void                 activate_url                    (GtkWidget          *widget,
@@ -181,6 +186,8 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)

  object_class->finalize = gtk_about_dialog_finalize;

+  widget_class->style_set = gtk_about_dialog_style_set;
+
  /**
   * GtkAboutDialog:name:
   *
@@ -250,7 +257,8 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
   *
   * The license of the program. This string is displayed in a 
   * text view in a secondary dialog, therefore it is fine to use
-   * a long multi-paragraph text.
+   * a long multi-paragraph text. Note that the text is not wrapped
+   * in the text view, thus it must contain the intended linebreaks.
   *
   * Since: 2.6
   */  
@@ -438,7 +446,6 @@ gtk_about_dialog_init (GtkAboutDialog *about)
  /* Widgets */
  gtk_widget_push_composite_child ();
  vbox = gtk_vbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);

  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about)->vbox), vbox, TRUE, TRUE, 0);

@@ -648,6 +655,37 @@ gtk_about_dialog_get_property (GObject    *object,
    }
 }

+static void
+dialog_style_set (GtkWidget *widget,
+		  GtkStyle *previous_style,
+		  gpointer data)
+{
+  GtkDialog *dialog;
+
+  dialog = GTK_DIALOG (widget);
+
+  /* Override the style properties with HIG-compliant spacings.  Ugh.
+   * http://developer.gnome.org/projects/gup/hig/1.0/layout.html#layout-dialogs
+   * http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-spacing
+   */
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 12);
+  gtk_box_set_spacing (GTK_BOX (dialog->vbox), 12);
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 0);
+  gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
+}
+
+static void
+gtk_about_dialog_style_set (GtkWidget *widget,
+			    GtkStyle  *previous_style)
+{
+  if (GTK_WIDGET_CLASS (gtk_about_dialog_parent_class)->style_set)
+    GTK_WIDGET_CLASS (gtk_about_dialog_parent_class)->style_set (widget, previous_style);
+
+  dialog_style_set (widget, previous_style, NULL);
+}
+
 /**
 * gtk_about_dialog_get_name:
 * @about: a #GtkAboutDialog
@@ -1532,6 +1570,27 @@ set_link_button_text (GtkWidget *about,
  g_free (link);
 }

+static gboolean
+link_button_enter (GtkWidget        *widget,
+		   GdkEventCrossing *event,
+		   GtkAboutDialog   *about)
+{
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  gdk_window_set_cursor (widget->window, priv->hand_cursor);
+
+  return FALSE;
+}
+
+static gboolean
+link_button_leave (GtkWidget        *widget,
+		   GdkEventCrossing *event,
+		   GtkAboutDialog   *about)
+{
+  gdk_window_set_cursor (widget->window, NULL);
+
+  return FALSE;
+}
+
 static GtkWidget *
 create_link_button (GtkWidget *about,
 		    gchar     *text,
@@ -1549,6 +1608,10 @@ create_link_button (GtkWidget *about,
  set_link_button_text (about, button, text);
  
  g_signal_connect (button, "clicked", callback, data);
+  g_signal_connect (button, "enter_notify_event",
+		    G_CALLBACK (link_button_enter), data);
+  g_signal_connect (button, "leave_notify_event",
+		    G_CALLBACK (link_button_leave), data);

  return button;
 }
@@ -1764,6 +1827,7 @@ add_credits_page (GtkAboutDialog *about,
  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
  gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+
  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 8);
  gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 8);

@@ -1777,6 +1841,8 @@ add_credits_page (GtkAboutDialog *about,
                    G_CALLBACK (credits_visibility_notify_event), about);

  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+  				       GTK_SHADOW_IN);
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
 				  GTK_POLICY_AUTOMATIC,
 				  GTK_POLICY_AUTOMATIC);
@@ -1892,9 +1958,10 @@ display_credits_dialog (GtkWidget *button,
  g_signal_connect (dialog, "destroy",
 		    G_CALLBACK (gtk_widget_destroyed),
 		    &(priv->credits_dialog));
+  g_signal_connect (dialog, "style_set",
+		    G_CALLBACK (dialog_style_set), NULL);

  notebook = gtk_notebook_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (notebook), 8);
  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, TRUE, TRUE, 0);

  if (priv->authors != NULL) 
@@ -1922,6 +1989,14 @@ display_credits_dialog (GtkWidget *button,
  gtk_widget_show_all (dialog);
 }

+static void
+set_policy (GtkWidget *sw)
+{
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+				  GTK_POLICY_AUTOMATIC,
+				  GTK_POLICY_AUTOMATIC);  
+}
+
 static void
 display_license_dialog (GtkWidget *button, 
 			gpointer   data)
@@ -1954,14 +2029,16 @@ display_license_dialog (GtkWidget *button,
  g_signal_connect (dialog, "destroy",
 		    G_CALLBACK (gtk_widget_destroyed),
 		    &(priv->license_dialog));
+  g_signal_connect (dialog, "style_set",
+		    G_CALLBACK (dialog_style_set), NULL);

  sw = gtk_scrolled_window_new (NULL, NULL);
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
 				       GTK_SHADOW_IN);
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				  GTK_POLICY_AUTOMATIC,
+				  GTK_POLICY_NEVER,
 				  GTK_POLICY_AUTOMATIC);
-  gtk_container_set_border_width (GTK_CONTAINER (sw), 8);
+  g_signal_connect (sw, "map", G_CALLBACK (set_policy), NULL);
  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), sw, TRUE, TRUE, 0);

  view = gtk_text_view_new ();
@@ -1970,6 +2047,7 @@ display_license_dialog (GtkWidget *button,

  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
  gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+
  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 8);
  gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 8);

@@ -376,7 +376,7 @@ gtk_button_box_get_child_secondary (GtkButtonBox *widget,
 *
 * This group appears after the other children if the style
 * is %GTK_BUTTONBOX_START, %GTK_BUTTONBOX_SPREAD or
- * %GTK_BUTTONBOX_EDGE, and before the the other children if the style
+ * %GTK_BUTTONBOX_EDGE, and before the other children if the style
 * is %GTK_BUTTONBOX_END. For horizontal button boxes, the definition
 * of before/after depends on direction of the widget (see
 * gtk_widget_set_direction()). If the style is %GTK_BUTTONBOX_START
@@ -1746,7 +1746,7 @@ gtk_button_grab_notify (GtkWidget *widget,
 * @image: a widget to set as the image for the button
 *
 * Set the image of @button to the given widget. Note that
- * it depends on the show-button-images setting whether the
+ * it depends on the gtk-button-images setting whether the
 * image will be displayed or not.
 *
 * Since: 2.6
@@ -1364,7 +1364,7 @@ gtk_container_set_focus_child (GtkContainer *container,
 * gtk_container_get_children:
 * @container: a #GtkContainer.
 * 
- * Returns the the container's non-internal children. See
+ * Returns the container's non-internal children. See
 * gtk_container_forall() for details on what constitutes an "internal" child. 
 *
 * Return value: a newly-allocated list of the container's non-internal children.
@@ -345,10 +345,16 @@ gtk_dialog_map (GtkWidget *widget)
  if (!window->focus_widget)
    {
      GList *children, *tmp_list;
+      GtkWidget *first_focus = NULL;
      
      do 
 	{
 	  g_signal_emit_by_name (window, "move_focus", GTK_DIR_TAB_FORWARD);
+
+	  if (first_focus == NULL)
+	    first_focus = window->focus_widget;
+	  else if (first_focus == window->focus_widget)
+	    break;
 	}
      while (GTK_IS_LABEL (window->focus_widget));

@@ -2700,7 +2700,7 @@ gtk_drag_set_icon_pixbuf  (GdkDragContext *context,
 * @hot_x: the X offset within the icon of the hotspot.
 * @hot_y: the Y offset within the icon of the hotspot.
 * 
- * Sets the the icon for a given drag from a stock ID.
+ * Sets the icon for a given drag from a stock ID.
 **/
 void 
 gtk_drag_set_icon_stock  (GdkDragContext *context,
@@ -3500,7 +3500,7 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
 					gtk_drag_key_cb,
 					info);

-  /* Send on a release pair to the the original 
+  /* Send on a release pair to the original 
   * widget to convince it to release its grab. We need to
   * call gtk_propagate_event() here, instead of 
   * gtk_widget_event() because widget like GtkList may
@@ -2968,14 +2968,17 @@ gtk_entry_create_layout (GtkEntry *entry,
 	    {
 	      GdkDisplay *display = gtk_widget_get_display (widget);
 	      GdkKeymap *keymap = gdk_keymap_get_for_display (display);
-	      pango_dir = gdk_keymap_get_direction (keymap);
+	      if (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_RTL)
+		pango_dir = PANGO_DIRECTION_RTL;
+	      else
+		pango_dir = PANGO_DIRECTION_LTR;
 	    }
          else
 	    {
-	      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
-		pango_dir = PANGO_DIRECTION_LTR;
-	      else
+	      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
 		pango_dir = PANGO_DIRECTION_RTL;
+	      else
+		pango_dir = PANGO_DIRECTION_LTR;
 	    }
        }

@@ -3391,7 +3394,7 @@ gtk_entry_adjust_scroll (GtkEntry *entry)
   * the right, when the scroll is at the utmost right. This
   * looks better to to me than confining the cursor inside the
   * border entirely, though it means that the cursor gets one
-   * pixel closer to the the edge of the widget on the right than
+   * pixel closer to the edge of the widget on the right than
   * on the left. This might need changing if one changed
   * INNER_BORDER from 2 to 1, as one would do on a
   * small-screen-real-estate display.
@@ -5178,7 +5181,8 @@ gtk_entry_completion_changed (GtkWidget *entry,
    return;

  /* no need to normalize for this test */
-  if (! strcmp ("", gtk_entry_get_text (GTK_ENTRY (entry))))
+  if (completion->priv->minimum_key_length > 0 &&
+      strcmp ("", gtk_entry_get_text (GTK_ENTRY (entry))) == 0)
    {
      if (GTK_WIDGET_VISIBLE (completion->priv->popup_window))
        _gtk_entry_completion_popdown (completion);
@@ -278,7 +278,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                                   g_param_spec_int ("minimum_key_length",
                                                     P_("Minimum Key Length"),
                                                     P_("Minimum length of the search key in order to look up matches"),
-                                                     -1,
+                                                     0,
                                                     G_MAXINT,
                                                     1,
                                                     G_PARAM_READWRITE));
@@ -942,6 +942,8 @@ gtk_entry_completion_set_model (GtkEntryCompletion *completion,
                           GTK_TREE_MODEL (completion->priv->filter_model));
  g_object_unref (completion->priv->filter_model);

+  g_object_notify (G_OBJECT (completion), "model");
+
  if (GTK_WIDGET_VISIBLE (completion->priv->popup_window))
    _gtk_entry_completion_resize_popup (completion);
 }
@@ -1014,9 +1016,14 @@ gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion *completion,
                                             gint                length)
 {
  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (completion));
-  g_return_if_fail (length >= 1);
+  g_return_if_fail (length >= 0);

-  completion->priv->minimum_key_length = length;
+  if (completion->priv->minimum_key_length != length)
+    {
+      completion->priv->minimum_key_length = length;
+     
+      g_object_notify (G_OBJECT (completion), "minimum_key_length");
+    }
 }

 /**
@@ -433,7 +433,7 @@ gtk_file_chooser_get_filename (GtkFileChooser *chooser)
 * @chooser: a #GtkFileChooser
 * @filename: the filename to set as current
 * 
- * Sets @filename as the current filename for the the file chooser;
+ * Sets @filename as the current filename for the file chooser;
 * If the file name isn't in the current folder of @chooser, then the
 * current folder of @chooser will be changed to the folder containing
 * @filename. This is equivalent to a sequence of
@@ -721,7 +721,7 @@ gtk_file_chooser_get_uri (GtkFileChooser *chooser)
 * @chooser: a #GtkFileChooser
 * @uri: the URI to set as current
 * 
- * Sets the file referred to by @uri as the current file for the the
+ * Sets the file referred to by @uri as the current file for the
 * file chooser; If the file name isn't in the current folder of @chooser,
 * then the current folder of @chooser will be changed to the folder containing
 * @uri. This is equivalent to a sequence of gtk_file_chooser_unselect_all()
@@ -85,8 +85,10 @@ typedef struct _GtkFileChooserDefaultClass GtkFileChooserDefaultClass;
 #define GTK_FILE_CHOOSER_DEFAULT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DEFAULT, GtkFileChooserDefaultClass))

 typedef enum {
-	LOAD_LOADING,
-	LOAD_FINISHED
+  LOAD_EMPTY,			/* There is no model */
+  LOAD_PRELOAD,			/* Model is loading and a timer is running; model isn't inserted into the tree yet */
+  LOAD_LOADING,			/* Timeout expired, model is inserted into the tree, but not fully loaded yet */
+  LOAD_FINISHED			/* Model is fully loaded and inserted into the tree */
 } LoadState;

 #define MAX_LOADING_TIME 500
@@ -96,12 +98,6 @@ struct _GtkFileChooserDefaultClass
  GtkVBoxClass parent_class;
 };

-typedef enum {
-  PENDING_OP_NONE,
-  PENDING_OP_SELECT_PATH,
-  PENDING_OP_SELECT_FIRST
-} PendingOp;
-
 struct _GtkFileChooserDefault
 {
  GtkVBox parent_instance;
@@ -148,8 +144,7 @@ struct _GtkFileChooserDefault
  LoadState load_state;
  guint load_timeout_id;

-  PendingOp pending_op;
-  GtkFilePath *pending_select_path;
+  GSList *pending_select_paths;

  GtkFileFilter *current_filter;
  GSList *filters;
@@ -278,7 +273,7 @@ typedef enum {
 } ShortcutsIndex;

 /* Icon size for if we can't get it from the theme */
-#define FALLBACK_ICON_SIZE 20
+#define FALLBACK_ICON_SIZE 16

 #define PREVIEW_HBOX_SPACING 12
 #define NUM_LINES 40
@@ -376,6 +371,8 @@ static gboolean shortcuts_select_func   (GtkTreeSelection      *selection,
 					 GtkTreePath           *path,
 					 gboolean               path_currently_selected,
 					 gpointer               data);
+static gboolean shortcuts_get_selected  (GtkFileChooserDefault *impl,
+					 GtkTreeIter           *iter);
 static void shortcuts_activate_iter (GtkFileChooserDefault *impl,
 				     GtkTreeIter           *iter);
 static int shortcuts_get_index (GtkFileChooserDefault *impl,
@@ -666,9 +663,8 @@ gtk_file_chooser_default_init (GtkFileChooserDefault *impl)
  impl->select_multiple = FALSE;
  impl->show_hidden = FALSE;
  impl->icon_size = FALLBACK_ICON_SIZE;
-  impl->load_state = LOAD_FINISHED;
-  impl->pending_op = PENDING_OP_NONE;
-  impl->pending_select_path = NULL;
+  impl->load_state = LOAD_EMPTY;
+  impl->pending_select_paths = NULL;

  gtk_widget_set_redraw_on_allocate (GTK_WIDGET (impl), TRUE);
  gtk_box_set_spacing (GTK_BOX (impl), 12);
@@ -729,6 +725,61 @@ shortcuts_free (GtkFileChooserDefault *impl)
  impl->shortcuts_model = NULL;
 }

+static void
+pending_select_paths_free (GtkFileChooserDefault *impl)
+{
+  GSList *l;
+
+  for (l = impl->pending_select_paths; l; l = l->next)
+    {
+      GtkFilePath *path;
+
+      path = l->data;
+      gtk_file_path_free (path);
+    }
+
+  g_slist_free (impl->pending_select_paths);
+  impl->pending_select_paths = NULL;
+}
+
+static void
+pending_select_paths_add (GtkFileChooserDefault *impl,
+			  const GtkFilePath     *path)
+{
+  impl->pending_select_paths = g_slist_prepend (impl->pending_select_paths, gtk_file_path_copy (path));
+}
+
+/* Used from gtk_tree_selection_selected_foreach() */
+static void
+store_selection_foreach (GtkTreeModel *model,
+			 GtkTreePath  *path,
+			 GtkTreeIter  *iter,
+			 gpointer      data)
+{
+  GtkFileChooserDefault *impl;
+  GtkTreeIter child_iter;
+  const GtkFilePath *file_path;
+
+  impl = GTK_FILE_CHOOSER_DEFAULT (data);
+
+  gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, iter);
+
+  file_path = _gtk_file_system_model_get_path (impl->browse_files_model, &child_iter);
+  pending_select_paths_add (impl, file_path);
+}
+
+/* Stores the current selection in the list of paths to select; this is used to
+ * preserve the selection when reloading the current folder.
+ */
+static void
+pending_select_paths_store_selection (GtkFileChooserDefault *impl)
+{
+  GtkTreeSelection *selection;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+  gtk_tree_selection_selected_foreach (selection, store_selection_foreach, impl);
+}
+
 static void
 gtk_file_chooser_default_finalize (GObject *object)
 {
@@ -767,11 +818,7 @@ gtk_file_chooser_default_finalize (GObject *object)
  if (impl->preview_path)
    gtk_file_path_free (impl->preview_path);

-  if (impl->pending_op == PENDING_OP_SELECT_PATH)
-    {
-      g_assert (impl->pending_select_path != NULL);
-      gtk_file_path_free (impl->pending_select_path);
-    }
+  pending_select_paths_free (impl);

  load_remove_timer (impl);

@@ -1056,9 +1103,9 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)
  } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model),&iter));
 }

-/* If a shortcut corresponds to the current folder, selects it */
-static void
-shortcuts_find_current_folder (GtkFileChooserDefault *impl)
+static void 
+shortcuts_find_folder (GtkFileChooserDefault *impl,
+		       GtkFilePath           *folder)
 {
  GtkTreeSelection *selection;
  int pos;
@@ -1066,8 +1113,8 @@ shortcuts_find_current_folder (GtkFileChooserDefault *impl)

  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));

-  g_assert (impl->current_folder != NULL);
-  pos = shortcut_find_position (impl, impl->current_folder);
+  g_assert (folder != NULL);
+  pos = shortcut_find_position (impl, folder);
  if (pos == -1)
    {
      gtk_tree_selection_unselect_all (selection);
@@ -1079,6 +1126,13 @@ shortcuts_find_current_folder (GtkFileChooserDefault *impl)
  gtk_tree_path_free (path);
 }

+/* If a shortcut corresponds to the current folder, selects it */
+static void
+shortcuts_find_current_folder (GtkFileChooserDefault *impl)
+{
+  shortcuts_find_folder (impl, impl->current_folder);
+}
+
 /* Convenience function to get the display name and icon info for a path */
 static GtkFileInfo *
 get_file_info (GtkFileSystem      *file_system, 
@@ -1452,10 +1506,41 @@ shortcuts_add_bookmarks (GtkFileChooserDefault *impl)
 {
  GSList *bookmarks;
  gboolean old_changing_folders;
-
+  GtkTreeIter iter;
+  GtkFilePath *list_selected = NULL;
+  GtkFilePath *combo_selected = NULL;
+  gboolean is_volume;
+  gpointer col_data;
+        
  old_changing_folders = impl->changing_folder;
  impl->changing_folder = TRUE;

+  if (shortcuts_get_selected (impl, &iter))
+    {
+      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
+			  &iter, 
+			  SHORTCUTS_COL_DATA, &col_data,
+			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+			  -1);
+
+      if (col_data && !is_volume)
+	list_selected = gtk_file_path_copy (col_data);
+    }
+
+  if (impl->save_folder_combo &&
+      gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo), 
+				     &iter))
+    {
+      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
+			  &iter, 
+			  SHORTCUTS_COL_DATA, &col_data,
+			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+			  -1);
+      
+      if (col_data && !is_volume)
+	combo_selected = gtk_file_path_copy (col_data);
+    }
+
  if (impl->num_bookmarks > 0)
    shortcuts_remove_rows (impl,
 			   shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR),
@@ -1466,12 +1551,28 @@ shortcuts_add_bookmarks (GtkFileChooserDefault *impl)
  gtk_file_paths_free (bookmarks);

  if (impl->num_bookmarks > 0)
-    {
-      shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
-    }
+    shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
+
  if (impl->shortcuts_filter_model)
    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model));

+  if (list_selected)
+    {
+      shortcuts_find_folder (impl, list_selected);
+      gtk_file_path_free (list_selected);
+    }
+
+  if (combo_selected)
+    {
+      gint pos;
+
+      pos = shortcut_find_position (impl, combo_selected);
+      if (pos != -1)
+	gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), 
+				  pos);
+      gtk_file_path_free (combo_selected);
+    }
+  
  impl->changing_folder = old_changing_folders;
 }

@@ -1918,6 +2019,9 @@ shortcuts_get_selected (GtkFileChooserDefault *impl,
  GtkTreeSelection *selection;
  GtkTreeIter parent_iter;

+  if (!impl->browse_shortcuts_tree_view)
+    return FALSE;
+
  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));

  if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
@@ -3957,7 +4061,7 @@ change_icon_theme (GtkFileChooserDefault *impl)

  settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));

-  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_SMALL_TOOLBAR, &width, &height))
+  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &width, &height))
    impl->icon_size = MAX (width, height);
  else
    impl->icon_size = FALLBACK_ICON_SIZE;
@@ -4038,7 +4142,7 @@ gtk_file_chooser_default_screen_changed (GtkWidget *widget,

 static gboolean
 get_is_file_filtered (GtkFileChooserDefault *impl,
-		      GtkFilePath           *path,
+		      const GtkFilePath     *path,
 		      GtkFileInfo           *file_info)
 {
  GtkFileFilterInfo filter_info;
@@ -4094,7 +4198,10 @@ gtk_file_chooser_default_map (GtkWidget *widget)
  GTK_WIDGET_CLASS (parent_class)->map (widget);

  if (impl->current_folder)
-    change_folder_and_display_error (impl, impl->current_folder);
+    {
+      pending_select_paths_store_selection (impl);
+      change_folder_and_display_error (impl, impl->current_folder);
+    }

  bookmarks_changed_cb (impl->file_system, impl);
 }
@@ -4278,12 +4385,12 @@ load_timeout_cb (gpointer data)
  GDK_THREADS_ENTER ();

  impl = GTK_FILE_CHOOSER_DEFAULT (data);
-  g_assert (impl->load_state == LOAD_LOADING);
+  g_assert (impl->load_state == LOAD_PRELOAD);
  g_assert (impl->load_timeout_id != 0);
  g_assert (impl->browse_files_model != NULL);

  impl->load_timeout_id = 0;
-  impl->load_state = LOAD_FINISHED;
+  impl->load_state = LOAD_LOADING;

  load_set_model (impl);

@@ -4297,10 +4404,10 @@ static void
 load_setup_timer (GtkFileChooserDefault *impl)
 {
  g_assert (impl->load_timeout_id == 0);
-  g_assert (impl->load_state == LOAD_FINISHED);
+  g_assert (impl->load_state != LOAD_PRELOAD);

  impl->load_timeout_id = g_timeout_add (MAX_LOADING_TIME, load_timeout_cb, impl);
-  impl->load_state = LOAD_LOADING;
+  impl->load_state = LOAD_PRELOAD;
 }

 /* Removes the load timeout and switches to the LOAD_FINISHED state */
@@ -4309,37 +4416,16 @@ load_remove_timer (GtkFileChooserDefault *impl)
 {
  if (impl->load_timeout_id != 0)
    {
-      g_assert (impl->load_state == LOAD_LOADING);
+      g_assert (impl->load_state == LOAD_PRELOAD);

      g_source_remove (impl->load_timeout_id);
      impl->load_timeout_id = 0;
-      impl->load_state = LOAD_FINISHED;
+      impl->load_state = LOAD_EMPTY;
    }
  else
-    g_assert (impl->load_state == LOAD_FINISHED);
-}
-
-/* Queues a pending operation relative to selecting a file when the current
- * folder finishes loading.
- */
-static void
-pending_op_queue (GtkFileChooserDefault *impl, PendingOp op, const GtkFilePath *path)
-{
-  if (impl->pending_op == PENDING_OP_SELECT_PATH)
-    {
-      g_assert (impl->pending_select_path != NULL);
-      gtk_file_path_free (impl->pending_select_path);
-
-      impl->pending_select_path = NULL;
-    }
-
-  impl->pending_op = op;
-
-  if (impl->pending_op == PENDING_OP_SELECT_PATH)
-    {
-      g_assert (path != NULL);
-      impl->pending_select_path = gtk_file_path_copy (path);
-    }
+    g_assert (impl->load_state == LOAD_EMPTY ||
+	      impl->load_state == LOAD_LOADING ||
+	      impl->load_state == LOAD_FINISHED);
 }

 /* Selects the first row in the file list */
@@ -4356,6 +4442,11 @@ browse_files_select_first_row (GtkFileChooserDefault *impl)
  gtk_tree_path_free (path);
 }

+struct center_selected_row_closure {
+  GtkFileChooserDefault *impl;
+  gboolean already_centered;
+};
+
 /* Callback used from gtk_tree_selection_selected_foreach(); centers the
 * selected row in the tree view.
 */
@@ -4365,52 +4456,159 @@ center_selected_row_foreach_cb (GtkTreeModel      *model,
 				GtkTreeIter       *iter,
 				gpointer           data)
 {
-  GtkFileChooserDefault *impl;
+  struct center_selected_row_closure *closure;

-  impl = GTK_FILE_CHOOSER_DEFAULT (data);
-  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (impl->browse_files_tree_view), path, NULL, TRUE, 0.5, 0.0);
+  closure = data;
+  if (closure->already_centered)
+    return;
+
+  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (closure->impl->browse_files_tree_view), path, NULL, TRUE, 0.5, 0.0);
+  closure->already_centered = TRUE;
 }

 /* Centers the selected row in the tree view */
 static void
 browse_files_center_selected_row (GtkFileChooserDefault *impl)
 {
+  struct center_selected_row_closure closure;
  GtkTreeSelection *selection;

+  closure.impl = impl;
+  closure.already_centered = FALSE;
+
  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
-  gtk_tree_selection_selected_foreach (selection, center_selected_row_foreach_cb, impl);
+  gtk_tree_selection_selected_foreach (selection, center_selected_row_foreach_cb, &closure);
+}
+
+static gboolean
+show_and_select_paths (GtkFileChooserDefault *impl,
+		       const GtkFilePath     *parent_path,
+		       const GtkFilePath     *only_one_path,
+		       GSList                *paths,
+		       GError               **error)
+{
+  GtkFileFolder *folder;
+  gboolean success;
+  gboolean have_hidden;
+  gboolean have_filtered;
+
+  if (!only_one_path && !paths)
+    return TRUE;
+
+  folder = gtk_file_system_get_folder (impl->file_system, parent_path, GTK_FILE_INFO_IS_HIDDEN, error);
+  if (!folder)
+    return FALSE;
+
+  success = FALSE;
+  have_hidden = FALSE;
+  have_filtered = FALSE;
+
+  if (only_one_path)
+    {
+      GtkFileInfo *info;
+
+      info = gtk_file_folder_get_info (folder, only_one_path, error);
+      if (info)
+	{
+	  success = TRUE;
+	  have_hidden = gtk_file_info_get_is_hidden (info);
+	  have_filtered = get_is_file_filtered (impl, only_one_path, info);
+	  gtk_file_info_free (info);
+	}
+    }
+  else
+    {
+      GSList *l;
+
+      for (l = paths; l; l = l->next)
+	{
+	  const GtkFilePath *path;
+	  GtkFileInfo *info;
+
+	  path = l->data;
+
+	  /* NULL GError */
+	  info = gtk_file_folder_get_info (folder, path, NULL);
+	  if (info)
+	    {
+	      if (!have_hidden)
+		have_hidden = gtk_file_info_get_is_hidden (info);
+
+	      if (!have_filtered)
+		have_filtered = get_is_file_filtered (impl, path, info);
+
+	      gtk_file_info_free (info);
+
+	      if (have_hidden && have_filtered)
+		break; /* we now have all the information we need */
+	    }
+	}
+
+      success = TRUE;
+    }
+
+  g_object_unref (folder);
+
+  if (!success)
+    return FALSE;
+
+  if (have_hidden)
+    g_object_set (impl, "show-hidden", TRUE, NULL);
+
+  if (have_filtered)
+    set_current_filter (impl, NULL);
+
+  if (only_one_path)
+    _gtk_file_system_model_path_do (impl->browse_files_model, only_one_path, select_func, impl);
+  else
+    {
+      GSList *l;
+
+      for (l = paths; l; l = l->next)
+	{
+	  const GtkFilePath *path;
+
+	  path = l->data;
+	  _gtk_file_system_model_path_do (impl->browse_files_model, path, select_func, impl);
+	}
+    }
+
+  return TRUE;
 }

 /* Processes the pending operation when a folder is finished loading */
 static void
-pending_op_process (GtkFileChooserDefault *impl)
+pending_select_paths_process (GtkFileChooserDefault *impl)
 {
-  switch (impl->pending_op)
+  g_assert (impl->load_state == LOAD_FINISHED);
+  g_assert (impl->browse_files_model != NULL);
+  g_assert (impl->sort_model != NULL);
+
+  if (impl->pending_select_paths)
    {
-    case PENDING_OP_NONE:
-      break;
-
-    case PENDING_OP_SELECT_PATH:
-      g_assert (impl->pending_select_path != NULL);
-
-      _gtk_file_system_model_path_do (impl->browse_files_model, impl->pending_select_path, select_func, impl);
-      gtk_file_path_free (impl->pending_select_path);
-      impl->pending_select_path = NULL;
-      impl->pending_op = PENDING_OP_NONE;
+      /* NULL GError */
+      show_and_select_paths (impl, impl->current_folder, NULL, impl->pending_select_paths, NULL);
+      pending_select_paths_free (impl);
      browse_files_center_selected_row (impl);
-      break;
-
-    case PENDING_OP_SELECT_FIRST:
-      browse_files_select_first_row (impl);
-      impl->pending_op = PENDING_OP_NONE;
-      break;
-
-    default:
-      g_assert_not_reached ();
+    }
+  else
+    {
+      /* We only select the first row if the chooser is actually mapped ---
+       * selecting the first row is to help the user when he is interacting with
+       * the chooser, but sometimes a chooser works not on behalf of the user,
+       * but rather on behalf of something else like GtkFileChooserButton.  In
+       * that case, the chooser's selection should be what the caller expects,
+       * as the user can't see that something else got selected.  See bug #165264.
+       *
+       * Also, we don't select the first file if we are in SAVE or CREATE_FOLDER
+       * modes.  Doing so would change the contents of the filename entry.
+       */
+      if (GTK_WIDGET_MAPPED (impl)
+	  && !(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
+	browse_files_select_first_row (impl);
    }

-  g_assert (impl->pending_op == PENDING_OP_NONE);
-  g_assert (impl->pending_select_path == NULL);
+  g_assert (impl->pending_select_paths == NULL);
 }

 /* Callback used when the file system model finishes loading */
@@ -4418,15 +4616,28 @@ static void
 browse_files_model_finished_loading_cb (GtkFileSystemModel    *model,
 					GtkFileChooserDefault *impl)
 {
-  if (impl->load_state == LOAD_LOADING)
+  if (impl->load_state == LOAD_PRELOAD)
    {
      load_remove_timer (impl);
      load_set_model (impl);
    }
+  else if (impl->load_state == LOAD_LOADING)
+    {
+      /* Nothing */
+    }
  else
-    g_assert (impl->load_state == LOAD_FINISHED);
+    {
+      /* We can't g_assert_not_reached(), as something other than us may have
+       *  initiated a folder reload.  See #165556.
+       */
+      return;
+    }

-  pending_op_process (impl);
+  g_assert (impl->load_timeout_id == 0);
+
+  impl->load_state = LOAD_FINISHED;
+
+  pending_select_paths_process (impl);
  set_busy_cursor (impl, FALSE);
 }

@@ -4437,7 +4648,7 @@ set_list_model (GtkFileChooserDefault *impl,
 {
  g_assert (impl->current_folder != NULL);

-  load_remove_timer (impl);
+  load_remove_timer (impl); /* This changes the state to LOAD_EMPTY */

  if (impl->browse_files_model)
    {
@@ -4464,7 +4675,7 @@ set_list_model (GtkFileChooserDefault *impl,
      return FALSE;
    }

-  load_setup_timer (impl);
+  load_setup_timer (impl); /* This changes the state to LOAD_PRELOAD */

  g_signal_connect (impl->browse_files_model, "finished-loading",
 		    G_CALLBACK (browse_files_model_finished_loading_cb), impl);
@@ -4603,13 +4814,13 @@ select_func (GtkFileSystemModel *model,
 	     gpointer            user_data)
 {
  GtkFileChooserDefault *impl = user_data;
-  GtkTreeView *tree_view = GTK_TREE_VIEW (impl->browse_files_tree_view);
-  GtkTreePath *sorted_path;
+  GtkTreeSelection *selection;
+  GtkTreeIter sorted_iter;

-  sorted_path = gtk_tree_model_sort_convert_child_path_to_path (impl->sort_model, path);
-  gtk_tree_view_set_cursor (tree_view, sorted_path, NULL, FALSE);
-  gtk_tree_view_scroll_to_cell (tree_view, sorted_path, NULL, FALSE, 0.0, 0.0);
-  gtk_tree_path_free (sorted_path);
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+
+  gtk_tree_model_sort_convert_child_iter_to_iter (impl->sort_model, &sorted_iter, iter);
+  gtk_tree_selection_select_iter (selection, &sorted_iter);
 }

 static gboolean
@@ -4619,54 +4830,44 @@ gtk_file_chooser_default_select_path (GtkFileChooser    *chooser,
 {
  GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
  GtkFilePath *parent_path;
+  gboolean same_path;

  if (!gtk_file_system_get_parent (impl->file_system, path, &parent_path, error))
    return FALSE;

  if (!parent_path)
    return _gtk_file_chooser_set_current_folder_path (chooser, path, error);
+
+  if (impl->load_state == LOAD_EMPTY)
+    same_path = FALSE;
  else
    {
-      gboolean result;
-      GtkFileFolder *folder;
-      GtkFileInfo *info;
-      gboolean is_hidden, is_filtered;
+      g_assert (impl->current_folder != NULL);

-      result = _gtk_file_chooser_set_current_folder_path (chooser, parent_path, error);
-
-      if (!result)
-	{
-	  gtk_file_path_free (parent_path);
-	  return result;
-	}
-
-      folder = gtk_file_system_get_folder (impl->file_system, parent_path, GTK_FILE_INFO_IS_HIDDEN, error);
-      gtk_file_path_free (parent_path);
-
-      if (!folder)
-	return FALSE;
-
-      info = gtk_file_folder_get_info (folder, path, error);
-      g_object_unref (folder);
-
-      if (!info)
-	return FALSE;
-
-      is_hidden   = gtk_file_info_get_is_hidden (info);
-      is_filtered = get_is_file_filtered (impl, (GtkFilePath *) path, info);
-      gtk_file_info_free (info);
-
-      if (is_hidden)
-	g_object_set (impl, "show-hidden", TRUE, NULL);
-
-      if (is_filtered)
-	set_current_filter (impl, NULL);
-
-      pending_op_queue (impl, PENDING_OP_SELECT_PATH, path);
-      return TRUE;
+      same_path = gtk_file_path_compare (parent_path, impl->current_folder) == 0;
    }

-  g_assert_not_reached ();
+  if (same_path && impl->load_state == LOAD_FINISHED)
+    {
+      gboolean result;
+
+      result = show_and_select_paths (impl, parent_path, path, NULL, error);
+      gtk_file_path_free (parent_path);
+      return result;
+    }
+
+  pending_select_paths_add (impl, path);
+
+  if (!same_path)
+    {
+      gboolean result;
+
+      result = _gtk_file_chooser_set_current_folder_path (chooser, parent_path, error);
+      gtk_file_path_free (parent_path);
+      return result;
+    }
+
+  return TRUE;
 }

 static void
@@ -5268,7 +5469,6 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
      if (num_selected == 1 && all_folders)
 	{
 	  switch_to_selected_folder (impl);
-	  pending_op_queue (impl, PENDING_OP_SELECT_FIRST, NULL);
 	  return FALSE;
 	}
      else
@@ -5304,7 +5504,19 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
 	  retval = FALSE;
 	}
      else
-	retval = TRUE;
+	{
+	  /* check that everything up to the last component exists */
+	  gtk_file_path_free (path);
+	  path = gtk_file_path_copy (_gtk_file_chooser_entry_get_current_folder (entry));
+	  is_folder = check_is_folder (impl->file_system, path, NULL);
+	  if (!is_folder)
+	    {
+	      change_folder_and_display_error (impl, path);
+	      retval = FALSE;
+	    }
+	  else
+	    retval = TRUE;
+	}

      gtk_file_path_free (path);
      return retval;
@@ -5358,14 +5570,7 @@ gtk_file_chooser_default_initial_focus (GtkFileChooserEmbed *chooser_embed)

  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
      || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
-    {
-      if (impl->load_state == LOAD_FINISHED)
-	browse_files_select_first_row (impl);
-      else
-	pending_op_queue (impl, PENDING_OP_SELECT_FIRST, NULL);
-
-      widget = impl->browse_files_tree_view;
-    }
+    widget = impl->browse_files_tree_view;
  else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
 	   || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
    widget = impl->save_file_name_entry;
@@ -5577,7 +5782,6 @@ shortcuts_row_activated_cb (GtkTreeView           *tree_view,
 						    &child_iter,
 						    &iter);
  shortcuts_activate_iter (impl, &child_iter);
-  pending_op_queue (impl, PENDING_OP_SELECT_FIRST, NULL);

  gtk_widget_grab_focus (impl->browse_files_tree_view);
 }
@@ -6184,7 +6388,7 @@ location_popup_handler (GtkFileChooserDefault *impl,
 static void
 up_folder_handler (GtkFileChooserDefault *impl)
 {
-  pending_op_queue (impl, PENDING_OP_SELECT_PATH, impl->current_folder);
+  pending_select_paths_add (impl, impl->current_folder);
  _gtk_path_bar_up (GTK_PATH_BAR (impl->browse_path_bar));
 }

@@ -634,8 +634,8 @@ gtk_file_chooser_dialog_new (const gchar         *title,
 * gtk_file_chooser_dialog_new_with_backend:
 * @title: Title of the dialog, or %NULL
 * @parent: Transient parent of the dialog, or %NULL
- * @backend: The name of the specific filesystem backend to use.
 * @action: Open or save mode for the dialog
+ * @backend: The name of the specific filesystem backend to use.
 * @first_button_text: stock ID or text to go in the first button, or %NULL
 * @Varargs: response ID for the first button, then additional (button, id) pairs, ending with %NULL
 *
@@ -3056,7 +3056,7 @@ open_user_dir (const gchar     *text_to_complete,

 #endif

-/* open a directory relative the the current relative directory */
+/* open a directory relative to the current relative directory */
 static CompletionDir*
 open_relative_dir (gchar           *dir_name,
 		   CompletionDir   *dir,
@@ -1124,8 +1124,8 @@ _gtk_file_system_model_set_filter (GtkFileSystemModel      *model,
 * then unrefs all the parent nodes.
 *
 * The reason for doing this operation as a callback
- * is so that if the operation performed with the the
- * path and iter results in referencing the the node
+ * is so that if the operation performed with the
+ * path and iter results in referencing the node
 * and/or parent nodes, we don't load all the information
 * about the nodes.
 *
@@ -115,7 +115,6 @@ struct stat_info_entry {
 };

 static const GtkFileInfoType STAT_NEEDED_MASK = (GTK_FILE_INFO_IS_FOLDER |
-						 GTK_FILE_INFO_IS_HIDDEN |
 						 GTK_FILE_INFO_MODIFICATION_TIME |
 						 GTK_FILE_INFO_SIZE);

@@ -215,8 +214,8 @@ static GtkFilePath *filename_to_path   (const gchar       *filename);
 static gboolean     filename_is_root  (const char       *filename);

 static gboolean fill_in_names (GtkFileFolderUnix *folder_unix, GError **error);
-static gboolean fill_in_stats (GtkFileFolderUnix *folder_unix, GError **error);
-static gboolean fill_in_mime_type (GtkFileFolderUnix *folder_unix, GError **error);
+static void fill_in_stats (GtkFileFolderUnix *folder_unix);
+static void fill_in_mime_type (GtkFileFolderUnix *folder_unix);

 static char *       get_parent_dir    (const char       *filename);

@@ -406,29 +405,41 @@ gtk_file_system_unix_get_folder (GtkFileSystem     *file_system,
    }
  else
    {
-      if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-	{
-	  gchar *display_name = g_filename_display_name (filename);
-	  g_set_error (error,
-		       GTK_FILE_SYSTEM_ERROR,
-		       GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-		       _("Error getting information for '%s': %s"),
-		       display_name,
-		       g_strerror (ENOENT));
+      struct stat statbuf;
+      int result;
+      int code;
+      int my_errno;

-	  g_free (display_name);
-	  g_free (filename_copy);
-	  return NULL;
+      result = stat (filename, &statbuf);
+
+      if (result == 0)
+	{
+	  if (!S_ISDIR (statbuf.st_mode))
+	    {
+	      result = -1;
+	      code = GTK_FILE_SYSTEM_ERROR_NOT_FOLDER;
+	      my_errno = ENOTDIR;
+	    }
 	}
-      else if (!g_file_test (filename, G_FILE_TEST_IS_DIR))
+      else
+	{
+	  my_errno = errno;
+
+	  if (my_errno == ENOENT)
+	    code = GTK_FILE_SYSTEM_ERROR_NONEXISTENT;
+	  else
+	    code = GTK_FILE_SYSTEM_ERROR_FAILED;
+	}
+
+      if (result != 0)
 	{
 	  gchar *display_name = g_filename_display_name (filename);
 	  g_set_error (error,
 		       GTK_FILE_SYSTEM_ERROR,
-		       GTK_FILE_SYSTEM_ERROR_NOT_FOLDER,
+		       code,
 		       _("Error getting information for '%s': %s"),
 		       display_name,
-		       g_strerror (ENOTDIR));
+		       g_strerror (my_errno));

 	  g_free (display_name);
 	  g_free (filename_copy);
@@ -449,16 +460,11 @@ gtk_file_system_unix_get_folder (GtkFileSystem     *file_system,
 			   folder_unix);
    }

-  if ((types & STAT_NEEDED_MASK) && !fill_in_stats (folder_unix, error))
-    {
-      g_object_unref (folder_unix);
-      return NULL;
-    }
-  if ((types & GTK_FILE_INFO_MIME_TYPE) && !fill_in_mime_type (folder_unix, error))
-    {
-      g_object_unref (folder_unix);
-      return NULL;
-    }
+  if ((types & STAT_NEEDED_MASK) != 0)
+    fill_in_stats (folder_unix);
+
+  if ((types & GTK_FILE_INFO_MIME_TYPE) != 0)
+    fill_in_mime_type (folder_unix);

  return GTK_FILE_FOLDER (folder_unix);
 }
@@ -1138,13 +1144,12 @@ get_icon_type_from_path (GtkFileSystemUnix *system_unix,

  *mime_type = NULL;

-  if (folder_unix)
+  if (folder_unix && folder_unix->have_stat)
    {
      char *basename;
      struct stat_info_entry *entry;

-      if (!fill_in_stats (folder_unix, NULL))
-	return ICON_NONE;
+      g_assert (folder_unix->stat_info != NULL);

      basename = g_path_get_basename (filename);
      entry = g_hash_table_lookup (folder_unix->stat_info, basename);
@@ -1159,20 +1164,18 @@ get_icon_type_from_path (GtkFileSystemUnix *system_unix,
 	  icon_type = entry->icon_type;
 	  if (icon_type == ICON_REGULAR)
 	    {
-	      (void)fill_in_mime_type (folder_unix, NULL);
+	      fill_in_mime_type (folder_unix);
 	      *mime_type = entry->mime_type;
 	    }
+
+	  return icon_type;
 	}
-      else
-	icon_type = ICON_NONE;
-    }
-  else
-    {
-      icon_type = get_icon_type (filename, NULL);
-      if (icon_type == ICON_REGULAR)
-	*mime_type = xdg_mime_get_mime_type_for_file (filename);
    }

+  icon_type = get_icon_type (filename, NULL);
+  if (icon_type == ICON_REGULAR)
+    *mime_type = xdg_mime_get_mime_type_for_file (filename);
+
  return icon_type;
 }

@@ -1677,6 +1680,141 @@ gtk_file_folder_unix_finalize (GObject *object)
  folder_parent_class->finalize (object);
 }

+/* Creates a GtkFileInfo for "/" by stat()ing it */
+static GtkFileInfo *
+file_info_for_root_with_error (const char  *root_name,
+			       GError     **error)
+{
+  struct stat statbuf;
+  GtkFileInfo *info;
+
+  if (stat (root_name, &statbuf) != 0)
+    {
+      int saved_errno;
+
+      saved_errno = errno; 
+      g_set_error (error,
+		   GTK_FILE_SYSTEM_ERROR,
+		   GTK_FILE_SYSTEM_ERROR_FAILED,
+		   _("Error getting information for '/': %s"),
+		   g_strerror (saved_errno));
+
+      return NULL;
+    }
+
+  info = gtk_file_info_new ();
+  gtk_file_info_set_display_name (info, "/");
+  gtk_file_info_set_is_folder (info, TRUE);
+  gtk_file_info_set_is_hidden (info, FALSE);
+  gtk_file_info_set_mime_type (info, "x-directory/normal");
+  gtk_file_info_set_modification_time (info, statbuf.st_mtime);
+  gtk_file_info_set_size (info, statbuf.st_size);
+
+  return info;
+}
+
+static gboolean
+stat_with_error (const char   *filename,
+		 struct stat  *statbuf,
+		 GError      **error)
+{
+  if (stat (filename, statbuf) == -1 &&
+      (errno != ENOENT || lstat (filename, statbuf) == -1))
+    {
+      int saved_errno;
+      int code;
+      char *display_name;
+
+      saved_errno = errno;
+
+      if (saved_errno == ENOENT)
+	code = GTK_FILE_SYSTEM_ERROR_NONEXISTENT;
+      else
+	code = GTK_FILE_SYSTEM_ERROR_FAILED;
+
+      display_name = g_filename_display_name (filename);
+      g_set_error (error,
+		   GTK_FILE_SYSTEM_ERROR,
+		   code,
+		   _("Error getting information for '%s': %s"),
+		   display_name,
+		   g_strerror (saved_errno));
+
+      g_free (display_name);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Creates a new GtkFileInfo from the specified data */
+static GtkFileInfo *
+create_file_info (const char     *filename,
+		  const char     *basename,
+		  GtkFileInfoType types,
+		  struct stat    *statbuf,
+		  const char     *mime_type)
+{
+  GtkFileInfo *info;
+
+  info = gtk_file_info_new ();
+  
+  if (types & GTK_FILE_INFO_DISPLAY_NAME)
+    {
+      gchar *display_name = g_filename_display_basename (filename);
+      gtk_file_info_set_display_name (info, display_name);
+      g_free (display_name);
+    }
+
+  if (types & GTK_FILE_INFO_IS_HIDDEN)
+    gtk_file_info_set_is_hidden (info, basename[0] == '.');
+
+  if (types & GTK_FILE_INFO_IS_FOLDER)
+    gtk_file_info_set_is_folder (info, S_ISDIR (statbuf->st_mode));
+
+  if (types & GTK_FILE_INFO_MIME_TYPE)
+    gtk_file_info_set_mime_type (info, mime_type);
+
+  if (types & GTK_FILE_INFO_MODIFICATION_TIME)
+    gtk_file_info_set_modification_time (info, statbuf->st_mtime);
+
+  if (types & GTK_FILE_INFO_SIZE)
+    gtk_file_info_set_size (info, (gint64) statbuf->st_size);
+
+  return info;
+}
+
+static struct stat_info_entry *
+create_stat_info_entry_and_emit_add (GtkFileFolderUnix *folder_unix,
+				     const char        *filename,
+				     const char        *basename,
+				     struct stat       *statbuf)
+{
+  GSList *paths;
+  GtkFilePath *path;
+  struct stat_info_entry *entry;
+
+  entry = g_new0 (struct stat_info_entry, 1);
+
+  if ((folder_unix->types & STAT_NEEDED_MASK) != 0)
+    entry->statbuf = *statbuf;
+
+  if ((folder_unix->types & GTK_FILE_INFO_MIME_TYPE) != 0)
+    entry->mime_type = g_strdup (xdg_mime_get_mime_type_for_file (filename));
+
+  g_hash_table_insert (folder_unix->stat_info,
+		       g_strdup (basename),
+		       entry);
+
+  path = gtk_file_path_new_dup (filename);
+  paths = g_slist_append (NULL, path);
+  g_signal_emit_by_name (folder_unix, "files-added", paths);
+  gtk_file_path_free (path);
+  g_slist_free (paths);
+
+  return entry;
+}
+
 static GtkFileInfo *
 gtk_file_folder_unix_get_info (GtkFileFolder      *folder,
 			       const GtkFilePath  *path,
@@ -1686,30 +1824,19 @@ gtk_file_folder_unix_get_info (GtkFileFolder      *folder,
  GtkFileInfo *info;
  gchar *dirname, *basename;
  const char *filename;
-  struct stat_info_entry *entry;
-  gboolean file_must_exist;
  GtkFileInfoType types;
+  struct stat statbuf;
+  const char *mime_type;

+  /* Get_info for "/" */
  if (!path)
    {
-      struct stat buf;
-
      g_return_val_if_fail (filename_is_root (folder_unix->filename), NULL);
-
-      if (stat (folder_unix->filename, &buf) != 0)
-	return NULL;
-
-      info = gtk_file_info_new ();
-      gtk_file_info_set_display_name (info, "/");
-      gtk_file_info_set_is_folder (info, TRUE);
-      gtk_file_info_set_is_hidden (info, FALSE);
-      gtk_file_info_set_mime_type (info, "x-directory/normal");
-      gtk_file_info_set_modification_time (info, buf.st_mtime);
-      gtk_file_info_set_size (info, buf.st_size);
-
-      return info;
+      return file_info_for_root_with_error (folder_unix->filename, error);
    }

+  /* Get_info for normal files */
+
  filename = gtk_file_path_get_string (path);
  g_return_val_if_fail (filename != NULL, NULL);
  g_return_val_if_fail (g_path_is_absolute (filename), NULL);
@@ -1720,56 +1847,46 @@ gtk_file_folder_unix_get_info (GtkFileFolder      *folder,

  basename = g_path_get_basename (filename);
  types = folder_unix->types;
-  file_must_exist = (types & ~GTK_FILE_INFO_DISPLAY_NAME) != 0;
-  entry = file_must_exist
-    ? g_hash_table_lookup (folder_unix->stat_info, basename)
-    : NULL;
-  /* basename freed later.  */

-  if (!file_must_exist || entry)
+  if (folder_unix->have_stat)
    {
-      info = gtk_file_info_new ();
+      struct stat_info_entry *entry;
+
+      g_assert (folder_unix->stat_info != NULL);
+      entry = g_hash_table_lookup (folder_unix->stat_info, basename);
+
+      if (!entry)
+	{
+	  if (!stat_with_error (filename, &statbuf, error))
+	    {
+	      g_free (basename);
+	      return NULL;
+	    }
+
+	  entry = create_stat_info_entry_and_emit_add (folder_unix, filename, basename, &statbuf);
+	}
+
+      info = create_file_info (filename, basename, types, &entry->statbuf, entry->mime_type);
+      g_free (basename);
+      return info;
    }
  else
    {
-      gchar *display_name = g_filename_display_name (filename);
-      g_set_error (error,
-		   GTK_FILE_SYSTEM_ERROR,
-		   GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-		   _("Error getting information for '%s'"),
-		   display_name);
-      g_free (display_name);
-      info = NULL;
-      types = 0;
+      if (!stat_with_error (filename, &statbuf, error))
+	{
+	  g_free (basename);
+	  return NULL;
+	}
+
+      if ((types & GTK_FILE_INFO_MIME_TYPE) != 0)
+	mime_type = xdg_mime_get_mime_type_for_file (filename);
+      else
+	mime_type = NULL;
+
+      info = create_file_info (filename, basename, types, &statbuf, mime_type);
+      g_free (basename);
+      return info;
    }
-
-  if (types & GTK_FILE_INFO_DISPLAY_NAME)
-    {
-      gchar *display_name = g_filename_display_basename (filename);
-
-      gtk_file_info_set_display_name (info, display_name);
-
-      g_free (display_name);
-    }
-
-  if (types & GTK_FILE_INFO_IS_HIDDEN)
-    gtk_file_info_set_is_hidden (info, basename[0] == '.');
-
-  if (types & GTK_FILE_INFO_IS_FOLDER)
-    gtk_file_info_set_is_folder (info, S_ISDIR (entry->statbuf.st_mode));
-
-  if (types & GTK_FILE_INFO_MIME_TYPE)
-    gtk_file_info_set_mime_type (info, entry->mime_type);
-
-  if (types & GTK_FILE_INFO_MODIFICATION_TIME)
-    gtk_file_info_set_modification_time (info, entry->statbuf.st_mtime);
-
-  if (types & GTK_FILE_INFO_SIZE)
-    gtk_file_info_set_size (info, (gint64)entry->statbuf.st_size);
-
-  g_free (basename);
-
-  return info;
 }


@@ -1804,7 +1921,6 @@ gtk_file_folder_unix_list_children (GtkFileFolder  *folder,
      l->data = filename_to_path (fullname);
      g_free (fullname);
    }
-  g_signal_emit_by_name (folder_unix, "finished-loading");

  return TRUE;
 }
@@ -1831,17 +1947,14 @@ fill_in_names (GtkFileFolderUnix *folder_unix, GError **error)
  if (folder_unix->stat_info)
    return TRUE;

-#if 0
-  g_print ("Reading directory %s\n", folder_unix->filename);
-#endif
-
-  folder_unix->stat_info = g_hash_table_new_full (g_str_hash, g_str_equal,
-						  (GDestroyNotify)g_free,
-						  (GDestroyNotify)free_stat_info_entry);
  dir = g_dir_open (folder_unix->filename, 0, error);
  if (!dir)
    return FALSE;

+  folder_unix->stat_info = g_hash_table_new_full (g_str_hash, g_str_equal,
+						  (GDestroyNotify) g_free,
+						  (GDestroyNotify) free_stat_info_entry);
+
  while (TRUE)
    {
      const gchar *basename = g_dir_read_name (dir);
@@ -1879,24 +1992,20 @@ cb_fill_in_stats (gpointer key, gpointer value, gpointer user_data)
 }


-static gboolean
-fill_in_stats (GtkFileFolderUnix *folder_unix, GError **error)
+static void
+fill_in_stats (GtkFileFolderUnix *folder_unix)
 {
  if (folder_unix->have_stat)
-    return TRUE;
+    return;

-  if (!fill_in_names (folder_unix, error))
-    return FALSE;
+  if (!fill_in_names (folder_unix, NULL))
+    return;

-#if 0
-  g_print ("Stating directory %s\n", folder_unix->filename);
-#endif
  g_hash_table_foreach_remove (folder_unix->stat_info,
 			       cb_fill_in_stats,
 			       folder_unix);

  folder_unix->have_stat = TRUE;
-  return TRUE;
 }


@@ -1917,21 +2026,22 @@ cb_fill_in_mime_type (gpointer key, gpointer value, gpointer user_data)
  return FALSE;
 }

-static gboolean
-fill_in_mime_type (GtkFileFolderUnix *folder_unix, GError **error)
+static void
+fill_in_mime_type (GtkFileFolderUnix *folder_unix)
 {
  if (folder_unix->have_mime_type)
-    return TRUE;
+    return;
+
+  if (!folder_unix->have_stat)
+    return;
+
+  g_assert (folder_unix->stat_info != NULL);

-#if 0
-  g_print ("Getting mime types for directory %s\n", folder_unix->filename);
-#endif
  g_hash_table_foreach_remove (folder_unix->stat_info,
 			       cb_fill_in_mime_type,
 			       folder_unix);

  folder_unix->have_mime_type = TRUE;
-  return TRUE;
 }

 static GtkFilePath *
@@ -606,7 +606,10 @@ gtk_file_system_win32_volume_get_display_name (GtkFileSystem       *file_system,

  g_return_val_if_fail (volume->drive != NULL, NULL);

-  if ((filename_is_drive_root (volume->drive) && volume->drive[0] >= 'C') ||
+  if (filename_is_drive_root (volume->drive) &&
+      volume->drive_type == DRIVE_REMOTE)
+    real_display_name = g_strdup (volume->drive);
+  else if ((filename_is_drive_root (volume->drive) && volume->drive[0] >= 'C') ||
      volume->drive_type != DRIVE_REMOVABLE)
    {
      gunichar2 *wdrive = g_utf8_to_utf16 (volume->drive, -1, NULL, NULL, NULL);
@@ -568,10 +568,7 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
  xdg_data_dirs = g_get_system_data_dirs ();
  for (i = 0; xdg_data_dirs[i]; i++) ;

-  priv->search_path_len = i + 2;
-#ifdef G_OS_UNIX
-  priv->search_path_len++;
-#endif
+  priv->search_path_len = 2 * i + 2;
  
  priv->search_path = g_new (char *, priv->search_path_len);
  
@@ -582,9 +579,8 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
  for (j = 0; xdg_data_dirs[j]; j++) 
    priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);

-#ifdef G_OS_UNIX
-  priv->search_path[i++] = g_strdup ("/usr/share/pixmaps");
-#endif
+  for (j = 0; xdg_data_dirs[j]; j++) 
+    priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL);

  priv->themes_valid = FALSE;
  priv->themes = NULL;
@@ -36,7 +36,7 @@
 #include "gtkwindow.h"
 #include "gtktextbuffer.h"

-#define DEBUG_ICON_VIEW
+#undef DEBUG_ICON_VIEW

 #define ICON_TEXT_PADDING 3

@@ -466,7 +466,7 @@ gtk_image_get_property (GObject     *object,
      break;
    case PROP_ICON_NAME:
      if (image->storage_type != GTK_IMAGE_ICON_NAME)
-	g_value_set_object (value, NULL);
+	g_value_set_string (value, NULL);
      else
 	g_value_set_string (value,
 			    image->data.name.icon_name);
@@ -58,6 +58,8 @@ struct _GtkComposeTable
 */

 static const guint16 gtk_compose_seqs[] = {
+  GDK_Greek_accentdieresis,	GDK_Greek_iota,	0,	0,	0,	0x0390,	/* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
+  GDK_Greek_accentdieresis,	GDK_Greek_upsilon,	0,	0,	0,	0x03B0,	/* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
  GDK_dead_grave,	GDK_space,	0,	0,	0,	0x0060,	/* GRAVE_ACCENT */
  GDK_dead_grave,	GDK_A,	0,	0,	0,	0x00C0,	/* LATIN_CAPITAL_LETTER_A_WITH_GRAVE */
  GDK_dead_grave,	GDK_E,	0,	0,	0,	0x00C8,	/* LATIN_CAPITAL_LETTER_E_WITH_GRAVE */
@@ -189,7 +189,9 @@ static void     gtk_menu_real_insert       (GtkMenuShell     *menu_shell,
 static void     gtk_menu_scrollbar_changed (GtkAdjustment    *adjustment,
 					    GtkMenu          *menu);
 static void     gtk_menu_handle_scrolling  (GtkMenu          *menu,
-					    gboolean         enter);
+					    gint	      event_x,
+					    gint	      event_y,
+					    gboolean          enter);
 static void     gtk_menu_set_tearoff_hints (GtkMenu          *menu,
 					    gint             width);
 static void     gtk_menu_style_set         (GtkWidget        *widget,
@@ -2763,7 +2765,7 @@ gtk_menu_motion_notify  (GtkWidget	   *widget,
  gboolean need_enter;

  if (GTK_IS_MENU (widget))
-    gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
+    gtk_menu_handle_scrolling (GTK_MENU (widget), event->x_root, event->y_root, TRUE);

  /* We received the event for one of two reasons:
   *
@@ -2917,20 +2919,23 @@ gtk_menu_scroll (GtkWidget	*widget,
 }

 static void
-gtk_menu_handle_scrolling (GtkMenu *menu, gboolean enter)
+gtk_menu_handle_scrolling (GtkMenu *menu,
+			   gint x,
+			   gint y,
+			   gboolean enter)
 {
  GtkMenuShell *menu_shell;
  gint width, height;
-  gint x, y;
  gint border;
  GdkRectangle rect;
  gboolean in_arrow;
  gboolean scroll_fast = FALSE;
  guint vertical_padding;
+  gint top_x, top_y;
+  gint win_x, win_y;

  menu_shell = GTK_MENU_SHELL (menu);

-  gdk_window_get_pointer (GTK_WIDGET (menu)->window, &x, &y, NULL);
  gdk_drawable_get_size (GTK_WIDGET (menu)->window, &width, &height);

  gtk_widget_style_get (GTK_WIDGET (menu),
@@ -2940,10 +2945,15 @@ gtk_menu_handle_scrolling (GtkMenu *menu, gboolean enter)
  border = GTK_CONTAINER (menu)->border_width +
    GTK_WIDGET (menu)->style->ythickness + vertical_padding;

+  gdk_window_get_position (menu->toplevel->window, &top_x, &top_y);
+  gdk_window_get_position (GTK_WIDGET (menu)->window, &win_x, &win_y);
+  win_x += top_x;
+  win_y += top_y;
+  
  if (menu->upper_arrow_visible && !menu->tearoff_active)
    {
-      rect.x = 0;
-      rect.y = 0;
+      rect.x = win_x;
+      rect.y = win_y;
      rect.width = width;
      rect.height = MENU_SCROLL_ARROW_HEIGHT + border;
      
@@ -2981,8 +2991,8 @@ gtk_menu_handle_scrolling (GtkMenu *menu, gboolean enter)
  
  if (menu->lower_arrow_visible && !menu->tearoff_active)
    {
-      rect.x = 0;
-      rect.y = height - border - MENU_SCROLL_ARROW_HEIGHT;
+      rect.x = win_x;
+      rect.y = win_y + height - border - MENU_SCROLL_ARROW_HEIGHT;
      rect.width = width;
      rect.height = MENU_SCROLL_ARROW_HEIGHT + border;

@@ -3031,7 +3041,7 @@ gtk_menu_enter_notify (GtkWidget        *widget,
      GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget);

      if (!menu_shell->ignore_enter)
-	gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
+	gtk_menu_handle_scrolling (GTK_MENU (widget), event->x_root, event->y_root, TRUE);
    }

  if (menu_item && GTK_IS_MENU_ITEM (menu_item))
@@ -3096,7 +3106,7 @@ gtk_menu_leave_notify (GtkWidget        *widget,
  if (gtk_menu_navigating_submenu (menu, event->x_root, event->y_root))
    return TRUE; 

-  gtk_menu_handle_scrolling (menu, FALSE);
+  gtk_menu_handle_scrolling (menu, event->x_root, event->y_root, FALSE);
  
  event_widget = gtk_get_event_widget ((GdkEvent*) event);
  
@@ -297,7 +297,7 @@ load_module (GSList      *module_list,
 		      g_module_symbol (module, "gtk_module_display_init",
 				       (gpointer *) &info->display_init_func);
 		      
-		      gtk_modules = g_slist_prepend (gtk_modules, info);
+		      gtk_modules = g_slist_append (gtk_modules, info);
 		      
 		      /* display_init == NULL indicates a non-multihead aware module.
 		       * For these, we delay the call to init_func until first display is 
@@ -278,16 +278,16 @@ gtk_object_add_arg_type (const gchar *arg_name,
      pspec = g_param_spec_boolean (pname, NULL, NULL, FALSE, arg_flags);
      break;
    case G_TYPE_INT:
-      pspec = g_param_spec_int (pname, NULL, NULL, -2147483647, 2147483647, 0, arg_flags);
+      pspec = g_param_spec_int (pname, NULL, NULL, G_MININT, G_MAXINT, 0, arg_flags);
      break;
    case G_TYPE_UINT:
-      pspec = g_param_spec_uint (pname, NULL, NULL, 0, 4294967295U, 0, arg_flags);
+      pspec = g_param_spec_uint (pname, NULL, NULL, 0, G_MAXUINT, 0, arg_flags);
      break;
    case G_TYPE_FLOAT:
-      pspec = g_param_spec_float (pname, NULL, NULL, -1E+37, 1E+37, 0, arg_flags);
+      pspec = g_param_spec_float (pname, NULL, NULL, -G_MAXFLOAT, G_MAXFLOAT, 0, arg_flags);
      break;
    case G_TYPE_DOUBLE:
-      pspec = g_param_spec_double (pname, NULL, NULL, -1E+307, 1E+307, 0, arg_flags);
+      pspec = g_param_spec_double (pname, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0, arg_flags);
      break;
    case G_TYPE_STRING:
      pspec = g_param_spec_string (pname, NULL, NULL, NULL, arg_flags);
@@ -1172,6 +1172,7 @@ gtk_paned_compute_position (GtkPaned *paned,
  paned->max_position = allocation;
  if (!paned->child2_shrink)
    paned->max_position = MAX (1, paned->max_position - child2_req);
+  paned->max_position = MAX (paned->min_position, paned->max_position);

  if (!paned->position_set)
    {
@@ -440,7 +440,7 @@ gtk_radio_action_set_group (GtkRadioAction *action,
 * gtk_radio_action_get_current_value:
 * @action: a #GtkRadioAction
 * 
- * Obtains the value property of the the currently active member of 
+ * Obtains the value property of the currently active member of 
 * the group to which @action belongs.
 * 
 * Return value: The value of the currently active group member
@@ -2086,7 +2086,7 @@ gtk_rc_init_style (GtkRcContext *context,
      GSList *tmp_styles;
      GType rc_style_type = GTK_TYPE_RC_STYLE;

-      /* Find the the first style where the RC file specified engine "" {}
+      /* Find the first style where the RC file specified engine "" {}
       * or the first derived style and use that to create the
       * merged style. If we only have raw GtkRcStyles, use the first
       * style to create the merged style.
@@ -3468,9 +3468,9 @@ gtk_default_draw_box (GtkStyle      *style,
    {
      GdkGC *gc = style->bg_gc[state_type];
      
-      if (state_type == GTK_STATE_SELECTED && strcmp (detail, "paned") == 0)
+      if (state_type == GTK_STATE_SELECTED && detail && strcmp (detail, "paned") == 0)
 	{
-	  if (!GTK_WIDGET_HAS_FOCUS (widget))
+	  if (widget && !GTK_WIDGET_HAS_FOCUS (widget))
 	    gc = style->base_gc[GTK_STATE_ACTIVE];
 	}

@@ -3833,7 +3833,7 @@ gtk_default_draw_check (GtkStyle      *style,
      x -= (1 + INDICATOR_PART_SIZE - width) / 2;
      y -= (1 + INDICATOR_PART_SIZE - height) / 2;

-      if (strcmp (detail, "check") == 0)	/* Menu item */
+      if (detail && strcmp (detail, "check") == 0)	/* Menu item */
 	{
 	  text_gc = style->fg_gc[state_type];
 	  base_gc = style->bg_gc[state_type];
@@ -3931,7 +3931,7 @@ gtk_default_draw_option (GtkStyle      *style,
      x -= (1 + INDICATOR_PART_SIZE - width) / 2;
      y -= (1 + INDICATOR_PART_SIZE - height) / 2;

-      if (strcmp (detail, "option") == 0)	/* Menu item */
+      if (detail && strcmp (detail, "option") == 0)	/* Menu item */
 	{
 	  text_gc = style->fg_gc[state_type];
 	  base_gc = style->bg_gc[state_type];
@@ -3965,7 +3965,7 @@ gtk_default_draw_option (GtkStyle      *style,
 	}
      else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
 	{
-	  if (strcmp (detail, "option") == 0)  /* Menu item */
+	  if (detail && strcmp (detail, "option") == 0)  /* Menu item */
 	    {
 	      draw_part (window, text_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
 	    }
@@ -4877,13 +4877,13 @@ gtk_default_draw_handle (GtkStyle      *style,
                 detail, x, y, width, height);
  
  
-  if (!strcmp (detail, "paned"))
+  if (detail && !strcmp (detail, "paned"))
    {
      /* we want to ignore the shadow border in paned widgets */
      xthick = 0;
      ythick = 0;

-      if (state_type == GTK_STATE_SELECTED && !GTK_WIDGET_HAS_FOCUS (widget))
+      if (state_type == GTK_STATE_SELECTED && widget && !GTK_WIDGET_HAS_FOCUS (widget))
 	{
 	  GdkColor unfocused_light;
      
@@ -4926,7 +4926,7 @@ gtk_default_draw_handle (GtkStyle      *style,
  gdk_gc_set_clip_rectangle (light_gc, &dest);
  gdk_gc_set_clip_rectangle (dark_gc, &dest);

-  if (!strcmp (detail, "paned"))
+  if (detail && !strcmp (detail, "paned"))
    {
      if (orientation == GTK_ORIENTATION_HORIZONTAL)
 	for (xx = x + width/2 - 15; xx <= x + width/2 + 15; xx += 5)
@@ -5751,10 +5751,10 @@ gtk_text_view_check_keymap_direction (GtkTextView *text_view)
 		    "gtk-split-cursor", &split_cursor,
 		    NULL);
      
-      if (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_LTR)
-	new_keyboard_dir = GTK_TEXT_DIR_LTR;
+      if (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_RTL)
+	new_keyboard_dir = GTK_TEXT_DIR_RTL;
      else
-	new_keyboard_dir  = GTK_TEXT_DIR_RTL;
+	new_keyboard_dir  = GTK_TEXT_DIR_LTR;
  
      if (split_cursor)
 	new_cursor_dir = GTK_TEXT_DIR_NONE;
@@ -590,7 +590,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
 							 P_("Headers Clickable"),
 							 P_("Column headers respond to click events"),
 							 FALSE,
-							 G_PARAM_WRITABLE));
+							 G_PARAM_READWRITE));

  g_object_class_install_property (o_class,
                                   PROP_EXPANDER_COLUMN,
@@ -4455,11 +4455,11 @@ gtk_tree_view_leave_notify (GtkWidget        *widget,
 {
  GtkTreeView *tree_view;

-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  tree_view = GTK_TREE_VIEW (widget);
+  tree_view->priv->pressed_button = -1;

  if (event->mode == GDK_CROSSING_GRAB)
    return TRUE;
-  tree_view = GTK_TREE_VIEW (widget);

  if (tree_view->priv->prelight_node)
    _gtk_tree_view_queue_draw_node (tree_view,
@@ -9222,7 +9222,7 @@ gtk_tree_view_new_with_model (GtkTreeModel *model)
 * gtk_tree_view_get_model:
 * @tree_view: a #GtkTreeView
 *
- * Returns the model the the #GtkTreeView is based on.  Returns %NULL if the
+ * Returns the model the #GtkTreeView is based on.  Returns %NULL if the
 * model is unset.
 *
 * Return value: A #GtkTreeModel, or %NULL if none is currently being used.
@@ -9508,7 +9508,7 @@ gtk_tree_view_get_headers_visible (GtkTreeView *tree_view)
 * @tree_view: A #GtkTreeView.
 * @headers_visible: %TRUE if the headers are visible
 *
- * Sets the the visibility state of the headers.
+ * Sets the visibility state of the headers.
 **/
 void
 gtk_tree_view_set_headers_visible (GtkTreeView *tree_view,
@@ -9607,7 +9607,6 @@ gtk_tree_view_set_headers_clickable (GtkTreeView *tree_view,
  GList *list;

  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (tree_view->priv->model != NULL);

  for (list = tree_view->priv->columns; list; list = list->next)
    gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (list->data), setting);
@@ -12498,7 +12497,8 @@ gtk_tree_view_search_move (GtkWidget   *window,

  /* search */
  gtk_tree_selection_unselect_all (selection);
-  gtk_tree_model_get_iter_first (model, &iter);
+  if (!gtk_tree_model_get_iter_first (model, &iter))
+    return;

  ret = gtk_tree_view_search_iter (model, selection, &iter, text,
 				   &count, up?((tree_view->priv->selected_iter) - 1):((tree_view->priv->selected_iter + 1)));
@@ -630,6 +630,16 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 		  _gtk_marshal_VOID__OBJECT,
 		  G_TYPE_NONE, 1,
 		  GTK_TYPE_WIDGET);
+  /**
+   * GtkWidget::style-set:
+   * @widget: the object on which the signal is emitted
+   * @previous_style: the previous style, or %NULL if the widget 
+   *   just got its initial style 
+   *
+   * 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.
+   */
  widget_signals[STYLE_SET] =
    g_signal_new ("style_set",
 		  G_TYPE_FROM_CLASS (gobject_class),
@@ -3247,7 +3257,7 @@ destroy_accel_path (gpointer data)
 /**
 * gtk_widget_set_accel_path:
 * @widget: a #GtkWidget
- * @accel_path: path used to look up the the accelerator
+ * @accel_path: path used to look up the accelerator
 * @accel_group: a #GtkAccelGroup.
 * 
 * Given an accelerator group, @accel_group, and an accelerator path,
@@ -2890,6 +2890,7 @@ gtk_window_set_icon_name (GtkWindow   *window,

  g_list_foreach (info->icon_list, (GFunc) g_object_unref, NULL);
  g_list_free (info->icon_list);
+  info->icon_list = NULL;
  
  update_themed_icon (NULL, window);

@@ -6670,7 +6671,7 @@ gtk_window_is_active (GtkWindow *window)
 * For real toplevel windows, this is identical to gtk_window_is_active(),
 * but for embedded windows, like #GtkPlug, the results will differ.
 * 
- * Return value: %TRUE if the the input focus is within this GtkWindow
+ * Return value: %TRUE if the input focus is within this GtkWindow
 *
 * Since: 2.4
 **/
@@ -29,6 +29,9 @@
 #include <glib.h>
 #include <glib/gstdio.h>

+static gboolean force_update = FALSE;
+static gboolean quiet = FALSE;
+
 #define CACHE_NAME "icon-theme.cache"

 #define HAS_SUFFIX_XPM (1 << 0)
@@ -606,13 +609,13 @@ build_cache (const gchar *path)
  utime_buf.modtime = cache_stat.st_mtime;
  utime (path, &utime_buf);
  
-  g_printerr ("Cache file created successfully.\n");
+  if (!quiet)
+    g_printerr ("Cache file created successfully.\n");
 }

-static gboolean force_update = FALSE;
-
 static GOptionEntry args[] = {
-  { "force", 0, 0, G_OPTION_ARG_NONE, &force_update, "Overwrite an existing cache, even if uptodate", NULL },
+  { "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, "Overwrite an existing cache, even if uptodate", NULL },
+  { "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, "Turn off verbose output", NULL },
  { NULL }
 };

@@ -1,3 +1,7 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>

 	* === Released 2.6.1 ===
@@ -1,3 +1,7 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>

 	* === Released 2.6.1 ===
@@ -446,9 +446,9 @@ get_pango_attr_list (GtkIMContextIME *context_ime, const gchar *utf8str)
      /*
       *  get attributes list of IME.
       */
-      len = ImmGetCompositionStringA (himc, GCS_COMPATTR, NULL, 0);
+      len = ImmGetCompositionStringW (himc, GCS_COMPATTR, NULL, 0);
      buf = g_alloca (len);
-      ImmGetCompositionStringA (himc, GCS_COMPATTR, buf, len);
+      ImmGetCompositionStringW (himc, GCS_COMPATTR, buf, len);

      /*
       *  schr and echr are pointer in utf8str.
@@ -810,7 +810,7 @@ gtk_im_context_xim_set_cursor_location (GtkIMContext *context,

  preedit_attr = XVaCreateNestedList (0,
 				      XNSpotLocation, &spot,
-				      0);
+				      NULL);
  XSetICValues (ic,
 		XNPreeditAttributes, preedit_attr,
 		NULL);
@@ -857,7 +857,7 @@ gtk_im_context_xim_reset (GtkIMContext *context)

  preedit_attr = XVaCreateNestedList(0,
                                     XNPreeditState, &preedit_state,
-                                     0);
+                                     NULL);
  if (!XGetICValues(ic,
                    XNPreeditAttributes, preedit_attr,
                    NULL))
@@ -869,7 +869,7 @@ gtk_im_context_xim_reset (GtkIMContext *context)

  preedit_attr = XVaCreateNestedList(0,
                                     XNPreeditState, preedit_state,
-                                     0);
+                                     NULL);
  if (have_preedit_state)
    XSetICValues(ic,
 		 XNPreeditAttributes, preedit_attr,
@@ -1,3 +1,50 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.2 ===
+
+2005-02-03  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated  Greek translation
+
+2005-01-31  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-01-30  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation by
+	Alessio Dessì <alessiodessi@tiscali.it>.
+
+2005-01-26  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2005-01-24  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation by
+	Alessio Dessì <alkex@inwind.it>.
+
+2005-01-20  Frank Arnold  <farnold@cvs.gnome.org>
+
+	* de.po: Updated German translation.
+
+2005-01-19  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2005-01-14  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2005-01-12  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2005-01-11  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
 2005-01-09  Takeshi AIHANA <aihana@gnome.gr.jp>

 	* ja.po: Updated Japanese translation.
@@ -323,7 +370,7 @@
                                                                                
        * en_GB.po: Updated British English translation.
                                                                                
-2004-10-15  Danilo Šegan  <dsegan@gmx.net>
+2004-10-15  Danilo Å egan  <dsegan@gmx.net>

 	* sr.po, sr@Latn.po: Updated Serbian translation.

@@ -373,7 +420,7 @@
 2004-08-16  Christian Rose  <menthos@menthos.com>

 	* bs.po: Added Bosnian translation by
-	Kenan Hadžiavdić <kenanh@frisurf.no>.
+	Kenan HadÅŸiavdiÄ <kenanh@frisurf.no>.

 2004-08-01  Matthias Clasen  <mclasen@redhat.com>

@@ -381,7 +428,7 @@

 2004-07-26  Christian Rose  <menthos@menthos.com>

-	* sv.po: Fix for #148437. Thanks to Robert Ögren for
+	* sv.po: Fix for #148437. Thanks to Robert Ãgren for
 	discovering the problem.

 2004-07-21  Christian Rose  <menthos@menthos.com>
@@ -410,7 +457,7 @@ Sun Jul 18 20:17:41 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 2004-05-29  Christian Rose  <menthos@menthos.com>

 	* tk.po: Added Turkmen translation by
-	Gurban Mühemmet Tewekgeli <gmtavakkoli@yahoo.com>.
+	Gurban MÃŒhemmet Tewekgeli <gmtavakkoli@yahoo.com>.

 2004-04-09  Baris Cicek  <baris@teamforce.name.tr>

@@ -489,7 +536,7 @@ Tue Mar 16 13:17:10 2004  Owen Taylor  <otaylor@redhat.com>
 2004-03-15  Mugurel Tudor  <mugurelu@go.ro>

 	* ro.po: Updated Romanian translation by
-	Mişu Moldovan  <dumol@go.ro>
+	MiÅu Moldovan  <dumol@go.ro>

 2004-03-13  Arafat Medini  <lumina@silverpen.de>

@@ -519,7 +566,7 @@ Tue Mar  9 10:04:02 2004  Owen Taylor  <otaylor@redhat.com>
 2004-03-09  Sanlig Badral  <badral@openmn.org>                                                                                 
        * mn.po: Updated Mongolian translation. 

-2004-03-09  Danilo Šegan  <dsegan@gmx.net>
+2004-03-09  Danilo Å egan  <dsegan@gmx.net>

 	* sr@ije.po: Updated Serbian Jekavian translation.

@@ -528,7 +575,7 @@ Tue Mar  9 10:04:02 2004  Owen Taylor  <otaylor@redhat.com>
 	* en_CA.po: Updated Canadian English translation to "1022
 	translated messages" status.

-2004-03-07  Mətin Əmirov  <metin@karegen.com>
+2004-03-07  MÉtin Æmirov  <metin@karegen.com>

 	* az.po: Translation updated.

@@ -536,7 +583,7 @@ Tue Mar  9 10:04:02 2004  Owen Taylor  <otaylor@redhat.com>

 	* zh_CN.po: Updated Simplified Chinese translation.

-2004-03-06  Mətin Əmirov  <metin@karegen.com>
+2004-03-06  MÉtin Æmirov  <metin@karegen.com>

 	* az.po: Translation updated.

@@ -544,11 +591,11 @@ Tue Mar  9 10:04:02 2004  Owen Taylor  <otaylor@redhat.com>

 	* es.po: Updated Spanish translation.

-2004-03-06  Žygimantas Beručka  <uid0@akl.lt>
+2004-03-06  Åœygimantas BeruÄka  <uid0@akl.lt>

 	* lt.po: Updated Lithuanian translation.

-2004-03-06  Danilo Šegan  <dsegan@gmx.net>
+2004-03-06  Danilo Å egan  <dsegan@gmx.net>

 	* sr.po, sr@Latn.po: Updated Serbian translation.

@@ -637,7 +684,7 @@ Tue Mar  2 17:06:05 2004  Owen Taylor  <otaylor@redhat.com>

 	* sq.po: Updated Albanian translation.

-2004-03-01  Danilo Šegan  <dsegan@gmx.net>
+2004-03-01  Danilo Å egan  <dsegan@gmx.net>

 	* sr.po, sr@Latn.po: Updated Serbian translation.
 	* sr@ije.po:  Updated Serbian Jekavian by Bojan Suzic.
@@ -654,7 +701,7 @@ Tue Mar  2 17:06:05 2004  Owen Taylor  <otaylor@redhat.com>

 	* en_CA.po: Updated Canadian English translation.

-2004-03-01  Danilo Šegan  <dsegan@gmx.net>
+2004-03-01  Danilo Å egan  <dsegan@gmx.net>

 	* sr.po, sr@Latn.po, sr@ije.po: Updated Serbian translation.

@@ -700,7 +747,7 @@ Tue Mar  2 17:06:05 2004  Owen Taylor  <otaylor@redhat.com>

 	* nl.po: Translation updated by Tino Meinen.

-2004-02-25  Danilo Šegan  <dsegan@gmx.net>
+2004-02-25  Danilo Å egan  <dsegan@gmx.net>

 	* sr@ije.po: Added unchecked Serbian Jekavian translation.

@@ -757,7 +804,7 @@ Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>

 	* sq.po: Updated Albanian translation.

-2004-02-22  Danilo Šegan  <dsegan@gmx.net>
+2004-02-22  Danilo Å egan  <dsegan@gmx.net>

 	* sr.po, sr@Latn.po: Updated Serbian translation.

@@ -794,7 +841,7 @@ Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>

 	* sq.po: Fixed Albanian translation.

-2004-02-20  Danilo Šegan  <dsegan@gmx.net>
+2004-02-20  Danilo Å egan  <dsegan@gmx.net>

 	* sr.po, sr@Latn.po: Updated Serbian translation.

@@ -879,7 +926,7 @@ Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>

 	* sv.po: Updated Swedish translation.

-2004-02-12  Danilo Šegan  <dsegan@gmx.net>
+2004-02-12  Danilo Å egan  <dsegan@gmx.net>

 	* sr.po, sr@Latn.po: Reviewed by Aleksandar Urosevic; Updated.
 	* POTFILES.in: Added missing files.
@@ -891,8 +938,8 @@ Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>
 2004-02-09  Gustavo Noronha Silva  <kov@debian.org>

 	* pt_BR.po: updated translation, changed
-	  translation to 'radio' from 'rádio' to
-	  'seleção', to be consistent with glade-2's
+	  translation to 'radio' from 'rÃ¡dio' to
+	  'seleÃ§Ã£o', to be consistent with glade-2's
 	  translation.

 2004-02-09  Vincent van Adrighem  <adrighem@gnome.org>
@@ -932,7 +979,7 @@ Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>

 	* pt.po: Updated Portuguese translation.

-2004-02-05  Mətin Əmirov  <metin@karegen.com>
+2004-02-05  MÉtin Æmirov  <metin@karegen.com>

 	* az.po: Translation updated.

@@ -979,7 +1026,7 @@ Mon Feb 02 10:01:00 2004 Alastair McKinstry <mckinstry@computer.org>

 	* el.po: Updated  Greek translation.

-2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+2004-01-27  Ãsmund SkjÃŠveland  <aasmunds@fys.uio.no>

 	* nn.po: Updated Norwegian Nynorsk translation.

@@ -1037,7 +1084,7 @@ Mon Feb 02 10:01:00 2004 Alastair McKinstry <mckinstry@computer.org>

 	* pl.po: Updated Polish translation by GNOME PL Team.

-2004-01-19  Danilo Šegan  <dsegan@gmx.net>
+2004-01-19  Danilo Å egan  <dsegan@gmx.net>

 	* Makefile.in.in: Added XGETTEXT_KEYWORDS.

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties 2.6-branch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2004-03-30 17:02+0200\n"
 "Last-Translator: Zuza Software Foundation <info@translate.org.za>\n"
 "Language-Team: Afrikaans <translate-discuss-af@lists.sourceforge.net>\n"
@@ -99,121 +99,121 @@ msgstr "Skerm"
 msgid "the GdkScreen for the renderer"
 msgstr "Die model vir die boomaansig"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 #, fuzzy
 msgid "Program name"
 msgstr "Merkernaam"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "Die oriëntering van die nutsbalk"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 #, fuzzy
 msgid "Comments string"
 msgstr "Kolomspasiëring"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 #, fuzzy
 msgid "Website label"
 msgstr "Gebruik grootte in etiket"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "Die oriëntering van die nutsbalk"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "Fontnaam"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "Huidige kleur"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -2048,11 +2048,11 @@ msgstr "Die titel van die fontkies-dialoog"
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 #, fuzzy
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Naam van die lêerstelsel-rugstelsel om te gebruik"
@@ -2589,11 +2589,11 @@ msgstr "Die wydte van die uitleg"
 msgid "The height of the layout"
 msgstr "Die hoogte van die uitleg"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Afskeurtitel"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -2601,31 +2601,31 @@ msgstr ""
 "'n Titel wat deur die vensterbestuurder vertoon kan word wanneer hierdie "
 "kieslys afgeskeur word"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 #, fuzzy
 msgid "Tearoff State"
 msgstr "Afskeurtitel"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 #, fuzzy
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""
 "'n Titel wat deur die vensterbestuurder vertoon kan word wanneer hierdie "
 "kieslys afgeskeur word"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Vertikale opvulling"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Ekstra ruimte aan bo- en onderkant van die kieslys"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Vertikale verplasing"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -2633,11 +2633,11 @@ msgstr ""
 "Wanneer die kieslys 'n subkieslys is, word dit hierdie getal pixels "
 "vertikaal verplaas"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Horisontale verplasing"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -2645,66 +2645,66 @@ msgstr ""
 "Wanneer die kieslys 'n subkieslys is, word dit hierdie getal pixels "
 "horisontaal verplaas"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Linkeraanhegting"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Die kolomnommer waaraan die linkersy van die kind geheg moet word"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Regteraanhegting"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "Die kolomnommer waaraan die regtersy van die kind geheg moet word"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Boaanhegting"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "Die kolomnommer waaraan die bokantste sy van die kind geheg moet word"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Onderaanhegting"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr ""
 "Die kolomnommer waaraan die onderkantste sy van die kind geheg moet word"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Kan snelsleutels wysig"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Of kieslyssnelsleutels gewysig kan word deur 'n sleutel oor die kieslysitem "
 "te druk"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Vertraag voor subkieslyste verskyn"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "minimum tyd wat die wyser oor 'n kieslysitem moet wag voor die subkieslys "
 "verskyn"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Vertraging voor subkieslys verskuil word"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4756,51 +4756,51 @@ msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr ""
 "Of gtk_widget_show_all() nie 'n uitwerking op hierdie dingesie moet hê nie"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Binnefokus"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Of die fokusaanwyser binne dingesies geteken moet word"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Fokus op reëlwydte"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Wydte in pixels van die fokusaanwyserlyn"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Fokuslyn-stippelpatroon"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Stippelpatroon wat gebruik moet word om die fokusaanwyser te teken"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Fokusopvulling"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "Wydte in pixels tussen fokusaanwyser en die dingesie-kassie"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Wyserkleur"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Kleure waarmee die invoegwyser geteken moet word"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Sekondêrewyser-kleur"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4808,11 +4808,11 @@ msgstr ""
 "Kleur waarmee die sekondêre invoegwyser geteken moet word wanneer gemengde "
 "regs-na-links- en links-na-regs-teks geredigeer word"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Wyserlyn-aspekratio"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Aspekratio waarmee die invoegwyser geteken moet word"

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2003-01-14 11:02+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -99,118 +99,118 @@ msgstr "እስክሪን"
 msgid "the GdkScreen for the renderer"
 msgstr ""

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr ""

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "የጽሑፉ መለያ"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr ""

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "የጽሑፉ መለያ"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "የፊደሉ ቅርጽ ስም"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "የአሁኑን ቀለም"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -1993,11 +1993,11 @@ msgstr "የመስኮቱ አርእስት"
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr ""

@@ -2515,111 +2515,111 @@ msgstr ""
 msgid "The height of the layout"
 msgstr ""

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr ""

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr ""

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 #, fuzzy
 msgid "Vertical Padding"
 msgstr "የቁመት ኩልኩል"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr ""

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 #, fuzzy
 msgid "Vertical Offset"
 msgstr "የቁመት ኩልኩል"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 #, fuzzy
 msgid "Horizontal Offset"
 msgstr "የአግድም ኩልኩል"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr ""

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr ""

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr ""

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 #, fuzzy
 msgid "Bottom Attach"
 msgstr "ወደ ታች (_B)"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr ""

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr ""

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr ""

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4559,61 +4559,61 @@ msgstr ""
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr ""

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr ""

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr ""

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr ""

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr ""

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr ""

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr ""

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr ""

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "የጠቋሚው ቀለም"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr ""

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr ""

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
 msgstr ""

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr ""

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr ""

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2004-03-17 08:30+0100\n"
 "Last-Translator: Arafat Medini <lumina@silverpen.de>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -101,121 +101,121 @@ msgstr "شاشة"
 msgid "the GdkScreen for the renderer"
 msgstr "نمط عرض الشجرة"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 #, fuzzy
 msgid "Program name"
 msgstr "اسم الشارة"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "اتجاه شريط ا?دوات"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 #, fuzzy
 msgid "Comments string"
 msgstr "فراغات العمود"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 #, fuzzy
 msgid "Website label"
 msgstr "استخدام حجم في الشارة"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "اتجاه شريط ا?دوات"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "اسم الخط"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "اللون الحالي"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -2011,11 +2011,11 @@ msgstr "عنوان حوار انتقاء الخطوط"
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "خلفيّة منتقي الملفات الإفتراضيّة"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "اسم خلفية GtkFileChooser التي ستستخدم إفتراضيّا"

@@ -2542,113 +2542,113 @@ msgstr "عرض التصميم"
 msgid "The height of the layout"
 msgstr "ارتفاع التصميم"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "قطف العنوان"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr "عنوان قد يعرض من قبل مدير النوافذ عند قطف هذه القائمة"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 #, fuzzy
 msgid "Tearoff State"
 msgstr "قطف العنوان"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 #, fuzzy
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "عنوان قد يعرض من قبل مدير النوافذ عند قطف هذه القائمة"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "الحشو العمودي"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "مساحة اضافية لأعلى وأسفل القائمة"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "التكافؤ العمودي"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""
 "عندما تكون القائمة قائمة فرعيّة تموقع هذا العدد من البكسلات عموديّا كتعويض"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "التكافؤ العمودي"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr "عندما·تكون·القائمة·قائمة·فرعيّة·تموقع·هذا·العدد·من·البكسلات·أفقيّا·كتعويض"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "ربط على اليسار"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "رقم العمود الذي إليه ستربط الجهة اليسرى للإبن"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "ربط على اليمين"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "رقم·العمود·الذي·إليه·ستربط·الجهة·اليمنى·للإبن"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "ربط بالأعلى"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "رقم·السطر·الذي·إليه·ستربط·الجهة·العليا·للإبن"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "ربط بالأسفل"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "رقم·السطر·الذي·إليه·ستربط·الجهة·السفلى·للإبن"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "من الممكن تغيير مفاتيح الاختصار"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "فيما اذا كان من الممكن تغيير مفاتيح اختصار القوائم بضغط مفتاح فوق عنصر "
 "القائمة"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "التأخير قبل ظهور القوائم المحوية"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "الوقت الأدنى الذي يجب أن يبقى فيه المؤشر فوق عنصر قائمة لتظهر القائمة المحوية"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "التأخير قبل اخفاء قائمة محوية"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4616,51 +4616,51 @@ msgstr "لا عرض للكل"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "فيما إذا لن يؤثّر gtk_widget_show_all() هذه القطعة"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "بؤرة داخلية"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "ما إذا يرسم مؤشر التركيز داخل القطع"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "عرض خط البؤرة"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "العرض بالبكسلات لسطر مؤشر التركيز"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "خط البؤرة بالنقش المتقطع"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "نمط الخط الفاصل المستعمل لرسم مؤشر التكيز"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "حشو البؤرة"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "العرض بالبكسلات بين مؤشر التركيز و قطعة 'صندوق'"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "لون المؤشر"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "اللون الذي يتم به رسم مؤشر ا?دخال"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "مؤشر ا?دخال الثانوي"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4668,11 +4668,11 @@ msgstr ""
 "اللون الذي سيرسم يه مؤشر الإدخال الثانوي عند تحرير نص مختلط من اليمين إلى "
 "اليسار و من اليسار إلى اليمين"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "نسبة الطول للعرض لمؤشر السطر"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "نسبة الطول للعرض التي سيرسم بها مؤشر إدخال."

@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2004-03-07 18:05+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <translation-team-az@lists.sourceforge."
@@ -124,121 +124,121 @@ msgstr "Ekran"
 msgid "the GdkScreen for the renderer"
 msgstr "Ağac görünüşü modeli"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 #, fuzzy
 msgid "Program name"
 msgstr "Təq adi"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "Vasitə çubuğu istiqaməti"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 #, fuzzy
 msgid "Comments string"
 msgstr "Sütünlar arası boşluq"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 #, fuzzy
 msgid "Website label"
 msgstr "Etiketdə böyüklüyü işlət"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "Vasitə çubuğu istiqaməti"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "Yazı növü adı"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "Hazırkı Rəng"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -2041,11 +2041,11 @@ msgstr "Yazı növü seçmə dialoqunun etiketi"
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "Ön qurğulu fayl seçici backend-i"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Ön qurğulu olarq işlədiləcək GtkFileChooser backend-inin adı"

@@ -2576,116 +2576,116 @@ msgstr "Düzülüş eni"
 msgid "The height of the layout"
 msgstr "Düzülüş hündürlüyü"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Etiketi Qopart"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""
 "Bu menyu qoparılmış vəziyyətdə olanda pəncərə idarəçisinin göstərəcəyi etiket"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 #, fuzzy
 msgid "Tearoff State"
 msgstr "Etiketi Qopart"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 #, fuzzy
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""
 "Bu menyu qoparılmış vəziyyətdə olanda pəncərə idarəçisinin göstərəcəyi etiket"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Şaquli Səviyyələmə"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Menyunun üst və alt tərəflərinə əlavə ediləcək sahə miqdarı"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Şaquli Offset"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""
 "Menyu alt menyu isə, onu bu qədər piksel offset şaquli olaraq yerləşdir"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Üfüqi Offset"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr "Menyu alt menyu isə, onu bu qədər piksel offset üfüqi olaraq yerləşdir"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Sol Əlavə"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Törəmənin sol tərəfinin ilişdiriləcəyi sütun nömrəsi"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Sağ Əlavə"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "Törəmənin sağ tərəfinin ilişdiriləcəyi sütun nömrəsi"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Üst Əlavə"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "Törəmənin üst tərəfinin ilişdiriləcəyi sütun nömrəsi"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Alt Əlavə"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "Törəmənin alt tərəfinin ilişdiriləcəyi sütun nömrəsi"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Sürə'tləndiricilər dəyişdirilə bilsin"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Menyu sürətləndiricilərin münyu üzvünün üstündə ikən düyməyə basılaraq "
 "dəyişdirilə bilməsi"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Alt menyuları göstərilmə gecikməsi"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Alt menyunun görünməsi üçün oxun menyunun üstündə dayanması məcbur olan "
 "minimal vaxt"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Alt menyuları gizlədilmə gecikməsi"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4701,52 +4701,52 @@ msgstr "Hamısını göstər olmasın"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "gtk_widget_show_all()-in bu widget-ə təsir etməməsi"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Daxili Fokus"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Pəncərəciklər daxilində fokus indikatorunun göstərilməsi"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Fokus uzunluğu"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Piksel olaraq fokus indikatoru eni"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Fokus sətiri tire naxışı"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Fokus indikatoru göstərilməsi üçün lazımi tire naxışı"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Fokus aralanması"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""
 "Piksel olaraq fokus indikatoru ilə pəncərəcik 'qutusu' arasındakı məsafə"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Ox rəngi"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Daxil etmə oxunun rəngi"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "İkinci ox rəngi"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4754,11 +4754,11 @@ msgstr ""
 "Qarışıq sağdan sola və soldan sağa mətni redaktə edərkən ikinci giriş "
 "kursorunun göstəriləcəyi rəng"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Kursor sətiri nisbəti"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Daxil etmə kursorunun göstəriləcəyi nisbət"

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties gtk-2-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2004-09-27 15:41+0330\n"
 "Last-Translator: Amir Hedayaty <amir@bamdad.org>\n"
 "Language-Team: Iranian Azerbaijani <az-ir@lists.sharif.edu>\n"
@@ -96,114 +96,114 @@ msgstr ""
 msgid "the GdkScreen for the renderer"
 msgstr ""

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr ""

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 msgid "The version of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr ""

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 msgid "List of authors of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 msgid "Logo Icon Name"
 msgstr ""

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 msgid "Link Color"
 msgstr ""

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -1946,11 +1946,11 @@ msgstr ""
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr ""

@@ -2451,107 +2451,107 @@ msgstr ""
 msgid "The height of the layout"
 msgstr ""

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr ""

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr ""

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr ""

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr ""

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr ""

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr ""

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr ""

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr ""

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr ""

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr ""

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr ""

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr ""

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr ""

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4484,61 +4484,61 @@ msgstr ""
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr ""

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr ""

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr ""

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr ""

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr ""

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr ""

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr ""

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr ""

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr ""

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr ""

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr ""

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
 msgstr ""

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr ""

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr ""

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2003-03-31 07:40+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -105,121 +105,121 @@ msgstr "Экран"
 msgid "the GdkScreen for the renderer"
 msgstr "Разнавід для адлюстраваньня дрэва"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 #, fuzzy
 msgid "Program name"
 msgstr "Назоў тэгу"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "Мейсцазнаходжаньне палоскі прылад"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 #, fuzzy
 msgid "Comments string"
 msgstr "Водступ між слупкоў"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 #, fuzzy
 msgid "Website label"
 msgstr "Адмеціна ўкладкі"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "Мейсцазнаходжаньне палоскі прылад"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "Назва шрыфту"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "Бягучы колер"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -2098,11 +2098,11 @@ msgstr "Назоў гэтага акна"
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 #, fuzzy
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Назва звычайнага шрыфту"
@@ -2648,11 +2648,11 @@ msgstr "Шырыня разьмеркаваньня."
 msgid "The height of the layout"
 msgstr "Вышыня разьмеркаваньня."

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Загаловак адарванага мэню"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -2660,115 +2660,115 @@ msgstr ""
 "Загаловак, які можа адлюстроўвацца аконным кіраўніком, пасля таго, як мэню "
 "будзе выключана."

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 #, fuzzy
 msgid "Tearoff State"
 msgstr "Загаловак адарванага мэню"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 #, fuzzy
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""
 "Загаловак, які можа адлюстроўвацца аконным кіраўніком, пасля таго, як мэню "
 "будзе выключана."

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 #, fuzzy
 msgid "Vertical Padding"
 msgstr "Вэртыкальная запаўненьне"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 #, fuzzy
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Памер прасторы зьверху й зьнізу ад віджэ�у ў піксэлях"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 #, fuzzy
 msgid "Vertical Offset"
 msgstr "Вэртыкальнае маштабаваньне"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 #, fuzzy
 msgid "Horizontal Offset"
 msgstr "Гарызантальнае маштабаваньне"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 #, fuzzy
 msgid "Left Attach"
 msgstr "Левы дадатак"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Нумар слупка каб дадаць левы бок нашчадка да"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 #, fuzzy
 msgid "Right Attach"
 msgstr "Правы дадатак"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 #, fuzzy
 msgid "The column number to attach the right side of the child to"
 msgstr "Нумар слупка каб дадаць левы бок нашчадка да"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 #, fuzzy
 msgid "Top Attach"
 msgstr "Верхні дадатак"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 #, fuzzy
 msgid "The row number to attach the top of the child to"
 msgstr "нумар радка каб дадаць ніз віджэта-нашчадка да"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 #, fuzzy
 msgid "Bottom Attach"
 msgstr "Ніжні дадатак"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "нумар радка каб дадаць ніз віджэта-нашчадка да"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Можа зьмяняць \"гарычыя\" клявішы"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Ці могуць быць зьменены \"гарачыя\" клявішы мэню, калі націснуць спалучэньне "
 "над пунктам мэню."

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Затрымка перд зьяўленьнем падмэню"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Час найменьшага знаходжаньня ўказальніка над мэню, пасьля якога зьявіцца "
 "падмэню."

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Затрымка перд зьнікненьнем падмэню"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4834,52 +4834,52 @@ msgstr ""
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr ""

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Унутранае засяроджаньне"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Ці будзе адлюстроўвацца паказальнік засяроджаньня ўнутры віджэтаў."

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Шырыня лініі засяроджаньня"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Шырыня, у піксэлях, лініі засяроджаньня."

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Узор лініі засяроджаньня"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Узор штрыхоў для адлюстраваньня засяроджаньня."

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Спад засяроджаньня"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""
 "Шырыня, у піксалях, паміж паказальнікам засяроджаньня й віджэтам \"box\"."

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Колер курсора"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Колер, выкарыстоўвываемы для адлюстраваньня курсору"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Колер другога курсору"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4887,11 +4887,11 @@ msgstr ""
 "Колер для адлюстраваньня другога курсору, калі выкарыстоўвываецца зьмешаны"
 "(зьлева направа й справа налева) ўвод тэксту."

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Прапорцыі курсору"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Прапорцыі курсору"

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gtk+-properties 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 22:52+0200\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2005-01-08 22:51+0200\n"
 "Last-Translator: Vladimir Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -99,11 +99,11 @@ msgstr "Екран"
 msgid "the GdkScreen for the renderer"
 msgstr "Екранът GdkScreen на изобразяващия модул"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr "Име на програмата"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
@@ -111,43 +111,43 @@ msgstr ""
 "Името на програмата. Ако не е зададено, по подразбиране се взима "
 "g_get_application_name()"

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr "Версия на програмата"

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 msgid "The version of the program"
 msgstr "Версията на програмата"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr "Авторски права"

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr "Информация за авторските права върху програмата"

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr "Коментар"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr "Коментари за програмата"

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr "Адрес на уебсайт"

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr "URL към уебсайта на програмата"

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr "Етикет на интернет страница"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
@@ -155,46 +155,46 @@ msgstr ""
 "Етикетът за хипервръзката към уебсайта на програмата. Ако не е зададен, по "
 "подразбиране е URL-то"

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr "Автори"

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 msgid "List of authors of the program"
 msgstr "Списък на авторите на програмата"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr "Документатори"

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr "Списък на хората, които са написали документацията на програмата"

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr "Дизайнери"

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""
 "Списък на хората, които са допринесли за художественото оформление на "
 "програмата"

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr "Преводачи"

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr "Списък с преводачи. Низът трябва да е отбелязан за превод"

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr "Лого"

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -202,21 +202,21 @@ msgstr ""
 "Лого за диалоговата кутия \"Относно\". Ако не е зададено, по подразбиране се "
 "задава gtk_window_get_default_icon_list()"

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 msgid "Logo Icon Name"
 msgstr "Име на иконата за логото"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""
 "Именована икона, която да се използва като лого за диалоговата кутия "
 "\"Относно\"."

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 msgid "Link Color"
 msgstr "Цвят на връзката"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr "Цветът на хипервръзките"

@@ -2044,11 +2044,11 @@ msgstr "Заглавието на диалоговата кутия за изб
 msgid "The desired width of the button widget, in characters."
 msgstr "Желаната широчина на бутона, в символи"

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "Модулът за файлова система по подразбиране"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Име на модула за GtkFileChooser, който да се използва по подразбиране"

@@ -2564,11 +2564,11 @@ msgstr "Ширината на подредбата"
 msgid "The height of the layout"
 msgstr "Височината на подредбата"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Откъснато заглавие"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -2576,27 +2576,27 @@ msgstr ""
 "Заглавие, което може да се покаже от мениджъра на прозорци, когато това меню "
 "е отделено"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr "Откъснато"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Булева стойност указваща дали заглавието е откъснато"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Вертикална обшивка"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Допълнително място над и под менюто"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Вертикален отстъп"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -2604,11 +2604,11 @@ msgstr ""
 "Когато менюто е подменю, да се разположи отместено на определен брой пиксели "
 "вертикално"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Хоризонтален отстъп"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -2616,69 +2616,69 @@ msgstr ""
 "Когато менюто е подменю, да се разположи отместено на определен брой пиксели "
 "хоризонтално"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Ляво прикрепяне"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Номер на колоната, към който да се прикрепи лявата страна на вложения елемент"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Дясно прикрепяне"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr ""
 "Номер на колоната, към който да се прикрепи лявата страна на вложения елемент"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Горно прикрепяне"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr ""
 "Номер на реда, към който да се прикрепи долната страна на вложения елемент"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Долно прикрепяне"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr ""
 "Номер на реда, към който да се прикрепи долната страна на вложения елемент"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Може да променя ускорителите"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Дали ускорителите за менюта могат да бъдат променяни чрез натискане на "
 "клавиш над обект от менюто."

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Закъснение преди появяване на подменюта"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Минимално време, през което показалеца трябва да остане над обект от меню "
 "преди да се появи подменюто"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Закъснение преди скриване на подменю"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4710,52 +4710,52 @@ msgstr "Да не се показва"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Дали gtk_widget_show_all() да не влияе на този обект"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Вътрешен Фокус"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Дали да изчертава индикатор за фокус вътре в графични обекти"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Ширина на линия за фокус"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Ширина, в пиксели, за линията на индикатора на фокус"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Линия на фокус с шаблон на тирета"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Образец с тирета използван за изчертаване на индикатор за фокус"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Рамка на фокуса"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""
 "Ширина в пиксели между индикатора 'фокус' и 'box'-ът на графичния обект"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Цвят на Показалец"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Цвят, с който ще се изчертава показалеца"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Цвят на Втори Показалец"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4763,11 +4763,11 @@ msgstr ""
 "Цвят, с който ще се изчертава втория показалец при редактиране на смесен "
 "ляво-десен и дясно-ляв текст"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Пропорция на показалеца"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Пропорция на показалеца"

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.gtk-2-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2004-03-18 10:45+0600\n"
 "Last-Translator: Progga <progga@BengaLinux.Org>\n"
 "Language-Team: Bangla <gnome-translation@BengaLinux.Org>\n"
@@ -98,121 +98,121 @@ msgstr "পর্দা"
 msgid "the GdkScreen for the renderer"
 msgstr "শাখা-প্রশাখার ন্যায় দৃশ্যের মডেল"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 #, fuzzy
 msgid "Program name"
 msgstr "ট্যাগের নাম"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "টুলবারের দিক"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 #, fuzzy
 msgid "Comments string"
 msgstr "প্রতি কলামে স্পেস-এর সংখ্যা"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 #, fuzzy
 msgid "Website label"
 msgstr "লেবেলে ফন্টের আকার ব্যবহার করো"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "টুলবারের দিক"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "ফন্টের নাম"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "বর্তমান রং"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -2036,11 +2036,11 @@ msgstr "ফন্ট নির্বাচক ডায়ালগের শির
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "স্বাভাবিক অবস্থায় ব্যবহৃত ফাইল বাছাইকারী ব্যাকএন্ড"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "স্বাভাবিক অবস্থায় যে GtkFileChooser ব্যাকএন্ড ব্যবহার করা হবে তার নাম"

@@ -2576,11 +2576,11 @@ msgid "The height of the layout"
 msgstr "নকশার (Layout) উচ্চতা"

 # FIXME: এইটা নিয়ে Confusion আছে
-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "বিচ্ছিন্ন শিরোনাম"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -2588,103 +2588,103 @@ msgstr ""
 "এই মেনুটি বিচ্ছিন্ন (???) থাকলে উইন্ডো ম্যানেজার যে শিরোনামটি প্রদর্শন করতে পারবে"

 # FIXME: এইটা নিয়ে Confusion আছে
-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 #, fuzzy
 msgid "Tearoff State"
 msgstr "বিচ্ছিন্ন শিরোনাম"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 #, fuzzy
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""
 "এই মেনুটি বিচ্ছিন্ন (???) থাকলে উইন্ডো ম্যানেজার যে শিরোনামটি প্রদর্শন করতে পারবে"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "উলম্ব প্যাডিং (Padding)"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "উইজেটের উপর ও নীচে যতগুলো স্পেস যোগ করা হবে"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "উলম্ব অফসেট"

 # FIXME
-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr "এটি যদি সাবমেনু হয়, তবে একে এই সংখ্যক পিক্সেল উলম্ব অফসেটে স্থাপন করো"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "অনুভূমিক অফসেট"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr "এটি যদি সাবমেনু হয়, তবে একে এই সংখ্যক পিক্সেল অনুভূমিক অফসেটে স্থাপন করো"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "বামপাশের সংযুক্তি"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "চাইল্ডের বাম পাশে যে কলাম নম্বর যুক্ত হবে"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "ডানপাশের সংযুক্তি"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "চাইল্ডের বাম পাশে যে কলাম নম্বর যুক্ত হবে"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "ঊর্ধ্ব সংযুক্তি"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "চাইল্ডের উপরের অংশে যে সারি নম্বর যুক্ত হবে"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "নিম্ন সংযুক্তি"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "চাইল্ডের নিচের অংশে যে সারি নম্বর যুক্ত হবে"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "চটপট কী (Key) পরিবর্তন করতে পারে"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr "মেনু আইটেমের ওপর চাপ দিয়ে চটপট কী (Key) পরিবর্তন করা যাবে কিনা"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "সাবমেনু দেখা যাওয়ার পূর্বে বিলম্ব"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "সাবমেনু দেখা যাওয়ার পূর্বে সর্বনিম্ন যে সময় যাবত্‍ পয়েন্টারটি মেনুতে প্রদর্শিত সাবমেনুর "
 "নামের ওপর থাকবে"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "সাবমেনু আড়াল করার পূর্বে বিলম্ব"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4704,51 +4704,51 @@ msgstr "সবকিছু দেখাও অকেজো"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "gtk_widget_show_all() এই উইজেটকে প্রভাবিত করবে না কিনা"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "অভ্যন্তরীণ ফোকাস"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "ফোকাস নির্দেশকটি উইজেটের ভেতর আঁকা হবে কিনা"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "ফোকাসের লাইনব্যাপ্তি"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "পিক্সেল হিসেবে ফোকাস নির্দেশক লাইনের প্রস্থ"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "ফোকাস লাইনের ড্যাশ প্যাটার্ন"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "ফোকাস নির্দেশক আঁকতে যে ধরনের ড্যাশ প্যাটার্ন আঁকতে হবে"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "ফোকাস প্যাডিং"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "পিক্সেল হিসেবে ফোকাস নির্দেশক ও উইজেট 'বাক্সের' মধ্যবর্তী স্থানের প্রস্থ"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "কার্সারের রং "

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "অক্ষর ঢোকানোর (Insertion) কার্সার আঁকতে যে রং ব্যবহৃত হবে"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "কার্সার আঁকায় ব্যবহৃত দ্বিতীয় রং"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4756,12 +4756,12 @@ msgstr ""
 "ডান-থেকে-বাম এবং বাম-থেকে-ডান এ লেখায় হয় এরকম টেক্সটের মিশ্রণ এডিট করার সময় "
 "অক্ষর ঢোকানোর (Insertion) কার্সার আঁকতে যে রং ব্যবহৃত হবে"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "কার্সার লাইনের আবয়ব অনুপাত"

 # বোঝা যাচ্ছে না
-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "যে আবয়ব অনুপাতে অক্ষর ঢোকানোর (Insertion) কার্সার আঁকা হবে"

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2004-01-15 16:03+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: br <LL@li.org>\n"
@@ -96,115 +96,115 @@ msgstr ""
 msgid "the GdkScreen for the renderer"
 msgstr ""

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr ""

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 msgid "The version of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr ""

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 msgid "List of authors of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "Anv an nodezh"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 msgid "Link Color"
 msgstr ""

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -1948,11 +1948,11 @@ msgstr ""
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr ""

@@ -2458,107 +2458,107 @@ msgstr ""
 msgid "The height of the layout"
 msgstr ""

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr ""

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr ""

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr ""

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr ""

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr ""

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr ""

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr ""

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr ""

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr ""

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr ""

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr ""

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr ""

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr ""

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr ""

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4491,61 +4491,61 @@ msgstr ""
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr ""

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr ""

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr ""

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr ""

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr ""

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr ""

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr ""

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr ""

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr ""

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr ""

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr ""

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
 msgstr ""

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr ""

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr ""

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties.gtk-2-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2004-07-19 00:47+0200\n"
 "Last-Translator: Kenan Hadžiavdić <kenan@bgnett.no>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -98,121 +98,121 @@ msgstr "Ekran"
 msgid "the GdkScreen for the renderer"
 msgstr "Model za razgranati pregled"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 #, fuzzy
 msgid "Program name"
 msgstr "Ime oznake"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "Orijentacija trake s alatima"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 #, fuzzy
 msgid "Comments string"
 msgstr "Prostor između kolona"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 #, fuzzy
 msgid "Website label"
 msgstr "Koristi veličinu u oznaci"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "Orijentacija trake s alatima"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "Ime fonta"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "Trenutna boja"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -2045,11 +2045,11 @@ msgstr "Naslov dijaloga za odabir fonta"
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "Podrška za uobičajeni iybornik datoteka"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Ime GtkFileChooser podrške koja će se koristiti uobičajeno"

@@ -2581,116 +2581,116 @@ msgstr "Grafički element prikaza"
 msgid "The height of the layout"
 msgstr "Visina prikaza"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Naslov otrgnutog"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""
 "Naslov koji upravitelj prozorima može prikazati kada je ovaj meni otrgnut"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 #, fuzzy
 msgid "Tearoff State"
 msgstr "Naslov otrgnutog"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 #, fuzzy
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""
 "Naslov koji upravitelj prozorima može prikazati kada je ovaj meni otrgnut"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Vertikalno popunjavanje"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Dodatni prostor na vrhu i dnu menija"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Vertikalni razmak"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""
 "Kada je meni podmeni, postavi ga u vertikalnom raymaku od ovoliko piksli"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Vodoravni razmak"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""
 "Kada je meni podmeni, postavi ga u vodoravnom razmaku od ovoliko piksli"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Lijevo pripajanje"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Broj kolone kojoj će se pripojiti lijeva strana podređenog elementa"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Desno pripajanje"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "Broj kolone kojoj će se pripojiti desna strana podređenog elementa"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Gornje pripajanje"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "Broj reda kojem će se pripojiti vrh podređenog elementa"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Donje pripajanje"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "Broj reda kojem će se pripojiti dno podređenog elementa"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Dopuštena izmjena prečica"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Da li je dopuštena izmjena prečica pritiskanjem tipke nad stavkom menija"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Vrijeme do pojavljivanja podmenija"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Vrijeme koje kursor miša mora zadržati nad stavkom menija da bi se pojavio "
 "podizbornik"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Vrijeme do skrivanja podmenija"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4725,52 +4725,52 @@ msgstr "Nemoj prikazati sve"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Da li gtk_widget_show_all() neće utjecati na ovaj grafički element"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Unutrašnji fokus"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Da li crtati pokazivač fokusa u grafičkim elementima"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Širina linije fokusa"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Širina, u pikslama, linije pokazivača fokusa"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Šablon za crtanje linije fokusa"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Šablon koji se koristi za crtanje pokazivač fokusa"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Popunjavanje za fokus"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""
 "Širina, u pikslama, između pokazivača fokusa i okvira grafičkog elementa"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Boja kursora"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Boja kursora za unos"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Boja sekundarnog kursora"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4778,11 +4778,11 @@ msgstr ""
 "Boja sekundarnog kursora pri izmjenama miješanog desno-na-lijevo i lijevo-na-"
 "desno teksta"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Omjer kursora"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Omjer u kojem će se crtati kursor za unos"

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2003-11-13 15:21+0100\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -108,121 +108,121 @@ msgstr "Pantalla"
 msgid "the GdkScreen for the renderer"
 msgstr "El model per la vista d'arbre"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 #, fuzzy
 msgid "Program name"
 msgstr "Nom de marcador"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr ""

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 #, fuzzy
 msgid "The version of the program"
 msgstr "L'orientació de la barra d'eines"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr ""

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 #, fuzzy
 msgid "Comments string"
 msgstr "Espaiat de columnes"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 #, fuzzy
 msgid "Website label"
 msgstr "Etiqueta de la pestanya"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
 msgstr ""

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr ""

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 #, fuzzy
 msgid "List of authors of the program"
 msgstr "L'orientació de la barra d'eines"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr ""

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr ""

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr ""

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr ""

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr ""

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 #, fuzzy
 msgid "Logo Icon Name"
 msgstr "Nom de família"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr ""

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 #, fuzzy
 msgid "Link Color"
 msgstr "Color actual"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr ""

@@ -2095,11 +2095,11 @@ msgstr "El títol de finestra"
 msgid "The desired width of the button widget, in characters."
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr ""

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 #, fuzzy
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Nom per defecte del tipus de lletra a utilitzar"
@@ -2644,11 +2644,11 @@ msgstr "L'amplada de la disposició"
 msgid "The height of the layout"
 msgstr "L'alçada de la disposició"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Títol de Tearoff"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -2656,115 +2656,115 @@ msgstr ""
 "Un títol que s'ha de visualitzar mitjançant el gestor de finestres quan "
 "aquest menú es desactivi"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 #, fuzzy
 msgid "Tearoff State"
 msgstr "Títol de Tearoff"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 #, fuzzy
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr ""
 "Un títol que s'ha de visualitzar mitjançant el gestor de finestres quan "
 "aquest menú es desactivi"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 #, fuzzy
 msgid "Vertical Padding"
 msgstr "Separació vertical"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 #, fuzzy
 msgid "Extra space at the top and bottom of the menu"
 msgstr "L'alineació d'espai a afegir de dalt a baix del giny, en punts"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 #, fuzzy
 msgid "Vertical Offset"
 msgstr "Escala vertical"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 #, fuzzy
 msgid "Horizontal Offset"
 msgstr "Escala horitzontal"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 #, fuzzy
 msgid "Left Attach"
 msgstr "Fitxer adjunt esquerre"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "El número de columna per adjuntar la banda esquerra del fill a"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 #, fuzzy
 msgid "Right Attach"
 msgstr "Fitxer adjunt dret"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 #, fuzzy
 msgid "The column number to attach the right side of the child to"
 msgstr "El número de columna per adjuntar la banda esquerra del fill a"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 #, fuzzy
 msgid "Top Attach"
 msgstr "Fitxer adjunt superior"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 #, fuzzy
 msgid "The row number to attach the top of the child to"
 msgstr "El número de fila per adjuntar la part inferior del fill a"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 #, fuzzy
 msgid "Bottom Attach"
 msgstr "Fitxer adjunt inferior"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "El número de fila per adjuntar la part inferior del fill a"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Poden canviar els acceleradors"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Si els acceleradors del menú es poden canviar prement una tecla sobre l'ítem "
 "del menú"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Retard abans de que apareguen els submenús"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Temps mínim que ha d'estar el punter sobre un element de menú abans que "
 "aparegui el submenú"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Retard abans d'amagar un submenú"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4842,51 +4842,51 @@ msgstr ""
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr ""

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Focus interior"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Si s'ha de dibuixar l'indicador del focus dins dels ginys"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Amplada de línia del focus"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Amplada, en píxels, de la línia indicadora del focus"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Patró de traç de la línia de focus"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Patró de traç utilitzat per dibuixar l'indicador del focus"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Separació del focus"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "Amplada, en píxels, entre l'indicador de focus i el giny 'box'"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Color del cursor"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Color amb el que es dibuixa el cursor d'inserció"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Color del cursor secundari"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4894,11 +4894,11 @@ msgstr ""
 "Color per dibuixar el cursor d'inserció secundària en editar la barreja del "
 "text de dreta-a-esquerra i d'esquerra-a-dreta."

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Ràtio d'aspecte de la línia del cursor"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Ràtio d'aspecte amb el que dibuixar el cursor d'inserció"

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2005-01-02 15:09+0100\n"
 "Last-Translator: Miloslav Trmac <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -102,54 +102,54 @@ msgstr "Obrazovka"
 msgid "the GdkScreen for the renderer"
 msgstr "GdkScreen pro vykreslovač"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr "Název programu"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr ""
 "Název programu. Pokud není nastaven, je implicitně g_get_application_name()"

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr "Verze programu"

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 msgid "The version of the program"
 msgstr "Verze programu"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr "Řetězec copyrightu"

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr "Informace o copyrightu na program"

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr "Řetězec poznámek"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr "Poznámky o programu"

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr "URL WWW stránek"

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr "URL pro odkaz na WWW stránky programu"

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr "Popisek WWW stránek"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
@@ -157,45 +157,45 @@ msgstr ""
 "Popisek pro odkaz na WWW stránky programu. Není-li nastaven, je implicitně "
 "roven URL"

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr "Autoři"

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 msgid "List of authors of the program"
 msgstr "Seznam autorů programu"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr "Dokumentátoři"

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr "Seznam lidí dokumentujících program"

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr "Umělci"

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr "Seznam lidí, kteří pro program tvořili grafiku"

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr "Kredity překladatelů"

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""
 "Kredity překladatelů. Tento řetězec by měl být označen jako přeložitelný"

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr "Logo"

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -203,19 +203,19 @@ msgstr ""
 "Logo pro dialog o aplikaci. Pokud není nastaveno, je implicitně "
 "gtk_window_get_default_icon_list()"

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 msgid "Logo Icon Name"
 msgstr "Název ikony s logem"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr "Pojmenovaná ikona, kterou použávat jako logo pro dialog o aplikaci."

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 msgid "Link Color"
 msgstr "Barva odkazu"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr "Barva odkazů"

@@ -2009,11 +2009,11 @@ msgstr "Titulek dialogu výběru souborů."
 msgid "The desired width of the button widget, in characters."
 msgstr "Požadovaná šířka widgetu tlačítka ve znacích."

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "Implicitní backend výběru souborů"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Název backendu GtkFileChooser, který používat implicitně"

@@ -2525,111 +2525,111 @@ msgstr "Šířka rozložení"
 msgid "The height of the layout"
 msgstr "Výška rozložení"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Titulek pro odtrhnutí"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""
 "Titulek, který může být zobrazen správcem oken, když je toto menu odtrženo"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr "Stav odtrhnutí"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Booleovská hodnota, která určuje, jestli je menu odtrženo"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Svislé doplnění"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Místo navíc nad a pod menu"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Svislé posunutí"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr "Když menu je podmenu, umístit je svisle posunuté o tolik pixelů"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Vodorovné posunutí"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr "Když menu je podmenu, umístit je vodorovně posunuté o tolik pixelů"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Připevnění vlevo"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Číslo sloupce, ke kterému připevnit levou stranu potomka"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Připevnění vpravo"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "Číslo sloupce, ke kterému připevnit pravou stranu potomka"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Připevnění nahoře"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "Číslo řádku, ke kterému připevnit horní stranu potomka"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Připevnění dole"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "Číslo řádku, ke kterému připevnit dolní stranu potomka"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Lze měnit akcelerátory"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Jestli mohou akcelerátory menu být změněny stiskem klávesy nad položkou menu"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Prodleva před zobrazením podmenu"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Minimální doba, kterou musí zůstat ukazatel nad položku menu, než se objeví "
 "podmenu"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Prodleva před skrytím podmenu"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4618,51 +4618,51 @@ msgstr "Nezobrazovat se všemi"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Jestli by gtk_widget_show_all() nemělo mít vliv na tento widget"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Vnitřní fokus"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Jestli vykreslovat indikátor fokusu ve widgetech"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Šířka čáry fokusu"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Šířka čáry indikátoru fokusu, v bodech"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Vzorek čáry indikátoru fokusu"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Vzorek používaný při kreslení čáry indikátoru fokusu"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Doplnění fokusu"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "Mezera mezi indikátorem fokusu a boxem widgetu, v pixelech"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Barva kurzoru"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Barva, kterou kreslit vkládací kurzor"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Barva sekundárního kurzoru"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4670,11 +4670,11 @@ msgstr ""
 "Barva, kterou kreslit sekundární kurzor při editaci kombinovaného textu "
 "zleva doprava a zprava doleva"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Poměr čáry kurzoru"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Poměr, kterým kreslit kurzor pro vkládání"

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2005-01-07 02:02+0000\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
@@ -98,11 +98,11 @@ msgstr "Sgrin"
 msgid "the GdkScreen for the renderer"
 msgstr "y GdkScreen ar gyfer y llunydd"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr "Enw'r rhaglen"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
@@ -110,43 +110,43 @@ msgstr ""
 "Enw'r rhaglen. Os nad yw'r enw wedi ei osod, y dewis rhagosodedig yw "
 "g_get_application_name()"

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr "Fersiwn rhaglen"

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 msgid "The version of the program"
 msgstr "Fersiwn y rhaglen"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr "Llinyn hawlfraint"

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr "Gwybodaeth hawlfraint ar gyfer y rhaglen"

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr "Llinyn sylwadau"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr "Sylwadau ynglŷn â'r rhaglen"

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr "LAU safle gwe"

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr "LAU cyswllt i safle gwe'r rhaglen"

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr "Label safle gwe"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
@@ -154,45 +154,45 @@ msgstr ""
 "Y label ar gyfer y cyswllt i safle gwe'r rhaglen. Os nad yw wedi ei osod, fe "
 "ddefnyddir yr LAU fel label"

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr "Awduron"

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 msgid "List of authors of the program"
 msgstr "Rhestr o awduron y rhaglen"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr "Dogfennwyr"

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr "Rhestr o'r rhai ysgrifennodd ddogfennaeth y rhaglen"

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr "Artistiaid"

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr "Rhestr o'r rhai gyfrannodd waith graffeg/celf i'r rhaglen"

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr "Clodau cyfieithwyr"

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""
 "Diolchiadau i'r cyfieithwyr. Dylid marcio'r llinyn hwn yn gyfieithiadwy"

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr "Logo"

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -200,19 +200,19 @@ msgstr ""
 "Logo ar gyfer y blwch ynghylch. Os na osodir hyn, y dewis rhagosodedig yw "
 "gtk_window_get_default_icon_list()"

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 msgid "Logo Icon Name"
 msgstr "Enw Eicon y Logo"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr "Enw'r eicon i'w ddefnyddio fel logo ar gyfer y blwch 'ynghylch'."

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 msgid "Link Color"
 msgstr "Lliw Cyswllt"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr "Lliw'r cysylltion"

@@ -2028,11 +2028,11 @@ msgstr "Teitl y deialog dewis ffeil"
 msgid "The desired width of the button widget, in characters."
 msgstr "Lled dewisol y teclyn botwm, mewn nodau."

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "Ochr gefn rhagosod y dewisydd ffeil"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Enw'r ochr gefn GtkFileChooser i'w ddefnyddio'n rhagosod"

@@ -2558,11 +2558,11 @@ msgstr "Lled y llunwedd"
 msgid "The height of the layout"
 msgstr "Hyd y llunwedd"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Teitl Rhwygun"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -2570,27 +2570,27 @@ msgstr ""
 "Teitl a all gael ei ddangos gan y rheolwr ffenestri pan rwygir y ddewislen "
 "hon"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr "Cyflwr Rhwygun"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Gwerth Boole sy'n penderfynu a chaiff y ddewislen ei rhwygo"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Bylchu Fertigol"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Gofod ychwannegol ar ben a gwaelod y ddewislen"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Atred Fertigol"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -2598,11 +2598,11 @@ msgstr ""
 "Pan mae'r ddewislen yn isddewislen, ei leoli'r nifer yma o bicseli yn is yn "
 "fertigol"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Atred Llorweddol"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -2610,64 +2610,64 @@ msgstr ""
 "Pan mae'r ddewislen yn isddewislen, ei leoli'r nifer yma o bicseli ar draws "
 "yn llorweddol"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Clymiad Chwith"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Rhif y golofn i glymu ochr chwith y plentyn iddi"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Clymiad De"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "Rhif y golofn i glymu ochr chwith y plentyn iddi"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Clwm Pen"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "Rhif y rhes i glymu pen y plentyn iddi"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Clwm Gwaelod"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "Rhif y rhes i glymu gwaelod y plentyn iddi"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Gellir newid cyflymwyr"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "A ellir newid cyflymwyr dewislenni gan wasgu bysell dros yr eitem dewislen"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Saib cyn fo is-ddewislenni yn ymddangos"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Yr amser lleiaf rhaid i'r pwyntydd aros dros eitem dewislen cyn i'r is-"
 "ddewislen ymddangos"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Saib cyn cuddio is-ddewislen"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4735,51 +4735,51 @@ msgstr "Dim \"dangos popeth\""
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "A ddylai gtk_widget_show_all() beidio ag affeithio'r teclyn hwn"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Ffocws Mewnol"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "A ddylid arlinio'r dangosydd ffocws o fewn teclynau"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Lled y llinell ffocws"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Lled, mewn picseli, y llinell dangos ffocws"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Patrwm llinell ffocws"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Y patrwm i'w ddefnyddio er mwyn arlunio y dangosydd ffocws"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Padio ffocws"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "Lled, mewn picsel, rhwng y dangosydd ffocws a 'bocs' y teclyn"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Lliw y cyrchydd"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Pa liw i arlunio'r cyrchydd mewnosod"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Lliw y cyrchydd eilaidd"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4787,11 +4787,11 @@ msgstr ""
 "Y lliw i'w ddefnyddio er mwyn arlunio y cyrchydd mewnosod eilaidd tra'n "
 "golygu testun chwith-i'r-de a de-i'r-chwith cymysg"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Cymhareb agwedd llinell cyrchydd"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Cymhareb agwedd er mwyn arlunio'r cyrchydd mewnosod"

@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
 "PO-Revision-Date: 2005-01-05 16:13+0100\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -124,11 +124,11 @@ msgstr "Skærm"
 msgid "the GdkScreen for the renderer"
 msgstr "Optegnerens GdkScreen"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr "Programnavn"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
@@ -136,43 +136,43 @@ msgstr ""
 "Programmets navn. Hvis dette ikke er angivet benyttes g_get_application_name"
 "()"

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr "Programversion"

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 msgid "The version of the program"
 msgstr "Programmets version"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr "Copyright-streng"

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr "Copyright-information for programmet"

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr "Kommentarstreng"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr "Kommentarer om programmet"

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr "Websted-adresse"

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr "Adressen til programmets websted"

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr "Websted-etiket"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
@@ -180,46 +180,46 @@ msgstr ""
 "Etiketten for adressen til programmets websted. Hvis denne ikke er angivet "
 "benyttes adressen."

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr "Forfattere"

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 msgid "List of authors of the program"
 msgstr "Liste over programmets forfattere"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr "Dokumentører"

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr "Liste over programmets dokumentører"

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr "Kunstnere"

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr ""
 "Liste over mennesker der har bidraget med grafik og/eller lyd til programmmet"

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr "Bidragydere til oversættelse"

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""
 "Bidragydere til oversættelse. Denne streng skal markeres som oversætbar"

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr "Logo"

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -227,19 +227,19 @@ msgstr ""
 "Et logo til om-vinduet. Hvis dette ikke er angivet benyttes "
 "gtk_window_get_default_icon_list()"

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 msgid "Logo Icon Name"
 msgstr "Logoikonnavn"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr "Et navngivetikon der skal bruges som logo for om-vinduet."

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 msgid "Link Color"
 msgstr "Link-farve"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr "Farven på links"

@@ -2051,11 +2051,11 @@ msgstr "Titlen på filvælgervinduet."
 msgid "The desired width of the button widget, in characters."
 msgstr "Den ønskede bredde på knapkontrollen i tegn."

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "Standard-filvælgerbagende"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Navn på den GtkFileChooser-bagende som skal anvendes som standard"

@@ -2573,38 +2573,38 @@ msgstr "Bredden af layoutet"
 msgid "The height of the layout"
 msgstr "Højden af layoutet"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Afrivningstitel"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""
 "En titel som vindueshåndteringen kan vise når denne menu bliver revet af"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr "Afrivningstilstand"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "En sandhedsværdi der indikerer om menuen er afrevet"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Lodret udfyldning"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Ekstra mellemrum i toppen og bunden af menuen"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Lodret afstand"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -2612,11 +2612,11 @@ msgstr ""
 "Placér menuen med en afstand på dette antal punkter lodret når menuen er en "
 "undermenu"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Vandret afstand"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -2624,63 +2624,63 @@ msgstr ""
 "Placér menuen med en afstand på dette antal punkter vandret når menuen er en "
 "undermenu"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Venstre vedhæftning"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Det kolonnenummer som venstre side af barnet skal vedhæftes"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Højre vedhæftning"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr "Det kolonnenummer som venstre side af barnet skal vedhæftes"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Topvedhæftning"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr "Det rækkenummer som toppen af barnet skal vedhæftes"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Bundvedhæftning"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "Det rækkenummer som bunden af barnet skal vedhæftes"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Kan ændre genveje"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr "Om menugenveje kan ændres ved at trykke på en tast over menupunktet"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Ventetid før undermenuer dukker op"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Det mindste tidsrum markøren skal befinde sig over et menupunkt før "
 "undermenuen dukker op"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Ventetid før en undermenu skjules"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4713,52 +4713,52 @@ msgstr "Ingen vis alle"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Om gtk_widget_show_all() ikke skal påvirke denne kontrol"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Indvendig fokus"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Om fokusindikatoren skal tegnes inde i kontrollen"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Fokuslinjebredde"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Bredde, i skærmpunkter, af fokuseringsindikatorens linje"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Stiplingsmønster til fokuslinje"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Stiplingsmønster der bruges til at tegne fokuseringsindikatoren"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Fokusudfyldning"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""
 "Bredde, i skærmpunkter, mellem fokuseringsindikatoren og kontrollens 'boks'"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Markørfarve"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Farve som indtastningsmarkøren skal tegnes med"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Sekundær markørfarve"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4766,11 +4766,11 @@ msgstr ""
 "Farve som bruges til at tegne den sekundære indtastningsmarkør ved "
 "redigering af blandet højre-mod-venstre- og venstre-mod-højre-tekst"

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Formatforhold for markørlinje"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Det formatforhold indtastningsmarkøren skal tegnes med"

@@ -7,16 +7,15 @@
 # Hendrik Richter <hendrik@gnome-de.org>, 2004.
 # Hendrik Brandt <heb@gnome-de.org>
 # IM = Input method => Eingabemethode
-# Hendrik Richter <hendrik@gnome-de.org>, 2004.
 # 
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: GTK+ HEAD\n"
+"Project-Id-Version: GTK+ 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-08 02:01-0500\n"
-"PO-Revision-Date: 2004-12-18 15:04+0100\n"
-"Last-Translator: Hendrik Brandt <heb@gnome-de.org>\n"
+"POT-Creation-Date: 2005-02-04 13:26-0500\n"
+"PO-Revision-Date: 2005-01-20 17:14+0100\n"
+"Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -107,11 +106,11 @@ msgstr "Bildschirm"
 msgid "the GdkScreen for the renderer"
 msgstr "Der GdkScreen für den Renderer"

-#: gtk/gtkaboutdialog.c:195
+#: gtk/gtkaboutdialog.c:202
 msgid "Program name"
 msgstr "Programmname"

-#: gtk/gtkaboutdialog.c:196
+#: gtk/gtkaboutdialog.c:203
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
@@ -119,43 +118,43 @@ msgstr ""
 "Der Name des Programms. Wird dies leer gelassen, so hat es den Wert von "
 "g_get_application_name()"

-#: gtk/gtkaboutdialog.c:210
+#: gtk/gtkaboutdialog.c:217
 msgid "Program version"
 msgstr "Programmversion"

-#: gtk/gtkaboutdialog.c:211
+#: gtk/gtkaboutdialog.c:218
 msgid "The version of the program"
 msgstr "Die Version des Programms"

-#: gtk/gtkaboutdialog.c:225
+#: gtk/gtkaboutdialog.c:232
 msgid "Copyright string"
 msgstr "Copyright Zeichenkette"

-#: gtk/gtkaboutdialog.c:226
+#: gtk/gtkaboutdialog.c:233
 msgid "Copyright information for the program"
 msgstr "Copyright-Informationen des Programms"

-#: gtk/gtkaboutdialog.c:243
+#: gtk/gtkaboutdialog.c:250
 msgid "Comments string"
 msgstr "Kommentare als Zeichenkette"

-#: gtk/gtkaboutdialog.c:244
+#: gtk/gtkaboutdialog.c:251
 msgid "Comments about the program"
 msgstr "Kommentare über dieses Programme"

-#: gtk/gtkaboutdialog.c:276
+#: gtk/gtkaboutdialog.c:284
 msgid "Website URL"
 msgstr "URL der Webseite"

-#: gtk/gtkaboutdialog.c:277
+#: gtk/gtkaboutdialog.c:285
 msgid "The URL for the link to the website of the program"
 msgstr "Die URL der Webseite des Programms"

-#: gtk/gtkaboutdialog.c:293
+#: gtk/gtkaboutdialog.c:301
 msgid "Website label"
 msgstr "Titel der Webseite"

-#: gtk/gtkaboutdialog.c:294
+#: gtk/gtkaboutdialog.c:302
 msgid ""
 "The label for the link to the website of the program. If this is not set, it "
 "defaults to the URL"
@@ -163,46 +162,46 @@ msgstr ""
 "Die Beschriftung für die Webseite des Programms. Wird dies leer gelassen, so "
 "hat es den Wert der URL"

-#: gtk/gtkaboutdialog.c:310
+#: gtk/gtkaboutdialog.c:318
 msgid "Authors"
 msgstr "Programm von"

-#: gtk/gtkaboutdialog.c:311
+#: gtk/gtkaboutdialog.c:319
 msgid "List of authors of the program"
 msgstr "Autoren des Programms"

-#: gtk/gtkaboutdialog.c:327
+#: gtk/gtkaboutdialog.c:335
 msgid "Documenters"
 msgstr "Dokumentation von"

-#: gtk/gtkaboutdialog.c:328
+#: gtk/gtkaboutdialog.c:336
 msgid "List of people documenting the program"
 msgstr "Autoren der Dokumentation"

-#: gtk/gtkaboutdialog.c:344
+#: gtk/gtkaboutdialog.c:352
 msgid "Artists"
 msgstr "Grafiken von"

-#: gtk/gtkaboutdialog.c:345
+#: gtk/gtkaboutdialog.c:353
 msgid "List of people who have contributed artwork to the program"
 msgstr "Personen, die Grafiken für das Programm erstellt haben"

-#: gtk/gtkaboutdialog.c:362
+#: gtk/gtkaboutdialog.c:370
 msgid "Translator credits"
 msgstr "Übersetzung von"

-#: gtk/gtkaboutdialog.c:363
+#: gtk/gtkaboutdialog.c:371
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""
 "Die Übersetzer des Programms. Diese Zeichenkette sollte als übersetzbar "
 "markiert werden"

-#: gtk/gtkaboutdialog.c:378
+#: gtk/gtkaboutdialog.c:386
 msgid "Logo"
 msgstr "Logo"

-#: gtk/gtkaboutdialog.c:379
+#: gtk/gtkaboutdialog.c:387
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -210,19 +209,19 @@ msgstr ""
 "Ein Logo für das Info-Fenster. Wird dies leer gelassen, so hat es den Wert "
 "von gtk_window_get_default_icon_list()"

-#: gtk/gtkaboutdialog.c:394
+#: gtk/gtkaboutdialog.c:402
 msgid "Logo Icon Name"
 msgstr "Name des Logo-Symbols"

-#: gtk/gtkaboutdialog.c:395
+#: gtk/gtkaboutdialog.c:403
 msgid "A named icon to use as the logo for the about box."
 msgstr "Symbol, das für das Info-Fenster verwendet werden soll."

-#: gtk/gtkaboutdialog.c:402
+#: gtk/gtkaboutdialog.c:410
 msgid "Link Color"
 msgstr "Farbe für Links"

-#: gtk/gtkaboutdialog.c:403
+#: gtk/gtkaboutdialog.c:411
 msgid "Color of hyperlinks"
 msgstr "Farbe für Hyperlinks"

@@ -2072,11 +2071,11 @@ msgstr "Der Titel des Dateiwählers."
 msgid "The desired width of the button widget, in characters."
 msgstr "Die gewünschte Breite des Knopfes in Zeichen"

-#: gtk/gtkfilechooserdefault.c:625
+#: gtk/gtkfilechooserdefault.c:622
 msgid "Default file chooser backend"
 msgstr "Vorgabe-Backend des Dateiwählers"

-#: gtk/gtkfilechooserdefault.c:626
+#: gtk/gtkfilechooserdefault.c:623
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Der Name des per Vorgabe zu verwendenden GtkFileChooser-Backends"

@@ -2604,11 +2603,11 @@ msgstr "Die Breite des Layouts"
 msgid "The height of the layout"
 msgstr "Die Höhe des Layouts"

-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:528
 msgid "Tearoff Title"
 msgstr "Abreißtitel"

-#: gtk/gtkmenu.c:527
+#: gtk/gtkmenu.c:529
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -2616,107 +2615,107 @@ msgstr ""
 "Ein Titel, der evtl. vom Fenstermanager angezeigt wird, wenn dieses Menü "
 "abgerissen wurde"

-#: gtk/gtkmenu.c:541
+#: gtk/gtkmenu.c:543
 msgid "Tearoff State"
 msgstr "Abreißstatus"

-#: gtk/gtkmenu.c:542
+#: gtk/gtkmenu.c:544
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Ein Boolscher Wert der anzeigt, ob das Menü abgerissen wurde"

-#: gtk/gtkmenu.c:548
+#: gtk/gtkmenu.c:550
 msgid "Vertical Padding"
 msgstr "Vertikale Polsterung"

-#: gtk/gtkmenu.c:549
+#: gtk/gtkmenu.c:551
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Die oben und unten am Menü hinzuzufügende Polsterung in Pixel"

-#: gtk/gtkmenu.c:557
+#: gtk/gtkmenu.c:559
 msgid "Vertical Offset"
 msgstr "Vertikaler Versatz"

-#: gtk/gtkmenu.c:558
+#: gtk/gtkmenu.c:560
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""
 "Wenn das Menü ein Untermenü ist, wird es vertikal um soviele Pixel versetzt"

-#: gtk/gtkmenu.c:566
+#: gtk/gtkmenu.c:568
 msgid "Horizontal Offset"
 msgstr "Horizontaler Versatz"

-#: gtk/gtkmenu.c:567
+#: gtk/gtkmenu.c:569
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""
 "Wenn das Menü ein Untermenü ist, wird es horizontal um soviele Pixel versetzt"

-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:579
 msgid "Left Attach"
 msgstr "Links anhängen"

-#: gtk/gtkmenu.c:578 gtk/gtktable.c:205
+#: gtk/gtkmenu.c:580 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Die Spaltennummer, an die die linke Seite des Kinds angehängt werden soll"

-#: gtk/gtkmenu.c:585
+#: gtk/gtkmenu.c:587
 msgid "Right Attach"
 msgstr "Rechts anhängen"

-#: gtk/gtkmenu.c:586
+#: gtk/gtkmenu.c:588
 msgid "The column number to attach the right side of the child to"
 msgstr ""
 "Die Spaltennummer, an die die rechte Seite des Kinds angehängt werden soll"

-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:595
 msgid "Top Attach"
 msgstr "Oben anhängen"

-#: gtk/gtkmenu.c:594
+#: gtk/gtkmenu.c:596
 msgid "The row number to attach the top of the child to"
 msgstr ""
 "Die Spaltennummer, an die die obere Seite des Kinds angehängt werden soll"

-#: gtk/gtkmenu.c:601
+#: gtk/gtkmenu.c:603
 msgid "Bottom Attach"
 msgstr "Unten anhängen"

-#: gtk/gtkmenu.c:602 gtk/gtktable.c:226
+#: gtk/gtkmenu.c:604 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr ""
 "Die Spaltennummer, an die die untere Seite des Kinds angehängt werden soll"

-#: gtk/gtkmenu.c:689
+#: gtk/gtkmenu.c:691
 msgid "Can change accelerators"
 msgstr "Kürzel können geändert werden"

-#: gtk/gtkmenu.c:690
+#: gtk/gtkmenu.c:692
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Sollen Menükürzel geändert werden können, indem man eine Taste drückt, wenn "
 "der Menüeintrag markiert ist?"

-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:697
 msgid "Delay before submenus appear"
 msgstr "Verzögerung bis zum Erscheinen der Untermenüs"

-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:698
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Die Zeit, die sich der Mauszeiger über einem Menüeintrag befinden muss, "
 "bevor das Untermenü erscheint"

-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:705
 msgid "Delay before hiding a submenu"
 msgstr "Verzögerung bis zum Verbergen eines Untermenüs"

-#: gtk/gtkmenu.c:704
+#: gtk/gtkmenu.c:706
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -4431,19 +4430,17 @@ msgstr ""

 #: gtk/gtktreeview.c:672
 msgid "Hover Selection"
-msgstr "Schwebende Auswahl"
+msgstr "Auswahl bei Überfahren"

 #: gtk/gtktreeview.c:673
 msgid "Whether the selection should follow the pointer"
-msgstr "Soll die Auswahl dem Zeige folgen?"
+msgstr "Soll die Auswahl dem Zeiger folgen?"

-# CHECK - »Expand on hover« oder »Hover the expansion«?
 #: gtk/gtktreeview.c:692
 msgid "Hover Expand"
-msgstr "Schwebendes Ausdehnen"
+msgstr "Ausdehnen bei Überfahren"

 #: gtk/gtktreeview.c:693
-#, fuzzy
 msgid ""
 "Whether rows should be expanded/collapsed when the pointer moves over them"
 msgstr ""
@@ -4787,53 +4784,53 @@ msgstr "Kein Show-All"
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Soll »gtk_widget_show_all()« dieses Widget nicht betreffen?"

-#: gtk/gtkwidget.c:1407
+#: gtk/gtkwidget.c:1417
 msgid "Interior Focus"
 msgstr "Interner Fokus"

-#: gtk/gtkwidget.c:1408
+#: gtk/gtkwidget.c:1418
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Soll der Fokusanzeiger in Widgets dargestellt werden?"

-#: gtk/gtkwidget.c:1414
+#: gtk/gtkwidget.c:1424
 msgid "Focus linewidth"
 msgstr "Länge der Fokuszeile"

-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1425
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Die Breite der Fokusanzeiger-Linie in Pixel"

-#: gtk/gtkwidget.c:1421
+#: gtk/gtkwidget.c:1431
 msgid "Focus line dash pattern"
 msgstr "Strichelmuster der Fokuszeile"

-#: gtk/gtkwidget.c:1422
+#: gtk/gtkwidget.c:1432
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Das zum Zeichnen des Fokusanzeigers verwendete Strichelmuster"

-#: gtk/gtkwidget.c:1427
+#: gtk/gtkwidget.c:1437
 msgid "Focus padding"
 msgstr "Fokus-Polsterung"

-#: gtk/gtkwidget.c:1428
+#: gtk/gtkwidget.c:1438
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""
 "Der Abstand zwischen dem Fokusanzeiger und dem »Kasten« um das Widget in "
 "Pixel"

-#: gtk/gtkwidget.c:1433
+#: gtk/gtkwidget.c:1443
 msgid "Cursor color"
 msgstr "Cursorfarbe"

-#: gtk/gtkwidget.c:1434
+#: gtk/gtkwidget.c:1444
 msgid "Color with which to draw insertion cursor"
 msgstr "Die Farbe, in der der Einfügecursor gezeichnet werden soll"

-#: gtk/gtkwidget.c:1439
+#: gtk/gtkwidget.c:1449
 msgid "Secondary cursor color"
 msgstr "Zweite Cursorfarbe"

-#: gtk/gtkwidget.c:1440
+#: gtk/gtkwidget.c:1450
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4841,11 +4838,11 @@ msgstr ""
 "Die Farbe des zweiten Einfügecursors, wenn rechts- und linksläufiger Text "
 "gemischt bearbeitet werden."

-#: gtk/gtkwidget.c:1445
+#: gtk/gtkwidget.c:1455
 msgid "Cursor line aspect ratio"
 msgstr "Seitenverhältnis der Cursorzeile"

-#: gtk/gtkwidget.c:1446
+#: gtk/gtkwidget.c:1456
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Das Seitenverhältnis, in dem der Einfügecursor gezeichnet werden soll"

--- a/Show More
+++ b/Show More