167 files changed, 70395 insertions, 4060 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ab2b6deb..9e2dec15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-15  Alexander Larsson  <alexl@redhat.com>
+
+        * Makefile.am:
+        * acconfig.h:
+        * configure.in:
+	* eel/
+        * libnautilus-private/Makefile.am:
+	Import eel into nautilus.
+
 2008-12-15  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 564207 – don't look for old kde trash
diff --git a/Makefile.am b/Makefile.am
index cfd3d90df..2c92cb8ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ desktop_in_files = 					\
 	nautilus-autorun-software.desktop.in
 
 SUBDIRS =			\
+	eel			\
 	libnautilus-extension	\
 	cut-n-paste-code 	\
 	libnautilus-private 	\
diff --git a/acconfig.h b/acconfig.h
index 8a5bdaa23..86dbe12db 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -24,3 +24,4 @@
 #undef HAVE_STARTUP_NOTIFICATION
 #undef HAVE_EXIF
 #undef HAVE_OLD_EXIF
+#undef HAVE_RENDER
diff --git a/configure.in b/configure.in
index 2b07b0e60..934efb7fa 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,7 @@
-AC_PREREQ(2.54)
+oAC_PREREQ(2.54)
 
 dnl ===========================================================================
 
-m4_define(eel_minver,                  2.25.1)
 m4_define(glib_minver,                 2.19.0)
 m4_define(gnome_desktop_minver,        2.9.91)
 m4_define(pango_minver,                1.1.2)
@@ -13,6 +12,8 @@ m4_define(beagle_minver,               0.2.4)
 m4_define(tracker_minver,              0.0.1)
 m4_define(exempi_minver,               1.99.2)
 m4_define(exempi_minver_newapi,        1.99.5)
+m4_define(gail_minver,                 0.16)
+
 
 dnl 1. If the library code has changed at all since last release, then increment revision.
 dnl 2. If any interfaces have been added, then increment current and set revision to 0.
@@ -32,12 +33,12 @@ AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AM_MAINTAINER_MODE
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
 
-AC_SUBST(EEL_REQUIRED, [eel_minver])
 AC_SUBST(GLIB_REQUIRED, [glib_minver])
 AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
 AC_SUBST(PANGO_REQUIRED, [pango_minver])
 AC_SUBST(GTK_REQUIRED, [gtk_minver])
 AC_SUBST(XML_REQUIRED, [xml_minver])
+AC_SUBST(GAIL_REQUIRED)
 
 dnl We need to decrement current by one in the calculation of the age because
 dnl the library was started with version "1:0:0" instead of "0:0:0"
@@ -56,7 +57,6 @@ AM_PROG_LIBTOOL
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 PKG_CHECK_MODULES(ALL, [
-	eel-2.0			>= eel_minver
 	glib-2.0		>= glib_minver
 	gnome-desktop-2.0	>= gnome_desktop_minver
 	gio-unix-2.0		
@@ -64,6 +64,7 @@ PKG_CHECK_MODULES(ALL, [
 	pango			>= pango_minver
 	gtk+-2.0		>= gtk_minver
 	libxml-2.0		>= xml_minver
+	gail			>= gail_minver
 	unique-1.0
 	dbus-glib-1
 ])
@@ -104,6 +105,7 @@ AM_CONDITIONAL(ENABLE_PROFILER, test "x$ENABLE_PROFILER" = "x1")
 
 dnl ==========================================================================
 
+AC_CHECK_PROGS(PERL, perl5 perl)
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 dnl ==========================================================================
@@ -370,6 +372,45 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+dnl ===========================================================================
+
+dnl strftime checks
+
+AC_TRY_RUN([#include <time.h>
+                int main ()
+                {
+                  char buf[100];
+                  struct tm tm = {0};
+                  tm.tm_year = 99;
+                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
+		      strcmp (buf, "1999")==0)
+                    return 0;
+                  return 1;
+                }
+            ],
+	    AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+            )
+
+dnl ===========================================================================
+
+#
+# Checks for Xft/XRender
+#
+have_render=false
+RENDER_LIBS=""
+
+AC_CHECK_LIB(Xrender, XRenderFindFormat, 
+    have_render=true,:,-lXext)
+
+if $have_render ; then
+   RENDER_LIBS="-lXrender -lXext"
+   AC_DEFINE(HAVE_RENDER)
+fi
+
+AC_SUBST(RENDER_LIBS)
+
+
+	    
 dnl ==========================================================================
 	
 dnl libegg
@@ -386,7 +427,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
 AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
 
 dnl core nautilus
-CORE_MODULES="glib-2.0 eel-2.0 gnome-desktop-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 $EXTRA_CORE_MODULES"
+CORE_MODULES="glib-2.0 gnome-desktop-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
 CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
 AC_SUBST(CORE_CFLAGS)
 CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
@@ -454,6 +495,8 @@ docs/Makefile
 docs/reference/Makefile
 docs/reference/libnautilus-extension/Makefile
 docs/reference/libnautilus-extension/version.xml
+eel/Makefile
+eel/eel-features.h
 icons/Makefile
 libnautilus-private/Makefile
 libnautilus-extension/Makefile
diff --git a/eel/ChangeLog b/eel/ChangeLog
new file mode 100644
index 000000000..0d22d7ce4
--- /dev/null
+++ b/eel/ChangeLog
@@ -0,0 +1,10652 @@
+2008-12-15  Alexander Larsson  <alexl@redhat.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * ChangeLog: Added.
+        * Makefile.am: Added.
+        * README: Added.
+        * README.canvas: Added.
+        * check-eel: Added.
+        * check-program.c: Added.
+        (main):
+        * eel-accessibility.c: Added.
+        (eel_accessibility_set_up_label_widget_relation):
+        (eel_accessibility_create_derived_type):
+        (get_quark_accessible):
+        (get_quark_gobject):
+        (eel_accessibility_get_atk_object):
+        (eel_accessibility_for_object):
+        (eel_accessibility_get_gobject):
+        (eel_accessibility_destroy):
+        (eel_accessibility_set_atk_object_return):
+        (get_simple_text):
+        (eel_accessibility_text_get_text):
+        (eel_accessibility_text_get_character_at_offset):
+        (eel_accessibility_text_get_text_before_offset):
+        (eel_accessibility_text_get_text_at_offset):
+        (eel_accessibility_text_get_text_after_offset):
+        (eel_accessibility_text_get_character_count):
+        (eel_accessibility_simple_text_interface_init):
+        (eel_accessibility_add_simple_text):
+        (eel_accessible_text_get_type):
+        (eel_accessibility_set_name):
+        (eel_accessibility_set_description):
+        * eel-accessibility.h: Added.
+        * eel-alert-dialog.c: Added.
+        (eel_alert_dialog_get_type):
+        (eel_alert_dialog_class_init):
+        (eel_alert_dialog_finalize):
+        (eel_alert_dialog_init):
+        (setup_type):
+        (eel_alert_dialog_set_property):
+        (eel_alert_dialog_get_property):
+        (eel_alert_dialog_set_primary_label):
+        (eel_alert_dialog_set_secondary_label):
+        (eel_alert_dialog_set_details_label):
+        (eel_alert_dialog_new):
+        (eel_alert_dialog_add_buttons):
+        (eel_alert_dialog_style_set):
+        * eel-alert-dialog.h: Added.
+        * eel-art-extensions.c: Added.
+        (eel_irect_copy):
+        (eel_irect_union):
+        (eel_irect_intersect):
+        (eel_irect_is_empty):
+        (eel_irect_assign):
+        (eel_irect_assign_dimensions):
+        (eel_irect_get_width):
+        (eel_irect_get_height):
+        (eel_drect_copy):
+        (eel_drect_is_empty):
+        (eel_drect_union):
+        (eel_irect_contains_point):
+        (eel_irect_hits_irect):
+        (eel_irect_equal):
+        (eel_irect_align):
+        (eel_dimensions_are_empty):
+        (eel_irect_offset_by):
+        (eel_irect_scale_by):
+        * eel-art-extensions.h: Added.
+        * eel-art-gtk-extensions.c: Added.
+        (eel_gdk_rectangle_to_eel_irect):
+        (eel_screen_get_dimensions):
+        (eel_gdk_window_get_bounds):
+        (eel_gdk_window_get_screen_relative_bounds):
+        (eel_gtk_widget_get_bounds):
+        (eel_gtk_widget_get_dimensions):
+        (eel_gtk_widget_get_preferred_dimensions):
+        (eel_gdk_window_clip_dirty_area_to_screen):
+        (eel_irect_to_gdk_rectangle):
+        (eel_gdk_window_get_dimensions):
+        (eel_gdk_get_pointer_position):
+        * eel-art-gtk-extensions.h: Added.
+        * eel-background-box.c: Added.
+        (eel_background_box_expose_event):
+        (eel_background_box_class_init):
+        (eel_background_box_init):
+        (eel_background_box_new):
+        * eel-background-box.h: Added.
+        * eel-background.c: Added.
+        (eel_background_class_init):
+        (on_bg_changed):
+        (eel_background_init):
+        (eel_background_remove_current_image):
+        (eel_background_finalize):
+        (placement_gnome_to_eel):
+        (placement_eel_to_gnome):
+        (eel_background_get_image_placement):
+        (eel_background_set_image_placement):
+        (eel_background_new):
+        (eel_background_unrealize):
+        (drawable_get_adjusted_size):
+        (eel_background_ensure_realized):
+        (eel_background_get_pixmap_and_color):
+        (eel_background_expose):
+        (set_image_properties):
+        (eel_background_get_color):
+        (eel_background_get_image_uri):
+        (eel_background_set_use_base):
+        (eel_background_set_color):
+        (eel_background_set_image_uri_helper):
+        (eel_background_set_image_uri):
+        (eel_background_set_image_uri_and_color):
+        (eel_background_receive_dropped_background_image):
+        (eel_background_is_set):
+        (eel_background_reset):
+        (eel_background_set_up_widget):
+        (eel_widget_background_changed):
+        (widget_style_set_cb):
+        (screen_size_changed):
+        (widget_realized_setup):
+        (widget_realize_cb):
+        (widget_unrealize_cb):
+        (eel_background_set_desktop):
+        (eel_background_is_desktop):
+        (eel_get_widget_background):
+        (eel_background_is_dark):
+        (eel_background_receive_dropped_color):
+        (eel_background_save_to_gconf):
+        (eel_self_check_background):
+        * eel-background.h: Added.
+        * eel-canvas-rect-ellipse.c: Added.
+        (eel_canvas_re_get_type):
+        (eel_canvas_re_class_init):
+        (eel_canvas_re_init):
+        (eel_canvas_re_destroy):
+        (get_bounds):
+        (set_gc_foreground):
+        (set_stipple):
+        (set_outline_gc_width):
+        (eel_canvas_re_set_fill):
+        (eel_canvas_re_set_outline):
+        (eel_canvas_re_set_property):
+        (get_color_value):
+        (eel_canvas_re_get_property):
+        (set_colors_and_stipples):
+        (eel_canvas_re_update_shared):
+        (eel_canvas_re_realize):
+        (eel_canvas_re_unrealize):
+        (eel_canvas_re_translate):
+        (eel_canvas_re_bounds):
+        (eel_canvas_rect_get_type):
+        (eel_canvas_rect_class_init):
+        (eel_canvas_rect_init):
+        (eel_canvas_rect_finalize):
+        (eel_canvas_rect_realize):
+        (render_rect_alpha):
+        (eel_canvas_rect_draw):
+        (eel_canvas_rect_point):
+        (request_redraw_borders):
+        (eel_canvas_rect_update):
+        (eel_canvas_ellipse_get_type):
+        (eel_canvas_ellipse_class_init):
+        (eel_canvas_ellipse_draw):
+        (eel_canvas_ellipse_point):
+        (eel_canvas_ellipse_update):
+        (rect_empty):
+        (make_rect):
+        (rects_intersect):
+        (diff_rects_guts):
+        (diff_rects):
+        * eel-canvas-rect-ellipse.h: Added.
+        * eel-canvas-util.c: Added.
+        (eel_canvas_points_new):
+        (eel_canvas_points_ref):
+        (eel_canvas_points_free):
+        (eel_canvas_get_miter_points):
+        (eel_canvas_get_butt_points):
+        (eel_canvas_polygon_to_point):
+        (eel_canvas_item_reset_bounds):
+        (eel_canvas_update_bbox):
+        * eel-canvas-util.h: Added.
+        * eel-canvas.c: Added.
+        (eel_canvas_item_get_type):
+        (eel_canvas_item_init):
+        (eel_canvas_item_new):
+        (item_post_create_setup):
+        (eel_canvas_item_set_property):
+        (eel_canvas_item_get_property):
+        (eel_canvas_item_construct):
+        (redraw_and_repick_if_mapped):
+        (eel_canvas_item_dispose):
+        (eel_canvas_item_realize):
+        (eel_canvas_item_unrealize):
+        (eel_canvas_item_map):
+        (eel_canvas_item_unmap):
+        (eel_canvas_item_update):
+        (eel_canvas_item_invoke_update):
+        (eel_canvas_item_invoke_point):
+        (eel_canvas_item_set):
+        (eel_canvas_item_set_valist):
+        (eel_canvas_item_move):
+        (put_item_after):
+        (eel_canvas_item_raise):
+        (eel_canvas_item_lower):
+        (eel_canvas_item_raise_to_top):
+        (eel_canvas_item_lower_to_bottom):
+        (eel_canvas_item_send_behind):
+        (eel_canvas_item_show):
+        (eel_canvas_item_hide):
+        (eel_canvas_item_grab):
+        (eel_canvas_item_ungrab):
+        (eel_canvas_item_w2i):
+        (eel_canvas_item_i2w):
+        (is_descendant):
+        (eel_canvas_item_reparent):
+        (eel_canvas_item_grab_focus):
+        (eel_canvas_item_get_bounds):
+        (eel_canvas_item_request_update):
+        (eel_canvas_item_request_redraw):
+        (eel_canvas_group_get_type):
+        (eel_canvas_group_class_init):
+        (eel_canvas_group_init):
+        (eel_canvas_group_set_property):
+        (eel_canvas_group_get_property):
+        (eel_canvas_group_destroy):
+        (eel_canvas_group_update):
+        (eel_canvas_group_unrealize):
+        (eel_canvas_group_map):
+        (eel_canvas_group_unmap):
+        (eel_canvas_group_draw):
+        (eel_canvas_group_point):
+        (eel_canvas_group_translate):
+        (eel_canvas_group_bounds):
+        (group_add):
+        (group_remove):
+        (eel_canvas_get_type):
+        (eel_canvas_get_property):
+        (eel_canvas_set_property):
+        (eel_canvas_accessible_adjustment_changed):
+        (eel_canvas_accessible_initialize):
+        (eel_canvas_accessible_get_n_children):
+        (eel_canvas_accessible_ref_child):
+        (eel_canvas_accessible_class_init):
+        (eel_canvas_accessible_get_type):
+        (eel_canvas_accessible_create):
+        (eel_canvas_accessible_factory_get_accessible_type):
+        (eel_canvas_accessible_factory_create_accessible):
+        (eel_canvas_accessible_factory_class_init):
+        (eel_canvas_accessible_factory_get_type):
+        (eel_canvas_class_init):
+        (panic_root_destroyed):
+        (eel_canvas_init):
+        (remove_idle):
+        (shutdown_transients):
+        (eel_canvas_destroy):
+        (eel_canvas_new):
+        (eel_canvas_map):
+        (eel_canvas_unmap):
+        (eel_canvas_realize):
+        (eel_canvas_unrealize):
+        (scroll_to):
+        (eel_canvas_size_allocate):
+        (emit_event):
+        (pick_current_item):
+        (eel_canvas_button):
+        (eel_canvas_motion):
+        (eel_canvas_key):
+        (eel_canvas_crossing):
+        (eel_canvas_focus_in):
+        (eel_canvas_focus_out):
+        (eel_canvas_expose):
+        (eel_canvas_draw_background):
+        (do_update):
+        (idle_handler):
+        (add_idle):
+        (eel_canvas_root):
+        (eel_canvas_set_scroll_region):
+        (eel_canvas_get_scroll_region):
+        (eel_canvas_set_center_scroll_region):
+        (eel_canvas_set_pixels_per_unit):
+        (eel_canvas_scroll_to):
+        (eel_canvas_get_scroll_offsets):
+        (eel_canvas_update_now):
+        (eel_canvas_get_item_at):
+        (eel_canvas_request_update):
+        (eel_canvas_request_update_real):
+        (eel_canvas_request_redraw):
+        (eel_canvas_w2c):
+        (eel_canvas_w2c_rect_d):
+        (eel_canvas_w2c_d):
+        (eel_canvas_c2w):
+        (eel_canvas_window_to_world):
+        (eel_canvas_world_to_window):
+        (eel_canvas_get_color):
+        (eel_canvas_get_color_pixel):
+        (eel_canvas_set_stipple_origin):
+        (boolean_handled_accumulator):
+        (eel_canvas_item_accessible_add_focus_handler):
+        (eel_canvas_item_accessible_get_item_extents):
+        (eel_canvas_item_accessible_is_item_in_window):
+        (eel_canvas_item_accessible_get_extents):
+        (eel_canvas_item_accessible_get_mdi_zorder):
+        (eel_canvas_item_accessible_grab_focus):
+        (eel_canvas_item_accessible_remove_focus_handler):
+        (eel_canvas_item_accessible_component_interface_init):
+        (eel_canvas_item_accessible_is_item_on_screen):
+        (eel_canvas_item_accessible_initialize):
+        (eel_canvas_item_accessible_ref_state_set):
+        (eel_canvas_item_accessible_class_init):
+        (eel_canvas_item_accessible_get_type):
+        (eel_canvas_item_accessible_create):
+        (eel_canvas_item_accessible_factory_get_accessible_type):
+        (eel_canvas_item_accessible_factory_create_accessible):
+        (eel_canvas_item_accessible_factory_class_init):
+        (eel_canvas_item_accessible_factory_get_type):
+        (eel_canvas_item_class_init):
+        * eel-canvas.h: Added.
+        * eel-debug-drawing.c: Added.
+        (debug_pixbuf_viewer_class_init):
+        (debug_pixbuf_viewer_init):
+        (debug_pixbuf_viewer_finalize):
+        (debug_pixbuf_viewer_size_request):
+        (debug_pixbuf_viewer_expose_event):
+        (debug_pixbuf_viewer_set_pixbuf):
+        (eel_debug_draw_rectangle_and_cross):
+        (eel_debug_show_pixbuf_in_external_viewer):
+        (debug_delete_event):
+        (destroy_debug_window):
+        (eel_debug_show_pixbuf):
+        (eel_debug_pixbuf_draw_point):
+        (eel_debug_pixbuf_draw_rectangle):
+        (eel_debug_pixbuf_draw_rectangle_inset):
+        * eel-debug-drawing.h: Added.
+        * eel-debug.c: Added.
+        (eel_stop_in_debugger):
+        (log_handler):
+        (eel_make_warnings_and_criticals_stop_in_debugger):
+        (eel_get_available_file_descriptor_count):
+        (eel_debug_shut_down):
+        (eel_debug_call_at_shutdown):
+        (eel_debug_call_at_shutdown_with_data):
+        * eel-debug.h: Added.
+        * eel-editable-label.c: Added.
+        (eel_editable_label_get_type):
+        (add_move_binding):
+        (eel_editable_label_class_init):
+        (eel_editable_label_editable_init):
+        (eel_editable_label_set_property):
+        (eel_editable_label_get_property):
+        (eel_editable_label_init):
+        (eel_editable_label_new):
+        (eel_editable_label_set_text):
+        (eel_editable_label_get_text):
+        (eel_editable_label_set_justify):
+        (eel_editable_label_get_justify):
+        (eel_editable_label_set_draw_outline):
+        (eel_editable_label_set_line_wrap):
+        (eel_editable_label_set_line_wrap_mode):
+        (eel_editable_label_get_line_wrap):
+        (eel_editable_label_get_font_description):
+        (eel_editable_label_set_font_description):
+        (eel_editable_label_finalize):
+        (eel_editable_label_clear_layout):
+        (eel_editable_label_recompute):
+        (label_wrap_width_free):
+        (get_label_wrap_width):
+        (eel_editable_label_ensure_layout):
+        (eel_editable_label_size_request):
+        (eel_editable_label_size_allocate):
+        (eel_editable_label_state_changed):
+        (eel_editable_label_style_set):
+        (eel_editable_label_direction_changed):
+        (get_layout_location):
+        (eel_editable_label_get_cursor_pos):
+        (eel_editable_label_get_block_cursor_location):
+        (make_cursor_gc):
+        (_eel_draw_insertion_cursor):
+        (eel_editable_label_draw_cursor):
+        (eel_editable_label_expose):
+        (eel_editable_label_realize):
+        (eel_editable_label_unrealize):
+        (eel_editable_label_map):
+        (eel_editable_label_unmap):
+        (window_to_layout_coords):
+        (get_layout_index):
+        (eel_editable_label_select_word):
+        (eel_editable_label_button_press):
+        (eel_editable_label_button_release):
+        (eel_editable_label_motion):
+        (get_text_callback):
+        (clear_text_callback):
+        (eel_editable_label_select_region_index):
+        (eel_editable_label_select_region):
+        (eel_editable_label_get_selection_bounds):
+        (eel_editable_label_get_layout):
+        (eel_editable_label_get_layout_offsets):
+        (eel_editable_label_pend_cursor_blink):
+        (eel_editable_label_check_cursor_blink):
+        (eel_editable_label_key_press):
+        (eel_editable_label_key_release):
+        (eel_editable_label_keymap_direction_changed):
+        (eel_editable_label_focus_in):
+        (eel_editable_label_focus_out):
+        (eel_editable_label_delete_text):
+        (eel_editable_label_insert_text):
+        (eel_editable_label_enter_text):
+        (eel_editable_label_commit_cb):
+        (eel_editable_label_preedit_changed_cb):
+        (eel_editable_label_retrieve_surrounding_cb):
+        (eel_editable_label_delete_surrounding_cb):
+        (eel_editable_label_focus):
+        (get_better_cursor):
+        (eel_editable_label_move_logically):
+        (eel_editable_label_move_visually):
+        (eel_editable_label_move_line):
+        (eel_editable_label_move_forward_word):
+        (eel_editable_label_move_backward_word):
+        (eel_editable_label_move_cursor):
+        (eel_editable_label_reset_im_context):
+        (eel_editable_label_delete_from_cursor):
+        (eel_editable_label_copy_clipboard):
+        (eel_editable_label_cut_clipboard):
+        (paste_received):
+        (eel_editable_label_paste):
+        (eel_editable_label_paste_clipboard):
+        (eel_editable_label_select_all):
+        (activate_cb):
+        (append_action_signal):
+        (popup_menu_detach):
+        (popup_position_func):
+        (eel_editable_label_toggle_overwrite):
+        (popup_targets_received):
+        (eel_editable_label_do_popup):
+        (editable_insert_text_emit):
+        (editable_delete_text_emit):
+        (editable_insert_text):
+        (editable_delete_text):
+        (editable_get_chars):
+        (editable_set_selection_bounds):
+        (editable_get_selection_bounds):
+        (editable_real_set_position):
+        (editable_get_position):
+        (eel_editable_label_accessible_get_text):
+        (eel_editable_label_accessible_get_character_at_offset):
+        (eel_editable_label_accessible_get_text_before_offset):
+        (eel_editable_label_accessible_get_text_at_offset):
+        (eel_editable_label_accessible_get_text_after_offset):
+        (eel_editable_label_accessible_get_caret_offset):
+        (eel_editable_label_accessible_set_caret_offset):
+        (eel_editable_label_accessible_get_character_count):
+        (eel_editable_label_accessible_get_n_selections):
+        (eel_editable_label_accessible_get_selection):
+        (eel_editable_label_accessible_add_selection):
+        (eel_editable_label_accessible_remove_selection):
+        (eel_editable_label_accessible_set_selection):
+        (eel_editable_label_accessible_get_run_attributes):
+        (eel_editable_label_accessible_get_default_attributes):
+        (eel_editable_label_accessible_get_character_extents):
+        (eel_editable_label_accessible_get_offset_at_point):
+        (atk_text_interface_init):
+        (eel_editable_label_accessible_set_text_contents):
+        (eel_editable_label_accessible_insert_text):
+        (eel_editable_label_accessible_copy_text):
+        (eel_editable_label_accessible_cut_text):
+        (eel_editable_label_accessible_delete_text):
+        (eel_editable_label_accessible_paste_received):
+        (eel_editable_label_accessible_paste_text):
+        (atk_editable_text_interface_init):
+        (eel_editable_label_accessible_notify_insert):
+        (eel_editable_label_accessible_idle_notify_insert):
+        (eel_editable_label_accessible_insert_text_cb):
+        (eel_editable_label_accessible_delete_text_cb):
+        (eel_editable_label_accessible_changed_cb):
+        (check_for_selection_change):
+        (eel_editable_label_accessible_notify_gtk):
+        (eel_editable_label_accessible_initialize):
+        (eel_editable_label_accessible_get_name):
+        (eel_editable_label_accessible_ref_state_set):
+        (eel_editable_label_accessible_finalize):
+        (eel_editable_label_accessible_class_init):
+        (eel_editable_label_get_accessible):
+        * eel-editable-label.h: Added.
+        * eel-enumeration.c: Added.
+        (eel_enumeration_new):
+        (free_entry):
+        (eel_enumeration_free):
+        (eel_enumeration_get_id):
+        (eel_enumeration_get_length):
+        (eel_enumeration_get_nth_entry):
+        (eel_enumeration_get_name_position):
+        (eel_enumeration_contains_name):
+        (eel_enumeration_get_value_for_name):
+        (eel_enumeration_get_name_for_value):
+        (eel_enumeration_get_names):
+        (eel_enumeration_new_from_tokens):
+        (dup_entry):
+        (eel_enumeration_new_from_entries):
+        (enumeration_table_free):
+        (enumeration_table_get):
+        (eel_enumeration_lookup):
+        (eel_enumeration_register):
+        (eel_self_check_enumeration):
+        * eel-enumeration.h: Added.
+        * eel-gconf-extensions.c: Added.
+        (global_client_free):
+        (eel_gconf_client_get_global):
+        (eel_gconf_handle_error):
+        (eel_gconf_set_boolean):
+        (eel_gconf_get_boolean):
+        (eel_gconf_set_integer):
+        (eel_gconf_get_integer):
+        (eel_gconf_set_string):
+        (eel_gconf_get_string):
+        (eel_gconf_set_string_list):
+        (eel_gconf_get_string_list):
+        (eel_gconf_unset):
+        (eel_gconf_is_default):
+        (eel_gconf_key_is_writable):
+        (eel_gconf_monitor_add):
+        (eel_gconf_monitor_remove):
+        (eel_gconf_preload_cache):
+        (eel_gconf_suggest_sync):
+        (eel_gconf_get_value):
+        (eel_gconf_get_default_value):
+        (simple_value_is_equal):
+        (eel_gconf_value_is_equal):
+        (eel_gconf_value_free):
+        (eel_gconf_notification_add):
+        (eel_gconf_notification_remove):
+        (eel_gconf_value_get_string_list):
+        (eel_gconf_value_set_string_list):
+        * eel-gconf-extensions.h: Added.
+        * eel-gdk-extensions.c: Added.
+        (eel_gdk_rectangle_contains_rectangle):
+        (eel_interpolate_color):
+        (eel_gradient_new):
+        (eel_gradient_is_gradient):
+        (eel_gradient_is_horizontal):
+        (eel_gradient_strip_trailing_direction_if_any):
+        (eel_gradient_parse_one_color_spec):
+        (eel_gradient_get_start_color_spec):
+        (eel_gradient_get_end_color_spec):
+        (eel_gradient_set_edge_color):
+        (eel_gradient_set_left_color_spec):
+        (eel_gradient_set_top_color_spec):
+        (eel_gradient_set_right_color_spec):
+        (eel_gradient_set_bottom_color_spec):
+        (eel_gdk_color_parse_with_white_default):
+        (eel_parse_rgb_with_white_default):
+        (eel_rgb16_to_rgb):
+        (eel_rgb8_to_rgb):
+        (eel_gdk_color_to_rgb):
+        (eel_gdk_rgb_to_color):
+        (eel_gdk_rgb_to_color_spec):
+        (eel_shift_color_component):
+        (eel_rgb_shift_color):
+        (eel_gdk_color_is_dark):
+        (eel_stipple_bitmap_for_screen):
+        (eel_stipple_bitmap):
+        (eel_gdk_window_bring_to_front):
+        (eel_gdk_window_focus):
+        (eel_gdk_window_set_wm_protocols):
+        (eel_gdk_window_set_wm_hints_input):
+        (eel_gdk_window_set_invisible_cursor):
+        (eel_gdk_parse_geometry):
+        (eel_gdk_draw_layout_with_drop_shadow):
+        (eel_gdk_color_as_hex_string):
+        (eel_self_check_parse):
+        (eel_self_check_gdk_rgb_to_color):
+        (eel_self_check_gdk_extensions):
+        * eel-gdk-extensions.h: Added.
+        * eel-gdk-pixbuf-extensions.c: Added.
+        (eel_gdk_pixbuf_list_ref):
+        (eel_gdk_pixbuf_list_free):
+        (eel_gdk_pixbuf_load):
+        (eel_gdk_pixbuf_load_from_stream):
+        (pixbuf_loader_size_prepared):
+        (eel_gdk_pixbuf_load_from_stream_at_size):
+        (free_pixbuf_load_handle):
+        (load_done):
+        (file_read_callback):
+        (file_opened_callback):
+        (eel_gdk_pixbuf_load_async):
+        (eel_cancel_gdk_pixbuf_load):
+        (eel_gdk_pixbuf_average_value):
+        (eel_gdk_scale_to_fit_factor):
+        (eel_gdk_pixbuf_scale_to_fit):
+        (eel_gdk_pixbuf_scale_down_to_fit):
+        (eel_gdk_scale_to_min_factor):
+        (eel_gdk_pixbuf_scale_to_min):
+        (eel_gdk_pixbuf_is_valid):
+        (eel_gdk_pixbuf_get_dimensions):
+        (eel_gdk_pixbuf_fill_rectangle_with_color):
+        (eel_gdk_pixbuf_save_to_file):
+        (eel_gdk_pixbuf_ref_if_not_null):
+        (eel_gdk_pixbuf_unref_if_not_null):
+        (eel_gdk_pixbuf_draw_to_drawable):
+        (eel_gdk_pixbuf_draw_to_pixbuf):
+        (eel_gdk_pixbuf_draw_to_pixbuf_alpha):
+        (pixbuf_destroy_callback):
+        (eel_gdk_pixbuf_new_from_pixbuf_sub_area):
+        (eel_gdk_pixbuf_new_from_existing_buffer):
+        (eel_gdk_pixbuf_intersect):
+        (eel_gdk_pixbuf_scale_down):
+        (check_average_value):
+        (eel_self_check_gdk_pixbuf_extensions):
+        * eel-gdk-pixbuf-extensions.h: Added.
+        * eel-glib-extensions.c: Added.
+        (eel_g_date_new_tm):
+        (eel_strdup_strftime):
+        (eel_g_list_exactly_one_item):
+        (eel_g_list_more_than_one_item):
+        (eel_g_list_equal):
+        (eel_g_str_list_equal):
+        (eel_g_str_list_copy):
+        (eel_g_str_list_alphabetize):
+        (eel_g_str_list_index):
+        (eel_g_list_free_deep_custom):
+        (eel_g_list_free_deep):
+        (eel_g_slist_free_deep_custom):
+        (eel_g_slist_free_deep):
+        (eel_g_strv_find):
+        (compare_pointers):
+        (eel_g_lists_sort_and_check_for_intersection):
+        (eel_g_list_partition):
+        (eel_get_system_time):
+        (print_key_string):
+        (free_hash_tables_at_exit):
+        (eel_g_hash_table_new_free_at_exit):
+        (flatten_hash_table_element):
+        (eel_g_hash_table_safe_for_each):
+        (eel_round):
+        (eel_g_list_from_g_slist):
+        (eel_g_slist_from_g_list):
+        (eel_get_operating_system_name):
+        (eel_compare_integer):
+        (eel_g_object_list_ref):
+        (eel_g_object_list_unref):
+        (eel_g_object_list_free):
+        (eel_g_object_list_copy):
+        (eel_add_weak_pointer):
+        (eel_remove_weak_pointer):
+        (filename_charset_cache_free):
+        (eel_get_filename_charset):
+        (check_tm_to_g_date):
+        (eel_test_predicate):
+        (test_strftime):
+        (eel_self_check_glib_extensions):
+        * eel-glib-extensions.h: Added.
+        * eel-gnome-extensions.c: Added.
+        (try_terminal_command):
+        (try_terminal_command_argv):
+        (get_terminal_command_prefix):
+        (eel_gnome_make_terminal_command):
+        (eel_gnome_open_terminal_on_screen):
+        (eel_gnome_open_terminal):
+        * eel-gnome-extensions.h: Added.
+        * eel-graphic-effects.c: Added.
+        (create_new_pixbuf):
+        (create_new_pixbuf_with_alpha):
+        (lighten_component):
+        (eel_create_spotlight_pixbuf):
+        (eel_create_darkened_pixbuf):
+        (eel_create_colorized_pixbuf):
+        (draw_frame_row):
+        (draw_frame_column):
+        (eel_stretch_frame_image):
+        (eel_embed_image_in_frame):
+        (eel_make_semi_transparent):
+        * eel-graphic-effects.h: Added.
+        * eel-gtk-container.c: Added.
+        (eel_gtk_container_child_expose_event):
+        (eel_gtk_container_child_map):
+        (eel_gtk_container_child_unmap):
+        (eel_gtk_container_child_add):
+        (eel_gtk_container_child_remove):
+        (eel_gtk_container_child_size_allocate):
+        * eel-gtk-container.h: Added.
+        * eel-gtk-extensions.c: Added.
+        (eel_gtk_window_get_geometry_string):
+        (send_delete_event):
+        (handle_standard_close_accelerator):
+        (eel_gtk_window_event_is_close_accelerator):
+        (eel_gtk_window_set_up_close_accelerator):
+        (sanity_check_window_position):
+        (sanity_check_window_dimensions):
+        (eel_gtk_window_set_initial_geometry):
+        (eel_gtk_window_set_initial_geometry_from_string):
+        (eel_pop_up_context_menu):
+        (eel_gtk_menu_append_separator):
+        (eel_gtk_menu_insert_separator):
+        (eel_gtk_menu_set_item_visibility):
+        (eel_point_in_allocation):
+        (eel_point_in_widget):
+        (eel_gtk_widget_set_shown):
+        (alive_disconnecter):
+        (eel_gtk_signal_connect_full_while_alive):
+        (while_realized_disconnecter):
+        (eel_gtk_signal_connect_while_realized):
+        (get_first_callback):
+        (eel_gtk_container_get_first_child):
+        (container_foreach_deep_callback):
+        (eel_gtk_container_foreach_deep):
+        (eel_gtk_adjustment_set_value):
+        (eel_gtk_adjustment_clamp_value):
+        (eel_gtk_label_make_bold):
+        (eel_gtk_label_set_scale):
+        (get_layout_location):
+        (eel_gtk_label_expose_event):
+        (eel_gtk_label_size_request):
+        (set_up_label):
+        (eel_gtk_label_set_drop_shadow_color):
+        (eel_gtk_label_set_drop_shadow_offset):
+        (eel_gtk_widget_set_background_color):
+        (eel_gtk_widget_set_foreground_color):
+        (eel_gtk_widget_find_windowed_ancestor):
+        (eel_gtk_get_system_font):
+        (eel_gtk_widget_get_button_event_location):
+        (eel_gtk_widget_get_motion_event_location):
+        (eel_gtk_tree_view_cell_is_completely_visible):
+        (tree_view_button_press_callback):
+        (eel_gtk_tree_view_set_activate_on_single_click):
+        (eel_gtk_viewport_get_visible_rect):
+        (eel_gtk_viewport_scroll_to_rect):
+        * eel-gtk-extensions.h: Added.
+        * eel-gtk-macros.h: Added.
+        * eel-i18n.c: Added.
+        (_eel_gettext):
+        * eel-i18n.h: Added.
+        * eel-image-table.c: Added.
+        (eel_image_table_class_init):
+        (eel_image_table_init):
+        (eel_image_table_finalize):
+        (eel_image_table_realize):
+        (eel_image_table_unrealize):
+        (eel_image_table_remove):
+        (eel_image_table_child_type):
+        (image_table_emit_signal):
+        (image_table_handle_motion):
+        (ancestor_enter_notify_event):
+        (ancestor_leave_notify_event):
+        (ancestor_motion_notify_event):
+        (ancestor_button_press_event):
+        (ancestor_button_release_event):
+        (eel_image_table_new):
+        (eel_image_table_add_empty_image):
+        * eel-image-table.h: Added.
+        * eel-labeled-image.c: Added.
+        (eel_labeled_image_class_init):
+        (eel_labeled_image_init):
+        (eel_labeled_image_finalize):
+        (eel_labeled_image_destroy):
+        (eel_labeled_image_set_property):
+        (eel_labeled_image_get_property):
+        (eel_labeled_image_size_request):
+        (eel_labeled_image_size_allocate):
+        (eel_labeled_image_expose_event):
+        (eel_labeled_image_map):
+        (eel_labeled_image_unmap):
+        (eel_labeled_image_add):
+        (eel_labeled_image_remove):
+        (eel_labeled_image_forall):
+        (is_fixed_height):
+        (labeled_image_get_image_dimensions):
+        (labeled_image_get_label_dimensions):
+        (labeled_image_get_image_bounds_fill):
+        (eel_labeled_image_get_image_bounds):
+        (labeled_image_get_label_bounds_fill):
+        (eel_labeled_image_get_label_bounds):
+        (labeled_image_update_alignments):
+        (labeled_image_get_content_dimensions):
+        (labeled_image_get_content_bounds):
+        (labeled_image_ensure_label):
+        (labeled_image_ensure_image):
+        (labeled_image_show_image):
+        (labeled_image_show_label):
+        (eel_labeled_image_new):
+        (eel_labeled_image_new_from_file_name):
+        (eel_labeled_image_set_label_position):
+        (eel_labeled_image_get_label_position):
+        (eel_labeled_image_set_show_label):
+        (eel_labeled_image_get_show_label):
+        (eel_labeled_image_set_show_image):
+        (eel_labeled_image_get_show_image):
+        (eel_labeled_image_set_fixed_image_height):
+        (eel_labeled_image_set_selected):
+        (eel_labeled_image_get_selected):
+        (eel_labeled_image_set_spacing):
+        (eel_labeled_image_get_spacing):
+        (eel_labeled_image_set_x_padding):
+        (eel_labeled_image_get_x_padding):
+        (eel_labeled_image_set_y_padding):
+        (eel_labeled_image_get_y_padding):
+        (eel_labeled_image_set_x_alignment):
+        (eel_labeled_image_get_x_alignment):
+        (eel_labeled_image_set_y_alignment):
+        (eel_labeled_image_get_y_alignment):
+        (eel_labeled_image_set_fill):
+        (eel_labeled_image_get_fill):
+        (eel_labled_set_mnemonic_widget):
+        (eel_labeled_image_button_new):
+        (eel_labeled_image_button_new_from_file_name):
+        (eel_labeled_image_toggle_button_new):
+        (eel_labeled_image_toggle_button_new_from_file_name):
+        (eel_labeled_image_radio_button_new):
+        (eel_labeled_image_radio_button_new_from_file_name):
+        (button_leave_callback):
+        (button_focus_out_event_callback):
+        (eel_labeled_image_check_button_new):
+        (eel_labeled_image_check_button_new_from_file_name):
+        (eel_labeled_image_set_pixbuf):
+        (eel_labeled_image_set_pixbuf_from_file_name):
+        (eel_labeled_image_set_text):
+        (eel_labeled_image_get_text):
+        (eel_labeled_image_set_can_focus):
+        (eel_labeled_image_accessible_initialize):
+        (get_image):
+        (eel_labeled_image_accessible_get_name):
+        (eel_labeled_image_accessible_image_get_size):
+        (eel_labeled_image_accessible_image_interface_init):
+        (eel_labeled_image_accessible_class_init):
+        (eel_labeled_image_get_accessible):
+        (eel_labeled_image_button_class_init):
+        (eel_labeled_image_button_get_type):
+        (eel_labeled_image_check_button_get_type):
+        (eel_labeled_image_toggle_button_get_type):
+        (eel_labeled_image_radio_button_get_type):
+        * eel-labeled-image.h: Added.
+        * eel-lib-self-check-functions.c: Added.
+        (eel_run_lib_self_checks):
+        * eel-lib-self-check-functions.h: Added.
+        * eel-pango-extensions.c: Added.
+        (eel_pango_attr_list_copy_or_create):
+        (eel_pango_attr_list_apply_global_attribute):
+        (measure_string_width):
+        (compute_character_widths):
+        (eel_string_ellipsize_start):
+        (eel_string_ellipsize_end):
+        (eel_string_ellipsize_middle):
+        (eel_pango_layout_set_text_ellipsized):
+        (eel_pango_font_description_get_largest_fitting_font_size):
+        (eel_create_bogus_test_pango_context):
+        (eel_self_check_ellipsize):
+        (eel_self_check_ellipsize_start):
+        (eel_self_check_ellipsize_middle):
+        (eel_self_check_ellipsize_end):
+        (eel_self_check_pango_extensions):
+        * eel-pango-extensions.h: Added.
+        * eel-preferences-builder.c: Added.
+        (eel_preferences_builder_combo_box_update):
+        (eel_preference_glade_never_sensitive):
+        (eel_preferences_builder_set_never_sensitive):
+        (eel_preferences_builder_bool_toggled):
+        (eel_preferences_builder_bool_update):
+        (eel_preferences_builder_connect_bool):
+        (eel_preferences_builder_connect_bool_slave):
+        (eel_preferences_builder_string_enum_combo_box_changed):
+        (eel_preferences_builder_string_enum_combo_box_update):
+        (eel_preferences_builder_connect_string_enum_combo_box):
+        (eel_preferences_builder_connect_string_enum_combo_box_slave):
+        (eel_preferences_builder_uint_enum_changed):
+        (eel_preferences_builder_uint_enum_update):
+        (eel_preferences_builder_connect_uint_enum):
+        (eel_preferences_builder_string_enum_radio_button_toggled):
+        (eel_preferences_builder_string_enum_radio_button_update):
+        (eel_preferences_builder_connect_string_enum_radio_button):
+        (eel_preferences_builder_list_enum_changed):
+        (eel_preferences_builder_list_enum_update):
+        (eel_preferences_builder_connect_list_enum):
+        * eel-preferences.c: Added.
+        (preferences_gconf_value_get_int):
+        (preferences_gconf_value_get_bool):
+        (preferences_gconf_value_get_string):
+        (preferences_gconf_value_get_string_array):
+        (preferences_peek_storage_path):
+        (preferences_set_storage_path):
+        (preferences_is_initialized):
+        (preferences_get_value):
+        (preferences_preference_is_gconf_key):
+        (preferences_key_make):
+        (preferences_get_default_value):
+        (preferences_callback_entry_compare):
+        (eel_preferences_get_is_invisible):
+        (eel_preferences_set_is_invisible):
+        (eel_preferences_set_boolean):
+        (eel_preferences_get_boolean):
+        (eel_preferences_set_integer):
+        (eel_preferences_get_integer):
+        (eel_preferences_get_uint):
+        (eel_preferences_set_uint):
+        (eel_preferences_get_enum):
+        (eel_preferences_set_enum):
+        (eel_preferences_set):
+        (eel_preferences_get):
+        (eel_preferences_set_string_array):
+        (string_array_is_valid):
+        (eel_preferences_get_string_array):
+        (eel_preferences_unset):
+        (eel_preferences_key_is_writable):
+        (preferences_callback_entry_invoke_function):
+        (preferences_entry_invoke_callbacks):
+        (update_auto_string):
+        (update_auto_string_array):
+        (update_auto_string_array_as_quarks):
+        (update_auto_integer_or_boolean):
+        (preferences_entry_update_auto_storage):
+        (preferences_something_changed_notice):
+        (preferences_entry_ensure_gconf_connection):
+        (preferences_entry_add_callback):
+        (preferences_entry_add_auto_storage):
+        (preferences_entry_check_remove_connection):
+        (preferences_entry_remove_callback):
+        (preferences_entry_remove_auto_storage):
+        (preferences_callback_entry_free):
+        (preferences_callback_entry_free_func):
+        (preferences_entry_free):
+        (preferences_entry_free_func):
+        (preferences_global_table_free):
+        (preferences_uninitialize):
+        (preferences_global_table_get_global):
+        (preferences_global_table_lookup):
+        (preferences_global_table_insert):
+        (preferences_global_table_lookup_or_insert):
+        (eel_preferences_add_callback):
+        (eel_preferences_add_auto_string):
+        (eel_preferences_add_auto_string_array):
+        (eel_preferences_add_auto_string_array_as_quarks):
+        (eel_preferences_add_auto_integer):
+        (eel_preferences_add_auto_enum):
+        (eel_preferences_add_auto_boolean):
+        (eel_preferences_remove_auto_string):
+        (eel_preferences_remove_auto_string_array):
+        (eel_preferences_remove_auto_integer):
+        (eel_preferences_remove_auto_boolean):
+        (preferences_while_alive_disconnector):
+        (eel_preferences_add_callback_while_alive):
+        (eel_preferences_remove_callback):
+        (eel_preferences_set_description):
+        (eel_preferences_get_description):
+        (eel_preferences_set_enumeration_id):
+        (eel_preferences_get_enumeration_id):
+        (preferences_set_emergency_fallback_stealing_value):
+        (eel_preferences_set_emergency_fallback_string):
+        (eel_preferences_set_emergency_fallback_integer):
+        (eel_preferences_set_emergency_fallback_boolean):
+        (eel_preferences_set_emergency_fallback_string_array):
+        (eel_preferences_get_emergency_fallback):
+        (eel_preferences_monitor_directory):
+        (eel_preferences_is_visible):
+        (eel_preferences_init):
+        (eel_self_check_preferences):
+        * eel-preferences.h: Added.
+        * eel-self-checks.c: Added.
+        (eel_exit_if_self_checks_failed):
+        (eel_report_check_failure):
+        (eel_strdup_boolean):
+        (eel_before_check):
+        (eel_after_check):
+        (eel_check_boolean_result):
+        (eel_check_rectangle_result):
+        (eel_check_dimensions_result):
+        (eel_check_point_result):
+        (eel_check_integer_result):
+        (eel_check_double_result):
+        (eel_check_string_result):
+        (eel_before_check_function):
+        (eel_after_check_function):
+        * eel-self-checks.h: Added.
+        * eel-stock-dialogs.c: Added.
+        (timed_wait_hash):
+        (timed_wait_hash_equal):
+        (timed_wait_delayed_close_destroy_dialog_callback):
+        (timed_wait_delayed_close_timeout_callback):
+        (timed_wait_free):
+        (timed_wait_dialog_destroy_callback):
+        (trash_dialog_response_callback):
+        (timed_wait_callback):
+        (eel_timed_wait_start_with_duration):
+        (eel_timed_wait_start):
+        (eel_timed_wait_stop):
+        (eel_run_simple_dialog):
+        (create_message_dialog):
+        (show_message_dialog):
+        (show_ok_dialog):
+        (eel_create_info_dialog):
+        (eel_show_info_dialog):
+        (eel_show_info_dialog_with_details):
+        (eel_show_warning_dialog):
+        (eel_show_error_dialog):
+        (eel_show_error_dialog_with_details):
+        (eel_show_yes_no_dialog):
+        (eel_create_question_dialog):
+        * eel-stock-dialogs.h: Added.
+        * eel-string.c: Added.
+        (eel_strlen):
+        (eel_strchr):
+        (eel_strcmp):
+        (eel_strcasecmp):
+        (eel_strcmp_case_breaks_ties):
+        (eel_str_is_empty):
+        (eel_str_is_equal):
+        (eel_istr_is_equal):
+        (eel_str_has_prefix):
+        (eel_str_has_suffix):
+        (eel_istr_has_prefix):
+        (eel_istr_has_suffix):
+        (eel_str_get_prefix):
+        (eel_str_to_int):
+        (eel_str_double_underscores):
+        (eel_str_capitalize):
+        (eel_str_middle_truncate):
+        (eel_str_strip_substring_and_after):
+        (eel_str_replace_substring):
+        (get_position):
+        (is_flag):
+        (is_length_modifier):
+        (get_arg_type_from_format):
+        (skip_argv):
+        (skip_to_arg):
+        (eel_strdup_vprintf_with_custom):
+        (eel_strdup_printf_with_custom):
+        (eel_ref_str_new_internal):
+        (eel_ref_str_new):
+        (eel_ref_str_get_unique):
+        (eel_ref_str_ref):
+        (eel_ref_str_unref):
+        (call_str_to_int):
+        (verify_printf):
+        (custom1_to_string):
+        (custom1_skip):
+        (custom2_to_string):
+        (custom2_skip):
+        (verify_custom):
+        (eel_self_check_string):
+        * eel-string.h: Added.
+        * eel-types.c: Added.
+        (eel_type_init):
+        * eel-types.h: Added.
+        * eel-vfs-extensions.c: Added.
+        (eel_uri_is_trash):
+        (eel_uri_is_search):
+        (eel_uri_is_desktop):
+        (eel_make_valid_utf8):
+        (eel_format_uri_for_display):
+        (eel_filename_strip_extension):
+        (eel_filename_get_rename_region):
+        * eel-vfs-extensions.h: Added.
+        * eel-wrap-table.c: Added.
+        (eel_wrap_table_class_init):
+        (eel_wrap_table_init):
+        (eel_wrap_table_finalize):
+        (eel_wrap_table_set_property):
+        (eel_wrap_table_get_property):
+        (eel_wrap_table_size_request):
+        (eel_wrap_table_size_allocate):
+        (eel_wrap_table_expose_event):
+        (eel_wrap_table_map):
+        (eel_wrap_table_unmap):
+        (eel_wrap_table_realize):
+        (eel_wrap_table_add):
+        (eel_wrap_table_remove):
+        (eel_wrap_table_forall):
+        (eel_wrap_table_child_type):
+        (wrap_table_get_num_fitting):
+        (wrap_table_layout):
+        (wrap_table_irect_max_dimensions):
+        (wrap_table_get_max_child_dimensions):
+        (wrap_table_get_content_dimensions):
+        (wrap_table_get_content_bounds):
+        (wrap_table_child_focus_in):
+        (eel_wrap_table_new):
+        (eel_wrap_table_set_x_spacing):
+        (eel_wrap_table_get_x_spacing):
+        (eel_wrap_table_set_y_spacing):
+        (eel_wrap_table_get_y_spacing):
+        (eel_wrap_table_find_child_at_event_point):
+        (eel_wrap_table_set_x_justification):
+        (eel_wrap_table_get_x_justification):
+        (eel_wrap_table_set_y_justification):
+        (eel_wrap_table_get_y_justification):
+        (eel_wrap_table_set_homogeneous):
+        (eel_wrap_table_get_homogeneous):
+        (eel_wrap_table_reorder_child):
+        (eel_wrap_table_get_num_children):
+        (eel_scrolled_wrap_table_new):
+        * eel-wrap-table.h: Added.
+        * eel-xml-extensions.c: Added.
+        (eel_xml_get_children):
+        (eel_xml_get_root_children):
+        (eel_xml_get_child_by_name_and_property):
+        (eel_xml_get_child_by_name):
+        (eel_xml_get_root_child_by_name_and_property):
+        (eel_xml_get_property_for_children):
+        (eel_xml_get_property_translated):
+        * eel-xml-extensions.h: Added.
+        * eel.h: Added.
+        * eelmarshal.list: Added.
+        * makeenums.pl: Added.
+        * maketypes.awk: Added.
+        * update-from-egg.sh: Added.
+
+2008-12-10  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-enumeration.[ch]:
+        * eel/eel-preferences-builder.c:
+        * eel/eel-preferences.[ch]:
+	Make enums uint (so we can use larger values for thumbnail limit).
+
+2008-12-08  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* test/test.h:
+	Flip include orders to fix the build (#563731).
+
+2008-12-07  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel/eel-background.c:
+	* test/test.h:
+	Remove more useless includes.
+	Thanks to Luis Menina (#563569).
+
+2008-12-07  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel/check-program.c:
+	* eel/eel-gdk-pixbuf-extensions.c:
+	* test/test-eel-background.c:
+	* test/test-eel-image-table.c:
+	Use single gdk-pixbuf and GTK+ headers includes.
+
+2008-12-01  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+==================== 2.25.1 ====================
+
+2008-12-01  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2008-11-18  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel/eel-preferences.c:
+	(eel_preferences_add_auto_string_array_as_quarks):
+	Plug a leak.
+
+2008-10-09  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-gdk-extensions.[ch]:
+	Remove old now unused function eel_gdk_color_parse()
+
+2008-10-07  Alexander Larsson  <alexl@redhat.com>
+
+        * configure.in:
+        * eel-2.0-uninstalled.pc.in:
+        * eel-2.0.pc.in:
+	Remove deps on startup-notify, libgnome* and libglade
+
+        * eel/eel-gnome-extensions.[ch]:
+	Remove GnomeIconSelector functions.
+	Remove glade functions
+	
+        * eel/eel-preferences-glade.c: Removed.
+        * eel/eel-preferences-builder.c: Added.
+        * eel/eel-preferences-glade.h: Removed
+        * eel/eel-preferences.h:
+	Move eel-preferences-glade.c to eel-preferences-builder.c and use
+	GtkBuilder instead of Glade.
+	Remove eel-preferences-glade.h and move GtkBuilder functions
+	into eel-preferences.h
+
+        * eel/Makefile.am:
+	Update for file renamed/deletions
+	
+        * eel/check-program.c:
+        * eel/eel-stock-dialogs.c:
+	Don't include libgnome headers.
+
+2008-10-07  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-gnome-extensions.[ch]:
+	Remove gnome_icon_selector code
+
+2008-10-06  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/check-program.c:
+        * test/test-eel-widgets.c:
+        * test/test.c:
+	Don't use GnomeProgram
+
+2008-10-06  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-stock-dialogs.c (timed_wait_callback):
+	Don't call gnome_authentication_manager_dialog_is_visible()
+	anymore, not needed with no gnome-vfs.
+
+2008-10-06  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-debug-drawing.c (eel_debug_show_pixbuf_in_external_viewer): 
+	Better ignoring of system return value. Fixes build (#555264)
+	
+2008-10-06  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/Makefile.am:
+        * eel/eel-mount-operation.[ch]:
+	Remove EelMountOperation
+
+2008-10-01  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.25.1.
+	Stable version lives on the gnome-2-24 branch.
+
+2008-09-22  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: post-release bump to 2.24.1
+
+==================== 2.24.0 ====================
+
+2008-09-22  Christian Neumair  <cneumair@gnome.org>
+
+	* NEWS:
+	Update for release.
+
+2008-09-15  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-mount-operation.c (ask_password):
+	Do not make password dialog modal. Fixes #539966.
+
+2008-09-13  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel/eel-preferences.c: (update_auto_string_array_as_quarks):
+	Fix a warning for an uninitialized variable.
+	Patch by Christian Kirbach (#552135).
+
+2008-09-10  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-preferences.c (update_auto_string_array_as_quarks),
+	(preferences_entry_update_auto_storage),
+	(preferences_entry_remove_auto_storage),
+	(eel_preferences_add_auto_string_array_as_quarks):
+	* eel/eel-preferences.h:
+	Add eel_preferences_add_auto_string_array_as_quarks(), which maps a
+	string array to a quark array. No remove function yet, since up to now
+	it is not needed. Parly fixes #551576.
+
+2008-09-08  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: post-release bump to 2.40.0
+
+==================== 2.23.92 ====================
+
+2008-09-08  Christian Neumair  <cneumair@gnome.org>
+
+	* NEWS:
+	Update for release.
+
+2008-09-08  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/Makefile.am:
+	* eel/eel-app-launch-context.c:
+	* eel/eel-app-launch-context.h:
+	Remove in favor of GdkAppLaunchContext.
+
+2008-09-06  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-gdk-pixbuf-extensions.c (pixbuf_loader_size_prepared):
+	Explicitly cast to float when determining aspect ratio. Fixes #550997.
+
+2008-09-02  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel/*.[ch]: use single headers GTK/GDK/Pango includes.
+
+2008-09-01  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: post-release bump to 2.23.92.
+
+==================== 2.23.91 ====================
+
+2008-09-01  Christian Neumair  <cneumair@gnome.org>
+
+	* NEWS:
+	Update for release.
+
+2008-09-01  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-vfs-extensions.c (eel_filename_strip_extension),
+	(eel_filename_get_rename_region):
+	* eel/eel-vfs-extensions.h:
+	Add eel_filename_strip_extension(), and use it in
+	eel_filename_get_rename_region(). Part of #309510. Thanks to Paolo
+	Borelli <pborelli@katamail.com> and Jared Moore <jaredm@gmx.com>.
+
+2008-09-01  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-gdk-pixbuf-extensions.c
+	(eel_gdk_pixbuf_load_from_stream), (pixbuf_loader_size_prepared),
+	(eel_gdk_pixbuf_load_from_stream_at_size):
+	* eel/eel-gdk-pixbuf-extensions.h:
+	Add eel_gdk_pixbuf_load_from_stream_at_size(), which sets the size of
+	the pixbuf loader when loading. Part of #529371.
+
+2008-08-03  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: post-release bump to 2.23.91.
+
+==================== 2.23.90 ====================
+
+2008-08-03  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: post-release bump to 2.23.90.
+
+==================== 2.23.6 ====================
+
+2008-07-21  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: post-release bump to 2.23.6.
+
+==================== 2.23.5 ====================
+
+2008-06-16  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: post-release bump to 2.23.5.
+
+==================== 2.23.4 ====================
+
+2008-06-16  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in: actually pre-release bump to 2.23.4.
+
+2008-06-16  Christian Neumair  <cneumair@gnome.org>
+
+	* NEWS: Update for release.
+	* configure.in: pre-release bump to 2.23.4.
+
+2008-06-10  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-editable-label.c
+	(eel_editable_label_get_block_cursor_location),
+	(eel_editable_label_draw_cursor),
+	(eel_editable_label_toggle_overwrite):
+	Use block cursor in insert mode. Fixes #511617. Thanks to Arthur
+	Taylor.
+
+2008-06-03  Vincent Untz  <vuntz@gnome.org>
+
+	* configure.in: post-release bump to 2.23.3
+
+==================== 2.23.2 ====================
+
+2008-06-03  Christian Neumair  <cneumair@gnome.org>
+
+	* NEWS:
+	* configure.in:
+	Require libgnome 2.23.0.
+
+2008-06-03  Christian Neumair  <cneumair@gnome.org>
+
+	* NEWS:
+	Update for release.
+
+Sun Jun  1 21:04:04 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c (struct EelBackgroundDetails): Remove
+	unused image_mtime
+
+Sun Jun  1 21:02:00 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c: Don't store the image_uri - instead rely
+	on getting it from GnomeBG.
+
+Sun Jun  1 20:39:03 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c: Don't monitor the file anymore; this is
+	done by GnomeBG.
+
+Sun Jun  1 20:24:12 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c (struct EelBackgroundDetails): Don't store
+	an EelBackgroundPlacement; instead compute it from the GnomeBG.
+
+Sun Jun  1 19:30:16 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c (eel_background_save_to_gconf): New function.
+
+Sat May 31 02:23:16 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c (eel_background_reload_image): Deal with
+	the case where image_uri is NULL.
+
+Sat May 31 00:39:25 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c (eel_background_reload_image): Use
+	gnome_bg_set_filename().
+
+	* configure.in: Require new gnome-desktop
+
+Fri May 30 23:23:53 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* Revert last commit, since we still need to deal with file uris.
+
+Fri May 30 22:13:51 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.[ch]: Rename eel_background_set/get_image_uri()
+	to set/get_image_filename() to reflect the fact that only local
+	files works.
+
+Fri May 30 21:31:09 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.h: Remove unused
+	eel_background_set_image_uri_sync() function.
+
+2008-04-21  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in:
+	post release version bump
+
+=== eel 2.23.1 ===
+
+2008-04-21  Christian Neumair  <cneumair@gnome.org>
+
+	* NEWS:
+	Update for release.
+
+2008-03-29  Christian Neumair  <cneumair@gnome.org>
+
+	* configure.in:
+	Use a slightly cleaner method of detecting libstartup-notification,
+	using macros instead of manually calling pkg-config (#507811).
+	Thanks to Lo�c Minier <lool@dooz.org>.
+
+2008-03-29  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-debug-drawing.c
+	(eel_debug_show_pixbuf_in_external_viewer):
+	Cast system() call result to void, to avoid complier warnings
+	(#502579).
+
+2008-03-28  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.23.1
+	Gnome 2.22 work continues on gnome-2-22 branch
+
+2008-03-28  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-accessibility.h:
+	* eel/eel-background.c (eel_background_set_image_uri_helper),
+	(eel_background_is_set):
+	* eel/eel-canvas-rect-ellipse.c (eel_canvas_re_destroy),
+	(eel_canvas_re_set_property), (eel_canvas_re_get_property):
+	* eel/eel-canvas.c (eel_canvas_item_set_property),
+	(eel_canvas_item_get_property), (eel_canvas_item_dispose),
+	(eel_canvas_item_invoke_update), (eel_canvas_group_set_property),
+	(eel_canvas_group_get_property), (eel_canvas_group_destroy),
+	(group_remove), (eel_canvas_accessible_get_n_children),
+	(eel_canvas_accessible_ref_child), (eel_canvas_accessible_create),
+	(eel_canvas_accessible_factory_create_accessible),
+	(eel_canvas_destroy), (eel_canvas_map), (eel_canvas_unmap),
+	(eel_canvas_realize), (eel_canvas_unrealize),
+	(eel_canvas_size_allocate), (eel_canvas_button),
+	(eel_canvas_motion), (eel_canvas_key), (eel_canvas_crossing),
+	(eel_canvas_expose), (do_update),
+	(eel_canvas_item_accessible_get_extents),
+	(eel_canvas_item_accessible_get_mdi_zorder),
+	(eel_canvas_item_accessible_component_interface_init),
+	(eel_canvas_item_accessible_create),
+	(eel_canvas_item_accessible_factory_create_accessible):
+	* eel/eel-debug-drawing.c (debug_pixbuf_viewer_size_request),
+	(debug_pixbuf_viewer_expose_event),
+	(debug_pixbuf_viewer_set_pixbuf):
+	* eel/eel-editable-label.c (add_move_binding),
+	(eel_editable_label_finalize), (eel_editable_label_size_request),
+	(eel_editable_label_style_set), (_eel_draw_insertion_cursor),
+	(eel_editable_label_expose),
+	(eel_editable_label_select_region_index), (popup_position_func),
+	(atk_text_interface_init), (atk_editable_text_interface_init),
+	(eel_editable_label_accessible_get_name):
+	* eel/eel-enumeration.c (eel_enumeration_new),
+	(eel_enumeration_new_from_entries):
+	* eel/eel-gconf-extensions.c (simple_value_is_equal):
+	* eel/eel-gdk-extensions.c (eel_gradient_new),
+	(eel_gradient_set_edge_color), (eel_gradient_set_left_color_spec),
+	(eel_gradient_set_top_color_spec),
+	(eel_gradient_set_right_color_spec),
+	(eel_gradient_set_bottom_color_spec),
+	(eel_gdk_color_parse_with_white_default):
+	* eel/eel-gdk-pixbuf-extensions.c (pixbuf_destroy_callback):
+	* eel/eel-graphic-effects.c (create_new_pixbuf),
+	(create_new_pixbuf_with_alpha):
+	* eel/eel-gtk-extensions.c (while_realized_disconnecter):
+	* eel/eel-image-table.c (eel_image_table_realize),
+	(eel_image_table_unrealize), (eel_image_table_remove),
+	(image_table_emit_signal), (image_table_handle_motion),
+	(ancestor_enter_notify_event), (ancestor_leave_notify_event),
+	(ancestor_motion_notify_event), (ancestor_button_press_event),
+	(ancestor_button_release_event):
+	* eel/eel-labeled-image.c (eel_labeled_image_set_property),
+	(eel_labeled_image_get_property), (eel_labeled_image_size_request),
+	(eel_labeled_image_size_allocate),
+	(eel_labeled_image_expose_event), (eel_labeled_image_map),
+	(eel_labeled_image_unmap), (eel_labeled_image_add),
+	(eel_labeled_image_remove), (eel_labeled_image_forall),
+	(labeled_image_get_image_dimensions),
+	(labeled_image_get_label_dimensions),
+	(labeled_image_get_image_bounds_fill),
+	(labeled_image_get_label_bounds_fill),
+	(labeled_image_update_alignments),
+	(labeled_image_get_content_dimensions),
+	(labeled_image_get_content_bounds), (labeled_image_ensure_label),
+	(labeled_image_ensure_image), (labeled_image_show_image),
+	(labeled_image_show_label), (eel_labled_set_mnemonic_widget),
+	(button_leave_callback), (button_focus_out_event_callback):
+	* eel/eel-preferences.c (preferences_gconf_value_get_int),
+	(preferences_gconf_value_get_bool),
+	(preferences_gconf_value_get_string),
+	(preferences_gconf_value_get_string_array),
+	(preferences_peek_storage_path), (preferences_set_storage_path),
+	(preferences_get_value), (preferences_preference_is_gconf_key),
+	(preferences_key_make), (preferences_get_default_value),
+	(eel_preferences_get_is_invisible), (string_array_is_valid),
+	(preferences_callback_entry_invoke_function),
+	(preferences_entry_invoke_callbacks), (update_auto_string),
+	(update_auto_string_array), (update_auto_integer_or_boolean),
+	(preferences_something_changed_notice),
+	(preferences_entry_ensure_gconf_connection),
+	(preferences_entry_add_callback),
+	(preferences_entry_add_auto_storage),
+	(preferences_entry_remove_callback),
+	(preferences_entry_remove_auto_storage),
+	(preferences_callback_entry_free),
+	(preferences_callback_entry_free_func), (preferences_entry_free),
+	(preferences_global_table_lookup),
+	(preferences_global_table_insert),
+	(preferences_global_table_lookup_or_insert),
+	(preferences_set_emergency_fallback_stealing_value):
+	* eel/eel-wrap-table.c (eel_wrap_table_set_property),
+	(eel_wrap_table_get_property), (eel_wrap_table_size_request),
+	(eel_wrap_table_size_allocate), (eel_wrap_table_expose_event),
+	(eel_wrap_table_map), (eel_wrap_table_unmap),
+	(eel_wrap_table_realize), (eel_wrap_table_add),
+	(eel_wrap_table_remove), (eel_wrap_table_forall),
+	(wrap_table_get_num_fitting), (wrap_table_layout),
+	(wrap_table_irect_max_dimensions),
+	(wrap_table_get_max_child_dimensions),
+	(wrap_table_get_content_dimensions),
+	(wrap_table_get_content_bounds), (wrap_table_child_focus_in):
+	g_assert() in static functions instead of using
+	g_return(_val)_if_fail() (#320246). Thanks to Aaditya Sood.
+
+2008-03-28  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.22.1 ===
+	
+2008-03-28  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release.
+
+2008-03-24  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-string.c (skip_argv), (custom1_skip), (custom2_skip):
+	Fix compiler warnings about unused value by casting va_arg
+	calls with unused return values to void (#523899).
+
+2008-03-11  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-background.c: (background_image_file_changed),
+	(eel_background_update_file_monitor),
+	(eel_background_set_image_uri_helper): Update EelBackground if the
+	image file changes. Fixes #106613.
+
+2008-03-11  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mount-operation.c:
+        (ask_question):
+	Don't pass in NULL as primary if there
+	is no newline in the message.
+
+2008-03-10  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Post release version bump
+
+=== eel 2.22.0 ===
+	
+2008-03-10  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Bump version to 2.22.0
+
+2008-02-25  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.21.92 ===
+	
+2008-02-25  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2008-02-22  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* eel/eel-mount-operation.c: (ask_question):
+	Use the first line of the question message as primary text for the
+	dialog so that it's formatted.
+	
+2008-02-21  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel/eel-background.c: (eel_background_ensure_realized):
+	Better fix for bug #517681.
+
+2008-02-21  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel/eel-background.c: (eel_background_ensure_realized):
+	Fix compilation warning. (#517681)
+	Patch from Rodrigo Moya.
+
+2008-02-21  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* eel-2.0-uninstalled.pc.in:
+	* eel-2.0.pc.in:
+	Update dependencies (#505831).
+
+2008-02-18  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mount-operation.c:
+	Handle the save-password flags (#516997)
+	Patch from Carlos Garcia Campos
+
+2008-02-13  Christian Persch  <chpe@gnome.org>
+
+	* eel/eel-editable-label.c:
+	(eel_editable_label_select_region_index): Update text targets list.
+	Bug #516230.
+
+2008-02-13  Christian Persch  <chpe@gnome.org>
+
+	* configure.in:
+	* eel/eel-string.c: (eel_strdup_vprintf_with_custom): Use G_VA_COPY.
+	Bug #516232.
+
+2008-02-13  Alexander Larsson  <alexl@redhat.com>
+
+        * configure.in:
+	Check for va_copy and define a replacement if not availible (#513199)
+	Patch from Jens Granseuer
+
+2008-02-11  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.21.91 ===
+	
+2008-02-11  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2008-01-28  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.21.90 ===
+	
+2008-01-28  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+	* configure.in:
+	Bump version to 2.21.90
+	
+2008-01-28  Alexander Larsson  <alexl@redhat.com>
+
+        * test/test-eel-image-table.c:
+	Use G_STRFUNC instead of deprecated G_GNUC_FUNCTION
+	
+Fri Jan 25 14:08:11 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* eel/eel-background.c: Add #define GNOME_DESKTOP_USE_UNSTABLE_API
+	before including gnome-bg.h
+	
+	* eel/eel-background.c: Delete eel_background_set_is_constant_size().
+
+2008-01-22  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-string.c:
+        (eel_ref_str_unref):
+	Fix leak and tighten up a possible race
+	condition when a unique string is ressurected.
+
+2008-01-14  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Post release version bump
+
+=== eel 2.21.5 ===
+
+2008-01-14  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Bump version to 2.21.5
+
+	* NEWS:
+	Updated for release
+
+2008-01-09  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mount-operation.c:
+	Update for gio API changes
+
+2007-12-20  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.21.1 ===
+
+2007-12-20  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+	* configure.in:
+	Require glib 2.15.0
+
+2007-12-20  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-app-launch-context.c:
+	Update to new file attribute names
+
+2007-12-14  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mount-operation.c:
+	Update to new flag enum names and values
+
+2007-12-14  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-app-launch-context.c:
+        * eel/eel-app-launch-context.h:
+        * eel/eel-background.c:
+        * eel/eel-gdk-pixbuf-extensions.c:
+        * eel/eel-gdk-pixbuf-extensions.h:
+        * eel/eel-mount-operation.h:
+        * eel/eel-vfs-extensions.c:
+	Only use <gio/gio.h> include 
+
+2007-12-13  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mount-operation.c:
+        (ask_password):
+	G_PASSWORD_FLAGS_ANON_SUPPORTED -> G_PASSWORD_FLAGS_ANONYMOUS_SUPPORTED
+
+2007-12-10  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-app-launch-context.c (add_startup_timeout):
+	Correct set_data name
+
+2007-11-30  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Bump version to 2.21.1
+	Remove extraversion
+
+2007-11-29  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-app-launch-context.c:
+        * eel/eel-vfs-extensions.c:
+	Update code to handle glib version of gio
+
+2007-11-22  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-string.c (handlers):
+	Make handlers static
+
+2007-11-22  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-string.[ch]:
+        Added eel_strdup_vprintf_with_custom and
+        eel_strdup_printf_with_custom
+
+2007-11-06  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mount-operation.c:
+	Fix build for new gio
+
+2007-11-06  Alexander Larsson  <alexl@redhat.com>
+
+        * configure.in:
+	Look for libstartupnotify
+	
+        * eel/Makefile.am:
+        * eel/eel-app-launch-context.[ch]:
+	Add EelAppLaunchContext
+	
+2007-11-02  Paolo Borelli  <pborelli@katamail.com>
+
+        * eel/eel-string.c:
+        * eel/eel-string.h:
+	Remove two functions that were just used in eel-string-list.
+
+2007-11-02  Paolo Borelli  <pborelli@katamail.com>
+
+        * eel/eel-preferences-glade.c:
+        * eel/eel-gconf-extensions.c:
+        * eel/eel-preferences.c:
+        * eel/eel-preferences.h:
+	Introduce eel_preference_[get|set]_string_array and remove
+	all uses of eel-string-list.
+
+        * eel/eel-enumerations.c:
+        * eel/eel-enumerations.h:
+	Simplify implementation and API and avoid use of eel-string-list.
+
+        * eel/eel-string-list.c:
+        * eel/eel-string-list.h:
+        * eel/Makefile.am:
+	Remove eel-string-list.c
+
+2007-11-02  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-string.c (eel_str_middle_truncate):
+	Fix off by one bug
+
+2007-11-01  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-string.c:
+        Make eel_str_middle_truncate handle utf8 strings
+	correctly.
+
+2007-10-24  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mount-operation.[ch]:
+	Add active_changed signal
+
+2007-10-24  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/Makefile.am:
+        * eel/eel-mount-operation.[ch]:
+	Add GMountOperation version with gtk+ dialogs
+
+2007-10-24  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-gdk-pixbuf-extensions.[ch]:
+        * eel/eel-background.c:
+	Convert gnome_vfs use to gio
+	
+        * configure.in:
+        * eel/check-program.c:
+        * test/test-eel-background.c:
+        * test/test.[ch]:
+	Remove dependencies on gnome-vfs, libgnomedesktop, etc
+
+2007-10-24  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-art-extensions.[ch]:
+        * eel/eel-enumeration.c:
+        * eel/eel-gdk-extensions.[ch]:
+        * eel/eel-glib-extensions.c:
+        * eel/eel-gtk-extensions.[ch]:
+        * eel/eel-pango-extensions.[ch]:
+        * eel/eel-self-checks.c:
+        * eel/eel-string-list.[ch]:
+        * eel/eel-string.[ch]:
+	Remove even more unused functions
+
+2007-10-24  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-editable-label.c:
+        * eel/eelmarshal.list:
+	Remove unused marshallers
+
+2007-10-24  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-art-extensions.[ch]:
+        * eel/eel-debug-drawing.c:
+        * eel/eel-gdk-extensions.[ch]:
+        * eel/eel-gdk-pixbuf-extensions.[ch]:
+        * eel/eel-glib-extensions.[ch]:
+        * eel/eel-lib-self-check-functions.h:
+        * test/Makefile.am:
+        * test/test-eel-gtk-style.c: Removed.
+        * test/test-eel-pixbuf-tile.c: Removed.
+        * test/test.c:
+	Remove unused functions
+
+2007-10-23  Alexander Larsson  <alexl@redhat.com>
+
+        * configure.in:
+        * eel/eel-art-extensions.[ch]:
+        * eel/eel-art-gtk-extensions.[ch]:
+        * eel/eel-background.c:
+        * eel/eel-debug-drawing.[ch]:
+        * eel/eel-gdk-pixbuf-extensions.[ch]:
+        * eel/eel-gnome-extensions.c:
+        * eel/eel-graphic-effects.c:
+        * eel/eel-gtk-container.[ch]:
+        * eel/eel-image-table.c:
+        * eel/eel-labeled-image.[ch]:
+        * eel/eel-self-checks.[ch]:
+        * eel/eel-wrap-table.c:
+        * test/test-eel-gtk-style.c:
+        * test/test-eel-pixbuf-tile.c:
+        * test/test.c:
+	Lift in the small amount of code and typedefs we
+	need from libart. Remove libart dependency.
+
+2007-10-23  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/Makefile.am:
+        * eel/eel-dateedit-extensions.[ch]: Removed.
+        * eel/eel-gnome-extensions.[ch]:
+        * eel/eel.h:
+	Remove unneeded eel functions
+
+2007-10-23  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-lib-self-check-functions.h:
+        * eel/eel-vfs-extensions.[ch]:
+	Remove a bunch of unnecessary gnome-vfs functions
+
+2007-10-11  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-gdk-pixbuf-extensions.[ch]:
+        Added eel_gdk_pixbuf_load_from_stream
+
+2007-10-01  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/Makefile.am:
+        * eel/eel-mime-application-chooser.[ch]:
+        * eel/eel-open-with-dialog.[ch]:
+	Move these to nautilus
+
+2007-10-01  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-mime-application-chooser.c:
+        * eel/eel-open-with-dialog.c:
+	Port more stuff to gio mimetype code
+
+        * eel/Makefile.am:
+        * eel/eel-mime-extensions.[ch]:
+	Remove unused code
+	
+2007-10-01  Alexander Larsson  <alexl@redhat.com>
+
+        * configure.in:
+	Pull in gio when linking
+	
+        * eel/eel-open-with-dialog.[ch]:
+	Update to use GAppInfo and gio APIs.
+
+2007-09-26  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-string.h:
+	Fix up macro definition.
+	It can't have a space before the param list
+
+2007-09-26  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-string.[ch];
+	Add eel_ref_str, a set of refcounted and optionally uniquified
+	string functions.
+
+2007-09-26  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-vfs-extensions.[ch]:
+	Remove more unused code
+
+2007-09-26  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-vfs-extensions.c:
+	Remove code not used by nautilus anymore
+
+2007-11-28  Soren Sandmann <sandmann@redhat.com>
+
+	* configure.in: Require libgnomedesktop 2.21.3
+
+	* eel/eel-background.[ch]: Make EelBackground a thin wrapper
+	around GnomeBG from libgnomedesktop.
+
+2007-10-12  Christian Kirbach  <Christian.Kirbach@googlemail.com>
+
+	* eel/eel-debug-drawing.c:
+	* eel/eel-debug-drawing.h:
+	(eel_debug_show_pixbuf): unconstify parameter 1 to
+	unbreak the build on gcc 4.2
+
+2007-09-18  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Add gio as extraversion
+
+        * eel/eel-gdk-pixbuf-extensions.c:
+        * eel/eel-vfs-extensions.[ch]:
+	Use goffset instead of GnomeVFSFileSize
+
+=== gio-branch starts here ===
+	
+2007-09-18  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.20.0 ===
+
+2007-09-18  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump version to 2.20.0
+
+2007-08-14  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.19.90 ===
+
+2007-08-14  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2007-07-31  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.19.6 ===
+
+2007-07-31  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2007-07-28  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-open-with-dialog.c: (get_all_applications_from_dir):
+	Don't crash if a menu entry has no exec. Fixes #455949.
+	Patch from Pascal Terjan  <pascal.terjan@free.fr>
+
+2007-07-10  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.19.5 ===
+
+2007-07-10  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2007-07-10  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Remove AC_ISC_POSIX: It would have to be called after AC_PROG_CC,
+	but Interactive Unix is obsolete.
+	Replace obsolete AC_STDC_HEADERS with AC_HEADER_STDC.
+	Remove AM_SANITY_CHECK: It's an internal macro that is called by
+	AM_INIT_AUTOMAKE anyway.
+	Remove unused AC_C_BIGENDIAN.
+	Remove redundant AC_PROG_AWK call.
+
+2007-06-23  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-glib-extensions.c: (eel_self_check_glib_extensions):
+	Set LC_TIME="C" before testing the output of eel_strdup_strftime
+	instead of having the translators to provide the expected results.
+	Fixes 'make check' when LC_TIME != LC_MESSAGES. (#348191)
+
+2007-06-21  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Don't set both -Wsign-compare and -Wno-sign-compare.
+	Don't set -Wchar-subscripts as it's included in -Wall.
+
+2007-06-20  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Don't set extra warning flags in the user environment CFLAGS.
+	Fixes 'make distcheck'.
+
+2007-06-19  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.19.4 ===
+	
+2006-06-18  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2007-06-12  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-mime-application-chooser.c: (set_uri_and_mime_type):
+	Clarify message by replacing "others" with "other files" in the
+	application chooser dialog. (#150559)
+	Patch from Bj�rn Lindqvist  <bjourne@gmail.com>  
+
+2006-06-05  Martin Wehner  <martin.wehner@gmail.com>
+	
+	* configure.in:
+	Post release version bump
+
+=== eel 2.19.3 ===
+	
+2006-06-05  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2007-06-01  Christian Neumair  <cneumair@gnome.org>
+
+	* eel/eel-open-with-dialog.c: (eel_open_with_search_equal_func): Match
+	application display name and binary path/base path. Fixes #359912.
+
+=== eel 2.19.2 ===
+	
+2007-05-14  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: 
+	* NEWS:
+	Update for 2.19.2
+
+2007-04-10  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-gconf-extensions.c:
+        (eel_gconf_monitor_add):
+        (eel_gconf_monitor_remove):
+        (eel_gconf_preload_cache):
+	Avoid leaked refcounts on default gconf client. (#235657)
+	Patch from Matthias Clasen
+
+2007-03-19  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.19.1
+	Gnome 2.18 work continues on gnome-2-18 branch
+
+2007-03-12  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+	* eel/eel-gtk-extensions.c (eel_gtk_window_set_initial_geometry):
+	Fix crasher due to bug sparse cleanup.
+
+2007-03-12  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+	
+=== eel 2.18.0 ===
+	
+2007-03-12  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+	* configure.in:
+	Bump version to 2.18.0
+
+2007-03-02  Alexander Larsson  <alexl@redhat.com>
+
+        * eel/eel-background.c:
+        * eel/eel-canvas.c:
+        * eel/eel-enumeration.c:
+        * eel/eel-gtk-extensions.c:
+        * eel/eel-image-table.c:
+        * eel/eel-labeled-image.c:
+	Sparse cleanups from kjartan
+
+2007-02-20  Christian Persch  <chpe@svn.gnome.org>
+
+	* eel/eel.h: Remove eel-ellipsizing-label.h inclusion.
+
+2007-02-20  Christian Persch  <chpe@svn.gnome.org>
+
+	* eel/Makefile.am:
+	R eel/eel-ellipsizing-label.c:
+	R eel/eel-ellipsizing-label.h:
+	* test/Makefile.am:
+	R test/test-eel-ellipsizing.c: Remove EelEllipsisingLabel. Bug
+	#409272.
+
+2007-02-20  Christian Persch  <chpe@svn.gnome.org>
+
+	* eel/Makefile.am:
+	* eel/eel-editable-label.c:
+	(eel_editable_label_select_region_index):
+	* eel/eel-ellipsizing-label.c:
+	* eel/eel-ellipsizing-label.h:
+	* eel/eel-string.c: (eel_self_check_string), (main):
+	* test/Makefile.am:
+	* test/test-eel-ellipsizing.c:
+
+2007-01-22  Alexander Larsson  <alexl@redhat.com>
+	
+	* configure.in:
+	Post release version bump
+	
+=== eel 2.17.90 ===
+	
+2007-01-22  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.17.90
+
+2007-01-18  Christian Persch  <chpe@svn.gnome.org>
+
+	* eel/eel-accessibility.c: (eel_accessibility_add_simple_text),
+	(eel_accessible_text_get_type):
+	* eel/eel-alert-dialog.c: (eel_alert_dialog_get_type):
+	* eel/eel-canvas.c: (eel_canvas_item_get_type),
+	(eel_canvas_group_get_type), (eel_canvas_get_type),
+	(eel_canvas_accessible_factory_get_type),
+	(eel_canvas_item_accessible_get_type),
+	(eel_canvas_item_accessible_factory_get_type):
+	* eel/eel-editable-label.c: (eel_editable_label_get_type),
+	(eel_editable_label_get_accessible):
+	* eel/eel-labeled-image.c: (eel_labeled_image_get_accessible):
+	* eel/eel-mime-application-chooser.c:
+	(eel_mime_application_chooser_get_type):
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_get_type): No need
+	to make GTypeInfo and GInterfaceInfo static. Bug #362031.
+
+2006-12-18  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	post release version bump
+
+=== eel 2.17.1 ===
+	
+2006-12-18  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2006-12-08  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_intersect):
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-gtk-extensions.c: (eel_gtk_get_system_font):
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-pango-extensions.c:
+	* eel/eel-pango-extensions.h:
+	Remove all traces of pangoft2 use, as we don't need this
+	any more. (#377711)
+
+2006-11-23  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-open-with-dialog.c: (get_all_applications_from_dir):
+	Only list appliations that accept file arguments (#345521)
+	Patch from Tom Parker
+
+2006-11-23  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.17.1
+	Gnome 2.16 work continues on gnome-2-16 branch
+
+2006-11-20  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.16.3 ===
+	
+2006-11-20  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: 
+	Call it 2.16.3 to match nautilus release
+	
+	* NEWS:
+	Update for release.
+
+2006-11-07  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	post release version bump
+
+=== eel 2.16.1 ===
+
+2006-11-07  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: 
+	* NEWS:
+	Update for release.
+
+2006-10-19  Christian Neumair  <chris@gnome-de.org>
+
+	* eel/eel-preferences.c:
+	(preferences_callback_entry_compare),
+	(preferences_entry_add_callback),
+	(preferences_entry_add_auto_storage),
+	(preferences_entry_remove_callback),
+	(preferences_uninitialize),
+	(preferences_global_table_get_global),
+	(preferences_while_alive_disconnector):
+	Bail when trying to add or remove an entry twice, skip entry removal
+	on object destroy disconnection after eel shutdown.
+
+=== eel 2.16.0 ===
+
+2006-09-04  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.16.0
+
+	* NEWS:
+	Update for release
+
+2006-09-01  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.c: (eel_editable_label_enter_text):
+	Don't reset im context when commiting text.
+
+2006-08-25  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/check-program.c: (main):
+	Fix build with EEL_OMIT_SELF_CHECK.
+
+2006-08-23  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-vfs-extensions.c: (eel_vfs_has_capability):
+	Fix crash that happened on DnD from firefox in nautilus.
+
+2006-08-21  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.15.92 ===
+
+2006-08-21  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2006-08-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Fix intltool req.
+
+2006-08-08  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.15.91 ===
+
+2006-08-08  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2006-08-08  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * configure.in: Really depend on a newer libgnome-menu.
+       * eel/eel-string-list.c: (eel_self_check_string_list):
+       * test/test-eel-gtk-style.c: (style_get_color), (style_get_gc),
+       (color_box_expose_event), (gc_box_expose_event),
+       (pixmap_box_expose_event):
+       * test/test-eel-image-table.c: (image_table_child_enter_callback),
+       (image_table_child_leave_callback):
+       * test/test-eel-pixbuf-tile.c: Remove and #if 0 out some dead code.
+
+2006-08-08  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.c:
+	Fix crash in previous fix.
+	
+2006-08-08  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.c:
+	Check mtime for background uri changes. (#349962)
+	Patch from Matthias Clasen
+
+2006-07-25  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post-release version bump
+
+=== eel 2.15.90 ===
+
+2006-07-25  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2006-07-24  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-mime-application-chooser.c: (refresh_model),
+	(set_uri_and_mime_type):
+	* eel/eel-open-with-dialog.c: (set_uri_and_mime_type):
+	Fix build with gcc 2.95 (#347552)
+
+	Patch from Jens Granseuer  <jensgr@gmx.net>
+
+2006-07-11  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post-release version bump
+
+=== eel 2.15.4 ===
+
+2006-07-11  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+	* configure.in:
+	Bump version to 2.15.4
+
+2006-07-11  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-open-with-dialog.c: (compare_applications),
+	(eel_open_with_dialog_add_items_idle):
+	Handle entry name == NULL without crashing. (#339904)
+
+	Based on a patch from Miguel Quiros  <mquiros@ugr.es>
+
+2006-07-11  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-accessibility.c:
+	(eel_accessibility_set_up_label_widget_relation):
+	Set up the atk widget/label relationship correctly. (#341420)  	
+
+	Patch from Willie Walker  <william.walker@sun.com>
+
+2006-06-19  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Require new gtk+
+
+	* eel/eel-mime-application-chooser.c:
+	word+char wrap label to avoid wide dialogs on large filenames.
+	Fixes bug #344958
+
+2006-06-12  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	post release version bump
+
+=== eel 2.15.2 ===
+
+2006-06-12  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2006-05-24  Paolo Borelli  <pborelli@katamail.com>
+
+	* eel/eel-gtk-extensions.[ch]: remove eel_gtk_signal_connect_free_data
+	and eel_gtk_signal_connect_free_data_custom, since there is
+	g_signal_connect_data.
+
+2006-05-24  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/Makefile.am:
+	* eel/eel-cell-renderer-pixbuf-list.[ch]:
+	Remove
+
+2006-05-24  Paolo Borelli  <pborelli@katamail.com>
+
+	* eel/eel-vfs-extensions.[ch]: remove eel_make_uri_from_input,
+	eel_make_uri_from_input_with_trailing_ws, eel_make_uri_from_shell_arg,
+	eel_uris_match, eel_uri_get_scheme, eel_uri_make_full_from_relative.
+	They have been moved into gnome-vfs itself for a long time and they
+	are not used anymore in nautilus. (bug #342237)
+
+2006-05-16  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post-release version bump.
+
+=== eel 2.15.1 ===
+
+2006-05-16  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2006-05-07  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-glib-extensions.c:
+	* eel/eel-glib-extensions.h:
+	Remove obsolete eel_setenv and eel_unsetenv functions.
+
+	* eel/eel-gtk-extensions.c: (eel_gtk_widget_set_shown):
+	* eel/eel-gtk-extensions.h:
+	Remove unused and obsolete eel_gtk_button_* functions (#170126)
+
+2006-05-07  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-mime-extensions.c: (eel_mime_get_available_mime_types):
+	* eel/eel-mime-extensions.h:
+	Fix typo in function name: s/availible/available/ (#326053)
+
+	Patch from Josep Puigdemont <josep.puigdemont@gmail.com>
+
+2006-05-01  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-mime-application-chooser.c: (refresh_model),
+	(set_uri_and_mime_type):
+	* eel/eel-open-with-dialog.c: (set_uri_and_mime_type):
+	Don't include surrounding markup in translateable messages.
+	Fixes #150555.
+
+	Patch from Ruben Vermeersch <ruben@lambda1.be>
+
+2006-04-28  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:  
+	* po/LINGUAS:
+	Update po/LINGUAS support to new guidelines. (#338017)
+
+	Patch from Przemyslaw Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+2006-04-25  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.15.1
+	2.14 development continues on gnome-2-14 branch.
+
+2006-04-15  Martin Wehner  <martin.wehner@gmail.com>
+
+	* po/LINGUAS:
+	Remove newlines to fix build with CVS intltool. (#338423) 
+
+2006-04-11  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post-release version bump.
+
+=== eel 2.14.1 ===
+
+2006-04-11  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release
+
+2006-04-10  Martin Wehner  <martin.wehner@gmail.com>
+
+	* Makefile.am: Add intltool artefacts.
+
+	* po/LINGUAS: New file listing all supported languages.
+
+	* configure.in: Require intltool and use po/LINGUAS instead of including
+	all languages directly in this file. See the wiki for more information:
+	http://live.gnome.org/GnomeGoals/PoLinguas
+
+	Patch from Przemyslaw Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+2006-04-08  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Don't check for *env functions anymore.
+
+	* eel/eel-glib-extensions.c: (eel_setenv), (eel_unsetenv):
+	Just call g_setenv and g_unsetenv. Fixes build on Darwin (#166880).
+	
+	Patch from Tony Arnold <tonyarnold@users.sourceforge.net>
+
+2006-03-26  Sebastien Bacher  <seb128@debian.org>
+
+	* configure.in: popt is not used by eel no need to require it
+
+2006-03-22  Tommi Vainikainen  <thv@iki.fi>
+
+	* configure.in (ALL_LINGUAS): Added Dzongkha (dz).
+
+2006-03-22  Paolo Borelli  <pborelli@katamail.com>
+
+	* eel/eel-enumeration.c: remove inefficient use of glist.
+	Fixes bug #335349.
+
+2006-03-20  Christian Neumair  <chris@gnome-de.org>
+
+	* configure.in:
+	Depend on libgnome-menu 2.13.5.
+	* eel/eel-open-with-dialog.c: (get_all_applications):
+	Also request desktop items which have NoDisplay set to TRUE.
+
+2006-03-13  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.14.0 ===
+
+2006-03-13  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.14.0
+
+	* NEWS:
+	Update for release
+
+2006-03-01  Vladimer SIchinava <vlsichinava@gmail.com>
+
+        * configure.in: Added ka (Georgian) to ALL_LINGUAS
+
+2006-02-28  Bill Haneman <billh@gnome.org>
+
+	* eel/eel-labeled-image.c:
+	(eel_labeled_image_accessible_get_name): Fixed
+	segv due to use of labeled_image struct without NULL check.
+	bug #330995.
+
+2006-02-27  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.13.92 ===
+
+2006-02-27  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2006-02-19  Erdal Ronahi  <erdal.ronahi@gmail.com>
+
+	* configure.in: Added ku (Kurdish) to ALL_LINGUAS
+
+2006-02-16  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-editable-label.c:
+	Include config.h to fix i18n of the context menu.
+	Fixes bug #331377.
+	Patch from Takao Fujiwara <takao.fujiwara@sun.com>
+
+2006-02-16  Martin Wehner  <martin.wehner@gmail.com>
+
+	* test/test.c: (test_window_set_title_with_pid):
+	Add a cast to fix build on Solaris. (#117825)
+	Patch from Fredrik Jonsson <fjo@nada.kth.se>
+
+2006-02-13  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.13.91 ===
+
+2006-02-13  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release.
+
+2006-02-07  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-extensions.c (eel_mime_add_application):
+	Add %f to exec line when creating open-with desktop files.
+	Patch from Christian Persch <chpe@gnome.org>
+	Bug #169202
+
+2006-01-31  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.13.90 ===
+
+2006-01-31  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release.
+
+	* configure.in:
+	Bump version to 2.13.90
+
+2006-01-21  Luca Ferretti  <elle.uca@libero.it>
+
+	* .cvsignore:
+	Added missing files to ignore.
+	* eel/.cvsignore:
+	Ditto.
+
+2006-01-16  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.13.4 ===
+
+2006-01-16  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release.
+
+2006-01-12  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.[ch]:
+	Add EEL_BACKGROUND_ZOOM
+	
+	* eel/eel-gdk-pixbuf-extensions.[ch]:
+	Add eel_gdk_scale_to_min_factor and eel_gdk_pixbuf_scale_to_min
+ 
+	Patch by Alan Swanson (#320830)
+
+2005-12-28  Abel Cheung  <maddog@linuxhall.org>
+
+	* configure.in: Added "zh_HK" to ALL_LINGUAS.
+
+2005-12-20  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Actuallu bump version.
+
+2005-12-20  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-extensions.[ch]:
+	Add eel_mime_get_availible_mime_types
+
+2005-12-17  Dennis Cranston  <dennis_cranston@yahoo.com>
+
+	* eel/eel-alert-dialog.c:  Hide dialog from taskbar, so it
+	does not display "untitled window".
+	
+2005-12-13  Dennis Cranston  <dennis_cranston@yahoo.com>
+
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_instance_init):
+	HIG fixes.
+
+2005-12-12  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.13.3 ===
+
+2005-12-12  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2005-12-09  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-alert-dialog.[ch]:
+	* eel/eel-gconf-extensions.c:
+	* eel/eel-gnome-extensions.c:
+	* eel/eel-open-with-dialog.c:
+	* eel/eel-stock-dialogs.[ch]:
+	Remove title from alerts. (#323134)
+
+	Patch from jaap@haitsma.org
+
+2005-12-08  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-preferences-glade.[ch]:
+	Use GtkComboBox, not GtkOptionMenu
+	Patch from jaap@haitsma.org
+
+2005-11-14  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.13.2 ===
+
+2005-11-14  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	Update for release.
+	
+2005-11-14  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-alert-dialog.c:
+	Include config.h so we get translations.
+	Patch from Yang Hong <yanghong@ccoss.com.cn>
+
+2005-10-28  Simos Xenitellis  <simos@gnome.org>
+
+	* configure.in: Added ky (Kirghiz) to ALL_LINGUAS.
+
+2005-10-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* eel/eel-art-gtk-extensions.c:
+	(eel_gdk_window_clip_dirty_area_to_screen):
+	* eel/eel-background.c: (eel_background_class_init):
+	* eel/eel-canvas.c: (item_post_create_setup),
+	(eel_canvas_group_get_property), (pick_current_item):
+	* eel/eel-editable-label.c: (eel_editable_label_ensure_layout),
+	(eel_editable_label_size_allocate), (eel_editable_label_map),
+	(eel_editable_label_unmap), (window_to_layout_coords),
+	(eel_editable_label_button_release),
+	(eel_editable_label_move_line),
+	(eel_editable_label_move_backward_word):
+	* eel/eel-ellipsizing-label.c: (real_expose_event):
+	* eel/eel-gconf-extensions.c: (simple_value_is_equal):
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_average_value):
+	* eel/eel-image-table.c: (eel_image_table_realize),
+	(image_table_emit_signal):
+	* eel/eel-mime-application-chooser.c:
+	(eel_mime_application_chooser_destroy):
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_destroy):
+	* eel/eel-pango-extensions.c:
+	(eel_pango_layout_set_text_ellipsized):
+	* eel/eel-stock-dialogs.c: (timed_wait_free): Large amounts of
+	cleanups. Mostly removal of unused code and some compiler warnings.
+
+2005-10-24  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.13.1 ===
+
+2005-10-24  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2005-10-19  Christian Neumair  <chris@gnome-de.org>
+
+	* eel/eel-mime-application-chooser.c: (create_tree_view):
+	Sort applications by display name, filed as part of #310038.
+
+2005-10-03  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.13.1. Further 2.12.x work is on
+	gnome-2-12 branch.
+	
+2005-10-03  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.12.1 ===
+
+2005-10-03  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for 2.12.1.
+
+2005-10-03  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-accessibility.c:
+	(eel_accessibility_set_up_label_widget_relation):
+	Slight cleanup. Patch from Christian Neumair.
+
+2005-09-05  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.12.0 ===
+
+2005-09-05  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: Update for release.
+
+2005-08-23  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.11.92 ===
+
+2005-08-23  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release.
+
+2005-08-09  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.11.91 ===
+	
+2005-08-09  Martin Wehner  <martin.wehner@gmail.com>
+
+	* NEWS:
+	Update for release.
+
+2005-08-05  Christian Neumair  <chris@gnome-de.org>
+
+	* src/eel-wrap-table.c: Get rid of broken scrolled window viewport
+	code. Fixes #308996.
+
+2005-08-01  Christian Persch  <chpe@cvs.gnome.org>
+
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger):
+	Use g_log_set_default_handler instead of adding handlers for
+	tons of domains (#312268).
+
+2005-07-25  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.11.90 ===
+	
+2005-07-25  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Bump version to 2.11.90
+
+	* NEWS:
+	Update for release.
+
+2005-07-20  Mikael Hallendal  <micke@imendio.com>
+
+	* eel/eel-vfs-extensions.[ch] (eel_uri_is_search):
+	Add x-nautilus-search URI.
+
+2005-07-19  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-application-chooser.c: (set_uri_and_mime_type):
+	* eel/eel-open-with-dialog.c: (set_uri_and_mime_type):
+	Add comments for translators. (#150558)
+
+	Patch from Brent Smith
+
+2005-07-13  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-wrap-table.c:
+	Take border width into account when wrapping (#155642)
+	Patch from Christian Neumair.
+
+2005-07-11  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.11.4 ===
+	
+2005-07-11  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release.
+
+2005-07-06  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* eel/eel-open-with-dialog.c: (add_or_find_application):
+	Fix a small leak.
+
+2005-07-01  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.11.3 ===
+	
+2005-07-01  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release.
+
+2005-06-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* eel/eel-mime-application-chooser.c: (remove_clicked_cb): Remove
+	const qualifier now that we free the application id.
+
+2005-06-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* eel/eel-mime-application-chooser.c:
+	(eel_mime_application_chooser_finalize), (remove_clicked_cb):
+	Plug some leaks.
+	* eel/eel-open-with-dialog.c: (check_application): Here too.
+	Closes bug #307268 and bug #307280
+
+2005-06-10  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-labeled-image.c: (labeled_image_get_image_bounds_fill),
+	(eel_labeled_image_get_image_bounds),
+	(labeled_image_get_label_bounds_fill),
+	(eel_labeled_image_get_label_bounds):
+	Add default cases with asserts.
+	
+	* eel/eel-mime-extensions.c: (open_temp_cache_file):
+	Initialize filename in error case.
+
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_add_icon_idle):
+	* eel/eel-preferences.c: (preferences_entry_remove_auto_storage):
+	Use NULL instead of 0.
+
+	* configure.in:
+	Add --Wno-pointer-sign
+
+	Fix gcc4 compilation (#300646). Based on patches from
+	Kjartan Maraas <kmaraas@gnome.org> and
+	James M. Cape <jcape@ignore-your.tv>
+
+2005-06-08  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Post release version bump.
+
+=== eel 2.11.2 ===
+	
+2005-06-08  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-open-with-dialog.c:
+	Fix const warning.
+
+	* NEWS:
+	Update for release.
+
+2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* eel/eel-open-with-dialog.c: (program_list_selection_changed):
+	Plug a couple of leaks. Closes bug #306767.
+
+2005-05-22  Sebastien Bacher  <seb128@debian.org>
+
+	* configure.in: 
+	Update of glib and gtk requirements to 2.6.0 (Closes: #304875).
+
+2005-05-17  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.11.1 ===
+	
+2005-05-17  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for 2.11.1 release
+
+2005-04-12  Alexander Larsson  <alexl@redhat.com>
+
+	* eel-2.0.pc.in: 
+	* eel-2.0-uninstalled.pc.in: 
+	Use gmodule-no-export-2.0 instead of gmodule-2.0 to avoid using --export-dynamic.
+
+2005-04-11  Mark McLoughlin  <mark@skynet.ie>
+
+	* eel/Makefile.am, eel/eel-open-with-dialog.c: update
+	for libgnome-menu API renaming.
+
+2005-04-11  Abduxukur Abdurixit <abduxukur.abdurixit@t-systems.ch>
+
+	* configure.in: Added 'ug' to ALL_LINGUAS.
+
+2005-04-08  Sebastien Bacher  <seb128@debian.org>
+
+	* configure.in: 
+	Update gnomevfs requirement to 2.9.1.
+
+2005-04-06  Mark McLoughlin  <mark@skynet.ie>
+
+	* eel/eel-open-with-dialog.c: (get_all_applications):
+	Update for slight change in menu_tree_lookup() API.
+
+2005-03-31  Steve Murphy  <murf@e-tools.com>
+
+        * configure.in: Added "rw" to ALL_LINGUAS.
+
+2005-03-28  Martin Wehner  <martin.wehner@gmail.com>
+
+	* eel/eel-accessibility.c: (get_simple_text):
+	Return NULL if the gobject is no longer valid.
+	Fixes bug #168161.
+	
+	Patch from Muktha <muktha.narayan@wipro.com>
+
+2005-03-27  Martin Wehner  <martin.wehner@gmail.com>
+
+	* configure.in:
+	Require libgnome-menu 2.11.1 for the new API.     
+
+	* eel/eel-open-with-dialog.c: (get_all_applications_from_dir),
+	(get_all_applications), (eel_open_with_dialog_add_items_idle):
+	Update to the new libgnome-menu API.
+
+	Patch from Christian Neumair <chris@gnome-de.org>
+
+2005-03-24  Adi Attar  <aattar@cvs.gnome.org>
+
+	* configure.in: Added 'xh' to ALL_LINGUAS.
+
+2005-03-22  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.11.1
+	Gnome 2.10 versions are now on the gnome-2-10 branch.
+
+2005-03-16  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.[ch]:
+	Move desktop background setting here to be able to share
+	pixmap with root window. (#169347)
+	
+	Patch from Nickolay V. Shmyrev 
+
+2005-03-07  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-extensions.c: (eel_mime_add_application):
+	Make sure user added desktop files don't conflict with global ones.
+	Patch from Christian Persch
+
+2005-03-07  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.10.0 ===
+	
+2005-03-07  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Update for 2.10 release
+
+2005-03-01  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Post release version bump
+
+=== eel 2.9.92 ===
+	
+2005-03-01  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2005-03-01  James Henstridge  <james@jamesh.id.au>
+
+	Fixes bug #164796 (approved by Alex)
+
+	* autogen.sh: request Automake >= 1.7.
+
+	* eel/eel-gdk-extensions.h (EEL_RGBA_COLOR_PACK): add casts to
+	guint32.  Fixes test failures on 64-bit systems.
+
+2005-02-24  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-vfs-extensions.c (eel_read_entire_file):
+	Just use gnome_vfs_read_entire_file().
+	We should remove this function eventually.
+
+2005-02-11  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-application-chooser.c (refresh_model):
+	Handle the case with no existing applications better.
+
+2005-02-10  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Post release version bump.
+
+=== eel 2.9.91 ===
+	
+2005-02-10  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release.
+
+2005-01-26  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-open-with-dialog.c (eel_open_with_dialog_finalize):
+	Remove idle handlers when closing window. (#165208)
+
+2005-01-25  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.9.90 ===
+	
+2005-01-25  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+	* configure.in:
+	Bump version to 2.9.90
+
+2005-01-25  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-open-with-dialog.c (eel_open_with_dialog_add_icon_idle):
+	Don't crash if no icon .
+
+2005-01-24  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* eel/eel-accessibility.c: (eel_accessible_text_get_type):
+	* eel/eel-editable-label.c:
+	(eel_editable_label_accessible_get_selection):
+	* eel/eel-gdk-extensions.c: (eel_stipple_bitmap):
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_tree_view_set_activate_on_single_click):
+	* eel/eel-preferences.c: (preferences_get_value),
+	(eel_preferences_get), (eel_preferences_get_string_list):
+	* eel/eel-stock-dialogs.c: (eel_show_yes_no_dialog):
+	* eel/eel-string-list.c: (eel_string_list_find_by_function):
+	* eel/eel-wrap-table.c: Fix a bunch of warnings from sparse.
+
+2005-01-24  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_instance_init):
+	Mark string for translation.
+	Patch from Yang Hong <yanghong@ccoss.com.cn>
+
+2005-01-23  Martin Wehner  <martin.wehner@epost.de>
+
+	* eel/eel-mime-application-chooser.c: (create_tree_view),
+	(refresh_model): Show application icon in the selector.
+
+	Patch from Fernando Herrera  <fernando.herrera@tecsidel.es>
+
+2005-01-21  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	* eel/Makefile.am:
+	require libgnome-desktop and libgnome-menu
+	
+	* eel/eel-mime-extensions.[ch]:
+	(eel_mime_add_custom_mime_type_for_desktop_file),
+	(eel_mime_check_for_desktop_duplicates):
+	New function to check for duplicate desktop files handling a mimetype
+	and to add custom mime types for desktop files.
+	
+	* eel/eel-open-with-dialog.c:
+	Show know applications from .desktop files and move
+	the entry to an expander to specify a custom app/command line.
+
+	Patch from Fernando Herrera <fernando.herrera@tecsidel.es>
+	 
+2005-01-13  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-alert-dialog.c (eel_alert_dialog_set_primary_label):
+	Escape the text put in the markup string.
+
+2005-01-11  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.9.2 ===
+	
+2005-01-11  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release.
+
+2004-11-25  Marco Pesenti Gritti  <marco@gnome.org>
+
+	reviewed by: Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-application-chooser.c: (refresh_model):
+	* eel/eel-mime-extensions.c: (eel_mime_add_application),
+	(eel_mime_check_for_duplicates):
+
+	Replcae usage of deprecate mime apis
+
+2004-11-24  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release bump
+
+=== eel 2.9.1 ===
+	
+2004-11-24  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2004-11-19  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eelmarshal.list:
+	Add some new needed marshallers.
+
+2004-10-29  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Update version to 2.9.1.
+	Gnome 2.8 versions are now on the gnome-2-8 branch.
+	
+==== gnome-2-8 branched from here ===	
+
+2004-10-28  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release bump
+
+=== eel 2.8.2 ===
+	
+2004-10-28  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for release
+
+2004-10-28  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-glib-extensions.[ch]:
+	New function, eel_get_filename_charset.
+	
+	* eel/eel-vfs-extensions.c:
+	Use eel_get_filename_charset to handle filename charset.
+	
+2004-10-21  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas.c: (eel_canvas_group_draw), (eel_canvas_expose):
+	Update to latest foocanvas, fix expose returning TRUE.
+
+2004-10-15  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-extensions.c: (eel_mime_add_application),
+	(eel_mime_check_for_duplicates):
+	Handle null mimetypes (required for property page if
+	file has no extension).
+
+2004-10-11  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.8.1 ===
+	
+2004-10-11  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for 2.8.1
+
+2004-09-28  Gora Mohanty  <gmohanty@cvs.gnome.org>
+                                                                                
+        * configure.in: Added 'or' to ALL_LINGUAS.
+    
+2004-09-13  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump.
+
+=== eel 2.8.0 ===
+	
+2004-09-13  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in: 
+	Update for 2.8.0
+
+2004-09-11  Abel Cheung  <maddog@linuxhall.org>
+
+	* configure.in: Added "ang" to ALL_LINGUAS.
+
+2004-09-06  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-extensions.c: (eel_mime_set_default_application):
+	Create ~/.local/share/applications as needed.
+
+2004-08-31  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-application-chooser.c:
+	(mime_monitor_data_changed_cb):
+	Refresh model when mime db changes
+		
+	* eel/eel-mime-extensions.c: (mime_update_program_done):
+	Remove spew
+
+2004-08-30  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.7.92 ===
+
+2004-08-30  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	Update for 2.7.92
+	
+	* configure.in:
+	Require new libgnomeui
+
+2004-08-25  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-stock-dialogs.c (timed_wait_callback):
+	Don't pop up cancel dialog if password dialog is visible.
+
+2004-08-16  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Added nb to ALL_LINGUAS.
+
+2004-08-16  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release bump to 2.7.92
+
+=== eel 2.7.4 ===
+
+2004-08-16  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for 2.7.4
+
+	* eel/eel-canvas.c:
+	Update from foocanvas.
+
+	* configure.in:
+	Require new gnome-vfs (for default application file
+	type change).
+
+2004-08-12  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas-rect-ellipse.c:
+	* eel/eel-canvas.c: (eel_canvas_key):
+	Update to latest foocanvas.
+
+2004-08-12  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-mime-extensions.c (eel_mime_set_default_application):
+	Use new name for default.list toplevel section.
+
+2004-08-09  Ray Strode  <rstrode@redhat.com>
+
+	* eel/eel-mime-extensions.c (eel_mime_add_application),
+	(eel_mime_set_default_application): free strings
+	when done with them (Spotted by Kjartan Maraas, bug 149718).
+
+2004-07-23  Christian Neumair  <chris@gnome-de.org>
+
+	* eel/eel-mime-application-chooser.c:
+	* eel/eel-open-with-dialog.c: Include gi18n-lib.h instead of gi18n.h.
+
+2004-07-23  Christian Neumair  <chris@gnome-de.org>
+	
+	* configure.in: Require GNOME-VFS 2.7.5 (HEAD).
+
+2004-07-23  Tomasz Kłoczko <kloczek@pld.org.pl>
+
+	* configure.in: better looking PKG_CHECK_MODULES() output.
+
+2004-07-22  Dave Camp  <dave@novell.com>
+
+	* configure.in: Post-release version bump
+
+=== eel 2.7.3 ===
+
+2004-07-22  Dave Camp  <dave@novell.com>
+
+	* configure.in: 
+	* NEWS: 2.7.3
+
+2004-07-21  Dave Camp  <dave@novell.com>
+
+	* Merged the eel-new-mime branch.
+
+2004-07-21  Dave Camp  <dave@novell.com>
+
+	* configure.in:
+	* eel/Makefile.am:
+	* eel/eel-mime-extensions.c: (write_desktop_file),
+	(mime_update_program_done), (eel_mime_add_glob_type),
+	(open_temp_cache_file), (line_is_for_mime_type),
+	(eel_mime_set_default_application),
+	(eel_mime_application_is_user_owned),
+	(eel_mime_application_remove):
+	* eel/eel-mime-extensions.h:
+	* eel/eel-mime-application-chooser.c:
+	* eel/eel-mime-application-chooser.h:
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_instance_init),
+	(eel_open_with_dialog_new), (eel_add_application_dialog_new):
+	* eel/eel-open-with-dialog.h: Add the eel-mime-application-chooser
+	dialog.
+
+Wed Jul 21 18:30:25 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* eel/eel-mime-extensions.c: (arg_is_exec_param),
+	(eel_mime_check_for_duplicates): Make fit eel coding guidelines.
+
+	* eel/eel-open-with-dialog.c (get_run_dialog_image): Get the image
+	from stock.
+	(eel_open_with_dialog_instance_init): Use the panel gnome-run
+	stock image.
+
+Wed Jul 21 02:54:32 2004  Jonathan Blandford  <jrb@gnome.org>
+
+	* eel/eel-mime-extensions.h: New public function:
+	eel_mime_check_for_duplicates()
+
+	* eel/eel-mime-extensions.c: (mime_update_program_done),
+	(run_update_command), (eel_mime_add_application),
+	(eel_mime_add_glob_type), (arg_is_exec_param),
+	(eel_mime_check_for_duplicates): New function that will check a
+	command line to see if another application with that name already
+	exists.  Also, the post-mime-update stuff has been modified
+	slightly.
+	
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_finalize),
+	(eel_open_with_dialog_destroy), (check_application),
+	(get_app_name), (add_or_find_application), (response_cb),
+	(eel_open_with_dialog_class_init), (chooser_response_cb),
+	(browse_clicked_cb), (entry_changed_cb),
+	(eel_open_with_dialog_instance_init), (get_extension),
+	(set_uri_and_mime_type), (eel_open_with_dialog_get_type): Some
+	whitespace 'cleanups'.  Dialog packing cleanup and behavior
+	changes.  Better error handling is included as well.
+
+Mon Jul 19 22:10:59 2004  Jonathan Blandford  <jrb@gnome.org>
+
+	* eel/eel-open-with-dialog.c (eel_open_with_dialog_new): make
+	function have no return value.
+
+2004-07-19  Dave Camp  <dave@novell.com>
+
+	* eel/Makefile.am:
+	* eel/eel-mime-extensions.c: (recursive_mkdir), (get_user_dir),
+	(ensure_mime_dir), (ensure_application_dir), (write_desktop_file),
+	(update_application_database), (eel_mime_add_application),
+	(get_override_filename), (get_override), (write_override),
+	(create_type_node), (get_type_node), (get_comment_node),
+	(add_glob_node), (update_mime_database), (eel_mime_add_glob_type):
+	* eel/eel-mime-extensions.h:
+	* eel/eel-open-with-dialog.c: (eel_open_with_dialog_finalize),
+	(eel_open_with_dialog_destroy), (check_application),
+	(get_app_name), (add_application), (emit_application_selected),
+	(response_cb), (entry_activate_cb),
+	(eel_open_with_dialog_class_init), (chooser_response_cb),
+	(browse_clicked_cb), (eel_open_with_dialog_instance_init),
+	(get_extension), (set_uri_and_mime_type),
+	(eel_open_with_dialog_new), (eel_open_with_dialog_get_type):
+	* eel/eel-open-with-dialog.h:
+	* eel/eel-preferences.c: (eel_preferences_remove_callback):
+	Add an Open With dialog that adds mime types and application 
+	mappings.
+
+2004-07-05  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update for 2.7.2
+
+2004-06-01  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release bump
+
+=== eel 2.7.1 ===
+	
+	* NEWS:
+	Update for 2.7.1
+
+2004-05-14  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in (LIBGLADE_REQUIRED):
+	Bump to 2.7.1 on HEAD, 2.6.3 is on gnome-2-6 branch
+
+2004-05-13  Dave Camp  <dave@novell.com>
+
+	* configure.in: Post-release version bump.
+
+=== eel 2.6.2 ===
+
+2004-05-13  Dave Camp  <dave@novell.com>
+
+	* NEWS: Updated for 2.6.2.
+
+2004-04-19  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Post release version bump
+
+=== eel 2.6.1 ===
+
+2004-04-19  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Updates for 2.6.1
+
+2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.
+
+2004-03-22  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.6.1
+
+=== eel 2.6.0 ===
+
+2004-03-22  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Update to 2.6.0
+
+2004-03-20  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * configure.in: Added "pa" (Punjabi) to ALL_LINGUAS.
+
+=== eel 2.5.91.1 ===
+
+2004-03-16  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Update to 2.5.91.1
+
+	* eel/eel-editable-label.c (eel_editable_label_retrieve_surrounding_cb):
+	Use correct index in gtk_im_context_set_surrounding. (#133464)
+	Patch from Theppitak Karoonboonyanan 
+
+=== eel 2.5.91 ===
+
+2004-03-15  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Update to 2.5.91
+
+=== eel 2.5.90 ===
+
+2004-03-08  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Update to 2.5.90
+
+2004-03-02  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-gnome-extensions.c (eel_gnome_shell_execute_on_screen):
+	* eel/Makefile.am:
+	* eel/egg-screen-exec.[c]:
+	Remove egg-screen-exec. Use gdk_spawn instead.
+
+2004-03-02  Carlos Garnacho Parro  <garnacho@tuxerver.net>
+
+	* eel/eel-gnome-extensions.c: (eel_gnome_icon_selector_new)
+	made it to use the new GtkFileChooser
+
+2004-03-02  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas.h:
+	* eel/eel-cell-renderer-pixbuf-list.c:
+	* eel/eel-editable-label.c: (eel_editable_label_key_press),
+	(popup_position_func):
+	* eel/eel-gdk-extensions.h:
+	* eel/eel-glib-extensions.c: (eel_unsetenv):
+	* eel/eel-labeled-image.c:
+	* eel/eel-wrap-table.c:
+	* eel/eel-wrap-table.h:
+	* test/test-eel-image-table.c: (image_table_child_enter_callback),
+	(image_table_child_leave_callback), (image_table_size_allocate):
+	* test/test.c: (test_quit):
+	* test/test.h:
+	Portability fixes. Patch from bugzilla-gnome@thewrittenword.com.
+	Fixes #131647.
+
+2004-03-01  Alexander Larsson  <alexl@redhat.com>
+
+	Patches from sun.
+	
+	* test/test-eel-image-table.c: (labeled_image_new):
+	Fix forte compiler issue
+	
+	* Makefile.am:
+	* configure.in:
+	* eel-2.0-uninstalled.pc.in:
+	Add uninstalled pkg-config file.
+		
+=== eel 2.5.8 ===
+
+2004-02-23  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.5.8
+
+2004-02-21  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "en_CA" to ALL_LINGUAS.
+
+=== eel 2.5.7 ===
+
+2004-02-11  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.5.7
+
+2004-02-06  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-glib-extensions.c (eel_strdup_strftime):
+	Fix check
+
+2004-02-06  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: 
+	* eel/eel-glib-extensions.c (eel_strdup_strftime):
+	Check for and support SUS modifiers.
+
+2004-02-05  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* eel/eel-alert-dialog.c (eel_alert_dialog_new): Set role of AtkObject
+	to ATK_ROLE_ALERT. Fixes bug #133273.
+
+2004-02-05  Tomasz Kӯczko <kloczek@pld.org.pl>
+
+	* eel/Makefile.am:
+	* test/Makefile.am: trivaial fix errors for automake 1.8.x - blank
+	  line following trailing backslash. Fixes are backward compatible with
+	  older automake.
+
+=== eel 2.5.6===
+
+2004-01-30  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.5.6
+
+2004-01-27  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas-util.c: (eel_canvas_get_miter_points):
+	* eel/eel-canvas.c: (emit_event):
+	Update from foocanvas. May fix nautilus event crash.
+
+2004-01-19  Narayana Pattipati <narayana.pattipati@wipro.com>
+
+	* eel/eel-editable-label.c (eel_editable_label_style_set), 
+	(eel_editable_label_expose): Change the background, foreground,
+	cursor and outer rectangle colors according to the theme
+	selected. Fixes bugzilla bug#123207
+
+=== eel 2.5.5 ===
+
+2004-01-12  Dave Camp  <dave@ximian.com>
+
+	* NEWS: 
+	* configure.in: 2.5.5
+
+2004-01-11  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-glib-extensions.h:
+	* eel/eel-glib-extensions.c: (eel_g_str_list_index): New function.
+	* eel/eel-gconf-extensions.h:
+	* eel/eel-gconf-extensions.c: (eel_gconf_unset): New function.
+	* eel/eel-preferences.h:
+	* eel/eel-preferences.c:  (eel_preferences_unset): New functions.
+	(eel_preferences_get_string_glist),
+	(eel_preferences_set_string_glist)
+	(update_auto_string_glist),
+	(preferences_entry_update_auto_storage),
+	(eel_preferences_add_auto_string_glist): Added a GList * 
+	interface to string list properties.
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_as_g_slist): 
+	Implemented differently.
+	(eel_string_list_as_g_list): New function.
+
+2004-01-03  Anders Carlsson  <andersca@gnome.org>
+
+	* eel/eel-input-event-box.c:
+	* eel/eel-input-event-box.h:
+	Remove these too.
+	
+2004-01-03  Anders Carlsson  <andersca@gnome.org>
+
+	* test/Makefile.am: Remove test-eel-image-chooser.c
+
+	* eel/eel.h: Remove references to removed headers.
+
+	* eel/Makefile.am:
+	* eel/eel-caption.c:
+	* eel/eel-caption.h:
+	* eel/eel-generous-bin.c:
+	* eel/eel-generous-bin.h:
+	* eel/eel-image-chooser.c:
+	* eel/eel-image-chooser.h:
+	* eel/eel-radio-button-group.c:
+	* eel/eel-radio-button-group.h:
+	* eel/eel-string-picker.c:
+	* eel/eel-string-picker.h:
+	* test/Makefile.am:
+	Remove unused eel stuff.
+	
+2004-01-02  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+        * configure.in: Added "hr" in ALL_LINGUAS.
+
+=== eel 2.5.4 ===
+	
+2003-12-29  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	2.5.4
+
+2003-12-11  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-stock-dialogs.c (show_message_dialog):
+	Connect to response in the right place
+	
+2003-12-11  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Require gtk+ 2.3.0
+	
+	* eel/Makefile.am:
+	* eel/eel-alert-dialog.[ch]:
+	New hig suporting dialog 
+
+	* eel/eel-stock-dialogs.[ch]:
+	Use new dialog, split up message
+	in primary and secondary string.
+	
+	* eel/eel-gconf-extensions.c:
+	* eel/eel-gnome-extensions.c:
+	* test/test-eel-widgets.c:
+	Use new API
+
+	Patch from dennis_cranston@yahoo.com (with some changes)
+	
+=== eel 2.5.3 ===
+	
+2003-12-08  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	2.5.3
+
+2003-11-25  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	eel/eel-accessibility.c 
+	(eel_accessibility_set_up_label_widget_relation): Call g_object_unref
+	on AtkRelationSet to avoid memory leak. Fixes bug #127899.
+
+=== eel 2.5.2 ===
+	
+2003-11-24  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.5.2
+
+2003-11-21  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.c:
+	Accessibility support, and better support
+	for GtkEditable signals.
+	Patch by padraig o'briain <Padraig.Obriain@Sun.COM>
+
+=== eel 2.5.1 ===
+	
+2003-11-10  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	2.5.1
+
+2003-10-27  Gregory Merchan  <merchan@phys.lsu.edu>
+
+	* eel/eel-gdk-extensions.c (eel_gdk_window_focus):
+	Use RevertToParent as specified in the ICCCM.
+	(eel_gdk_window_set_wm_hints_input):
+	Guard against changes to C booleans.
+	* eel/eel-gnome-extensions.c (eel_gnome_icon_selector_new)
+	* eel/eel-stock-dialogs.c (timed_wait_callback)
+	* eel/eel-stock-dialogs.c (eel_run_simple_dialog)
+	* eel/eel-stock-dialogs.c (create_message_dialog)
+	Don't set WM_CLASS. It should match the application.
+	* eel/eel-gtk-extensions.c:
+	Remove comment and unused #define from bad old algorithm.
+	(eel_gtk_window_event_is_close_accelerator):
+	Remove Escape from close accelerators; it's not HIG compliant.
+	This reverts change from 2001-04-30.
+
+2003-10-22  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/Makefile.am: 
+	* test/Makefile.am:
+	Disable GNOME_DISABLE_DEPRECATED for now
+
+2003-10-21  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-preferences.c:
+	Fix leaks.
+	Patch from Martin Wehner <martin.wehner@epost.de>
+
+=== eel 2.5.0 ===
+	
+2003-10-20  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.5.0
+
+2003-10-15  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/Makefile.am: 
+	* test/Makefile.am:
+	Disable GTK_DISABLE_DEPRECATED for now, since gtk 2.4
+	deprecated various widgets.
+
+2003-10-06  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mr" to ALL_LINGUAS.
+
+2003-10-02  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	Merge from foo-canvas.c:
+
+        * eel/eeel-canvas.c 
+	(eel_canvas_item_accessible_ref_state_set):
+        Do not refer to item->canvas if item can be NULL. (bug #123179)
+
+        (eel_canvas_set_pixels_per_unit) : round
+          when mapping back to integer coordinates to guard against inadverent
+          decrement due to lack of precision.
+          eg zoom of 0.85 == 0.849999999 would lose a pixel
+	Fix from Jody Goldberg <jody@gnome.org>
+
+       (do_update):
+        Loop do_update if picking caused need_update to be set again.
+        (Thanks to George <jirka@5z.com> for noticing this)
+	Fix from  Alexander Larsson  <alexl@redhat.com>
+
+2003-09-24  Dave Camp  <dave@ximian.com>
+
+	* eel/eelmarshal.list: Added VOID:STRING,LONG,LONG,POINTER.
+
+2003-09-19  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "br" to ALL_LINGUAS.
+
+=== eel 2.4.0 ===
+	
+2003-09-08  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	2.4.0
+
+2003-09-04  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-gdk-extensions.c (eel_gdk_window_focus):
+	Don't use RevertToNone
+
+=== eel 2.3.90 ===
+	
+2003-09-02  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in: 2.3.90
+
+2003-08-28  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "ne" to ALL_LINGUAS.
+
+=== eel 2.3.9 ===
+	
+2003-08-25  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	2.3.9
+
+=== eel 2.3.8 ===
+	
+2003-08-08  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:  2.3.8
+
+Tue Jul 22 16:18:26 2003  George Lebl <jirka@5z.com>
+
+	* eel/eel-gconf-extensions.[ch]: add eel_gconf_key_is_writable,
+	  which calls gconf_client_key_is_writable 
+
+	* eel/eel-preferences.[ch]: add eel_preferences_key_is_writable,
+	  which in turn calls eel_gconf_key_is_writable on the full key
+
+	* eel/eel-preferences-glade.c: When the key is not writable on
+	  setup, then make the widget insensitive and then monitor the
+	  state to make sure it can't be ever made sensitive (since it can't
+	  be ever written)
+
+2003-07-21  Dave Camp  <dave@ximian.com>
+
+	* NEWS:
+	* configure.in:
+	Bumped to 2.3.7.
+
+2003-07-08  Balamurali Viswanathan <balamurali.viswanathan@wipro.com>
+
+	* configure.in: Checking for X Development libraries explicitly.
+	* eel/Makefile.am: Added X_LIBS to libeel_2_la_LDFLAGS
+
+2003-07-07  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas-rect-ellipse.c (render_rect_alpha):
+	Update from foocanvas, fixes #116752
+
+=== eel 2.3.6 ===
+	
+2003-06-27  Dave Camp  <dave@ximian.com>
+
+	* NEWS:
+	* configure.in:
+	Bump version to 2.3.6.
+
+=== eel 2.3.5 ===
+	
+2003-06-23  Dave Camp  <dave@ximian.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump version to 2.3.5.
+
+2003-06-15  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* configure.in:
+	Remove -Wsign-promo and add -Wno-strict-aliasing to the list
+        of options to test for. Fixes the gcc 3.3 aliasing warnings.
+
+2003-06-13  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas-rect-ellipse.c: (get_color_value),
+	(set_colors_and_stipples), (eel_canvas_re_update_shared),
+	(eel_canvas_re_realize), (eel_canvas_ellipse_update):
+	* eel/eel-canvas.c: (eel_canvas_item_dispose),
+	(eel_canvas_item_unrealize), (eel_canvas_item_invoke_update),
+	(eel_canvas_item_ungrab), (eel_canvas_item_request_update),
+	(eel_canvas_group_unrealize), (eel_canvas_group_map),
+	(eel_canvas_init), (shutdown_transients), (eel_canvas_expose),
+	(do_update):
+	* eel/eel-canvas.h:
+	Update to latest foo-canvas.
+
+=== eel 2.3.4 ===
+	
+2003-06-10  Dave Camp  <dave@ximian.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump version to 2.3.4.
+
+2003-06-05 Kenneth Rohde Christiansen <kenneth@gnu.org>
+
+	* configure.in: Added li to ALL_LINGUAS.
+
+2003-06-04  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump version to 2.3.3.
+
+2003-05-26  Anders Carlsson  <andersca@codefactory.se>
+
+	* eel/Makefile.am:
+	* eel/eel-caption-table.c:
+	* eel/eel-caption-table.h:
+	* eel/eel-password-dialog.c:
+	* eel/eel-password-dialog.h:
+	* eel/eel.h:
+	* test/Makefile.am:
+	* test/test-eel-password-dialog.c:
+	* test/test-eel-widgets.c: (main), (test_radio_changed_callback):
+	Remove EelCaptionTable and EelPasswordDialog since they're not 
+	used anymore.
+	
+=== eel 2.3.2 ===
+
+2003-05-19  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.3.2.
+
+2003-05-15  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-vfs-extensions.[ch]:
+	New define EEL_DESKTOP_URI and function eel_uri_is_desktop.
+
+=== eel 2.3.1 ===
+
+2003-05-05  Telsa Gwynne  <hobbit@aloss.ukuu.org.uk>
+
+       * configure.in: Added cy to ALL_LINGUAS
+       * po/cy.po: Added
+	
+2003-05-05  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Update
+
+	* configure.in:
+	Bump version
+
+2003-05-04  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added sr and sr@Latn to ALL_LINGUAS.
+
+2003-04-23  Masahiro Sakai  <sakai@tom.sfc.keio.ac.jp>
+
+	* configure.in: call AC_LIBTOOL_WIN32_DLL.
+	* eel/Makefile.am (libeel_2_la_LDFLAGS): add -no-undefined.
+
+	These are necessary for building DLL on win32 platform.
+
+2003-04-07  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas.c:
+	Update foocanvas.
+
+=== eel 2.2.3 ===
+	
+2003-03-31  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.2.3
+
+2003-03-27  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-vfs-extensions.[ch] (eel_filename_get_rename_region):
+	New function to get the rename region for a filename.
+
+2003-03-19  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-accessibility.c (eel_accessibility_set_atk_object_return):
+	Fix warning.
+
+2003-03-19  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* eel/eel-accessibility.c
+	(eel_accessibility_destroy): Change function name from
+	eel_accessibility_weak_unref. Remove call to g_object_unref().
+	(eel_accessibility_set_atk_object_return): Use call to
+	call to g_object_qdata_full() instead of g_object_weak_ref().
+
+	This fixes bug #107725.
+
+2003-03-18  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas.c (eel_canvas_set_pixels_per_unit):
+	Update from foocanvas. Now less tearing when changing
+	zoom level.
+
+2003-03-17  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-preferences-glade.[ch]: 
+
+	Add eel_preferences_glade_connect_string_enum_option_menu_slave
+	and eel_preferences_glade_connect_bool_slave.
+	
+2003-03-17  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.c (eel_editable_label_expose):
+	Draw frame even if text is "".
+
+2003-03-13  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "ml" to ALL_LINGUAS.
+
+2003-03-12  Balamurali Viswanathan <balamurali.viswanathan@wipro.com>
+
+	*eel/eel-stock-dialogs.c
+	 connect the "response" signal of the trash dialog
+
+=== eel 2.2.2 ===
+	
+2003-03-10  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump version to 2.2.2.
+
+2003-03-04  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/Makefile.am: 
+	* eel/eel-input-event-box.[ch]:
+	New widget. Basically GtkEventBox with a INPUT_ONLY window.
+
+2003-03-04  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas.c:
+	Update foocanvas. Fix a11y crash.
+
+2003-03-04  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-accessibility.[ch]:
+	Publicaly export some utility functions.
+	Patch from padraig.obriain@sun.com
+
+2003-03-04  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas.c:
+	Update foocanvas. Gets a11y support from padraig.
+
+2003-03-03  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-canvas.c:
+	Update from foo-canvas. Fixes group movement,
+	removes silly warning.
+
+2003-02-28  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.[ch]:
+	Add eel_editable_label_get_font_description and
+	eel_editable_label_set_font_description.
+
+2003-02-27  Taneem Ahmed  <taneem@eyetap.org>
+
+	* configur.in: Added "bn" to ALL_LINGUAS
+
+2003-02-25  Samúel Jón Gunnarsson <sammi@techattack.nu>
+
+	* configur.in: Added is to ALL_LINGUAS
+
+2003-02-21  Paisa Seeluangsawat  <paisa@colorado.edu>
+
+	* configure.in (ALL_LINGUAS): Added "th".
+
+2003-02-18  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "ga" to ALL_LINGUAS.
+
+2003-02-14  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-glib-extensions.c (eel_unsetenv):
+	Fix bug. Patch from hidetoshi.tajima@sun.com.
+
+=== eel 2.2.1 ===
+	
+2003-02-11  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump version to 2.2.1
+
+2003-02-09  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "kn" to ALL_LINGUAS.
+
+2003-02-07  Abel Cheung  <maddog@linux.org.hk>
+
+	* configure.in: Removed "ga" from ALL_LINGUAS. Empty translation file.
+
+2003-02-06  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "id" to ALL_LINGUAS.
+
+2003-02-05  James M. Cape  <jcape@ignore-your.tv>
+
+	* eel/eel-background.c,
+	eel/eel-canvas-rect-ellipse.c,
+	eel/eel-canvas.c,
+	eel/eel-cell-renderer-pixbuf-list.c,
+	eel/eel-editable-label.c,
+	eel/eel-gdk-pixbuf-extensions.c,
+	eel/eel-gnome-extensions.c,
+	eel/eel-stock-dialogs.c,
+	test/test-eel-image-table.c:
+	Replace gtk+ functions deprecated in 2.3.
+
+=== eel 2.2.0.2 ===
+
+2003-01-27  Dave Camp  <dave@ximian.com>
+
+	* NEWS: 
+	* configure.in: 2.2.0.2
+
+=== eel 2.2.0.1 ===
+
+2003-01-22  Dave Camp  <dave@ximian.com>
+
+	* NEWS:
+	* configure.in: 2.2.0.1
+
+2003-01-21  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+=== eel 2.2.0 ===
+
+2003-01-20  Dave Camp  <dave@ximian.com>
+
+	* NEWS:
+	* configure.in: 2.2.0.
+
+2003-01-17  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-preferences-glade.c:
+	Correct previous fix.
+	
+2003-01-17  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-preferences-glade.c:
+	Fix a bug in the handling of the hashtable for int enums.
+
+=== eel 2.1.91 ===
+
+2003-01-13  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.1.91.
+
+2003-01-13  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.c:
+	Hack in eel_background_set_up_widget to always get the right size
+	for desktop window pixmaps. This is needed since bonoboplug children
+	gets realized at the wrong size first and then the correct size.
+	This hack allows us to not load the background image twice and to
+	not flicker.
+	Don't draw the background for canvases. This is not needed since
+	we set up the correct window background.
+
+2003-01-12  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Amharic (am) and Farsi (fa) to ALL_LINGUAS
+
+=== eel 2.1.6 ===
+
+2003-01-06  Dave Camp  <dave@ximian.com>
+
+	* NEWS:
+	* configure.in: 2.1.6.
+
+2002-12-17  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	* eel/Makefile.am:
+	* test/Makefile.am:
+	-pthread build fixes
+
+=== eel 2.1.5 ===
+	
+2002-12-16  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump to 2.1.5
+
+2002-12-13  Alex Duggan   <aldug@gnome.org>
+ 	
+   * configure.in:
+   * eel-2.0.pc.in:
+   * eel.spec.in:
+   remove libgnomecanvas deps
+   
+=== eel 2.1.4 ===
+	
+2002-12-09  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: 
+	* NEWS:
+	Bump to 2.1.4
+
+2002-12-05  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-gnome-extensions.c: (list_icon_selected_callback): Free
+	the return value of gnome_icon_selection_get_icon().  Patch from
+	Jörgen Viksell <jorgen.viksell@telia.com>
+
+Wed Dec  4 12:50:35 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* eel/eel-editable-label.c (eel_editable_label_ensure_layout):
+	Fix bugzilla.gnome.org #95429 - set input method text to pango layout.
+
+=== eel 2.1.3 ===
+	
+2002-11-25  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-vfs-extensions.c:
+	Fix checks so we distcheck.
+	
+2002-11-25  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: 
+	* NEWS:
+	Bump to 2.1.3.
+
+2002-11-21  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.[ch]:
+	(eel_background_set_up_widget):
+	Set the background pixmap/color on the right window for canvas widgets.
+	(eel_background_get_suggested_pixmap_size):
+	New function.
+
+	Based on patch from Brian.Cameron@sun.com
+	
+2002-11-19  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.[ch]:
+	Don't use private gtk functions.
+
+2002-11-05  Dave Camp  <dave@ximian.com>
+
+	* test/Makefile.am:
+	* test/test-eel-widgets.c: (main),
+	(string_picker_changed_callback):
+	* test/test.c:
+	* test/test.h: Took out the tests of removed code. 
+
+2002-11-05  Diego Gonzalez  <diego@pemas.net>
+
+	* po/POTFILES.in: remove eel/eel-preferencs-box.c
+	* eel/Makefile.am: remove eel-font-picker.[c-h],
+	eel-preferences-box.[c-h], eel-preferences-group.[c-h],
+	eel-preferences-item.[c-h], eel-preferences-pane.[c-h],
+	eel-text-caption.[c-h] from the build, these files aren't
+	used anymore
+
+	* eel/eel.h: remove those headers from here.
+
+2002-11-04  Diego González  <diego@pemas.net>
+
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gnome-extensions.c: (get_set_value_imethod),
+	(do_nothing_cb), (eel_bonobo_pbclient_set_value_async):
+	remove these functions since they are now in libbonobo
+
+2002-11-04  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: (file_read_callback):
+	Fix bug with failed reads.
+
+	* eel/eel-wrap-table.c: (eel_wrap_table_class_init),
+	(eel_wrap_table_init), (eel_wrap_table_realize),
+	(wrap_table_get_num_fitting), (wrap_table_layout),
+	(wrap_table_get_max_child_dimensions):
+	Correct size request.
+	Patch from Jan Arne Petersen <jpetersen@gnome-de.org>
+
+2002-11-03  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* configure.in: Added Belarusian to ALL_LINGUAS
+
+=== eel 2.1.2 ===
+	
+2002-10-31  Dave Camp  <dave@ximian.com>
+
+	* MAINTAINERS: Updated.
+
+	* configure.in:
+	* NEWS: 2.1.2
+
+2002-10-31  Dave Camp  <dave@ximian.com>
+	
+	* eel/eel-background.c: (eel_background_class_init),
+	(eel_background_set_image_placement), (eel_background_set_color),
+	(eel_background_set_image_uri_helper),
+	(set_image_and_color_image_loading_done_callback),
+	(eel_background_set_image_uri_and_color),
+	(eel_background_receive_dropped_background_image),
+	(eel_background_receive_dropped_color): * eel/eel-background.h:
+	Take a GdkDragAction argument to the receive_dropped_* functions,
+	and pass it on in the changed signal.
+
+2002-10-31  Dave Camp  <dave@ximian.com>
+
+	* eel/Makefile.am:
+	* eel/eel-preferences-glade.c:
+	* eel/eel-preferences-glade.h: New files to connect glade widgets to
+	preferences.  Patch from Jan Arne Petersen <jpetersen@uni-bonn.de>.
+
+2002-10-25  Dave Camp  <dave@ximian.com>
+
+	* eel/Makefile.am: Oops.  Removed extra \ at the end of a
+	commented out line.
+
+2002-10-19  Dave Camp  <dave@ximian.com>
+
+	* eel/Makefile.am: Take out -DBONOBO_DISABLE_DEPRECATED while the
+	make_registration_id() api is being worked out.
+
+=== eel 2.1.1 ===
+
+2002-10-14  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Added news items
+
+	* configure.in:
+	Bump version to 2.1.1
+
+2002-10-02  Mark McLoughlin  <mark@skynet.ie>
+
+	* acconfig.h: define HAVE_GTK_MULTIHEAD
+	for egg-screen-exec.c.
+
+	* configure.in: require gtk 2.1.0 and remove
+	HAVE_GTK_MULTIHEAD define.
+
+	* eel/eel-gnome-extensions.c,
+	  eel/eel-gtk-extensions.c,
+	  eel/eel-gdk-extensions.c: don't conditionally
+	build multihead support, gtk HEAD is required.
+
+2002-10-02  Mark McLoughlin  <mark@skynet.ie>
+
+	* eel/eel-gdk-extensions.c:
+	(eel_stipple_bitmap_for_screen): use gdk_screen_get_display
+	instead of assuming the default display.
+
+	* eel/eel-gnome-extensions.c:
+	(eel_gnome_shell_execute_on_screen): use the default screen
+	if screen == NULL.
+
+2002-10-02  Mark McLoughlin  <mark@skynet.ie>
+
+	* eel/eel-gnome-extensions.[ch]:
+	(eel_gnome_shell_execute_on_screen): rename from
+	eel_gnome_screen_shell_execute.
+	(eel_gnome_shell_execute): update.
+	(eel_gnome_open_terminal_on_screen): rename from
+	eel_gnome_screen_open_terminal.
+	(eel_gnome_open_terminal): update.
+
+2002-10-02  Mark McLoughlin  <mark@skynet.ie>
+
+	* eel/eel-gtk-extensions.c: (eel_gtk_window_set_initial_geometry):
+	fix build without HAVE_GTK_MULTIHEAD.
+
+	* eel/egg-screen-exec.c: sync with libegg.
+
+2002-10-02  Mark McLoughlin  <mark@skynet.ie>
+
+	* configure.in: add check for gtk with multihead support.
+
+	* eel/Makefile.am: add egg-screen-exec.[ch] to the build.
+
+	* eel/eel-gdk-extensions.[ch]:
+	(eel_stipple_bitmap_for_screen): implement per screen stipple
+	bitmaps.
+	(eel_stipple_bitmap): use eel_stipple_bitmap_for_screen.
+
+	* eel/eel-gnome-extensions.[ch]:
+	(eel_gnome_screen_shell_execute): implement.
+	(eel_gnome_screen_open_terminal): implement.
+	(eel_gnome_open_terminal):
+
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_window_set_initial_geometry):
+	use gdk_screen_get_(width|height).
+
+2002-10-01  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.[ch]:
+	Added eel_editable_label_set_line_wrap_mode.
+
+2002-09-30  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.c:
+	Implement GtkEditable
+	
+2002-09-30  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.c:
+	Finish cut/paste and other stuff.
+
+=== eel 2.1.0 ===
+
+2002-09-27  Dave Camp  <dave@ximian.com>
+
+	* NEWS: Updated.
+
+2002-09-27  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Bump version to 2.1.0.
+
+2002-09-26  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-editable-label.c:
+	Remove leftover debug spew.
+
+2002-09-26  Alexander Larsson  <alexl@redhat.com>
+
+	* test/Makefile.am:
+	* test/test-eel-canvas-items.c:
+	Remove canvas item test.
+
+2002-09-26  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/Makefile.am:
+	Add new files, remove old files.
+	
+	* eel/README.canvas:
+	* eel/eel-canvas.[ch]:
+	* eel/eel-canvas-util.[ch]:
+	* eel/eel-canvas-rect-ellipse.[ch]:
+	Import gtk+ only canvas from foocanvas.
+
+	* eel/eel-canvas-rect.[ch]:
+	Remove old rect object not longer needed.
+	
+	* eel/eel-gnome-extensions.[ch]:
+	Remove old canvas extensions no longer needed.
+	
+	* eel/eel-background.[ch]:
+	Update to the new canvas.
+	
+	* eel/eel-editable-label.[ch]:
+	New editable label for rename mode.
+	
+	* eel/eel-lib-self-check-functions.h:
+	Remove old tests.
+	
+	* eel/eelmarshal.list:
+	New marshallers.
+	
+	* test/Makefile.am:
+	* test/test-eel-editable-label.c:
+	Small test for EelEditableLabel
+
+2002-09-15  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-preferences-item.h:
+	* eel/eel-preferences-item.c:
+	(eel_preferences_item_set_description),
+	(eel_preferences_item_set_accessible_description),
+	(eel_preferences_item_set_accessible_description_array): Allow users
+	to set accessible descriptions of preferences items.
+	* eel/eel-preferences-box.c: (preferences_box_populate_pane):
+	* eel/eel-preferences-box.h: Allow the user to specify accessible
+	descriptions for the controls.
+	* eel/eel-radio-button-group.c:
+	(eel_radio_button_group_set_entry_accessible_description),
+	* eel/eel-radio-button-group.h: Allow the user to specify
+	accessible descriptions for the radio buttons.
+
+2002-09-10  jacob berkman  <jacob@ximian.com>
+
+	* eel/eel-types.c: define EEL_COMPILATION
+
+	* eel/Makefile.am (INCLUDES): don't define EEL_COMPILATION
+
+	this fixes actual build problems on OS X, but wasn't correct
+	anywhere.
+
+2002-09-10  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-background.c: (eel_background_ensure_realized),
+	(eel_background_set_color_no_emit), (eel_background_set_use_base): 
+	If requested, use base as the fallback color instead of bg.
+	
+2002-09-04  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "he" to ALL_LINGUAS.
+
+2002-09-03  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-background.c
+	(eel_background_load_image_callback): disable,
+	until the nautilus side is re-thunk.
+
+2002-09-03  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-background.c
+	(set_image_and_color_image_loading_done_callback): 
+	don't double emit apperance_changed occasionaly.
+	(eel_background_class_init): add determine_image_placement.
+	(eel_background_load_image_callback): call signal.
+	[ based on Thomas Meeks' prototype ]
+
+	* eel/eelmarshal.list: add enum:int,int
+
+2002-08-30  Alexander Larsson  <alexl@redhat.com>
+
+	branched of gnome 2.0.x development to gnome-2-0 branch.
+
+=== eel 2.0.6 ===
+	
+2002-08-28  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	* configure.in:
+	Bumped to 2.0.6.
+
+=== eel 2.0.5 ===
+
+2002-08-23  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Version bumped to 2.0.5.
+
+=== eel 2.0.4 ===
+
+2002-08-14  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Version bumped to 2.0.4
+
+2002-08-12  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-string-picker.c: (eel_string_picker_set_string_list):
+	Use eel_string_list_peek_nth() instead of eel_string_list_nth().
+	Fixes a small leak.
+	
+=== eel 2.0.3 ===
+
+2002-08-05  Dave Camp  <dave@ximian.com>
+
+	* NEWS: Updated.
+	* configure.in: 2.0.3.
+
+2002-07-28  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "sq" to ALL_LINGUAS.
+
+2002-07-27  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-background.c: (widget_realize_cb),
+	(eel_get_widget_background): Set up the widget background on
+	realize.
+
+2002-07-27  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-background.c: (widget_style_set_cb),
+	(eel_get_widget_background): Put back the style_set handler.
+
+=== eel 2.0.2 ===
+
+2002-07-25  Dave Camp  <dave@ximian.com>
+
+	* NEWS: Add a list of changes.
+	* configure.in: Bump version to 2.0.2.
+
+2002-07-25  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Bosnian (bs) to ALL_LINGUAS
+
+2002-07-24  Dave Camp  <dave@ximian.com>
+
+	* eel/Makefile.am: Build eel-background-box.[ch], don't build
+	eel-background-style.[ch].
+	* eel/eel-background-style.[ch]: Removed.
+	* eel/eel-background-box.[ch]: New widget that handles background
+	drawing itself.
+	* eel/eel-background.c: (eel_background_init),
+	(eel_get_widget_background): Removed the style setting and font
+	updating code.  This is now the responsibility of the widget using
+	the EelBackground.
+	(eel_background_expose): Helper function for widgets using
+	EelBackground.
+	(eel_background_set_up_widget): New function.
+	(eel_widget_background_changed): Call
+	eel_background_set_up_widget().
+
+=== eel 2.0.1 ===
+	
+2002-07-22  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Bump version to 2.0.01.
+	Add list of changes.
+
+2002-07-18  Federico Mena Quintero  <federico@ximian.com>
+
+	Fixes the eel part of #46238; see Nautilus for the rest of the fix.
+
+	* eel/eel-background.c (eel_background_ensure_realized): If we
+	fail to parse the color spec, don't default to white.  Instead use
+	the background color from the widget's style.
+	(widget_style_set_cb): New callback for the widget's "style_set"
+	signal.  We regenerate the background and its style when the theme
+	changes.
+	(eel_background_set_widget_style): We need a little hack here to
+	unset the GTK_USER_STYLE flag because otherwise we will not be
+	notified of theme changes through the "style_set" signal.  The
+	real solution is not to use a style of our own, but rather paint
+	the widget by hand when needed.
+	(eel_background_init): Start with is_solid_color = TRUE.
+
+2002-07-17  Frank Worsley  <fworsley@shaw.ca>
+
+	* eel/eel-gtk-extensions.c:
+	* eel/eel-gtk-extensions.h:
+	(eel_gtk_window_set_initial_geometry_from_string):
+	add an ignore_position parameter
+	
+2002-07-12  Damon Chaplin  <damon@ximian.com>
+
+	* eel/eel-gtk-extensions.c (eel_gtk_button_new_with_stock_icon): new
+	function to create a button with a mnemonic label and a stock icon.
+	GTK+ doesn't make this easy. Needed for bug #85666.
+
+2002-07-10  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-gtk-extensions.c: (tree_view_button_press_callback),
+	(eel_gtk_tree_view_set_activate_on_single_click): New functions 
+	to make a GtkTreeView activate a row on a single click.
+	* eel/eel-gtk-extensions.h: Prototype for
+	eel_gtk_tree_view_set_activate_on_single_click.
+	* eel/eel-image-chooser.c: (eel_image_chooser_row_activated),
+	(eel_image_chooser_finalize), (eel_image_chooser_instance_init),
+	(eel_image_chooser_get_selected_path),
+	(eel_image_chooser_set_selected_row): Only send a changed event
+	when the user activates the row.
+
+2002-07-10  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c
+	(eel_gdk_pixbuf_average_value): unsigned
+	dividend, width, height.
+	split out loop invariant and simplify,
+	killing umpteen multiplies for non-alpha case.
+
+2002-07-09  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c (destroy_global_buffer),
+	(eel_gdk_pixbuf_get_global_buffer): move these into the only
+	place that uses them, and hide.
+
+	* test/test-eel-pixbuf-tile.c: here
+	(pixbuf_drawing_area_expose_event): upd.
+
+2002-07-09  Damon Chaplin  <damon@ximian.com>
+
+	* eel/eel-preferences-box.c (eel_preferences_box_new): added a
+	'Cat_egories' label and mnemonic accel above the list. Fixes part
+	of bug #85673.
+
+	* eel/eel-preferences-group.c (eel_preferences_group_new): set the
+	border width of the second column of prefs to match the first.
+
+2002-07-08  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-labeled-image.c
+	(eel_labeled_image_get_accessible): cope better
+	with the no a11y scenario.
+
+2002-07-08  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-labeled-image.c
+	(eel_labeled_image_radio_button_get_type): impl.
+	(eel_labeled_image_radio_button_new_from_file_name),
+	(eel_labeled_image_radio_button_new): impl.
+
+2002-07-02  Michael Meeks  <michael@ximian.com>
+
+	* configure.in: use libglade.
+
+	* eel-2.0.pc.in (Requires): upd.
+
+	* eel/eel-labeled-image.c (eel_labeled_image_set_text):
+	set text with mnemonic.
+	(eel_labled_set_mnemonic_widget): impl.
+	(eel_labeled_*_button_new): set the mnemonic widget.
+
+	* eel/eel-gnome-extensions.c (eel_glade_get_file): impl.
+
+2002-06-28  Marco Pesenti Gritti  <marco@it.gnome.org>
+
+	* eel/eel-gtk-extensions.c (eel_popup_menu_position_func):
+	Remove context menus custom positioning code to be consistent
+	with other gnome applications.
+
+2002-06-27  Frank Worsley  <fworsley@shaw.ca>
+
+	* eel/eel-vfs-extensions.c: (eel_vfs_has_capability_uri):
+	* eel/eel-vfs-extensions.h:
+	implemented EEL_VFS_CAPABILITY_SAFE_TO_EXECUTE
+
+2002-06-25  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-vfs-extensions.c (eel_vfs_has_capability_uri): Moved
+	here from eel_vfs_test_capabilities().
+	(eel_vfs_has_capability): New function, takes a string uri.
+	* eel/eel-vfs-extensions.h: Changed EelVfsTest to EelVfsCapability,
+ 	and EEL_VFS_TEST_* to EEL_VFS_CAPABILITY_*.
+
+2002-06-25  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* acconfig.h:
+	* configure.in:
+	* eel/Makefile.am:
+	* eel/check-program.c: (main):
+	* eel/eel-enumeration.c:
+	* eel/eel-gconf-extensions.c:
+	* eel/eel-glib-extensions.c:
+	* eel/eel-gnome-extensions.c:
+	* eel/eel-i18n.c: (_eel_gettext):
+	* eel/eel-i18n.h:
+	* eel/eel-password-dialog.c:
+	* eel/eel-preferences-box.c:
+	* eel/eel-stock-dialogs.c:
+	* eel/eel-vfs-extensions.c:
+	* eel/eel-xml-extensions.c:
+	Use our own _() macro to ensure bind_textdomain_codeset is set
+       	(when available)
+
+
+2002-06-14  Satyajit Kanungo  <satyajit.kanungo@wipro.com>
+
+	* eel/eel-preferences-box.c : Added a call to get the active pane
+	  for eel preference dialog box. (Applied by Damon Chaplin.)
+
+2002-06-13  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-stock-dialogs.c: (eel_run_simple_dialog): Don't try to
+	connect to the delete_event signal of the dialog, and handle
+	gtk_dialog_run() returning GTK_RESPONSE_DELETE_EVENT.  Fixes 
+	#78948.
+
+2002-06-12  Damon Chaplin  <damon@ximian.com>
+
+	* eel/eel-gnome-extensions.c (icon_selected): hide the dialog at the
+	start of the function and set the dismissed flag to indicate we're
+	acting on it, so if we do get called again we just return.
+	Fixes bug #84134.
+
+2002-06-10  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-preferences-box.c: change treeview shadow type
+	to GTK_SHADOW_IN and add some spacing for consistency with
+	the rest of gnome.
+
+	Patch from Jorn Baayen  <jorn@nl.linux.org>
+
+2002-06-10  Alexander Larsson  <alla@lysator.liu.se>
+
+	* NEWS:
+	Update version nr.
+
+	* configure.in:
+	Update requirements to latest versions of everything.
+
+2002-06-10  Naba Kumar <kh_naba@users.sourceforge.net>
+
+	* configure.in: Added hi in ALL_LINGUAS.
+
+2002-06-09  Abel Cheung  <maddog@linux.org.hk>
+
+	* eel/eel-glib-extension.c: Clarify the comment about
+	strftime check.
+
+2002-06-07  Damon Chaplin  <damon@ximian.com>
+
+	* test/Makefile.am (INCLUDES): 
+	* eel/Makefile.am (INCLUDES): use $(prefix)/${DATADIRNAME}/locale
+	instead of $(datadir)/locale so it works on Solaris.
+
+2002-06-06  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-vfs-extensions.c
+	(eel_vfs_test_capabilities): impl.
+
+2002-06-06  Michael Meeks  <michael@ximian.com>
+
+	* Version 2.0.0
+
+2002-06-06  Jacob Berkman  <jacob@ximian.com>
+
+	* eel/eel-gdk-extensions.c: pangoxft.h is not present on all
+	systems, i think it's safe to just include pango/pango.h
+
+2002-06-04  Yanko Kaneti <yaneti@declera.com>
+
+	* configure.in: (ALL_LINGUAS) Added Bulgarian (bg).
+
+=== eel 1.1.17 ===
+
+2002-06-03  Alex Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	Add some actual changes.
+
+2002-06-03  Alexander Larsson  <alla@lysator.liu.se>
+
+	* NEWS:
+	* configure.in:
+	Bump version to 1.1.17
+	
+2002-05-31  Alex Larsson  <alexl@redhat.com>
+
+	* eel/eel-gdk-extensions.[ch] (eel_gdk_draw_layout_with_drop_shadow):
+	Add new function.
+
+2002-05-28  Havoc Pennington  <hp@redhat.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: remove bogus #include <png.h>,
+	we no longer use libpng
+
+2002-05-27  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-vfs-extensions.c
+	(eel_make_valid_utf8): copy from nautilus
+	(eel_format_uri_for_display_internal): use it
+	for awkward (invalid) cases, that we still need to
+	display in an error dialog.
+
+=== eel 1.1.16 ===
+	
+2002-05-27  Alexander Larsson  <alla@lysator.liu.se>
+
+	* NEWS:
+	* configure.in:
+	Bump version to 1.1.16
+
+2002-05-23  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-vfs-extensions.c
+	(eel_format_uri_for_display_internal): move the utf8
+	validation assert down to after we've handled 'locale_encoded
+	filenames' as best we can.
+
+2002-05-22  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-vfs-extensions.c (eel_is_valid_uri): impl.
+
+2002-05-21  Damon Chaplin  <damon@ximian.com>
+
+	* eel/eel-gnome-extensions.c (eel_gnome_icon_selector_new): store
+	the dialog pointer before calling eel_remove_weak_pointer(), as that
+	will set it to NULL. We want to return it.
+
+	* eel/eel-gdk-pixbuf-extensions.c (eel_gdk_pixbuf_load): close the
+	pixbuf loader if we get a vfs error. It complains if we unref it
+	without closing it.
+
+=== eel 1.1.15 ===
+	
+2002-05-20  Alex Larsson  <alexl@redhat.com>
+
+	* NEWS:
+	* configure.in:
+	Bump version to 1.15.
+
+2002-05-18  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Added "mk" to ALL_LINGUAS.
+	
+2002-05-16  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-background-style.c (eel_background_style_draw_flat_box):
+	unref the pixmap instead of leaking it if not changes_with_size.
+
+2002-05-16  Mark McLoughlin  <mark@skynet.ie>
+
+	* eel/eel-pango-extensions.c: (measure_string_width),
+	(compute_character_widths), (eel_string_ellipsize_start),
+	(eel_string_ellipsize_end), (eel_string_ellipsize_middle),
+	(eel_self_check_ellipsize): don't create redundant layouts
+	when doing calculations. Just use the one we've already
+	created.
+
+2002-05-14  Federico Mena Quintero  <federico@ximian.com>
+
+	* eel/eel-text-caption.c (entry_key_press_callback): Event
+	handlers should return a gboolean!  Fixes #75229.
+
+=== eel 1.1.14 ===
+	
+2002-05-13  Alex Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	Update to 1.1.14
+
+2002-05-12  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-pango-extensions.c 
+	(eel_pango_layout_fit_to_dimensions): Fix this utterly broken
+	function by rewriting parts of it. Fixes #81183, reported
+	by Owen Taylor.
+
+2002-05-11  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-background.c: (eel_background_start_loading_image),
+	(eel_background_set_style_font_from_default),
+	(eel_background_set_widget_style), (eel_widget_font_changed),
+	(eel_get_widget_background):
+	Hacks to update the style when the default font changes.
+
+2002-05-08  Damon Chaplin  <damon@ximian.com>
+
+	* eel/eel-gnome-extensions.c (eel_gnome_icon_selector_new): connect
+	the dialog signals up before calling gnome_icon_selection_show_icons()
+	and also add a weak pointer to the dialog. We need to do this as
+	GnomeIconSelection reenters the main loop while loading icons, so
+	it can be closed or a button can be clicked before returning.
+	Fixes bug #75387.
+
+=== eel 1.1.13 ===
+	
+2002-05-04  David Emory Watson  <dwatson@cs.ucr.edu>
+
+	This is needed to fix bug 46582.
+
+	* configure.in:
+	* NEWS: Bump version to 1.1.13.
+
+	* eel/eel-vfs-extensions.c:
+	* eel/eel-vfs-extensions.h:
+	(eel_make_uri_from_input_internal): Optionally strip trailing
+	whitespace since it could be part of a valid uri.
+	(eel_make_uri_from_input): Update.
+	(eel_make_uri_from_input_with_trailing_ws): New.
+
+2002-04-30  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-preferences-item.c
+	(enumeration_menu_changed_callback),
+	(enumeration_list_changed_callback):
+	Don't use the translated string when looking up the enumeration position.
+	Fixes #64696
+	
+2002-04-29  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Vietnamese (vi) to ALL_LINGUAS
+	* configure.in: Added Walloon (wa) to ALL_LINGUAS
+	* configure.in: Added Basque (eu) to ALL_LINGUAS
+
+=== eel 1.1.12 ===
+	
+2002-04-28  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	* NEWS:
+	Bump version to 1.1.12.
+
+2002-04-28  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	Removed -Wcast-align. This broke the build for Alpha on RH 7.1,
+	even in header files! And it's not that useful.
+	See bug #79860.
+
+2002-04-27  Murray Cumming  <murrayc@usa.net>
+
+	*  eel/eel-stock-dialogs.c (eel_show_yes_no_dialog):
+	Bug #80072:
+	Use eel_create_question_dialog instead() of show_message_dialog()
+	so that the custom button titles can be used.
+
+2002-04-26  Gustavo Giráldez  <gustavo.giraldez@gmx.net>
+
+	* eel/eel-ellipsizing-label.c (real_finalize): chain call to
+	parent class' finalize.
+
+2002-04-22  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-image-chooser.c: (eel_scrolled_image_chooser_new):
+	Set shadow type to GTK_SHADOW_IN. Fixes #73389.
+	
+=== eel 1.1.11 ===
+	
+2002-04-21  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in:
+	* NEWS:
+	Bump version to 1.1.11.
+
+2002-04-21  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-background.c (eel_background_ensure_image_scaled):
+	Work around the fact that scaling large pixbufs to 1x1 crashes
+	while allocating several gigs of memory.
+
+2002-04-21  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-gtk-extensions.c: (eel_gtk_label_set_scale),
+	(get_layout_location), (eel_gtk_label_expose_event),
+	(eel_gtk_label_size_request), (set_up_label),
+	(eel_gtk_label_set_drop_shadow_color),
+	(eel_gtk_label_set_drop_shadow_offset):
+	* eel/eel-gtk-extensions.h:
+	Add eel_gtk_label_set_drop_shadow_color and
+	eel_gtk_label_set_drop_shadow_offset functions.
+	
+2002-04-18  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gnome-extensions.c
+	(do_nothing_cb, get_set_value_imethod),
+	(eel_bonobo_pbclient_set_value_async): impl.
+	async property setter to cut throbber
+	latency.
+
+2002-04-17  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-background.c: (eel_background_start_loading_image):
+	If we load the pixbuf sync, unref it so that we won't leak it.
+	
+	* eel/eel-image-chooser.c: (eel_image_chooser_cell_data_func):
+	Free strings.
+	
+	* eel/eel-labeled-image.c: (eel_labeled_image_class_init),
+	(eel_labeled_image_destroy), (eel_labeled_image_forall):
+	Add a ::destroy handler that destroys the image and label.
+	
+	* eel/eel-preferences-box.c:
+	(preferences_box_category_list_recreate):
+	Free the GtkTreeIter.
+	
+	* eel/eel-preferences-item.c:
+	(preferences_item_update_editable_integer):
+	Free the caption.
+	
+2002-04-17  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-background.c (eel_background_finalize): 
+	Free details after using it, not before.
+
+	* eel/eel-preferences.c: (eel_preferences_get_enum):
+	Free enums.
+	
+	* eel/eel-string-list.c: (eel_string_list_peek_nth):
+	* eel/eel-string-list.h:
+	Add eel_string_list_peek_nth which does not strdup the
+	string returned.
+
+=== eel 1.1.10 ===
+	
+2002-04-14  Alexander Larsson  <alla@lysator.liu.se>
+
+	* NEWS:
+	* configure.in:
+	Bump version to 1.1.10
+
+2002-04-14  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-gnome-extensions.c (eel_gnome_canvas_set_scroll_region):
+	Don't request_update all item unless the top left corner of
+	the scroll region changed.
+
+2002-04-13  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-gnome-extensions.c (eel_gnome_shell_execute):
+	Print a warning on failure. For debugging purposes.
+
+2002-04-12  Jody Goldberg <jody@gnome.org>
+
+	* eel/eel-gnome-extensions.c (eel_gnome_shell_execute) : no one uses
+	  the return type anyway, remove it and make this a wrapper around
+	  g_spawn_command_line_async.  Fixes lots of problems.
+
+2002-04-12  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* configure.in:
+	Update required GAIL version to 0.13
+
+	* eel/eel-accessibility.h:
+	gailtextutil.h has moved from util directory to libgail-util
+
+	* eel/eel-accessibility.c:
+	Update calls to gail_text_util_get_substring as start_pos and end_pos
+	arguments have been changed from gint* to gint
+
+2002-04-07  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-preferences-item.[ch]:
+	Add EEL_PREFERENCE_ITEM_ENUMERATION_MENU_INTEGER type that
+	stores the integer value of the enum. This is needed for
+	the Nautilus thumbnail size limit.
+
+2002-04-04  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-preferences-item.c
+	(eel_preferences_item_set_description): set
+	text with mnemonics.
+
+	* eel/eel-labeled-image.c
+	(eel_labeled_image_set_selected),
+	(eel_labeled_image_get_selected): impl.
+
+	* eel/eel-gtk-extensions.c
+	(eel_pop_up_context_menu): tolerate a NULL event.
+
+2002-04-04  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-accessibility.c
+	(eel_accessibility_set_description),
+	(eel_accessibility_set_name): impl.
+
+2002-04-03  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-accessibility.c (get_quark_gobject),
+	(get_quark_accessible): share quark id's with
+	gobject-accessible.
+	(eel_accessibility_set_atk_object_return): only
+	hook up weak refs etc. for non GObjectAccessible
+	derived types - otherwise we double unref the
+	accessible.
+
+2002-04-02  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-accessibility.c
+	(eel_accessible_text_get_type): impl.
+	(eel_accessibility_for_object): impl.
+
+	* eel-2.0.pc.in (Requires): add gail.
+
+2002-04-01  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-accessibility.c
+	(eel_accessibility_add_simple_text): impl.
+	(eel_accessibility_set_text_util): impl.
+	(get_simple_text): 
+
+	* configure.in: require gail >= 0.11 for accessibility.
+
+2002-03-30  Alexander Larsson  <alla@lysator.liu.se>
+
+	* test/test-eel-pixbuf-scale.c:
+	Don't double define DEST_WIDTH and DEST_HEIGHT.
+
+2002-03-29  Havoc Pennington  <hp@pobox.com>
+
+	* eel/eel-gconf-extensions.c (eel_gconf_value_is_equal): don't use
+	private gconf fields, and fix a bug in comparison of equality 
+	of list values (if (a != NULL || b != NULL) return FALSE)
+
+2002-03-28  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-labeled-image.c
+	(eel_labeled_image_toggle_button_new_from_file_name),
+	(eel_labeled_image_check_button_new_from_file_name),
+	(eel_labeled_image_button_new_from_file_name),
+	(eel_labeled_image_toggle_button_new),
+	(eel_labeled_image_check_button_new),
+	(eel_labeled_image_button_new): use the new button types
+	so we can update accessibility support there.
+	(eel_labeled_image_button_class_init): use to
+	override all button's get_accessibles.
+	(eel_labeled_image_toggle_button_get_type), 
+	(eel_labeled_image_check_button_get_type),
+	(eel_labeled_image_button_get_type): impl.
+	(eel_labeled_image_get_accessible): handle all
+	button and plain label accessibility setup.
+	(get_image): impl.
+	(eel_labeled_image_accessible_image_get_size): impl.
+	(eel_labeled_image_accessible_get_name): impl.
+	(eel_labeled_image_accessible_image_interface_init),
+	(eel_labeled_image_accessible_class_init),
+	(eel_labeled_image_button_class_init),
+	(eel_labeled_image_get_accessible): impl. etc.
+
+2002-03-28  Alex Larsson  <alexl@redhat.com>
+
+	* eel/eel-gdk-pixbuf-extensions.[ch]:
+	Added new function eel_gdk_pixbuf_scale_down() that does
+	fast downscaling. Speeds up thumbnailing.
+	Use it in eel_gdk_pixbuf_scale_down_to_fit().
+
+	* test/Makefile.am:
+	* test/test-eel-pixbuf-scale.c:
+	Tests for pixmap scaling.
+
+2002-03-28  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gtk-extensions.c
+	(eel_gtk_button_set_padding): many buttons (eg.
+	stock ones) do not have a GTK_MISC as a child,
+	don't do daft things to them.
+
+	* test/test-eel-labeled-image.c
+	(labeled_image_button_window_new): add a plain
+	labeled image.
+
+2002-03-28  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-labeled-image.c
+	(eel_labeled_image_set_can_focus): impl.
+	(eel_labeled_image_class_init): add activate
+	signal & bindings.
+	(eel_labeled_image_expose_event): render
+	selection and focus.
+
+2002-03-28  Michael Meeks  <michael@ximian.com>
+	
+	* test/test-eel-widgets.c
+	(create_pixbuf): use DATADIR instead of a hard
+	coded path.
+	(test_ok_dialog): impl.
+	(main): upd.
+	Add window titles to elucidate function.
+
+	* TODO: clean & add a11y bits.
+
+	* test/test-eel-image-chooser.c: ditto.
+
+	* eel/eel-caption-table.c
+	(eel_caption_table_set_row_info): set role on
+	invisible entries' accessibles to 'password'.
+
+2002-03-27  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-accessibility.h
+	(EEL_ACCESSIBLE_FACTORY): don't auto-generate the
+	type name.
+
+	* eel/eel-accessibility.c
+	(eel_accessibility_weak_unref): notify defunct.
+
+2002-03-26  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-accessibility.c
+	[ cut & paste helpers from bonobo until gail is stable ]:
+	(eel_accessibility_set_atk_object_return),
+	(eel_accessibility_get_atk_object): impl.
+	(eel_a11_weak_unref, get_quark_accessible): impl.
+	(eel_accessibility_create_derived_type): impl.
+	(eel_accessibility_get_atk_object): impl.
+
+	* eel/eel-accessibility.h
+	(EEL_ACCESSIBLE_FACTORY, EEL_WIDGET_SET_FACTORY):
+	copy from gail - we need them.
+
+=== eel 1.1.9 ===
+		
+2002-03-24  Alexander Larsson  <alla@lysator.liu.se>
+
+	* configure.in: Bump version to 1.1.9
+
+	* NEWS: bump version.
+
+2002-03-22  Dave Camp  <dave@ximian.com>
+
+	* eel/eel-gtk-extensions.c: (eel_gtk_viewport_get_visible_rect),
+	(eel_gtk_viewport_scroll_to_rect): New functions.
+	* eel/eel-gtk-extensions.h: Prototypes for the eel_gtk_viewport
+	functions.
+	* eel/eel-wrap-table.c: (eel_scrolled_wrap_table_new): New
+	function to create a wrap table inside of a scrolled window.
+	(eel_wrap_table_add), (eel_wrap_table_remove): If the wrap table
+	is scrolled, connect to focus_in_event.
+	(wrap_table_child_focus_in): New function, scrolls to the focused
+	item in the viewport.
+	* eel/eel-wrap-table.h: Prototype for eel_scrolled_wrap_table_new.
+
+2002-03-18  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-string.c: 
+	Only include eel-lib-self-check-functions.h if 
+	EEL_OMIT_SELF_CHECK isn't defined.
+
+	* eel/eel-pango-extensions.c: 
+	Only include eel-lib-self-check-functions.h if 
+	EEL_OMIT_SELF_CHECK isn't defined.
+
+	* eel/Makefile.am:
+	* eel/eel-accessibility.c:
+	(eel_accessibility_set_up_label_widget_relation):
+	* eel/eel-accessibility.h:
+	* eel/eel-caption-table.c: (eel_caption_table_resize):
+	* eel/eel-caption.c: (eel_caption_set_child):
+	Add new accessibility utility functions and have our
+	label-widget composite widgets use them.
+	
+	* test/test-eel-widgets.c: (create_pixbuf):
+	Update path due to e-h changes.
+	
+2002-03-17  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Bump required versions.
+
+=== eel 1.1.8 ===
+		
+2002-03-17  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: Bump version to 1.1.8
+	
+	* NEWS: Bump version.
+	
+	* eel/eel-vfs-extensions.c: (eel_format_uri_for_display_internal),
+	(eel_escape_high_chars), (eel_make_uri_from_input_internal),
+	(eel_format_uri_for_display), (eel_make_uri_from_input),
+	(eel_self_check_vfs_extensions):
+	Handle utf8 and G_BORKEN_FILENAMES better.
+
+2002-03-13  Gregory Leblanc  <gleblanc@linuxweasel.com>
+
+	* eel.spec.in:  New one, from Chris Chabot
+
+2002-03-11  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gnome-extensions.c
+	(eel_bonobo_make_registration_id): impl.
+
+2002-03-11  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-gdk-extensions.c:
+	* eel/eel-gdk-extensions.h:
+	Remove the now unneeded eel_set_mini_icon function.
+	
+=== eel 1.1.7 ===
+
+2002-03-10  Darin Adler  <darin@bentspoon.com>
+
+	* NEWS: Bump version.
+
+2002-03-09  Alexander Larsson  <alexl@redhat.com>
+
+	* eel/eel-image-table.c: (image_table_emit_signal),
+	(image_table_handle_motion), (ancestor_button_press_event),
+	(ancestor_button_release_event):
+	* eel/eel-image-table.h (EelImageTableEvent):
+	Add the original GdkEvent to the EelImageTableEvent. You
+	may need e.g. the time from the event. (Needed to fix
+	stuck grab in nautilus.)
+
+2002-03-08  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-preferences.c:
+	(eel_preferences_set_emergency_fallback_string_list): Add a
+	g_slist_reverse so that emergency fallback string lists are
+	in the proper order.
+
+	* eel/eel-background.c: Tweak formatting.
+
+2002-03-07  Anders Carlsson  <andersca@gnu.org>
+
+	* configure.in: Bump version to 1.1.7
+
+	* eel/eel-preferences-item.c:
+	(preferences_item_update_editable_string),
+	(preferences_item_create_editable_string),
+	(eel_preferences_item_new),
+	(preferences_item_update_displayed_value),
+	(eel_preferences_item_set_description):
+	* eel/eel-preferences-item.h:
+	Add EEL_PREFERENCES_ITEM_EDITABLE_PASSWORD_STRING type.
+	
+	* eel/eel-text-caption.c: (eel_text_caption_set_expand_tilde),
+	(eel_text_caption_set_visibility):
+	* eel/eel-text-caption.h:
+	Add eel_text_caption_set_visibility which controls the visibility
+	of the GtkEntry.
+	
+2002-03-06  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-preferences-box.c: (eel_preferences_dialog_new): Make the
+	button say "Close" instead of "OK".
+
+2002-03-06  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-cell-renderer-pixbuf-list.c:
+	(eel_cell_renderer_pixbuf_list_class_init):
+	* eel/eel-labeled-image.c: (eel_labeled_image_class_init):
+	Remove strings we really don't need; lets not waste time translating
+	these since no one ever sees them.
+
+	* eel/eel-password-dialog.c: (eel_password_dialog_new): Tweak comment.
+
+	* eel/eel-preferences-box.c: Add gnome-i18n.h include. Not sure why
+	this wasn't needed before.
+
+	* eel/eel-preferences.c: Remove unneeded gnome-i18n.h include.
+
+2002-03-06  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-preferences-box.c: (eel_preferences_box_new):
+	* eel/eel-wrap-table.c: (eel_wrap_table_class_init):
+	Take out some strings that we don't really need to translate.
+
+2002-03-06  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-preferences-item.c
+	(preferences_item_update_enumeration_radio),
+	(preferences_item_update_enumeration_menu),
+	(enumeration_radio_changed_callback),
+	(enumeration_menu_changed_callback): upd. for enums
+
+	* eel/eel-preferences.c
+	(eel_preferences_add_auto_enum): impl.
+	(preferences_entry_update_auto_storage): upd. for enums.
+
+2002-03-05  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-preferences.c
+	(eel_preferences_get_enum, eel_preferences_set_enum): impl.
+
+	* eel/eel-enumeration.c (eel_enumeration_get_sub_name),
+	(eel_enumeration_get_sub_value): impl.
+
+=== eel 1.1.6 ===
+
+2002-03-04  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-stock-dialogs.c: (show_message_dialog): Put additional button to
+	the left of the other buttons. Doing it this way is pretty nasty, but I
+	don't know any better way to match what the HI folks want.
+
+2002-03-03  Alexander Larsson  <alla@lysator.liu.se>
+
+	* NEWS:
+	* configure.in:
+	Bump version.
+	
+	* eel/eel-background.h:
+	Add eel_background_set_is_constant_size() and
+	eel_background_get_pixmap_and_color()
+	Remove eel_background_is_too_complex_for_gtk_style().
+	
+	* eel/eel-background.c: (eel_background_init),
+	(eel_background_finalize), (get_pixmap_size), (eel_background_unrealize),
+	(eel_background_ensure_realized), (eel_background_get_pixmap_and_color),
+	(draw_background_callback), (eel_widget_background_changed):
+	Add bitmap generation and caching capability.
+	(eel_background_set_is_constant_size): set if windows don't change size,
+	used by the nautilus desktop window.
+	(eel_background_is_too_complex_for_gtk_style); Remve. Not used anymore.
+	(eel_background_receive_dropped_background_image): Remove old reset.png hack.
+
+	* eel/eel-background-style.c:
+	(eel_background_style_finalize): unref background
+	(eel_background_style_draw_flat_box), (eel_background_style_set_background):
+	Use cached pixmaps from EelBackground. 
+	(eel_background_style_new): Set the background. No need to mess
+	with the base style.
+	(eel_background_style_clone): Need to clone the background too.
+	(eel_background_style_class_init): add clone and set_background virtual
+	methods
+	
+2002-03-03  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-preferences-item.c:
+	(preferences_item_create_enumeration_list),
+	(preferences_item_create_enumeration_menu):
+	* eel/eel-string-picker.c: (eel_string_picker_set_string_list),
+	(eel_string_picker_insert_separator):
+	* eel/eel-string-picker.h:
+	Create the string list first and then insert it into the
+	string picker, instead of rebuilding the option menu 
+	on every insert.
+	
+2002-03-01  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-glib-extensions.h:
+	* eel/eel-glib-extensions.c: (eel_g_object_list_ref),
+	(eel_g_object_list_unref), (eel_g_object_list_free),
+	(eel_g_object_list_copy), (eel_add_weak_pointer),
+	(eel_remove_weak_pointer): New names for old functions
+	from eel-gtk-extensions.c.
+	
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-extensions.c: Remove old functions.
+
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-image-chooser.c: (eel_image_chooser_set_selected_row):
+	Handle -1 by deselecting all rows.
+
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gnome-extensions.c: (icon_selected): Since this is no longer
+	a callback, get rid of the widget parameter.
+	(icon_cancel_pressed): Get rid of the widget parameter.
+	(entry_activated_callback): Check result of stat.
+	(eel_gnome_icon_selector_new): Store a pointer to the dialog that we
+	can use later to close it.
+
+2002-02-27  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-password-dialog.c: (dialog_show_callback),
+	(eel_password_dialog_set_readonly_username):
+	If the username is readonly, focus the password entry. Otherwise
+	focus the username entry. Fixes #72801.
+	
+2002-02-27  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-extensions.h:
+	* eel/eel-gdk-extensions.c: (eel_gdk_rectangle_contains_rectangle): New.
+
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_tree_view_cell_is_completely_visible): New.
+
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_cancel_gdk_pixbuf_load):
+	We need to close the loader even if we are just dropping it on the floor.
+	Not sure that's good design, but I want to make gdk-pixbuf happy.
+
+	* eel/eel-image-chooser.c: (eel_scrolled_image_chooser_show_selected_row):
+	Only scroll if row isn't already completely visible.
+
+=== eel 1.1.5 ===
+
+2002-02-25  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-pango-extensions.c:
+	(eel_pango_font_description_get_largest_fitting_font_size):
+	* eel/eel-pango-extensions.h:
+	Implement eel_pango_font_description_get_largest_fitting_font_size.
+	
+2002-02-22  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	* eel/eel.h:
+	* eel/eel-generous-bin.c: Re-add.
+	* eel/eel-generous-bin.h: Re-add.
+
+2002-02-21  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-pango-extensions.c
+	(eel_pango_layout_fit_to_dimensions): impl.
+
+	* eel/eel-gdk-pixbuf-extensions.c
+	(eel_gdk_pixbuf_draw_layout_clipped): document.
+
+2002-02-22  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	* eel/eel.h:
+	* eel/eel-generous-bin.c: Remove.
+	* eel/eel-generous-bin.h: Remove.
+	* eel/eel-region.c: Remove.
+	* eel/eel-region.h: Remove.
+
+	* eel/eel-image-table.c: Remove include "eel-region.h".
+
+2002-02-22  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-glib-extensions.h:
+	* eel/eel-glib-extensions.c:
+	Remove unused eel_g_ptr_array_* functions.
+	
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gnome-extensions.c:
+	Remove unused eel_gnome_canvas_world_to_window_rectangle.
+	(eel_gnome_canvas_world_to_widget_rectangle),
+	(eel_gnome_canvas_widget_to_world),
+	(eel_gnome_canvas_world_to_widget):
+	Rename to reflect a clearer conception of these. They map to the
+	widget coordinate system. Clearer than trying to talk about
+	widget->window vs.  layout->bin_window .
+	
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-extensions.c:
+	Remove unused eel_gtk_style_shade,
+	eel_get_window_list_ordered_front_to_back,
+	eel_gtk_widget_standard_realize,
+	eel_gtk_bin_standard_size_allocate,
+	eel_gtk_bin_standard_size_request.
+	(eel_gtk_widget_get_button_event_location): New.
+	(eel_gtk_widget_get_motion_event_location): New.
+
+	* test/Makefile.am:
+	* test/dumb-box.c: Remove.
+	* test/dumb-box.h: Remove.
+	* test/test-eel-gtk-style.c:
+	Just keep this compiling. Not clear if it still is useful.
+
+	* RENAMING: at_exit -> at_shutdown
+	
+2002-02-21  Darin Adler  <darin@bentspoon.com>
+
+	* AUTHORS:
+	* MAINTAINERS:
+	Add some people.
+
+	* eel/eel-gdk-pixbuf-extensions.c:
+	(eel_gdk_pixbuf_draw_layout_clipped):
+	Draw nothing if the rectangle is empty or "less than empty"
+	rather than asserting.
+
+2002-02-20  David Emory Watson  <dwatson@cs.ucr.edu>
+
+	eel/eel-preferences-box.c:
+	(eel_preferences_box_init): Remove connect.
+	(user_level_changed_callback): Removed.
+
+2002-02-20  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c
+	(eel_gdk_pixbuf_draw_layout): split out into
+	(eel_gdk_pixbuf_draw_layout_clipped): here, new method.
+
+2002-02-20  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-wrap-table.c (eel_wrap_table_class_init): 
+	do an eel_type_init.
+
+	* eel/eel-types.c (eel_type_init): protect vs.
+	double init.
+
+2002-02-19  jacob berkman  <jacob@ximian.com>
+
+	* eel/eel-gnome-extensions.c (get_terminal_command_prefix):
+	gnome-terminal 2 does not accept --login or --start-factory-server
+
+	* eel/eel-gtk-extensions.[ch] (eel_gtk_selection_data_*_deep):
+	remove as these are fixed in GTK 2.0 (fixes a double free crash)
+
+2002-02-19  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-preferences-box.c
+	(category_list_row_activated_callback): rename to
+	(category_list_selection_changed): this & use the selection's
+	changed signal instead.
+	(eel_preferences_box_new): upd.
+	(preferences_box_category_list_recreate): upd.
+
+2002-02-18  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* configure.in: remove GNOME_COMMON_INIT, GNOME_PLATFORM_GNOME_2
+
+2002-02-16  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-gdk-pixbuf-extensions.c (eel_gdk_pixbuf_draw_to_pixbuf_alpha):
+	Add G_OBJECT() casts for g_object_ref/unref so we don't give warnings
+	due to pixbuf being const.
+
+2002-02-16  David Emory Watson  <dwatson@cs.ucr.edu>
+
+	* NEWS: Bump version.
+	* configure.in: Bump version.
+
+	* eel/eel-gdk-extensions.h:
+	* eel/eel-gdk-extensions.c:
+	(eel_gdk_color_parse): New.
+	(eel_gdk_color_parse_with_white_default): call eel_gdk_color_parse ().
+	
+2002-02-15  Michael Meeks  <michael@ximian.com>
+
+	* eel/Makefile.am: add deprecated flags
+	permanantly.
+
+	* eel/eel-gdk-extensions.c
+	(eel_gdk_choose_foreground_color),
+	(eel_gdk_gc_choose_foreground_color): prune,
+	unused, and funky color handling.
+
+	* test/test-eel-pixbuf-tile.c:
+	update image paths to include the prefix.
+
+	* eel/eel-debug-drawing.c
+	(eel_debug_draw_rectangle_and_cross): make sure
+	we allocate the color.
+
+2002-02-13  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-image-table.c
+	(image_table_peek_clear_gc): upd. color handling.
+	(eel_image_table_set_smooth_background_color),
+	(eel_image_table_set_is_smooth): kill, unused.
+	(eel_image_table_expose_event): kill.
+	(image_table_foreach_child_subtract_content),
+	(image_table_peek_clear_gc): remove
+
+	* eel/eel-gdk-pixbuf-extensions.c
+	(pixbuf_destroy_callback),
+	(eel_gdk_pixbuf_list_ref, eel_gdk_pixbuf_list_free):
+	use g_object_ref/unref instead of gdk_pixbuf_~
+
+	* eel/eel-gdk-extensions.c
+	(eel_fill_rectangle_with_color): remove, color
+	handling not pleasant, and not used.
+	(eel_gdk_gc_choose_foreground_color): upd.
+
+
+	* eel/eel-debug-drawing.c
+	(eel_debug_draw_rectangle_and_cross): upd. color
+	handling.
+
+2002-02-12  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-stock-dialogs.h (eel_create_info_dialog): 
+	fix header comment.
+
+2002-02-12  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-wrap-table.c: (eel_wrap_table_class_init):
+	Register enums in here. This gets rid of the last place
+	we had GNOME2_CONVERSION_COMPLETE.
+
+	* eel/maketypes.awk: Fix to make EEL_TYPE_X instead of
+	EEL_TYPE_EEL_X.
+
+2002-02-12  Tõivo Leedjärv  <leedjarv@interest.ee>
+
+	* configure.in: Added et to ALL_LINGUAS.
+
+2002-02-12  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-preferences-box.c
+	(eel_preferences_box_new): create a tree view &
+	list model
+	(category_list_select_row_callback): rename to 
+	(category_list_row_activated_callback): this & re-write..
+	(preferences_box_find_row): re-write.
+	(preferences_model_foreach_find): impl.
+	(eel_preferences_box_rename_pane): re-write.
+	(eel_preferences_box_finalize): unref the category model.
+	(eel_preferences_dialog_new): show after
+	populating with panes, so we don't get re-sizing jerkiness
+	on the list.
+	(preferences_box_select_pane): tolerate setting the name
+	with the existing string.
+
+	* eel/eel-text-caption.c: remove unused TEXT_CAPTION_INVALID
+
+	* eel/eel-password-dialog.c: remove unused DIALOG_OK_BUTTON
+
+2002-02-12  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-canvas-rect.c (eel_canvas_rect_realize): Surround
+	variable declarations with HAVE_RENDER.
+
+2002-02-10  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Require newer libxml where location of xml memory
+	calls has moved.
+	* eel/eel-xml-extensions.c: Remove unneeded include of xmlmemory.h.
+
+==== eel 1.1.4 ====
+
+2002-02-09  Darin Adler  <darin@bentspoon.com>
+
+	* NEWS: Bump version.
+	* configure.in: Bump version.
+
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger):
+	Add gnome-vfs-modules to list of domains.
+
+2002-02-08  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-canvas-rect.c: (eel_canvas_rect_realize),
+	(eel_canvas_rect_unrealize):
+	Chain to parent implementations.
+	
+2002-02-06  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am: Turn on GNOME_DISABLE_DEPRECATED and
+	EEL_COMPILATION. Get rid of eel-gobject-extensions.[ch].
+
+	* eel/eel-art-gtk-extensions.h:
+	* eel/eel-art-gtk-extensions.c: (eel_gdk_window_get_bounds),
+	(eel_gdk_window_get_screen_relative_bounds),
+	(eel_gtk_widget_get_bounds), (eel_gtk_widget_get_dimensions),
+	(eel_gtk_widget_get_preferred_dimensions),
+	(eel_gdk_window_clip_dirty_area_to_screen),
+	(eel_gdk_window_get_dimensions), (eel_gdk_get_pointer_position):
+	Eliminate misguided use of const. Fix a few deprecated things.
+
+	* eel/eel-background-style.c: (eel_gdk_window_update_sizes):
+	Use gdk_drawable_get_size instead of gdk_window_get_size.
+
+	* eel/eel-background.c: (draw_background_callback): Use g_object_unref
+	instead of gdk_gc_unref.
+	(eel_get_widget_background): Use g_signal_connect_object instead
+	of eel_signal_connect_object_while_alive.
+
+	* eel/eel-debug-drawing.c: (eel_debug_draw_rectangle_and_cross):
+	Use g_object_unref instead of gdk_gc_unref.
+
+	* eel/eel-debug.c: Turn this back on.
+
+	* eel/eel-gnome-extensions.c: (eel_gnome_icon_selector_new): Get
+	rid of a misguided use of eel_signal_connect_while_alive -- plain
+	old g_signal_connect works fine.
+
+	* eel/eel-gobject-extensions.c: Remove.
+	* eel/eel-gobject-extensions.h: Remove.
+
+	* eel/eel-image-table.c: (eel_image_table_unrealize): Use g_object_unref
+	instead of gdk_gc_unref.
+
+	* eel/eel-labeled-image.c: (eel_labeled_image_check_button_new): Get
+	rid of some misguided use of eel_signal_connect_while alive -- plain
+	old g_signal_connect works fine.
+
+	* eel/eel-password-dialog.c: (eel_password_dialog_new): Get
+        rid of some misguided use of eel_signal_connect_while alive -- plain
+        old g_signal_connect works fine.
+
+	* eel/maketypes.awk: Grab a new copy from gtk+. Is there a way to do
+	this without copied and pasted code?
+	* eel/eel-types.c: (eel_type_init): Change name to EEL_TYPE_N_BUILTINS.
+
+	* test/Makefile.am: Turn on G_DISABLE_DEPRECATED, GDK_DISABLE_DEPRECATED,
+	GTK_DISABLE_DEPRECATED, GNOME_DISABLE_DEPRECATED.
+
+	* test/test-eel-background.c: (main): Turn of GtkCTree code that was
+	already half-disabled.
+
+	* test/test-eel-canvas-items.c: (item_event), (setup_item),
+	(create_canvas_items), (create_canvas): gtk_signal_connect -> g_signal_connect.
+	Remove some colormap stuff. gtk_widget_set_usize -> gtk_widget_set_size_request.
+	gtk_window_set_policy -> gtk_window_set_resizable.
+	* test/test-eel-gtk-style.c: (color_box_expose_event): gdk_gc_unref -> g_object_unref.
+	(pixmap_box_expose_event): gdk_window_get_size -> gdk_drawable_get_size.
+	* test/test.c: (test_window_new): gtk_window_set_policy -> gtk_window_set_resizable
+
+2002-02-06  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-wrap-table.c
+	(eel_wrap_table_class_init),
+	(eel_wrap_table_set_property),
+	(eel_wrap_table_get_property): ditto
+
+	* eel/makeenums.pl (parse_entries): output
+	GEnumValue not GtkEnumValue - this should use
+	glib-mkenums though.
+
+	* eel/eel-gtk-extensions.c
+	(eel_gtk_signal_connect_full_while_alive),
+	(eel_gtk_signal_connect_free_data_custom):
+	port deprecated bits.
+	(eel_gtk_class_name_make_like_existing_type):
+	remove - unused & not portable.
+
+	* eel/eel-gnome-extensions.c
+	(eel_gnome_icon_selector_new): remove all
+	deprecated bits.
+
+	* eel/eel-dateedit-extensions.c
+	(eel_gnome_date_edit_get_date_as_string): ditto.
+
+	* eel/eel-labeled-image.c
+	(eel_labeled_image_class_init),
+	(eel_labeled_image_set_property),
+	(eel_labeled_image_get_property),
+	(eel_labeled_image_check_button_new): ditto.
+
+	* eel/eel-preferences-item.c
+	(preferences_item_update_displayed_value),
+	(preferences_item_update_displayed_value): ditto.
+
+	* eel/eel-stock-dialogs.c
+	(timed_wait_callback): ditto.
+
+2002-02-05  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-dateedit-extensions.c
+	(eel_gnome_date_edit_get_date_as_string): add
+	deprecated comment.
+
+	* eel/eel-background.c
+	(eel_background_reset),
+	(eel_background_set_color),
+	(eel_get_widget_background),
+	(eel_background_set_image_placement),
+	(eel_background_load_image_callback),
+	(eel_background_cancel_loading_image),
+	(eel_background_set_image_uri_helper), 
+	(set_image_and_color_image_loading_done_callback),
+	(eel_background_class_init): build with deprecated
+	things disabled.
+
+	* eel/eel-radio-button-group.c
+	(eel_radio_button_group_class_init): ditto.
+
+	* eel/eel-preferences-item.c
+	(preferences_item_update_custom),
+	(eel_preferences_item_set_description): ditto.
+
+	* eel/eel-caption-table.c
+	(eel_caption_table_class_init, entry_activate),
+	(eel_caption_table_resize): ditto.
+
+	* eel/eel-password-dialog.c
+	(eel_password_dialog_new): ditto.
+
+	* eel/eel-gtk-extensions.c
+	(handle_standard_close_accelerator),
+	(eel_gtk_menu_set_item_visibility),
+	(alive_disconnecter),
+	(eel_gtk_signal_connect_while_realized): ditto.
+
+	* eel/eel-gnome-extensions.c
+	(try_terminal_command),
+	(eel_gnome_icon_selector_new): ditto.
+
+	* eel/eel-ellipsizing-label.c
+	(eel_ellipsizing_label_new): ditto.
+
+	* eel/eel-text-caption.c
+	(eel_text_caption_class_init),
+	(eel_text_caption_set_editable),
+	(eel_text_caption_init, eel_text_caption_init): ditto.
+
+	* eel/eel-string-picker.c
+	(eel_string_picker_class_init): ditto.
+
+	* eel/eel-stock-dialogs.c
+	(timed_wait_delayed_close_timeout_callback),
+	(eel_show_info_dialog_with_details),
+	(delete_event_callback): ditto.
+
+2002-02-05  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-clist.c: Remove.
+	* eel/eel-clist.h: Remove.
+	* eel/eel-ctree.c: Remove.
+	* eel/eel-ctree.h: Remove.
+	* eel/eel-dnd.c: Move back into Nautilus.
+	* eel/eel-dnd.h: Move back into Nautilus.
+	* eel/eel-list-column-title.c: Remove.
+	* eel/eel-list-column-title.h: Remove.
+	* eel/eel-list.c: Remove.
+	* eel/eel-list.h: Remove.
+	* eel/eel.h: Housekeeping.
+	* eel/Makefile.am: Housekeeping.
+
+==== eel 1.1.3 ====
+
+2002-02-04  Darin Adler  <darin@bentspoon.com>
+
+	* NEWS: Update for 1.1.3.
+	* .cvsignore: Don't ignore the tarballs.
+
+	* eel/eel-pango-extensions.c: (eel_string_ellipsize_middle):
+	* eel/eel-wrap-table.c: (wrap_table_layout): Fixes to make things
+	compile with gcc 3.0.2, based on a patch contributed by Anush
+	<nothin2chance@yahoo.com>.
+
+2002-02-04  Laszlo Peter  <laca@ireland.sun.com>
+
+	* COPYING: change to LGPL
+
+	* eel/eel-background-style.c eel/eel-background-style.h
+	  eel/eel-background.c eel/eel-background.h
+	  eel/eel-dateedit-extensions.c eel/eel-dateedit-extensions.h
+	  eel/eel-debug-drawing.c eel/eel-debug-drawing.h eel/eel-debug.c
+	  eel/eel-debug.h eel/eel-enumeration.c eel/eel-enumeration.h
+	  eel/eel-graphic-effects.h eel/eel-gtk-macros.h
+	  eel/eel-lib-self-check-functions.c
+	  eel/eel-lib-self-check-functions.h eel/eel-list-column-title.c
+	  eel/eel-list-column-title.h eel/eel-region.c eel/eel-region.h
+	  eel/eel-self-checks.c eel/eel-self-checks.h
+	  eel/eel-string-list.c eel/eel-string-list.h: correct licensing
+	  information in the headers by permission of the Copyright holders.
+
+Mon Feb  4 11:24:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* eel/eel-gnome-extensions.c (dialog_response_callback): 
+	Labels need a statement after them. (Fixes -Werror problem
+	with recent GCC.)
+
+2002-01-30  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-preferences-item.h:
+	* eel/eel-preferences-item.c: 
+	(preferences_item_update_font),
+	(font_changed_callback), (preferences_item_create_font),
+	(eel_preferences_item_new),
+	(preferences_item_update_displayed_value),
+	(eel_preferences_item_set_description):
+	Make EEL_PREFERENCE_ITEM_FONT use the Eel font picker, and get
+	rid of all support for EEL_PREFERENCE_ITEM_SMOOTH_FONT.
+
+2002-01-30  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Bump to 1.1.3 since we have an API change.
+
+	* eel/eel-dnd.h: start_x and start_y are in window coordinates,
+	not world coordinates.
+	
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gnome-extensions.c:
+	(eel_gnome_canvas_world_to_canvas_window_rectangle): New.
+	(eel_gnome_canvas_canvas_window_to_world): New.
+	(eel_gnome_canvas_world_to_canvas_window): New.
+
+==== eel 1.1.2 ====
+
+2002-01-29  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-pango-extensions.c: (eel_self_check_ellipsize),
+	(eel_self_check_pango_extensions): Turn off ellipsizing self-checks
+	because they are failing for me.
+
+2002-01-29  Darin Adler  <darin@bentspoon.com>
+
+	* NEWS: Update for 1.1.2 release.
+
+2002-01-28  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* eel/eel-glib-extensions.c, eel/eel-glib-extensions.h:
+	(eel_g_list_copy): remove, it was moved into glib.
+	* eel/eel-gtk-extensions.c, eel/eel-gtk-extensions.h:
+	(eel_gtk_window_present): remove, it was moved into gtk+.
+
+2002-01-28  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am: Use LC_ALL instead of LC_COLLATE.
+	* eel/eel-gnome-extensions.c: (eel_gnome_canvas_item_send_behind):
+	Oops, it was sending things in front.
+
+2002-01-27  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-stock-dialogs.c (eel_run_simple_dialog): Start with 
+	a response id that is 0.
+
+2002-01-27  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gnome-extensions.c: (eel_gnome_canvas_item_send_behind): New.
+
+2002-01-27  Alexander Larsson  <alla@lysator.liu.se>
+
+	* acconfig.h:
+	Add HAVE_RENDER
+
+	* configure.in:
+	Add checks for Xrender
+
+	* eel/Makefile.am:
+	Add RENDER_LIBS and eel-canvas-rect.[ch]
+
+	* eel/eel-canvas-rect.[ch]:
+	New type EelCanvasRect. Implemented for the Nautilus
+	selection rectangle.
+	
+	* eel/eel-lib-self-check-functions.h:
+	Add eel_self_check_canvas_rect to list of tests
+
+	* test/test-eel-canvas-items.c:
+	Add a test of the eel canvas items.
+	
+	* test/Makefile.am:
+	Build test-eel-canvas-items
+
+2002-01-24  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-pango-extensions.h:
+	* eel/eel-pango-extensions.c: (eel_pango_ft2_get_context): New.
+
+	* eel/eel-gtk-extensions.c: (create_pango_ft2_context): Use
+	the new eel_pango_ft2_get_context.
+
+2002-01-23  Peteris Krisjanis <peteris.krisjanis@ttc.lv>
+
+	* eel/configure.in: added lv to ALL_LINGUAS
+
+2002-01-22  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-font-picker.c: (font_picker_get_index_for_font):
+	Handle NULL family_name.
+
+2002-01-21  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-font-picker.h:
+	* eel/eel-font-picker.c:
+	* test/test-eel-font-picker.c:
+	Rewrite to use Pango -- first cut, not done yet.
+
+	* eel/eel-preferences-item.c:
+	(preferences_item_create_smooth_font): Pass NULL for the PangoContext.
+
+2002-01-19  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* eel/eel-glib-extensions.c: (eel_strdup_strftime):
+	Convert format string into locale encoding at start, and convert back
+	into utf-8 the result. 
+
+2002-01-19  Darin Adler  <darin@bentspoon.com>
+
+	* test/test-eel-gtk-style.c: (style_get_color), (style_get_gc):
+	Fix mistake in that last change that didn't compile.
+
+2002-01-19  Darin Adler  <darin@bentspoon.com>
+
+	* test/test-eel-gtk-style.c: (style_get_color), (style_get_gc):
+	Tweak code so gcc 3.x doesn't give warnings.
+
+2002-01-18  Darin Adler  <darin@bentspoon.com>
+
+	* TODO: Remove some already-done items.
+	
+	* eel/check-program.c: (main): Use the new eel_debug_shut_down.
+	
+	* eel/eel-debug.h:
+	* eel/eel-debug.c: (eel_debug_shut_down),
+	(eel_debug_call_at_shutdown),
+	(eel_debug_call_at_shutdown_with_data): New.
+	
+	* eel/eel-debug-drawing.c: (eel_debug_show_pixbuf):
+	* eel/eel-enumeration.c: (enumeration_table_get):
+	* eel/eel-font-picker.c: (global_font_list_get):
+	* eel/eel-gconf-extensions.c: (eel_gconf_client_get_global):
+	* eel/eel-gdk-pixbuf-extensions.c:
+	(eel_gdk_pixbuf_get_global_buffer):
+	* eel/eel-glib-extensions.c: (eel_g_hash_table_new_free_at_exit):
+	* eel/eel-preferences.c: (preferences_global_table_get_global):
+	Switch from g_atexit to eel_debug_call_at_shutdown.
+	
+	* eel/eel-image-table.h:
+	* eel/eel-image-table.c: (eel_image_table_class_init),
+	(eel_image_table_init), (eel_image_table_new): Get rid of
+	set_is_smooth signal, eel_image_table_set_is_smooth, and use of
+	eel_smooth_widget calls.
+	
+	* eel/eel-image-with-background.c: Remove.
+	* eel/eel-image-with-background.h: Remove.
+	* eel/eel-image.c: Remove.
+	* eel/eel-image.h: Remove.
+	* eel/eel-smooth-widget.c: Remove.
+	* eel/eel-smooth-widget.h: Remove.
+	* eel/eel-viewport.c: Remove.
+	* eel/eel-viewport.h: Remove.
+	
+	* eel/Makefile.am: Kill eel-image-with-background.[ch],
+	eel-image.[ch], eel-smooth-widget.[ch], eel-viewport.[ch].
+	* eel/eel.h: Ditto.
+	
+	* eel/eel-labeled-image.c: (eel_labeled_image_get_arg),
+	(eel_labeled_image_add), (eel_labeled_image_remove),
+	(labeled_image_ensure_image), (eel_labeled_image_set_pixbuf),
+	(eel_labeled_image_set_pixbuf_from_file_name): Port from EelImage
+	to GtkImage.
+	
+	* eel/eel-radio-button-group.c:
+	(eel_radio_button_group_set_entry_pixbuf): Port from EelImage to
+	GtkImage.
+	
+	* test/test-eel-image-table.c: (image_table_new_scrolled): Port
+	from EelViewport to GtkViewport.
+	
+	* THANKS: Fix typo.
+	* eel/eel-wrap-table.c: Fix comment format.
+	
+	* test/test-eel-image-background.c: Remove.
+	* test/test-eel-image-simple.c: Remove.
+	* test/test-eel-viewport-constraint.c: Remove.
+
+	* test/.cvsignore: Remove obsolete tests.
+	* test/Makefile.am: Remove obsolete tests.
+
+	* test/test-eel-image-chooser.c: (main): Remove eel_smooth_widget
+	call.
+	
+	* test/test.c: Remove EelImage code.
+
+2002-01-17  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-pango-extensions.c:
+	(eel_pango_layout_set_text_ellipsized): Soften an assert to
+	a g_return.
+
+2002-01-17  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am: Fix parallel builds by getting rid of an
+	ill-advised use of a full path to the library.
+
+	* eel/eel-pango-extensions.c: (eel_string_ellipsize_start),
+	(eel_string_ellipsize_end): These were reversed.
+
+	* test/.cvsignore: test-eel-ellipsizing
+
+2002-01-17  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-cell-renderer-pixbuf-list.h: Fix warning.
+
+	* eel/Makefile.am:
+	Add eel-cell-renderer-pixbuf-list.[ch]
+	
+	* eel/eel-background-style.c: (eel_background_style_draw_flat_box):
+	Special case GtkTreeView.
+	
+	* eel/eel-cell-renderer-pixbuf-list.c:
+	* eel/eel-cell-renderer-pixbuf-list.h:
+	Add these.
+	
+	* eel/eel-stock-dialogs.c: (show_ok_dialog):
+	Set default response to GTK_RESPONSE_OK.
+	
+2002-01-16  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Bump version to 1.1.2.
+
+2002-01-16  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_draw_layout):
+	Fix case where clipped height or width turns out to be 0.
+	* eel/eel-gtk-macros.h: Remove some unused macros, deprecate
+	others.
+	* eel/eel-pango-extensions.c: Remove extra include.
+	* eel/eel-preferences-box.c: (eel_preferences_dialog_new):
+	Don't try to eel_gtk_window_set_up_close_accelerator, since it's
+	a dialog that already has a close accelerator.
+
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* eel/eel.h: add eel-pango-extensions.h
+
+	* eel/eel-pango-extensions.c
+	(eel_pango_layout_set_text_ellipsized): put ellipsize code back in
+	here and port to Pango
+	
+	* eel/eel-ellipsizing-label.c: re-enable ellipsization in the
+	widget, change bad hack implementation to different bad hack
+	implementation to avoid queueing a resize in size_allocate
+	(real_style_set): remove style_set handler because it results in a
+	queue_resize anyway
+	(real_size_allocate): auto-select ellipsize mode based on label
+	alignment
+
+==== eel 1.1.1 ====
+
+2002-01-15  Darin Adler  <darin@bentspoon.com>
+
+	* NEWS: Get ready for eel 1.1.1 release.
+	* eel/Makefile.am: Fix makeenums.pl stuff so it works when
+	srcdir != destdir.
+
+2002-01-15  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-extensions.c: (create_pango_ft2_context):
+	Tiny tweak to the code -- makes it more readable, I think.
+
+2002-01-09  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-gtk-extensions.c (create_pango_ft2_context):
+	Copy the font description from the base_context.
+
+Thu Jan 10 10:53:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* eel/eel-gnome-extensions.c
+	(eel_gnome_canvas_world_to_window_rectangle): Remove
+	unused variable so things compile.
+
+2002-01-09  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gnome-extensions.c:
+	Remove gnome_win_hints_*.
+
+	* eel/eel-list.c: (eel_list_destroy): Something I missed in the
+	last change -- forgot to NULL out details.
+
+2002-01-09  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-list.c: (eel_list_destroy),
+	(unschedule_keyboard_row_reveal):
+	Protect against double destroys, but do it in an inelegant way,
+	which shouldn't matter, since we plan to remove this class.
+
+2002-01-09  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-font-extensions.c: Remove.
+	* eel/eel-gdk-font-extensions.h: Remove.
+
+2002-01-08  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	* eel/eel-ctree.c:
+	* eel/eel-ellipsizing-label.c:
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel-list.c:
+	* eel/eel.h:
+	Remove eel-gdk-font-extensions.[ch]
+	
+	* eel/eel-clist.h: Fix some overzealous global replace.
+	
+	* eel/eel-gobject-extensions.c:
+	(eel_signal_connect_object_while_alive),
+	(eel_signal_connect_while_alive):
+	Add some more g_return_if_fail.
+	
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-extensions.c: (eel_gtk_label_set_scale): New.
+	(eel_gtk_widget_set_foreground_color): Set text color too.
+	
+	* eel/eel-image-table.c:
+	* eel/eel-image.c:
+	* eel/eel-labeled-image.c:
+	Add includes needed now that eel-gtk-extensions doesn't include
+	gtkclist.h or gtkpixmap.h any more.
+	
+	* eel/eel-pango-extensions.h:
+	* eel/eel-pango-extensions.c: (eel_pango_attr_list_copy_or_create),
+	(eel_pango_attr_list_apply_global_attribute): New helper functions
+	used by the eel_gtk_label_set_scale and the other code in here.
+	(apply_global_attribute): New name for an old function.
+	(eel_pango_layout_set_weight): New.
+	
+	* eel/eel-wrap-table.c: (eel_wrap_table_class_init):
+	Don't add the enums, since we just get lots of complaints and we
+	don't really use them right now.
+
+2002-01-05  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "ms" to ALL_LINGUAS.
+
+2002-01-04  Havoc Pennington  <hp@pobox.com>
+
+	* eel/eel-gconf-extensions.c (eel_gconf_monitor_add): don't do the
+	recursive preload here, too much stuff in /apps/nautilus it seems
+	like. Rely on explicit preloads in other code.
+
+	* eel/eel-font-picker.c (font_picker_get_selected_style_entry):
+	add FIXME and GNOME2_CONVERSION_COMPLETE for similar
+	option_menu->menu_item issue
+
+	* eel/eel-string-picker.c (eel_string_picker_get_selected_string):
+	use gtk_option_menu_get_history() instead of setting item index 
+	as object data - option_menu->menu_item is no longer non-NULL
+	apparently, when we want it to be.
+
+	* eel/eel-gconf-extensions.c
+	(eel_gconf_value_get_eel_string_list): add a function to get an
+	EelStringList
+
+	* eel/eel-preferences-item.c
+	(preferences_item_create_enumeration_list): use emergency fallback
+	instead of default for deciding on number of string pickers
+
+	* eel/eel-graphic-effects.c: don't include art_config.h, it 
+	ended up being included twice and has no include guards
+
+	* eel/eel-preferences.c: remove user levels, remove concept of
+	installing defaults here, never "fix" invalid values in gconf
+	database (as we did when a list of enum values was invalid), don't
+	bother to cache values since GConfClient does already, remove
+	callbacks_blocked which incorrectly relied on
+	synchronicity/non-reentrancy of gconf, don't store the default
+	value, remove all suggest_sync
+	(eel_preferences_set_emergency_fallback): new function to replace
+	setting defaults
+	(eel_preferences_get_emergency_fallback): getter
+
+	* eel/eel-gconf-extensions.c (eel_gconf_preload_cache): New
+	function to allow us to get a bunch of GConf data in a single
+	round trip
+	(eel_gconf_get_default_value): new function to get the default
+	from the schema
+	
+2002-01-04  Darin Adler  <darin@bentspoon.com>
+
+	* HACKING: Update.
+	* NEWS: Update.
+	* README: Update.
+	* TODO: Update.
+	* MAINTAINERS: Update.
+	* Makefile.shared: Remove.
+
+	* configure.in: Clean up. Update requirements.
+	* eel-2.0.pc.in: Remove bogus bonobo-activation dependency.
+	* eel.spec.in: Remove bogus oaf dependency.
+	* eel/Makefile.am: Do CFLAGS and LIBS a new better way.
+	* test/Makefile.am: Change name of CFLAGS.
+
+	* eel/eel-graphic-effects.c: Get rid of extra include.
+
+2002-01-04  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-gdk-extensions.c (eel_gdk_rgb_to_color): Fix up
+	color conversion routines, as suggested by Darin.
+	(eel_self_check_gdk_rgb_to_color): Add debug function.
+	(eel_gdk_color_as_hex_string): Print all 48 bits of the
+	color.
+	(eel_self_check_gdk_extensions): Add some tests for
+	eel_gdk_rgb_to_color.
+
+2002-01-03  Darin Adler  <darin@bentspoon.com>
+
+	* test/Makefile.am:
+	* test/test-eel-font-picker.c: (main):
+	Loose ends from removing EelFontManager.
+
+2002-01-03  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gnome-extensions.c: (get_terminal_command_prefix):
+	Port to use libgnome to get terminal choice from GConf.
+
+	* eel/Makefile.am:
+	* eel/eel-font-manager.c: Remove.
+	* eel/eel-font-manager.h: Remove.
+	* eel/eel-font-picker.c:
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel.h:
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/test-eel-font-manager.c: Remove.
+	* test/test-eel-font-picker.c: (main):
+	Remove EelFontManager.
+
+2002-01-03  Darin Adler  <darin@bentspoon.com>
+
+	* RENAMING: Lets take those "-extensions" off the names of all
+	the header files, since "eel" already contains the concept that
+	it's "extensions". I'll probably do this soon since I have the
+	access to do the CVS magic now.
+
+	* eel/eel-gnome-extensions.c:
+	(eel_gnome_stock_set_icon_or_register): Remove.
+
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_window_is_on_current_workspace_and_area) Remove.
+
+	* eel/eel-gdk-font-extensions.c: (xlfd_string_get_nth_as_int):
+	* eel/eel-preferences-item.c: (update_integer_settings_at_idle):
+	* eel/eel-string.c: (eel_eat_str_to_int) (eel_self_check_string):
+	* eel/eel-string.h:
+	* test/test.c: (test_text_caption_get_text_as_int):
+	Death to eel_eat_str_to_int. I basically can't face Owen in
+	public when I know that I have an interface like that in code
+	that I wrote.
+
+2002-01-03  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-pango-extensions.c
+	* eel/eel-pango-extensions.h 
+	(eel_pango_layout_set_font_desc): Remove this function since
+	pango_layout_set_font_description does the same thing and
+	better.
+
+2002-01-03  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	* eel/eel-canvas-rect.c: Removed.
+	* eel/eel-canvas-rect.h: Removed.
+	* eel/eel-lib-self-check-functions.h:
+	Bye for now to EelCanvasRect. If we do this optimization, it
+	should be in libgnomecanvas itself.
+	
+	* eel/eel-font-picker.c: (font_picker_populate),
+	(global_font_list_free), (global_font_list_get),
+	(font_picker_find_entries_for_font):
+	Hack to get rid of asserts about empty font list. This is
+	a short term solution. Long term we have to decide what
+	we are going to offer for choosing fonts.
+
+2002-01-03  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-graphic-effects.c:
+	Fix the include. It's not legal to include art_config.h
+	directly. I added an art_misc.h include so that things
+	will work with older libart and people won't get confused.
+
+	* data/.cvsignore:
+	* data/fonts/.cvsignore:
+	* data/fonts/urw/.cvsignore:
+	Re-remove these. Michael added them back in rather than
+	deleting the obsolete files.
+
+	* test/.cvsignore:
+	Re-remove the obsolete entries in here. Again, Michael
+	added these back in rather than deleting the obsolete
+	files in his directory.
+
+2002-01-03  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c
+	(eel_gdk_pixbuf_save_to_file): use gdk-pixbuf's save code.
+
+	* eel/eel-graphic-effects.c: add art_config.h include.
+
+	* eel/eel-font-manager.c: use DATADIR not EEL_DATADIR.
+
+2002-01-03  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-pango-extensions.h:
+	* eel/eel-pango-extensions.c: Use the API Darin suggested instead
+	since that makes more sense.
+
+2002-01-02  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Remove unused libpng code.
+	* eel.spec.in: Remove libpng, fonts, and librsvg.
+
+2002-01-02  Darin Adler  <darin@bentspoon.com>
+
+	* Makefile.am:
+	* configure.in:
+	* data/: Remove all of the data, since it was fonts that are not
+	needed any more.
+
+	* configure.in:
+	* eel-2.0.pc.in:
+	Remove dependency on librsvg.
+
+	* eel/Makefile.am:
+	* eel/eel-font-picker.h:
+	* eel/eel-glyph.c: Removed.
+	* eel/eel-glyph.h: Removed.
+	* eel/eel-label.c: Removed.
+	* eel/eel-label.h: Removed.
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel-scalable-font-private.h: Removed.
+	* eel/eel-scalable-font.c: Removed.
+	* eel/eel-scalable-font.h: Removed.
+	* eel/eel-smooth-text-layout.c: Removed.
+	* eel/eel-smooth-text-layout.h: Removed.
+	* eel/eel.h:
+	* test/test-eel-font-manager.c:
+	* test/test-eel-font-picker.c: (update_font),
+	(font_changed_update_label_callback), (use_defalt_font_callback),
+	(use_defalt_bold_font_callback), (main):
+	* test/test-eel-gtk-style.c:
+	* test/test-eel-image-scrolled.c: (toggle_smooth_callback),
+	(label_window_new), (label_window_new_scrolled):
+	Remove eel-glyph, eel-label, eel-scalable-font, eel-smooth-text-layout.
+
+	* eel/eel-graphic-effects.c:
+	Remove incorrect art_config.h include.
+
+	* eel/eel-labeled-image.c: (eel_labeled_image_add),
+	(eel_labeled_image_remove), (labeled_image_ensure_label),
+	(eel_labeled_image_set_text), (eel_labeled_image_get_text):
+	* test/test-eel-viewport-constraint.c:
+	(summary_view_item_label_new):
+	Port to GtkLabel from EelLabel.
+
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/test-eel-font-simple.c: Remove.
+	* test/test-eel-font.c: Remove.
+	* test/test-eel-glyph-simple.c: Remove.
+	* test/test-eel-glyph.c: Remove.
+	* test/test-eel-label-flavorful.c: Remove.
+	* test/test-eel-label-offset.c: Remove.
+	* test/test-eel-label-scrolled.c: Remove.
+	* test/test-eel-label-simple.c: Remove.
+	* test/test-eel-label-wrapped.c: Remove.
+	* test/test-eel-label.c: Remove.
+	* test/test-eel-smooth-text-layout.c: Remove.
+	Remove test-eel-font*, test-eel-glyph*, test-eel-label*.
+
+	* test/test.h:
+	* test/test-eel-pixbuf-tile.c:
+	Change test includes around a tiny bit.
+
+2002-01-02  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	* eel/eel-clickable-image.c:
+	* eel/eel-clickable-image.h:
+	* eel/eel-label-with-background.c:
+	* eel/eel-label-with-background.h:
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel-smooth-text-layout-cache.c:
+	* eel/eel-smooth-text-layout-cache.h:
+	* eel/eel.h:
+	* test/test-eel-clickable-image.c:
+	* test/test-eel-label-background.c:
+	* test/Makefile.am:
+	* test/test.c:
+	Delete some unused classes and files. More to come.
+	
+	* eel/eel-ellipsizing-label.c: (real_finalize),
+	(eel_ellipsizing_label_class_init):
+	Use finalize instead of destroy.
+	
+	* eel/eel-labeled-image.c:
+	* eel/eel-labeled-image.h:
+	* test/test-eel-image-table.c: (labeled_image_new):
+	Remove some unused functions that are hard to implement with
+	GtkLabel (instead of EelLabel).
+
+2002-01-02  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_draw_layout):
+	Clip the ink_rect to what will fit in the buffer. This prevents
+	problems with gdk_pixbuf_composite, which doesn't help us with
+	clipping at all.
+
+2002-01-02  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gnome-extensions.c: (eel_gnome_canvas_get_pango_context):
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-extensions.c: (create_pango_ft2_context),
+	(eel_gtk_widget_get_pango_ft2_context):
+	Add new function to get a freetype2 context for drawing on the
+	client side. Code moved from the canvas-specific function that
+	was in here before.
+
+2002-01-02  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* eel/eel-background.c: (eel_background_ensure_image_scaled),
+	(eel_background_start_loading_image),
+	(eel_background_set_image_uri_helper),
+	(eel_background_set_image_uri),
+	(eel_background_set_image_uri_sync),
+	(eel_background_set_image_uri_and_color):
+	* eel/eel-background.h:
+	Add support for synchronous loading of image (needed to fix
+	flash when starting Nautilus desktop)
+
+2002-01-02  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-image-chooser.c: Use gtk_tree_model_get instead
+	of gtk_tree_model_get_value; this simplifies a lot since we 
+	don't need to fool around with GValues.
+
+2002-01-01  Anders Carlsson  <andersca@gnu.org>
+
+	* test/test-eel-image-chooser.c: Update picture paths.
+
+	* eel/eel-pango-extensions.h: New file.
+
+	* eel/eel-pango-extensions.c: New file.
+
+	* eel/eel-vfs-extensions.c (eel_read_file_async): Fix the argument
+	order.
+
+	* eel/eel-text-caption.c (eel_text_caption_init):
+	Call gtk_entry_set_activates_default.
+
+	* eel/eel-radio-button-group.c (eel_radio_button_group_insert): Enable
+	mnemonic support.
+
+	* eel/eel-image-chooser.c: Rewrite to use GtkTreeView.
+	
+	* eel/eel-image-chooser.h: Inherit from GtkTreeView and remove
+	an unused and unneeded API call.
+
+	* eel/eel-caption.c (eel_caption_set_title_label): Use
+	gtk_label_set_text_with_mnemonic instead.
+	(eel_caption_set_child): Use gtk_label_set_mnemonic_widget.
+
+2001-12-20  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_draw_layout):
+	Use ink_rect now that the pango bug that was plaguing me is fixed.
+
+	* eel/eel-gnome-extensions.c: (create_pango_context_for_aa_canvas):
+	Remove some unneeded casts.
+
+2001-12-21  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * configure.in: Added new pt translation to ALL_LINGUAS
+
+2001-12-18  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gconf-extensions.c (eel_gconf_monitor_add):
+	recursively cache the GConf keys to reduce CORBA traffic.
+
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_draw_layout):
+	Use the logical_rect to determine the left side.
+
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger):
+	Add GdkPixbuf.
+
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_draw_layout):
+	Simplified parameters.
+
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger): Turn this back on.
+	Michael turned it off by accident.
+
+2001-12-13  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_draw_layout_to_pixbuf):
+	New function for drawing with Pango. Seems to be agonizingly slow
+	due to lack of cache, but I'm not sure if that's the problem.
+	
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gnome-extensions.c: (create_pango_context_for_aa_canvas),
+	(eel_gnome_canvas_get_pango_context): Helper function for getting
+	the appropriate context when drawing to an anti-aliased GnomeCanvas.
+
+	* eel/eel-gtk-extensions.c: Add an include that's needed now that
+	I removed excess includes from eel-gnome-extensions.h.
+
+2001-12-12  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-list-column-title.c (eel_list_column_title_paint):
+	remove erroneous style unref.
+
+2001-12-11  Laszlo Peter  <laca@ireland.sun.com>
+
+	* eel/Makefile.am: add dependencies to fix building with make -j
+
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-caption-table.c: (eel_caption_table_resize),
+	(eel_caption_table_set_row_info): Use gtk+ mnemonics.
+	
+	* eel/eel-gnome-extensions.c: (icon_selected_callback),
+	(icon_cancel_pressed), (dialog_response_callback),
+	(entry_activated), (eel_gnome_icon_selector_new):
+	* eel/eel-gnome-extensions.h:
+	Bring back the eel icon selector and remove the 
+	eel_dialog_get_button_by_index function.
+	
+	* eel/eel-password-dialog.c: 
+	(caption_table_activate_callback):
+	Use gtk_window_activate_default instead of calling
+	gtk_button_clicked on the ok button.
+	(eel_password_dialog_new):
+	Use mnemonics in the Username and Password
+	labels.
+	
+2001-12-08  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-list.c: populate from stable & port
+
+	* eel/eel-list-column-title.c: build it
+
+	* eel/eel-clist.[ch]: cross port changes to Gtk+2.0's
+	version of GtkCList.
+
+	* eel/eel-ctree.[ch]: cross port changes to Gtk+2.0's
+	version of GtkCTree.
+
+	* eel/eelmarshal.list: add lots of marshallers.
+
+2001-12-07  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-art-extensions.c: (eel_art_irect_union): Add missing return.
+
+2001-12-07  Laszlo Peter  <laca@ireland.sun.com>
+
+	* eel/eel-art-extensions.c, eel/eel-debug-drawing.c: replace illegal
+	uses of the ternary operator with if-else.
+
+	* test/test-eel-clickable-image.c, test/test-eel-image-table.c:
+	s/__FUNCTION__/G_GNUC_FUNCTION/
+
+2001-12-06  Darin Adler  <darin@bentspoon.com>
+
+	* lots of files
+	Get rid of unneeded casts in calls to g_object_ref/unref.
+
+2001-12-06  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-debug.c: (log_handler): Remove the code that adds the
+	program name and pid to each message. glib now has that built
+	in if you set the G_MESSAGES_PREFIXED environment variable.
+
+	* eel/eel-debug.h:
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger),
+	New strategy for the call that makes warnings and criticals
+	stop in the debugger. We just use a hard-coded list of domains
+	here in Eel, rather than asking the caller to pass in the list
+	of domains. Forward looking to the day when we can do this
+	without explicitly doing it for each domain.
+
+	* eel/check-program.c: (main):
+	* test/test.c: (test_init):
+	Fix callers that no longer need to list the domains.
+
+2001-11-30  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	* eel/eel-background-style.c:
+	* eel/eel-background-style.h:
+	Create EelBackgroundStyle subclass for GtkStyle that implements
+	gradients. This is a better version of a hack we used for Gtk 1.X.
+	
+	* eel/eel-background.c: (eel_background_set_widget_style): Use
+	EelBackgroundStyle.
+	(eel_self_check_background): Fix an unref/sink thing.
+	
+	* eel/eel-background.c:
+	(eel_background_receive_dropped_color):
+	* test/test-eel-image-background.c:
+	(window_new_with_eel_background_gradient),
+	(window_new_with_gtk_background_hacked):
+	* test/test-eel-label-background.c:
+	(window_new_with_eel_background_gradient),
+	(window_new_with_gtk_background_hacked):
+	* test/test-eel-label.c:
+	(red_background_color_value_changed_callback),
+	(green_background_color_value_changed_callback),
+	(blue_background_color_value_changed_callback),
+	(create_background_frame):
+	* test/test-eel-viewport-constraint.c: (create_row):
+	Change all rgb:RRRR/GGGG/BBBB to use #RRGGBB format instead.
+	
+	* eel/eel-gdk-extensions.h: Fix typo in name of unimplemented
+	function. I should probably just delete it.
+	
+	* eel/eel-gdk-extensions.c:
+	(eel_gdk_color_parse_with_white_default): Add placeholder for rgb:
+	code, in case we need it.
+	(eel_parse_rgb_with_white_default): Call
+	eel_gdk_color_parse_with_white_default so we share code.
+	(eel_gdk_rgb_to_color_spec): Create #RRGGBB format.
+	(eel_gdk_color_as_hex_string): Create #RRGGBB format.
+	(eel_self_check_gdk_extensions): Use #RRGGBB format.
+
+Tue Nov 20 20:26:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add [quoting] around AC_CHECK_HEADER
+	needed by some autoconf versions.
+
+Mon Nov 19 17:34:16 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+	* eel/eel-stock-dialogs.c (eel_run_simple_dialog): remove uneeded
+	GTK_OBJECT_DESTROYED check.
+
+	Patch from Gediminas Paulauskas <menesis@delfi.lt>
+
+	* eel/check-program.c, eel/eel-debug.c, test/test.c: replace
+	g_log_domain_glib with "Glib"
+	* eel/eel-gobject-extensions.h: replace #include <gobject/gobject.h>
+	with glib-object.h
+
+2001-11-09  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-stock-dialogs.c: (show_ok_dialog),
+	(eel_create_info_dialog), (eel_show_info_dialog),
+	(details_dialog_response_callback): Destroy dialogs when the
+	button is pushed. We still need to refine this further.
+
+2001-11-08  Darin Adler  <darin@bentspoon.com>
+
+	* Tons of files.
+	Removed many unneeded G_OBJECT casts.
+
+2001-11-08  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-stock-dialogs.h:
+	* eel/eel-stock-dialogs.c:
+	A cut at porting this all to GtkDialog.
+
+2001-11-08  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: call ourselves eel rather than eel2, and use
+	eel-2.0 for the gettext package name
+
+	* acconfig.h: add GETTEXT_PACKAGE
+
+2001-11-06  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	* eel/eel-gobject-extensions.h:
+	* eel/eel-gobject-extensions.c:
+	(eel_signal_connect_object_while_alive),
+	(eel_signal_connect_while_alive):
+	Add new eel-gobject-extensions.[ch].
+
+	* Many of files.
+	More Gtk->G changes.
+
+2001-11-06  Darin Adler  <darin@bentspoon.com>
+
+	* Lots of files.
+	More GtkObject -> GObject.
+
+2001-11-06  Michael Meeks  <michael@ximian.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c
+	(free_pixbuf_load_handle): do a g_object_unref not an
+	unref.
+
+2001-11-03  Darin Adler  <darin@bentspoon.com>
+
+	* Tons of files:
+	A bit more GtkObject -> GObject conversion.
+
+2001-11-03  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-macros.h: Ref the parent class instead of just
+	peeking at it.
+
+2001-11-03  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-preferences.c: (preferences_while_alive_disconnector),
+	(eel_preferences_add_callback_while_alive):
+	* eel/eel-preferences.h:
+	Change eel_preferences_add_callback_while_alive to work with
+	any GObject, not just a GtkObject.
+
+	* eel/eel-preferences-box.c: (eel_preferences_box_init):
+	* eel/eel-preferences-item.c: (preferences_item_set_main_child):
+	* eel/eel-preferences-pane.c: (eel_preferences_pane_init),
+	(eel_preferences_pane_add_control_preference):
+	Update callers.
+
+2001-11-03  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-macros.h:
+	Another update to the boilerplate macros. I also decided to
+	do a name change to take out the word "DEFINE".
+
+	* Many files.
+	Update for name change.
+
+2001-11-01  Havoc Pennington  <hp@pobox.com>
+
+	* eel/eel-gtk-extensions.c (eel_gtk_window_get_geometry_string):
+	new function to replace gnome_geometry_string
+
+2001-11-01  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-macros.h: When I fixed the comma in my copy, I
+	made some formatting changes.
+
+2001-11-01  Havoc Pennington  <hp@pobox.com>
+
+	* eel/eel-gtk-macros.h (EEL_DEFINE_BONOBO_BOILERPLATE): add
+	missing comma
+
+	* test/test-eel-label-simple.c (use_system_font_callback): adapt 
+	to not use eel_widget_set_font(), and add note about how the use
+	of eel_gtk_get_system_font() here is broken and is only for
+	testing purposes and no one should copy it.
+
+	* eel/eel-gtk-extensions.c (eel_gtk_window_present): that one was
+	easy
+	(eel_gtk_widget_set_font_by_name): port to GTK 2
+	(eel_gtk_label_make_bold): port to GTK 2
+	(eel_gtk_label_make_larger): port and note in docs that it's
+	broken
+	(eel_gtk_label_make_smaller): port and note in docs that it's
+	broken
+	(eel_gtk_widget_set_background_color): do this properly
+	(eel_gtk_widget_set_foreground_color): ditto
+	(eel_get_current_event_time): remove, just use
+	gtk_get_current_event_time()
+	(eel_drag_set_icon_pixbuf): remove, just use
+	gtk_drag_set_icon_pixbuf()
+	(eel_gtk_widget_standard_draw): delete, there is no draw method
+	anymore
+	(eel_gtk_pixmap_new_empty): make this less lame
+	(eel_nullify_when_destroyed): work on GObject, use
+	g_object_add_weak_pointer()
+	(eel_nullify_cancel): corresponding change
+	(eel_gtk_widget_set_font): remove, just use
+	gtk_widget_modify_font()
+	(eel_gtk_style_set_font): delete, this was totally broken; I don't
+	know what it's for but we have to do it a different way
+	(eel_gtk_menu_insert_separator): use GtkSeparatorMenuItem!
+	woo-hoo! also, remove setting it insensitive, this will be fixed
+	before 2.0 so it isn't required
+	(EEL_STANDARD_BUTTON_PADDING): remove, should fix in GTK if we are
+	going to fix it
+	(eel_gtk_button_auto_click): remove, use gtk_widget_activate()
+	(eel_gtk_button_set_standard_padding): remove, should not be used
+	(activate_button_on_double_click): use gtk_widget_activate()
+	instead of eel_gtk_button_auto_click()
+	(eel_gtk_window_set_initial_geometry): use gtk_window_move()
+	instead of gtk_widget_set_uposition()
+	(eel_gtk_window_set_up_close_accelerator): make it whine if you
+	use it on GtkDialog, since that breaks the standard GtkDialog
+	close accelerators
+	(eel_popup_menu_position_func): remove obsolete FIXME about
+	GdkPoint using gint16
+
+	* eel/eel-gdk-extensions.c (eel_gdk_window_set_invisible_cursor):
+	port to GTK 2 (not sure why it used Xlib before)
+
+	* eel/eel-dnd.c (eel_drag_drop_action_ask): port to GTK 2
+
+2001-11-01  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-macros.h: Oops, need to pass init and fini functions
+	in to bonobo_type_unique.
+
+2001-11-01  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Remove some unused stuff.
+	* eel/eel-gtk-macros.h: Fix boilerplate to work with GObject, not
+	just GtkObject. Share code with the BonoboObject case too.
+
+2001-10-29  Darin Adler  <darin@bentspoon.com>
+
+	* eel-2.0.pc.in: Add some Requires.
+
+2001-10-29  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am: Fix typo.
+
+2001-10-28  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Fix comment, remove unnecessary direct pkgconfig
+	macro since GNOME_PLATFORM_GNOME_2 takes care of htat.
+
+	* many files:
+	Since everyone else calls them class_init and init, renamed our
+	initialize_class and initialize to match existing practice.
+
+	* eel/eel-gtk-macros.h:
+	Added EEL_DEFINE_BONOBO_BOILERPLATE.
+
+	* eel/eel-xml-extensions.h:
+	* eel/eel-xml-extensions.c: (eel_xml_remove_node): Remove this
+	since xmlUnlinkNode is now implemented.
+
+2001-10-27  jacob berkman  <jacob@ximian.com>
+
+	* eel/eel-background.c (eel_background_start_loading_image):
+	update to new vfs priority macro name
+
+2001-10-22  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-extensions.c: (eel_gdk_window_set_wm_protocols):
+	* eel/eel-gdk-font-extensions.c: (eel_gdk_font_get_name):
+	Fix for GdkAtom/XAtom change in gtk.
+
+2001-10-20  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-background.c: (eel_background_start_loading_image):
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_load_async):
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-vfs-extensions.c: (eel_read_file_async),
+	(eel_read_entire_file_async):
+	* eel/eel-vfs-extensions.h: Update async eel functions using gnome-vfs
+	to take a priority argument because of the recent priority changes in
+	gnome-vfs.
+
+2001-10-11  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-clickable-image.c: (eel_clickable_image_new_solid):
+	* eel/eel-image-chooser.c: (eel_image_chooser_insert_row):
+	* eel/eel-image.c: (eel_image_initialize_class),
+	(eel_image_initialize), (eel_image_finalize), (eel_image_set_arg),
+	(eel_image_get_arg), (eel_image_size_request),
+	(eel_image_expose_event), (eel_image_new_solid):
+	* eel/eel-image.h:
+	* eel/eel-label.c: (eel_label_initialize_class),
+	(eel_label_initialize), (eel_label_finalize), (eel_label_set_arg),
+	(eel_label_get_arg), (eel_label_size_request), (label_paint),
+	(paint_label_smooth), (paint_label_smooth_cached),
+	(eel_label_expose_event), (label_can_cache_contents),
+	(eel_label_new_solid):
+	* eel/eel-label.h:
+	* eel/eel-labeled-image.c: (eel_labeled_image_make_smaller):
+	* eel/eel-labeled-image.h:
+	* eel/eel-smooth-widget.c: (eel_smooth_widget_paint),
+	(eel_smooth_widget_get_preferred_dimensions):
+	* eel/eel-smooth-widget.h:
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/test-eel-image-background.c:
+	(window_new_with_eel_background_image),
+	(window_new_with_eel_background_gradient),
+	(window_new_with_gtk_background),
+	(window_new_with_gtk_background_hacked),
+	(window_new_with_solid_background):
+	* test/test-eel-image-simple.c: (image_window_new), (main):
+	* test/test-eel-image-tile.c:
+	* test/test-eel-image.c:
+	* test/test-eel-label-background.c:
+	(window_new_with_eel_background_image),
+	(window_new_with_eel_background_gradient),
+	(window_new_with_gtk_background),
+	(window_new_with_gtk_background_hacked),
+	(window_new_with_solid_background):
+	* test/test-eel-label-scrolled.c: (label_window_new),
+	(label_window_new_scrolled), (label_window_new_table):
+	* test/test-eel-labeled-image.c: (main):
+	* test/test-eel-viewport-constraint.c: (create_eel_label):
+	* test/test.c: (test_image_new), (test_label_new):
+	* test/test.h:
+	Lose the "tile" feature of EelImage and EelLabel.  The short story
+	is that this code is unnecessary.  Losing it makes the widgets
+	simpler and should make the transition to using GtkImage from Gtk+
+	2.0 a little easier.  Blame 70% Arlo 30% Ramiro for this "feature."
+	
+2001-10-10  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-debug-drawing.c:
+	* eel/eel-label.c:
+	* eel/eel-smooth-text-layout.c:
+	Mark functions static for proper namespace hygiene.
+
+2001-10-02  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-canvas-rect.c: (test_diff_rects): Change call to
+	g_string_printfa to use g_string_append_printf.
+
+2001-10-02  Darin Adler  <darin@bentspoon.com>
+
+	* .cvsignore:
+	* Makefile.am:
+	* configure.in:
+	Remove use of xml-i18n-tools, since we don't have anything that
+	we use it to localize.
+
+2001-10-02  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-background.c: (eel_background_is_dark): Remove extra
+	factor of two that was making every background seem dark.
+
+2001-10-01  Darin Adler  <darin@bentspoon.com>
+
+      	Now that we are setting the translation domain properly to make
+        _() use eel translations, we must use explicit gettext calls
+        when we want application translations.
+
+        * eel/eel-dnd.c: (eel_drag_drop_action_ask): Switch into the
+        eel domain when calling gnome_popup_menu_new so we get the
+        eel translations of the menu items.
+
+        * eel/eel-enumeration.c:
+        (eel_enumeration_get_nth_description_translated):
+        * eel/eel-preferences-box.c: (preferences_box_populate_pane),
+        (eel_preferences_box_populate):
+        * eel/eel-xml-extensions.c: (eel_xml_get_property_translated):
+        Use gettext, not _(), to translate strings passed from elsewhere.
+
+        * eel/eel-preferences.c:
+        (eel_preferences_get_user_level_name_for_display):
+        Use _(), not gettext, to translate strings in this code.
+
+        * eel/eel-gdk-font-extensions.c:
+        Remove gnome-i18n.h include where it's not used.
+
+	* configure.in: Remove unused @REBUILD@ stuff.
+	* eel/eel-glib-extensions.c: Whitespace tweaks.
+	
+2001-09-28  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-font-manager.c: (eel_self_check_font_manager):
+	Cleaned up tests a bit.
+
+	* eel/eel-string-list.c: (eel_self_check_string_list):
+	Changed test results back now that g_strsplit behavior has been
+	changed in glib.
+
+	* configure.in: Bump required glib version to 1.3.9.
+
+2001-09-28  Darin Adler  <darin@bentspoon.com>
+
+	Port from destroy to finalize.
+
+	* eel/eel-background.c: (eel_background_initialize_class),
+	(eel_background_finalize):
+	* eel/eel-canvas-rect.c: (rect_finalize),
+	(eel_canvas_rect_initialize_class):
+	* eel/eel-caption-table.c: (eel_caption_table_initialize_class),
+	(caption_table_finalize):
+	* eel/eel-caption.c: (eel_caption_initialize_class),
+	(eel_caption_finalize):
+	* eel/eel-clickable-image.c:
+	(eel_clickable_image_initialize_class),
+	(eel_clickable_image_finalize):
+	* eel/eel-debug-drawing.c: (debug_pixbuf_viewer_initialize_class),
+	(debug_pixbuf_viewer_finalize):
+	* eel/eel-font-picker.c: (eel_font_picker_initialize_class),
+	(eel_font_picker_finalize):
+	* eel/eel-gtk-extensions.c: (eel_gtk_style_set_font),
+	(eel_gtk_widget_set_font), (eel_gtk_get_system_font):
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-image-chooser.c: (eel_image_chooser_initialize_class),
+	(eel_image_chooser_finalize), (eel_image_chooser_destroy):
+	* eel/eel-image-table.c: (eel_image_table_initialize_class),
+	(eel_image_table_finalize):
+	* eel/eel-image.c: (eel_image_initialize_class),
+	(eel_image_finalize):
+	* eel/eel-label.c: (eel_label_initialize_class),
+	(eel_label_finalize):
+	* eel/eel-labeled-image.c: (eel_labeled_image_initialize_class),
+	(eel_labeled_image_finalize):
+	* eel/eel-list-column-title.c:
+	(eel_list_column_title_initialize_class),
+	(eel_list_column_title_finalize):
+	* eel/eel-password-dialog.c:
+	(eel_password_dialog_initialize_class),
+	(eel_password_dialog_initialize), (eel_password_dialog_finalize),
+	(eel_password_dialog_new):
+	* eel/eel-preferences-box.c:
+	(eel_preferences_box_initialize_class),
+	(eel_preferences_box_finalize):
+	* eel/eel-preferences-group.c:
+	(eel_preferences_group_initialize_class),
+	(eel_preferences_group_finalize):
+	* eel/eel-preferences-item.c:
+	(eel_preferences_item_initialize_class),
+	(preferences_item_finalize):
+	* eel/eel-preferences-pane.c:
+	(eel_preferences_pane_initialize_class),
+	(eel_preferences_pane_finalize):
+	* eel/eel-radio-button-group.c:
+	(eel_radio_button_group_initialize_class),
+	(eel_radio_button_group_finalize):
+	* eel/eel-scalable-font.c: (eel_scalable_font_initialize_class),
+	(eel_scalable_font_finalize):
+	* eel/eel-smooth-text-layout-cache.c:
+	(eel_smooth_text_layout_cache_initialize_class),
+	(eel_smooth_text_layout_cache_finalize):
+	* eel/eel-smooth-text-layout.c:
+	(eel_smooth_text_layout_initialize_class),
+	(eel_smooth_text_layout_finalize):
+	* eel/eel-string-picker.c: (eel_string_picker_initialize_class),
+	(eel_string_picker_finalize):
+	* eel/eel-text-caption.c: (eel_text_caption_initialize_class),
+	(eel_text_caption_finalize):
+	* eel/eel-viewport.c: (eel_viewport_initialize_class),
+	(eel_viewport_finalize):
+	* eel/eel-wrap-table.c: (eel_wrap_table_initialize_class),
+	(eel_wrap_table_finalize):
+	Replace destroy default handlers with finalize ones in most cases.
+	In a few cases, divide an existing destroy handler into two pieces.
+
+	* test/test-eel-label-flavorful.c: (decreasing_label_window_new):
+	* test/test-eel-label-simple.c: (use_system_font_callback):
+	Re-enable some test code.
+
+2001-09-27  Darin Adler  <darin@bentspoon.com>
+
+	* test/test-eel-label-flavorful.c: (label_set_label_to_font_name):
+	Oops. One more thing to fix in here. Use pango call.
+
+2001-09-26  Darin Adler  <darin@bentspoon.com>
+
+	* eel/Makefile.am:
+	Another pass. The last one was too simplistic.
+
+2001-09-26  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in:
+	Get the path of glib-genmarshal.
+
+	* eel/.cvsignore:
+	* eel/Makefile.am:
+	Fix up generated file build to be simpler. Most importantly, add
+	the feature where it won't recompile everything every time any
+	header changes.
+
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-extensions.c: (eel_gtk_get_system_font):
+	Wrote Pango version of this function.
+
+	* test/test-eel-label-flavorful.c: (label_set_label_to_font_name):
+	Reenabled some ifdef'd out code.
+
+2001-09-19  Marius Andreiana  <mandreiana@yahoo.com>
+
+	* configure.in: Added ro (Romanian) to ALL_LINGUAS
+	
+2001-09-18  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-ellipsizing-label.c: (recompute_ellipsized_text):
+	* eel/eel-gdk-pixbuf-extensions.c: (check_average_value):
+	* eel/eel-gtk-extensions.c: (eel_gtk_widget_set_font_by_name),
+	(eel_gtk_label_make_bold), (eel_gtk_label_make_larger),
+	(eel_gtk_label_make_smaller):
+	* test/test-eel-label-flavorful.c: (label_set_label_to_font_name):
+	* test/test-eel-label-simple.c: (use_system_font_callback):
+
+	Turned off a lot of GdkFont stuff so we can still compile.
+	This highlights more of the gnome 2 conversion work that will
+	be needed.
+
+2001-09-17  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-background.c: (eel_background_is_dark): Make this work
+	with background images that are transparent or partly-transparent.
+	It turns out this was another part of the problem with the default
+	Nautilus theme's text color.
+	
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_average_value):
+	Fix bug that caused incorrect average values in pixbufs with more
+	than about 66000 pixels. Alex Larsson found the problem and
+	provided a fix that I used as a starting point. Also change
+	algorithm so that it handles the alpha channel. Also made it use
+	64-bit arithmetic for simplicity -- hope that doesn't make it too
+	slow. Also changed it to use an argb value instead of a GdkColor.
+	(eel_gdk_pixbuf_intersect): Get rid of special case for
+	eel_gdk_pixbuf_whole_pixbuf by making just using a wide-open
+	rectangle instead.
+	(check_average_value), (eel_self_check_gdk_pixbuf_extensions):
+	Added some test cases for eel_gdk_pixbuf_average_value.
+
+2001-09-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
+2001-09-07  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-font-extensions.h:
+	* eel/eel-gdk-font-extensions.c: (eel_gdk_font_get_italic),
+	(eel_gdk_font_get_bold), (eel_gdk_font_get_larger),
+	(eel_gdk_font_get_largest_fitting), (font_get_bold),
+	(font_get_size_in_pixels): Call the new eel_gdk_font_get_name.
+	(eel_gdk_font_get_name): Public version of font_get_name. Code
+	stolen from gal used to get name from X.
+
+	* test/test-eel-label-flavorful.c: (label_set_label_to_font_name):
+	Call eel_gdk_font_get_name, remove font_get_name.
+
+2001-09-07  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Got rid of dependency on libgnomesupport.
+
+	* eel/eel-gdk-font-extensions.c: (font_get_name):
+	* test/test-eel-label-flavorful.c: (font_get_name):
+	Disabled these until we can figure out what to do about them.
+
+2001-09-03  Darin Adler  <darin@bentspoon.com>
+
+	* eel/check-program.c: (main):
+	* test/test-eel-password-dialog.c: (main):
+	* test/test-eel-widgets.c: (main):
+	* test/test.c: (test_init):
+	Use libgnomeui_module_info_get () instead of
+	libgnomeui_module_info.
+
+2001-09-01  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-extensions.c: Remove include.
+
+2001-09-01  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-dnd.c:
+	(is_path_that_gnome_uri_list_extract_filenames_can_parse):
+	* eel/eel-font-manager.c: (font_description_table_add),
+	(next_token):
+	* eel/eel-glib-extensions.c: (eel_strdup_strftime):
+	* eel/eel-string.c: (eel_istr_has_prefix), (eel_istr_has_suffix),
+	(eel_str_to_int), (eel_str_capitalize):
+	Oops! How did I miss all of these places that needed to use
+	the new g_ascii_* calls?
+
+2001-08-31  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-background.c:
+	* eel/eel-dnd.c:
+	* eel/eel-font-manager.c:
+	* eel/eel-glib-extensions.c:
+	* eel/eel-list.c:
+	* eel/eel-string.c:
+	* eel/eel-vfs-extensions.c: (is_valid_scheme_character),
+	(eel_make_uri_canonical):
+	Get rid of all includes of <ctype.h> and use non-locale-specific
+	g_ascii_* calls from glib instead.
+
+2001-08-31  Darin Adler  <darin@bentspoon.com>
+
+	Rolled change from stable eel-1-0 branch:
+
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_class_name_make_like_existing_type),
+	(eel_gtk_get_system_font): Fix storage leaks by using
+	gtk_object_sink to get rid of temporary widgets that are never
+	parented instead of using gtk_object_destroy.
+
+2001-08-31  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-extensions.c: (eel_gtk_window_present):
+	Get things compiling again by getting rid of code that uses
+	gnome_win_hints (for now).
+
+2001-08-31  Abel Cheung  <maddog@linux.org.hk>
+
+	* configure.in (ALL_LINGUAS): zh_TW.Big5 -> zh_TW
+
+2001-08-27  Darin Adler  <darin@bentspoon.com>
+
+	Rolled change from stable eel-1-0 branch:
+	
+	2001-08-27  Alex Larsson  <alexl@redhat.com>
+	
+	* eel/eel-list-column-title.c (truncate_string):
+	Fix elipsis truncation on multibyte locales.
+
+2001-08-27  Anders Carlsson  <andersca@gnu.org>
+
+	* eel/eel-font-manager.c (eel_self_check_font_manager): Remove
+	unused original_current_dir variable.
+
+ 	* eel/eel-canvas-rect.c (rect_update): Free our fill_svp
+ 	if it exists.
+ 
+ 	* eel/eel-gdk-font-extensions.c (xlfd_string_get_nth_as_int): 
+ 	Free strings returned by xlfd_string_get_nth.
+
+2001-08-24  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Require librsvg 1.1, not 1.1.0.
+	* eel/eel-glyph.c: Use header from libart, not librsvg.
+
+2001-08-22  Ramiro Estrugo  <ramiro@fateware.com>
+
+	Change from the stable eel-1-0 branch.
+
+	* eel/eel-gconf-extensions.c: (eel_gconf_value_set_string_list):
+	Fix leaks introduced in last checkin.
+
+2001-08-22  Ramiro Estrugo  <ramiro@fateware.com>
+
+	Change from the stable eel-1-0 branch.
+
+	* eel/eel-gconf-extensions.h:
+	* eel/eel-gconf-extensions.c: (eel_gconf_is_default): Use value
+	free cover that does its own not NULL checking.
+	(eel_gconf_value_get_string_list),
+	(eel_gconf_value_set_string_list): New function to deal with
+	GConfValue lists of GNONF_VALUE_STRING type.
+
+	* eel/eel-preferences.c: (preferences_gconf_value_get_int),
+	(preferences_gconf_value_get_bool),
+	(preferences_gconf_value_get_string),
+	(preferences_gconf_value_get_string_list), (preferences_get_value),
+	(preferences_preference_is_gconf_key), (preferences_key_make),
+	(preferences_find_first_non_null_default_value),
+	(eel_preferences_get_visible_user_level),
+	(eel_preferences_set_visible_user_level),
+	(eel_preferences_set_is_invisible), (eel_preferences_set_boolean),
+	(eel_preferences_get_boolean), (eel_preferences_set_integer),
+	(eel_preferences_get_integer), (eel_preferences_set),
+	(eel_preferences_get), (eel_preferences_set_string_list),
+	(eel_preferences_get_string_list),
+	(eel_preferences_default_set_integer),
+	(eel_preferences_default_get_integer),
+	(eel_preferences_default_set_boolean),
+	(eel_preferences_default_get_boolean),
+	(eel_preferences_default_set_string),
+	(eel_preferences_default_get_string),
+	(eel_preferences_default_set_string_list),
+	(eel_preferences_default_get_string_list),
+	(preferences_entry_invoke_callbacks_if_needed),
+	(preferences_entry_update_cached_value),
+	(preferences_entry_ensure_gconf_connection),
+	(preferences_entry_free), (preferences_global_table_free),
+	(eel_preferences_add_callback), (eel_preferences_add_auto_string),
+	(eel_preferences_add_auto_string_list),
+	(eel_preferences_add_auto_integer),
+	(eel_preferences_add_auto_boolean),
+	(eel_preferences_remove_auto_string),
+	(eel_preferences_remove_auto_string_list),
+	(eel_preferences_remove_auto_integer),
+	(eel_preferences_remove_auto_boolean),
+	(preferences_while_alive_disconnector),
+	(eel_preferences_add_callback_while_alive),
+	(eel_preferences_remove_callback),
+	(eel_preferences_set_description),
+	(eel_preferences_set_enumeration_id),
+	(eel_preferences_visible_in_current_user_level),
+	(eel_preferences_initialize):
+	Cleanup whacky system where preference visibilities and default
+	values were stored using gconf.  Instead, store the visibilities
+	and defaults values in the already existing table of preferences.
+	The changes make this code a bit simpler.  In particular, the code
+	to create the right keys is now gone.  Add some covers for getting
+	values out of GConfValue safely and with some extra checking the
+	the types are right.
+
+2001-08-21  Maciej Stachowiak  <mjs@anarchy.noisehavoc.org>
+
+	Merge from stable branch:
+	
+	2001-08-20  Maciej Stachowiak  <mjs@noisehavoc.org>
+ 
+ 	* eel/eel-clist.c: (eel_clist_set_column_justification,
+ 	size_allocate_title_buttons): Try to remove some sources of
+ 	crashing when EelList is used as a drop-in replacement for
+ 	GtkCList. (Using EelCList directly still crashes).
+ 	* eel/eel-list-column-title.c: (eel_list_column_title_paint): More
+ 	potential crash reduction.
+ 
+ 	* test/Makefile.am: Speed up the build a bit by removing some
+ 	redundant libraries.
+ 	* eel/Makefile.am: Likewise.
+
+2001-08-21  Maciej Stachowiak  <mjs@noisehavoc.org>
+
+	* eel/eel-font-manager.c (collect_fonts_from_directory): Adjust to
+	recent removal of filtering from gnome-vfs.
+
+2001-08-21  Maciej Stachowiak  <mjs@eazel.com>
+
+	Merge from eel-1-0 branch:
+
+	2001-07-20  Maciej Stachowiak  <mjs@eazel.com>
+ 
+        * eel/eel-ctree.c: (draw_row): Fix bugzilla.eazel.com bug 8387
+ 	(Dragging elements to a folder entry should make it hilighted) by
+	making the text of the drop target row bold in addition to making
+	the icon darker. I think this looks a lot better.
+ 
+2001-08-17  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gtk-extensions.c: Remove include of obsolete header.
+
+2001-08-17  Ramiro Estrugo  <ramiro@fateware.com>
+
+	Change from the stable eel-1-0 branch.
+	
+	Make these widgets more useful outside Nautilus by providing
+	functions to change ui elements (such as titles and descriptions)
+	as well iterators.
+
+	These changes do not affect either binary or source compatibility
+	for Nautilus.
+	
+	* eel/eel-preferences-box.h:
+	* eel/eel-preferences-box.c:
+	(preferences_box_populate_pane), (eel_preferences_dialog_new),
+	(eel_preferences_dialog_get_box), Add accessor for the preferences
+	box of a dialog.
+	(eel_preferences_dialog_populate), Separate the populate function
+	out on its own.
+	(eel_preferences_box_for_each_pane), New function for iterating
+	panes.
+	(eel_preferences_box_rename_pane), New function to rename a pane.
+	(eel_preferences_box_get_pane_name): New function to find the name
+	of a pane.
+
+	* eel/eel-preferences-group.h:
+	* eel/eel-preferences-group.c:
+	(eel_preferences_group_set_title_label), New function for changing
+	the title label of a group.
+	(eel_preferences_group_for_each_item): New function for iterating
+	items.
+
+	* eel/eel-preferences-pane.h:
+	* eel/eel-preferences-pane.c: (eel_preferences_pane_initialize),
+	(eel_preferences_pane_destroy), (eel_preferences_pane_new),
+	(eel_preferences_pane_add_group),
+	(preferences_pane_get_max_caption_width),
+	(eel_preferences_pane_update),
+	(eel_preferences_pane_add_control_preference), Use more consistent
+	paramter names.
+	(eel_preferences_pane_for_each_group): New function for iterating
+	groups.
+
+	* eel/eel-preferences-item.h:
+	* eel/eel-preferences-item.c:
+	* eel/eelmarshal.list:
+	(eel_preferences_item_initialize_class),
+	(preferences_item_update_custom),
+	(preferences_item_set_main_child),
+	(preferences_item_create_enumeration_list),
+	(preferences_item_create_boolean),
+	(preferences_item_create_editable_string),
+	(preferences_item_create_editable_integer),
+	(preferences_item_create_enumeration_menu),
+	(preferences_item_create_font),
+	(preferences_item_create_smooth_font),
+	(eel_preferences_item_get_name), (update_text_settings_at_idle),
+	(preferences_item_update_text_settings_at_idle),
+	(update_integer_settings_at_idle),
+	(preferences_item_update_editable_integer_settings_at_idle),
+	(preferences_item_update_description),
+	(eel_preferences_item_set_control_preference),
+	(eel_preferences_item_set_control_action),
+	(preferences_item_get_control_showing),
+	(eel_preferences_item_enumeration_list_set_unique_exceptions),
+	(eel_preferences_item_set_description):
+	Add new functions for changing the descriptions of items.  Factor
+	out the code to set descriptions into its own function and make
+	that public.  Use more consistent parameter names.  Add signal for
+	notifying custom items about description changes.
+
+2001-08-15  Darin Adler  <darin@bentspoon.com>
+
+	Remove some glib extensions that are obviated by additions to
+	glib 2.0.
+
+	* eel/eel-glib-extensions.h: Remove EEL_N_ELEMENTS (G_N_ELEMENTS),
+	eel_g_list_safe_for_each (g_list_foreach), eel_g_list_sort_custom
+	(g_list_sort_with_data), eel_g_string_append_len (g_string_append_len),
+	eel_g_hash_table_remove_deep_custom, eel_g_hash_table_remove_deep,
+	eel_g_hash_table_destroy_deep_custom, eel_g_hash_table_destroy_deep
+	(use g_hash_table_new_full instead), eel_g_ptr_array_sort
+	(g_ptr_array_sort_with_data), eel_shell_quote (g_shell_quote).
+.
+	* eel/eel-glib-extensions.c: (eel_strdup_strftime):
+	Use g_string_append_len instead of eel_g_string_append_len.
+	(eel_dumb_down_for_multi_byte_locale_hack): Use G_N_ELEMENTS
+	instead of EEL_N_ELEMENTS.
+	(eel_self_check_glib_extensions): Test g_shell_quote instead
+	of eel_shell_quote.
+
+	* eel/eel-gnome-extensions.c: (try_terminal_command),
+	(try_terminal_command_argv), (get_terminal_command_prefix),
+	(eel_gnome_make_terminal_command):
+	Use g_shell_quote instead of eel_shell_quote.
+
+	* eel/eel-gtk-extensions.c: (eel_gtk_object_list_unref):
+	Use g_list_foreach instead of eel_g_list_safe_for_each.
+
+	* eel/eel-scalable-font.c: (free_global_font_handle_table),
+	(initialize_global_stuff_if_needed):
+	Use g_hash_table_new_full instead of eel_g_hash_table_destroy_deep_custom.
+
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger):
+	* eel/eel-font-manager.c: (font_directory_is_ignored),
+	(font_foundry_is_ignored), (font_family_is_ignored),
+	(eel_font_manager_get_default_font),
+	(eel_font_manager_get_default_bold_font):
+	* eel/eel-font-picker.c: (font_make_style_name):
+	* eel/eel-list.c: (eel_list_initialize_dnd),
+	(get_data_on_first_target_we_support):
+	* test/test-eel-gtk-style.c:
+	* test/test-eel-image-chooser.c: (populate_image_chooser_callback),
+	(populate_button_group_callback):
+	* test/test-eel-image-table.c: (labeled_image_new),
+	(image_table_new_scrolled):
+	* test/test-eel-image.c: (main):
+	Use G_N_ELEMENTS instead of EEL_N_ELEMENTS.
+
+Wed Aug 15 16:32:56 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* eel/eel-dnd.c (eel_drag_default_drop_action_for_icons): make the
+	trash directory.
+
+2001-08-15  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c: Use a 64K buffer instead of
+	a 4K one.
+
+2001-08-14  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-font-manager.c: (eel_font_manager_get_bold):
+	Remove another ill-advised call to
+	eel_font_manager_file_is_scalable_font. Even if we do want
+	to test the file's type, we definitely don't want to do it
+	inside g_return_if_fail.
+
+2001-08-14  Alex Larsson  <alexl@redhat.com>
+
+	* eel/eel-scalable-font.c (eel_scalable_font_new):
+	Don't test eel_font_manager_file_is_scalable_font (),
+	it does slow I/O.
+	(eel_scalable_font_get_default_font,
+	eel_scalable_font_get_default_bold_font):
+	Don't keep recreating new EelScalableFonts for the
+	default font.
+
+2001-08-13  Darin Adler  <darin@bentspoon.com>
+	
+	* eel/eel-background.c: (eel_background_load_image_callback),
+	(draw_background_callback), (render_background_callback),
+	(eel_background_set_up_canvas):
+	Replace the old EelBackgroundCanvasGroup hack with code that uses
+	the new draw_background and render_background signals in
+	GnomeCanvas.
+
+	* eel/Makefile.am:
+	* eel/eel-background-canvas-group.c:
+	* eel/eel-background-canvas-group.h:
+	Remove the old EelBackgroundCanvasGroup class.
+
+2001-08-09  Ramiro Estrugo  <ramiro@fateware.com>
+
+	Change from the eel-1-0 branch.
+	
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-extensions.c: (eel_art_point_assign),
+	(eel_art_point_clamp), (eel_art_point_offset_by):
+	Add ArtPoint version of some functions.
+
+2001-08-08  Darin Adler  <darin@bentspoon.com>
+
+	* autogen.sh: No need for hack-macros any more.
+	* configure.in: No need to check for freetype, since
+	we don't depend on it directly. We use it via librsvg.
+	* eel.spec.in: No need to check for freetype.
+
+2001-08-06  Darin Adler  <darin@bentspoon.com>
+
+	* autogen.sh: No need to gettextize, xml-i18n-toolize, and
+	libtoolize twice.
+	* configure.in: Switch from lots of GNOME_PKGCONFIG_CHECK_MODULES
+	calls to a lot fewer PKG_CHECK_MODULES calls. More oaf ->
+	bonobo-activation renaming. No need to build intl directory.
+	* Makefile.am: No need to build intl directory.
+
+	* test/Makefile.am: No need to use -I to include this directory.
+	
+	* eel/check-program.c:
+	* test/test-eel-password-dialog.c:
+	* test/test-eel-widgets.c:
+	<libgnomeui/gnome-init.h> -> <libgnomeui/gnome-ui-init.h>.
+	
+2001-07-26  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Fix option checking code. Before it was setting
+	VFS_CFLAGS, which was wrong.
+	
+	* eel/Makefile.am: Add -DG_DISABLE_DEPRECATED.
+	
+	* eel/eel-background.c: (eel_widget_background_changed):
+	Use gtk_widget_queue_draw instead of gtk_widget_queue_clear.
+	* eel/eel-canvas-rect.c: (test_diff_rects): Use g_string_printfa
+	instead of g_string_sprintfa.
+	* eel/eel-caption.c: (eel_caption_get_title_label): Use
+	gtk_label_get_text instead of gtk_label_get.
+	* eel/eel-clickable-image.c:
+	(eel_clickable_image_initialize_class): Use g_signal_new instead
+	of gtk_signal_new.
+	(label_enter), (label_leave), (label_handle_button_release): Use
+	g_signal_emit instead of gtk_signal_emit.
+	* eel/eel-debug-drawing.c: (eel_debug_show_pixbuf): Use
+	gtk_window_set_resizable instead of gtk_window_set_policy.
+	* eel/eel-font-picker.c: (font_picker_populate): Use
+	gtk_radio_menu_item_get_group instead of gtk_radio_menu_item_group.
+	* eel/eel-gdk-extensions.c: (eel_fill_rectangle_with_color),
+	(eel_gdk_gc_choose_foreground_color): Get rid of unneeded calls to
+	gdk_rgb_init.
+	* eel/eel-glib-extensions.c: (eel_test_predicate): Use
+	g_ascii_strcasecmp instead of g_strcasecmp.
+	* eel/eel-gtk-extensions.h: Add ifdefs so we can compile this
+	header with GTK_DISABLE_DEPRECATED on -- helps us notice what we
+	should get rid of.
+	* eel/eel-image-chooser.c: (eel_image_chooser_initialize_class):
+	Use G_STRUCT_OFFSET instead of GTK_SIGNAL_OFFSET.
+	(eel_image_chooser_set_selected_row): Use g_signal_emit instead of
+	gtk_signal_emit.
+	* eel/eel-image-table.c: (eel_image_table_initialize_class),
+	(image_table_emit_signal): Use g_signal_emit instead of
+	gtk_signal_emit.
+	* eel/eel-image.c: (eel_image_initialize_class): Use
+	G_STRUCT_OFFSET instead of GTK_SIGNAL_OFFSET.
+	* eel/eel-label.c: (eel_label_initialize_class): Use
+	G_STRUCT_OFFSET instead of GTK_SIGNAL_OFFSET.
+	* eel/eel-preferences-box.c: (eel_preferences_dialog_new): Use
+	gtk_window_set_resizable instead of gtk_window_set_policy.
+	* eel/eel-preferences-item.c:
+	(preferences_item_create_editable_string): Use g_ascii_strcasecmp
+	instead of g_strcasecmp.
+	* eel/eel-radio-button-group.c: (eel_radio_button_group_insert):
+	Use gtk_radio_button_get_group instead of gtk_radio_button_group.
+	* eel/eel-stock-dialogs.c: (find_message_label): Use
+	gtk_label_get_text instead of gtk_label_get.
+	* eel/eel-string.c: (eel_strcasecmp): Use g_ascii_strcasecmp
+	instead of g_strcasecmp.
+
+	* eel/eel-gdk-font-extensions.h: Fix typo in comment.
+
+2001-07-26  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* configure.in:
+	* eel/.cvsignore:
+	* eel/Makefile.am:
+	* eel/eel-features.c:
+	* eel/eel-features.h.in:
+	* eel/eel.h:
+	Add eel-features.[ch] so that the version of the library can be
+	checked at runtime.
+	
+2001-07-26  Ramiro Estrugo  <ramiro@fateware.com>
+
+	Change from the the eel-1-0 branch:
+
+	* eel/eel-image.h:
+	* eel/eel-image.c: (eel_image_initialize_class),
+	(eel_image_initialize), (eel_image_set_arg), (eel_image_get_arg),
+	(eel_image_expose_event), (eel_image_get_pixbuf_opacity),
+	(eel_image_set_pixbuf_insensitive_opacity),
+	(eel_image_get_pixbuf_insensitive_opacity):
+	Add support for rendering the image pixbuf at a lower opacity when
+	the widget state is insensitive.
+
+2001-07-25  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/Makefile.am:
+	Add missing eelmarshal.list to EXTRA_DIST and use a sophisticated
+	alphabetized order on the list.
+	
+2001-07-25  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel-2.0.pc.in:
+	Change link flags to '-leel-2' instead of '-leel'
+	
+2001-07-25  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* configure.in:
+	Add defines for Eel library major, minor and micro version numbers
+	so that we can use these to properly set the shared library
+	version info.
+	Make the includedir be eel-2/eel' instead of 'eel' so that we can
+	have GNOME1 and GNOME2 installations of Eel cohabiting in the
+	same $prefix.
+
+	Change the PACKAGE name to eel2.
+
+	* data/fonts/urw/Makefile.am:
+	Data dir is now 'share/eel-2/eel' instead of 'share/eel'
+
+	* eel-2.0.pc.in:
+	Include dir is now include/eel-2/eel' instead of 'include/eel'
+
+	* eel.spec.in:
+	Update for includedir and datadir changes.
+	Add missing .mo file rule.
+	Cleanup some.
+	
+	* eel/Makefile.am:
+	Set the shared library version info.
+	Change libary name to libeel-2 so that we can install it in the
+	same prefix as libeel (GNOME1 and GNOME2 cohabitation)
+	Install headers in the new 'eel-2/eel' includedir.
+	Update EEL_DATADIR for new 'eel-2/eel' data location so that
+	fallback fonts can be found in the right place.
+
+	* test/Makefile.am:
+	Update for includedir and datadir changes.
+
+	* test/dumb-box.c: (eel_dumb_box_expose):
+	More sythetic exposure fixes.
+	
+2001-07-24  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-image-chooser.c: (image_chooser_expose_event):
+	* eel/eel-viewport.c: (eel_viewport_expose_event):
+	* eel/eel-wrap-table.c: (eel_wrap_table_expose_event):
+	More sythetic expose event fixes.
+	
+2001-07-24  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-gtk-container.c: (eel_gtk_container_child_expose_event):
+	Fix the way that expose events are synthesized for children of
+	containers.  In Gtk+ 2.0 there is a standard and convenient way of
+	doing this, so we use that instead of doing it "by hand".
+	
+2001-07-24  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-clickable-image.c:
+	(eel_clickable_image_initialize_class):
+	* eel/eel-clickable-image.h:
+	* eel/eel-font-picker.c: (eel_font_picker_initialize_class):
+	* eel/eel-font-picker.h:
+	* eel/eel-image-chooser.c: (eel_image_chooser_initialize_class):
+	* eel/eel-image-chooser.h:
+	* eel/eel-image-table.c: (eel_image_table_initialize_class):
+	* eel/eel-image-table.h:
+	* eel/eel-image.c: (eel_image_initialize_class):
+	* eel/eel-label.c: (eel_label_initialize_class):
+	* eel/eel-preferences-item.c:
+	(eel_preferences_item_initialize_class):
+	* eel/eel-preferences-item.h:
+	* eel/eel-radio-button-group.c:
+	(eel_radio_button_group_initialize_class):
+	* eel/eel-radio-button-group.h:
+	* eel/eel-string-picker.c: (eel_string_picker_initialize_class):
+	* eel/eel-string-picker.h:
+	* eel/eel-text-caption.c: (eel_text_caption_initialize_class):
+	* eel/eel-text-caption.h:
+	Changes to make the GTK+ 2.0 signal system happier.  Make sure
+	that all signals are declared in the class structure and that the
+	offset argument to gtk_signal_new () points to a valid method
+	offset.
+	
+2001-07-24  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c:
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-smooth-widget.c: (smooth_widget_get_gtk_background):
+	Remove the use of a "safe" (and very hacky) drawable to pixbuf
+	function, since the problems we were working around have been
+	fixed in GTK+ 2.0.
+	With this change, "smooth" widgets work again.
+	
+	* test/test.c: (test_init):
+	Comment out the gnome_program_init() thing for now.
+	Currently the gnome_program_init() function makes the test
+	programs hang for me.  Using just the gtk_init () works for
+	most tests, so I am using just that until the gnome_program_init ()
+	function is fixed or we learn how to use it properly.
+
+2001-07-24  Ramiro Estrugo  <ramiro@fateware.com>
+
+	Change from the the eel-1-0 branch:
+	
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_prepend): New function
+	to prepend a string to the collection.
+	(eel_string_list_append_string_list): Rename from
+	eel_string_list_append () which was a confusing name.
+	This API change doesnt affect Nautilus or Eel since neither used
+	this function.
+
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+	* acconfig.h: Also need to add GNOME_EXPLICIT_TRANSLATION_DOMAIN
+	here for autoheader.
+
+2001-07-17  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Add GNOME_EXPLICIT_TRANSLATION_DOMAIN so messages
+	withing eel get translated properly.
+
+2001-07-17  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-gdk-font-extensions.c:
+	(eel_gdk_font_get_largest_fitting): Add FIXME about incorrect
+	assumption that the longest string is the widest.
+	(xlfd_string_get_nth): Check for extra characters before the "-",
+	and don't allow n == 0.
+	(xlfd_string_replace_nth), Check for extra characters before the
+	"-", don't allow n == 0, and use return_if_fail to check for bad
+	values of n rather than just returning NULL.
+	(xlfd_string_get_nth_as_int): Use return_if_fail to check for bad
+	values of n rather than just returning XFLD_INVALID_VALUE. Remove
+	extra check for NULL.
+	(eel_self_check_gdk_font_extensions): Add lots of new self-checks
+	and change rule so that we don't allow an extra trailing "-"
+	character.
+
+	* eel/check-program.c: (main): Use gnome_program_init correctly.
+	* test/test-eel-password-dialog.c: (main): Use gnome_program_init
+	correctly.
+	* test/test-eel-widgets.c: (main): Use gnome_program_init
+	correctly.
+
+2001-07-16  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-self-checks.c: (eel_check_string_list_result):
+	Fix place where I called the wrong function.
+
+2001-07-15  Darin Adler  <darin@bentspoon.com>
+
+	* eel/check-program.c: (main): Fix up init calls. I am still quite
+	confused about how to use gnome_program_init properly.
+
+	* eel/eel-preferences-item.h:
+	* eel/eel-preferences-item.c:
+	* eel/eel-self-checks.h:
+	* eel/eel-string-list.h:
+	* eel/eel-string.h:
+	Corrected spelling error: "delimeter" -> "delimiter".
+
+	* eel/eel-self-checks.c: (eel_check_string_list_result):
+	Changed string list check to be simpler and distinguish lists
+	with empty strings in them from empty lists.
+
+2001-07-13  Darin Adler  <darin@bentspoon.com>
+
+	* eel/check-program.c:
+	* eel/eel-xml-extensions.c:
+	* eel/eel-xml-extensions.h:
+	Fix gnome-xml includes to use <libxml/*>. Before it was just
+	picking up the wrong headers on my machine, which is why it worked.
+
+2001-07-13  Darin Adler  <darin@bentspoon.com>
+
+	Now things link, and the test programs compile too.
+
+	* configure.in:
+	* eel/check-program.c: (main):
+	* eel/eel-list-column-title.c:
+	* eel/eel-list.c:
+	* eel/eel-smooth-widget.c: (smooth_widget_get_gtk_background):
+	* test/dumb-box.h:
+	* test/test-eel-image-chooser.c: (populate_image_chooser_callback):
+	* test/test-eel-image.c: (pixbuf_new_from_name):
+	* test/test-eel-label-flavorful.c: (font_get_name):
+	* test/test-eel-label-offset.c:
+	* test/test-eel-label.c: (main):
+	* test/test-eel-password-dialog.c: (main):
+	* test/test-eel-pixbuf-tile.c: (pixbuf_drawing_area_expose_event),
+	(drawable_drawing_area_expose_event):
+	* test/test-eel-viewport-constraint.c: (main):
+	* test/test-eel-widgets.c: (create_pixbuf), (main):
+	* test/test.c: (test_pixbuf_new_named), (eel_pixmap_file):
+	* test/test.h:
+
+2001-07-13  Darin Adler  <darin@bentspoon.com>
+
+	Enough to make everything compile.
+	The eel self-check program doesn't link yet.
+
+	* eel/check-program.c: (main):
+	* eel/eel-password-dialog.c: (caption_table_activate_callback),
+	(eel_password_dialog_new), (eel_password_dialog_run_and_block):
+	* eel/eel-preferences-box.c: (eel_preferences_dialog_new):
+	* eel/eel-stock-dialogs.c: (timed_wait_callback),
+	(eel_run_simple_dialog), (create_message_dialog),
+	(show_message_box), (show_ok_box), (eel_create_info_dialog),
+	(details_dialog_clicked_callback),
+	(eel_show_info_dialog_with_details),
+	(eel_show_error_dialog_with_details), (eel_show_yes_no_dialog),
+	(eel_create_question_dialog):
+	* eel/eel-types.c: (eel_type_init):
+
+2001-07-13  Darin Adler  <darin@bentspoon.com>
+
+	A cut at making things compile with GNOME 2.
+	Some things are inside #ifdef GNOME2_CONVERSION_COMPLETE.
+	90% of the way to compiling everything.
+
+	* eel/.cvsignore:
+	* eel/Makefile.am:
+	* eel/check-program.c: (main):
+	* eel/eel-background-canvas-group.c:
+	(eel_background_canvas_group_supplant_root_class):
+	* eel/eel-background.c: (eel_background_initialize_class),
+	(eel_background_draw), (eel_background_draw_flat_box),
+	(eel_background_set_widget_style), (eel_get_widget_background),
+	(eel_background_receive_dropped_color):
+	* eel/eel-canvas-rect.c: (rect_update):
+	* eel/eel-canvas-rect.h:
+	* eel/eel-caption-table.c: (eel_caption_table_initialize_class),
+	(eel_caption_table_get_entry_text):
+	* eel/eel-clickable-image.c:
+	(eel_clickable_image_initialize_class):
+	* eel/eel-clist.c:
+	* eel/eel-ctree.c: (eel_ctree_class_init):
+	* eel/eel-dnd.c: (eel_drag_drop_action_ask):
+	* eel/eel-enumeration.c:
+	* eel/eel-font-manager.c: (file_as_string),
+	(font_description_table_new), (collect_fonts_from_directory),
+	(directory_contains_file), (try_using_font_server),
+	(ensure_local_font_table), (eel_font_manager_get_default_font),
+	(eel_font_manager_get_default_bold_font),
+	(eel_self_check_font_manager):
+	* eel/eel-font-picker.c: (eel_font_picker_initialize_class),
+	(font_picker_add_item), (font_picker_populate):
+	* eel/eel-gdk-extensions.c: (eel_gdk_window_set_invisible_cursor):
+	* eel/eel-gdk-font-extensions.c: (font_get_name):
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_load),
+	(file_read_callback), (load_done),
+	(eel_gdk_pixbuf_get_from_window_safe):
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-glib-extensions.c:
+	* eel/eel-gnome-extensions.c: (eel_dialog_get_button_by_index),
+	(get_terminal_command_prefix), (eel_gnome_icon_selector_new),
+	(eel_gnome_stock_set_icon_or_register):
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gtk-extensions.c: (send_delete_event),
+	(handle_standard_close_accelerator),
+	(eel_popup_menu_position_func), (eel_gtk_menu_insert_separator),
+	(eel_gtk_signal_connect_full_while_alive),
+	(eel_gtk_signal_connect_while_realized),
+	(eel_nullify_when_destroyed), (eel_nullify_cancel),
+	(event_get_time):
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-macros.h:
+	* eel/eel-image-chooser.c: (eel_image_chooser_initialize_class):
+	* eel/eel-image-table.c: (eel_image_table_initialize_class):
+	* eel/eel-image.c: (eel_image_initialize_class),
+	(eel_image_set_pixbuf_from_file_name),
+	(eel_image_set_tile_pixbuf_from_file_name):
+	* eel/eel-label.c: (eel_label_initialize_class),
+	(eel_label_set_is_smooth),
+	(eel_label_set_tile_pixbuf_from_file_name),
+	(eel_label_set_never_smooth):
+	* eel/eel-list-column-title.c:
+	(eel_list_column_title_initialize_class),
+	(eel_list_column_title_destroy), (eel_list_column_title_finalize),
+	(eel_list_column_title_request), (eel_list_column_title_paint):
+	* eel/eel-list.c: (eel_list_initialize_class),
+	(eel_list_initialize), (eel_list_clear_keyboard_focus),
+	(eel_list_set_keyboard_focus), (eel_list_size_request),
+	(new_column_width), (draw_rows), (eel_list_draw),
+	(eel_list_expose), (eel_list_row_at):
+	* eel/eel-password-dialog.c: (caption_table_activate_callback),
+	(eel_password_dialog_new), (eel_password_dialog_run_and_block):
+	* eel/eel-password-dialog.h:
+	* eel/eel-preferences-box.c: (preferences_box_select_pane),
+	(eel_preferences_dialog_new):
+	* eel/eel-preferences-box.h:
+	* eel/eel-preferences-group.c:
+	(eel_preferences_group_get_title_label):
+	* eel/eel-preferences-item.c:
+	(eel_preferences_item_initialize_class):
+	* eel/eel-preferences-pane.h:
+	* eel/eel-preferences.c:
+	* eel/eel-radio-button-group.c:
+	(eel_radio_button_group_initialize_class):
+	* eel/eel-region.c: (gdk_region_new_from_irect),
+	(eel_region_add_rectangle), (eel_region_subtract_rectangle):
+	* eel/eel-scalable-font.c:
+	* eel/eel-smooth-widget.h:
+	* eel/eel-stock-dialogs.c: (add_label_to_dialog),
+	(timed_wait_delayed_close_timeout_callback), (timed_wait_free),
+	(timed_wait_dialog_destroy_callback), (timed_wait_callback),
+	(delete_event_callback), (eel_run_simple_dialog),
+	(create_message_dialog), (show_message_box), (show_ok_box),
+	(eel_create_info_dialog), (eel_show_info_dialog),
+	(details_dialog_clicked_callback),
+	(eel_show_info_dialog_with_details), (eel_show_warning_dialog),
+	(eel_show_error_dialog), (eel_show_error_dialog_with_details),
+	(eel_show_yes_no_dialog), (eel_create_question_dialog):
+	* eel/eel-stock-dialogs.h:
+	* eel/eel-string-picker.c: (eel_string_picker_initialize_class),
+	(eel_string_picker_set_string_list):
+	* eel/eel-text-caption.c: (eel_text_caption_initialize_class):
+	* eel/eel-types.c: (eel_type_init):
+	* eel/eel-viewport.c: (eel_viewport_initialize_class),
+	(eel_viewport_draw), (eel_viewport_size_allocate):
+	* eel/eel-xml-extensions.c:
+
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-font-manager.c: (collect_fonts_from_directory):
+	Fix code that can segfault due to unknown MIME type.
+
+	* eel/eel-scalable-font.c: (initialize_global_stuff_if_needed):
+	Tell librsvg our datadir so we don't have to be in the same prefix
+	as librsvg. There's this bad thing where we install fonts that the
+	librsvg library has to find. Lets hope we can obsolete this
+	completely soon.
+
+2001-07-09  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* .cvsignore:
+	* Makefile.am:
+	* autogen.sh:
+	* configure.in:
+	* eel-2.0.pc.in:
+	* eel-config.in:
+	* eel.spec.in:
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-gtk-extensions.h:
+	* eel/eel-background-canvas-group.c:
+	* eel/eel-background-canvas-group.h:
+	* eel/eel-background.h:
+	* eel/eel-canvas-rect.h:
+	* eel/eel-caption-table.h:
+	* eel/eel-caption.h:
+	* eel/eel-clickable-image.h:
+	* eel/eel-font-manager.h:
+	* eel/eel-font-picker.h:
+	* eel/eel-gconf-extensions.h:
+	* eel/eel-glyph.h:
+	* eel/eel-image-chooser.h:
+	* eel/eel-image-table.h:
+	* eel/eel-image-with-background.h:
+	* eel/eel-image.h:
+	* eel/eel-label-with-background.h:
+	* eel/eel-label.h:
+	* eel/eel-labeled-image.h:
+	* eel/eel-list.h:
+	* eel/eel-password-dialog.h:
+	* eel/eel-preferences-box.h:
+	* eel/eel-preferences-group.h:
+	* eel/eel-preferences-item.h:
+	* eel/eel-preferences-pane.h:
+	* eel/eel-preferences.h:
+	* eel/eel-radio-button-group.h:
+	* eel/eel-region.h:
+	* eel/eel-scalable-font-private.h:
+	* eel/eel-scalable-font.h:
+	* eel/eel-smooth-text-layout-cache.h:
+	* eel/eel-smooth-text-layout.h:
+	* eel/eel-smooth-widget.h:
+	* eel/eel-string-picker.h:
+	* eel/eel-text-caption.h:
+	* eel/eel-vfs-extensions.h:
+	* eel/eel-viewport.h:
+	* eel/eel-wrap-table.h:
+	* eelConf.sh.in:
+	Begin port to GNOME2, part 1.  Make configure work in the GNOME2
+	universe and also a few simple s/BEGIN_GNOME_DECLS/G_BEGIN_DECLS/
+	
+2001-07-09  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-extensions.c: (eel_art_drect_get_width),
+	(eel_art_drect_get_height), (eel_art_irect_assign_end_points),
+	(eel_art_drect_assign_end_points), (eel_art_ipoint_offset_by),
+	(eel_art_point_equal):
+	More ArtDRect versions of point/rectangle stuff.
+	
+==== eel 1.0.1 ====
+
+2001-07-05  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Bumped version to 1.0.1
+	* NEWS: Some notes about recent changes.
+
+2001-06-26  Alexander Larsson  <alla@lysator.liu.se>
+
+	* eel/eel-font-manager.c (eel_font_manager_get_default_font,
+	eel_font_manager_get_default_bold_font):
+	Don't keep looking for the files after we found them the first
+	time.
+
+2001-06-26  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-extensions.c: (eel_art_irect_is_empty): New function.
+	(eel_art_ipoint_offset_by): New function.
+
+2001-06-25  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-extensions.c: (eel_dimensions_clamp),
+	(test_dimensions_clamp), (eel_self_check_art_extensions):
+	New constant points.  New function to clamp dimensions .
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_insert_string_list):
+	New function to insert a string list into another.
+	
+2001-06-06  Ramiro Estrugo  <ramiro@fateware.com>
+
+        Patch from Frederic Devernay <Frederic.Devernay@sophia.inria.fr> 
+        (tweaked by me to | bits instead of +) to make the Eel Font Manager 
+        follow links when determining the mime type of fonts. 
+ 
+	* eel/eel-font-manager.c: (collect_fonts_from_directory),
+	(eel_font_manager_file_is_scalable_font):
+
+2001-06-06  Darin Adler  <darin@bentspoon.com>
+
+	Integrated a revised version of a patch by Eungkyu Song
+	<eungkyu@sparcs.org> to make the font manager code accept either a
+	tab or a space as the separator.
+
+	* eel/eel-font-manager.c: (font_description_table_add): Use
+	strpbrk instead of strstr.
+
+2001-06-06  Alex Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.[ch] (eel_background_draw):
+	This function now takes both the src and dest coordinates.
+	(eel_background_draw_to_drawable): Update to the new
+	eel_background_draw API.
+	* eel/eel-background-canvas-group.c
+	(eel_background_canvas_group_draw): Update to the new
+	eel_background_draw API.
+
+2001-06-05  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-gtk-container.c: (eel_gtk_container_child_size_allocate):
+	Move the critical after the child check for NULL since we allow
+	a NULL child to be given.
+	
+2001-06-05  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-art-extensions.c: (eel_art_ipoint_clamp),
+	(test_irect_intersect), (test_irect_union), (test_ipoint_clamp),
+	(eel_self_check_art_extensions):
+	* eel/eel-art-extensions.h:
+	New function to clamp a point plus checks for that.
+	
+2001-06-04  Ramiro Estrugo  <ramiro@fateware.com>
+
+	* eel/eel-debug-drawing.h:
+	* eel/eel-debug-drawing.c:
+	(eel_debug_show_pixbuf_in_external_viewer):
+	Replace the hard coded eog viewer to one that can accept any
+	external viewer.  I ran into the problem that the Eog binary
+	changed names from "eog" to "eog-shell" so I decided to make this
+	debug feature more generic.
+	
+	* eel/Makefile.am:
+	* eel/eel.h:
+	* eel/eel-gtk-container.h:
+	* eel/eel-gtk-container.c: (eel_gtk_container_child_expose_event),
+	(eel_gtk_container_child_map), (eel_gtk_container_child_unmap),
+	(eel_gtk_container_child_add), (eel_gtk_container_child_remove),
+	(eel_gtk_container_child_size_allocate):
+	New files.  Functions to simplify the implementations of
+	GtkContainer widgets.
+	
+	* eel/eel-gtk-extensions.c: (eel_gtk_widget_standard_realize):
+	Dont hardcode the event mask.  Use gtk_widget_get_events()
+	instead.  Also document this fact so that users are aware that
+	they need to set the event mask using gtk_widget_set_events () -
+	which is the right Gtk+ way anyway.
+
+	* eel/eel-image-chooser.c: (eel_image_chooser_initialize):
+	Call gtk_widget_set_events() with the right event mask for the
+	image chooser.
+
+	* eel/eel-labeled-image.c: (eel_labeled_image_size_allocate),
+	(eel_labeled_image_expose_event), (eel_labeled_image_map),
+	(eel_labeled_image_unmap), (eel_labeled_image_add),
+	(eel_labeled_image_remove):
+	Simplify the implementations of GtkContainer methods by using the
+	functions in eel-gtk-container.[ch].  Theres probably other
+	widgets in Eel and Nautilus that could benefit from this
+	simplification/code sharing as well.
+
+	* eel/eel-self-checks.c: (eel_check_double_result):
+	* eel/eel-self-checks.h:
+	New checks for double values.
+	
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_new_from_string_array):
+	New function to allocate a EelStringList from a regular C string
+	array.
+	(eel_string_list_assign_from_string_array): New function to assign
+	a regular C string array to a EelStringList.
+	(eel_string_list_reverse): New function to reverse a string list.
+	(test_string_list_reverse), (test_new_from_string_array),
+	(eel_self_check_string_list): Self checks for the above new
+	functions.
+
+	* test/dumb-box.c: (eel_dumb_box_initialize_class),
+	(eel_dumb_box_expose): Some dumb cleanup of old comment cruft.
+	* test/test-eel-font-simple.c: (main):
+	* test/test-eel-font.c: (main):
+	* test/test-eel-glyph-simple.c: (main):
+	* test/test-eel-glyph.c: (main):
+	* test/test-eel-smooth-text-layout.c: (main):
+	Update for changes in debug function to view pixbufs in external
+	viewers.
+	
+2001-06-04  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-font-manager.c: (collect_fonts_from_directory),
+	(eel_font_manager_file_is_scalable_font):
+	* test/test-eel-background.c: (main):
+	* test/test-eel-label.c: (widget_set_eel_background_image):
+	* test/test.c: (test_gtk_widget_set_background_image):
+	Fix all code that prepends "file://" to try to make a URI from a
+	path. Use gnome_vfs_get_uri_from_local_path instead.
+
+2001-06-01  Alex Larsson  <alexl@redhat.com>
+
+	* eel/eel-background.c (eel_background_draw_flat_box):
+	Only render area if we get passed an area.
+	(eel_background_draw): Do correct translation of
+	coordinates for destination drawable.
+
+2001-06-01  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Bump version number to 1.0.0.1
+	* NEWS: Mention the plans to release 1.0.1
+
+2001-06-01  Darin Adler  <darin@bentspoon.com>
+
+	* eel/eel-list.c: (eel_list_button_release): Fixed code that was
+	passing x twice instead of x and y that prevented single-click
+	from working in the Nautilus list view. Also did some other
+	cleanups to behavior when multiple buttons are pressed at once.
+
+2001-05-22  John Harper  <jsh@pixelslut.com>
+
+	Fallout from fixing bug 8220 (Having Ctrl as default "modifier
+	key used for default WM shortcuts" breaks everything...):
+
+	* eel/eel-list.c (eel_list_keyboard_move_to,
+	eel_list_keyboard_space): changed to use Control modifier
+	instead of Alt
+
+2001-05-20  Darin Adler  <darin@eazel.com>
+
+	Checked in change for Miguel Rodríguez Pérez
+	<migras@atlas.uvigo.es>.
+
+	* eel/eel-preferences-item.c 
+	(preferences_item_update_editable_string): 
+	(preferences_item_update_editable_integer): Only update
+	text if it changed.
+
+2001-05-19  George Lebl  <jirka@5z.com>
+ 
+	* configure.in, po/cs.po: Add czech translations
+ 
+2001-05-17  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_signal_connect_full_while_alive): Weakened a
+	too-strong g_return_if_fail.
+
+2001-05-09  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-self-checks.h:
+	* eel/eel-self-checks.c:
+	Make eel_after_check() and eel_report_check_failure() public so
+	that third party projects can use them to construct their own
+	checks and still be able to use the same check failure reporting
+	machinery.
+	
+2001-05-08  Darin Adler  <darin@eazel.com>
+
+	* RENAMING: Refine the renaming ideas.
+
+==== eel 1.0 ====
+
+2001-05-04  Robin * Slomkowski  <rslomkow@rslomkow.org>
+
+	* configure.in: fixed lirsvg test for 1.0.x
+
+2001-05-04  Robin * Slomkowski  <rslomkow@rslomkow.org>
+
+	* configure.in: upped version to 1.0 and changed upped
+	  dependance too librsvg 1.0.0
+
+2001-05-04  Robin * Slomkowski  <rslomkow@rslomkow.org>
+
+	* configure.in: upped version to 0.1
+
+2001-05-04  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-preferences-item.c:
+	(preferences_item_create_editable_string):
+	Restore a silly hack for the sake of Nautilus.  Id like to
+	properly fix this, but not so close to a release.
+	
+2001-05-04  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* configure.in:
+	Add GConf and OAF dependency.
+
+	* eel.spec.in:
+	Add GConf and OAF dependency.  Also add missing BuildRequires
+	entries.
+	
+	* eel/Makefile.am:
+	Need to set librsvg cflags directly here, since librsvg does not
+	appear in any public eel headers and thus not exported in
+	eel-config --cflags.
+
+	* eel/eel-dateedit-extensions.c:
+	* eel/eel-dateedit-extensions.h:
+	* eel/eel-gconf-extensions.c:
+	* eel/eel-gconf-extensions.h:
+	* eel/eel-generous-bin.c:
+	* eel/eel-generous-bin.h:
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel-preferences-box.c:
+	* eel/eel-preferences-box.h:
+	* eel/eel-preferences-group.c:
+	* eel/eel-preferences-group.h:
+	* eel/eel-preferences-item.c:
+	* eel/eel-preferences-item.h:
+	* eel/eel-preferences-pane.c:
+	* eel/eel-preferences-pane.h:
+	* eel/eel-preferences.c:
+	* eel/eel-preferences.h:
+	* eel/eel.h:
+	Move over some more stuff over from Nautilus.
+	
+2001-05-03  Darin Adler  <darin@eazel.com>
+
+	* RENAMING: Some renaming ideas.
+
+2001-05-03  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-vfs-extensions.h:
+	* eel/eel-vfs-extensions.c: (eel_make_uri_from_half_baked_uri),
+	(eel_self_check_vfs_extensions): Add new call to make a canonical
+	URI from the kind of half-baked URIs that are used in gmc URL
+	files and in drag and drop. The definition of a half-baked URI is
+	that it starts with "file:" and then has a normal path, without
+	URI escaping.
+
+	* Makefile.am: Fixed a typo.
+	
+2001-05-03  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-gdk-extensions.h: Add an opaque version of the color
+	packing macro.
+	* eel/eel-gdk-extensions.c: (eel_self_check_gdk_extensions): Add
+	checks for color packing macros.
+
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-extensions.c: (eel_art_irect_intersect),
+	(eel_art_irect_union), (eel_dimensions_assign),
+	(eel_dimensions_equal), (eel_art_ipoint_assign),
+	(eel_art_ipoint_equal), (test_intersect), (test_union),
+	(eel_self_check_art_extensions): Some more art extensions.
+	Currently unused in Eel or Nautilus.
+
+	* eel/eel-self-checks.h:
+	* eel/eel-self-checks.c:
+	Add self check machinery for EelArtIPoints.
+	
+	* eel/eel-gdk-pixbuf-extensions.h: Dumb spacing tweak.
+
+2001-05-02  Darin Adler  <darin@eazel.com>
+
+	Fixed bug 8219 (crash under libefence):
+
+	* eel/eel-scalable-font.c: (eel_scalable_font_new),
+	(free_global_font_handle_table): Dup the font names before using
+	them as keys, since the underlying freetype font can last longer
+	than the EelScalableFont.
+
+2001-05-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-debug-drawing.c: (eel_debug_show_pixbuf_in_eog):
+	Update for EOG name change.  eog got renamed to eog-shell.
+	
+2001-05-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* configure.in:
+	Lots of improvement.  Make dealing with dependency libs/cflags simpler.
+
+	* eel/Makefile.am:
+	* test/Makefile.am:
+	Eliminate cut-n-paste disease by using dependency macros defined
+	in configure.in.
+	
+2001-05-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* autogen.sh:
+	Detect whether the invocation of configure failed and print a
+	message accordingly.  We used to always assume that configure was
+	successful and print misleading "now type make to build $PROJECT"
+	messages.
+
+2001-05-01  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* configure.in:
+	Simplify the freetype2 detection insanity by using autoconf macro
+	technology.  The new test should work with both FreeType2 RPMS as
+	well as freetype built from source in any prefix.
+	
+2001-05-01  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-gdk-pixbuf-extensions.c:
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-glyph.c:
+	* eel/eel-glyph.h:
+	* eel/eel-label.c:
+	* eel/eel-scalable-font.c:
+	* eel/eel-scalable-font.h:
+	* eel/eel-smooth-text-layout.c:
+	* eel/eel-smooth-widget.c:
+	* test/test-eel-font-simple.c:
+	* test/test-eel-font.c:
+	* test/test-eel-glyph-simple.c:
+	* test/test-eel-glyph.c:
+	* test/test-eel-smooth-text-layout.c:
+	More work on changing parameters for functions that accept and
+	return ArtIRect, EelArtIPoint, ArtDRect, EelDimensions to pass by
+	value instead of by pointer.
+
+2001-05-01  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* test/Makefile.am:
+	Add include flag for test directory.
+	
+2001-05-01  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-image-chooser.c:
+	Respect the GtkStyle.
+	
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/dumb-box.h:
+	* test/dumb-box.c:
+	* test-eel-gtk-style.c:
+	Add a GtkStyle debugging tool	
+	
+	* test/test-eel-image-chooser.c:
+	Update for style respect changes.
+	
+2001-04-30  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am:
+	Remove some garbage that apparently satan tried to sneak in.
+	
+2001-04-30  Darin Adler  <darin@eazel.com>
+
+	reviewed by: John Sullivan <sullivan@eazel.com>
+
+	Fixed bug 8198 ("New Terminal" does not use GNOME default
+	applications). This involved changing the API, so it requires
+	changes to Nautilus too.
+
+	* eel/eel-glib-extensions.c: (eel_shell_quote): Make it smarter so
+	it doesn't quote simple things with no fancy characters in them.
+	(eel_self_check_glib_extensions): Update test.
+	
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-gnome-extensions.c: (try_terminal_command),
+	(try_terminal_command_argv), (get_terminal_command_prefix): New
+	functions, used to implement eel_gnome_open_terminal. These look
+	at the gnome-config setting that controls which terminal program
+	is used.
+	(eel_gnome_make_terminal_command): New public function. We've now
+	eliminated the concept of just getting the name of a terminal
+	program.
+	(eel_gnome_open_terminal): Use eel_gnome_make_terminal_command to
+	do the hard part.
+
+2001-04-30  John Sullivan  <sullivan@eazel.com>
+
+	Fixed bug 6234 (Escape should close Properties window)
+	Fixed bug 6271 (Close dialogs with Escape to match GNOME standard)
+
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_window_event_is_close_accelerator): Close dialogs with
+	Escape as well as Control-W. (non-GnomeDialogs can either call 	
+	eel_gtk_window_set_up_close_accelerator to arrange this, or can call
+	this querying function directly).
+
+2001-04-30  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-art-extensions.c:
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-gtk-extensions.c:
+	* eel/eel-art-gtk-extensions.h:
+	* eel/eel-clickable-image.c:
+	* eel/eel-debug-drawing.c:
+	* eel/eel-debug-drawing.h:
+	* eel/eel-gdk-pixbuf-extensions.c:
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-glyph.c:
+	* eel/eel-glyph.h:
+	* eel/eel-gnome-extensions.c:
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-image-chooser.c:
+	* eel/eel-image-table.c:
+	* eel/eel-image-with-background.c:
+	* eel/eel-image.c:
+	* eel/eel-label.c:
+	* eel/eel-labeled-image.c:
+	* eel/eel-region.h:
+	* eel/eel-smooth-text-layout.c:
+	* eel/eel-smooth-text-layout.h:
+	* eel/eel-smooth-widget.c:
+	* eel/eel-smooth-widget.h:
+	* eel/eel-wrap-table.c:
+	* test/test-eel-font.c:
+	* test/test-eel-glyph-simple.c:
+	* test/test-eel-glyph.c:
+	* test/test-eel-pixbuf-tile.c:
+	* test/test-eel-smooth-text-layout.c:
+	* test/test.c:
+	Change parameters for functions that accept and return ArtIRect,
+	EelArtIPoint, ArtDRect, EelDimensions to pass by value instead of
+	by pointer.
+	
+2001-04-29  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-enumeration.c: (eel_self_check_enumeration):
+	Add one more check.
+	
+	* eel/eel-string-picker.h:
+	* eel/eel-string-picker.c: (eel_string_picker_set_string_list),
+	(eel_string_picker_insert_string),
+	(eel_string_picker_insert_separator):
+	Add support for separators.
+	
+2001-04-26  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-extensions.c: (eel_art_irect_align),
+	(eel_dimensions_are_empty), (eel_art_irect_assign_dimensions),
+	(eel_self_check_art_extensions): Change constants to be lower
+	case.  Also declare them as "extern const" and not just "extern."
+
+	* eel/eel-art-gtk-extensions.c: (eel_gdk_rectangle_to_art_irect),
+	(eel_gdk_window_get_bounds),
+	(eel_gdk_window_get_screen_relative_bounds),
+	(eel_gtk_widget_get_bounds), (eel_gtk_widget_get_dimensions),
+	(eel_gtk_widget_get_preferred_dimensions),
+	(eel_gdk_window_clip_dirty_area_to_screen),
+	(eel_gdk_window_get_dimensions):
+	* eel/eel-debug-drawing.c: (debug_pixbuf_viewer_size_request):
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_get_dimensions),
+	(eel_gdk_pixbuf_intersect):
+	* eel/eel-glyph.c: (eel_glyph_get_dimensions),
+	(eel_glyph_intersect):
+	* eel/eel-image-chooser.c: (image_chooser_get_partial_dimensions):
+	* eel/eel-image.c: (image_get_pixbuf_dimensions),
+	(image_get_pixbuf_bounds), (image_get_tile_dimensions):
+	* eel/eel-label.c: (label_composite_text_callback_cached),
+	(label_get_text_dimensions), (label_get_text_bounds),
+	(label_get_content_dimensions), (label_get_content_bounds),
+	(label_get_tile_dimensions):
+	* eel/eel-labeled-image.c: (labeled_image_get_image_dimensions),
+	(labeled_image_get_label_dimensions),
+	(labeled_image_get_image_bounds_fill),
+	(eel_labeled_image_get_image_bounds),
+	(labeled_image_get_label_bounds_fill),
+	(eel_labeled_image_get_label_bounds),
+	(labeled_image_get_content_dimensions),
+	(labeled_image_get_content_bounds):
+	* eel/eel-scalable-font.c: (eel_scalable_font_measure_text):
+	* eel/eel-smooth-text-layout.c:
+	(eel_smooth_text_layout_get_dimensions):
+	* eel/eel-smooth-widget.c: (smooth_widget_get_tile_origin_point),
+	(eel_smooth_widget_get_tile_bounds),
+	(eel_smooth_widget_get_preferred_dimensions):
+	* eel/eel-viewport.c: (eel_viewport_get_scroll_offset):
+	* eel/eel-wrap-table.c: (wrap_table_art_irect_max_dimensions),
+	(wrap_table_get_max_child_dimensions),
+	(wrap_table_get_content_dimensions),
+	(wrap_table_get_content_bounds), (wrap_table_get_scroll_offset):
+	Update for art extensions constants renaming.
+	
+2001-04-26  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-image-chooser.c: (image_chooser_motion_notify_event),
+	(image_chooser_button_press_event),
+	(image_chooser_button_release_event):
+	Use pointer grab technology to prevent the list from getting
+	events from unrelated widgets.
+	
+2001-04-26  John Sullivan  <sullivan@eazel.com>
+
+	* eel/eel-list.c: (eel_list_get_cell_hit_rectangle), (draw_cell):
+	Made drawing and hit-testing code immune to NULL text. This was
+	spewing out tons of complaints before in search results view
+	(from the fancy date-squeezing code).
+
+2001-04-26  John Sullivan  <sullivan@eazel.com>
+
+	Merged from nautilus-1 branch:
+
+	2001-03-30  Ramiro Estrugo  <ramiro@eazel.com>
+
+	reviewed by: John Harper  <jsh@eazel.com>
+
+	* eel/eel-stock-dialogs.c: (create_message_box):
+	Make sure the label is not NULL before changing its line wrap.
+	This works around the crashing problem.  Why the label is NULL is
+	still a mystery.
+
+2001-04-26  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-debug.h:
+	* eel/eel-debug.c: (call_default_log_handler_with_better_message):
+	Add comment about handling cases where we're out of
+	memory. Removed unneeded NULL-handling code.
+	(eel_assert_computed_str), (eel_str_equal_with_free): Removed an
+	old unused feature.
+	
+	* eel/eel-gnome-extensions.c: Formatting tweaks.
+
+2001-04-26  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-enumeration.h:
+	* eel/eel-enumeration.c:
+	(eel_enumeration_get_nth_description_translated),
+	(eel_enumeration_id_get_nth_description),
+	(eel_enumeration_id_get_nth_description_translated):
+	New functions to fetch translated descriptions.
+	
+2001-04-26  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am:
+	Build the image chooser widget.
+	
+	* eel/eel-art-gtk-extensions.h:
+	* eel/eel-art-gtk-extensions.c: (eel_gdk_get_pointer_position):
+	New function to obtain the pointer position as a point.
+	
+	* eel/eel-caption.h:
+	* eel/eel-caption.c: (eel_caption_initialize_class),
+	(eel_caption_destroy), (caption_show_all),
+	(eel_caption_set_show_title):
+	Fix some rotten comments and other minor style tweaks.  Remove
+	unused defines.  Fix wrongly named show_all method, a cut-n-paste
+	mistake.
+	
+	* eel/eel-gdk-extensions.h:
+	* eel/eel-gdk-extensions.c: (eel_gdk_rgb_to_color):
+	Return the resulting color as a structure instead of a pointer.
+	
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-extensions.c: (eel_gtk_widget_standard_realize),
+	(eel_gtk_widget_standard_draw),
+	(eel_gtk_bin_standard_size_allocate),
+	(eel_gtk_bin_standard_size_request):
+	Implementations of some standard gtk widget methods.
+	
+	* eel/eel-label.c:
+	(eel_label_set_solid_background_color),
+	(eel_label_set_text_color): Fix a bug where the label
+	wouldnt properly update when some color attributes changed because
+	of a stale solid pixbuf cache.
+
+	* eel/eel-radio-button-group.h:
+	* eel/eel-radio-button-group.c:
+	(eel_radio_button_group_clear): New function to clear out all the
+	items in the group.
+	(eel_radio_button_group_initialize_class):
+	(eel_radio_button_group_initialize),
+	(eel_radio_button_group_destroy), (button_toggled),
+	(eel_radio_button_group_insert):
+	Nautilus style tweaks.  Remove unused constant.  Change signal
+	signature to be simpler.  Remove the signal data nastiness and let
+	the caller find out the active item by using the getter methods
+	instead.  	
+	(eel_radio_button_group_get_active_index),
+	(eel_radio_button_group_set_active_index): Use signed integers for
+	the active index.
+
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_append):
+	New function to append one string list to another.
+	
+	* eel/eel-viewport.h:
+	* eel/eel-viewport.c: (eel_gtk_scrolled_window_add_with_viewport):
+	New convenience function to create scrolled windows with an
+	EelViewport as the child.
+	
+	* eel/eel.h:
+	Add eel-image-chooser.h
+	
+	* test/.cvsignore:
+	* test/Makefile.am:
+	Build the image chooser test.
+
+	* test/test.h:
+	Include eel.h instead of the individual headers.
+	
+2001-04-26  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-image-chooser.h:
+	* eel/eel-image-chooser.c:
+	New widget to choose an image from a list.
+	
+	* test/test-eel-image-chooser.c:
+	Test program for the new widget.
+	
+2001-04-24  Darin Adler  <darin@eazel.com>
+
+	reviewed by: Ramiro Estrugo <ramiro@eazel.com>
+
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger):
+	Add more log domains, most importantly "".
+
+2001-04-20  John Harper  <jsh@eazel.com>
+
+	reviewed by: Darin Adler  <darin@eazel.com>
+
+	* eel/eel-gnome-extensions.h, eel/eel-gnome-extensions.c
+	(eel_gnome_win_hints_get_area,
+	eel_gnome_win_hints_get_current_area,
+	eel_gnome_win_hints_set_area,
+	eel_gnome_win_hints_set_current_area): new functions
+
+	* eel/eel-gtk-extensions.c (eel_gtk_window_present): changed to
+	use the above new functions
+
+	* eel/eel-gtk-extensions.h, eel/eel-gtk-extensions.c
+	(eel_gtk_window_is_on_current_workspace_and_area): new function
+
+2001-04-20  jacob berkman  <jacob@ximian.com>
+
+	* eel/eel-gtk-extensions.c (eel_gtk_window_present): make sure the
+	window is also on the current viewport/area.  sawfish needs to be
+	updated to listen to _WIN_AREA changes though.
+
+2001-04-20  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-font-manager.c: (try_using_font_server):
+	Remove printf left in by accident.
+	
+2001-04-20  Ramiro Estrugo  <ramiro@eazel.com>
+
+	Fix for 8084 - Not all fonts are added to the font list in
+	preferences dialog.
+	
+	* eel/eel-font-manager.c: (try_using_font_server),
+	(ensure_local_font_table):
+	Try more than just one know location for the font server
+	configuation file.  If different systems (like different Linux
+	distributions) put this in other places, then we'll have to update
+	this code as we know more.  Seems lame, but I guess if
+	distributors and "users" have a choice where to put config files,
+	then we have no choice but comply.
+	
+2001-04-20  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-glib-extensions.h:
+	* eel/eel-glib-extensions.c: (eel_get_operating_system_name),
+	(eel_self_check_glib_extensions):
+	New function to find out the system name.
+	
+2001-04-20  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* configure.in:
+	Use /usr/X instead of /usr/openwin which is the new way on
+	solaris.
+	
+2001-04-20  Ramiro Estrugo  <ramiro@eazel.com>
+
+	Fix for bug 7847 - SOLARIS: When Smoother Graphics turned on -
+	cannot change Fonts.
+
+	* acconfig.h:
+	* configure.in:
+	* eel/eel-font-manager.c: (ensure_local_font_table):
+	Add support for reaping fonts even when the system is not using
+	the font server.
+	
+	* eel/eel-string-list.c: (eel_self_check_string_list):
+	Add a few more checks for string tokenizing.
+	
+2001-04-19  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am: Add a log domain define for Eel.
+	* eel/eel-debug.c: 
+	(eel_make_warnings_and_criticals_stop_in_debugger): Remove
+	G_LOG_DOMAIN item as it will be the same as Eel for this module.
+	Add Gdk-Pixbuf to the list of standard log domains.
+
+2001-04-19  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-debug.c:
+	(eel_make_warnings_and_criticals_stop_in_debugger):
+	Add a list of "standard" domains for which this debugging feature
+	is always turned on.
+	
+2001-04-19  Darin Adler  <darin@eazel.com>
+
+	reviewed by: Ramiro Estrugo <ramiro@eazel.com>
+
+	* eel/eel-debug.c: (get_process_name),
+	(call_default_log_handler_with_better_message), (log_handler),
+	(set_log_handler),
+	(eel_make_warnings_and_criticals_stop_in_debugger):
+	Add the process name and number prefix to all lines. Also fix
+	the use of getuid where we meant to use getpid. Also tweak
+	the names of things a bit to make it nicer.
+
+2001-04-19  Ramiro Estrugo  <ramiro@eazel.com>
+
+	reviewed by: Darin Adler  <darin@eazel.com>
+
+	* eel/eel-debug.c: (get_process_command_line): A function to try
+	and obtain the command line used to invoke the process.
+	(eel_stop_after_default_log_handler):  Print out the process id
+	and possible command line to make the warning/critical more
+	useful.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-canvas-rect.c: (canvas_item_update_svp_no_repaint),
+	(canvas_item_update_svp_clip_no_repaint), (rect_update): Renamed
+	the internal functions to make it more clear what they do.
+	(eel_canvas_rect_initialize_class): Improved comment.
+	(rects_intersect): Changed name.
+	(diff_rects): Update for new name of rects_intersect.
+	(test_rects_intersect), (eel_self_check_canvas_rect): Added tests
+	for rects_intersect.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-canvas-rect.c: (rect_update): Removed a bunch of code
+	that's not needed since we decided to optimize only the case
+	where the canvas is an anti-aliased one.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-canvas-rect.c: (rect_update): Fixed backwards logic that
+	made it never draw the outline.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-canvas-rect.c: (make_drect): New function.
+	(make_empty_drect): New function.
+	(make_rect_vpath): Changed to take ArtDRect.
+	(eel_canvas_item_update_svp), (eel_canvas_item_update_svp_clip):
+	Stole functions from GnomeCanvas code, because we need versions
+	that don't do a request_update.
+	(canvas_request_update_rect): New function.
+	(rect_update): Changed to do smart calculation about what to
+	update using the diff_rects function.
+	(diff_rects_guts), (diff_rects): New implementation that doesn't
+	use macros. Also changed to leave out empty rectangles.
+	(eel_self_check_canvas_rect): Updated tests that involve empty
+	rectangles and added some new ones.
+
+2001-04-18  Christopher James Lahey  <clahey@ximian.com>
+
+	* eel/eel-canvas-rect.c (intersect_rectangles): Fixed the
+	intersect_rectangles function to have rectangles that are tangent
+	return as not intersecting.
+	(eel_self_check_canvas_rect): Fixed the tests.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-canvas-rect.c: (rect_update): Call diff_rectangles so we
+	don't get an unused function warning.
+	(diff_rectangles): Took out of #if 0 and made it compile without
+	warnings.
+	(test_diff_rectangles): Test function that uses string for result.
+	(eel_self_check_canvas_rect): Added two self-tests. The one that
+	currently fails is commented out.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-canvas-rect.h:
+	* eel/eel-canvas-rect.c: (set_gc_foreground), (set_stipple),
+	(set_outline_gc_width), (re_update_shared), (re_get_bounds),
+	(make_rect_vpath), (rect_update): Copied the update function
+	and everything it needs in here, so we can prepare to modify it.
+
+2001-04-18  Christopher James Lahey  <clahey@ximian.com>
+
+	* eel/eel-canvas-rect.c: Added some tests #ifdefed out.  Wrote the
+	diff and intersection functions.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-canvas-rect.c: (eel_self_check_canvas_rect):
+	* eel/eel-lib-self-check-functions.h:
+	Added a self-check function for EelCanvasRect.
+
+	* eel/eel-self-checks.c: (eel_exit_if_self_checks_failed):
+	Formatting tweak.
+
+2001-04-18  Darin Adler  <darin@eazel.com>
+
+	* eel/Makefile.am:
+	* eel/eel-canvas-rect.c:
+	* eel/eel-canvas-rect.h:
+	Added new class that Chris Lahey and I are working on should make
+	the selection rectangle in Nautilus much faster.
+
+2001-04-18  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am: Add the generated files to the CLEANFILES so
+	that 'make clean' gets rid of them properly.
+
+2001-04-18  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-enumeration.h:
+	* eel/eel-enumeration.c: (eel_enumeration_contains_name),
+	(eel_enumeration_id_contains_name), (eel_self_check_enumeration):
+	New functions to check whether an enumeration contains a specific
+	name.
+	
+	* eel/eel-string-picker.h:
+	* eel/eel-string-picker.c: (eel_string_picker_initialize),
+	(eel_string_picker_destroy), (option_menu_activate_callback),
+	(menu_item_set_sensitivity_callback),
+	(menu_item_update_sensitivity),
+	(string_picker_update_menu_sensitivities),
+	(eel_string_picker_set_insensitive_list):
+	Add support for installing a list of insensitive choices.
+	(eel_string_picker_set_string_list): Make sure the list is
+	different before actually doing any work.
+	(eel_string_picker_get_string_list),
+	(eel_string_picker_get_selected_string),
+	(eel_string_picker_set_selected_string),
+	(eel_string_picker_set_selected_string_index),
+	(eel_string_picker_insert_string), (eel_string_picker_contains),
+	(eel_string_picker_get_index_for_string),
+	(eel_string_picker_clear): Some minor tweaking to conform with
+	Nautilus style some more.
+	
+2001-04-17  Darin Adler  <darin@eazel.com>
+
+	* eel/Makefile.am:
+	* eel/eel.h:
+	Take eel-dnd.h out. This should go back to Nautilus at some
+	point, I think.
+
+	* eel/eel-dnd.h:
+	* eel/eel-dnd.c:
+	(is_path_that_gnome_uri_list_extract_filenames_can_parse),
+	(add_one_compatible_uri), (eel_drag_drag_data_get): Another cut
+	at making the kind of "URL" that is compatible with bad old
+	URL-parsing code.
+
+2001-04-17  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: 
+	(eel_string_list_copy): Better name for this function.  Dont need
+	case_sensitive parameter since it can be fetched from the
+	string_list we are about to copy.
+	(eel_string_list_as_g_slist): Change list variable name to make
+	things a tiny bit clearer.
+	(eel_string_list_as_string): Better name for this function.  Add a
+	num_strings parameter that can be used to limit the number of
+	strings from the list used to make the new concatenated string.
+	(eel_self_check_string_list):  Update for _as_string changes.
+
+	* eel/eel-enumeration.c: (eel_enumeration_copy),
+	(eel_enumeration_get_names): Update for _copy changes.
+
+	* eel/eel-gdk-font-extensions.c: (xlfd_string_replace_nth): 
+	Update for _as_string changes.
+
+	* eel/eel-self-checks.c: (eel_check_string_list_result): Update
+	for _as_string changes.
+
+	* eel/eel-string-picker.c: (eel_string_picker_get_string_list),
+	(eel_string_picker_insert_string): Update for _copy changes.
+
+2001-04-17  Darin Adler  <darin@eazel.com>
+
+	* eel/eel-dnd.c: (add_one_path_with_file_prefix): Coddle existing
+	drag and drop recipients who use the gnome-libs helper functions.
+	For them, we must provide a "URL" (quotes intentional) that is
+	just a full path with "file:" stuck on the beginning.
+
+2001-04-17  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c:
+	(eel_string_list_new_from_g_slist): New function to create string
+	lists from GLists.
+	(eel_string_list_new_from_g_list), (eel_string_list_as_g_slist):
+	Better names for the GLlist and GSList functions.
+	(eel_string_list_as_concatenated_string): Return an empty string
+	("") if the input string list is NULL.
+	(eel_string_list_for_each): Make the for_each iterator a little
+	more type safe.
+	(eel_self_check_string_list): New checks for GSList functions.
+	New function to create string lists from GLists.  Better names for
+	the GLlist and GSList functions.
+	
+2001-04-17  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_new_from_slist),
+	(eel_string_list_as_slist), (eel_self_check_string_list):
+	New function to create string lists from slists.	
+	
+2001-04-17  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_new),
+	(eel_string_list_new_from_string),
+	(eel_string_list_new_from_string_list),
+	(eel_string_list_new_from_tokens),
+	(eel_string_list_assign_from_string_list),
+	(eel_string_list_insert), (eel_string_list_nth),
+	(eel_string_list_nth_as_integer), (eel_string_list_modify_nth),
+	(eel_string_list_remove_nth), (eel_string_list_contains),
+	(eel_string_list_find_by_function), (eel_string_list_get_length),
+	(eel_string_list_clear), (eel_string_list_equals),
+	(eel_string_list_as_g_slist),
+	(eel_string_list_get_index_for_string),
+	(eel_string_list_as_concatenated_string), (eel_string_list_sort),
+	(eel_string_list_sort_by_function),
+	(eel_string_list_remove_duplicates), (eel_string_list_for_each),
+	(eel_string_list_get_longest_string),
+	(eel_string_list_get_longest_string_length), (str_is_equal),
+	(eel_self_check_string_list):
+	Change implementation of string list to use a GSList instead of a
+	GList.  A few changes to match the nautilus style more.
+
+2001-04-16  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am:
+	Use RSVG_CFLAGS not RSVG_LIBS.
+	
+	* eel/eel-self-checks.c: (eel_check_string_list_result):
+	* eel/eel-self-checks.h:
+	Add support for EelStringList checks.
+	
+	* eel/eel-string-list.h:
+	* eel/eel-string-list.c: (eel_string_list_is_case_sensitive):
+	New function that returns whether the string list is case
+	sensitive or not.
+	
+2001-04-16  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am: Make the self checks header private and dont
+	install it.  Remove some unused include flags and a debug printf.
+
+	* eel/eel.h: Dont include the self checks header since its now
+	private.
+	
+	* test/Makefile.am: Remove some unused include flags.
+
+2001-04-16  Maciej Stachowiak  <mjs@eazel.com>
+
+	* eel/Makefile.am: Fix `make distcheck'.
+
+2001-04-16  Darin Adler  <darin@eazel.com>
+
+	* eel/Makefile.am: Remove stray reference to eel-boxed.defs
+	that was making the Tinderbox unhappy.
+
+2001-04-16  Maciej Stachowiak  <mjs@eazel.com>
+
+	* configure.in, eel/.cvsignore, eel/Makefile.am, eel/eel-types.c,
+	eel/eel-types.h, eel/eel.h, eel/makeenums.pl, eel/maketypes.awk:
+	Automatically generate GtkTypes for the various enumerations in
+	eel like gtk+ and gnome do. This is needed for language bindings.
+
+2001-04-13  Pavel Cisler  <pavel@eazel.com>
+
+	* eel/eel-list.c: (get_cell_text),
+	(eel_list_get_cell_hit_rectangle), (eel_list_item_hit),
+	(eel_list_button_press), (eel_list_button_release):
+	Add proper hit testing to the list view -- items now only get hit when
+	you click on text or an icon, clicking in empty space deselects.
+	
+	* eel/eel-list.c:(eel_list_setup_style_colors):
+	Tweak divider line colors to match Arlo's original spec.
+	
+	* eel/eel-list.c: (draw_cell),
+	(eel_list_get_initial_drag_offset):
+	Some small tweaks.
+
+2001-04-13  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-gdk-font-extensions.c: (eel_gdk_font_get_fixed):
+	Dont use the translated font anymore, thats the old broken way.
+	Try to load just a font (not a fontset) if the first try fails.
+	
+2001-04-12  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/check-program.c: (main):
+	* eel/eel-glib-extensions.c: (eel_g_hash_table_new_free_at_exit):
+	Use NAUTILUS_DEBUG, not EEL_DEBUG for now.
+
+	* eel/eel-font-manager.c: (ensure_local_font_table):
+	Use ~/.nautilus instead of ~/.eel for compatibility.
+	
+2001-04-09  Pavel Cisler  <pavel@eazel.com>
+
+	reviewed by: Mike Engber <engber@eazel.com>
+
+	* eel/eel-ellipsizing-label.c: (recompute_ellipsized_text):
+	* eel/eel-gdk-font-extensions.c: (eel_string_ellipsize),
+	(eel_self_check_ellipsize):
+	* eel/eel-gdk-font-extensions.h:
+	Tweak the API of the ellipsizing functions to make it a little
+	more convenient to use.
+
+2001-04-09  John Sullivan  <sullivan@eazel.com>
+
+	reviewed by: Pavel Cisler  <pavel@eazel.com>
+
+	* eel/eel-list-column-title.h:
+	* eel/eel-list-column-title.c:
+	(eel_list_column_title_queue_draw): New public function.
+	
+	* eel/eel-list.h:
+	* eel/eel-list.c:
+	(eel_list_set_sort_column), (eel_list_set_sort_type): New
+	functions that call eel_clist versions and also make the
+	column titles redraw.
+
+2001-04-08  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-enumeration.h:
+	* eel/eel-enumeration.c: (eel_enumeration_new),
+	(eel_enumeration_copy), (eel_enumeration_free),
+	(eel_enumeration_insert), (eel_enumeration_get_id),
+	(eel_enumeration_get_nth_name),
+	(eel_enumeration_get_nth_description),
+	(eel_enumeration_get_nth_value), (eel_enumeration_get_length),
+	(eel_enumeration_new_from_tokens),
+	(eel_enumeration_get_name_position),
+	(eel_enumeration_get_description_position),
+	(eel_enumeration_get_value_position), (eel_enumeration_get_names),
+	(eel_enumeration_insert_entries),
+	(enumeration_table_free_one_node), (enumeration_table_free),
+	(enumeration_table_get), (enumeration_table_lookup),
+	(enumeration_register), (eel_enumeration_register),
+	(eel_enumeration_lookup), (eel_enumeration_id_get_nth_name),
+	(eel_enumeration_id_get_nth_description),
+	(eel_enumeration_id_get_nth_value),
+	(eel_enumeration_id_get_length),
+	(eel_enumeration_id_get_name_position),
+	(eel_enumeration_id_get_description_position),
+	(eel_enumeration_id_get_value_position),
+	(eel_self_check_enumeration):
+	Add a way to register and query a global preference table using
+	string ids.  Makes it easier to deal with enumerations.  Perhaps
+	we can even lost the non id based functions.
+	
+2001-04-05  Andy Hertzfeld  <andy@eazel.com>
+
+	* eel/eel-gtk-extensions.c: (eel_gtk_marshal_POINTER__POINTER_INT):
+	* eel/eel-gtk-extensions.h:
+	added marshalling function needed for my post-1_0 branch
+	
+2001-04-05  Pavel Cisler  <pavel@eazel.com>
+
+	reviewed by: John Harper  <jsh@eazel.com>
+
+	Code needed to support nice list view column resizing.
+	
+	* eel/eel-gtk-extensions.c:
+	(eel_gtk_marshal_POINTER__INT_INT_POINTER_POINTER):
+	* eel/eel-gtk-extensions.h:
+	Add a marshalling function.
+
+	* eel/eel-list.c: (eel_list_initialize_class), (get_cell_text),
+	(draw_cell):
+	* eel/eel-list.h:
+	Use a signal to get the cell text, formatted for the right width.
+
+2001-04-05  Pavel Cisler  <pavel@eazel.com>
+
+	* eel/Makefile.am:
+	More fixes to not pick up libraries from /usr/lib first.
+	Checking in for Ramiro.
+
+2001-04-05  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am:
+	Put freettype and png libs at end of link line to prevent /usr/lib conflict.
+	
+2001-04-05  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-dnd.h:
+	* eel/eel-dnd.c: (eel_drag_init), (eel_drag_selection_item_new),
+	(drag_selection_item_destroy), (eel_drag_build_selection_list),
+	(eel_drag_items_local), (eel_drag_items_in_trash),
+	(eel_drag_default_drop_action_for_icons):
+	Make some constant private as they were not used anywhere else.
+	Make sure all public structures have an Eel namespace.
+
+	* eel/eel-clist.c:
+	* eel/eel-clist.h:
+	* eel/eel-list.c:
+	* eel/eel-list.h:
+	Indentation.
+
+	* Makefile.am:
+	* eel/eel-string-map.h:
+	* eel/eel-string-map.c:
+	* eel/eel-lib-self-check-functions.h:
+	Retire unused code.
+	
+	* eel/eel-vfs-extensions.h:
+	* eel/eel-vfs-extensions.c:
+	Fix the authors blurb.
+	
+2001-04-04  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am:
+	* eel/eel-clist.c:
+	* eel/eel-clist.h:
+	* eel/eel-ctree.c:
+	* eel/eel-ctree.h:
+	* eel/eel-dnd.c:
+	* eel/eel-dnd.h:
+	* eel/eel-list-column-title.c:
+	* eel/eel-list-column-title.h:
+	* eel/eel-list.c:
+	* eel/eel-list.h:
+	Move clist, ctree, and list widgets over from Nautilus.
+	
+2001-04-04  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel.spec.in:
+	Fix a dumb mistake in how the date was specified.
+
+2001-04-04  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/Makefile.am:
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel-vfs-extensions.h:
+	* eel/eel-vfs-extensions.c: (eel_read_entire_file),
+	(read_file_close_callback), (read_file_close),
+	(read_file_succeeded), (read_file_failed),
+	(read_file_read_callback), (read_file_read_chunk),
+	(read_file_open_callback),
+	(pthread_eel_read_file_callback_idle_binder),
+	(pthread_eel_read_file_callback_common),
+	(pthread_eel_read_file_synchronous_callback),
+	(pthread_eel_read_file_asynchronous_callback),
+	(pthread_eel_read_file_thread_entry),
+	(pthread_eel_read_file_async),
+	(pthread_eel_read_file_async_cancel), (eel_read_file_async),
+	(eel_read_entire_file_async), (eel_read_file_cancel),
+	(eel_uri_is_trash), (eel_uri_is_trash_folder),
+	(eel_uri_is_in_trash), (eel_format_uri_for_display),
+	(is_valid_scheme_character), (has_valid_scheme),
+	(eel_make_uri_from_input), (file_uri_from_local_relative_path),
+	(eel_make_uri_from_shell_arg), (eel_uri_get_basename),
+	(eel_uri_get_scheme), (is_uri_partial),
+	(remove_internal_relative_components),
+	(eel_uri_make_full_from_relative), (eel_uri_is_local_scheme),
+	(eel_handle_trailing_slashes), (eel_make_uri_canonical),
+	(eel_make_uri_canonical_strip_fragment), (uris_match),
+	(eel_uris_match), (eel_uris_match_ignore_fragments),
+	(eel_is_remote_uri), (eel_make_directory_and_parents),
+	(eel_copy_uri_simple), (eel_self_check_vfs_extensions):
+	Move gnome-vfs extensions over from
+	nautilus/nautilus-file-utilities.[ch]
+	
+2001-04-04  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* HACKING:
+	* README:
+	* RENAMING:
+	* THANKS:
+	Updated to be Eel specific.  Removed crufy leftover from Nautilus
+	move.
+
+	* configure.in:
+	* eel.spec.in:
+	Remove unused popt and imlib depenencies.
+	
+2001-04-04  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/check-program.c: (main):
+	Cleanup a lot of leftover cruft.
+	
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-gtk-extensions.h:
+	* eel/eel-background-canvas-group.c:
+	* eel/eel-background.c:
+	* eel/eel-background.h:
+	* eel/eel-caption-table.c:
+	* eel/eel-caption-table.h:
+	* eel/eel-caption.c:
+	* eel/eel-caption.h:
+	* eel/eel-clickable-image.c:
+	* eel/eel-clickable-image.h:
+	* eel/eel-debug-drawing.c:
+	* eel/eel-debug-drawing.h:
+	* eel/eel-debug.h:
+	* eel/eel-ellipsizing-label.c:
+	* eel/eel-ellipsizing-label.h:
+	* eel/eel-enumeration.h:
+	* eel/eel-font-manager.c:
+	* eel/eel-font-manager.h:
+	* eel/eel-font-picker.c:
+	* eel/eel-font-picker.h:
+	* eel/eel-gdk-extensions.h:
+	* eel/eel-gdk-font-extensions.c:
+	* eel/eel-gdk-font-extensions.h:
+	* eel/eel-gdk-pixbuf-extensions.c:
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-glib-extensions.h:
+	* eel/eel-glyph.c:
+	* eel/eel-glyph.h:
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-graphic-effects.h:
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-image-table.c:
+	* eel/eel-image-table.h:
+	* eel/eel-image.c:
+	* eel/eel-image.h:
+	* eel/eel-label.c:
+	* eel/eel-label.h:
+	* eel/eel-labeled-image.c:
+	* eel/eel-labeled-image.h:
+	* eel/eel-password-dialog.c:
+	* eel/eel-password-dialog.h:
+	* eel/eel-radio-button-group.c:
+	* eel/eel-radio-button-group.h:
+	* eel/eel-region.h:
+	* eel/eel-scalable-font.c:
+	* eel/eel-scalable-font.h:
+	* eel/eel-self-checks.h:
+	* eel/eel-smooth-text-layout-cache.c:
+	* eel/eel-smooth-text-layout-cache.h:
+	* eel/eel-smooth-text-layout.c:
+	* eel/eel-smooth-text-layout.h:
+	* eel/eel-smooth-widget.c:
+	* eel/eel-smooth-widget.h:
+	* eel/eel-stock-dialogs.h:
+	* eel/eel-string-list.c:
+	* eel/eel-string-list.h:
+	* eel/eel-string-map.c:
+	* eel/eel-string-map.h:
+	* eel/eel-string-picker.c:
+	* eel/eel-string-picker.h:
+	* eel/eel-string.h:
+	* eel/eel-text-caption.c:
+	* eel/eel-text-caption.h:
+	* eel/eel-viewport.c:
+	* eel/eel-viewport.h:
+	* eel/eel-wrap-table.c:
+	* eel/eel-wrap-table.h:
+	* eel/eel-xml-extensions.h:
+	Many style and indention changes.
+	
+2001-04-03  Darin Adler  <darin@eazel.com>
+
+	reviewed by: Ramiro
+
+	* eel/Makefile.am: Make a eel-background-canvas-group.h
+	private. Remove duplicate FREETYPE2_LIBS.
+	* eel/eel-glib-extensions.h: Get rid of EEL_MACRO_BEGIN and
+	EEL_MACRO_END (too close to G_STMT_START/END).
+
+2001-04-03  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-ellipsizing-label.c: (recompute_ellipsized_text):
+	Synchronize with Nautilus (for the last time hopefully).
+
+2001-04-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* test/test-eel-label.c:
+	* test/test.h:
+	Remove rogue unused #includes.
+	
+2001-04-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* configure.in:
+	Stuff that goes in eelConf.sh was missing.
+	
+2001-04-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel-config.in:
+	* eelConf.sh.in:
+	Eelify.
+	
+2001-04-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/check-eel:
+	Run checks with --sm-disable so that the session manager will not
+	hang and show dialogs.
+	
+2001-04-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel/eel-background-canvas-group.c:
+	(eel_background_canvas_group_initialize_common):
+	* eel/eel-font-manager.c: (eel_font_manager_get_default_font):
+	* eel/eel-gdk-font-extensions.c:
+	* eel/eel-stock-dialogs.c:
+	(timed_wait_delayed_close_timeout_callback), (timed_wait_free):
+	* eel/eel-text-caption.c:
+	Synchronize with Nautilus.
+	
+2001-04-02  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* acconfig.h:
+	* configure.in:
+	* eel.spec.in:
+	* eel/Makefile.am:
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-gtk-extensions.h:
+	* eel/eel-background-canvas-group.c:
+	(eel_background_canvas_group_initialize_common):
+	* eel/eel-background.c: (eel_background_destroy):
+	* eel/eel-background.h:
+	* eel/eel-caption-table.h:
+	* eel/eel-caption.c: (eel_caption_set_child),
+	(eel_caption_set_extra_spacing):
+	* eel/eel-caption.h:
+	* eel/eel-clickable-image.h:
+	* eel/eel-debug-drawing.c: (eel_debug_show_pixbuf_in_eog):
+	* eel/eel-debug-drawing.h:
+	* eel/eel-debug.h:
+	* eel/eel-ellipsizing-label.h:
+	* eel/eel-entry.c: (emacs_shortcuts_preference_changed_callback),
+	(eel_entry_initialize), (eel_entry_destroy):
+	* eel/eel-entry.h:
+	* eel/eel-enumeration.c: (eel_enumeration_new_from_tokens),
+	(eel_enumeration_get_entry_position),
+	(eel_enumeration_get_value_position),
+	(eel_enumeration_get_entries), (eel_self_check_enumeration):
+	* eel/eel-enumeration.h:
+	* eel/eel-file-utilities.h:
+	* eel/eel-font-factory.c:
+	(eel_font_factory_get_font_from_preferences):
+	* eel/eel-font-factory.h:
+	* eel/eel-font-manager.c: (font_description_table_add),
+	(font_description_table_new), (directory_contains_file),
+	(ensure_local_font_table), (eel_font_manager_get_default_font),
+	(eel_font_manager_get_default_bold_font),
+	(eel_self_check_font_manager):
+	* eel/eel-font-manager.h:
+	* eel/eel-font-picker.h:
+	* eel/eel-gdk-extensions.h:
+	* eel/eel-gdk-font-extensions.c: (eel_string_ellipsize_start),
+	(eel_string_ellipsize_end), (eel_string_ellipsize_middle),
+	(eel_self_check_ellipsize), (eel_self_check_ellipsize_start),
+	(eel_self_check_ellipsize_middle), (eel_self_check_ellipsize_end),
+	(eel_self_check_gdk_font_extensions):
+	* eel/eel-gdk-font-extensions.h:
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-glib-extensions.h:
+	* eel/eel-glyph.h:
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-graphic-effects.h:
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-image-table.h:
+	* eel/eel-image.h:
+	* eel/eel-label.c: (eel_label_set_text):
+	* eel/eel-label.h:
+	* eel/eel-labeled-image.h:
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel-password-dialog.h:
+	* eel/eel-radio-button-group.h:
+	* eel/eel-region.h:
+	* eel/eel-scalable-font.h:
+	* eel/eel-self-checks.h:
+	* eel/eel-smooth-text-layout-cache.h:
+	* eel/eel-smooth-text-layout.h:
+	* eel/eel-smooth-widget.c:
+	(eel_smooth_widget_global_set_is_smooth),
+	(eel_smooth_widget_register):
+	* eel/eel-smooth-widget.h:
+	* eel/eel-stock-dialogs.h:
+	* eel/eel-string-list.h:
+	* eel/eel-string-map.h:
+	* eel/eel-string-picker.h:
+	* eel/eel-string.h:
+	* eel/eel-text-caption.h:
+	* eel/eel-viewport.h:
+	* eel/eel-wrap-table.h:
+	* eel/eel-xml-extensions.h:
+	* test/Makefile.am:
+	* test/test.c: (eel_pixmap_file):
+	* test/test.h:
+	Synchronize with nautilus.
+	
+2001-03-28  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* eel.spec.in:
+	First pass at making the spec file valid.
+	
+2001-03-28  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* Makefile.am:
+	* acconfig.h:
+	* configure.in:
+	Remove more Nautilus cruft.  Make distcheck now passes.
+	
+2001-03-28  Ramiro Estrugo  <ramiro@eazel.com>
+
+	Change 'nautilus' namespace to 'eel' everywhere.
+	
+	* eel/Makefile.am:
+	* eel/check-program.c: (main):
+	* eel/eel-art-extensions.c: (eel_art_irect_contains_irect),
+	(eel_art_irect_contains_point), (eel_art_irect_hits_irect),
+	(eel_art_irect_equal), (eel_art_drect_equal),
+	(eel_art_irect_is_valid), (eel_art_irect_assign),
+	(eel_art_irect_get_width), (eel_art_irect_get_height),
+	(eel_art_irect_align), (eel_dimensions_empty),
+	(eel_art_irect_assign_dimensions), (eel_art_irect_offset_by),
+	(eel_art_irect_offset_to), (eel_art_irect_scale_by),
+	(eel_art_irect_inset), (eel_art_drect_offset_by),
+	(eel_art_drect_offset_to), (eel_art_irect_offset_by_point),
+	(eel_art_irect_offset_to_point), (eel_art_drect_scale_by),
+	(eel_art_drect_inset), (eel_self_check_art_extensions):
+	* eel/eel-art-extensions.h:
+	* eel/eel-art-gtk-extensions.c: (eel_gdk_rectangle_to_art_irect),
+	(eel_screen_get_dimensions), (eel_gdk_window_get_bounds),
+	(eel_gdk_window_get_screen_relative_bounds),
+	(eel_gtk_widget_get_bounds), (eel_gtk_widget_get_dimensions),
+	(eel_gtk_widget_get_preferred_dimensions),
+	(eel_gdk_window_clip_dirty_area_to_screen),
+	(eel_art_irect_to_gdk_rectangle), (eel_gdk_window_get_dimensions):
+	* eel/eel-art-gtk-extensions.h:
+	* eel/eel-background-canvas-group.c:
+	(eel_background_canvas_group_initialize_class),
+	(eel_background_canvas_group_initialize_common),
+	(eel_background_canvas_group_initialize),
+	(eel_background_canvas_group_supplant_root_class),
+	(eel_background_canvas_group_update),
+	(eel_background_canvas_group_draw),
+	(eel_background_canvas_group_render):
+	* eel/eel-background-canvas-group.h:
+	* eel/eel-background.c: (eel_background_initialize_class),
+	(eel_background_initialize), (eel_background_remove_current_image),
+	(eel_background_destroy), (eel_background_get_combine_mode),
+	(eel_background_set_combine_mode),
+	(eel_background_get_image_placement),
+	(eel_background_set_image_placement_no_emit),
+	(eel_background_set_image_placement), (eel_background_new),
+	(reset_cached_color_info),
+	(eel_background_ensure_gradient_buffered),
+	(fill_canvas_from_gradient_buffer),
+	(eel_background_image_totally_obscures),
+	(eel_background_ensure_image_scaled), (eel_background_pre_draw),
+	(eel_background_draw), (eel_background_draw_to_drawable),
+	(eel_background_draw_to_pixbuf), (draw_pixbuf_tiled_aa),
+	(eel_background_draw_aa), (eel_background_draw_to_canvas),
+	(eel_background_get_color), (eel_background_get_image_uri),
+	(eel_background_set_color_no_emit), (eel_background_set_color),
+	(eel_background_load_image_callback),
+	(eel_background_is_image_load_in_progress),
+	(eel_background_cancel_loading_image),
+	(eel_background_start_loading_image),
+	(eel_background_set_image_uri_helper),
+	(eel_background_set_image_uri),
+	(set_image_and_color_image_loading_done_callback),
+	(eel_background_set_image_uri_and_color),
+	(eel_background_receive_dropped_background_image),
+	(eel_gtk_style_get_default_class), (eel_gdk_window_update_sizes),
+	(eel_background_draw_flat_box),
+	(eel_background_get_gtk_style_class),
+	(eel_background_set_widget_style), (eel_background_is_set),
+	(eel_background_is_loaded), (eel_background_reset),
+	(eel_background_set_up_canvas), (eel_widget_background_changed),
+	(eel_get_widget_background), (eel_widget_has_attached_background),
+	(eel_gtk_widget_find_background_ancestor),
+	(eel_background_is_too_complex_for_gtk_style),
+	(eel_background_is_dark), (eel_background_receive_dropped_color),
+	(eel_self_check_background):
+	* eel/eel-background.h:
+	* eel/eel-caption-table.c: (eel_caption_table_initialize_class),
+	(eel_caption_table_initialize), (caption_table_destroy),
+	(eel_caption_table_resize), (caption_table_index_of_entry),
+	(caption_table_find_next_sensitive_entry), (entry_activate),
+	(eel_caption_table_new), (eel_caption_table_set_row_info),
+	(eel_caption_table_set_entry_text),
+	(eel_caption_table_set_entry_readonly),
+	(eel_caption_table_entry_grab_focus),
+	(eel_caption_table_get_entry_text),
+	(eel_caption_table_get_num_rows):
+	* eel/eel-caption-table.h:
+	* eel/eel-caption.c: (eel_caption_initialize_class),
+	(eel_caption_initialize), (eel_caption_destroy),
+	(eel_font_picker_show_all), (update_title), (eel_caption_new),
+	(eel_caption_set_title_label), (eel_caption_set_show_title),
+	(eel_caption_get_title_label), (eel_caption_get_title_label_width),
+	(eel_caption_set_child), (eel_caption_set_spacing):
+	* eel/eel-caption.h:
+	* eel/eel-clickable-image.c:
+	(eel_clickable_image_initialize_class),
+	(eel_clickable_image_initialize), (eel_clickable_image_destroy),
+	(eel_clickable_image_get_arg), (eel_clickable_image_realize),
+	(label_enter), (label_leave), (label_handle_motion),
+	(label_handle_button_press), (label_handle_button_release),
+	(ancestor_enter_notify_event), (ancestor_leave_notify_event),
+	(ancestor_motion_notify_event), (ancestor_button_press_event),
+	(ancestor_button_release_event),
+	(eel_clickable_image_expose_event),
+	(eel_clickable_image_set_up_pixbufs), (eel_clickable_image_new),
+	(eel_clickable_image_new_from_file_name),
+	(eel_clickable_image_new_solid),
+	(eel_clickable_image_set_prelight):
+	* eel/eel-clickable-image.h:
+	* eel/eel-debug-drawing.c: (debug_pixbuf_viewer_destroy),
+	(debug_pixbuf_viewer_size_request),
+	(debug_pixbuf_viewer_expose_event),
+	(debug_pixbuf_viewer_set_pixbuf),
+	(eel_debug_draw_rectangle_and_cross),
+	(eel_debug_show_pixbuf_in_eog), (eel_debug_show_pixbuf),
+	(eel_debug_pixbuf_draw_point), (eel_debug_pixbuf_draw_rectangle),
+	(eel_debug_pixbuf_draw_rectangle_inset):
+	* eel/eel-debug-drawing.h:
+	* eel/eel-debug.c: (eel_stop_in_debugger),
+	(eel_stop_after_default_log_handler),
+	(eel_set_stop_after_default_log_handler),
+	(eel_make_warnings_and_criticals_stop_in_debugger),
+	(eel_get_available_file_descriptor_count),
+	(eel_str_equal_with_free):
+	* eel/eel-debug.h:
+	* eel/eel-ellipsizing-label.c:
+	(eel_ellipsizing_label_initialize_class),
+	(eel_ellipsizing_label_initialize), (real_destroy),
+	(eel_ellipsizing_label_new), (recompute_ellipsized_text),
+	(eel_ellipsizing_label_set_text), (real_size_request),
+	(real_size_allocate), (real_style_set):
+	* eel/eel-ellipsizing-label.h:
+	* eel/eel-entry.c: (eel_entry_initialize), (eel_entry_new),
+	(eel_entry_new_with_max_length), (eel_entry_destroy),
+	(obscure_cursor), (eel_entry_key_press), (eel_entry_motion_notify),
+	(eel_entry_select_all), (select_all_at_idle),
+	(eel_entry_select_all_at_idle), (eel_entry_set_text),
+	(eel_entry_set_selection), (eel_entry_button_press),
+	(eel_entry_button_release), (eel_entry_insert_text),
+	(eel_entry_delete_text), (eel_entry_selection_clear),
+	(eel_entry_initialize_class):
+	* eel/eel-entry.h:
+	* eel/eel-enumeration.c: (eel_enumeration_new),
+	(eel_enumeration_free), (eel_enumeration_insert),
+	(eel_enumeration_get_nth_entry),
+	(eel_enumeration_get_nth_description),
+	(eel_enumeration_get_nth_value), (eel_enumeration_get_num_entries),
+	(eel_self_check_enumeration):
+	* eel/eel-enumeration.h:
+	* eel/eel-file-utilities.c: (eel_format_uri_for_display),
+	(eel_make_uri_from_input), (file_uri_from_local_relative_path),
+	(eel_make_uri_from_shell_arg), (eel_uri_get_basename),
+	(eel_uri_get_scheme), (eel_uri_make_full_from_relative),
+	(eel_uri_is_trash), (eel_uri_is_trash_folder),
+	(eel_uri_is_in_trash), (eel_uri_is_local_scheme),
+	(eel_handle_trailing_slashes), (eel_make_uri_canonical),
+	(eel_make_uri_canonical_strip_fragment), (uris_match),
+	(eel_uris_match), (eel_uris_match_ignore_fragments),
+	(eel_file_name_matches_hidden_pattern),
+	(eel_file_name_matches_backup_pattern), (eel_make_path),
+	(eel_get_user_directory), (eel_get_desktop_directory),
+	(eel_user_main_directory_exists), (eel_get_pixmap_directory),
+	(eel_is_remote_uri), (eel_pixmap_file), (eel_read_entire_file),
+	(read_file_close), (read_file_succeeded), (read_file_failed),
+	(read_file_read_callback), (read_file_read_chunk),
+	(read_file_open_callback),
+	(pthread_eel_read_file_callback_idle_binder),
+	(pthread_eel_read_file_callback_common),
+	(pthread_eel_read_file_synchronous_callback),
+	(pthread_eel_read_file_asynchronous_callback),
+	(pthread_eel_read_file_thread_entry),
+	(pthread_eel_read_file_async),
+	(pthread_eel_read_file_async_cancel), (eel_read_file_async),
+	(eel_read_entire_file_async), (eel_read_file_cancel),
+	(eel_make_directory_and_parents), (eel_copy_uri_simple),
+	(eel_unique_temporary_file_name), (eel_get_build_time_stamp),
+	(eel_get_build_message), (eel_self_check_file_utilities):
+	* eel/eel-file-utilities.h:
+	* eel/eel-font-factory.c: (eel_get_current_font_factory),
+	(eel_font_factory_get), (eel_font_factory_initialize),
+	(eel_font_factory_initialize_class), (destroy),
+	(font_hash_node_lookup), (font_hash_node_lookup_with_insertion),
+	(eel_font_factory_get_font_by_family),
+	(eel_font_factory_get_font_from_preferences):
+	* eel/eel-font-factory.h:
+	* eel/eel-font-manager.c: (font_description_new),
+	(font_description_table_add), (font_get_font_type),
+	(font_description_table_find), (font_description_table_for_each),
+	(font_description_table_new), (directory_contains_file),
+	(font_directory_is_ignored), (font_foundry_is_ignored),
+	(font_family_is_ignored), (font_manager_collect_font_tables),
+	(ensure_local_font_table), (eel_font_manager_for_each_font),
+	(eel_font_manager_get_default_font),
+	(eel_font_manager_get_default_bold_font),
+	(eel_font_manager_file_is_scalable_font),
+	(font_list_find_bold_callback), (eel_font_manager_get_bold),
+	(eel_font_manager_weight_is_bold), (get_test_font_dir),
+	(eel_self_check_font_manager):
+	* eel/eel-font-manager.h:
+	* eel/eel-font-picker.c: (eel_font_picker_initialize_class),
+	(option_menu_button_press_event), (menu_deactivate),
+	(eel_font_picker_initialize), (eel_font_picker_destroy),
+	(font_list_find), (style_menu_item_activate_callback),
+	(style_menu_item_button_release_event), (font_picker_add_item),
+	(font_picker_populate), (font_find_style), (font_make_style_name),
+	(font_slant_string_to_enum), (font_set_width_string_to_enum),
+	(font_style_entry_new), (font_list_count_families),
+	(compare_font_entry), (global_font_list_get), (compare_style),
+	(global_font_list_populate_callback),
+	(eel_gtk_menu_shell_get_num_items),
+	(font_picker_get_selected_style_entry),
+	(font_picker_find_entries_for_font),
+	(font_picker_get_index_for_entry), (eel_font_picker_new),
+	(eel_font_picker_get_selected_font),
+	(eel_font_picker_set_selected_font):
+	* eel/eel-font-picker.h:
+	* eel/eel-gdk-extensions.c: (eel_fill_rectangle),
+	(eel_fill_rectangle_with_color), (eel_rectangle_contains),
+	(eel_rectangle_inset), (eel_interpolate_color), (eel_gradient_new),
+	(eel_gradient_is_gradient), (eel_gradient_is_horizontal),
+	(eel_gradient_strip_trailing_direction_if_any),
+	(eel_gradient_parse_one_color_spec),
+	(eel_gradient_get_start_color_spec),
+	(eel_gradient_get_end_color_spec), (eel_gradient_set_edge_color),
+	(eel_gradient_set_left_color_spec),
+	(eel_gradient_set_top_color_spec),
+	(eel_gradient_set_right_color_spec),
+	(eel_gradient_set_bottom_color_spec),
+	(eel_gdk_color_parse_with_white_default),
+	(eel_parse_rgb_with_white_default), (eel_rgb16_to_rgb),
+	(eel_rgb8_to_rgb), (eel_gdk_color_to_rgb), (eel_gdk_rgb_to_color),
+	(eel_gdk_rgb_to_color_spec), (eel_shift_color_component),
+	(eel_rgb_shift_color), (eel_gdk_color_is_dark),
+	(eel_gdk_choose_foreground_color),
+	(eel_gdk_gc_choose_foreground_color), (eel_stipple_bitmap),
+	(eel_gdk_window_bring_to_front), (eel_gdk_window_focus),
+	(eel_gdk_window_set_wm_protocols), (eel_set_mini_icon),
+	(eel_gdk_window_set_wm_hints_input),
+	(eel_gdk_window_set_invisible_cursor), (eel_gdk_parse_geometry),
+	(eel_gdk_color_as_hex_string), (eel_self_check_parse),
+	(eel_self_check_gdk_extensions):
+	* eel/eel-gdk-extensions.h:
+	* eel/eel-gdk-font-extensions.c: (eel_gdk_font_get_italic),
+	(eel_gdk_font_get_bold), (font_bitmap_get_by_size),
+	(eel_gdk_font_get_larger), (eel_gdk_font_get_smaller),
+	(eel_gdk_font_equal), (eel_gdk_font_get_largest_fitting),
+	(eel_string_ellipsize_start), (font_get_bold), (font_list_fonts),
+	(font_list_table_free_one_node), (font_list_fonts_cached),
+	(eel_gdk_font_get_fixed), (xlfd_string_get_nth),
+	(xlfd_string_replace_nth), (xlfd_string_get_nth_as_int),
+	(xlfd_string_could_be_scalable_non_bitmap),
+	(eel_gdk_font_xlfd_string_new), (font_entry_has_bold_weight_test),
+	(font_entry_has_italic_slant_test),
+	(font_entry_is_scalable_non_bitmap_test),
+	(eel_self_check_ellipsize_start),
+	(eel_self_check_gdk_font_extensions):
+	* eel/eel-gdk-font-extensions.h:
+	* eel/eel-gdk-pixbuf-extensions.c: (eel_gdk_pixbuf_list_ref),
+	(eel_gdk_pixbuf_list_free), (eel_gdk_pixbuf_load),
+	(eel_gdk_pixbuf_load_async), (file_opened_callback),
+	(file_read_callback), (free_pixbuf_load_handle), (load_done),
+	(eel_cancel_gdk_pixbuf_load), (eel_gdk_pixbuf_average_value),
+	(eel_gdk_scale_to_fit_factor), (eel_gdk_pixbuf_scale_to_fit),
+	(eel_gdk_pixbuf_scale_down_to_fit), (eel_gdk_pixbuf_is_valid),
+	(eel_gdk_pixbuf_get_dimensions),
+	(eel_gdk_pixbuf_fill_rectangle_with_color),
+	(eel_gdk_pixbuf_save_to_file), (eel_gdk_pixbuf_ref_if_not_null),
+	(eel_gdk_pixbuf_unref_if_not_null),
+	(eel_gdk_pixbuf_draw_to_drawable), (eel_gdk_pixbuf_draw_to_pixbuf),
+	(eel_gdk_pixbuf_draw_to_pixbuf_alpha),
+	(eel_gdk_pixbuf_new_from_pixbuf_sub_area),
+	(eel_gdk_pixbuf_new_from_existing_buffer), (pixbuf_draw_tiled),
+	(draw_tile_to_pixbuf_callback), (draw_tile_to_drawable_callback),
+	(eel_gdk_pixbuf_draw_to_pixbuf_tiled),
+	(eel_gdk_pixbuf_draw_to_drawable_tiled),
+	(eel_gdk_pixbuf_get_global_buffer),
+	(eel_gdk_pixbuf_get_from_window_safe), (eel_gdk_pixbuf_intersect),
+	(eel_self_check_gdk_pixbuf_extensions):
+	* eel/eel-gdk-pixbuf-extensions.h:
+	* eel/eel-glib-extensions.c: (eel_setenv), (eel_unsetenv),
+	(eel_g_date_new_tm), (eel_strdup_strftime),
+	(eel_g_list_exactly_one_item), (eel_g_list_more_than_one_item),
+	(eel_g_list_equal), (eel_g_list_copy), (eel_g_str_list_equal),
+	(eel_g_str_list_copy), (eel_g_str_list_alphabetize),
+	(eel_g_list_free_deep_custom), (eel_g_list_free_deep),
+	(eel_g_slist_free_deep_custom), (eel_g_slist_free_deep),
+	(eel_g_strv_find), (eel_g_list_safe_for_each),
+	(eel_g_list_sort_merge), (eel_g_list_is_already_sorted),
+	(eel_g_list_sort_custom),
+	(eel_g_lists_sort_and_check_for_intersection),
+	(eel_g_list_partition), (eel_g_ptr_array_new_from_list),
+	(eel_g_ptr_array_sort), (eel_g_ptr_array_search),
+	(eel_get_system_time), (eel_g_hash_table_new_free_at_exit),
+	(eel_g_hash_table_safe_for_each),
+	(eel_g_hash_table_remove_deep_custom),
+	(eel_g_hash_table_remove_deep),
+	(eel_g_hash_table_destroy_deep_custom),
+	(eel_g_hash_table_destroy_deep), (eel_g_string_append_len),
+	(eel_shell_quote), (eel_round), (eel_g_list_from_g_slist),
+	(eel_g_slist_from_g_list),
+	(eel_dumb_down_for_multi_byte_locale_hack), (eel_compare_integer),
+	(check_tm_to_g_date), (eel_test_predicate), (test_strftime),
+	(eel_self_check_glib_extensions):
+	* eel/eel-glib-extensions.h:
+	* eel/eel-glyph.c: (eel_glyph_new), (eel_glyph_free),
+	(glyph_get_width_space_safe), (glyph_get_height_space_safe),
+	(eel_glyph_get_width), (eel_glyph_get_height),
+	(eel_glyph_get_dimensions), (eel_glyph_get_underline_rectangle),
+	(glyph_is_valid), (eel_glyph_draw_to_pixbuf),
+	(eel_glyph_intersect), (eel_glyph_compare):
+	* eel/eel-glyph.h:
+	* eel/eel-gnome-extensions.c:
+	(eel_gnome_canvas_world_to_window_rectangle),
+	(eel_gnome_canvas_world_to_canvas_rectangle),
+	(eel_gnome_canvas_item_get_current_canvas_bounds),
+	(eel_gnome_canvas_item_request_redraw),
+	(eel_gnome_canvas_request_redraw_rectangle),
+	(eel_gnome_canvas_item_get_world_bounds),
+	(eel_gnome_canvas_item_get_canvas_bounds),
+	(eel_gnome_canvas_draw_pixbuf_helper),
+	(eel_gnome_canvas_draw_pixbuf_helper_alpha),
+	(eel_gnome_canvas_draw_pixbuf), (eel_gnome_canvas_fill_rgb),
+	(eel_gnome_dialog_get_button_by_index),
+	(eel_gnome_canvas_item_request_update_deep),
+	(eel_gnome_canvas_request_update_all),
+	(eel_gnome_canvas_set_scroll_region),
+	(eel_gnome_canvas_set_scroll_region_left_justify),
+	(eel_gnome_canvas_set_scroll_region_include_visible_area),
+	(eel_gnome_shell_execute), (eel_gnome_get_terminal_path),
+	(eel_gnome_open_terminal), (icon_selected_callback),
+	(eel_gnome_icon_selector_new),
+	(eel_gnome_stock_set_icon_or_register):
+	* eel/eel-gnome-extensions.h:
+	* eel/eel-graphic-effects.c: (eel_create_spotlight_pixbuf),
+	(eel_create_darkened_pixbuf), (eel_create_colorized_pixbuf),
+	(eel_stretch_frame_image), (eel_embed_image_in_frame),
+	(eel_make_semi_transparent):
+	* eel/eel-graphic-effects.h:
+	* eel/eel-gtk-extensions.c: (finish_button_activation),
+	(eel_gtk_button_auto_click), (eel_gtk_button_set_padding),
+	(eel_gtk_button_set_standard_padding),
+	(eel_gtk_clist_get_first_selected_row),
+	(eel_gtk_clist_get_last_selected_row),
+	(activate_button_on_double_click),
+	(eel_gtk_clist_set_double_click_button),
+	(eel_gtk_signal_connect_free_data_custom),
+	(eel_gtk_signal_connect_free_data), (eel_gtk_window_present),
+	(handle_standard_close_accelerator),
+	(eel_gtk_window_event_is_close_accelerator),
+	(eel_gtk_window_set_up_close_accelerator),
+	(eel_gtk_window_set_initial_geometry),
+	(eel_gtk_window_set_initial_geometry_from_string),
+	(eel_gtk_selection_data_copy_deep),
+	(eel_gtk_selection_data_free_deep), (eel_popup_menu_position_func),
+	(eel_truncate_text_for_menu_item), (eel_pop_up_context_menu),
+	(eel_gtk_menu_append_separator), (eel_gtk_menu_insert_separator),
+	(eel_gtk_menu_set_item_visibility),
+	(eel_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE),
+	(eel_gtk_marshal_NONE__INT_INT_INT),
+	(eel_gtk_marshal_NONE__POINTER_INT_INT_INT),
+	(eel_gtk_marshal_NONE__POINTER_INT_POINTER_POINTER),
+	(eel_gtk_marshal_NONE__POINTER_POINTER_INT_INT_INT),
+	(eel_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT),
+	(eel_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT),
+	(eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT),
+	(eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT
+	), (eel_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE_DOUBLE),
+	(eel_gtk_marshal_NONE__DOUBLE),
+	(eel_gtk_marshal_NONE__DOUBLE_DOUBLE_DOUBLE),
+	(eel_gtk_marshal_POINTER__NONE), (eel_gtk_marshal_INT__NONE),
+	(eel_gtk_marshal_POINTER__INT), (eel_gtk_marshal_POINTER__POINTER),
+	(eel_gtk_marshal_INT__POINTER_POINTER),
+	(eel_gtk_marshal_INT__POINTER_INT),
+	(eel_gtk_marshal_POINTER__POINTER_POINTER),
+	(eel_gtk_marshal_POINTER__POINTER_POINTER_POINTER),
+	(eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER),
+	(eel_gtk_marshal_POINTER__POINTER_INT_INT_POINTER_POINTER),
+	(eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER_POIN
+	TER), (eel_point_in_allocation), (eel_point_in_widget),
+	(eel_gtk_object_list_ref), (eel_gtk_object_list_unref),
+	(eel_gtk_object_list_free), (eel_gtk_object_list_copy),
+	(eel_gtk_style_set_font), (eel_gtk_widget_set_font),
+	(eel_gtk_widget_set_shown), (eel_gtk_widget_set_font_by_name),
+	(eel_gtk_signal_connect_full_while_alive),
+	(eel_gtk_signal_connect_while_realized),
+	(eel_nullify_when_destroyed), (eel_nullify_cancel),
+	(eel_gtk_container_get_first_child),
+	(eel_gtk_container_foreach_deep), (eel_gtk_pixmap_new_empty),
+	(eel_gtk_adjustment_set_value), (eel_gtk_adjustment_clamp_value),
+	(eel_gtk_label_make_bold), (eel_gtk_label_make_larger),
+	(eel_gtk_label_make_smaller),
+	(eel_gtk_widget_set_background_color),
+	(eel_gtk_widget_set_foreground_color),
+	(eel_gtk_widget_find_windowed_ancestor), (eel_gtk_style_shade),
+	(eel_gtk_class_name_make_like_existing_type),
+	(eel_get_window_list_ordered_front_to_back),
+	(eel_gtk_get_system_font), (eel_get_current_event_time),
+	(eel_drag_set_icon_pixbuf):
+	* eel/eel-gtk-extensions.h:
+	* eel/eel-gtk-macros.h:
+	* eel/eel-image-table.c: (eel_image_table_initialize_class),
+	(eel_image_table_initialize), (eel_image_table_destroy),
+	(eel_image_table_expose_event), (eel_image_table_realize),
+	(eel_image_table_unrealize), (eel_image_table_remove),
+	(eel_image_table_child_type),
+	(eel_image_table_set_is_smooth_signal),
+	(image_table_foreach_child_subtract_content),
+	(image_table_clear_dirty_areas), (image_table_peek_clear_gc),
+	(image_table_emit_signal), (image_table_handle_motion),
+	(ancestor_enter_notify_event), (ancestor_leave_notify_event),
+	(ancestor_motion_notify_event), (ancestor_button_press_event),
+	(ancestor_button_release_event), (eel_image_table_new),
+	(eel_image_table_set_is_smooth),
+	(eel_image_table_set_smooth_background_color),
+	(eel_image_table_add_empty_image):
+	* eel/eel-image-table.h:
+	* eel/eel-image-with-background.c: (draw_background_callback),
+	(eel_image_new_with_background):
+	* eel/eel-image-with-background.h:
+	* eel/eel-image.c: (eel_image_initialize_class),
+	(eel_image_initialize), (eel_image_destroy), (eel_image_set_arg),
+	(eel_image_get_arg), (eel_image_size_request),
+	(image_paint_pixbuf_callback), (image_composite_pixbuf_callback),
+	(eel_image_expose_event), (eel_image_set_is_smooth_signal),
+	(image_get_pixbuf_dimensions), (image_get_pixbuf_bounds),
+	(image_get_tile_dimensions), (image_is_smooth), (eel_image_new),
+	(eel_image_set_is_smooth), (eel_image_get_is_smooth),
+	(eel_image_set_tile_pixbuf), (eel_image_get_tile_pixbuf),
+	(eel_image_set_pixbuf), (eel_image_set_pixbuf_from_file_name),
+	(eel_image_get_pixbuf), (eel_image_set_pixbuf_opacity),
+	(eel_image_get_pixbuf_opacity), (eel_image_set_tile_opacity),
+	(eel_image_get_tile_opacity), (eel_image_set_tile_width),
+	(eel_image_get_tile_width), (eel_image_set_tile_height),
+	(eel_image_get_tile_height), (eel_image_set_tile_mode_vertical),
+	(eel_image_get_tile_mode_vertical),
+	(eel_image_set_tile_mode_horizontal),
+	(eel_image_get_tile_mode_horizontal),
+	(eel_image_set_tile_pixbuf_from_file_name),
+	(eel_image_set_background_mode), (eel_image_get_background_mode),
+	(eel_image_set_solid_background_color),
+	(eel_image_get_solid_background_color), (eel_image_new_solid),
+	(eel_image_set_never_smooth):
+	* eel/eel-image.h:
+	* eel/eel-label-with-background.c: (draw_background_callback),
+	(eel_label_new_with_background):
+	* eel/eel-label-with-background.h:
+	* eel/eel-label.c: (eel_label_initialize_class),
+	(eel_label_initialize), (eel_label_destroy), (eel_label_set_arg),
+	(eel_label_get_arg), (eel_label_size_request),
+	(eel_label_size_allocate), (label_paint_pixbuf_callback),
+	(label_composite_text_callback_cached),
+	(label_composite_text_callback),
+	(label_composite_text_and_shadow_callback), (label_paint),
+	(paint_label_smooth), (paint_label_smooth_cached),
+	(eel_label_expose_event), (eel_label_set_is_smooth_signal),
+	(label_get_default_line_wrap_width), (label_get_text_dimensions),
+	(label_get_text_bounds), (label_get_content_dimensions),
+	(label_get_content_bounds), (label_get_tile_dimensions),
+	(label_solid_cache_pixbuf_clear), (label_can_cache_contents),
+	(label_peek_text), (label_smooth_text_ensure),
+	(label_smooth_text_clear), (label_is_smooth), (eel_label_new),
+	(eel_label_set_smooth_font), (eel_label_get_smooth_font),
+	(eel_label_set_smooth_font_size), (eel_label_get_smooth_font_size),
+	(label_force_cached_requisition_flush), (eel_label_set_is_smooth),
+	(eel_label_get_is_smooth), (eel_label_set_tile_pixbuf),
+	(eel_label_get_tile_pixbuf), (eel_label_set_text_opacity),
+	(eel_label_get_text_opacity), (eel_label_set_tile_opacity),
+	(eel_label_get_tile_opacity), (eel_label_set_tile_width),
+	(eel_label_get_tile_width), (eel_label_set_tile_height),
+	(eel_label_get_tile_height), (eel_label_set_tile_mode_vertical),
+	(eel_label_get_tile_mode_vertical),
+	(eel_label_set_tile_mode_horizontal),
+	(eel_label_get_tile_mode_horizontal),
+	(eel_label_set_tile_pixbuf_from_file_name),
+	(eel_label_set_background_mode), (eel_label_get_background_mode),
+	(eel_label_set_solid_background_color),
+	(eel_label_get_solid_background_color),
+	(eel_label_set_smooth_line_wrap_width),
+	(eel_label_get_smooth_line_wrap_width), (eel_label_set_text_color),
+	(eel_label_get_text_color),
+	(eel_label_set_smooth_drop_shadow_offset),
+	(eel_label_get_smooth_drop_shadow_offset),
+	(eel_label_set_smooth_drop_shadow_color),
+	(eel_label_get_smooth_drop_shadow_color), (eel_label_set_justify),
+	(eel_label_get_text_justify), (eel_label_set_text),
+	(eel_label_get_text), (eel_label_set_wrap), (eel_label_get_wrap),
+	(eel_label_new_solid), (eel_label_make_bold),
+	(eel_label_make_larger), (eel_label_make_smaller),
+	(eel_label_set_never_smooth),
+	(eel_label_set_adjust_wrap_on_resize),
+	(eel_label_get_adjust_wrap_on_resize):
+	* eel/eel-label.h:
+	* eel/eel-labeled-image.c: (eel_labeled_image_initialize_class),
+	(eel_labeled_image_initialize), (eel_labeled_image_destroy),
+	(eel_labeled_image_set_arg), (eel_labeled_image_get_arg),
+	(eel_labeled_image_size_request),
+	(eel_labeled_image_size_allocate),
+	(eel_labeled_image_expose_event), (eel_labeled_image_map),
+	(eel_labeled_image_unmap), (eel_labeled_image_add),
+	(eel_labeled_image_remove), (eel_labeled_image_forall),
+	(is_fixed_height), (labeled_image_get_image_dimensions),
+	(labeled_image_get_label_dimensions),
+	(labeled_image_get_image_bounds_fill),
+	(eel_labeled_image_get_image_bounds),
+	(labeled_image_get_label_bounds_fill),
+	(eel_labeled_image_get_label_bounds),
+	(labeled_image_update_alignments),
+	(labeled_image_get_content_dimensions),
+	(labeled_image_get_content_bounds), (labeled_image_ensure_label),
+	(labeled_image_ensure_image), (labeled_image_show_image),
+	(labeled_image_show_label), (eel_labeled_image_new),
+	(eel_labeled_image_new_from_file_name),
+	(eel_labeled_image_set_label_position),
+	(eel_labeled_image_get_label_position),
+	(eel_labeled_image_set_show_label),
+	(eel_labeled_image_get_show_label),
+	(eel_labeled_image_set_show_image),
+	(eel_labeled_image_get_show_image),
+	(eel_labeled_image_set_fixed_image_height),
+	(eel_labeled_image_set_spacing), (eel_labeled_image_get_spacing),
+	(eel_labeled_image_set_x_padding),
+	(eel_labeled_image_get_x_padding),
+	(eel_labeled_image_set_y_padding),
+	(eel_labeled_image_get_y_padding),
+	(eel_labeled_image_set_x_alignment),
+	(eel_labeled_image_get_x_alignment),
+	(eel_labeled_image_set_y_alignment),
+	(eel_labeled_image_get_y_alignment), (eel_labeled_image_set_fill),
+	(eel_labeled_image_get_fill), (eel_labeled_image_button_new),
+	(eel_labeled_image_button_new_from_file_name),
+	(eel_labeled_image_toggle_button_new),
+	(eel_labeled_image_toggle_button_new_from_file_name),
+	(button_leave_callback), (eel_labeled_image_check_button_new),
+	(eel_labeled_image_check_button_new_from_file_name),
+	(eel_labeled_image_set_pixbuf),
+	(eel_labeled_image_set_pixbuf_from_file_name),
+	(eel_labeled_image_set_tile_pixbuf),
+	(eel_labeled_image_set_tile_pixbuf_from_file_name),
+	(eel_labeled_image_get_pixbuf), (eel_labeled_image_set_text),
+	(eel_labeled_image_get_text), (eel_labeled_image_make_bold),
+	(eel_labeled_image_make_larger), (eel_labeled_image_make_smaller),
+	(eel_labeled_image_set_tile_width),
+	(eel_labeled_image_set_tile_height),
+	(eel_labeled_image_set_background_mode),
+	(eel_labeled_image_set_solid_background_color),
+	(eel_labeled_image_set_smooth_drop_shadow_offset),
+	(eel_labeled_image_set_smooth_drop_shadow_color),
+	(eel_labeled_image_set_text_color),
+	(eel_labeled_image_set_label_never_smooth):
+	* eel/eel-labeled-image.h:
+	* eel/eel-lib-self-check-functions.c: (eel_run_lib_self_checks):
+	* eel/eel-lib-self-check-functions.h:
+	* eel/eel-password-dialog.c:
+	(eel_password_dialog_initialize_class),
+	(eel_password_dialog_initialize), (eel_password_dialog_destroy),
+	(dialog_show_callback), (dialog_close_callback),
+	(caption_table_activate_callback), (eel_password_dialog_new),
+	(eel_password_dialog_run_and_block),
+	(eel_password_dialog_set_username),
+	(eel_password_dialog_set_password),
+	(eel_password_dialog_set_readonly_username),
+	(eel_password_dialog_get_username),
+	(eel_password_dialog_get_password),
+	(eel_password_dialog_get_remember),
+	(eel_password_dialog_set_remember),
+	(eel_password_dialog_set_remember_label_text):
+	* eel/eel-password-dialog.h:
+	* eel/eel-radio-button-group.c:
+	(eel_radio_button_group_initialize_class),
+	(eel_radio_button_group_initialize),
+	(eel_radio_button_group_destroy),
+	(radio_button_group_emit_changed_signal),
+	(radio_button_group_free_button_group), (button_toggled),
+	(eel_radio_button_group_new), (eel_radio_button_group_insert),
+	(eel_radio_button_group_get_active_index),
+	(eel_radio_button_group_set_active_index),
+	(eel_radio_button_group_set_entry_pixbuf),
+	(eel_radio_button_group_set_entry_description_text):
+	* eel/eel-radio-button-group.h:
+	* eel/eel-region.c: (eel_region_new), (eel_region_free),
+	(gdk_region_new_from_irect), (eel_region_add_rectangle),
+	(eel_region_subtract_rectangle), (eel_region_set_gc_clip_region):
+	* eel/eel-region.h:
+	* eel/eel-scalable-font-private.h:
+	* eel/eel-scalable-font.c: (eel_scalable_font_initialize_class),
+	(eel_scalable_font_initialize), (eel_scalable_font_destroy),
+	(eel_scalable_font_new), (eel_scalable_font_make_bold),
+	(eel_scalable_font_measure_text), (eel_scalable_font_text_width),
+	(eel_scalable_font_draw_text),
+	(eel_scalable_font_largest_fitting_font_size),
+	(eel_scalable_font_get_default_font),
+	(eel_scalable_font_get_default_bold_font),
+	(eel_scalable_font_get_rsvg_handle),
+	(eel_scalable_font_get_rsvg_context),
+	(eel_self_check_scalable_font):
+	* eel/eel-scalable-font.h:
+	* eel/eel-self-checks.c: (eel_exit_if_self_checks_failed),
+	(eel_report_check_failure), (eel_strdup_boolean),
+	(eel_before_check), (eel_after_check), (eel_check_boolean_result),
+	(eel_check_rectangle_result), (eel_check_dimensions_result),
+	(eel_check_integer_result), (eel_check_string_result),
+	(eel_before_check_function), (eel_after_check_function):
+	* eel/eel-self-checks.h:
+	* eel/eel-smooth-text-layout-cache.c: (cache_index_new),
+	(cache_insert), (cache_remove), (cache_enter), (cache_evict),
+	(cache_lookup), (cache_trim),
+	(eel_smooth_text_layout_cache_render),
+	(eel_smooth_text_layout_cache_new),
+	(eel_smooth_text_layout_cache_initialize_class),
+	(eel_smooth_text_layout_cache_initialize), (free_one_cache_entry),
+	(eel_smooth_text_layout_cache_destroy), (check_one),
+	(eel_self_check_smooth_text_layout_cache):
+	* eel/eel-smooth-text-layout-cache.h:
+	* eel/eel-smooth-text-layout.c:
+	(eel_smooth_text_layout_initialize_class),
+	(eel_smooth_text_layout_initialize),
+	(eel_smooth_text_layout_destroy), (smooth_text_layout_clear_lines),
+	(smooth_text_layout_ensure_lines),
+	(smooth_text_layout_line_list_new),
+	(smooth_text_layout_line_list_free),
+	(smooth_text_layout_line_list_draw_to_pixbuf),
+	(smooth_text_layout_line_list_new_wrapped),
+	(smooth_text_layout_get_empty_line_height),
+	(smooth_text_layout_get_num_empty_lines),
+	(smooth_text_layout_get_max_line_width),
+	(smooth_text_layout_get_total_line_height),
+	(smooth_text_layout_get_line_wrap_width),
+	(eel_smooth_text_layout_new),
+	(eel_smooth_text_layout_draw_to_pixbuf),
+	(eel_smooth_text_layout_draw_to_pixbuf_shadow),
+	(eel_smooth_text_layout_get_dimensions),
+	(eel_smooth_text_layout_get_width),
+	(eel_smooth_text_layout_get_height),
+	(eel_smooth_text_layout_set_wrap),
+	(eel_smooth_text_layout_get_wrap),
+	(eel_smooth_text_layout_set_font),
+	(eel_smooth_text_layout_get_font),
+	(eel_smooth_text_layout_set_font_size),
+	(eel_smooth_text_layout_get_font_size),
+	(eel_smooth_text_layout_set_line_spacing),
+	(eel_smooth_text_layout_get_line_spacing),
+	(eel_smooth_text_layout_set_empty_line_height),
+	(eel_smooth_text_layout_get_empty_line_height),
+	(smooth_text_layout_set_text),
+	(eel_smooth_text_layout_set_line_break_characters),
+	(eel_smooth_text_layout_get_line_break_characters),
+	(eel_smooth_text_layout_set_line_wrap_width),
+	(text_layout_free_row), (eel_text_layout_free),
+	(eel_text_layout_new), (eel_smooth_text_layout_compare):
+	* eel/eel-smooth-text-layout.h:
+	* eel/eel-smooth-widget.c: (preferences_get_is_smooth),
+	(eel_smooth_widget_register),
+	(smooth_widget_get_tile_origin_point),
+	(smooth_widget_get_gtk_background), (smooth_widget_get_background),
+	(smooth_widget_paint_tile_opaque),
+	(smooth_widget_paint_tile_transparent),
+	(smooth_widget_paint_content_opaque),
+	(smooth_widget_paint_content_transparent),
+	(smooth_widget_paint_tile_and_content_transparent),
+	(eel_smooth_widget_paint), (eel_smooth_widget_get_tile_bounds),
+	(eel_smooth_widget_get_preferred_dimensions),
+	(eel_smooth_widget_register_type):
+	* eel/eel-smooth-widget.h:
+	* eel/eel-stock-dialogs.c: (timed_wait_free),
+	(timed_wait_dialog_destroy_callback), (timed_wait_callback),
+	(eel_timed_wait_start_with_duration), (eel_timed_wait_start),
+	(eel_timed_wait_stop), (eel_run_simple_dialog),
+	(find_message_label), (create_message_box),
+	(eel_create_info_dialog), (eel_show_info_dialog),
+	(details_dialog_clicked_callback),
+	(eel_show_info_dialog_with_details), (eel_show_warning_dialog),
+	(eel_show_error_dialog), (eel_show_error_dialog_with_details),
+	(eel_show_yes_no_dialog), (eel_create_question_dialog):
+	* eel/eel-stock-dialogs.h:
+	* eel/eel-string-list.c: (eel_string_list_new),
+	(eel_string_list_new_from_string),
+	(eel_string_list_new_from_string_list),
+	(eel_string_list_new_from_tokens),
+	(eel_string_list_assign_from_string_list), (eel_string_list_free),
+	(eel_string_list_insert), (eel_string_list_nth),
+	(eel_string_list_nth_as_integer), (eel_string_list_modify_nth),
+	(eel_string_list_remove_nth), (eel_string_list_contains),
+	(eel_string_list_find_by_function), (eel_string_list_get_length),
+	(eel_string_list_clear), (eel_string_list_equals),
+	(eel_string_list_as_g_list),
+	(eel_string_list_get_index_for_string),
+	(eel_string_list_as_concatenated_string), (eel_string_list_sort),
+	(eel_string_list_sort_by_function),
+	(eel_string_list_remove_duplicates), (eel_string_list_for_each),
+	(eel_string_list_get_longest_string),
+	(eel_string_list_get_longest_string_length), (str_is_equal),
+	(test_dog), (test_data), (test_true), (test_false),
+	(compare_number), (eel_self_check_string_list):
+	* eel/eel-string-list.h:
+	* eel/eel-string-map.c: (eel_string_map_new),
+	(eel_string_map_free), (eel_string_map_clear),
+	(eel_string_map_lookup), (eel_string_map_add), (map_entry_new),
+	(map_entry_free), (map_entry_list_lookup), (str_is_equal),
+	(eel_self_check_string_map):
+	* eel/eel-string-map.h:
+	* eel/eel-string-picker.c: (eel_string_picker_initialize_class),
+	(eel_string_picker_initialize), (eel_string_picker_destroy),
+	(option_menu_activate_callback), (eel_string_picker_new),
+	(eel_string_picker_set_string_list),
+	(eel_string_picker_get_string_list),
+	(eel_string_picker_get_selected_string),
+	(eel_string_picker_set_selected_string),
+	(eel_string_picker_set_selected_string_index),
+	(eel_string_picker_insert_string), (eel_string_picker_contains),
+	(eel_string_picker_get_index_for_string),
+	(eel_string_picker_clear):
+	* eel/eel-string-picker.h:
+	* eel/eel-string.c: (eel_strlen), (eel_strchr), (eel_strcmp),
+	(eel_strcasecmp), (eel_strcmp_case_breaks_ties), (eel_strcoll),
+	(eel_str_is_empty), (eel_str_is_equal), (eel_istr_is_equal),
+	(eel_strcmp_compare_func), (eel_strcoll_compare_func),
+	(eel_strcasecmp_compare_func), (eel_str_has_prefix),
+	(eel_str_has_suffix), (eel_istr_has_prefix), (eel_istr_has_suffix),
+	(eel_str_get_prefix), (eel_str_get_after_prefix), (eel_str_to_int),
+	(eel_str_strip_chr), (eel_str_strip_trailing_chr),
+	(eel_str_strip_trailing_str), (eel_eat_str_to_int),
+	(eel_str_double_underscores), (eel_str_capitalize),
+	(eel_str_middle_truncate), (eel_str_count_characters),
+	(eel_str_strip_substring_and_after), (eel_str_replace_substring),
+	(eel_str_remove_bracketed_text), (call_str_to_int),
+	(call_eat_str_to_int), (eel_self_check_string):
+	* eel/eel-string.h:
+	* eel/eel-text-caption.c: (eel_text_caption_initialize_class),
+	(eel_text_caption_initialize), (eel_text_caption_destroy),
+	(entry_changed_callback), (entry_key_press_callback),
+	(eel_text_caption_new), (eel_text_caption_get_text),
+	(eel_text_caption_set_text), (eel_text_caption_set_editable),
+	(eel_text_caption_set_expand_tilde):
+	* eel/eel-text-caption.h:
+	* eel/eel-viewport.c: (eel_viewport_initialize_class),
+	(eel_viewport_initialize), (eel_viewport_destroy),
+	(eel_viewport_draw), (eel_viewport_size_allocate),
+	(eel_viewport_expose_event), (eel_viewport_realize),
+	(eel_viewport_paint), (eel_viewport_set_is_smooth_signal),
+	(eel_viewport_new), (eel_viewport_set_is_smooth),
+	(eel_viewport_get_is_smooth), (eel_viewport_set_constrain_width),
+	(eel_viewport_get_constrain_width),
+	(eel_viewport_set_constrain_height),
+	(eel_viewport_get_constrain_height),
+	(eel_viewport_set_never_smooth), (eel_viewport_get_scroll_offset):
+	* eel/eel-viewport.h:
+	* eel/eel-wrap-table.c: (eel_wrap_table_initialize_class),
+	(eel_wrap_table_initialize), (eel_wrap_table_destroy),
+	(eel_wrap_table_set_arg), (eel_wrap_table_get_arg),
+	(eel_wrap_table_size_request), (eel_wrap_table_size_allocate),
+	(eel_wrap_table_expose_event), (eel_wrap_table_map),
+	(eel_wrap_table_unmap), (eel_wrap_table_add),
+	(eel_wrap_table_remove), (eel_wrap_table_forall),
+	(eel_wrap_table_child_type), (wrap_table_layout),
+	(wrap_table_art_irect_max_dimensions),
+	(wrap_table_get_max_child_dimensions),
+	(wrap_table_get_content_dimensions),
+	(wrap_table_get_content_bounds), (wrap_table_get_scroll_offset),
+	(wrap_table_find_child_at_point), (eel_wrap_table_new),
+	(eel_wrap_table_set_x_spacing), (eel_wrap_table_get_x_spacing),
+	(eel_wrap_table_set_y_spacing), (eel_wrap_table_get_y_spacing),
+	(eel_wrap_table_find_child_at_event_point),
+	(eel_wrap_table_set_x_justification),
+	(eel_wrap_table_get_x_justification),
+	(eel_wrap_table_set_y_justification),
+	(eel_wrap_table_get_y_justification),
+	(eel_wrap_table_set_homogeneous), (eel_wrap_table_get_homogeneous),
+	(eel_wrap_table_reorder_child), (eel_wrap_table_get_num_children):
+	* eel/eel-wrap-table.h:
+	* eel/eel-xml-extensions.c: (eel_xml_get_children),
+	(eel_xml_get_root_children),
+	(eel_xml_get_child_by_name_and_property),
+	(eel_xml_get_child_by_name),
+	(eel_xml_get_root_child_by_name_and_property),
+	(eel_xml_get_property_for_children),
+	(eel_xml_get_property_translated), (eel_xml_remove_node):
+	* eel/eel-xml-extensions.h:
+	* test/Makefile.am:
+	* test/test-eel-background.c: (main):
+	* test/test-eel-clickable-image.c: (clicked_callback),
+	(enter_callback), (leave_callback), (clickable_image_new):
+	* test/test-eel-font-manager.c: (font_type_to_string),
+	(font_iterator_callback), (main):
+	* test/test-eel-font-picker.c: (update_font),
+	(font_changed_update_label_callback),
+	(font_changed_update_file_name_callback),
+	(use_defalt_font_callback), (use_defalt_bold_font_callback),
+	(use_defalt_font_update_picker_callback),
+	(use_defalt_bold_font_update_picker_callback),
+	(print_selected_font_callback), (main):
+	* test/test-eel-font-simple.c: (main):
+	* test/test-eel-font.c: (main):
+	* test/test-eel-glyph-simple.c: (glyph_new), (main):
+	* test/test-eel-glyph.c: (glyph_new), (main):
+	* test/test-eel-image-background.c:
+	(window_new_with_eel_background_image),
+	(window_new_with_eel_background_gradient),
+	(window_new_with_solid_background), (main):
+	* test/test-eel-image-scrolled.c: (toggle_smooth_callback),
+	(label_window_new), (label_window_new_scrolled):
+	* test/test-eel-image-simple.c: (toggle_smooth_callback),
+	(image_window_new), (main):
+	* test/test-eel-image-table.c: (labeled_image_new),
+	(image_table_child_enter_callback),
+	(image_table_child_leave_callback),
+	(image_table_child_pressed_callback),
+	(image_table_child_released_callback),
+	(image_table_child_clicked_callback), (image_table_size_allocate),
+	(image_table_new_scrolled):
+	* test/test-eel-image-tile.c:
+	(window_new_with_eel_background_image),
+	(window_new_with_eel_background_gradient), (window_four_new),
+	(main):
+	* test/test-eel-image.c: (icon_get_path), (label_new),
+	(label_enter_event), (label_leave_event), (label_free_data),
+	(image_new), (image_new_from_name), (label_add_prelighting),
+	(header_new), (main):
+	* test/test-eel-label-background.c:
+	(window_new_with_eel_background_image),
+	(window_new_with_eel_background_gradient),
+	(window_new_with_solid_background), (main):
+	* test/test-eel-label-flavorful.c: (increasing_label_window_new),
+	(decreasing_label_window_new), (main):
+	* test/test-eel-label-offset.c: (main):
+	* test/test-eel-label-scrolled.c: (label_window_new),
+	(label_window_new_scrolled), (label_window_new_table):
+	* test/test-eel-label-simple.c: (use_system_font_callback),
+	(use_system_font_bold_callback), (main):
+	* test/test-eel-label-wrapped.c: (create_eel_label),
+	(create_gtk_label_window), (create_eel_label_window), (main):
+	* test/test-eel-label.c: (red_label_color_value_changed_callback),
+	(green_label_color_value_changed_callback),
+	(blue_label_color_value_changed_callback),
+	(alpha_label_color_value_changed_callback),
+	(red_background_color_value_changed_callback),
+	(green_background_color_value_changed_callback),
+	(blue_background_color_value_changed_callback),
+	(alpha_background_color_value_changed_callback),
+	(text_caption_changed_callback), (create_value_scale),
+	(create_color_picker_frame), (create_text_caption_frame),
+	(widget_set_eel_background_image),
+	(widget_set_eel_background_color),
+	(widget_get_eel_background_color), (widget_set_background_reset),
+	(background_changed_callback), (justification_changed_callback),
+	(drop_shadow_offset_changed_callback), (create_background_frame),
+	(create_justification_frame), (create_drop_shadow_offset_frame),
+	(main):
+	* test/test-eel-labeled-image.c: (labeled_image_new),
+	(labeled_image_window_new), (labeled_image_button_window_new),
+	(main):
+	* test/test-eel-password-dialog.c: (authenticate_boink_callback):
+	* test/test-eel-pixbuf-tile.c: (pixbuf_drawing_area_expose_event),
+	(drawable_drawing_area_expose_event):
+	* test/test-eel-smooth-text-layout.c: (main):
+	* test/test-eel-viewport-constraint.c:
+	(widget_set_eel_background_color), (create_eel_label),
+	(summary_view_item_label_new), (create_row), (main):
+	* test/test-eel-widgets.c: (create_pixbuf),
+	(radio_group_load_it_up), (test_radio_group),
+	(test_radio_group_horizontal), (test_caption_table),
+	(test_string_picker), (test_text_caption),
+	(string_picker_changed_callback), (text_caption_changed_callback),
+	(test_radio_changed_callback):
+	* test/test.c: (test_init), (test_gtk_widget_set_background_image),
+	(test_gtk_widget_set_background_color), (test_pixbuf_new_named),
+	(test_image_new), (test_label_new),
+	(test_text_caption_get_text_as_int),
+	(test_pixbuf_draw_rectangle_tiled):
+	* test/test.h:
+
+2001-03-28  Ramiro Estrugo  <ramiro@eazel.com>
+
+	Started ChangeLog
+
+# Local Variables:
+# coding: utf-8
+# End:
diff --git a/eel/Makefile.am b/eel/Makefile.am
new file mode 100644
index 000000000..2e89dd78d
--- /dev/null
+++ b/eel/Makefile.am
@@ -0,0 +1,188 @@
+NULL=
+
+noinst_LTLIBRARIES=libeel-2.la
+
+INCLUDES =						\
+	-DG_LOG_DOMAIN=\"Eel\"				\
+	-I$(top_srcdir)					\
+	$(CORE_CFLAGS)					\
+	-DDATADIR=\""$(datadir)"\"			\
+	-DSOURCE_DATADIR=\""$(top_srcdir)/data"\"	\
+	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
+	-DG_DISABLE_DEPRECATED				\
+	-DGDK_DISABLE_DEPRECATED			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGMENU_I_KNOW_THIS_IS_UNSTABLE			\
+	$(NULL)
+
+libeel_2_la_LDFLAGS =				\
+	-version-info @EEL_VERSION_INFO@	\
+	-no-undefined				\
+	$(CORE_LIBS)				\
+	$(RENDER_LIBS)				\
+	$(X_LIBS)				\
+	$(NULL)
+
+libeel_2_la_SOURCES =				\
+	eel-accessibility.c			\
+	eel-alert-dialog.c			\
+	eel-art-extensions.c			\
+	eel-art-gtk-extensions.c		\
+	eel-background.c			\
+	eel-background-box.c                    \
+	eel-canvas.c				\
+	eel-canvas-util.c			\
+	eel-canvas-rect-ellipse.c		\
+	eel-debug-drawing.c			\
+	eel-debug.c				\
+	eel-editable-label.c			\
+	eel-enumeration.c			\
+	eel-gconf-extensions.c			\
+	eel-gdk-extensions.c			\
+	eel-gdk-pixbuf-extensions.c		\
+	eel-glib-extensions.c			\
+	eel-gnome-extensions.c			\
+	eel-graphic-effects.c			\
+	eel-gtk-container.c			\
+	eel-gtk-extensions.c			\
+	eel-i18n.c				\
+	eel-image-table.c			\
+	eel-labeled-image.c			\
+	eel-lib-self-check-functions.c		\
+	eel-pango-extensions.c			\
+	eel-preferences-builder.c		\
+	eel-preferences.c			\
+	eel-self-checks.c			\
+	eel-stock-dialogs.c			\
+	eel-string.c				\
+	eel-types.c				\
+	eel-vfs-extensions.c			\
+	eel-wrap-table.c			\
+	eel-xml-extensions.c			\
+	eel-lib-self-check-functions.h		\
+	$(NULL)
+
+libeelincludedir = $(includedir)/eel-2/eel
+
+eel_headers =					\
+	eel-accessibility.h			\
+	eel-alert-dialog.h			\
+	eel-art-extensions.h			\
+	eel-art-gtk-extensions.h		\
+	eel-background.h			\
+	eel-background-box.h                    \
+	eel-canvas.h				\
+	eel-canvas-util.h			\
+	eel-canvas-rect-ellipse.h		\
+	eel-debug-drawing.h			\
+	eel-debug.h				\
+	eel-editable-label.h			\
+	eel-enumeration.h			\
+	eel-gconf-extensions.h			\
+	eel-gdk-extensions.h			\
+	eel-gdk-pixbuf-extensions.h		\
+	eel-glib-extensions.h			\
+	eel-gnome-extensions.h			\
+	eel-graphic-effects.h			\
+	eel-gtk-container.h			\
+	eel-gtk-extensions.h			\
+	eel-gtk-macros.h			\
+	eel-i18n.h				\
+	eel-image-table.h			\
+	eel-labeled-image.h			\
+	eel-pango-extensions.h			\
+	eel-preferences.h			\
+	eel-self-checks.h			\
+	eel-stock-dialogs.h			\
+	eel-string.h				\
+	eel-types.h				\
+	eel-vfs-extensions.h			\
+	eel-wrap-table.h			\
+	eel-xml-extensions.h			\
+	eel.h					\
+	$(NULL)
+
+libeelinclude_HEADERS =				\
+	$(eel_headers)				\
+	eel-type-builtins.h			\
+	eel-marshal.h				\
+	$(NULL)
+
+marshal_sources = 				\
+	eel-marshal.h				\
+	eel-marshal.c				\
+	$(NULL)
+
+eel-marshal.h: eelmarshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=eel_marshal > $@
+eel-marshal.c: eelmarshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --body --prefix=eel_marshal > $@
+
+stamp_sources =					\
+	eel-enums.defs				\
+	eel-type-builtins-evals.c		\
+	$(NULL)
+
+stamps =					\
+	eel-makeenums-stamp			\
+	eel-stamp				\
+	$(NULL)
+
+eel-makeenums-stamp: makeenums.pl $(eel_headers)
+	$(PERL) $< defs $(filter-out $<,$^) > xgen-eed \
+	&& (cmp -s xgen-eed eel-enums.defs || mv -f xgen-eed eel-enums.defs) \
+	&& rm -f xgen-eed \
+	&& $(PERL) $< arrays $(filter-out $<,$^) > xgen-etbe \
+	&& (cmp -s xgen-etbe eel-type-builtins-evals.c || mv -f xgen-etbe eel-type-builtins-evals.c) \
+	&& rm -f xgen-etbe \
+	&& echo timestamp > $@
+
+maketypes_sources =				\
+	eel-type-builtins.h			\
+	eel-type-builtins-ids.c			\
+	eel-type-builtins-vars.c		\
+	$(NULL)
+
+eel-stamp: eel-makeenums-stamp $(maketypes_sources)
+	echo timestamp > $@
+
+eel-type-builtins.h: eel-enums.defs maketypes.awk eel-makeenums-stamp
+	LC_ALL=C $(AWK) -f $(srcdir)/maketypes.awk $< macros > $@
+eel-type-builtins-vars.c: eel-enums.defs maketypes.awk eel-makeenums-stamp
+	LC_ALL=C $(AWK) -f $(srcdir)/maketypes.awk $< variables > $@
+eel-type-builtins-ids.c: eel-enums.defs maketypes.awk eel-makeenums-stamp
+	LC_ALL=C $(AWK) -f $(srcdir)/maketypes.awk $< entries > $@
+
+noinst_PROGRAMS = check-program
+
+check_program_SOURCES = check-program.c
+check_program_DEPENDENCIES = libeel-2.la
+check_program_LDADD = $(EEL_LIBS)
+check_program_LDFLAGS =	$(check_program_DEPENDENCIES) -lm
+
+TESTS = check-eel
+
+EXTRA_DIST =					\
+	check-eel				\
+	eelmarshal.list				\
+	makeenums.pl				\
+	maketypes.awk				\
+	$(NULL)
+
+$(libeel_2_la_OBJECTS): $(marshal_sources)
+
+# This trick causes the stamp file to be built first.
+Makefile: eel-stamp
+
+# This trick causes the generated files to be built the first time.
+$(stamp_sources): # never add any dependencies
+	test -f $@ || touch $@
+
+built_sources =	$(stamps) $(stamp_sources) $(maketypes_sources) $(marshal_sources)
+CLEANFILES = $(built_sources)
+DONT_DIST_FILES = $(built_sources)
+
+dist-hook:
+	for file in $(DONT_DIST_FILES) ; do \
+	    rm -f $(distdir)/$$file ; \
+	done
diff --git a/eel/README b/eel/README
new file mode 100644
index 000000000..15d86bbad
--- /dev/null
+++ b/eel/README
@@ -0,0 +1,4 @@
+README for eel/eel
+
+Writeme
+
diff --git a/eel/README.canvas b/eel/README.canvas
new file mode 100644
index 000000000..86103774e
--- /dev/null
+++ b/eel/README.canvas
@@ -0,0 +1,25 @@
+eel-canvas is a cut-and-pasted version of some parts foo-canvas.
+Please do not change the cut and pasted parts. If you need to
+upgrade to a new foo-canvas, use this:
+	
+FOODIR=../../foocanvas/libfoocanvas
+
+cp $FOODIR/foo-canvas.c eel-canvas.c
+cp $FOODIR/foo-canvas.h eel-canvas.h
+cp $FOODIR/foo-canvas-util.c eel-canvas-util.c
+cp $FOODIR/foo-canvas-util.h eel-canvas-util.h
+cp $FOODIR/foo-canvas-rect-ellipse.h eel-canvas-rect-ellipse.h
+cp $FOODIR/foo-canvas-rect-ellipse.c eel-canvas-rect-ellipse.c
+	
+perl -pi -e 's/foo_canvas_marshal_/eel_marshal_/s' eel-canvas.c
+perl -pi -e 's/foo-canvas-marshal\.h/eel-marshal\.h/s' eel-canvas.c
+perl -pi -e 's/#include\ \"foo-canvas-marshal\.c\"//s' eel-canvas.c
+perl -pi -e 's/foo-canvas-i18n\.h/eel-i18n\.h/s' eel-canvas.c
+
+perl -pi -e 's/foo_canvas_/eel_canvas_/g' eel-canvas*.[ch]
+perl -pi -e 's/FOO_CANVAS/EEL_CANVAS/g' eel-canvas*.[ch]
+perl -pi -e 's/FooCanvas/EelCanvas/g' eel-canvas*.[ch]
+perl -pi -e 's/foo-canvas/eel-canvas/g' eel-canvas*.[ch]
+perl -pi -e 's/libfoocanvas/eel/g' eel-canvas*.[ch]
+perl -pi -e 's/FOO_TYPE_/EEL_TYPE_/g' eel-canvas*.[ch]
+perl -pi -e 's/FOO_IS_/EEL_IS_/g' eel-canvas*.[ch]
diff --git a/eel/check-eel b/eel/check-eel
new file mode 100755
index 000000000..d1c67b62e
--- /dev/null
+++ b/eel/check-eel
@@ -0,0 +1,3 @@
+#!/bin/sh
+./check-program --g-fatal-warnings --sm-disable
+
diff --git a/eel/check-program.c b/eel/check-program.c
new file mode 100644
index 000000000..e5d58ec77
--- /dev/null
+++ b/eel/check-program.c
@@ -0,0 +1,60 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* check-program.c: A simple driver for eel self checks.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+
+#include <eel/eel-debug.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-lib-self-check-functions.h>
+#include <eel/eel-self-checks.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <libxml/parser.h>
+#include <stdlib.h>
+
+int
+main (int argc, char *argv[])
+{
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+	eel_make_warnings_and_criticals_stop_in_debugger ();
+	
+
+	LIBXML_TEST_VERSION
+	gtk_init (&argc, &argv);
+
+	/* Run the checks for eel twice. */
+
+	eel_run_lib_self_checks ();
+	eel_exit_if_self_checks_failed ();
+
+	eel_run_lib_self_checks ();
+	eel_exit_if_self_checks_failed ();
+
+	eel_debug_shut_down ();
+
+#endif /* !EEL_OMIT_SELF_CHECK */
+	
+	return EXIT_SUCCESS;
+}
diff --git a/eel/eel-accessibility.c b/eel/eel-accessibility.c
new file mode 100644
index 000000000..71fd7761a
--- /dev/null
+++ b/eel/eel-accessibility.c
@@ -0,0 +1,413 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* eel-accessibility.h - Utility functions for accessibility
+
+   Copyright (C) 2002 Anders Carlsson, Sun Microsystems, Inc.
+
+   The Eel Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Eel Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Eel Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors:
+	Anders Carlsson <andersca@gnu.org>
+	Michael Meeks   <michael@ximian.com>
+*/
+#include <config.h>
+#include <gtk/gtk.h>
+#include <atk/atkrelationset.h>
+#include <eel/eel-accessibility.h>
+
+void
+eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget)
+{
+	AtkObject *atk_widget, *atk_label;
+
+	atk_label = gtk_widget_get_accessible (label);
+	atk_widget = gtk_widget_get_accessible (widget);
+
+	/* Create the label -> widget relation */
+	atk_object_add_relationship (atk_label, ATK_RELATION_LABEL_FOR, atk_widget);
+
+	/* Create the widget -> label relation */
+	atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
+}
+
+/*
+ * Hacks to make re-using gail somewhat easier.
+ */
+
+/**
+ * eel_accessibility_create_derived_type:
+ * @type_name: the name for the new accessible type eg. NautilusIconCanvasItemAccessible
+ * @existing_gobject_with_proxy: the GType of an object that has a registered factory that
+ *      manufactures the type we want to inherit from. ie. to inherit from a GailCanvasItem
+ *      we need to pass GNOME_TYPE_CANVAS_ITEM - since GailCanvasItem is registered against
+ *      that type.
+ * @opt_gail_parent_class: the name of the Gail class to derive from eg. GailCanvasItem
+ * @class_init: the init function to run for this class
+ * 
+ * This should be run to register the type, it can subsequently be run with
+ * the same name and will not re-register it, but simply return it.
+ *
+ * NB. to do instance init, you prolly want to override AtkObject::initialize
+ * 
+ * Return value: the registered type, or 0 on failure.
+ **/
+GType
+eel_accessibility_create_derived_type (const char *type_name,
+				       GType existing_gobject_with_proxy,
+				       EelAccessibilityClassInitFn class_init)
+{
+	GType type;
+	GType parent_atk_type;
+	GTypeInfo tinfo = { 0 };
+	GTypeQuery query;
+	AtkObjectFactory *factory;
+
+	if ((type = g_type_from_name (type_name))) {
+		return type;
+	}
+
+	factory = atk_registry_get_factory
+		(atk_get_default_registry (),
+		 existing_gobject_with_proxy);
+	if (!factory) {
+		return G_TYPE_INVALID;
+	}
+	
+	parent_atk_type = atk_object_factory_get_accessible_type (factory);
+	if (!parent_atk_type) {
+		return G_TYPE_INVALID;
+	}
+
+	/*
+	 * Figure out the size of the class and instance 
+	 * we are deriving from
+	 */
+	g_type_query (parent_atk_type, &query);
+
+	if (class_init) {
+		tinfo.class_init = (GClassInitFunc) class_init;
+	}
+
+	tinfo.class_size    = query.class_size;
+	tinfo.instance_size = query.instance_size;
+
+	/* Register the type */
+	type = g_type_register_static (
+		parent_atk_type, type_name, &tinfo, 0);
+
+	return type;
+}
+
+
+static GQuark
+get_quark_accessible (void)
+{
+	static GQuark quark_accessible_object = 0;
+
+	if (!quark_accessible_object) {
+		quark_accessible_object = g_quark_from_static_string
+			("accessible-object");
+	}
+
+	return quark_accessible_object;
+}
+
+static GQuark
+get_quark_gobject (void)
+{
+	static GQuark quark_accessible_gobject = 0;
+
+	if (!quark_accessible_gobject) {
+		quark_accessible_gobject = g_quark_from_static_string
+			("object-for-accessible");
+	}
+
+	return quark_accessible_gobject;
+}
+
+/**
+ * eel_accessibility_get_atk_object:
+ * @object: a GObject of some sort
+ * 
+ * gets an AtkObject associated with a GObject
+ * 
+ * Return value: the associated accessible if one exists or NULL
+ **/
+AtkObject *
+eel_accessibility_get_atk_object (gpointer object)
+{
+	return g_object_get_qdata (object, get_quark_accessible ());
+}
+
+/**
+ * eel_accessibilty_for_object:
+ * @object: a GObject of some sort
+ * 
+ * gets an AtkObject associated with a GObject and if it doesn't
+ * exist creates a suitable accessible object.
+ * 
+ * Return value: an associated accessible.
+ **/
+AtkObject *
+eel_accessibility_for_object (gpointer object)
+{
+	if (GTK_IS_WIDGET (object))
+		return gtk_widget_get_accessible (object);
+
+	return atk_gobject_accessible_for_object (object);
+}
+
+/**
+ * eel_accessibility_get_gobject:
+ * @object: an AtkObject
+ * 
+ * gets the GObject associated with the AtkObject, for which
+ * @object provides accessibility support.
+ * 
+ * Return value: the accessible's associated GObject
+ **/
+gpointer
+eel_accessibility_get_gobject (AtkObject *object)
+{
+	return g_object_get_qdata (G_OBJECT (object), get_quark_gobject ());
+}
+
+static void
+eel_accessibility_destroy (gpointer data,
+			   GObject *where_the_object_was)
+{
+	atk_object_notify_state_change
+		(ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE); 
+}
+
+/**
+ * eel_accessibility_set_atk_object_return:
+ * @object: a GObject
+ * @atk_object: it's AtkObject
+ * 
+ * used to register and return a new accessible object for something
+ * 
+ * Return value: @atk_object.
+ **/
+AtkObject *
+eel_accessibility_set_atk_object_return (gpointer   object,
+					 AtkObject *atk_object)
+{
+	atk_object_initialize (atk_object, object);
+
+	if (!ATK_IS_GOBJECT_ACCESSIBLE (atk_object)) {
+		g_object_set_qdata_full
+			(object, get_quark_accessible (), atk_object,
+			 (GDestroyNotify)eel_accessibility_destroy);
+		g_object_set_qdata
+			(G_OBJECT (atk_object), get_quark_gobject (), object);
+	}
+
+	return atk_object;
+}
+
+static GailTextUtil *
+get_simple_text (gpointer object)
+{
+	GObject *gobject;
+	EelAccessibleTextIface *aif;
+
+	if (GTK_IS_ACCESSIBLE (object)) {
+		gobject = G_OBJECT (GTK_ACCESSIBLE (object)->widget);
+	} else {
+		gobject = eel_accessibility_get_gobject (object);
+	}
+
+	if (!gobject) {
+		return NULL;
+	}
+
+	aif = EEL_ACCESSIBLE_TEXT_GET_IFACE (gobject);
+	if (!aif) {
+		g_warning ("No accessible text inferface on '%s'",
+			   g_type_name_from_instance ((gpointer) gobject));
+
+	} else if (aif->get_text) {
+		return aif->get_text (gobject);
+	}
+
+	return NULL;
+}
+
+char *
+eel_accessibility_text_get_text (AtkText *text,
+				 gint     start_pos,
+				 gint     end_pos)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_substring (util, start_pos, end_pos);
+}
+
+gunichar 
+eel_accessibility_text_get_character_at_offset (AtkText *text,
+						gint     offset)
+{
+	char *txt, *index;
+	gint sucks1 = 0, sucks2 = -1;
+	gunichar c;
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, 0);
+
+	txt = gail_text_util_get_substring (util, sucks1, sucks2);
+
+	index = g_utf8_offset_to_pointer (txt, offset);
+	c = g_utf8_get_char (index);
+	g_free (txt);
+
+	return c;
+}
+
+char *
+eel_accessibility_text_get_text_before_offset (AtkText	      *text,
+					       gint            offset,
+					       AtkTextBoundary boundary_type,
+					       gint           *start_offset,
+					       gint           *end_offset)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_text (
+		util, NULL, GAIL_BEFORE_OFFSET, 
+		boundary_type, offset, start_offset, end_offset);
+}
+
+char *
+eel_accessibility_text_get_text_at_offset (AtkText        *text,
+					   gint            offset,
+					   AtkTextBoundary boundary_type,
+					   gint           *start_offset,
+					   gint           *end_offset)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_text (
+		util, NULL, GAIL_AT_OFFSET,
+		boundary_type, offset, start_offset, end_offset);
+}
+
+gchar*
+eel_accessibility_text_get_text_after_offset  (AtkText	      *text,
+					       gint            offset,
+					       AtkTextBoundary boundary_type,
+					       gint           *start_offset,
+					       gint           *end_offset)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, NULL);
+
+	return gail_text_util_get_text (
+		util, NULL, GAIL_AFTER_OFFSET, 
+		boundary_type, offset, start_offset, end_offset);
+}
+
+gint
+eel_accessibility_text_get_character_count (AtkText *text)
+{
+	GailTextUtil *util = get_simple_text (text);
+	g_return_val_if_fail (util != NULL, -1);
+
+	return gtk_text_buffer_get_char_count (util->buffer);
+}
+
+static void
+eel_accessibility_simple_text_interface_init (AtkTextIface *iface)
+{
+	iface->get_text                = eel_accessibility_text_get_text;
+	iface->get_character_at_offset = eel_accessibility_text_get_character_at_offset;
+	iface->get_text_before_offset  = eel_accessibility_text_get_text_before_offset;
+	iface->get_text_at_offset      = eel_accessibility_text_get_text_at_offset;
+	iface->get_text_after_offset   = eel_accessibility_text_get_text_after_offset;
+	iface->get_character_count     = eel_accessibility_text_get_character_count;
+
+/*	iface->get_caret_offset = eel_accessibility_text_get_caret_offset;
+	iface->set_caret_offset = eel_accessibility_text_set_caret_offset;
+	iface->get_selection = eel_accessibility_text_get_selection;
+	iface->get_n_selections = eel_accessibility_text_get_n_selections;
+	iface->add_selection = eel_accessibility_text_add_selection;
+	iface->remove_selection = eel_accessibility_text_remove_selection;
+	iface->set_selection = eel_accessibility_text_set_selection;
+	iface->get_run_attributes = eel_accessibility_text_get_run_attributes;
+	iface->get_default_attributes = eel_accessibility_text_get_default_attributes;
+	iface->get_character_extents = eel_accessibility_text_get_character_extents;
+	iface->get_offset_at_point = eel_accessibility_text_get_offset_at_point; */
+}
+
+void
+eel_accessibility_add_simple_text (GType type)
+{
+	const GInterfaceInfo simple_text_info = {
+		(GInterfaceInitFunc)
+		eel_accessibility_simple_text_interface_init,
+		(GInterfaceFinalizeFunc) NULL,
+		NULL
+	};
+
+	g_return_if_fail (type != G_TYPE_INVALID);
+
+	g_type_add_interface_static (
+		type, ATK_TYPE_TEXT, &simple_text_info);
+}
+
+GType
+eel_accessible_text_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		const GTypeInfo tinfo = {
+			sizeof (AtkTextIface),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) NULL,
+			(GClassFinalizeFunc) NULL
+		};
+
+		type = g_type_register_static (
+			G_TYPE_INTERFACE, "EelAccessibleText", &tinfo, 0);
+	}
+
+	return type;
+}
+
+void
+eel_accessibility_set_name (gpointer    object,
+			    const char *name)
+{
+	AtkObject *atk_object = eel_accessibility_for_object (object);
+
+	if (atk_object) {
+		atk_object_set_name (atk_object, name);
+	}
+}
+
+void
+eel_accessibility_set_description (gpointer    object,
+				   const char *description)
+{
+	AtkObject *atk_object = eel_accessibility_for_object (object);
+
+	if (atk_object) {
+		atk_object_set_description (atk_object, description);
+	}
+}
diff --git a/eel/eel-accessibility.h b/eel/eel-accessibility.h
new file mode 100644
index 000000000..72db9781d
--- /dev/null
+++ b/eel/eel-accessibility.h
@@ -0,0 +1,152 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* eel-accessibility.h - Utility functions for accessibility
+
+   Copyright (C) 2002 Anders Carlsson
+
+   The Eel Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Eel Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Eel Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Anders Carlsson <andersca@gnu.org>
+*/
+
+#ifndef EEL_ACCESSIBILITY_H
+#define EEL_ACCESSIBILITY_H
+
+#include <glib-object.h>
+#include <atk/atkobject.h>
+#include <atk/atkregistry.h>
+#include <atk/atkobjectfactory.h>
+#include <gtk/gtk.h>
+#include <libgail-util/gailtextutil.h>
+
+void eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget);
+
+typedef void     (*EelAccessibilityClassInitFn)    (AtkObjectClass *klass);
+
+AtkObject    *eel_accessibility_get_atk_object        (gpointer              object);
+AtkObject    *eel_accessibility_for_object            (gpointer              object);
+gpointer      eel_accessibility_get_gobject           (AtkObject            *object);
+AtkObject    *eel_accessibility_set_atk_object_return (gpointer              object,
+						       AtkObject            *atk_object);
+GType         eel_accessibility_create_derived_type   (const char           *type_name,
+						       GType                 existing_gobject_with_proxy,
+						       EelAccessibilityClassInitFn class_init);
+void          eel_accessibility_set_name              (gpointer              object,
+						       const char           *name);
+void          eel_accessibility_set_description       (gpointer              object,
+						       const char           *description);
+
+char*         eel_accessibility_text_get_text         (AtkText              *text,
+                                                       gint                 start_pos,
+                                                       gint                 end_pos);
+gunichar      eel_accessibility_text_get_character_at_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset);
+char*         eel_accessibility_text_get_text_before_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset,
+                                                       AtkTextBoundary      boundary_type,
+                                                       gint                 *start_offset,
+                                                       gint                 *end_offset);
+char*         eel_accessibility_text_get_text_at_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset,
+                                                       AtkTextBoundary      boundary_type,
+                                                       gint                 *start_offset,
+                                                       gint                 *end_offset);
+char*         eel_accessibility_text_get_text_after_offset
+                                                      (AtkText              *text,
+                                                       gint                 offset,
+                                                       AtkTextBoundary      boundary_type,
+                                                       gint                 *start_offset,
+                                                       gint                 *end_offset);
+gint          eel_accessibility_text_get_character_count
+                                                      (AtkText              *text);
+
+                     
+#define EEL_TYPE_ACCESSIBLE_TEXT           (eel_accessible_text_get_type ())
+#define EEL_IS_ACCESSIBLE_TEXT(obj)        G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_ACCESSIBLE_TEXT)
+#define EEL_ACCESSIBLE_TEXT(obj)           G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_ACCESSIBLE_TEXT, EelAccessibleText)
+#define EEL_ACCESSIBLE_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), EEL_TYPE_ACCESSIBLE_TEXT, EelAccessibleTextIface))
+
+/* Instead of implementing the AtkText interface, implement this */
+typedef struct _EelAccessibleText EelAccessibleText;
+
+typedef struct {
+	GTypeInterface parent;
+	
+	GailTextUtil *(*get_text)   (GObject *text);
+	PangoLayout  *(*get_layout) (GObject *text);
+} EelAccessibleTextIface;
+
+GType eel_accessible_text_get_type      (void);
+void  eel_accessibility_add_simple_text (GType type);
+
+/* From gail - should be unneccessary when AtkObjectFactory is fixed */
+#define EEL_ACCESSIBLE_FACTORY(type, factory_name, type_as_function, opt_create_accessible)	\
+										\
+static GType									\
+type_as_function ## _factory_get_accessible_type (void)				\
+{										\
+  return type;									\
+}										\
+										\
+static AtkObject*								\
+type_as_function ## _factory_create_accessible (GObject *obj)			\
+{										\
+  AtkObject *accessible;							\
+										\
+  g_assert (G_IS_OBJECT (obj));  						\
+										\
+  accessible = opt_create_accessible (obj);					\
+										\
+  return accessible;								\
+}										\
+										\
+static void									\
+type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
+{										\
+  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
+  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
+}										\
+										\
+static GType									\
+type_as_function ## _factory_get_type (void)					\
+{										\
+  static GType t = 0;								\
+										\
+  if (!t)									\
+  {										\
+    static const GTypeInfo tinfo =						\
+    {										\
+      sizeof (AtkObjectFactoryClass),					\
+      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,			\
+      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
+    };										\
+										\
+    t = g_type_register_static (						\
+	    ATK_TYPE_OBJECT_FACTORY, factory_name, &tinfo, 0);			\
+  }										\
+										\
+  return t;									\
+}
+
+#define EEL_OBJECT_SET_FACTORY(object_type, type_as_function)			\
+	atk_registry_set_factory_type (atk_get_default_registry (),		\
+				       object_type,				\
+				       type_as_function ## _factory_get_type ())
+
+
+#endif /* EEL_ACCESSIBILITY_H */
diff --git a/eel/eel-alert-dialog.c b/eel/eel-alert-dialog.c
new file mode 100644
index 000000000..9813fd99a
--- /dev/null
+++ b/eel/eel-alert-dialog.c
@@ -0,0 +1,467 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-alert-dialog.c: An HIG compliant alert dialog.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+*/
+#include <config.h>
+
+#include "eel-alert-dialog.h"
+#include "eel-i18n.h"
+#include "eel-gtk-macros.h"
+#include <gtk/gtk.h>
+#include <string.h>
+
+enum {
+  PROP_0,
+  PROP_ALERT_TYPE,
+  PROP_BUTTONS
+};
+
+struct _EelAlertDialogDetails {
+	GtkWidget *image;
+	GtkWidget *primary_label;
+	GtkWidget *secondary_label;
+	GtkWidget *details_expander;
+	GtkWidget *details_label;
+	GtkMessageType type;
+};
+
+
+static gpointer parent_class;
+
+static void eel_alert_dialog_finalize     (GObject             *object);
+static void eel_alert_dialog_class_init   (EelAlertDialogClass *klass);
+static void eel_alert_dialog_init         (EelAlertDialog      *dialog);
+static void eel_alert_dialog_style_set    (GtkWidget           *widget,
+					   GtkStyle            *prev_style);
+static void eel_alert_dialog_set_property (GObject             *object,
+					   guint                prop_id,
+					   const GValue        *value,
+					   GParamSpec          *pspec);
+static void eel_alert_dialog_get_property (GObject             *object,
+					   guint                prop_id,
+					   GValue              *value,
+					   GParamSpec          *pspec);
+static void eel_alert_dialog_add_buttons  (EelAlertDialog      *alert_dialog,
+					   GtkButtonsType       buttons);
+
+GType
+eel_alert_dialog_get_type (void)
+{
+	static GType dialog_type = 0;
+
+	if (!dialog_type) {
+	
+		const GTypeInfo dialog_info =
+		{
+			sizeof (EelAlertDialogClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) eel_alert_dialog_class_init,
+			NULL,
+			NULL,
+			sizeof (EelAlertDialog),
+			0,
+			(GInstanceInitFunc) eel_alert_dialog_init,
+		};
+	
+		dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "EelAlertDialog",
+	                                              &dialog_info, 0);
+	}
+	return dialog_type;
+}
+
+static void
+eel_alert_dialog_class_init (EelAlertDialogClass *class)
+{
+	GtkWidgetClass *widget_class;
+	GObjectClass   *gobject_class;
+
+	widget_class = GTK_WIDGET_CLASS (class);
+	gobject_class = G_OBJECT_CLASS (class);
+
+	parent_class = g_type_class_peek_parent (class);
+
+	G_OBJECT_CLASS (class)->finalize = eel_alert_dialog_finalize;
+	
+	widget_class->style_set = eel_alert_dialog_style_set;
+
+	gobject_class->set_property = eel_alert_dialog_set_property;
+	gobject_class->get_property = eel_alert_dialog_get_property;
+  
+	gtk_widget_class_install_style_property (widget_class,
+	                                         g_param_spec_int ("alert_border",
+	                                         _("Image/label border"),
+	                                         _("Width of border around the label and image in the alert dialog"),
+	                                         0,
+	                                         G_MAXINT,
+	                                         5,
+	                                         G_PARAM_READABLE));
+  
+	g_object_class_install_property (gobject_class,
+	                                 PROP_ALERT_TYPE,
+	                                 g_param_spec_enum ("alert_type",
+	                                 _("Alert Type"),
+	                                 _("The type of alert"),
+	                                 GTK_TYPE_MESSAGE_TYPE,
+	                                 GTK_MESSAGE_INFO,
+	                                 G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+  
+	g_object_class_install_property (gobject_class,
+	                                 PROP_BUTTONS,
+	                                 g_param_spec_enum ("buttons",
+	                                 _("Alert Buttons"),
+	                                 _("The buttons shown in the alert dialog"),
+	                                 GTK_TYPE_BUTTONS_TYPE,
+	                                 GTK_BUTTONS_NONE,
+	                                 G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+eel_alert_dialog_finalize (GObject *object)
+{
+	EelAlertDialog *dialog;
+
+	dialog = EEL_ALERT_DIALOG (object);
+
+	g_free (dialog->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+
+static void
+eel_alert_dialog_init (EelAlertDialog *dialog)
+{
+	GtkWidget *hbox;
+	GtkWidget *vbox;
+	GtkWidget *expander;
+	
+	dialog->details = g_new0 (EelAlertDialogDetails, 1);
+	
+	dialog->details->primary_label = gtk_label_new (NULL);
+	dialog->details->secondary_label = gtk_label_new (NULL);
+	dialog->details->details_label = gtk_label_new (NULL);
+	dialog->details->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
+	gtk_misc_set_alignment (GTK_MISC (dialog->details->image), 0.5, 0.0);
+
+	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->primary_label), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (dialog->details->primary_label), TRUE);
+	gtk_label_set_use_markup (GTK_LABEL (dialog->details->primary_label), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (dialog->details->primary_label), 0.0, 0.5);
+
+	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->secondary_label), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (dialog->details->secondary_label), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (dialog->details->secondary_label), 0.0, 0.5);
+
+	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->details_label), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (dialog->details->details_label), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (dialog->details->details_label), 0.0, 0.5);
+
+	hbox = gtk_hbox_new (FALSE, 12);
+	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+
+	gtk_box_pack_start (GTK_BOX (hbox), dialog->details->image,
+	                    FALSE, FALSE, 0);
+
+	vbox = gtk_vbox_new (FALSE, 12);
+	
+	gtk_box_pack_start (GTK_BOX (hbox), vbox,
+	                    FALSE, FALSE, 0);
+
+	gtk_box_pack_start (GTK_BOX (vbox), dialog->details->primary_label,
+	                    FALSE, FALSE, 0);
+		      
+	gtk_box_pack_start (GTK_BOX (vbox), dialog->details->secondary_label,
+	                    FALSE, FALSE, 0);
+
+	expander = gtk_expander_new_with_mnemonic (_("Show more _details"));
+	dialog->details->details_expander = expander;
+	gtk_expander_set_spacing (GTK_EXPANDER (expander), 6);
+	gtk_container_add (GTK_CONTAINER (expander), dialog->details->details_label);
+	
+	gtk_box_pack_start (GTK_BOX (vbox), expander, 
+			    FALSE, FALSE, 0);
+	
+
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, 
+	                    FALSE, FALSE, 0);
+
+	gtk_widget_show_all (hbox);
+	gtk_widget_hide (expander);
+	
+}
+
+static void
+setup_type (EelAlertDialog *dialog,
+	    GtkMessageType  type)
+{
+	const gchar *stock_id = NULL;
+	GtkStockItem item;
+  
+	switch (type) {
+		case GTK_MESSAGE_INFO:
+			stock_id = GTK_STOCK_DIALOG_INFO;
+			break;
+		case GTK_MESSAGE_QUESTION:
+			stock_id = GTK_STOCK_DIALOG_QUESTION;
+			break;
+		case GTK_MESSAGE_WARNING:
+			stock_id = GTK_STOCK_DIALOG_WARNING;
+			break;
+		case GTK_MESSAGE_ERROR:
+			stock_id = GTK_STOCK_DIALOG_ERROR;
+			break;
+		default:
+			g_warning ("Unknown GtkMessageType %d", type);
+			break;
+	}
+
+	if (stock_id == NULL) {
+		stock_id = GTK_STOCK_DIALOG_INFO;
+  	}
+	
+	if (gtk_stock_lookup (stock_id, &item)) {
+		gtk_image_set_from_stock (GTK_IMAGE (dialog->details->image), stock_id,
+		                          GTK_ICON_SIZE_DIALOG);
+	} else {
+		g_warning ("Stock dialog ID doesn't exist?");
+	}
+}
+
+static void 
+eel_alert_dialog_set_property (GObject      *object,
+                               guint         prop_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+	EelAlertDialog *dialog;
+  
+	dialog = EEL_ALERT_DIALOG (object);
+  
+	switch (prop_id) {
+		case PROP_ALERT_TYPE:
+			dialog->details->type = g_value_get_enum (value);
+			setup_type (dialog, dialog->details->type);
+			break;
+		case PROP_BUTTONS:
+			eel_alert_dialog_add_buttons (dialog, g_value_get_enum (value));
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void 
+eel_alert_dialog_get_property (GObject     *object,
+                               guint        prop_id,
+                               GValue      *value,
+                               GParamSpec  *pspec)
+{
+	EelAlertDialog *dialog;
+  
+	dialog = EEL_ALERT_DIALOG (object);
+  
+	switch (prop_id) {
+		case PROP_ALERT_TYPE:
+			g_value_set_enum (value, dialog->details->type);
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+void
+eel_alert_dialog_set_primary_label (EelAlertDialog *dialog,
+                                    const gchar *message)
+{
+	gchar *markup_str;
+	char *escaped_message;
+
+	if (message != NULL) {
+		escaped_message = g_markup_escape_text (message, -1);
+		markup_str = g_strconcat ("<span weight=\"bold\" size=\"larger\">", escaped_message, "</span>", NULL);
+		gtk_label_set_markup (GTK_LABEL (EEL_ALERT_DIALOG (dialog)->details->primary_label),
+		                      markup_str);
+		g_free (markup_str);
+		g_free (escaped_message);
+	}
+}
+
+void
+eel_alert_dialog_set_secondary_label (EelAlertDialog *dialog,
+                                      const gchar *message)
+{
+	if (message != NULL) {
+		gtk_label_set_text (GTK_LABEL (EEL_ALERT_DIALOG (dialog)->details->secondary_label),
+		                    message);
+	} else {
+		gtk_widget_hide (EEL_ALERT_DIALOG (dialog)->details->secondary_label);
+	}
+}
+
+void
+eel_alert_dialog_set_details_label (EelAlertDialog *dialog,
+				    const gchar    *message)
+{
+	if (message != NULL) {
+		gtk_widget_show (dialog->details->details_expander);
+		gtk_label_set_text (GTK_LABEL (dialog->details->details_label), message);
+	} else {
+		gtk_widget_hide (dialog->details->details_expander);
+	}
+}
+
+
+GtkWidget*
+eel_alert_dialog_new (GtkWindow     *parent,
+                      GtkDialogFlags flags,
+                      GtkMessageType type,
+                      GtkButtonsType buttons,
+                      const gchar   *primary_message,
+                      const gchar   *secondary_message)
+{
+	GtkWidget *widget;
+	GtkDialog *dialog;
+
+	g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
+
+	widget = g_object_new (EEL_TYPE_ALERT_DIALOG,
+	                       "alert_type", type,
+	                       "buttons", buttons,
+	                       NULL);
+	atk_object_set_role (gtk_widget_get_accessible (widget), ATK_ROLE_ALERT);
+
+	dialog = GTK_DIALOG (widget);
+	
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);		
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
+	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+	gtk_dialog_set_has_separator (dialog, FALSE);
+
+	/* Make sure we don't get a window title. 
+         * HIG says that alert dialogs should not have window title
+         */
+	gtk_window_set_title (GTK_WINDOW (dialog), "");
+	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE);
+  	
+	eel_alert_dialog_set_primary_label (EEL_ALERT_DIALOG (dialog),
+	                                    primary_message);
+		       
+	eel_alert_dialog_set_secondary_label (EEL_ALERT_DIALOG (dialog),
+	                                      secondary_message);
+
+	if (parent != NULL) {
+		gtk_window_set_transient_for (GTK_WINDOW (widget),
+		                              GTK_WINDOW (parent));
+	}
+
+	if (flags & GTK_DIALOG_MODAL) {
+		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+	}
+
+	if (flags & GTK_DIALOG_DESTROY_WITH_PARENT) {
+		gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+	}
+	return widget;
+}
+
+static void
+eel_alert_dialog_add_buttons (EelAlertDialog* alert_dialog,
+                              GtkButtonsType  buttons)
+{
+	GtkDialog* dialog;
+	
+	dialog = GTK_DIALOG (alert_dialog);
+
+	switch (buttons) {
+		case GTK_BUTTONS_NONE:
+			break;
+		case GTK_BUTTONS_OK:
+			gtk_dialog_add_button (dialog,
+		                               GTK_STOCK_OK,
+			                       GTK_RESPONSE_OK);
+			gtk_dialog_set_default_response (dialog, 
+			                                GTK_RESPONSE_OK);
+			break;
+		case GTK_BUTTONS_CLOSE:
+			gtk_dialog_add_button (dialog,
+		                               GTK_STOCK_CLOSE,
+			                      GTK_RESPONSE_CLOSE);
+			gtk_dialog_set_default_response (dialog, 
+			                                 GTK_RESPONSE_CLOSE);
+			break;
+		case GTK_BUTTONS_CANCEL:
+			gtk_dialog_add_button (dialog,
+			                       GTK_STOCK_CANCEL,
+			                       GTK_RESPONSE_CANCEL);
+			gtk_dialog_set_default_response (dialog, 
+			                                 GTK_RESPONSE_CANCEL);
+			break;
+		case GTK_BUTTONS_YES_NO:
+			gtk_dialog_add_button (dialog,
+			                       GTK_STOCK_NO,
+			                       GTK_RESPONSE_NO);
+			gtk_dialog_add_button (dialog,
+			                       GTK_STOCK_YES,
+			                       GTK_RESPONSE_YES);
+			gtk_dialog_set_default_response (dialog, 
+			                                 GTK_RESPONSE_YES);
+			break;
+		case GTK_BUTTONS_OK_CANCEL:
+			gtk_dialog_add_button (dialog,
+			                       GTK_STOCK_CANCEL,
+			                       GTK_RESPONSE_CANCEL);
+			gtk_dialog_add_button (dialog,
+			                       GTK_STOCK_OK,
+			                       GTK_RESPONSE_OK);
+			gtk_dialog_set_default_response (dialog, 
+			                                 GTK_RESPONSE_OK);
+			break;
+		default:
+			g_warning ("Unknown GtkButtonsType");
+ 			break;
+	} 
+	g_object_notify (G_OBJECT (alert_dialog), "buttons");
+}
+
+static void
+eel_alert_dialog_style_set (GtkWidget *widget,
+                            GtkStyle  *prev_style)
+{
+	GtkWidget *parent;
+	gint border_width;
+	
+	border_width = 0;
+
+	parent = GTK_WIDGET (EEL_ALERT_DIALOG (widget)->details->image->parent);
+
+	if (parent != NULL) {
+		gtk_widget_style_get (widget, "alert_border",
+		                      &border_width, NULL);
+
+		gtk_container_set_border_width (GTK_CONTAINER (parent),
+		                                border_width);
+	}
+
+	if (GTK_WIDGET_CLASS (parent_class)->style_set) {
+		(GTK_WIDGET_CLASS (parent_class)->style_set) (widget, prev_style);
+	}
+}
diff --git a/eel/eel-alert-dialog.h b/eel/eel-alert-dialog.h
new file mode 100644
index 000000000..d0a253462
--- /dev/null
+++ b/eel/eel-alert-dialog.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-alert-dialog.h: An HIG compliant alert dialog.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef EEL_ALERT_DIALOG_H
+#define EEL_ALERT_DIALOG_H
+
+#include <gtk/gtk.h>
+
+#define EEL_TYPE_ALERT_DIALOG        (eel_alert_dialog_get_type ())
+#define EEL_ALERT_DIALOG(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_ALERT_DIALOG, EelAlertDialog))
+
+typedef struct _EelAlertDialog        EelAlertDialog;
+typedef struct _EelAlertDialogClass   EelAlertDialogClass;
+typedef struct _EelAlertDialogDetails EelAlertDialogDetails;
+
+struct _EelAlertDialog
+{
+	GtkDialog parent_instance;
+	EelAlertDialogDetails *details;
+};
+
+struct _EelAlertDialogClass
+{
+	GtkDialogClass parent_class;
+};
+
+GType      eel_alert_dialog_get_type (void);
+
+GtkWidget* eel_alert_dialog_new                 (GtkWindow      *parent,
+                                                 GtkDialogFlags  flags,
+                                                 GtkMessageType  type,
+                                                 GtkButtonsType  buttons,
+                                                 const gchar    *primary_message,
+                                                 const gchar    *secondary_message);
+void       eel_alert_dialog_set_primary_label   (EelAlertDialog *dialog,
+		                                 const gchar    *message);
+void       eel_alert_dialog_set_secondary_label (EelAlertDialog *dialog,
+		                                 const gchar    *message);
+void       eel_alert_dialog_set_details_label   (EelAlertDialog *dialog,
+						 const gchar    *message);
+
+#endif /* EEL_ALERT_DIALOG_H */
diff --git a/eel/eel-art-extensions.c b/eel/eel-art-extensions.c
new file mode 100644
index 000000000..a74ccab07
--- /dev/null
+++ b/eel/eel-art-extensions.c
@@ -0,0 +1,308 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-art-extensions.c - implementation of libart extension functions.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+
+#include "eel-art-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include <math.h>
+
+const EelDRect eel_drect_empty = { 0.0, 0.0, 0.0, 0.0 };
+const EelIRect eel_irect_empty = { 0, 0, 0, 0 };
+const EelIPoint eel_ipoint_max = { G_MAXINT, G_MAXINT };
+const EelIPoint eel_ipoint_min = { G_MININT, G_MININT };
+const EelIPoint eel_ipoint_zero = { 0, 0 };
+const EelDimensions eel_dimensions_empty = { 0, 0 };
+
+void
+eel_irect_copy (EelIRect *dest, const EelIRect *src)
+{
+	dest->x0 = src->x0;
+	dest->y0 = src->y0;
+	dest->x1 = src->x1;
+	dest->y1 = src->y1;
+}
+
+void
+eel_irect_union (EelIRect *dest,
+		  const EelIRect *src1,
+		  const EelIRect *src2) {
+	if (eel_irect_is_empty (src1)) {
+		eel_irect_copy (dest, src2);
+	} else if (eel_irect_is_empty (src2)) {
+		eel_irect_copy (dest, src1);
+	} else {
+		dest->x0 = MIN (src1->x0, src2->x0);
+		dest->y0 = MIN (src1->y0, src2->y0);
+		dest->x1 = MAX (src1->x1, src2->x1);
+		dest->y1 = MAX (src1->y1, src2->y1);
+	}
+}
+
+void
+eel_irect_intersect (EelIRect *dest,
+		     const EelIRect *src1,
+		     const EelIRect *src2)
+{
+	dest->x0 = MAX (src1->x0, src2->x0);
+	dest->y0 = MAX (src1->y0, src2->y0);
+	dest->x1 = MIN (src1->x1, src2->x1);
+	dest->y1 = MIN (src1->y1, src2->y1);
+}
+
+gboolean
+eel_irect_is_empty (const EelIRect *src)
+{
+	return (src->x1 <= src->x0 ||
+		src->y1 <= src->y0);
+}
+
+EelIRect
+eel_irect_assign (int x,
+		      int y,
+		      int width,
+		      int height)
+{
+	EelIRect rectangle;
+
+	rectangle.x0 = x;
+	rectangle.y0 = y;
+	rectangle.x1 = rectangle.x0 + width;
+	rectangle.y1 = rectangle.y0 + height;
+
+	return rectangle;
+}
+
+/**
+ * eel_irect_assign_dimensions:
+ * 
+ * @x: X coodinate for resulting rectangle.
+ * @y: Y coodinate for resulting rectangle.
+ * @dimensions: A EelDimensions structure for the rect's width and height.
+ *
+ * Returns: An EelIRect with the given coordinates and dimensions.
+ */
+EelIRect
+eel_irect_assign_dimensions (int x,
+				 int y,
+				 EelDimensions dimensions)
+{
+	EelIRect rectangle;
+
+	rectangle.x0 = x;
+	rectangle.y0 = y;
+	rectangle.x1 = rectangle.x0 + dimensions.width;
+	rectangle.y1 = rectangle.y0 + dimensions.height;
+
+	return rectangle;
+}
+
+/**
+ * eel_irect_get_width:
+ * 
+ * @rectangle: An EelIRect.
+ *
+ * Returns: The width of the rectangle.
+ * 
+ */
+int
+eel_irect_get_width (EelIRect rectangle)
+{
+	return rectangle.x1 - rectangle.x0;
+}
+
+/**
+ * eel_irect_get_height:
+ * 
+ * @rectangle: An EelIRect.
+ *
+ * Returns: The height of the rectangle.
+ * 
+ */
+int
+eel_irect_get_height (EelIRect rectangle)
+{
+	return rectangle.y1 - rectangle.y0;
+}
+
+
+static void
+eel_drect_copy (EelDRect *dest,
+		const EelDRect *src)
+{
+	dest->x0 = src->x0;
+	dest->y0 = src->y0;
+	dest->x1 = src->x1;
+	dest->y1 = src->y1;
+}
+
+static gboolean
+eel_drect_is_empty (const EelDRect *src)
+{
+	return (src->x1 <= src->x0 || src->y1 <= src->y0);
+}
+
+void
+eel_drect_union (EelDRect *dest,
+		 const EelDRect *src1,
+		 const EelDRect *src2)
+{
+	if (eel_drect_is_empty (src1)) {
+		eel_drect_copy (dest, src2);
+	} else if (eel_drect_is_empty (src2)) {
+		eel_drect_copy (dest, src1);
+	} else {
+		dest->x0 = MIN (src1->x0, src2->x0);
+		dest->y0 = MIN (src1->y0, src2->y0);
+		dest->x1 = MAX (src1->x1, src2->x1);
+		dest->y1 = MAX (src1->y1, src2->y1);
+	}
+}
+
+
+/**
+ * eel_irect_contains_point:
+ * 
+ * @rectangle: An EelIRect.
+ * @x: X coordinate to test.
+ * @y: Y coordinate to test.
+ *
+ * Returns: A boolean value indicating whether the rectangle 
+ *          contains the x,y coordinate.
+ * 
+ */
+gboolean
+eel_irect_contains_point (EelIRect rectangle,
+			  int x,
+			  int y)
+{
+	return x >= rectangle.x0
+		&& x <= rectangle.x1
+		&& y >= rectangle.y0
+		&& y <= rectangle.y1;
+}
+
+gboolean
+eel_irect_hits_irect (EelIRect rectangle_a,
+			  EelIRect rectangle_b)
+{
+	EelIRect intersection;
+	eel_irect_intersect (&intersection, &rectangle_a, &rectangle_b);
+	return !eel_irect_is_empty (&intersection);
+}
+
+gboolean
+eel_irect_equal (EelIRect rectangle_a,
+		     EelIRect rectangle_b)
+{
+	return rectangle_a.x0 == rectangle_b.x0
+		&& rectangle_a.y0 == rectangle_b.y0
+		&& rectangle_a.x1 == rectangle_b.x1
+		&& rectangle_a.y1 == rectangle_b.y1;
+}
+
+/**
+ * eel_irect_align:
+ * 
+ * @container: The rectangle that is to contain the aligned rectangle.
+ * @aligned_width: Width of rectangle being algined.
+ * @aligned_height: Height of rectangle being algined.
+ * @x_alignment: X alignment.
+ * @y_alignment: Y alignment.
+ *
+ * Returns: A rectangle aligned within a container rectangle
+ *          using the given alignment parameters.
+ */
+EelIRect
+eel_irect_align (EelIRect container,
+		     int aligned_width,
+		     int aligned_height,
+		     float x_alignment,
+		     float y_alignment)
+{
+	EelIRect aligned;
+	int available_width;
+	int available_height;
+
+	if (eel_irect_is_empty (&container)) {
+		return eel_irect_empty;
+	}
+
+	if (aligned_width == 0 || aligned_height == 0) {
+		return eel_irect_empty;
+	}
+
+	/* Make sure the aligment parameters are within range */
+	x_alignment = MAX (0, x_alignment);
+	x_alignment = MIN (1.0, x_alignment);
+	y_alignment = MAX (0, y_alignment);
+	y_alignment = MIN (1.0, y_alignment);
+
+	available_width = eel_irect_get_width (container) - aligned_width;
+	available_height = eel_irect_get_height (container) - aligned_height;
+
+	aligned.x0 = floor (container.x0 + (available_width * x_alignment) + 0.5);
+	aligned.y0 = floor (container.y0 + (available_height * y_alignment) + 0.5);
+	aligned.x1 = aligned.x0 + aligned_width;
+	aligned.y1 = aligned.y0 + aligned_height;
+
+	return aligned;
+}
+
+
+/**
+ * eel_dimensions_are_empty:
+ * 
+ * @dimensions: A EelDimensions structure.
+ *
+ * Returns: Whether the dimensions are empty.
+ */
+gboolean
+eel_dimensions_are_empty (EelDimensions dimensions)
+{
+	return dimensions.width <= 0 || dimensions.height <= 0;
+}
+
+EelIRect 
+eel_irect_offset_by (EelIRect rectangle, int x, int y)
+{
+	rectangle.x0 += x;
+	rectangle.x1 += x;
+	rectangle.y0 += y;
+	rectangle.y1 += y;
+	
+	return rectangle;
+}
+
+EelIRect 
+eel_irect_scale_by (EelIRect rectangle, double scale)
+{
+	rectangle.x0 *= scale;
+	rectangle.x1 *= scale;
+	rectangle.y0 *= scale;
+	rectangle.y1 *= scale;
+	
+	return rectangle;
+}
diff --git a/eel/eel-art-extensions.h b/eel/eel-art-extensions.h
new file mode 100644
index 000000000..ad9e9e517
--- /dev/null
+++ b/eel/eel-art-extensions.h
@@ -0,0 +1,111 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-art-extensions.h - interface of libart extension functions.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_ART_EXTENSIONS_H
+#define EEL_ART_EXTENSIONS_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct {
+  double x, y;
+} EelDPoint;
+
+typedef struct {
+	int x;
+	int y;
+} EelIPoint;
+
+typedef struct  {
+  double x0, y0, x1, y1;
+} EelDRect;
+
+typedef struct  {
+  /*< public >*/
+  int x0, y0, x1, y1;
+} EelIRect;
+
+typedef struct {
+	int width;
+	int height;
+} EelDimensions;
+
+extern const EelDRect eel_drect_empty;
+extern const EelIRect eel_irect_empty;
+extern const EelIPoint eel_ipoint_max;
+extern const EelIPoint eel_ipoint_min;
+extern const EelIPoint eel_ipoint_zero;
+extern const EelDimensions eel_dimensions_empty;
+
+void     eel_irect_copy              (EelIRect       *dest,
+				      const EelIRect *src);
+void     eel_irect_union             (EelIRect       *dest,
+				      const EelIRect *src1,
+				      const EelIRect *src2);
+void     eel_irect_intersect         (EelIRect       *dest,
+				      const EelIRect *src1,
+				      const EelIRect *src2);
+gboolean eel_irect_equal             (EelIRect        rectangle_a,
+				      EelIRect        rectangle_b);
+gboolean eel_irect_hits_irect        (EelIRect        rectangle_a,
+				      EelIRect        rectangle_b);
+EelIRect eel_irect_offset_by         (EelIRect        rectangle,
+				      int             x,
+				      int             y);
+EelIRect eel_irect_scale_by          (EelIRect        rectangle,
+				      double          scale);
+gboolean eel_irect_is_empty          (const EelIRect *rectangle);
+gboolean eel_irect_contains_point    (EelIRect        outer_rectangle,
+				      int             x,
+				      int             y);
+EelIRect eel_irect_assign            (int             x,
+				      int             y,
+				      int             width,
+				      int             height);
+EelIRect eel_irect_assign_dimensions (int             x,
+				      int             y,
+				      EelDimensions   dimensions);
+int      eel_irect_get_width         (EelIRect        rectangle);
+int      eel_irect_get_height        (EelIRect        rectangle);
+EelIRect eel_irect_align             (EelIRect        container,
+				      int             aligned_width,
+				      int             aligned_height,
+				      float           x_alignment,
+				      float           y_alignment);
+
+
+void eel_drect_union (EelDRect       *dest,
+		      const EelDRect *src1,
+		      const EelDRect *src2);
+
+
+/* EelDimensions functions. */
+gboolean      eel_dimensions_are_empty        (EelDimensions dimensions);
+
+
+G_END_DECLS
+
+#endif /* EEL_ART_EXTENSIONS_H */
diff --git a/eel/eel-art-gtk-extensions.c b/eel/eel-art-gtk-extensions.c
new file mode 100644
index 000000000..73d92079f
--- /dev/null
+++ b/eel/eel-art-gtk-extensions.c
@@ -0,0 +1,313 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-eel-gtk-extensions.c - Access gtk/gdk attributes as libeel rectangles.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PEELICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+
+#include "eel-art-gtk-extensions.h"
+#include <gdk/gdkx.h>
+
+/**
+ * eel_gdk_rectangle_to_eel_irect:
+ * @gdk_rectangle: The source GdkRectangle.
+ *
+ * Return value: An EelIRect representation of the GdkRectangle.
+ *
+ * This is a very simple conversion of rectangles from the Gdk to the Libeel
+ * universe.  This is useful in code that does clipping (or other operations)
+ * using libeel and has a GdkRectangle to work with - for example expose_event()
+ * in GtkWidget's. 
+ */
+EelIRect
+eel_gdk_rectangle_to_eel_irect (GdkRectangle gdk_rectangle)
+{
+	EelIRect rectangle;
+
+	rectangle.x0 = gdk_rectangle.x;
+	rectangle.y0 = gdk_rectangle.y;
+	rectangle.x1 = rectangle.x0 + (int) gdk_rectangle.width;
+	rectangle.y1 = rectangle.y0 + (int) gdk_rectangle.height;
+
+	return rectangle;
+}
+
+/**
+ * eel_screen_get_dimensions:
+ *
+ * Return value: The screen dimensions.
+ *
+ */
+EelDimensions
+eel_screen_get_dimensions (void)
+{
+	EelDimensions screen_dimensions;
+
+	screen_dimensions.width = gdk_screen_width ();
+	screen_dimensions.height = gdk_screen_height ();
+	
+	g_assert (screen_dimensions.width > 0);
+	g_assert (screen_dimensions.height > 0);
+
+	return screen_dimensions;
+}
+
+/**
+ * eel_gdk_window_get_bounds:
+ * @gdk_window: The source GdkWindow.
+ *
+ * Return value: An EelIRect representation of the given GdkWindow's geometry
+ * relative to its parent in the Gdk window hierarchy.
+ *
+ */
+EelIRect
+eel_gdk_window_get_bounds (GdkWindow *gdk_window)
+{
+	EelIRect bounds;
+	int width;
+	int height;
+
+	g_return_val_if_fail (gdk_window != NULL, eel_irect_empty);
+
+	gdk_window_get_position (gdk_window, &bounds.x0, &bounds.y0);
+	gdk_drawable_get_size (gdk_window, &width, &height);
+
+	bounds.x1 = bounds.x0 + width;
+	bounds.y1 = bounds.y0 + height;
+
+	return bounds;
+}
+
+/**
+ * eel_gdk_window_get_bounds:
+ * @gdk_window: The source GdkWindow.
+ *
+ * Return value: An EelIRect representation of the given GdkWindow's geometry
+ * relative to the screen.
+ *
+ */
+EelIRect
+eel_gdk_window_get_screen_relative_bounds (GdkWindow *gdk_window)
+{
+	EelIRect screen_bounds;
+	int width;
+	int height;
+	
+	g_return_val_if_fail (gdk_window != NULL, eel_irect_empty);
+
+	if (!gdk_window_get_origin (gdk_window,
+				    &screen_bounds.x0,
+				    &screen_bounds.y0)) {
+		return eel_irect_empty;
+	}
+	
+	gdk_drawable_get_size (gdk_window, &width, &height);
+	
+	screen_bounds.x1 = screen_bounds.x0 + width;
+	screen_bounds.y1 = screen_bounds.y0 + height;
+	
+	return screen_bounds;
+}
+
+/**
+ * eel_gtk_widget_get_bounds:
+ * @gtk_widget: The source GtkWidget.
+ *
+ * Return value: An EelIRect representation of the given GtkWidget's geometry
+ * relative to its parent.  In the Gtk universe this is known as "allocation."
+ *
+ */
+EelIRect
+eel_gtk_widget_get_bounds (GtkWidget *gtk_widget)
+{
+	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), eel_irect_empty);
+	
+	return eel_irect_assign (gtk_widget->allocation.x,
+				     gtk_widget->allocation.y,
+				     (int) gtk_widget->allocation.width,
+				     (int) gtk_widget->allocation.height);
+}
+
+/**
+ * eel_gtk_widget_get_dimensions:
+ * @gtk_widget: The source GtkWidget.
+ *
+ * Return value: The widget's dimensions.  The returned dimensions are only valid
+ *               after the widget's geometry has been "allocated" by its container.
+ */
+EelDimensions
+eel_gtk_widget_get_dimensions (GtkWidget *gtk_widget)
+{
+	EelDimensions dimensions;
+	
+	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), eel_dimensions_empty);
+	
+	dimensions.width = (int) gtk_widget->allocation.width;
+	dimensions.height = (int) gtk_widget->allocation.height;
+	
+	return dimensions;
+}
+
+/**
+ * eel_gtk_widget_get_preferred_dimensions:
+ * @gtk_widget: The source GtkWidget.
+ *
+ * Return value: The widget's preferred dimensions.  The preferred dimensions are
+ *               computed by calling the widget's 'size_request' method and thus
+ *               could potentially be expensive for complicated widgets.
+ */
+EelDimensions
+eel_gtk_widget_get_preferred_dimensions (GtkWidget *gtk_widget)
+{
+	GtkRequisition requisition;
+	EelDimensions preferred_dimensions;
+
+	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), eel_dimensions_empty);
+
+	gtk_widget_size_request (gtk_widget, &requisition);
+
+	preferred_dimensions.width = (int) requisition.width;
+	preferred_dimensions.height = (int) requisition.height;
+
+	return preferred_dimensions;
+}
+
+/**
+ * eel_gdk_window_clip_dirty_area_to_screen:
+ * @gdk_window: The GdkWindow that the damage occured on.
+ * @dirty_area: The dirty area as an EelIRect.
+ *
+ * Return value: An EelIRect of the dirty area clipped to the screen.
+ *
+ * This function is useful to do less work in expose_event() GtkWidget methods.
+ * It also ensures that any drawing that the widget does is actually onscreen.
+ */
+EelIRect
+eel_gdk_window_clip_dirty_area_to_screen (GdkWindow *gdk_window,
+					  EelIRect dirty_area)
+{
+	EelIRect clipped;
+	EelDimensions screen_dimensions;
+	EelIRect screen_relative_bounds;
+	int dirty_width;
+	int dirty_height;
+
+	g_return_val_if_fail (gdk_window != NULL, eel_irect_empty);
+
+	dirty_width = dirty_area.x1 - dirty_area.x0;
+	dirty_height = dirty_area.y1 - dirty_area.y0;
+
+	g_return_val_if_fail (dirty_width > 0, eel_irect_empty);
+	g_return_val_if_fail (dirty_height > 0, eel_irect_empty);
+
+	screen_dimensions = eel_screen_get_dimensions ();
+	screen_relative_bounds = eel_gdk_window_get_screen_relative_bounds (gdk_window);
+	
+	/* Window is obscured by left edge of screen */
+	if ((screen_relative_bounds.x0 + dirty_area.x0) < 0) {
+		int clipped_width = screen_relative_bounds.x0 + dirty_area.x0 + dirty_width;
+		clipped.x0 = dirty_area.x0 + dirty_width - clipped_width;
+		clipped.x1 = clipped.x0 + clipped_width;
+	} else {
+		clipped.x0 = dirty_area.x0;
+		clipped.x1 = clipped.x0 + dirty_width;
+	}
+	
+	/* Window is obscured by right edge of screen */
+	if (screen_relative_bounds.x1 > screen_dimensions.width) {
+ 		int obscured_width;
+		
+		obscured_width = 
+			screen_relative_bounds.x0 + dirty_area.x0 + dirty_width - screen_dimensions.width;
+		
+		if (obscured_width > 0) {
+			clipped.x1 -= obscured_width;
+		}
+	}
+
+	/* Window is obscured by top edge of screen */
+	if ((screen_relative_bounds.y0 + dirty_area.y0) < 0) {
+		int clipped_height = screen_relative_bounds.y0 + dirty_area.y0 + dirty_height;
+		clipped.y0 = dirty_area.y0 + dirty_height - clipped_height;
+		clipped.y1 = clipped.y0 + clipped_height;
+	} else {
+		clipped.y0 = dirty_area.y0;
+		clipped.y1 = clipped.y0 + dirty_height;
+	}
+	
+	/* Window is obscured by bottom edge of screen */
+	if (screen_relative_bounds.y1 > screen_dimensions.height) {
+ 		int obscured_height;
+		
+		obscured_height = 
+			screen_relative_bounds.y0 + dirty_area.y0 + dirty_height - screen_dimensions.height;
+		
+		if (obscured_height > 0) {
+			clipped.y1 -= obscured_height;
+		}
+	}
+
+	if (eel_irect_is_empty (&clipped)) {
+		clipped = eel_irect_empty;
+	}
+
+	return clipped;
+}
+
+GdkRectangle
+eel_irect_to_gdk_rectangle (EelIRect rectangle)
+{
+	GdkRectangle gdk_rect;
+
+	gdk_rect.x = rectangle.x0;
+	gdk_rect.y = rectangle.y0;
+	gdk_rect.width = eel_irect_get_width (rectangle);
+	gdk_rect.height = eel_irect_get_height (rectangle);
+
+	return gdk_rect;
+}
+
+EelDimensions
+eel_gdk_window_get_dimensions (GdkWindow *gdk_window)
+{
+	EelDimensions dimensions;
+	
+	g_return_val_if_fail (gdk_window != NULL, eel_dimensions_empty);
+
+	gdk_drawable_get_size (gdk_window, &dimensions.width, &dimensions.height);
+
+	return dimensions;
+}
+
+EelIPoint
+eel_gdk_get_pointer_position (void)
+{
+
+	EelIPoint position;
+
+	gdk_window_get_pointer (gdk_get_default_root_window (),
+				&position.x,
+				&position.y,
+				NULL);
+	
+	return position;
+}
diff --git a/eel/eel-art-gtk-extensions.h b/eel/eel-art-gtk-extensions.h
new file mode 100644
index 000000000..6b0704d3d
--- /dev/null
+++ b/eel/eel-art-gtk-extensions.h
@@ -0,0 +1,70 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-art-gtk-extensions.h - Access gtk/gdk attributes as libart rectangles.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+/* The following functions accept gtk/gdk structures and
+ * return their bounds and dimensions, where:
+ *
+ * bounds: The (x,y) and (width, height) of something.
+ * dimensions: The (width, height) of something.
+ *
+ * These are very useful in code that uses libart functions
+ * to do operations on ArtIRects (such as intersection)
+ */
+
+#ifndef EEL_ART_GTK_EXTENSIONS_H
+#define EEL_ART_GTK_EXTENSIONS_H
+
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-art-extensions.h>
+
+G_BEGIN_DECLS
+
+/* Convert between GdkRectangle and EelIRect and back */
+GdkRectangle  eel_irect_to_gdk_rectangle            (EelIRect      rectangle);
+EelIRect      eel_gdk_rectangle_to_eel_irect            (GdkRectangle  gdk_rectangle);
+EelDimensions eel_screen_get_dimensions                 (void);
+
+/* GdkWindow parent-relative bounds */
+EelIRect      eel_gdk_window_get_bounds                 (GdkWindow    *window);
+
+/* GdkWindow dimensions */
+EelDimensions eel_gdk_window_get_dimensions             (GdkWindow    *window);
+
+/* GdkWindow screen parent-relative bounds */
+EelIRect      eel_gdk_window_get_screen_relative_bounds (GdkWindow    *window);
+
+/* Clip a dirty area (from exposures) to the on screen parts of a GdkWindow */
+EelIRect      eel_gdk_window_clip_dirty_area_to_screen  (GdkWindow    *window,
+							 EelIRect      dirty_area);
+
+/* GtkWidget bounds and dimensions */
+EelIRect      eel_gtk_widget_get_bounds                 (GtkWidget    *widget);
+EelDimensions eel_gtk_widget_get_dimensions             (GtkWidget    *widget);
+EelDimensions eel_gtk_widget_get_preferred_dimensions   (GtkWidget    *widget);
+EelIPoint     eel_gdk_get_pointer_position              (void);
+
+G_END_DECLS
+
+#endif /* EEL_ART_GTK_EXTENSIONS_H */
diff --git a/eel/eel-background-box.c b/eel/eel-background-box.c
new file mode 100644
index 000000000..a577bebcb
--- /dev/null
+++ b/eel/eel-background-box.c
@@ -0,0 +1,70 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-background-box.c - an event box that renders an eel background
+
+   Copyright (C) 2002 Sun Microsystems, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Dave Camp <dave@ximian.com>
+*/
+
+#include <config.h>
+#include "eel-background-box.h"
+
+#include "eel-gtk-macros.h"
+#include "eel-background.h"
+
+static void eel_background_box_class_init   (EelBackgroundBoxClass *background_box_class);
+static void eel_background_box_init         (EelBackgroundBox      *background);
+
+EEL_CLASS_BOILERPLATE (EelBackgroundBox, eel_background_box, GTK_TYPE_EVENT_BOX)
+
+static gboolean
+eel_background_box_expose_event (GtkWidget *widget,
+				 GdkEventExpose *event)
+{
+	eel_background_expose (widget, event);
+	
+	gtk_container_propagate_expose (GTK_CONTAINER (widget), 
+					GTK_BIN (widget)->child,
+					event);
+	
+	return TRUE;
+}
+
+static void
+eel_background_box_class_init (EelBackgroundBoxClass *klass)
+{
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+	
+ 	widget_class->expose_event = eel_background_box_expose_event;
+}
+
+static void
+eel_background_box_init (EelBackgroundBox *box)
+{
+}
+
+GtkWidget*
+eel_background_box_new (void)
+{
+	EelBackgroundBox *background_box;
+
+	background_box = EEL_BACKGROUND_BOX (gtk_widget_new (eel_background_box_get_type (), NULL));
+	
+	return GTK_WIDGET (background_box);
+}
diff --git a/eel/eel-background-box.h b/eel/eel-background-box.h
new file mode 100644
index 000000000..239858d6f
--- /dev/null
+++ b/eel/eel-background-box.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-background-box.c - an event box that renders an eel background
+
+   Copyright (C) 2002 Sun Microsystems, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Dave Camp <dave@ximian.com>
+*/
+
+#ifndef EEL_BACKGROUND_BOX_H
+#define EEL_BACKGROUND_BOX_H
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define EEL_TYPE_BACKGROUND_BOX            (eel_background_box_get_type ())
+#define EEL_BACKGROUND_BOX(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_BACKGROUND_BOX, EelBackgroundBox))
+#define EEL_BACKGROUND_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_BACKGROUND_BOX, EelBackgroundBoxClass))
+#define EEL_IS_BACKGROUND_BOX(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_BACKGROUND_BOX))
+#define EEL_IS_BACKGROUND_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_BACKGROUND_BOX))
+
+typedef struct EelBackgroundBox	       EelBackgroundBox;
+typedef struct EelBackgroundBoxClass       EelBackgroundBoxClass;
+typedef struct EelBackgroundBoxDetails     EelBackgroundBoxDetails;
+
+struct EelBackgroundBox
+{
+	/* Superclass */
+	GtkEventBox event_box;
+};
+
+struct EelBackgroundBoxClass 
+{
+	GtkEventBoxClass parent_class;
+};
+
+GtkType    eel_background_box_get_type (void);
+GtkWidget *eel_background_box_new      (void);
+
+G_END_DECLS
+
+#endif /* EEL_BACKGROUND_TABLE_H */
+
+
diff --git a/eel/eel-background.c b/eel/eel-background.c
new file mode 100644
index 000000000..c2348c9ca
--- /dev/null
+++ b/eel/eel-background.c
@@ -0,0 +1,933 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-background.c: Object for the background of a widget.
+ 
+   Copyright (C) 2000 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-background.h"
+#include "eel-gdk-extensions.h"
+#include "eel-gdk-pixbuf-extensions.h"
+#include "eel-glib-extensions.h"
+#include "eel-gnome-extensions.h"
+#include "eel-gtk-macros.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-string.h"
+#include "eel-marshal.h"
+#include "eel-types.h"
+#include "eel-type-builtins.h"
+#include <gtk/gtk.h>
+#include <eel/eel-canvas.h>
+#include <eel/eel-canvas-util.h>
+#include <gio/gio.h>
+#include <math.h>
+#include <stdio.h>
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+#include <libgnomeui/gnome-bg.h>
+
+static void       eel_background_class_init                (gpointer       klass);
+static void       eel_background_init                      (gpointer       object,
+							    gpointer       klass);
+static void       eel_background_finalize                  (GObject       *object);
+static GdkPixmap *eel_background_get_pixmap_and_color      (EelBackground *background,
+							    GdkWindow     *window,
+							    GdkColor      *color,
+							    gboolean      *changes_with_size);
+static void set_image_properties (EelBackground *background);
+
+EEL_CLASS_BOILERPLATE (EelBackground, eel_background, GTK_TYPE_OBJECT)
+
+enum {
+	APPEARANCE_CHANGED,
+	SETTINGS_CHANGED,
+	RESET,
+	LAST_SIGNAL
+};
+
+/* This is the size of the GdkRGB dither matrix, in order to avoid
+ * bad dithering when tiling the gradient
+ */
+#define GRADIENT_PIXMAP_TILE_SIZE 128
+
+static guint signals[LAST_SIGNAL];
+
+struct EelBackgroundDetails {
+	char *color;
+	
+	GnomeBG *bg;
+
+	/* Realized data: */
+	gboolean background_changes_with_size;
+	GdkPixmap *background_pixmap;
+	int background_entire_width;
+	int background_entire_height;
+	GdkColor default_color;
+
+	gboolean use_base;
+	
+	/* Is this background attached to desktop window */
+	gboolean is_desktop;
+	/* Desktop screen size watcher */
+	gulong screen_size_handler;
+	/* Can we use common pixmap for root window and desktop window */
+	gboolean use_common_pixmap;
+};
+
+static void
+eel_background_class_init (gpointer klass)
+{
+	GObjectClass *object_class;
+
+	object_class = G_OBJECT_CLASS (klass);
+
+	eel_type_init ();
+
+	signals[APPEARANCE_CHANGED] =
+		g_signal_new ("appearance_changed",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
+			      G_STRUCT_OFFSET (EelBackgroundClass,
+					       appearance_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE,
+			      0);
+	signals[SETTINGS_CHANGED] =
+		g_signal_new ("settings_changed",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
+			      G_STRUCT_OFFSET (EelBackgroundClass,
+					       settings_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__INT,
+			      G_TYPE_NONE,
+			      1, G_TYPE_INT);
+	signals[RESET] =
+		g_signal_new ("reset",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
+			      G_STRUCT_OFFSET (EelBackgroundClass,
+					       reset),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE,
+			      0);
+
+	object_class->finalize = eel_background_finalize;
+}
+
+static void
+on_bg_changed (GnomeBG *bg, EelBackground *background)
+{
+	g_signal_emit (G_OBJECT (background),
+		       signals[APPEARANCE_CHANGED], 0);
+}
+
+static void
+eel_background_init (gpointer object, gpointer klass)
+{
+	EelBackground *background;
+
+	background = EEL_BACKGROUND (object);
+
+	background->details = g_new0 (EelBackgroundDetails, 1);
+	background->details->default_color.red = 0xffff;
+	background->details->default_color.green = 0xffff;
+	background->details->default_color.blue = 0xffff;
+	background->details->bg = gnome_bg_new ();
+
+	g_signal_connect (background->details->bg, "changed",
+			  G_CALLBACK (on_bg_changed), background);
+	
+}
+
+/* The safe way to clear an image from a background is:
+ * 		eel_background_set_image_uri (NULL);
+ * This fn is a private utility - it does NOT clear
+ * the details->bg_uri setting.
+ */
+static void
+eel_background_remove_current_image (EelBackground *background)
+{
+	if (background->details->bg != NULL) {
+		g_object_unref (G_OBJECT (background->details->bg));
+		background->details->bg = NULL;
+	}
+}
+
+static void
+eel_background_finalize (GObject *object)
+{
+	EelBackground *background;
+
+	background = EEL_BACKGROUND (object);
+
+	g_free (background->details->color);
+	eel_background_remove_current_image (background);
+
+	if (background->details->background_pixmap != NULL) {
+		g_object_unref (background->details->background_pixmap);
+		background->details->background_pixmap = NULL;
+	}
+
+	g_free (background->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static EelBackgroundImagePlacement
+placement_gnome_to_eel (GnomeBGPlacement p)
+{
+	switch (p) {
+	case GNOME_BG_PLACEMENT_CENTERED:
+		return EEL_BACKGROUND_CENTERED;
+	case GNOME_BG_PLACEMENT_FILL_SCREEN:
+		return EEL_BACKGROUND_SCALED;
+	case GNOME_BG_PLACEMENT_SCALED:
+		return EEL_BACKGROUND_SCALED_ASPECT;
+	case GNOME_BG_PLACEMENT_ZOOMED:
+		return EEL_BACKGROUND_ZOOM;
+	case GNOME_BG_PLACEMENT_TILED:
+		return EEL_BACKGROUND_TILED;
+	}
+
+	return EEL_BACKGROUND_TILED;
+}
+
+static GnomeBGPlacement
+placement_eel_to_gnome (EelBackgroundImagePlacement p)
+{
+	switch (p) {
+	case EEL_BACKGROUND_CENTERED:
+		return GNOME_BG_PLACEMENT_CENTERED;
+	case EEL_BACKGROUND_SCALED:
+		return GNOME_BG_PLACEMENT_FILL_SCREEN;
+	case EEL_BACKGROUND_SCALED_ASPECT:
+		return GNOME_BG_PLACEMENT_SCALED;
+	case EEL_BACKGROUND_ZOOM:
+		return GNOME_BG_PLACEMENT_ZOOMED;
+	case EEL_BACKGROUND_TILED:
+		return GNOME_BG_PLACEMENT_TILED;
+	}
+
+	return GNOME_BG_PLACEMENT_TILED;
+}
+
+EelBackgroundImagePlacement
+eel_background_get_image_placement (EelBackground *background)
+{
+	g_return_val_if_fail (EEL_IS_BACKGROUND (background), EEL_BACKGROUND_TILED);
+
+	return placement_gnome_to_eel (gnome_bg_get_placement (background->details->bg));
+}
+
+void
+eel_background_set_image_placement (EelBackground              *background,
+				    EelBackgroundImagePlacement new_placement)
+{
+	g_return_if_fail (EEL_IS_BACKGROUND (background));
+
+	gnome_bg_set_placement (background->details->bg,
+				placement_eel_to_gnome (new_placement));
+}
+
+EelBackground *
+eel_background_new (void)
+{
+	return EEL_BACKGROUND (g_object_new (EEL_TYPE_BACKGROUND, NULL));
+}
+
+static void
+eel_background_unrealize (EelBackground *background)
+{
+	if (background->details->background_pixmap != NULL) {
+		g_object_unref (background->details->background_pixmap);
+		background->details->background_pixmap = NULL;
+	}
+	background->details->background_entire_width = 0;
+	background->details->background_entire_height = 0;
+	background->details->default_color.red = 0xffff;
+	background->details->default_color.green = 0xffff;
+	background->details->default_color.blue = 0xffff;
+}
+
+static void
+drawable_get_adjusted_size (EelBackground *background,
+			    GdkDrawable   *drawable,
+			    int		  *width,
+			    int	          *height)
+{
+	GdkScreen *screen;
+	
+	/* 
+	 * Screen resolution change makes root drawable have incorrect size.
+	 */    
+	gdk_drawable_get_size (drawable, width, height);
+
+	if (background->details->is_desktop) {
+		screen = gdk_drawable_get_screen (drawable);
+		*width = gdk_screen_get_width (screen);
+		*height = gdk_screen_get_height (screen);
+	}
+}
+
+static gboolean
+eel_background_ensure_realized (EelBackground *background, GdkWindow *window)
+{
+	gpointer data;
+	GtkWidget *widget;
+	GtkStyle *style;
+	gboolean changed;
+	int entire_width;
+	int entire_height;
+	
+	drawable_get_adjusted_size (background, window, &entire_width, &entire_height);
+	
+	/* Set the default color */
+	
+	/* Get the widget to which the window belongs and its style as well */
+	gdk_window_get_user_data (window, &data);
+	widget = GTK_WIDGET (data);
+	if (widget != NULL) {
+		style = gtk_widget_get_style (widget);
+		if (background->details->use_base) {
+			background->details->default_color = style->base[GTK_STATE_NORMAL];
+		} else {
+			background->details->default_color = style->bg[GTK_STATE_NORMAL];
+		}
+		
+		gdk_rgb_find_color (style->colormap, &(background->details->default_color));
+	}
+
+	/* If the pixmap doesn't change with the window size, never update
+	 * it again.
+	 */
+	if (background->details->background_pixmap != NULL &&
+	    !background->details->background_changes_with_size) {
+		return FALSE;
+	}
+
+	/* If the window size is the same as last time, don't update */
+	if (entire_width == background->details->background_entire_width &&
+	    entire_height == background->details->background_entire_height) {
+		return FALSE;
+	}
+
+	if (background->details->background_pixmap != NULL) {
+		g_object_unref (background->details->background_pixmap);
+		background->details->background_pixmap = NULL;
+	}
+
+	changed = FALSE;
+
+	set_image_properties (background);
+
+	background->details->background_changes_with_size = gnome_bg_changes_with_size (background->details->bg);
+	background->details->background_pixmap = gnome_bg_create_pixmap (background->details->bg,
+									 window,
+									 entire_width, entire_height,
+									 background->details->is_desktop);
+
+	changed = TRUE;
+	
+	
+	background->details->background_entire_width = entire_width;
+	background->details->background_entire_height = entire_height;
+	
+	return changed;
+}
+
+static GdkPixmap *
+eel_background_get_pixmap_and_color (EelBackground *background,
+				     GdkWindow     *window,
+				     GdkColor      *color,
+				     gboolean      *changes_with_size)
+{
+	int entire_width;
+	int entire_height;
+
+	drawable_get_adjusted_size (background, window, &entire_width, &entire_height);
+
+	eel_background_ensure_realized (background, window);
+	
+	*color = background->details->default_color;
+	*changes_with_size = background->details->background_changes_with_size;
+	
+	if (background->details->background_pixmap != NULL) {
+		return g_object_ref (background->details->background_pixmap);
+	} 
+	return NULL;
+}
+
+void
+eel_background_expose (GtkWidget                   *widget,
+		       GdkEventExpose              *event)
+{
+	GdkColor color;
+	int window_width;
+	int window_height;
+	gboolean changes_with_size;
+	GdkPixmap *pixmap;
+	GdkGC *gc;
+	GdkGCValues gc_values;
+	GdkGCValuesMask value_mask;
+
+	EelBackground *background;
+	
+	if (event->window != widget->window) {
+		return;
+	}
+
+	background = eel_get_widget_background (widget);
+
+	drawable_get_adjusted_size (background, widget->window, &window_width, &window_height);
+	
+	pixmap = eel_background_get_pixmap_and_color (background,
+						      widget->window,
+						      &color,
+						      &changes_with_size);
+
+        if (!changes_with_size) {
+                /* The background was already drawn by X, since we set
+                 * the GdkWindow background/back_pixmap.
+                 * No need to draw it again. */
+                if (pixmap) {
+                        g_object_unref (pixmap);
+                }
+                return;
+        }
+ 
+	if (pixmap) {
+		gc_values.tile = pixmap;
+		gc_values.ts_x_origin = 0;
+		gc_values.ts_y_origin = 0;
+		gc_values.fill = GDK_TILED;
+		value_mask = GDK_GC_FILL | GDK_GC_TILE | GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN;
+	} else {
+		gdk_rgb_find_color (gtk_widget_get_colormap (widget), &color);
+		gc_values.foreground = color;
+		gc_values.fill = GDK_SOLID;
+		value_mask = GDK_GC_FILL | GDK_GC_FOREGROUND;
+	}
+	
+	gc = gdk_gc_new_with_values (widget->window, &gc_values, value_mask);
+	
+	gdk_gc_set_clip_rectangle (gc, &event->area);
+
+	gdk_draw_rectangle (widget->window, gc, TRUE, 0, 0, window_width, window_height);
+	
+	g_object_unref (gc);
+	
+	if (pixmap) {
+		g_object_unref (pixmap);
+	}
+}
+
+static void
+set_image_properties (EelBackground *background)
+{
+	if (!background->details->color) {
+		gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_SOLID,
+				 &background->details->default_color, NULL);
+	} else if (!eel_gradient_is_gradient (background->details->color)) {
+		GdkColor c;
+
+		eel_gdk_color_parse_with_white_default (background->details->color, &c);
+	
+		gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_SOLID, &c, NULL);
+	} else {
+		GdkColor c1;
+		GdkColor c2;
+		char *spec;
+
+		spec = eel_gradient_get_start_color_spec (background->details->color);
+		eel_gdk_color_parse_with_white_default (spec, &c1);
+		g_free (spec);
+
+		spec = eel_gradient_get_end_color_spec (background->details->color);
+		eel_gdk_color_parse_with_white_default (spec, &c2);
+		g_free (spec);
+
+		if (eel_gradient_is_horizontal (background->details->color))
+			gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_H_GRADIENT, &c1, &c2);
+		else
+			gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_V_GRADIENT, &c1, &c2);
+
+	}
+}
+
+char *
+eel_background_get_color (EelBackground *background)
+{
+	g_return_val_if_fail (EEL_IS_BACKGROUND (background), NULL);
+
+	return g_strdup (background->details->color);
+}
+
+char *
+eel_background_get_image_uri (EelBackground *background)
+{
+	const char *filename;
+	
+	g_return_val_if_fail (EEL_IS_BACKGROUND (background), NULL);
+
+	filename = gnome_bg_get_filename (background->details->bg);
+	
+	return g_filename_to_uri (filename, NULL, NULL);
+}
+
+/* Use style->base as the default color instead of bg */
+void
+eel_background_set_use_base (EelBackground *background,
+			     gboolean use_base)
+{
+	background->details->use_base = use_base;
+}
+
+void
+eel_background_set_color (EelBackground *background,
+			  const char *color)
+{
+	if (eel_strcmp (background->details->color, color) != 0) {
+		g_free (background->details->color);
+		background->details->color = g_strdup (color);
+		
+		set_image_properties (background);
+	}
+}
+
+static gboolean
+eel_background_set_image_uri_helper (EelBackground *background,
+				     const char *image_uri,
+				     gboolean emit_signal)
+{
+	char *filename;
+
+	if (image_uri != NULL) {
+		filename = g_filename_from_uri (image_uri, NULL, NULL);
+	}
+	else {
+		filename = NULL;
+	}
+	
+	gnome_bg_set_filename (background->details->bg, filename);
+
+	if (emit_signal) {
+		g_signal_emit (GTK_OBJECT (background), signals[SETTINGS_CHANGED], 0, GDK_ACTION_COPY);
+	}
+
+	set_image_properties (background);
+	
+	g_free (filename);
+	
+	return TRUE;
+}
+
+void
+eel_background_set_image_uri (EelBackground *background, const char *image_uri)
+{
+	
+	
+	eel_background_set_image_uri_helper (background, image_uri, TRUE);
+}
+
+/* Use this fn to set both the image and color and avoid flash. The color isn't
+ * changed till after the image is done loading, that way if an update occurs
+ * before then, it will use the old color and image.
+ */
+static void
+eel_background_set_image_uri_and_color (EelBackground *background, GdkDragAction action,
+					const char *image_uri, const char *color)
+{
+	eel_background_set_image_uri_helper (background, image_uri, FALSE);
+	eel_background_set_color (background, color);
+
+	/* We always emit, even if the color didn't change, because the image change
+	 * relies on us doing it here.
+	 */
+
+	g_signal_emit (background, signals[SETTINGS_CHANGED], 0, action);
+}
+
+void
+eel_background_receive_dropped_background_image (EelBackground *background,
+						 GdkDragAction action,
+						 const char *image_uri)
+{
+	/* Currently, we only support tiled images. So we set the placement.
+	 * We rely on eel_background_set_image_uri_and_color to emit
+	 * the SETTINGS_CHANGED & APPEARANCE_CHANGE signals.
+	 */
+	eel_background_set_image_placement (background, EEL_BACKGROUND_TILED);
+	
+	eel_background_set_image_uri_and_color (background, action, image_uri, NULL);
+}
+
+/**
+ * eel_background_is_set:
+ * 
+ * Check whether the background's color or image has been set.
+ */
+gboolean
+eel_background_is_set (EelBackground *background)
+{
+	g_assert (EEL_IS_BACKGROUND (background));
+
+	return background->details->color != NULL
+		|| gnome_bg_get_filename (background->details->bg) != NULL;
+}
+
+/**
+ * eel_background_reset:
+ *
+ * Emit the reset signal to forget any color or image that has been
+ * set previously.
+ */
+void
+eel_background_reset (EelBackground *background)
+{
+	g_return_if_fail (EEL_IS_BACKGROUND (background));
+
+	g_signal_emit (GTK_OBJECT (background), signals[RESET], 0);
+}
+
+static void
+eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+{
+	GtkStyle *style;
+	GdkPixmap *pixmap;
+	GdkPixmap *root_pixmap;
+	GdkColor color;
+	
+	int window_width;
+	int window_height;
+	
+	GdkWindow *window;
+	gboolean changes_with_size;
+
+	if (!GTK_WIDGET_REALIZED (widget)) {
+		return;
+	}
+
+	drawable_get_adjusted_size (background, widget->window, &window_width, &window_height);
+	
+	pixmap = eel_background_get_pixmap_and_color (background,
+						      widget->window,
+						      &color, 
+						      &changes_with_size);
+
+	style = gtk_widget_get_style (widget);
+	
+	gdk_rgb_find_color (style->colormap, &color);
+
+	if (EEL_IS_CANVAS (widget)) {
+		window = GTK_LAYOUT (widget)->bin_window;
+	} else {
+		window = widget->window;
+	}
+
+	if (!changes_with_size || background->details->is_desktop) {
+		gdk_window_set_back_pixmap (window, pixmap, FALSE);
+	} else {
+		gdk_window_set_back_pixmap (window, NULL, FALSE);
+		gdk_window_set_background (window, &color);
+	}
+	
+
+	background->details->background_changes_with_size =
+		gnome_bg_changes_with_size (background->details->bg);
+	
+	if (background->details->is_desktop) {
+
+		root_pixmap = NULL;
+
+		if (background->details->use_common_pixmap) {
+			root_pixmap = g_object_ref (pixmap);
+		} else {
+			root_pixmap = gnome_bg_create_pixmap (background->details->bg, window,
+							      window_width, window_height, TRUE);
+		}
+
+		gnome_bg_set_pixmap_as_root (gdk_drawable_get_screen (window), root_pixmap);
+		g_object_unref (root_pixmap);
+	}
+	
+	if (pixmap) {
+		g_object_unref (pixmap);
+	}
+}
+
+static void
+eel_widget_background_changed (GtkWidget *widget, EelBackground *background)
+{
+	eel_background_unrealize (background);
+	eel_background_set_up_widget (background, widget);
+
+	gtk_widget_queue_draw (widget);
+}
+
+/* Callback used when the style of a widget changes.  We have to regenerate its
+ * EelBackgroundStyle so that it will match the chosen GTK+ theme.
+ */
+static void
+widget_style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data)
+{
+	EelBackground *background;
+	
+	background = EEL_BACKGROUND (data);
+	
+	eel_widget_background_changed (widget, background);
+}
+
+static void
+screen_size_changed (GdkScreen *screen, EelBackground *background)
+{
+	g_signal_emit (background, signals[APPEARANCE_CHANGED], 0);
+}
+
+
+static void
+widget_realized_setup (GtkWidget *widget, gpointer data)
+{
+	EelBackground *background;
+	
+	background = EEL_BACKGROUND (data);
+	
+        if (background->details->is_desktop) {
+		GdkWindow *root_window;	
+		GdkScreen *screen;
+		
+		screen = gtk_widget_get_screen (widget);
+
+		if (background->details->screen_size_handler > 0) {
+		        g_signal_handler_disconnect (screen,
+				                     background->details->screen_size_handler);
+		}
+	
+		background->details->screen_size_handler = 
+			g_signal_connect (screen, "size_changed",
+            				  G_CALLBACK (screen_size_changed), background);
+
+		root_window = gdk_screen_get_root_window(screen);			
+		
+		if (gdk_drawable_get_visual (root_window) == gtk_widget_get_visual (widget)) {
+			background->details->use_common_pixmap = TRUE;
+		} else {
+			background->details->use_common_pixmap = FALSE;
+		}
+	}
+}
+
+static void
+widget_realize_cb (GtkWidget *widget, gpointer data)
+{
+	EelBackground *background;
+	
+	background = EEL_BACKGROUND (data);
+
+	widget_realized_setup (widget, data);
+		
+	eel_background_set_up_widget (background, widget);
+}
+
+static void
+widget_unrealize_cb (GtkWidget *widget, gpointer data)
+{
+	EelBackground *background;
+	
+	background = EEL_BACKGROUND (data);
+
+	if (background->details->screen_size_handler > 0) {
+		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
+				                     background->details->screen_size_handler);
+			background->details->screen_size_handler = 0;
+	}
+	background->details->use_common_pixmap = FALSE;
+}
+
+void
+eel_background_set_desktop (EelBackground *background, GtkWidget *widget, gboolean is_desktop)
+{
+	background->details->is_desktop = is_desktop;
+
+	if (GTK_WIDGET_REALIZED(widget) && background->details->is_desktop) {
+		widget_realized_setup (widget, background);
+	}
+	
+}
+
+gboolean
+eel_background_is_desktop (EelBackground *background)
+{
+	return background->details->is_desktop;
+}
+
+/* Gets the background attached to a widget.
+
+   If the widget doesn't already have a EelBackground object,
+   this will create one. To change the widget's background, you can
+   just call eel_background methods on the widget.
+
+   If the widget is a canvas, nothing more needs to be done.  For
+   normal widgets, you need to call eel_background_expose() from your
+   expose handler to draw the background.
+
+   Later, we might want a call to find out if we already have a background,
+   or a way to share the same background among multiple widgets; both would
+   be straightforward.
+*/
+EelBackground *
+eel_get_widget_background (GtkWidget *widget)
+{
+	gpointer data;
+	EelBackground *background;
+
+	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+	/* Check for an existing background. */
+	data = g_object_get_data (G_OBJECT (widget), "eel_background");
+	if (data != NULL) {
+		g_assert (EEL_IS_BACKGROUND (data));
+		return data;
+	}
+
+	/* Store the background in the widget's data. */
+	background = eel_background_new ();
+	g_object_ref (background);
+	gtk_object_sink (GTK_OBJECT (background));
+	g_object_set_data_full (G_OBJECT (widget), "eel_background",
+				background, g_object_unref);
+
+	/* Arrange to get the signal whenever the background changes. */
+	g_signal_connect_object (background, "appearance_changed",
+				 G_CALLBACK (eel_widget_background_changed), widget, G_CONNECT_SWAPPED);
+	eel_widget_background_changed (widget, background);
+
+	g_signal_connect_object (widget, "style_set",
+				 G_CALLBACK (widget_style_set_cb),
+				 background,
+				 0);
+	g_signal_connect_object (widget, "realize",
+				 G_CALLBACK (widget_realize_cb),
+				 background,
+				 0);
+	g_signal_connect_object (widget, "unrealize",
+				 G_CALLBACK (widget_unrealize_cb),
+				 background,
+				 0);
+
+	return background;
+}
+
+/* determine if a background is darker or lighter than average, to help clients know what
+   colors to draw on top with */
+gboolean
+eel_background_is_dark (EelBackground *background)
+{
+	return gnome_bg_is_dark (background->details->bg);
+}
+   
+/* handle dropped colors */
+void
+eel_background_receive_dropped_color (EelBackground *background,
+				      GtkWidget *widget,
+				      GdkDragAction action,
+				      int drop_location_x,
+				      int drop_location_y,
+				      const GtkSelectionData *selection_data)
+{
+	guint16 *channels;
+	char *color_spec;
+	char *new_gradient_spec;
+	int left_border, right_border, top_border, bottom_border;
+
+	g_return_if_fail (EEL_IS_BACKGROUND (background));
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+	g_return_if_fail (selection_data != NULL);
+
+	/* Convert the selection data into a color spec. */
+	if (selection_data->length != 8 || selection_data->format != 16) {
+		g_warning ("received invalid color data");
+		return;
+	}
+	channels = (guint16 *) selection_data->data;
+	color_spec = g_strdup_printf ("#%02X%02X%02X",
+				      channels[0] >> 8,
+				      channels[1] >> 8,
+				      channels[2] >> 8);
+
+	/* Figure out if the color was dropped close enough to an edge to create a gradient.
+	   For the moment, this is hard-wired, but later the widget will have to have some
+	   say in where the borders are.
+	*/
+	left_border = 32;
+	right_border = widget->allocation.width - 32;
+	top_border = 32;
+	bottom_border = widget->allocation.height - 32;
+	if (drop_location_x < left_border && drop_location_x <= right_border) {
+		new_gradient_spec = eel_gradient_set_left_color_spec (background->details->color, color_spec);
+	} else if (drop_location_x >= left_border && drop_location_x > right_border) {
+		new_gradient_spec = eel_gradient_set_right_color_spec (background->details->color, color_spec);
+	} else if (drop_location_y < top_border && drop_location_y <= bottom_border) {
+		new_gradient_spec = eel_gradient_set_top_color_spec (background->details->color, color_spec);
+	} else if (drop_location_y >= top_border && drop_location_y > bottom_border) {
+		new_gradient_spec = eel_gradient_set_bottom_color_spec (background->details->color, color_spec);
+	} else {
+		new_gradient_spec = g_strdup (color_spec);
+	}
+	
+	g_free (color_spec);
+
+	eel_background_set_image_uri_and_color (background, action, NULL, new_gradient_spec);
+
+	g_free (new_gradient_spec);
+}
+
+void
+eel_background_save_to_gconf (EelBackground *background)
+{
+	GConfClient *client = gconf_client_get_default ();
+
+	if (background->details->bg)
+		gnome_bg_save_to_preferences (background->details->bg, client);
+}
+
+/* self check code */
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+void
+eel_self_check_background (void)
+{
+	EelBackground *background;
+
+	background = eel_background_new ();
+
+	eel_background_set_color (background, NULL);
+	eel_background_set_color (background, "");
+	eel_background_set_color (background, "red");
+	eel_background_set_color (background, "red-blue");
+	eel_background_set_color (background, "red-blue:h");
+
+	gtk_object_sink (GTK_OBJECT (background));
+}
+
+#endif
diff --git a/eel/eel-background.h b/eel/eel-background.h
new file mode 100644
index 000000000..d2fff5139
--- /dev/null
+++ b/eel/eel-background.h
@@ -0,0 +1,155 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-background.h: Object for the background of a widget.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#ifndef EEL_BACKGROUND_H
+#define EEL_BACKGROUND_H
+
+/* Windows for Eel can contain backgrounds that are either tiled
+   with an image, a solid color, or a color gradient. This class manages
+   the process of loading the image if necessary and parsing the string
+   that specifies either a color or color gradient.
+
+   The color or gradient is always present, even if there's a tiled image
+   on top of it. This is used when the tiled image can't be loaded for
+   some reason (or just has not been loaded yet).
+
+   The EelBackground object is easier to modify than a GtkStyle.
+   You can just call eel_get_window_background and modify the
+   returned background directly, unlike a style, which must be copied,
+   modified and then set.
+*/
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+typedef struct EelBackground EelBackground;
+typedef struct EelBackgroundClass EelBackgroundClass;
+
+#define EEL_TYPE_BACKGROUND \
+	(eel_background_get_type ())
+#define EEL_BACKGROUND(obj) \
+	(GTK_CHECK_CAST ((obj), EEL_TYPE_BACKGROUND, EelBackground))
+#define EEL_BACKGROUND_CLASS(klass) \
+	(GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_BACKGROUND, EelBackgroundClass))
+#define EEL_IS_BACKGROUND(obj) \
+	(GTK_CHECK_TYPE ((obj), EEL_TYPE_BACKGROUND))
+#define EEL_IS_BACKGROUND_CLASS(klass) \
+	(GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_BACKGROUND))
+
+typedef enum {
+	EEL_BACKGROUND_TILED = 0, /* zero makes this the default placement */
+	EEL_BACKGROUND_CENTERED,
+	EEL_BACKGROUND_SCALED,
+	EEL_BACKGROUND_SCALED_ASPECT,
+	EEL_BACKGROUND_ZOOM
+} EelBackgroundImagePlacement;
+
+GtkType                     eel_background_get_type                         (void);
+EelBackground *             eel_background_new                              (void);
+
+
+/* Calls to change a background. */
+void                        eel_background_set_use_base                     (EelBackground               *background,
+									     gboolean                     use_base);
+void                        eel_background_set_color                        (EelBackground               *background,
+									     const char                  *color_or_gradient);
+void                        eel_background_set_image_uri                    (EelBackground               *background,
+									     const char                  *image_uri);
+
+void                        eel_background_reset                            (EelBackground               *background);
+void                        eel_background_set_image_placement              (EelBackground               *background,
+									     EelBackgroundImagePlacement  placement);
+
+/* Should be TRUE for desktop background */
+void			    eel_background_set_desktop 			    (EelBackground              *background,
+									     GtkWidget *widget, 
+									     gboolean is_desktop);
+gboolean		    eel_background_is_desktop 			    (EelBackground              *background);
+
+/* Calls to interrogate the current state of a background. */
+char *                      eel_background_get_color                        (EelBackground               *background);
+char *                      eel_background_get_image_uri                    (EelBackground               *background);
+EelBackgroundImagePlacement eel_background_get_image_placement              (EelBackground               *background);
+gboolean                    eel_background_is_dark                          (EelBackground               *background);
+gboolean                    eel_background_is_set                           (EelBackground               *background);
+
+/* Helper function for widgets using EelBackground */
+void                        eel_background_expose                           (GtkWidget                   *widget,
+									     GdkEventExpose              *event);
+
+/* Handles a dragged color being dropped on a widget to change the background color. */
+void                        eel_background_receive_dropped_color            (EelBackground               *background,
+									     GtkWidget                   *widget,
+									     GdkDragAction                action,
+									     int                          drop_location_x,
+									     int                          drop_location_y,
+									     const GtkSelectionData      *dropped_color);
+
+/* Handles a special-case image name that means "reset to default background" too. */
+void                        eel_background_receive_dropped_background_image (EelBackground               *background,
+									     GdkDragAction                action,
+									     const char                  *image_uri);
+
+/* Gets or creates a background so that it's attached to a widget. */
+EelBackground *             eel_get_widget_background                       (GtkWidget                   *widget);
+void			    eel_background_save_to_gconf                    (EelBackground               *background);
+
+typedef struct EelBackgroundDetails EelBackgroundDetails;
+
+struct EelBackground
+{
+	GtkObject object;
+	EelBackgroundDetails *details;
+};
+
+struct EelBackgroundClass
+{
+	GtkObjectClass parent_class;
+
+	/* This signal is emitted whenever the background settings are
+	 * changed.
+	 */
+	void (* settings_changed) (EelBackground *);
+
+	/* This signal is emitted whenever the appearance of the
+	 * background has changed, like when the background settings are
+	 * altered or when an image is loaded.
+	 */
+	void (* appearance_changed) (EelBackground *);
+
+	/* This signal is emitted when image loading is over - whether it
+	 * was successfully loaded or not.
+	 */
+	void (* image_loading_done) (EelBackground *background, gboolean successful_load);
+
+	/* This signal is emitted when the background is reset by receiving
+	   the reset property from a drag
+	 */
+	void (* reset) (EelBackground *);
+
+};
+
+#endif /* EEL_BACKGROUND_H */
diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c
new file mode 100644
index 000000000..fe86f625b
--- /dev/null
+++ b/eel/eel-canvas-rect-ellipse.c
@@ -0,0 +1,1489 @@
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+/* Rectangle and ellipse item types for EelCanvas widget
+ *
+ * EelCanvas is basically a port of the Tk toolkit's most excellent canvas widget.  Tk is
+ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties.
+ *
+ *
+ * Author: Federico Mena <federico@nuclecu.unam.mx>
+ */
+
+#include <config.h>
+#include <math.h>
+#include "eel-canvas-rect-ellipse.h"
+#include "eel-canvas-util.h"
+#include <string.h>
+
+#ifdef HAVE_RENDER
+#include <gdk/gdkx.h>
+#include <X11/extensions/Xrender.h>
+#endif
+
+/* Base class for rectangle and ellipse item types */
+
+#define noVERBOSE
+
+enum {
+	PROP_0,
+	PROP_X1,
+	PROP_Y1,
+	PROP_X2,
+	PROP_Y2,
+	PROP_FILL_COLOR,
+	PROP_FILL_COLOR_GDK,
+	PROP_FILL_COLOR_RGBA,
+	PROP_OUTLINE_COLOR,
+	PROP_OUTLINE_COLOR_GDK,
+	PROP_OUTLINE_COLOR_RGBA,
+	PROP_FILL_STIPPLE,
+	PROP_OUTLINE_STIPPLE,
+	PROP_WIDTH_PIXELS,
+	PROP_WIDTH_UNITS
+};
+
+
+static void eel_canvas_re_class_init (EelCanvasREClass *class);
+static void eel_canvas_re_init       (EelCanvasRE      *re);
+static void eel_canvas_re_destroy    (GtkObject          *object);
+static void eel_canvas_re_set_property (GObject              *object,
+					  guint                 param_id,
+					  const GValue         *value,
+					  GParamSpec           *pspec);
+static void eel_canvas_re_get_property (GObject              *object,
+					  guint                 param_id,
+					  GValue               *value,
+					  GParamSpec           *pspec);
+
+static void eel_canvas_re_update_shared (EelCanvasItem *item,
+					   double i2w_dx, double i2w_dy, int flags);
+static void eel_canvas_re_realize     (EelCanvasItem *item);
+static void eel_canvas_re_unrealize   (EelCanvasItem *item);
+static void eel_canvas_re_bounds      (EelCanvasItem *item, double *x1, double *y1, double *x2, double *y2);
+static void eel_canvas_re_translate   (EelCanvasItem *item, double dx, double dy);
+static void eel_canvas_rect_update      (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags);
+static void eel_canvas_ellipse_update      (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags);
+
+typedef struct {
+  /*< public >*/
+  int x0, y0, x1, y1;
+}  Rect;
+
+static Rect make_rect (int x0, int y0, int x1, int y1);
+static void  diff_rects (Rect r1, Rect r2, int *count, Rect result[4]);
+
+static EelCanvasItemClass *re_parent_class;
+static EelCanvasREClass *rect_parent_class;
+
+
+GType
+eel_canvas_re_get_type (void)
+{
+	static GType re_type = 0;
+
+	if (!re_type) {
+		GTypeInfo re_info = {
+		  sizeof (EelCanvasREClass),
+		  (GBaseInitFunc) NULL,
+		  (GBaseFinalizeFunc) NULL,
+		  (GClassInitFunc) eel_canvas_re_class_init,
+		  NULL,           /* class_finalize */
+		  NULL,           /* class_data */
+		  sizeof (EelCanvasRE),
+		  0,              /* n_preallocs */
+		  (GInstanceInitFunc) eel_canvas_re_init
+		};
+
+		re_type = g_type_register_static (eel_canvas_item_get_type (),
+						  "EelCanvasRE",
+						  &re_info,
+						  0);
+	}
+
+	return re_type;
+}
+
+static void
+eel_canvas_re_class_init (EelCanvasREClass *class)
+{
+	GObjectClass *gobject_class;
+	GtkObjectClass *object_class;
+	EelCanvasItemClass *item_class;
+
+	gobject_class = (GObjectClass *) class;
+	object_class = (GtkObjectClass *) class;
+	item_class = (EelCanvasItemClass *) class;
+
+	re_parent_class = g_type_class_peek_parent (class);
+
+	gobject_class->set_property = eel_canvas_re_set_property;
+	gobject_class->get_property = eel_canvas_re_get_property;
+
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_X1,
+                 g_param_spec_double ("x1", NULL, NULL,
+				      -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_Y1,
+                 g_param_spec_double ("y1", NULL, NULL,
+				      -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_X2,
+                 g_param_spec_double ("x2", NULL, NULL,
+				      -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_Y2,
+                 g_param_spec_double ("y2", NULL, NULL,
+				      -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_FILL_COLOR,
+                 g_param_spec_string ("fill_color", NULL, NULL,
+                                      NULL,
+                                      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_FILL_COLOR_GDK,
+                 g_param_spec_boxed ("fill_color_gdk", NULL, NULL,
+				     GDK_TYPE_COLOR,
+				     (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_FILL_COLOR_RGBA,
+                 g_param_spec_uint ("fill_color_rgba", NULL, NULL,
+				    0, G_MAXUINT, 0,
+				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_FILL_STIPPLE,
+                 g_param_spec_object ("fill_stipple", NULL, NULL,
+                                      GDK_TYPE_DRAWABLE,
+                                      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_OUTLINE_COLOR,
+                 g_param_spec_string ("outline_color", NULL, NULL,
+                                      NULL,
+                                      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_OUTLINE_COLOR_GDK,
+                 g_param_spec_boxed ("outline_color_gdk", NULL, NULL,
+				     GDK_TYPE_COLOR,
+				     (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_OUTLINE_COLOR_RGBA,
+                 g_param_spec_uint ("outline_color_rgba", NULL, NULL,
+				    0, G_MAXUINT, 0,
+				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_OUTLINE_STIPPLE,
+                 g_param_spec_object ("outline_stipple", NULL, NULL,
+                                      GDK_TYPE_DRAWABLE,
+                                      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_WIDTH_PIXELS,
+                 g_param_spec_uint ("width_pixels", NULL, NULL,
+				    0, G_MAXUINT, 0,
+				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+        g_object_class_install_property
+                (gobject_class,
+                 PROP_WIDTH_UNITS,
+                 g_param_spec_double ("width_units", NULL, NULL,
+				      0.0, G_MAXDOUBLE, 0.0,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+
+	object_class->destroy = eel_canvas_re_destroy;
+
+	item_class->realize = eel_canvas_re_realize;
+	item_class->unrealize = eel_canvas_re_unrealize;
+	item_class->translate = eel_canvas_re_translate;
+	item_class->bounds = eel_canvas_re_bounds;
+}
+
+static void
+eel_canvas_re_init (EelCanvasRE *re)
+{
+	re->x1 = 0.0;
+	re->y1 = 0.0;
+	re->x2 = 0.0;
+	re->y2 = 0.0;
+	re->width = 0.0;
+}
+
+static void
+eel_canvas_re_destroy (GtkObject *object)
+{
+	EelCanvasRE *re;
+
+	g_assert (object != NULL);
+	g_assert (EEL_IS_CANVAS_RE (object));
+
+	re = EEL_CANVAS_RE (object);
+
+	/* remember, destroy can be run multiple times! */
+
+	if (re->fill_stipple)
+		g_object_unref (re->fill_stipple);
+	re->fill_stipple = NULL;
+
+	if (re->outline_stipple)
+		g_object_unref (re->outline_stipple);
+	re->outline_stipple = NULL;
+
+	if (GTK_OBJECT_CLASS (re_parent_class)->destroy)
+		(* GTK_OBJECT_CLASS (re_parent_class)->destroy) (object);
+}
+
+static void get_bounds (EelCanvasRE *re, double *px1, double *py1, double *px2, double *py2)
+{
+	EelCanvasItem *item;
+	double x1, y1, x2, y2;
+	int cx1, cy1, cx2, cy2;
+	double hwidth;
+
+#ifdef VERBOSE
+	g_print ("re get_bounds\n");
+#endif
+	item = EEL_CANVAS_ITEM (re);
+
+	if (re->width_pixels)
+		hwidth = (re->width / item->canvas->pixels_per_unit) / 2.0;
+	else
+		hwidth = re->width / 2.0;
+
+	x1 = re->x1;
+	y1 = re->y1;
+	x2 = re->x2;
+	y2 = re->y2;
+
+	eel_canvas_item_i2w (item, &x1, &y1);
+	eel_canvas_item_i2w (item, &x2, &y2);
+	eel_canvas_w2c (item->canvas, x1 - hwidth, y1 - hwidth, &cx1, &cy1);
+	eel_canvas_w2c (item->canvas, x2 + hwidth, y2 + hwidth, &cx2, &cy2);
+	*px1 = cx1;
+	*py1 = cy1;
+	*px2 = cx2;
+	*py2 = cy2;
+
+	/* Some safety fudging */
+
+	*px1 -= 2;
+	*py1 -= 2;
+	*px2 += 2;
+	*py2 += 2;
+}
+
+/* Convenience function to set a GC's foreground color to the specified pixel value */
+static void
+set_gc_foreground (GdkGC *gc, gulong pixel)
+{
+	GdkColor c;
+
+	if (!gc)
+		return;
+
+	c.pixel = pixel;
+	gdk_gc_set_foreground (gc, &c);
+}
+
+/* Sets the stipple pattern for the specified gc */
+static void
+set_stipple (GdkGC *gc, GdkBitmap **internal_stipple, GdkBitmap *stipple, int reconfigure)
+{
+	if (*internal_stipple && !reconfigure)
+		g_object_unref (*internal_stipple);
+
+	*internal_stipple = stipple;
+	if (stipple && !reconfigure)
+		g_object_ref (stipple);
+
+	if (gc) {
+		if (stipple) {
+			gdk_gc_set_stipple (gc, stipple);
+			gdk_gc_set_fill (gc, GDK_STIPPLED);
+		} else
+			gdk_gc_set_fill (gc, GDK_SOLID);
+	}
+}
+
+/* Recalculate the outline width of the rectangle/ellipse and set it in its GC */
+static void
+set_outline_gc_width (EelCanvasRE *re)
+{
+	int width;
+
+	if (!re->outline_gc)
+		return;
+
+	if (re->width_pixels)
+		width = (int) re->width;
+	else
+		width = (int) (re->width * re->item.canvas->pixels_per_unit + 0.5);
+
+	gdk_gc_set_line_attributes (re->outline_gc, width,
+				    GDK_LINE_SOLID, GDK_CAP_PROJECTING, GDK_JOIN_MITER);
+}
+
+static void
+eel_canvas_re_set_fill (EelCanvasRE *re, gboolean fill_set)
+{
+	if (re->fill_set != fill_set) {
+		re->fill_set = fill_set;
+		eel_canvas_item_request_update (EEL_CANVAS_ITEM (re));
+	}
+}
+
+static void
+eel_canvas_re_set_outline (EelCanvasRE *re, gboolean outline_set)
+{
+	if (re->outline_set != outline_set) {
+		re->outline_set = outline_set;
+		eel_canvas_item_request_update (EEL_CANVAS_ITEM (re));
+	}
+}
+
+static void
+eel_canvas_re_set_property (GObject              *object,
+			      guint                 param_id,
+			      const GValue         *value,
+			      GParamSpec           *pspec)
+{
+	EelCanvasItem *item;
+	EelCanvasRE *re;
+	GdkColor color = { 0, 0, 0, 0, };
+	GdkColor *pcolor;
+	int have_pixel;
+
+	g_assert (object != NULL);
+	g_assert (EEL_IS_CANVAS_RE (object));
+
+	item = EEL_CANVAS_ITEM (object);
+	re = EEL_CANVAS_RE (object);
+	have_pixel = FALSE;
+
+	switch (param_id) {
+	case PROP_X1:
+		re->x1 = g_value_get_double (value);
+
+		eel_canvas_item_request_update (item);
+		break;
+
+	case PROP_Y1:
+		re->y1 = g_value_get_double (value);
+
+		eel_canvas_item_request_update (item);
+		break;
+
+	case PROP_X2:
+		re->x2 = g_value_get_double (value);
+
+		eel_canvas_item_request_update (item);
+		break;
+
+	case PROP_Y2:
+		re->y2 = g_value_get_double (value);
+
+		eel_canvas_item_request_update (item);
+		break;
+
+	case PROP_FILL_COLOR:
+	case PROP_FILL_COLOR_GDK:
+	case PROP_FILL_COLOR_RGBA:
+		switch (param_id) {
+		case PROP_FILL_COLOR:
+			if (g_value_get_string (value) &&
+			    gdk_color_parse (g_value_get_string (value), &color))
+				eel_canvas_re_set_fill (re, TRUE);
+			else
+				eel_canvas_re_set_fill (re, FALSE);
+
+			re->fill_color = ((color.red & 0xff00) << 16 |
+					  (color.green & 0xff00) << 8 |
+					  (color.blue & 0xff00) |
+					  0xff);
+			break;
+
+		case PROP_FILL_COLOR_GDK:
+			pcolor = g_value_get_boxed (value);
+			eel_canvas_re_set_fill (re, pcolor != NULL);
+
+			if (pcolor) {
+				GdkColormap *colormap;
+
+				color = *pcolor;
+				colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
+				gdk_rgb_find_color (colormap, &color);
+				have_pixel = TRUE;
+			}
+
+			re->fill_color = ((color.red & 0xff00) << 16 |
+					  (color.green & 0xff00) << 8 |
+					  (color.blue & 0xff00) |
+					  0xff);
+			break;
+
+		case PROP_FILL_COLOR_RGBA:
+			eel_canvas_re_set_fill (re, TRUE);
+			re->fill_color = g_value_get_uint (value);
+			break;
+		}
+#ifdef VERBOSE
+		g_print ("re fill color = %08x\n", re->fill_color);
+#endif
+		if (have_pixel)
+			re->fill_pixel = color.pixel;
+		else
+			re->fill_pixel = eel_canvas_get_color_pixel (item->canvas, re->fill_color);
+
+		set_gc_foreground (re->fill_gc, re->fill_pixel);
+
+		eel_canvas_item_request_redraw (item);		
+		break;
+
+	case PROP_OUTLINE_COLOR:
+	case PROP_OUTLINE_COLOR_GDK:
+	case PROP_OUTLINE_COLOR_RGBA:
+		switch (param_id) {
+		case PROP_OUTLINE_COLOR:
+			if (g_value_get_string (value) &&
+			    gdk_color_parse (g_value_get_string (value), &color))
+				eel_canvas_re_set_outline (re, TRUE);
+			else
+				eel_canvas_re_set_outline (re, FALSE);
+
+			re->outline_color = ((color.red & 0xff00) << 16 |
+					     (color.green & 0xff00) << 8 |
+					     (color.blue & 0xff00) |
+					     0xff);
+			break;
+
+		case PROP_OUTLINE_COLOR_GDK:
+			pcolor = g_value_get_boxed (value);
+			eel_canvas_re_set_outline (re, pcolor != NULL);
+
+			if (pcolor) {
+				GdkColormap *colormap;
+
+				color = *pcolor;
+				colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
+				gdk_rgb_find_color (colormap, &color);
+
+				have_pixel = TRUE;
+			}
+
+			re->outline_color = ((color.red & 0xff00) << 16 |
+					     (color.green & 0xff00) << 8 |
+					     (color.blue & 0xff00) |
+					     0xff);
+			break;
+
+		case PROP_OUTLINE_COLOR_RGBA:
+			eel_canvas_re_set_outline (re, TRUE);
+			re->outline_color = g_value_get_uint (value);
+			break;
+		}
+#ifdef VERBOSE
+		g_print ("re outline color %x %x %x\n", color.red, color.green, color.blue);
+#endif
+		if (have_pixel)
+			re->outline_pixel = color.pixel;
+		else
+			re->outline_pixel = eel_canvas_get_color_pixel (item->canvas,
+									  re->outline_color);
+
+		set_gc_foreground (re->outline_gc, re->outline_pixel);
+
+		eel_canvas_item_request_redraw (item);		
+		break;
+
+	case PROP_FILL_STIPPLE:
+	        set_stipple (re->fill_gc, &re->fill_stipple, (GdkBitmap *) g_value_get_object (value), FALSE);
+
+		break;
+
+	case PROP_OUTLINE_STIPPLE:
+	        set_stipple (re->outline_gc, &re->outline_stipple, (GdkBitmap *) g_value_get_object (value), FALSE);
+		break;
+
+	case PROP_WIDTH_PIXELS:
+		re->width = g_value_get_uint (value);
+		re->width_pixels = TRUE;
+		set_outline_gc_width (re);
+
+		eel_canvas_item_request_update (item);
+		break;
+
+	case PROP_WIDTH_UNITS:
+		re->width = fabs (g_value_get_double (value));
+		re->width_pixels = FALSE;
+		set_outline_gc_width (re);
+
+		eel_canvas_item_request_update (item);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+		break;
+	}
+}
+
+/* Allocates a GdkColor structure filled with the specified pixel, and puts it into the specified
+ * value for returning it in the get_property method.
+ */
+static void
+get_color_value (EelCanvasRE *re, gulong pixel, GValue *value)
+{
+	GdkColor color;
+	EelCanvasItem *item = (EelCanvasItem *) re;
+	GdkColormap *colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
+
+	gdk_colormap_query_color (colormap, pixel, &color);
+	g_value_set_boxed (value, &color);
+}
+
+static void
+eel_canvas_re_get_property (GObject              *object,
+			      guint                 param_id,
+			      GValue               *value,
+			      GParamSpec           *pspec)
+{
+	EelCanvasRE *re;
+
+	g_assert (object != NULL);
+	g_assert (EEL_IS_CANVAS_RE (object));
+
+	re = EEL_CANVAS_RE (object);
+
+	switch (param_id) {
+	case PROP_X1:
+		g_value_set_double (value,  re->x1);
+		break;
+
+	case PROP_Y1:
+		g_value_set_double (value,  re->y1);
+		break;
+
+	case PROP_X2:
+		g_value_set_double (value,  re->x2);
+		break;
+
+	case PROP_Y2:
+		g_value_set_double (value,  re->y2);
+		break;
+
+	case PROP_FILL_COLOR_GDK:
+		get_color_value (re, re->fill_pixel, value);
+		break;
+
+	case PROP_OUTLINE_COLOR_GDK:
+		get_color_value (re, re->outline_pixel, value);
+		break;
+
+	case PROP_FILL_COLOR_RGBA:
+		g_value_set_uint (value,  re->fill_color);
+		break;
+
+	case PROP_OUTLINE_COLOR_RGBA:
+		g_value_set_uint (value,  re->outline_color);
+		break;
+
+	case PROP_FILL_STIPPLE:
+		g_value_set_object (value,  (GObject *) re->fill_stipple);
+		break;
+
+	case PROP_OUTLINE_STIPPLE:
+		g_value_set_object (value,  (GObject *) re->outline_stipple);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+		break;
+	}
+}
+
+static void
+set_colors_and_stipples (EelCanvasRE *re)
+{
+	set_gc_foreground (re->fill_gc, re->fill_pixel);
+	set_gc_foreground (re->outline_gc, re->outline_pixel);
+	set_stipple (re->fill_gc, &re->fill_stipple, re->fill_stipple, TRUE);
+	set_stipple (re->outline_gc, &re->outline_stipple, re->outline_stipple, TRUE);
+	set_outline_gc_width (re);
+}
+
+static void
+eel_canvas_re_update_shared (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags)
+{
+	EelCanvasRE *re;
+
+#ifdef VERBOSE
+	g_print ("eel_canvas_re_update_shared\n");
+#endif
+	re = EEL_CANVAS_RE (item);
+
+	if (re_parent_class->update)
+		(* re_parent_class->update) (item, i2w_dx, i2w_dy, flags);
+
+	set_colors_and_stipples (re);
+
+#ifdef OLD_XFORM
+	recalc_bounds (re);
+#endif
+}
+
+static void
+eel_canvas_re_realize (EelCanvasItem *item)
+{
+	EelCanvasRE *re;
+
+#ifdef VERBOSE
+	g_print ("eel_canvas_re_realize\n");
+#endif
+	re = EEL_CANVAS_RE (item);
+
+	if (re_parent_class->realize)
+		(* re_parent_class->realize) (item);
+
+	re->fill_gc = gdk_gc_new (item->canvas->layout.bin_window);
+	re->fill_pixel = eel_canvas_get_color_pixel (item->canvas, re->fill_color);
+	re->outline_gc = gdk_gc_new (item->canvas->layout.bin_window);
+	re->outline_pixel = eel_canvas_get_color_pixel (item->canvas, re->outline_color);
+	set_colors_and_stipples (re);
+
+#ifdef OLD_XFORM
+	(* EEL_CANVAS_ITEM_CLASS (item->object.klass)->update) (item, NULL, NULL, 0);
+#endif
+}
+
+static void
+eel_canvas_re_unrealize (EelCanvasItem *item)
+{
+	EelCanvasRE *re;
+
+	re = EEL_CANVAS_RE (item);
+
+	g_object_unref (re->fill_gc);
+	re->fill_gc = NULL;
+	g_object_unref (re->outline_gc);
+	re->outline_gc = NULL;
+
+	if (re_parent_class->unrealize)
+		(* re_parent_class->unrealize) (item);
+}
+
+static void
+eel_canvas_re_translate (EelCanvasItem *item, double dx, double dy)
+{
+	EelCanvasRE *re;
+
+#ifdef VERBOSE
+	g_print ("eel_canvas_re_translate\n");
+#endif
+	re = EEL_CANVAS_RE (item);
+
+	re->x1 += dx;
+	re->y1 += dy;
+	re->x2 += dx;
+	re->y2 += dy;
+}
+
+
+static void
+eel_canvas_re_bounds (EelCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
+{
+	EelCanvasRE *re;
+	double hwidth;
+
+#ifdef VERBOSE
+	g_print ("eel_canvas_re_bounds\n");
+#endif
+	re = EEL_CANVAS_RE (item);
+
+	if (re->width_pixels)
+		hwidth = (re->width / item->canvas->pixels_per_unit) / 2.0;
+	else
+		hwidth = re->width / 2.0;
+
+	*x1 = re->x1 - hwidth;
+	*y1 = re->y1 - hwidth;
+	*x2 = re->x2 + hwidth;
+	*y2 = re->y2 + hwidth;
+}
+
+/* Rectangle item */
+
+
+static void eel_canvas_rect_class_init (EelCanvasRectClass *class);
+static void eel_canvas_rect_init (EelCanvasRect *rect);
+static void eel_canvas_rect_finalize (GObject *object);
+static void eel_canvas_rect_realize  (EelCanvasItem *item);
+
+static void   eel_canvas_rect_draw   (EelCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose);
+static double eel_canvas_rect_point  (EelCanvasItem *item, double x, double y, int cx, int cy,
+				        EelCanvasItem **actual_item);
+
+struct _EelCanvasRectPrivate {
+	Rect last_update_rect;
+	Rect last_outline_update_rect;
+	int last_outline_update_width;
+
+#ifdef HAVE_RENDER
+	gboolean use_render;
+	XRenderPictFormat *format;
+#endif
+};
+
+GType
+eel_canvas_rect_get_type (void)
+{
+	static GType rect_type = 0;
+
+	if (!rect_type) {
+		GTypeInfo rect_info = {
+		  sizeof (EelCanvasRectClass),
+		  (GBaseInitFunc) NULL,
+		  (GBaseFinalizeFunc) NULL,
+		  (GClassInitFunc) eel_canvas_rect_class_init,
+		  NULL,           /* class_finalize */
+		  NULL,           /* class_data */
+		  sizeof (EelCanvasRect),
+		  0,              /* n_preallocs */
+		  (GInstanceInitFunc) eel_canvas_rect_init
+		};
+
+		rect_type = g_type_register_static (eel_canvas_re_get_type (),
+						    "EelCanvasRect",
+						    &rect_info,
+						    0);
+	}
+
+	return rect_type;
+}
+
+static void
+eel_canvas_rect_class_init (EelCanvasRectClass *class)
+{
+	EelCanvasItemClass *item_class;
+
+	rect_parent_class = g_type_class_peek_parent (class);
+
+	item_class = (EelCanvasItemClass *) class;
+
+	item_class->draw = eel_canvas_rect_draw;
+	item_class->point = eel_canvas_rect_point;
+	item_class->update = eel_canvas_rect_update;
+	item_class->realize = eel_canvas_rect_realize;
+
+	G_OBJECT_CLASS (class)->finalize = eel_canvas_rect_finalize;
+	
+}
+
+static void
+eel_canvas_rect_init (EelCanvasRect *rect)
+{
+	rect->priv = g_new0 (EelCanvasRectPrivate, 1);
+}
+
+static void
+eel_canvas_rect_finalize (GObject *object)
+{
+	EelCanvasRect *rect = EEL_CANVAS_RECT (object);
+
+	if (rect->priv) {
+		g_free (rect->priv);
+	}
+
+	G_OBJECT_CLASS (rect_parent_class)->finalize (object);
+}
+
+static void
+eel_canvas_rect_realize  (EelCanvasItem *item)
+{
+#ifdef HAVE_RENDER
+	EelCanvasRectPrivate *priv;
+	int event_base, error_base;
+
+	priv = EEL_CANVAS_RECT (item)->priv;
+
+	priv->use_render = XRenderQueryExtension (gdk_display, &event_base, &error_base);
+
+	if (priv->use_render) {
+		Display *dpy;
+		GdkVisual *gdk_visual;
+		Visual *visual;
+
+		dpy = gdk_x11_drawable_get_xdisplay (GTK_WIDGET (item->canvas)->window);
+		gdk_visual = gtk_widget_get_visual (GTK_WIDGET (item->canvas));
+		visual = gdk_x11_visual_get_xvisual (gdk_visual);
+
+		priv->format = XRenderFindVisualFormat (dpy, visual);
+	}
+#endif
+	
+	if (EEL_CANVAS_ITEM_CLASS (rect_parent_class)->realize) {
+		(* EEL_CANVAS_ITEM_CLASS (rect_parent_class)->realize) (item);
+	}
+}
+
+
+static void
+render_rect_alpha (EelCanvasRect *rect,
+		   GdkDrawable *drawable,
+		   int x, int y,
+		   int width, int height,
+		   guint32 rgba)
+{
+	GdkPixbuf *pixbuf;
+	guchar *data;
+	int rowstride, i;
+	guchar r, g, b, a;
+	EelCanvasRectPrivate *priv;
+
+	if (width <= 0 || height <= 0 ) {
+		return;
+	}
+	
+	priv = rect->priv;
+
+	r = (rgba >> 24) & 0xff;
+	g = (rgba >> 16) & 0xff;
+	b = (rgba >> 8) & 0xff;
+	a = (rgba >> 0) & 0xff;
+
+#ifdef HAVE_RENDER
+	/* Every visual is not guaranteed to have a matching
+	 * XRenderPictFormat. So make sure that format is not null before
+	 * trying to render using Xrender calls.
+	 */
+	if (priv->use_render && (priv->format != NULL)) {
+		GdkDrawable *real_drawable;
+		int x_offset, y_offset;
+
+		Display *dpy;
+		Picture  pict;
+		XRenderPictureAttributes attributes;
+		XRenderColor color;
+
+		gdk_window_get_internal_paint_info (drawable, &real_drawable,
+						    &x_offset, &y_offset);
+
+		dpy = gdk_x11_drawable_get_xdisplay (real_drawable);
+
+		pict = XRenderCreatePicture (dpy,
+					     gdk_x11_drawable_get_xid (real_drawable),
+					     priv->format,
+					     0,
+					     &attributes);
+
+
+		/* Convert to premultiplied alpha: */
+		r = r * a / 255;
+		g = g * a / 255;
+		b = b * a / 255;
+		
+		color.red = (r << 8) + r;
+		color.green = (g << 8) + g;
+		color.blue = (b << 8) + b;
+		color.alpha = (a << 8) + a;
+		
+		XRenderFillRectangle (dpy,
+				      PictOpOver,
+				      pict,
+				      &color,
+				      x - x_offset, y - y_offset,
+				      width, height);
+		
+		XRenderFreePicture (dpy, pict);
+
+		return;
+	}
+#endif
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
+	data = gdk_pixbuf_get_pixels (pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	
+	r = (rgba >> 24) & 0xff;
+	g = (rgba >> 16) & 0xff;
+	b = (rgba >> 8) & 0xff;
+	a = (rgba >> 0) & 0xff;
+	
+	for (i = 0; i < width*4; ) {
+		data[i++] = r;
+		data[i++] = g;
+		data[i++] = b;
+		data[i++] = a;
+	}
+	
+	for (i = 1; i < height; i++) {
+		memcpy (data + i*rowstride, data, width*4);
+	}
+	
+	gdk_draw_pixbuf (drawable, NULL, pixbuf,
+			 0, 0, x, y, width, height,
+			 GDK_RGB_DITHER_NONE, 0, 0);
+	g_object_unref (pixbuf);
+}
+
+
+static void
+eel_canvas_rect_draw (EelCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose)
+{
+	EelCanvasRE *re;
+	double x1, y1, x2, y2;
+	int cx1, cy1, cx2, cy2;
+	double i2w_dx, i2w_dy;
+
+	re = EEL_CANVAS_RE (item);
+
+	/* Get canvas pixel coordinates */
+	i2w_dx = 0.0;
+	i2w_dy = 0.0;
+	eel_canvas_item_i2w (item, &i2w_dx, &i2w_dy);
+	
+	x1 = re->x1 + i2w_dx;
+	y1 = re->y1 + i2w_dy;
+	x2 = re->x2 + i2w_dx;
+	y2 = re->y2 + i2w_dy;
+
+	eel_canvas_w2c (item->canvas, x1, y1, &cx1, &cy1);
+	eel_canvas_w2c (item->canvas, x2, y2, &cx2, &cy2);
+	
+	if (re->fill_set) {
+		if ((re->fill_color & 0xff) != 255) {
+			GdkRectangle *rectangles;
+			gint i, n_rectangles;
+			GdkRectangle draw_rect;
+			GdkRectangle part;
+
+			draw_rect.x = cx1;
+			draw_rect.y = cy1;
+			draw_rect.width = cx2 - cx1 + 1;
+			draw_rect.height = cy2 - cy1 + 1;
+			
+			/* For alpha mode, only render the parts of the region
+			   that are actually exposed */
+			gdk_region_get_rectangles (expose->region,
+						   &rectangles,
+						   &n_rectangles);
+
+			for (i = 0; i < n_rectangles; i++) {
+				if (gdk_rectangle_intersect (&rectangles[i],
+							     &draw_rect,
+							     &part)) {
+					render_rect_alpha (EEL_CANVAS_RECT (item),
+							   drawable,
+							   part.x, part.y,
+							   part.width, part.height,
+							   re->fill_color);
+				}
+			}
+			
+			g_free (rectangles);
+		} else {
+			if (re->fill_stipple)
+				eel_canvas_set_stipple_origin (item->canvas, re->fill_gc);
+
+			gdk_draw_rectangle (drawable,
+					    re->fill_gc,
+					    TRUE,
+					    cx1, cy1,
+					    cx2 - cx1 + 1,
+					    cy2 - cy1 + 1);
+		}
+	}
+
+	if (re->outline_set) {
+		if (re->outline_stipple)
+			eel_canvas_set_stipple_origin (item->canvas, re->outline_gc);
+
+		gdk_draw_rectangle (drawable,
+				    re->outline_gc,
+				    FALSE,
+				    cx1,
+				    cy1,
+				    cx2 - cx1,
+				    cy2 - cy1);
+	}
+}
+
+static double
+eel_canvas_rect_point (EelCanvasItem *item, double x, double y, int cx, int cy, EelCanvasItem **actual_item)
+{
+	EelCanvasRE *re;
+	double x1, y1, x2, y2;
+	double hwidth;
+	double dx, dy;
+	double tmp;
+
+#ifdef VERBOSE
+	g_print ("eel_canvas_rect_point\n");
+#endif
+	re = EEL_CANVAS_RE (item);
+
+	*actual_item = item;
+
+	/* Find the bounds for the rectangle plus its outline width */
+
+	x1 = re->x1;
+	y1 = re->y1;
+	x2 = re->x2;
+	y2 = re->y2;
+
+	if (re->outline_set) {
+		if (re->width_pixels)
+			hwidth = (re->width / item->canvas->pixels_per_unit) / 2.0;
+		else
+			hwidth = re->width / 2.0;
+
+		x1 -= hwidth;
+		y1 -= hwidth;
+		x2 += hwidth;
+		y2 += hwidth;
+	} else
+		hwidth = 0.0;
+
+	/* Is point inside rectangle (which can be hollow if it has no fill set)? */
+
+	if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) {
+		if (re->fill_set || !re->outline_set)
+			return 0.0;
+
+		dx = x - x1;
+		tmp = x2 - x;
+		if (tmp < dx)
+			dx = tmp;
+
+		dy = y - y1;
+		tmp = y2 - y;
+		if (tmp < dy)
+			dy = tmp;
+
+		if (dy < dx)
+			dx = dy;
+
+		dx -= 2.0 * hwidth;
+
+		if (dx < 0.0)
+			return 0.0;
+		else
+			return dx;
+	}
+
+	/* Point is outside rectangle */
+
+	if (x < x1)
+		dx = x1 - x;
+	else if (x > x2)
+		dx = x - x2;
+	else
+		dx = 0.0;
+
+	if (y < y1)
+		dy = y1 - y;
+	else if (y > y2)
+		dy = y - y2;
+	else
+		dy = 0.0;
+
+	return sqrt (dx * dx + dy * dy);
+}
+
+static void
+request_redraw_borders (EelCanvas *canvas,
+			Rect     *update_rect,
+			int     width)
+{
+	eel_canvas_request_redraw (canvas,
+				   update_rect->x0, update_rect->y0,
+				   update_rect->x1, update_rect->y0 + width);
+	eel_canvas_request_redraw (canvas,
+				   update_rect->x0, update_rect->y1-width,
+				   update_rect->x1, update_rect->y1);
+	eel_canvas_request_redraw (canvas,
+				   update_rect->x0,       update_rect->y0,
+				   update_rect->x0+width, update_rect->y1);
+	eel_canvas_request_redraw (canvas,
+				   update_rect->x1-width, update_rect->y0,
+				   update_rect->x1,       update_rect->y1);
+}
+
+
+static void
+eel_canvas_rect_update (EelCanvasItem *item, double i2w_dx, double i2w_dy, gint flags)
+{
+	EelCanvasRE *re;
+	double x1, y1, x2, y2;
+	int cx1, cy1, cx2, cy2;
+	int repaint_rects_count, i;
+	int width_pixels;
+	int width_lt, width_rb;
+	Rect update_rect, repaint_rects[4];
+	EelCanvasRectPrivate *priv;
+
+	eel_canvas_re_update_shared (item, i2w_dx, i2w_dy, flags);
+
+	re = EEL_CANVAS_RE (item);
+	priv = EEL_CANVAS_RECT (item)->priv;
+	
+	x1 = re->x1 + i2w_dx;
+	y1 = re->y1 + i2w_dy;
+	x2 = re->x2 + i2w_dx;
+	y2 = re->y2 + i2w_dy;
+
+	eel_canvas_w2c (item->canvas, x1, y1, &cx1, &cy1);
+	eel_canvas_w2c (item->canvas, x2, y2, &cx2, &cy2);
+
+	update_rect = make_rect (cx1, cy1, cx2+1, cy2+1);
+#if 0
+	eel_canvas_request_redraw (item->canvas,
+				   update_rect.x0, update_rect.y0,
+				   update_rect.x1, update_rect.y1);
+	eel_canvas_request_redraw (item->canvas,
+				   priv->last_update_rect.x0, priv->last_update_rect.y0,
+				   priv->last_update_rect.x1, priv->last_update_rect.y1);
+#else
+	diff_rects (update_rect, priv->last_update_rect,
+		    &repaint_rects_count, repaint_rects);
+	for (i = 0; i < repaint_rects_count; i++) {
+		eel_canvas_request_redraw (item->canvas,
+					   repaint_rects[i].x0, repaint_rects[i].y0,
+					   repaint_rects[i].x1, repaint_rects[i].y1);
+	}
+#endif
+	priv->last_update_rect = update_rect;
+
+	if (re->outline_set) {
+		/* Outline and bounding box */
+		if (re->width_pixels)
+			width_pixels = (int) re->width;
+		else
+			width_pixels = (int) floor (re->width * re->item.canvas->pixels_per_unit + 0.5);
+
+		width_lt = width_pixels / 2;
+		width_rb = (width_pixels + 1) / 2;
+		
+		cx1 -= width_lt;
+		cy1 -= width_lt;
+		cx2 += width_rb;
+		cy2 += width_rb;
+
+		update_rect = make_rect (cx1, cy1, cx2, cy2);
+		request_redraw_borders (item->canvas, &update_rect,
+					(width_lt + width_rb));
+		request_redraw_borders (item->canvas, &priv->last_outline_update_rect,
+					priv->last_outline_update_width);
+		priv->last_outline_update_rect = update_rect;
+		priv->last_outline_update_width = width_lt + width_rb;
+		
+		item->x1 = cx1;
+		item->y1 = cy1;
+		item->x2 = cx2+1;
+		item->y2 = cy2+1;
+	} else {
+		item->x1 = cx1;
+		item->y1 = cy1;
+		item->x2 = cx2+1;
+		item->y2 = cy2+1;
+	}
+}
+
+/* Ellipse item */
+
+
+static void eel_canvas_ellipse_class_init (EelCanvasEllipseClass *class);
+
+static void   eel_canvas_ellipse_draw   (EelCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose);
+static double eel_canvas_ellipse_point  (EelCanvasItem *item, double x, double y, int cx, int cy,
+					   EelCanvasItem **actual_item);
+
+
+GType
+eel_canvas_ellipse_get_type (void)
+{
+	static GType ellipse_type = 0;
+
+	if (!ellipse_type) {
+		GTypeInfo ellipse_info = {
+		  sizeof (EelCanvasEllipseClass),
+		  (GBaseInitFunc) NULL,
+		  (GBaseFinalizeFunc) NULL,
+		  (GClassInitFunc) eel_canvas_ellipse_class_init,
+		  NULL,           /* class_finalize */
+		  NULL,           /* class_data */
+		  sizeof (EelCanvasEllipse),
+		  0,              /* n_preallocs */
+		  (GInstanceInitFunc) NULL
+
+		};
+
+		ellipse_type = g_type_register_static (eel_canvas_re_get_type (),
+						       "EelCanvasEllipse",
+						       &ellipse_info,
+						       0);
+	}
+
+	return ellipse_type;
+}
+
+static void
+eel_canvas_ellipse_class_init (EelCanvasEllipseClass *class)
+{
+	EelCanvasItemClass *item_class;
+
+	item_class = (EelCanvasItemClass *) class;
+
+	item_class->draw = eel_canvas_ellipse_draw;
+	item_class->point = eel_canvas_ellipse_point;
+	item_class->update = eel_canvas_ellipse_update;
+}
+
+static void
+eel_canvas_ellipse_draw (EelCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose)
+{
+	EelCanvasRE *re;
+	int x1, y1, x2, y2;
+	double i2w_dx, i2w_dy;
+
+	re = EEL_CANVAS_RE (item);
+
+	/* Get canvas pixel coordinates */
+
+	i2w_dx = 0.0;
+	i2w_dy = 0.0;
+	eel_canvas_item_i2w (item, &i2w_dx, &i2w_dy);
+	
+	eel_canvas_w2c (item->canvas,
+			  re->x1 + i2w_dx,
+			  re->y1 + i2w_dy,
+			  &x1, &y1);
+	eel_canvas_w2c (item->canvas,
+			  re->x2 + i2w_dx,
+			  re->y2 + i2w_dy,
+			  &x2, &y2);
+
+	if (re->fill_set) {
+		if (re->fill_stipple)
+			eel_canvas_set_stipple_origin (item->canvas, re->fill_gc);
+
+		gdk_draw_arc (drawable,
+			      re->fill_gc,
+			      TRUE,
+			      x1,
+			      y1,
+			      x2 - x1,
+			      y2 - y1,
+			      0 * 64,
+			      360 * 64);
+	}
+
+	if (re->outline_set) {
+		if (re->outline_stipple)
+			eel_canvas_set_stipple_origin (item->canvas, re->outline_gc);
+
+		gdk_draw_arc (drawable,
+			      re->outline_gc,
+			      FALSE,
+			      x1,
+			      y1,
+			      x2 - x1,
+			      y2 - y1,
+			      0 * 64,
+			      360 * 64);
+	}
+}
+
+static double
+eel_canvas_ellipse_point (EelCanvasItem *item, double x, double y, int cx, int cy, EelCanvasItem **actual_item)
+{
+	EelCanvasRE *re;
+	double dx, dy;
+	double scaled_dist;
+	double outline_dist;
+	double center_dist;
+	double width;
+	double a, b;
+	double diamx, diamy;
+
+	re = EEL_CANVAS_RE (item);
+
+	*actual_item = item;
+
+	if (re->outline_set) {
+		if (re->width_pixels)
+			width = re->width / item->canvas->pixels_per_unit;
+		else
+			width = re->width;
+	} else
+		width = 0.0;
+
+	/* Compute the distance between the center of the ellipse and the point, with the ellipse
+	 * considered as being scaled to a circle.
+	 */
+
+	dx = x - (re->x1 + re->x2) / 2.0;
+	dy = y - (re->y1 + re->y2) / 2.0;
+	center_dist = sqrt (dx * dx + dy * dy);
+
+	a = dx / ((re->x2 + width - re->x1) / 2.0);
+	b = dy / ((re->y2 + width - re->y1) / 2.0);
+	scaled_dist = sqrt (a * a + b * b);
+
+	/* If the scaled distance is greater than 1, then we are outside.  Compute the distance from
+	 * the point to the edge of the circle, then scale back to the original un-scaled coordinate
+	 * system.
+	 */
+
+	if (scaled_dist > 1.0)
+		return (center_dist / scaled_dist) * (scaled_dist - 1.0);
+
+	/* We are inside the outer edge of the ellipse.  If it is filled, then we are "inside".
+	 * Otherwise, do the same computation as above, but also check whether we are inside the
+	 * outline.
+	 */
+
+	if (re->fill_set)
+		return 0.0;
+
+	if (scaled_dist > EEL_CANVAS_EPSILON)
+		outline_dist = (center_dist / scaled_dist) * (1.0 - scaled_dist) - width;
+	else {
+		/* Handle very small distance */
+
+		diamx = re->x2 - re->x1;
+		diamy = re->y2 - re->y1;
+
+		if (diamx < diamy)
+			outline_dist = (diamx - width) / 2.0;
+		else
+			outline_dist = (diamy - width) / 2.0;
+	}
+
+	if (outline_dist < 0.0)
+		return 0.0;
+
+	return outline_dist;
+}
+
+static void
+eel_canvas_ellipse_update (EelCanvasItem *item, double i2w_dx, double i2w_dy, gint flags)
+{
+	EelCanvasRE *re;
+	double x0, y0, x1, y1;
+
+#ifdef VERBOSE
+	g_print ("eel_canvas_sllipse_update item %x\n", item);
+#endif
+
+	eel_canvas_re_update_shared (item, i2w_dx, i2w_dy, flags);
+	re = EEL_CANVAS_RE (item);
+
+	get_bounds (re, &x0, &y0, &x1, &y1);
+	eel_canvas_update_bbox (item, x0, y0, x1, y1);
+}
+
+static int
+rect_empty (const Rect *src) {
+  return (src->x1 <= src->x0 || src->y1 <= src->y0);
+}
+
+static Rect
+make_rect (int x0, int y0, int x1, int y1)
+{
+	Rect r;
+
+	r.x0 = x0;
+	r.y0 = y0;
+	r.x1 = x1;
+	r.y1 = y1;
+	return r;
+}
+
+static gboolean
+rects_intersect (Rect r1, Rect r2)
+{
+	if (r1.x0 >= r2.x1) {
+		return FALSE;
+	}
+	if (r2.x0 >= r1.x1) {
+		return FALSE;
+	}
+	if (r1.y0 >= r2.y1) {
+		return FALSE;
+	}
+	if (r2.y0 >= r1.y1) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static void
+diff_rects_guts (Rect ra, Rect rb, int *count, Rect result[4])
+{
+	if (ra.x0 < rb.x0) {
+		result[(*count)++] = make_rect (ra.x0, ra.y0, rb.x0, ra.y1);
+	}
+	if (ra.y0 < rb.y0) {
+		result[(*count)++] = make_rect (ra.x0, ra.y0, ra.x1, rb.y0);
+	}
+	if (ra.x1 < rb.x1) {
+		result[(*count)++] = make_rect (ra.x1, rb.y0, rb.x1, rb.y1);
+	}
+	if (ra.y1 < rb.y1) {
+		result[(*count)++] = make_rect (rb.x0, ra.y1, rb.x1, rb.y1);
+	}
+}
+
+static void
+diff_rects (Rect r1, Rect r2, int *count, Rect result[4])
+{
+	g_assert (count != NULL);
+	g_assert (result != NULL);
+
+	*count = 0;
+
+	if (rects_intersect (r1, r2)) {
+		diff_rects_guts (r1, r2, count, result);
+		diff_rects_guts (r2, r1, count, result);
+	} else {
+		if (!rect_empty (&r1)) {
+			result[(*count)++] = r1;
+		}
+		if (!rect_empty (&r2)) {
+			result[(*count)++] = r2;
+		}
+	}
+}
diff --git a/eel/eel-canvas-rect-ellipse.h b/eel/eel-canvas-rect-ellipse.h
new file mode 100644
index 000000000..6535ddd73
--- /dev/null
+++ b/eel/eel-canvas-rect-ellipse.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+/* Rectangle and ellipse item types for EelCanvas widget
+ *
+ * EelCanvas is basically a port of the Tk toolkit's most excellent canvas widget.  Tk is
+ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties.
+ *
+ *
+ * Author: Federico Mena <federico@nuclecu.unam.mx>
+ */
+
+#ifndef EEL_CANVAS_RECT_ELLIPSE_H
+#define EEL_CANVAS_RECT_ELLIPSE_H
+
+
+#include <eel/eel-canvas.h>
+
+G_BEGIN_DECLS
+
+
+/* Base class for rectangle and ellipse item types.  These are defined by their top-left and
+ * bottom-right corners.  Rectangles and ellipses share the following arguments:
+ *
+ * name			type		read/write	description
+ * ------------------------------------------------------------------------------------------
+ * x1			double		RW		Leftmost coordinate of rectangle or ellipse
+ * y1			double		RW		Topmost coordinate of rectangle or ellipse
+ * x2			double		RW		Rightmost coordinate of rectangle or ellipse
+ * y2			double		RW		Bottommost coordinate of rectangle or ellipse
+ * fill_color		string		W		X color specification for fill color,
+ *							or NULL pointer for no color (transparent)
+ * fill_color_gdk	GdkColor*	RW		Allocated GdkColor for fill
+ * outline_color	string		W		X color specification for outline color,
+ *							or NULL pointer for no color (transparent)
+ * outline_color_gdk	GdkColor*	RW		Allocated GdkColor for outline
+ * fill_stipple		GdkBitmap*	RW		Stipple pattern for fill
+ * outline_stipple	GdkBitmap*	RW		Stipple pattern for outline
+ * width_pixels		uint		RW		Width of the outline in pixels.  The outline will
+ *							not be scaled when the canvas zoom factor is changed.
+ * width_units		double		RW		Width of the outline in canvas units.  The outline
+ *							will be scaled when the canvas zoom factor is changed.
+ */
+
+
+#define EEL_TYPE_CANVAS_RE            (eel_canvas_re_get_type ())
+#define EEL_CANVAS_RE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_RE, EelCanvasRE))
+#define EEL_CANVAS_RE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RE, EelCanvasREClass))
+#define EEL_IS_CANVAS_RE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_RE))
+#define EEL_IS_CANVAS_RE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_RE))
+#define EEL_CANVAS_RE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_RE, EelCanvasREClass))
+
+
+typedef struct _EelCanvasRE      EelCanvasRE;
+typedef struct _EelCanvasREClass EelCanvasREClass;
+
+struct _EelCanvasRE {
+	EelCanvasItem item;
+
+	GdkBitmap *fill_stipple;	/* Stipple for fill */
+	GdkBitmap *outline_stipple;	/* Stipple for outline */
+
+	GdkGC *fill_gc;			/* GC for filling */
+	GdkGC *outline_gc;		/* GC for outline */
+
+	gulong fill_pixel;		/* Fill color */
+	gulong outline_pixel;		/* Outline color */
+
+	double x1, y1, x2, y2;		/* Corners of item */
+	double width;			/* Outline width */
+
+	guint fill_color;		/* Fill color, RGBA */
+	guint outline_color;		/* Outline color, RGBA */
+
+	/* Configuration flags */
+
+	unsigned int fill_set : 1;	/* Is fill color set? */
+	unsigned int outline_set : 1;	/* Is outline color set? */
+	unsigned int width_pixels : 1;	/* Is outline width specified in pixels or units? */
+};
+
+struct _EelCanvasREClass {
+	EelCanvasItemClass parent_class;
+};
+
+
+/* Standard Gtk function */
+GType eel_canvas_re_get_type (void) G_GNUC_CONST;
+
+
+/* Rectangle item.  No configurable or queryable arguments are available (use those in
+ * EelCanvasRE).
+ */
+
+
+#define EEL_TYPE_CANVAS_RECT            (eel_canvas_rect_get_type ())
+#define EEL_CANVAS_RECT(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRect))
+#define EEL_CANVAS_RECT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass))
+#define EEL_IS_CANVAS_RECT(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_RECT))
+#define EEL_IS_CANVAS_RECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_RECT))
+#define EEL_CANVAS_RECT_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass))
+
+
+typedef struct _EelCanvasRect EelCanvasRect;
+typedef struct _EelCanvasRectPrivate EelCanvasRectPrivate;
+typedef struct _EelCanvasRectClass EelCanvasRectClass;
+
+struct _EelCanvasRect {
+	EelCanvasRE re;
+	EelCanvasRectPrivate *priv;
+};
+
+struct _EelCanvasRectClass {
+	EelCanvasREClass parent_class;
+};
+
+
+/* Standard Gtk function */
+GType eel_canvas_rect_get_type (void) G_GNUC_CONST;
+
+
+/* Ellipse item.  No configurable or queryable arguments are available (use those in
+ * EelCanvasRE).
+ */
+
+
+#define EEL_TYPE_CANVAS_ELLIPSE            (eel_canvas_ellipse_get_type ())
+#define EEL_CANVAS_ELLIPSE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipse))
+#define EEL_CANVAS_ELLIPSE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipseClass))
+#define EEL_IS_CANVAS_ELLIPSE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_ELLIPSE))
+#define EEL_IS_CANVAS_ELLIPSE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_ELLIPSE))
+#define EEL_CANVAS_ELLIPSE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipseClass))
+
+
+typedef struct _EelCanvasEllipse EelCanvasEllipse;
+typedef struct _EelCanvasEllipseClass EelCanvasEllipseClass;
+
+struct _EelCanvasEllipse {
+	EelCanvasRE re;
+};
+
+struct _EelCanvasEllipseClass {
+	EelCanvasREClass parent_class;
+};
+
+
+/* Standard Gtk function */
+GType eel_canvas_ellipse_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif
diff --git a/eel/eel-canvas-util.c b/eel/eel-canvas-util.c
new file mode 100644
index 000000000..724af7670
--- /dev/null
+++ b/eel/eel-canvas-util.c
@@ -0,0 +1,396 @@
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+/* Miscellaneous utility functions for the EelCanvas widget
+ *
+ * EelCanvas is basically a port of the Tk toolkit's most excellent canvas widget.  Tk is
+ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties.
+ *
+ *
+ * Author: Federico Mena <federico@nuclecu.unam.mx>
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <glib.h>
+#include <math.h>
+#include "eel-canvas.h"
+#include "eel-canvas-util.h"
+
+/*
+ * Ok, so some systems require magic incantations for M_PI to be defined.
+ * It's not important enough to worry about.
+ */
+#ifndef M_PI
+#define M_PI 3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117
+#endif
+
+/**
+ * eel_canvas_points_new:
+ * @num_points: The number of points to allocate space for in the array.
+ * 
+ * Creates a structure that should be used to pass an array of points to
+ * items.
+ * 
+ * Return value: A newly-created array of points.  It should be filled in
+ * by the user.
+ **/
+EelCanvasPoints *
+eel_canvas_points_new (int num_points)
+{
+	EelCanvasPoints *points;
+
+	g_return_val_if_fail (num_points > 1, NULL);
+
+	points = g_new (EelCanvasPoints, 1);
+	points->num_points = num_points;
+	points->coords = g_new (double, 2 * num_points);
+	points->ref_count = 1;
+
+	return points;
+}
+
+/**
+ * eel_canvas_points_ref:
+ * @points: A canvas points structure.
+ * 
+ * Increases the reference count of the specified points structure.
+ * 
+ * Return value: The canvas points structure itself.
+ **/
+EelCanvasPoints *
+eel_canvas_points_ref (EelCanvasPoints *points)
+{
+	g_return_val_if_fail (points != NULL, NULL);
+
+	points->ref_count += 1;
+	return points;
+}
+
+/**
+ * eel_canvas_points_free:
+ * @points: A canvas points structure.
+ * 
+ * Decreases the reference count of the specified points structure.  If it
+ * reaches zero, then the structure is freed.
+ **/
+void
+eel_canvas_points_free (EelCanvasPoints *points)
+{
+	g_return_if_fail (points != NULL);
+
+	points->ref_count -= 1;
+	if (points->ref_count == 0) {
+		g_free (points->coords);
+		g_free (points);
+	}
+}
+
+/**
+ * eel_canvas_get_miter_points:
+ * @x1: X coordinate of the first point
+ * @y1: Y coordinate of the first point
+ * @x2: X coordinate of the second (angle) point
+ * @y2: Y coordinate of the second (angle) point
+ * @x3: X coordinate of the third point
+ * @y3: Y coordinate of the third point
+ * @width: Width of the line
+ * @mx1: The X coordinate of the first miter point is returned here.
+ * @my1: The Y coordinate of the first miter point is returned here.
+ * @mx2: The X coordinate of the second miter point is returned here.
+ * @my2: The Y coordinate of the second miter point is returned here.
+ * 
+ * Given three points forming an angle, computes the coordinates of the inside
+ * and outside points of the mitered corner formed by a line of a given width at
+ * that angle.
+ * 
+ * Return value: FALSE if the angle is less than 11 degrees (this is the same
+ * threshold as X uses.  If this occurs, the return points are not modified.
+ * Otherwise, returns TRUE.
+ **/
+int
+eel_canvas_get_miter_points (double x1, double y1, double x2, double y2, double x3, double y3,
+			     double width,
+			     double *mx1, double *my1, double *mx2, double *my2)
+{
+	double theta1;		/* angle of segment p2-p1 */
+	double theta2;		/* angle of segment p2-p3 */
+	double theta;		/* angle between line segments */
+	double theta3;		/* angle that bisects theta1 and theta2 and points to p1 */
+	double dist;		/* distance of miter points from p2 */
+	double dx, dy;		/* x and y offsets corresponding to dist */
+
+	double ELEVEN_DEGREES = 11.0 * M_PI / 180.0;
+
+	/* Degenerate cases.  */
+	if ((x1 == x2 && y1 == y2) || (x2 == x3 && y2 == y3))
+		return FALSE;
+
+	theta1 = atan2 (y1 - y2, x1 - x2);
+	theta2 = atan2 (y3 - y2, x3 - x2);
+	theta = theta1 - theta2;
+
+	/* Normalize to (-pi; pi].  */
+	if (theta > M_PI)
+		theta -= 2.0 * M_PI;
+	else if (theta <= -M_PI)
+		theta += 2.0 * M_PI;
+
+	if (fabs (theta) < ELEVEN_DEGREES)
+		return FALSE;
+
+	dist = fabs (0.5 * width / sin (0.5 * theta));
+
+	theta3 = (theta1 + theta2) / 2.0;
+	if (sin (theta3 - theta1) > 0.0)
+		theta3 += M_PI;
+
+	dx = dist * cos (theta3);
+	dy = dist * sin (theta3);
+
+	*mx1 = x2 + dx;
+	*mx2 = x2 - dx;
+	*my1 = y2 + dy;
+	*my2 = y2 - dy;
+
+	return TRUE;
+}
+
+/**
+ * eel_canvas_get_butt_points:
+ * @x1: X coordinate of first point in the line
+ * @y1: Y cooordinate of first point in the line
+ * @x2: X coordinate of second point (endpoint) of the line
+ * @y2: Y coordinate of second point (endpoint) of the line
+ * @width: Width of the line
+ * @project: Whether the butt points should project out by width/2 distance
+ * @bx1: X coordinate of first butt point is returned here
+ * @by1: Y coordinate of first butt point is returned here
+ * @bx2: X coordinate of second butt point is returned here
+ * @by2: Y coordinate of second butt point is returned here
+ * 
+ * Computes the butt points of a line segment.
+ **/
+void
+eel_canvas_get_butt_points (double x1, double y1, double x2, double y2,
+			      double width, int project,
+			      double *bx1, double *by1, double *bx2, double *by2)
+{
+	double length;
+	double dx, dy;
+
+	width *= 0.5;
+	dx = x2 - x1;
+	dy = y2 - y1;
+	length = sqrt (dx * dx + dy * dy);
+
+	if (length < EEL_CANVAS_EPSILON) {
+		*bx1 = *bx2 = x2;
+		*by1 = *by2 = y2;
+	} else {
+		dx = -width * (y2 - y1) / length;
+		dy = width * (x2 - x1) / length;
+
+		*bx1 = x2 + dx;
+		*bx2 = x2 - dx;
+		*by1 = y2 + dy;
+		*by2 = y2 - dy;
+
+		if (project) {
+			*bx1 += dy;
+			*bx2 += dy;
+			*by1 -= dx;
+			*by2 -= dx;
+		}
+	}
+}
+
+/**
+ * eel_canvas_polygon_to_point:
+ * @poly: Vertices of the polygon.  X coordinates are in the even indices, and Y
+ * coordinates are in the odd indices
+ * @num_points: Number of points in the polygon
+ * @x: X coordinate of the point
+ * @y: Y coordinate of the point
+ * 
+ * Computes the distance between a point and a polygon.
+ * 
+ * Return value: The distance from the point to the polygon, or zero if the
+ * point is inside the polygon.
+ **/
+double
+eel_canvas_polygon_to_point (double *poly, int num_points, double x, double y)
+{
+	double best;
+	int intersections;
+	int i;
+	double *p;
+	double dx, dy;
+
+	/* Iterate through all the edges in the polygon, updating best and intersections.
+	 *
+	 * When computing intersections, include left X coordinate of line within its range, but not
+	 * Y coordinate.  Otherwise if the point lies exactly below a vertex we'll count it as two
+	 * intersections.
+	 */
+
+	best = 1.0e36;
+	intersections = 0;
+
+	for (i = num_points, p = poly; i > 1; i--, p += 2) {
+		double px, py, dist;
+
+		/* Compute the point on the current edge closest to the point and update the
+		 * intersection count.  This must be done separately for vertical edges, horizontal
+		 * edges, and others.
+		 */
+
+		if (p[2] == p[0]) {
+			/* Vertical edge */
+
+			px = p[0];
+
+			if (p[1] >= p[3]) {
+				py = MIN (p[1], y);
+				py = MAX (py, p[3]);
+			} else {
+				py = MIN (p[3], y);
+				py = MAX (py, p[1]);
+			}
+		} else if (p[3] == p[1]) {
+			/* Horizontal edge */
+
+			py = p[1];
+
+			if (p[0] >= p[2]) {
+				px = MIN (p[0], x);
+				px = MAX (px, p[2]);
+
+				if ((y < py) && (x < p[0]) && (x >= p[2]))
+					intersections++;
+			} else {
+				px = MIN (p[2], x);
+				px = MAX (px, p[0]);
+
+				if ((y < py) && (x < p[2]) && (x >= p[0]))
+					intersections++;
+			}
+		} else {
+			double m1, b1, m2, b2;
+			int lower;
+
+			/* Diagonal edge.  Convert the edge to a line equation (y = m1*x + b1), then
+			 * compute a line perpendicular to this edge but passing through the point,
+			 * (y = m2*x + b2).
+			 */
+
+			m1 = (p[3] - p[1]) / (p[2] - p[0]);
+			b1 = p[1] - m1 * p[0];
+
+			m2 = -1.0 / m1;
+			b2 = y - m2 * x;
+
+			px = (b2 - b1) / (m1 - m2);
+			py = m1 * px + b1;
+
+			if (p[0] > p[2]) {
+				if (px > p[0]) {
+					px = p[0];
+					py = p[1];
+				} else if (px < p[2]) {
+					px = p[2];
+					py = p[3];
+				}
+			} else {
+				if (px > p[2]) {
+					px = p[2];
+					py = p[3];
+				} else if (px < p[0]) {
+					px = p[0];
+					py = p[1];
+				}
+			}
+
+			lower = (m1 * x + b1) > y;
+
+			if (lower && (x >= MIN (p[0], p[2])) && (x < MAX (p[0], p[2])))
+				intersections++;
+		}
+
+		/* Compute the distance to the closest point, and see if that is the best so far */
+
+		dx = x - px;
+		dy = y - py;
+		dist = sqrt (dx * dx + dy * dy);
+		if (dist < best)
+			best = dist;
+	}
+
+	/* We've processed all the points.  If the number of intersections is odd, the point is
+	 * inside the polygon.
+	 */
+
+	if (intersections & 0x1)
+		return 0.0;
+	else
+		return best;
+}
+
+/**
+ * eel_canvas_item_reset_bounds:
+ * @item: A canvas item
+ * 
+ * Resets the bounding box of a canvas item to an empty rectangle.
+ **/
+void
+eel_canvas_item_reset_bounds (EelCanvasItem *item)
+{
+	item->x1 = 0.0;
+	item->y1 = 0.0;
+	item->x2 = 0.0;
+	item->y2 = 0.0;
+}
+
+/**
+ * eel_canvas_update_bbox:
+ * @canvas: the canvas needing update
+ * @x1: Left coordinate of the new bounding box
+ * @y1: Top coordinate of the new bounding box
+ * @x2: Right coordinate of the new bounding box
+ * @y2: Bottom coordinate of the new bounding box
+ *
+ * Sets the bbox to the new value, requesting full repaint.
+ **/
+void
+eel_canvas_update_bbox (EelCanvasItem *item, int x1, int y1, int x2, int y2)
+{
+	eel_canvas_item_request_redraw (item);
+	item->x1 = x1;
+	item->y1 = y1;
+	item->x2 = x2;
+	item->y2 = y2;
+	eel_canvas_item_request_redraw (item);
+}
+
diff --git a/eel/eel-canvas-util.h b/eel/eel-canvas-util.h
new file mode 100644
index 000000000..d3bd7014d
--- /dev/null
+++ b/eel/eel-canvas-util.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+/* Miscellaneous utility functions for the EelCanvas widget
+ *
+ * EelCanvas is basically a port of the Tk toolkit's most excellent canvas widget.  Tk is
+ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties.
+ *
+ * Author: Federico Mena <federico@nuclecu.unam.mx>
+ */
+
+#ifndef EEL_CANVAS_UTIL_H
+#define EEL_CANVAS_UTIL_H
+
+
+G_BEGIN_DECLS
+
+
+/* This structure defines an array of points.  X coordinates are stored in the even-numbered
+ * indices, and Y coordinates are stored in the odd-numbered indices.  num_points indicates the
+ * number of points, so the array is 2*num_points elements big.
+ */
+typedef struct {
+	double *coords;
+	int num_points;
+	int ref_count;
+} EelCanvasPoints;
+
+
+/* Allocate a new EelCanvasPoints structure with enough space for the specified number of points */
+EelCanvasPoints *eel_canvas_points_new (int num_points);
+
+/* Increate ref count */
+EelCanvasPoints *eel_canvas_points_ref (EelCanvasPoints *points);
+#define eel_canvas_points_unref eel_canvas_points_free
+
+/* Decrease ref count and free structure if it has reached zero */
+void eel_canvas_points_free (EelCanvasPoints *points);
+
+/* Given three points forming an angle, compute the coordinates of the inside and outside points of
+ * the mitered corner formed by a line of a given width at that angle.
+ *
+ * If the angle is less than 11 degrees, then FALSE is returned and the return points are not
+ * modified.  Otherwise, TRUE is returned.
+ */
+int eel_canvas_get_miter_points (double x1, double y1, double x2, double y2, double x3, double y3,
+				   double width,
+				   double *mx1, double *my1, double *mx2, double *my2);
+
+/* Compute the butt points of a line segment.  If project is FALSE, then the results are as follows:
+ *
+ *            -------------------* (bx1, by1)
+ *                               |
+ *   (x1, y1) *------------------* (x2, y2)
+ *                               |
+ *            -------------------* (bx2, by2)
+ *
+ * that is, the line is not projected beyond (x2, y2).  If project is TRUE, then the results are as
+ * follows:
+ *
+ *            -------------------* (bx1, by1)
+ *                      (x2, y2) |
+ *   (x1, y1) *-------------*    |
+ *                               |
+ *            -------------------* (bx2, by2)
+ */
+void eel_canvas_get_butt_points (double x1, double y1, double x2, double y2,
+				   double width, int project,
+				   double *bx1, double *by1, double *bx2, double *by2);
+
+/* Calculate the distance from a polygon to a point.  The polygon's X coordinates are in the even
+ * indices of the poly array, and the Y coordinates are in the odd indices.
+ */
+double eel_canvas_polygon_to_point (double *poly, int num_points, double x, double y);
+
+
+void eel_canvas_item_reset_bounds (EelCanvasItem *item);
+
+/* Sets the bbox to the new value, requesting full repaint. */
+void eel_canvas_update_bbox (EelCanvasItem *item, int x1, int y1, int x2, int y2);
+
+G_END_DECLS
+
+#endif
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
new file mode 100644
index 000000000..15a20b93a
--- /dev/null
+++ b/eel/eel-canvas.c
@@ -0,0 +1,3979 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+/*
+ * EelCanvas widget - Tk-like canvas widget for Gnome
+ *
+ * EelCanvas is basically a port of the Tk toolkit's most excellent canvas widget.  Tk is
+ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties.
+ *
+ *
+ * Authors: Federico Mena <federico@nuclecu.unam.mx>
+ *          Raph Levien <raph@gimp.org>
+ */
+
+/*
+ * TO-DO list for the canvas:
+ *
+ * - Allow to specify whether EelCanvasImage sizes are in units or pixels (scale or don't scale).
+ *
+ * - Implement a flag for eel_canvas_item_reparent() that tells the function to keep the item
+ *   visually in the same place, that is, to keep it in the same place with respect to the canvas
+ *   origin.
+ *
+ * - GC put functions for items.
+ *
+ * - Widget item (finish it).
+ *
+ * - GList *eel_canvas_gimme_all_items_contained_in_this_area (EelCanvas *canvas, Rectangle area);
+ *
+ * - Retrofit all the primitive items with microtile support.
+ *
+ * - Curve support for line item.
+ *
+ * - Arc item (Havoc has it; to be integrated in EelCanvasEllipse).
+ *
+ * - Sane font handling API.
+ *
+ * - Get_arg methods for items:
+ *   - How to fetch the outline width and know whether it is in pixels or units?
+ */
+
+#include <config.h>
+
+#include <math.h>
+#include <string.h>
+#include <stdio.h>
+#include <gdk/gdkprivate.h>
+#include <gtk/gtk.h>
+#include "eel-canvas.h"
+#include "eel-i18n.h"
+
+#include "eel-marshal.h"
+
+static void eel_canvas_request_update (EelCanvas      *canvas);
+static void group_add                   (EelCanvasGroup *group,
+					 EelCanvasItem  *item);
+static void group_remove                (EelCanvasGroup *group,
+					 EelCanvasItem  *item);
+static void redraw_and_repick_if_mapped (EelCanvasItem *item);
+
+/*** EelCanvasItem ***/
+
+/* Some convenience stuff */
+#define GCI_UPDATE_MASK (EEL_CANVAS_UPDATE_REQUESTED | EEL_CANVAS_UPDATE_DEEP)
+#define GCI_EPSILON 1e-18
+
+enum {
+	ITEM_PROP_0,
+	ITEM_PROP_PARENT,
+	ITEM_PROP_VISIBLE
+};
+
+enum {
+	ITEM_EVENT,
+	ITEM_LAST_SIGNAL
+};
+
+static void eel_canvas_item_class_init     (EelCanvasItemClass *class);
+static void eel_canvas_item_init           (EelCanvasItem      *item);
+static int  emit_event                       (EelCanvas *canvas, GdkEvent *event);
+
+static guint item_signals[ITEM_LAST_SIGNAL];
+
+static GtkObjectClass *item_parent_class;
+
+static gpointer accessible_item_parent_class;
+static gpointer accessible_parent_class;
+
+
+/**
+ * eel_canvas_item_get_type:
+ *
+ * Registers the &EelCanvasItem class if necessary, and returns the type ID
+ * associated to it.
+ *
+ * Return value:  The type ID of the &EelCanvasItem class.
+ **/
+GType
+eel_canvas_item_get_type (void)
+{
+	static GType canvas_item_type = 0;
+
+	if (!canvas_item_type) {
+		const GTypeInfo canvas_item_info = {
+			sizeof (EelCanvasItemClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_canvas_item_class_init,
+			NULL,           /* class_finalize */
+			NULL,           /* class_data */
+			sizeof (EelCanvasItem),
+			0,              /* n_preallocs */
+			(GInstanceInitFunc) eel_canvas_item_init
+		};
+
+		canvas_item_type = g_type_register_static (gtk_object_get_type (),
+							   "EelCanvasItem",
+							   &canvas_item_info,
+							   0);
+	}
+
+	return canvas_item_type;
+}
+
+/* Object initialization function for EelCanvasItem */
+static void
+eel_canvas_item_init (EelCanvasItem *item)
+{
+	item->object.flags |= EEL_CANVAS_ITEM_VISIBLE;
+}
+
+/**
+ * eel_canvas_item_new:
+ * @parent: The parent group for the new item.
+ * @type: The object type of the item.
+ * @first_arg_name: A list of object argument name/value pairs, NULL-terminated,
+ * used to configure the item.  For example, "fill_color", "black",
+ * "width_units", 5.0, NULL.
+ * @Varargs:
+ *
+ * Creates a new canvas item with @parent as its parent group.  The item is
+ * created at the top of its parent's stack, and starts up as visible.  The item
+ * is of the specified @type, for example, it can be
+ * eel_canvas_rect_get_type().  The list of object arguments/value pairs is
+ * used to configure the item.
+ *
+ * Return value: The newly-created item.
+ **/
+EelCanvasItem *
+eel_canvas_item_new (EelCanvasGroup *parent, GType type, const gchar *first_arg_name, ...)
+{
+	EelCanvasItem *item;
+	va_list args;
+
+	g_return_val_if_fail (EEL_IS_CANVAS_GROUP (parent), NULL);
+	g_return_val_if_fail (g_type_is_a (type, eel_canvas_item_get_type ()), NULL);
+
+	item = EEL_CANVAS_ITEM (g_object_new (type, NULL));
+
+	va_start (args, first_arg_name);
+	eel_canvas_item_construct (item, parent, first_arg_name, args);
+	va_end (args);
+
+	return item;
+}
+
+
+/* Performs post-creation operations on a canvas item (adding it to its parent
+ * group, etc.)
+ */
+static void
+item_post_create_setup (EelCanvasItem *item)
+{
+	group_add (EEL_CANVAS_GROUP (item->parent), item);
+
+	redraw_and_repick_if_mapped (item);
+}
+
+/* Set_property handler for canvas items */
+static void
+eel_canvas_item_set_property (GObject *gobject, guint param_id,
+			      const GValue *value, GParamSpec *pspec)
+{
+	EelCanvasItem *item;
+
+	g_assert (EEL_IS_CANVAS_ITEM (gobject));
+
+	item = EEL_CANVAS_ITEM (gobject);
+
+	switch (param_id) {
+	case ITEM_PROP_PARENT:
+		if (item->parent != NULL) {
+		    g_warning ("Cannot set `parent' argument after item has "
+			       "already been constructed.");
+		} else if (g_value_get_object (value)) {
+			item->parent = EEL_CANVAS_ITEM (g_value_get_object (value));
+			item->canvas = item->parent->canvas;
+			item_post_create_setup (item);
+		}
+		break;
+	case ITEM_PROP_VISIBLE:
+		if (g_value_get_boolean (value)) {
+			eel_canvas_item_show (item);
+		} else {
+			eel_canvas_item_hide (item);
+		}
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, param_id, pspec);
+		break;
+	}
+}
+
+/* Get_property handler for canvas items */
+static void
+eel_canvas_item_get_property (GObject *gobject, guint param_id,
+			      GValue *value, GParamSpec *pspec)
+{
+	EelCanvasItem *item;
+
+	g_assert (EEL_IS_CANVAS_ITEM (gobject));
+
+	item = EEL_CANVAS_ITEM (gobject);
+
+	switch (param_id) {
+	case ITEM_PROP_VISIBLE:
+		g_value_set_boolean (value, item->object.flags & EEL_CANVAS_ITEM_VISIBLE);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, param_id, pspec);
+		break;
+	}
+}
+
+/**
+ * eel_canvas_item_construct:
+ * @item: An unconstructed canvas item.
+ * @parent: The parent group for the item.
+ * @first_arg_name: The name of the first argument for configuring the item.
+ * @args: The list of arguments used to configure the item.
+ *
+ * Constructs a canvas item; meant for use only by item implementations.
+ **/
+void
+eel_canvas_item_construct (EelCanvasItem *item, EelCanvasGroup *parent,
+			   const gchar *first_arg_name, va_list args)
+{
+	g_return_if_fail (EEL_IS_CANVAS_GROUP (parent));
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	item->parent = EEL_CANVAS_ITEM (parent);
+	item->canvas = item->parent->canvas;
+
+	g_object_set_valist (G_OBJECT (item), first_arg_name, args);
+
+	item_post_create_setup (item);
+}
+
+
+static void
+redraw_and_repick_if_mapped (EelCanvasItem *item)
+{
+	if (item->object.flags & EEL_CANVAS_ITEM_MAPPED) {
+		eel_canvas_item_request_redraw (item);
+		item->canvas->need_repick = TRUE;
+	}
+}
+
+
+/* Standard object dispose function for canvas items */
+static void
+eel_canvas_item_dispose (GObject *object)
+{
+	EelCanvasItem *item;
+
+	g_assert (EEL_IS_CANVAS_ITEM (object));
+
+	item = EEL_CANVAS_ITEM (object);
+
+	eel_canvas_item_request_redraw (item);
+
+	/* Make the canvas forget about us */
+
+	if (item == item->canvas->current_item) {
+		item->canvas->current_item = NULL;
+		item->canvas->need_repick = TRUE;
+	}
+
+	if (item == item->canvas->new_current_item) {
+		item->canvas->new_current_item = NULL;
+		item->canvas->need_repick = TRUE;
+	}
+
+	if (item == item->canvas->grabbed_item) {
+		GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (item->canvas));
+		item->canvas->grabbed_item = NULL;
+		gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
+	}
+
+	if (item == item->canvas->focused_item)
+		item->canvas->focused_item = NULL;
+
+	/* Normal destroy stuff */
+
+	if (item->object.flags & EEL_CANVAS_ITEM_MAPPED)
+		(* EEL_CANVAS_ITEM_GET_CLASS (item)->unmap) (item);
+
+	if (item->object.flags & EEL_CANVAS_ITEM_REALIZED)
+		(* EEL_CANVAS_ITEM_GET_CLASS (item)->unrealize) (item);
+
+	if (item->parent)
+		group_remove (EEL_CANVAS_GROUP (item->parent), item);
+
+	G_OBJECT_CLASS (item_parent_class)->dispose (object);
+}
+
+/* Realize handler for canvas items */
+static void
+eel_canvas_item_realize (EelCanvasItem *item)
+{
+	if (item->parent && !(item->parent->object.flags & EEL_CANVAS_ITEM_REALIZED))
+		(* EEL_CANVAS_ITEM_GET_CLASS (item->parent)->realize) (item->parent);
+	
+	if (item->parent == NULL && !GTK_WIDGET_REALIZED (GTK_WIDGET (item->canvas)))
+		gtk_widget_realize (GTK_WIDGET (item->canvas));
+	
+	GTK_OBJECT_SET_FLAGS (item, EEL_CANVAS_ITEM_REALIZED);
+
+	eel_canvas_item_request_update (item);
+}
+
+/* Unrealize handler for canvas items */
+static void
+eel_canvas_item_unrealize (EelCanvasItem *item)
+{
+	if (item->object.flags & EEL_CANVAS_ITEM_MAPPED)
+		(* EEL_CANVAS_ITEM_GET_CLASS (item)->unmap) (item);
+	
+	GTK_OBJECT_UNSET_FLAGS (item, EEL_CANVAS_ITEM_REALIZED);
+}
+
+/* Map handler for canvas items */
+static void
+eel_canvas_item_map (EelCanvasItem *item)
+{
+	GTK_OBJECT_SET_FLAGS (item, EEL_CANVAS_ITEM_MAPPED);
+}
+
+/* Unmap handler for canvas items */
+static void
+eel_canvas_item_unmap (EelCanvasItem *item)
+{
+	GTK_OBJECT_UNSET_FLAGS (item, EEL_CANVAS_ITEM_MAPPED);
+}
+
+/* Update handler for canvas items */
+static void
+eel_canvas_item_update (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags)
+{
+	GTK_OBJECT_UNSET_FLAGS (item, EEL_CANVAS_ITEM_NEED_UPDATE);
+	GTK_OBJECT_UNSET_FLAGS (item, EEL_CANVAS_ITEM_NEED_DEEP_UPDATE);
+}
+
+/*
+ * This routine invokes the update method of the item
+ * Please notice, that we take parent to canvas pixel matrix as argument
+ * unlike virtual method ::update, whose argument is item 2 canvas pixel
+ * matrix
+ *
+ * I will try to force somewhat meaningful naming for affines (Lauris)
+ * General naming rule is FROM2TO, where FROM and TO are abbreviations
+ * So p2cpx is Parent2CanvasPixel and i2cpx is Item2CanvasPixel
+ * I hope that this helps to keep track of what really happens
+ *
+ */
+
+static void
+eel_canvas_item_invoke_update (EelCanvasItem *item,
+			       double i2w_dx,
+			       double i2w_dy,
+			       int flags)
+{
+	int child_flags;
+
+	child_flags = flags;
+
+	/* apply object flags to child flags */
+	child_flags &= ~EEL_CANVAS_UPDATE_REQUESTED;
+
+	if (item->object.flags & EEL_CANVAS_ITEM_NEED_UPDATE)
+		child_flags |= EEL_CANVAS_UPDATE_REQUESTED;
+
+	if (item->object.flags & EEL_CANVAS_ITEM_NEED_DEEP_UPDATE)
+		child_flags |= EEL_CANVAS_UPDATE_DEEP;
+
+	if (child_flags & GCI_UPDATE_MASK) {
+		if (EEL_CANVAS_ITEM_GET_CLASS (item)->update)
+			EEL_CANVAS_ITEM_GET_CLASS (item)->update (item, i2w_dx, i2w_dy, child_flags);
+	}
+ 
+	/* If this fail you probably forgot to chain up to
+	 * EelCanvasItem::update from a derived class */
+ 	g_assert (!(item->object.flags & EEL_CANVAS_ITEM_NEED_UPDATE));
+}
+
+/*
+ * This routine invokes the point method of the item.
+ * The arguments x, y should be in the parent item local coordinates.
+ */
+
+static double
+eel_canvas_item_invoke_point (EelCanvasItem *item, double x, double y, int cx, int cy, EelCanvasItem **actual_item)
+{
+	/* Calculate x & y in item local coordinates */
+
+	if (EEL_CANVAS_ITEM_GET_CLASS (item)->point)
+		return EEL_CANVAS_ITEM_GET_CLASS (item)->point (item, x, y, cx, cy, actual_item);
+
+	return 1e18;
+}
+
+/**
+ * eel_canvas_item_set:
+ * @item: A canvas item.
+ * @first_arg_name: The list of object argument name/value pairs used to configure the item.
+ * @Varargs:
+ *
+ * Configures a canvas item.  The arguments in the item are set to the specified
+ * values, and the item is repainted as appropriate.
+ **/
+void
+eel_canvas_item_set (EelCanvasItem *item, const gchar *first_arg_name, ...)
+{
+	va_list args;
+
+	va_start (args, first_arg_name);
+	eel_canvas_item_set_valist (item, first_arg_name, args);
+	va_end (args);
+}
+
+
+/**
+ * eel_canvas_item_set_valist:
+ * @item: A canvas item.
+ * @first_arg_name: The name of the first argument used to configure the item.
+ * @args: The list of object argument name/value pairs used to configure the item.
+ *
+ * Configures a canvas item.  The arguments in the item are set to the specified
+ * values, and the item is repainted as appropriate.
+ **/
+void
+eel_canvas_item_set_valist (EelCanvasItem *item, const gchar *first_arg_name, va_list args)
+{
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	g_object_set_valist (G_OBJECT (item), first_arg_name, args);
+
+#if 0
+	/* I commented this out, because item implementations have to schedule update/redraw */
+	eel_canvas_item_request_redraw (item);
+#endif
+
+	item->canvas->need_repick = TRUE;
+}
+
+
+/**
+ * eel_canvas_item_move:
+ * @item: A canvas item.
+ * @dx: Horizontal offset.
+ * @dy: Vertical offset.
+ *
+ * Moves a canvas item by creating an affine transformation matrix for
+ * translation by using the specified values. This happens in item
+ * local coordinate system, so if you have nontrivial transform, it
+ * most probably does not do, what you want.
+ **/
+void
+eel_canvas_item_move (EelCanvasItem *item, double dx, double dy)
+{
+        g_return_if_fail (item != NULL);
+        g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+        if (!EEL_CANVAS_ITEM_GET_CLASS (item)->translate) {
+                g_warning ("Item type %s does not implement translate method.\n",
+                           g_type_name (GTK_OBJECT_TYPE (item)));
+                return;
+        }
+
+        (* EEL_CANVAS_ITEM_GET_CLASS (item)->translate) (item, dx, dy);
+
+	if (item->object.flags & EEL_CANVAS_ITEM_MAPPED) 
+		item->canvas->need_repick = TRUE;
+
+	if (!(item->object.flags & EEL_CANVAS_ITEM_NEED_DEEP_UPDATE)) {
+		item->object.flags |= EEL_CANVAS_ITEM_NEED_DEEP_UPDATE;
+		if (item->parent != NULL)
+			eel_canvas_item_request_update (item->parent);
+		else
+			eel_canvas_request_update (item->canvas);
+	}
+
+}
+
+/* Convenience function to reorder items in a group's child list.  This puts the
+ * specified link after the "before" link. Returns TRUE if the list was changed.
+ */
+static gboolean
+put_item_after (GList *link, GList *before)
+{
+	EelCanvasGroup *parent;
+
+	if (link == before)
+		return FALSE;
+
+	parent = EEL_CANVAS_GROUP (EEL_CANVAS_ITEM (link->data)->parent);
+
+	if (before == NULL) {
+		if (link == parent->item_list)
+			return FALSE;
+
+		link->prev->next = link->next;
+
+		if (link->next)
+			link->next->prev = link->prev;
+		else
+			parent->item_list_end = link->prev;
+
+		link->prev = before;
+		link->next = parent->item_list;
+		link->next->prev = link;
+		parent->item_list = link;
+	} else {
+		if ((link == parent->item_list_end) && (before == parent->item_list_end->prev))
+			return FALSE;
+
+		if (link->next)
+			link->next->prev = link->prev;
+
+		if (link->prev)
+			link->prev->next = link->next;
+		else {
+			parent->item_list = link->next;
+			parent->item_list->prev = NULL;
+		}
+
+		link->prev = before;
+		link->next = before->next;
+
+		link->prev->next = link;
+
+		if (link->next)
+			link->next->prev = link;
+		else
+			parent->item_list_end = link;
+	}
+	return TRUE;
+}
+
+
+/**
+ * eel_canvas_item_raise:
+ * @item: A canvas item.
+ * @positions: Number of steps to raise the item.
+ *
+ * Raises the item in its parent's stack by the specified number of positions.
+ * If the number of positions is greater than the distance to the top of the
+ * stack, then the item is put at the top.
+ **/
+void
+eel_canvas_item_raise (EelCanvasItem *item, int positions)
+{
+	GList *link, *before;
+	EelCanvasGroup *parent;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+	g_return_if_fail (positions >= 0);
+
+	if (!item->parent || positions == 0)
+		return;
+
+	parent = EEL_CANVAS_GROUP (item->parent);
+	link = g_list_find (parent->item_list, item);
+	g_assert (link != NULL);
+
+	for (before = link; positions && before; positions--)
+		before = before->next;
+
+	if (!before)
+		before = parent->item_list_end;
+
+	if (put_item_after (link, before)) {
+		redraw_and_repick_if_mapped (item);
+	}
+}
+
+
+/**
+ * eel_canvas_item_lower:
+ * @item: A canvas item.
+ * @positions: Number of steps to lower the item.
+ *
+ * Lowers the item in its parent's stack by the specified number of positions.
+ * If the number of positions is greater than the distance to the bottom of the
+ * stack, then the item is put at the bottom.
+ **/
+void
+eel_canvas_item_lower (EelCanvasItem *item, int positions)
+{
+	GList *link, *before;
+	EelCanvasGroup *parent;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+	g_return_if_fail (positions >= 1);
+
+	if (!item->parent || positions == 0)
+		return;
+
+	parent = EEL_CANVAS_GROUP (item->parent);
+	link = g_list_find (parent->item_list, item);
+	g_assert (link != NULL);
+
+	if (link->prev)
+		for (before = link->prev; positions && before; positions--)
+			before = before->prev;
+	else
+		before = NULL;
+
+	if (put_item_after (link, before)) {
+		redraw_and_repick_if_mapped (item);
+	}
+}
+
+
+/**
+ * eel_canvas_item_raise_to_top:
+ * @item: A canvas item.
+ *
+ * Raises an item to the top of its parent's stack.
+ **/
+void
+eel_canvas_item_raise_to_top (EelCanvasItem *item)
+{
+	GList *link;
+	EelCanvasGroup *parent;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	if (!item->parent)
+		return;
+
+	parent = EEL_CANVAS_GROUP (item->parent);
+	link = g_list_find (parent->item_list, item);
+	g_assert (link != NULL);
+
+	if (put_item_after (link, parent->item_list_end)) {
+		redraw_and_repick_if_mapped (item);
+	}
+}
+
+
+/**
+ * eel_canvas_item_lower_to_bottom:
+ * @item: A canvas item.
+ *
+ * Lowers an item to the bottom of its parent's stack.
+ **/
+void
+eel_canvas_item_lower_to_bottom (EelCanvasItem *item)
+{
+	GList *link;
+	EelCanvasGroup *parent;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	if (!item->parent)
+		return;
+
+	parent = EEL_CANVAS_GROUP (item->parent);
+	link = g_list_find (parent->item_list, item);
+	g_assert (link != NULL);
+
+	if (put_item_after (link, NULL)) {
+		redraw_and_repick_if_mapped (item);
+	}
+}
+
+/**
+ * eel_canvas_item_send_behind:
+ * @item: A canvas item.
+ * @behind_item: The canvas item to put item behind, or NULL
+ *
+ * Moves item to a in the position in the stacking order so that
+ * it is placed immediately below behind_item, or at the top if
+ * behind_item is NULL.
+ **/
+void
+eel_canvas_item_send_behind (EelCanvasItem *item,
+			     EelCanvasItem *behind_item)
+{
+	GList *item_list;
+	int item_position, behind_position;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	if (behind_item == NULL) {
+		eel_canvas_item_raise_to_top (item);
+		return;
+	}
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (behind_item));
+	g_return_if_fail (item->parent == behind_item->parent);
+
+	item_list = EEL_CANVAS_GROUP (item->parent)->item_list;
+
+	item_position = g_list_index (item_list, item);
+	g_assert (item_position != -1);
+	behind_position = g_list_index (item_list, behind_item);
+	g_assert (behind_position != -1);
+	g_assert (item_position != behind_position);
+
+	if (item_position == behind_position - 1) {
+		return;
+	}
+
+	if (item_position < behind_position) {
+		eel_canvas_item_raise (item, (behind_position - 1) - item_position);
+	} else {
+		eel_canvas_item_lower (item, item_position - behind_position);
+	}
+}
+
+/**
+ * eel_canvas_item_show:
+ * @item: A canvas item.
+ *
+ * Shows a canvas item.  If the item was already shown, then no action is taken.
+ **/
+void
+eel_canvas_item_show (EelCanvasItem *item)
+{
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	if (!(item->object.flags & EEL_CANVAS_ITEM_VISIBLE)) {
+		item->object.flags |= EEL_CANVAS_ITEM_VISIBLE;
+		
+		if (!(item->object.flags & EEL_CANVAS_ITEM_REALIZED))
+			(* EEL_CANVAS_ITEM_GET_CLASS (item)->realize) (item);
+
+		if (item->parent != NULL) {
+			if (!(item->object.flags & EEL_CANVAS_ITEM_MAPPED) &&
+			    item->parent->object.flags & EEL_CANVAS_ITEM_MAPPED)
+				(* EEL_CANVAS_ITEM_GET_CLASS (item)->map) (item);
+		} else {
+			if (!(item->object.flags & EEL_CANVAS_ITEM_MAPPED) &&
+			    GTK_WIDGET_MAPPED (GTK_WIDGET (item->canvas)))
+				(* EEL_CANVAS_ITEM_GET_CLASS (item)->map) (item);
+		}
+
+		redraw_and_repick_if_mapped (item);
+	}
+}
+
+
+/**
+ * eel_canvas_item_hide:
+ * @item: A canvas item.
+ *
+ * Hides a canvas item.  If the item was already hidden, then no action is
+ * taken.
+ **/
+void
+eel_canvas_item_hide (EelCanvasItem *item)
+{
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	if (item->object.flags & EEL_CANVAS_ITEM_VISIBLE) {
+		item->object.flags &= ~EEL_CANVAS_ITEM_VISIBLE;
+
+		redraw_and_repick_if_mapped (item);
+		
+		if (item->object.flags & EEL_CANVAS_ITEM_MAPPED)
+			(* EEL_CANVAS_ITEM_GET_CLASS (item)->unmap) (item);
+
+		/* No need to unrealize when we just want to hide */
+	}
+}
+
+
+/**
+ * eel_canvas_item_grab:
+ * @item: A canvas item.
+ * @event_mask: Mask of events that will be sent to this item.
+ * @cursor: If non-NULL, the cursor that will be used while the grab is active.
+ * @etime: The timestamp required for grabbing the mouse, or GDK_CURRENT_TIME.
+ *
+ * Specifies that all events that match the specified event mask should be sent
+ * to the specified item, and also grabs the mouse by calling
+ * gdk_pointer_grab().  The event mask is also used when grabbing the pointer.
+ * If @cursor is not NULL, then that cursor is used while the grab is active.
+ * The @etime parameter is the timestamp required for grabbing the mouse.
+ *
+ * Return value: If an item was already grabbed, it returns %GDK_GRAB_ALREADY_GRABBED.  If
+ * the specified item was hidden by calling eel_canvas_item_hide(), then it
+ * returns %GDK_GRAB_NOT_VIEWABLE.  Else, it returns the result of calling
+ * gdk_pointer_grab().
+ **/
+int
+eel_canvas_item_grab (EelCanvasItem *item, guint event_mask, GdkCursor *cursor, guint32 etime)
+{
+	int retval;
+
+	g_return_val_if_fail (EEL_IS_CANVAS_ITEM (item), GDK_GRAB_NOT_VIEWABLE);
+	g_return_val_if_fail (GTK_WIDGET_MAPPED (item->canvas), GDK_GRAB_NOT_VIEWABLE);
+
+	if (item->canvas->grabbed_item)
+		return GDK_GRAB_ALREADY_GRABBED;
+
+	if (!(item->object.flags & EEL_CANVAS_ITEM_MAPPED))
+		return GDK_GRAB_NOT_VIEWABLE;
+
+	retval = gdk_pointer_grab (item->canvas->layout.bin_window,
+				   FALSE,
+				   event_mask,
+				   NULL,
+				   cursor,
+				   etime);
+
+	if (retval != GDK_GRAB_SUCCESS)
+		return retval;
+
+	item->canvas->grabbed_item = item;
+	item->canvas->grabbed_event_mask = event_mask;
+	item->canvas->current_item = item; /* So that events go to the grabbed item */
+
+	return retval;
+}
+
+
+/**
+ * eel_canvas_item_ungrab:
+ * @item: A canvas item that holds a grab.
+ * @etime: The timestamp for ungrabbing the mouse.
+ *
+ * Ungrabs the item, which must have been grabbed in the canvas, and ungrabs the
+ * mouse.
+ **/
+void
+eel_canvas_item_ungrab (EelCanvasItem *item, guint32 etime)
+{
+	GdkDisplay *display;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	if (item->canvas->grabbed_item != item)
+		return;
+
+	display = gtk_widget_get_display (GTK_WIDGET (item->canvas));
+	item->canvas->grabbed_item = NULL;
+	gdk_display_pointer_ungrab (display, etime);
+}
+
+
+/**
+ * eel_canvas_item_w2i:
+ * @item: A canvas item.
+ * @x: X coordinate to convert (input/output value).
+ * @y: Y coordinate to convert (input/output value).
+ *
+ * Converts a coordinate pair from world coordinates to item-relative
+ * coordinates.
+ **/
+void
+eel_canvas_item_w2i (EelCanvasItem *item, double *x, double *y)
+{
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+	g_return_if_fail (x != NULL);
+	g_return_if_fail (y != NULL);
+
+	item = item->parent;
+	while (item) {
+		if (EEL_IS_CANVAS_GROUP (item)) {
+			*x -= EEL_CANVAS_GROUP (item)->xpos;
+			*y -= EEL_CANVAS_GROUP (item)->ypos;
+		}
+
+		item = item->parent;
+	}
+}
+
+
+/**
+ * eel_canvas_item_i2w:
+ * @item: A canvas item.
+ * @x: X coordinate to convert (input/output value).
+ * @y: Y coordinate to convert (input/output value).
+ *
+ * Converts a coordinate pair from item-relative coordinates to world
+ * coordinates.
+ **/
+void
+eel_canvas_item_i2w (EelCanvasItem *item, double *x, double *y)
+{
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+	g_return_if_fail (x != NULL);
+	g_return_if_fail (y != NULL);
+
+	item = item->parent;
+	while (item) {
+		if (EEL_IS_CANVAS_GROUP (item)) {
+			*x += EEL_CANVAS_GROUP (item)->xpos;
+			*y += EEL_CANVAS_GROUP (item)->ypos;
+		}
+
+		item = item->parent;
+	}
+}
+
+/* Returns whether the item is an inferior of or is equal to the parent. */
+static int
+is_descendant (EelCanvasItem *item, EelCanvasItem *parent)
+{
+	for (; item; item = item->parent)
+		if (item == parent)
+			return TRUE;
+
+	return FALSE;
+}
+
+/**
+ * eel_canvas_item_reparent:
+ * @item: A canvas item.
+ * @new_group: A canvas group.
+ *
+ * Changes the parent of the specified item to be the new group.  The item keeps
+ * its group-relative coordinates as for its old parent, so the item may change
+ * its absolute position within the canvas.
+ **/
+void
+eel_canvas_item_reparent (EelCanvasItem *item, EelCanvasGroup *new_group)
+{
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+	g_return_if_fail (EEL_IS_CANVAS_GROUP (new_group));
+
+	/* Both items need to be in the same canvas */
+	g_return_if_fail (item->canvas == EEL_CANVAS_ITEM (new_group)->canvas);
+
+	/* The group cannot be an inferior of the item or be the item itself --
+	 * this also takes care of the case where the item is the root item of
+	 * the canvas.  */
+	g_return_if_fail (!is_descendant (EEL_CANVAS_ITEM (new_group), item));
+
+	/* Everything is ok, now actually reparent the item */
+
+	g_object_ref (GTK_OBJECT (item)); /* protect it from the unref in group_remove */
+
+	eel_canvas_item_request_redraw (item);
+
+	group_remove (EEL_CANVAS_GROUP (item->parent), item);
+	item->parent = EEL_CANVAS_ITEM (new_group);
+	group_add (new_group, item);
+
+	/* Redraw and repick */
+
+	redraw_and_repick_if_mapped (item);
+
+	g_object_unref (GTK_OBJECT (item));
+}
+
+/**
+ * eel_canvas_item_grab_focus:
+ * @item: A canvas item.
+ *
+ * Makes the specified item take the keyboard focus, so all keyboard events will
+ * be sent to it.  If the canvas widget itself did not have the focus, it grabs
+ * it as well.
+ **/
+void
+eel_canvas_item_grab_focus (EelCanvasItem *item)
+{
+	EelCanvasItem *focused_item;
+	GdkEvent ev;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+	g_return_if_fail (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (item->canvas)));
+
+	focused_item = item->canvas->focused_item;
+
+	if (focused_item) {
+		ev.focus_change.type = GDK_FOCUS_CHANGE;
+		ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
+		ev.focus_change.send_event = FALSE;
+		ev.focus_change.in = FALSE;
+
+		emit_event (item->canvas, &ev);
+	}
+
+	item->canvas->focused_item = item;
+	gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
+
+	if (focused_item) {                                                     
+		ev.focus_change.type = GDK_FOCUS_CHANGE;                        
+		ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
+		ev.focus_change.send_event = FALSE;                             
+		ev.focus_change.in = TRUE;                                      
+
+		emit_event (item->canvas, &ev);                          
+	}                               
+}
+
+
+/**
+ * eel_canvas_item_get_bounds:
+ * @item: A canvas item.
+ * @x1: Leftmost edge of the bounding box (return value).
+ * @y1: Upper edge of the bounding box (return value).
+ * @x2: Rightmost edge of the bounding box (return value).
+ * @y2: Lower edge of the bounding box (return value).
+ *
+ * Queries the bounding box of a canvas item.  The bounds are returned in the
+ * coordinate system of the item's parent.
+ **/
+void
+eel_canvas_item_get_bounds (EelCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
+{
+	double tx1, ty1, tx2, ty2;
+
+	g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+
+	tx1 = ty1 = tx2 = ty2 = 0.0;
+
+	/* Get the item's bounds in its coordinate system */
+
+	if (EEL_CANVAS_ITEM_GET_CLASS (item)->bounds)
+		(* EEL_CANVAS_ITEM_GET_CLASS (item)->bounds) (item, &tx1, &ty1, &tx2, &ty2);
+
+	/* Return the values */
+
+	if (x1)
+		*x1 = tx1;
+
+	if (y1)
+		*y1 = ty1;
+
+	if (x2)
+		*x2 = tx2;
+
+	if (y2)
+		*y2 = ty2;
+}
+
+
+/**
+ * eel_canvas_item_request_update
+ * @item: A canvas item.
+ *
+ * To be used only by item implementations.  Requests that the canvas queue an
+ * update for the specified item.
+ **/
+void
+eel_canvas_item_request_update (EelCanvasItem *item)
+{
+	g_return_if_fail (!item->canvas->doing_update);
+
+	if (item->object.flags & EEL_CANVAS_ITEM_NEED_UPDATE)
+		return;
+
+	item->object.flags |= EEL_CANVAS_ITEM_NEED_UPDATE;
+
+	if (item->parent != NULL) {
+		/* Recurse up the tree */
+		eel_canvas_item_request_update (item->parent);
+	} else {
+		/* Have reached the top of the tree, make sure the update call gets scheduled. */
+		eel_canvas_request_update (item->canvas);
+	}
+}
+
+/**
+ * eel_canvas_item_request_update
+ * @item: A canvas item.
+ *
+ * Convenience function that informs a canvas that the specified item needs
+ * to be repainted. To be used by item implementations
+ **/
+void
+eel_canvas_item_request_redraw (EelCanvasItem *item)
+{
+	if (item->object.flags & EEL_CANVAS_ITEM_MAPPED)
+		eel_canvas_request_redraw (item->canvas,
+					   item->x1, item->y1,
+					   item->x2 + 1, item->y2 + 1);
+}
+
+
+
+/*** EelCanvasGroup ***/
+
+
+enum {
+	GROUP_PROP_0,
+	GROUP_PROP_X,
+	GROUP_PROP_Y
+};
+
+
+static void eel_canvas_group_class_init  (EelCanvasGroupClass *class);
+static void eel_canvas_group_init        (EelCanvasGroup      *group);
+static void eel_canvas_group_set_property(GObject               *object, 
+					    guint                  param_id,
+					    const GValue          *value,
+					    GParamSpec            *pspec);
+static void eel_canvas_group_get_property(GObject               *object,
+					    guint                  param_id,
+					    GValue                *value,
+					    GParamSpec            *pspec);
+
+static void eel_canvas_group_destroy     (GtkObject             *object);
+
+static void   eel_canvas_group_update      (EelCanvasItem *item,
+					      double           i2w_dx,
+					      double           i2w_dy,
+					      int              flags);
+static void   eel_canvas_group_unrealize   (EelCanvasItem *item);
+static void   eel_canvas_group_map         (EelCanvasItem *item);
+static void   eel_canvas_group_unmap       (EelCanvasItem *item);
+static void   eel_canvas_group_draw        (EelCanvasItem *item, GdkDrawable *drawable,
+					      GdkEventExpose *expose);
+static double eel_canvas_group_point       (EelCanvasItem *item, double x, double y,
+					      int cx, int cy,
+					      EelCanvasItem **actual_item);
+static void   eel_canvas_group_translate   (EelCanvasItem *item, double dx, double dy);
+static void   eel_canvas_group_bounds      (EelCanvasItem *item, double *x1, double *y1,
+					      double *x2, double *y2);
+
+
+static EelCanvasItemClass *group_parent_class;
+
+
+/**
+ * eel_canvas_group_get_type:
+ *
+ * Registers the &EelCanvasGroup class if necessary, and returns the type ID
+ * associated to it.
+ *
+ * Return value:  The type ID of the &EelCanvasGroup class.
+ **/
+GType
+eel_canvas_group_get_type (void)
+{
+	static GType group_type = 0;
+
+	if (!group_type) {
+		const GTypeInfo group_info = {
+			sizeof (EelCanvasGroupClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_canvas_group_class_init,
+			NULL,           /* class_finalize */
+			NULL,           /* class_data */
+			sizeof (EelCanvasGroup),
+			0,              /* n_preallocs */
+			(GInstanceInitFunc) eel_canvas_group_init
+
+	
+		};
+
+		group_type = g_type_register_static (eel_canvas_item_get_type (),
+						     "EelCanvasGroup",
+						     &group_info,
+						     0);
+	}
+
+	return group_type;
+}
+
+/* Class initialization function for EelCanvasGroupClass */
+static void
+eel_canvas_group_class_init (EelCanvasGroupClass *class)
+{
+	GObjectClass *gobject_class;
+	GtkObjectClass *object_class;
+	EelCanvasItemClass *item_class;
+
+	gobject_class = (GObjectClass *) class;
+	object_class = (GtkObjectClass *) class;
+	item_class = (EelCanvasItemClass *) class;
+
+	group_parent_class = gtk_type_class (eel_canvas_item_get_type ());
+
+	gobject_class->set_property = eel_canvas_group_set_property;
+	gobject_class->get_property = eel_canvas_group_get_property;
+
+	g_object_class_install_property
+		(gobject_class, GROUP_PROP_X,
+		 g_param_spec_double ("x",
+				      _("X"),
+				      _("X"),
+				      -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+	g_object_class_install_property
+		(gobject_class, GROUP_PROP_Y,
+		 g_param_spec_double ("y",
+				      _("Y"),
+				      _("Y"),
+				      -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+
+	object_class->destroy = eel_canvas_group_destroy;
+
+	item_class->update = eel_canvas_group_update;
+	item_class->unrealize = eel_canvas_group_unrealize;
+	item_class->map = eel_canvas_group_map;
+	item_class->unmap = eel_canvas_group_unmap;
+	item_class->draw = eel_canvas_group_draw;
+	item_class->point = eel_canvas_group_point;
+	item_class->translate = eel_canvas_group_translate;
+	item_class->bounds = eel_canvas_group_bounds;
+}
+
+/* Object initialization function for EelCanvasGroup */
+static void
+eel_canvas_group_init (EelCanvasGroup *group)
+{
+	group->xpos = 0.0;
+	group->ypos = 0.0;
+}
+
+/* Set_property handler for canvas groups */
+static void
+eel_canvas_group_set_property (GObject *gobject, guint param_id,
+			       const GValue *value, GParamSpec *pspec)
+{
+	EelCanvasItem *item;
+	EelCanvasGroup *group;
+	double old;
+	gboolean moved;
+
+	g_assert (EEL_IS_CANVAS_GROUP (gobject));
+
+	item = EEL_CANVAS_ITEM (gobject);
+	group = EEL_CANVAS_GROUP (gobject);
+
+	moved = FALSE;
+	switch (param_id) {
+	case GROUP_PROP_X:
+		old = group->xpos;
+		group->xpos = g_value_get_double (value);
+		if (old != group->xpos)
+			moved = TRUE;
+		break;
+
+	case GROUP_PROP_Y:
+		old = group->ypos;
+		group->ypos = g_value_get_double (value);
+		if (old != group->ypos)
+			moved = TRUE;
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, param_id, pspec);
+		break;
+	}
+
+	if (moved) {
+		item->object.flags |= EEL_CANVAS_ITEM_NEED_DEEP_UPDATE;
+		if (item->parent != NULL)
+			eel_canvas_item_request_update (item->parent);
+		else
+			eel_canvas_request_update (item->canvas);
+	}
+}
+
+/* Get_property handler for canvas groups */
+static void
+eel_canvas_group_get_property (GObject *gobject, guint param_id,
+				 GValue *value, GParamSpec *pspec)
+{
+	EelCanvasGroup *group;
+
+	g_assert (EEL_IS_CANVAS_GROUP (gobject));
+
+	group = EEL_CANVAS_GROUP (gobject);
+
+	switch (param_id) {
+	case GROUP_PROP_X:
+		g_value_set_double (value, group->xpos);
+		break;
+
+	case GROUP_PROP_Y:
+		g_value_set_double (value, group->ypos);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, param_id, pspec);
+		break;
+	}
+}
+
+/* Destroy handler for canvas groups */
+static void
+eel_canvas_group_destroy (GtkObject *object)
+{
+	EelCanvasGroup *group;
+	EelCanvasItem *child;
+	GList *list;
+
+	g_assert (EEL_IS_CANVAS_GROUP (object));
+
+	group = EEL_CANVAS_GROUP (object);
+
+	list = group->item_list;
+	while (list) {
+		child = list->data;
+		list = list->next;
+
+		gtk_object_destroy (GTK_OBJECT (child));
+	}
+
+	if (GTK_OBJECT_CLASS (group_parent_class)->destroy)
+		(* GTK_OBJECT_CLASS (group_parent_class)->destroy) (object);
+}
+
+/* Update handler for canvas groups */
+static void
+eel_canvas_group_update (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags)
+{
+	EelCanvasGroup *group;
+	GList *list;
+	EelCanvasItem *i;
+	double bbox_x0, bbox_y0, bbox_x1, bbox_y1;
+	gboolean first = TRUE;
+
+	group = EEL_CANVAS_GROUP (item);
+
+	(* group_parent_class->update) (item, i2w_dx, i2w_dy, flags);
+
+	bbox_x0 = 0;
+	bbox_y0 = 0;
+	bbox_x1 = 0;
+	bbox_y1 = 0;
+
+	for (list = group->item_list; list; list = list->next) {
+		i = list->data;
+
+		eel_canvas_item_invoke_update (i, i2w_dx + group->xpos, i2w_dy + group->ypos, flags);
+
+		if (first) {
+			first = FALSE;
+			bbox_x0 = i->x1;
+			bbox_y0 = i->y1;
+			bbox_x1 = i->x2;
+			bbox_y1 = i->y2;
+		} else {
+			bbox_x0 = MIN (bbox_x0, i->x1);
+			bbox_y0 = MIN (bbox_y0, i->y1);
+			bbox_x1 = MAX (bbox_x1, i->x2);
+			bbox_y1 = MAX (bbox_y1, i->y2);
+		}
+	}
+	item->x1 = bbox_x0;
+	item->y1 = bbox_y0;
+	item->x2 = bbox_x1;
+	item->y2 = bbox_y1;
+}
+
+/* Unrealize handler for canvas groups */
+static void
+eel_canvas_group_unrealize (EelCanvasItem *item)
+{
+	EelCanvasGroup *group;
+	GList *list;
+	EelCanvasItem *i;
+
+	group = EEL_CANVAS_GROUP (item);
+
+	/* Unmap group before children to avoid flash */
+	if (item->object.flags & EEL_CANVAS_ITEM_MAPPED)
+		(* EEL_CANVAS_ITEM_GET_CLASS (item)->unmap) (item);
+
+	for (list = group->item_list; list; list = list->next) {
+		i = list->data;
+
+		if (i->object.flags & EEL_CANVAS_ITEM_REALIZED)
+			(* EEL_CANVAS_ITEM_GET_CLASS (i)->unrealize) (i);
+	}
+
+	(* group_parent_class->unrealize) (item);
+}
+
+/* Map handler for canvas groups */
+static void
+eel_canvas_group_map (EelCanvasItem *item)
+{
+	EelCanvasGroup *group;
+	GList *list;
+	EelCanvasItem *i;
+
+	group = EEL_CANVAS_GROUP (item);
+
+	for (list = group->item_list; list; list = list->next) {
+		i = list->data;
+
+		if (i->object.flags & EEL_CANVAS_ITEM_VISIBLE &&
+		    !(i->object.flags & EEL_CANVAS_ITEM_MAPPED)) {
+			if (!(i->object.flags & EEL_CANVAS_ITEM_REALIZED))
+				(* EEL_CANVAS_ITEM_GET_CLASS (i)->realize) (i);
+				
+			(* EEL_CANVAS_ITEM_GET_CLASS (i)->map) (i);
+		}
+	}
+
+	(* group_parent_class->map) (item);
+}
+
+/* Unmap handler for canvas groups */
+static void
+eel_canvas_group_unmap (EelCanvasItem *item)
+{
+	EelCanvasGroup *group;
+	GList *list;
+	EelCanvasItem *i;
+
+	group = EEL_CANVAS_GROUP (item);
+
+	for (list = group->item_list; list; list = list->next) {
+		i = list->data;
+
+		if (i->object.flags & EEL_CANVAS_ITEM_MAPPED)
+			(* EEL_CANVAS_ITEM_GET_CLASS (i)->unmap) (i);
+	}
+
+	(* group_parent_class->unmap) (item);
+}
+
+/* Draw handler for canvas groups */
+static void
+eel_canvas_group_draw (EelCanvasItem *item, GdkDrawable *drawable,
+			 GdkEventExpose *expose)
+{
+	EelCanvasGroup *group;
+	GList *list;
+	EelCanvasItem *child = NULL;
+
+	group = EEL_CANVAS_GROUP (item);
+
+	for (list = group->item_list; list; list = list->next) {
+		child = list->data;
+
+		if ((child->object.flags & EEL_CANVAS_ITEM_MAPPED) &&
+		    (EEL_CANVAS_ITEM_GET_CLASS (child)->draw)) {
+			GdkRectangle child_rect;
+			
+			child_rect.x = child->x1;
+			child_rect.y = child->y1;
+			child_rect.width = child->x2 - child->x1 + 1;
+			child_rect.height = child->y2 - child->y1 + 1;
+
+			if (gdk_region_rect_in (expose->region, &child_rect) != GDK_OVERLAP_RECTANGLE_OUT)
+				(* EEL_CANVAS_ITEM_GET_CLASS (child)->draw) (child, drawable, expose);
+		}
+	}
+}
+
+/* Point handler for canvas groups */
+static double
+eel_canvas_group_point (EelCanvasItem *item, double x, double y, int cx, int cy,
+			EelCanvasItem **actual_item)
+{
+	EelCanvasGroup *group;
+	GList *list;
+	EelCanvasItem *child, *point_item;
+	int x1, y1, x2, y2;
+	double gx, gy;
+	double dist, best;
+	int has_point;
+
+	group = EEL_CANVAS_GROUP (item);
+
+	x1 = cx - item->canvas->close_enough;
+	y1 = cy - item->canvas->close_enough;
+	x2 = cx + item->canvas->close_enough;
+	y2 = cy + item->canvas->close_enough;
+
+	best = 0.0;
+	*actual_item = NULL;
+
+	gx = x - group->xpos;
+	gy = y - group->ypos;
+
+	dist = 0.0; /* keep gcc happy */
+
+	for (list = group->item_list; list; list = list->next) {
+		child = list->data;
+
+		if ((child->x1 > x2) || (child->y1 > y2) || (child->x2 < x1) || (child->y2 < y1))
+			continue;
+
+		point_item = NULL; /* cater for incomplete item implementations */
+
+		if ((child->object.flags & EEL_CANVAS_ITEM_MAPPED)
+		    && EEL_CANVAS_ITEM_GET_CLASS (child)->point) {
+			dist = eel_canvas_item_invoke_point (child, gx, gy, cx, cy, &point_item);
+			has_point = TRUE;
+		} else
+			has_point = FALSE;
+
+		if (has_point
+		    && point_item
+		    && ((int) (dist * item->canvas->pixels_per_unit + 0.5)
+			<= item->canvas->close_enough)) {
+			best = dist;
+			*actual_item = point_item;
+		}
+	}
+
+	return best;
+}
+
+static void
+eel_canvas_group_translate (EelCanvasItem *item, double dx, double dy)
+{
+        EelCanvasGroup *group;
+
+        group = EEL_CANVAS_GROUP (item);
+
+        group->xpos += dx;
+        group->ypos += dy;
+}
+
+/* Bounds handler for canvas groups */
+static void
+eel_canvas_group_bounds (EelCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
+{
+	EelCanvasGroup *group;
+	EelCanvasItem *child;
+	GList *list;
+	double tx1, ty1, tx2, ty2;
+	double minx, miny, maxx, maxy;
+	int set;
+
+	group = EEL_CANVAS_GROUP (item);
+
+	/* Get the bounds of the first visible item */
+
+	child = NULL; /* Unnecessary but eliminates a warning. */
+
+	set = FALSE;
+
+	for (list = group->item_list; list; list = list->next) {
+		child = list->data;
+
+		if (child->object.flags & EEL_CANVAS_ITEM_MAPPED) {
+			set = TRUE;
+			eel_canvas_item_get_bounds (child, &minx, &miny, &maxx, &maxy);
+			break;
+		}
+	}
+
+	/* If there were no visible items, return an empty bounding box */
+
+	if (!set) {
+		*x1 = *y1 = *x2 = *y2 = 0.0;
+		return;
+	}
+
+	/* Now we can grow the bounds using the rest of the items */
+
+	list = list->next;
+
+	for (; list; list = list->next) {
+		child = list->data;
+
+		if (!(child->object.flags & EEL_CANVAS_ITEM_MAPPED))
+			continue;
+
+		eel_canvas_item_get_bounds (child, &tx1, &ty1, &tx2, &ty2);
+
+		if (tx1 < minx)
+			minx = tx1;
+
+		if (ty1 < miny)
+			miny = ty1;
+
+		if (tx2 > maxx)
+			maxx = tx2;
+
+		if (ty2 > maxy)
+			maxy = ty2;
+	}
+
+	/* Make the bounds be relative to our parent's coordinate system */
+
+	if (item->parent) {
+		minx += group->xpos;
+		miny += group->ypos;
+		maxx += group->xpos;
+		maxy += group->ypos;
+	}
+	
+	*x1 = minx;
+	*y1 = miny;
+	*x2 = maxx;
+	*y2 = maxy;
+}
+
+/* Adds an item to a group */
+static void
+group_add (EelCanvasGroup *group, EelCanvasItem *item)
+{
+	g_object_ref (GTK_OBJECT (item));
+	gtk_object_sink (GTK_OBJECT (item));
+
+	if (!group->item_list) {
+		group->item_list = g_list_append (group->item_list, item);
+		group->item_list_end = group->item_list;
+	} else
+		group->item_list_end = g_list_append (group->item_list_end, item)->next;
+
+	if (item->object.flags & EEL_CANVAS_ITEM_VISIBLE &&
+	    group->item.object.flags & EEL_CANVAS_ITEM_MAPPED) {
+		if (!(item->object.flags & EEL_CANVAS_ITEM_REALIZED))
+			(* EEL_CANVAS_ITEM_GET_CLASS (item)->realize) (item);
+		
+		if (!(item->object.flags & EEL_CANVAS_ITEM_MAPPED))
+			(* EEL_CANVAS_ITEM_GET_CLASS (item)->map) (item);
+	}
+}
+
+/* Removes an item from a group */
+static void
+group_remove (EelCanvasGroup *group, EelCanvasItem *item)
+{
+	GList *children;
+
+	g_assert (EEL_IS_CANVAS_GROUP (group));
+	g_assert (EEL_IS_CANVAS_ITEM (item));
+
+	for (children = group->item_list; children; children = children->next)
+		if (children->data == item) {
+			if (item->object.flags & EEL_CANVAS_ITEM_MAPPED)
+				(* EEL_CANVAS_ITEM_GET_CLASS (item)->unmap) (item);
+
+			if (item->object.flags & EEL_CANVAS_ITEM_REALIZED)
+				(* EEL_CANVAS_ITEM_GET_CLASS (item)->unrealize) (item);
+
+			/* Unparent the child */
+
+			item->parent = NULL;
+			g_object_unref (GTK_OBJECT (item));
+
+			/* Remove it from the list */
+
+			if (children == group->item_list_end)
+				group->item_list_end = children->prev;
+
+			group->item_list = g_list_remove_link (group->item_list, children);
+			g_list_free (children);
+			break;
+		}
+}
+
+
+/*** EelCanvas ***/
+
+
+enum {
+	DRAW_BACKGROUND,
+	LAST_SIGNAL
+};
+
+static void eel_canvas_class_init          (EelCanvasClass *class);
+static void eel_canvas_init                (EelCanvas      *canvas);
+static void eel_canvas_destroy             (GtkObject        *object);
+static void eel_canvas_map                 (GtkWidget        *widget);
+static void eel_canvas_unmap               (GtkWidget        *widget);
+static void eel_canvas_realize             (GtkWidget        *widget);
+static void eel_canvas_unrealize           (GtkWidget        *widget);
+static void eel_canvas_size_allocate       (GtkWidget        *widget,
+					      GtkAllocation    *allocation);
+static gint eel_canvas_button              (GtkWidget        *widget,
+					      GdkEventButton   *event);
+static gint eel_canvas_motion              (GtkWidget        *widget,
+					      GdkEventMotion   *event);
+static gint eel_canvas_expose              (GtkWidget        *widget,
+					      GdkEventExpose   *event);
+static gint eel_canvas_key                 (GtkWidget        *widget,
+					      GdkEventKey      *event);
+static gint eel_canvas_crossing            (GtkWidget        *widget,
+					      GdkEventCrossing *event);
+static gint eel_canvas_focus_in            (GtkWidget        *widget,
+					      GdkEventFocus    *event);
+static gint eel_canvas_focus_out           (GtkWidget        *widget,
+					      GdkEventFocus    *event);
+static void eel_canvas_request_update_real (EelCanvas      *canvas);
+static void eel_canvas_draw_background     (EelCanvas      *canvas,
+					      int               x,
+					      int               y,
+					      int               width,
+					      int               height);
+
+
+static GtkLayoutClass *canvas_parent_class;
+
+static guint canvas_signals[LAST_SIGNAL];
+
+/**
+ * eel_canvas_get_type:
+ *
+ * Registers the &EelCanvas class if necessary, and returns the type ID
+ * associated to it.
+ *
+ * Return value:  The type ID of the &EelCanvas class.
+ **/
+GType
+eel_canvas_get_type (void)
+{
+	static GType canvas_type = 0;
+
+	if (!canvas_type) {
+		const GTypeInfo canvas_info = {
+			sizeof (EelCanvasClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_canvas_class_init,
+			NULL,           /* class_finalize */
+			NULL,           /* class_data */
+			sizeof (EelCanvas),
+			0,              /* n_preallocs */
+			(GInstanceInitFunc) eel_canvas_init
+		};
+
+		canvas_type = g_type_register_static (gtk_layout_get_type (),
+						      "EelCanvas",
+						      &canvas_info,
+						      0);
+	}
+
+	return canvas_type;
+}
+
+static void
+eel_canvas_get_property (GObject    *object, 
+			   guint       prop_id,
+			   GValue     *value,
+			   GParamSpec *pspec)
+{
+	switch (prop_id) {
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+eel_canvas_set_property (GObject      *object, 
+			   guint         prop_id,
+			   const GValue *value,
+			   GParamSpec   *pspec)
+{
+	switch (prop_id) {
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+eel_canvas_accessible_adjustment_changed (GtkAdjustment *adjustment,
+					  gpointer       data)
+{
+	AtkObject *atk_obj;
+
+	/* The scrollbars have changed */
+	atk_obj = ATK_OBJECT (data);
+
+	g_signal_emit_by_name (atk_obj, "visible_data_changed");
+}
+
+static void
+eel_canvas_accessible_initialize (AtkObject *obj, 
+				  gpointer   data)
+{
+	EelCanvas *canvas;
+
+	if (ATK_OBJECT_CLASS (accessible_parent_class)->initialize != NULL) 
+		ATK_OBJECT_CLASS (accessible_parent_class)->initialize (obj, data);
+
+	canvas = EEL_CANVAS (data);
+	g_signal_connect (canvas->layout.hadjustment,
+			  "value_changed",
+			  G_CALLBACK (eel_canvas_accessible_adjustment_changed),
+			  obj);
+	g_signal_connect (canvas->layout.vadjustment,
+			  "value_changed",
+			  G_CALLBACK (eel_canvas_accessible_adjustment_changed),
+			  obj);
+	
+	obj->role = ATK_ROLE_LAYERED_PANE;
+}
+
+static gint
+eel_canvas_accessible_get_n_children (AtkObject* obj)
+{
+ 	GtkAccessible *accessible;
+	GtkWidget *widget;
+	EelCanvas *canvas;
+	EelCanvasGroup *root_group;
+
+	accessible = GTK_ACCESSIBLE (obj);
+	widget = accessible->widget;
+	if (widget == NULL) {
+		/* State is defunct */
+		return 0;
+	}
+
+	g_assert (EEL_IS_CANVAS (widget));
+
+	canvas = EEL_CANVAS (widget);
+	root_group = eel_canvas_root (canvas);
+	g_assert (root_group != NULL);
+	return 1;
+}
+
+static AtkObject*
+eel_canvas_accessible_ref_child (AtkObject *obj,
+                                 gint       i)
+{
+	GtkAccessible *accessible;
+	GtkWidget *widget;
+	EelCanvas *canvas;
+	EelCanvasGroup *root_group;
+	AtkObject *atk_object;
+
+	/* Canvas only has one child, so return NULL if index is non zero */
+	if (i != 0) {
+        	return NULL;
+	}
+
+	accessible = GTK_ACCESSIBLE (obj);
+	widget = accessible->widget;
+	if (widget == NULL) {
+		/* State is defunct */
+		return NULL;
+	}
+
+	canvas = EEL_CANVAS (widget);
+	root_group = eel_canvas_root (canvas);
+	g_assert (root_group != NULL);
+	atk_object = atk_gobject_accessible_for_object (G_OBJECT (root_group));
+	g_object_ref (atk_object);
+	
+	g_warning ("Accessible support for FooGroup needs to be implemented");
+	
+	return atk_object;
+}
+
+static void
+eel_canvas_accessible_class_init (AtkObjectClass *klass)
+{
+ 	accessible_parent_class = g_type_class_peek_parent (klass);
+
+	klass->initialize = eel_canvas_accessible_initialize;
+	klass->get_n_children = eel_canvas_accessible_get_n_children;
+	klass->ref_child = eel_canvas_accessible_ref_child;
+}
+
+static GType
+eel_canvas_accessible_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		AtkObjectFactory *factory;
+		GType parent_atk_type;
+		GTypeQuery query;
+		GTypeInfo tinfo = { 0 };
+
+		factory = atk_registry_get_factory (atk_get_default_registry(),
+						    GTK_TYPE_WIDGET);
+		if (!factory) {
+			return G_TYPE_INVALID;
+		}
+		parent_atk_type = atk_object_factory_get_accessible_type (factory);
+		if (!parent_atk_type) {
+			return G_TYPE_INVALID;
+		}
+		g_type_query (parent_atk_type, &query);
+		tinfo.class_init = (GClassInitFunc) eel_canvas_accessible_class_init;
+		tinfo.class_size = query.class_size;
+		tinfo.instance_size = query.instance_size;
+		type = g_type_register_static (parent_atk_type,
+					       "EelCanvasAccessibility",
+					       &tinfo, 0);
+	}
+	return type;
+}
+
+static AtkObject *
+eel_canvas_accessible_create (GObject *for_object)
+{
+	GType type;
+	AtkObject *accessible;
+	EelCanvas *canvas;
+
+	canvas = EEL_CANVAS (for_object);
+	g_assert (canvas != NULL);
+
+	type = eel_canvas_accessible_get_type ();
+
+	if (type == G_TYPE_INVALID) {
+		return atk_no_op_object_new (for_object);
+	}
+
+	accessible = g_object_new (type, NULL);
+	atk_object_initialize (accessible, for_object);
+	return accessible;
+}
+
+static GType
+eel_canvas_accessible_factory_get_accessible_type (void)
+{
+	return eel_canvas_accessible_get_type ();
+}
+
+static AtkObject*
+eel_canvas_accessible_factory_create_accessible (GObject *obj)
+{
+	AtkObject *accessible;
+
+	g_assert (G_IS_OBJECT (obj));
+
+	accessible = eel_canvas_accessible_create (obj);
+
+	return accessible;
+}
+
+static void
+eel_canvas_accessible_factory_class_init (AtkObjectFactoryClass *klass)
+{
+	klass->create_accessible = eel_canvas_accessible_factory_create_accessible;
+	klass->get_accessible_type = eel_canvas_accessible_factory_get_accessible_type;
+}
+ 
+static GType
+eel_canvas_accessible_factory_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		const GTypeInfo tinfo = {
+			sizeof (AtkObjectFactoryClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_canvas_accessible_factory_class_init,
+			NULL,		/* class_finalize */
+			NULL,		/* class_data */
+			sizeof (AtkObjectFactory),
+			0,		/* n_preallocs */
+			NULL
+		};
+		type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY,
+					       "EelCanvasAccessibilityFactory",
+					       &tinfo, 0);
+	}
+
+	return type;
+}
+
+
+/* Class initialization function for EelCanvasClass */
+static void
+eel_canvas_class_init (EelCanvasClass *klass)
+{
+	GObjectClass   *gobject_class;
+	GtkObjectClass *object_class;
+	GtkWidgetClass *widget_class;
+
+	gobject_class = (GObjectClass *)klass;
+	object_class  = (GtkObjectClass *) klass;
+	widget_class  = (GtkWidgetClass *) klass;
+
+	canvas_parent_class = gtk_type_class (gtk_layout_get_type ());
+
+	gobject_class->set_property = eel_canvas_set_property;
+	gobject_class->get_property = eel_canvas_get_property;
+
+	object_class->destroy = eel_canvas_destroy;
+
+	widget_class->map = eel_canvas_map;
+	widget_class->unmap = eel_canvas_unmap;
+	widget_class->realize = eel_canvas_realize;
+	widget_class->unrealize = eel_canvas_unrealize;
+	widget_class->size_allocate = eel_canvas_size_allocate;
+	widget_class->button_press_event = eel_canvas_button;
+	widget_class->button_release_event = eel_canvas_button;
+	widget_class->motion_notify_event = eel_canvas_motion;
+	widget_class->expose_event = eel_canvas_expose;
+	widget_class->key_press_event = eel_canvas_key;
+	widget_class->key_release_event = eel_canvas_key;
+	widget_class->enter_notify_event = eel_canvas_crossing;
+	widget_class->leave_notify_event = eel_canvas_crossing;
+	widget_class->focus_in_event = eel_canvas_focus_in;
+	widget_class->focus_out_event = eel_canvas_focus_out;
+
+	klass->draw_background = eel_canvas_draw_background;
+	klass->request_update = eel_canvas_request_update_real;
+
+	canvas_signals[DRAW_BACKGROUND] =
+		g_signal_new ("draw_background",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EelCanvasClass, draw_background),
+			      NULL, NULL,
+			      eel_marshal_VOID__INT_INT_INT_INT,
+			      G_TYPE_NONE, 4, 
+			      G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
+
+	atk_registry_set_factory_type (atk_get_default_registry (),
+				       EEL_TYPE_CANVAS,
+				       eel_canvas_accessible_factory_get_type ());
+}
+
+/* Callback used when the root item of a canvas is destroyed.  The user should
+ * never ever do this, so we panic if this happens.
+ */
+static void
+panic_root_destroyed (GtkObject *object, gpointer data)
+{
+	g_error ("Eeeek, root item %p of canvas %p was destroyed!", object, data);
+}
+
+/* Object initialization function for EelCanvas */
+static void
+eel_canvas_init (EelCanvas *canvas)
+{
+	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
+
+	gtk_widget_set_redraw_on_allocate (GTK_WIDGET (canvas), FALSE);
+
+	canvas->scroll_x1 = 0.0;
+	canvas->scroll_y1 = 0.0;
+	canvas->scroll_x2 = canvas->layout.width;
+	canvas->scroll_y2 = canvas->layout.height;
+
+	canvas->pixels_per_unit = 1.0;
+
+	canvas->pick_event.type = GDK_LEAVE_NOTIFY;
+	canvas->pick_event.crossing.x = 0;
+	canvas->pick_event.crossing.y = 0;
+
+	gtk_layout_set_hadjustment (GTK_LAYOUT (canvas), NULL);
+	gtk_layout_set_vadjustment (GTK_LAYOUT (canvas), NULL);
+
+	/* Create the root item as a special case */
+
+	canvas->root = EEL_CANVAS_ITEM (g_object_new (eel_canvas_group_get_type (), NULL));
+	canvas->root->canvas = canvas;
+
+	g_object_ref (GTK_OBJECT (canvas->root));
+	gtk_object_sink (GTK_OBJECT (canvas->root));
+
+	canvas->root_destroy_id = g_signal_connect (GTK_OBJECT (canvas->root), "destroy",
+						    (GtkSignalFunc) panic_root_destroyed,
+						    canvas);
+
+	canvas->need_repick = TRUE;
+	canvas->doing_update = FALSE;
+}
+
+/* Convenience function to remove the idle handler of a canvas */
+static void
+remove_idle (EelCanvas *canvas)
+{
+	if (canvas->idle_id == 0)
+		return;
+
+	g_source_remove (canvas->idle_id);
+	canvas->idle_id = 0;
+}
+
+/* Removes the transient state of the canvas (idle handler, grabs). */
+static void
+shutdown_transients (EelCanvas *canvas)
+{
+	/* We turn off the need_redraw flag, since if the canvas is mapped again
+	 * it will request a redraw anyways.  We do not turn off the need_update
+	 * flag, though, because updates are not queued when the canvas remaps
+	 * itself.
+	 */
+	if (canvas->need_redraw) {
+		canvas->need_redraw = FALSE;
+	}
+
+	if (canvas->grabbed_item) {
+		GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (canvas));
+		canvas->grabbed_item = NULL;
+		gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
+	}
+
+	remove_idle (canvas);
+}
+
+/* Destroy handler for EelCanvas */
+static void
+eel_canvas_destroy (GtkObject *object)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (object));
+
+	/* remember, destroy can be run multiple times! */
+
+	canvas = EEL_CANVAS (object);
+
+	if (canvas->root_destroy_id) {
+		g_signal_handler_disconnect (GTK_OBJECT (canvas->root), canvas->root_destroy_id);
+		canvas->root_destroy_id = 0;
+	}
+	if (canvas->root) {
+		g_object_unref (GTK_OBJECT (canvas->root));
+		canvas->root = NULL;
+	}
+
+	shutdown_transients (canvas);
+
+	if (GTK_OBJECT_CLASS (canvas_parent_class)->destroy)
+		(* GTK_OBJECT_CLASS (canvas_parent_class)->destroy) (object);
+}
+
+/**
+ * eel_canvas_new:
+ * @void:
+ *
+ * Creates a new empty canvas.  If you wish to use the
+ * &EelCanvasImage item inside this canvas, then you must push the gdk_imlib
+ * visual and colormap before calling this function, and they can be popped
+ * afterwards.
+ *
+ * Return value: A newly-created canvas.
+ **/
+GtkWidget *
+eel_canvas_new (void)
+{
+	return GTK_WIDGET (g_object_new (eel_canvas_get_type (), NULL));
+}
+
+/* Map handler for the canvas */
+static void
+eel_canvas_map (GtkWidget *widget)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (widget));
+
+	/* Normal widget mapping stuff */
+
+	if (GTK_WIDGET_CLASS (canvas_parent_class)->map)
+		(* GTK_WIDGET_CLASS (canvas_parent_class)->map) (widget);
+
+	canvas = EEL_CANVAS (widget);
+
+	/* Map items */
+
+	if (canvas->root->object.flags & EEL_CANVAS_ITEM_VISIBLE &&
+	    !(canvas->root->object.flags & EEL_CANVAS_ITEM_MAPPED) &&
+	    EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->map)
+		(* EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->map) (canvas->root);
+}
+
+/* Unmap handler for the canvas */
+static void
+eel_canvas_unmap (GtkWidget *widget)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (widget));
+
+	canvas = EEL_CANVAS (widget);
+
+	shutdown_transients (canvas);
+
+	/* Unmap items */
+
+	if (EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->unmap)
+		(* EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->unmap) (canvas->root);
+
+	/* Normal widget unmapping stuff */
+
+	if (GTK_WIDGET_CLASS (canvas_parent_class)->unmap)
+		(* GTK_WIDGET_CLASS (canvas_parent_class)->unmap) (widget);
+}
+
+/* Realize handler for the canvas */
+static void
+eel_canvas_realize (GtkWidget *widget)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (widget));
+
+	/* Normal widget realization stuff */
+
+	if (GTK_WIDGET_CLASS (canvas_parent_class)->realize)
+		(* GTK_WIDGET_CLASS (canvas_parent_class)->realize) (widget);
+
+	canvas = EEL_CANVAS (widget);
+
+	gdk_window_set_events (canvas->layout.bin_window,
+			       (gdk_window_get_events (canvas->layout.bin_window)
+				 | GDK_EXPOSURE_MASK
+				 | GDK_BUTTON_PRESS_MASK
+				 | GDK_BUTTON_RELEASE_MASK
+				 | GDK_POINTER_MOTION_MASK
+				 | GDK_KEY_PRESS_MASK
+				 | GDK_KEY_RELEASE_MASK
+				 | GDK_ENTER_NOTIFY_MASK
+				 | GDK_LEAVE_NOTIFY_MASK
+				 | GDK_FOCUS_CHANGE_MASK));
+
+	/* Create our own temporary pixmap gc and realize all the items */
+
+	canvas->pixmap_gc = gdk_gc_new (canvas->layout.bin_window);
+
+	(* EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->realize) (canvas->root);
+}
+
+/* Unrealize handler for the canvas */
+static void
+eel_canvas_unrealize (GtkWidget *widget)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (widget));
+
+	canvas = EEL_CANVAS (widget);
+
+	shutdown_transients (canvas);
+
+	/* Unrealize items and parent widget */
+
+	(* EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->unrealize) (canvas->root);
+
+	g_object_unref (canvas->pixmap_gc);
+	canvas->pixmap_gc = NULL;
+
+	if (GTK_WIDGET_CLASS (canvas_parent_class)->unrealize)
+		(* GTK_WIDGET_CLASS (canvas_parent_class)->unrealize) (widget);
+}
+
+/* Handles scrolling of the canvas.  Adjusts the scrolling and zooming offset to
+ * keep as much as possible of the canvas scrolling region in view.
+ */
+static void
+scroll_to (EelCanvas *canvas, int cx, int cy)
+{
+	int scroll_width, scroll_height;
+	int right_limit, bottom_limit;
+	int old_zoom_xofs, old_zoom_yofs;
+	int changed_x = FALSE, changed_y = FALSE;
+	int canvas_width, canvas_height;
+
+	canvas_width = GTK_WIDGET (canvas)->allocation.width;
+	canvas_height = GTK_WIDGET (canvas)->allocation.height;
+
+	scroll_width = floor ((canvas->scroll_x2 - canvas->scroll_x1) * canvas->pixels_per_unit + 0.5);
+	scroll_height = floor ((canvas->scroll_y2 - canvas->scroll_y1) * canvas->pixels_per_unit + 0.5);
+
+	right_limit = scroll_width - canvas_width;
+	bottom_limit = scroll_height - canvas_height;
+
+	old_zoom_xofs = canvas->zoom_xofs;
+	old_zoom_yofs = canvas->zoom_yofs;
+
+	if (right_limit < 0) {
+		cx = 0;
+		if (canvas->center_scroll_region) {
+			canvas->zoom_xofs = (canvas_width - scroll_width) / 2;
+			scroll_width = canvas_width;
+		} else {
+			canvas->zoom_xofs = 0;
+		}
+	} else if (cx < 0) {
+		cx = 0;
+		canvas->zoom_xofs = 0;
+	} else if (cx > right_limit) {
+		cx = right_limit;
+		canvas->zoom_xofs = 0;
+	} else
+		canvas->zoom_xofs = 0;
+
+	if (bottom_limit < 0) {
+		cy = 0;
+		if (canvas->center_scroll_region) {
+			canvas->zoom_yofs = (canvas_height - scroll_height) / 2;
+			scroll_height = canvas_height;
+		} else {
+			canvas->zoom_yofs = 0;
+		}
+	} else if (cy < 0) {
+		cy = 0;
+		canvas->zoom_yofs = 0;
+	} else if (cy > bottom_limit) {
+		cy = bottom_limit;
+		canvas->zoom_yofs = 0;
+	} else
+		canvas->zoom_yofs = 0;
+
+	if ((canvas->zoom_xofs != old_zoom_xofs) || (canvas->zoom_yofs != old_zoom_yofs)) {
+		/* This can only occur, if either canvas size or widget size changes */
+		/* So I think we can request full redraw here */
+		/* More stuff - we have to mark root as needing fresh affine (Lauris) */
+		if (!(canvas->root->object.flags & EEL_CANVAS_ITEM_NEED_DEEP_UPDATE)) {
+			canvas->root->object.flags |= EEL_CANVAS_ITEM_NEED_DEEP_UPDATE;
+			eel_canvas_request_update (canvas);
+		}
+		gtk_widget_queue_draw (GTK_WIDGET (canvas));
+	}
+
+	if (((int) canvas->layout.hadjustment->value) != cx) {
+		canvas->layout.hadjustment->value = cx;
+		changed_x = TRUE;
+	}
+
+	if (((int) canvas->layout.vadjustment->value) != cy) {
+		canvas->layout.vadjustment->value = cy;
+		changed_y = TRUE;
+	}
+
+	if ((scroll_width != (int) canvas->layout.width) || (scroll_height != (int) canvas->layout.height)) {
+		gtk_layout_set_size (GTK_LAYOUT (canvas), scroll_width, scroll_height);
+	}
+	
+	/* Signal GtkLayout that it should do a redraw. */
+	if (changed_x)
+		g_signal_emit_by_name (GTK_OBJECT (canvas->layout.hadjustment), "value_changed");
+	if (changed_y)
+		g_signal_emit_by_name (GTK_OBJECT (canvas->layout.vadjustment), "value_changed");
+}
+
+/* Size allocation handler for the canvas */
+static void
+eel_canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (widget));
+	g_assert (allocation != NULL);
+
+	if (GTK_WIDGET_CLASS (canvas_parent_class)->size_allocate)
+		(* GTK_WIDGET_CLASS (canvas_parent_class)->size_allocate) (widget, allocation);
+
+	canvas = EEL_CANVAS (widget);
+
+	/* Recenter the view, if appropriate */
+
+	canvas->layout.hadjustment->page_size = allocation->width;
+	canvas->layout.hadjustment->page_increment = allocation->width / 2;
+
+	canvas->layout.vadjustment->page_size = allocation->height;
+	canvas->layout.vadjustment->page_increment = allocation->height / 2;
+
+	scroll_to (canvas,
+		   canvas->layout.hadjustment->value,
+		   canvas->layout.vadjustment->value);
+
+	g_signal_emit_by_name (GTK_OBJECT (canvas->layout.hadjustment), "changed");
+	g_signal_emit_by_name (GTK_OBJECT (canvas->layout.vadjustment), "changed");
+}
+
+/* Emits an event for an item in the canvas, be it the current item, grabbed
+ * item, or focused item, as appropriate.
+ */
+
+static int
+emit_event (EelCanvas *canvas, GdkEvent *event)
+{
+	GdkEvent ev;
+	gint finished;
+	EelCanvasItem *item;
+	EelCanvasItem *parent;
+	guint mask;
+
+	/* Could be an old pick event */
+	if (!GTK_WIDGET_REALIZED (canvas)) {
+		return FALSE;
+	}
+
+	/* Perform checks for grabbed items */
+
+	if (canvas->grabbed_item &&
+	    !is_descendant (canvas->current_item, canvas->grabbed_item)) {
+		return FALSE;
+        }
+
+	if (canvas->grabbed_item) {
+		switch (event->type) {
+		case GDK_ENTER_NOTIFY:
+			mask = GDK_ENTER_NOTIFY_MASK;
+			break;
+
+		case GDK_LEAVE_NOTIFY:
+			mask = GDK_LEAVE_NOTIFY_MASK;
+			break;
+
+		case GDK_MOTION_NOTIFY:
+			mask = GDK_POINTER_MOTION_MASK;
+			break;
+
+		case GDK_BUTTON_PRESS:
+		case GDK_2BUTTON_PRESS:
+		case GDK_3BUTTON_PRESS:
+			mask = GDK_BUTTON_PRESS_MASK;
+			break;
+
+		case GDK_BUTTON_RELEASE:
+			mask = GDK_BUTTON_RELEASE_MASK;
+			break;
+
+		case GDK_KEY_PRESS:
+			mask = GDK_KEY_PRESS_MASK;
+			break;
+
+		case GDK_KEY_RELEASE:
+			mask = GDK_KEY_RELEASE_MASK;
+			break;
+
+		default:
+			mask = 0;
+			break;
+		}
+
+		if (!(mask & canvas->grabbed_event_mask))
+			return FALSE;
+	}
+
+	/* Convert to world coordinates -- we have two cases because of diferent
+	 * offsets of the fields in the event structures.
+	 */
+
+	ev = *event;
+
+	switch (ev.type)
+        {
+	case GDK_ENTER_NOTIFY:
+	case GDK_LEAVE_NOTIFY:
+		eel_canvas_window_to_world (canvas,
+					      ev.crossing.x, ev.crossing.y,
+					      &ev.crossing.x, &ev.crossing.y);
+		break;
+
+	case GDK_MOTION_NOTIFY:
+                eel_canvas_window_to_world (canvas,
+                                              ev.motion.x, ev.motion.y,
+                                              &ev.motion.x, &ev.motion.y);
+                break;
+
+	case GDK_BUTTON_PRESS:
+	case GDK_2BUTTON_PRESS:
+	case GDK_3BUTTON_PRESS:
+                eel_canvas_window_to_world (canvas,
+                                              ev.motion.x, ev.motion.y,
+                                              &ev.motion.x, &ev.motion.y);
+                break;
+
+	case GDK_BUTTON_RELEASE:
+		eel_canvas_window_to_world (canvas,
+					      ev.motion.x, ev.motion.y,
+					      &ev.motion.x, &ev.motion.y);
+		break;
+
+	default:
+		break;
+	}
+
+	/* Choose where we send the event */
+
+	item = canvas->current_item;
+
+	if (canvas->focused_item
+	    && ((event->type == GDK_KEY_PRESS) ||
+		(event->type == GDK_KEY_RELEASE) ||
+		(event->type == GDK_FOCUS_CHANGE)))
+		item = canvas->focused_item;
+
+	/* The event is propagated up the hierarchy (for if someone connected to
+	 * a group instead of a leaf event), and emission is stopped if a
+	 * handler returns TRUE, just like for GtkWidget events.
+	 */
+
+	finished = FALSE;
+
+	while (item && !finished) {
+		g_object_ref (GTK_OBJECT (item));
+
+		g_signal_emit (
+		       GTK_OBJECT (item), item_signals[ITEM_EVENT], 0,
+			&ev, &finished);
+		
+		parent = item->parent;
+		g_object_unref (GTK_OBJECT (item));
+
+		item = parent;
+	}
+
+	return finished;
+}
+
+/* Re-picks the current item in the canvas, based on the event's coordinates.
+ * Also emits enter/leave events for items as appropriate.
+ */
+static int
+pick_current_item (EelCanvas *canvas, GdkEvent *event)
+{
+	int button_down;
+	double x, y;
+	int cx, cy;
+	int retval;
+
+	retval = FALSE;
+
+	/* If a button is down, we'll perform enter and leave events on the
+	 * current item, but not enter on any other item.  This is more or less
+	 * like X pointer grabbing for canvas items.
+	 */
+	button_down = canvas->state & (GDK_BUTTON1_MASK
+				       | GDK_BUTTON2_MASK
+				       | GDK_BUTTON3_MASK
+				       | GDK_BUTTON4_MASK
+				       | GDK_BUTTON5_MASK);
+	if (!button_down)
+		canvas->left_grabbed_item = FALSE;
+
+	/* Save the event in the canvas.  This is used to synthesize enter and
+	 * leave events in case the current item changes.  It is also used to
+	 * re-pick the current item if the current one gets deleted.  Also,
+	 * synthesize an enter event.
+	 */
+	if (event != &canvas->pick_event) {
+		if ((event->type == GDK_MOTION_NOTIFY) || (event->type == GDK_BUTTON_RELEASE)) {
+			/* these fields have the same offsets in both types of events */
+
+			canvas->pick_event.crossing.type       = GDK_ENTER_NOTIFY;
+			canvas->pick_event.crossing.window     = event->motion.window;
+			canvas->pick_event.crossing.send_event = event->motion.send_event;
+			canvas->pick_event.crossing.subwindow  = NULL;
+			canvas->pick_event.crossing.x          = event->motion.x;
+			canvas->pick_event.crossing.y          = event->motion.y;
+			canvas->pick_event.crossing.mode       = GDK_CROSSING_NORMAL;
+			canvas->pick_event.crossing.detail     = GDK_NOTIFY_NONLINEAR;
+			canvas->pick_event.crossing.focus      = FALSE;
+			canvas->pick_event.crossing.state      = event->motion.state;
+
+			/* these fields don't have the same offsets in both types of events */
+
+			if (event->type == GDK_MOTION_NOTIFY) {
+				canvas->pick_event.crossing.x_root = event->motion.x_root;
+				canvas->pick_event.crossing.y_root = event->motion.y_root;
+			} else {
+				canvas->pick_event.crossing.x_root = event->button.x_root;
+				canvas->pick_event.crossing.y_root = event->button.y_root;
+			}
+		} else
+			canvas->pick_event = *event;
+	}
+
+	/* Don't do anything else if this is a recursive call */
+
+	if (canvas->in_repick)
+		return retval;
+
+	/* LeaveNotify means that there is no current item, so we don't look for one */
+
+	if (canvas->pick_event.type != GDK_LEAVE_NOTIFY) {
+		/* these fields don't have the same offsets in both types of events */
+
+		if (canvas->pick_event.type == GDK_ENTER_NOTIFY) {
+			x = canvas->pick_event.crossing.x;
+			y = canvas->pick_event.crossing.y;
+		} else {
+			x = canvas->pick_event.motion.x;
+			y = canvas->pick_event.motion.y;
+		}
+
+		/* canvas pixel coords */
+
+		cx = (int) (x + 0.5);
+		cy = (int) (y + 0.5);
+
+		/* world coords */
+		eel_canvas_c2w (canvas, cx, cy, &x, &y);
+
+		/* find the closest item */
+		if (canvas->root->object.flags & EEL_CANVAS_ITEM_MAPPED)
+			eel_canvas_item_invoke_point (canvas->root, x, y, cx, cy,
+							&canvas->new_current_item);
+		else
+			canvas->new_current_item = NULL;
+	} else
+		canvas->new_current_item = NULL;
+
+	if ((canvas->new_current_item == canvas->current_item) && !canvas->left_grabbed_item)
+		return retval; /* current item did not change */
+
+	/* Synthesize events for old and new current items */
+
+	if ((canvas->new_current_item != canvas->current_item)
+	    && (canvas->current_item != NULL)
+	    && !canvas->left_grabbed_item) {
+		GdkEvent new_event;
+
+		new_event = canvas->pick_event;
+		new_event.type = GDK_LEAVE_NOTIFY;
+
+		new_event.crossing.detail = GDK_NOTIFY_ANCESTOR;
+		new_event.crossing.subwindow = NULL;
+		canvas->in_repick = TRUE;
+		retval = emit_event (canvas, &new_event);
+		canvas->in_repick = FALSE;
+	}
+
+	/* new_current_item may have been set to NULL during the call to emit_event() above */
+
+	if ((canvas->new_current_item != canvas->current_item) && button_down) {
+		canvas->left_grabbed_item = TRUE;
+		return retval;
+	}
+
+	/* Handle the rest of cases */
+
+	canvas->left_grabbed_item = FALSE;
+	canvas->current_item = canvas->new_current_item;
+
+	if (canvas->current_item != NULL) {
+		GdkEvent new_event;
+
+		new_event = canvas->pick_event;
+		new_event.type = GDK_ENTER_NOTIFY;
+		new_event.crossing.detail = GDK_NOTIFY_ANCESTOR;
+		new_event.crossing.subwindow = NULL;
+		retval = emit_event (canvas, &new_event);
+	}
+
+	return retval;
+}
+
+/* Button event handler for the canvas */
+static gint
+eel_canvas_button (GtkWidget *widget, GdkEventButton *event)
+{
+	EelCanvas *canvas;
+	int mask;
+	int retval;
+
+	g_assert (EEL_IS_CANVAS (widget));
+	g_assert (event != NULL);
+
+	retval = FALSE;
+
+	canvas = EEL_CANVAS (widget);
+
+	/*
+	 * dispatch normally regardless of the event's window if an item has
+	 * has a pointer grab in effect
+	 */
+	if (!canvas->grabbed_item && event->window != canvas->layout.bin_window)
+		return retval;
+
+	switch (event->button) {
+	case 1:
+		mask = GDK_BUTTON1_MASK;
+		break;
+	case 2:
+		mask = GDK_BUTTON2_MASK;
+		break;
+	case 3:
+		mask = GDK_BUTTON3_MASK;
+		break;
+	case 4:
+		mask = GDK_BUTTON4_MASK;
+		break;
+	case 5:
+		mask = GDK_BUTTON5_MASK;
+		break;
+	default:
+		mask = 0;
+	}
+
+	switch (event->type) {
+	case GDK_BUTTON_PRESS:
+	case GDK_2BUTTON_PRESS:
+	case GDK_3BUTTON_PRESS:
+		/* Pick the current item as if the button were not pressed, and
+		 * then process the event.
+		 */
+		canvas->state = event->state;
+		pick_current_item (canvas, (GdkEvent *) event);
+		canvas->state ^= mask;
+		retval = emit_event (canvas, (GdkEvent *) event);
+		break;
+
+	case GDK_BUTTON_RELEASE:
+		/* Process the event as if the button were pressed, then repick
+		 * after the button has been released
+		 */
+		canvas->state = event->state;
+		retval = emit_event (canvas, (GdkEvent *) event);
+		event->state ^= mask;
+		canvas->state = event->state;
+		pick_current_item (canvas, (GdkEvent *) event);
+		event->state ^= mask;
+		break;
+
+	default:
+		g_assert_not_reached ();
+	}
+
+	return retval;
+}
+
+/* Motion event handler for the canvas */
+static gint
+eel_canvas_motion (GtkWidget *widget, GdkEventMotion *event)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (widget));
+	g_assert (event != NULL);
+
+	canvas = EEL_CANVAS (widget);
+
+	if (event->window != canvas->layout.bin_window)
+		return FALSE;
+
+	canvas->state = event->state;
+	pick_current_item (canvas, (GdkEvent *) event);
+	return emit_event (canvas, (GdkEvent *) event);
+}
+
+/* Key event handler for the canvas */
+static gint
+eel_canvas_key (GtkWidget *widget, GdkEventKey *event)
+{
+	EelCanvas *canvas;
+	
+	g_assert (EEL_IS_CANVAS (widget));
+	g_assert (event != NULL);
+
+	canvas = EEL_CANVAS (widget);
+	
+	if (emit_event (canvas, (GdkEvent *) event))
+		return TRUE;
+	if (event->type == GDK_KEY_RELEASE)
+		return GTK_WIDGET_CLASS (canvas_parent_class)->key_release_event (widget, event);
+	else
+		return GTK_WIDGET_CLASS (canvas_parent_class)->key_press_event (widget, event);
+}
+
+
+/* Crossing event handler for the canvas */
+static gint
+eel_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event)
+{
+	EelCanvas *canvas;
+
+	g_assert (EEL_IS_CANVAS (widget));
+	g_assert (event != NULL);
+
+	canvas = EEL_CANVAS (widget);
+
+	if (event->window != canvas->layout.bin_window)
+		return FALSE;
+
+	canvas->state = event->state;
+	return pick_current_item (canvas, (GdkEvent *) event);
+}
+
+/* Focus in handler for the canvas */
+static gint
+eel_canvas_focus_in (GtkWidget *widget, GdkEventFocus *event)
+{
+	EelCanvas *canvas;
+
+	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
+
+	canvas = EEL_CANVAS (widget);
+
+	if (canvas->focused_item)
+		return emit_event (canvas, (GdkEvent *) event);
+	else
+		return FALSE;
+}
+
+/* Focus out handler for the canvas */
+static gint
+eel_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
+{
+	EelCanvas *canvas;
+
+	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
+
+	canvas = EEL_CANVAS (widget);
+
+	if (canvas->focused_item)
+		return emit_event (canvas, (GdkEvent *) event);
+	else
+		return FALSE;
+}
+
+/* Expose handler for the canvas */
+static gint
+eel_canvas_expose (GtkWidget *widget, GdkEventExpose *event)
+{
+	EelCanvas *canvas;
+
+	canvas = EEL_CANVAS (widget);
+
+	if (!GTK_WIDGET_DRAWABLE (widget) || (event->window != canvas->layout.bin_window)) return FALSE;
+
+#ifdef VERBOSE
+	g_print ("Expose\n");
+#endif
+	/* If there are any outstanding items that need updating, do them now */
+	if (canvas->idle_id) {
+		g_source_remove (canvas->idle_id);
+		canvas->idle_id = 0;
+	}
+	if (canvas->need_update) {
+		g_assert (!canvas->doing_update);
+
+		canvas->doing_update = TRUE;
+		eel_canvas_item_invoke_update (canvas->root, 0, 0, 0);
+
+		g_assert (canvas->doing_update);
+
+		canvas->doing_update = FALSE;
+
+		canvas->need_update = FALSE;
+	}
+
+	/* Hmmm. Would like to queue antiexposes if the update marked
+	   anything that is gonna get redrawn as invalid */
+	
+	
+	g_signal_emit (G_OBJECT (canvas), canvas_signals[DRAW_BACKGROUND], 0, 
+		       event->area.x, event->area.y,
+		       event->area.width, event->area.height);
+	
+	if (canvas->root->object.flags & EEL_CANVAS_ITEM_MAPPED)
+		(* EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->draw) (canvas->root,
+								      canvas->layout.bin_window,
+								      event);
+
+
+
+	/* Chain up to get exposes on child widgets */
+	GTK_WIDGET_CLASS (canvas_parent_class)->expose_event (widget, event);
+
+	return FALSE;
+}
+
+static void
+eel_canvas_draw_background (EelCanvas *canvas,
+			    int x, int y, int width, int height)
+{
+	/* By default, we use the style background. */
+	gdk_gc_set_foreground (canvas->pixmap_gc,
+			       &GTK_WIDGET (canvas)->style->bg[GTK_STATE_NORMAL]);
+	gdk_draw_rectangle (canvas->layout.bin_window,
+			    canvas->pixmap_gc,
+			    TRUE,
+			    x, y,
+			    width, height);
+}
+
+static void
+do_update (EelCanvas *canvas)
+{
+	/* Cause the update if necessary */
+
+update_again:
+	if (canvas->need_update) {
+		g_assert (!canvas->doing_update);
+
+		canvas->doing_update = TRUE;
+		eel_canvas_item_invoke_update (canvas->root, 0, 0, 0);
+
+		g_assert (canvas->doing_update);
+
+		canvas->doing_update = FALSE;
+
+		canvas->need_update = FALSE;
+	}
+
+	/* Pick new current item */
+
+	while (canvas->need_repick) {
+		canvas->need_repick = FALSE;
+		pick_current_item (canvas, &canvas->pick_event);
+	}
+
+	/* it is possible that during picking we emitted an event in which
+	   the user then called some function which then requested update
+	   of something.  Without this we'd be left in a state where
+	   need_update would have been left TRUE and the canvas would have
+	   been left unpainted. */
+	if (canvas->need_update) {
+		goto update_again;
+	}
+}
+
+/* Idle handler for the canvas.  It deals with pending updates and redraws. */
+static gint
+idle_handler (gpointer data)
+{
+	EelCanvas *canvas;
+
+	GDK_THREADS_ENTER ();
+
+	canvas = EEL_CANVAS (data);
+	do_update (canvas);
+
+	/* Reset idle id */
+	canvas->idle_id = 0;
+
+	GDK_THREADS_LEAVE ();
+
+	return FALSE;
+}
+
+/* Convenience function to add an idle handler to a canvas */
+static void
+add_idle (EelCanvas *canvas)
+{
+	if (!canvas->idle_id) {
+		/* We let the update idle handler have higher priority
+		 * than the redraw idle handler so the canvas state
+		 * will be updated during the expose event.  canvas in
+		 * expose_event.
+		 */
+		canvas->idle_id = g_idle_add_full (GDK_PRIORITY_REDRAW - 20,
+						   idle_handler, canvas, NULL);
+	}
+}
+
+/**
+ * eel_canvas_root:
+ * @canvas: A canvas.
+ *
+ * Queries the root group of a canvas.
+ *
+ * Return value: The root group of the specified canvas.
+ **/
+EelCanvasGroup *
+eel_canvas_root (EelCanvas *canvas)
+{
+	g_return_val_if_fail (EEL_IS_CANVAS (canvas), NULL);
+
+	return EEL_CANVAS_GROUP (canvas->root);
+}
+
+
+/**
+ * eel_canvas_set_scroll_region:
+ * @canvas: A canvas.
+ * @x1: Leftmost limit of the scrolling region.
+ * @y1: Upper limit of the scrolling region.
+ * @x2: Rightmost limit of the scrolling region.
+ * @y2: Lower limit of the scrolling region.
+ *
+ * Sets the scrolling region of a canvas to the specified rectangle.  The canvas
+ * will then be able to scroll only within this region.  The view of the canvas
+ * is adjusted as appropriate to display as much of the new region as possible.
+ **/
+void
+eel_canvas_set_scroll_region (EelCanvas *canvas, double x1, double y1, double x2, double y2)
+{
+	double wxofs, wyofs;
+	int xofs, yofs;
+
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	if ((canvas->scroll_x1 == x1) && (canvas->scroll_y1 == y1) &&
+	    (canvas->scroll_x2 == x2) && (canvas->scroll_y2 == y2)) {
+		return;
+	}
+	
+	/*
+	 * Set the new scrolling region.  If possible, do not move the visible contents of the
+	 * canvas.
+	 */
+
+	eel_canvas_c2w (canvas,
+			  GTK_LAYOUT (canvas)->hadjustment->value + canvas->zoom_xofs,
+			  GTK_LAYOUT (canvas)->vadjustment->value + canvas->zoom_yofs,
+			  /*canvas->zoom_xofs,
+			  canvas->zoom_yofs,*/
+			  &wxofs, &wyofs);
+
+	canvas->scroll_x1 = x1;
+	canvas->scroll_y1 = y1;
+	canvas->scroll_x2 = x2;
+	canvas->scroll_y2 = y2;
+
+	eel_canvas_w2c (canvas, wxofs, wyofs, &xofs, &yofs);
+
+	scroll_to (canvas, xofs, yofs);
+
+	canvas->need_repick = TRUE;
+
+	if (!(canvas->root->object.flags & EEL_CANVAS_ITEM_NEED_DEEP_UPDATE)) {
+		canvas->root->object.flags |= EEL_CANVAS_ITEM_NEED_DEEP_UPDATE;
+		eel_canvas_request_update (canvas);
+	}
+}
+
+
+/**
+ * eel_canvas_get_scroll_region:
+ * @canvas: A canvas.
+ * @x1: Leftmost limit of the scrolling region (return value).
+ * @y1: Upper limit of the scrolling region (return value).
+ * @x2: Rightmost limit of the scrolling region (return value).
+ * @y2: Lower limit of the scrolling region (return value).
+ *
+ * Queries the scrolling region of a canvas.
+ **/
+void
+eel_canvas_get_scroll_region (EelCanvas *canvas, double *x1, double *y1, double *x2, double *y2)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	if (x1)
+		*x1 = canvas->scroll_x1;
+
+	if (y1)
+		*y1 = canvas->scroll_y1;
+
+	if (x2)
+		*x2 = canvas->scroll_x2;
+
+	if (y2)
+		*y2 = canvas->scroll_y2;
+}
+
+void
+eel_canvas_set_center_scroll_region (EelCanvas *canvas,
+				     gboolean center_scroll_region)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	canvas->center_scroll_region = center_scroll_region != 0;
+
+	scroll_to (canvas,
+		   canvas->layout.hadjustment->value,
+		   canvas->layout.vadjustment->value);
+}
+
+
+/**
+ * eel_canvas_set_pixels_per_unit:
+ * @canvas: A canvas.
+ * @n: The number of pixels that correspond to one canvas unit.
+ *
+ * Sets the zooming factor of a canvas by specifying the number of pixels that
+ * correspond to one canvas unit.
+ **/
+void
+eel_canvas_set_pixels_per_unit (EelCanvas *canvas, double n)
+{
+	GtkWidget *widget;
+	double cx, cy;
+	int x1, y1;
+	int center_x, center_y;
+	GdkWindow *window;
+	GdkWindowAttr attributes;
+	gint attributes_mask;
+
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+	g_return_if_fail (n > EEL_CANVAS_EPSILON);
+
+	widget = GTK_WIDGET (canvas);
+
+	center_x = widget->allocation.width / 2;
+	center_y = widget->allocation.height / 2;
+
+	/* Find the coordinates of the screen center in units. */
+	cx = (canvas->layout.hadjustment->value + center_x) / canvas->pixels_per_unit + canvas->scroll_x1 + canvas->zoom_xofs;
+	cy = (canvas->layout.vadjustment->value + center_y) / canvas->pixels_per_unit + canvas->scroll_y1 + canvas->zoom_yofs;
+
+	/* Now calculate the new offset of the upper left corner. (round not truncate) */
+	x1 = ((cx - canvas->scroll_x1) * n) - center_x + .5;
+	y1 = ((cy - canvas->scroll_y1) * n) - center_y + .5;
+
+	canvas->pixels_per_unit = n;
+
+	if (!(canvas->root->object.flags & EEL_CANVAS_ITEM_NEED_DEEP_UPDATE)) {
+		canvas->root->object.flags |= EEL_CANVAS_ITEM_NEED_DEEP_UPDATE;
+		eel_canvas_request_update (canvas);
+	}
+
+	/* Map a background None window over the bin_window to avoid
+	 * scrolling the window scroll causing exposes.
+	 */
+	window = NULL;
+	if (GTK_WIDGET_MAPPED (widget)) {
+		attributes.window_type = GDK_WINDOW_CHILD;
+		attributes.x = widget->allocation.x;
+		attributes.y = widget->allocation.y;
+		attributes.width = widget->allocation.width;
+		attributes.height = widget->allocation.height;
+		attributes.wclass = GDK_INPUT_OUTPUT;
+		attributes.visual = gtk_widget_get_visual (widget);
+		attributes.colormap = gtk_widget_get_colormap (widget);
+		attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;
+		
+		attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+		
+		window = gdk_window_new (gtk_widget_get_parent_window (widget),
+					 &attributes, attributes_mask);
+		gdk_window_set_back_pixmap (window, NULL, FALSE);
+		gdk_window_set_user_data (window, widget);
+		
+		gdk_window_show (window);
+	}
+
+	scroll_to (canvas, x1, y1);
+
+	/* If we created a an overlapping background None window, remove it how.
+	 *
+	 * TODO: We would like to temporarily set the bin_window background to
+	 * None to avoid clearing the bin_window to the background, but gdk doesn't
+	 * expose enought to let us do this, so we get a flash-effect here. At least
+	 * it looks better than scroll + expose.
+	 */
+	if (window != NULL) {
+		gdk_window_hide (window);
+		gdk_window_set_user_data (window, NULL);
+		gdk_window_destroy (window);
+	}
+
+	canvas->need_repick = TRUE;
+}
+
+/**
+ * eel_canvas_scroll_to:
+ * @canvas: A canvas.
+ * @cx: Horizontal scrolling offset in canvas pixel units.
+ * @cy: Vertical scrolling offset in canvas pixel units.
+ *
+ * Makes a canvas scroll to the specified offsets, given in canvas pixel units.
+ * The canvas will adjust the view so that it is not outside the scrolling
+ * region.  This function is typically not used, as it is better to hook
+ * scrollbars to the canvas layout's scrolling adjusments.
+ **/
+void
+eel_canvas_scroll_to (EelCanvas *canvas, int cx, int cy)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	scroll_to (canvas, cx, cy);
+}
+
+/**
+ * eel_canvas_get_scroll_offsets:
+ * @canvas: A canvas.
+ * @cx: Horizontal scrolling offset (return value).
+ * @cy: Vertical scrolling offset (return value).
+ *
+ * Queries the scrolling offsets of a canvas.  The values are returned in canvas
+ * pixel units.
+ **/
+void
+eel_canvas_get_scroll_offsets (EelCanvas *canvas, int *cx, int *cy)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	if (cx)
+		*cx = canvas->layout.hadjustment->value;
+
+	if (cy)
+		*cy = canvas->layout.vadjustment->value;
+}
+
+/**
+ * eel_canvas_update_now:
+ * @canvas: A canvas.
+ *
+ * Forces an immediate update and redraw of a canvas.  If the canvas does not
+ * have any pending update or redraw requests, then no action is taken.  This is
+ * typically only used by applications that need explicit control of when the
+ * display is updated, like games.  It is not needed by normal applications.
+ */
+void
+eel_canvas_update_now (EelCanvas *canvas)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	if (!(canvas->need_update || canvas->need_redraw))
+		return;
+	remove_idle (canvas);
+	do_update (canvas);
+}
+
+/**
+ * eel_canvas_get_item_at:
+ * @canvas: A canvas.
+ * @x: X position in world coordinates.
+ * @y: Y position in world coordinates.
+ *
+ * Looks for the item that is under the specified position, which must be
+ * specified in world coordinates.
+ *
+ * Return value: The sought item, or NULL if no item is at the specified
+ * coordinates.
+ **/
+EelCanvasItem *
+eel_canvas_get_item_at (EelCanvas *canvas, double x, double y)
+{
+	EelCanvasItem *item;
+	double dist;
+	int cx, cy;
+
+	g_return_val_if_fail (EEL_IS_CANVAS (canvas), NULL);
+
+	eel_canvas_w2c (canvas, x, y, &cx, &cy);
+
+	dist = eel_canvas_item_invoke_point (canvas->root, x, y, cx, cy, &item);
+	if ((int) (dist * canvas->pixels_per_unit + 0.5) <= canvas->close_enough)
+		return item;
+	else
+		return NULL;
+}
+
+/* Queues an update of the canvas */
+static void
+eel_canvas_request_update (EelCanvas *canvas)
+{
+	EEL_CANVAS_GET_CLASS (canvas)->request_update (canvas);
+}
+
+static void
+eel_canvas_request_update_real (EelCanvas *canvas)
+{
+	canvas->need_update = TRUE;
+	add_idle (canvas);
+}
+
+/**
+ * eel_canvas_request_redraw:
+ * @canvas: A canvas.
+ * @x1: Leftmost coordinate of the rectangle to be redrawn.
+ * @y1: Upper coordinate of the rectangle to be redrawn.
+ * @x2: Rightmost coordinate of the rectangle to be redrawn, plus 1.
+ * @y2: Lower coordinate of the rectangle to be redrawn, plus 1.
+ *
+ * Convenience function that informs a canvas that the specified rectangle needs
+ * to be repainted.  The rectangle includes @x1 and @y1, but not @x2 and @y2.
+ * To be used only by item implementations.
+ **/
+void
+eel_canvas_request_redraw (EelCanvas *canvas, int x1, int y1, int x2, int y2)
+{
+	GdkRectangle bbox;
+
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	if (!GTK_WIDGET_DRAWABLE (canvas) || (x1 >= x2) || (y1 >= y2)) return;
+
+	bbox.x = x1;
+	bbox.y = y1;
+	bbox.width = x2 - x1;
+	bbox.height = y2 - y1;
+
+	gdk_window_invalidate_rect (canvas->layout.bin_window,
+				    &bbox, FALSE);
+}
+
+/**
+ * eel_canvas_w2c:
+ * @canvas: A canvas.
+ * @wx: World X coordinate.
+ * @wy: World Y coordinate.
+ * @cx: X pixel coordinate (return value).
+ * @cy: Y pixel coordinate (return value).
+ *
+ * Converts world coordinates into canvas pixel coordinates.
+ **/
+void
+eel_canvas_w2c (EelCanvas *canvas, double wx, double wy, int *cx, int *cy)
+{
+	double zoom;
+
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+	
+	zoom = canvas->pixels_per_unit;
+	
+	if (cx)
+		*cx = floor ((wx - canvas->scroll_x1)*zoom + canvas->zoom_xofs + 0.5);
+	if (cy)
+		*cy = floor ((wy - canvas->scroll_y1)*zoom + canvas->zoom_yofs + 0.5);
+}
+
+/**
+ * eel_canvas_w2c:
+ * @canvas: A canvas.
+ * @world: rectangle in world coordinates.
+ * @canvas: rectangle in canvase coordinates.
+ *
+ * Converts rectangles in world coordinates into canvas pixel coordinates.
+ **/
+void
+eel_canvas_w2c_rect_d (EelCanvas *canvas,
+			 double *x1, double *y1,
+			 double *x2, double *y2)
+{
+	eel_canvas_w2c_d (canvas,
+			    *x1, *y1,
+			    x1, y1);
+	eel_canvas_w2c_d (canvas,
+			    *x2, *y2,
+			    x2, y2);
+}
+
+
+
+/**
+ * eel_canvas_w2c_d:
+ * @canvas: A canvas.
+ * @wx: World X coordinate.
+ * @wy: World Y coordinate.
+ * @cx: X pixel coordinate (return value).
+ * @cy: Y pixel coordinate (return value).
+ *
+ * Converts world coordinates into canvas pixel coordinates.  This version
+ * returns coordinates in floating point coordinates, for greater precision.
+ **/
+void
+eel_canvas_w2c_d (EelCanvas *canvas, double wx, double wy, double *cx, double *cy)
+{
+	double zoom;
+
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	zoom = canvas->pixels_per_unit;
+	
+	if (cx)
+		*cx = (wx - canvas->scroll_x1)*zoom + canvas->zoom_xofs;
+	if (cy)
+		*cy = (wy - canvas->scroll_y1)*zoom + canvas->zoom_yofs;
+}
+
+
+/**
+ * eel_canvas_c2w:
+ * @canvas: A canvas.
+ * @cx: Canvas pixel X coordinate.
+ * @cy: Canvas pixel Y coordinate.
+ * @wx: X world coordinate (return value).
+ * @wy: Y world coordinate (return value).
+ *
+ * Converts canvas pixel coordinates to world coordinates.
+ **/
+void
+eel_canvas_c2w (EelCanvas *canvas, int cx, int cy, double *wx, double *wy)
+{
+	double zoom;
+
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	zoom = canvas->pixels_per_unit;
+	
+	if (wx)
+		*wx = (cx - canvas->zoom_xofs)/zoom + canvas->scroll_x1;
+	if (wy)
+		*wy = (cy - canvas->zoom_yofs)/zoom + canvas->scroll_y1;
+}
+
+
+/**
+ * eel_canvas_window_to_world:
+ * @canvas: A canvas.
+ * @winx: Window-relative X coordinate.
+ * @winy: Window-relative Y coordinate.
+ * @worldx: X world coordinate (return value).
+ * @worldy: Y world coordinate (return value).
+ *
+ * Converts window-relative coordinates into world coordinates.  You can use
+ * this when you need to convert mouse coordinates into world coordinates, for
+ * example.
+ * Window coordinates are really the same as canvas coordinates now, but this
+ * function is here for backwards compatibility reasons.
+ **/
+void
+eel_canvas_window_to_world (EelCanvas *canvas, double winx, double winy,
+			      double *worldx, double *worldy)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	if (worldx)
+		*worldx = canvas->scroll_x1 + ((winx - canvas->zoom_xofs)
+					       / canvas->pixels_per_unit);
+
+	if (worldy)
+		*worldy = canvas->scroll_y1 + ((winy - canvas->zoom_yofs)
+					       / canvas->pixels_per_unit);
+}
+
+
+/**
+ * eel_canvas_world_to_window:
+ * @canvas: A canvas.
+ * @worldx: World X coordinate.
+ * @worldy: World Y coordinate.
+ * @winx: X window-relative coordinate.
+ * @winy: Y window-relative coordinate.
+ *
+ * Converts world coordinates into window-relative coordinates.
+ * Window coordinates are really the same as canvas coordinates now, but this
+ * function is here for backwards compatibility reasons.
+ **/
+void
+eel_canvas_world_to_window (EelCanvas *canvas, double worldx, double worldy,
+			    double *winx, double *winy)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+
+	if (winx)
+		*winx = (canvas->pixels_per_unit)*(worldx - canvas->scroll_x1) + canvas->zoom_xofs;
+
+	if (winy)
+		*winy = (canvas->pixels_per_unit)*(worldy - canvas->scroll_y1) + canvas->zoom_yofs;
+}
+
+
+
+/**
+ * eel_canvas_get_color:
+ * @canvas: A canvas.
+ * @spec: X color specification, or NULL for "transparent".
+ * @color: Returns the allocated color.
+ *
+ * Allocates a color based on the specified X color specification.  As a
+ * convenience to item implementations, it returns TRUE if the color was
+ * allocated, or FALSE if the specification was NULL.  A NULL color
+ * specification is considered as "transparent" by the canvas.
+ *
+ * Return value: TRUE if @spec is non-NULL and the color is allocated.  If @spec
+ * is NULL, then returns FALSE.
+ **/
+int
+eel_canvas_get_color (EelCanvas *canvas, const char *spec, GdkColor *color)
+{
+	GdkColormap *colormap;
+
+	g_return_val_if_fail (EEL_IS_CANVAS (canvas), FALSE);
+	g_return_val_if_fail (color != NULL, FALSE);
+
+	if (!spec) {
+		color->pixel = 0;
+		color->red = 0;
+		color->green = 0;
+		color->blue = 0;
+		return FALSE;
+	}
+
+	gdk_color_parse (spec, color);
+
+	colormap = gtk_widget_get_colormap (GTK_WIDGET (canvas));
+
+	gdk_rgb_find_color (colormap, color);
+
+	return TRUE;
+}
+
+/**
+ * eel_canvas_get_color_pixel:
+ * @canvas: A canvas.
+ * @rgba: RGBA color specification.
+ *
+ * Allocates a color from the RGBA value passed into this function.  The alpha
+ * opacity value is discarded, since normal X colors do not support it.
+ *
+ * Return value: Allocated pixel value corresponding to the specified color.
+ **/
+gulong
+eel_canvas_get_color_pixel (EelCanvas *canvas, guint rgba)
+{
+	GdkColormap *colormap;
+	GdkColor color;
+
+	g_return_val_if_fail (EEL_IS_CANVAS (canvas), 0);
+
+	color.red = ((rgba & 0xff000000) >> 16) + ((rgba & 0xff000000) >> 24);
+	color.green = ((rgba & 0x00ff0000) >> 8) + ((rgba & 0x00ff0000) >> 16);
+	color.blue = (rgba & 0x0000ff00) + ((rgba & 0x0000ff00) >> 8);
+	color.pixel = 0;
+
+	colormap = gtk_widget_get_colormap (GTK_WIDGET (canvas));
+
+	gdk_rgb_find_color (colormap, &color);
+
+	return color.pixel;
+}
+
+
+/* FIXME: This function is not useful anymore */
+/**
+ * eel_canvas_set_stipple_origin:
+ * @canvas: A canvas.
+ * @gc: GC on which to set the stipple origin.
+ *
+ * Sets the stipple origin of the specified GC as is appropriate for the canvas,
+ * so that it will be aligned with other stipple patterns used by canvas items.
+ * This is typically only needed by item implementations.
+ **/
+void
+eel_canvas_set_stipple_origin (EelCanvas *canvas, GdkGC *gc)
+{
+	g_return_if_fail (EEL_IS_CANVAS (canvas));
+	g_return_if_fail (GDK_IS_GC (gc));
+
+	gdk_gc_set_ts_origin (gc, 0, 0);
+}
+
+static gboolean
+boolean_handled_accumulator (GSignalInvocationHint *ihint,
+			     GValue                *return_accu,
+			     const GValue          *handler_return,
+			     gpointer               dummy)
+{
+	gboolean continue_emission;
+	gboolean signal_handled;
+	
+	signal_handled = g_value_get_boolean (handler_return);
+	g_value_set_boolean (return_accu, signal_handled);
+	continue_emission = !signal_handled;
+	
+	return continue_emission;
+}
+
+static guint
+eel_canvas_item_accessible_add_focus_handler (AtkComponent    *component,
+                                              AtkFocusHandler handler)
+{
+ 	GSignalMatchType match_type;
+	guint signal_id;
+
+	match_type = G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC;
+	signal_id = g_signal_lookup ("focus-event", ATK_TYPE_OBJECT);
+
+	if (!g_signal_handler_find (component, match_type, signal_id, 0, NULL,
+                                    (gpointer) handler, NULL)) {
+		return g_signal_connect_closure_by_id (component,
+                                                       signal_id, 0,
+                                                       g_cclosure_new (
+                                                       G_CALLBACK (handler), NULL,
+                                                       (GClosureNotify) NULL),
+                                                       FALSE);
+	} 
+	return 0;
+}
+
+static void
+eel_canvas_item_accessible_get_item_extents (EelCanvasItem *item,
+                                             GdkRectangle  *rect)
+{
+ 	double bx1, bx2, by1, by2;
+	gint scroll_x, scroll_y;
+	gint x1, x2, y1, y2;
+
+	eel_canvas_item_get_bounds (item, &bx1, &by1, &bx2, &by2);
+	eel_canvas_w2c_rect_d (item->canvas, &bx1, &by1, &bx2, &by2);
+	eel_canvas_get_scroll_offsets (item->canvas, &scroll_x, &scroll_y);
+	x1 = floor (bx1);
+	y1 = floor (by1);
+	x2 = ceil (bx2);
+	y2 = ceil (by2);
+	rect->x = x1 - scroll_x;
+	rect->y = y1 - scroll_y;
+	rect->width = x2 - x1;
+	rect->height = y2 - y1;
+}
+
+static gboolean
+eel_canvas_item_accessible_is_item_in_window (EelCanvasItem *item,
+                                              GdkRectangle  *rect)
+{
+ 	GtkWidget *widget;
+	gboolean retval;
+
+	widget = GTK_WIDGET (item->canvas);
+	if (widget->window) {
+		int window_width, window_height;
+
+		gdk_window_get_geometry (widget->window, NULL, NULL,
+                                         &window_width, &window_height, NULL);
+		/*
+                 * Check whether rectangles intersect
+		 */
+                if (rect->x + rect->width < 0 ||
+                    rect->y + rect->height < 0 ||
+                    rect->x > window_width  ||
+                    rect->y > window_height) {
+			retval = FALSE;
+		} else {
+                        retval = TRUE;
+		}
+	} else {
+                retval = FALSE;
+	}
+        return retval;
+}
+
+
+static void
+eel_canvas_item_accessible_get_extents (AtkComponent *component,
+                                        gint		*x,
+                                        gint		*y,
+                                        gint		*width,
+                                        gint		*height,
+                                        AtkCoordType coord_type)
+{
+ 	AtkGObjectAccessible *atk_gobj;
+	GObject *obj;
+	EelCanvasItem *item;
+	gint window_x, window_y;
+	gint toplevel_x, toplevel_y;
+	GdkRectangle rect;
+	GdkWindow *window;
+	GtkWidget *canvas;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (component);
+	obj = atk_gobject_accessible_get_object (atk_gobj);
+
+	if (obj == NULL) {
+		/* item is defunct */
+		return;
+	}
+
+        /* Get the CanvasItem */
+	item = EEL_CANVAS_ITEM (obj);
+
+	/* If this item has no parent canvas, something's broken */
+	g_assert (GTK_IS_WIDGET (item->canvas));
+
+	eel_canvas_item_accessible_get_item_extents (item, &rect);
+	*width = rect.width;
+	*height = rect.height;
+	if (!eel_canvas_item_accessible_is_item_in_window (item, &rect)) {
+		*x = G_MININT;
+		*y = G_MININT;
+		return;
+	}
+
+        canvas = GTK_WIDGET (item->canvas);
+	window = gtk_widget_get_parent_window (canvas);
+	gdk_window_get_origin (window, &window_x, &window_y);
+	*x = rect.x + window_x;
+	*y = rect.y + window_y;
+	if (coord_type == ATK_XY_WINDOW) {
+		window = gdk_window_get_toplevel (canvas->window);
+		gdk_window_get_origin (window, &toplevel_x, &toplevel_y);
+		*x -= toplevel_x;
+		*y -= toplevel_y;
+	}
+        return;
+}
+
+static gint
+eel_canvas_item_accessible_get_mdi_zorder (AtkComponent *component)
+{
+	AtkGObjectAccessible *atk_gobj;
+	GObject *g_obj;
+	EelCanvasItem *item;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (component);
+	g_obj = atk_gobject_accessible_get_object (atk_gobj);
+	if (g_obj == NULL) {
+		/* Object is defunct */
+		return -1;
+	}
+
+	item = EEL_CANVAS_ITEM (g_obj);
+	if (item->parent) {
+       		return g_list_index (EEL_CANVAS_GROUP (item->parent)->item_list, item);
+	} else {
+		g_assert (item->canvas->root == item);
+		return 0;
+	}
+}
+
+static gboolean
+eel_canvas_item_accessible_grab_focus (AtkComponent *component)
+{
+ 	AtkGObjectAccessible *atk_gobj;
+	GObject *obj;
+	EelCanvasItem *item;
+	GtkWidget *toplevel;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (component);
+	obj = atk_gobject_accessible_get_object (atk_gobj);
+
+	item = EEL_CANVAS_ITEM (obj);
+	if (item == NULL) {
+		/* item is defunct */
+		return FALSE;
+	}
+
+        eel_canvas_item_grab_focus (item);
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->canvas));
+	if (GTK_WIDGET_TOPLEVEL (toplevel)) {
+		gtk_window_present (GTK_WINDOW (toplevel));
+	}
+
+	return TRUE;
+}
+
+static void
+eel_canvas_item_accessible_remove_focus_handler (AtkComponent *component,
+                                                 guint		handler_id)
+{
+ 	g_signal_handler_disconnect (component, handler_id);
+}
+
+static void
+eel_canvas_item_accessible_component_interface_init (AtkComponentIface *iface)
+{
+	g_assert (iface != NULL);
+
+	iface->add_focus_handler = eel_canvas_item_accessible_add_focus_handler;
+	iface->get_extents = eel_canvas_item_accessible_get_extents;
+	iface->get_mdi_zorder = eel_canvas_item_accessible_get_mdi_zorder;
+	iface->grab_focus = eel_canvas_item_accessible_grab_focus;
+      	iface->remove_focus_handler = eel_canvas_item_accessible_remove_focus_handler;
+}
+
+static gboolean
+eel_canvas_item_accessible_is_item_on_screen (EelCanvasItem *item)
+{
+	GdkRectangle rect;
+
+	eel_canvas_item_accessible_get_item_extents (item, &rect);
+	return eel_canvas_item_accessible_is_item_in_window (item, &rect);
+}
+
+static void
+eel_canvas_item_accessible_initialize (AtkObject *obj, gpointer data)
+{
+	if (ATK_OBJECT_CLASS (accessible_item_parent_class)->initialize != NULL)
+		ATK_OBJECT_CLASS (accessible_item_parent_class)->initialize (obj, data);
+	g_object_set_data (G_OBJECT (obj), "atk-component-layer",
+			   GINT_TO_POINTER (ATK_LAYER_MDI));
+}
+
+static AtkStateSet*
+eel_canvas_item_accessible_ref_state_set (AtkObject *accessible)
+{
+ 	AtkGObjectAccessible *atk_gobj;
+	GObject *obj;
+ 	EelCanvasItem *item;
+	AtkStateSet *state_set;
+
+	state_set = ATK_OBJECT_CLASS (accessible_item_parent_class)->ref_state_set (accessible);
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
+	obj = atk_gobject_accessible_get_object (atk_gobj);
+
+	item = EEL_CANVAS_ITEM (obj);
+	if (item == NULL) {
+		atk_state_set_add_state (state_set, ATK_STATE_DEFUNCT);
+	} else {
+                if (item->object.flags & EEL_CANVAS_ITEM_VISIBLE) {
+			atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
+			
+			if (eel_canvas_item_accessible_is_item_on_screen (item)) {
+  				atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
+       			}
+		}
+        	if (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (item->canvas))) {
+			atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
+
+			if (item->canvas->focused_item == item) {
+				atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
+			}
+		}
+	}
+
+        return state_set;
+}
+
+static void
+eel_canvas_item_accessible_class_init (AtkObjectClass *klass)
+{
+ 	accessible_item_parent_class = g_type_class_peek_parent (klass);
+
+	klass->initialize = eel_canvas_item_accessible_initialize;
+	klass->ref_state_set = eel_canvas_item_accessible_ref_state_set;
+}
+
+static GType
+eel_canvas_item_accessible_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		const GInterfaceInfo atk_component_info = {
+			(GInterfaceInitFunc) eel_canvas_item_accessible_component_interface_init,
+                 	(GInterfaceFinalizeFunc) NULL,
+			NULL
+		};
+		AtkObjectFactory *factory;
+		GType parent_atk_type;
+		GTypeQuery query;
+		GTypeInfo tinfo = { 0 };
+
+		factory = atk_registry_get_factory (atk_get_default_registry(),
+						    GTK_TYPE_OBJECT);
+		if (!factory) {
+			return G_TYPE_INVALID;
+		}
+		parent_atk_type = atk_object_factory_get_accessible_type (factory);
+		if (!parent_atk_type) {
+			return G_TYPE_INVALID;
+		}
+		g_type_query (parent_atk_type, &query);
+		tinfo.class_init = (GClassInitFunc) eel_canvas_item_accessible_class_init;
+		tinfo.class_size = query.class_size;
+		tinfo.instance_size = query.instance_size;
+		type = g_type_register_static (parent_atk_type,
+					       "EelCanvasItemAccessibility",
+					       &tinfo, 0);
+
+		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
+					     &atk_component_info);
+
+	}
+
+	return type;
+}
+
+static AtkObject *
+eel_canvas_item_accessible_create (GObject *for_object)
+{
+	GType type;
+	AtkObject *accessible;
+	EelCanvasItem *item;
+
+	item = EEL_CANVAS_ITEM (for_object);
+	g_assert (item != NULL);
+
+	type = eel_canvas_item_accessible_get_type ();
+	if (type == G_TYPE_INVALID) {
+		return atk_no_op_object_new (for_object);
+	}
+
+        accessible = g_object_new (type, NULL);
+	atk_object_initialize (accessible, for_object);
+	return accessible;
+}
+
+static GType
+eel_canvas_item_accessible_factory_get_accessible_type (void)
+{
+	return eel_canvas_item_accessible_get_type ();
+}
+
+static AtkObject*
+eel_canvas_item_accessible_factory_create_accessible (GObject *obj)
+{
+	AtkObject *accessible;
+
+	g_assert (G_IS_OBJECT (obj));
+
+	accessible = eel_canvas_item_accessible_create (obj);
+
+	return accessible;
+}
+
+static void
+eel_canvas_item_accessible_factory_class_init (AtkObjectFactoryClass *klass)
+{
+	klass->create_accessible = eel_canvas_item_accessible_factory_create_accessible;
+	klass->get_accessible_type = eel_canvas_item_accessible_factory_get_accessible_type;
+}
+ 
+static GType
+eel_canvas_item_accessible_factory_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		const GTypeInfo tinfo = {
+			sizeof (AtkObjectFactoryClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_canvas_item_accessible_factory_class_init,
+			NULL,		/* class_finalize */
+			NULL,		/* class_data */
+			sizeof (AtkObjectFactory),
+			0,		/* n_preallocs */
+			NULL
+		};
+		type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY,
+					       "EelCanvasItemAccessibilityFactory",
+					       &tinfo, 0);
+	}
+
+	return type;
+}
+
+/* Class initialization function for EelCanvasItemClass */
+static void
+eel_canvas_item_class_init (EelCanvasItemClass *class)
+{
+	GObjectClass *gobject_class;
+
+	gobject_class = (GObjectClass *) class;
+
+	item_parent_class = gtk_type_class (gtk_object_get_type ());
+
+	gobject_class->set_property = eel_canvas_item_set_property;
+	gobject_class->get_property = eel_canvas_item_get_property;
+
+	g_object_class_install_property
+		(gobject_class, ITEM_PROP_PARENT,
+		 g_param_spec_object ("parent", NULL, NULL,
+				      EEL_TYPE_CANVAS_ITEM,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+	
+	g_object_class_install_property
+		(gobject_class, ITEM_PROP_VISIBLE,
+		 g_param_spec_boolean ("visible", NULL, NULL,
+				      TRUE,
+				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+
+	item_signals[ITEM_EVENT] =
+		g_signal_new ("event",
+			      G_TYPE_FROM_CLASS (class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EelCanvasItemClass, event),
+			      boolean_handled_accumulator, NULL,
+			      eel_marshal_BOOLEAN__BOXED,
+			      G_TYPE_BOOLEAN, 1,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+	gobject_class->dispose = eel_canvas_item_dispose;
+
+	class->realize = eel_canvas_item_realize;
+	class->unrealize = eel_canvas_item_unrealize;
+	class->map = eel_canvas_item_map;
+	class->unmap = eel_canvas_item_unmap;
+	class->update = eel_canvas_item_update;
+
+	atk_registry_set_factory_type (atk_get_default_registry (),
+                                       EEL_TYPE_CANVAS_ITEM,
+                                       eel_canvas_item_accessible_factory_get_type ());
+}
diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h
new file mode 100644
index 000000000..83b19d171
--- /dev/null
+++ b/eel/eel-canvas.h
@@ -0,0 +1,530 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+/* EelCanvas widget - Tk-like canvas widget for Gnome
+ *
+ * EelCanvas is basically a port of the Tk toolkit's most excellent canvas
+ * widget.  Tk is copyrighted by the Regents of the University of California,
+ * Sun Microsystems, and other parties.
+ *
+ *
+ * Authors: Federico Mena <federico@nuclecu.unam.mx>
+ *          Raph Levien <raph@gimp.org>
+ */
+
+#ifndef EEL_CANVAS_H
+#define EEL_CANVAS_H
+
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <stdarg.h>
+
+G_BEGIN_DECLS
+
+
+/* "Small" value used by canvas stuff */
+#define EEL_CANVAS_EPSILON 1e-10
+
+
+/* Macros for building colors that fit in a 32-bit integer.  The values are in
+ * [0, 255].
+ */
+
+#define EEL_CANVAS_COLOR(r, g, b) ((((int) (r) & 0xff) << 24)	\
+				     | (((int) (g) & 0xff) << 16)	\
+				     | (((int) (b) & 0xff) << 8)	\
+				     | 0xff)
+
+#define EEL_CANVAS_COLOR_A(r, g, b, a) ((((int) (r) & 0xff) << 24)	\
+					  | (((int) (g) & 0xff) << 16)	\
+					  | (((int) (b) & 0xff) << 8)	\
+					  | ((int) (a) & 0xff))
+
+
+typedef struct _EelCanvas           EelCanvas;
+typedef struct _EelCanvasClass      EelCanvasClass;
+typedef struct _EelCanvasItem       EelCanvasItem;
+typedef struct _EelCanvasItemClass  EelCanvasItemClass;
+typedef struct _EelCanvasGroup      EelCanvasGroup;
+typedef struct _EelCanvasGroupClass EelCanvasGroupClass;
+
+
+/* EelCanvasItem - base item class for canvas items
+ *
+ * All canvas items are derived from EelCanvasItem.  The only information a
+ * EelCanvasItem contains is its parent canvas, its parent canvas item group,
+ * and its bounding box in world coordinates.
+ *
+ * Items inside a canvas are organized in a tree of EelCanvasItemGroup nodes
+ * and EelCanvasItem leaves.  Each canvas has a single root group, which can
+ * be obtained with the eel_canvas_get_root() function.
+ *
+ * The abstract EelCanvasItem class does not have any configurable or
+ * queryable attributes.
+ */
+
+/* Object flags for items */
+enum {
+	EEL_CANVAS_ITEM_REALIZED         = 1 << 4,
+	EEL_CANVAS_ITEM_MAPPED           = 1 << 5,
+	EEL_CANVAS_ITEM_ALWAYS_REDRAW    = 1 << 6,
+	EEL_CANVAS_ITEM_VISIBLE          = 1 << 7,
+	EEL_CANVAS_ITEM_NEED_UPDATE      = 1 << 8,
+	EEL_CANVAS_ITEM_NEED_DEEP_UPDATE = 1 << 9
+};
+
+/* Update flags for items */
+enum {
+	EEL_CANVAS_UPDATE_REQUESTED  = 1 << 0,
+	EEL_CANVAS_UPDATE_DEEP       = 1 << 1
+};
+
+#define EEL_TYPE_CANVAS_ITEM            (eel_canvas_item_get_type ())
+#define EEL_CANVAS_ITEM(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_ITEM, EelCanvasItem))
+#define EEL_CANVAS_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_ITEM, EelCanvasItemClass))
+#define EEL_IS_CANVAS_ITEM(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_ITEM))
+#define EEL_IS_CANVAS_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_ITEM))
+#define EEL_CANVAS_ITEM_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_ITEM, EelCanvasItemClass))
+
+
+struct _EelCanvasItem {
+	GtkObject object;
+
+	/* Parent canvas for this item */
+	EelCanvas *canvas;
+
+	/* Parent canvas group for this item (a EelCanvasGroup) */
+	EelCanvasItem *parent;
+
+	/* Bounding box for this item (in canvas coordinates) */
+	double x1, y1, x2, y2;
+};
+
+struct _EelCanvasItemClass {
+	GtkObjectClass parent_class;
+
+	/* Tell the item to update itself.  The flags are from the update flags
+	 * defined above.  The item should update its internal state from its
+	 * queued state, and recompute and request its repaint area. The
+	 * update method also recomputes the bounding box of the item.
+	 */
+	void (* update) (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags);
+
+	/* Realize an item -- create GCs, etc. */
+	void (* realize) (EelCanvasItem *item);
+
+	/* Unrealize an item */
+	void (* unrealize) (EelCanvasItem *item);
+
+	/* Map an item - normally only need by items with their own GdkWindows */
+	void (* map) (EelCanvasItem *item);
+
+	/* Unmap an item */
+	void (* unmap) (EelCanvasItem *item);
+
+	/* Draw an item of this type.  (x, y) are the upper-left canvas pixel
+	 * coordinates of the drawable, a temporary pixmap, where things get
+	 * drawn.  (width, height) are the dimensions of the drawable.
+	 */
+	void (* draw) (EelCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose);
+
+	/* Calculate the distance from an item to the specified point.  It also
+         * returns a canvas item which is the item itself in the case of the
+         * object being an actual leaf item, or a child in case of the object
+         * being a canvas group.  (cx, cy) are the canvas pixel coordinates that
+         * correspond to the item-relative coordinates (x, y).
+	 */
+	double (* point) (EelCanvasItem *item, double x, double y, int cx, int cy,
+			  EelCanvasItem **actual_item);
+
+	void (* translate) (EelCanvasItem *item, double dx, double dy);
+	
+	/* Fetch the item's bounding box (need not be exactly tight).  This
+	 * should be in item-relative coordinates.
+	 */
+	void (* bounds) (EelCanvasItem *item, double *x1, double *y1, double *x2, double *y2);
+
+	/* Signal: an event ocurred for an item of this type.  The (x, y)
+	 * coordinates are in the canvas world coordinate system.
+	 */
+	gboolean (* event)                (EelCanvasItem *item, GdkEvent *event);
+
+	/* Reserved for future expansion */
+	gpointer spare_vmethods [4];
+};
+
+
+/* Standard Gtk function */
+GType eel_canvas_item_get_type (void) G_GNUC_CONST;
+
+/* Create a canvas item using the standard Gtk argument mechanism.  The item is
+ * automatically inserted at the top of the specified canvas group.  The last
+ * argument must be a NULL pointer.
+ */
+EelCanvasItem *eel_canvas_item_new (EelCanvasGroup *parent, GType type,
+				    const gchar *first_arg_name, ...);
+
+/* Constructors for use in derived classes and language wrappers */
+void eel_canvas_item_construct (EelCanvasItem *item, EelCanvasGroup *parent,
+				const gchar *first_arg_name, va_list args);
+
+/* Configure an item using the standard Gtk argument mechanism.  The last
+ * argument must be a NULL pointer.
+ */
+void eel_canvas_item_set (EelCanvasItem *item, const gchar *first_arg_name, ...);
+
+/* Used only for language wrappers and the like */
+void eel_canvas_item_set_valist (EelCanvasItem *item,
+				 const gchar *first_arg_name, va_list args);
+
+/* Move an item by the specified amount */
+void eel_canvas_item_move (EelCanvasItem *item, double dx, double dy);
+
+/* Raise an item in the z-order of its parent group by the specified number of
+ * positions.
+ */
+void eel_canvas_item_raise (EelCanvasItem *item, int positions);
+
+/* Lower an item in the z-order of its parent group by the specified number of
+ * positions.
+ */
+void eel_canvas_item_lower (EelCanvasItem *item, int positions);
+
+/* Raise an item to the top of its parent group's z-order. */
+void eel_canvas_item_raise_to_top (EelCanvasItem *item);
+
+/* Lower an item to the bottom of its parent group's z-order */
+void eel_canvas_item_lower_to_bottom (EelCanvasItem *item);
+
+/* Send an item behind another item */
+void eel_canvas_item_send_behind (EelCanvasItem *item,
+				  EelCanvasItem *behind_item);
+
+
+/* Show an item (make it visible).  If the item is already shown, it has no
+ * effect.
+ */
+void eel_canvas_item_show (EelCanvasItem *item);
+
+/* Hide an item (make it invisible).  If the item is already invisible, it has
+ * no effect.
+ */
+void eel_canvas_item_hide (EelCanvasItem *item);
+
+/* Grab the mouse for the specified item.  Only the events in event_mask will be
+ * reported.  If cursor is non-NULL, it will be used during the duration of the
+ * grab.  Time is a proper X event time parameter.  Returns the same values as
+ * XGrabPointer().
+ */
+int eel_canvas_item_grab (EelCanvasItem *item, unsigned int event_mask,
+			  GdkCursor *cursor, guint32 etime);
+
+/* Ungrabs the mouse -- the specified item must be the same that was passed to
+ * eel_canvas_item_grab().  Time is a proper X event time parameter.
+ */
+void eel_canvas_item_ungrab (EelCanvasItem *item, guint32 etime);
+
+/* These functions convert from a coordinate system to another.  "w" is world
+ * coordinates and "i" is item coordinates.
+ */
+void eel_canvas_item_w2i (EelCanvasItem *item, double *x, double *y);
+void eel_canvas_item_i2w (EelCanvasItem *item, double *x, double *y);
+
+/* Remove the item from its parent group and make the new group its parent.  The
+ * item will be put on top of all the items in the new group.  The item's
+ * coordinates relative to its new parent to *not* change -- this means that the
+ * item could potentially move on the screen.
+ * 
+ * The item and the group must be in the same canvas.  An item cannot be
+ * reparented to a group that is the item itself or that is an inferior of the
+ * item.
+ */
+void eel_canvas_item_reparent (EelCanvasItem *item, EelCanvasGroup *new_group);
+
+/* Used to send all of the keystroke events to a specific item as well as
+ * GDK_FOCUS_CHANGE events.
+ */
+void eel_canvas_item_grab_focus (EelCanvasItem *item);
+
+/* Fetch the bounding box of the item.  The bounding box may not be exactly
+ * tight, but the canvas items will do the best they can.  The returned bounding
+ * box is in the coordinate system of the item's parent.
+ */
+void eel_canvas_item_get_bounds (EelCanvasItem *item,
+				 double *x1, double *y1, double *x2, double *y2);
+
+/* Request that the update method eventually get called.  This should be used
+ * only by item implementations.
+ */
+void eel_canvas_item_request_update (EelCanvasItem *item);
+
+/* Request a redraw of the bounding box of the canvas item */
+void eel_canvas_item_request_redraw (EelCanvasItem *item);
+
+/* EelCanvasGroup - a group of canvas items
+ *
+ * A group is a node in the hierarchical tree of groups/items inside a canvas.
+ * Groups serve to give a logical structure to the items.
+ *
+ * Consider a circuit editor application that uses the canvas for its schematic
+ * display.  Hierarchically, there would be canvas groups that contain all the
+ * components needed for an "adder", for example -- this includes some logic
+ * gates as well as wires.  You can move stuff around in a convenient way by
+ * doing a eel_canvas_item_move() of the hierarchical groups -- to move an
+ * adder, simply move the group that represents the adder.
+ *
+ * The following arguments are available:
+ *
+ * name		type		read/write	description
+ * --------------------------------------------------------------------------------
+ * x		double		RW		X coordinate of group's origin
+ * y		double		RW		Y coordinate of group's origin
+ */
+
+
+#define EEL_TYPE_CANVAS_GROUP            (eel_canvas_group_get_type ())
+#define EEL_CANVAS_GROUP(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroup))
+#define EEL_CANVAS_GROUP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass))
+#define EEL_IS_CANVAS_GROUP(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_GROUP))
+#define EEL_IS_CANVAS_GROUP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_GROUP))
+#define EEL_CANVAS_GROUP_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass))
+
+
+struct _EelCanvasGroup {
+	EelCanvasItem item;
+
+	double xpos, ypos;
+	
+	/* Children of the group */
+	GList *item_list;
+	GList *item_list_end;
+};
+
+struct _EelCanvasGroupClass {
+	EelCanvasItemClass parent_class;
+};
+
+
+/* Standard Gtk function */
+GType eel_canvas_group_get_type (void) G_GNUC_CONST;
+
+
+/*** EelCanvas ***/
+
+
+#define EEL_TYPE_CANVAS            (eel_canvas_get_type ())
+#define EEL_CANVAS(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS, EelCanvas))
+#define EEL_CANVAS_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS, EelCanvasClass))
+#define EEL_IS_CANVAS(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS))
+#define EEL_IS_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS))
+#define EEL_CANVAS_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS, EelCanvasClass))
+
+
+struct _EelCanvas {
+	GtkLayout layout;
+
+	/* Root canvas group */
+	EelCanvasItem *root;
+
+	/* The item containing the mouse pointer, or NULL if none */
+	EelCanvasItem *current_item;
+
+	/* Item that is about to become current (used to track deletions and such) */
+	EelCanvasItem *new_current_item;
+
+	/* Item that holds a pointer grab, or NULL if none */
+	EelCanvasItem *grabbed_item;
+
+	/* If non-NULL, the currently focused item */
+	EelCanvasItem *focused_item;
+
+	/* GC for temporary draw pixmap */
+	GdkGC *pixmap_gc;
+
+	/* Event on which selection of current item is based */
+	GdkEvent pick_event;
+
+	/* Scrolling region */
+	double scroll_x1, scroll_y1;
+	double scroll_x2, scroll_y2;
+
+	/* Scaling factor to be used for display */
+	double pixels_per_unit;
+
+	/* Idle handler ID */
+	guint idle_id;
+
+	/* Signal handler ID for destruction of the root item */
+	guint root_destroy_id;
+
+	/* Internal pixel offsets when zoomed out */
+	int zoom_xofs, zoom_yofs;
+
+	/* Last known modifier state, for deferred repick when a button is down */
+	int state;
+
+	/* Event mask specified when grabbing an item */
+	guint grabbed_event_mask;
+
+	/* Tolerance distance for picking items */
+	int close_enough;
+
+	/* Whether the canvas should center the canvas in the middle of
+	 * the window if the scroll region is smaller than the window */
+	unsigned int center_scroll_region : 1;
+
+	/* Whether items need update at next idle loop iteration */
+	unsigned int need_update : 1;
+
+	/* Are we in the midst of an update */
+	unsigned int doing_update : 1;
+
+	/* Whether the canvas needs redrawing at the next idle loop iteration */
+	unsigned int need_redraw : 1;
+
+	/* Whether current item will be repicked at next idle loop iteration */
+	unsigned int need_repick : 1;
+
+	/* For use by internal pick_current_item() function */
+	unsigned int left_grabbed_item : 1;
+
+	/* For use by internal pick_current_item() function */
+	unsigned int in_repick : 1;
+};
+
+struct _EelCanvasClass {
+	GtkLayoutClass parent_class;
+
+	/* Draw the background for the area given.
+	 */
+	void (* draw_background) (EelCanvas *canvas,
+				  int x, int y, int width, int height);
+
+	/* Private Virtual methods for groping the canvas inside bonobo */
+	void (* request_update) (EelCanvas *canvas);
+
+	/* Reserved for future expansion */
+	gpointer spare_vmethods [4];
+};
+
+
+/* Standard Gtk function */
+GType eel_canvas_get_type (void) G_GNUC_CONST;
+
+/* Creates a new canvas.  You should check that the canvas is created with the
+ * proper visual and colormap.  Any visual will do unless you intend to insert
+ * gdk_imlib images into it, in which case you should use the gdk_imlib visual.
+ *
+ * You should call eel_canvas_set_scroll_region() soon after calling this
+ * function to set the desired scrolling limits for the canvas.
+ */
+GtkWidget *eel_canvas_new (void);
+
+/* Returns the root canvas item group of the canvas */
+EelCanvasGroup *eel_canvas_root (EelCanvas *canvas);
+
+/* Sets the limits of the scrolling region, in world coordinates */
+void eel_canvas_set_scroll_region (EelCanvas *canvas,
+				   double x1, double y1, double x2, double y2);
+
+/* Gets the limits of the scrolling region, in world coordinates */
+void eel_canvas_get_scroll_region (EelCanvas *canvas,
+				   double *x1, double *y1, double *x2, double *y2);
+
+/* Sets the number of pixels that correspond to one unit in world coordinates */
+void eel_canvas_set_pixels_per_unit (EelCanvas *canvas, double n);
+
+/* Wether the canvas centers the scroll region if it is smaller than the window  */
+void eel_canvas_set_center_scroll_region (EelCanvas *canvas, gboolean center_scroll_region);
+
+/* Scrolls the canvas to the specified offsets, given in canvas pixel coordinates */
+void eel_canvas_scroll_to (EelCanvas *canvas, int cx, int cy);
+
+/* Returns the scroll offsets of the canvas in canvas pixel coordinates.  You
+ * can specify NULL for any of the values, in which case that value will not be
+ * queried.
+ */
+void eel_canvas_get_scroll_offsets (EelCanvas *canvas, int *cx, int *cy);
+
+/* Requests that the canvas be repainted immediately instead of in the idle
+ * loop.
+ */
+void eel_canvas_update_now (EelCanvas *canvas);
+
+/* Returns the item that is at the specified position in world coordinates, or
+ * NULL if no item is there.
+ */
+EelCanvasItem *eel_canvas_get_item_at (EelCanvas *canvas, double x, double y);
+
+/* For use only by item type implementations.  Request that the canvas
+ * eventually redraw the specified region, specified in canvas pixel
+ * coordinates.  The region contains (x1, y1) but not (x2, y2).
+ */
+void eel_canvas_request_redraw (EelCanvas *canvas, int x1, int y1, int x2, int y2);
+
+/* These functions convert from a coordinate system to another.  "w" is world
+ * coordinates, "c" is canvas pixel coordinates (pixel coordinates that are
+ * (0,0) for the upper-left scrolling limit and something else for the
+ * lower-left scrolling limit).
+ */
+void eel_canvas_w2c_rect_d (EelCanvas *canvas,
+			    double *x1, double *y1,
+			    double *x2, double *y2);
+void eel_canvas_w2c (EelCanvas *canvas, double wx, double wy, int *cx, int *cy);
+void eel_canvas_w2c_d (EelCanvas *canvas, double wx, double wy, double *cx, double *cy);
+void eel_canvas_c2w (EelCanvas *canvas, int cx, int cy, double *wx, double *wy);
+
+/* This function takes in coordinates relative to the GTK_LAYOUT
+ * (canvas)->bin_window and converts them to world coordinates.
+ * These days canvas coordinates and window coordinates are the same, but
+ * these are left for backwards compat reasons.
+ */
+void eel_canvas_window_to_world (EelCanvas *canvas,
+				 double winx, double winy, double *worldx, double *worldy);
+
+/* This is the inverse of eel_canvas_window_to_world() */
+void eel_canvas_world_to_window (EelCanvas *canvas,
+				 double worldx, double worldy, double *winx, double *winy);
+
+/* Takes a string specification for a color and allocates it into the specified
+ * GdkColor.  If the string is null, then it returns FALSE. Otherwise, it
+ * returns TRUE.
+ */
+int eel_canvas_get_color (EelCanvas *canvas, const char *spec, GdkColor *color);
+
+/* Allocates a color from the RGB value passed into this function. */
+gulong eel_canvas_get_color_pixel (EelCanvas *canvas,
+				   guint        rgba);
+     
+
+/* Sets the stipple origin of the specified gc so that it will be aligned with
+ * all the stipples used in the specified canvas.  This is intended for use only
+ * by canvas item implementations.
+ */
+void eel_canvas_set_stipple_origin (EelCanvas *canvas, GdkGC *gc);
+
+G_END_DECLS
+
+#endif
diff --git a/eel/eel-debug-drawing.c b/eel/eel-debug-drawing.c
new file mode 100644
index 000000000..39423b8fa
--- /dev/null
+++ b/eel/eel-debug-drawing.c
@@ -0,0 +1,527 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-debug-drawing.c: Eel drawing debugging aids.
+ 
+   Copyright (C) 2000 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-debug-drawing.h"
+
+#include "eel-art-gtk-extensions.h"
+#include "eel-debug.h"
+#include "eel-gdk-extensions.h"
+#include "eel-gdk-extensions.h"
+#include "eel-gdk-pixbuf-extensions.h"
+#include "eel-gtk-extensions.h"
+#include "eel-gtk-extensions.h"
+#include "eel-gtk-macros.h"
+
+#include <gtk/gtk.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+
+/*
+ * PixbufViewer is a very simple "private" widget that displays
+ * a GdkPixbuf.  It is used by eel_debug_show_pixbuf() to
+ * display a pixbuf in an in process pixbuf debugging window.
+ *
+ * We cant use EelImage for this because part of the reason
+ * for pixbuf debugging is to debug EelImage itself.
+ */
+#define DEBUG_TYPE_PIXBUF_VIEWER (debug_pixbuf_viewer_get_type ())
+#define DEBUG_PIXBUF_VIEWER(obj) (GTK_CHECK_CAST ((obj), DEBUG_TYPE_PIXBUF_VIEWER, DebugPixbufViewer))
+#define DEBUG_IS_PIXBUF_VIEWER(obj) (GTK_CHECK_TYPE ((obj), DEBUG_TYPE_PIXBUF_VIEWER))
+
+typedef struct DebugPixbufViewer DebugPixbufViewer;
+typedef struct DebugPixbufViewerClass DebugPixbufViewerClass;
+
+static GtkType debug_pixbuf_viewer_get_type   (void);
+static void    debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer,
+					       GdkPixbuf         *pixbuf);
+
+struct DebugPixbufViewer
+{
+	GtkWidget widget;
+	GdkPixbuf *pixbuf;
+};
+
+struct DebugPixbufViewerClass
+{
+	GtkWidgetClass parent_class;
+};
+
+/* GtkObjectClass methods */
+static void debug_pixbuf_viewer_class_init (DebugPixbufViewerClass *pixbuf_viewer_class);
+static void debug_pixbuf_viewer_init       (DebugPixbufViewer      *pixbuf_viewer);
+static void debug_pixbuf_viewer_finalize         (GObject                *object);
+
+/* GtkWidgetClass methods */
+static void debug_pixbuf_viewer_size_request     (GtkWidget              *widget,
+						  GtkRequisition         *requisition);
+static int  debug_pixbuf_viewer_expose_event     (GtkWidget              *widget,
+						  GdkEventExpose         *event);
+
+EEL_CLASS_BOILERPLATE (DebugPixbufViewer, debug_pixbuf_viewer, GTK_TYPE_WIDGET)
+
+static void
+debug_pixbuf_viewer_class_init (DebugPixbufViewerClass *pixbuf_viewer_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (pixbuf_viewer_class);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (pixbuf_viewer_class);
+
+	object_class->finalize = debug_pixbuf_viewer_finalize;
+	widget_class->size_request = debug_pixbuf_viewer_size_request;
+	widget_class->expose_event = debug_pixbuf_viewer_expose_event;
+}
+
+static void
+debug_pixbuf_viewer_init (DebugPixbufViewer *viewer)
+{
+	GTK_WIDGET_UNSET_FLAGS (viewer, GTK_CAN_FOCUS);
+	GTK_WIDGET_SET_FLAGS (viewer, GTK_NO_WINDOW);
+}
+
+static void
+debug_pixbuf_viewer_finalize (GObject *object)
+{
+ 	DebugPixbufViewer *viewer;
+
+	viewer = DEBUG_PIXBUF_VIEWER (object);
+	eel_gdk_pixbuf_unref_if_not_null (viewer->pixbuf);
+	viewer->pixbuf = NULL;
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static void
+debug_pixbuf_viewer_size_request (GtkWidget *widget, GtkRequisition *requisition)
+{
+	DebugPixbufViewer *viewer;
+	EelDimensions dimensions;
+
+	g_assert (DEBUG_IS_PIXBUF_VIEWER (widget));
+	g_assert (requisition != NULL);
+	
+	viewer = DEBUG_PIXBUF_VIEWER (widget);
+
+	if (viewer->pixbuf != NULL) {
+		dimensions = eel_gdk_pixbuf_get_dimensions (viewer->pixbuf);
+	} else {
+		dimensions = eel_dimensions_empty;
+	}
+	
+   	requisition->width = MAX (2, dimensions.width);
+   	requisition->height = MAX (2, dimensions.height);
+}
+
+static int
+debug_pixbuf_viewer_expose_event (GtkWidget *widget, GdkEventExpose *event)
+{
+ 	DebugPixbufViewer *viewer;
+	EelIRect clipped_dirty_area;
+	EelIRect dirty_area;
+	EelIRect bounds;
+
+	g_assert (DEBUG_IS_PIXBUF_VIEWER (widget));
+	g_assert (event != NULL);
+	g_assert (event->window == widget->window);
+	g_assert (GTK_WIDGET_REALIZED (widget));
+	
+ 	viewer = DEBUG_PIXBUF_VIEWER (widget);
+
+	if (viewer->pixbuf == NULL) {
+		return TRUE;
+	}
+	
+	bounds.x0 = widget->allocation.x + (widget->allocation.width - gdk_pixbuf_get_width (viewer->pixbuf)) / 2;
+	bounds.y0 = widget->allocation.y + (widget->allocation.height - gdk_pixbuf_get_height (viewer->pixbuf)) / 2;
+	bounds.x1 = bounds.x0 + gdk_pixbuf_get_width (viewer->pixbuf);
+	bounds.y1 = bounds.y0 + gdk_pixbuf_get_height (viewer->pixbuf);
+	
+	/* Clip the dirty area to the screen; bail if no work to do */
+	dirty_area = eel_gdk_rectangle_to_eel_irect (event->area);
+	clipped_dirty_area = eel_gdk_window_clip_dirty_area_to_screen (event->window,
+								       dirty_area);
+	if (!eel_irect_is_empty (&clipped_dirty_area)) {
+		EelIRect clipped_bounds;
+
+		eel_irect_intersect (&clipped_bounds, &bounds, &clipped_dirty_area);
+
+		if (!eel_irect_is_empty (&clipped_bounds)) {
+			g_assert (clipped_bounds.x0 >= bounds.x0);
+			g_assert (clipped_bounds.y0 >= bounds.y0);
+			
+			eel_gdk_pixbuf_draw_to_drawable (viewer->pixbuf,
+							 event->window,
+							 widget->style->white_gc,
+							 clipped_bounds.x0 - bounds.x0,
+							 clipped_bounds.y0 - bounds.y0,
+							 clipped_bounds,
+							 GDK_RGB_DITHER_NONE,
+							 GDK_PIXBUF_ALPHA_BILEVEL,
+							 EEL_STANDARD_ALPHA_THRESHHOLD);
+		}
+	}
+
+	bounds.x0 -= 1;
+	bounds.y0 -= 1;
+	bounds.x1 += 1;
+	bounds.y1 += 1;
+
+	return TRUE;
+}
+
+static void
+debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer, GdkPixbuf *pixbuf)
+{
+	g_assert (DEBUG_IS_PIXBUF_VIEWER (viewer));
+	
+	if (pixbuf != viewer->pixbuf) {
+		eel_gdk_pixbuf_unref_if_not_null (viewer->pixbuf);
+		eel_gdk_pixbuf_ref_if_not_null (pixbuf);
+		viewer->pixbuf = pixbuf;
+		gtk_widget_queue_resize (GTK_WIDGET (viewer));
+	}
+}
+
+/**
+ * eel_debug_draw_rectangle_and_cross:
+ * @rectangle: Rectangle bounding the rectangle.
+ * @color: Color to use for the rectangle and cross.
+ *
+ * Draw a rectangle and cross.  Useful for debugging exposure events.
+ */
+void
+eel_debug_draw_rectangle_and_cross (GdkDrawable *drawable,
+				    EelIRect rectangle,
+				    guint32 color,
+				    gboolean draw_cross)
+{
+	GdkGC *gc;
+	GdkColor color_gdk = { 0 };
+
+	int width;
+	int height;
+
+	g_return_if_fail (drawable != NULL);
+	g_return_if_fail (!eel_irect_is_empty (&rectangle));
+
+	width = rectangle.x1 - rectangle.x0;
+	height = rectangle.y1 - rectangle.y0;
+
+ 	gc = gdk_gc_new (drawable);
+ 	gdk_gc_set_function (gc, GDK_COPY);
+	
+	color_gdk.red   = ((color >> 16) & 0xff) << 8;
+	color_gdk.green = ((color >>  8) & 0xff) << 8;
+	color_gdk.blue  = ((color      ) & 0xff) << 8;
+	gdk_colormap_alloc_color (
+		gdk_drawable_get_colormap (drawable),
+		&color_gdk, FALSE, FALSE);
+	gdk_gc_set_rgb_fg_color (gc, &color_gdk);
+	
+	gdk_draw_rectangle (drawable,
+			    gc,
+			    FALSE,
+			    rectangle.x0,
+			    rectangle.y0,
+			    width - 1,
+			    height - 1);
+
+	if (draw_cross) {
+		gdk_draw_line (drawable,
+			       gc,
+			       rectangle.x0,
+			       rectangle.y0,
+			       rectangle.x0 + width - 1,
+			       rectangle.y0 + height - 1);
+		
+		gdk_draw_line (drawable,
+			       gc,
+			       rectangle.x0 + width - 1,
+			       rectangle.y0,
+			       rectangle.x0,
+			       rectangle.y0 + height - 1);
+	}
+
+	g_object_unref (gc);
+}
+
+/**
+ * eel_debug_show_pixbuf_in_external_viewer:
+ * @pixbuf: Pixbuf to show.
+ * @viewer_name: Viewer name.
+ *
+ * Show the given pixbuf in an external out of process viewer.
+ * This is very useful for debugging pixbuf stuff.
+ *
+ * Perhaps this function should be #ifdef DEBUG or something like that.
+ */
+void
+eel_debug_show_pixbuf_in_external_viewer (const GdkPixbuf *pixbuf,
+					  const char *viewer_name)
+{
+	char *command;
+	char *file_name;
+	gboolean save_result;
+	int ignore;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (viewer_name != NULL);
+
+	file_name = g_strdup ("/tmp/eel-debug-png-file-XXXXXX");
+
+	if (mktemp (file_name) != file_name) {
+		g_free (file_name);
+		file_name = g_strdup_printf ("/tmp/isis-debug-png-file-%d", getpid ());
+	}
+
+	save_result = eel_gdk_pixbuf_save_to_file (pixbuf, file_name);
+
+	if (save_result == FALSE) {
+		g_warning ("Failed to save '%s'", file_name);
+		g_free (file_name);
+		return;
+	}
+	
+	command = g_strdup_printf ("%s %s", viewer_name, file_name);
+
+	ignore = system (command);
+	g_free (command);
+	remove (file_name);
+	g_free (file_name);
+}
+
+static GtkWidget *debug_window = NULL;
+static GtkWidget *debug_image = NULL;
+
+static void
+debug_delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
+{
+	gtk_widget_hide (widget);
+}
+
+static void
+destroy_debug_window (void)
+{
+	if (debug_window != NULL) {
+		gtk_widget_destroy (debug_window);
+		debug_window = NULL;
+	}
+}
+
+/**
+ * eel_debug_show_pixbuf_in:
+ * @pixbuf: Pixbuf to show.
+ *
+ * Show the given pixbuf in an in process window.
+ */
+void
+eel_debug_show_pixbuf (GdkPixbuf *pixbuf)
+{
+	if (debug_window == NULL) {
+		GtkWidget *vbox;
+		
+		debug_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+		vbox = gtk_vbox_new (FALSE, 0);
+		gtk_container_add (GTK_CONTAINER (debug_window), vbox);
+		gtk_window_set_title (GTK_WINDOW (debug_window), "Pixbuf debugging");
+		gtk_window_set_resizable (GTK_WINDOW (debug_window), TRUE);
+		gtk_container_set_border_width (GTK_CONTAINER (debug_window), 10);
+		g_signal_connect (debug_window, "delete_event", G_CALLBACK (debug_delete_event), NULL);
+		
+		debug_image = gtk_widget_new (debug_pixbuf_viewer_get_type (), NULL);
+		
+		gtk_box_pack_start (GTK_BOX (vbox), debug_image, TRUE, TRUE, 0);
+
+		eel_gtk_widget_set_background_color (debug_window, "white");
+
+		eel_debug_call_at_shutdown (destroy_debug_window);
+		
+		gtk_widget_show (debug_image);
+		gtk_widget_show (vbox);
+	}
+
+	gtk_widget_show (debug_window);
+	debug_pixbuf_viewer_set_pixbuf (DEBUG_PIXBUF_VIEWER (debug_image), pixbuf);
+
+	gdk_window_clear_area_e (debug_window->window, 0, 0, -1, -1);
+}
+
+void
+eel_debug_pixbuf_draw_point (GdkPixbuf *pixbuf,
+			     int x,
+			     int y,
+			     guint32 color,
+			     int opacity)
+{
+	EelDimensions dimensions;
+	guchar *pixels;
+	gboolean has_alpha;
+	guint pixel_offset;
+	guint rowstride;
+	guchar red;
+	guchar green;
+	guchar blue;
+	guchar alpha;
+	guchar *offset;
+
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
+	g_return_if_fail (opacity >= EEL_OPACITY_FULLY_TRANSPARENT);
+	g_return_if_fail (opacity <= EEL_OPACITY_FULLY_OPAQUE);
+
+	dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+
+	g_return_if_fail (x >= 0 && x < dimensions.width);
+	g_return_if_fail (y >= 0 && y < dimensions.height);
+
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
+	pixel_offset = has_alpha ? 4 : 3;
+
+	red = EEL_RGBA_COLOR_GET_R (color);
+	green = EEL_RGBA_COLOR_GET_G (color);
+	blue = EEL_RGBA_COLOR_GET_B (color);
+	alpha = (guchar) opacity;
+
+	offset = pixels + y * rowstride + x * pixel_offset;
+
+	*(offset + 0) = red;
+	*(offset + 1) = green;
+	*(offset + 2) = blue;
+	
+	if (has_alpha) {
+		*(offset + 3) = alpha;
+	}
+}
+
+void
+eel_debug_pixbuf_draw_rectangle (GdkPixbuf *pixbuf,
+				 gboolean filled,
+				 int x0,
+				 int y0,
+				 int x1,
+				 int y1,
+				 guint32 color,
+				 int opacity)
+{
+	EelDimensions dimensions;
+	int x;
+	int y;
+
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
+	g_return_if_fail (opacity >= EEL_OPACITY_FULLY_TRANSPARENT);
+	g_return_if_fail (opacity <= EEL_OPACITY_FULLY_OPAQUE);
+
+	dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+
+	if (x0 == -1) {
+		x0 = 0;
+	}
+
+	if (y0 == -1) {
+		y0 = 0;
+	}
+
+	if (x1 == -1) {
+		x1 = dimensions.width - 1;
+	}
+
+	if (y1 == -1) {
+		y1 = dimensions.height - 1;
+	}
+
+	g_return_if_fail (x1 > x0);
+	g_return_if_fail (y1 > y0);
+	g_return_if_fail (x0 >= 0 && x0 < dimensions.width);
+	g_return_if_fail (y0 >= 0 && y0 < dimensions.height);
+	g_return_if_fail (x1 >= 0 && x1 < dimensions.width);
+	g_return_if_fail (y1 >= 0 && y1 < dimensions.height);
+
+	if (filled) {
+		for (y = y0; y <= y1; y++) {
+			for (x = x0; x <= x1; x++) {
+				eel_debug_pixbuf_draw_point (pixbuf, x, y, color, opacity);
+			}
+		}
+	} else {
+		/* Top / Bottom */
+		for (x = x0; x <= x1; x++) {
+			eel_debug_pixbuf_draw_point (pixbuf, x, y0, color, opacity);
+			eel_debug_pixbuf_draw_point (pixbuf, x, y1, color, opacity);
+		}
+		
+		/* Left / Right */
+		for (y = y0; y <= y1; y++) {
+			eel_debug_pixbuf_draw_point (pixbuf, x0, y, color, opacity);
+			eel_debug_pixbuf_draw_point (pixbuf, x1, y, color, opacity);
+		}
+	}
+}
+
+void
+eel_debug_pixbuf_draw_rectangle_inset (GdkPixbuf *pixbuf,
+				       gboolean filled,
+				       int x0,
+				       int y0,
+				       int x1,
+				       int y1,
+				       guint32 color,
+				       int opacity,
+				       int inset)
+{
+	EelDimensions dimensions;
+	
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
+	g_return_if_fail (opacity >= EEL_OPACITY_FULLY_TRANSPARENT);
+	g_return_if_fail (opacity <= EEL_OPACITY_FULLY_OPAQUE);
+
+	dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+
+	if (x0 == -1) {
+		x0 = 0;
+	}
+
+	if (y0 == -1) {
+		y0 = 0;
+	}
+
+	if (x1 == -1) {
+		x1 = dimensions.width - 1;
+	}
+
+	if (y1 == -1) {
+		y1 = dimensions.height - 1;
+	}
+
+	x0 += inset;
+	y0 += inset;
+	x1 -= inset;
+	y1 -= inset;
+
+	g_return_if_fail (x1 > x0);
+	g_return_if_fail (y1 > y0);
+
+	eel_debug_pixbuf_draw_rectangle (pixbuf, filled, x0, y0, x1, y1, color, opacity);
+}
diff --git a/eel/eel-debug-drawing.h b/eel/eel-debug-drawing.h
new file mode 100644
index 000000000..294866952
--- /dev/null
+++ b/eel/eel-debug-drawing.h
@@ -0,0 +1,72 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-debug-drawing.h: Eel drawing debugging aids.
+ 
+   Copyright (C) 2000 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_DEBUG_DRAWING_H
+#define EEL_DEBUG_DRAWING_H
+
+#include <eel/eel-gdk-pixbuf-extensions.h>
+
+/* Draw a rectangle and cross on the given window */
+void eel_debug_draw_rectangle_and_cross       (GdkDrawable     *drawable,
+					       EelIRect         rectangle,
+					       guint32          color,
+					       gboolean         draw_cross);
+
+/* Show the given pixbuf in an external out of process viewer */
+void eel_debug_show_pixbuf_in_external_viewer (const GdkPixbuf *pixbuf,
+					       const char      *viewer_name);
+
+/* Show the given pixbuf in an in process window */
+void eel_debug_show_pixbuf                    (GdkPixbuf *pixbuf);
+
+/* Draw a point in a pixbuf */
+void eel_debug_pixbuf_draw_point              (GdkPixbuf       *pixbuf,
+					       int              x,
+					       int              y,
+					       guint32          color,
+					       int              opacity);
+/* Draw a rectangle in a pixbuf.  The coordinates (-1,-1( (-1,-1) will use
+ * the whole pixbuf. */
+void eel_debug_pixbuf_draw_rectangle          (GdkPixbuf       *pixbuf,
+					       gboolean         filled,
+					       int              x0,
+					       int              y0,
+					       int              x1,
+					       int              y1,
+					       guint32          color,
+					       int              opacity);
+/* Draw an inset rectangle in a pixbuf.  Positive inset make the rectangle
+ * smaller.  Negative inset makes it larger.
+ */
+void eel_debug_pixbuf_draw_rectangle_inset    (GdkPixbuf       *pixbuf,
+					       gboolean         filled,
+					       int              x0,
+					       int              y0,
+					       int              x1,
+					       int              y1,
+					       guint32          color,
+					       int              opacity,
+					       int              inset);
+
+#endif /* EEL_DEBUG_DRAWING_H */
diff --git a/eel/eel-debug.c b/eel/eel-debug.c
new file mode 100644
index 000000000..ecd000f62
--- /dev/null
+++ b/eel/eel-debug.c
@@ -0,0 +1,129 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-debug.c: Eel debugging aids.
+ 
+   Copyright (C) 2000, 2001 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-debug.h"
+
+#include <glib.h>
+#include <signal.h>
+#include <stdio.h>
+
+typedef struct {
+	gpointer data;
+	GFreeFunc function;
+} ShutdownFunction;
+
+static GList *shutdown_functions;
+
+/* Raise a SIGINT signal to get the attention of the debugger.
+ * When not running under the debugger, we don't want to stop,
+ * so we ignore the signal for just the moment that we raise it.
+ */
+void
+eel_stop_in_debugger (void)
+{
+	void (* saved_handler) (int);
+
+	saved_handler = signal (SIGINT, SIG_IGN);
+	raise (SIGINT);
+	signal (SIGINT, saved_handler);
+}
+
+/* Stop in the debugger after running the default log handler.
+ * This makes certain kinds of messages stop in the debugger
+ * without making them fatal (you can continue).
+ */
+static void
+log_handler (const char *domain,
+	     GLogLevelFlags level,
+	     const char *message,
+	     gpointer data)
+{
+	g_log_default_handler (domain, level, message, data);
+	if ((level & (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING)) != 0) {
+		eel_stop_in_debugger ();
+	}
+}
+
+void
+eel_make_warnings_and_criticals_stop_in_debugger (void)
+{
+	g_log_set_default_handler (log_handler, NULL);
+}
+
+int 
+eel_get_available_file_descriptor_count (void)
+{
+	int count;
+	GList *list;
+	GList *p;
+	FILE *file;
+
+	list = NULL;
+	for (count = 0; ; count++) {
+		file = fopen ("/dev/null", "r");
+		if (file == NULL) {
+			break;
+		}
+		list = g_list_prepend (list, file);
+	}
+
+	for (p = list; p != NULL; p = p->next) {
+		fclose (p->data);
+	}
+	g_list_free (list);
+
+	return count;
+}
+
+void
+eel_debug_shut_down (void)
+{
+	ShutdownFunction *f;
+
+	while (shutdown_functions != NULL) {
+		f = shutdown_functions->data;
+		shutdown_functions = g_list_remove (shutdown_functions, f);
+		
+		f->function (f->data);
+		g_free (f);
+	}
+}
+
+void
+eel_debug_call_at_shutdown (EelFunction function)
+{
+	eel_debug_call_at_shutdown_with_data ((GFreeFunc) function, NULL);
+}
+
+void
+eel_debug_call_at_shutdown_with_data (GFreeFunc function, gpointer data)
+{
+	ShutdownFunction *f;
+
+	f = g_new (ShutdownFunction, 1);
+	f->data = data;
+	f->function = function;
+	shutdown_functions = g_list_prepend (shutdown_functions, f);
+}
diff --git a/eel/eel-debug.h b/eel/eel-debug.h
new file mode 100644
index 000000000..fdd5ca335
--- /dev/null
+++ b/eel/eel-debug.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-debug.h: Eel debugging aids.
+ 
+   Copyright (C) 2000, 2001 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Darin Adler <darin@eazel.com>
+*/
+
+#ifndef EEL_DEBUG_H
+#define EEL_DEBUG_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef void (* EelFunction) (void);
+
+void eel_stop_in_debugger                             (void);
+void eel_make_warnings_and_criticals_stop_in_debugger (void);
+int  eel_get_available_file_descriptor_count          (void);
+
+/* A way to do cleanup at exit for compatibility with shutdown tools
+ * like the ones in Bonobo.
+ */
+void eel_debug_shut_down                              (void);
+void eel_debug_call_at_shutdown                       (EelFunction function);
+void eel_debug_call_at_shutdown_with_data             (GFreeFunc   function,
+						       gpointer    data);
+
+G_END_DECLS
+
+#endif /* EEL_DEBUG_H */
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
new file mode 100644
index 000000000..ab60eca76
--- /dev/null
+++ b/eel/eel-editable-label.c
@@ -0,0 +1,4410 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include <config.h>
+#include <math.h>
+#include <string.h>
+
+#include "eel-editable-label.h"
+#include "eel-i18n.h"
+#include "eel-marshal.h"
+#include "eel-accessibility.h"
+#include <libgail-util/gailmisc.h>
+
+#include <pango/pango.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+enum {
+  MOVE_CURSOR,
+  POPULATE_POPUP,
+  DELETE_FROM_CURSOR,
+  CUT_CLIPBOARD,
+  COPY_CLIPBOARD,
+  PASTE_CLIPBOARD,
+  TOGGLE_OVERWRITE,
+  LAST_SIGNAL
+};
+
+enum {
+  PROP_0,
+  PROP_TEXT,
+  PROP_JUSTIFY,
+  PROP_WRAP,
+  PROP_CURSOR_POSITION,
+  PROP_SELECTION_BOUND
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+static void     eel_editable_label_editable_init           (GtkEditableClass      *iface);
+static void     eel_editable_label_class_init              (EelEditableLabelClass *klass);
+static void     eel_editable_label_init                    (EelEditableLabel      *label);
+static void     eel_editable_label_set_property            (GObject               *object,
+							    guint                  prop_id,
+							    const GValue          *value,
+							    GParamSpec            *pspec);
+static void     eel_editable_label_get_property            (GObject               *object,
+							    guint                  prop_id,
+							    GValue                *value,
+							    GParamSpec            *pspec);
+static void     eel_editable_label_finalize                (GObject               *object);
+static void     eel_editable_label_size_request            (GtkWidget             *widget,
+							    GtkRequisition        *requisition);
+static void     eel_editable_label_size_allocate           (GtkWidget             *widget,
+							    GtkAllocation         *allocation);
+static void     eel_editable_label_state_changed           (GtkWidget             *widget,
+							    GtkStateType           state);
+static void     eel_editable_label_style_set               (GtkWidget             *widget,
+							    GtkStyle              *previous_style);
+static void     eel_editable_label_direction_changed       (GtkWidget             *widget,
+							    GtkTextDirection       previous_dir);
+static gint     eel_editable_label_expose                  (GtkWidget             *widget,
+							    GdkEventExpose        *event);
+static void     eel_editable_label_realize                 (GtkWidget             *widget);
+static void     eel_editable_label_unrealize               (GtkWidget             *widget);
+static void     eel_editable_label_map                     (GtkWidget             *widget);
+static void     eel_editable_label_unmap                   (GtkWidget             *widget);
+static gint     eel_editable_label_button_press            (GtkWidget             *widget,
+							    GdkEventButton        *event);
+static gint     eel_editable_label_button_release          (GtkWidget             *widget,
+							    GdkEventButton        *event);
+static gint     eel_editable_label_motion                  (GtkWidget             *widget,
+							    GdkEventMotion        *event);
+static gint     eel_editable_label_key_press               (GtkWidget             *widget,
+							    GdkEventKey           *event);
+static gint     eel_editable_label_key_release             (GtkWidget             *widget,
+							    GdkEventKey           *event);
+static gint     eel_editable_label_focus_in                (GtkWidget             *widget,
+							    GdkEventFocus         *event);
+static gint     eel_editable_label_focus_out               (GtkWidget             *widget,
+							    GdkEventFocus         *event);
+static AtkObject *eel_editable_label_get_accessible        (GtkWidget             *widget);
+static void     eel_editable_label_commit_cb               (GtkIMContext          *context,
+							    const gchar           *str,
+							    EelEditableLabel      *label);
+static void     eel_editable_label_preedit_changed_cb      (GtkIMContext          *context,
+							    EelEditableLabel      *label);
+static gboolean eel_editable_label_retrieve_surrounding_cb (GtkIMContext          *context,
+							    EelEditableLabel      *label);
+static gboolean eel_editable_label_delete_surrounding_cb   (GtkIMContext          *slave,
+							    gint                   offset,
+							    gint                   n_chars,
+							    EelEditableLabel      *label);
+static void     eel_editable_label_clear_layout            (EelEditableLabel      *label);
+static void     eel_editable_label_recompute               (EelEditableLabel      *label);
+static void     eel_editable_label_ensure_layout           (EelEditableLabel      *label,
+							    gboolean               include_preedit);
+static void     eel_editable_label_select_region_index     (EelEditableLabel      *label,
+							    gint                   anchor_index,
+							    gint                   end_index);
+static gboolean eel_editable_label_focus                   (GtkWidget             *widget,
+							    GtkDirectionType       direction);
+static void     eel_editable_label_move_cursor             (EelEditableLabel      *label,
+							    GtkMovementStep        step,
+							    gint                   count,
+							    gboolean               extend_selection);
+static void     eel_editable_label_delete_from_cursor      (EelEditableLabel      *label,
+							    GtkDeleteType          type,
+							    gint                   count);
+static void     eel_editable_label_copy_clipboard          (EelEditableLabel      *label);
+static void     eel_editable_label_cut_clipboard           (EelEditableLabel      *label);
+static void     eel_editable_label_paste                   (EelEditableLabel      *label,
+							    GdkAtom                selection);
+static void     eel_editable_label_paste_clipboard         (EelEditableLabel      *label);
+static void     eel_editable_label_select_all              (EelEditableLabel      *label);
+static void     eel_editable_label_do_popup                (EelEditableLabel      *label,
+							    GdkEventButton        *event);
+static void     eel_editable_label_toggle_overwrite        (EelEditableLabel      *label);
+static gint     eel_editable_label_move_forward_word       (EelEditableLabel      *label,
+							    gint                   start);
+static gint     eel_editable_label_move_backward_word      (EelEditableLabel      *label,
+							    gint                   start);
+static void     eel_editable_label_reset_im_context        (EelEditableLabel      *label);
+static void     eel_editable_label_check_cursor_blink      (EelEditableLabel      *label);
+static void     eel_editable_label_pend_cursor_blink       (EelEditableLabel      *label);
+
+/* Editable implementation: */
+static void     editable_insert_text_emit     (GtkEditable *editable,
+					       const gchar *new_text,
+					       gint         new_text_length,
+					       gint        *position);
+static void     editable_delete_text_emit     (GtkEditable *editable,
+					       gint         start_pos,
+					       gint         end_pos);
+static void     editable_insert_text          (GtkEditable *editable,
+					       const gchar *new_text,
+					       gint         new_text_length,
+					       gint        *position);
+static void     editable_delete_text          (GtkEditable *editable,
+					       gint         start_pos,
+					       gint         end_pos);
+static gchar *  editable_get_chars            (GtkEditable *editable,
+					       gint         start_pos,
+					       gint         end_pos);
+static void     editable_set_selection_bounds (GtkEditable *editable,
+					       gint         start,
+					       gint         end);
+static gboolean editable_get_selection_bounds (GtkEditable *editable,
+					       gint        *start,
+					       gint        *end);
+static void     editable_real_set_position    (GtkEditable *editable,
+					       gint         position);
+static gint     editable_get_position         (GtkEditable *editable);
+
+static GdkGC *  make_cursor_gc                (GtkWidget   *widget,
+					       const gchar *property_name,
+					       GdkColor    *fallback);
+
+
+
+static GtkMiscClass *parent_class = NULL;
+
+GType
+eel_editable_label_get_type (void)
+{
+  static GType label_type = 0;
+  
+  if (!label_type)
+    {
+      const GTypeInfo label_info =
+      {
+	sizeof (EelEditableLabelClass),
+	NULL,           /* base_init */
+	NULL,           /* base_finalize */
+	(GClassInitFunc) eel_editable_label_class_init,
+	NULL,           /* class_finalize */
+	NULL,           /* class_data */
+	sizeof (EelEditableLabel),
+	32,             /* n_preallocs */
+	(GInstanceInitFunc) eel_editable_label_init,
+      };
+
+      const GInterfaceInfo editable_info =
+      {
+	(GInterfaceInitFunc) eel_editable_label_editable_init,	/* interface_init */
+	NULL,							/* interface_finalize */
+	NULL							/* interface_data */
+      };
+
+      
+      label_type = g_type_register_static (GTK_TYPE_MISC, "EelEditableLabel", &label_info, 0);
+      g_type_add_interface_static (label_type,
+				   GTK_TYPE_EDITABLE,
+				   &editable_info);
+    }
+  
+  return label_type;
+}
+
+static void
+add_move_binding (GtkBindingSet  *binding_set,
+		  guint           keyval,
+		  guint           modmask,
+		  GtkMovementStep step,
+		  gint            count)
+{
+  g_assert ((modmask & GDK_SHIFT_MASK) == 0);
+  
+  gtk_binding_entry_add_signal (binding_set, keyval, modmask,
+				"move_cursor", 3,
+				G_TYPE_ENUM, step,
+				G_TYPE_INT, count,
+                                G_TYPE_BOOLEAN, FALSE);
+
+  /* Selection-extending version */
+  gtk_binding_entry_add_signal (binding_set, keyval, modmask | GDK_SHIFT_MASK,
+				"move_cursor", 3,
+				G_TYPE_ENUM, step,
+				G_TYPE_INT, count,
+                                G_TYPE_BOOLEAN, TRUE);
+}
+
+static void
+eel_editable_label_class_init (EelEditableLabelClass *class)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+  GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+  GtkBindingSet *binding_set;
+
+  parent_class = gtk_type_class (GTK_TYPE_MISC);
+  
+  gobject_class->set_property = eel_editable_label_set_property;
+  gobject_class->get_property = eel_editable_label_get_property;
+  gobject_class->finalize = eel_editable_label_finalize;
+
+  widget_class->size_request = eel_editable_label_size_request;
+  widget_class->size_allocate = eel_editable_label_size_allocate;
+  widget_class->state_changed = eel_editable_label_state_changed;
+  widget_class->style_set = eel_editable_label_style_set;
+  widget_class->direction_changed = eel_editable_label_direction_changed;
+  widget_class->expose_event = eel_editable_label_expose;
+  widget_class->realize = eel_editable_label_realize;
+  widget_class->unrealize = eel_editable_label_unrealize;
+  widget_class->map = eel_editable_label_map;
+  widget_class->unmap = eel_editable_label_unmap;
+  widget_class->button_press_event = eel_editable_label_button_press;
+  widget_class->button_release_event = eel_editable_label_button_release;
+  widget_class->motion_notify_event = eel_editable_label_motion;
+  widget_class->focus = eel_editable_label_focus;
+  widget_class->key_press_event = eel_editable_label_key_press;
+  widget_class->key_release_event = eel_editable_label_key_release;
+  widget_class->focus_in_event = eel_editable_label_focus_in;
+  widget_class->focus_out_event = eel_editable_label_focus_out;
+  widget_class->get_accessible = eel_editable_label_get_accessible;
+
+  class->move_cursor = eel_editable_label_move_cursor;
+  class->delete_from_cursor = eel_editable_label_delete_from_cursor;
+  class->copy_clipboard = eel_editable_label_copy_clipboard;
+  class->cut_clipboard = eel_editable_label_cut_clipboard;
+  class->paste_clipboard = eel_editable_label_paste_clipboard;
+  class->toggle_overwrite = eel_editable_label_toggle_overwrite;
+  
+  signals[MOVE_CURSOR] = 
+    g_signal_new ("move_cursor",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, move_cursor),
+		  NULL, NULL,
+		  eel_marshal_VOID__ENUM_INT_BOOLEAN,
+		  G_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT, G_TYPE_BOOLEAN);
+  
+  signals[COPY_CLIPBOARD] =
+    g_signal_new ("copy_clipboard",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET  (EelEditableLabelClass, copy_clipboard),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+  
+  signals[POPULATE_POPUP] =
+    g_signal_new ("populate_popup",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, populate_popup),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__OBJECT,
+		  G_TYPE_NONE, 1, GTK_TYPE_MENU);
+
+  signals[DELETE_FROM_CURSOR] = 
+    g_signal_new ("delete_from_cursor",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, delete_from_cursor),
+		  NULL, NULL, 
+		  eel_marshal_VOID__ENUM_INT,
+		  G_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, G_TYPE_INT);
+  
+  signals[CUT_CLIPBOARD] =
+    g_signal_new ("cut_clipboard",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, cut_clipboard),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
+  signals[PASTE_CLIPBOARD] =
+    g_signal_new ("paste_clipboard",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, paste_clipboard),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
+  signals[TOGGLE_OVERWRITE] =
+    g_signal_new ("toggle_overwrite",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (EelEditableLabelClass, toggle_overwrite),
+		  NULL, NULL, 
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
+  
+  g_object_class_install_property (G_OBJECT_CLASS(object_class),
+                                   PROP_TEXT,
+                                   g_param_spec_string ("text",
+                                                        _("Text"),
+                                                        _("The text of the label."),
+                                                        NULL,
+                                                        G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+				   PROP_JUSTIFY,
+                                   g_param_spec_enum ("justify",
+                                                      _("Justification"),
+                                                      _("The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that."),
+						      GTK_TYPE_JUSTIFICATION,
+						      GTK_JUSTIFY_LEFT,
+                                                      G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_WRAP,
+                                   g_param_spec_boolean ("wrap",
+                                                        _("Line wrap"),
+                                                        _("If set, wrap lines if the text becomes too wide."),
+                                                        FALSE,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_CURSOR_POSITION,
+                                   g_param_spec_int ("cursor_position",
+                                                     _("Cursor Position"),
+                                                     _("The current position of the insertion cursor in chars."),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     G_PARAM_READABLE));
+  
+  g_object_class_install_property (gobject_class,
+                                   PROP_SELECTION_BOUND,
+                                   g_param_spec_int ("selection_bound",
+                                                     _("Selection Bound"),
+                                                     _("The position of the opposite end of the selection from the cursor in chars."),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     G_PARAM_READABLE));
+  
+  /*
+   * Key bindings
+   */
+
+  binding_set = gtk_binding_set_by_class (class);
+
+  /* Moving the insertion point */
+  add_move_binding (binding_set, GDK_Right, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  
+  add_move_binding (binding_set, GDK_Left, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+
+  add_move_binding (binding_set, GDK_KP_Right, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  
+  add_move_binding (binding_set, GDK_KP_Left, 0,
+		    GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+  
+  add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_LOGICAL_POSITIONS, 1);
+  
+  add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_LOGICAL_POSITIONS, -1);
+  
+  add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_WORDS, 1);
+
+  add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_WORDS, -1);
+
+  add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_WORDS, 1);
+
+  add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_WORDS, -1);
+  
+  add_move_binding (binding_set, GDK_a, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_PARAGRAPH_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_e, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_PARAGRAPH_ENDS, 1);
+
+  add_move_binding (binding_set, GDK_f, GDK_MOD1_MASK,
+		    GTK_MOVEMENT_WORDS, 1);
+
+  add_move_binding (binding_set, GDK_b, GDK_MOD1_MASK,
+		    GTK_MOVEMENT_WORDS, -1);
+
+  add_move_binding (binding_set, GDK_Home, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_End, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
+
+  add_move_binding (binding_set, GDK_KP_Home, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_KP_End, 0,
+		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
+  
+  add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, 1);
+
+  add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, -1);
+
+  add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+		    GTK_MOVEMENT_BUFFER_ENDS, 1);
+
+  add_move_binding (binding_set, GDK_Up, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, -1);
+
+  add_move_binding (binding_set, GDK_KP_Up, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, -1);
+  
+  add_move_binding (binding_set, GDK_Down, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+  add_move_binding (binding_set, GDK_KP_Down, 0,
+                    GTK_MOVEMENT_DISPLAY_LINES, 1);
+  
+  /* Select all
+   */
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+                                "move_cursor", 3,
+                                GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
+                                G_TYPE_INT, -1,
+				G_TYPE_BOOLEAN, FALSE);
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+                                "move_cursor", 3,
+                                GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
+                                G_TYPE_INT, 1,
+				G_TYPE_BOOLEAN, TRUE);
+  
+  /* Deleting text */
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_CHARS,
+				G_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, 0,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_CHARS,
+				G_TYPE_INT, 1);
+  
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_CHARS,
+				G_TYPE_INT, -1);
+
+  /* Make this do the same as Backspace, to help with mis-typing */
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
+                                "delete_from_cursor", 2,
+                                G_TYPE_ENUM, GTK_DELETE_CHARS,
+                                G_TYPE_INT, -1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+				G_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+				G_TYPE_INT, 1);
+  
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
+				"delete_from_cursor", 2,
+				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+				G_TYPE_INT, -1);
+
+  /* Cut/copy/paste */
+
+  gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
+				"cut_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
+				"copy_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
+				"paste_clipboard", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
+				"cut_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_CONTROL_MASK,
+				"copy_clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_SHIFT_MASK,
+				"paste_clipboard", 0);
+
+  /* Overwrite */
+  gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
+				"toggle_overwrite", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Insert, 0,
+				"toggle_overwrite", 0);
+}
+
+static void
+eel_editable_label_editable_init (GtkEditableClass *iface)
+{
+  iface->do_insert_text = editable_insert_text_emit;
+  iface->do_delete_text = editable_delete_text_emit;
+  iface->insert_text = editable_insert_text;
+  iface->delete_text = editable_delete_text;
+  iface->get_chars = editable_get_chars;
+  iface->set_selection_bounds = editable_set_selection_bounds;
+  iface->get_selection_bounds = editable_get_selection_bounds;
+  iface->set_position = editable_real_set_position;
+  iface->get_position = editable_get_position;
+}
+
+
+static void 
+eel_editable_label_set_property (GObject      *object,
+				 guint         prop_id,
+				 const GValue *value,
+				 GParamSpec   *pspec)
+{
+  EelEditableLabel *label;
+
+  label = EEL_EDITABLE_LABEL (object);
+  
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      eel_editable_label_set_text (label, g_value_get_string (value));
+      break;
+    case PROP_JUSTIFY:
+      eel_editable_label_set_justify (label, g_value_get_enum (value));
+      break;
+    case PROP_WRAP:
+      eel_editable_label_set_line_wrap (label, g_value_get_boolean (value));
+      break;	  
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void 
+eel_editable_label_get_property (GObject     *object,
+				 guint        prop_id,
+				 GValue      *value,
+				 GParamSpec  *pspec)
+{
+  EelEditableLabel *label;
+  gint offset;
+  
+  label = EEL_EDITABLE_LABEL (object);
+  
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      g_value_set_string (value, label->text);
+      break;
+    case PROP_JUSTIFY:
+      g_value_set_enum (value, label->jtype);
+      break;
+    case PROP_WRAP:
+      g_value_set_boolean (value, label->wrap);
+      break;
+    case PROP_CURSOR_POSITION:
+      offset = g_utf8_pointer_to_offset (label->text,
+					 label->text + label->selection_end);
+      g_value_set_int (value, offset);
+      break;
+    case PROP_SELECTION_BOUND:
+      offset = g_utf8_pointer_to_offset (label->text,
+					 label->text + label->selection_anchor);
+      g_value_set_int (value, offset);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+eel_editable_label_init (EelEditableLabel *label)
+{
+  label->jtype = GTK_JUSTIFY_LEFT;
+  label->wrap = FALSE;
+  label->wrap_mode = PANGO_WRAP_WORD;
+
+  label->layout = NULL;
+  label->text_size = 1;
+  label->text = g_malloc (label->text_size);
+  label->text[0] = '\0';
+  label->n_bytes = 0;
+  
+  GTK_WIDGET_SET_FLAGS (label, GTK_CAN_FOCUS);
+
+    /* This object is completely private. No external entity can gain a reference
+   * to it; so we create it here and destroy it in finalize().
+   */
+  label->im_context = gtk_im_multicontext_new ();
+
+  g_signal_connect (G_OBJECT (label->im_context), "commit",
+		    G_CALLBACK (eel_editable_label_commit_cb), label);
+  g_signal_connect (G_OBJECT (label->im_context), "preedit_changed",
+		    G_CALLBACK (eel_editable_label_preedit_changed_cb), label);
+  g_signal_connect (G_OBJECT (label->im_context), "retrieve_surrounding",
+		    G_CALLBACK (eel_editable_label_retrieve_surrounding_cb), label);
+  g_signal_connect (G_OBJECT (label->im_context), "delete_surrounding",
+		    G_CALLBACK (eel_editable_label_delete_surrounding_cb), label);
+}
+
+/**
+ * eel_editable_label_new:
+ * @str: The text of the label
+ *
+ * Creates a new label with the given text inside it. You can
+ * pass %NULL to get an empty label widget.
+ *
+ * Return value: the new #EelEditableLabel
+ **/
+GtkWidget*
+eel_editable_label_new (const gchar *str)
+{
+  EelEditableLabel *label;
+  
+  label = g_object_new (EEL_TYPE_EDITABLE_LABEL, NULL);
+
+  if (str && *str)
+    eel_editable_label_set_text (label, str);
+  
+  return GTK_WIDGET (label);
+}
+
+/**
+ * eel_editable_label_set_text:
+ * @label: a #EelEditableLabel
+ * @str: The text you want to set.
+ *
+ * Sets the text within the #EelEditableLabel widget.  It overwrites any text that
+ * was there before.  
+ *
+ * This will also clear any previously set mnemonic accelerators.
+ **/
+void
+eel_editable_label_set_text (EelEditableLabel *label,
+			     const gchar *str)
+{
+  GtkEditable *editable;
+  int tmp_pos;
+  
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  g_return_if_fail (str != NULL);
+  
+  if (strcmp (label->text, str) == 0)
+    return;
+
+  editable = GTK_EDITABLE (label);
+  gtk_editable_delete_text (editable, 0, -1);
+  tmp_pos = 0;
+  gtk_editable_insert_text (editable, str, strlen (str), &tmp_pos);
+}
+
+/**
+ * eel_editable_label_get_text:
+ * @label: a #EelEditableLabel
+ * 
+ * Fetches the text from a label widget, as displayed on the
+ * screen. This does not include any embedded underlines
+ * indicating mnemonics or Pango markup. (See eel_editable_label_get_label())
+ * 
+ * Return value: the text in the label widget. This is the internal
+ *   string used by the label, and must not be modified.
+ **/
+G_CONST_RETURN gchar *
+eel_editable_label_get_text (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), NULL);
+
+  return label->text;
+}
+
+/**
+ * eel_editable_label_set_justify:
+ * @label: a #EelEditableLabel
+ * @jtype: a #GtkJustification
+ *
+ * Sets the alignment of the lines in the text of the label relative to
+ * each other.  %GTK_JUSTIFY_LEFT is the default value when the
+ * widget is first created with eel_editable_label_new(). If you instead want
+ * to set the alignment of the label as a whole, use
+ * gtk_misc_set_alignment() instead. eel_editable_label_set_justify() has no
+ * effect on labels containing only a single line.
+ **/
+void
+eel_editable_label_set_justify (EelEditableLabel        *label,
+				GtkJustification jtype)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  g_return_if_fail (jtype >= GTK_JUSTIFY_LEFT && jtype <= GTK_JUSTIFY_FILL);
+  
+  if ((GtkJustification) label->jtype != jtype)
+    {
+      label->jtype = jtype;
+
+      /* No real need to be this drastic, but easier than duplicating the code */
+      eel_editable_label_recompute (label);
+      
+      g_object_notify (G_OBJECT (label), "justify");
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+    }
+}
+
+/**
+ * eel_editable_label_get_justify:
+ * @label: a #EelEditableLabel
+ *
+ * Returns the justification of the label. See eel_editable_label_set_justify ().
+ *
+ * Return value: #GtkJustification
+ **/
+GtkJustification
+eel_editable_label_get_justify (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), 0);
+
+  return label->jtype;
+}
+
+void
+eel_editable_label_set_draw_outline (EelEditableLabel *label,
+				     gboolean          draw_outline)
+{
+    draw_outline = draw_outline != FALSE;
+
+    if (label->draw_outline != draw_outline)
+    {
+      label->draw_outline = draw_outline;
+      
+      gtk_widget_queue_draw (GTK_WIDGET (label));
+    }
+
+}
+
+
+/**
+ * eel_editable_label_set_line_wrap:
+ * @label: a #EelEditableLabel
+ * @wrap: the setting
+ *
+ * Toggles line wrapping within the #EelEditableLabel widget.  %TRUE makes it break
+ * lines if text exceeds the widget's size.  %FALSE lets the text get cut off
+ * by the edge of the widget if it exceeds the widget size.
+ **/
+void
+eel_editable_label_set_line_wrap (EelEditableLabel *label,
+				  gboolean  wrap)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  wrap = wrap != FALSE;
+  
+  if (label->wrap != wrap)
+    {
+      label->wrap = wrap;
+      g_object_notify (G_OBJECT (label), "wrap");
+      
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+    }
+}
+
+
+void
+eel_editable_label_set_line_wrap_mode (EelEditableLabel *label,
+				       PangoWrapMode     mode)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  if (label->wrap_mode != mode)
+    {
+      label->wrap_mode = mode;
+      
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+    }
+  
+}
+
+
+/**
+ * eel_editable_label_get_line_wrap:
+ * @label: a #EelEditableLabel
+ *
+ * Returns whether lines in the label are automatically wrapped. See eel_editable_label_set_line_wrap ().
+ *
+ * Return value: %TRUE if the lines of the label are automatically wrapped.
+ */
+gboolean
+eel_editable_label_get_line_wrap (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), FALSE);
+
+  return label->wrap;
+}
+
+PangoFontDescription *
+eel_editable_label_get_font_description (EelEditableLabel *label)
+{
+  if (label->font_desc)
+    return pango_font_description_copy (label->font_desc);
+
+  return NULL;
+}
+
+void
+eel_editable_label_set_font_description (EelEditableLabel *label,
+					 const PangoFontDescription *desc)
+{
+  if (label->font_desc)
+    pango_font_description_free (label->font_desc);
+
+  if (desc)
+    label->font_desc = pango_font_description_copy (desc);
+  else
+    label->font_desc = NULL;
+
+  eel_editable_label_clear_layout (label);
+}
+
+static void
+eel_editable_label_finalize (GObject *object)
+{
+  EelEditableLabel *label;
+  
+  g_assert (EEL_IS_EDITABLE_LABEL (object));
+  
+  label = EEL_EDITABLE_LABEL (object);
+
+  if (label->font_desc)
+    {
+      pango_font_description_free (label->font_desc);
+      label->font_desc = NULL;
+    }
+  
+  g_object_unref (G_OBJECT (label->im_context));
+  label->im_context = NULL;
+  
+  g_free (label->text);
+  label->text = NULL;
+
+  if (label->layout)
+    {
+      g_object_unref (G_OBJECT (label->layout));
+      label->layout = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+eel_editable_label_clear_layout (EelEditableLabel *label)
+{
+  if (label->layout)
+    {
+      g_object_unref (G_OBJECT (label->layout));
+      label->layout = NULL;
+    }
+}
+
+static void
+eel_editable_label_recompute (EelEditableLabel *label)
+{
+  eel_editable_label_clear_layout (label);
+  eel_editable_label_check_cursor_blink (label);
+}
+
+typedef struct _LabelWrapWidth LabelWrapWidth;
+struct _LabelWrapWidth
+{
+  gint width;
+  PangoFontDescription *font_desc;
+};
+
+static void
+label_wrap_width_free (gpointer data)
+{
+  LabelWrapWidth *wrap_width = data;
+  pango_font_description_free (wrap_width->font_desc);
+  g_free (wrap_width);
+}
+
+static gint
+get_label_wrap_width (EelEditableLabel *label)
+{
+  PangoLayout *layout;
+  GtkStyle *style = GTK_WIDGET (label)->style;
+
+  LabelWrapWidth *wrap_width = g_object_get_data (G_OBJECT (style), "gtk-label-wrap-width");
+  if (!wrap_width)
+    {
+      wrap_width = g_new0 (LabelWrapWidth, 1);
+      g_object_set_data_full (G_OBJECT (style), "gtk-label-wrap-width",
+			      wrap_width, label_wrap_width_free);
+    }
+
+  if (wrap_width->font_desc && pango_font_description_equal (wrap_width->font_desc, style->font_desc))
+    return wrap_width->width;
+
+  if (wrap_width->font_desc)
+    pango_font_description_free (wrap_width->font_desc);
+
+  wrap_width->font_desc = pango_font_description_copy (style->font_desc);
+
+  layout = gtk_widget_create_pango_layout (GTK_WIDGET (label), 
+					   "This long string gives a good enough length for any line to have.");
+  pango_layout_get_size (layout, &wrap_width->width, NULL);
+  g_object_unref (layout);
+
+  return wrap_width->width;
+}
+
+static void
+eel_editable_label_ensure_layout (EelEditableLabel *label,
+				  gboolean        include_preedit)
+{
+  GtkWidget *widget;
+  PangoRectangle logical_rect;
+
+  /* Normalize for comparisons */
+  include_preedit = include_preedit != 0;
+
+  if (label->preedit_length > 0 &&
+      include_preedit != label->layout_includes_preedit)
+    eel_editable_label_clear_layout (label);
+  
+  widget = GTK_WIDGET (label);
+
+  if (label->layout == NULL)
+    {
+      gchar *preedit_string = NULL;
+      gint preedit_length = 0;
+      PangoAttrList *preedit_attrs = NULL;
+      PangoAlignment align = PANGO_ALIGN_LEFT; /* Quiet gcc */
+      PangoAttrList *tmp_attrs = pango_attr_list_new ();
+
+      if (include_preedit)
+	{
+	  gtk_im_context_get_preedit_string (label->im_context,
+					     &preedit_string, &preedit_attrs, NULL);
+	  preedit_length = label->preedit_length;
+	}
+
+      if (preedit_length)
+	{
+	  GString *tmp_string = g_string_new (NULL);
+	  
+	  g_string_prepend_len (tmp_string, label->text, label->n_bytes);
+	  g_string_insert (tmp_string, label->selection_anchor, preedit_string);
+      
+	  label->layout = gtk_widget_create_pango_layout (widget, tmp_string->str);
+      
+	  pango_attr_list_splice (tmp_attrs, preedit_attrs,
+				  label->selection_anchor, preedit_length);
+	  
+	  g_string_free (tmp_string, TRUE);
+	}
+      else
+	{
+	  label->layout = gtk_widget_create_pango_layout (widget, label->text);
+	}
+      label->layout_includes_preedit = include_preedit;
+
+      if (label->font_desc != NULL)
+	pango_layout_set_font_description (label->layout, label->font_desc);
+      
+      pango_layout_set_attributes (label->layout, tmp_attrs);
+      
+      if (preedit_string)
+	g_free (preedit_string);
+      if (preedit_attrs)
+	pango_attr_list_unref (preedit_attrs);
+      pango_attr_list_unref (tmp_attrs);
+
+      switch (label->jtype)
+	{
+	case GTK_JUSTIFY_LEFT:
+	  align = PANGO_ALIGN_LEFT;
+	  break;
+	case GTK_JUSTIFY_RIGHT:
+	  align = PANGO_ALIGN_RIGHT;
+	  break;
+	case GTK_JUSTIFY_CENTER:
+	  align = PANGO_ALIGN_CENTER;
+	  break;
+	case GTK_JUSTIFY_FILL:
+	  /* FIXME: This just doesn't work to do this */
+	  align = PANGO_ALIGN_LEFT;
+	  pango_layout_set_justify (label->layout, TRUE);
+	  break;
+	default:
+	  g_assert_not_reached();
+	}
+
+      pango_layout_set_alignment (label->layout, align);
+
+      if (label->wrap)
+	{
+	  gint longest_paragraph;
+	  gint width, height;
+	  gint set_width;
+
+	  gtk_widget_get_size_request (widget, &set_width, NULL);
+	  if (set_width > 0)
+	    pango_layout_set_width (label->layout, set_width * PANGO_SCALE);
+	  else
+	    {
+	      gint wrap_width;
+	      
+	      pango_layout_set_width (label->layout, -1);
+	      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+
+	      width = logical_rect.width;
+	      
+	      /* Try to guess a reasonable maximum width */
+	      longest_paragraph = width;
+
+	      wrap_width = get_label_wrap_width (label);
+	      width = MIN (width, wrap_width);
+	      width = MIN (width,
+			   PANGO_SCALE * (gdk_screen_width () + 1) / 2);
+	      
+	      pango_layout_set_width (label->layout, width);
+	      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+	      width = logical_rect.width;
+	      height = logical_rect.height;
+	      
+	      /* Unfortunately, the above may leave us with a very unbalanced looking paragraph,
+	       * so we try short search for a narrower width that leaves us with the same height
+	       */
+	      if (longest_paragraph > 0)
+		{
+		  gint nlines, perfect_width;
+		  
+		  nlines = pango_layout_get_line_count (label->layout);
+		  perfect_width = (longest_paragraph + nlines - 1) / nlines;
+		  
+		  if (perfect_width < width)
+		    {
+		      pango_layout_set_width (label->layout, perfect_width);
+		      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+		      
+		      if (logical_rect.height <= height)
+			width = logical_rect.width;
+		      else
+			{
+			  gint mid_width = (perfect_width + width) / 2;
+			  
+			  if (mid_width > perfect_width)
+			    {
+			      pango_layout_set_width (label->layout, mid_width);
+			      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+			      
+			      if (logical_rect.height <= height)
+				width = logical_rect.width;
+			    }
+			}
+		    }
+		}
+	      pango_layout_set_width (label->layout, width);
+	    }
+	  pango_layout_set_wrap (label->layout, label->wrap_mode);
+	}
+      else		/* !label->wrap */
+	pango_layout_set_width (label->layout, -1);
+    }
+}
+
+static void
+eel_editable_label_size_request (GtkWidget      *widget,
+				 GtkRequisition *requisition)
+{
+  EelEditableLabel *label;
+  gint width, height;
+  PangoRectangle logical_rect;
+  gint set_width;
+
+  g_assert (EEL_IS_EDITABLE_LABEL (widget));
+  g_assert (requisition != NULL);
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  /*  
+   * If word wrapping is on, then the height requisition can depend
+   * on:
+   *
+   *   - Any width set on the widget via gtk_widget_set_usize().
+   *   - The padding of the widget (xpad, set by gtk_misc_set_padding)
+   *
+   * Instead of trying to detect changes to these quantities, if we
+   * are wrapping, we just rewrap for each size request. Since
+   * size requisitions are cached by the GTK+ core, this is not
+   * expensive.
+   */
+
+  if (label->wrap)
+    eel_editable_label_recompute (label);
+
+  eel_editable_label_ensure_layout (label, TRUE);
+
+  width = label->misc.xpad * 2;
+  height = label->misc.ypad * 2;
+
+  pango_layout_get_extents (label->layout, NULL, &logical_rect);
+  
+  gtk_widget_get_size_request (widget, &set_width, NULL);
+  if (label->wrap && set_width > 0)
+    width += set_width;
+  else 
+    width += PANGO_PIXELS (logical_rect.width);
+  
+  height += PANGO_PIXELS (logical_rect.height);
+
+  requisition->width = width;
+  requisition->height = height;
+}
+
+static void
+eel_editable_label_size_allocate (GtkWidget     *widget,
+				  GtkAllocation *allocation)
+{
+  (* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
+}
+
+static void
+eel_editable_label_state_changed (GtkWidget   *widget,
+				  GtkStateType prev_state)
+{
+  EelEditableLabel *label;
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_select_region (label, 0, 0);
+
+  if (GTK_WIDGET_CLASS (parent_class)->state_changed)
+    GTK_WIDGET_CLASS (parent_class)->state_changed (widget, prev_state);
+}
+
+static void 
+eel_editable_label_style_set (GtkWidget *widget,
+			      GtkStyle  *previous_style)
+{
+  EelEditableLabel *label;
+  static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
+  
+  g_assert (EEL_IS_EDITABLE_LABEL (widget));
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  /* We have to clear the layout, fonts etc. may have changed */
+  eel_editable_label_recompute (label);
+
+  /* Set the background, foreground and cursor colors based on 
+   * the new theme selected.
+   */
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+	gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+
+	if (label->primary_cursor_gc != NULL) 
+	  {
+		gtk_gc_release (label->primary_cursor_gc);
+		label->primary_cursor_gc = NULL;
+	  }
+
+	if (label->secondary_cursor_gc != NULL) 
+	  {
+		gtk_gc_release (label->secondary_cursor_gc);
+		label->secondary_cursor_gc = NULL;
+	  }
+
+	label->primary_cursor_gc = make_cursor_gc (widget,
+						   "cursor-color",
+						   &widget->style->black);
+
+	label->secondary_cursor_gc = make_cursor_gc (widget,
+						     "secondary-cursor-color",
+						     &gray);
+    }
+}
+
+static void 
+eel_editable_label_direction_changed (GtkWidget        *widget,
+				      GtkTextDirection previous_dir)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+
+  if (label->layout)
+    pango_layout_context_changed (label->layout);
+
+  GTK_WIDGET_CLASS (parent_class)->direction_changed (widget, previous_dir);
+}
+
+static void
+get_layout_location (EelEditableLabel  *label,
+                     gint      *xp,
+                     gint      *yp)
+{
+  GtkMisc *misc;
+  GtkWidget *widget;
+  gfloat xalign;
+  GtkRequisition req;
+  gint x, y;
+  
+  misc = GTK_MISC (label);
+  widget = GTK_WIDGET (label);
+  
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+    xalign = misc->xalign;
+  else
+    xalign = 1.0 - misc->xalign;
+
+  gtk_widget_get_child_requisition (widget, &req);
+  
+  x = floor ((gint)misc->xpad
+             + ((widget->allocation.width - req.width) * xalign)
+             + 0.5);
+  
+  y = floor ((gint)misc->ypad 
+             + ((widget->allocation.height - req.height) * misc->yalign)
+             + 0.5);
+
+  if (xp)
+    *xp = x;
+
+  if (yp)
+    *yp = y;
+}
+
+static void
+eel_editable_label_get_cursor_pos (EelEditableLabel  *label,
+				   PangoRectangle *strong_pos,
+				   PangoRectangle *weak_pos)
+{
+  const gchar *text;
+  const gchar *preedit_text;
+  gint index;
+  
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  text = pango_layout_get_text (label->layout);
+  preedit_text = text + label->selection_anchor;
+  index = label->selection_anchor +
+    g_utf8_offset_to_pointer (preedit_text, label->preedit_cursor) - preedit_text;
+      
+  pango_layout_get_cursor_pos (label->layout, index, strong_pos, weak_pos);
+}
+
+/* Copied from gtkutil private function */
+static gboolean
+eel_editable_label_get_block_cursor_location (EelEditableLabel  *label,
+					      gint *index,
+					      PangoRectangle *pos,
+					      gboolean *at_line_end)
+{
+  const gchar *text;
+  const gchar *preedit_text;
+  PangoLayoutLine *layout_line;
+  PangoRectangle strong_pos, weak_pos;
+  gint line_no;
+  gboolean rtl;
+  PangoContext *context;
+  PangoFontMetrics *metrics;
+  const PangoFontDescription *font_desc;
+  
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  text = pango_layout_get_text (label->layout);
+  preedit_text = text + label->selection_anchor;
+  text = g_utf8_offset_to_pointer (preedit_text, label->preedit_cursor);
+  index[0] = label->selection_anchor + text - preedit_text;
+
+  pango_layout_index_to_pos (label->layout, index[0], pos);
+
+  index[1] = label->selection_anchor + g_utf8_next_char (text) - preedit_text;
+
+  if (pos->width != 0)
+    {
+      if (at_line_end)
+	*at_line_end = FALSE;
+      if (pos->width < 0) /* RTL char, shift x value back to top left of rect */
+	{
+	  pos->x += pos->width;
+	  pos->width = -pos->width;
+	}
+      return TRUE;
+    }
+
+  pango_layout_index_to_line_x (label->layout, index[0], FALSE, &line_no, NULL);
+  layout_line = pango_layout_get_line_readonly (label->layout, line_no);
+  if (layout_line == NULL)
+    return FALSE;
+
+    text = pango_layout_get_text (label->layout);
+  if (index[0] < layout_line->start_index + layout_line->length)
+    {
+      /* this may be a zero-width character in the middle of the line,
+       * or it could be a character where line is wrapped, we do want
+       * block cursor in latter case */
+      if (g_utf8_next_char (text + index[0]) - text !=
+	  layout_line->start_index + layout_line->length)
+	{
+	  /* zero-width character in the middle of the line, do not
+	   * bother with block cursor */
+	  return FALSE;
+	}
+    }
+
+  /* Cursor is at the line end. It may be an empty line, or it could
+   * be on the left or on the right depending on text direction, or it
+   * even could be in the middle of visual layout in bidi text. */
+
+  pango_layout_get_cursor_pos (label->layout, index[0], &strong_pos, &weak_pos);
+
+  if (strong_pos.x != weak_pos.x)
+    {
+      /* do not show block cursor in this case, since the character typed
+       * in may or may not appear at the cursor position */
+      return FALSE;
+    }
+
+  context = pango_layout_get_context (label->layout);
+
+  /* In case when index points to the end of line, pos->x is always most right
+   * pixel of the layout line, so we need to correct it for RTL text. */
+  if (layout_line->length)
+    {
+      if (layout_line->resolved_dir == PANGO_DIRECTION_RTL)
+	{
+	  PangoLayoutIter *iter;
+	  PangoRectangle line_rect;
+	  gint i;
+	  gint left, right;
+	  const gchar *p;
+
+	  p = g_utf8_prev_char (text + index[0]);
+
+	  pango_layout_line_index_to_x (layout_line, p - text, FALSE, &left);
+	  pango_layout_line_index_to_x (layout_line, p - text, TRUE, &right);
+	  pos->x = MIN (left, right);
+
+	  iter = pango_layout_get_iter (label->layout);
+	  for (i = 0; i < line_no; i++)
+	    pango_layout_iter_next_line (iter);
+	  pango_layout_iter_get_line_extents (iter, NULL, &line_rect);
+	  pango_layout_iter_free (iter);
+
+          rtl = TRUE;
+	  pos->x += line_rect.x;
+	}
+      else
+	rtl = FALSE;
+    }
+  else
+    {
+      rtl = pango_context_get_base_dir (context) == PANGO_DIRECTION_RTL;
+    }
+  
+  font_desc = pango_layout_get_font_description (label->layout);
+  if (!font_desc)
+    font_desc = pango_context_get_font_description (context);
+
+  metrics = pango_context_get_metrics (context, font_desc, NULL);
+  pos->width = pango_font_metrics_get_approximate_char_width (metrics);
+  pango_font_metrics_unref (metrics);
+
+  if (rtl)
+    pos->x -= pos->width - 1;
+
+  if (at_line_end)
+    *at_line_end = TRUE;
+
+  return pos->width != 0;
+}
+
+
+/* These functions are copies from gtk+, as they are not exported from gtk+ */
+
+static GdkGC *
+make_cursor_gc (GtkWidget   *widget,
+		const gchar *property_name,
+		GdkColor    *fallback)
+{
+  GdkGCValues gc_values;
+  GdkGCValuesMask gc_values_mask;
+  GdkColor *cursor_color;
+
+  gtk_widget_style_get (widget, property_name, &cursor_color, NULL);
+  
+  gc_values_mask = GDK_GC_FOREGROUND;
+  if (cursor_color)
+    {
+      gc_values.foreground = *cursor_color;
+      gdk_color_free (cursor_color);
+    }
+  else
+    gc_values.foreground = *fallback;
+  
+  gdk_rgb_find_color (widget->style->colormap, &gc_values.foreground);
+  return gtk_gc_get (widget->style->depth, widget->style->colormap, &gc_values, gc_values_mask);
+}
+
+static void
+_eel_draw_insertion_cursor (GtkWidget        *widget,
+			    GdkDrawable      *drawable,
+			    GdkGC            *gc,
+                            GdkRectangle     *location,
+                            GtkTextDirection  direction,
+                            gboolean          draw_arrow)
+{
+  gint stem_width;
+  gint arrow_width;
+  gint x, y;
+  gint i;
+  gfloat cursor_aspect_ratio;
+  gint offset;
+  
+  g_assert (direction != GTK_TEXT_DIR_NONE);
+  
+  gtk_widget_style_get (widget, "cursor-aspect-ratio", &cursor_aspect_ratio, NULL);
+  
+  stem_width = location->height * cursor_aspect_ratio + 1;
+  arrow_width = stem_width + 1;
+
+  /* put (stem_width % 2) on the proper side of the cursor */
+  if (direction == GTK_TEXT_DIR_LTR)
+    offset = stem_width / 2;
+  else
+    offset = stem_width - stem_width / 2;
+  
+  for (i = 0; i < stem_width; i++)
+    gdk_draw_line (drawable, gc,
+		   location->x + i - offset, location->y,
+		   location->x + i - offset, location->y + location->height - 1);
+
+  if (draw_arrow)
+    {
+      if (direction == GTK_TEXT_DIR_RTL)
+        {
+          x = location->x - offset - 1;
+          y = location->y + location->height - arrow_width * 2 - arrow_width + 1;
+  
+          for (i = 0; i < arrow_width; i++)
+            {
+              gdk_draw_line (drawable, gc,
+                             x, y + i + 1,
+                             x, y + 2 * arrow_width - i - 1);
+              x --;
+            }
+        }
+      else if (direction == GTK_TEXT_DIR_LTR)
+        {
+          x = location->x + stem_width - offset;
+          y = location->y + location->height - arrow_width * 2 - arrow_width + 1;
+  
+          for (i = 0; i < arrow_width; i++) 
+            {
+              gdk_draw_line (drawable, gc,
+                             x, y + i + 1,
+                             x, y + 2 * arrow_width - i - 1);
+              x++;
+            }
+        }
+    }
+}
+
+static void
+eel_editable_label_draw_cursor (EelEditableLabel  *label, gint xoffset, gint yoffset)
+{
+  if (GTK_WIDGET_DRAWABLE (label))
+    {
+      GtkWidget *widget = GTK_WIDGET (label);
+
+      GtkTextDirection keymap_direction;
+      GtkTextDirection widget_direction;
+      gboolean split_cursor;
+      gboolean block;
+      gboolean block_at_line_end;
+      gint range[2];
+      PangoRectangle strong_pos, weak_pos;
+      PangoRectangle *cursor1 = NULL;
+      PangoRectangle *cursor2 = NULL;
+      GdkRectangle cursor_location;
+      GtkTextDirection dir1 = GTK_TEXT_DIR_NONE;
+      GtkTextDirection dir2 = GTK_TEXT_DIR_NONE;
+
+      keymap_direction =
+	(gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ?
+	GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
+
+      widget_direction = gtk_widget_get_direction (widget);
+
+      if (label->overwrite_mode &&
+	  eel_editable_label_get_block_cursor_location (label, range,
+							&strong_pos,
+							&block_at_line_end))
+	block = TRUE;
+      else
+	block = FALSE;
+
+      if (!block)
+	{ 
+          eel_editable_label_get_cursor_pos (label, &strong_pos, &weak_pos);
+
+          g_object_get (gtk_widget_get_settings (widget),
+			"gtk-split-cursor", &split_cursor,
+			NULL);
+
+          dir1 = widget_direction;
+      
+	  if (split_cursor)
+	    {
+	      cursor1 = &strong_pos;
+
+	      if (strong_pos.x != weak_pos.x ||
+		  strong_pos.y != weak_pos.y)
+		{
+		  dir2 = (widget_direction == GTK_TEXT_DIR_LTR) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR;
+		  cursor2 = &weak_pos;
+		}
+	    }
+	  else
+	    {
+	      if (keymap_direction == widget_direction)
+		  cursor1 = &strong_pos;
+	      else
+		  cursor1 = &weak_pos;
+	    }
+      
+          cursor_location.x = xoffset + PANGO_PIXELS (cursor1->x);
+	  cursor_location.y = yoffset + PANGO_PIXELS (cursor1->y);
+	  cursor_location.width = 0;
+	  cursor_location.height = PANGO_PIXELS (cursor1->height);
+
+	  _eel_draw_insertion_cursor (widget, widget->window,
+				      label->primary_cursor_gc,
+				      &cursor_location, dir1,
+				      dir2 != GTK_TEXT_DIR_NONE);
+
+	  if (dir2 != GTK_TEXT_DIR_NONE)
+	    {
+	      cursor_location.x = xoffset + PANGO_PIXELS (cursor2->x);
+	      cursor_location.y = yoffset + PANGO_PIXELS (cursor2->y);
+	      cursor_location.width = 0;
+	      cursor_location.height = PANGO_PIXELS (cursor2->height);
+
+	      _eel_draw_insertion_cursor (widget, widget->window,
+					  label->secondary_cursor_gc,
+					  &cursor_location, dir2, TRUE);
+	    }
+	}
+      else /* Block cursor */
+	{
+          GdkRegion *clip;
+
+	  gdk_draw_rectangle (widget->window, label->primary_cursor_gc, TRUE,
+			      xoffset + PANGO_PIXELS (strong_pos.x),
+			      yoffset + PANGO_PIXELS (strong_pos.y),
+			      PANGO_PIXELS (strong_pos.width),
+			      PANGO_PIXELS (strong_pos.height));
+
+	  if (!block_at_line_end)
+	    {
+	      clip = gdk_pango_layout_get_clip_region (label->layout,
+						       xoffset, yoffset,
+						       range, 1);
+
+	      /* FIXME should use gtk_paint, but it can't use a clip
+	       * region
+	       */
+
+	      gdk_gc_set_clip_region (label->primary_cursor_gc, clip);
+
+	      gdk_draw_layout_with_colors (widget->window,
+		                           label->primary_cursor_gc,
+					   xoffset, yoffset,
+					   label->layout,
+					   &widget->style->base[GTK_STATE_NORMAL],
+					   NULL);
+
+	      gdk_gc_set_clip_region (label->primary_cursor_gc, NULL);
+	      gdk_region_destroy (clip);
+	    }
+	}	  
+    }
+}
+
+
+static gint
+eel_editable_label_expose (GtkWidget      *widget,
+			   GdkEventExpose *event)
+{
+  EelEditableLabel *label;
+  gint x, y;
+  
+  g_assert (EEL_IS_EDITABLE_LABEL (widget));
+  g_assert (event != NULL);
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) &&
+      label->text)
+    {
+      get_layout_location (label, &x, &y);
+      
+      gtk_paint_layout (widget->style,
+                        widget->window,
+                        GTK_WIDGET_STATE (widget),
+			FALSE,
+                        &event->area,
+                        widget,
+                        "label",
+                        x, y,
+                        label->layout);
+      
+      if (label->selection_anchor != label->selection_end)
+        {
+          gint range[2];
+	  const char *text;
+          GdkRegion *clip;
+	  GtkStateType state;
+	  
+          range[0] = label->selection_anchor;
+          range[1] = label->selection_end;
+
+	  /* Handle possible preedit string */
+	  if (label->preedit_length > 0 &&
+	      range[1] > label->selection_anchor)
+	    {
+	      text = pango_layout_get_text (label->layout) + label->selection_anchor;
+	      range[1] += g_utf8_offset_to_pointer (text, label->preedit_length) - text;
+	    }
+	  
+          if (range[0] > range[1])
+            {
+              gint tmp = range[0];
+              range[0] = range[1];
+              range[1] = tmp;
+            }
+
+          clip = gdk_pango_layout_get_clip_region (label->layout,
+                                                   x, y,
+                                                   range,
+                                                   1);
+
+          /* FIXME should use gtk_paint, but it can't use a clip
+           * region
+           */
+
+          gdk_gc_set_clip_region (widget->style->black_gc, clip);
+
+
+	  state = GTK_STATE_SELECTED;
+	  if (!GTK_WIDGET_HAS_FOCUS (widget))
+	    state = GTK_STATE_ACTIVE;
+	      
+          gdk_draw_layout_with_colors (widget->window,
+                                       widget->style->black_gc,
+                                       x, y,
+                                       label->layout,
+                                       &widget->style->text[state],
+                                       &widget->style->base[state]);
+
+          gdk_gc_set_clip_region (widget->style->black_gc, NULL);
+          gdk_region_destroy (clip);
+        }
+      else if (GTK_WIDGET_HAS_FOCUS (widget))
+	eel_editable_label_draw_cursor (label, x, y);
+
+      if (label->draw_outline)
+	gdk_draw_rectangle (widget->window,
+			    widget->style->fg_gc [GTK_WIDGET_STATE (widget)],
+			    FALSE,
+			    0, 0,
+			    widget->allocation.width - 1,
+			    widget->allocation.height - 1);
+    }
+
+  return FALSE;
+}
+
+static void
+eel_editable_label_realize (GtkWidget *widget)
+{
+  EelEditableLabel *label;
+  GdkWindowAttr attributes;
+  gint attributes_mask;
+  static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
+
+  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  label = EEL_EDITABLE_LABEL (widget);
+
+  attributes.wclass = GDK_INPUT_OUTPUT;
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.x = widget->allocation.x;
+  attributes.y = widget->allocation.y;
+  attributes.width = widget->allocation.width;
+  attributes.height = widget->allocation.height;
+  attributes.visual = gtk_widget_get_visual (widget);
+  attributes.colormap = gtk_widget_get_colormap (widget);
+  attributes.cursor = gdk_cursor_new (GDK_XTERM);
+  attributes.event_mask = gtk_widget_get_events (widget) |
+    (GDK_EXPOSURE_MASK |
+     GDK_BUTTON_PRESS_MASK |
+     GDK_BUTTON_RELEASE_MASK |
+     GDK_BUTTON1_MOTION_MASK |
+     GDK_BUTTON3_MOTION_MASK |
+     GDK_POINTER_MOTION_HINT_MASK |
+     GDK_POINTER_MOTION_MASK |
+     GDK_ENTER_NOTIFY_MASK |
+     GDK_LEAVE_NOTIFY_MASK);
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y  | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR;
+
+  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+				   &attributes, attributes_mask);
+  gdk_window_set_user_data (widget->window, widget);
+
+  gdk_cursor_unref (attributes.cursor);
+
+  widget->style = gtk_style_attach (widget->style, widget->window);
+  
+  gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+
+  gtk_im_context_set_client_window (label->im_context, widget->window);
+
+  label->primary_cursor_gc = make_cursor_gc (widget,
+					     "cursor-color",
+					     &widget->style->black);
+      
+  label->secondary_cursor_gc = make_cursor_gc (widget,
+					       "secondary-cursor-color",
+					       &gray);
+}
+
+static void
+eel_editable_label_unrealize (GtkWidget *widget)
+{
+  EelEditableLabel *label;
+
+  label = EEL_EDITABLE_LABEL (widget);
+
+  gtk_gc_release (label->primary_cursor_gc);
+  label->primary_cursor_gc = NULL;
+  
+  gtk_gc_release (label->secondary_cursor_gc);
+  label->secondary_cursor_gc = NULL;
+
+  /* Strange. Copied from GtkEntry, should be NULL? */
+  gtk_im_context_set_client_window (label->im_context, NULL);
+  
+  (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+}
+
+static void
+eel_editable_label_map (GtkWidget *widget)
+{
+  (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
+}
+
+static void
+eel_editable_label_unmap (GtkWidget *widget)
+{
+  (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
+}
+
+static void
+window_to_layout_coords (EelEditableLabel *label,
+                         gint     *x,
+                         gint     *y)
+{
+  gint lx, ly;
+
+  /* get layout location in widget->window coords */
+  get_layout_location (label, &lx, &ly);
+  
+  if (x)
+    *x -= lx;                   /* go to layout */
+
+  if (y)
+    *y -= ly;                   /* go to layout */
+}
+
+static void
+get_layout_index (EelEditableLabel *label,
+                  gint      x,
+                  gint      y,
+                  gint     *index)
+{
+  gint trailing = 0;
+  const gchar *cluster;
+  const gchar *cluster_end;
+
+  *index = 0;
+  
+  eel_editable_label_ensure_layout (label, TRUE);
+  
+  window_to_layout_coords (label, &x, &y);
+
+  x *= PANGO_SCALE;
+  y *= PANGO_SCALE;
+  
+  pango_layout_xy_to_index (label->layout,
+                            x, y,
+                            index, &trailing);
+
+  if (*index >= label->selection_anchor && label->preedit_length)
+    {
+      if (*index >= label->selection_anchor + label->preedit_length)
+	*index -= label->preedit_length;
+      else
+	{
+	  *index = label->selection_anchor;
+	  trailing = 0;
+	}
+    }
+  
+  cluster = label->text + *index;
+  cluster_end = cluster;
+  while (trailing)
+    {
+      cluster_end = g_utf8_next_char (cluster_end);
+      --trailing;
+    }
+
+  *index += (cluster_end - cluster);
+}
+
+static void
+eel_editable_label_select_word (EelEditableLabel *label)
+{
+  gint min, max;
+  
+  gint start_index = eel_editable_label_move_backward_word (label, label->selection_end);
+  gint end_index = eel_editable_label_move_forward_word (label, label->selection_end);
+
+  min = MIN (label->selection_anchor,
+	     label->selection_end);
+  max = MAX (label->selection_anchor,
+	     label->selection_end);
+
+  min = MIN (min, start_index);
+  max = MAX (max, end_index);
+
+  eel_editable_label_select_region_index (label, min, max);
+}
+
+static gint
+eel_editable_label_button_press (GtkWidget      *widget,
+				 GdkEventButton *event)
+{
+  EelEditableLabel *label;
+  gint index = 0;
+  
+  label = EEL_EDITABLE_LABEL (widget);
+
+  if (event->button == 1)
+    {
+      if (!GTK_WIDGET_HAS_FOCUS (widget))
+	gtk_widget_grab_focus (widget);
+
+      if (event->type == GDK_3BUTTON_PRESS)
+	{
+	  eel_editable_label_select_region_index (label, 0, strlen (label->text));
+	  return TRUE;
+	}
+      
+      if (event->type == GDK_2BUTTON_PRESS)
+	{
+	  eel_editable_label_select_word (label);
+	  return TRUE;
+	}
+      
+      get_layout_index (label, event->x, event->y, &index);
+      
+      if ((label->selection_anchor !=
+	   label->selection_end) &&
+	  (event->state & GDK_SHIFT_MASK))
+	{
+	  gint min, max;
+	  
+	  /* extend (same as motion) */
+	  min = MIN (label->selection_anchor,
+		     label->selection_end);
+	  max = MAX (label->selection_anchor,
+		     label->selection_end);
+	  
+	  min = MIN (min, index);
+	  max = MAX (max, index);
+	  
+	  /* ensure the anchor is opposite index */
+	  if (index == min)
+	    {
+	      gint tmp = min;
+	      min = max;
+	      max = tmp;
+	    }
+	  
+	  eel_editable_label_select_region_index (label, min, max);
+	}
+      else
+	{
+	  if (event->type == GDK_3BUTTON_PRESS)
+	      eel_editable_label_select_region_index (label, 0, strlen (label->text));
+	  else if (event->type == GDK_2BUTTON_PRESS)
+	      eel_editable_label_select_word (label);
+	  else 
+	    /* start a replacement */
+	    eel_editable_label_select_region_index (label, index, index);
+	}
+  
+      return TRUE;
+    }
+  else if (event->button == 2 && event->type == GDK_BUTTON_PRESS)
+    {
+      get_layout_index (label, event->x, event->y, &index);
+      
+      eel_editable_label_select_region_index (label, index, index);
+      eel_editable_label_paste (label, GDK_SELECTION_PRIMARY);
+      
+      return TRUE;
+    }
+  else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+    {
+      eel_editable_label_do_popup (label, event);
+
+      return TRUE;
+      
+    }
+  return FALSE;
+}
+
+static gint
+eel_editable_label_button_release (GtkWidget      *widget,
+				   GdkEventButton *event)
+
+{
+  if (event->button != 1)
+    return FALSE;
+  
+  /* The goal here is to return TRUE iff we ate the
+   * button press to start selecting.
+   */
+  
+  return TRUE;
+}
+
+static gint
+eel_editable_label_motion (GtkWidget      *widget,
+			   GdkEventMotion *event)
+{
+  EelEditableLabel *label;
+  gint index;
+  gint x, y;
+  
+  label = EEL_EDITABLE_LABEL (widget);
+  
+  if ((event->state & GDK_BUTTON1_MASK) == 0)
+    return FALSE;
+
+  gdk_window_get_pointer (widget->window,
+                          &x, &y, NULL);
+  
+  get_layout_index (label, x, y, &index);
+
+  eel_editable_label_select_region_index (label,
+					  label->selection_anchor,
+					  index);
+  
+  return TRUE;
+}
+
+static void
+get_text_callback (GtkClipboard     *clipboard,
+                   GtkSelectionData *selection_data,
+                   guint             info,
+                   gpointer          user_data_or_owner)
+{
+  EelEditableLabel *label;
+  
+  label = EEL_EDITABLE_LABEL (user_data_or_owner);
+  
+  if ((label->selection_anchor != label->selection_end) &&
+      label->text)
+    {
+      gint start, end;
+      gint len;
+      
+      start = MIN (label->selection_anchor,
+                   label->selection_end);
+      end = MAX (label->selection_anchor,
+                 label->selection_end);
+
+      len = strlen (label->text);
+
+      if (end > len)
+        end = len;
+
+      if (start > len)
+        start = len;
+
+      gtk_selection_data_set_text (selection_data,
+				   label->text + start,
+				   end - start);
+    }
+}
+
+static void
+clear_text_callback (GtkClipboard     *clipboard,
+                     gpointer          user_data_or_owner)
+{
+  EelEditableLabel *label;
+
+  label = EEL_EDITABLE_LABEL (user_data_or_owner);
+
+  label->selection_anchor = label->selection_end;
+      
+  gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+static void
+eel_editable_label_select_region_index (EelEditableLabel *label,
+					gint      anchor_index,
+					gint      end_index)
+{
+  GtkClipboard *clipboard;
+
+  g_assert (EEL_IS_EDITABLE_LABEL (label));
+  
+
+  if (label->selection_anchor == anchor_index &&
+      label->selection_end == end_index)
+    return;
+
+  eel_editable_label_reset_im_context (label);
+
+  label->selection_anchor = anchor_index;
+  label->selection_end = end_index;
+
+  clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);      
+      
+  if (anchor_index != end_index)
+    {
+      GtkTargetList *list;
+      GtkTargetEntry *targets;
+      guint n_targets;
+
+      list = gtk_target_list_new (NULL, 0);
+      gtk_target_list_add_text_targets (list, 0);
+      targets = gtk_target_table_new_from_list (list, &n_targets);
+
+      gtk_clipboard_set_with_owner (clipboard,
+				    targets, n_targets,
+				    get_text_callback,
+				    clear_text_callback,
+				    G_OBJECT (label));
+
+      gtk_clipboard_set_can_store (clipboard, NULL, 0);
+      gtk_target_table_free (targets, n_targets);
+      gtk_target_list_unref (list);
+    }
+  else
+    {
+      if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (label))
+	gtk_clipboard_clear (clipboard);
+    }
+  
+  gtk_widget_queue_draw (GTK_WIDGET (label));
+  
+  g_object_freeze_notify (G_OBJECT (label));
+  g_object_notify (G_OBJECT (label), "cursor_position");
+  g_object_notify (G_OBJECT (label), "selection_bound");
+  g_object_thaw_notify (G_OBJECT (label));
+}
+
+/**
+ * eel_editable_label_select_region:
+ * @label: a #EelEditableLabel
+ * @start_offset: start offset (in characters not bytes)
+ * @end_offset: end offset (in characters not bytes)
+ *
+ * Selects a range of characters in the label, if the label is selectable.
+ * See eel_editable_label_set_selectable(). If the label is not selectable,
+ * this function has no effect. If @start_offset or
+ * @end_offset are -1, then the end of the label will be substituted.
+ * 
+ **/
+void
+eel_editable_label_select_region  (EelEditableLabel *label,
+				   gint      start_offset,
+				   gint      end_offset)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  if (label->text)
+    {
+      if (start_offset < 0)
+        start_offset = g_utf8_strlen (label->text, -1);
+      
+      if (end_offset < 0)
+        end_offset = g_utf8_strlen (label->text, -1);
+      
+      eel_editable_label_select_region_index (label,
+					      g_utf8_offset_to_pointer (label->text, start_offset) - label->text,
+					      g_utf8_offset_to_pointer (label->text, end_offset) - label->text);
+    }
+}
+
+/**
+ * eel_editable_label_get_selection_bounds:
+ * @label: a #EelEditableLabel
+ * @start: return location for start of selection, as a character offset
+ * @end: return location for end of selection, as a character offset
+ * 
+ * Gets the selected range of characters in the label, returning %TRUE
+ * if there's a selection.
+ * 
+ * Return value: %TRUE if selection is non-empty
+ **/
+gboolean
+eel_editable_label_get_selection_bounds (EelEditableLabel  *label,
+					 gint      *start,
+					 gint      *end)
+{
+  gint start_index, end_index;
+  gint start_offset, end_offset;
+  gint len;
+  
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), FALSE);
+
+      
+  start_index = MIN (label->selection_anchor,
+		     label->selection_end);
+  end_index = MAX (label->selection_anchor,
+		   label->selection_end);
+
+  len = strlen (label->text);
+  
+  if (end_index > len)
+    end_index = len;
+  
+  if (start_index > len)
+    start_index = len;
+  
+  start_offset = g_utf8_strlen (label->text, start_index);
+  end_offset = g_utf8_strlen (label->text, end_index);
+  
+  if (start_offset > end_offset)
+    {
+      gint tmp = start_offset;
+      start_offset = end_offset;
+      end_offset = tmp;
+    }
+  
+  if (start)
+    *start = start_offset;
+  
+  if (end)
+    *end = end_offset;
+  
+  return start_offset != end_offset;
+}
+
+
+/**
+ * eel_editable_label_get_layout:
+ * @label: a #EelEditableLabel
+ * 
+ * Gets the #PangoLayout used to display the label.
+ * The layout is useful to e.g. convert text positions to
+ * pixel positions, in combination with eel_editable_label_get_layout_offsets().
+ * The returned layout is owned by the label so need not be
+ * freed by the caller.
+ * 
+ * Return value: the #PangoLayout for this label
+ **/
+PangoLayout*
+eel_editable_label_get_layout (EelEditableLabel *label)
+{
+  g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), NULL);
+
+  eel_editable_label_ensure_layout (label, TRUE);
+
+  return label->layout;
+}
+
+/**
+ * eel_editable_label_get_layout_offsets:
+ * @label: a #EelEditableLabel
+ * @x: location to store X offset of layout, or %NULL
+ * @y: location to store Y offset of layout, or %NULL
+ *
+ * Obtains the coordinates where the label will draw the #PangoLayout
+ * representing the text in the label; useful to convert mouse events
+ * into coordinates inside the #PangoLayout, e.g. to take some action
+ * if some part of the label is clicked. Of course you will need to
+ * create a #GtkEventBox to receive the events, and pack the label
+ * inside it, since labels are a #GTK_NO_WINDOW widget. Remember
+ * when using the #PangoLayout functions you need to convert to
+ * and from pixels using PANGO_PIXELS() or #PANGO_SCALE.
+ * 
+ **/
+void
+eel_editable_label_get_layout_offsets (EelEditableLabel *label,
+				       gint     *x,
+				       gint     *y)
+{
+  g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+  
+  get_layout_location (label, x, y);
+}
+
+static void
+eel_editable_label_pend_cursor_blink (EelEditableLabel *label)
+{
+  /* TODO */
+}
+
+static void
+eel_editable_label_check_cursor_blink (EelEditableLabel *label)
+{
+  /* TODO */
+}
+
+static gint
+eel_editable_label_key_press (GtkWidget   *widget,
+			      GdkEventKey *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_pend_cursor_blink (label);
+
+  if (gtk_im_context_filter_keypress (label->im_context, event))
+    {
+      /*TODO eel_editable_label_obscure_mouse_cursor (label);*/
+      label->need_im_reset = TRUE;
+      return TRUE;
+    }
+
+  if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
+    /* Activate key bindings
+     */
+    return TRUE;
+
+  return FALSE;
+}
+
+static gint
+eel_editable_label_key_release (GtkWidget   *widget,
+				GdkEventKey *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+
+  if (gtk_im_context_filter_keypress (label->im_context, event))
+    {
+      label->need_im_reset = TRUE;
+      return TRUE;
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
+}
+
+static void
+eel_editable_label_keymap_direction_changed (GdkKeymap *keymap,
+					     EelEditableLabel  *label)
+{
+  gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+static gint
+eel_editable_label_focus_in (GtkWidget     *widget,
+			     GdkEventFocus *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+  
+  gtk_widget_queue_draw (widget);
+  
+  label->need_im_reset = TRUE;
+  gtk_im_context_focus_in (label->im_context);
+
+  g_signal_connect (gdk_keymap_get_default (),
+		    "direction_changed",
+		    G_CALLBACK (eel_editable_label_keymap_direction_changed), label);
+
+  eel_editable_label_check_cursor_blink (label);
+
+  return FALSE;
+}
+
+static gint
+eel_editable_label_focus_out (GtkWidget     *widget,
+			      GdkEventFocus *event)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (widget);
+  
+  gtk_widget_queue_draw (widget);
+
+  label->need_im_reset = TRUE;
+  gtk_im_context_focus_out (label->im_context);
+
+  eel_editable_label_check_cursor_blink (label);
+  
+  g_signal_handlers_disconnect_by_func (gdk_keymap_get_default (),
+                                        (gpointer) eel_editable_label_keymap_direction_changed,
+                                        label);
+  
+  return FALSE;
+}
+
+static void
+eel_editable_label_delete_text (EelEditableLabel *label,
+				int start_pos,
+				int end_pos)
+{
+  int anchor, end;
+  
+  if (start_pos < 0)
+    start_pos = 0;
+  if (end_pos < 0 || end_pos > label->n_bytes)
+    end_pos = label->n_bytes;
+  
+  if (start_pos < end_pos)
+    {
+      g_memmove (label->text + start_pos, label->text + end_pos, label->n_bytes + 1 - end_pos);
+      label->n_bytes -= (end_pos - start_pos);
+
+      anchor = label->selection_anchor;
+      if (anchor > start_pos)
+	anchor -= MIN (anchor, end_pos) - start_pos;
+
+      end = label->selection_end;
+      if (end > start_pos)
+	end -= MIN (end, end_pos) - start_pos;
+      
+      /* We might have changed the selection */
+      eel_editable_label_select_region_index (label, anchor, end);
+      
+      eel_editable_label_recompute (label);  
+      gtk_widget_queue_resize (GTK_WIDGET (label));
+      
+      g_object_notify (G_OBJECT (label), "text");
+      g_signal_emit_by_name (GTK_EDITABLE (label), "changed");
+    }
+}
+
+static void
+eel_editable_label_insert_text (EelEditableLabel *label,
+				const gchar *new_text,
+				gint         new_text_length,
+				gint        *index)
+{
+  if (new_text_length + label->n_bytes + 1 > label->text_size)
+    {
+      while (new_text_length + label->n_bytes + 1 > label->text_size)
+	{
+	  if (label->text_size == 0)
+	    label->text_size = 16;
+	  else
+	    label->text_size *= 2;
+	}
+
+      label->text = g_realloc (label->text, label->text_size);
+    }
+
+  g_object_freeze_notify (G_OBJECT (label));
+
+  g_memmove (label->text + *index + new_text_length, label->text + *index, label->n_bytes - *index);
+  memcpy (label->text + *index, new_text, new_text_length);
+  
+  label->n_bytes += new_text_length;
+
+  /* NUL terminate for safety and convenience */
+  label->text[label->n_bytes] = '\0';
+
+  g_object_notify (G_OBJECT (label), "text");
+
+  if (label->selection_anchor > *index)
+    {
+      g_object_notify (G_OBJECT (label), "cursor_position");
+      g_object_notify (G_OBJECT (label), "selection_bound");
+      label->selection_anchor += new_text_length;
+    }
+  
+  if (label->selection_end > *index)
+    {
+      label->selection_end += new_text_length;
+      g_object_notify (G_OBJECT (label), "selection_bound");
+    }
+
+  *index += new_text_length;
+
+  eel_editable_label_recompute (label);  
+  gtk_widget_queue_resize (GTK_WIDGET (label));
+
+  g_object_thaw_notify (G_OBJECT (label));
+  g_signal_emit_by_name (GTK_EDITABLE (label), "changed");
+}
+
+/* Used for im_commit_cb and inserting Unicode chars */
+static void
+eel_editable_label_enter_text (EelEditableLabel *label,
+			       const gchar    *str)
+{
+  GtkEditable *editable = GTK_EDITABLE (label);
+  gint tmp_pos;
+  gboolean old_need_im_reset;
+
+  /* Never reset the im while commiting, as that resets possible im state */
+  old_need_im_reset = label->need_im_reset;
+  label->need_im_reset = FALSE;
+
+  if (label->selection_end != label->selection_anchor)
+    gtk_editable_delete_selection (editable);
+  else
+    {
+      if (label->overwrite_mode)
+        eel_editable_label_delete_from_cursor (label, GTK_DELETE_CHARS, 1);
+    }
+  
+  tmp_pos = g_utf8_pointer_to_offset (label->text,
+                                      label->text + label->selection_anchor);
+  gtk_editable_insert_text (GTK_EDITABLE (label), str, strlen (str), &tmp_pos);
+  tmp_pos = g_utf8_offset_to_pointer (label->text, tmp_pos) - label->text;
+  eel_editable_label_select_region_index (label, tmp_pos, tmp_pos);
+
+  label->need_im_reset = old_need_im_reset;
+}
+
+/* IM Context Callbacks
+ */
+
+static void
+eel_editable_label_commit_cb (GtkIMContext *context,
+			      const gchar  *str,
+			      EelEditableLabel  *label)
+{
+  eel_editable_label_enter_text (label, str);
+}
+
+static void 
+eel_editable_label_preedit_changed_cb (GtkIMContext *context,
+				       EelEditableLabel  *label)
+{
+  gchar *preedit_string;
+  gint cursor_pos;
+  
+  gtk_im_context_get_preedit_string (label->im_context,
+				     &preedit_string, NULL,
+				     &cursor_pos);
+  label->preedit_length = strlen (preedit_string);
+  cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+  label->preedit_cursor = cursor_pos;
+  g_free (preedit_string);
+
+  eel_editable_label_recompute (label);  
+  gtk_widget_queue_resize (GTK_WIDGET (label));
+}
+
+static gboolean
+eel_editable_label_retrieve_surrounding_cb (GtkIMContext *context,
+					    EelEditableLabel  *label)
+{
+  gtk_im_context_set_surrounding (context,
+				  label->text,
+				  strlen (label->text) + 1,
+				  label->selection_end);
+
+  return TRUE;
+}
+
+static gboolean
+eel_editable_label_delete_surrounding_cb (GtkIMContext *slave,
+					  gint          offset,
+					  gint          n_chars,
+					  EelEditableLabel  *label)
+{
+  gint current_pos;
+
+  current_pos = g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+  gtk_editable_delete_text (GTK_EDITABLE (label), 
+			    current_pos + offset, 
+			    current_pos + offset + n_chars);
+
+  return TRUE;
+}
+
+static gboolean
+eel_editable_label_focus (GtkWidget         *widget,
+			  GtkDirectionType   direction)
+{
+  /* We never want to be in the tab chain */
+  return FALSE;
+}
+
+/* Compute the X position for an offset that corresponds to the "more important
+ * cursor position for that offset. We use this when trying to guess to which
+ * end of the selection we should go to when the user hits the left or
+ * right arrow key.
+ */
+static void
+get_better_cursor (EelEditableLabel *label,
+		   gint      index,
+		   gint      *x,
+		   gint      *y)
+{
+  GtkTextDirection keymap_direction =
+    (gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ?
+    GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
+  GtkTextDirection widget_direction = gtk_widget_get_direction (GTK_WIDGET (label));
+  gboolean split_cursor;
+  PangoRectangle strong_pos, weak_pos;
+  
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
+		"gtk-split-cursor", &split_cursor,
+		NULL);
+
+  eel_editable_label_get_cursor_pos (label, &strong_pos, &weak_pos);
+
+  if (split_cursor)
+    {
+      *x = strong_pos.x / PANGO_SCALE;
+      *y = strong_pos.y / PANGO_SCALE;
+    }
+  else
+    {
+      if (keymap_direction == widget_direction)
+	{
+	  *x = strong_pos.x / PANGO_SCALE;
+	  *y = strong_pos.y / PANGO_SCALE;
+	}
+      else
+	{
+	  *x = weak_pos.x / PANGO_SCALE;
+	  *y = weak_pos.y / PANGO_SCALE;
+	}
+    }
+}
+
+
+static gint
+eel_editable_label_move_logically (EelEditableLabel *label,
+				   gint      start,
+				   gint      count)
+{
+  gint offset = g_utf8_pointer_to_offset (label->text,
+					  label->text + start);
+
+  if (label->text)
+    {
+      PangoLogAttr *log_attrs;
+      gint n_attrs;
+      gint length;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+      
+      length = g_utf8_strlen (label->text, -1);
+
+      pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
+
+      while (count > 0 && offset < length)
+	{
+	  do
+	    offset++;
+	  while (offset < length && !log_attrs[offset].is_cursor_position);
+	  
+	  count--;
+	}
+      while (count < 0 && offset > 0)
+	{
+	  do
+	    offset--;
+	  while (offset > 0 && !log_attrs[offset].is_cursor_position);
+	  
+	  count++;
+	}
+      
+      g_free (log_attrs);
+    }
+
+  return g_utf8_offset_to_pointer (label->text, offset) - label->text;
+}
+
+static gint
+eel_editable_label_move_visually (EelEditableLabel *label,
+				  gint      start,
+				  gint      count)
+{
+  gint index;
+
+  index = start;
+  
+  while (count != 0)
+    {
+      int new_index, new_trailing;
+      gboolean split_cursor;
+      gboolean strong;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+
+      g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
+		    "gtk-split-cursor", &split_cursor,
+		    NULL);
+
+      if (split_cursor)
+	strong = TRUE;
+      else
+	{
+	  GtkTextDirection keymap_direction =
+	    (gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ?
+	    GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
+
+	  strong = keymap_direction == gtk_widget_get_direction (GTK_WIDGET (label));
+	}
+      
+      if (count > 0)
+	{
+	  pango_layout_move_cursor_visually (label->layout, strong, index, 0, 1, &new_index, &new_trailing);
+	  count--;
+	}
+      else
+	{
+	  pango_layout_move_cursor_visually (label->layout, strong, index, 0, -1, &new_index, &new_trailing);
+	  count++;
+	}
+
+      if (new_index < 0 || new_index == G_MAXINT)
+	break;
+
+      index = new_index;
+      
+      while (new_trailing--)
+	index = g_utf8_next_char (label->text + new_index) - label->text;
+    }
+  
+  return index;
+}
+
+static gint
+eel_editable_label_move_line (EelEditableLabel *label,
+			      gint      start,
+			      gint      count)
+{
+  int n_lines, i;
+  int x;
+  PangoLayoutLine *line;
+  int index;
+  
+  eel_editable_label_ensure_layout (label, FALSE);
+
+  n_lines = pango_layout_get_line_count (label->layout);
+
+  for (i = 0; i < n_lines; i++)
+    {
+      line = pango_layout_get_line (label->layout, i);
+      if (start >= line->start_index &&
+	  start <= line->start_index + line->length)
+	{
+	  pango_layout_line_index_to_x (line, start, FALSE, &x);
+	  break;
+	}
+    }
+  if (i == n_lines)
+    i = n_lines - 1;
+  
+  i += count;
+  i = CLAMP (i, 0, n_lines - 1);
+
+  line = pango_layout_get_line (label->layout, i);
+  if (pango_layout_line_x_to_index (line,
+				    x,
+				    &index, NULL))
+    return index;
+  else
+    {
+      if (i == n_lines - 1)
+	return line->start_index + line->length;
+      else
+	return line->start_index + line->length - 1;
+    }
+}
+
+static gint
+eel_editable_label_move_forward_word (EelEditableLabel *label,
+				      gint      start)
+{
+  gint new_pos = g_utf8_pointer_to_offset (label->text,
+					   label->text + start);
+  gint length;
+
+  length = g_utf8_strlen (label->text, -1);
+  if (new_pos < length)
+    {
+      PangoLogAttr *log_attrs;
+      gint n_attrs;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+      
+      pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
+      
+      /* Find the next word end */
+      new_pos++;
+      while (new_pos < n_attrs && !log_attrs[new_pos].is_word_end)
+	new_pos++;
+
+      g_free (log_attrs);
+    }
+
+  return g_utf8_offset_to_pointer (label->text, new_pos) - label->text;
+}
+
+
+static gint
+eel_editable_label_move_backward_word (EelEditableLabel *label,
+				       gint      start)
+{
+  gint new_pos = g_utf8_pointer_to_offset (label->text,
+					   label->text + start);
+  
+  if (new_pos > 0)
+    {
+      PangoLogAttr *log_attrs;
+      gint n_attrs;
+
+      eel_editable_label_ensure_layout (label, FALSE);
+      
+      pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
+      
+      new_pos -= 1;
+
+      /* Find the previous word beginning */
+      while (new_pos > 0 && !log_attrs[new_pos].is_word_start)
+	new_pos--;
+
+      g_free (log_attrs);
+    }
+
+  return g_utf8_offset_to_pointer (label->text, new_pos) - label->text;
+}
+
+static void
+eel_editable_label_move_cursor (EelEditableLabel    *label,
+				GtkMovementStep      step,
+				gint                 count,
+				gboolean             extend_selection)
+{
+  gint new_pos;
+  
+  new_pos = label->selection_end;
+
+  if (label->selection_end != label->selection_anchor &&
+      !extend_selection)
+    {
+      /* If we have a current selection and aren't extending it, move to the
+       * start/or end of the selection as appropriate
+       */
+      switch (step)
+	{
+	case GTK_MOVEMENT_DISPLAY_LINES:
+	case GTK_MOVEMENT_VISUAL_POSITIONS:
+	  {
+	    gint end_x, end_y;
+	    gint anchor_x, anchor_y;
+	    gboolean end_is_left;
+	    
+	    get_better_cursor (label, label->selection_end, &end_x, &end_y);
+	    get_better_cursor (label, label->selection_anchor, &anchor_x, &anchor_y);
+
+	    end_is_left = (end_y < anchor_y) || (end_y == anchor_y && end_x < anchor_x);
+	    
+	    if (count < 0)
+	      new_pos = end_is_left ? label->selection_end : label->selection_anchor;
+	    else
+	      new_pos = !end_is_left ? label->selection_end : label->selection_anchor;
+
+	    break;
+	  }
+	case GTK_MOVEMENT_LOGICAL_POSITIONS:
+	case GTK_MOVEMENT_WORDS:
+	  if (count < 0)
+	    new_pos = MIN (label->selection_end, label->selection_anchor);
+	  else
+	    new_pos = MAX (label->selection_end, label->selection_anchor);
+	  break;
+	case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
+	case GTK_MOVEMENT_PARAGRAPH_ENDS:
+	case GTK_MOVEMENT_BUFFER_ENDS:
+	  /* FIXME: Can do better here */
+	  new_pos = count < 0 ? 0 : strlen (label->text);
+	  break;
+	case GTK_MOVEMENT_PARAGRAPHS:
+	case GTK_MOVEMENT_PAGES:
+	  break;
+	default:
+	  g_assert_not_reached ();
+	  break;
+	}
+    }
+  else
+    {
+      switch (step)
+	{
+	case GTK_MOVEMENT_LOGICAL_POSITIONS:
+	  new_pos = eel_editable_label_move_logically (label, new_pos, count);
+	  break;
+	case GTK_MOVEMENT_VISUAL_POSITIONS:
+	  new_pos = eel_editable_label_move_visually (label, new_pos, count);
+	  break;
+	case GTK_MOVEMENT_WORDS:
+	  while (count > 0)
+	    {
+	      new_pos = eel_editable_label_move_forward_word (label, new_pos);
+	      count--;
+	    }
+	  while (count < 0)
+	    {
+	      new_pos = eel_editable_label_move_backward_word (label, new_pos);
+	      count++;
+	    }
+	  break;
+	case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
+	case GTK_MOVEMENT_PARAGRAPH_ENDS:
+	case GTK_MOVEMENT_BUFFER_ENDS:
+	  /* FIXME: Can do better here */
+	  new_pos = count < 0 ? 0 : strlen (label->text);
+	  break;
+	case GTK_MOVEMENT_DISPLAY_LINES:
+	  new_pos = eel_editable_label_move_line (label, new_pos, count);
+	  break;
+	  break;
+	case GTK_MOVEMENT_PARAGRAPHS:
+	case GTK_MOVEMENT_PAGES:
+	  break;
+	default:
+	  g_assert_not_reached ();
+	  break;
+	}
+    }
+
+  if (extend_selection)
+    eel_editable_label_select_region_index (label,
+					    label->selection_anchor,
+					    new_pos);
+  else
+    eel_editable_label_select_region_index (label, new_pos, new_pos);
+}
+
+static void
+eel_editable_label_reset_im_context (EelEditableLabel  *label)
+{
+  if (label->need_im_reset)
+    {
+      label->need_im_reset = 0;
+      gtk_im_context_reset (label->im_context);
+    }
+}
+
+
+static void
+eel_editable_label_delete_from_cursor (EelEditableLabel *label,
+				       GtkDeleteType     type,
+				       gint              count)
+{
+  GtkEditable *editable = GTK_EDITABLE (label);
+  gint start_pos = label->selection_anchor;
+  gint end_pos = label->selection_anchor;
+  
+  eel_editable_label_reset_im_context (label);
+
+  if (label->selection_anchor != label->selection_end)
+    {
+      gtk_editable_delete_selection (editable);
+      return;
+    }
+  
+  switch (type)
+    {
+    case GTK_DELETE_CHARS:
+      end_pos = eel_editable_label_move_logically (label, start_pos, count);
+      start_pos = g_utf8_pointer_to_offset (label->text, label->text + start_pos);
+      end_pos = g_utf8_pointer_to_offset (label->text, label->text + end_pos);
+      gtk_editable_delete_text (GTK_EDITABLE (label), MIN (start_pos, end_pos), MAX (start_pos, end_pos));
+      break;
+    case GTK_DELETE_WORDS:
+      if (count < 0)
+	{
+	  /* Move to end of current word, or if not on a word, end of previous word */
+	  end_pos = eel_editable_label_move_backward_word (label, end_pos);
+	  end_pos = eel_editable_label_move_forward_word (label, end_pos);
+	}
+      else if (count > 0)
+	{
+	  /* Move to beginning of current word, or if not on a word, begining of next word */
+	  start_pos = eel_editable_label_move_forward_word (label, start_pos);
+	  start_pos = eel_editable_label_move_backward_word (label, start_pos);
+	}
+	
+      /* Fall through */
+    case GTK_DELETE_WORD_ENDS:
+      while (count < 0)
+	{
+	  start_pos = eel_editable_label_move_backward_word (label, start_pos);
+	  count++;
+	}
+      while (count > 0)
+	{
+	  end_pos = eel_editable_label_move_forward_word (label, end_pos);
+	  count--;
+	}
+      start_pos = g_utf8_pointer_to_offset (label->text, label->text + start_pos);
+      end_pos = g_utf8_pointer_to_offset (label->text, label->text + end_pos);
+ 
+      gtk_editable_delete_text (GTK_EDITABLE (label), start_pos, end_pos);
+      break;
+    case GTK_DELETE_DISPLAY_LINE_ENDS:
+    case GTK_DELETE_PARAGRAPH_ENDS:
+      end_pos = g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+      if (count < 0)
+	gtk_editable_delete_text (GTK_EDITABLE (label), 0, end_pos);
+      else
+	gtk_editable_delete_text (GTK_EDITABLE (label), end_pos, -1);
+      break;
+    case GTK_DELETE_DISPLAY_LINES:
+    case GTK_DELETE_PARAGRAPHS:
+      gtk_editable_delete_text (GTK_EDITABLE (label), 0, -1);  
+      break;
+    case GTK_DELETE_WHITESPACE:
+      /* TODO eel_editable_label_delete_whitespace (label); */
+      break;
+    }
+  
+  eel_editable_label_pend_cursor_blink (label);
+}
+
+
+static void
+eel_editable_label_copy_clipboard (EelEditableLabel *label)
+{
+  if (label->text)
+    {
+      gint start, end;
+      gint len;
+      
+      start = MIN (label->selection_anchor,
+                   label->selection_end);
+      end = MAX (label->selection_anchor,
+                 label->selection_end);
+
+      len = strlen (label->text);
+
+      if (end > len)
+        end = len;
+
+      if (start > len)
+        start = len;
+
+      if (start != end)
+	gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
+				label->text + start, end - start);
+    }
+}
+
+static void
+eel_editable_label_cut_clipboard (EelEditableLabel *label)
+{
+  if (label->text)
+    {
+      gint start, end;
+      gint len;
+      
+      start = MIN (label->selection_anchor,
+                   label->selection_end);
+      end = MAX (label->selection_anchor,
+                 label->selection_end);
+
+      len = strlen (label->text);
+
+      if (end > len)
+        end = len;
+
+      if (start > len)
+        start = len;
+
+      if (start != end)
+	{
+	  gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
+				  label->text + start, end - start);
+          start = g_utf8_pointer_to_offset (label->text, label->text + start);
+          end = g_utf8_pointer_to_offset (label->text, label->text + end);
+	  gtk_editable_delete_text (GTK_EDITABLE (label), start, end);
+	}
+    }
+}
+
+static void
+paste_received (GtkClipboard *clipboard,
+		const gchar  *text,
+		gpointer      data)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (data);
+  GtkEditable *editable = GTK_EDITABLE (label);
+  gint tmp_pos;
+      
+  if (text)
+    {
+      if (label->selection_end != label->selection_anchor)
+	gtk_editable_delete_selection (editable);
+
+      tmp_pos = g_utf8_pointer_to_offset (label->text,
+                                      label->text + label->selection_anchor);
+      gtk_editable_insert_text (GTK_EDITABLE (label), text, strlen (text), &tmp_pos);
+      tmp_pos = g_utf8_offset_to_pointer (label->text, tmp_pos) - label->text;
+      eel_editable_label_select_region_index (label, tmp_pos, tmp_pos);
+    }
+
+  g_object_unref (G_OBJECT (label));
+}
+
+static void
+eel_editable_label_paste (EelEditableLabel *label,
+			  GdkAtom   selection)
+{
+  g_object_ref (G_OBJECT (label));
+  gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (label), selection),
+			      paste_received, label);
+}
+
+static void
+eel_editable_label_paste_clipboard (EelEditableLabel *label)
+{
+  eel_editable_label_paste (label, GDK_NONE);
+}
+
+static void
+eel_editable_label_select_all (EelEditableLabel *label)
+{
+  eel_editable_label_select_region_index (label, 0, strlen (label->text));
+}
+
+/* Quick hack of a popup menu
+ */
+static void
+activate_cb (GtkWidget *menuitem,
+	     EelEditableLabel  *label)
+{
+  const gchar *signal = g_object_get_data (G_OBJECT (menuitem), "gtk-signal");
+  g_signal_emit_by_name (GTK_OBJECT (label), signal);
+}
+
+static void
+append_action_signal (EelEditableLabel     *label,
+		      GtkWidget    *menu,
+		      const gchar  *stock_id,
+		      const gchar  *signal,
+                      gboolean      sensitive)
+{
+  GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
+
+  g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
+  g_signal_connect (GTK_OBJECT (menuitem), "activate",
+		    GTK_SIGNAL_FUNC (activate_cb), label);
+
+  gtk_widget_set_sensitive (menuitem, sensitive);
+  
+  gtk_widget_show (menuitem);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+}
+
+static void
+popup_menu_detach (GtkWidget *attach_widget,
+		   GtkMenu   *menu)
+{
+  EelEditableLabel *label;
+  label = EEL_EDITABLE_LABEL (attach_widget);
+
+  label->popup_menu = NULL;
+}
+
+static void
+popup_position_func (GtkMenu   *menu,
+                     gint      *x,
+                     gint      *y,
+                     gboolean  *push_in,
+                     gpointer	user_data)
+{
+  EelEditableLabel *label;
+  GtkWidget *widget;
+  GtkRequisition req;
+  
+  label = EEL_EDITABLE_LABEL (user_data);  
+  widget = GTK_WIDGET (label);
+
+  g_assert (GTK_WIDGET_REALIZED (label));
+
+  gdk_window_get_origin (widget->window, x, y);      
+
+  /*gtk_widget_size_request (label->popup_menu, &req);*/
+  req = widget->requisition;
+  
+  *x += widget->allocation.width / 2;
+  *y += widget->allocation.height;
+
+  *x = CLAMP (*x, 0, MAX (0, gdk_screen_width () - req.width));
+  *y = CLAMP (*y, 0, MAX (0, gdk_screen_height () - req.height));
+}
+
+static void
+eel_editable_label_toggle_overwrite (EelEditableLabel *label)
+{
+  label->overwrite_mode = !label->overwrite_mode;
+  gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+typedef struct
+{
+  EelEditableLabel *label;
+  gint button;
+  guint time;
+} PopupInfo;
+
+static void
+popup_targets_received (GtkClipboard     *clipboard,
+			GtkSelectionData *data,
+			gpointer          user_data)
+{
+  GtkWidget *menuitem, *submenu;
+  gboolean have_selection;
+  gboolean clipboard_contains_text;
+  PopupInfo *info;
+  EelEditableLabel *label;
+
+  info = user_data;
+  label = info->label;
+
+  if (GTK_WIDGET_REALIZED (label))
+    {
+      if (label->popup_menu)
+	gtk_widget_destroy (label->popup_menu);
+  
+      label->popup_menu = gtk_menu_new ();
+
+      gtk_menu_attach_to_widget (GTK_MENU (label->popup_menu),
+				 GTK_WIDGET (label),
+				 popup_menu_detach);
+
+      have_selection =
+	label->selection_anchor != label->selection_end;
+  
+      clipboard_contains_text = gtk_selection_data_targets_include_text (data);
+
+      append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut_clipboard",
+			    have_selection);
+      append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy_clipboard",
+			    have_selection);
+      append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste_clipboard",
+			    clipboard_contains_text);
+  
+      menuitem = gtk_menu_item_new_with_label (_("Select All"));
+      g_signal_connect_object (GTK_OBJECT (menuitem), "activate",
+			       GTK_SIGNAL_FUNC (eel_editable_label_select_all), label,
+			       G_CONNECT_SWAPPED);
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
+
+      menuitem = gtk_separator_menu_item_new ();
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
+      
+      menuitem = gtk_menu_item_new_with_label (_("Input Methods"));
+      gtk_widget_show (menuitem);
+      submenu = gtk_menu_new ();
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+      
+      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
+  
+      gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (label->im_context),
+					    GTK_MENU_SHELL (submenu));
+
+      g_signal_emit (GTK_OBJECT (label),
+		     signals[POPULATE_POPUP], 0,
+		     label->popup_menu);
+
+      if (info->button)
+	gtk_menu_popup (GTK_MENU (label->popup_menu), NULL, NULL,
+			NULL, NULL,
+			info->button, info->time);
+      else
+	{
+	  gtk_menu_popup (GTK_MENU (label->popup_menu), NULL, NULL,
+			  popup_position_func, label,
+			  info->button, info->time);
+	  gtk_menu_shell_select_first (GTK_MENU_SHELL (label->popup_menu), FALSE);
+	}
+    }
+
+  g_object_unref (label);
+  g_free (info);
+}
+
+static void
+eel_editable_label_do_popup (EelEditableLabel *label,
+			     GdkEventButton   *event)
+{
+  PopupInfo *info = g_new (PopupInfo, 1);
+
+  /* In order to know what entries we should make sensitive, we
+   * ask for the current targets of the clipboard, and when
+   * we get them, then we actually pop up the menu.
+   */
+  info->label = g_object_ref (label);
+  
+  if (event)
+    {
+      info->button = event->button;
+      info->time = event->time;
+    }
+  else
+    {
+      info->button = 0;
+      info->time = gtk_get_current_event_time ();
+    }
+
+  gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD),
+				  gdk_atom_intern ("TARGETS", FALSE),
+				  popup_targets_received,
+				  info);
+}
+
+/************ Editable implementation ****************/
+
+static void
+editable_insert_text_emit  (GtkEditable *editable,
+			    const gchar *new_text,
+			    gint         new_text_length,
+			    gint        *position)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  gchar buf[64];
+  gchar *text;
+  int text_length;
+
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (*position < 0 || *position > text_length)
+    *position = text_length;
+  
+  g_object_ref (G_OBJECT (editable));
+  
+  if (new_text_length <= 63)
+    text = buf;
+  else
+    text = g_new (gchar, new_text_length + 1);
+
+  text[new_text_length] = '\0';
+  strncpy (text, new_text, new_text_length);
+  
+  g_signal_emit_by_name (editable, "insert_text", text, new_text_length, position);
+
+  if (new_text_length > 63)
+    g_free (text);
+
+  g_object_unref (G_OBJECT (editable));
+}
+
+static void
+editable_delete_text_emit (GtkEditable *editable,
+			   gint         start_pos,
+			   gint         end_pos)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end_pos < 0 || end_pos > text_length)
+    end_pos = text_length;
+  if (start_pos < 0)
+    start_pos = 0;
+  if (start_pos > end_pos)
+    start_pos = end_pos;
+  
+  g_object_ref (G_OBJECT (editable));
+
+  g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos);
+
+  g_object_unref (G_OBJECT (editable));
+}
+
+static void
+editable_insert_text (GtkEditable *editable,
+		      const gchar *new_text,
+		      gint         new_text_length,
+		      gint        *position)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  gint index;
+
+  if (new_text_length < 0)
+    new_text_length = strlen (new_text);
+
+  index = g_utf8_offset_to_pointer (label->text, *position) - label->text;
+
+  eel_editable_label_insert_text (label,
+				  new_text,
+				  new_text_length,
+				  &index);
+  
+  *position = g_utf8_pointer_to_offset (label->text, label->text + index);
+}
+
+static void
+editable_delete_text (GtkEditable *editable,
+		      gint         start_pos,
+		      gint         end_pos)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  gint start_index, end_index;
+
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end_pos < 0 || end_pos > text_length)
+    end_pos = text_length;
+  if (start_pos < 0)
+    start_pos = 0;
+  if (start_pos > end_pos)
+    start_pos = end_pos;
+
+  start_index = g_utf8_offset_to_pointer (label->text, start_pos) - label->text;
+  end_index = g_utf8_offset_to_pointer (label->text, end_pos) - label->text;
+  
+  eel_editable_label_delete_text (label, start_index, end_index);
+}
+
+static gchar *    
+editable_get_chars (GtkEditable   *editable,
+		    gint           start_pos,
+		    gint           end_pos)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  gint start_index, end_index;
+  
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end_pos < 0 || end_pos > text_length)
+    end_pos = text_length;
+  if (start_pos < 0)
+    start_pos = 0;
+  if (start_pos > end_pos)
+    start_pos = end_pos;
+
+  start_index = g_utf8_offset_to_pointer (label->text, start_pos) - label->text;
+  end_index = g_utf8_offset_to_pointer (label->text, end_pos) - label->text;
+
+  return g_strndup (label->text + start_index, end_index - start_index);
+}
+
+static void
+editable_set_selection_bounds (GtkEditable *editable,
+			       gint         start,
+			       gint         end)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  gint start_index, end_index;
+  
+  text_length = g_utf8_strlen (label->text, -1);
+
+  if (end < 0 || end > text_length)
+    end = text_length;
+  if (start < 0)
+    start = text_length;
+  if (start > text_length)
+    start = text_length;
+  
+  eel_editable_label_reset_im_context (label);
+
+  start_index = g_utf8_offset_to_pointer (label->text, start) - label->text;
+  end_index = g_utf8_offset_to_pointer (label->text, end) - label->text;
+
+  eel_editable_label_select_region_index (label, start_index, end_index);
+}
+
+static gboolean
+editable_get_selection_bounds (GtkEditable *editable,
+			       gint        *start,
+			       gint        *end)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+
+  *start = g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+  *end = g_utf8_pointer_to_offset (label->text, label->text + label->selection_end);
+
+  return (label->selection_anchor != label->selection_end);
+}
+
+static void
+editable_real_set_position (GtkEditable *editable,
+			    gint         position)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  int text_length;
+  int index;
+  
+  text_length = g_utf8_strlen (label->text, -1);
+  
+  if (position < 0 || position > text_length)
+    position = text_length;
+
+  index = g_utf8_offset_to_pointer (label->text, position) - label->text;
+  
+  if (index != label->selection_anchor ||
+      index != label->selection_end)
+    {
+      eel_editable_label_select_region_index (label, index, index);
+    }
+}
+
+static gint
+editable_get_position (GtkEditable *editable)
+{
+  EelEditableLabel *label = EEL_EDITABLE_LABEL (editable);
+  
+  return g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor);
+}
+
+
+static AtkObjectClass *a11y_parent_class = NULL;
+
+static const char* eel_editable_label_accessible_data = "eel-editable-label-accessible-data";
+
+/************ Accessible implementation ****************/
+
+typedef struct {
+	GailTextUtil *textutil;
+        gint         selection_anchor;
+        gint         selection_end;
+        gchar        *signal_name;
+        gint         position;
+        gint         length;
+} EelEditableLabelAccessiblePrivate;
+
+typedef struct
+{
+  EelEditableLabel* label;
+  gint position;
+} EelEditableLabelAccessiblePaste;
+
+
+static gchar*
+eel_editable_label_accessible_get_text (AtkText *text,
+					gint    start_pos,
+					gint    end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+  /* State is defunct */
+    return NULL;
+
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  return gail_text_util_get_substring (priv->textutil, start_pos, end_pos);
+}
+
+static gunichar 
+eel_editable_label_accessible_get_character_at_offset (AtkText *text,
+						       gint     offset)
+{
+  GtkWidget *widget;
+  EelEditableLabelAccessiblePrivate *priv;
+  gchar *string;
+  gchar *index;
+  gunichar unichar;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return '\0';
+
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  string = gail_text_util_get_substring (priv->textutil, 0, -1);
+  if (offset >= g_utf8_strlen (string, -1))
+    {
+      unichar = '\0';
+    }
+  else
+    {
+      index = g_utf8_offset_to_pointer (string, offset);
+
+      unichar = g_utf8_get_char(index);
+    }
+
+  g_free(string);
+  return unichar;
+}
+
+static gchar*
+eel_editable_label_accessible_get_text_before_offset (AtkText         *text,
+						      gint            offset,
+						      AtkTextBoundary boundary_type,
+						      gint            *start_offset,
+						      gint            *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+  /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+
+  return gail_text_util_get_text (priv->textutil,
+                                  eel_editable_label_get_layout (label),
+                                  GAIL_BEFORE_OFFSET, 
+                                  boundary_type, offset,
+                                  start_offset, end_offset);
+}
+
+static gchar*
+eel_editable_label_accessible_get_text_at_offset (AtkText          *text,
+						  gint             offset,
+						  AtkTextBoundary  boundary_type,
+						  gint             *start_offset,
+    						  gint             *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  return gail_text_util_get_text (priv->textutil,
+                                  eel_editable_label_get_layout (label),
+                                  GAIL_AT_OFFSET, 
+                                  boundary_type, offset,
+                                  start_offset, end_offset);
+}
+
+static gchar*
+eel_editable_label_accessible_get_text_after_offset  (AtkText          *text,
+						      gint             offset,
+						      AtkTextBoundary  boundary_type,
+						      gint             *start_offset,
+						      gint             *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data);
+  return gail_text_util_get_text (priv->textutil,
+                                  eel_editable_label_get_layout (label),
+                                  GAIL_AFTER_OFFSET, 
+                                  boundary_type, offset,
+                                  start_offset, end_offset);
+}
+
+static gint
+eel_editable_label_accessible_get_caret_offset (AtkText *text)
+{
+  GtkWidget *widget;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return 0;
+
+  return gtk_editable_get_position (GTK_EDITABLE (widget));
+}
+
+static gboolean
+eel_editable_label_accessible_set_caret_offset (AtkText *text, gint offset)
+{
+  GtkWidget *widget;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+  gtk_editable_set_position (GTK_EDITABLE (widget), offset);
+  return TRUE;
+}
+
+static gint
+eel_editable_label_accessible_get_character_count (AtkText *text)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return 0;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  return g_utf8_strlen (eel_editable_label_get_text (label), -1);
+}
+
+static gint
+eel_editable_label_accessible_get_n_selections (AtkText *text)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return -1;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+  if (select_start != select_end)
+    return 1;
+  else
+    return 0;
+}
+
+static gchar*
+eel_editable_label_accessible_get_selection (AtkText *text,
+					    gint    selection_num,
+					    gint    *start_pos,
+					    gint    *end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+ /* Only let the user get the selection if one is set, and if the
+  * selection_num is 0.
+  */
+  if (selection_num != 0)
+     return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), start_pos, end_pos);
+
+  if (*start_pos != *end_pos)
+     return gtk_editable_get_chars (GTK_EDITABLE (label), *start_pos, *end_pos);
+  else
+     return NULL;
+}
+
+static gboolean
+eel_editable_label_accessible_add_selection (AtkText *text,
+					     gint    start_pos,
+					     gint    end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+ /* If there is already a selection, then don't allow another to be added,
+  * since EelEditableLabel only supports one selected region.
+  */
+  if (select_start == select_end)
+    {
+       gtk_editable_select_region (GTK_EDITABLE (label), start_pos, end_pos);
+       return TRUE;
+    }
+  else
+   return FALSE;
+}
+
+static gboolean
+eel_editable_label_accessible_remove_selection (AtkText *text,
+						gint    selection_num)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end, caret_pos;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+  if (selection_num != 0)
+     return FALSE;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+  if (select_start != select_end)
+    {
+     /* Setting the start & end of the selected region to the caret position
+      * turns off the selection.
+      */
+      caret_pos = gtk_editable_get_position (GTK_EDITABLE (label));
+      gtk_editable_select_region (GTK_EDITABLE (label), caret_pos, caret_pos);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static gboolean
+eel_editable_label_accessible_set_selection (AtkText *text,
+					     gint    selection_num,
+					     gint    start_pos,
+					     gint    end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint select_start, select_end;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return FALSE;
+
+ /* Only let the user move the selection if one is set, and if the
+  * selection_num is 0
+  */
+  if (selection_num != 0)
+     return FALSE;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (label), &select_start, 
+                                     &select_end);
+
+  if (select_start != select_end)
+    {
+      gtk_editable_select_region (GTK_EDITABLE (label), start_pos, end_pos);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static AtkAttributeSet*
+eel_editable_label_accessible_get_run_attributes (AtkText *text,
+						  gint    offset,
+						  gint    *start_offset,
+						  gint    *end_offset)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  AtkAttributeSet *at_set = NULL;
+  GtkTextDirection dir;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+ 
+  dir = gtk_widget_get_direction (widget);
+  if (dir == GTK_TEXT_DIR_RTL)
+    {
+      at_set = gail_misc_add_attribute (at_set,
+                                        ATK_TEXT_ATTR_DIRECTION,
+       g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_DIRECTION, dir)));
+    }
+
+  at_set = gail_misc_layout_get_run_attributes (at_set,
+                                                eel_editable_label_get_layout (label),
+                                                label->text,
+                                                offset,
+                                                start_offset,
+                                                end_offset);
+  return at_set;
+}
+
+static AtkAttributeSet*
+eel_editable_label_accessible_get_default_attributes (AtkText *text)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  AtkAttributeSet *at_set = NULL;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return NULL;
+
+  label = EEL_EDITABLE_LABEL (widget);
+
+  at_set = gail_misc_get_default_attributes (at_set,
+                                             eel_editable_label_get_layout (label),
+                                             widget);
+  return at_set;
+}
+
+static void
+eel_editable_label_accessible_get_character_extents (AtkText      *text,
+						     gint         offset,
+						     gint         *x,
+						     gint         *y,
+						     gint         *width,
+						     gint         *height,
+						     AtkCoordType coords)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  PangoRectangle char_rect;
+  gint index, cursor_index, x_layout, y_layout;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  eel_editable_label_get_layout_offsets (label, &x_layout, &y_layout);
+  index = g_utf8_offset_to_pointer (label->text, offset) - label->text;
+  cursor_index = label->selection_anchor;
+  if (index > cursor_index)
+    index += label->preedit_length;
+  pango_layout_index_to_pos (eel_editable_label_get_layout(label), index, &char_rect);
+ 
+  gail_misc_get_extents_from_pango_rectangle (widget, &char_rect, 
+                        x_layout, y_layout, x, y, width, height, coords);
+} 
+
+static gint 
+eel_editable_label_accessible_get_offset_at_point (AtkText      *text,
+						   gint         x,
+						   gint         y,
+						   AtkCoordType coords)
+{ 
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  gint index, cursor_index, x_layout, y_layout;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return -1;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  
+  eel_editable_label_get_layout_offsets (label, &x_layout, &y_layout);
+  
+  index = gail_misc_get_index_at_point_in_layout (widget, 
+               eel_editable_label_get_layout(label), x_layout, y_layout, x, y, coords);
+  if (index == -1)
+    {
+      if (coords == ATK_XY_SCREEN || coords == ATK_XY_WINDOW)
+        return g_utf8_strlen (label->text, -1);
+
+      return index;  
+    }
+  else
+    {
+      cursor_index = label->selection_anchor;
+      if (index >= cursor_index && label->preedit_length)
+        {
+          if (index >= cursor_index + label->preedit_length)
+            index -= label->preedit_length;
+          else
+            index = cursor_index;
+        }
+      return g_utf8_pointer_to_offset (label->text, label->text + index);
+    }
+}
+
+static void
+atk_text_interface_init (AtkTextIface *iface)
+{
+  g_assert (iface != NULL);
+
+  iface->get_text = eel_editable_label_accessible_get_text;
+  iface->get_character_at_offset = eel_editable_label_accessible_get_character_at_offset;
+  iface->get_text_before_offset = eel_editable_label_accessible_get_text_before_offset;
+  iface->get_text_at_offset = eel_editable_label_accessible_get_text_at_offset;
+  iface->get_text_after_offset = eel_editable_label_accessible_get_text_after_offset;
+  iface->get_caret_offset = eel_editable_label_accessible_get_caret_offset;
+  iface->set_caret_offset = eel_editable_label_accessible_set_caret_offset;
+  iface->get_character_count = eel_editable_label_accessible_get_character_count;
+  iface->get_n_selections = eel_editable_label_accessible_get_n_selections;
+  iface->get_selection = eel_editable_label_accessible_get_selection;
+  iface->add_selection = eel_editable_label_accessible_add_selection;
+  iface->remove_selection = eel_editable_label_accessible_remove_selection;
+  iface->set_selection = eel_editable_label_accessible_set_selection;
+  iface->get_run_attributes = eel_editable_label_accessible_get_run_attributes;
+  iface->get_default_attributes = eel_editable_label_accessible_get_default_attributes;
+  iface->get_character_extents = eel_editable_label_accessible_get_character_extents;
+  iface->get_offset_at_point = eel_editable_label_accessible_get_offset_at_point;
+}
+
+static void
+eel_editable_label_accessible_set_text_contents (AtkEditableText *text,
+						 const gchar     *string)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+
+  eel_editable_label_set_text (label, string);
+}
+
+static void
+eel_editable_label_accessible_insert_text (AtkEditableText *text,
+					   const gchar     *string,
+					   gint            length,
+					   gint            *position)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+
+  gtk_editable_insert_text (editable, string, length, position);
+}
+
+static void
+eel_editable_label_accessible_copy_text   (AtkEditableText *text,
+					   gint            start_pos,
+					   gint            end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+  gchar *str;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+  str = gtk_editable_get_chars (editable, start_pos, end_pos);
+  gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), str, -1);
+}
+
+static void
+eel_editable_label_accessible_cut_text (AtkEditableText *text,
+					gint            start_pos,
+					gint            end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+  gchar *str;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+  str = gtk_editable_get_chars (editable, start_pos, end_pos);
+  gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), str, -1);
+  gtk_editable_delete_text (editable, start_pos, end_pos);
+}
+
+static void
+eel_editable_label_accessible_delete_text (AtkEditableText *text,
+					   gint            start_pos,
+					   gint            end_pos)
+{
+  GtkWidget *widget;
+  EelEditableLabel *label;
+  GtkEditable *editable;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  label = EEL_EDITABLE_LABEL (widget);
+  editable = GTK_EDITABLE (label);
+
+  gtk_editable_delete_text (editable, start_pos, end_pos);
+}
+
+static void
+eel_editable_label_accessible_paste_received (GtkClipboard *clipboard,
+					      const gchar  *text,
+					      gpointer     data)
+{
+  EelEditableLabelAccessiblePaste* paste_struct = (EelEditableLabelAccessiblePaste *)data;
+
+  if (text)
+    gtk_editable_insert_text (GTK_EDITABLE (paste_struct->label), text, -1,
+       &(paste_struct->position));
+
+  g_object_unref (paste_struct->label);
+}
+
+static void
+eel_editable_label_accessible_paste_text (AtkEditableText *text,
+					  gint            position)
+{
+  GtkWidget *widget;
+  GtkEditable *editable;
+  EelEditableLabelAccessiblePaste paste_struct;
+
+  widget = GTK_ACCESSIBLE (text)->widget;
+  if (widget == NULL)
+    /* State is defunct */
+    return;
+
+  editable = GTK_EDITABLE (widget);
+  if (!gtk_editable_get_editable (editable))
+    return;
+  paste_struct.label = EEL_EDITABLE_LABEL (widget);
+  paste_struct.position = position;
+
+  g_object_ref (paste_struct.label);
+  gtk_clipboard_request_text (gtk_clipboard_get (GDK_NONE),
+    eel_editable_label_accessible_paste_received, &paste_struct);
+}
+
+static void
+atk_editable_text_interface_init (AtkEditableTextIface *iface)
+{
+  g_assert (iface != NULL);
+
+  iface->set_text_contents = eel_editable_label_accessible_set_text_contents;
+  iface->insert_text = eel_editable_label_accessible_insert_text;
+  iface->copy_text = eel_editable_label_accessible_copy_text;
+  iface->cut_text = eel_editable_label_accessible_cut_text;
+  iface->delete_text = eel_editable_label_accessible_delete_text;
+  iface->paste_text = eel_editable_label_accessible_paste_text;
+}
+
+static void
+eel_editable_label_accessible_notify_insert (AtkObject *accessible)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  if (priv->signal_name)
+    {
+      g_signal_emit_by_name (accessible, 
+                             priv->signal_name,
+                             priv->position,
+                             priv->length);
+      priv->signal_name = NULL;
+    }
+}
+
+static gboolean
+eel_editable_label_accessible_idle_notify_insert (gpointer data)
+{
+  eel_editable_label_accessible_notify_insert (data);
+  return FALSE;
+}
+
+/* Note arg1 returns the character at the start of the insert.
+ * arg2 returns the number of characters inserted.
+ */
+static void 
+eel_editable_label_accessible_insert_text_cb (EelEditableLabel *label, 
+                                              gchar            *arg1, 
+                                              gint             arg2,
+                                              gpointer         arg3)
+{
+  AtkObject *accessible;
+  EelEditableLabelAccessiblePrivate *priv;
+  gint *position = (gint *) arg3;
+
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (label));
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  if (!priv->signal_name)
+    {
+      priv->signal_name = "text_changed::insert";
+      priv->position = *position;
+      priv->length = arg2;
+    }
+  /*
+   * The signal will be emitted when the cursor position is updated.
+   * or in an idle handler if it not updated.
+   */
+   g_idle_add (eel_editable_label_accessible_idle_notify_insert, accessible);
+}
+
+/* Note arg1 returns the start of the delete range, arg2 returns the
+ * end of the delete range if multiple characters are deleted.	
+ */
+static void 
+eel_editable_label_accessible_delete_text_cb (EelEditableLabel *label,
+					      gint             arg1, 
+					      gint             arg2)
+{
+  AtkObject *accessible;
+
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (label));
+
+  /*
+   * Zero length text deleted so ignore
+   */
+  if (arg2 - arg1 == 0)
+    return;
+
+  g_signal_emit_by_name (accessible, "text_changed::delete", arg1, arg2 - arg1);
+}
+
+static void
+eel_editable_label_accessible_changed_cb (EelEditableLabel *label)
+{
+  AtkObject *accessible;
+  EelEditableLabelAccessiblePrivate *priv;
+
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (label));
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  gail_text_util_text_setup (priv->textutil, eel_editable_label_get_text (label));
+}
+
+static gboolean 
+check_for_selection_change (AtkObject   *accessible,
+                            GtkWidget   *widget)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+  EelEditableLabel *label;
+  gboolean ret_val = FALSE;
+
+  priv = g_object_get_data (G_OBJECT (accessible), eel_editable_label_accessible_data);
+  label = EEL_EDITABLE_LABEL (widget);
+ 
+  if (label->selection_anchor != label->selection_end)
+    {
+      if (label->selection_anchor != priv->selection_anchor ||
+          label->selection_end != priv->selection_end)
+        /*
+         * This check is here as this function can be called
+         * for notification of selection_end and selection_anchor.
+         * The values of selection_anchor and selection_end may be the same 
+         * for both notifications and we only want to generate one
+         * text_selection_changed signal.
+         */
+        ret_val = TRUE;
+    }
+  else 
+    {
+      /* We had a selection */
+      ret_val = (priv->selection_anchor != priv->selection_end);
+    }
+  priv->selection_anchor = label->selection_anchor;
+  priv->selection_end = label->selection_end;
+
+  return ret_val;
+}
+
+static void
+eel_editable_label_accessible_notify_gtk (GObject    *obj,
+                                          GParamSpec *pspec)
+{
+  GtkWidget *widget;
+  AtkObject *accessible;
+  EelEditableLabel *label;
+
+  widget = GTK_WIDGET (obj);
+  label = EEL_EDITABLE_LABEL (widget);
+  accessible = gtk_widget_get_accessible (widget);
+
+  if (strcmp (pspec->name, "cursor-position") == 0)
+    {
+      eel_editable_label_accessible_notify_insert (accessible);
+      if (check_for_selection_change (accessible, widget))
+        g_signal_emit_by_name (accessible, "text_selection_changed");
+      /*
+       * The label cursor position has moved so generate the signal.
+       */
+      g_signal_emit_by_name (accessible, "text_caret_moved",
+                             g_utf8_pointer_to_offset (label->text,
+					 label->text + label->selection_anchor));
+    }
+  else if (strcmp (pspec->name, "selection-bound") == 0)
+    {
+      eel_editable_label_accessible_notify_insert (accessible);
+
+      if (check_for_selection_change (accessible, widget))
+        g_signal_emit_by_name (accessible, "text_selection_changed");
+    }
+}
+
+static void
+eel_editable_label_accessible_initialize (AtkObject *accessible,
+                                          gpointer   widget)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+  EelEditableLabel *label;
+
+  a11y_parent_class->initialize (accessible, widget);
+
+  label = EEL_EDITABLE_LABEL (widget);
+  priv = g_new0 (EelEditableLabelAccessiblePrivate, 1);
+  priv->textutil = gail_text_util_new ();
+  gail_text_util_text_setup (priv->textutil, eel_editable_label_get_text (EEL_EDITABLE_LABEL (widget)));
+  priv->selection_anchor = label->selection_anchor;
+  priv->selection_end = label->selection_end;
+  g_object_set_data (G_OBJECT (accessible), eel_editable_label_accessible_data, priv);
+  g_signal_connect (widget, "insert-text",
+        G_CALLBACK (eel_editable_label_accessible_insert_text_cb), NULL);
+  g_signal_connect (widget, "delete-text",
+        G_CALLBACK (eel_editable_label_accessible_delete_text_cb), NULL);
+  g_signal_connect (widget, "changed",
+        G_CALLBACK (eel_editable_label_accessible_changed_cb), NULL);
+
+  g_signal_connect (widget,
+                    "notify",
+                    G_CALLBACK (eel_editable_label_accessible_notify_gtk),
+                    NULL);
+  atk_object_set_role (accessible, ATK_ROLE_TEXT);
+}
+
+static G_CONST_RETURN gchar*
+eel_editable_label_accessible_get_name (AtkObject *accessible)
+{
+  if (accessible->name != NULL)
+    return accessible->name;
+  else
+    {
+      GtkWidget *widget;
+
+      widget = GTK_ACCESSIBLE (accessible)->widget;
+      if (widget == NULL)
+      /* State is defunct */
+        return NULL;
+
+      g_assert (EEL_IS_EDITABLE_LABEL (widget));
+      return eel_editable_label_get_text (EEL_EDITABLE_LABEL (widget));
+    }
+}
+
+static AtkStateSet*
+eel_editable_label_accessible_ref_state_set (AtkObject *accessible)
+{
+  AtkStateSet *state_set;
+  GtkWidget *widget;
+
+  state_set = a11y_parent_class->ref_state_set (accessible);
+  widget = GTK_ACCESSIBLE (accessible)->widget;
+ 
+  if (widget == NULL)
+    return state_set;
+
+  atk_state_set_add_state (state_set, ATK_STATE_EDITABLE);
+  atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE);
+  return state_set;
+}
+
+static void 
+eel_editable_label_accessible_finalize (GObject *object)
+{
+  EelEditableLabelAccessiblePrivate *priv;
+
+  priv = g_object_get_data (object, eel_editable_label_accessible_data);
+  g_object_unref (priv->textutil);
+  g_free (priv);
+  G_OBJECT_CLASS (a11y_parent_class)->finalize (object);
+}
+
+static void
+eel_editable_label_accessible_class_init (AtkObjectClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  a11y_parent_class = g_type_class_peek_parent (klass);
+
+  klass->initialize = eel_editable_label_accessible_initialize;
+  klass->get_name = eel_editable_label_accessible_get_name;
+  klass->ref_state_set = eel_editable_label_accessible_ref_state_set;
+  gobject_class->finalize = eel_editable_label_accessible_finalize;
+}
+
+static AtkObject *
+eel_editable_label_get_accessible (GtkWidget *widget)
+{
+  static GType type = 0;
+  AtkObject *accessible;
+
+  if ((accessible = eel_accessibility_get_atk_object (widget)))
+    return accessible;
+
+  if (!type)
+    {
+      const GInterfaceInfo atk_editable_text_info = 
+      {
+        (GInterfaceInitFunc) atk_editable_text_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      const GInterfaceInfo atk_text_info =
+      {
+        (GInterfaceInitFunc) atk_text_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+
+      type = eel_accessibility_create_derived_type ("EelEditableLabelAccessible",
+		       G_TYPE_FROM_INSTANCE (widget),
+		       eel_editable_label_accessible_class_init);
+
+      if (!type)
+        return NULL;
+
+      g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
+      g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
+    }
+
+  accessible = g_object_new (type, NULL);
+
+  return eel_accessibility_set_atk_object_return (widget, accessible);
+}
+
diff --git a/eel/eel-editable-label.h b/eel/eel-editable-label.h
new file mode 100644
index 000000000..1255ea36f
--- /dev/null
+++ b/eel/eel-editable-label.h
@@ -0,0 +1,142 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#ifndef __EEL_EDITABLE_LABEL_H__
+#define __EEL_EDITABLE_LABEL_H__
+
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+#define EEL_TYPE_EDITABLE_LABEL		  (eel_editable_label_get_type ())
+#define EEL_EDITABLE_LABEL(obj)		  (GTK_CHECK_CAST ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabel))
+#define EEL_EDITABLE_LABEL_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
+#define EEL_IS_EDITABLE_LABEL(obj)	  (GTK_CHECK_TYPE ((obj), EEL_TYPE_EDITABLE_LABEL))
+#define EEL_IS_EDITABLE_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_EDITABLE_LABEL))
+#define EEL_EDITABLE_LABEL_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
+       
+
+typedef struct _EelEditableLabel       EelEditableLabel;
+typedef struct _EelEditableLabelClass  EelEditableLabelClass;
+
+typedef struct _EelEditableLabelSelectionInfo EelEditableLabelSelectionInfo;
+
+struct _EelEditableLabel
+{
+  GtkMisc misc;
+
+  /*< private >*/
+  guint   jtype : 2;
+  guint   wrap : 1;
+  guint   overwrite_mode : 1;
+  guint   draw_outline : 1;
+  PangoWrapMode  wrap_mode;
+  
+  gchar  *text;
+  int text_size; /* allocated size, in bytes */
+  int n_bytes;	 /* length in use (not including terminating zero), in bytes */
+
+  PangoLayout *layout;
+  guint        layout_includes_preedit : 1;
+
+  int selection_anchor; /* cursor pos, byte index */
+  int selection_end; /* byte index */
+  
+  GtkWidget *popup_menu;
+
+  GtkIMContext *im_context;
+  gboolean need_im_reset;
+  int preedit_length;	/* length of preedit string, in bytes */
+  int preedit_cursor;	/* offset of cursor within preedit string, in chars */
+
+  GdkGC *primary_cursor_gc;
+  GdkGC *secondary_cursor_gc;
+  
+  PangoFontDescription *font_desc;
+};
+
+struct _EelEditableLabelClass
+{
+  GtkMiscClass parent_class;
+
+  void (* move_cursor)        (EelEditableLabel  *label,
+			       GtkMovementStep    step,
+			       gint               count,
+			       gboolean           extend_selection);
+  void (* insert_at_cursor)   (EelEditableLabel  *label,
+			       const gchar       *str);
+  void (* delete_from_cursor) (EelEditableLabel  *label,
+			       GtkDeleteType      type,
+			       gint               count);
+  void (* cut_clipboard)      (EelEditableLabel  *label);
+  void (* copy_clipboard)     (EelEditableLabel  *label);
+  void (* paste_clipboard)    (EelEditableLabel  *label);
+  void (* toggle_overwrite)   (EelEditableLabel  *label);
+  
+  /* Hook to customize right-click popup for selectable labels */
+  void (* populate_popup)   (EelEditableLabel  *label,
+                             GtkMenu           *menu);
+};
+
+GType                 eel_editable_label_get_type          (void) G_GNUC_CONST;
+GtkWidget*            eel_editable_label_new                  (const char       *str);
+void                  eel_editable_label_set_text             (EelEditableLabel *label,
+							       const char       *str);
+G_CONST_RETURN gchar* eel_editable_label_get_text             (EelEditableLabel *label);
+void                  eel_editable_label_set_justify          (EelEditableLabel *label,
+							       GtkJustification  jtype);
+GtkJustification      eel_editable_label_get_justify          (EelEditableLabel *label);
+void                  eel_editable_label_set_line_wrap        (EelEditableLabel *label,
+							       gboolean          wrap);
+void                  eel_editable_label_set_line_wrap_mode   (EelEditableLabel *label,
+							       PangoWrapMode     mode);
+gboolean              eel_editable_label_get_line_wrap        (EelEditableLabel *label);
+void                  eel_editable_label_set_draw_outline     (EelEditableLabel *label,
+							       gboolean          wrap);
+void                  eel_editable_label_select_region        (EelEditableLabel *label,
+							       gint              start_offset,
+							       gint              end_offset);
+gboolean              eel_editable_label_get_selection_bounds (EelEditableLabel *label,
+							       gint             *start,
+							       gint             *end);
+PangoLayout *         eel_editable_label_get_layout           (EelEditableLabel *label);
+void                  eel_editable_label_get_layout_offsets   (EelEditableLabel *label,
+							       gint             *x,
+							       gint             *y);
+PangoFontDescription *eel_editable_label_get_font_description (EelEditableLabel *label);
+void                  eel_editable_label_set_font_description (EelEditableLabel *label,
+							       const PangoFontDescription *desc);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __EEL_EDITABLE_LABEL_H__ */
diff --git a/eel/eel-enumeration.c b/eel/eel-enumeration.c
new file mode 100644
index 000000000..8691c80da
--- /dev/null
+++ b/eel/eel-enumeration.c
@@ -0,0 +1,533 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-enumeration.c: Enumeration data structure.
+
+   Copyright (C) 2000 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-enumeration.h"
+
+#include "eel-debug.h"
+#include "eel-glib-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-string.h"
+#include "eel-i18n.h"
+
+static gboolean suppress_duplicate_registration_warning;
+
+struct EelEnumeration
+{
+	char *id;
+	GPtrArray *entries; /* array of EelEnumerationEntry */
+};
+
+static EelEnumeration *
+eel_enumeration_new (const char *id)
+{
+	EelEnumeration *enumeration;
+
+	g_assert (id != NULL);
+	g_assert (id[0] != '\0');
+	
+	enumeration = g_new0 (EelEnumeration, 1);
+
+	enumeration->id = g_strdup (id);
+	enumeration->entries = g_ptr_array_new ();
+
+	return enumeration;
+}
+
+static void
+free_entry (EelEnumerationEntry *entry)
+{
+	g_free (entry->name);
+	g_free (entry->description);
+	g_free (entry);
+}
+
+static void
+eel_enumeration_free (EelEnumeration *enumeration)
+{
+	if (enumeration == NULL) {
+		return;
+	}
+
+	g_free (enumeration->id);
+	g_ptr_array_foreach (enumeration->entries, (GFunc) free_entry, NULL);
+	g_ptr_array_free (enumeration->entries, TRUE);
+	g_free (enumeration);
+}
+
+char *
+eel_enumeration_get_id (const EelEnumeration *enumeration)
+{
+	g_return_val_if_fail (enumeration != NULL, NULL);
+
+	return g_strdup (enumeration->id);
+}
+
+guint
+eel_enumeration_get_length (const EelEnumeration *enumeration)
+{
+	g_return_val_if_fail (enumeration != NULL, 0);
+
+	return enumeration->entries->len;
+}
+
+const EelEnumerationEntry *
+eel_enumeration_get_nth_entry (const EelEnumeration *enumeration,
+			       guint n)
+{
+	g_return_val_if_fail (enumeration != NULL, NULL);
+	g_return_val_if_fail (n < enumeration->entries->len, NULL);
+
+	return (EelEnumerationEntry *) g_ptr_array_index (enumeration->entries, n);
+}
+
+int
+eel_enumeration_get_name_position (const EelEnumeration *enumeration,
+				   const char *name)
+{
+	int i;
+
+	g_return_val_if_fail (enumeration != NULL, -1);
+	g_return_val_if_fail (name != NULL, -1);
+
+	for (i = 0; i < enumeration->entries->len; ++i) {
+		EelEnumerationEntry *entry = enumeration->entries->pdata[i];
+		if (strcmp (name, entry->name) == 0) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+gboolean
+eel_enumeration_contains_name (const EelEnumeration *enumeration,
+			       const char *name)
+{
+	g_return_val_if_fail (enumeration != NULL, FALSE);
+	g_return_val_if_fail (name != NULL, FALSE);
+
+	return eel_enumeration_get_name_position (enumeration, name) != -1;
+}
+
+guint
+eel_enumeration_get_value_for_name (const EelEnumeration *enumeration,
+				    const char           *name)
+{
+	int i;
+
+	g_return_val_if_fail (enumeration != NULL, 0);
+	g_return_val_if_fail (name != NULL, 0);
+
+	for (i = 0; i < enumeration->entries->len; ++i) {
+		EelEnumerationEntry *entry = enumeration->entries->pdata[i];
+		if (strcmp (name, entry->name) == 0) {
+			return entry->value;
+		}
+	}
+
+	g_warning ("No name '%s' in enumeration '%s'", name, enumeration->id);
+
+	return 0;
+}
+
+const char *
+eel_enumeration_get_name_for_value (const EelEnumeration *enumeration,
+				    int                   value)
+{
+	int i;
+
+	g_return_val_if_fail (enumeration != NULL, 0);
+
+	for (i = 0; i < enumeration->entries->len; ++i) {
+		EelEnumerationEntry *entry = enumeration->entries->pdata[i];
+		if (value == entry->value) {
+			return entry->name;
+		}
+	}
+
+	g_warning ("No value '%d' in enumeration '%s'", value, enumeration->id);
+
+	return NULL;
+}
+
+char **
+eel_enumeration_get_names (const EelEnumeration *enumeration)
+{
+	GPtrArray *names;
+	int i;
+
+	g_return_val_if_fail (enumeration != NULL, NULL);
+
+	if (enumeration->entries->len == 0) {
+		return NULL;
+	}
+
+	names = g_ptr_array_sized_new (enumeration->entries->len + 1);
+	for (i = 0; i < enumeration->entries->len; ++i) {
+		EelEnumerationEntry *entry = enumeration->entries->pdata[i];
+		g_ptr_array_add (names, g_strdup (entry->name));
+	}
+	g_ptr_array_add (names, NULL);
+
+	return (char **) g_ptr_array_free (names, FALSE);
+}
+
+static EelEnumeration *
+eel_enumeration_new_from_tokens (const char *id,
+				 const char *names,
+				 const char *descriptions,
+				 const char *values,
+				 const char *delimiter)
+{
+	EelEnumeration *enumeration;
+	char **namev;
+	char **descriptionv;
+	char **valuev;
+	int length;
+	guint i;
+
+	g_return_val_if_fail (id != NULL, NULL);
+	g_return_val_if_fail (id[0] != '\0', NULL);
+	g_return_val_if_fail (names != NULL, NULL);
+	g_return_val_if_fail (names[0] != '\0', NULL);
+	g_return_val_if_fail (values != NULL, NULL);
+	g_return_val_if_fail (values[0] != '\0', NULL);
+	g_return_val_if_fail (delimiter != NULL, NULL);
+	g_return_val_if_fail (delimiter[0] != '\0', NULL);
+
+	enumeration = eel_enumeration_new (id);
+
+	namev = g_strsplit (names, delimiter, -1);
+	valuev = g_strsplit (values, delimiter, -1);
+
+	length = g_strv_length (namev);
+	if (g_strv_length (valuev) != length) {
+		g_warning ("names and values have different lengths.");
+		g_strfreev (namev);
+		g_strfreev (valuev);
+		return NULL;
+	}
+
+	descriptionv = descriptions != NULL ? 
+		       g_strsplit (descriptions, delimiter, -1) : NULL;
+
+	if (descriptionv != NULL) {
+		if (g_strv_length (descriptionv) != length) {
+			g_warning ("names and descriptions have different lengths.");
+			g_strfreev (namev);
+			g_strfreev (descriptionv);
+			g_strfreev (valuev);
+			return NULL;
+		}
+	}
+
+	for (i = 0; i < length; i++) {
+		EelEnumerationEntry *entry;
+		int value;
+
+		if (!eel_str_to_int (valuev[i], &value)) {
+			g_warning ("Could not convert value '%d' to an integer.  Using 0.", i);
+			value = 0;
+		}
+
+		entry = g_new0 (EelEnumerationEntry, 1);
+		entry->name = namev[i];
+		entry->description = descriptionv ? descriptionv[i] : NULL;
+		entry->value = value;
+
+		g_ptr_array_add (enumeration->entries, entry);
+	}
+
+	return enumeration;
+}
+
+static EelEnumerationEntry *
+dup_entry (const EelEnumerationEntry *entry)
+{
+	EelEnumerationEntry *res;
+
+	res = g_new0 (EelEnumerationEntry, 1);
+	res->name = g_strdup (entry->name);
+	res->description = g_strdup (entry->description);
+	res->value = entry->value;
+
+	return res;
+}
+
+static EelEnumeration *
+eel_enumeration_new_from_entries (const char *id,
+				  const EelEnumerationEntry entries[],
+				  guint n_entries)
+{
+	EelEnumeration *enumeration;
+	guint i;
+
+	g_assert (id != NULL);
+	g_assert (id[0] != '\0');
+	g_assert (entries != NULL);
+
+	enumeration = eel_enumeration_new (id);
+
+	for (i = 0; i < n_entries; i++) {
+		g_ptr_array_add (enumeration->entries, dup_entry (&entries[i]));
+	}
+
+	return enumeration;
+}
+
+static GHashTable *enumeration_table = NULL;
+
+static void
+enumeration_table_free (void)
+{
+	if (enumeration_table != NULL) {
+		g_hash_table_destroy (enumeration_table);
+		enumeration_table = NULL;
+	}
+}
+
+static GHashTable *
+enumeration_table_get (void)
+{
+	if (enumeration_table != NULL) {
+		return enumeration_table;
+	}
+
+	enumeration_table = g_hash_table_new_full (g_str_hash,
+						   g_str_equal,
+						   (GDestroyNotify) g_free,
+						   (GDestroyNotify) eel_enumeration_free);
+
+	eel_debug_call_at_shutdown (enumeration_table_free);
+
+	return enumeration_table;
+}
+
+const EelEnumeration *
+eel_enumeration_lookup (const char *id)
+{
+	GHashTable *table;
+
+	g_return_val_if_fail (id != NULL, NULL);
+	g_return_val_if_fail (id[0] != '\0', NULL);
+
+	table = enumeration_table_get ();
+	g_return_val_if_fail (table != NULL, NULL);
+
+	return g_hash_table_lookup (table, id);
+}
+
+void
+eel_enumeration_register (const char                *id,
+			  const EelEnumerationEntry  entries[],
+			  guint                      n_entries)
+{
+	GHashTable *table;
+	EelEnumeration *enumeration;
+
+	g_return_if_fail (id != NULL);
+	g_return_if_fail (id[0] != '\0');
+	g_return_if_fail (entries != NULL);
+
+	table = enumeration_table_get ();
+	g_return_if_fail (table != NULL);
+
+	if (eel_enumeration_lookup (id) != NULL) {
+		if (!suppress_duplicate_registration_warning) {
+			g_warning ("Trying to register duplicate enumeration '%s'.", id);
+		}
+
+		return;
+	}
+
+	enumeration = eel_enumeration_new_from_entries (id, entries, n_entries);
+
+	g_hash_table_insert (table, g_strdup (id), enumeration);
+}
+
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+#define CHECK_ENUMERATION_ENTRY(enumeration, i, name, description, value) \
+	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_name_position (enumeration, name), i); \
+	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_value_for_name (enumeration, name), value); \
+	EEL_CHECK_STRING_RESULT (g_strdup (eel_enumeration_get_name_for_value (enumeration, value)), name);
+
+static EelEnumerationEntry speed_tradeoff_enum_entries[] = {
+	{ "always",	    "Always",		10 },
+	{ "local_only",	    "Local Files Only",	20 },
+	{ "never",	    "Never",		30 }
+};
+
+static EelEnumerationEntry standard_zoom_levels_enum_entries[] = {
+	{ "smallest",	    "25%",	25 },
+	{ "smaller",	    "50%",	50 },
+	{ "small",	    "75%",	75 },
+	{ "standard",	    "100%",	100 },
+	{ "large",	    "150%",	150 },
+	{ "larger",	    "200%",	200 },
+	{ "largest",	    "400%",	400 }
+};
+
+static EelEnumerationEntry file_size_enum_entries[] = {
+	{ "102400",	    "100 K",	102400 },
+	{ "512000",	    "500 K",	512000 },
+	{ "1048576",	    "1 MB",	1048576 },
+	{ "3145728",	    "3 MB",	3145728 },
+	{ "5242880",	    "5 MB",	5242880 },
+	{ "10485760",	    "10 MB",	10485760 },
+	{ "104857600",	    "100 MB",	104857600 }
+};
+
+#define CHECK_REGISTERED_ENUMERATION(enumname) \
+G_STMT_START { \
+	const EelEnumeration *e; \
+	int i; \
+	e = eel_enumeration_lookup (#enumname); \
+	g_return_if_fail (e != NULL); \
+	for (i = 0; i < G_N_ELEMENTS (enumname##_enum_entries); i++) { \
+		CHECK_ENUMERATION_ENTRY (e, \
+					 i, \
+				 	 enumname##_enum_entries[i].name, \
+					 enumname##_enum_entries[i].description, \
+					 enumname##_enum_entries[i].value); \
+	} \
+	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_length (e), i); \
+} G_STMT_END
+
+void
+eel_self_check_enumeration (void)
+{
+	EelEnumeration *e;
+	char **names;
+
+	/***/
+	e = eel_enumeration_new_from_tokens ("id",
+					     "single",
+					     NULL,
+					     "1",
+					     ",");
+	
+	CHECK_ENUMERATION_ENTRY (e, 0, "single", "", 1);
+ 	EEL_CHECK_STRING_RESULT (eel_enumeration_get_id (e), "id");
+ 	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_length (e), 1);
+	eel_enumeration_free (e);
+
+	/***/
+	e = eel_enumeration_new_from_tokens ("id",
+					     "apple,orange,banana",
+					     NULL,
+					     "1,2,3",
+					     ",");
+	
+	CHECK_ENUMERATION_ENTRY (e, 0, "apple", "", 1);
+	CHECK_ENUMERATION_ENTRY (e, 1, "orange", "", 2);
+	CHECK_ENUMERATION_ENTRY (e, 2, "banana", "", 3);
+ 	EEL_CHECK_STRING_RESULT (eel_enumeration_get_id (e), "id");
+ 	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_length (e), 3);
+	eel_enumeration_free (e);
+
+	/***/
+	e = eel_enumeration_new_from_tokens ("id",
+					     "foo",
+					     NULL,
+					     "666",
+					     ",");
+	CHECK_ENUMERATION_ENTRY (e, 0, "foo", "", 666);
+ 	EEL_CHECK_STRING_RESULT (eel_enumeration_get_id (e), "id");
+ 	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_length (e), 1);
+	eel_enumeration_free (e);
+
+	/***/
+	e = eel_enumeration_new_from_tokens ("id",
+					     "one,two,---,three",
+					     "One,Two,---,Three",
+					     "1,2,0,3",
+					     ",");
+	CHECK_ENUMERATION_ENTRY (e, 0, "one", "One", 1);
+	CHECK_ENUMERATION_ENTRY (e, 1, "two", "Two", 2);
+	CHECK_ENUMERATION_ENTRY (e, 2, "---", "---", 0);
+	CHECK_ENUMERATION_ENTRY (e, 3, "three", "Three", 3);
+ 	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_length (e), 4);
+	eel_enumeration_free (e);
+
+	/***/
+	e = eel_enumeration_new_from_tokens ("id",
+					     "red,green,blue",
+					     "Red Desc,Green Desc,Blue Desc",
+					     "10,20,30",
+					     ",");
+	
+	CHECK_ENUMERATION_ENTRY (e, 0, "red", "Red Desc", 10);
+	CHECK_ENUMERATION_ENTRY (e, 1, "green", "Green Desc", 20);
+	CHECK_ENUMERATION_ENTRY (e, 2, "blue", "Blue Desc", 30);
+ 	EEL_CHECK_STRING_RESULT (eel_enumeration_get_id (e), "id");
+ 	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_length (e), 3);
+	
+ 	EEL_CHECK_BOOLEAN_RESULT (eel_enumeration_contains_name (e, "red"), TRUE);
+ 	EEL_CHECK_BOOLEAN_RESULT (eel_enumeration_contains_name (e, "green"), TRUE);
+ 	EEL_CHECK_BOOLEAN_RESULT (eel_enumeration_contains_name (e, "blue"), TRUE);
+ 	EEL_CHECK_BOOLEAN_RESULT (eel_enumeration_contains_name (e, "pink"), FALSE);
+	
+	eel_enumeration_free (e);
+
+	/***/
+	e = eel_enumeration_new_from_tokens ("id",
+					     "red,foo:green,bar:blue,baz",
+					     "Red,Desc:Green,Desc:Blue,Desc",
+					     "10:20:30",
+					     ":");
+
+	CHECK_ENUMERATION_ENTRY (e, 0, "red,foo", "Red,Desc", 10);
+	CHECK_ENUMERATION_ENTRY (e, 1, "green,bar", "Green,Desc", 20);
+	CHECK_ENUMERATION_ENTRY (e, 2, "blue,baz", "Blue,Desc", 30);
+ 	EEL_CHECK_STRING_RESULT (eel_enumeration_get_id (e), "id");
+ 	EEL_CHECK_INTEGER_RESULT (eel_enumeration_get_length (e), 3);
+ 	EEL_CHECK_BOOLEAN_RESULT (eel_enumeration_contains_name (e, "black"), FALSE);
+
+	names = eel_enumeration_get_names (e);
+	EEL_CHECK_INTEGER_RESULT (strcmp(names[2], "blue,baz"), 0);
+	g_strfreev (names);
+	eel_enumeration_free (e);
+
+	/***/
+	suppress_duplicate_registration_warning = TRUE;
+	eel_enumeration_register ("speed_tradeoff",
+				  speed_tradeoff_enum_entries,
+				  G_N_ELEMENTS (speed_tradeoff_enum_entries));
+	eel_enumeration_register ("standard_zoom_levels",
+				  standard_zoom_levels_enum_entries,
+				  G_N_ELEMENTS (standard_zoom_levels_enum_entries));
+	eel_enumeration_register ("file_size",
+				  file_size_enum_entries,
+				  G_N_ELEMENTS (file_size_enum_entries));
+	suppress_duplicate_registration_warning = FALSE;
+
+	CHECK_REGISTERED_ENUMERATION(speed_tradeoff);
+	CHECK_REGISTERED_ENUMERATION(standard_zoom_levels);
+	CHECK_REGISTERED_ENUMERATION(file_size);
+}
+
+#endif /* !EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-enumeration.h b/eel/eel-enumeration.h
new file mode 100644
index 000000000..16db385ca
--- /dev/null
+++ b/eel/eel-enumeration.h
@@ -0,0 +1,63 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-enumeration.h: Enumeration data structure.
+ 
+   Copyright (C) 2000 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_ENUMERATION_H
+#define EEL_ENUMERATION_H
+
+#include <glib.h>
+
+/* Opaque EelEnumeration declaration. */
+typedef struct EelEnumeration EelEnumeration;
+
+typedef struct
+{
+	char *name;
+	char *description;
+	guint value;
+} EelEnumerationEntry;
+
+char *          eel_enumeration_get_id                            (const EelEnumeration      *enumeration);
+
+guint           eel_enumeration_get_length                        (const EelEnumeration      *enumeration);
+const EelEnumerationEntry *
+                eel_enumeration_get_nth_entry                     (const EelEnumeration      *enumeration,
+								   guint                      n);
+int             eel_enumeration_get_name_position                 (const EelEnumeration      *enumeration,
+								   const char                *name);
+gboolean        eel_enumeration_contains_name                     (const EelEnumeration      *enumeration,
+								   const char                *name);
+guint           eel_enumeration_get_value_for_name                (const EelEnumeration      *enumeration,
+								   const char                *name);
+const char *    eel_enumeration_get_name_for_value                (const EelEnumeration      *enumeration,
+								   int                        value);
+char **         eel_enumeration_get_names                         (const EelEnumeration      *enumeration);
+
+void            eel_enumeration_register                          (const char                *id,
+								   const EelEnumerationEntry  entries[],
+								   guint                      n_entries);
+const EelEnumeration *
+                eel_enumeration_lookup                            (const char                *id);
+
+#endif /* EEL_ENUMERATION_H */
+
diff --git a/eel/eel-gconf-extensions.c b/eel/eel-gconf-extensions.c
new file mode 100644
index 000000000..5230b2741
--- /dev/null
+++ b/eel/eel-gconf-extensions.c
@@ -0,0 +1,647 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gconf-extensions.c - Stuff to make GConf easier to use.
+
+   Copyright (C) 2000, 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-gconf-extensions.h"
+
+#include "eel-debug.h"
+#include "eel-glib-extensions.h"
+#include "eel-stock-dialogs.h"
+#include "eel-string.h"
+#include "eel-i18n.h"
+
+#include <gconf/gconf-client.h>
+#include <gconf/gconf.h>
+
+static GConfClient *global_gconf_client = NULL;
+
+static void
+global_client_free (void)
+{
+	if (global_gconf_client == NULL) {
+		return;
+	}
+	
+	g_object_unref (global_gconf_client);
+	global_gconf_client = NULL;
+}
+
+/* Public */
+GConfClient *
+eel_gconf_client_get_global (void)
+{
+	/* Initialize gconf if needed */
+	if (!gconf_is_initialized ()) {
+		char *argv[] = { "eel-preferences", NULL };
+		GError *error = NULL;
+		
+		if (!gconf_init (1, argv, &error)) {
+			if (eel_gconf_handle_error (&error)) {
+				return NULL;
+			}
+		}
+	}
+	
+	if (global_gconf_client == NULL) {
+		global_gconf_client = gconf_client_get_default ();
+		eel_debug_call_at_shutdown (global_client_free);
+	}
+	
+	return global_gconf_client;
+}
+
+gboolean
+eel_gconf_handle_error (GError **error)
+{
+	char *message;
+	static gboolean shown_dialog = FALSE;
+	
+	g_return_val_if_fail (error != NULL, FALSE);
+
+	if (*error != NULL) {
+		g_warning (_("GConf error:\n  %s"), (*error)->message);
+		if (! shown_dialog) {
+			shown_dialog = TRUE;
+
+			message = g_strdup_printf (_("GConf error: %s"),
+						   (*error)->message);
+			eel_show_error_dialog (message, 
+			                       _("All further errors shown "
+			                       "only on terminal."),
+			                       NULL);
+			g_free (message);
+		}
+		g_error_free (*error);
+		*error = NULL;
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+void
+eel_gconf_set_boolean (const char *key,
+			    gboolean boolean_value)
+{
+	GConfClient *client;
+	GError *error = NULL;
+	
+	g_return_if_fail (key != NULL);
+
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+	
+	gconf_client_set_bool (client, key, boolean_value, &error);
+	eel_gconf_handle_error (&error);
+}
+
+gboolean
+eel_gconf_get_boolean (const char *key)
+{
+	gboolean result;
+	GConfClient *client;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (key != NULL, FALSE);
+	
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, FALSE);
+	
+	result = gconf_client_get_bool (client, key, &error);
+	
+	if (eel_gconf_handle_error (&error)) {
+		result = FALSE;
+	}
+	
+	return result;
+}
+
+void
+eel_gconf_set_integer (const char *key,
+			    int int_value)
+{
+	GConfClient *client;
+	GError *error = NULL;
+
+	g_return_if_fail (key != NULL);
+
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+
+	gconf_client_set_int (client, key, int_value, &error);
+	eel_gconf_handle_error (&error);
+}
+
+int
+eel_gconf_get_integer (const char *key)
+{
+	int result;
+	GConfClient *client;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (key != NULL, 0);
+	
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, 0);
+	
+	result = gconf_client_get_int (client, key, &error);
+
+	if (eel_gconf_handle_error (&error)) {
+		result = 0;
+	}
+
+	return result;
+}
+
+void
+eel_gconf_set_string (const char *key,
+			   const char *string_value)
+{
+	GConfClient *client;
+	GError *error = NULL;
+
+	g_return_if_fail (key != NULL);
+
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+	
+	gconf_client_set_string (client, key, string_value, &error);
+	eel_gconf_handle_error (&error);
+}
+
+char *
+eel_gconf_get_string (const char *key)
+{
+	char *result;
+	GConfClient *client;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (key != NULL, NULL);
+	
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, NULL);
+	
+	result = gconf_client_get_string (client, key, &error);
+	
+	if (eel_gconf_handle_error (&error)) {
+		result = g_strdup ("");
+	}
+	
+	return result;
+}
+
+void
+eel_gconf_set_string_list (const char *key,
+				const GSList *slist)
+{
+	GConfClient *client;
+	GError *error;
+
+	g_return_if_fail (key != NULL);
+
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+
+	error = NULL;
+	gconf_client_set_list (client, key, GCONF_VALUE_STRING,
+			       /* Need cast cause of GConf api bug */
+			       (GSList *) slist,
+			       &error);
+	eel_gconf_handle_error (&error);
+}
+
+GSList *
+eel_gconf_get_string_list (const char *key)
+{
+	GSList *slist;
+	GConfClient *client;
+	GError *error;
+	
+	g_return_val_if_fail (key != NULL, NULL);
+	
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, NULL);
+	
+	error = NULL;
+	slist = gconf_client_get_list (client, key, GCONF_VALUE_STRING, &error);
+	if (eel_gconf_handle_error (&error)) {
+		slist = NULL;
+	}
+
+	return slist;
+}
+
+void
+eel_gconf_unset (const char *key)
+{
+	GConfClient *client;
+	GError *error;
+	
+	g_return_if_fail (key != NULL);
+	
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+	
+	error = NULL;
+	gconf_client_unset (client, key, &error);
+	eel_gconf_handle_error (&error);
+}
+
+gboolean
+eel_gconf_is_default (const char *key)
+{
+	gboolean result;
+	GConfValue *value;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (key != NULL, FALSE);
+	
+	value = gconf_client_get_without_default  (eel_gconf_client_get_global (), key, &error);
+
+	if (eel_gconf_handle_error (&error)) {
+		if (value != NULL) {
+			gconf_value_free (value);
+		}
+		return FALSE;
+	}
+
+	result = (value == NULL);
+	eel_gconf_value_free (value);
+	return result;
+}
+
+gboolean
+eel_gconf_key_is_writable (const char *key)
+{
+	gboolean result;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (key != NULL, FALSE);
+	
+	result = gconf_client_key_is_writable  (eel_gconf_client_get_global (), key, &error);
+
+	if (eel_gconf_handle_error (&error)) {
+		return result;
+	}
+
+	return result;
+}
+
+gboolean
+eel_gconf_monitor_add (const char *directory)
+{
+	GError *error = NULL;
+	GConfClient *client;
+
+	g_return_val_if_fail (directory != NULL, FALSE);
+
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, FALSE);
+
+	gconf_client_add_dir (client,
+			      directory,
+			      GCONF_CLIENT_PRELOAD_NONE,
+			      &error);
+	
+	if (eel_gconf_handle_error (&error)) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+gboolean
+eel_gconf_monitor_remove (const char *directory)
+{
+	GError *error = NULL;
+	GConfClient *client;
+
+	if (directory == NULL) {
+		return FALSE;
+	}
+
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, FALSE);
+	
+	gconf_client_remove_dir (client,
+				 directory,
+				 &error);
+	
+	if (eel_gconf_handle_error (&error)) {
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+void
+eel_gconf_preload_cache (const char             *directory,
+			 GConfClientPreloadType  preload_type)
+{
+	GError *error = NULL;
+	GConfClient *client;
+
+	if (directory == NULL) {
+		return;
+	}
+
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+	
+	gconf_client_preload (client,
+			      directory,
+			      preload_type,
+			      &error);
+	
+	eel_gconf_handle_error (&error);
+}
+
+void
+eel_gconf_suggest_sync (void)
+{
+	GConfClient *client;
+	GError *error = NULL;
+
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+	
+	gconf_client_suggest_sync (client, &error);
+	eel_gconf_handle_error (&error);
+}
+
+GConfValue*
+eel_gconf_get_value (const char *key)
+{
+	GConfValue *value = NULL;
+	GConfClient *client;
+	GError *error = NULL;
+
+	g_return_val_if_fail (key != NULL, NULL);
+
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, NULL);
+
+	value = gconf_client_get (client, key, &error);
+	
+	if (eel_gconf_handle_error (&error)) {
+		if (value != NULL) {
+			gconf_value_free (value);
+			value = NULL;
+		}
+	}
+
+	return value;
+}
+
+GConfValue*
+eel_gconf_get_default_value (const char *key)
+{
+	GConfValue *value = NULL;
+	GConfClient *client;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (key != NULL, NULL);
+
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, NULL);
+
+	value = gconf_client_get_default_from_schema (client, key, &error);
+	
+	if (eel_gconf_handle_error (&error)) {
+		if (value != NULL) {
+			gconf_value_free (value);
+			value = NULL;
+		}
+	}
+
+	return value;
+}
+
+static gboolean
+simple_value_is_equal (const GConfValue *a,
+		       const GConfValue *b)
+{
+	g_assert (a != NULL);
+	g_assert (b != NULL);
+
+	switch (a->type) {
+	case GCONF_VALUE_STRING:
+		return eel_str_is_equal (gconf_value_get_string (a),
+					 gconf_value_get_string (b));
+
+	case GCONF_VALUE_INT:
+		return gconf_value_get_int (a) ==
+			gconf_value_get_int (b);
+
+	case GCONF_VALUE_FLOAT:
+		return gconf_value_get_float (a) ==
+			gconf_value_get_float (b);
+
+	case GCONF_VALUE_BOOL:
+		return gconf_value_get_bool (a) ==
+			gconf_value_get_bool (b);
+	default:
+		g_assert_not_reached ();
+	}
+	
+	return FALSE;
+}
+
+gboolean
+eel_gconf_value_is_equal (const GConfValue *a,
+			       const GConfValue *b)
+{
+	GSList *node_a;
+	GSList *node_b;
+
+	if (a == NULL && b == NULL) {
+		return TRUE;
+	}
+
+	if (a == NULL || b == NULL) {
+		return FALSE;
+	}
+
+	if (a->type != b->type) {
+		return FALSE;
+	}
+
+	switch (a->type) {
+	case GCONF_VALUE_STRING:
+	case GCONF_VALUE_INT:
+	case GCONF_VALUE_FLOAT:
+	case GCONF_VALUE_BOOL:
+		return simple_value_is_equal (a, b);
+		break;
+		
+	case GCONF_VALUE_LIST:
+		if (gconf_value_get_list_type (a) !=
+		    gconf_value_get_list_type (b)) {
+			return FALSE;
+		}
+
+		node_a = gconf_value_get_list (a);
+		node_b = gconf_value_get_list (b);
+		
+		if (node_a == NULL && node_b == NULL) {
+			return TRUE;
+		}
+
+		if (g_slist_length (node_a) !=
+		    g_slist_length (node_b)) {
+			return FALSE;
+		}
+		
+		for (;
+		     node_a != NULL && node_b != NULL;
+		     node_a = node_a->next, node_b = node_b->next) {
+			g_assert (node_a->data != NULL);
+			g_assert (node_b->data != NULL);
+			if (!simple_value_is_equal (node_a->data, node_b->data)) {
+				return FALSE;
+			}
+		}
+		
+		return TRUE;
+	default:
+		/* FIXME: pair ? */
+		g_assert (0);
+	}
+	
+	g_assert_not_reached ();
+	return FALSE;
+}
+
+void
+eel_gconf_value_free (GConfValue *value)
+{
+	if (value == NULL) {
+		return;
+	}
+	
+	gconf_value_free (value);
+}
+
+guint
+eel_gconf_notification_add (const char *key,
+				 GConfClientNotifyFunc notification_callback,
+				 gpointer callback_data)
+{
+	guint notification_id;
+	GConfClient *client;
+	GError *error = NULL;
+	
+	g_return_val_if_fail (key != NULL, EEL_GCONF_UNDEFINED_CONNECTION);
+	g_return_val_if_fail (notification_callback != NULL, EEL_GCONF_UNDEFINED_CONNECTION);
+
+	client = eel_gconf_client_get_global ();
+	g_return_val_if_fail (client != NULL, EEL_GCONF_UNDEFINED_CONNECTION);
+	
+	notification_id = gconf_client_notify_add (client,
+						   key,
+						   notification_callback,
+						   callback_data,
+						   NULL,
+						   &error);
+	
+	if (eel_gconf_handle_error (&error)) {
+		if (notification_id != EEL_GCONF_UNDEFINED_CONNECTION) {
+			gconf_client_notify_remove (client, notification_id);
+			notification_id = EEL_GCONF_UNDEFINED_CONNECTION;
+		}
+	}
+	
+	return notification_id;
+}
+
+void
+eel_gconf_notification_remove (guint notification_id)
+{
+	GConfClient *client;
+
+	if (notification_id == EEL_GCONF_UNDEFINED_CONNECTION) {
+		return;
+	}
+	
+	client = eel_gconf_client_get_global ();
+	g_return_if_fail (client != NULL);
+
+	gconf_client_notify_remove (client, notification_id);
+}
+
+GSList *
+eel_gconf_value_get_string_list (const GConfValue *value)
+{
+ 	GSList *result;
+ 	const GSList *slist;
+ 	const GSList *node;
+	const char *string;
+	const GConfValue *next_value;
+
+	if (value == NULL) {
+		return NULL;
+	}
+
+	g_return_val_if_fail (value->type == GCONF_VALUE_LIST, NULL);
+	g_return_val_if_fail (gconf_value_get_list_type (value) == GCONF_VALUE_STRING, NULL);
+
+	slist = gconf_value_get_list (value);
+	result = NULL;
+	for (node = slist; node != NULL; node = node->next) {
+		next_value = node->data;
+		g_return_val_if_fail (next_value != NULL, NULL);
+		g_return_val_if_fail (next_value->type == GCONF_VALUE_STRING, NULL);
+		string = gconf_value_get_string (next_value);
+		result = g_slist_prepend (result, g_strdup (string));
+	}
+	return g_slist_reverse (result);
+}
+
+void
+eel_gconf_value_set_string_list (GConfValue *value,
+				 const GSList *string_list)
+{
+ 	const GSList *node;
+	GConfValue *next_value;
+ 	GSList *value_list;
+
+	g_return_if_fail (value->type == GCONF_VALUE_LIST);
+	g_return_if_fail (gconf_value_get_list_type (value) == GCONF_VALUE_STRING);
+
+	value_list = NULL;
+	for (node = string_list; node != NULL; node = node->next) {
+		next_value = gconf_value_new (GCONF_VALUE_STRING);
+		gconf_value_set_string (next_value, node->data);
+		value_list = g_slist_append (value_list, next_value);
+	}
+
+	gconf_value_set_list (value, value_list);
+
+	for (node = value_list; node != NULL; node = node->next) {
+		gconf_value_free (node->data);
+	}
+	g_slist_free (value_list);
+}
+
diff --git a/eel/eel-gconf-extensions.h b/eel/eel-gconf-extensions.h
new file mode 100644
index 000000000..c659ee0e9
--- /dev/null
+++ b/eel/eel-gconf-extensions.h
@@ -0,0 +1,73 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gconf-extensions.h - Stuff to make GConf easier to use.
+
+   Copyright (C) 2000, 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_GCONF_EXTENSIONS_H
+#define EEL_GCONF_EXTENSIONS_H
+
+#include <glib.h>
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+G_BEGIN_DECLS
+
+#define EEL_GCONF_UNDEFINED_CONNECTION 0
+
+GConfClient *eel_gconf_client_get_global     (void);
+gboolean     eel_gconf_handle_error          (GError                **error);
+void         eel_gconf_set_boolean           (const char             *key,
+					      gboolean                boolean_value);
+gboolean     eel_gconf_get_boolean           (const char             *key);
+int          eel_gconf_get_integer           (const char             *key);
+void         eel_gconf_set_integer           (const char             *key,
+					      int                     int_value);
+char *       eel_gconf_get_string            (const char             *key);
+void         eel_gconf_set_string            (const char             *key,
+					      const char             *string_value);
+GSList *     eel_gconf_get_string_list       (const char             *key);
+void         eel_gconf_set_string_list       (const char             *key,
+					      const GSList           *string_list_value);
+void         eel_gconf_unset                 (const char             *key);
+gboolean     eel_gconf_key_is_writable       (const char             *key);
+gboolean     eel_gconf_is_default            (const char             *key);
+gboolean     eel_gconf_monitor_add           (const char             *directory);
+gboolean     eel_gconf_monitor_remove        (const char             *directory);
+void         eel_gconf_preload_cache         (const char             *directory,
+					      GConfClientPreloadType  preload_type);
+void         eel_gconf_suggest_sync          (void);
+GConfValue*  eel_gconf_get_value             (const char             *key);
+GConfValue*  eel_gconf_get_default_value     (const char             *key);
+gboolean     eel_gconf_value_is_equal        (const GConfValue       *a,
+					      const GConfValue       *b);
+void         eel_gconf_value_free            (GConfValue             *value);
+guint        eel_gconf_notification_add      (const char             *key,
+					      GConfClientNotifyFunc   notification_callback,
+					      gpointer                callback_data);
+void         eel_gconf_notification_remove   (guint                   notification_id);
+GSList *     eel_gconf_value_get_string_list (const GConfValue       *value);
+void         eel_gconf_value_set_string_list (GConfValue             *value,
+					      const GSList           *string_list);
+
+G_END_DECLS
+
+#endif /* EEL_GCONF_EXTENSIONS_H */
diff --git a/eel/eel-gdk-extensions.c b/eel/eel-gdk-extensions.c
new file mode 100644
index 000000000..7e34be145
--- /dev/null
+++ b/eel/eel-gdk-extensions.c
@@ -0,0 +1,947 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gdk-extensions.c: Graphics routines to augment what's in gdk.
+
+   Copyright (C) 1999, 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>, 
+            Pavel Cisler <pavel@eazel.com>,
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-gdk-extensions.h"
+
+#include "eel-glib-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-string.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <stdlib.h>
+#include <pango/pango.h>
+
+#define GRADIENT_BAND_SIZE 4
+
+/**
+ * eel_gdk_rectangle_contains_rectangle:
+ * @outer: Rectangle possibly containing another rectangle.
+ * @inner: Rectangle that might be inside.
+ *
+ * Retun TRUE if inner rectangle is contained inside outer rectangle
+ */
+gboolean
+eel_gdk_rectangle_contains_rectangle (GdkRectangle outer, GdkRectangle inner)
+{
+	return outer.x <= inner.x && outer.x + outer.width >= inner.x + inner.width
+		&& outer.y <= inner.y && outer.y + outer.height >= inner.y + inner.height;
+}
+
+/**
+ * eel_interpolate_color:
+ * @ratio: Place on line between colors to interpolate.
+ * @start_color: Color for one end.
+ * @end_color: Color for the other end
+ * @interpolated_color: Result.
+ *
+ * Compute a color between @start_color and @end_color in color space.
+ * Currently, the color space used is RGB, but a future version could
+ * instead do the interpolation in the best color space for expressing
+ * human perception.
+ */
+guint32
+eel_interpolate_color (gdouble ratio,
+		       guint32 start_rgb,
+		       guint32 end_rgb)
+{
+	guchar red, green, blue;
+
+	g_return_val_if_fail (ratio >= 0.0, 0);
+	g_return_val_if_fail (ratio <= 1.0, 0);
+
+	red = ((start_rgb >> 16) & 0xFF) * (1.0 - ratio) + ((end_rgb >> 16) & 0xFF) * ratio;
+	green = ((start_rgb >> 8) & 0xFF) * (1.0 - ratio) + ((end_rgb >> 8) & 0xFF) * ratio;
+	blue = (start_rgb & 0xFF) * (1.0 - ratio) + (end_rgb & 0xFF) * ratio;
+	return (((red << 8) | green) << 8) | blue;
+}
+
+/**
+ * eel_gradient_new
+ * @start_color: Color for the top or left.
+ * @end_color: Color for the bottom or right.
+ * @is_horizontal: Direction of the gradient.
+ *
+ * Create a string that combines the start and end colors along
+ * with the direction of the gradient in a standard format.
+ */
+char *
+eel_gradient_new (const char *start_color,
+		       const char *end_color,
+		       gboolean is_horizontal)
+{
+	/* Handle the special case where the start and end colors are identical.
+	   Handle the special case where the end color is an empty string.
+	*/
+	if (eel_strcmp(start_color, end_color) == 0 || end_color == NULL || end_color[0] == '\0') {
+		return g_strdup (start_color);
+	}
+
+	/* Handle the special case where the start color is an empty string. */
+	if (start_color == NULL || start_color[0] == '\0') {
+		return g_strdup (end_color);
+	}
+	
+	/* Handle the general case. */
+	return g_strconcat (start_color, "-", end_color, is_horizontal ? ":h" : NULL, NULL);
+}
+
+/**
+ * eel_gradient_is_gradient
+ * @gradient_spec: A gradient spec. string.
+ *
+ * Return true if the spec. specifies a gradient instead of a solid color.
+ */
+gboolean
+eel_gradient_is_gradient (const char *gradient_spec)
+{
+	return eel_strchr (gradient_spec, '-') != NULL;
+}
+
+/**
+ * eel_gradient_is_horizontal
+ * @gradient_spec: A gradient spec. string.
+ *
+ * Return true if the spec. specifies a horizontal gradient.
+ */
+gboolean
+eel_gradient_is_horizontal (const char *gradient_spec)
+{
+	size_t length;
+
+	length = eel_strlen (gradient_spec);
+	return length >= 2 && gradient_spec[length - 2] == ':' && gradient_spec[length - 1] == 'h';
+}
+
+static char *
+eel_gradient_strip_trailing_direction_if_any (const char *gradient_spec)
+{
+	size_t length;
+
+	length = eel_strlen (gradient_spec);
+	if (length >= 2 && gradient_spec[length - 2] == ':'
+	    && (gradient_spec[length - 1] == 'v' || gradient_spec[length - 1] == 'h')) {
+		length -= 2;
+	}
+
+	return g_strndup (gradient_spec, length);
+}
+
+/* For parsing n-point gradients. Successive calls should pass the next_spec value
+ * set by the previous call as their first argument - to continue parsing where the
+ * previous call left off.
+ */
+char *
+eel_gradient_parse_one_color_spec (const char *spec, int *percent, const char **next_spec)
+{
+	char *result;
+	const char *rgb_end_ptr;
+	const char *percent_ptr;
+	const char *separator_ptr;
+	
+	percent_ptr   = eel_strchr (spec, '%');
+	separator_ptr = eel_strchr (spec, '-');
+
+	if (percent_ptr != NULL && (separator_ptr == NULL || percent_ptr < separator_ptr)) {
+		if (percent != NULL) {
+			*percent = (int) strtol (percent_ptr + 1, NULL, 10);
+		}
+		rgb_end_ptr = percent_ptr;
+	} else {
+		if (percent != NULL) {
+			*percent = 100;
+		}
+		rgb_end_ptr = separator_ptr;
+	}
+		
+	if (rgb_end_ptr != NULL) {
+		result = g_strndup (spec, rgb_end_ptr - spec);
+	} else {
+		result = eel_gradient_strip_trailing_direction_if_any (spec);
+	}
+
+	/* It's important not to use spec after setting *next_spec because it's
+	 * likely that *next_spec == spec. 
+	 */
+	if (next_spec != NULL) {
+		*next_spec = (separator_ptr != NULL) ? separator_ptr + 1 : NULL;
+	}
+
+	return result;
+}
+
+/* FIXME bugzilla.eazel.com 5076:
+ * anyone using eel_gradient_get_start_color_spec or
+ * eel_gradient_get_end_color_spec is assuming the gradient
+ * is 2 colors which is questionable.
+ * 
+ * Callers should be rewritten and these fns eliminated.
+ */
+ 
+/**
+ * eel_gradient_get_start_color_spec
+ * @gradient_spec: A gradient spec. string.
+ *
+ * Return the start color.
+ * This may be the entire gradient_spec if it's a solid color.
+ */
+char *
+eel_gradient_get_start_color_spec (const char *gradient_spec)
+{
+	return eel_gradient_parse_one_color_spec (gradient_spec, NULL, NULL);
+}
+
+/**
+ * eel_gradient_get_end_color_spec
+ * @gradient_spec: A gradient spec. string.
+ *
+ * Return the end color.
+ * This may be the entire gradient_spec if it's a solid color.
+ */
+char *
+eel_gradient_get_end_color_spec (const char *gradient_spec)
+{
+	char* color = NULL;
+
+	do {
+		g_free (color);
+		color = eel_gradient_parse_one_color_spec (gradient_spec, NULL, &gradient_spec);
+	} while (gradient_spec != NULL);
+
+	return color;
+}
+
+/* Do the work shared by all the set_color_spec functions below. */
+static char *
+eel_gradient_set_edge_color (const char *gradient_spec,
+				  const char *edge_color,
+				  gboolean is_horizontal,
+				  gboolean change_end)
+{
+	char *opposite_color;
+	char *result;
+
+	g_assert (edge_color != NULL);
+
+	/* Get the color from the existing gradient spec. for the opposite
+	   edge. This will parse away all the stuff we don't want from the
+	   old gradient spec.
+	*/
+	opposite_color = change_end
+		? eel_gradient_get_start_color_spec (gradient_spec)
+		: eel_gradient_get_end_color_spec (gradient_spec);
+
+	/* Create a new gradient spec. The eel_gradient_new function handles
+	   some special cases, so we don't have to bother with them here.
+	*/
+	result = eel_gradient_new (change_end ? opposite_color : edge_color,
+					change_end ? edge_color : opposite_color,
+					is_horizontal);
+
+	g_free (opposite_color);
+
+	return result;
+}
+
+/**
+ * eel_gradient_set_left_color_spec
+ * @gradient_spec: A gradient spec. string.
+ * @left_color: Color spec. to replace left color with.
+ *
+ * Changes the left color to what's passed in.
+ * This creates a horizontal gradient.
+ */
+char *
+eel_gradient_set_left_color_spec (const char *gradient_spec,
+				       const char *left_color)
+{
+	g_return_val_if_fail (gradient_spec != NULL, NULL);
+	g_return_val_if_fail (left_color != NULL, NULL);
+
+	return eel_gradient_set_edge_color (gradient_spec, left_color, TRUE, FALSE);
+}
+
+/**
+ * eel_gradient_set_top_color_spec
+ * @gradient_spec: A gradient spec. string.
+ * @top_color: Color spec. to replace top color with.
+ *
+ * Changes the top color to what's passed in.
+ * This creates a vertical gradient.
+ */
+char *
+eel_gradient_set_top_color_spec (const char *gradient_spec,
+				      const char *top_color)
+{
+	g_return_val_if_fail (gradient_spec != NULL, NULL);
+	g_return_val_if_fail (top_color != NULL, NULL);
+
+	return eel_gradient_set_edge_color (gradient_spec, top_color, FALSE, FALSE);
+}
+
+/**
+ * eel_gradient_set_right_color_spec
+ * @gradient_spec: A gradient spec. string.
+ * @right_color: Color spec. to replace right color with.
+ *
+ * Changes the right color to what's passed in.
+ * This creates a horizontal gradient.
+ */
+char *
+eel_gradient_set_right_color_spec (const char *gradient_spec,
+					const char *right_color)
+{
+	g_return_val_if_fail (gradient_spec != NULL, NULL);
+	g_return_val_if_fail (right_color != NULL, NULL);
+
+	return eel_gradient_set_edge_color (gradient_spec, right_color, TRUE, TRUE);
+}
+
+/**
+ * eel_gradient_set_bottom_color_spec
+ * @gradient_spec: A gradient spec. string.
+ * @bottom_color: Color spec. to replace bottom color with.
+ *
+ * Changes the bottom color to what's passed in.
+ * This creates a vertical gradient.
+ */
+char *
+eel_gradient_set_bottom_color_spec (const char *gradient_spec,
+					 const char *bottom_color)
+{
+	g_return_val_if_fail (gradient_spec != NULL, NULL);
+	g_return_val_if_fail (bottom_color != NULL, NULL);
+
+	return eel_gradient_set_edge_color (gradient_spec, bottom_color, FALSE, TRUE);
+}
+
+/**
+ * eel_gdk_color_parse_with_white_default
+ * @color_spec: A color spec, or NULL.
+ * @color: Pointer to place to put resulting color.
+ *
+ * The same as gdk_color_parse, except sets the color to white if
+ * the spec. can't be parsed, instead of returning a boolean flag.
+ */
+void
+eel_gdk_color_parse_with_white_default (const char *color_spec,
+					GdkColor *color)
+{
+	gboolean got_color;
+
+	g_return_if_fail (color != NULL);
+
+	got_color = FALSE;
+	if (color_spec != NULL) {
+		if (gdk_color_parse (color_spec, color)) {
+			got_color = TRUE;
+		}
+	}
+
+	if (!got_color) {
+		color->red = 0xFFFF;
+		color->green = 0xFFFF;
+		color->blue = 0xFFFF;
+	}
+}
+
+/**
+ * eel_parse_rgb_with_white_default
+ * @color_spec: A color spec, or NULL.
+ * Returns: An rgb value.
+ *
+ * The same as gdk_color_parse, except sets the color to white if
+ * the spec. can't be parsed instead of returning a boolean flag
+ * and returns a guint32 rgb value instead of a GdkColor.
+ */
+guint32
+eel_parse_rgb_with_white_default (const char *color_spec)
+{
+	GdkColor color;
+
+	eel_gdk_color_parse_with_white_default (color_spec, &color);
+	return ((color.red << 8) & EEL_RGB_COLOR_RED)
+		| (color.green & EEL_RGB_COLOR_GREEN)
+		| ((color.blue >> 8) & EEL_RGB_COLOR_BLUE);
+}
+
+guint32
+eel_rgb16_to_rgb (gushort r, gushort g, gushort b)
+{
+	guint32 result;
+
+	result = (0xff0000 | (r & 0xff00));
+	result <<= 8;
+	result |= ((g & 0xff00) | (b >> 8));
+
+	return result;
+}
+
+guint32
+eel_rgb8_to_rgb (guchar r, guchar g, guchar b)
+{
+	return eel_rgb16_to_rgb (r << 8, g << 8, b << 8);
+}
+
+/**
+ * eel_gdk_color_to_rgb
+ * @color: A GdkColor style color.
+ * Returns: An rgb value.
+ *
+ * Converts from a GdkColor stlye color to a gdk_rgb one.
+ * Alpha gets set to fully opaque
+ */
+guint32
+eel_gdk_color_to_rgb (const GdkColor *color)
+{
+	return eel_rgb16_to_rgb (color->red, color->green, color->blue);
+}
+
+/**
+ * eel_gdk_rgb_to_color
+ * @color: a gdk_rgb style value.
+ *
+ * Converts from a gdk_rgb value style to a GdkColor one.
+ * The gdk_rgb color alpha channel is ignored.
+ * 
+ * Return value: A GdkColor structure version of the given RGB color.
+ */
+GdkColor
+eel_gdk_rgb_to_color (guint32 color)
+{
+	GdkColor result;
+
+	result.red = ((color >> 16) & 0xFF) * 0x101;
+	result.green = ((color >> 8) & 0xFF) * 0x101;
+	result.blue = (color & 0xff) * 0x101;
+	result.pixel = 0;
+
+	return result;
+}
+
+/**
+ * eel_gdk_rgb_to_color_spec
+ * @color: a gdk_rgb style value.
+ *
+ * Converts from a gdk_rgb value style to a string color spec.
+ * The gdk_rgb color alpha channel is ignored.
+ * 
+ * Return value: a newly allocated color spec.
+ */
+char *
+eel_gdk_rgb_to_color_spec (const guint32 color)
+{
+	return g_strdup_printf ("#%06X", (guint) (color & 0xFFFFFF));
+}
+
+static guint32
+eel_shift_color_component (guchar component, float shift_by)
+{
+	guint32 result;
+	if (shift_by > 1.0) {
+		result = component * (2 - shift_by);
+	} else {
+		result = 0xff - shift_by * (0xff - component);
+	}
+
+	return result & 0xff;
+}
+
+/**
+ * eel_rgb_shift_color
+ * @color: A color.
+ * @shift_by: darken or lighten factor.
+ * Returns: An darkened or lightened rgb value.
+ *
+ * Darkens (@shift_by > 1) or lightens (@shift_by < 1)
+ * @color.
+ */
+guint32
+eel_rgb_shift_color (guint32 color, float shift_by)
+{
+	guint32 result;
+
+	/* shift red by shift_by */
+	result = eel_shift_color_component((color & 0x00ff0000) >> 16, shift_by);
+	result <<= 8;
+	/* shift green by shift_by */
+	result |=  eel_shift_color_component((color & 0x0000ff00) >> 8, shift_by);
+	result <<= 8;
+	/* shift blue by shift_by */
+	result |=  eel_shift_color_component((color & 0x000000ff), shift_by);
+
+	/* alpha doesn't change */
+	result |= (0xff000000 & color);
+
+	return result;
+}
+
+/**
+ * eel_gdk_color_is_dark:
+ * 
+ * Return true if the given color is `dark'
+ */
+gboolean
+eel_gdk_color_is_dark (GdkColor *color)
+{
+	int intensity;
+
+	intensity = (((color->red >> 8) * 77)
+		     + ((color->green >> 8) * 150)
+		     + ((color->blue >> 8) * 28)) >> 8;
+
+	return intensity < 128;
+}
+
+/**
+ * eel_stipple_bitmap_for_screen:
+ * 
+ * Get pointer to 50% stippled bitmap suitable for use
+ * on @screen. This is a global object; do not free.
+ */
+GdkBitmap *
+eel_stipple_bitmap_for_screen (GdkScreen *screen)
+{
+	static char       stipple_bits[] = { 0x02, 0x01 };
+	static GPtrArray *stipples = NULL;
+	int screen_num, n_screens, i;
+
+	if (stipples == NULL) {
+		n_screens = gdk_display_get_n_screens (
+					gdk_screen_get_display (screen));
+		stipples = g_ptr_array_sized_new (n_screens);
+
+		for (i = 0; i < n_screens; i++) {
+			g_ptr_array_index (stipples, i) = NULL;
+		}
+	}
+
+	screen_num = gdk_screen_get_number (screen);
+
+	if (g_ptr_array_index (stipples, screen_num) == NULL) {
+		g_ptr_array_index (stipples, screen_num) =
+			gdk_bitmap_create_from_data (
+				gdk_screen_get_root_window (screen),
+				stipple_bits, 2, 2);
+	}
+
+	return g_ptr_array_index (stipples, screen_num);
+}
+
+/**
+ * eel_stipple_bitmap:
+ *
+ * Get pointer to 50% stippled bitmap suitable for use
+ * on the default screen. This is a global object; do
+ * not free.
+ *
+ * This method is not multiscreen safe. Do not use it.
+ */
+GdkBitmap *
+eel_stipple_bitmap (void)
+{
+	return eel_stipple_bitmap_for_screen (gdk_screen_get_default ());
+}
+
+/**
+ * eel_gdk_window_bring_to_front:
+ * 
+ * Raise window and give it focus.
+ */
+void 
+eel_gdk_window_bring_to_front (GdkWindow *window)
+{
+	/* This takes care of un-iconifying the window and
+	 * raising it if needed.
+	 */
+	gdk_window_show (window);
+
+	/* If the window was already showing, it would not have
+	 * the focus at this point. Do a little X trickery to
+	 * ensure it is focused.
+	 */
+	eel_gdk_window_focus (window, GDK_CURRENT_TIME);
+}
+
+void
+eel_gdk_window_focus (GdkWindow *window, guint32 timestamp)
+{
+	gdk_error_trap_push ();
+	XSetInputFocus (GDK_DISPLAY (),
+			GDK_WINDOW_XWINDOW (window),
+			RevertToParent,
+			timestamp);
+	gdk_flush();
+	gdk_error_trap_pop ();
+}
+
+void
+eel_gdk_window_set_wm_protocols (GdkWindow *window,
+				 GdkAtom *protocols,
+				 int nprotocols)
+{
+	Atom *atoms;
+	int i;
+
+	atoms = g_new (Atom, nprotocols);
+	for (i = 0; i < nprotocols; i++) {
+		atoms[i] = gdk_x11_atom_to_xatom (protocols[i]);
+	}
+
+	XSetWMProtocols (GDK_WINDOW_XDISPLAY (window),
+			 GDK_WINDOW_XWINDOW (window),
+			 atoms, nprotocols);
+
+	g_free (atoms);
+}
+
+/**
+ * eel_gdk_window_set_wm_hints_input:
+ * 
+ * Set the WM_HINTS.input flag to the passed in value
+ */
+void
+eel_gdk_window_set_wm_hints_input (GdkWindow *window, gboolean status)
+{
+	Display *dpy;
+	Window id;
+	XWMHints *wm_hints;
+
+	g_return_if_fail (window != NULL);
+
+	dpy = GDK_WINDOW_XDISPLAY (window);
+	id = GDK_WINDOW_XWINDOW (window);
+
+	wm_hints = XGetWMHints (dpy, id);
+	if (wm_hints == 0) {
+		wm_hints = XAllocWMHints ();
+	}
+
+	wm_hints->flags |= InputHint;
+	wm_hints->input = (status == FALSE) ? False : True;
+
+	XSetWMHints (dpy, id, wm_hints);
+	XFree (wm_hints);
+}
+
+void
+eel_gdk_window_set_invisible_cursor (GdkWindow *window)
+{
+	GdkBitmap *empty_bitmap;
+	GdkCursor *cursor;
+	GdkColor useless;
+	char invisible_cursor_bits[] = { 0x0 };	
+	
+	useless.red = useless.green = useless.blue = 0;
+	useless.pixel = 0;
+	
+	empty_bitmap = gdk_bitmap_create_from_data (window,
+						    invisible_cursor_bits,
+						    1, 1);
+	
+	cursor = gdk_cursor_new_from_pixmap (empty_bitmap,
+					     empty_bitmap,
+					     &useless,
+					     &useless, 0, 0);
+
+	gdk_window_set_cursor (window, cursor);
+
+	gdk_cursor_unref (cursor);
+
+	g_object_unref (empty_bitmap);
+}
+
+EelGdkGeometryFlags
+eel_gdk_parse_geometry (const char *string, int *x_return, int *y_return,
+			     guint *width_return, guint *height_return)
+{
+	int x11_flags;
+	EelGdkGeometryFlags gdk_flags;
+
+	g_return_val_if_fail (string != NULL, EEL_GDK_NO_VALUE);
+	g_return_val_if_fail (x_return != NULL, EEL_GDK_NO_VALUE);
+	g_return_val_if_fail (y_return != NULL, EEL_GDK_NO_VALUE);
+	g_return_val_if_fail (width_return != NULL, EEL_GDK_NO_VALUE);
+	g_return_val_if_fail (height_return != NULL, EEL_GDK_NO_VALUE);
+
+	x11_flags = XParseGeometry (string, x_return, y_return,
+				    width_return, height_return);
+
+	gdk_flags = EEL_GDK_NO_VALUE;
+	if (x11_flags & XValue) {
+		gdk_flags |= EEL_GDK_X_VALUE;
+	}
+	if (x11_flags & YValue) {
+		gdk_flags |= EEL_GDK_Y_VALUE;
+	}
+	if (x11_flags & WidthValue) {
+		gdk_flags |= EEL_GDK_WIDTH_VALUE;
+	}
+	if (x11_flags & HeightValue) {
+		gdk_flags |= EEL_GDK_HEIGHT_VALUE;
+	}
+	if (x11_flags & XNegative) {
+		gdk_flags |= EEL_GDK_X_NEGATIVE;
+	}
+	if (x11_flags & YNegative) {
+		gdk_flags |= EEL_GDK_Y_NEGATIVE;
+	}
+
+	return gdk_flags;
+}
+
+void
+eel_gdk_draw_layout_with_drop_shadow (GdkDrawable         *drawable,
+				      GdkGC               *gc,
+				      GdkColor            *text_color,
+				      GdkColor            *shadow_color,
+				      int                  x,
+				      int                  y,
+				      PangoLayout         *layout)
+{
+	gdk_draw_layout_with_colors (drawable, gc,
+				     x+1, y+1,
+				     layout,
+				     shadow_color, NULL);
+	
+	gdk_draw_layout_with_colors (drawable, gc,
+				     x, y,
+				     layout,
+				     text_color, NULL);
+}
+
+#if ! defined (EEL_OMIT_SELF_CHECK)
+
+static char *
+eel_gdk_color_as_hex_string (GdkColor color)
+{
+	return g_strdup_printf ("%04X%04X%04X",
+				color.red, color.green, color.blue);
+}
+
+static char *
+eel_self_check_parse (const char *color_spec)
+{
+	GdkColor color;
+
+	eel_gdk_color_parse_with_white_default (color_spec, &color);
+	return eel_gdk_color_as_hex_string (color);
+}
+
+static char *
+eel_self_check_gdk_rgb_to_color (guint32 color)
+{
+	GdkColor result;
+
+	result = eel_gdk_rgb_to_color (color);
+
+	return eel_gdk_color_as_hex_string (result);
+}
+
+void
+eel_self_check_gdk_extensions (void)
+{
+	/* eel_interpolate_color */
+	EEL_CHECK_INTEGER_RESULT (eel_interpolate_color (0.0, 0, 0), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_interpolate_color (0.0, 0, 0xFFFFFF), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_interpolate_color (0.5, 0, 0xFFFFFF), 0x7F7F7F);
+	EEL_CHECK_INTEGER_RESULT (eel_interpolate_color (1.0, 0, 0xFFFFFF), 0xFFFFFF);
+
+	/* eel_fill_rectangle */
+	/* Make a GdkImage and fill it, maybe? */
+
+	/* eel_fill_rectangle_with_color */
+
+	/* eel_fill_rectangle_with_gradient */
+
+	/* eel_gradient_new */
+	EEL_CHECK_STRING_RESULT (eel_gradient_new ("", "", FALSE), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_new ("a", "b", FALSE), "a-b");
+	EEL_CHECK_STRING_RESULT (eel_gradient_new ("a", "b", TRUE), "a-b:h");
+	EEL_CHECK_STRING_RESULT (eel_gradient_new ("a", "a", FALSE), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_new ("a", "a", TRUE), "a");
+
+	/* eel_gradient_is_gradient */
+	EEL_CHECK_BOOLEAN_RESULT (eel_gradient_is_gradient (""), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_gradient_is_gradient ("-"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_gradient_is_gradient ("a"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_gradient_is_gradient ("a-b"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_gradient_is_gradient ("a-b:h"), TRUE);
+
+	/* eel_gradient_get_start_color_spec */
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec (""), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("-"), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a-b"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a-"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("-b"), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a:h"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a:v"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a:c"), "a:c");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a:-b"), "a:");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_start_color_spec ("a:-b:v"), "a:");
+
+	/* eel_gradient_get_end_color_spec */
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec (""), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("-"), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a-b"), "b");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a-"), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("-b"), "b");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a:h"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a:v"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a:c"), "a:c");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a:-b"), "b");
+	EEL_CHECK_STRING_RESULT (eel_gradient_get_end_color_spec ("a:-b:v"), "b");
+
+	/* eel_gradient_set_left_color_spec */
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("", ""), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("a", ""), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("a", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("a", "b"), "b-a:h");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("a-c:v", "b"), "b-c:h");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("a-c:v", "c"), "c");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_left_color_spec ("a:-b:v", "d"), "d-b:h");
+
+	/* eel_gradient_set_top_color_spec */
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("", ""), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("a", ""), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("a", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("a", "b"), "b-a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("a-c:v", "b"), "b-c");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("a-c:v", "c"), "c");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_top_color_spec ("a:-b:h", "d"), "d-b");
+
+	/* eel_gradient_set_right_color_spec */
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("", ""), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("a", ""), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("a", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("a", "b"), "a-b:h");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("a-c:v", "b"), "a-b:h");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("a-c:v", "c"), "a-c:h");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_right_color_spec ("a:-b:v", "d"), "a:-d:h");
+
+	/* eel_gradient_set_bottom_color_spec */
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("", ""), "");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("a", ""), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("a", "a"), "a");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("a", "b"), "a-b");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("a-c:v", "b"), "a-b");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("a-c:v", "c"), "a-c");
+	EEL_CHECK_STRING_RESULT (eel_gradient_set_bottom_color_spec ("a:-b:h", "d"), "a:-d");
+
+	/* eel_gdk_color_parse_with_white_default */
+	EEL_CHECK_STRING_RESULT (eel_self_check_parse (""), "FFFFFFFFFFFF");
+	EEL_CHECK_STRING_RESULT (eel_self_check_parse ("a"), "FFFFFFFFFFFF");
+	EEL_CHECK_STRING_RESULT (eel_self_check_parse ("white"), "FFFFFFFFFFFF");
+	EEL_CHECK_STRING_RESULT (eel_self_check_parse ("black"), "000000000000");
+	EEL_CHECK_STRING_RESULT (eel_self_check_parse ("red"), "FFFF00000000");
+	EEL_CHECK_STRING_RESULT (eel_self_check_parse ("#012345"), "010123234545");
+	/* EEL_CHECK_STRING_RESULT (eel_self_check_parse ("rgb:0123/4567/89AB"), "#014589"); */
+
+	/* eel_gdk_rgb_to_color */
+	EEL_CHECK_STRING_RESULT (eel_self_check_gdk_rgb_to_color (EEL_RGB_COLOR_RED), "FFFF00000000");
+	EEL_CHECK_STRING_RESULT (eel_self_check_gdk_rgb_to_color (EEL_RGB_COLOR_BLACK), "000000000000");
+	EEL_CHECK_STRING_RESULT (eel_self_check_gdk_rgb_to_color (EEL_RGB_COLOR_WHITE), "FFFFFFFFFFFF");
+	EEL_CHECK_STRING_RESULT (eel_self_check_gdk_rgb_to_color (EEL_RGB_COLOR_PACK (0x01, 0x23, 0x45)), "010123234545");
+	
+	/* EEL_RGBA_COLOR_PACK */
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0xFF, 0x00, 0x00, 00), EEL_RGB_COLOR_RED);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0x00, 0xFF, 0x00, 00), EEL_RGB_COLOR_GREEN);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0x00, 0x00, 0xFF, 00), EEL_RGB_COLOR_BLUE);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 00), EEL_RGB_COLOR_WHITE);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 00), EEL_RGB_COLOR_BLACK);
+
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0xFF, 0x00, 0x00, 0xFF), EEL_RGBA_COLOR_OPAQUE_RED);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0x00, 0xFF, 0x00, 0xFF), EEL_RGBA_COLOR_OPAQUE_GREEN);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0x00, 0x00, 0xFF, 0xFF), EEL_RGBA_COLOR_OPAQUE_BLUE);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 0xFF), EEL_RGBA_COLOR_OPAQUE_WHITE);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 0xFF), EEL_RGBA_COLOR_OPAQUE_BLACK);
+
+	/* EEL_RGB_COLOR_PACK */
+	EEL_CHECK_INTEGER_RESULT (EEL_RGB_COLOR_PACK (0xFF, 0x00, 0x00), EEL_RGBA_COLOR_OPAQUE_RED);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGB_COLOR_PACK (0x00, 0xFF, 0x00), EEL_RGBA_COLOR_OPAQUE_GREEN);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGB_COLOR_PACK (0x00, 0x00, 0xFF), EEL_RGBA_COLOR_OPAQUE_BLUE);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGB_COLOR_PACK (0xFF, 0xFF, 0xFF), EEL_RGBA_COLOR_OPAQUE_WHITE);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGB_COLOR_PACK (0x00, 0x00, 0x00), EEL_RGBA_COLOR_OPAQUE_BLACK);
+
+	/* EEL_RGBA_COLOR_GET_R */
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGBA_COLOR_OPAQUE_RED), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGBA_COLOR_OPAQUE_GREEN), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGBA_COLOR_OPAQUE_BLUE), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGBA_COLOR_OPAQUE_WHITE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGBA_COLOR_OPAQUE_BLACK), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGB_COLOR_RED), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGB_COLOR_GREEN), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGB_COLOR_BLUE), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGB_COLOR_WHITE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_R (EEL_RGB_COLOR_BLACK), 0x00);
+
+	/* EEL_RGBA_COLOR_GET_G */
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGBA_COLOR_OPAQUE_RED), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGBA_COLOR_OPAQUE_GREEN), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGBA_COLOR_OPAQUE_BLUE), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGBA_COLOR_OPAQUE_WHITE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGBA_COLOR_OPAQUE_BLACK), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGB_COLOR_RED), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGB_COLOR_GREEN), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGB_COLOR_BLUE), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGB_COLOR_WHITE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_G (EEL_RGB_COLOR_BLACK), 0x00);
+
+	/* EEL_RGBA_COLOR_GET_B */
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGBA_COLOR_OPAQUE_RED), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGBA_COLOR_OPAQUE_GREEN), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGBA_COLOR_OPAQUE_BLUE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGBA_COLOR_OPAQUE_WHITE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGBA_COLOR_OPAQUE_BLACK), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGB_COLOR_RED), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGB_COLOR_GREEN), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGB_COLOR_BLUE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGB_COLOR_WHITE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_B (EEL_RGB_COLOR_BLACK), 0x00);
+
+	/* EEL_RGBA_COLOR_GET_A */
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGBA_COLOR_OPAQUE_RED), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGBA_COLOR_OPAQUE_GREEN), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGBA_COLOR_OPAQUE_BLUE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGBA_COLOR_OPAQUE_WHITE), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGBA_COLOR_OPAQUE_BLACK), 0xFF);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGB_COLOR_RED), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGB_COLOR_GREEN), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGB_COLOR_BLUE), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGB_COLOR_WHITE), 0x00);
+	EEL_CHECK_INTEGER_RESULT (EEL_RGBA_COLOR_GET_A (EEL_RGB_COLOR_BLACK), 0x00);
+
+}
+
+#endif /* ! EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h
new file mode 100644
index 000000000..9df8d0442
--- /dev/null
+++ b/eel/eel-gdk-extensions.h
@@ -0,0 +1,163 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gdk-extensions.h: Graphics routines to augment what's in gdk.
+
+   Copyright (C) 1999, 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>,
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_GDK_EXTENSIONS_H
+#define EEL_GDK_EXTENSIONS_H
+
+#include <gdk/gdk.h>
+
+#define EEL_RGB_COLOR_RED	0xFF0000
+#define EEL_RGB_COLOR_GREEN	0x00FF00
+#define EEL_RGB_COLOR_BLUE	0x0000FF
+#define EEL_RGB_COLOR_WHITE	0xFFFFFF
+#define EEL_RGB_COLOR_BLACK	0x000000
+
+#define EEL_RGBA_COLOR_OPAQUE_RED	0xFFFF0000
+#define EEL_RGBA_COLOR_OPAQUE_GREEN	0xFF00FF00
+#define EEL_RGBA_COLOR_OPAQUE_BLUE	0xFF0000FF
+#define EEL_RGBA_COLOR_OPAQUE_WHITE	0xFFFFFFFF
+#define EEL_RGBA_COLOR_OPAQUE_BLACK	0xFF000000
+
+/* Pack RGBA values into 32 bits */
+#define EEL_RGBA_COLOR_PACK(r, g, b, a)		\
+( (((guint32)a) << 24) |			\
+  (((guint32)r) << 16) |			\
+  (((guint32)g) <<  8) |			\
+  (((guint32)b) <<  0) )
+
+/* Pack opaque RGBA values into 32 bits */
+#define EEL_RGB_COLOR_PACK(r, g, b)		\
+EEL_RGBA_COLOR_PACK((r), (g), (b), 0xFF)
+
+/* Access the individual RGBA components */
+#define EEL_RGBA_COLOR_GET_R(color) (((color) >> 16) & 0xff)
+#define EEL_RGBA_COLOR_GET_G(color) (((color) >> 8) & 0xff)
+#define EEL_RGBA_COLOR_GET_B(color) (((color) >> 0) & 0xff)
+#define EEL_RGBA_COLOR_GET_A(color) (((color) >> 24) & 0xff)
+
+/* Bits returned by eel_gdk_parse_geometry */
+typedef enum {
+	EEL_GDK_NO_VALUE     = 0x00,
+	EEL_GDK_X_VALUE      = 0x01,
+	EEL_GDK_Y_VALUE      = 0x02,
+	EEL_GDK_WIDTH_VALUE  = 0x04,
+	EEL_GDK_HEIGHT_VALUE = 0x08,
+	EEL_GDK_ALL_VALUES   = 0x0f,
+	EEL_GDK_X_NEGATIVE   = 0x10,
+	EEL_GDK_Y_NEGATIVE   = 0x20
+} EelGdkGeometryFlags;
+
+/* A gradient spec. is a string that contains a specifier for either a
+   color or a gradient. If the string has a "-" in it, then it's a gradient.
+   The gradient is vertical by default and the spec. can end with ":v" to indicate that.
+   If the gradient ends with ":h", the gradient is horizontal.
+*/
+char *              eel_gradient_new                       (const char          *start_color,
+							    const char          *end_color,
+							    gboolean             is_horizontal);
+char *              eel_gradient_parse_one_color_spec      (const char          *spec,
+							    int                 *percent,
+							    const char         **next_spec);
+gboolean            eel_gradient_is_gradient               (const char          *gradient_spec);
+char *              eel_gradient_get_start_color_spec      (const char          *gradient_spec);
+char *              eel_gradient_get_end_color_spec        (const char          *gradient_spec);
+gboolean            eel_gradient_is_horizontal             (const char          *gradient_spec);
+char *              eel_gradient_set_left_color_spec       (const char          *gradient_spec,
+							    const char          *left_color);
+char *              eel_gradient_set_top_color_spec        (const char          *gradient_spec,
+							    const char          *top_color);
+char *              eel_gradient_set_right_color_spec      (const char          *gradient_spec,
+							    const char          *right_color);
+char *              eel_gradient_set_bottom_color_spec     (const char          *gradient_spec,
+							    const char          *bottom_color);
+
+
+/* A version of parse_color that substitutes a default color instead of returning
+   a boolean to indicate it cannot be parsed.
+*/
+void                eel_gdk_color_parse_with_default       (const char          *color_spec,
+							    const GdkColor      *default_color,
+							    GdkColor            *parsed_color);
+void                eel_gdk_color_parse_with_white_default (const char          *color_spec,
+							    GdkColor            *parsed_color);
+guint32             eel_parse_rgb_with_default             (const char          *color_spec,
+							    guint32              default_rgb);
+guint32             eel_parse_rgb_with_white_default       (const char          *color_spec);
+guint32             eel_rgb_shift_color                    (guint32              color,
+							    float                shift_by);
+guint32             eel_rgb16_to_rgb                       (gushort              r,
+							    gushort              g,
+							    gushort              b);
+guint32             eel_rgb8_to_rgb                        (guchar               r,
+							    guchar               g,
+							    guchar               b);
+guint32             eel_gdk_color_to_rgb                   (const GdkColor      *color);
+GdkColor            eel_gdk_rgb_to_color                   (guint32              color);
+char *              eel_gdk_rgb_to_color_spec              (guint32              color);
+
+gboolean            eel_gdk_color_is_dark                  (GdkColor            *color);
+
+/* A routine to get a 50% gray stippled bitmap for use in some types of highlighting. */
+GdkBitmap *         eel_stipple_bitmap_for_screen          (GdkScreen *screen);
+GdkBitmap *         eel_stipple_bitmap                     (void);
+
+
+/* Misc GdkRectangle helper functions */
+gboolean            eel_gdk_rectangle_contains_rectangle   (GdkRectangle         outer,
+							    GdkRectangle         inner);
+
+
+/* A basic operation we use for drawing gradients is interpolating two colors.*/
+guint32             eel_interpolate_color                  (gdouble              ratio,
+							    guint32              start_rgb,
+							    guint32              end_rgb);
+
+/* Misc GdkWindow helper functions */
+void                eel_gdk_window_bring_to_front          (GdkWindow           *window);
+void                eel_gdk_window_set_invisible_cursor    (GdkWindow           *window);
+void                eel_gdk_window_focus                   (GdkWindow           *window,
+							    guint32              timestamp);
+void                eel_gdk_window_set_wm_protocols        (GdkWindow           *window,
+							    GdkAtom             *protocols,
+							    int                  nprotocols);
+
+
+void                eel_gdk_window_set_wm_hints_input      (GdkWindow           *w,
+							    gboolean             status);
+
+/* Wrapper for XParseGeometry */
+EelGdkGeometryFlags eel_gdk_parse_geometry                 (const char          *string,
+							    int                 *x_return,
+							    int                 *y_return,
+							    guint               *width_return,
+							    guint               *height_return);
+void                eel_gdk_draw_layout_with_drop_shadow   (GdkDrawable         *drawable,
+							    GdkGC               *gc,
+							    GdkColor            *text_color,
+							    GdkColor            *shadow_color,
+							    int                  x,
+							    int                  y,
+							    PangoLayout         *layout);
+#endif /* EEL_GDK_EXTENSIONS_H */
diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c
new file mode 100644
index 000000000..9f7dd665c
--- /dev/null
+++ b/eel/eel-gdk-pixbuf-extensions.c
@@ -0,0 +1,1305 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gdk-pixbuf-extensions.c: Routines to augment what's in gdk-pixbuf.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-gdk-pixbuf-extensions.h"
+
+#include "eel-art-gtk-extensions.h"
+#include "eel-debug-drawing.h"
+#include "eel-debug.h"
+#include "eel-gdk-extensions.h"
+#include "eel-glib-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-string.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
+#include <gio/gio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define LOAD_BUFFER_SIZE 65536
+
+const EelIRect eel_gdk_pixbuf_whole_pixbuf = { G_MININT, G_MININT, G_MAXINT, G_MAXINT };
+
+struct EelPixbufLoadHandle {
+	GCancellable *cancellable;
+	GInputStream *stream;
+	EelPixbufLoadCallback callback;
+	gpointer callback_data;
+	GdkPixbufLoader *loader;
+	char buffer[LOAD_BUFFER_SIZE];
+};
+
+/**
+ * eel_gdk_pixbuf_list_ref
+ * @pixbuf_list: A list of GdkPixbuf objects.
+ *
+ * Refs all the pixbufs.
+ **/
+void
+eel_gdk_pixbuf_list_ref (GList *pixbuf_list)
+{
+	g_list_foreach (pixbuf_list, (GFunc) g_object_ref, NULL);
+}
+
+/**
+ * eel_gdk_pixbuf_list_free
+ * @pixbuf_list: A list of GdkPixbuf objects.
+ *
+ * Unrefs all the pixbufs, then frees the list.
+ **/
+void
+eel_gdk_pixbuf_list_free (GList *pixbuf_list)
+{
+	eel_g_list_free_deep_custom (pixbuf_list, (GFunc) g_object_unref, NULL);
+}
+
+GdkPixbuf *
+eel_gdk_pixbuf_load (const char *uri)
+{
+	GdkPixbuf *pixbuf;
+	GFile *file;
+	GFileInputStream *stream;
+
+	g_return_val_if_fail (uri != NULL, NULL);
+
+	file = g_file_new_for_uri (uri);
+
+	stream = g_file_read (file, NULL, NULL);
+	
+	g_object_unref (file);
+	
+	if (stream == NULL) {
+		return NULL;
+	}
+
+	pixbuf = eel_gdk_pixbuf_load_from_stream (G_INPUT_STREAM (stream));
+
+	g_object_unref (stream);
+		
+	return pixbuf;
+}
+
+GdkPixbuf *
+eel_gdk_pixbuf_load_from_stream (GInputStream  *stream)
+{
+	return eel_gdk_pixbuf_load_from_stream_at_size (stream, -1);
+}
+
+static void
+pixbuf_loader_size_prepared (GdkPixbufLoader *loader,
+			     int              width,
+			     int              height,
+			     gpointer         desired_size_ptr)
+{
+	int size, desired_size;
+	float scale;
+
+	size = MAX (width, height);
+	desired_size = GPOINTER_TO_INT (desired_size_ptr);
+
+	if (size != desired_size) {
+		scale = (float) desired_size / size;
+		gdk_pixbuf_loader_set_size (loader,
+					    floor (scale * width + 0.5),
+					    floor (scale * height + 0.5));
+	}
+}
+
+GdkPixbuf *
+eel_gdk_pixbuf_load_from_stream_at_size (GInputStream  *stream,
+					 int            size)
+{
+	char buffer[LOAD_BUFFER_SIZE];
+	gssize bytes_read;
+	GdkPixbufLoader *loader;
+	GdkPixbuf *pixbuf;
+	gboolean got_eos;
+	
+
+	g_return_val_if_fail (stream != NULL, NULL);
+
+	got_eos = FALSE;
+	loader = gdk_pixbuf_loader_new ();
+
+	if (size > 0) {
+		g_signal_connect (loader, "size-prepared",
+				  G_CALLBACK (pixbuf_loader_size_prepared),
+				  GINT_TO_POINTER (size));
+	}
+
+	while (1) {
+		bytes_read = g_input_stream_read (stream, buffer, sizeof (buffer),
+						  NULL, NULL);
+		
+		if (bytes_read < 0) {
+			break;
+		}
+		if (bytes_read == 0) {
+			got_eos = TRUE;
+			break;
+		}
+		if (!gdk_pixbuf_loader_write (loader,
+					      buffer,
+					      bytes_read,
+					      NULL)) {
+			break;
+		}
+	}
+
+	g_input_stream_close (stream, NULL, NULL);
+	gdk_pixbuf_loader_close (loader, NULL);
+
+	pixbuf = NULL;
+	if (got_eos) {
+		pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+		if (pixbuf != NULL) {
+			g_object_ref (pixbuf);
+		}
+	}
+
+	g_object_unref (loader);
+
+	return pixbuf;
+}
+
+static void
+free_pixbuf_load_handle (EelPixbufLoadHandle *handle)
+{
+	g_object_unref (handle->cancellable);
+	if (handle->loader != NULL) {
+		g_object_unref (handle->loader);
+	}
+	if (handle->stream) {
+		g_input_stream_close_async (handle->stream, 0, NULL, NULL, NULL);
+		g_object_unref (handle->stream);
+	}
+	g_free (handle);
+}
+
+static void
+load_done (EelPixbufLoadHandle *handle, GError *error, gboolean get_pixbuf)
+{
+	GdkPixbuf *pixbuf;
+
+	if (handle->loader != NULL) {
+		gdk_pixbuf_loader_close (handle->loader, NULL);
+	}
+
+	pixbuf = get_pixbuf ? gdk_pixbuf_loader_get_pixbuf (handle->loader) : NULL;
+	
+	handle->callback (error, pixbuf, handle->callback_data);
+
+	free_pixbuf_load_handle (handle);
+}
+
+static void
+file_read_callback (GObject *source_object,
+		    GAsyncResult *res,
+		    gpointer user_data)
+{
+	EelPixbufLoadHandle *handle;
+	gssize bytes_read;
+	GError *error;
+
+	handle = user_data;
+
+	if (g_cancellable_is_cancelled (handle->cancellable)) {
+		free_pixbuf_load_handle (handle);
+		return;
+	}
+	
+	error = NULL;
+	bytes_read = g_input_stream_read_finish  (G_INPUT_STREAM (source_object),
+						  res, &error);
+	
+	if (bytes_read > 0) {
+		if (!gdk_pixbuf_loader_write (handle->loader,
+					      handle->buffer,
+					      bytes_read,
+					      &error)) {
+			bytes_read = -1;
+		} else {
+			g_input_stream_read_async (handle->stream,
+						   handle->buffer,
+						   sizeof (handle->buffer),
+						   0,
+						   handle->cancellable,
+						   file_read_callback, handle);
+			return;
+		}
+	}
+
+	load_done (handle, error, bytes_read == 0);
+	
+	if (error != NULL) {
+		g_error_free (error);
+	}
+}
+
+static void
+file_opened_callback (GObject *source_object,
+		      GAsyncResult *res,
+		      gpointer user_data)
+{
+	EelPixbufLoadHandle *handle;
+	GFileInputStream *stream;
+	GError *error;
+
+	handle = user_data;
+
+	if (g_cancellable_is_cancelled (handle->cancellable)) {
+		free_pixbuf_load_handle (handle);
+		return;
+	}
+
+	error = NULL;
+	stream = g_file_read_finish (G_FILE (source_object), res, &error);
+
+	if (stream == NULL) {
+		load_done (handle, error, FALSE);
+		g_error_free (error);
+		return;
+	}
+
+	handle->stream = G_INPUT_STREAM (stream);
+	handle->loader = gdk_pixbuf_loader_new ();
+
+	
+	g_input_stream_read_async (handle->stream,
+				   handle->buffer,
+				   sizeof (handle->buffer),
+				   0,
+				   handle->cancellable,
+				   file_read_callback, handle);
+}
+
+EelPixbufLoadHandle *
+eel_gdk_pixbuf_load_async (const char *uri,
+			   int priority,
+			   EelPixbufLoadCallback callback,
+			   gpointer callback_data)
+{
+	EelPixbufLoadHandle *handle;
+	GFile *file;
+
+	handle = g_new0 (EelPixbufLoadHandle, 1);
+	handle->cancellable = g_cancellable_new ();
+	handle->callback = callback;
+	handle->callback_data = callback_data;
+
+	file = g_file_new_for_uri (uri);
+	
+	g_file_read_async (file, priority, handle->cancellable,
+			   file_opened_callback, handle);
+
+	return handle;
+}
+
+void
+eel_cancel_gdk_pixbuf_load (EelPixbufLoadHandle *handle)
+{
+	if (handle == NULL) {
+		return;
+	}
+	
+	g_cancellable_cancel (handle->cancellable);
+}
+
+/* return the average value of each component */
+guint32
+eel_gdk_pixbuf_average_value (GdkPixbuf *pixbuf)
+{
+	guint64 a_total, r_total, g_total, b_total;
+	guint row, column;
+	int row_stride;
+	const guchar *pixels, *p;
+	int r, g, b, a;
+	guint64 dividend;
+	guint width, height;
+
+	width = gdk_pixbuf_get_width (pixbuf);
+	height = gdk_pixbuf_get_height (pixbuf);
+	row_stride = gdk_pixbuf_get_rowstride (pixbuf);
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+	/* iterate through the pixbuf, counting up each component */
+	a_total = 0;
+	r_total = 0;
+	g_total = 0;
+	b_total = 0;
+
+	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
+		for (row = 0; row < height; row++) {
+			p = pixels + (row * row_stride);
+			for (column = 0; column < width; column++) {
+				r = *p++;
+				g = *p++;
+				b = *p++;
+				a = *p++;
+				
+				a_total += a;
+				r_total += r * a;
+				g_total += g * a;
+				b_total += b * a;
+			}
+		}
+		dividend = height * width * 0xFF;
+		a_total *= 0xFF;
+	} else {
+		for (row = 0; row < height; row++) {
+			p = pixels + (row * row_stride);
+			for (column = 0; column < width; column++) {
+				r = *p++;
+				g = *p++;
+				b = *p++;
+				
+				r_total += r;
+				g_total += g;
+				b_total += b;
+			}
+		}
+		dividend = height * width;
+		a_total = dividend * 0xFF;
+	}
+
+	return ((a_total + dividend / 2) / dividend) << 24
+		| ((r_total + dividend / 2) / dividend) << 16
+		| ((g_total + dividend / 2) / dividend) << 8
+		| ((b_total + dividend / 2) / dividend);
+}
+
+double
+eel_gdk_scale_to_fit_factor (int width, int height,
+			     int max_width, int max_height,
+			     int *scaled_width, int *scaled_height)
+{
+	double scale_factor;
+	
+	scale_factor = MIN (max_width  / (double) width, max_height / (double) height);
+
+	*scaled_width  = floor (width * scale_factor + .5);
+	*scaled_height = floor (height * scale_factor + .5);
+
+	return scale_factor;
+}
+
+/* Returns a scaled copy of pixbuf, preserving aspect ratio. The copy will
+ * be scaled as large as possible without exceeding the specified width and height.
+ */
+GdkPixbuf *
+eel_gdk_pixbuf_scale_to_fit (GdkPixbuf *pixbuf, int max_width, int max_height)
+{
+	int scaled_width;
+	int scaled_height;
+
+	eel_gdk_scale_to_fit_factor (gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
+				     max_width, max_height,
+				     &scaled_width, &scaled_height);
+
+	return gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR);	
+}
+
+/* Returns a copy of pixbuf scaled down, preserving aspect ratio, to fit
+ * within the specified width and height. If it already fits, a copy of
+ * the original, without scaling, is returned.
+ */
+GdkPixbuf *
+eel_gdk_pixbuf_scale_down_to_fit (GdkPixbuf *pixbuf, int max_width, int max_height)
+{
+	int scaled_width;
+	int scaled_height;
+	
+	double scale_factor;
+
+	scale_factor = eel_gdk_scale_to_fit_factor (gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
+						    max_width, max_height,
+						    &scaled_width, &scaled_height);
+
+	if (scale_factor >= 1.0) {
+		return gdk_pixbuf_copy (pixbuf);
+	} else {				
+		return eel_gdk_pixbuf_scale_down (pixbuf, scaled_width, scaled_height);	
+	}
+}
+
+double
+eel_gdk_scale_to_min_factor (int width, int height,
+			     int min_width, int min_height,
+			     int *scaled_width, int *scaled_height)
+{
+	double scale_factor;
+
+	scale_factor = MAX (min_width / (double) width, min_height / (double) height);
+
+	*scaled_width  = floor (width * scale_factor + .5);
+	*scaled_height = floor (height * scale_factor + .5);
+
+	return scale_factor;
+}
+
+/* Returns a scaled copy of pixbuf, preserving aspect ratio. The copy will
+ * be scaled as small as possible without going under the specified width and height.
+ */
+GdkPixbuf *
+eel_gdk_pixbuf_scale_to_min (GdkPixbuf *pixbuf, int min_width, int min_height)
+{
+	int scaled_width;
+	int scaled_height;
+
+	eel_gdk_scale_to_min_factor (gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
+				     min_width, min_height,
+				     &scaled_width, &scaled_height);
+
+	return gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR);
+}
+
+/**
+ * eel_gdk_pixbuf_is_valid:
+ * @pixbuf: A GdkPixbuf
+ *
+ * Return value: A boolean indicating whether the given pixbuf is valid.
+ *
+ * A pixbuf is valid if:
+ * 
+ *   1. It is non NULL
+ *   2. It is has non NULL pixel data.
+ *   3. It has width and height greater than 0.
+ */
+gboolean
+eel_gdk_pixbuf_is_valid (const GdkPixbuf *pixbuf)
+{
+	return ((pixbuf != NULL)
+		&& (gdk_pixbuf_get_pixels (pixbuf) != NULL)
+		&& (gdk_pixbuf_get_width (pixbuf) > 0)
+		&& (gdk_pixbuf_get_height (pixbuf) > 0));
+}
+
+/**
+ * eel_gdk_pixbuf_get_dimensions:
+ * @pixbuf: A GdkPixbuf
+ *
+ * Return value: The dimensions of the pixbuf as a EelDimensions.
+ *
+ * This function is useful in code that uses libart rect 
+ * intersection routines.
+ */
+EelDimensions
+eel_gdk_pixbuf_get_dimensions (const GdkPixbuf *pixbuf)
+{
+	EelDimensions dimensions;
+
+	g_return_val_if_fail (eel_gdk_pixbuf_is_valid (pixbuf), eel_dimensions_empty);
+
+	dimensions.width = gdk_pixbuf_get_width (pixbuf);
+	dimensions.height = gdk_pixbuf_get_height (pixbuf);
+
+	return dimensions;
+}
+
+/**
+ * eel_gdk_pixbuf_fill_rectangle_with_color:
+ * @pixbuf: Target pixbuf to fill into.
+ * @area: Rectangle to fill.
+ * @color: The color to use.
+ *
+ * Fill the rectangle with the the given color.
+ */
+void
+eel_gdk_pixbuf_fill_rectangle_with_color (GdkPixbuf *pixbuf,
+					  EelIRect area,
+					  guint32 color)
+{
+	EelIRect target;
+	guchar red;
+	guchar green;
+	guchar blue;
+	guchar alpha;
+	guchar *pixels;
+	gboolean has_alpha;
+	guint pixel_offset;
+	guint rowstride;
+	guchar *row_offset;
+	int x;
+	int y;
+
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
+	
+	target = eel_gdk_pixbuf_intersect (pixbuf, 0, 0, area);
+	if (eel_irect_is_empty (&target)) {
+		return;
+	}
+
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
+	pixel_offset = has_alpha ? 4 : 3;
+	red = EEL_RGBA_COLOR_GET_R (color);
+	green = EEL_RGBA_COLOR_GET_G (color);
+	blue = EEL_RGBA_COLOR_GET_B (color);
+	alpha = EEL_RGBA_COLOR_GET_A (color);
+
+	row_offset = pixels + target.y0 * rowstride;
+
+	for (y = target.y0; y < target.y1; y++) {
+		guchar *offset = row_offset + (target.x0 * pixel_offset);
+		
+		for (x = target.x0; x < target.x1; x++) {
+			*(offset++) = red;
+			*(offset++) = green;
+			*(offset++) = blue;
+			
+			if (has_alpha) {
+				*(offset++) = alpha;
+			}
+			
+		}
+
+		row_offset += rowstride;
+	}
+}
+
+gboolean
+eel_gdk_pixbuf_save_to_file (const GdkPixbuf *pixbuf,
+			     const char *file_name)
+{
+	return gdk_pixbuf_save ((GdkPixbuf *) pixbuf,
+				file_name, "png", NULL, NULL);
+}
+
+void
+eel_gdk_pixbuf_ref_if_not_null (GdkPixbuf *pixbuf_or_null)
+{
+	if (pixbuf_or_null != NULL) {
+		g_object_ref (pixbuf_or_null);
+	}
+}
+
+void
+eel_gdk_pixbuf_unref_if_not_null (GdkPixbuf *pixbuf_or_null)
+{
+	if (pixbuf_or_null != NULL) {
+		g_object_unref (pixbuf_or_null);
+	}
+}
+
+void
+eel_gdk_pixbuf_draw_to_drawable (const GdkPixbuf *pixbuf,
+				 GdkDrawable *drawable,
+				 GdkGC *gc,
+				 int source_x,
+				 int source_y,
+				 EelIRect destination_area,
+				 GdkRgbDither dither,
+				 GdkPixbufAlphaMode alpha_compositing_mode,
+				 int alpha_threshold)
+{
+	EelDimensions dimensions;
+	EelIRect target;
+	EelIRect source;
+	int target_width;
+	int target_height;
+	int source_width;
+	int source_height;
+
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
+	g_return_if_fail (drawable != NULL);
+	g_return_if_fail (gc != NULL);
+	g_return_if_fail (!eel_irect_is_empty (&destination_area));
+ 	g_return_if_fail (alpha_threshold > EEL_OPACITY_FULLY_TRANSPARENT);
+ 	g_return_if_fail (alpha_threshold <= EEL_OPACITY_FULLY_OPAQUE);
+ 	g_return_if_fail (alpha_compositing_mode >= GDK_PIXBUF_ALPHA_BILEVEL);
+ 	g_return_if_fail (alpha_compositing_mode <= GDK_PIXBUF_ALPHA_FULL);
+
+	dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+	
+	g_return_if_fail (source_x >= 0);
+	g_return_if_fail (source_y >= 0);
+	g_return_if_fail (source_x < dimensions.width);
+	g_return_if_fail (source_y < dimensions.height);
+
+	/* Clip the destination area to the pixbuf dimensions; bail if no work */
+	target = eel_gdk_pixbuf_intersect (pixbuf,
+					   destination_area.x0,
+					   destination_area.y0,
+					   destination_area);
+	if (eel_irect_is_empty (&target)) {
+		return;
+	}
+
+	/* Assign the source area */
+	source = eel_irect_assign (source_x,
+				       source_y,
+				       dimensions.width - source_x,
+				       dimensions.height - source_y);
+
+	/* Adjust the target width if the source area is smaller than the
+	 * source pixbuf dimensions */
+	target_width = target.x1 - target.x0;
+	target_height = target.y1 - target.y0;
+	source_width = source.x1 - source.x0;
+	source_height = source.y1 - source.y0;
+
+	target.x1 = target.x0 + MIN (target_width, source_width);
+	target.y1 = target.y0 + MIN (target_height, source_height);
+
+	gdk_draw_pixbuf (drawable, gc, (GdkPixbuf *) pixbuf,
+			 source.x0,
+			 source.y0,
+			 target.x0,
+			 target.y0,
+			 target.x1 - target.x0,
+			 target.y1 - target.y0,
+			 dither,
+			 0,
+			 0);
+}
+
+/**
+ * eel_gdk_pixbuf_draw_to_pixbuf:
+ * @pixbuf: The source pixbuf to draw.
+ * @destination_pixbuf: The destination pixbuf.
+ * @source_x: The source pixbuf x coordiate to composite from.
+ * @source_y: The source pixbuf y coordiate to composite from.
+ * @destination_area: The destination area within the destination pixbuf.
+ *                    This area will be clipped if invalid in any way.
+ *
+ * Copy one pixbuf onto another another..  This function has some advantages
+ * over plain gdk_pixbuf_copy_area():
+ *
+ *   Composition paramters (source coordinate, destination area) are
+ *   given in a way that is consistent with the rest of the extensions
+ *   in this file.  That is, it matches the declaration of
+ *   eel_gdk_pixbuf_draw_to_pixbuf_alpha() and 
+ *   eel_gdk_pixbuf_draw_to_drawable() very closely.
+ *
+ *   All values are clipped to make sure they are valid.
+ *
+ */
+void
+eel_gdk_pixbuf_draw_to_pixbuf (const GdkPixbuf *pixbuf,
+			       GdkPixbuf *destination_pixbuf,
+			       int source_x,
+			       int source_y,
+			       EelIRect destination_area)
+{
+	EelDimensions dimensions;
+	EelIRect target;
+	EelIRect source;
+	int target_width;
+	int target_height;
+	int source_width;
+	int source_height;
+	
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (destination_pixbuf));
+	g_return_if_fail (!eel_irect_is_empty (&destination_area));
+
+	dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+
+	g_return_if_fail (source_x >= 0);
+	g_return_if_fail (source_y >= 0);
+	g_return_if_fail (source_x < dimensions.width);
+	g_return_if_fail (source_y < dimensions.height);
+
+	/* Clip the destination area to the pixbuf dimensions; bail if no work */
+	target = eel_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
+	if (eel_irect_is_empty (&target)) {
+ 		return;
+ 	}
+
+	/* Assign the source area */
+	source = eel_irect_assign (source_x,
+				       source_y,
+				       dimensions.width - source_x,
+				       dimensions.height - source_y);
+
+	/* Adjust the target width if the source area is smaller than the
+	 * source pixbuf dimensions */
+	target_width = target.x1 - target.x0;
+	target_height = target.y1 - target.y0;
+	source_width = source.x1 - source.x0;
+	source_height = source.y1 - source.y0;
+
+	target.x1 = target.x0 + MIN (target_width, source_width);
+	target.y1 = target.y0 + MIN (target_height, source_height);
+
+	gdk_pixbuf_copy_area (pixbuf,
+			      source.x0,
+			      source.y0,
+			      target.x1 - target.x0,
+			      target.y1 - target.y0,
+			      destination_pixbuf,
+			      target.x0,
+			      target.y0);
+}
+
+/**
+ * eel_gdk_pixbuf_draw_to_pixbuf_alpha:
+ * @pixbuf: The source pixbuf to draw.
+ * @destination_pixbuf: The destination pixbuf.
+ * @source_x: The source pixbuf x coordiate to composite from.
+ * @source_y: The source pixbuf y coordiate to composite from.
+ * @destination_area: The destination area within the destination pixbuf.
+ *                    This area will be clipped if invalid in any way.
+ * @opacity: The opacity of the drawn tiles where 0 <= opacity <= 255.
+ * @interpolation_mode: The interpolation mode.  See <gdk-pixbuf.h>
+ *
+ * Composite one pixbuf over another.  This function has some advantages
+ * over plain gdk_pixbuf_composite():
+ *
+ *   Composition paramters (source coordinate, destination area) are
+ *   given in a way that is consistent with the rest of the extensions
+ *   in this file.  That is, it matches the declaration of
+ *   eel_gdk_pixbuf_draw_to_pixbuf() and 
+ *   eel_gdk_pixbuf_draw_to_drawable() very closely.
+ *
+ *   All values are clipped to make sure they are valid.
+ *
+ *   Workaround a limitation in gdk_pixbuf_composite() that does not allow
+ *   the source (x,y) to be greater than (0,0)
+ * 
+ */
+void
+eel_gdk_pixbuf_draw_to_pixbuf_alpha (const GdkPixbuf *pixbuf,
+				     GdkPixbuf *destination_pixbuf,
+				     int source_x,
+				     int source_y,
+				     EelIRect destination_area,
+				     int opacity,
+				     GdkInterpType interpolation_mode)
+{
+	EelDimensions dimensions;
+	EelIRect target;
+	EelIRect source;
+	int target_width;
+	int target_height;
+	int source_width;
+	int source_height;
+
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (destination_pixbuf));
+	g_return_if_fail (!eel_irect_is_empty (&destination_area));
+	g_return_if_fail (opacity >= EEL_OPACITY_FULLY_TRANSPARENT);
+	g_return_if_fail (opacity <= EEL_OPACITY_FULLY_OPAQUE);
+	g_return_if_fail (interpolation_mode >= GDK_INTERP_NEAREST);
+	g_return_if_fail (interpolation_mode <= GDK_INTERP_HYPER);
+	
+	dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+
+	g_return_if_fail (source_x >= 0);
+	g_return_if_fail (source_y >= 0);
+	g_return_if_fail (source_x < dimensions.width);
+	g_return_if_fail (source_y < dimensions.height);
+
+	/* Clip the destination area to the pixbuf dimensions; bail if no work */
+	target = eel_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
+	if (eel_irect_is_empty (&target)) {
+ 		return;
+ 	}
+
+	/* Assign the source area */
+	source = eel_irect_assign (source_x,
+				       source_y,
+				       dimensions.width - source_x,
+				       dimensions.height - source_y);
+	
+	/* Adjust the target width if the source area is smaller than the
+	 * source pixbuf dimensions */
+	target_width = target.x1 - target.x0;
+	target_height = target.y1 - target.y0;
+	source_width = source.x1 - source.x0;
+	source_height = source.y1 - source.y0;
+
+	target.x1 = target.x0 + MIN (target_width, source_width);
+	target.y1 = target.y0 + MIN (target_height, source_height);
+	
+	/* If the source point is not (0,0), then we need to create a sub pixbuf
+	 * with only the source area.  This is needed to work around a limitation
+	 * in gdk_pixbuf_composite() that requires the source area to be (0,0). */
+	if (source.x0 != 0 || source.y0 != 0) {
+		EelIRect area;
+		int width;
+		int height;
+
+		width = dimensions.width - source.x0;
+		height = dimensions.height - source.y0;
+		
+		area.x0 = source.x0;
+		area.y0 = source.y0;
+		area.x1 = area.x0 + width;
+		area.y1 = area.y0 + height;
+		
+		pixbuf = eel_gdk_pixbuf_new_from_pixbuf_sub_area ((GdkPixbuf *) pixbuf, area);
+	} else {
+		g_object_ref (G_OBJECT (pixbuf));
+	}
+	
+	gdk_pixbuf_composite (pixbuf,
+			      destination_pixbuf,
+			      target.x0,
+			      target.y0,
+			      target.x1 - target.x0,
+			      target.y1 - target.y0,
+			      target.x0,
+			      target.y0,
+			      1.0,
+			      1.0,
+			      interpolation_mode,
+			      opacity);
+
+	g_object_unref (G_OBJECT (pixbuf));
+}
+
+static void
+pixbuf_destroy_callback (guchar  *pixels,
+			 gpointer callback_data)
+{
+	g_assert (pixels != NULL);
+	g_assert (callback_data != NULL);
+
+	g_object_unref (callback_data);
+}
+
+/**
+ * eel_gdk_pixbuf_new_from_pixbuf_sub_area:
+ * @pixbuf: The source pixbuf.
+ * @area: The area within the source pixbuf to use for the sub pixbuf.
+ *        This area needs to be contained within the bounds of the 
+ *        source pixbuf, otherwise it will be clipped to that. 
+ *
+ * Return value: A newly allocated pixbuf that shares the pixel data
+ *               of the source pixbuf in order to represent a sub area.
+ *
+ * Create a pixbuf from a sub area of another pixbuf.  The resulting pixbuf
+ * will share the pixel data of the source pixbuf.  Memory bookeeping is
+ * all taken care for the caller.  All you need to do is gdk_pixbuf_unref()
+ * the resulting pixbuf to properly free resources.
+ */
+GdkPixbuf *
+eel_gdk_pixbuf_new_from_pixbuf_sub_area (GdkPixbuf *pixbuf,
+					 EelIRect area)
+{
+	GdkPixbuf *sub_pixbuf;
+	EelIRect target;
+	guchar *pixels;
+	
+	g_return_val_if_fail (eel_gdk_pixbuf_is_valid (pixbuf), NULL);
+	g_return_val_if_fail (!eel_irect_is_empty (&area), NULL);
+
+	/* Clip the pixbuf by the given area; bail if no work */
+	target = eel_gdk_pixbuf_intersect (pixbuf, 0, 0, area);
+	if (eel_irect_is_empty (&target)) {
+ 		return NULL;
+ 	}
+
+	/* Since we are going to be sharing the given pixbuf's data, we need 
+	 * to ref it.  It will be unreffed in the destroy function above */
+	g_object_ref (pixbuf);
+
+	/* Compute the offset into the pixel data */
+	pixels = 
+		gdk_pixbuf_get_pixels (pixbuf)
+		+ (target.y0 * gdk_pixbuf_get_rowstride (pixbuf))
+		+ (target.x0 * (gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3));
+	
+	/* Make a pixbuf pretending its real estate is the sub area */
+	sub_pixbuf = gdk_pixbuf_new_from_data (pixels,
+					       GDK_COLORSPACE_RGB,
+					       gdk_pixbuf_get_has_alpha (pixbuf),
+					       8,
+					       eel_irect_get_width (target),
+					       eel_irect_get_height (target),
+					       gdk_pixbuf_get_rowstride (pixbuf),
+					       pixbuf_destroy_callback,
+					       pixbuf);
+
+	return sub_pixbuf;
+}
+
+/**
+ * eel_gdk_pixbuf_new_from_existing_buffer:
+ * @buffer: The existing buffer.
+ * @buffer_rowstride: The existing buffer's rowstride.
+ * @buffer_has_alpha: A boolean value indicating whether the buffer has alpha.
+ * @area: The area within the existing buffer to use for the pixbuf.
+ *        This area needs to be contained within the bounds of the 
+ *        buffer, otherwise memory will be trashed.
+ *
+ * Return value: A newly allocated pixbuf that uses the existing buffer
+ *               for its pixel data.
+ *
+ * Create a pixbuf from an existing buffer.
+ *
+ * The resulting pixbuf is only valid for as long as &buffer is valid.  It is
+ * up to the caller to make sure they both exist in the same scope.
+ * Also, it is up to the caller to make sure that the given area is fully 
+ * contained in the buffer, otherwise memory trashing will happen.
+ */
+GdkPixbuf *
+eel_gdk_pixbuf_new_from_existing_buffer (guchar *buffer,
+					 int buffer_rowstride,
+					 gboolean buffer_has_alpha,
+					 EelIRect area)
+{
+	GdkPixbuf *pixbuf;
+	guchar *pixels;
+	
+	g_return_val_if_fail (buffer != NULL, NULL);
+	g_return_val_if_fail (buffer_rowstride > 0, NULL);
+	g_return_val_if_fail (!eel_irect_is_empty (&area), NULL);
+	
+	/* Compute the offset into the buffer */
+	pixels = 
+		buffer
+		+ (area.y0 * buffer_rowstride)
+		+ (area.x0 * (buffer_has_alpha ? 4 : 3));
+	
+	pixbuf = gdk_pixbuf_new_from_data (pixels,
+					   GDK_COLORSPACE_RGB,
+					   buffer_has_alpha,
+					   8,
+					   eel_irect_get_width (area),
+					   eel_irect_get_height (area),
+					   buffer_rowstride,
+					   NULL,
+					   NULL);
+
+	return pixbuf;
+}
+
+/**
+ * eel_gdk_pixbuf_intersect:
+ * @pixbuf: A GdkPixbuf.
+ * @pixbuf_x: X coordinate of pixbuf.
+ * @pixbuf_y: Y coordinate of pixbuf.
+ * @rectangle: An EelIRect.
+ *
+ * Return value: The intersection of the pixbuf and the given rectangle.
+ *
+ */
+EelIRect
+eel_gdk_pixbuf_intersect (const GdkPixbuf *pixbuf,
+			  int pixbuf_x,
+			  int pixbuf_y,
+			  EelIRect rectangle)
+{
+	EelIRect intersection;
+	EelIRect bounds;
+	EelDimensions dimensions;
+
+	g_return_val_if_fail (eel_gdk_pixbuf_is_valid (pixbuf), eel_irect_empty);
+
+	dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+	bounds = eel_irect_assign_dimensions (pixbuf_x, pixbuf_y, dimensions);
+
+	eel_irect_intersect (&intersection, &rectangle, &bounds);
+
+	/* In theory, this is not needed because a rectangle is empty
+	 * regardless of how MUCH negative the dimensions are.  
+	 * However, to make debugging and self checks simpler, we
+	 * consistenly return a standard empty rectangle.
+	 */
+	if (eel_irect_is_empty (&intersection)) {
+		return eel_irect_empty;
+	}
+
+	return intersection;
+}
+
+GdkPixbuf *
+eel_gdk_pixbuf_scale_down (GdkPixbuf *pixbuf,
+			   int dest_width,
+			   int dest_height)
+{
+	int source_width, source_height;
+	int s_x1, s_y1, s_x2, s_y2;
+	int s_xfrac, s_yfrac;
+	int dx, dx_frac, dy, dy_frac;
+	div_t ddx, ddy;
+	int x, y;
+	int r, g, b, a;
+	int n_pixels;
+	gboolean has_alpha;
+	guchar *dest, *src, *xsrc, *src_pixels;
+	GdkPixbuf *dest_pixbuf;
+	int pixel_stride;
+	int source_rowstride, dest_rowstride;
+
+	if (dest_width == 0 || dest_height == 0) {
+		return NULL;
+	}
+	
+	source_width = gdk_pixbuf_get_width (pixbuf);
+	source_height = gdk_pixbuf_get_height (pixbuf);
+
+	g_assert (source_width >= dest_width);
+	g_assert (source_height >= dest_height);
+
+	ddx = div (source_width, dest_width);
+	dx = ddx.quot;
+	dx_frac = ddx.rem;
+	
+	ddy = div (source_height, dest_height);
+	dy = ddy.quot;
+	dy_frac = ddy.rem;
+
+	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
+	source_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	src_pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+	dest_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8,
+				      dest_width, dest_height);
+	dest = gdk_pixbuf_get_pixels (dest_pixbuf);
+	dest_rowstride = gdk_pixbuf_get_rowstride (dest_pixbuf);
+
+	pixel_stride = (has_alpha)?4:3;
+	
+	s_y1 = 0;
+	s_yfrac = -dest_height/2;
+	while (s_y1 < source_height) {
+		s_y2 = s_y1 + dy;
+		s_yfrac += dy_frac;
+		if (s_yfrac > 0) {
+			s_y2++;
+			s_yfrac -= dest_height;
+		}
+
+		s_x1 = 0;
+		s_xfrac = -dest_width/2;
+		while (s_x1 < source_width) {
+			s_x2 = s_x1 + dx;
+			s_xfrac += dx_frac;
+			if (s_xfrac > 0) {
+				s_x2++;
+				s_xfrac -= dest_width;
+			}
+
+			/* Average block of [x1,x2[ x [y1,y2[ and store in dest */
+			r = g = b = a = 0;
+			n_pixels = 0;
+
+			src = src_pixels + s_y1 * source_rowstride + s_x1 * pixel_stride;
+			for (y = s_y1; y < s_y2; y++) {
+				xsrc = src;
+				if (has_alpha) {
+					for (x = 0; x < s_x2-s_x1; x++) {
+						n_pixels++;
+						
+						r += xsrc[3] * xsrc[0];
+						g += xsrc[3] * xsrc[1];
+						b += xsrc[3] * xsrc[2];
+						a += xsrc[3];
+						xsrc += 4;
+					}
+				} else {
+					for (x = 0; x < s_x2-s_x1; x++) {
+						n_pixels++;
+						r += *xsrc++;
+						g += *xsrc++;
+						b += *xsrc++;
+					}
+				}
+				src += source_rowstride;
+			}
+			
+			if (has_alpha) {
+				if (a != 0) {
+					*dest++ = r / a;
+					*dest++ = g / a;
+					*dest++ = b / a;
+					*dest++ = a / n_pixels;
+				} else {
+					*dest++ = 0;
+					*dest++ = 0;
+					*dest++ = 0;
+					*dest++ = 0;
+				}
+			} else {
+				*dest++ = r / n_pixels;
+				*dest++ = g / n_pixels;
+				*dest++ = b / n_pixels;
+			}
+			
+			s_x1 = s_x2;
+		}
+		s_y1 = s_y2;
+		dest += dest_rowstride - dest_width * pixel_stride;
+	}
+	
+	return dest_pixbuf;
+}
+
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+static char *
+check_average_value (int width, int height, const char* fill)
+{
+	char c;
+	guint r, g, b, a;
+	gboolean alpha, gray;
+	int gray_tweak;
+	GdkPixbuf *pixbuf;
+	int x, y, rowstride, n_channels;
+	guchar *pixels;
+	guint32 average;
+	guchar v;
+
+	r = g = b = a = 0;
+	alpha = FALSE;
+	gray = FALSE;
+	gray_tweak = 0;
+	if (sscanf (fill, " %x,%x,%x,%x %c", &r, &g, &b, &a, &c) == 4) {
+		alpha = TRUE;
+	} else if (sscanf (fill, " %x,%x,%x %c", &r, &g, &b, &c) == 3) {
+	} else if (sscanf (fill, " gray%d %c", &gray_tweak, &c) == 1) {
+		gray = TRUE;
+	} else {
+		return g_strdup ("bad fill string format");
+	}
+
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, width, height);
+
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	n_channels = gdk_pixbuf_get_n_channels (pixbuf);
+
+	if (!gray) {
+		for (y = 0; y < height; y++) {
+			for (x = 0; x < width; x++) {
+				pixels [y * rowstride + x * n_channels + 0] = r;
+				pixels [y * rowstride + x * n_channels + 1] = g;
+				pixels [y * rowstride + x * n_channels + 2] = b;
+				if (alpha) {
+					pixels [y * rowstride + x * n_channels + 3] = a;
+				}
+			}
+		}
+	} else {
+		for (y = 0; y < height; y++) {
+			for (x = 0; x < width; x++) {
+				v = ((x + y) & 1) ? 0x80 : 0x7F;
+				if (((x + y) & 0xFF) == 0)
+					v += gray_tweak;
+				pixels [y * rowstride + x * n_channels + 0] = v;
+				pixels [y * rowstride + x * n_channels + 1] = v;
+				pixels [y * rowstride + x * n_channels + 2] = v;
+			}
+		}
+		pixels [0] += gray_tweak;
+		pixels [1] += gray_tweak;
+		pixels [2] += gray_tweak;
+	}
+
+	average = eel_gdk_pixbuf_average_value (pixbuf);
+	g_object_unref (pixbuf);
+
+	return g_strdup_printf ("%02X,%02X,%02X,%02X",
+				(average >> 16) & 0xFF,
+				(average >> 8) & 0xFF,
+				average & 0xFF,
+				average >> 24);
+}
+
+void
+eel_self_check_gdk_pixbuf_extensions (void)
+{
+	GdkPixbuf *pixbuf;
+	EelIRect clip_area;
+
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 100, 100);
+
+	EEL_CHECK_BOOLEAN_RESULT (eel_gdk_pixbuf_is_valid (pixbuf), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_gdk_pixbuf_is_valid (NULL), FALSE);
+
+	EEL_CHECK_DIMENSIONS_RESULT (eel_gdk_pixbuf_get_dimensions (pixbuf), 100, 100);
+
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, eel_gdk_pixbuf_whole_pixbuf), 0, 0, 100, 100);
+
+	clip_area = eel_irect_assign (0, 0, 0, 0);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 0, 0);
+
+	clip_area = eel_irect_assign (0, 0, 0, 0);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 0, 0);
+
+	clip_area = eel_irect_assign (0, 0, 100, 100);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 100, 100);
+
+	clip_area = eel_irect_assign (-10, -10, 100, 100);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 90, 90);
+
+	clip_area = eel_irect_assign (-10, -10, 110, 110);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 100, 100);
+
+	clip_area = eel_irect_assign (0, 0, 99, 99);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 99, 99);
+
+	clip_area = eel_irect_assign (0, 0, 1, 1);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 1, 1);
+
+	clip_area = eel_irect_assign (-1, -1, 1, 1);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 0, 0);
+
+	clip_area = eel_irect_assign (-1, -1, 2, 2);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 1, 1);
+
+	clip_area = eel_irect_assign (100, 100, 1, 1);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 0, 0);
+
+	clip_area = eel_irect_assign (101, 101, 1, 1);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 0, 0, 0, 0);
+
+	clip_area = eel_irect_assign (80, 0, 100, 100);
+	EEL_CHECK_RECTANGLE_RESULT (eel_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area), 80, 0, 100, 100);
+
+	g_object_unref (pixbuf);
+
+	/* No checks for empty pixbufs because GdkPixbuf doesn't seem to allow them. */
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "00,00,00"), "00,00,00,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "00,00,00,00"), "00,00,00,00");
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "00,00,00,FF"), "00,00,00,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "01,01,01"), "01,01,01,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "FE,FE,FE"), "FE,FE,FE,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "FF,FF,FF"), "FF,FF,FF,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "FF,FF,FF,00"), "00,00,00,00");
+	EEL_CHECK_STRING_RESULT (check_average_value (1, 1, "11,22,33"), "11,22,33,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "00,00,00"), "00,00,00,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "00,00,00,00"), "00,00,00,00");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "00,00,00,FF"), "00,00,00,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "01,01,01"), "01,01,01,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "FE,FE,FE"), "FE,FE,FE,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "FF,FF,FF"), "FF,FF,FF,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "FF,FF,FF,00"), "00,00,00,00");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "11,22,33"), "11,22,33,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "gray -1"), "7F,7F,7F,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "gray 0"), "80,80,80,FF");
+	EEL_CHECK_STRING_RESULT (check_average_value (1000, 1000, "gray 1"), "80,80,80,FF");
+}
+
+#endif /* !EEL_OMIT_SELF_CHECK */
+
diff --git a/eel/eel-gdk-pixbuf-extensions.h b/eel/eel-gdk-pixbuf-extensions.h
new file mode 100644
index 000000000..f6801e781
--- /dev/null
+++ b/eel/eel-gdk-pixbuf-extensions.h
@@ -0,0 +1,155 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gdk-pixbuf-extensions.h: Routines to augment what's in gdk-pixbuf.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_GDK_PIXBUF_EXTENSIONS_H
+#define EEL_GDK_PIXBUF_EXTENSIONS_H
+
+#include <eel/eel-art-extensions.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#include <gio/gio.h>
+
+#define EEL_STANDARD_ALPHA_THRESHHOLD 128
+#define EEL_OPACITY_FULLY_TRANSPARENT 0
+#define EEL_OPACITY_FULLY_OPAQUE      255
+
+extern const EelIRect eel_gdk_pixbuf_whole_pixbuf;
+
+typedef struct EelPixbufLoadHandle EelPixbufLoadHandle;
+typedef void (* EelPixbufLoadCallback) (GError         *error,
+					GdkPixbuf      *pixbuf,
+					gpointer        callback_data);
+
+/* Convenience functions for lists of GdkPixbuf objects. */
+void                 eel_gdk_pixbuf_list_ref                  (GList                 *pixbuf_list);
+void                 eel_gdk_pixbuf_list_unref                (GList                 *pixbuf_list);
+void                 eel_gdk_pixbuf_list_free                 (GList                 *pixbuf_list);
+
+
+/* Loading a GdkPixbuf with a URI. */
+GdkPixbuf *          eel_gdk_pixbuf_load                      (const char            *uri);
+GdkPixbuf *          eel_gdk_pixbuf_load_from_stream          (GInputStream          *stream);
+GdkPixbuf *          eel_gdk_pixbuf_load_from_stream_at_size  (GInputStream          *stream,
+							       int                    size);
+
+
+/* Same thing async. */
+EelPixbufLoadHandle *eel_gdk_pixbuf_load_async                (const char            *uri,
+							       int                    priority,
+							       EelPixbufLoadCallback  callback,
+							       gpointer               callback_data);
+void                 eel_cancel_gdk_pixbuf_load               (EelPixbufLoadHandle   *handle);
+GdkPixbuf *          eel_gdk_pixbuf_scale_down_to_fit         (GdkPixbuf             *pixbuf,
+							       int                    max_width,
+							       int                    max_height);
+GdkPixbuf *          eel_gdk_pixbuf_scale_to_fit              (GdkPixbuf             *pixbuf,
+							       int                    max_width,
+							       int                    max_height);
+double               eel_gdk_scale_to_fit_factor              (int                    width,
+							       int                    height,
+							       int                    max_width,
+							       int                    max_height,
+							       int                   *scaled_width,
+							       int                   *scaled_height);
+GdkPixbuf *          eel_gdk_pixbuf_scale_to_min              (GdkPixbuf             *pixbuf,
+							       int                    min_width,
+							       int                    min_height);
+double              eel_gdk_scale_to_min_factor               (int                   width,
+                                                               int                   height,
+							       int                   min_width,
+							       int                   min_height,
+							       int                   *scaled_width,
+							       int                   *scaled_height);
+
+/* return average color values for each component (argb) */
+guint32              eel_gdk_pixbuf_average_value             (GdkPixbuf             *pixbuf);
+void                 eel_gdk_pixbuf_fill_rectangle_with_color (GdkPixbuf             *pixbuf,
+							       EelIRect               area,
+							       guint32                color);
+
+
+/* Save a pixbuf to a png file.  Return value indicates succss/TRUE or failure/FALSE */
+gboolean             eel_gdk_pixbuf_save_to_file              (const GdkPixbuf       *pixbuf,
+							       const char            *file_name);
+void                 eel_gdk_pixbuf_ref_if_not_null           (GdkPixbuf             *pixbuf_or_null);
+void                 eel_gdk_pixbuf_unref_if_not_null         (GdkPixbuf             *pixbuf_or_null);
+
+
+/* Copy a pixbuf to an area of a GdkDrawable */
+void                 eel_gdk_pixbuf_draw_to_drawable          (const GdkPixbuf       *pixbuf,
+							       GdkDrawable           *drawable,
+							       GdkGC                 *gc,
+							       int                    source_x,
+							       int                    source_y,
+							       EelIRect               destination_area,
+							       GdkRgbDither           dither,
+							       GdkPixbufAlphaMode     alpha_compositing_mode,
+							       int                    alpha_threshold);
+
+/* Copy a pixbuf to an area of another pixbuf */
+void                 eel_gdk_pixbuf_draw_to_pixbuf            (const GdkPixbuf       *pixbuf,
+							       GdkPixbuf             *destination_pixbuf,
+							       int                    source_x,
+							       int                    source_y,
+							       EelIRect               destination_area);
+
+
+/* Composite one pixbuf over another with the given opacity */
+void                 eel_gdk_pixbuf_draw_to_pixbuf_alpha      (const GdkPixbuf       *pixbuf,
+							       GdkPixbuf             *destination_pixbuf,
+							       int                    source_x,
+							       int                    source_y,
+							       EelIRect               destination_area,
+							       int                    opacity,
+							       GdkInterpType          interpolation_mode);
+
+
+/* Create a pixbuf from a sub area of another pixbuf */
+GdkPixbuf *          eel_gdk_pixbuf_new_from_pixbuf_sub_area  (GdkPixbuf             *pixbuf,
+							       EelIRect               area);
+/* Create a pixbuf from an existing buffer. */
+GdkPixbuf *          eel_gdk_pixbuf_new_from_existing_buffer  (guchar                *buffer,
+							       int                    buffer_rowstride,
+							       gboolean               buffer_has_alpha,
+							       EelIRect               area);
+
+/* Determine whether a pixbuf is valid or not */
+gboolean             eel_gdk_pixbuf_is_valid                  (const GdkPixbuf       *pixbuf);
+
+/* Access the dimensions of a pixbuf. */
+EelDimensions        eel_gdk_pixbuf_get_dimensions            (const GdkPixbuf       *pixbuf);
+
+/* Return the intersection of the pixbuf with the given rectangle. */
+EelIRect             eel_gdk_pixbuf_intersect                 (const GdkPixbuf       *pixbuf,
+							       int                    pixbuf_x,
+							       int                    pixbuf_y,
+							       EelIRect               rectangle);
+
+/* Scales large pixbufs down fast */
+GdkPixbuf *          eel_gdk_pixbuf_scale_down                (GdkPixbuf *pixbuf,
+							       int dest_width,
+							       int dest_height);
+
+#endif /* EEL_GDK_PIXBUF_EXTENSIONS_H */
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c
new file mode 100644
index 000000000..5152d9591
--- /dev/null
+++ b/eel/eel-glib-extensions.c
@@ -0,0 +1,1159 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-glib-extensions.c - implementation of new functions that conceptually
+                                belong in glib. Perhaps some of these will be
+                                actually rolled into glib someday.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: John Sullivan <sullivan@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-glib-extensions.h"
+
+#include "eel-debug.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-string.h"
+#include "eel-i18n.h"
+#include <glib-object.h>
+#include <math.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/utsname.h>
+#include <time.h>
+#include <locale.h>
+
+/* Legal conversion specifiers, as specified in the C standard. */
+#define C_STANDARD_STRFTIME_CHARACTERS "aAbBcdHIjmMpSUwWxXyYZ"
+#define C_STANDARD_NUMERIC_STRFTIME_CHARACTERS "dHIjmMSUwWyY"
+#define SUS_EXTENDED_STRFTIME_MODIFIERS "EO"
+
+#define SAFE_SHELL_CHARACTERS "-_0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
+typedef struct {
+	GHashTable *hash_table;
+	char *display_name;
+	gboolean keys_known_to_be_strings;
+} HashTableToFree;
+
+static GList *hash_tables_to_free_at_exit;
+
+/**
+ * eel_g_date_new_tm:
+ * 
+ * Get a new GDate * for the date represented by a tm struct. 
+ * The caller is responsible for g_free-ing the result.
+ * @time_pieces: Pointer to a tm struct representing the date to be converted.
+ * 
+ * Returns: Newly allocated date.
+ * 
+ **/
+GDate *
+eel_g_date_new_tm (struct tm *time_pieces)
+{
+	/* tm uses 0-based months; GDate uses 1-based months.
+	 * tm_year needs 1900 added to get the full year.
+	 */
+	return g_date_new_dmy (time_pieces->tm_mday,
+			       time_pieces->tm_mon + 1,
+			       time_pieces->tm_year + 1900);
+}
+
+/**
+ * eel_strdup_strftime:
+ *
+ * Cover for standard date-and-time-formatting routine strftime that returns
+ * a newly-allocated string of the correct size. The caller is responsible
+ * for g_free-ing the returned string.
+ *
+ * Besides the buffer management, there are two differences between this
+ * and the library strftime:
+ *
+ *   1) The modifiers "-" and "_" between a "%" and a numeric directive
+ *      are defined as for the GNU version of strftime. "-" means "do not
+ *      pad the field" and "_" means "pad with spaces instead of zeroes".
+ *   2) Non-ANSI extensions to strftime are flagged at runtime with a
+ *      warning, so it's easy to notice use of the extensions without
+ *      testing with multiple versions of the library.
+ *
+ * @format: format string to pass to strftime. See strftime documentation
+ * for details.
+ * @time_pieces: date/time, in struct format.
+ * 
+ * Return value: Newly allocated string containing the formatted time.
+ **/
+char *
+eel_strdup_strftime (const char *format, struct tm *time_pieces)
+{
+	GString *string;
+	const char *remainder, *percent;
+	char code[4], buffer[512];
+	char *piece, *result, *converted;
+	size_t string_length;
+	gboolean strip_leading_zeros, turn_leading_zeros_to_spaces;
+	char modifier;
+	int i;
+
+	/* Format could be translated, and contain UTF-8 chars,
+	 * so convert to locale encoding which strftime uses */
+	converted = g_locale_from_utf8 (format, -1, NULL, NULL, NULL);
+	g_return_val_if_fail (converted != NULL, NULL);
+	
+	string = g_string_new ("");
+	remainder = converted;
+
+	/* Walk from % character to % character. */
+	for (;;) {
+		percent = strchr (remainder, '%');
+		if (percent == NULL) {
+			g_string_append (string, remainder);
+			break;
+		}
+		g_string_append_len (string, remainder,
+				     percent - remainder);
+
+		/* Handle the "%" character. */
+		remainder = percent + 1;
+		switch (*remainder) {
+		case '-':
+			strip_leading_zeros = TRUE;
+			turn_leading_zeros_to_spaces = FALSE;
+			remainder++;
+			break;
+		case '_':
+			strip_leading_zeros = FALSE;
+			turn_leading_zeros_to_spaces = TRUE;
+			remainder++;
+			break;
+		case '%':
+			g_string_append_c (string, '%');
+			remainder++;
+			continue;
+		case '\0':
+			g_warning ("Trailing %% passed to eel_strdup_strftime");
+			g_string_append_c (string, '%');
+			continue;
+		default:
+			strip_leading_zeros = FALSE;
+			turn_leading_zeros_to_spaces = FALSE;
+			break;
+		}
+
+		modifier = 0;
+		if (strchr (SUS_EXTENDED_STRFTIME_MODIFIERS, *remainder) != NULL) {
+			modifier = *remainder;
+			remainder++;
+
+			if (*remainder == 0) {
+				g_warning ("Unfinished %%%c modifier passed to eel_strdup_strftime", modifier);
+				break;
+			}
+		} 
+		
+		if (strchr (C_STANDARD_STRFTIME_CHARACTERS, *remainder) == NULL) {
+			g_warning ("eel_strdup_strftime does not support "
+				   "non-standard escape code %%%c",
+				   *remainder);
+		}
+
+		/* Convert code to strftime format. We have a fixed
+		 * limit here that each code can expand to a maximum
+		 * of 512 bytes, which is probably OK. There's no
+		 * limit on the total size of the result string.
+		 */
+		i = 0;
+		code[i++] = '%';
+		if (modifier != 0) {
+#ifdef HAVE_STRFTIME_EXTENSION
+			code[i++] = modifier;
+#endif
+		}
+		code[i++] = *remainder;
+		code[i++] = '\0';
+		string_length = strftime (buffer, sizeof (buffer),
+					  code, time_pieces);
+		if (string_length == 0) {
+			/* We could put a warning here, but there's no
+			 * way to tell a successful conversion to
+			 * empty string from a failure.
+			 */
+			buffer[0] = '\0';
+		}
+
+		/* Strip leading zeros if requested. */
+		piece = buffer;
+		if (strip_leading_zeros || turn_leading_zeros_to_spaces) {
+			if (strchr (C_STANDARD_NUMERIC_STRFTIME_CHARACTERS, *remainder) == NULL) {
+				g_warning ("eel_strdup_strftime does not support "
+					   "modifier for non-numeric escape code %%%c%c",
+					   remainder[-1],
+					   *remainder);
+			}
+			if (*piece == '0') {
+				do {
+					piece++;
+				} while (*piece == '0');
+				if (!g_ascii_isdigit (*piece)) {
+				    piece--;
+				}
+			}
+			if (turn_leading_zeros_to_spaces) {
+				memset (buffer, ' ', piece - buffer);
+				piece = buffer;
+			}
+		}
+		remainder++;
+
+		/* Add this piece. */
+		g_string_append (string, piece);
+	}
+	
+	/* Convert the string back into utf-8. */
+	result = g_locale_to_utf8 (string->str, -1, NULL, NULL, NULL);
+
+	g_string_free (string, TRUE);
+	g_free (converted);
+
+	return result;
+}
+
+/**
+ * eel_g_list_exactly_one_item
+ *
+ * Like g_list_length (list) == 1, only O(1) instead of O(n).
+ * @list: List.
+ *
+ * Return value: TRUE if the list has exactly one item.
+ **/
+gboolean
+eel_g_list_exactly_one_item (GList *list)
+{
+	return list != NULL && list->next == NULL;
+}
+
+/**
+ * eel_g_list_more_than_one_item
+ *
+ * Like g_list_length (list) > 1, only O(1) instead of O(n).
+ * @list: List.
+ *
+ * Return value: TRUE if the list has more than one item.
+ **/
+gboolean
+eel_g_list_more_than_one_item (GList *list)
+{
+	return list != NULL && list->next != NULL;
+}
+
+/**
+ * eel_g_list_equal
+ *
+ * Compares two lists to see if they are equal.
+ * @list_a: First list.
+ * @list_b: Second list.
+ *
+ * Return value: TRUE if the lists are the same length with the same elements.
+ **/
+gboolean
+eel_g_list_equal (GList *list_a, GList *list_b)
+{
+	GList *p, *q;
+
+	for (p = list_a, q = list_b; p != NULL && q != NULL; p = p->next, q = q->next) {
+		if (p->data != q->data) {
+			return FALSE;
+		}
+	}
+	return p == NULL && q == NULL;
+}
+
+/**
+ * eel_g_str_list_equal
+ *
+ * Compares two lists of C strings to see if they are equal.
+ * @list_a: First list.
+ * @list_b: Second list.
+ *
+ * Return value: TRUE if the lists contain the same strings.
+ **/
+gboolean
+eel_g_str_list_equal (GList *list_a, GList *list_b)
+{
+	GList *p, *q;
+
+	for (p = list_a, q = list_b; p != NULL && q != NULL; p = p->next, q = q->next) {
+		if (eel_strcmp (p->data, q->data) != 0) {
+			return FALSE;
+		}
+	}
+	return p == NULL && q == NULL;
+}
+
+/**
+ * eel_g_str_list_copy
+ *
+ * @list: List of strings and/or NULLs to copy.
+ * Return value: Deep copy of @list.
+ **/
+GList *
+eel_g_str_list_copy (GList *list)
+{
+	GList *node, *result;
+
+	result = NULL;
+	
+	for (node = g_list_last (list); node != NULL; node = node->prev) {
+		result = g_list_prepend (result, g_strdup (node->data));
+	}
+	return result;
+}
+
+/**
+ * eel_g_str_list_alphabetize
+ *
+ * Sort a list of strings using locale-sensitive rules.
+ *
+ * @list: List of strings and/or NULLs.
+ * 
+ * Return value: @list, sorted.
+ **/
+GList *
+eel_g_str_list_alphabetize (GList *list)
+{
+	return g_list_sort (list, (GCompareFunc) g_utf8_collate);
+}
+
+int
+eel_g_str_list_index (GList *str_list,
+		      const char *str)
+{
+	int i;
+	GList *l;
+	for (i = 0, l = str_list; l != NULL; l = l->next, i++) {
+		if (!strcmp (str, (const char*)l->data)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+/**
+ * eel_g_list_free_deep_custom
+ *
+ * Frees the elements of a list and then the list, using a custom free function.
+ *
+ * @list: List of elements that can be freed with the provided free function.
+ * @element_free_func: function to call with the data pointer and user_data to free it.
+ * @user_data: User data to pass to element_free_func
+ **/
+void
+eel_g_list_free_deep_custom (GList *list, GFunc element_free_func, gpointer user_data)
+{
+	g_list_foreach (list, element_free_func, user_data);
+	g_list_free (list);
+}
+
+/**
+ * eel_g_list_free_deep
+ *
+ * Frees the elements of a list and then the list.
+ * @list: List of elements that can be freed with g_free.
+ **/
+void
+eel_g_list_free_deep (GList *list)
+{
+	eel_g_list_free_deep_custom (list, (GFunc) g_free, NULL);
+}
+
+/**
+ * eel_g_list_free_deep_custom
+ *
+ * Frees the elements of a list and then the list, using a custom free function.
+ *
+ * @list: List of elements that can be freed with the provided free function.
+ * @element_free_func: function to call with the data pointer and user_data to free it.
+ * @user_data: User data to pass to element_free_func
+ **/
+void
+eel_g_slist_free_deep_custom (GSList *list, GFunc element_free_func, gpointer user_data)
+{
+	g_slist_foreach (list, element_free_func, user_data);
+	g_slist_free (list);
+}
+
+/**
+ * eel_g_slist_free_deep
+ *
+ * Frees the elements of a list and then the list.
+ * @list: List of elements that can be freed with g_free.
+ **/
+void
+eel_g_slist_free_deep (GSList *list)
+{
+	eel_g_slist_free_deep_custom (list, (GFunc) g_free, NULL);
+}
+
+
+/**
+ * eel_g_strv_find
+ * 
+ * Get index of string in array of strings.
+ * 
+ * @strv: NULL-terminated array of strings.
+ * @find_me: string to search for.
+ * 
+ * Return value: index of array entry in @strv that
+ * matches @find_me, or -1 if no matching entry.
+ */
+int
+eel_g_strv_find (char **strv, const char *find_me)
+{
+	int index;
+
+	g_return_val_if_fail (find_me != NULL, -1);
+	
+	for (index = 0; strv[index] != NULL; ++index) {
+		if (strcmp (strv[index], find_me) == 0) {
+			return index;
+		}
+	}
+
+	return -1;
+}
+
+static int
+compare_pointers (gconstpointer pointer_1, gconstpointer pointer_2)
+{
+	if ((const char *) pointer_1 < (const char *) pointer_2) {
+		return -1;
+	}
+	if ((const char *) pointer_1 > (const char *) pointer_2) {
+		return +1;
+	}
+	return 0;
+}
+
+gboolean
+eel_g_lists_sort_and_check_for_intersection (GList **list_1,
+					     GList **list_2) 
+
+{
+	GList *node_1, *node_2;
+	int compare_result;
+	
+	*list_1 = g_list_sort (*list_1, compare_pointers);
+	*list_2 = g_list_sort (*list_2, compare_pointers);
+
+	node_1 = *list_1;
+	node_2 = *list_2;
+
+	while (node_1 != NULL && node_2 != NULL) {
+		compare_result = compare_pointers (node_1->data, node_2->data);
+		if (compare_result == 0) {
+			return TRUE;
+		}
+		if (compare_result <= 0) {
+			node_1 = node_1->next;
+		}
+		if (compare_result >= 0) {
+			node_2 = node_2->next;
+		}
+	}
+
+	return FALSE;
+}
+
+
+/**
+ * eel_g_list_partition
+ * 
+ * Parition a list into two parts depending on whether the data
+ * elements satisfy a provided predicate. Order is preserved in both
+ * of the resulting lists, and the original list is consumed. A list
+ * of the items that satisfy the predicate is returned, and the list
+ * of items not satisfying the predicate is returned via the failed
+ * out argument.
+ * 
+ * @list: List to partition.
+ * @predicate: Function to call on each element.
+ * @user_data: Data to pass to function.  
+ * @failed: The GList * variable pointed to by this argument will be
+ * set to the list of elements for which the predicate returned
+ * false. */
+
+GList *
+eel_g_list_partition (GList *list,
+			   EelPredicateFunction  predicate,
+			   gpointer user_data,
+			   GList **failed)
+{
+	GList *predicate_true;
+	GList *predicate_false;
+	GList *reverse;
+	GList *p;
+	GList *next;
+
+	predicate_true = NULL;
+	predicate_false = NULL;
+
+	reverse = g_list_reverse (list);
+
+	for (p = reverse; p != NULL; p = next) {
+		next = p->next;
+		
+		if (next != NULL) {
+			next->prev = NULL;
+		}
+
+		if (predicate (p->data, user_data)) {
+			p->next = predicate_true;
+ 			if (predicate_true != NULL) {
+				predicate_true->prev = p;
+			}
+			predicate_true = p;
+		} else {
+			p->next = predicate_false;
+ 			if (predicate_false != NULL) {
+				predicate_false->prev = p;
+			}
+			predicate_false = p;
+		}
+	}
+
+	*failed = predicate_false;
+	return predicate_true;
+}
+
+/**
+ * eel_get_system_time
+ * 
+ * Return value: number of microseconds since the machine was turned on
+ */
+gint64
+eel_get_system_time (void)
+{
+	struct timeval tmp;
+
+	gettimeofday (&tmp, NULL);
+	return (gint64)tmp.tv_usec + (gint64)tmp.tv_sec * G_GINT64_CONSTANT (1000000);
+}
+
+static void
+print_key_string (gpointer key, gpointer value, gpointer callback_data)
+{
+	g_assert (callback_data == NULL);
+
+	g_print ("--> %s\n", (char *) key);
+}
+
+static void
+free_hash_tables_at_exit (void)
+{
+	GList *p;
+	HashTableToFree *hash_table_to_free;
+	guint size;
+
+	for (p = hash_tables_to_free_at_exit; p != NULL; p = p->next) {
+		hash_table_to_free = p->data;
+
+		size = g_hash_table_size (hash_table_to_free->hash_table);
+		if (size != 0) {
+			if (hash_table_to_free->keys_known_to_be_strings) {
+				g_print ("\n--- Hash table keys for warning below:\n");
+				g_hash_table_foreach (hash_table_to_free->hash_table,
+						      print_key_string,
+						      NULL);
+			}
+			g_warning ("\"%s\" hash table still has %u element%s at quit time%s",
+				   hash_table_to_free->display_name, size,
+				   size == 1 ? "" : "s",
+				   hash_table_to_free->keys_known_to_be_strings
+				   ? " (keys above)" : "");
+		}
+
+		g_hash_table_destroy (hash_table_to_free->hash_table);
+		g_free (hash_table_to_free->display_name);
+		g_free (hash_table_to_free);
+	}
+	g_list_free (hash_tables_to_free_at_exit);
+	hash_tables_to_free_at_exit = NULL;
+}
+
+GHashTable *
+eel_g_hash_table_new_free_at_exit (GHashFunc hash_func,
+				   GCompareFunc key_compare_func,
+				   const char *display_name)
+{
+	GHashTable *hash_table;
+	HashTableToFree *hash_table_to_free;
+
+	/* FIXME: We can take out the NAUTILUS_DEBUG check once we
+	 * have fixed more of the leaks. For now, it's a bit too noisy
+	 * for the general public.
+	 */
+	if (hash_tables_to_free_at_exit == NULL) {
+		eel_debug_call_at_shutdown (free_hash_tables_at_exit);
+	}
+
+	hash_table = g_hash_table_new (hash_func, key_compare_func);
+
+	hash_table_to_free = g_new (HashTableToFree, 1);
+	hash_table_to_free->hash_table = hash_table;
+	hash_table_to_free->display_name = g_strdup (display_name);
+	hash_table_to_free->keys_known_to_be_strings =
+		hash_func == g_str_hash;
+
+	hash_tables_to_free_at_exit = g_list_prepend
+		(hash_tables_to_free_at_exit, hash_table_to_free);
+
+	return hash_table;
+}
+
+typedef struct {
+	GList *keys;
+	GList *values;
+} FlattenedHashTable;
+
+static void
+flatten_hash_table_element (gpointer key, gpointer value, gpointer callback_data)
+{
+	FlattenedHashTable *flattened_table;
+
+	flattened_table = callback_data;
+	flattened_table->keys = g_list_prepend
+		(flattened_table->keys, key);
+	flattened_table->values = g_list_prepend
+		(flattened_table->values, value);
+}
+
+void
+eel_g_hash_table_safe_for_each (GHashTable *hash_table,
+				GHFunc callback,
+				gpointer callback_data)
+{
+	FlattenedHashTable flattened;
+	GList *p, *q;
+
+	flattened.keys = NULL;
+	flattened.values = NULL;
+
+	g_hash_table_foreach (hash_table,
+			      flatten_hash_table_element,
+			      &flattened);
+
+	for (p = flattened.keys, q = flattened.values;
+	     p != NULL;
+	     p = p->next, q = q->next) {
+		(* callback) (p->data, q->data, callback_data);
+	}
+
+	g_list_free (flattened.keys);
+	g_list_free (flattened.values);
+}
+
+int
+eel_round (double d)
+{
+	double val;
+
+	val = floor (d + .5);
+
+	/* The tests are needed because the result of floating-point to integral
+	 * conversion is undefined if the floating point value is not representable
+	 * in the new type. E.g. the magnititude is too large or a negative
+	 * floating-point value being converted to an unsigned.
+	 */
+	g_return_val_if_fail (val <= INT_MAX, INT_MAX);
+	g_return_val_if_fail (val >= INT_MIN, INT_MIN);
+
+	return val;
+}
+
+GList *
+eel_g_list_from_g_slist (GSList *slist)
+{
+	GList *list;
+	GSList *node;
+
+	list = NULL;
+	for (node = slist; node != NULL; node = node->next) {
+		list = g_list_prepend (list, node->data);
+	}
+	return g_list_reverse (list);
+}
+
+GSList *
+eel_g_slist_from_g_list (GList *list)
+{
+	GSList *slist;
+	GList *node;
+
+	slist = NULL;
+	for (node = list; node != NULL; node = node->next) {
+		slist = g_slist_prepend (slist, node->data);
+	}
+	return g_slist_reverse (slist);
+}
+
+/* Return the operating system name: Linux, Solaris, etc. */
+char *
+eel_get_operating_system_name (void)
+{
+	struct utsname buffer;
+
+	if (uname (&buffer) != -1) {
+		/* Check for special sysnames for which there is 
+		 * more accepted names.
+		 */
+		if (eel_str_is_equal (buffer.sysname, "SunOS")) {
+			return g_strdup ("Solaris");
+		}
+
+		return g_strdup (buffer.sysname);
+	}
+
+	return g_strdup ("Unix");
+}
+
+int
+eel_compare_integer (gconstpointer a,
+			  gconstpointer b)
+{
+	int int_a;
+	int int_b;
+
+	int_a = GPOINTER_TO_INT (a);
+	int_b = GPOINTER_TO_INT (b);
+
+	if (int_a == int_b) {
+		return 0;
+	}
+
+	return int_a < int_b ? -1 : 1;
+}
+
+/**
+ * eel_g_object_list_ref
+ *
+ * Ref all the objects in a list.
+ * @list: GList of objects.
+ **/
+GList *
+eel_g_object_list_ref (GList *list)
+{
+	g_list_foreach (list, (GFunc) g_object_ref, NULL);
+	return list;
+}
+
+/**
+ * eel_g_object_list_unref
+ *
+ * Unref all the objects in a list.
+ * @list: GList of objects.
+ **/
+void
+eel_g_object_list_unref (GList *list)
+{
+	g_list_foreach (list, (GFunc) g_object_unref, NULL);
+}
+
+/**
+ * eel_g_object_list_free
+ *
+ * Free a list of objects after unrefing them.
+ * @list: GList of objects.
+ **/
+void
+eel_g_object_list_free (GList *list)
+{
+	eel_g_object_list_unref (list);
+	g_list_free (list);
+}
+
+/**
+ * eel_g_object_list_copy
+ *
+ * Copy the list of objects, ref'ing each one.
+ * @list: GList of objects.
+ **/
+GList *
+eel_g_object_list_copy (GList *list)
+{
+	return g_list_copy (eel_g_object_list_ref (list));
+}
+
+/**
+ * eel_add_weak_pointer
+ *
+ * Nulls out a saved reference to an object when the object gets destroyed.
+ *
+ * @pointer_location: Address of the saved pointer.
+ **/
+void 
+eel_add_weak_pointer (gpointer pointer_location)
+{
+	gpointer *object_location;
+
+	g_return_if_fail (pointer_location != NULL);
+
+	object_location = (gpointer *) pointer_location;
+	if (*object_location == NULL) {
+		/* The reference is NULL, nothing to do. */
+		return;
+	}
+
+	g_return_if_fail (G_IS_OBJECT (*object_location));
+
+	g_object_add_weak_pointer (G_OBJECT (*object_location),
+				   object_location);
+}
+
+/**
+ * eel_remove_weak_pointer
+ *
+ * Removes the weak pointer that was added by eel_add_weak_pointer.
+ * Also nulls out the pointer.
+ *
+ * @pointer_location: Pointer that was passed to eel_add_weak_pointer.
+ **/
+void 
+eel_remove_weak_pointer (gpointer pointer_location)
+{
+	gpointer *object_location;
+
+	g_return_if_fail (pointer_location != NULL);
+
+	object_location = (gpointer *) pointer_location;	
+	if (*object_location == NULL) {
+		/* The object was already destroyed and the reference
+		 * nulled out, nothing to do.
+		 */
+		return;
+	}
+
+	g_return_if_fail (G_IS_OBJECT (*object_location));
+
+	g_object_remove_weak_pointer (G_OBJECT (*object_location),
+				      object_location);
+	
+	*object_location = NULL;
+}
+
+/* Get the filename encoding, returns TRUE if utf8 */
+
+typedef struct _EelFilenameCharsetCache EelFilenameCharsetCache;
+
+struct _EelFilenameCharsetCache {
+  gboolean is_utf8;
+  gchar *charset;
+  gchar *filename_charset;
+};
+
+static void
+filename_charset_cache_free (gpointer data)
+{
+  EelFilenameCharsetCache *cache = data;
+  g_free (cache->charset);
+  g_free (cache->filename_charset);
+  g_free (cache);
+}
+
+/*
+ * eel_get_filename_charset:
+ * @charset: return location for the name of the filename encoding 
+ *
+ * Determines the character set used for filenames by consulting the 
+ * environment variables G_FILENAME_ENCODING and G_BROKEN_FILENAMES. 
+ *
+ * G_FILENAME_ENCODING may be set to a comma-separated list of character 
+ * set names. The special token "@locale" is taken to mean the character set 
+ * for the current locale. The first character set from the list is taken 
+ * as the filename encoding. 
+ * If G_FILENAME_ENCODING is not set, but G_BROKEN_FILENAMES is, the
+ * character set of the current locale is taken as the filename encoding.
+ *
+ * The returned @charset belongs to Eel and must not be freed.
+ * 
+ * Return value: %TRUE if the charset used for filename is UTF-8.
+ */
+gboolean
+eel_get_filename_charset (const gchar **filename_charset)
+{
+  static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
+  EelFilenameCharsetCache *cache = g_static_private_get (&cache_private);
+  const gchar *charset;
+  
+  if (!cache)
+    {
+      cache = g_new0 (EelFilenameCharsetCache, 1);
+      g_static_private_set (&cache_private, cache, filename_charset_cache_free);
+    }
+
+  g_get_charset (&charset);
+
+  if (!(cache->charset && strcmp (cache->charset, charset) == 0))
+    {
+      const gchar *new_charset;
+      gchar *p, *q;
+
+      g_free (cache->charset);
+      g_free (cache->filename_charset);
+      cache->charset = g_strdup (charset);
+      
+      p = getenv ("G_FILENAME_ENCODING");
+      if (p != NULL) 
+	{
+	  q = strchr (p, ',');
+	  if (!q) 
+	    q = p + strlen (p);
+
+	  if (strncmp ("@locale", p, q - p) == 0)
+	    {
+	      cache->is_utf8 = g_get_charset (&new_charset);
+	      cache->filename_charset = g_strdup (new_charset);
+	    }
+	  else
+	    {
+	      cache->filename_charset = g_strndup (p, q - p);
+	      cache->is_utf8 = (strcmp (cache->filename_charset, "UTF-8") == 0);
+	    }
+	}
+      else if (getenv ("G_BROKEN_FILENAMES") != NULL)
+	{
+	  cache->is_utf8 = g_get_charset (&new_charset);
+	  cache->filename_charset = g_strdup (new_charset);
+	}
+      else 
+	{
+	  cache->filename_charset = g_strdup ("UTF-8");
+	  cache->is_utf8 = TRUE;
+	}
+    }
+
+  if (filename_charset)
+    *filename_charset = cache->filename_charset;
+
+  return cache->is_utf8;
+}
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+static void 
+check_tm_to_g_date (time_t time)
+{
+	struct tm *before_conversion;
+	struct tm after_conversion;
+	GDate *date;
+
+	before_conversion = localtime (&time);
+	date = eel_g_date_new_tm (before_conversion);
+
+	g_date_to_struct_tm (date, &after_conversion);
+
+	g_date_free (date);
+
+	EEL_CHECK_INTEGER_RESULT (after_conversion.tm_mday,
+				       before_conversion->tm_mday);
+	EEL_CHECK_INTEGER_RESULT (after_conversion.tm_mon,
+				       before_conversion->tm_mon);
+	EEL_CHECK_INTEGER_RESULT (after_conversion.tm_year,
+				       before_conversion->tm_year);
+}
+
+static gboolean
+eel_test_predicate (gpointer data,
+		    gpointer callback_data)
+{
+	return g_ascii_strcasecmp (data, callback_data) <= 0;
+}
+
+static char *
+test_strftime (const char *format,
+	       int year,
+	       int month,
+	       int day,
+	       int hour,
+	       int minute,
+	       int second)
+{
+	struct tm time_pieces;
+
+	time_pieces.tm_sec = second;
+	time_pieces.tm_min = minute;
+	time_pieces.tm_hour = hour;
+	time_pieces.tm_mday = day;
+	time_pieces.tm_mon = month - 1;
+	time_pieces.tm_year = year - 1900;
+	time_pieces.tm_isdst = -1;
+	mktime (&time_pieces);
+
+	return eel_strdup_strftime (format, &time_pieces);
+}
+
+void
+eel_self_check_glib_extensions (void)
+{
+	char **strv;
+	GList *compare_list_1;
+	GList *compare_list_2;
+	GList *compare_list_3;
+	GList *compare_list_4;
+	GList *compare_list_5;
+	gint64 time1, time2;
+	GList *list_to_partition;
+	GList *expected_passed;
+	GList *expected_failed;
+	GList *actual_passed;
+	GList *actual_failed;
+	char *huge_string;
+	
+	check_tm_to_g_date (0);			/* lower limit */
+	check_tm_to_g_date ((time_t) -1);	/* upper limit */
+	check_tm_to_g_date (time (NULL));	/* current time */
+
+	strv = g_strsplit ("zero|one|two|three|four", "|", 0);
+	EEL_CHECK_INTEGER_RESULT (eel_g_strv_find (strv, "zero"), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_g_strv_find (strv, "one"), 1);
+	EEL_CHECK_INTEGER_RESULT (eel_g_strv_find (strv, "four"), 4);
+	EEL_CHECK_INTEGER_RESULT (eel_g_strv_find (strv, "five"), -1);
+	EEL_CHECK_INTEGER_RESULT (eel_g_strv_find (strv, ""), -1);
+	EEL_CHECK_INTEGER_RESULT (eel_g_strv_find (strv, "o"), -1);
+	g_strfreev (strv);
+
+	/* eel_get_system_time */
+	time1 = eel_get_system_time ();
+	time2 = eel_get_system_time ();
+	EEL_CHECK_BOOLEAN_RESULT (time1 - time2 > -1000, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (time1 - time2 <= 0, TRUE);
+
+	/* eel_g_str_list_equal */
+
+	/* We g_strdup because identical string constants can be shared. */
+
+	compare_list_1 = NULL;
+	compare_list_1 = g_list_append (compare_list_1, g_strdup ("Apple"));
+	compare_list_1 = g_list_append (compare_list_1, g_strdup ("zebra"));
+	compare_list_1 = g_list_append (compare_list_1, g_strdup ("!@#!@$#@$!"));
+
+	compare_list_2 = NULL;
+	compare_list_2 = g_list_append (compare_list_2, g_strdup ("Apple"));
+	compare_list_2 = g_list_append (compare_list_2, g_strdup ("zebra"));
+	compare_list_2 = g_list_append (compare_list_2, g_strdup ("!@#!@$#@$!"));
+
+	compare_list_3 = NULL;
+	compare_list_3 = g_list_append (compare_list_3, g_strdup ("Apple"));
+	compare_list_3 = g_list_append (compare_list_3, g_strdup ("zebra"));
+
+	compare_list_4 = NULL;
+	compare_list_4 = g_list_append (compare_list_4, g_strdup ("Apple"));
+	compare_list_4 = g_list_append (compare_list_4, g_strdup ("zebra"));
+	compare_list_4 = g_list_append (compare_list_4, g_strdup ("!@#!@$#@$!"));
+	compare_list_4 = g_list_append (compare_list_4, g_strdup ("foobar"));
+
+	compare_list_5 = NULL;
+	compare_list_5 = g_list_append (compare_list_5, g_strdup ("Apple"));
+	compare_list_5 = g_list_append (compare_list_5, g_strdup ("zzzzzebraaaaaa"));
+	compare_list_5 = g_list_append (compare_list_5, g_strdup ("!@#!@$#@$!"));
+
+	EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_2), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_3), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_4), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_5), FALSE);
+
+	eel_g_list_free_deep (compare_list_1);
+	eel_g_list_free_deep (compare_list_2);
+	eel_g_list_free_deep (compare_list_3);
+	eel_g_list_free_deep (compare_list_4);
+	eel_g_list_free_deep (compare_list_5);
+
+	/* eel_g_list_partition */
+
+	list_to_partition = NULL;
+	list_to_partition = g_list_append (list_to_partition, "Cadillac");
+	list_to_partition = g_list_append (list_to_partition, "Pontiac");
+	list_to_partition = g_list_append (list_to_partition, "Ford");
+	list_to_partition = g_list_append (list_to_partition, "Range Rover");
+	
+	expected_passed = NULL;
+	expected_passed = g_list_append (expected_passed, "Cadillac");
+	expected_passed = g_list_append (expected_passed, "Ford");
+	
+	expected_failed = NULL;
+	expected_failed = g_list_append (expected_failed, "Pontiac");
+	expected_failed = g_list_append (expected_failed, "Range Rover");
+	
+	actual_passed = eel_g_list_partition (list_to_partition, 
+						   eel_test_predicate,
+						   "m",
+						   &actual_failed);
+	
+	EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (expected_passed, actual_passed), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (expected_failed, actual_failed), TRUE);
+	
+	/* Don't free "list_to_partition", since it is consumed
+	 * by eel_g_list_partition.
+	 */
+	
+	g_list_free (expected_passed);
+	g_list_free (actual_passed);
+	g_list_free (expected_failed);
+	g_list_free (actual_failed);
+
+	/* eel_strdup_strftime */
+	huge_string = g_new (char, 10000+1);
+	memset (huge_string, 'a', 10000);
+	huge_string[10000] = '\0';
+
+	setlocale (LC_TIME, "C");
+
+	EEL_CHECK_STRING_RESULT (test_strftime ("", 2000, 1, 1, 0, 0, 0), "");
+	EEL_CHECK_STRING_RESULT (test_strftime (huge_string, 2000, 1, 1, 0, 0, 0), huge_string);
+	EEL_CHECK_STRING_RESULT (test_strftime ("%%", 2000, 1, 1, 1, 0, 0), "%");
+	EEL_CHECK_STRING_RESULT (test_strftime ("%%%%", 2000, 1, 1, 1, 0, 0), "%%");
+	EEL_CHECK_STRING_RESULT (test_strftime ("%m/%d/%y, %I:%M %p", 2000, 1, 1, 1, 0, 0), "01/01/00, 01:00 AM");
+	EEL_CHECK_STRING_RESULT (test_strftime ("%-m/%-d/%y, %-I:%M %p", 2000, 1, 1, 1, 0, 0), "1/1/00, 1:00 AM");
+	EEL_CHECK_STRING_RESULT (test_strftime ("%_m/%_d/%y, %_I:%M %p", 2000, 1, 1, 1, 0, 0), " 1/ 1/00,  1:00 AM");
+
+	setlocale (LC_TIME, "");
+
+	g_free (huge_string);
+
+	/* eel_shell_quote */
+	EEL_CHECK_STRING_RESULT (g_shell_quote (""), "''");
+	EEL_CHECK_STRING_RESULT (g_shell_quote ("a"), "'a'");
+	EEL_CHECK_STRING_RESULT (g_shell_quote ("("), "'('");
+	EEL_CHECK_STRING_RESULT (g_shell_quote ("'"), "''\\'''");
+	EEL_CHECK_STRING_RESULT (g_shell_quote ("'a"), "''\\''a'");
+	EEL_CHECK_STRING_RESULT (g_shell_quote ("a'"), "'a'\\'''");
+	EEL_CHECK_STRING_RESULT (g_shell_quote ("a'a"), "'a'\\''a'");
+
+	/* eel_compare_integer */
+	EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (0)), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (1)), -1);
+	EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (1), GINT_TO_POINTER (0)), 1);
+	EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (0)), -1);
+	EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (-1)), 1);
+	EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (-1)), 0);
+
+#ifdef __linux__
+	EEL_CHECK_STRING_RESULT (eel_get_operating_system_name (), "Linux");
+#endif
+}
+
+#endif /* !EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h
new file mode 100644
index 000000000..bb3c41a30
--- /dev/null
+++ b/eel/eel-glib-extensions.h
@@ -0,0 +1,126 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-glib-extensions.h - interface for new functions that conceptually
+                                belong in glib. Perhaps some of these will be
+                                actually rolled into glib someday.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: John Sullivan <sullivan@eazel.com>
+*/
+
+#ifndef EEL_GLIB_EXTENSIONS_H
+#define EEL_GLIB_EXTENSIONS_H
+
+#include <glib.h>
+
+/* A gboolean variant for bit fields. */
+typedef guint eel_boolean_bit;
+
+/* Callback functions that have user data. */
+typedef int      (* EelCompareFunction)   (gconstpointer a,
+					   gconstpointer b,
+					   gpointer callback_data);
+typedef int      (* EelSearchFunction)    (gconstpointer item,
+					   gpointer callback_data);
+
+/* Predicate. */
+typedef gboolean (* EelPredicateFunction) (gpointer data,
+					   gpointer callback_data);
+
+/* Date & time functions. */
+GDate *     eel_g_date_new_tm                           (struct tm             *time_pieces);
+char *      eel_strdup_strftime                         (const char            *format,
+							 struct tm             *time_pieces);
+
+/* GList functions. */
+gboolean    eel_g_list_exactly_one_item                 (GList                 *list);
+gboolean    eel_g_list_more_than_one_item               (GList                 *list);
+gboolean    eel_g_list_equal                            (GList                 *list_a,
+							 GList                 *list_b);
+gboolean    eel_g_lists_sort_and_check_for_intersection (GList                **list_a,
+							 GList                **list_b);
+GList *     eel_g_list_partition                        (GList                 *list,
+							 EelPredicateFunction   predicate,
+							 gpointer               user_data,
+							 GList                **removed);
+
+/* List functions for lists of g_free'able objects. */
+void        eel_g_list_free_deep                        (GList                 *list);
+void        eel_g_list_free_deep_custom                 (GList                 *list,
+							 GFunc                  element_free_func,
+							 gpointer               user_data);
+
+/* GSList functions. */
+GList *     eel_g_list_from_g_slist                     (GSList                *list);
+GSList *    eel_g_slist_from_g_list                     (GList                 *list);
+
+/* List functions for slists of g_free'able objects. */
+void        eel_g_slist_free_deep                       (GSList                *list);
+void        eel_g_slist_free_deep_custom                (GSList                *list,
+							 GFunc                  element_free_func,
+							 gpointer               user_data);
+
+/* List functions for lists of C strings. */
+gboolean    eel_g_str_list_equal                        (GList                 *str_list_a,
+							 GList                 *str_list_b);
+GList *     eel_g_str_list_copy                         (GList                 *str_list);
+GList *     eel_g_str_list_alphabetize                  (GList                 *str_list);
+int         eel_g_str_list_index                        (GList                 *str_list,
+							 const char            *str);
+
+/* List functions for lists of objects */
+GList *     eel_g_object_list_ref                       (GList                 *list);
+void        eel_g_object_list_unref                     (GList                 *list);
+void        eel_g_object_list_free                      (GList                 *list);
+GList *     eel_g_object_list_copy                      (GList                 *list);
+
+/* GHashTable functions */
+GHashTable *eel_g_hash_table_new_free_at_exit           (GHashFunc              hash_function,
+							 GCompareFunc           key_compare_function,
+							 const char            *display_name);
+void        eel_g_hash_table_safe_for_each              (GHashTable            *hash_table,
+							 GHFunc                 callback,
+							 gpointer               callback_data);
+
+/* NULL terminated string arrays (strv). */
+int         eel_g_strv_find                             (char                 **strv,
+							 const char            *find_me);
+
+/* return the time in microseconds since the machine was started */
+gint64      eel_get_system_time                         (void);
+
+/* math */
+int         eel_round                                   (double                 d);
+
+/* A GCompareFunc for integers */
+int         eel_compare_integer                         (gconstpointer          a,
+							 gconstpointer          b);
+
+/* Return the operating system name: Linux, Solaris, etc. */
+char *      eel_get_operating_system_name               (void);
+
+/* Better weak pointer functions */
+void        eel_add_weak_pointer                        (gpointer               pointer_location);
+void        eel_remove_weak_pointer                     (gpointer               pointer_location);
+
+/* Get the filename encoding, returns TRUE if utf8 */
+gboolean    eel_get_filename_charset                    (const gchar **filename_charset);
+
+
+#endif /* EEL_GLIB_EXTENSIONS_H */
diff --git a/eel/eel-gnome-extensions.c b/eel/eel-gnome-extensions.c
new file mode 100644
index 000000000..b6a27a5c6
--- /dev/null
+++ b/eel/eel-gnome-extensions.c
@@ -0,0 +1,203 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gnome-extensions.c - implementation of new functions that operate on
+                            gnome classes. Perhaps some of these should be
+  			    rolled into gnome someday.
+
+   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+
+#include "eel-gnome-extensions.h"
+#include "eel-art-extensions.h"
+#include "eel-gdk-extensions.h"
+#include "eel-glib-extensions.h"
+#include "eel-gtk-extensions.h"
+#include "eel-stock-dialogs.h"
+#include "eel-i18n.h"
+#include <X11/Xatom.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <libgnome/gnome-desktop-utils.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+/* Return a command string containing the path to a terminal on this system. */
+
+static char *
+try_terminal_command (const char *program,
+		      const char *args)
+{
+	char *program_in_path, *quoted, *result;
+
+	if (program == NULL) {
+		return NULL;
+	}
+
+	program_in_path = g_find_program_in_path (program);
+	if (program_in_path == NULL) {
+		return NULL;
+	}
+
+	quoted = g_shell_quote (program_in_path);
+	if (args == NULL || args[0] == '\0') {
+		return quoted;
+	}
+	result = g_strconcat (quoted, " ", args, NULL);
+	g_free (quoted);
+	return result;
+}
+
+static char *
+try_terminal_command_argv (int argc,
+			   char **argv)
+{
+	GString *string;
+	int i;
+	char *quoted, *result;
+
+	if (argc == 0) {
+		return NULL;
+	}
+
+	if (argc == 1) {
+		return try_terminal_command (argv[0], NULL);
+	}
+	
+	string = g_string_new (argv[1]);
+	for (i = 2; i < argc; i++) {
+		quoted = g_shell_quote (argv[i]);
+		g_string_append_c (string, ' ');
+		g_string_append (string, quoted);
+		g_free (quoted);
+	}
+	result = try_terminal_command (argv[0], string->str);
+	g_string_free (string, TRUE);
+
+	return result;
+}
+
+static char *
+get_terminal_command_prefix (gboolean for_command)
+{
+	int argc;
+	char **argv;
+	char *command;
+	guint i;
+	static const char *const commands[][3] = {
+		{ "gnome-terminal", "-x",                                      "" },
+		{ "dtterm",         "-e",                                      "-ls" },
+		{ "nxterm",         "-e",                                      "-ls" },
+		{ "color-xterm",    "-e",                                      "-ls" },
+		{ "rxvt",           "-e",                                      "-ls" },
+		{ "xterm",          "-e",                                      "-ls" },
+	};
+
+	/* Try the terminal from preferences. Use without any
+	 * arguments if we are just doing a standalone terminal.
+	 */
+	argc = 0;
+	argv = g_new0 (char *, 1);
+	gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
+
+	command = NULL;
+	if (argc != 0) {
+		if (for_command) {
+			command = try_terminal_command_argv (argc, argv);
+		} else {
+			/* Strip off the arguments in a lame attempt
+			 * to make it be an interactive shell.
+			 */
+			command = try_terminal_command (argv[0], NULL);
+		}
+	}
+
+	while (argc != 0) {
+		g_free (argv[--argc]);
+	}
+	g_free (argv);
+
+	if (command != NULL) {
+		return command;
+	}
+
+	/* Try well-known terminal applications in same order that gmc did. */
+	for (i = 0; i < G_N_ELEMENTS (commands); i++) {
+		command = try_terminal_command (commands[i][0],
+						commands[i][for_command ? 1 : 2]);
+		if (command != NULL) {
+			break;
+		}
+	}
+	
+	return command;
+}
+
+char *
+eel_gnome_make_terminal_command (const char *command)
+{
+	char *prefix, *quoted, *terminal_command;
+
+	if (command == NULL) {
+		return get_terminal_command_prefix (FALSE);
+	}
+	prefix = get_terminal_command_prefix (TRUE);
+	quoted = g_shell_quote (command);
+	terminal_command = g_strconcat (prefix, " /bin/sh -c ", quoted, NULL);
+	g_free (prefix);
+	g_free (quoted);
+	return terminal_command;
+}
+
+void
+eel_gnome_open_terminal_on_screen (const char *command,
+				   GdkScreen  *screen)
+{
+	char *command_line;
+
+	if (screen == NULL) {
+		screen = gdk_screen_get_default ();
+	}
+	
+	command_line = eel_gnome_make_terminal_command (command);
+	if (command_line == NULL) {
+		g_message ("Could not start a terminal");
+		return;
+	}
+	gdk_spawn_command_line_on_screen (screen, command_line, NULL);
+	g_free (command_line);
+}
+
+void
+eel_gnome_open_terminal (const char *command)
+{
+	eel_gnome_open_terminal_on_screen (command, NULL);
+}
diff --git a/eel/eel-gnome-extensions.h b/eel/eel-gnome-extensions.h
new file mode 100644
index 000000000..aea54f005
--- /dev/null
+++ b/eel/eel-gnome-extensions.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gnome-extensions.h - interface for new functions that operate on
+                                 gnome classes. Perhaps some of these should be
+  			         rolled into gnome someday.
+
+   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#ifndef EEL_GNOME_EXTENSIONS_H
+#define EEL_GNOME_EXTENSIONS_H
+
+#include <gtk/gtk.h>
+
+/* icon selection callback function. */
+typedef void (* EelIconSelectionFunction) (const char *icon_path, gpointer callback_data);
+
+
+/* Return a command string containing the path to a terminal on this system. */
+char *        eel_gnome_make_terminal_command                         (const char               *command);
+
+/* Open up a new terminal, optionally passing in a command to execute */
+void          eel_gnome_open_terminal                                 (const char               *command);
+void          eel_gnome_open_terminal_on_screen                       (const char               *command,
+								       GdkScreen                *screen);
+								 
+#endif /* EEL_GNOME_EXTENSIONS_H */
diff --git a/eel/eel-graphic-effects.c b/eel/eel-graphic-effects.c
new file mode 100644
index 000000000..7d62987bb
--- /dev/null
+++ b/eel/eel-graphic-effects.c
@@ -0,0 +1,399 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* Eel - pixbuf manipulation routines for graphical effects.
+ *
+ * Copyright (C) 2000 Eazel, Inc
+ *
+ * Author: Andy Hertzfeld <andy@eazel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* This file contains pixbuf manipulation routines used for graphical effects like pre-lighting
+   and selection hilighting */
+
+#include <config.h>
+#include "eel-graphic-effects.h"
+#include <string.h>
+
+/* shared utility to create a new pixbuf from the passed-in one */
+
+static GdkPixbuf *
+create_new_pixbuf (GdkPixbuf *src)
+{
+	g_assert (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB);
+	g_assert ((!gdk_pixbuf_get_has_alpha (src)
+			       && gdk_pixbuf_get_n_channels (src) == 3)
+			      || (gdk_pixbuf_get_has_alpha (src)
+				  && gdk_pixbuf_get_n_channels (src) == 4));
+
+	return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
+			       gdk_pixbuf_get_has_alpha (src),
+			       gdk_pixbuf_get_bits_per_sample (src),
+			       gdk_pixbuf_get_width (src),
+			       gdk_pixbuf_get_height (src));
+}
+
+static GdkPixbuf *
+create_new_pixbuf_with_alpha (GdkPixbuf *src)
+{
+	g_assert (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB);
+	g_assert ((!gdk_pixbuf_get_has_alpha (src)
+			       && gdk_pixbuf_get_n_channels (src) == 3)
+			      || (gdk_pixbuf_get_has_alpha (src)
+				  && gdk_pixbuf_get_n_channels (src) == 4));
+
+	return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
+			       TRUE,
+			       gdk_pixbuf_get_bits_per_sample (src),
+			       gdk_pixbuf_get_width (src),
+			       gdk_pixbuf_get_height (src));
+}
+
+/* utility routine to bump the level of a color component with pinning */
+
+static guchar
+lighten_component (guchar cur_value)
+{
+	int new_value = cur_value;
+	new_value += 24 + (new_value >> 3);
+	if (new_value > 255) {
+		new_value = 255;
+	}
+	return (guchar) new_value;
+}
+
+GdkPixbuf *
+eel_create_spotlight_pixbuf (GdkPixbuf* src)
+{
+	GdkPixbuf *dest;
+	int i, j;
+	int width, height, has_alpha, src_row_stride, dst_row_stride;
+	guchar *target_pixels, *original_pixels;
+	guchar *pixsrc, *pixdest;
+
+	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
+	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
+			       && gdk_pixbuf_get_n_channels (src) == 3)
+			      || (gdk_pixbuf_get_has_alpha (src)
+				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
+	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
+
+	dest = create_new_pixbuf (src);
+	
+	has_alpha = gdk_pixbuf_get_has_alpha (src);
+	width = gdk_pixbuf_get_width (src);
+	height = gdk_pixbuf_get_height (src);
+	dst_row_stride = gdk_pixbuf_get_rowstride (dest);
+	src_row_stride = gdk_pixbuf_get_rowstride (src);
+	target_pixels = gdk_pixbuf_get_pixels (dest);
+	original_pixels = gdk_pixbuf_get_pixels (src);
+
+	for (i = 0; i < height; i++) {
+		pixdest = target_pixels + i * dst_row_stride;
+		pixsrc = original_pixels + i * src_row_stride;
+		for (j = 0; j < width; j++) {		
+			*pixdest++ = lighten_component (*pixsrc++);
+			*pixdest++ = lighten_component (*pixsrc++);
+			*pixdest++ = lighten_component (*pixsrc++);
+			if (has_alpha) {
+				*pixdest++ = *pixsrc++;
+			}
+		}
+	}
+	return dest;
+}
+
+
+/* the following routine was stolen from the panel to darken a pixbuf, by manipulating the saturation */
+
+/* saturation is 0-255, darken is 0-255 */
+
+GdkPixbuf *
+eel_create_darkened_pixbuf (GdkPixbuf *src, int saturation, int darken)
+{
+	gint i, j;
+	gint width, height, src_row_stride, dest_row_stride;
+	gboolean has_alpha;
+	guchar *target_pixels, *original_pixels;
+	guchar *pixsrc, *pixdest;
+	guchar intensity;
+	guchar alpha;
+	guchar negalpha;
+	guchar r, g, b;
+	GdkPixbuf *dest;
+
+	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
+	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
+			       && gdk_pixbuf_get_n_channels (src) == 3)
+			      || (gdk_pixbuf_get_has_alpha (src)
+				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
+	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
+
+	dest = create_new_pixbuf (src);
+
+	has_alpha = gdk_pixbuf_get_has_alpha (src);
+	width = gdk_pixbuf_get_width (src);
+	height = gdk_pixbuf_get_height (src);
+	dest_row_stride = gdk_pixbuf_get_rowstride (dest);
+	src_row_stride = gdk_pixbuf_get_rowstride (src);
+	target_pixels = gdk_pixbuf_get_pixels (dest);
+	original_pixels = gdk_pixbuf_get_pixels (src);
+
+	for (i = 0; i < height; i++) {
+		pixdest = target_pixels + i * dest_row_stride;
+		pixsrc = original_pixels + i * src_row_stride;
+		for (j = 0; j < width; j++) {
+			r = *pixsrc++;
+			g = *pixsrc++;
+			b = *pixsrc++;
+			intensity = (r * 77 + g * 150 + b * 28) >> 8;
+			negalpha = ((255 - saturation) * darken) >> 8;
+			alpha = (saturation * darken) >> 8;
+			*pixdest++ = (negalpha * intensity + alpha * r) >> 8;
+			*pixdest++ = (negalpha * intensity + alpha * g) >> 8;
+			*pixdest++ = (negalpha * intensity + alpha * b) >> 8;
+			if (has_alpha) {
+				*pixdest++ = *pixsrc++;
+			}
+		}
+	}
+	return dest;
+}
+
+/* this routine colorizes the passed-in pixbuf by multiplying each pixel with the passed in color */
+
+GdkPixbuf *
+eel_create_colorized_pixbuf (GdkPixbuf *src,
+				  int red_value,
+				  int green_value,
+				  int blue_value)
+{
+	int i, j;
+	int width, height, has_alpha, src_row_stride, dst_row_stride;
+	guchar *target_pixels;
+	guchar *original_pixels;
+	guchar *pixsrc;
+	guchar *pixdest;
+	GdkPixbuf *dest;
+	
+	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
+	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
+			       && gdk_pixbuf_get_n_channels (src) == 3)
+			      || (gdk_pixbuf_get_has_alpha (src)
+				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
+	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
+
+	dest = create_new_pixbuf (src);
+	
+	has_alpha = gdk_pixbuf_get_has_alpha (src);
+	width = gdk_pixbuf_get_width (src);
+	height = gdk_pixbuf_get_height (src);
+	src_row_stride = gdk_pixbuf_get_rowstride (src);
+	dst_row_stride = gdk_pixbuf_get_rowstride (dest);
+	target_pixels = gdk_pixbuf_get_pixels (dest);
+	original_pixels = gdk_pixbuf_get_pixels (src);
+
+	for (i = 0; i < height; i++) {
+		pixdest = target_pixels + i*dst_row_stride;
+		pixsrc = original_pixels + i*src_row_stride;
+		for (j = 0; j < width; j++) {		
+			*pixdest++ = (*pixsrc++ * red_value) >> 8;
+			*pixdest++ = (*pixsrc++ * green_value) >> 8;
+			*pixdest++ = (*pixsrc++ * blue_value) >> 8;
+			if (has_alpha) {
+				*pixdest++ = *pixsrc++;
+			}
+		}
+	}
+	return dest;
+}
+
+/* utility to stretch a frame to the desired size */
+
+static void
+draw_frame_row (GdkPixbuf *frame_image, int target_width, int source_width, int source_v_position, int dest_v_position, GdkPixbuf *result_pixbuf, int left_offset, int height)
+{
+	int remaining_width, h_offset, slab_width;
+	
+	remaining_width = target_width;
+	h_offset = 0;
+	while (remaining_width > 0) {	
+		slab_width = remaining_width > source_width ? source_width : remaining_width;
+		gdk_pixbuf_copy_area (frame_image, left_offset, source_v_position, slab_width, height, result_pixbuf, left_offset + h_offset, dest_v_position);
+		remaining_width -= slab_width;
+		h_offset += slab_width; 
+	}
+}
+
+/* utility to draw the middle section of the frame in a loop */
+static void
+draw_frame_column (GdkPixbuf *frame_image, int target_height, int source_height, int source_h_position, int dest_h_position, GdkPixbuf *result_pixbuf, int top_offset, int width)
+{
+	int remaining_height, v_offset, slab_height;
+	
+	remaining_height = target_height;
+	v_offset = 0;
+	while (remaining_height > 0) {	
+		slab_height = remaining_height > source_height ? source_height : remaining_height;
+		gdk_pixbuf_copy_area (frame_image, source_h_position, top_offset, width, slab_height, result_pixbuf, dest_h_position, top_offset + v_offset);
+		remaining_height -= slab_height;
+		v_offset += slab_height; 
+	}
+}
+
+GdkPixbuf *
+eel_stretch_frame_image (GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset,
+			 int dest_width, int dest_height, gboolean fill_flag)
+{
+	GdkPixbuf *result_pixbuf;
+	guchar *pixels_ptr;
+	int frame_width, frame_height;
+	int y, row_stride;
+	int target_width, target_frame_width;
+	int target_height, target_frame_height;
+	
+	frame_width  = gdk_pixbuf_get_width  (frame_image);
+	frame_height = gdk_pixbuf_get_height (frame_image );
+	
+	if (fill_flag) {
+		result_pixbuf = gdk_pixbuf_scale_simple (frame_image, dest_width, dest_height, GDK_INTERP_NEAREST);
+	} else {
+		result_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, dest_width, dest_height);
+	}
+	row_stride = gdk_pixbuf_get_rowstride (result_pixbuf);
+	pixels_ptr = gdk_pixbuf_get_pixels (result_pixbuf);
+	
+	/* clear the new pixbuf */
+	if (!fill_flag) {
+		for (y = 0; y < dest_height; y++) {
+			memset (pixels_ptr, 255, row_stride);
+			pixels_ptr += row_stride; 
+		}
+	}
+	
+	target_width  = dest_width - left_offset - right_offset;
+	target_frame_width = frame_width - left_offset - right_offset;
+	
+	target_height  = dest_height - top_offset - bottom_offset;
+	target_frame_height = frame_height - top_offset - bottom_offset;
+	
+	/* draw the left top corner  and top row */
+	gdk_pixbuf_copy_area (frame_image, 0, 0, left_offset, top_offset, result_pixbuf, 0,  0);
+	draw_frame_row (frame_image, target_width, target_frame_width, 0, 0, result_pixbuf, left_offset, top_offset);
+	
+	/* draw the right top corner and left column */
+	gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, 0, right_offset, top_offset, result_pixbuf, dest_width - right_offset,  0);
+	draw_frame_column (frame_image, target_height, target_frame_height, 0, 0, result_pixbuf, top_offset, left_offset);
+
+	/* draw the bottom right corner and bottom row */
+	gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, frame_height - bottom_offset, right_offset, bottom_offset, result_pixbuf, dest_width - right_offset,  dest_height - bottom_offset);
+	draw_frame_row (frame_image, target_width, target_frame_width, frame_height - bottom_offset, dest_height - bottom_offset, result_pixbuf, left_offset, bottom_offset);
+		
+	/* draw the bottom left corner and the right column */
+	gdk_pixbuf_copy_area (frame_image, 0, frame_height - bottom_offset, left_offset, bottom_offset, result_pixbuf, 0,  dest_height - bottom_offset);
+	draw_frame_column (frame_image, target_height, target_frame_height, frame_width - right_offset, dest_width - right_offset, result_pixbuf, top_offset, right_offset);
+	
+	return result_pixbuf;
+}
+
+
+/* draw an arbitrary frame around an image, with the result passed back in a newly allocated pixbuf */
+GdkPixbuf *
+eel_embed_image_in_frame (GdkPixbuf *source_image, GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset)
+{
+	GdkPixbuf *result_pixbuf;
+	int source_width, source_height;
+	int dest_width, dest_height;
+	
+	source_width  = gdk_pixbuf_get_width  (source_image);
+	source_height = gdk_pixbuf_get_height (source_image);
+
+	dest_width  = source_width  + left_offset + right_offset;
+	dest_height = source_height + top_offset  + bottom_offset;
+	
+	result_pixbuf = eel_stretch_frame_image (frame_image, left_offset, top_offset, right_offset, bottom_offset, 
+						      dest_width, dest_height, FALSE);
+		
+	/* Finally, copy the source image into the framed area */
+	gdk_pixbuf_copy_area (source_image, 0, 0, source_width, source_height, result_pixbuf, left_offset,  top_offset);
+
+	return result_pixbuf;
+}
+
+
+/* this routine takes the source pixbuf and returns a new one that's semi-transparent, by
+   clearing every other pixel's alpha value in a checkerboard grip.  We have to do the
+   checkerboard instead of reducing the alpha since it will be turned into an alpha-less
+   gdkpixmap and mask for the actual dragging */
+
+GdkPixbuf *
+eel_make_semi_transparent (GdkPixbuf *src)
+{
+	gint i, j, temp_alpha;
+	gint width, height, has_alpha, src_row_stride, dst_row_stride;
+	guchar *target_pixels, *original_pixels;
+	guchar *pixsrc, *pixdest;
+	guchar alpha_value;
+	GdkPixbuf *dest_pixbuf;
+	guchar start_alpha_value;
+	
+	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
+	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
+			       && gdk_pixbuf_get_n_channels (src) == 3)
+			      || (gdk_pixbuf_get_has_alpha (src)
+				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
+	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
+
+	dest_pixbuf = create_new_pixbuf_with_alpha (src);
+
+	has_alpha = gdk_pixbuf_get_has_alpha (src);
+	width = gdk_pixbuf_get_width (src);
+	height = gdk_pixbuf_get_height (src);
+	src_row_stride = gdk_pixbuf_get_rowstride (src);
+	dst_row_stride = gdk_pixbuf_get_rowstride (dest_pixbuf);
+	
+	/* set up pointers to the actual pixels */
+	target_pixels = gdk_pixbuf_get_pixels (dest_pixbuf);
+	original_pixels = gdk_pixbuf_get_pixels (src);
+
+	/* loop through the pixels to do the actual work, copying from the source to the destination */
+	start_alpha_value = ~0;
+	for (i = 0; i < height; i++) {
+		pixdest = target_pixels + i * dst_row_stride;
+		pixsrc = original_pixels + i * src_row_stride;
+		alpha_value = start_alpha_value;
+		for (j = 0; j < width; j++) {
+			*pixdest++ = *pixsrc++; /* red */
+			*pixdest++ = *pixsrc++; /* green */
+			*pixdest++ = *pixsrc++; /* blue */
+			
+			if (has_alpha) {
+				temp_alpha = *pixsrc++;
+			} else {
+				temp_alpha = ~0;
+			}
+			*pixdest++ = temp_alpha & alpha_value;
+			
+			alpha_value = ~alpha_value;
+		}
+		
+		start_alpha_value = ~start_alpha_value;
+	}
+	
+	return dest_pixbuf;
+}
+
diff --git a/eel/eel-graphic-effects.h b/eel/eel-graphic-effects.h
new file mode 100644
index 000000000..41060e037
--- /dev/null
+++ b/eel/eel-graphic-effects.h
@@ -0,0 +1,66 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-graphic-effects.h: Pixmap manipulation routines for graphical effects.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+ 
+   Authors: Andy Hertzfeld <andy@eazel.com>
+ */
+
+#ifndef EEL_GRAPHIC_EFFECTS_H
+#define EEL_GRAPHIC_EFFECTS_H
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+/* return a lightened pixbuf for pre-lighting */
+GdkPixbuf *eel_create_spotlight_pixbuf (GdkPixbuf *source_pixbuf);
+
+/* return a darkened pixbuf for selection hiliting */
+GdkPixbuf *eel_create_darkened_pixbuf  (GdkPixbuf *source_pixbuf,
+					int        saturation,
+					int        darken);
+
+/* return a pixbuf colorized with the color specified by the parameters */
+GdkPixbuf* eel_create_colorized_pixbuf (GdkPixbuf *source_pixbuf,
+					int        red_value,
+					int        green_value,
+					int        blue_value);
+
+/* stretch a image frame */
+GdkPixbuf *eel_stretch_frame_image     (GdkPixbuf *frame_image,
+					int        left_offset,
+					int        top_offset,
+					int        right_offset,
+					int        bottom_offset,
+					int        dest_width,
+					int        dest_height,
+					gboolean   fill_flag);
+
+/* embed in image in a frame */
+GdkPixbuf *eel_embed_image_in_frame    (GdkPixbuf *source_image,
+					GdkPixbuf *frame_image,
+					int        left_offset,
+					int        top_offset,
+					int        right_offset,
+					int        bottom_offset);
+
+/* return a semi-transparent pixbuf from the source pixbuf using a checkboard
+   stipple in the alpha channel (so it can be converted to an alpha-less pixmap) */
+GdkPixbuf *eel_make_semi_transparent   (GdkPixbuf *source_pixbuf);
+
+#endif /* EEL_GRAPHIC_EFFECTS_H */
diff --git a/eel/eel-gtk-container.c b/eel/eel-gtk-container.c
new file mode 100644
index 000000000..247d7eb13
--- /dev/null
+++ b/eel/eel-gtk-container.c
@@ -0,0 +1,209 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gtk-container.c - Functions to simplify the implementations of 
+  			 GtkContainer widgets.
+
+   Copyright (C) 2001 Ramiro Estrugo.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-gtk-container.h"
+#include "eel-art-extensions.h"
+
+/**
+ * eel_gtk_container_child_expose_event:
+ * 
+ * @container: A GtkContainer widget.
+ * @child: A child of @container or NULL;
+ * @event: The expose event.
+ *
+ * Forward an expose event to a child if needed.  It is valid to give a NULL @child.
+ * In that case this function is a noop.  Proper clipping is done to ensure that the @child
+ * does indeed need to be forwarded the exposure event.  Finally, the forwarding 
+ * only occurs if the child is a NO_WINDOW widget.  Of course, it is valid to feed
+ * non NO_WINDOW widgets to this function, in which case this function is a noop.
+ */
+void
+eel_gtk_container_child_expose_event (GtkContainer *container,
+				      GtkWidget *child,
+				      GdkEventExpose *event)
+{
+	g_return_if_fail (GTK_IS_CONTAINER (container));
+
+	if (child == NULL) {
+		return;
+	}
+
+	g_return_if_fail (GTK_IS_WIDGET (child));
+
+	gtk_container_propagate_expose (container, child, event);
+}
+
+/**
+ * eel_gtk_container_child_map:
+ * 
+ * @container: A GtkContainer widget.
+ * @child: A child of @container or NULL;
+ *
+ * Map a child if needed.  This is usually called from the "GtkWidget::map"
+ * method of the @container widget.  If @child is NULL, then this function is a noop.
+ */
+void
+eel_gtk_container_child_map (GtkContainer *container,
+			     GtkWidget *child)
+{
+	g_return_if_fail (GTK_IS_CONTAINER (container));
+
+	if (child == NULL) {
+		return;
+	}
+
+	g_return_if_fail (child->parent == GTK_WIDGET (container));
+
+	if (GTK_WIDGET_VISIBLE (child) && !GTK_WIDGET_MAPPED (child)) {
+		gtk_widget_map (child);
+	}
+}
+
+/**
+ * eel_gtk_container_child_unmap:
+ * 
+ * @container: A GtkContainer widget.
+ * @child: A child of @container or NULL;
+ *
+ * Unmap a child if needed.  This is usually called from the "GtkWidget::unmap"
+ * method of the @container widget.  If @child is NULL, then this function is a noop.
+ */
+void
+eel_gtk_container_child_unmap (GtkContainer *container,
+			       GtkWidget *child)
+{
+	g_return_if_fail (GTK_IS_CONTAINER (container));
+
+	if (child == NULL) {
+		return;
+	}
+
+	g_return_if_fail (child->parent == GTK_WIDGET (container));
+	
+	if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_MAPPED (child)) {
+		gtk_widget_unmap (child);
+	}
+}
+
+/**
+ * eel_gtk_container_child_add:
+ * 
+ * @container: A GtkContainer widget.
+ * @child: A non NULL unparented child.
+ *
+ * Add a @child to a @container.  The @child is realized, mapped
+ * and resized if needed.  This is usually called from the "GtkContainer::add"
+ * method of the @container.  The @child cannot be NULL.
+ */
+void
+eel_gtk_container_child_add (GtkContainer *container,
+			     GtkWidget *child)
+{
+	g_return_if_fail (GTK_IS_CONTAINER (container));
+	g_return_if_fail (GTK_IS_WIDGET (child));
+	
+	gtk_widget_set_parent (child, GTK_WIDGET (container));
+
+	if (GTK_WIDGET_REALIZED (container)) {
+		gtk_widget_realize (child);
+	}
+	
+	if (GTK_WIDGET_VISIBLE (container) && GTK_WIDGET_VISIBLE (child)) {
+		if (GTK_WIDGET_MAPPED (container)) {
+			gtk_widget_map (child);
+		}
+		
+		gtk_widget_queue_resize (child);
+	}
+}
+
+/**
+ * eel_gtk_container_child_remove:
+ * 
+ * @container: A GtkContainer widget.
+ * @child: A non NULL child of @container.
+ *
+ * Remove @child from @container.  The @container is resized if needed.
+ * This is usually called from the "GtkContainer::remove" method of the
+ * @container.  The child cannot be NULL.
+ */
+void
+eel_gtk_container_child_remove (GtkContainer *container,
+				GtkWidget *child)
+{
+	gboolean child_was_visible;
+
+	g_return_if_fail (GTK_IS_CONTAINER (container));
+	g_return_if_fail (GTK_IS_WIDGET (child));
+	g_return_if_fail (child->parent == GTK_WIDGET (container));
+	
+	child_was_visible = GTK_WIDGET_VISIBLE (child);
+	
+	gtk_widget_unparent (child);
+
+	if (child_was_visible) {
+		gtk_widget_queue_resize (GTK_WIDGET (container));
+	}
+}
+
+/**
+ * eel_gtk_container_child_size_allocate:
+ * 
+ * @container: A GtkContainer widget.
+ * @child: A child of @container or NULL;
+ *
+ * Invoke the "GtkWidget::size_allocate" method of @child.  
+ * This function is usually called from the "GtkWidget::size_allocate"
+ * method of @container.  The child can be NULL, in which case this 
+ * function is a noop.
+ */
+void
+eel_gtk_container_child_size_allocate (GtkContainer *container,
+				       GtkWidget *child,
+				       EelIRect child_geometry)
+{
+	GtkAllocation child_allocation;
+
+	g_return_if_fail (GTK_IS_CONTAINER (container));
+
+	if (child == NULL) {
+		return;
+	}
+
+	g_return_if_fail (GTK_IS_WIDGET (child));
+	g_return_if_fail (child->parent == GTK_WIDGET (container));
+
+ 	if (eel_irect_is_empty (&child_geometry)) {
+		return;
+	}
+
+	child_allocation.x = child_geometry.x0;
+	child_allocation.y = child_geometry.y0;
+	child_allocation.width = eel_irect_get_width (child_geometry);
+	child_allocation.height = eel_irect_get_height (child_geometry);
+	
+	gtk_widget_size_allocate (child, &child_allocation);
+}
diff --git a/eel/eel-gtk-container.h b/eel/eel-gtk-container.h
new file mode 100644
index 000000000..06415e641
--- /dev/null
+++ b/eel/eel-gtk-container.h
@@ -0,0 +1,47 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gtk-container.h - Functions to simplify the implementations of 
+  			 GtkContainer widgets.
+
+   Copyright (C) 2001 Ramiro Estrugo.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_GTK_CONTAINER_H
+#define EEL_GTK_CONTAINER_H
+
+#include <gtk/gtk.h>
+#include <eel/eel-art-extensions.h>
+
+void eel_gtk_container_child_expose_event (GtkContainer   *container,
+					   GtkWidget      *child,
+					   GdkEventExpose *event);
+void eel_gtk_container_child_map          (GtkContainer   *container,
+					   GtkWidget      *child);
+void eel_gtk_container_child_unmap        (GtkContainer   *container,
+					   GtkWidget      *child);
+void eel_gtk_container_child_add          (GtkContainer   *container,
+					   GtkWidget      *child);
+void eel_gtk_container_child_remove       (GtkContainer   *container,
+					   GtkWidget      *child);
+void eel_gtk_container_child_size_allocate (GtkContainer *container,
+					    GtkWidget *child,
+					    EelIRect child_geometry);
+
+#endif /* EEL_GTK_CONTAINER_H */
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
new file mode 100644
index 000000000..81b8014a8
--- /dev/null
+++ b/eel/eel-gtk-extensions.c
@@ -0,0 +1,1174 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gtk-extensions.c - implementation of new functions that operate on
+  			  gtk classes. Perhaps some of these should be
+  			  rolled into gtk someday.
+
+   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: John Sullivan <sullivan@eazel.com>
+            Ramiro Estrugo <ramiro@eazel.com>
+	    Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-gtk-extensions.h"
+
+#include "eel-gdk-pixbuf-extensions.h"
+#include "eel-glib-extensions.h"
+#include "eel-gnome-extensions.h"
+#include "eel-pango-extensions.h"
+#include "eel-string.h"
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <math.h>
+#include "eel-marshal.h"
+#include "eel-marshal.c"
+
+/* This number is fairly arbitrary. Long enough to show a pretty long
+ * menu title, but not so long to make a menu grotesquely wide.
+ */
+#define MAXIMUM_MENU_TITLE_LENGTH	48
+
+/* Used for window position & size sanity-checking. The sizes are big enough to prevent
+ * at least normal-sized gnome panels from obscuring the window at the screen edges. 
+ */
+#define MINIMUM_ON_SCREEN_WIDTH		100
+#define MINIMUM_ON_SCREEN_HEIGHT	100
+
+
+/**
+ * eel_gtk_window_get_geometry_string:
+ * @window: a #GtkWindow
+ * 
+ * Obtains the geometry string for this window, suitable for
+ * set_geometry_string(); assumes the window has NorthWest gravity
+ * 
+ * Return value: geometry string, must be freed
+ **/
+char*
+eel_gtk_window_get_geometry_string (GtkWindow *window)
+{
+	char *str;
+	int w, h, x, y;
+	
+	g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+	g_return_val_if_fail (gtk_window_get_gravity (window) ==
+			      GDK_GRAVITY_NORTH_WEST, NULL);
+
+	gtk_window_get_position (window, &x, &y);
+	gtk_window_get_size (window, &w, &h);
+	
+	str = g_strdup_printf ("%dx%d+%d+%d", w, h, x, y);
+
+	return str;
+}
+
+static void
+send_delete_event (GtkWindow *window)
+{
+	/* Synthesize delete_event to close window. */
+	
+	GdkEvent event;
+	GtkWidget *widget;
+	
+	widget = GTK_WIDGET (window);
+	
+	event.any.type = GDK_DELETE;
+	event.any.window = widget->window;
+	event.any.send_event = TRUE;
+	
+	g_object_ref (event.any.window);
+	gtk_main_do_event (&event);
+	g_object_unref (event.any.window);
+}
+
+static int
+handle_standard_close_accelerator (GtkWindow *window, 
+				   GdkEventKey *event, 
+				   gpointer user_data)
+{
+	g_assert (GTK_IS_WINDOW (window));
+	g_assert (event != NULL);
+	g_assert (user_data == NULL);
+
+	if (eel_gtk_window_event_is_close_accelerator (window, event)) {
+		send_delete_event (window);
+		g_signal_stop_emission_by_name (
+			G_OBJECT (window), "key_press_event");
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * eel_gtk_window_event_is_close_accelerator:
+ * 
+ * Tests whether a key event is a standard window close accelerator.
+ * Not needed for clients that use eel_gtk_window_set_up_close_accelerator;
+ * use only if you must set up your own key_event handler for your own reasons.
+ **/
+gboolean
+eel_gtk_window_event_is_close_accelerator (GtkWindow *window, GdkEventKey *event)
+{
+	g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+	g_return_val_if_fail (event != NULL, FALSE);
+
+	if (event->state & GDK_CONTROL_MASK) {
+		/* Note: menu item equivalents are case-sensitive, so we will
+		 * be case-sensitive here too.
+		 */		
+		if (event->keyval == EEL_STANDARD_CLOSE_WINDOW_CONTROL_KEY) {
+			return TRUE;
+		}
+	}
+
+
+	return FALSE;	
+}
+
+/**
+ * eel_gtk_window_set_up_close_accelerator:
+ * 
+ * Sets up the standard keyboard equivalent to close the window.
+ * Call this for windows that don't set up a keyboard equivalent to
+ * close the window some other way, e.g. via a menu item accelerator.
+ *
+ * NOTE: do not use for GtkDialog, it already sets up the right
+ * stuff here.
+ * 
+ * @window: The GtkWindow that should be hidden when the standard
+ * keyboard equivalent is typed.
+ **/
+void
+eel_gtk_window_set_up_close_accelerator (GtkWindow *window)
+{
+	g_return_if_fail (GTK_IS_WINDOW (window));
+
+	if (GTK_IS_DIALOG (window)) {
+		g_warning ("eel_gtk_window_set_up_close_accelerator: Should not mess with close accelerator on GtkDialogs");
+		return;
+	}
+	
+	g_signal_connect (window,
+			    "key_press_event",
+			    G_CALLBACK (handle_standard_close_accelerator),
+			    NULL);
+}
+
+static void
+sanity_check_window_position (int *left, int *top)
+{
+	g_assert (left != NULL);
+	g_assert (top != NULL);
+
+	/* Make sure the top of the window is on screen, for
+	 * draggability (might not be necessary with all window managers,
+	 * but seems reasonable anyway). Make sure the top of the window
+	 * isn't off the bottom of the screen, or so close to the bottom
+	 * that it might be obscured by the panel.
+	 */
+	*top = CLAMP (*top, 0, gdk_screen_height() - MINIMUM_ON_SCREEN_HEIGHT);
+	
+	/* FIXME bugzilla.eazel.com 669: 
+	 * If window has negative left coordinate, set_uposition sends it
+	 * somewhere else entirely. Not sure what level contains this bug (XWindows?).
+	 * Hacked around by pinning the left edge to zero, which just means you
+	 * can't set a window to be partly off the left of the screen using
+	 * this routine.
+	 */
+	/* Make sure the left edge of the window isn't off the right edge of
+	 * the screen, or so close to the right edge that it might be
+	 * obscured by the panel.
+	 */
+	*left = CLAMP (*left, 0, gdk_screen_width() - MINIMUM_ON_SCREEN_WIDTH);
+}
+
+static void
+sanity_check_window_dimensions (guint *width, guint *height)
+{
+	g_assert (width != NULL);
+	g_assert (height != NULL);
+
+	/* Pin the size of the window to the screen, so we don't end up in
+	 * a state where the window is so big essential parts of it can't
+	 * be reached (might not be necessary with all window managers,
+	 * but seems reasonable anyway).
+	 */
+	*width = MIN (*width, gdk_screen_width());
+	*height = MIN (*height, gdk_screen_height());
+}
+
+/**
+ * eel_gtk_window_set_initial_geometry:
+ * 
+ * Sets the position and size of a GtkWindow before the
+ * GtkWindow is shown. It is an error to call this on a window that
+ * is already on-screen. Takes into account screen size, and does
+ * some sanity-checking on the passed-in values.
+ * 
+ * @window: A non-visible GtkWindow
+ * @geometry_flags: A EelGdkGeometryFlags value defining which of
+ * the following parameters have defined values
+ * @left: pixel coordinate for left of window
+ * @top: pixel coordinate for top of window
+ * @width: width of window in pixels
+ * @height: height of window in pixels
+ */
+void
+eel_gtk_window_set_initial_geometry (GtkWindow *window, 
+					  EelGdkGeometryFlags geometry_flags,
+					  int left,
+					  int top,
+					  guint width,
+					  guint height)
+{
+	GdkScreen *screen;
+	int real_left, real_top;
+	int screen_width, screen_height;
+
+	g_return_if_fail (GTK_IS_WINDOW (window));
+
+	/* Setting the default size doesn't work when the window is already showing.
+	 * Someday we could make this move an already-showing window, but we don't
+	 * need that functionality yet. 
+	 */
+	g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
+
+	if ((geometry_flags & EEL_GDK_X_VALUE) && (geometry_flags & EEL_GDK_Y_VALUE)) {
+		real_left = left;
+		real_top = top;
+
+		screen = gtk_window_get_screen (window);
+		screen_width  = gdk_screen_get_width  (screen);
+		screen_height = gdk_screen_get_height (screen);
+
+		/* This is sub-optimal. GDK doesn't allow us to set win_gravity
+		 * to South/East types, which should be done if using negative
+		 * positions (so that the right or bottom edge of the window
+		 * appears at the specified position, not the left or top).
+		 * However it does seem to be consistent with other GNOME apps.
+		 */
+		if (geometry_flags & EEL_GDK_X_NEGATIVE) {
+			real_left = screen_width - real_left;
+		}
+		if (geometry_flags & EEL_GDK_Y_NEGATIVE) {
+			real_top = screen_height - real_top;
+		}
+
+		sanity_check_window_position (&real_left, &real_top);
+		gtk_window_move (window, real_left, real_top);
+	}
+
+	if ((geometry_flags & EEL_GDK_WIDTH_VALUE) && (geometry_flags & EEL_GDK_HEIGHT_VALUE)) {
+		sanity_check_window_dimensions (&width, &height);
+		gtk_window_set_default_size (GTK_WINDOW (window), (int)width, (int)height);
+	}
+}
+
+/**
+ * eel_gtk_window_set_initial_geometry_from_string:
+ * 
+ * Sets the position and size of a GtkWindow before the
+ * GtkWindow is shown. The geometry is passed in as a string. 
+ * It is an error to call this on a window that
+ * is already on-screen. Takes into account screen size, and does
+ * some sanity-checking on the passed-in values.
+ * 
+ * @window: A non-visible GtkWindow
+ * @geometry_string: A string suitable for use with eel_gdk_parse_geometry
+ * @minimum_width: If the width from the string is smaller than this,
+ * use this for the width.
+ * @minimum_height: If the height from the string is smaller than this,
+ * use this for the height.
+ * @ignore_position: If true position data from string will be ignored.
+ */
+void
+eel_gtk_window_set_initial_geometry_from_string (GtkWindow *window, 
+						 const char *geometry_string,
+						 guint minimum_width,
+						 guint minimum_height,
+						 gboolean ignore_position)
+{
+	int left, top;
+	guint width, height;
+	EelGdkGeometryFlags geometry_flags;
+
+	g_return_if_fail (GTK_IS_WINDOW (window));
+	g_return_if_fail (geometry_string != NULL);
+
+	/* Setting the default size doesn't work when the window is already showing.
+	 * Someday we could make this move an already-showing window, but we don't
+	 * need that functionality yet. 
+	 */
+	g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
+
+	geometry_flags = eel_gdk_parse_geometry (geometry_string, &left, &top, &width, &height);
+
+	/* Make sure the window isn't smaller than makes sense for this window.
+	 * Other sanity checks are performed in set_initial_geometry.
+	 */
+	if (geometry_flags & EEL_GDK_WIDTH_VALUE) {
+		width = MAX (width, minimum_width);
+	}
+	if (geometry_flags & EEL_GDK_HEIGHT_VALUE) {
+		height = MAX (height, minimum_height);
+	}
+	
+	/* Ignore saved window position if requested. */
+	if (ignore_position) {
+		geometry_flags &= ~(EEL_GDK_X_VALUE | EEL_GDK_Y_VALUE);
+	}
+
+	eel_gtk_window_set_initial_geometry (window, geometry_flags, left, top, width, height);
+}
+
+/**
+ * eel_pop_up_context_menu:
+ * 
+ * Pop up a context menu under the mouse.
+ * The menu is sunk after use, so it will be destroyed unless the 
+ * caller first ref'ed it.
+ * 
+ * This function is more of a helper function than a gtk extension,
+ * so perhaps it belongs in a different file.
+ * 
+ * @menu: The menu to pop up under the mouse.
+ * @offset_x: Number of pixels to displace the popup menu vertically
+ * @offset_y: Number of pixels to displace the popup menu horizontally
+ * @event: The event that invoked this popup menu.
+ **/
+void 
+eel_pop_up_context_menu (GtkMenu	     *menu,
+			      gint16	      offset_x,
+			      gint16	      offset_y,
+			      GdkEventButton *event)
+{
+	GdkPoint offset;
+	int button;
+
+	g_return_if_fail (GTK_IS_MENU (menu));
+
+	offset.x = offset_x;
+	offset.y = offset_y;
+
+	/* The event button needs to be 0 if we're popping up this menu from
+	 * a button release, else a 2nd click outside the menu with any button
+	 * other than the one that invoked the menu will be ignored (instead
+	 * of dismissing the menu). This is a subtle fragility of the GTK menu code.
+	 */
+
+	if (event) {
+		button = event->type == GDK_BUTTON_RELEASE
+			? 0
+			: event->button;
+	} else {
+		button = 0;
+	}
+	
+	gtk_menu_popup (menu,					/* menu */
+			NULL,					/* parent_menu_shell */
+			NULL,					/* parent_menu_item */
+			NULL,
+			&offset,			        /* data */
+			button,					/* button */
+			event ? event->time : GDK_CURRENT_TIME); /* activate_time */
+
+	gtk_object_sink (GTK_OBJECT (menu));
+}
+
+GtkMenuItem *
+eel_gtk_menu_append_separator (GtkMenu *menu)
+{
+	return eel_gtk_menu_insert_separator (menu, -1);
+}
+
+GtkMenuItem *
+eel_gtk_menu_insert_separator (GtkMenu *menu, int index)
+{
+	GtkWidget *menu_item;
+
+	menu_item = gtk_separator_menu_item_new ();
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menu_item, index);
+
+	return GTK_MENU_ITEM (menu_item);
+}
+
+void
+eel_gtk_menu_set_item_visibility (GtkMenu *menu, int index, gboolean visible)
+{
+	GList *children;
+	GtkWidget *menu_item;
+
+	g_return_if_fail (GTK_IS_MENU (menu));
+
+	children = gtk_container_get_children (GTK_CONTAINER (menu));
+	g_return_if_fail (index >= 0 && index < (int) g_list_length (children));
+
+	menu_item = GTK_WIDGET (g_list_nth_data (children, index));
+	if (visible) {
+		gtk_widget_show (menu_item);
+	} else {
+		gtk_widget_hide (menu_item);
+	}
+
+	g_list_free (children);
+}
+
+gboolean
+eel_point_in_allocation (const GtkAllocation *allocation,
+			      int x, int y)
+{
+	g_return_val_if_fail (allocation != NULL, FALSE);
+	return x >= allocation->x
+		&& y >= allocation->y
+		&& x < allocation->x + allocation->width 
+		&& y < allocation->y + allocation->height;
+}
+
+/* FIXME this function is dangerous, because widget->window coords (or
+ * other window-belonging-to-widget coords) do not need to be in the
+ * same coordinate system as widget->allocation.
+ * If you use this function, be aware of that. Someone should probably
+ * audit all uses, too.
+ */
+gboolean
+eel_point_in_widget (GtkWidget *widget,
+			  int x, int y)
+{
+	if (widget == NULL) {
+		return FALSE;
+	}
+	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+	return eel_point_in_allocation (&widget->allocation, x, y);
+}
+
+/**
+ * eel_gtk_widget_set_shown
+ *
+ * Show or hide a widget.
+ * @widget: The widget.
+ * @shown: Boolean value indicating whether the widget should be shown or hidden.
+ **/
+void
+eel_gtk_widget_set_shown (GtkWidget *widget, gboolean shown)
+{
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+
+	if (shown) {
+		gtk_widget_show (widget);
+	} else {
+		gtk_widget_hide (widget);
+	}
+}
+
+/* This stuff is stolen from Gtk. */
+
+typedef struct DisconnectInfo {
+	GtkObject *object1;
+	guint disconnect_handler1;
+	guint signal_handler;
+	GtkObject *object2;
+	guint disconnect_handler2;
+} DisconnectInfo;
+
+static void
+alive_disconnecter (GtkObject *object, DisconnectInfo *info)
+{
+	g_assert (info != NULL);
+	g_assert (GTK_IS_OBJECT (info->object1));
+	g_assert (info->disconnect_handler1 != 0);
+	g_assert (info->signal_handler != 0);
+	g_assert (GTK_IS_OBJECT (info->object2));
+	g_assert (info->disconnect_handler2 != 0);
+	g_assert (object == info->object1 || object == info->object2);
+	
+	g_signal_handler_disconnect (info->object1, info->disconnect_handler1);
+	g_signal_handler_disconnect (info->object1, info->signal_handler);
+	g_signal_handler_disconnect (info->object2, info->disconnect_handler2);
+	
+	g_free (info);
+}
+
+/**
+ * eel_gtk_signal_connect_full_while_alive
+ *
+ * Like gtk_signal_connect_while_alive, but works with full parameters.
+ **/
+void
+eel_gtk_signal_connect_full_while_alive (GtkObject *object,
+					 const gchar *name,
+					 GtkSignalFunc func,
+					 GtkCallbackMarshal marshal,
+					 gpointer data,
+					 GtkDestroyNotify destroy_func,
+					 gboolean object_signal,
+					 gboolean after,
+					 GtkObject *alive_object)
+{
+	DisconnectInfo *info;
+	
+	g_return_if_fail (GTK_IS_OBJECT (object));
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (func != NULL || marshal != NULL);
+	g_return_if_fail (object_signal == FALSE || object_signal == TRUE);
+	g_return_if_fail (after == FALSE || after == TRUE);
+	g_return_if_fail (GTK_IS_OBJECT (alive_object));
+	
+	info = g_new (DisconnectInfo, 1);
+	info->object1 = object;
+	info->object2 = alive_object;
+	
+
+	info->signal_handler = g_signal_connect_closure (
+		object, name,
+		(object_signal
+		 ? g_cclosure_new_swap
+		 : g_cclosure_new) (func, data, (GClosureNotify) destroy_func),
+		after);
+
+	info->disconnect_handler1 = g_signal_connect (G_OBJECT (object),
+						      "destroy",
+						      G_CALLBACK (alive_disconnecter),
+						      info);
+	info->disconnect_handler2 = g_signal_connect (G_OBJECT (alive_object),
+						      "destroy",
+						      G_CALLBACK (alive_disconnecter),
+						      info);
+}
+
+typedef struct
+{
+	GtkObject *object;
+	guint object_destroy_handler;
+	
+	GtkWidget *realized_widget;
+	guint realized_widget_destroy_handler;
+	guint realized_widget_unrealized_handler;
+
+	guint signal_handler;
+} RealizeDisconnectInfo;
+
+static void
+while_realized_disconnecter (GtkObject *object,
+			     RealizeDisconnectInfo *info)
+{
+	g_assert (GTK_IS_OBJECT (object));
+	g_assert (info != NULL);
+	g_assert (GTK_IS_OBJECT (info->object));
+	g_assert (info->object_destroy_handler != 0);
+	g_assert (info->object_destroy_handler != 0);
+	g_assert (info->realized_widget_destroy_handler != 0);
+	g_assert (info->realized_widget_unrealized_handler != 0);
+
+ 	g_signal_handler_disconnect (info->object, info->object_destroy_handler);
+ 	g_signal_handler_disconnect (info->object, info->signal_handler);
+ 	g_signal_handler_disconnect (info->realized_widget, info->realized_widget_destroy_handler);
+ 	g_signal_handler_disconnect (info->realized_widget, info->realized_widget_unrealized_handler);
+	g_free (info);
+}
+
+/**
+ * eel_gtk_signal_connect_while_realized:
+ *
+ * @object: Object to connect to.
+ * @name: Name of signal to connect to.
+ * @callback: Caller's callback.
+ * @callback_data: Caller's callback_data.
+ * @realized_widget: Widget to monitor for realized state.  Signal is connected
+ *                   while this wigget is realized.
+ *
+ * Connect to a signal of an object while another widget is realized.  This is 
+ * useful for non windowed widgets that need to monitor events in their ancestored
+ * windowed widget.  The signal is automatically disconnected when &widget is
+ * unrealized.  Also, the signal is automatically disconnected when either &object
+ * or &widget are destroyed.
+ **/
+void
+eel_gtk_signal_connect_while_realized (GtkObject *object,
+					    const char *name,
+					    GtkSignalFunc callback,
+					    gpointer callback_data,
+					    GtkWidget *realized_widget)
+{
+	RealizeDisconnectInfo *info;
+
+	g_return_if_fail (GTK_IS_OBJECT (object));
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (name[0] != '\0');
+	g_return_if_fail (callback != NULL);
+	g_return_if_fail (GTK_IS_WIDGET (realized_widget));
+	g_return_if_fail (GTK_WIDGET_REALIZED (realized_widget));
+
+	info = g_new0 (RealizeDisconnectInfo, 1);
+	
+	info->object = object;
+	info->object_destroy_handler = 
+		g_signal_connect (G_OBJECT (info->object),
+				  "destroy",
+				  G_CALLBACK (while_realized_disconnecter),
+				  info);
+	
+	info->realized_widget = realized_widget;
+	info->realized_widget_destroy_handler = 
+		g_signal_connect (G_OBJECT (info->realized_widget),
+				  "destroy",
+				  G_CALLBACK (while_realized_disconnecter),
+				  info);
+	info->realized_widget_unrealized_handler = 
+		g_signal_connect_after (G_OBJECT (info->realized_widget),
+					"unrealize",
+					G_CALLBACK (while_realized_disconnecter),
+					info);
+
+	info->signal_handler = g_signal_connect (G_OBJECT (info->object),
+						 name, callback, callback_data);
+}
+
+/**
+ * eel_gtk_container_get_first_child.
+ *
+ * Returns the first child of a container.
+ * @container: The container.
+ **/
+
+static void
+get_first_callback (GtkWidget *widget, gpointer callback_data)
+{
+	GtkWidget **first_child_slot;
+
+	g_assert (GTK_IS_WIDGET (widget));
+	g_assert (callback_data != NULL);
+	
+	first_child_slot = callback_data;
+
+	if (*first_child_slot == NULL) {
+		*first_child_slot = widget;
+		/* We'd stop the iterating now if we could. */
+	} else {
+		g_assert (GTK_IS_WIDGET (*first_child_slot));
+	}
+}
+
+GtkWidget *
+eel_gtk_container_get_first_child (GtkContainer *container)
+{
+	GtkWidget *first_child;
+
+	g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
+	
+	first_child = NULL;
+	gtk_container_foreach (container, get_first_callback, &first_child);
+	g_assert (first_child == NULL || GTK_IS_WIDGET (first_child));
+	return first_child;
+}
+
+typedef struct {
+	GtkCallback   callback;
+	gpointer      callback_data;
+} container_foreach_deep_callback_data;
+
+static void
+container_foreach_deep_callback (GtkWidget *child, gpointer data)
+{
+	container_foreach_deep_callback_data *deep_data;
+
+	deep_data = (container_foreach_deep_callback_data *) data;
+
+	deep_data->callback (child, deep_data->callback_data);
+
+	if (GTK_IS_CONTAINER (child)) {
+		gtk_container_foreach (GTK_CONTAINER (child), container_foreach_deep_callback, data);
+	}
+}
+
+void
+eel_gtk_container_foreach_deep (GtkContainer *container,
+				     GtkCallback callback,
+				     gpointer callback_data)
+{
+	container_foreach_deep_callback_data deep_data;
+	deep_data.callback = callback;
+	deep_data.callback_data = callback_data;
+	gtk_container_foreach (container, container_foreach_deep_callback, &deep_data);
+}
+
+/* The standard gtk_adjustment_set_value ignores page size, which
+ * disagrees with the logic used by scroll bars, for example.
+ */
+void
+eel_gtk_adjustment_set_value (GtkAdjustment *adjustment,
+				   float value)
+{
+	float upper_page_start, clamped_value;
+
+	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+	
+	upper_page_start = MAX (adjustment->upper - adjustment->page_size, adjustment->lower);
+	clamped_value = CLAMP (value, adjustment->lower, upper_page_start);
+	if (clamped_value != adjustment->value) {
+		adjustment->value = clamped_value;
+		gtk_adjustment_value_changed (adjustment);
+	}
+}
+
+/* Clamp a value if the minimum or maximum has changed. */
+void
+eel_gtk_adjustment_clamp_value (GtkAdjustment *adjustment)
+{
+	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+	
+	eel_gtk_adjustment_set_value (adjustment, adjustment->value);
+}
+
+/**
+ * eel_gtk_label_make_bold.
+ *
+ * Switches the font of label to a bold equivalent.
+ * @label: The label.
+ **/
+void
+eel_gtk_label_make_bold (GtkLabel *label)
+{
+	PangoFontDescription *font_desc;
+
+	font_desc = pango_font_description_new ();
+
+	pango_font_description_set_weight (font_desc,
+					   PANGO_WEIGHT_BOLD);
+
+	/* This will only affect the weight of the font, the rest is
+	 * from the current state of the widget, which comes from the
+	 * theme or user prefs, since the font desc only has the
+	 * weight flag turned on.
+	 */
+	gtk_widget_modify_font (GTK_WIDGET (label), font_desc);
+
+	pango_font_description_free (font_desc);
+}
+
+/**
+ * eel_gtk_label_set_scale:
+ * @label: 
+ * @num_steps: 
+ *
+ * Function is broken, see eel_gtk_label_make_larger() for explanation
+ * 
+ **/
+void
+eel_gtk_label_set_scale (GtkLabel *label,
+			 double scale_factor)
+{
+	PangoAttrList *old_attr_list;
+	PangoAttrList *attr_list;
+	
+	g_return_if_fail (GTK_IS_LABEL (label));
+	g_return_if_fail (scale_factor > 0);
+
+	old_attr_list = gtk_label_get_attributes (label);
+	attr_list = eel_pango_attr_list_apply_global_attribute (old_attr_list,
+								pango_attr_scale_new (scale_factor));
+	gtk_label_set_attributes (label, attr_list);
+	pango_attr_list_unref (attr_list);
+}
+
+static void
+get_layout_location (GtkLabel  *label,
+                     gint      *xp,
+                     gint      *yp)
+{
+  GtkMisc *misc;
+  GtkWidget *widget;
+  float xalign;
+  int x, y;
+  int shadow_offset;
+  
+  shadow_offset = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label),
+						      "eel-label-shadow-offset"));
+  
+  misc = GTK_MISC (label);
+  widget = GTK_WIDGET (label);
+  
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+    xalign = misc->xalign;
+  else
+    xalign = 1.0 - misc->xalign;
+  
+  x = floor (widget->allocation.x + (int)misc->xpad
+             + ((widget->allocation.width - widget->requisition.width - shadow_offset) * xalign)
+             + 0.5);
+  
+  y = floor (widget->allocation.y + (int)misc->ypad 
+             + ((widget->allocation.height - widget->requisition.height - shadow_offset) * misc->yalign)
+             + 0.5);
+  
+
+  if (xp)
+    *xp = x;
+
+  if (yp)
+    *yp = y;
+}
+
+static gboolean
+eel_gtk_label_expose_event (GtkLabel *label, GdkEventExpose *event, gpointer user_data)
+{
+	int x, y;
+	GdkColor color;
+	GtkWidget *widget;
+	GdkGC *gc;
+	guint32 shadow_color;
+	int shadow_offset;
+	
+	shadow_color = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label),
+							   "eel-label-shadow-color"));
+	shadow_offset = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label),
+							    "eel-label-shadow-offset"));
+
+	color = eel_gdk_rgb_to_color (shadow_color);
+	
+	get_layout_location (label, &x, &y);
+
+	widget = GTK_WIDGET (label);
+	if (shadow_offset > 0) {
+		gc = gdk_gc_new (widget->window);
+		gdk_gc_set_rgb_fg_color (gc, &color);
+		gdk_gc_set_clip_rectangle (gc, &event->area);
+		
+		gdk_draw_layout (widget->window,
+				 gc,
+				 x + shadow_offset, y + shadow_offset,
+				 label->layout);
+		g_object_unref (gc);
+	}
+	
+	gtk_paint_layout (widget->style,
+			  widget->window,
+			  GTK_WIDGET_STATE (widget),
+			  FALSE,
+			  &event->area,
+			  widget,
+			  "label",
+			  x, y,
+			  label->layout);
+
+	return TRUE;
+}
+
+static void
+eel_gtk_label_size_request (GtkLabel *label, GtkRequisition *requisition, gpointer user_data)
+{
+	gint shadow_offset;
+
+	shadow_offset = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label),
+							    "eel-label-shadow-offset"));
+
+	requisition->width += shadow_offset;
+	requisition->height += shadow_offset;
+}
+
+static void
+set_up_label (GtkLabel *label)
+{
+
+	if (g_object_get_data (G_OBJECT (label), "eel-label-set-up") != NULL) {
+		return;
+	}
+
+	g_signal_connect (label, "expose_event",
+			  G_CALLBACK (eel_gtk_label_expose_event), NULL);
+	g_signal_connect_after (label, "size_request",
+				G_CALLBACK (eel_gtk_label_size_request), NULL);
+
+	g_object_set_data (G_OBJECT (label), "eel-label-set-up", "eel-label-set-up");
+}
+
+void
+eel_gtk_label_set_drop_shadow_color (GtkLabel *label,
+				     guint32 color)
+{
+	set_up_label (label);
+
+	g_object_set_data (G_OBJECT (label), "eel-label-shadow-color",
+			   GINT_TO_POINTER (color));
+		
+	gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+void
+eel_gtk_label_set_drop_shadow_offset (GtkLabel *label,
+				      gint offset)
+{
+	set_up_label (label);
+
+	g_object_set_data (G_OBJECT (label), "eel-label-shadow-offset",
+			   GINT_TO_POINTER (offset));
+	
+	gtk_widget_queue_draw (GTK_WIDGET (label));
+}
+
+void
+eel_gtk_widget_set_background_color (GtkWidget *widget,
+				     const char *color_spec)
+{
+	GdkColor color;
+
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+
+	eel_gdk_color_parse_with_white_default (color_spec, &color);
+
+	gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &color);
+	gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &color);
+	gtk_widget_modify_bg (widget, GTK_STATE_ACTIVE, &color);
+	gtk_widget_modify_base (widget, GTK_STATE_ACTIVE, &color);
+}
+
+void
+eel_gtk_widget_set_foreground_color (GtkWidget *widget,
+				     const char *color_spec)
+{
+	GdkColor color;
+
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+
+	eel_gdk_color_parse_with_white_default (color_spec, &color);
+
+	gtk_widget_modify_fg (widget, GTK_STATE_NORMAL, &color);
+	gtk_widget_modify_text (widget, GTK_STATE_NORMAL, &color);
+	gtk_widget_modify_fg (widget, GTK_STATE_ACTIVE, &color);
+	gtk_widget_modify_text (widget, GTK_STATE_ACTIVE, &color);
+}
+
+GtkWidget *
+eel_gtk_widget_find_windowed_ancestor (GtkWidget *widget)
+{
+	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+	while (widget && GTK_WIDGET_NO_WINDOW (widget)) {
+		widget = widget->parent;
+	}
+
+	return widget;
+}
+
+/* eel_gtk_get_system_font:
+ *
+ * Return the system font as selected in the control center. Need to 
+ * g_object_unref() the result when done with it.
+ *
+ * Perhaps there is a better way to figure out what that font is, but
+ * the following is simple enough and it works.
+ */
+PangoFontDescription *
+eel_gtk_get_system_font (void)
+{
+	GtkWidget *label;
+	PangoFontDescription *font;
+
+	label = gtk_label_new ("");
+	
+	gtk_widget_ensure_style (label);
+
+	font = pango_font_description_copy (label->style->font_desc);
+
+ 	gtk_object_sink (GTK_OBJECT (label));
+
+	return font;
+}
+
+void
+eel_gtk_widget_get_button_event_location (GtkWidget *widget,
+					  const GdkEventButton *event,
+					  int *x,
+					  int *y)
+{
+	int window_x, window_y;
+
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+	g_return_if_fail (event != NULL);
+
+	gdk_window_get_position (event->window, &window_x, &window_y);
+	if (x != NULL) {
+		*x = event->x + window_x - widget->allocation.x;
+	}
+	if (y != NULL) {
+		*y = event->y + window_y - widget->allocation.y;
+	}
+}
+
+void
+eel_gtk_widget_get_motion_event_location (GtkWidget *widget,
+					  const GdkEventMotion *event,
+					  int *x,
+					  int *y)
+{
+	eel_gtk_widget_get_button_event_location (widget, (const GdkEventButton *) event, x, y);
+}
+
+gboolean
+eel_gtk_tree_view_cell_is_completely_visible (GtkTreeView          *tree_view,
+					      GtkTreePath          *path,
+					      GtkTreeViewColumn    *column)
+{
+	GdkRectangle cell_rect, visible_rect;
+
+	gtk_tree_view_get_background_area (tree_view, path, column, &cell_rect);
+	gtk_tree_view_widget_to_tree_coords (tree_view, cell_rect.x, cell_rect.y,
+					     &cell_rect.x, &cell_rect.y);
+	gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
+	return eel_gdk_rectangle_contains_rectangle (visible_rect, cell_rect);
+}
+
+static gboolean 
+tree_view_button_press_callback (GtkWidget *tree_view,
+				 GdkEventButton *event,
+				 gpointer data)
+{
+	GtkTreePath *path;
+	GtkTreeViewColumn *column;
+
+	if (event->button == 1 && event->type == GDK_BUTTON_PRESS) {
+		if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tree_view),
+						   event->x, event->y,
+						   &path,
+						   &column,
+						   NULL, 
+						   NULL)) {
+			gtk_tree_view_row_activated
+				(GTK_TREE_VIEW (tree_view), path, column);
+		}
+	}
+
+	return FALSE;
+}
+
+void
+eel_gtk_tree_view_set_activate_on_single_click (GtkTreeView *tree_view,
+						gboolean should_activate)
+{
+	guint button_press_id;
+
+	button_press_id = GPOINTER_TO_UINT 
+		(g_object_get_data (G_OBJECT (tree_view), 
+				    "eel-tree-view-activate"));
+
+	if (button_press_id && !should_activate) {
+		g_signal_handler_disconnect (tree_view, button_press_id);
+		g_object_set_data (G_OBJECT (tree_view), 
+				   "eel-tree-view-activate", 
+				   NULL);
+	} else if (!button_press_id && should_activate) {
+		button_press_id = g_signal_connect 
+			(tree_view,
+			 "button_press_event",
+			 G_CALLBACK  (tree_view_button_press_callback),
+			 NULL);
+		g_object_set_data (G_OBJECT (tree_view), 
+				   "eel-tree-view-activate", 
+				   GUINT_TO_POINTER (button_press_id));
+	}
+}
+
+gboolean
+eel_gtk_viewport_get_visible_rect (GtkViewport  *viewport, 
+				   GdkRectangle *rect)
+{
+	GdkRectangle viewport_rect;
+	GdkRectangle child_rect;
+	gboolean return_val;
+
+	g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), FALSE);
+	g_return_val_if_fail (rect != NULL, FALSE);
+	
+	if (GTK_WIDGET_REALIZED (viewport)) {
+		viewport_rect.x = 0;
+		viewport_rect.y = 0;
+		gdk_drawable_get_size (viewport->view_window, 
+				       &viewport_rect.width, 
+				       &viewport_rect.height);
+		
+		gdk_window_get_position (viewport->bin_window,
+					 &child_rect.x,
+					 &child_rect.y);
+		gdk_drawable_get_size (viewport->bin_window,
+				       &child_rect.width,
+				       &child_rect.height);
+
+		return_val = gdk_rectangle_intersect (&viewport_rect, 
+						      &child_rect,
+						      rect);
+		rect->x -= child_rect.x;
+		rect->y -= child_rect.y;
+		
+		return return_val;
+	}
+	
+	rect->x = rect->y = rect->width = rect->height = 0;
+	return FALSE;
+}
+
+void
+eel_gtk_viewport_scroll_to_rect (GtkViewport  *viewport, 
+				 GdkRectangle *rect)
+{
+	GdkRectangle visible_rect;
+	int scroll_x;
+	int scroll_y;
+	GtkAdjustment *adjustment;
+
+	g_return_if_fail (GTK_IS_VIEWPORT (viewport));
+	g_return_if_fail (rect != NULL);
+
+	if (eel_gtk_viewport_get_visible_rect (viewport, &visible_rect)) {
+		scroll_x = -1;
+		scroll_y = -1;
+
+		if (rect->x + rect->width > visible_rect.x + visible_rect.width) {
+			scroll_x = rect->x - (visible_rect.width - rect->width);
+		}
+		if (rect->y + rect->height > visible_rect.y + visible_rect.height) {
+			scroll_y = rect->y - (visible_rect.height - rect->height);
+		}
+
+		if (rect->x < visible_rect.x) {
+			scroll_x = rect->x;
+		}
+
+		if (rect->y < visible_rect.y) {
+			scroll_y = rect->y;
+		}
+
+		adjustment = gtk_viewport_get_hadjustment (viewport);
+		if (adjustment && scroll_x != -1) {
+			eel_gtk_adjustment_set_value (adjustment,
+						      (double)scroll_x);
+		}
+
+		adjustment = gtk_viewport_get_vadjustment (viewport);
+		if (adjustment && scroll_y != -1) {
+			eel_gtk_adjustment_set_value (adjustment,
+						      (double)scroll_y);
+		}
+	}
+}
diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h
new file mode 100644
index 000000000..7bf16024e
--- /dev/null
+++ b/eel/eel-gtk-extensions.h
@@ -0,0 +1,141 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-gtk-extensions.h - interface for new functions that operate on
+  			       gtk classes. Perhaps some of these should be
+  			       rolled into gtk someday.
+
+   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: John Sullivan <sullivan@eazel.com>
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_GTK_EXTENSIONS_H
+#define EEL_GTK_EXTENSIONS_H
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
+#include <eel/eel-gdk-extensions.h>
+
+#define EEL_DEFAULT_POPUP_MENU_DISPLACEMENT 	2
+#define EEL_STANDARD_CLOSE_WINDOW_CONTROL_KEY 	'w'
+
+/* signals */
+void                  eel_gtk_signal_connect_full_while_alive         (GtkObject            *object,
+								       const gchar          *name,
+								       GtkSignalFunc         func,
+								       GtkCallbackMarshal    marshal,
+								       gpointer              data,
+								       GtkDestroyNotify      destroy_func,
+								       gboolean              object_signal,
+								       gboolean              after,
+								       GtkObject            *alive_object);
+void                  eel_gtk_signal_connect_while_realized           (GtkObject            *object,
+								       const char           *name,
+								       GtkSignalFunc         callback,
+								       gpointer              callback_data,
+								       GtkWidget            *realized_widget);
+
+/* GtkWidget */
+void                  eel_gtk_widget_set_shown                        (GtkWidget            *widget,
+								       gboolean              shown);
+gboolean              eel_point_in_allocation                         (const GtkAllocation  *allocation,
+								       int                   x,
+								       int                   y);
+gboolean              eel_point_in_widget                             (GtkWidget            *widget,
+								       int                   x,
+								       int                   y);
+void                  eel_gtk_widget_set_background_color             (GtkWidget            *widget,
+								       const char           *color_spec);
+void                  eel_gtk_widget_set_foreground_color             (GtkWidget            *widget,
+								       const char           *color_spec);
+GtkWidget *           eel_gtk_widget_find_windowed_ancestor           (GtkWidget            *widget);
+PangoFontDescription *eel_gtk_get_system_font                         (void);
+void                  eel_gtk_widget_get_button_event_location        (GtkWidget            *widget,
+								       const GdkEventButton *event,
+								       int                  *x,
+								       int                  *y);
+void                  eel_gtk_widget_get_motion_event_location        (GtkWidget            *widget,
+								       const GdkEventMotion *event,
+								       int                  *x,
+								       int                  *y);
+
+/* GtkContainer */
+GtkWidget *           eel_gtk_container_get_first_child               (GtkContainer         *container);
+void                  eel_gtk_container_foreach_deep                  (GtkContainer         *container,
+								       GtkCallback           callback,
+								       gpointer              callback_data);
+
+/* GtkWindow */
+void                  eel_gtk_window_set_initial_geometry             (GtkWindow            *window,
+								       EelGdkGeometryFlags   geometry_flags,
+								       int                   left,
+								       int                   top,
+								       guint                 width,
+								       guint                 height);
+void                  eel_gtk_window_set_initial_geometry_from_string (GtkWindow            *window,
+								       const char           *geometry_string,
+								       guint                 minimum_width,
+								       guint                 minimum_height,
+								       gboolean		     ignore_position);
+void                  eel_gtk_window_set_up_close_accelerator         (GtkWindow            *window);
+gboolean              eel_gtk_window_event_is_close_accelerator       (GtkWindow            *window,
+								       GdkEventKey          *event);
+char *                eel_gtk_window_get_geometry_string              (GtkWindow            *window);
+
+
+/* GtkMenu and GtkMenuItem */
+void                  eel_pop_up_context_menu                         (GtkMenu              *menu,
+								       gint16                offset_x,
+								       gint16                offset_y,
+								       GdkEventButton       *event);
+GtkMenuItem *         eel_gtk_menu_append_separator                   (GtkMenu              *menu);
+GtkMenuItem *         eel_gtk_menu_insert_separator                   (GtkMenu              *menu,
+								       int                   index);
+void                  eel_gtk_menu_set_item_visibility                (GtkMenu              *menu,
+								       int                   index,
+								       gboolean              visible);
+
+/* GtkLabel */
+void                  eel_gtk_label_make_bold                         (GtkLabel             *label);
+void                  eel_gtk_label_set_scale                         (GtkLabel             *label,
+								       double                scale_factor);
+void                  eel_gtk_label_set_drop_shadow_color             (GtkLabel             *label,
+								       guint32               color);
+void                  eel_gtk_label_set_drop_shadow_offset            (GtkLabel             *label,
+								       gint                  offset); 
+/* GtkAdjustment */
+void                  eel_gtk_adjustment_set_value                    (GtkAdjustment        *adjustment,
+								       float                 value);
+void                  eel_gtk_adjustment_clamp_value                  (GtkAdjustment        *adjustment);
+
+/* GtkTreeView */
+gboolean              eel_gtk_tree_view_cell_is_completely_visible    (GtkTreeView          *tree_view,
+								       GtkTreePath          *path,
+								       GtkTreeViewColumn    *column);
+void                  eel_gtk_tree_view_set_activate_on_single_click  (GtkTreeView               *tree_view,
+								       gboolean                   should_activate);
+
+/* GtkViewport */
+gboolean              eel_gtk_viewport_get_visible_rect               (GtkViewport          *viewport, 
+								       GdkRectangle         *rect);
+
+void                  eel_gtk_viewport_scroll_to_rect                 (GtkViewport          *viewport,
+								       GdkRectangle         *rect);
+
+#endif /* EEL_GTK_EXTENSIONS_H */
diff --git a/eel/eel-gtk-macros.h b/eel/eel-gtk-macros.h
new file mode 100644
index 000000000..c47453f1c
--- /dev/null
+++ b/eel/eel-gtk-macros.h
@@ -0,0 +1,178 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-gtk-macros.h: Macros to reduce boilerplate when using GTK.
+ 
+   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Authors: Darin Adler <darin@bentspoon.com>
+            Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_GTK_MACROS_H
+#define EEL_GTK_MACROS_H
+
+#ifndef EEL_DISABLE_DEPRECATED
+
+/* Define a parent_class global and a get_type function for a GTK class.
+   Since this is boilerplate, it's better not to repeat it over and over again.
+   Called like this:
+
+       EEL_CLASS_BOILERPLATE (EelBookmark, eel_bookmark, GTK_TYPE_OBJECT)
+
+   The parent_class_type parameter is guaranteed to be evaluated only once
+   so it can be an expression, even an expression that contains a function call.
+*/
+
+#define EEL_CLASS_BOILERPLATE(class_name, prefix, parent_class_type)          \
+	EEL_BOILERPLATE (class_name, class_name, prefix, parent_class_type,   \
+                         EEL_REGISTER_TYPE)
+#define EEL_REGISTER_TYPE(class_name, corba_name)                             \
+	g_type_register_static (parent_type, #class_name, &info, 0)
+
+#define EEL_BOILERPLATE(class_name, corba_name, prefix, parent_class_type,    \
+                        register_type)                                        \
+                                                                              \
+static gpointer parent_class;                                                 \
+                                                                              \
+GtkType                                                                       \
+prefix##_get_type (void)                                                      \
+{                                                                             \
+	GtkType parent_type;                                                  \
+	static GtkType type;                                                  \
+                                                                              \
+	if (type == 0) {                                                      \
+		static GTypeInfo info = {                                     \
+			sizeof (class_name##Class),                           \
+                        NULL, NULL,                                           \
+			(GClassInitFunc) prefix##_class_init,                 \
+                        NULL, NULL,                                           \
+			sizeof (class_name), 0,                               \
+			(GInstanceInitFunc) prefix##_init,                    \
+			NULL                                                  \
+		};                                                            \
+                                                                              \
+		parent_type = (parent_class_type);                            \
+		type = register_type (class_name, corba_name);                \
+		parent_class = g_type_class_ref (parent_type);                \
+	}                                                                     \
+                                                                              \
+	return type;                                                          \
+}
+
+/* Call a parent class version of a virtual function (or default
+ * signal handler since that's the same thing). Nice because it
+ * documents what it's doing and there is less chance for a
+ * typo. Depends on the parent class pointer having the conventional
+ * name "parent_class" as the boilerplate macro above does it.
+ */
+#define EEL_CALL_PARENT(parent_class_cast_macro, signal, parameters)          \
+                                                                              \
+G_STMT_START {                                                                \
+	if (parent_class_cast_macro (parent_class)->signal != NULL) {         \
+		(* parent_class_cast_macro (parent_class)->signal) parameters;\
+        }                                                                     \
+} G_STMT_END
+
+/* Same thing, for functions with a return value. */
+#define EEL_CALL_PARENT_WITH_RETURN_VALUE(parent_class_cast_macro, signal,    \
+                                          parameters)                         \
+                                                                              \
+(parent_class_cast_macro (parent_class)->signal == NULL)                      \
+	? 0                                                                   \
+	: ((* parent_class_cast_macro (parent_class)->signal) parameters)
+
+#endif /* EEL_DISABLE_DEPRECATED */
+
+/* Call a virtual function. Useful when the virtual function is not a
+ * signal, otherwise you want to gtk_signal emit. Nice because it
+ * documents what it's doing and there is less chance for a typo.
+ */
+#define EEL_CALL_METHOD(class_cast_macro, object, signal, parameters)         \
+                                                                              \
+G_STMT_START {                                                                \
+	if (class_cast_macro (G_OBJECT_GET_CLASS (object))->signal != NULL) { \
+		(* class_cast_macro (G_OBJECT_GET_CLASS (object))->signal)    \
+                parameters;                                                   \
+	}                                                                     \
+} G_STMT_END
+
+/* Same thing, for functions with a return value. */
+#define EEL_CALL_METHOD_WITH_RETURN_VALUE(class_cast_macro, object, signal,   \
+                                          parameters)                         \
+                                                                              \
+(class_cast_macro (G_OBJECT_GET_CLASS (object))->signal == NULL)              \
+	? 0                                                                   \
+	: ((* class_cast_macro (G_OBJECT_GET_CLASS (object))->signal)         \
+           parameters)                                                        \
+
+#ifndef G_DISABLE_ASSERT
+
+/* Define a signal that is not implemented by this class but must be 
+ * implemented by subclasses. This macro should be used inside the
+ * class initialization function. The companion macro EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL
+ * must be used earlier in the file. Called like this:
+ * 
+ * EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass,
+ *					 fm_directory_view,
+ *					 clear); 
+ */
+#define EEL_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, prefix, signal)        \
+                                                                              \
+* (void (**)(void)) & (class_pointer)->signal = prefix##_unimplemented_##signal
+
+/* Provide a debug-only implementation of a signal that must be implemented
+ * by subclasses. The debug-only implementation fires a warning if it is called.
+ * This macro should be placed as if it were a function, earlier in the file
+ * than the class initialization function. Called like this:
+ * 
+ * EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear);
+ */
+#define EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL(prefix, signal)                    \
+                                                                              \
+static void                                                                   \
+prefix##_unimplemented_##signal (void)                                        \
+{                                                                             \
+	g_warning ("failed to override signal " #prefix "->" #signal);        \
+}
+
+#else /* G_DISABLE_ASSERT */
+
+#define EEL_DEFINE_MUST_OVERRIDE_SIGNAL(class_cast_macro, class_pointer, prefix, signal)
+#define EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL(prefix, signal)
+#define EEL_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, prefix, signal)
+
+#endif /* G_DISABLE_ASSERT */
+
+/* Access a method. */
+#define EEL_ACCESS_METHOD(class_cast_macro, object, method)                   \
+(class_cast_macro (G_OBJECT_GET_CLASS (object))->method)
+
+/* Invoke a method for a given object. */
+#define EEL_INVOKE_METHOD(class_cast_macro, object, method, parameters)       \
+((* EEL_ACCESS_METHOD (class_cast_macro, object, method)) parameters)
+
+/* Assert the non-nullness of a method for a given object. */
+#define EEL_ASSERT_METHOD(class_cast_macro, object, method)                   \
+g_assert (EEL_ACCESS_METHOD (class_cast_macro, object, method) != NULL)
+
+/* Invoke a method if it ain't null. */
+#define EEL_INVOKE_METHOD_IF(class_cast_macro, object, method, parameters)    \
+(EEL_ACCESS_METHOD (class_cast_macro, object, method) ? 0 :                   \
+	EEL_INVOKE_METHOD (class_cast_macro, object, method, parameters))
+
+#endif /* EEL_GTK_MACROS_H */
diff --git a/eel/eel-i18n.c b/eel/eel-i18n.c
new file mode 100644
index 000000000..83f9fec64
--- /dev/null
+++ b/eel/eel-i18n.c
@@ -0,0 +1,51 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-i18n.c:  I18n stuff for Eel.
+
+   Copyright (C) 2002 MandrakeSoft.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Frederic Crozat <fcrozat@mandrakesoft.com>
+*/
+
+#include <config.h>
+#include <glib.h>
+#include "eel-i18n.h"
+
+#ifdef ENABLE_NLS
+
+#include <libintl.h>
+
+
+
+G_CONST_RETURN char *
+_eel_gettext (const char *str)
+{
+	static gboolean _eel_gettext_initialized = FALSE;
+
+	if (!_eel_gettext_initialized) {
+		bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+#    ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#    endif
+		_eel_gettext_initialized = TRUE;
+	}
+
+	return dgettext (GETTEXT_PACKAGE, str);
+}
+
+#endif /* ENABLE_NLS */
diff --git a/eel/eel-i18n.h b/eel/eel-i18n.h
new file mode 100644
index 000000000..b45568968
--- /dev/null
+++ b/eel/eel-i18n.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-i18n.h: I18n stuff for Eel.
+
+   Copyright (C) 2002 MandrakeSoft
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Frederic Crozat <fcrozat@mandrakesoft.com>
+*/
+
+#ifndef EEL_I18N_H
+#define EEL_I18N_H
+
+#ifdef ENABLE_NLS
+#include <glib.h>
+
+G_CONST_RETURN char *
+_eel_gettext (const char *str) G_GNUC_FORMAT (1);
+
+#include <libintl.h>
+#define _(String) _eel_gettext(String)
+
+#ifdef gettext_noop
+#define N_(String) gettext_noop(String)
+#else
+#define N_(String) (String)
+#endif
+#else /* NLS is disabled */
+#define _(String) (String)
+#define N_(String) (String)
+#define textdomain(String) (String)
+#define gettext(String) (String)
+#define dgettext(Domain,String) (String)
+#define dcgettext(Domain,String,Type) (String)
+#define bindtextdomain(Domain,Directory) (Domain)
+#endif
+
+
+#endif /* EEL_I18N_H */
diff --git a/eel/eel-image-table.c b/eel/eel-image-table.c
new file mode 100644
index 000000000..977477e56
--- /dev/null
+++ b/eel/eel-image-table.c
@@ -0,0 +1,579 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-image-table.c - An image table.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-image-table.h"
+
+#include "eel-art-extensions.h"
+#include "eel-art-gtk-extensions.h"
+#include "eel-debug-drawing.h"
+#include "eel-gtk-extensions.h"
+#include "eel-gtk-macros.h"
+#include "eel-labeled-image.h"
+#include "eel-marshal.h"
+#include <gtk/gtk.h>
+
+/* Arguments */
+enum
+{
+	ARG_0,
+	ARG_CHILD_UNDER_POINTER
+};
+
+/* Detail member struct */
+struct EelImageTableDetails
+{
+	GtkWidget *child_under_pointer;
+	GtkWidget *child_being_pressed;
+	GdkGC     *clear_gc;
+};
+
+/* Signals */
+typedef enum
+{
+	CHILD_ENTER,
+	CHILD_LEAVE,
+	CHILD_PRESSED,
+	CHILD_RELEASED,
+	CHILD_CLICKED,
+	LAST_SIGNAL
+} ImageTableSignals;
+
+/* Signals */
+static guint image_table_signals[LAST_SIGNAL] = { 0 };
+
+static void    eel_image_table_class_init     (EelImageTableClass *image_table_class);
+static void    eel_image_table_init           (EelImageTable      *image);
+
+/* GObjectClass methods */
+static void    eel_image_table_finalize             (GObject            *object);
+
+/* GtkWidgetClass methods */
+static void    eel_image_table_realize              (GtkWidget          *widget);
+static void    eel_image_table_unrealize            (GtkWidget          *widget);
+
+/* GtkContainerClass methods */
+static void    eel_image_table_remove               (GtkContainer       *container,
+						     GtkWidget          *widget);
+static GtkType eel_image_table_child_type           (GtkContainer       *container);
+
+/* Private EelImageTable methods */
+static void    image_table_emit_signal              (EelImageTable      *image_table,
+						     GtkWidget          *child,
+						     guint               signal_index,
+						     int                 x,
+						     int                 y,
+						     int                 button,
+						     guint               state,
+						     GdkEvent           *event);
+
+/* Ancestor callbacks */
+static int     ancestor_enter_notify_event          (GtkWidget          *widget,
+						     GdkEventCrossing   *event,
+						     gpointer            event_data);
+static int     ancestor_leave_notify_event          (GtkWidget          *widget,
+						     GdkEventCrossing   *event,
+						     gpointer            event_data);
+static int     ancestor_motion_notify_event         (GtkWidget          *widget,
+						     GdkEventMotion     *event,
+						     gpointer            event_data);
+static int     ancestor_button_press_event          (GtkWidget          *widget,
+						     GdkEventButton     *event,
+						     gpointer            event_data);
+static int     ancestor_button_release_event        (GtkWidget          *widget,
+						     GdkEventButton     *event,
+						     gpointer            event_data);
+
+EEL_CLASS_BOILERPLATE (EelImageTable, eel_image_table, EEL_TYPE_WRAP_TABLE)
+
+static void
+eel_image_table_class_init (EelImageTableClass *image_table_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (image_table_class);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (image_table_class);
+	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (image_table_class);
+
+	/* GObjectClass */
+	object_class->finalize = eel_image_table_finalize;
+	
+ 	/* GtkWidgetClass */
+ 	widget_class->realize = eel_image_table_realize;
+ 	widget_class->unrealize = eel_image_table_unrealize;
+
+ 	/* GtkContainerClass */
+	container_class->remove = eel_image_table_remove;
+	container_class->child_type = eel_image_table_child_type;
+
+	/* Signals */
+	image_table_signals[CHILD_ENTER] = g_signal_new ("child_enter",
+							 G_TYPE_FROM_CLASS (object_class),
+							 G_SIGNAL_RUN_LAST,
+							 G_STRUCT_OFFSET (EelImageTableClass, child_enter),
+							 NULL, NULL,
+							 eel_marshal_VOID__OBJECT_POINTER,
+							 G_TYPE_NONE,
+							 2,
+							 GTK_TYPE_WIDGET,
+							 G_TYPE_POINTER);
+	image_table_signals[CHILD_LEAVE] = g_signal_new ("child_leave",
+							 G_TYPE_FROM_CLASS (object_class),
+							 G_SIGNAL_RUN_LAST,
+							 G_STRUCT_OFFSET (EelImageTableClass, child_leave),
+							 NULL, NULL,
+							 eel_marshal_VOID__OBJECT_POINTER,
+							 G_TYPE_NONE,
+							 2,
+							 GTK_TYPE_WIDGET,
+							 G_TYPE_POINTER);
+	image_table_signals[CHILD_PRESSED] = g_signal_new ("child_pressed",
+							   G_TYPE_FROM_CLASS (object_class),
+							   G_SIGNAL_RUN_LAST,
+							   G_STRUCT_OFFSET (EelImageTableClass, child_pressed),
+							   NULL, NULL,
+							   eel_marshal_VOID__OBJECT_POINTER,
+							   G_TYPE_NONE,
+							   2,
+							   GTK_TYPE_WIDGET,
+							   G_TYPE_POINTER);
+	image_table_signals[CHILD_RELEASED] = g_signal_new ("child_released",
+							    G_TYPE_FROM_CLASS (object_class),
+							    G_SIGNAL_RUN_LAST,
+							    G_STRUCT_OFFSET (EelImageTableClass, child_released),
+							    NULL, NULL,
+							    eel_marshal_VOID__OBJECT_POINTER,
+							    G_TYPE_NONE,
+							    2,
+							    GTK_TYPE_WIDGET,
+							    G_TYPE_POINTER);
+	image_table_signals[CHILD_CLICKED] = g_signal_new ("child_clicked",
+							   G_TYPE_FROM_CLASS (object_class),
+							   G_SIGNAL_RUN_LAST,
+							   G_STRUCT_OFFSET (EelImageTableClass, child_clicked),
+							   NULL, NULL,
+							   eel_marshal_VOID__OBJECT_POINTER,
+							   G_TYPE_NONE,
+							   2,
+							   GTK_TYPE_WIDGET,
+							   G_TYPE_POINTER);
+}
+
+static void
+eel_image_table_init (EelImageTable *image_table)
+{
+	GTK_WIDGET_SET_FLAGS (image_table, GTK_NO_WINDOW);
+
+	image_table->details = g_new0 (EelImageTableDetails, 1);
+}
+
+/* GObjectClass methods */
+static void
+eel_image_table_finalize (GObject *object)
+{
+ 	EelImageTable *image_table;
+	
+	image_table = EEL_IMAGE_TABLE (object);
+
+	g_free (image_table->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static void
+eel_image_table_realize (GtkWidget *widget)
+{
+	GtkWidget *windowed_ancestor;
+
+	g_assert (EEL_IS_IMAGE_TABLE (widget));
+	
+	/* Chain realize */
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+
+	windowed_ancestor = eel_gtk_widget_find_windowed_ancestor (widget);
+	g_assert (GTK_IS_WIDGET (windowed_ancestor));
+	
+	gtk_widget_add_events (windowed_ancestor,
+			       GDK_BUTTON_PRESS_MASK
+			       | GDK_BUTTON_RELEASE_MASK
+			       | GDK_BUTTON_MOTION_MASK
+			       | GDK_ENTER_NOTIFY_MASK
+			       | GDK_LEAVE_NOTIFY_MASK
+			       | GDK_POINTER_MOTION_MASK);
+
+	eel_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
+					       "enter_notify_event",
+					       G_CALLBACK (ancestor_enter_notify_event),
+					       widget,
+					       widget);
+	
+	eel_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
+					       "leave_notify_event",
+					       G_CALLBACK (ancestor_leave_notify_event),
+					       widget,
+					       widget);
+	
+	eel_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
+					       "motion_notify_event",
+					       G_CALLBACK (ancestor_motion_notify_event),
+					       widget,
+					       widget);
+	
+	eel_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
+					       "button_press_event",
+					       G_CALLBACK (ancestor_button_press_event),
+					       widget,
+					       widget);
+	
+	eel_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
+					       "button_release_event",
+					       G_CALLBACK (ancestor_button_release_event),
+					       widget,
+					       widget);
+}
+
+static void
+eel_image_table_unrealize (GtkWidget *widget)
+{
+	EelImageTable *image_table;
+
+	g_assert (EEL_IS_IMAGE_TABLE (widget));
+
+	image_table = EEL_IMAGE_TABLE (widget);
+
+	if (image_table->details->clear_gc != NULL) {
+		g_object_unref (image_table->details->clear_gc);
+		image_table->details->clear_gc = NULL;
+	}
+
+	/* Chain unrealize */
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
+}
+
+/* GtkContainerClass methods */
+static void
+eel_image_table_remove (GtkContainer *container,
+			GtkWidget *child)
+{
+	EelImageTable *image_table;
+	
+	g_assert (EEL_IS_IMAGE_TABLE (container));
+	g_assert (EEL_IS_LABELED_IMAGE (child));
+	
+	image_table = EEL_IMAGE_TABLE (container);
+
+	if (child == image_table->details->child_under_pointer) {
+		image_table->details->child_under_pointer = NULL;
+	}
+
+	if (child == image_table->details->child_being_pressed) {
+		image_table->details->child_being_pressed = NULL;
+	}
+
+	EEL_CALL_PARENT (GTK_CONTAINER_CLASS, remove, (container, child));
+}
+
+static GtkType
+eel_image_table_child_type (GtkContainer *container)
+{
+	return EEL_TYPE_LABELED_IMAGE;
+}
+
+/* Private EelImageTable methods */
+
+static void
+image_table_emit_signal (EelImageTable *image_table,
+			 GtkWidget *child,
+			 guint signal_index,
+			 int x,
+			 int y,
+			 int button,
+			 guint state,
+			 GdkEvent *gdk_event)
+{
+	EelImageTableEvent event;
+
+	g_assert (EEL_IS_IMAGE_TABLE (image_table));
+	g_assert (GTK_IS_WIDGET (child));
+	g_assert (signal_index < LAST_SIGNAL);
+
+	event.x = x;
+	event.y = y;
+	event.button = button;
+	event.state = state;
+	event.event = gdk_event;
+	
+	g_signal_emit (image_table, 
+		       image_table_signals[signal_index],
+		       0,
+		       child,
+		       &event);
+}
+
+static void
+image_table_handle_motion (EelImageTable *image_table,
+			   int x,
+			   int y,
+			   GdkEvent *event)
+{
+	GtkWidget *child;
+	GtkWidget *leave_emit_child = NULL;
+	GtkWidget *enter_emit_child = NULL;
+
+	g_assert (EEL_IS_IMAGE_TABLE (image_table));
+
+	child = eel_wrap_table_find_child_at_event_point (EEL_WRAP_TABLE (image_table), x, y);
+
+	if (child && !GTK_WIDGET_SENSITIVE (child)) {
+		return;
+	}
+
+	if (child == image_table->details->child_under_pointer) {
+		return;
+	}
+
+	if (child != NULL) {
+		if (image_table->details->child_under_pointer != NULL) {
+			leave_emit_child = image_table->details->child_under_pointer;
+		}
+
+		image_table->details->child_under_pointer = child;
+		enter_emit_child = image_table->details->child_under_pointer;
+	} else {
+		if (image_table->details->child_under_pointer != NULL) {
+			leave_emit_child = image_table->details->child_under_pointer;
+		}
+
+		image_table->details->child_under_pointer = NULL;
+	}
+
+	if (leave_emit_child != NULL) {
+		image_table_emit_signal (image_table,
+					 leave_emit_child,
+					 CHILD_LEAVE,
+					 x,
+					 y,
+					 0,
+					 0,
+					 (GdkEvent *)event);
+	}
+
+	if (enter_emit_child != NULL) {
+		image_table_emit_signal (image_table,
+					 enter_emit_child,
+					 CHILD_ENTER,
+					 x,
+					 y,
+					 0,
+					 0,
+					 (GdkEvent *)event);
+	}
+}
+
+static int
+ancestor_enter_notify_event (GtkWidget *widget,
+			     GdkEventCrossing *event,
+			     gpointer event_data)
+{
+	g_assert (GTK_IS_WIDGET (widget));
+	g_assert (EEL_IS_IMAGE_TABLE (event_data));
+	g_assert (event != NULL);
+
+	image_table_handle_motion (EEL_IMAGE_TABLE (event_data), event->x, event->y, (GdkEvent *) event);
+
+	return FALSE;
+}
+
+static int
+ancestor_leave_notify_event (GtkWidget *widget,
+			     GdkEventCrossing *event,
+			     gpointer event_data)
+{
+	EelIRect bounds;
+	int x = -1;
+	int y = -1;
+	
+	g_assert (GTK_IS_WIDGET (widget));
+	g_assert (EEL_IS_IMAGE_TABLE (event_data));
+	g_assert (event != NULL);
+
+	bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (event_data));
+	
+	if (eel_irect_contains_point (bounds, event->x, event->y)) {
+		x = event->x;
+		y = event->y;
+	}
+
+	image_table_handle_motion (EEL_IMAGE_TABLE (event_data), x, y, (GdkEvent *) event);
+	
+	return FALSE;
+}
+
+static int
+ancestor_motion_notify_event (GtkWidget *widget,
+			      GdkEventMotion *event,
+			      gpointer event_data)
+{
+	g_assert (GTK_IS_WIDGET (widget));
+	g_assert (EEL_IS_IMAGE_TABLE (event_data));
+	g_assert (event != NULL);
+
+	image_table_handle_motion (EEL_IMAGE_TABLE (event_data), (int) event->x, (int) event->y, (GdkEvent *) event);
+
+	return FALSE;
+}
+
+static int
+ancestor_button_press_event (GtkWidget *widget,
+			     GdkEventButton *event,
+			     gpointer event_data)
+{
+  	EelImageTable *image_table;
+	GtkWidget *child;
+
+	g_assert (GTK_IS_WIDGET (widget));
+	g_assert (EEL_IS_IMAGE_TABLE (event_data));
+	g_assert (event != NULL);
+
+ 	image_table = EEL_IMAGE_TABLE (event_data);
+
+	child = eel_wrap_table_find_child_at_event_point (EEL_WRAP_TABLE (image_table), event->x, event->y);
+
+	if (child && !GTK_WIDGET_SENSITIVE (child)) {
+		return FALSE;
+	}
+
+	if (child != NULL) {
+		if (child == image_table->details->child_under_pointer) {
+			image_table->details->child_being_pressed = child;
+			image_table_emit_signal (image_table,
+						 child,
+						 CHILD_PRESSED,
+						 event->x,
+						 event->y,
+						 event->button,
+						 event->state,
+						 (GdkEvent *)event);
+		}
+	}
+
+	return FALSE;
+}
+
+static int
+ancestor_button_release_event (GtkWidget *widget,
+			       GdkEventButton *event,
+			       gpointer event_data)
+{
+  	EelImageTable *image_table;
+	GtkWidget *child;
+	GtkWidget *released_emit_child = NULL;
+	GtkWidget *clicked_emit_child = NULL;
+
+	g_assert (GTK_IS_WIDGET (widget));
+	g_assert (EEL_IS_IMAGE_TABLE (event_data));
+	g_assert (event != NULL);
+
+ 	image_table = EEL_IMAGE_TABLE (event_data);
+
+	child = eel_wrap_table_find_child_at_event_point (EEL_WRAP_TABLE (image_table), event->x, event->y);
+
+	if (child && !GTK_WIDGET_SENSITIVE (child)) {
+		return FALSE;
+	}
+
+	if (image_table->details->child_being_pressed != NULL) {
+		released_emit_child = image_table->details->child_being_pressed;
+	}
+
+	if (child != NULL) {
+		if (child == image_table->details->child_being_pressed) {
+			clicked_emit_child = child;
+		}
+	}
+	
+	image_table->details->child_being_pressed = NULL;
+
+	if (released_emit_child != NULL) {
+		image_table_emit_signal (image_table,
+					 released_emit_child,
+					 CHILD_RELEASED,
+					 event->x,
+					 event->y,
+					 event->button,
+					 event->state,
+					 (GdkEvent *)event);
+	}
+	
+	if (clicked_emit_child != NULL) {
+
+		image_table_emit_signal (image_table,
+					 clicked_emit_child,
+					 CHILD_CLICKED,
+					 event->x,
+					 event->y,
+					 event->button,
+					 event->state,
+					 (GdkEvent *)event);
+	}
+	
+	return FALSE;
+}
+
+/**
+ * eel_image_table_new:
+ */
+GtkWidget*
+eel_image_table_new (gboolean homogeneous)
+{
+	EelImageTable *image_table;
+
+	image_table = EEL_IMAGE_TABLE (gtk_widget_new (eel_image_table_get_type (), NULL));
+
+	eel_wrap_table_set_homogeneous (EEL_WRAP_TABLE (image_table), homogeneous);
+	
+	return GTK_WIDGET (image_table);
+}
+
+/**
+ * eel_image_table_add_empty_child:
+ * @image_table: A EelImageTable.
+ *
+ * Add a "empty" child to the table.  Useful when you want to have
+ * empty space between 2 children.
+ *
+ * Returns: The empty child - A EelLabeledImage widget with no label
+ *          or pixbuf.
+ */
+GtkWidget *
+eel_image_table_add_empty_image (EelImageTable *image_table)
+{
+	GtkWidget *empty;
+
+	g_return_val_if_fail (EEL_IS_IMAGE_TABLE (image_table), NULL);
+
+	empty = eel_labeled_image_new (NULL, NULL);
+	gtk_container_add (GTK_CONTAINER (image_table), empty);
+	gtk_widget_set_sensitive (empty, FALSE);
+
+	return empty;
+}
diff --git a/eel/eel-image-table.h b/eel/eel-image-table.h
new file mode 100644
index 000000000..dfda964f3
--- /dev/null
+++ b/eel/eel-image-table.h
@@ -0,0 +1,89 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-image-table.h - An image table.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_IMAGE_TABLE_H
+#define EEL_IMAGE_TABLE_H
+
+#include <eel/eel-wrap-table.h>
+
+G_BEGIN_DECLS
+
+#define EEL_TYPE_IMAGE_TABLE            (eel_image_table_get_type ())
+#define EEL_IMAGE_TABLE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_IMAGE_TABLE, EelImageTable))
+#define EEL_IMAGE_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_IMAGE_TABLE, EelImageTableClass))
+#define EEL_IS_IMAGE_TABLE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_IMAGE_TABLE))
+#define EEL_IS_IMAGE_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_IMAGE_TABLE))
+
+typedef struct EelImageTable		EelImageTable;
+typedef struct EelImageTableClass	EelImageTableClass;
+typedef struct EelImageTableDetails	EelImageTableDetails;
+
+typedef struct
+{
+	int x;
+	int y;
+	int button;
+	guint state;
+	GdkEvent *event;
+} EelImageTableEvent;
+
+struct EelImageTable
+{
+	/* Superclass */
+	EelWrapTable wrap_table;
+
+	/* Private things */
+	EelImageTableDetails *details;
+};
+
+struct EelImageTableClass
+{
+	EelWrapTableClass parent_class;
+
+	/* Signals */
+	void (* child_enter) (EelImageTable *image_table,
+			      GtkWidget *child,
+			      const EelImageTableEvent *event);
+	void (* child_leave) (EelImageTable *image_table,
+			      GtkWidget *child,
+			      const EelImageTableEvent *event);
+	void (* child_pressed) (EelImageTable *image_table,
+				GtkWidget *child,
+				const EelImageTableEvent *event);
+	void (* child_released) (EelImageTable *image_table,
+				 GtkWidget *child,
+				 const EelImageTableEvent *event);
+	void (* child_clicked) (EelImageTable *image_table,
+				GtkWidget *child,
+				const EelImageTableEvent *event);
+};
+
+/* Public GtkImageTable methods */
+GtkType    eel_image_table_get_type         (void);
+GtkWidget *eel_image_table_new              (gboolean       homogeneous);
+GtkWidget *eel_image_table_add_empty_image  (EelImageTable *image_table);
+
+G_END_DECLS
+
+#endif /* EEL_IMAGE_TABLE_H */
diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c
new file mode 100644
index 000000000..bae5e9d28
--- /dev/null
+++ b/eel/eel-labeled-image.c
@@ -0,0 +1,2376 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-labeled-image.c - A labeled image.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-labeled-image.h"
+
+#include "eel-art-extensions.h"
+#include "eel-art-gtk-extensions.h"
+#include "eel-debug-drawing.h"
+#include "eel-gtk-container.h"
+#include "eel-gtk-extensions.h"
+#include "eel-gtk-macros.h"
+#include "eel-accessibility.h"
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <atk/atkimage.h>
+
+#define DEFAULT_SPACING 0
+#define DEFAULT_X_PADDING 0
+#define DEFAULT_Y_PADDING 0
+#define DEFAULT_X_ALIGNMENT 0.5
+#define DEFAULT_Y_ALIGNMENT 0.5
+
+/* Signals */
+enum
+{
+	ACTIVATE,
+	LAST_SIGNAL
+};
+
+/* Arguments */
+enum
+{
+	PROP_0,
+	PROP_FILL,
+	PROP_LABEL,
+	PROP_LABEL_POSITION,
+	PROP_PIXBUF,
+	PROP_SHOW_IMAGE,
+	PROP_SHOW_LABEL,
+	PROP_SPACING,
+	PROP_X_ALIGNMENT,
+	PROP_X_PADDING,
+	PROP_Y_ALIGNMENT,
+	PROP_Y_PADDING
+};
+
+/* Detail member struct */
+struct EelLabeledImageDetails
+{
+	GtkWidget *image;
+	GtkWidget *label;
+	GtkPositionType label_position;
+	gboolean show_label;
+	gboolean show_image;
+	guint spacing;
+	float x_alignment;
+	float y_alignment;
+	int x_padding;
+	int y_padding;
+	int fixed_image_height;
+	gboolean fill;
+};
+
+/* derived types so we can add our accessibility interfaces */
+static GType         eel_labeled_image_button_get_type        (void);
+static GType         eel_labeled_image_check_button_get_type  (void);
+static GType         eel_labeled_image_radio_button_get_type  (void);
+static GType         eel_labeled_image_toggle_button_get_type (void);
+
+
+static void          eel_labeled_image_class_init         (EelLabeledImageClass  *labeled_image_class);
+static void          eel_labeled_image_init               (EelLabeledImage       *image);
+static void          eel_labeled_image_finalize           (GObject               *object);
+
+
+
+/* GObjectClass methods */
+static void          eel_labeled_image_set_property       (GObject               *object,
+							   guint                  property_id,
+							   const GValue          *value,
+							   GParamSpec            *pspec);
+static void          eel_labeled_image_get_property       (GObject               *object,
+							   guint                  property_id,
+							   GValue                *value,
+							   GParamSpec            *pspec);
+
+/* GtkObjectClass methods */
+static void          eel_labeled_image_destroy            (GtkObject             *object);
+
+/* GtkWidgetClass methods */
+static void          eel_labeled_image_size_request       (GtkWidget             *widget,
+							   GtkRequisition        *requisition);
+static int           eel_labeled_image_expose_event       (GtkWidget             *widget,
+							   GdkEventExpose        *event);
+static void          eel_labeled_image_size_allocate      (GtkWidget             *widget,
+							   GtkAllocation         *allocation);
+static void          eel_labeled_image_map                (GtkWidget             *widget);
+static void          eel_labeled_image_unmap              (GtkWidget             *widget);
+static AtkObject    *eel_labeled_image_get_accessible     (GtkWidget             *widget);
+
+/* GtkContainerClass methods */
+static void          eel_labeled_image_add                (GtkContainer          *container,
+							   GtkWidget             *widget);
+static void          eel_labeled_image_remove             (GtkContainer          *container,
+							   GtkWidget             *widget);
+static void          eel_labeled_image_forall             (GtkContainer          *container,
+							   gboolean               include_internals,
+							   GtkCallback            callback,
+							   gpointer               callback_data);
+
+/* Private EelLabeledImage methods */
+static EelDimensions labeled_image_get_image_dimensions   (const EelLabeledImage *labeled_image);
+static EelDimensions labeled_image_get_label_dimensions   (const EelLabeledImage *labeled_image);
+static void          labeled_image_ensure_label           (EelLabeledImage       *labeled_image);
+static void          labeled_image_ensure_image           (EelLabeledImage       *labeled_image);
+static EelIRect      labeled_image_get_content_bounds     (const EelLabeledImage *labeled_image);
+static EelDimensions labeled_image_get_content_dimensions (const EelLabeledImage *labeled_image);
+static void          labeled_image_update_alignments      (EelLabeledImage       *labeled_image);
+static gboolean      labeled_image_show_label             (const EelLabeledImage *labeled_image);
+static gboolean      labeled_image_show_image             (const EelLabeledImage *labeled_image);
+
+static guint labeled_image_signals[LAST_SIGNAL] = { 0 };
+
+EEL_CLASS_BOILERPLATE (EelLabeledImage, eel_labeled_image, GTK_TYPE_CONTAINER)
+
+/* Class init methods */
+static void
+eel_labeled_image_class_init (EelLabeledImageClass *labeled_image_class)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (labeled_image_class);
+	GtkObjectClass *object_class = GTK_OBJECT_CLASS (labeled_image_class);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (labeled_image_class);
+	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (labeled_image_class);
+	GtkBindingSet *binding_set;
+
+	gobject_class->finalize = eel_labeled_image_finalize;
+
+	/* GObjectClass */
+	gobject_class->set_property = eel_labeled_image_set_property;
+	gobject_class->get_property = eel_labeled_image_get_property;
+
+	/* GtkObjectClass */
+	object_class->destroy = eel_labeled_image_destroy;
+
+ 	/* GtkWidgetClass */
+ 	widget_class->size_request = eel_labeled_image_size_request;
+	widget_class->size_allocate = eel_labeled_image_size_allocate;
+ 	widget_class->expose_event = eel_labeled_image_expose_event;
+	widget_class->map = eel_labeled_image_map;
+	widget_class->unmap = eel_labeled_image_unmap;
+	widget_class->get_accessible = eel_labeled_image_get_accessible;
+
+ 	/* GtkContainerClass */
+	container_class->add = eel_labeled_image_add;
+	container_class->remove = eel_labeled_image_remove;
+	container_class->forall = eel_labeled_image_forall;
+
+	labeled_image_signals[ACTIVATE] =
+		g_signal_new ("activate",
+			      G_TYPE_FROM_CLASS (labeled_image_class),
+			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+			      G_STRUCT_OFFSET (EelLabeledImageClass,
+					       activate),
+			      NULL, NULL, 
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE, 0);	
+	widget_class->activate_signal = labeled_image_signals[ACTIVATE];
+
+	binding_set = gtk_binding_set_by_class (gobject_class);
+	
+	gtk_binding_entry_add_signal (binding_set, 
+				      GDK_Return, 0,
+				      "activate", 0);
+	gtk_binding_entry_add_signal (binding_set, 
+				      GDK_KP_Enter, 0,
+				      "activate", 0);
+	gtk_binding_entry_add_signal (binding_set, 
+				      GDK_space, 0,
+				      "activate", 0);
+
+
+	/* Properties */
+        g_object_class_install_property (
+		gobject_class,
+		PROP_PIXBUF,
+		g_param_spec_object ("pixbuf", NULL, NULL,
+				     GDK_TYPE_PIXBUF, G_PARAM_READWRITE));
+
+        g_object_class_install_property (
+		gobject_class,
+		PROP_LABEL,
+		g_param_spec_string ("label", NULL, NULL,
+				     "", G_PARAM_READWRITE));
+
+
+        g_object_class_install_property (
+		gobject_class,
+		PROP_LABEL_POSITION,
+		g_param_spec_enum ("label_position", NULL, NULL,
+				   GTK_TYPE_POSITION_TYPE,
+				   GTK_POS_BOTTOM,
+				   G_PARAM_READWRITE));
+
+        g_object_class_install_property (
+		gobject_class,
+		PROP_SHOW_LABEL,
+		g_param_spec_boolean ("show_label", NULL, NULL,
+				      TRUE, G_PARAM_READWRITE)); 
+				   
+        g_object_class_install_property (
+		gobject_class,
+		PROP_SHOW_IMAGE,
+		g_param_spec_boolean ("show_image", NULL, NULL,
+				      TRUE, G_PARAM_READWRITE)); 
+				   
+
+	g_object_class_install_property (
+		gobject_class,
+		PROP_SPACING,
+		g_param_spec_uint ("spacing", NULL, NULL,
+				   0,
+				   G_MAXINT,
+				   DEFAULT_SPACING,
+				   G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		gobject_class,
+		PROP_X_PADDING,
+		g_param_spec_int ("x_padding", NULL, NULL,
+				  0,
+				  G_MAXINT,
+				  DEFAULT_X_PADDING,
+				  G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		gobject_class,
+		PROP_Y_PADDING,
+		g_param_spec_int ("y_padding", NULL, NULL,
+				  0,
+				  G_MAXINT,
+				  DEFAULT_Y_PADDING,
+				  G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		gobject_class,
+		PROP_X_ALIGNMENT,
+		g_param_spec_float ("x_alignment", NULL, NULL,
+				    0.0,
+				    1.0,
+				    DEFAULT_X_ALIGNMENT,
+				    G_PARAM_READWRITE));
+   
+	g_object_class_install_property (
+		gobject_class,
+		PROP_Y_ALIGNMENT,
+		g_param_spec_float ("y_alignment", NULL, NULL,
+				    0.0,
+				    1.0,
+				    DEFAULT_Y_ALIGNMENT,
+				    G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		gobject_class,
+		PROP_FILL,
+		g_param_spec_boolean ("fill", NULL, NULL,
+				      FALSE,
+				      G_PARAM_READWRITE));
+}
+
+static void
+eel_labeled_image_init (EelLabeledImage *labeled_image)
+{
+	GTK_WIDGET_SET_FLAGS (labeled_image, GTK_NO_WINDOW);
+
+	labeled_image->details = g_new0 (EelLabeledImageDetails, 1);
+	labeled_image->details->show_label = TRUE;
+	labeled_image->details->show_image = TRUE;
+	labeled_image->details->label_position = GTK_POS_BOTTOM;
+	labeled_image->details->spacing = DEFAULT_SPACING;
+	labeled_image->details->x_padding = DEFAULT_X_PADDING;
+	labeled_image->details->y_padding = DEFAULT_Y_PADDING;
+	labeled_image->details->x_alignment = DEFAULT_X_ALIGNMENT;
+	labeled_image->details->y_alignment = DEFAULT_Y_ALIGNMENT;
+	labeled_image->details->fixed_image_height = 0;
+
+	eel_labeled_image_set_fill (labeled_image, FALSE);
+}
+
+static void
+eel_labeled_image_finalize (GObject *object)
+{
+ 	EelLabeledImage *labeled_image;
+	
+	labeled_image = EEL_LABELED_IMAGE (object);
+
+	g_free (labeled_image->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+
+static void
+eel_labeled_image_destroy (GtkObject *object)
+{
+ 	EelLabeledImage *labeled_image;
+	
+	labeled_image = EEL_LABELED_IMAGE (object);
+
+	if (labeled_image->details->image != NULL) {
+		gtk_widget_destroy (labeled_image->details->image);
+	}
+
+	if (labeled_image->details->label != NULL) {
+		gtk_widget_destroy (labeled_image->details->label);
+	}
+
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+}
+
+/* GObjectClass methods */
+static void
+eel_labeled_image_set_property (GObject      *object,
+				guint         property_id,
+				const GValue *value,
+				GParamSpec   *pspec)
+{
+	EelLabeledImage *labeled_image;
+	
+	g_assert (EEL_IS_LABELED_IMAGE (object));
+
+ 	labeled_image = EEL_LABELED_IMAGE (object);
+
+ 	switch (property_id)
+	{
+	case PROP_PIXBUF:
+		eel_labeled_image_set_pixbuf (labeled_image,
+					      g_value_get_object (value));
+		break;
+
+	case PROP_LABEL:
+		eel_labeled_image_set_text (labeled_image, g_value_get_string (value));
+		break;
+
+	case PROP_LABEL_POSITION:
+		eel_labeled_image_set_label_position (labeled_image,
+						      g_value_get_enum (value));
+		break;
+
+	case PROP_SHOW_LABEL:
+		eel_labeled_image_set_show_label (labeled_image,
+						  g_value_get_boolean (value));
+		break;
+
+	case PROP_SHOW_IMAGE:
+		eel_labeled_image_set_show_image (labeled_image,
+						  g_value_get_boolean (value));
+		break;
+
+	case PROP_SPACING:
+		eel_labeled_image_set_spacing (labeled_image,
+					       g_value_get_uint (value));
+		break;
+
+	case PROP_X_PADDING:
+		eel_labeled_image_set_x_padding (labeled_image,
+						 g_value_get_int (value));
+		break;
+
+	case PROP_Y_PADDING:
+		eel_labeled_image_set_y_padding (labeled_image,
+						 g_value_get_int (value));
+		break;
+
+	case PROP_X_ALIGNMENT:
+		eel_labeled_image_set_x_alignment (labeled_image,
+						   g_value_get_float (value));
+		break;
+
+	case PROP_Y_ALIGNMENT:
+		eel_labeled_image_set_y_alignment (labeled_image,
+						   g_value_get_float (value));
+		break;
+
+	case PROP_FILL:
+		eel_labeled_image_set_fill (labeled_image,
+					    g_value_get_boolean (value));
+		break;
+ 	default:
+		g_assert_not_reached ();
+	}
+}
+
+static void
+eel_labeled_image_get_property (GObject    *object,
+				guint       property_id,
+				GValue     *value,
+				GParamSpec *pspec)
+{
+	EelLabeledImage *labeled_image;
+
+	g_assert (EEL_IS_LABELED_IMAGE (object));
+	
+	labeled_image = EEL_LABELED_IMAGE (object);
+
+ 	switch (property_id)
+	{
+	case PROP_LABEL:
+		if (labeled_image->details->label == NULL) {
+			g_value_set_string (value, NULL);
+		} else {
+			g_value_set_string (value, 
+					    gtk_label_get_text (GTK_LABEL (
+						    labeled_image->details->label)));
+		}
+		break;
+
+	case PROP_LABEL_POSITION:
+		g_value_set_enum (value, eel_labeled_image_get_label_position (labeled_image));
+		break;
+
+	case PROP_SHOW_LABEL:
+		g_value_set_boolean (value, eel_labeled_image_get_show_label (labeled_image));
+		break;
+
+	case PROP_SHOW_IMAGE:
+		g_value_set_boolean (value, eel_labeled_image_get_show_image (labeled_image));
+		break;
+
+	case PROP_SPACING:
+		g_value_set_uint (value, eel_labeled_image_get_spacing (labeled_image));
+		break;
+
+	case PROP_X_PADDING:
+		g_value_set_int (value, eel_labeled_image_get_x_padding (labeled_image));
+		break;
+
+	case PROP_Y_PADDING:
+		g_value_set_int (value, eel_labeled_image_get_y_padding (labeled_image));
+		break;
+
+	case PROP_X_ALIGNMENT:
+		g_value_set_float (value, eel_labeled_image_get_x_alignment (labeled_image));
+		break;
+
+	case PROP_Y_ALIGNMENT:
+		g_value_set_float (value, eel_labeled_image_get_y_alignment (labeled_image));
+		break;
+
+	case PROP_FILL:
+		g_value_set_boolean (value, eel_labeled_image_get_fill (labeled_image));
+		break;
+
+ 	default:
+		g_assert_not_reached ();
+	}
+}
+
+/* GtkWidgetClass methods */
+static void
+eel_labeled_image_size_request (GtkWidget *widget,
+				GtkRequisition *requisition)
+{
+	EelLabeledImage *labeled_image;
+ 	EelDimensions content_dimensions;
+
+ 	g_assert (EEL_IS_LABELED_IMAGE (widget));
+ 	g_assert (requisition != NULL);
+
+  	labeled_image = EEL_LABELED_IMAGE (widget);
+	
+ 	content_dimensions = labeled_image_get_content_dimensions (labeled_image);
+
+	requisition->width = 
+		MAX (1, content_dimensions.width) +
+		2 * labeled_image->details->x_padding;
+
+	requisition->height = 
+		MAX (1, content_dimensions.height) +
+		2 * labeled_image->details->y_padding;
+}
+
+static void
+eel_labeled_image_size_allocate (GtkWidget *widget,
+				 GtkAllocation *allocation)
+{
+	EelLabeledImage *labeled_image;
+ 	EelIRect image_bounds;
+	EelIRect label_bounds;
+
+ 	g_assert (EEL_IS_LABELED_IMAGE (widget));
+ 	g_assert (allocation != NULL);
+
+  	labeled_image = EEL_LABELED_IMAGE (widget);
+
+	widget->allocation = *allocation;
+	
+ 	label_bounds = eel_labeled_image_get_label_bounds (labeled_image);
+	eel_gtk_container_child_size_allocate (GTK_CONTAINER (widget),
+					       labeled_image->details->label,
+					       label_bounds);
+
+ 	image_bounds = eel_labeled_image_get_image_bounds (labeled_image);
+	eel_gtk_container_child_size_allocate (GTK_CONTAINER (widget),
+					       labeled_image->details->image,
+					       image_bounds);
+}
+
+static int
+eel_labeled_image_expose_event (GtkWidget *widget,
+				GdkEventExpose *event)
+{
+	EelLabeledImage *labeled_image;
+	EelIRect label_bounds;
+
+	g_assert (EEL_IS_LABELED_IMAGE (widget));
+	g_assert (GTK_WIDGET_REALIZED (widget));
+	g_assert (event != NULL);
+
+  	labeled_image = EEL_LABELED_IMAGE (widget);
+
+	if (GTK_WIDGET_STATE (widget) == GTK_STATE_SELECTED || 
+	    GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE) {
+		label_bounds = eel_labeled_image_get_label_bounds (EEL_LABELED_IMAGE (widget));
+
+		gtk_paint_flat_box (widget->style,
+				    widget->window,
+				    GTK_WIDGET_STATE (widget),
+				    GTK_SHADOW_NONE,
+				    &event->area,
+				    widget,
+				    "eel-labeled-image",
+				    label_bounds.x0, label_bounds.y0,
+				    label_bounds.x1 - label_bounds.x0, 
+				    label_bounds.y1 - label_bounds.y0);
+	}
+
+	if (labeled_image_show_label (labeled_image)) {
+		eel_gtk_container_child_expose_event (GTK_CONTAINER (widget),
+						      labeled_image->details->label,
+						      event);
+	}
+	
+	if (labeled_image_show_image (labeled_image)) {
+		eel_gtk_container_child_expose_event (GTK_CONTAINER (widget),
+						      labeled_image->details->image,
+						      event);
+	}
+
+	if (GTK_WIDGET_HAS_FOCUS (widget)) {
+		label_bounds = eel_labeled_image_get_image_bounds (EEL_LABELED_IMAGE (widget));
+		gtk_paint_focus (widget->style, widget->window,
+				 GTK_STATE_NORMAL,
+				 &event->area, widget,
+				 "eel-focusable-labeled-image",
+				 label_bounds.x0, label_bounds.y0,
+				 label_bounds.x1 - label_bounds.x0, 
+				 label_bounds.y1 - label_bounds.y0);
+	}		
+
+	return FALSE;
+}
+
+static void
+eel_labeled_image_map (GtkWidget *widget)
+{
+	EelLabeledImage *labeled_image;
+
+	g_assert (EEL_IS_LABELED_IMAGE (widget));
+	
+	labeled_image = EEL_LABELED_IMAGE (widget);
+
+ 	GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+	
+	if (labeled_image_show_label (labeled_image)) {
+		eel_gtk_container_child_map (GTK_CONTAINER (widget), labeled_image->details->label);
+	}
+
+	if (labeled_image_show_image (labeled_image)) {
+		eel_gtk_container_child_map (GTK_CONTAINER (widget), labeled_image->details->image);
+	}
+}
+
+static void
+eel_labeled_image_unmap (GtkWidget *widget)
+{
+	EelLabeledImage *labeled_image;
+
+	g_assert (EEL_IS_LABELED_IMAGE (widget));
+	
+	labeled_image = EEL_LABELED_IMAGE (widget);
+
+	GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+	
+	eel_gtk_container_child_unmap (GTK_CONTAINER (widget), labeled_image->details->label);
+	eel_gtk_container_child_unmap (GTK_CONTAINER (widget), labeled_image->details->image);
+}
+
+/* GtkContainerClass methods */
+static void
+eel_labeled_image_add (GtkContainer *container,
+		       GtkWidget *child)
+{
+	g_assert (GTK_IS_LABEL (child) || GTK_IS_IMAGE (child));
+
+	eel_gtk_container_child_add (container, child);
+}
+
+static void
+eel_labeled_image_remove (GtkContainer *container,
+			  GtkWidget *child)
+{
+	EelLabeledImage *labeled_image;
+	
+	g_assert (GTK_IS_LABEL (child) || GTK_IS_IMAGE (child));
+	
+	labeled_image = EEL_LABELED_IMAGE (container);;
+
+	g_assert (child == labeled_image->details->image || child == labeled_image->details->label);
+
+	eel_gtk_container_child_remove (container, child);
+
+	if (labeled_image->details->image == child) {
+		labeled_image->details->image = NULL;
+	}
+
+	if (labeled_image->details->label == child) {
+		labeled_image->details->label = NULL;
+	}
+}
+
+static void
+eel_labeled_image_forall (GtkContainer *container,
+			  gboolean include_internals,
+			  GtkCallback callback,
+			  gpointer callback_data)
+{
+	EelLabeledImage *labeled_image;
+	
+	g_assert (EEL_IS_LABELED_IMAGE (container));
+	g_assert (callback != NULL);
+	
+	labeled_image = EEL_LABELED_IMAGE (container);
+
+	if (include_internals) {
+		if (labeled_image->details->image != NULL) {
+			(* callback) (labeled_image->details->image, callback_data);
+		}
+		
+		if (labeled_image->details->label != NULL) {
+			(* callback) (labeled_image->details->label, callback_data);
+		}
+	}
+}
+
+/* Private EelLabeledImage methods */
+static gboolean
+is_fixed_height (const EelLabeledImage *labeled_image)
+{
+	return labeled_image->details->fixed_image_height > 0;
+}
+
+static EelDimensions
+labeled_image_get_image_dimensions (const EelLabeledImage *labeled_image)
+{
+	EelDimensions image_dimensions;
+	GtkRequisition image_requisition;	
+
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	if (!labeled_image_show_image (labeled_image)) {
+		return eel_dimensions_empty;
+	}
+	
+	gtk_widget_size_request (labeled_image->details->image, &image_requisition);
+
+	image_dimensions.width = (int) image_requisition.width;
+	image_dimensions.height = (int) image_requisition.height;
+
+	if (is_fixed_height (labeled_image)) {
+		image_dimensions.height = labeled_image->details->fixed_image_height;
+	}
+
+	return image_dimensions;
+}
+
+static EelDimensions
+labeled_image_get_label_dimensions (const EelLabeledImage *labeled_image)
+{
+	EelDimensions label_dimensions;
+	GtkRequisition label_requisition;	
+
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	if (!labeled_image_show_label (labeled_image)) {
+		return eel_dimensions_empty;
+	}
+	
+	gtk_widget_size_request (labeled_image->details->label, &label_requisition);
+	
+	label_dimensions.width = (int) label_requisition.width;
+	label_dimensions.height = (int) label_requisition.height;
+
+	return label_dimensions;
+}
+
+static EelIRect
+labeled_image_get_image_bounds_fill (const EelLabeledImage *labeled_image)
+{
+	EelIRect image_bounds;
+	EelDimensions image_dimensions;
+	EelIRect content_bounds;
+	EelIRect bounds;
+
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	image_dimensions = labeled_image_get_image_dimensions (labeled_image);
+
+	if (eel_dimensions_are_empty (image_dimensions)) {
+		return eel_irect_empty;
+	}
+
+	content_bounds = labeled_image_get_content_bounds (labeled_image);
+	bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
+	
+	if (!labeled_image_show_label (labeled_image)) {
+		image_bounds = bounds;
+	} else {
+		switch (labeled_image->details->label_position) {
+		case GTK_POS_LEFT:
+			image_bounds.y0 = bounds.y0;
+			image_bounds.x0 = content_bounds.x1 - image_dimensions.width;
+			image_bounds.y1 = bounds.y1;
+			image_bounds.x1 = bounds.x1;
+			break;
+
+		case GTK_POS_RIGHT:
+			image_bounds.y0 = bounds.y0;
+			image_bounds.x0 = bounds.x0;
+			image_bounds.y1 = bounds.y1;
+			image_bounds.x1 = content_bounds.x0 + image_dimensions.width;
+			break;
+
+		case GTK_POS_TOP:
+			image_bounds.x0 = bounds.x0;
+			image_bounds.y0 = content_bounds.y1 - image_dimensions.height;
+			image_bounds.x1 = bounds.x1;
+			image_bounds.y1 = bounds.y1;
+			break;
+
+		case GTK_POS_BOTTOM:
+			image_bounds.x0 = bounds.x0;
+			image_bounds.y0 = bounds.y0;
+			image_bounds.x1 = bounds.x1;
+			image_bounds.y1 = content_bounds.y0 + image_dimensions.height;
+			break;
+
+		default:
+			image_bounds.x0 = 0;
+			image_bounds.y0 = 0;
+			image_bounds.x1 = 0;
+			image_bounds.y1 = 0;
+			g_assert_not_reached ();
+		}
+	}
+
+	return image_bounds;
+}
+
+EelIRect
+eel_labeled_image_get_image_bounds (const EelLabeledImage *labeled_image)
+{
+	EelDimensions image_dimensions;
+	EelDimensions label_dimensions;
+	GtkRequisition image_requisition;
+	EelIRect image_bounds;
+	EelIRect content_bounds;
+
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_irect_empty);
+
+	if (labeled_image->details->fill) {
+		return labeled_image_get_image_bounds_fill (labeled_image);
+	}
+
+	/* get true real dimensions if we're in fixed height mode */
+	if (is_fixed_height (labeled_image) && labeled_image_show_image (labeled_image)) {
+		gtk_widget_size_request (labeled_image->details->image, &image_requisition);
+		image_dimensions.width = (int) image_requisition.width;
+		image_dimensions.height = (int) image_requisition.height;
+	} else {
+		image_dimensions = labeled_image_get_image_dimensions (labeled_image);
+	}
+	
+	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
+
+	if (eel_dimensions_are_empty (image_dimensions)) {
+		return eel_irect_empty;
+	}
+
+	content_bounds = labeled_image_get_content_bounds (labeled_image);
+	
+	if (!labeled_image_show_label (labeled_image)) {
+		image_bounds.x0 = 
+			content_bounds.x0 +
+			(eel_irect_get_width (content_bounds) - image_dimensions.width) / 2;
+		image_bounds.y0 = 
+			content_bounds.y0 +
+			(eel_irect_get_height (content_bounds) - image_dimensions.height) / 2;
+	} else {
+		switch (labeled_image->details->label_position) {
+		case GTK_POS_LEFT:
+			image_bounds.x0 = content_bounds.x1 - image_dimensions.width;
+			image_bounds.y0 = 
+				content_bounds.y0 +
+				(eel_irect_get_height (content_bounds) - image_dimensions.height) / 2;
+			break;
+
+		case GTK_POS_RIGHT:
+			image_bounds.x0 = content_bounds.x0;
+			image_bounds.y0 = 
+				content_bounds.y0 +
+				(eel_irect_get_height (content_bounds) - image_dimensions.height) / 2;
+			break;
+
+		case GTK_POS_TOP:
+			image_bounds.x0 = 
+				content_bounds.x0 +
+				(eel_irect_get_width (content_bounds) - image_dimensions.width) / 2;
+			image_bounds.y0 = content_bounds.y1 - image_dimensions.height;
+			break;
+
+		case GTK_POS_BOTTOM:
+			image_bounds.x0 = 
+				content_bounds.x0 +
+				(eel_irect_get_width (content_bounds) - image_dimensions.width) / 2;
+				
+			if (is_fixed_height (labeled_image)) {	
+				image_bounds.y0 = content_bounds.y0 + eel_irect_get_height (content_bounds)
+					- image_dimensions.height
+					- label_dimensions.height
+					- labeled_image->details->spacing;
+			} else {
+				image_bounds.y0 = content_bounds.y0;
+			}	
+
+			break;
+
+		default:
+			image_bounds.x0 = 0;
+			image_bounds.y0 = 0;
+			g_assert_not_reached ();
+		}
+	}
+	
+	image_bounds.x1 = image_bounds.x0 + image_dimensions.width;
+	image_bounds.y1 = image_bounds.y0 + image_dimensions.height;
+
+	return image_bounds;
+}
+
+static EelIRect
+labeled_image_get_label_bounds_fill (const EelLabeledImage *labeled_image)
+{
+	EelIRect label_bounds;
+	EelDimensions label_dimensions;
+	EelIRect content_bounds;
+	EelIRect bounds;
+
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
+
+	if (eel_dimensions_are_empty (label_dimensions)) {
+		return eel_irect_empty;
+	}
+
+	content_bounds = labeled_image_get_content_bounds (labeled_image);
+	bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
+
+	/* Only the label is shown */
+	if (!labeled_image_show_image (labeled_image)) {
+		label_bounds = bounds;
+		/* Both label and image are shown */
+	} else {
+		switch (labeled_image->details->label_position) {
+		case GTK_POS_LEFT:
+			label_bounds.y0 = bounds.y0;
+			label_bounds.x0 = bounds.x0;
+			label_bounds.y1 = bounds.y1;
+			label_bounds.x1 = content_bounds.x0 + label_dimensions.width;
+			break;
+
+		case GTK_POS_RIGHT:
+			label_bounds.y0 = bounds.y0;
+			label_bounds.x0 = content_bounds.x1 - label_dimensions.width;
+			label_bounds.y1 = bounds.y1;
+			label_bounds.x1 = bounds.x1;
+			break;
+
+		case GTK_POS_TOP:
+			label_bounds.x0 = bounds.x0;
+			label_bounds.y0 = bounds.y0;
+			label_bounds.x1 = bounds.x1;
+			label_bounds.y1 = content_bounds.y0 + label_dimensions.height;
+			break;
+
+		case GTK_POS_BOTTOM:
+			label_bounds.x0 = bounds.x0;
+			label_bounds.y0 = content_bounds.y1 - label_dimensions.height;
+			label_bounds.x1 = bounds.x1;
+			label_bounds.y1 = bounds.y1;
+			break;
+
+		default:
+			label_bounds.x0 = 0;
+			label_bounds.y0 = 0;
+			label_bounds.x1 = 0;
+			label_bounds.y1 = 0;
+			g_assert_not_reached ();
+		}
+	}
+
+	return label_bounds;
+}
+
+EelIRect
+eel_labeled_image_get_label_bounds (const EelLabeledImage *labeled_image)
+{
+	EelIRect label_bounds;
+	EelDimensions label_dimensions;
+	EelIRect content_bounds;
+
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_irect_empty);
+
+	if (labeled_image->details->fill) {
+		return labeled_image_get_label_bounds_fill (labeled_image);
+	}
+
+	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
+
+	if (eel_dimensions_are_empty (label_dimensions)) {
+		return eel_irect_empty;
+	}
+
+	content_bounds = labeled_image_get_content_bounds (labeled_image);
+
+	/* Only the label is shown */
+	if (!labeled_image_show_image (labeled_image)) {
+		label_bounds.x0 = 
+			content_bounds.x0 +
+			(eel_irect_get_width (content_bounds) - label_dimensions.width) / 2;
+		label_bounds.y0 = 
+			content_bounds.y0 +
+			(eel_irect_get_height (content_bounds) - label_dimensions.height) / 2;
+		/* Both label and image are shown */
+	} else {
+		switch (labeled_image->details->label_position) {
+		case GTK_POS_LEFT:
+			label_bounds.x0 = content_bounds.x0;
+			label_bounds.y0 = 
+				content_bounds.y0 +
+				(eel_irect_get_height (content_bounds) - label_dimensions.height) / 2;
+			break;
+
+		case GTK_POS_RIGHT:
+			label_bounds.x0 = content_bounds.x1 - label_dimensions.width;
+			label_bounds.y0 = 
+				content_bounds.y0 +
+				(eel_irect_get_height (content_bounds) - label_dimensions.height) / 2;
+			break;
+
+		case GTK_POS_TOP:
+			label_bounds.x0 = 
+				content_bounds.x0 +
+				(eel_irect_get_width (content_bounds) - label_dimensions.width) / 2;
+			label_bounds.y0 = content_bounds.y0;
+			break;
+
+		case GTK_POS_BOTTOM:
+			label_bounds.x0 = 
+				content_bounds.x0 +
+				(eel_irect_get_width (content_bounds) - label_dimensions.width) / 2;
+			label_bounds.y0 = content_bounds.y1 - label_dimensions.height;
+			break;
+
+		default:
+			label_bounds.x0 = 0;
+			label_bounds.y0 = 0;
+			g_assert_not_reached ();
+		}
+	}
+	
+	label_bounds.x1 = label_bounds.x0 + label_dimensions.width;
+	label_bounds.y1 = label_bounds.y0 + label_dimensions.height;
+
+	return label_bounds;
+}
+
+static void
+labeled_image_update_alignments (EelLabeledImage *labeled_image)
+{
+
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	if (labeled_image->details->label != NULL) {
+		float x_alignment;
+		float y_alignment;
+		
+		if (labeled_image->details->fill) {	
+			x_alignment = GTK_MISC (labeled_image->details->label)->xalign;
+			y_alignment = GTK_MISC (labeled_image->details->label)->yalign;
+			
+			/* Only the label is shown */
+			if (!labeled_image_show_image (labeled_image)) {
+				x_alignment = 0.5;
+				y_alignment = 0.5;
+				/* Both label and image are shown */
+			} else {
+				switch (labeled_image->details->label_position) {
+				case GTK_POS_LEFT:
+					x_alignment = 1.0;
+					y_alignment = 0.5;
+					break;
+					
+				case GTK_POS_RIGHT:
+					x_alignment = 0.0;
+					y_alignment = 0.5;
+					break;
+					
+				case GTK_POS_TOP:
+					x_alignment = 0.5;
+					y_alignment = 1.0;
+					break;
+					
+				case GTK_POS_BOTTOM:
+					x_alignment = 0.5;
+					y_alignment = 0.0;
+					break;
+				}
+				
+			}
+
+			gtk_misc_set_alignment (GTK_MISC (labeled_image->details->label),
+						x_alignment,
+						y_alignment);
+		}
+	}
+
+	if (labeled_image->details->image != NULL) {
+		float x_alignment;
+		float y_alignment;
+		
+		if (labeled_image->details->fill) {	
+			x_alignment = GTK_MISC (labeled_image->details->image)->xalign;
+			y_alignment = GTK_MISC (labeled_image->details->image)->yalign;
+			
+			/* Only the image is shown */
+			if (!labeled_image_show_label (labeled_image)) {
+				x_alignment = 0.5;
+				y_alignment = 0.5;
+				/* Both label and image are shown */
+			} else {
+				switch (labeled_image->details->label_position) {
+				case GTK_POS_LEFT:
+					x_alignment = 0.0;
+					y_alignment = 0.5;
+					break;
+
+				case GTK_POS_RIGHT:
+					x_alignment = 1.0;
+					y_alignment = 0.5;
+					break;
+					
+				case GTK_POS_TOP:
+					x_alignment = 0.5;
+					y_alignment = 0.0;
+					break;
+					
+				case GTK_POS_BOTTOM:
+					x_alignment = 0.5;
+					y_alignment = 1.0;
+					break;
+				}
+			}
+			
+			gtk_misc_set_alignment (GTK_MISC (labeled_image->details->image),
+						x_alignment,
+						y_alignment);
+		}
+	}
+}
+
+static EelDimensions
+labeled_image_get_content_dimensions (const EelLabeledImage *labeled_image)
+{
+	EelDimensions image_dimensions;
+	EelDimensions label_dimensions;
+	EelDimensions content_dimensions;
+
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	image_dimensions = labeled_image_get_image_dimensions (labeled_image);
+	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
+
+	content_dimensions = eel_dimensions_empty;
+
+	/* Both shown */
+	if (!eel_dimensions_are_empty (image_dimensions) && !eel_dimensions_are_empty (label_dimensions)) {
+		content_dimensions.width = 
+			image_dimensions.width + labeled_image->details->spacing + label_dimensions.width;
+		switch (labeled_image->details->label_position) {
+		case GTK_POS_LEFT:
+		case GTK_POS_RIGHT:
+			content_dimensions.width = 
+				image_dimensions.width + labeled_image->details->spacing + label_dimensions.width;
+			content_dimensions.height = MAX (image_dimensions.height, label_dimensions.height);
+			break;
+
+		case GTK_POS_TOP:
+		case GTK_POS_BOTTOM:
+			content_dimensions.width = MAX (image_dimensions.width, label_dimensions.width);
+			content_dimensions.height = 
+				image_dimensions.height + labeled_image->details->spacing + label_dimensions.height;
+			break;
+		}
+		/* Only image shown */
+	} else if (!eel_dimensions_are_empty (image_dimensions)) {
+		content_dimensions.width = image_dimensions.width;
+		content_dimensions.height = image_dimensions.height;
+		/* Only label shown */
+	} else {
+		content_dimensions.width = label_dimensions.width;
+		content_dimensions.height = label_dimensions.height;
+	}
+
+	return content_dimensions;
+}
+
+static EelIRect
+labeled_image_get_content_bounds (const EelLabeledImage *labeled_image)
+{
+	EelDimensions content_dimensions;
+	EelIRect content_bounds;
+	EelIRect bounds;
+
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
+
+	content_dimensions = labeled_image_get_content_dimensions (labeled_image);
+	content_bounds = eel_irect_align (bounds,
+					      content_dimensions.width,
+					      content_dimensions.height,
+					      labeled_image->details->x_alignment,
+					      labeled_image->details->y_alignment);
+
+	return content_bounds;
+}
+
+static void
+labeled_image_ensure_label (EelLabeledImage *labeled_image)
+{
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	if (labeled_image->details->label != NULL) {
+		return;
+	}
+
+ 	labeled_image->details->label = gtk_label_new (NULL);
+	gtk_container_add (GTK_CONTAINER (labeled_image), labeled_image->details->label);
+	gtk_widget_show (labeled_image->details->label);
+}
+
+static void
+labeled_image_ensure_image (EelLabeledImage *labeled_image)
+{
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	if (labeled_image->details->image != NULL) {
+		return;
+	}
+
+ 	labeled_image->details->image = gtk_image_new ();
+	gtk_container_add (GTK_CONTAINER (labeled_image), labeled_image->details->image);
+	gtk_widget_show (labeled_image->details->image);
+}
+
+static gboolean
+labeled_image_show_image (const EelLabeledImage *labeled_image)
+{
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	return labeled_image->details->image != NULL && labeled_image->details->show_image;
+}
+
+static gboolean
+labeled_image_show_label (const EelLabeledImage *labeled_image)
+{
+	g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	return labeled_image->details->label != NULL && labeled_image->details->show_label;
+}
+
+/**
+ * eel_labeled_image_new:
+ * @text: Text to use for label or NULL.
+ * @pixbuf: Pixbuf to use for image or NULL.
+ *
+ * Returns A newly allocated EelLabeledImage.  If the &text parameter is not
+ * NULL then the LabeledImage will show a label.  If the &pixbuf parameter is not
+ * NULL then the LabeledImage will show a pixbuf.  Either of these can be NULL at
+ * creation time.  
+ *
+ * Later in the lifetime of the widget you can invoke methods that affect the 
+ * label and/or the image.  If at creation time these were NULL, then they will
+ * be created as neeeded.
+ *
+ * Thus, using this widget in place of EelImage or EelLabel is "free" with
+ * only the GtkObject and function call overhead.
+ *
+ */
+GtkWidget*
+eel_labeled_image_new (const char *text,
+		       GdkPixbuf *pixbuf)
+{
+	EelLabeledImage *labeled_image;
+
+	labeled_image = EEL_LABELED_IMAGE (gtk_widget_new (eel_labeled_image_get_type (), NULL));
+	
+	if (text != NULL) {
+		eel_labeled_image_set_text (labeled_image, text);
+	}
+
+	if (pixbuf != NULL) {
+		eel_labeled_image_set_pixbuf (labeled_image, pixbuf);
+	}
+
+	labeled_image_update_alignments (labeled_image);
+
+	return GTK_WIDGET (labeled_image);
+}
+
+/**
+ * eel_labeled_image_new_from_file_name:
+ * @text: Text to use for label or NULL.
+ * @file_name: File name of picture to use for pixbuf.  Cannot be NULL.
+ *
+ * Returns A newly allocated EelLabeledImage.  If the &text parameter is not
+ * NULL then the LabeledImage will show a label.
+ *
+ */
+GtkWidget*
+eel_labeled_image_new_from_file_name (const char *text,
+				      const char *pixbuf_file_name)
+{
+	EelLabeledImage *labeled_image;
+
+	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
+
+	labeled_image = EEL_LABELED_IMAGE (eel_labeled_image_new (text, NULL));
+	eel_labeled_image_set_pixbuf_from_file_name (labeled_image, pixbuf_file_name);
+	return GTK_WIDGET (labeled_image);
+}
+
+/**
+ * eel_labeled_image_set_label_position:
+ * @labeled_image: A EelLabeledImage.
+ * @label_position: The position of the label with respect to the image.
+ *
+ * Set the position of the label with respect to the image as follows:
+ *
+ * GTK_POS_LEFT:
+ *   [ <label> <image> ]
+ *
+ * GTK_POS_RIGHT:
+ *   [ <image> <label> ]
+ *
+ * GTK_POS_TOP:
+ *   [ <label> ]
+ *   [ <image> ]
+ *
+ * GTK_POS_BOTTOM:
+ *   [ <image> ]
+ *   [ <label> ]
+ *
+ */
+void
+eel_labeled_image_set_label_position (EelLabeledImage *labeled_image,
+				      GtkPositionType label_position)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+	g_return_if_fail (label_position >= GTK_POS_LEFT);
+	g_return_if_fail (label_position <= GTK_POS_BOTTOM);
+	
+	if (labeled_image->details->label_position == label_position) {
+		return;
+	}
+
+	labeled_image->details->label_position = label_position;
+
+	labeled_image_update_alignments (labeled_image);
+
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_label_postiion:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns an enumeration indicating the position of the label with respect to the image.
+ */
+GtkPositionType
+eel_labeled_image_get_label_position (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+	
+	return labeled_image->details->label_position;
+}
+
+/**
+ * eel_labeled_image_set_show_label:
+ * @labeled_image: A EelLabeledImage.
+ * @show_image: A boolean value indicating whether the label should be shown.
+ *
+ * Update the labeled image to either show or hide the internal label widget.
+ * This function doesnt have any effect if the LabeledImage doesnt already
+ * contain an label.
+ */
+void
+eel_labeled_image_set_show_label (EelLabeledImage *labeled_image,
+				  gboolean show_label)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	if (labeled_image->details->show_label == show_label) {
+		return;
+	}
+
+	labeled_image->details->show_label = show_label;
+
+	if (labeled_image->details->label != NULL) {
+		if (labeled_image->details->show_label) {
+			gtk_widget_show (labeled_image->details->label);
+		} else {
+			gtk_widget_hide (labeled_image->details->label);
+		}
+	}
+
+	labeled_image_update_alignments (labeled_image);
+
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_show_label:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns a boolean value indicating whether the internal label is shown.
+ */
+gboolean
+eel_labeled_image_get_show_label (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+	
+	return labeled_image->details->show_label;
+}
+
+/**
+ * eel_labeled_image_set_show_image:
+ * @labeled_image: A EelLabeledImage.
+ * @show_image: A boolean value indicating whether the image should be shown.
+ *
+ * Update the labeled image to either show or hide the internal image widget.
+ * This function doesnt have any effect if the LabeledImage doesnt already
+ * contain an image.
+ */
+void
+eel_labeled_image_set_show_image (EelLabeledImage *labeled_image,
+				  gboolean show_image)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	if (labeled_image->details->show_image == show_image) {
+		return;
+	}
+
+	labeled_image->details->show_image = show_image;
+
+	if (labeled_image->details->image != NULL) {
+		if (labeled_image->details->show_image) {
+			gtk_widget_show (labeled_image->details->image);
+		} else {
+			gtk_widget_hide (labeled_image->details->image);
+		}
+	}
+
+	labeled_image_update_alignments (labeled_image);
+
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_show_image:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns a boolean value indicating whether the internal image is shown.
+ */
+gboolean
+eel_labeled_image_get_show_image (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+	
+	return labeled_image->details->show_image;
+}
+
+
+/**
+ * eel_labeled_image_set_fixed_image_height:
+ * @labeled_image: A EelLabeledImage.
+ * @fixed_image_height: The new fixed image height.
+ *
+ * Normally, we measure the height of images, but it's sometimes useful
+ * to use a fixed height for all the images.  This routine sets the
+ * image height to the passed in value
+ *
+ */
+void
+eel_labeled_image_set_fixed_image_height (EelLabeledImage *labeled_image,
+					  int new_height)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	if (labeled_image->details->fixed_image_height == new_height) {
+		return;
+	}
+	
+	labeled_image->details->fixed_image_height = new_height;
+
+	labeled_image_update_alignments (labeled_image);
+	
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_set_selected:
+ * @labeled_image: A EelLabeledImage.
+ * @selected: A boolean value indicating whether the labeled image
+ * should be selected.
+ *
+ * Selects or deselects the labeled image.
+ *
+ */
+void            
+eel_labeled_image_set_selected (EelLabeledImage *labeled_image,
+				gboolean selected)
+{
+	GtkStateType state;
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	state = selected ? GTK_STATE_SELECTED : GTK_STATE_NORMAL;
+
+	gtk_widget_set_state (GTK_WIDGET (labeled_image), state);
+	gtk_widget_set_state (labeled_image->details->image, state);
+	gtk_widget_set_state (labeled_image->details->label, state);
+}
+
+/**
+ * eel_labeled_image_get_selected:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns the selected state of the labeled image.
+ *
+ */
+gboolean        
+eel_labeled_image_get_selected (EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), FALSE);
+
+	return GTK_WIDGET (labeled_image)->state == GTK_STATE_SELECTED;
+}
+
+/**
+ * eel_labeled_image_set_spacing:
+ * @labeled_image: A EelLabeledImage.
+ * @spacing: The new spacing between label and image.
+ *
+ * Set the spacing between label and image.  This will only affect
+ * the geometry of the widget if both a label and image are currently
+ * visible.
+ *
+ */
+void
+eel_labeled_image_set_spacing (EelLabeledImage *labeled_image,
+			       guint spacing)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	if (labeled_image->details->spacing == spacing) {
+		return;
+	}
+	
+	labeled_image->details->spacing = spacing;
+
+	labeled_image_update_alignments (labeled_image);
+	
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_spacing:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns: The spacing between the label and image.
+ */
+guint
+eel_labeled_image_get_spacing (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+	
+	return labeled_image->details->spacing;
+}
+
+/**
+ * eel_labeled_image_set_x_padding:
+ * @labeled_image: A EelLabeledImage.
+ * @x_padding: The new horizontal padding.
+ *
+ * Set horizontal padding for the EelLabeledImage.  The padding
+ * attribute work just like that in GtkMisc.
+ */
+void
+eel_labeled_image_set_x_padding (EelLabeledImage *labeled_image,
+				 int x_padding)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	x_padding = MAX (0, x_padding);
+	
+	if (labeled_image->details->x_padding == x_padding) {
+		return;
+	}
+	
+	labeled_image->details->x_padding = x_padding;
+	labeled_image_update_alignments (labeled_image);
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_x_padding:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns: The horizontal padding for the LabeledImage's content.
+ */
+int
+eel_labeled_image_get_x_padding (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+
+	return labeled_image->details->x_padding;
+}
+
+/**
+ * eel_labeled_image_set_y_padding:
+ * @labeled_image: A EelLabeledImage.
+ * @x_padding: The new vertical padding.
+ *
+ * Set vertical padding for the EelLabeledImage.  The padding
+ * attribute work just like that in GtkMisc.
+ */
+void
+eel_labeled_image_set_y_padding (EelLabeledImage *labeled_image,
+				 int y_padding)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	y_padding = MAX (0, y_padding);
+	
+	if (labeled_image->details->y_padding == y_padding) {
+		return;
+	}
+	
+	labeled_image->details->y_padding = y_padding;
+	labeled_image_update_alignments (labeled_image);
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_x_padding:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns: The vertical padding for the LabeledImage's content.
+ */
+int
+eel_labeled_image_get_y_padding (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+
+	return labeled_image->details->y_padding;
+}
+
+/**
+ * eel_labeled_image_set_x_alignment:
+ * @labeled_image: A EelLabeledImage.
+ * @x_alignment: The new horizontal alignment.
+ *
+ * Set horizontal alignment for the EelLabeledImage's content.
+ * The 'content' is the union of the image and label.  The alignment
+ * attribute work just like that in GtkMisc.
+ */
+void
+eel_labeled_image_set_x_alignment (EelLabeledImage *labeled_image,
+				   float x_alignment)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	x_alignment = MAX (0, x_alignment);
+	x_alignment = MIN (1.0, x_alignment);
+	
+	if (labeled_image->details->x_alignment == x_alignment) {
+		return;
+	}
+	
+	labeled_image->details->x_alignment = x_alignment;
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_x_alignment:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns: The horizontal alignment for the LabeledImage's content.
+ */
+float
+eel_labeled_image_get_x_alignment (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+
+	return labeled_image->details->x_alignment;
+}
+
+/**
+ * eel_labeled_image_set_y_alignment:
+ * @labeled_image: A EelLabeledImage.
+ * @y_alignment: The new vertical alignment.
+ *
+ * Set vertical alignment for the EelLabeledImage's content.
+ * The 'content' is the union of the image and label.  The alignment
+ * attribute work just like that in GtkMisc.
+ */
+void
+eel_labeled_image_set_y_alignment (EelLabeledImage *labeled_image,
+				   float y_alignment)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	y_alignment = MAX (0, y_alignment);
+	y_alignment = MIN (1.0, y_alignment);
+	
+	if (labeled_image->details->y_alignment == y_alignment) {
+		return;
+	}
+	
+	labeled_image->details->y_alignment = y_alignment;
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_y_alignment:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Returns: The vertical alignment for the LabeledImage's content.
+ */
+float
+eel_labeled_image_get_y_alignment (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+
+	return labeled_image->details->y_alignment;
+}
+
+/**
+ * eel_labeled_image_set_fill:
+ * @labeled_image: A EelLabeledImage.
+ * @fill: A boolean value indicating whether the internal image and label
+ * widgets should fill all the available allocation.
+ *
+ * By default the internal image and label wigets are sized to their natural
+ * preferred geometry.  You can use the 'fill' attribute of LabeledImage
+ * to have the internal widgets fill as much of the LabeledImage allocation
+ * as is available.
+ */
+void
+eel_labeled_image_set_fill (EelLabeledImage *labeled_image,
+			    gboolean fill)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+	
+	if (labeled_image->details->fill == fill) {
+		return;
+	}
+
+	labeled_image->details->fill = fill;
+
+	labeled_image_update_alignments (labeled_image);
+	
+	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+}
+
+/**
+ * eel_labeled_image_get_fill:
+ * @labeled_image: A EelLabeledImage.
+ *
+ * Retruns a boolean value indicating whether the internal widgets fill
+ * all the available allocation.
+ */
+gboolean
+eel_labeled_image_get_fill (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), 0);
+	
+	return labeled_image->details->fill;
+}
+
+static void
+eel_labled_set_mnemonic_widget (GtkWidget *image_widget,
+				GtkWidget *mnemonic_widget)
+{
+	EelLabeledImage *image;
+
+	g_assert (EEL_IS_LABELED_IMAGE (image_widget));
+
+	image = EEL_LABELED_IMAGE (image_widget);
+
+	if (image->details->label)
+		gtk_label_set_mnemonic_widget
+			(GTK_LABEL (image->details->label), mnemonic_widget);
+}
+
+/**
+ * eel_labeled_image_button_new:
+ * @text: Text to use for label or NULL.
+ * @pixbuf: Pixbuf to use for image or NULL.
+ *
+ * Create a stock GtkButton with a EelLabeledImage child.
+ *
+ */
+GtkWidget *
+eel_labeled_image_button_new (const char *text,
+			      GdkPixbuf *pixbuf)
+{
+	GtkWidget *button;
+	GtkWidget *labeled_image;
+	
+	button = g_object_new (eel_labeled_image_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new (text, pixbuf);
+	gtk_container_add (GTK_CONTAINER (button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, button);
+	gtk_widget_show (labeled_image);
+	
+	return button;
+}
+
+/**
+ * eel_labeled_image_button_new_from_file_name:
+ * @text: Text to use for label or NULL.
+ * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
+ *
+ * Create a stock GtkToggleButton with a EelLabeledImage child.
+ *
+ */
+GtkWidget *
+eel_labeled_image_button_new_from_file_name (const char *text,
+					     const char *pixbuf_file_name)
+{
+	GtkWidget *button;
+	GtkWidget *labeled_image;
+
+	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
+	
+	button = g_object_new (eel_labeled_image_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new_from_file_name (text, pixbuf_file_name);
+	gtk_container_add (GTK_CONTAINER (button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, button);
+	gtk_widget_show (labeled_image);
+	
+	return button;
+}
+
+/**
+ * eel_labeled_image_toggle_button_new:
+ * @text: Text to use for label or NULL.
+ * @pixbuf: Pixbuf to use for image or NULL.
+ *
+ * Create a stock GtkToggleButton with a EelLabeledImage child.
+ *
+ */
+GtkWidget *
+eel_labeled_image_toggle_button_new (const char *text,
+				     GdkPixbuf *pixbuf)
+{
+	GtkWidget *toggle_button;
+	GtkWidget *labeled_image;
+	
+	toggle_button = g_object_new (eel_labeled_image_toggle_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new (text, pixbuf);
+	gtk_container_add (GTK_CONTAINER (toggle_button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, toggle_button);
+	gtk_widget_show (labeled_image);
+	
+	return toggle_button;
+}
+
+/**
+ * eel_labeled_image_toggle_button_new_from_file_name:
+ * @text: Text to use for label or NULL.
+ * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
+ *
+ * Create a stock GtkToggleButton with a EelLabeledImage child.
+ *
+ */
+GtkWidget *
+eel_labeled_image_toggle_button_new_from_file_name (const char *text,
+						    const char *pixbuf_file_name)
+{
+	GtkWidget *toggle_button;
+	GtkWidget *labeled_image;
+
+	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
+	
+	toggle_button = g_object_new (eel_labeled_image_toggle_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new_from_file_name (text, pixbuf_file_name);
+	gtk_container_add (GTK_CONTAINER (toggle_button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, toggle_button);
+	gtk_widget_show (labeled_image);
+	
+	return toggle_button;
+}
+
+/**
+ * eel_labeled_image_toggle_button_new:
+ * @text: Text to use for label or NULL.
+ * @pixbuf: Pixbuf to use for image or NULL.
+ *
+ * Create a stock GtkToggleButton with a EelLabeledImage child.
+ *
+ * Returns: the new radio button.
+ */
+GtkWidget *
+eel_labeled_image_radio_button_new (const char *text,
+				    GdkPixbuf  *pixbuf)
+{
+	GtkWidget *radio_button;
+	GtkWidget *labeled_image;
+	
+	radio_button = g_object_new (eel_labeled_image_radio_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new (text, pixbuf);
+	gtk_container_add (GTK_CONTAINER (radio_button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, radio_button);
+	gtk_widget_show (labeled_image);
+	
+	return radio_button;
+}
+
+/**
+ * eel_labeled_image_radio_button_new_from_file_name:
+ * @text: Text to use for label or NULL.
+ * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
+ *
+ * Create a stock GtkRadioButton with a EelLabeledImage child.
+ *
+ * Returns: the new radio button.
+ */
+GtkWidget *
+eel_labeled_image_radio_button_new_from_file_name (const char *text,
+						   const char *pixbuf_file_name)
+{
+	GtkWidget *radio_button;
+	GtkWidget *labeled_image;
+
+	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
+	
+	radio_button = g_object_new (eel_labeled_image_radio_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new_from_file_name (text, pixbuf_file_name);
+	gtk_container_add (GTK_CONTAINER (radio_button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, radio_button);
+	gtk_widget_show (labeled_image);
+	
+	return radio_button;
+}
+
+/*
+ * Workaround some bugs in GtkCheckButton where the widget 
+ * does not redraw properly after leave or focus out events
+ * 
+ * The workaround is to draw a little bit more than the 
+ * widget itself - 4 pixels worth.  For some reason the
+ * widget does not properly redraw its edges.
+ */
+static void
+button_leave_callback (GtkWidget *widget,
+		       gpointer callback_data)
+{
+	g_assert (GTK_IS_WIDGET (widget));
+
+	if (GTK_WIDGET_DRAWABLE (widget)) {
+		const int fudge = 4;
+		EelIRect bounds;
+
+		bounds = eel_gtk_widget_get_bounds (widget);
+		
+		bounds.x0 -= fudge;
+		bounds.y0 -= fudge;
+		bounds.x1 += fudge;
+		bounds.y1 += fudge;
+		
+		gtk_widget_queue_draw_area (widget->parent,
+					    bounds.x0,
+					    bounds.y0,
+					    eel_irect_get_width (bounds),
+					    eel_irect_get_height (bounds));
+	}
+}
+
+static gint
+button_focus_out_event_callback (GtkWidget *widget,
+				 GdkEventFocus *event,
+				 gpointer callback_data)
+{
+	g_assert (GTK_IS_WIDGET (widget));
+
+	button_leave_callback (widget, callback_data);
+
+	return FALSE;
+}
+
+/**
+ * eel_labeled_image_check_button_new:
+ * @text: Text to use for label or NULL.
+ * @pixbuf: Pixbuf to use for image or NULL.
+ *
+ * Create a stock GtkCheckButton with a EelLabeledImage child.
+ *
+ */
+GtkWidget *
+eel_labeled_image_check_button_new (const char *text,
+				    GdkPixbuf *pixbuf)
+{
+	GtkWidget *check_button;
+	GtkWidget *labeled_image;
+	
+	check_button = g_object_new (eel_labeled_image_check_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new (text, pixbuf);
+	gtk_container_add (GTK_CONTAINER (check_button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, check_button);
+	gtk_widget_show (labeled_image);
+	
+	/*
+	 * Workaround some bugs in GtkCheckButton where the widget 
+	 * does not redraw properly after leave or focus out events
+	 */
+	g_signal_connect (check_button, "leave",
+			  G_CALLBACK (button_leave_callback), NULL);
+	g_signal_connect (check_button, "focus_out_event",
+			  G_CALLBACK (button_focus_out_event_callback), NULL);
+	
+	return check_button;
+}
+
+/**
+ * eel_labeled_image_check_button_new_from_file_name:
+ * @text: Text to use for label or NULL.
+ * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
+ *
+ * Create a stock GtkCheckButton with a EelLabeledImage child.
+ *
+ */
+GtkWidget *
+eel_labeled_image_check_button_new_from_file_name (const char *text,
+						   const char *pixbuf_file_name)
+{
+	GtkWidget *check_button;
+	GtkWidget *labeled_image;
+
+	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
+	
+	check_button = g_object_new (eel_labeled_image_check_button_get_type (), NULL);
+	labeled_image = eel_labeled_image_new_from_file_name (text, pixbuf_file_name);
+	gtk_container_add (GTK_CONTAINER (check_button), labeled_image);
+	eel_labled_set_mnemonic_widget (labeled_image, check_button);
+	gtk_widget_show (labeled_image);
+	
+	return check_button;
+}
+
+/*
+ * The rest of the methods are proxies for those in EelImage and 
+ * EelLabel.  We have all these so that we dont have to expose 
+ * our internal widgets at all.  Probably more of these will be added
+ * as they are needed.
+ */
+
+/**
+ * eel_labeled_image_set_pixbuf:
+ * @labaled_image: A EelLabeledImage.
+ * @pixbuf: New pixbuf to use or NULL.
+ *
+ * Change the pixbuf displayed by the LabeledImage.  Note that the widget display
+ * is only updated if the show_image attribute is TRUE.
+ *
+ * If no internal image widget exists as of yet, a new one will be created.
+ *
+ * A NULL &pixbuf will cause the internal image widget (if alive) to be destroyed.
+ */
+void
+eel_labeled_image_set_pixbuf (EelLabeledImage *labeled_image,
+			      GdkPixbuf *pixbuf)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	if (pixbuf == NULL) {
+		if (labeled_image->details->image != NULL) {
+			gtk_widget_destroy (labeled_image->details->image);
+			labeled_image->details->image = NULL;
+		}
+		
+		gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+	} else {
+		labeled_image_ensure_image (labeled_image);
+		gtk_image_set_from_pixbuf (GTK_IMAGE (labeled_image->details->image), pixbuf);
+	}
+}
+
+void
+eel_labeled_image_set_pixbuf_from_file_name (EelLabeledImage *labeled_image,
+					     const char *pixbuf_file_name)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	labeled_image_ensure_image (labeled_image);
+	gtk_image_set_from_file (GTK_IMAGE (labeled_image->details->image), pixbuf_file_name);
+}
+
+/**
+ * eel_labeled_image_set_text:
+ * @labaled_image: A EelLabeledImage.
+ * @text: New text (with mnemnonic) to use or NULL.
+ *
+ * Change the text displayed by the LabeledImage.  Note that the widget display
+ * is only updated if the show_label attribute is TRUE.
+ *
+ * If no internal label widget exists as of yet, a new one will be created.
+ *
+ * A NULL &text will cause the internal label widget (if alive) to be destroyed.
+ */
+void
+eel_labeled_image_set_text (EelLabeledImage *labeled_image,
+			    const char *text)
+{
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+
+	if (text == NULL) {
+		if (labeled_image->details->label) {
+			gtk_widget_destroy (labeled_image->details->label);
+			labeled_image->details->label = NULL;
+		}
+		
+		gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
+	} else {
+		labeled_image_ensure_label (labeled_image);
+		gtk_label_set_text_with_mnemonic
+			(GTK_LABEL (labeled_image->details->label), text);
+	}
+}
+
+char *
+eel_labeled_image_get_text (const EelLabeledImage *labeled_image)
+{
+	g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), NULL);
+	
+	if (labeled_image->details->label == NULL) {
+		return NULL;
+	}
+
+	return g_strdup (gtk_label_get_text (GTK_LABEL (labeled_image->details->label)));
+}
+
+void
+eel_labeled_image_set_can_focus (EelLabeledImage *labeled_image,
+				 gboolean         can_focus)
+{
+	if (can_focus) {
+		GTK_WIDGET_SET_FLAGS
+			(GTK_WIDGET (labeled_image), GTK_CAN_FOCUS);
+		
+	} else {
+		GTK_WIDGET_UNSET_FLAGS
+			(GTK_WIDGET (labeled_image), GTK_CAN_FOCUS);
+	}
+}
+
+static AtkObjectClass *a11y_parent_class = NULL;
+
+static void
+eel_labeled_image_accessible_initialize (AtkObject *accessible,
+					 gpointer   widget)
+{
+	a11y_parent_class->initialize (accessible, widget);
+}
+
+static EelLabeledImage *
+get_image (gpointer object)
+{
+	GtkWidget *widget;
+
+	if (!(widget = GTK_ACCESSIBLE (object)->widget)) {
+		return NULL;
+	}
+	
+	if (GTK_IS_BUTTON (widget))
+		widget = GTK_BIN (widget)->child;
+
+	return EEL_LABELED_IMAGE (widget);
+}
+
+static G_CONST_RETURN gchar *
+eel_labeled_image_accessible_get_name (AtkObject *accessible)
+{
+	EelLabeledImage *labeled_image;
+
+	labeled_image = get_image (accessible);
+
+	if (labeled_image && labeled_image->details &&
+	    labeled_image->details->label)
+		return gtk_label_get_text
+			(GTK_LABEL (labeled_image->details->label));
+
+	g_warning ("no label on '%p'", labeled_image);
+
+	return NULL;
+}
+
+static void
+eel_labeled_image_accessible_image_get_size (AtkImage *image,
+					     gint     *width,
+					     gint     *height)
+{
+	EelLabeledImage *labeled_image;
+
+	labeled_image = get_image (image);
+
+	if (!labeled_image || !labeled_image->details->image) {
+		*width = *height = 0;
+		return;
+	}
+
+	*width = labeled_image->details->image->allocation.width;
+	*height = labeled_image->details->image->allocation.height;
+}
+
+static void
+eel_labeled_image_accessible_image_interface_init (AtkImageIface *iface)
+{
+	iface->get_image_size = eel_labeled_image_accessible_image_get_size;
+}
+
+static void
+eel_labeled_image_accessible_class_init (AtkObjectClass *klass)
+{
+	a11y_parent_class = g_type_class_peek_parent (klass);
+
+	klass->get_name = eel_labeled_image_accessible_get_name;
+	klass->initialize = eel_labeled_image_accessible_initialize;
+}
+
+enum {
+	BUTTON,
+	CHECK,
+	TOGGLE,
+	RADIO,
+	PLAIN,
+	LAST_ONE
+};
+
+static AtkObject *
+eel_labeled_image_get_accessible (GtkWidget *widget)
+{
+	int i;
+	static GType types[LAST_ONE] = { 0 };
+	const char *tname;
+	AtkRole role;
+	AtkObject *accessible;
+
+	if ((accessible = eel_accessibility_get_atk_object (widget)))
+		return accessible;
+
+	if (GTK_IS_CHECK_BUTTON (widget)) {
+		i = BUTTON;
+		role = ATK_ROLE_CHECK_BOX;
+		tname = "EelLabeledImageCheckButtonAccessible";
+
+	} else if (GTK_IS_TOGGLE_BUTTON (widget)) {
+		i = CHECK;
+		role = ATK_ROLE_TOGGLE_BUTTON;
+		tname = "EelLabeledImageToggleButtonAccessible";
+
+	} else if (GTK_IS_RADIO_BUTTON (widget)) {
+		i = RADIO;
+		role = ATK_ROLE_RADIO_BUTTON;
+		tname = "EelLabeledImageRadioButtonAccessible";
+
+	} else if (GTK_IS_BUTTON (widget)) {
+		i = TOGGLE;
+		role = ATK_ROLE_PUSH_BUTTON;
+		tname = "EelLabeledImagePushButtonAccessible";
+
+	} else { /* plain */
+		i = PLAIN;
+		role = ATK_ROLE_IMAGE;
+		tname = "EelLabeledImagePlainAccessible";
+	}
+
+	if (!types [i]) {
+		const GInterfaceInfo atk_image_info = {
+			(GInterfaceInitFunc) eel_labeled_image_accessible_image_interface_init,
+			(GInterfaceFinalizeFunc) NULL,
+			NULL
+		};
+
+		types [i] = eel_accessibility_create_derived_type
+			(tname, G_TYPE_FROM_INSTANCE (widget),
+			 eel_labeled_image_accessible_class_init);
+
+		if (!types [i])
+			return NULL;
+
+		g_type_add_interface_static (
+			types [i], ATK_TYPE_IMAGE, &atk_image_info);
+	}
+
+	accessible = g_object_new (types [i], NULL);
+	atk_object_set_role (accessible, role);
+
+	return eel_accessibility_set_atk_object_return (widget, accessible);
+}
+
+static void
+eel_labeled_image_button_class_init (GtkWidgetClass *klass)
+{
+	klass->get_accessible = eel_labeled_image_get_accessible;
+}
+
+static GType
+eel_labeled_image_button_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		GTypeInfo info = {
+			sizeof (GtkButtonClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_labeled_image_button_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (GtkButton),
+			0, /* n_preallocs */
+			(GInstanceInitFunc) NULL
+		};
+		
+		type = g_type_register_static
+			(GTK_TYPE_BUTTON,
+			 "EelLabeledImageButton", &info, 0);
+	}
+
+	return type;
+}
+
+static GType
+eel_labeled_image_check_button_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		GTypeInfo info = {
+			sizeof (GtkCheckButtonClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_labeled_image_button_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (GtkCheckButton),
+			0, /* n_preallocs */
+			(GInstanceInitFunc) NULL
+		};
+		
+		type = g_type_register_static
+			(GTK_TYPE_CHECK_BUTTON,
+			 "EelLabeledImageCheckButton", &info, 0);
+	}
+
+	return type;
+}
+
+static GType
+eel_labeled_image_toggle_button_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		GTypeInfo info = {
+			sizeof (GtkToggleButtonClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_labeled_image_button_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (GtkToggleButton),
+			0, /* n_preallocs */
+			(GInstanceInitFunc) NULL
+		};
+		
+		type = g_type_register_static
+			(GTK_TYPE_TOGGLE_BUTTON,
+			 "EelLabeledImageToggleButton", &info, 0);
+	}
+
+	return type;
+}
+
+
+static GType
+eel_labeled_image_radio_button_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		GTypeInfo info = {
+			sizeof (GtkRadioButtonClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) eel_labeled_image_button_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (GtkRadioButton),
+			0, /* n_preallocs */
+			(GInstanceInitFunc) NULL
+		};
+		
+		type = g_type_register_static
+			(GTK_TYPE_RADIO_BUTTON,
+			 "EelLabeledImageRadioButton", &info, 0);
+	}
+
+	return type;
+}
diff --git a/eel/eel-labeled-image.h b/eel/eel-labeled-image.h
new file mode 100644
index 000000000..61dbd043d
--- /dev/null
+++ b/eel/eel-labeled-image.h
@@ -0,0 +1,156 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-labeled-image.h - A labeled image.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+/* EelLabeledImage is a container widget.  It can only contain internal 
+ * widgets.  These internal widgets are can be a EelLabel and/or a 
+ * EelImage.  These internal widgets are created as needed.  That means
+ * that EelLabeledImage can always be used for "free" instead of a 
+ * EelLabel or EelImage.  The only overhead is that of the GtkObject
+ * machinery.
+ *
+ * The position of the label with respect to the image is controlled by the
+ * 'label_positon' attribute.
+ *
+ * By default the internal image and label widgets are sized to their natural
+ * preferred geometry.  You can use the 'fill' attribute of LabeledImage
+ * to have the internal widgets fill as much of the LabeledImage allocation
+ * as is available.
+ *
+ * LabeledImage also has x_padding/y_padding and x_alignment/y_alignment 
+ * attributes that behave exaclty as those in the GtkMisc class.
+ *
+ * Note that the alignments are ignored if the fill attribute is TRUE.
+ */
+
+#ifndef EEL_LABELED_IMAGE_H
+#define EEL_LABELED_IMAGE_H
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
+#include <eel/eel-art-extensions.h>
+
+G_BEGIN_DECLS
+
+#define EEL_TYPE_LABELED_IMAGE            (eel_labeled_image_get_type ())
+#define EEL_LABELED_IMAGE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_LABELED_IMAGE, EelLabeledImage))
+#define EEL_LABELED_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_LABELED_IMAGE, EelLabeledImageClass))
+#define EEL_IS_LABELED_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_LABELED_IMAGE))
+#define EEL_IS_LABELED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_LABELED_IMAGE))
+
+typedef struct EelLabeledImage		  EelLabeledImage;
+typedef struct EelLabeledImageClass	  EelLabeledImageClass;
+typedef struct EelLabeledImageDetails	  EelLabeledImageDetails;
+
+struct EelLabeledImage
+{
+	/* Superclass */
+	GtkContainer container;
+
+	/* Private things */
+	EelLabeledImageDetails *details;
+};
+
+struct EelLabeledImageClass
+{
+	GtkContainerClass parent_class;
+
+	void (*activate) (EelLabeledImage *image);
+};
+
+/* Public GtkLabeledImage methods */
+GtkType         eel_labeled_image_get_type                         (void);
+GtkWidget *     eel_labeled_image_new                              (const char              *text,
+								    GdkPixbuf               *pixbuf);
+GtkWidget *     eel_labeled_image_new_from_file_name               (const char              *text,
+								    const char              *pixbuf_file_name);
+void            eel_labeled_image_set_label_position               (EelLabeledImage         *labeled_image,
+								    GtkPositionType          label_position);
+GtkPositionType eel_labeled_image_get_label_position               (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_show_label                   (EelLabeledImage         *labeled_image,
+								    gboolean                 show_label);
+gboolean        eel_labeled_image_get_show_label                   (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_show_image                   (EelLabeledImage         *labeled_image,
+								    gboolean                 show_image);
+gboolean        eel_labeled_image_get_show_image                   (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_can_focus                    (EelLabeledImage         *labeled_image,
+								    gboolean                 can_focus);
+void            eel_labeled_image_set_spacing                      (EelLabeledImage         *labeled_image,
+								    guint                    spacing);
+guint           eel_labeled_image_get_spacing                      (const EelLabeledImage   *labeled_image);
+int             eel_labeled_image_get_x_padding                    (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_x_padding                    (EelLabeledImage         *labeled_image,
+								    int                      x_padding);
+int             eel_labeled_image_get_y_padding                    (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_y_padding                    (EelLabeledImage         *labeled_image,
+								    int                      y_padding);
+float           eel_labeled_image_get_x_alignment                  (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_x_alignment                  (EelLabeledImage         *labeled_image,
+								    float                    x_alignment);
+float           eel_labeled_image_get_y_alignment                  (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_y_alignment                  (EelLabeledImage         *labeled_image,
+								    float                    y_alignment);
+void            eel_labeled_image_set_fill                         (EelLabeledImage         *labeled_image,
+								    gboolean                 fill);
+gboolean        eel_labeled_image_get_fill                         (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_fixed_image_height           (EelLabeledImage         *labeled_image,
+								    int                      fixed_image_height);
+void            eel_labeled_image_set_selected                     (EelLabeledImage         *labeled_image,
+								    gboolean                 selected);
+gboolean        eel_labeled_image_get_selected                     (EelLabeledImage         *labeled_image);
+
+/* Functions for creating stock GtkButtons with a labeled image child */
+GtkWidget *     eel_labeled_image_button_new                       (const char              *text,
+								    GdkPixbuf               *pixbuf);
+GtkWidget *     eel_labeled_image_button_new_from_file_name        (const char              *text,
+								    const char              *pixbuf_file_name);
+GtkWidget *     eel_labeled_image_toggle_button_new                (const char              *text,
+								    GdkPixbuf               *pixbuf);
+GtkWidget *     eel_labeled_image_toggle_button_new_from_file_name (const char              *text,
+								    const char              *pixbuf_file_name);
+GtkWidget *     eel_labeled_image_check_button_new                 (const char              *text,
+								    GdkPixbuf               *pixbuf);
+GtkWidget *     eel_labeled_image_check_button_new_from_file_name  (const char              *text,
+								    const char              *pixbuf_file_name);
+GtkWidget *     eel_labeled_image_radio_button_new                 (const char              *text,
+								    GdkPixbuf               *pixbuf);
+GtkWidget *     eel_labeled_image_radio_button_new_from_file_name  (const char              *text,
+								    const char              *pixbuf_file_name);
+
+/* These are proxies for methods in EelImage and EelLabel */
+void            eel_labeled_image_set_pixbuf                       (EelLabeledImage         *labeled_image,
+								    GdkPixbuf               *pixbuf);
+void            eel_labeled_image_set_pixbuf_from_file_name        (EelLabeledImage         *labeled_image,
+								    const char              *pixbuf_file_name);
+GdkPixbuf*      eel_labeled_image_get_pixbuf                       (const EelLabeledImage   *labeled_image);
+void            eel_labeled_image_set_text                         (EelLabeledImage         *labeled_image,
+								    const char              *text);
+char*           eel_labeled_image_get_text                         (const EelLabeledImage   *labeled_image);
+EelIRect        eel_labeled_image_get_image_bounds                 (const EelLabeledImage   *labeled_image);
+EelIRect        eel_labeled_image_get_label_bounds                 (const EelLabeledImage   *labeled_image);
+
+G_END_DECLS
+
+#endif /* EEL_LABELED_IMAGE_H */
+
+
diff --git a/eel/eel-lib-self-check-functions.c b/eel/eel-lib-self-check-functions.c
new file mode 100644
index 000000000..dd9770aac
--- /dev/null
+++ b/eel/eel-lib-self-check-functions.c
@@ -0,0 +1,38 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+   
+   eel-lib-self-check-functions.c: Wrapper for all self check functions
+   in Eel proper.
+ 
+   Copyright (C) 2000 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+
+#if ! defined (EEL_OMIT_SELF_CHECK)
+
+#include "eel-lib-self-check-functions.h"
+
+void
+eel_run_lib_self_checks (void)
+{
+	EEL_LIB_FOR_EACH_SELF_CHECK_FUNCTION (EEL_CALL_SELF_CHECK_FUNCTION)
+}
+
+#endif /* ! EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-lib-self-check-functions.h b/eel/eel-lib-self-check-functions.h
new file mode 100644
index 000000000..837babfe8
--- /dev/null
+++ b/eel/eel-lib-self-check-functions.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-lib-self-check-functions.h: Wrapper and prototypes for all
+   self-check functions in libeel.
+ 
+   Copyright (C) 2000 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Darin Adler <darin@eazel.com>
+*/
+
+#include "eel-self-checks.h"
+
+void eel_run_lib_self_checks (void);
+
+/* Putting the prototypes for these self-check functions in each
+   header file for the files they are defined in would make compiling
+   the self-check framework take way too long (since one file would
+   have to include everything).
+
+   So we put the list of functions here instead.
+
+   Instead of just putting prototypes here, we put this macro that
+   can be used to do operations on the whole list of functions.
+*/
+
+#define EEL_LIB_FOR_EACH_SELF_CHECK_FUNCTION(macro) \
+	macro (eel_self_check_background) \
+	macro (eel_self_check_enumeration) \
+	macro (eel_self_check_gdk_extensions) \
+	macro (eel_self_check_gdk_pixbuf_extensions) \
+	macro (eel_self_check_glib_extensions) \
+        macro (eel_self_check_pango_extensions) \
+	macro (eel_self_check_preferences) \
+	macro (eel_self_check_string) \
+/* Add new self-check functions to the list above this line. */
+
+/* Generate prototypes for all the functions. */
+EEL_LIB_FOR_EACH_SELF_CHECK_FUNCTION (EEL_SELF_CHECK_FUNCTION_PROTOTYPE)
diff --git a/eel/eel-pango-extensions.c b/eel/eel-pango-extensions.c
new file mode 100644
index 000000000..cbb9c0dce
--- /dev/null
+++ b/eel/eel-pango-extensions.c
@@ -0,0 +1,586 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-pango-extensions.h - interface for new functions that conceptually
+                            belong in pango. Perhaps some of these will be
+                            actually rolled into pango someday.
+
+   Copyright (C) 2001 Anders Carlsson
+
+   The Eel Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Eel Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Eel Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Anders Carlsson <andersca@gnu.org>
+*/
+
+#include <config.h>
+#include "eel-pango-extensions.h"
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+#include "eel-lib-self-check-functions.h"
+#endif
+
+#include <gtk/gtk.h>
+#include <pango/pango.h>
+#include <string.h>
+
+PangoAttrList *
+eel_pango_attr_list_copy_or_create (PangoAttrList *attr_list)
+{
+	if (attr_list != NULL) {
+		return pango_attr_list_copy (attr_list);
+	}
+	return pango_attr_list_new ();
+}
+
+PangoAttrList *
+eel_pango_attr_list_apply_global_attribute (PangoAttrList *attr_list,
+					    PangoAttribute *attr)
+{
+	PangoAttrList *new_attr_list;
+
+	g_return_val_if_fail (attr != NULL, NULL);
+
+	attr->start_index = 0;
+	attr->end_index = G_MAXINT;
+	
+	new_attr_list = eel_pango_attr_list_copy_or_create (attr_list);
+	pango_attr_list_change (new_attr_list, attr);
+	return new_attr_list;
+}
+
+#define ELLIPSIS "..."
+
+/* Caution: this is an _expensive_ function */
+static int
+measure_string_width (const char  *string,
+		      PangoLayout *layout)
+{
+	int width;
+	
+	pango_layout_set_text (layout, string, -1);
+	pango_layout_get_pixel_size (layout, &width, NULL);
+
+	return width;
+}
+
+/* this is also plenty slow */
+static void
+compute_character_widths (const char    *string,
+			  PangoLayout   *layout,
+			  int           *char_len_return,
+			  int          **widths_return,
+			  int          **cuts_return)
+{
+	int *widths;
+	int *offsets;
+	int *cuts;
+	int char_len;
+	int byte_len;
+	const char *p;
+	int i;
+	PangoLayoutIter *iter;
+	PangoLogAttr *attrs;
+	
+#define BEGINS_UTF8_CHAR(x) (((x) & 0xc0) != 0x80)
+	
+	char_len = g_utf8_strlen (string, -1);
+	byte_len = strlen (string);
+	
+	widths = g_new (int, char_len);
+	offsets = g_new (int, byte_len);
+
+	/* Create a translation table from byte index to char offset */
+	p = string;
+	i = 0;
+	while (*p) {
+		int byte_index = p - string;
+		
+		if (BEGINS_UTF8_CHAR (*p)) {
+			offsets[byte_index] = i;
+			++i;
+		} else {
+			offsets[byte_index] = G_MAXINT; /* segv if we try to use this */
+		}
+		
+		++p;
+	}
+
+	/* Now fill in the widths array */
+	pango_layout_set_text (layout, string, -1);
+	
+	iter = pango_layout_get_iter (layout);
+
+	do {
+		PangoRectangle extents;
+		int byte_index;
+
+		byte_index = pango_layout_iter_get_index (iter);
+
+		if (byte_index < byte_len) {
+			pango_layout_iter_get_char_extents (iter, &extents);
+			
+			g_assert (BEGINS_UTF8_CHAR (string[byte_index]));
+			g_assert (offsets[byte_index] < char_len);
+			
+			widths[offsets[byte_index]] = PANGO_PIXELS (extents.width);
+		}
+		
+	} while (pango_layout_iter_next_char (iter));
+
+	pango_layout_iter_free (iter);
+
+	g_free (offsets);
+	
+	*widths_return = widths;
+
+	/* Now compute character offsets that are legitimate places to
+	 * chop the string
+	 */
+	attrs = g_new (PangoLogAttr, char_len + 1);
+	
+	pango_get_log_attrs (string, byte_len, -1,
+			     pango_context_get_language (
+				     pango_layout_get_context (layout)),
+			     attrs,
+			     char_len + 1);
+
+	cuts = g_new (int, char_len);
+	i = 0;
+	while (i < char_len) {
+		cuts[i] = attrs[i].is_cursor_position;
+
+		++i;
+	}
+
+	g_free (attrs);
+
+	*cuts_return = cuts;
+
+	*char_len_return = char_len;
+}
+
+
+static char *
+eel_string_ellipsize_start (const char *string, PangoLayout *layout, int width)
+{
+	int resulting_width;
+	int *cuts;
+	int *widths;
+	int char_len;
+	const char *p;
+	int truncate_offset;
+
+	/* Zero-length string can't get shorter - catch this here to
+	 * avoid expensive calculations
+	 */
+	if (*string == '\0')
+		return g_strdup ("");
+
+	/* I'm not sure if this short-circuit is a net win; it might be better
+	 * to just dump this, and always do the compute_character_widths() etc.
+	 * down below.
+	 */
+	resulting_width = measure_string_width (string, layout);
+
+	if (resulting_width <= width) {
+		/* String is already short enough. */
+		return g_strdup (string);
+	}
+
+	/* Remove width of an ellipsis */
+	width -= measure_string_width (ELLIPSIS, layout);
+
+	if (width < 0) {
+		/* No room even for an ellipsis. */
+		return g_strdup ("");
+	}
+
+	/* Our algorithm involves removing enough chars from the string to bring
+	 * the width to the required small size. However, due to ligatures,
+	 * combining characters, etc., it's not guaranteed that the algorithm
+	 * always works 100%. It's sort of a heuristic thing. It should work
+	 * nearly all the time... but I wouldn't put in
+	 * g_assert (width of resulting string < width).
+	 *
+	 * Hmm, another thing that this breaks with is explicit line breaks
+	 * in "string"
+	 */
+
+	compute_character_widths (string, layout, &char_len, &widths, &cuts);
+
+        for (truncate_offset = 1; truncate_offset < char_len; truncate_offset++) {
+
+        	resulting_width -= widths[truncate_offset];
+
+        	if (resulting_width <= width &&
+		    cuts[truncate_offset]) {
+			break;
+        	}
+        }
+
+	g_free (cuts);
+	g_free (widths);
+	
+	p = g_utf8_offset_to_pointer (string, truncate_offset);
+	
+	return g_strconcat (ELLIPSIS, p, NULL);
+}
+
+static char *
+eel_string_ellipsize_end (const char *string, PangoLayout *layout, int width)
+{
+	int resulting_width;
+	int *cuts;
+	int *widths;
+	int char_len;
+	const char *p;
+	int truncate_offset;
+	char *result;
+	
+	/* See explanatory comments in ellipsize_start */
+	
+	if (*string == '\0')
+		return g_strdup ("");
+
+	resulting_width = measure_string_width (string, layout);
+	
+	if (resulting_width <= width) {
+		return g_strdup (string);
+	}
+
+	width -= measure_string_width (ELLIPSIS, layout);
+
+	if (width < 0) {
+		return g_strdup ("");
+	}
+	
+	compute_character_widths (string, layout, &char_len, &widths, &cuts);
+	
+        for (truncate_offset = char_len - 1; truncate_offset > 0; truncate_offset--) {
+        	resulting_width -= widths[truncate_offset];
+        	if (resulting_width <= width &&
+		    cuts[truncate_offset]) {
+			break;
+        	}
+        }
+
+	g_free (cuts);
+	g_free (widths);
+
+	p = g_utf8_offset_to_pointer (string, truncate_offset);
+	
+	result = g_malloc ((p - string) + strlen (ELLIPSIS) + 1);
+	memcpy (result, string, (p - string));
+	strcpy (result + (p - string), ELLIPSIS);
+
+	return result;
+}
+
+static char *
+eel_string_ellipsize_middle (const char *string, PangoLayout *layout, int width)
+{
+	int resulting_width;
+	int *cuts;
+	int *widths;
+	int char_len;
+	int starting_fragment_byte_len;
+	int ending_fragment_byte_index;
+	int starting_fragment_length;
+	int ending_fragment_offset;
+	char *result;
+	
+	/* See explanatory comments in ellipsize_start */
+	
+	if (*string == '\0')
+		return g_strdup ("");
+
+	resulting_width = measure_string_width (string, layout);
+	
+	if (resulting_width <= width) {
+		return g_strdup (string);
+	}
+
+	width -= measure_string_width (ELLIPSIS, layout);
+
+	if (width < 0) {
+		return g_strdup ("");
+	}
+	
+	compute_character_widths (string, layout, &char_len, &widths, &cuts);
+	
+	starting_fragment_length = char_len / 2;
+	ending_fragment_offset = starting_fragment_length + 1;
+	
+	/* Shave off a character at a time from the first and the second half
+	 * until we can fit
+	 */
+	resulting_width -= widths[ending_fragment_offset - 1];
+	
+	/* depending on whether the original string length is odd or even, start by
+	 * shaving off the characters from the starting or ending fragment
+	 */
+	if (char_len % 2) {
+		goto shave_end;
+	}
+
+	while (starting_fragment_length > 0 || ending_fragment_offset < char_len) {
+		if (resulting_width <= width &&
+		    cuts[ending_fragment_offset] &&
+		    cuts[starting_fragment_length]) {
+			break;
+		}
+
+		if (starting_fragment_length > 0) {
+			resulting_width -= widths[starting_fragment_length];
+			starting_fragment_length--;
+		}
+
+	shave_end:
+		if (resulting_width <= width &&
+		    cuts[ending_fragment_offset] &&
+		    cuts[starting_fragment_length]) {
+			break;
+		}
+
+		if (ending_fragment_offset < char_len) {
+			resulting_width -= widths[ending_fragment_offset];
+			ending_fragment_offset++;
+		}
+	}
+
+	g_free (cuts);
+	g_free (widths);	
+	
+	/* patch the two fragments together with an ellipsis */
+	result = g_malloc (strlen (string) + strlen (ELLIPSIS) + 1); /* a bit wasteful, no biggie */
+
+	starting_fragment_byte_len = g_utf8_offset_to_pointer (string, starting_fragment_length) - string;
+	ending_fragment_byte_index = g_utf8_offset_to_pointer (string, ending_fragment_offset) - string;
+	
+	memcpy (result, string, starting_fragment_byte_len);
+	strcpy (result + starting_fragment_byte_len, ELLIPSIS);
+	strcpy (result + starting_fragment_byte_len + strlen (ELLIPSIS), string + ending_fragment_byte_index);
+
+	return result;
+}
+
+
+/**
+ * eel_pango_layout_set_text_ellipsized
+ *
+ * @layout: a pango layout
+ * @string: A a string to be ellipsized.
+ * @width: Desired maximum width in points.
+ * @mode: The desired ellipsizing mode.
+ * 
+ * Truncates a string if required to fit in @width and sets it on the
+ * layout. Truncation involves removing characters from the start, middle or end
+ * respectively and replacing them with "...". Algorithm is a bit
+ * fuzzy, won't work 100%.
+ * 
+ */
+void
+eel_pango_layout_set_text_ellipsized (PangoLayout  *layout,
+				      const char   *string,
+				      int           width,
+				      EelEllipsizeMode mode)
+{
+	char *s;
+
+	g_return_if_fail (PANGO_IS_LAYOUT (layout));
+	g_return_if_fail (string != NULL);
+	g_return_if_fail (width >= 0);
+	
+	switch (mode) {
+	case EEL_ELLIPSIZE_START:
+		s = eel_string_ellipsize_start (string, layout, width);
+		break;
+	case EEL_ELLIPSIZE_MIDDLE:
+		s = eel_string_ellipsize_middle (string, layout, width);
+		break;
+	case EEL_ELLIPSIZE_END:
+		s = eel_string_ellipsize_end (string, layout, width);
+		break;
+	default:
+		g_return_if_reached ();
+	}
+	
+	pango_layout_set_text (layout, s, -1);
+	
+	g_free (s);
+}
+
+
+int
+eel_pango_font_description_get_largest_fitting_font_size (const PangoFontDescription *font_desc,
+							  PangoContext *context,
+							  const char   *text,
+							  int           available_width,
+							  int           minimum_acceptable_font_size,
+							  int           maximum_acceptable_font_size)
+{
+	int i;
+	int width;
+	PangoLayout *layout;
+	PangoFontDescription *font;
+
+	g_return_val_if_fail (text != NULL, 0);
+	g_return_val_if_fail (text[0] != '\0', 0);
+	g_return_val_if_fail (available_width > 0, 0);
+	g_return_val_if_fail (minimum_acceptable_font_size > 0, 0);
+	g_return_val_if_fail (maximum_acceptable_font_size > 0, 0);
+	g_return_val_if_fail (maximum_acceptable_font_size > minimum_acceptable_font_size, 0);
+
+	layout = pango_layout_new (context);
+	pango_layout_set_text (layout, text, -1);
+	pango_layout_set_font_description (layout, font_desc);
+	
+	font = pango_font_description_new ();
+
+	for (i = maximum_acceptable_font_size; i >= minimum_acceptable_font_size; i--) {
+
+		pango_font_description_set_size (font, i * PANGO_SCALE);
+		pango_layout_set_font_description (layout, font);
+		pango_layout_get_pixel_size (layout, &width, NULL);
+
+		if (width <= available_width) {
+			pango_font_description_free (font);
+			g_object_unref (layout);
+			return i;
+		}
+	}
+
+	pango_font_description_free (font);
+	g_object_unref (layout);
+	return i;
+}
+
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+static PangoContext *
+eel_create_bogus_test_pango_context (void)
+{
+	PangoContext *context;
+	
+	context = gdk_pango_context_get ();
+	pango_context_set_language (context, gtk_get_default_language ());
+	
+	return context;
+}
+
+/* Testing string truncation is tough because we do not know what font/
+ * font metrics to expect on a given system. To work around this we use
+ * a substring of the original, measure it's length using the given font, 
+ * add the length of the "..." string and use that for truncation.
+ * The result should then be the substring prepended with a "..."
+ */
+static char *
+eel_self_check_ellipsize (const char *string, const char *truncate_to_length_string, EelEllipsizeMode mode)
+{
+	PangoContext *context;
+	int truncation_length;
+	char *result;
+	PangoLayout *layout;
+	
+	context = eel_create_bogus_test_pango_context ();
+	layout = pango_layout_new (context);
+	
+	/* measure the length we want to truncate to */
+	truncation_length = measure_string_width (truncate_to_length_string, layout);
+
+	eel_pango_layout_set_text_ellipsized (layout, string, truncation_length, mode);
+
+	result = g_strdup (pango_layout_get_text (layout));
+	
+	g_object_unref (G_OBJECT (context));
+	g_object_unref (G_OBJECT (layout));
+
+	return result;
+}
+
+static char *
+eel_self_check_ellipsize_start (const char *string, const char *truncate_to_length_string)
+{
+	return eel_self_check_ellipsize (string, truncate_to_length_string, EEL_ELLIPSIZE_START);
+}
+
+static char *
+eel_self_check_ellipsize_middle (const char *string, const char *truncate_to_length_string)
+{
+	return eel_self_check_ellipsize (string, truncate_to_length_string, EEL_ELLIPSIZE_MIDDLE);
+}
+
+static char *
+eel_self_check_ellipsize_end (const char *string, const char *truncate_to_length_string)
+{
+	return eel_self_check_ellipsize (string, truncate_to_length_string, EEL_ELLIPSIZE_END);
+}
+
+void
+eel_self_check_pango_extensions (void)
+{
+	PangoContext *context;
+
+	/* used to test ellipsize routines */
+	context = eel_create_bogus_test_pango_context ();
+
+	/* Turned off these tests because they are failing for me and I
+	 * want the release to be able to pass "make check". We'll have
+	 * to revisit this at some point. The failures started because
+	 * I changed my default font and enabled Xft support. I presume
+	 * this is simply the "fuzziness" Havoc mentions in his comments
+	 * above.
+	 *                                                - Darin
+	 */
+
+    if (0) {
+	/* eel_string_ellipsize_start */
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_start ("012345678", "0012345678"), "012345678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_start ("012345678", "012345678"), "012345678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_start ("012345678", "...45678"), "...45678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_start ("012345678", "...5678"), "...5678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_start ("012345678", "...678"), "...678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_start ("012345678", "...78"), "...78");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_start ("012345678", "...8"), "...8");
+
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("012345678", "0123456789"), "012345678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("012345678", "012345678"), "012345678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("012345678", "012...78"), "012...78");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("012345678", "01...78"), "01...78");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("012345678", "01...8"), "01...8");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("012345678", "0...8"), "0...8");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("012345678", "0..."), "0...");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("0123456789", "0123456789"), "0123456789");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("0123456789", "012...789"), "012...789");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("0123456789", "012...89"), "012...89");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("0123456789", "01...89"), "01...89");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("0123456789", "01...9"), "01...9");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("0123456789", "0...9"), "0...9");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_middle ("0123456789", "0..."), "0...");
+
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_end ("012345678", "0123456789"), "012345678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_end ("012345678", "012345678"), "012345678");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_end ("012345678", "01234..."), "01234...");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_end ("012345678", "0123..."), "0123...");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_end ("012345678", "012..."), "012...");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_end ("012345678", "01..."), "01...");
+	EEL_CHECK_STRING_RESULT (eel_self_check_ellipsize_end ("012345678", "0..."), "0...");
+    }
+
+	g_object_unref (context);
+}
+
+#endif /* !EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-pango-extensions.h b/eel/eel-pango-extensions.h
new file mode 100644
index 000000000..efa96572a
--- /dev/null
+++ b/eel/eel-pango-extensions.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-pango-extensions.h - interface for new functions that conceptually
+                            belong in pango. Perhaps some of these will be
+                            actually rolled into pango someday.
+
+   Copyright (C) 2001 Anders Carlsson
+
+   The Eel Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Eel Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Eel Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Anders Carlsson <andersca@gnu.org>
+*/
+
+#ifndef EEL_PANGO_EXTENSIONS_H
+#define EEL_PANGO_EXTENSIONS_H
+
+#include <pango/pango.h>
+
+typedef enum {
+	EEL_ELLIPSIZE_START,
+	EEL_ELLIPSIZE_MIDDLE,
+	EEL_ELLIPSIZE_END
+} EelEllipsizeMode;
+
+PangoAttrList *eel_pango_attr_list_copy_or_create         (PangoAttrList    *attr_list);
+PangoAttrList *eel_pango_attr_list_apply_global_attribute (PangoAttrList    *attr_list,
+							   PangoAttribute   *attr);
+int eel_pango_font_description_get_largest_fitting_font_size (const PangoFontDescription *font_desc,
+							      PangoContext               *context,
+							      const char                 *text,
+							      int                         available_width,
+							      int                         minimum_acceptable_font_size,
+							      int                         maximum_acceptable_font_size);
+
+/* caution: this function is expensive. */
+void           eel_pango_layout_set_text_ellipsized       (PangoLayout      *layout,
+							   const char       *string,
+							   int               width,
+							   EelEllipsizeMode  mode);
+
+#endif /* EEL_PANGO_EXTENSIONS_H */
diff --git a/eel/eel-preferences-builder.c b/eel/eel-preferences-builder.c
new file mode 100644
index 000000000..d4522cec3
--- /dev/null
+++ b/eel/eel-preferences-builder.c
@@ -0,0 +1,564 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-preferences-glade.c - Some functions to connect a Glade-file to gconf keys.
+
+   Copyright (C) 2002 Jan Arne Petersen
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Jan Arne Petersen <jpetersen@uni-bonn.de>
+*/
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "eel-preferences.h"
+
+#define EEL_PREFERENCES_BUILDER_DATA_KEY "eel_preferences_builder_data_key"
+#define EEL_PREFERENCES_BUILDER_DATA_VALUE "eel_preferences_builder_data_value"
+#define EEL_PREFERENCES_BUILDER_DATA_MAP "eel_preferences_builder_data_map"
+#define EEL_PREFERENCES_BUILDER_DATA_WIDGETS "eel_preferences_builder_data_widgets"
+
+/* helper */
+
+static void
+eel_preferences_builder_combo_box_update (GtkComboBox *combo_box,
+					gpointer value,
+					GCallback change_callback)
+{
+	GHashTable *map;
+	int active;
+	gpointer key;
+
+	map = (GHashTable *) g_object_get_data (G_OBJECT (combo_box),
+						EEL_PREFERENCES_BUILDER_DATA_MAP);
+	active = GPOINTER_TO_INT (g_hash_table_lookup (map, value));
+
+	if (active == -1) {
+		return;
+	}
+
+	key = g_object_get_data (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_KEY);
+
+	g_signal_handlers_block_by_func (combo_box, change_callback, key);
+	gtk_combo_box_set_active (combo_box, active);
+	g_signal_handlers_unblock_by_func (combo_box, change_callback, key);
+}
+
+static void
+eel_preference_glade_never_sensitive (GtkWidget *widget, GtkStateType state)
+{
+	gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE);
+}
+
+static void
+eel_preferences_builder_set_never_sensitive (GtkWidget *widget)
+{
+	gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE);
+	g_signal_connect (G_OBJECT (widget), "state_changed",
+			  G_CALLBACK (eel_preference_glade_never_sensitive),
+			  NULL);
+}
+
+/* bool preference */
+
+static void
+eel_preferences_builder_bool_toggled (GtkToggleButton *toggle_button,
+				    char *key)
+{
+	eel_preferences_set_boolean (key, gtk_toggle_button_get_active (toggle_button));
+}
+
+static void
+eel_preferences_builder_bool_update (GtkToggleButton *toggle_button)
+{
+	gboolean value;
+	gpointer key;
+
+	key = g_object_get_data (G_OBJECT (toggle_button), EEL_PREFERENCES_BUILDER_DATA_KEY);
+
+	value = eel_preferences_get_boolean (key);
+	g_signal_handlers_block_by_func (toggle_button, eel_preferences_builder_bool_toggled, key);
+	gtk_toggle_button_set_active (toggle_button, value);
+	g_signal_handlers_unblock_by_func (toggle_button, eel_preferences_builder_bool_toggled, key);
+}
+
+void
+eel_preferences_builder_connect_bool (GtkBuilder *builder,
+				      const char *component,
+				      const char *key)
+{
+	GtkToggleButton *toggle_button;
+
+	g_return_if_fail (builder != NULL);
+	g_return_if_fail (component != NULL);
+	g_return_if_fail (key != NULL);
+
+	toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, component));
+	g_object_set_data_full (G_OBJECT (toggle_button), EEL_PREFERENCES_BUILDER_DATA_KEY,
+				g_strdup (key), (GDestroyNotify) g_free);
+
+	eel_preferences_add_callback_while_alive (key,
+				      		  (EelPreferencesCallback) eel_preferences_builder_bool_update,
+				      		  toggle_button, G_OBJECT (toggle_button));
+
+	if (!eel_preferences_key_is_writable (key)) {
+		eel_preferences_builder_set_never_sensitive (GTK_WIDGET (toggle_button));
+	}
+	
+	g_signal_connect (G_OBJECT (toggle_button), "toggled",
+			  G_CALLBACK (eel_preferences_builder_bool_toggled),
+			  g_object_get_data (G_OBJECT (toggle_button),
+				  		       EEL_PREFERENCES_BUILDER_DATA_KEY));
+
+	eel_preferences_builder_bool_update (toggle_button);
+}
+
+void
+eel_preferences_builder_connect_bool_slave (GtkBuilder *builder,
+					    const char *component,
+					    const char *key)
+{
+	GtkToggleButton *toggle_button;
+
+	g_return_if_fail (builder != NULL);
+	g_return_if_fail (component != NULL);
+	g_return_if_fail (key != NULL);
+
+	toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, component));
+
+	if (!eel_preferences_key_is_writable (key)) {
+		eel_preferences_builder_set_never_sensitive (GTK_WIDGET (toggle_button));
+	}
+	
+	g_signal_connect_data (G_OBJECT (toggle_button), "toggled",
+			       G_CALLBACK (eel_preferences_builder_bool_toggled),
+			       g_strdup (key), (GClosureNotify) g_free, 0);
+}
+
+/* string enum (ComboBox) preference */
+
+static void
+eel_preferences_builder_string_enum_combo_box_changed (GtkComboBox *combo_box,
+						     char *key)
+{
+	int active;
+	char **values;
+	int i;
+
+	active = gtk_combo_box_get_active  (combo_box);
+	values = g_object_get_data (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_VALUE);
+
+	i = 0;
+	while (i < active && values[i] != NULL) {
+		i++;
+	}
+
+	if (values[i] == NULL) {
+		return;
+	}
+
+	eel_preferences_set (key, values[i]);
+}
+
+static void
+eel_preferences_builder_string_enum_combo_box_update (GtkComboBox *combo_box)
+{
+	char *value;
+
+	value = eel_preferences_get (g_object_get_data (G_OBJECT (combo_box),
+							EEL_PREFERENCES_BUILDER_DATA_KEY));
+
+	eel_preferences_builder_combo_box_update (combo_box, value,
+						  G_CALLBACK (eel_preferences_builder_string_enum_combo_box_changed));
+
+	g_free (value);
+}
+
+void
+eel_preferences_builder_connect_string_enum_combo_box (GtkBuilder *builder,
+						       const char *component,
+						       const char *key,
+						       const char **values)
+{
+	GtkWidget *combo_box;
+	GHashTable *map;
+	int i;
+
+	g_return_if_fail (builder != NULL);
+	g_return_if_fail (component != NULL);
+	g_return_if_fail (key != NULL);
+	g_return_if_fail (values != NULL);
+	
+	combo_box = GTK_WIDGET (gtk_builder_get_object (builder, component));
+
+	map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
+
+	for (i = 0; values[i] != NULL; i++) {
+		g_hash_table_insert (map, g_strdup (values[i]), GINT_TO_POINTER (i));
+	}
+
+	g_object_set_data_full (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_MAP, map,
+				(GDestroyNotify) g_hash_table_destroy);
+	g_object_set_data (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_VALUE, values);
+	g_object_set_data_full (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_KEY,
+				g_strdup (key), (GDestroyNotify) g_free);
+
+	eel_preferences_add_callback_while_alive (key,
+				 		  (EelPreferencesCallback) eel_preferences_builder_string_enum_combo_box_update,
+						  combo_box, G_OBJECT (combo_box));
+
+	if (!eel_preferences_key_is_writable (key)) {
+		eel_preferences_builder_set_never_sensitive (GTK_WIDGET (combo_box));
+	}
+
+	g_signal_connect (G_OBJECT (combo_box), "changed",
+			  G_CALLBACK (eel_preferences_builder_string_enum_combo_box_changed),
+			  g_object_get_data (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_KEY));
+
+	eel_preferences_builder_string_enum_combo_box_update (GTK_COMBO_BOX (combo_box));
+}
+
+void
+eel_preferences_builder_connect_string_enum_combo_box_slave (GtkBuilder *builder,
+							     const char *component,
+							     const char *key)
+{
+	GtkWidget *combo_box;
+
+	g_return_if_fail (builder != NULL);
+	g_return_if_fail (component != NULL);
+	g_return_if_fail (key != NULL);
+	
+	combo_box = GTK_WIDGET (gtk_builder_get_object (builder, component));
+
+	g_assert (g_object_get_data (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_MAP) != NULL);
+
+	if (!eel_preferences_key_is_writable (key)) {
+		eel_preferences_builder_set_never_sensitive (GTK_WIDGET (combo_box));
+	}
+
+	g_signal_connect_data (G_OBJECT (combo_box), "changed",
+			       G_CALLBACK (eel_preferences_builder_string_enum_combo_box_changed),
+			       g_strdup (key), (GClosureNotify) g_free, 0);
+}
+
+
+/* int enum preference */
+
+static void
+eel_preferences_builder_uint_enum_changed (GtkComboBox *combo_box,
+					   char *key)
+{
+	int active;
+	GSList *value_list;
+	int i;
+
+	active = gtk_combo_box_get_active (combo_box);
+	value_list = (GSList *) g_object_get_data (G_OBJECT (combo_box),
+						   EEL_PREFERENCES_BUILDER_DATA_VALUE);
+
+	i = 0;
+	while (i < active && value_list->next != NULL) {
+		i++;
+		value_list = value_list->next;
+	}
+
+	eel_preferences_set_uint (key, GPOINTER_TO_UINT (value_list->data));
+}
+
+static void
+eel_preferences_builder_uint_enum_update (GtkComboBox *combo_box)
+{
+	guint value;
+
+	value = eel_preferences_get_uint (g_object_get_data (G_OBJECT (combo_box),
+							     EEL_PREFERENCES_BUILDER_DATA_KEY));
+
+	eel_preferences_builder_combo_box_update (combo_box, GUINT_TO_POINTER (value),
+						  G_CALLBACK (eel_preferences_builder_uint_enum_changed));
+}
+
+void
+eel_preferences_builder_connect_uint_enum (GtkBuilder  *builder,
+					   const char  *component,
+					   const char  *key,
+					   const guint *values,
+					   int          num_values)
+{
+	GHashTable *map;
+	int i;
+	guint value;
+	GtkComboBox *combo_box;
+	GSList *value_list;
+
+	g_return_if_fail (builder != NULL);
+	g_return_if_fail (component != NULL);
+	g_return_if_fail (key != NULL);
+	g_return_if_fail (values != NULL);
+	
+	combo_box = GTK_COMBO_BOX (gtk_builder_get_object (builder, component));
+
+	map = g_hash_table_new (g_direct_hash, g_direct_equal);
+	value_list = NULL;
+
+	for (i = 0; i < num_values; i++) {
+		value = values[i];
+		value_list = g_slist_append (value_list, GUINT_TO_POINTER (value));
+		g_hash_table_insert (map, GUINT_TO_POINTER (value), GINT_TO_POINTER (i));
+	}
+
+	g_object_set_data_full (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_MAP, map,
+				(GDestroyNotify) g_hash_table_destroy);
+	g_object_set_data_full (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_VALUE, value_list,
+				(GDestroyNotify) g_slist_free);
+	g_object_set_data_full (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_KEY,
+				g_strdup (key), (GDestroyNotify) g_free);
+
+	if (!eel_preferences_key_is_writable (key)) {
+		eel_preferences_builder_set_never_sensitive (GTK_WIDGET (combo_box));
+	}
+
+	g_signal_connect (G_OBJECT (combo_box), "changed",
+			  G_CALLBACK (eel_preferences_builder_uint_enum_changed),
+			  g_object_get_data (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_KEY));
+
+	eel_preferences_add_callback_while_alive (key,
+				 		  (EelPreferencesCallback) eel_preferences_builder_uint_enum_update,
+						  combo_box, G_OBJECT (combo_box));
+
+	eel_preferences_builder_uint_enum_update (combo_box);
+}
+
+
+/* String Enum (RadioButton) preference */
+
+static void
+eel_preferences_builder_string_enum_radio_button_toggled (GtkToggleButton *toggle_button,
+							char *key)
+{
+	if (gtk_toggle_button_get_active (toggle_button) == FALSE) {
+		return;
+	}
+
+	eel_preferences_set (key,
+			     g_object_get_data (G_OBJECT (toggle_button),
+				     		EEL_PREFERENCES_BUILDER_DATA_VALUE));
+}
+
+static void
+eel_preferences_builder_string_enum_radio_button_update (GtkWidget *widget)
+{
+	gpointer key;
+	char *value;
+	GHashTable *map;
+	gpointer object;
+
+	key = g_object_get_data (G_OBJECT (widget), EEL_PREFERENCES_BUILDER_DATA_KEY);
+	value = eel_preferences_get (key);
+	map = g_object_get_data (G_OBJECT (widget), EEL_PREFERENCES_BUILDER_DATA_MAP);
+	object = g_hash_table_lookup (map, value);
+	g_free (value);
+	if (object == NULL) {
+		return;
+	}
+
+	g_signal_handlers_block_by_func (widget,
+					 eel_preferences_builder_string_enum_radio_button_toggled,
+					 key);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), TRUE);
+	g_signal_handlers_unblock_by_func (widget,
+					   eel_preferences_builder_string_enum_radio_button_toggled,
+					   key);
+}
+
+void
+eel_preferences_builder_connect_string_enum_radio_button (GtkBuilder *builder,
+							  const char **components,
+							  const char *key,
+							  const char **values)
+{
+	GHashTable *map;
+	int i;
+	GtkWidget *widget;
+	gboolean writable;
+
+	g_return_if_fail (builder != NULL);
+	g_return_if_fail (components != NULL);
+	g_return_if_fail (key != NULL);
+	g_return_if_fail (values != NULL);
+
+	map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
+
+	writable = eel_preferences_key_is_writable (key);
+
+	widget = NULL;
+	for (i = 0; components[i] != NULL && values[i] != NULL; i++) {
+		widget = GTK_WIDGET (gtk_builder_get_object (builder, components[i]));
+		g_hash_table_insert (map, g_strdup (values[i]), widget);
+		if (i == 0) {
+			g_object_set_data_full (G_OBJECT (widget),
+						EEL_PREFERENCES_BUILDER_DATA_MAP, map,
+					        (GDestroyNotify) g_hash_table_destroy);
+		} else {
+			g_object_set_data (G_OBJECT (widget),
+					   EEL_PREFERENCES_BUILDER_DATA_MAP, map);
+		}
+		g_object_set_data_full (G_OBJECT (widget),
+					EEL_PREFERENCES_BUILDER_DATA_VALUE, g_strdup (values[i]),
+					(GDestroyNotify) g_free);
+		g_object_set_data_full (G_OBJECT (widget),
+					EEL_PREFERENCES_BUILDER_DATA_KEY, g_strdup (key),
+					(GDestroyNotify) g_free);
+
+		if (!writable) {
+			eel_preferences_builder_set_never_sensitive (widget);
+		}
+
+		g_signal_connect (G_OBJECT (widget), "toggled",
+				  G_CALLBACK (eel_preferences_builder_string_enum_radio_button_toggled),
+				  g_object_get_data (G_OBJECT (widget),
+					  	     EEL_PREFERENCES_BUILDER_DATA_KEY));
+	}
+
+	eel_preferences_add_callback_while_alive (key,
+						  (EelPreferencesCallback) eel_preferences_builder_string_enum_radio_button_update,
+						  widget, G_OBJECT (widget));
+
+	eel_preferences_builder_string_enum_radio_button_update (widget);
+}
+
+
+/* list enum preference */
+
+static void
+eel_preferences_builder_list_enum_changed (GtkComboBox *combo_box,
+					 char *key)
+{
+	GSList *widgets;
+	int active;
+	char **values;
+	int i;
+	GPtrArray *v;
+
+	widgets = g_object_get_data (G_OBJECT (combo_box), EEL_PREFERENCES_BUILDER_DATA_WIDGETS);
+
+	v = g_ptr_array_new ();
+	for (; widgets != NULL; widgets = widgets->next) {
+		active = gtk_combo_box_get_active (GTK_COMBO_BOX (widgets->data));
+		values = g_object_get_data (G_OBJECT (combo_box),
+					    EEL_PREFERENCES_BUILDER_DATA_VALUE);
+
+		i = 0;
+		while (i < active && values[i] != NULL) {
+			i++;
+		}
+
+		if (values[i] != NULL) {
+			g_ptr_array_add (v, values[i]);
+		}
+	}
+	g_ptr_array_add (v, NULL);
+
+	eel_preferences_set_string_array (key, (char **) v->pdata);
+	g_ptr_array_free (v, TRUE);
+}
+
+static void
+eel_preferences_builder_list_enum_update (GtkWidget *widget)
+{
+	char **values;
+	GSList *components;
+	int i;
+
+	values = eel_preferences_get_string_array (g_object_get_data (G_OBJECT (widget),
+								      EEL_PREFERENCES_BUILDER_DATA_KEY));
+	components = g_object_get_data (G_OBJECT (widget), EEL_PREFERENCES_BUILDER_DATA_WIDGETS);
+	for (i = 0; values[i] != NULL && components != NULL; i++, components = components->next) {
+		eel_preferences_builder_combo_box_update (GTK_COMBO_BOX (components->data), 
+							values[i],
+							G_CALLBACK (eel_preferences_builder_list_enum_changed));
+	}
+
+	g_strfreev (values);
+}
+
+void 
+eel_preferences_builder_connect_list_enum (GtkBuilder *builder,
+					   const char **components,
+					   const char *key,
+					   const char **values)
+{
+	GtkWidget *combo_box;
+	GHashTable *map;
+	int i;
+	GSList *widgets;
+	gboolean writable;
+
+ 	g_return_if_fail (builder != NULL);
+	g_return_if_fail (components != NULL);
+	g_return_if_fail (key != NULL);
+	g_return_if_fail (values != NULL);
+	
+	map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
+
+	for (i = 0; values[i] != NULL; i++) {
+		g_hash_table_insert (map, g_strdup (values[i]), GINT_TO_POINTER (i));
+	}
+
+	writable = eel_preferences_key_is_writable (key);
+
+	combo_box = NULL;
+	widgets = NULL;
+	for (i = 0; components[i] != NULL; i++) {
+		combo_box = GTK_WIDGET (gtk_builder_get_object (builder, components[i]));
+		widgets = g_slist_append (widgets, combo_box);
+		if (i == 0) {
+			g_object_set_data_full (G_OBJECT (combo_box),
+						EEL_PREFERENCES_BUILDER_DATA_MAP, map,
+						(GDestroyNotify) g_hash_table_destroy);
+			g_object_set_data_full (G_OBJECT (combo_box),
+						EEL_PREFERENCES_BUILDER_DATA_WIDGETS,
+						widgets, (GDestroyNotify) g_slist_free);
+		} else {
+			g_object_set_data (G_OBJECT (combo_box),
+					   EEL_PREFERENCES_BUILDER_DATA_MAP, map);
+			g_object_set_data (G_OBJECT (combo_box),
+					   EEL_PREFERENCES_BUILDER_DATA_WIDGETS, widgets);
+		}
+		g_object_set_data (G_OBJECT (combo_box),
+				   EEL_PREFERENCES_BUILDER_DATA_VALUE, values);
+		g_object_set_data_full (G_OBJECT (combo_box),
+				        EEL_PREFERENCES_BUILDER_DATA_KEY, g_strdup (key),
+					(GDestroyNotify) g_free);
+
+		if (!writable) {
+			eel_preferences_builder_set_never_sensitive (combo_box);
+		}
+
+		g_signal_connect (G_OBJECT (combo_box), "changed",
+			  	  G_CALLBACK (eel_preferences_builder_list_enum_changed),
+				  g_object_get_data (G_OBJECT (combo_box),
+					  	     EEL_PREFERENCES_BUILDER_DATA_KEY));
+	}
+
+	eel_preferences_add_callback_while_alive (key,
+						  (EelPreferencesCallback) eel_preferences_builder_list_enum_update,
+						  combo_box, G_OBJECT (combo_box));
+	
+	eel_preferences_builder_list_enum_update (combo_box);
+}
+
diff --git a/eel/eel-preferences.c b/eel/eel-preferences.c
new file mode 100644
index 000000000..cc12160c8
--- /dev/null
+++ b/eel/eel-preferences.c
@@ -0,0 +1,1701 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-preferences.c - Preference peek/poke/notify implementation.
+
+   Copyright (C) 1999, 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-preferences.h"
+
+#include "eel-debug.h"
+#include "eel-gconf-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-enumeration.h"
+#include "eel-glib-extensions.h"
+#include "eel-string.h"
+#include <gconf/gconf-client.h>
+#include <gconf/gconf.h>
+#include <gtk/gtk.h>
+
+/* An enumeration used for updating auto-storage variables in a type-specific way. 
+ * FIXME: there is another enumeration like this in eel-global-preferences.c,
+ * used for different purposes but in a related way. Should we combine them?
+ */
+typedef enum {
+	PREFERENCE_BOOLEAN = 1,
+	PREFERENCE_INTEGER,
+	PREFERENCE_STRING,
+	PREFERENCE_STRING_ARRAY,
+	PREFERENCE_STRING_ARRAY_AS_QUARKS
+} PreferenceType;
+
+/*
+ * PreferencesEntry:
+ *
+ * A structure to manage preference hash table nodes.
+ * Preferences are hash tables.  The hash key is the preference name
+ * (a string).  The  hash value is a pointer of the following struct:
+ */
+typedef struct {
+	char *name;
+	char *description;
+	PreferenceType type;
+	gboolean invisible;
+	GList *callback_list;
+	GList *auto_storage_list;
+	int gconf_connection_id;
+	char *enumeration_id;
+	GConfValue *fallback;
+} PreferencesEntry;
+
+/*
+ * PreferencesCallbackEntry:
+ *
+ * A structure to manage callback lists.  A callback list is a GList.
+ * The callback_data in each list node is a pointer to the following 
+ * struct:
+ */
+typedef struct {
+	EelPreferencesCallback callback;
+	gpointer callback_data;
+} PreferencesCallbackEntry;
+
+static GHashTable *global_table = NULL;
+static char *storage_path = NULL;
+static gboolean initialized = FALSE;
+
+static void              preferences_global_table_free             (void);
+static char *            preferences_key_make                      (const char               *name);
+static void              preferences_callback_entry_free           (PreferencesCallbackEntry *callback_entry);
+static void              preferences_entry_update_auto_storage     (PreferencesEntry         *entry);
+static PreferencesEntry *preferences_global_table_lookup_or_insert (const char               *name);
+
+static int
+preferences_gconf_value_get_int (const GConfValue *value)
+{
+	if (value == NULL) {
+		return 0;
+	}
+	g_assert (value->type == GCONF_VALUE_INT);
+	return gconf_value_get_int (value);
+}
+
+static gboolean
+preferences_gconf_value_get_bool (const GConfValue *value)
+{
+	if (value == NULL) {
+		return FALSE;
+	}
+	g_assert (value->type == GCONF_VALUE_BOOL);
+	return gconf_value_get_bool (value);
+}
+
+static char *
+preferences_gconf_value_get_string (const GConfValue *value)
+{
+	if (value == NULL) {
+		return g_strdup ("");
+	}
+	g_assert (value->type == GCONF_VALUE_STRING);
+	return g_strdup (gconf_value_get_string (value));
+}
+
+static char **
+preferences_gconf_value_get_string_array (const GConfValue *value)
+{
+	GSList *slist, *l;
+	GPtrArray *result;
+
+	if (value == NULL) {
+		return NULL;
+	}
+
+	g_assert (value->type == GCONF_VALUE_LIST);
+	g_assert (gconf_value_get_list_type (value) == GCONF_VALUE_STRING);
+
+	slist = eel_gconf_value_get_string_list (value);
+
+	result = g_ptr_array_new ();
+	for (l = slist; l != NULL; l = l->next) {
+		g_ptr_array_add (result, l->data);
+	}
+	g_slist_free (slist);
+	g_ptr_array_add (result, NULL);
+
+ 	return (char **) g_ptr_array_free (result, FALSE);
+}
+
+static const char *
+preferences_peek_storage_path (void)
+{
+	g_assert (storage_path != NULL);
+
+	return storage_path;
+}
+
+static void
+preferences_set_storage_path (const char *new_storage_path)
+{
+	g_assert (eel_strlen (new_storage_path) > 0);
+
+	/* Make sure the path is indeed different */
+	if (eel_str_is_equal (new_storage_path, storage_path)) {
+		return;
+	}
+
+	/* Free the preference hash table */
+	preferences_global_table_free ();
+
+	/* Stop monitoring the old path */
+	eel_gconf_monitor_remove (storage_path);
+
+	g_free (storage_path);
+	storage_path = g_strdup (new_storage_path);
+
+	/* Start monitoring the new path */
+	eel_gconf_monitor_add (storage_path);
+}
+
+static gboolean
+preferences_is_initialized (void)
+{
+	return initialized;
+}
+
+static GConfValue *
+preferences_get_value (const char *name)
+{
+	GConfValue *result;
+	char *key;
+	PreferencesEntry *entry;
+	
+	g_assert (name != NULL);
+	g_assert (preferences_is_initialized ());
+
+	key = preferences_key_make (name);
+	result = eel_gconf_get_value (key);
+	g_free (key);
+
+	if (result == NULL) {		
+		entry = preferences_global_table_lookup_or_insert (name);
+
+		if (entry->fallback)
+			result = gconf_value_copy (entry->fallback);
+	}
+	
+	return result;
+}
+
+/* If the preference name begind with a "/", we interpret 
+ * it as a straight gconf key. */
+static gboolean
+preferences_preference_is_gconf_key (const char *name)
+{
+	g_assert (name != NULL);
+	
+	if (eel_str_has_prefix (name, "/")) {
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+static char *
+preferences_key_make (const char *name)
+{
+	g_assert (name != NULL);
+	
+	if (!preferences_preference_is_gconf_key (name)) {
+		return g_strdup (name);
+	}
+
+	/* Otherwise, we prefix it with the path */
+	return g_strconcat (preferences_peek_storage_path (), "/",
+			    name, NULL);
+}
+
+/* Get default from schema or emergency fallback */
+static GConfValue *
+preferences_get_default_value (const char *name)
+{
+	GConfValue *result;
+	PreferencesEntry *entry;
+	char *key;
+
+	g_assert (name != NULL);
+
+	key = preferences_key_make (name);
+
+	result = eel_gconf_get_default_value (key);
+
+	g_free (key);
+
+	if (result == NULL) {
+		entry = preferences_global_table_lookup_or_insert (name);
+		if (entry && entry->fallback)
+			result = gconf_value_copy (entry->fallback);
+	}
+	
+        return result;
+}
+
+static int
+preferences_callback_entry_compare (gconstpointer a,
+				    gconstpointer b)
+{
+	const PreferencesCallbackEntry *a_entry = a;
+	const PreferencesCallbackEntry *b_entry = b;
+
+	if (a_entry->callback < b_entry->callback) {
+		return -1;
+	}
+
+	if (a_entry->callback > b_entry->callback) {
+		return +1;
+	}
+
+	if (a_entry->callback_data < b_entry->callback_data) {
+		return -1;
+	}
+
+	if (a_entry->callback_data > b_entry->callback_data) {
+		return +1;
+	}
+
+	return 0;
+}
+
+/* Public preferences functions */
+
+gboolean
+eel_preferences_get_is_invisible (const char *name)
+{
+	g_assert (name != NULL);
+	g_assert (preferences_is_initialized ());
+
+	return preferences_global_table_lookup_or_insert (name)->invisible;
+}
+
+void
+eel_preferences_set_is_invisible (const char *name,
+				  gboolean is_invisible)
+{
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	preferences_global_table_lookup_or_insert (name)->invisible = is_invisible;
+}
+
+void
+eel_preferences_set_boolean (const char *name,
+			     gboolean boolean_value)
+{
+	char *key;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+	
+	key = preferences_key_make (name);
+	eel_gconf_set_boolean (key, boolean_value);
+	g_free (key);
+
+	eel_gconf_suggest_sync ();
+}
+
+gboolean
+eel_preferences_get_boolean (const char *name)
+{
+ 	gboolean result;
+	GConfValue *value;
+
+	g_return_val_if_fail (name != NULL, 0);
+	g_return_val_if_fail (preferences_is_initialized (), 0);
+
+	value = preferences_get_value (name);
+	result = preferences_gconf_value_get_bool (value);
+	eel_gconf_value_free (value);
+	
+	return result;
+}
+
+void
+eel_preferences_set_integer (const char *name,
+			     int int_value)
+{
+	char *key;
+	int old_value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+	
+	key = preferences_key_make (name);
+	old_value = eel_preferences_get_integer (name);
+	
+	if (int_value != old_value) {
+		eel_gconf_set_integer (key, int_value);
+	}
+	g_free (key);
+}
+
+int
+eel_preferences_get_integer (const char *name)
+{
+ 	int result;
+	GConfValue *value;
+
+	g_return_val_if_fail (name != NULL, 0);
+	g_return_val_if_fail (preferences_is_initialized (), 0);
+
+	value = preferences_get_value (name);
+	result = preferences_gconf_value_get_int (value);
+	eel_gconf_value_free (value);
+
+	return result;
+}
+
+/* GConf has no unsigned store, save as signed and cast */
+guint
+eel_preferences_get_uint (const char *name)
+{
+	return (guint)eel_preferences_get_integer (name);
+}
+void
+eel_preferences_set_uint (const char              *name,
+			  guint                    uint_value)
+{
+	eel_preferences_set_integer (name, (int)uint_value);
+}
+
+guint
+eel_preferences_get_enum (const char *name)
+{
+	guint             ret_val;
+	char             *str_value;
+	GConfValue       *value;
+	const EelEnumeration   *enumeration;
+	PreferencesEntry *entry;
+
+	g_return_val_if_fail (name != NULL, 0);
+	g_return_val_if_fail (preferences_is_initialized (), 0);
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_return_val_if_fail (entry != NULL, 0);
+
+	enumeration = eel_enumeration_lookup (entry->enumeration_id);
+
+	if (!enumeration) {
+		g_warning ("No enum entry for '%s' (%s)",
+			   name, entry->enumeration_id);
+		return 0;
+	}
+
+	value = preferences_get_value (name);
+	if (value->type == GCONF_VALUE_INT) { /* compatibility path */
+		ret_val = (guint)preferences_gconf_value_get_int (value);
+		eel_gconf_value_free (value);
+		return ret_val;
+	}
+
+	str_value = preferences_gconf_value_get_string (value);
+	eel_gconf_value_free (value);
+
+	if (str_value == NULL) {
+		g_warning ("No key for '%s' at %s", str_value, name);
+		return 0;
+	}
+
+	ret_val = eel_enumeration_get_value_for_name (enumeration, str_value);
+
+	g_free (str_value);
+
+	return ret_val;
+}
+
+void
+eel_preferences_set_enum (const char *name,
+			  guint       int_value)
+{
+	const char       *str_value;
+	const EelEnumeration   *enumeration;
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_return_if_fail (entry != NULL);
+
+	enumeration = eel_enumeration_lookup (entry->enumeration_id);
+
+	if (!enumeration) {
+		g_warning ("No enum entry for '%s' (%s)",
+			   name, entry->enumeration_id);
+		return;
+	}
+
+	str_value = eel_enumeration_get_name_for_value (enumeration, int_value);
+
+	if (str_value == NULL) {
+		g_warning ("No enum match for '%d'", int_value);
+		return;
+	}
+
+	eel_preferences_set (name, str_value);
+}
+
+void
+eel_preferences_set (const char *name,
+		     const char *string_value)
+{
+	char *key;
+	char *old_value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	key = preferences_key_make (name);
+	old_value = eel_preferences_get (name);
+
+	if (strcmp (string_value, old_value) != 0) {
+		eel_gconf_set_string (key, string_value);
+	}
+	g_free (key);
+	g_free (old_value);
+}
+
+char *
+eel_preferences_get (const char *name)
+{
+ 	char *result;
+	GConfValue *value;
+
+	g_return_val_if_fail (name != NULL, NULL);
+	g_return_val_if_fail (preferences_is_initialized (), NULL);
+
+	value = preferences_get_value (name);
+	result = preferences_gconf_value_get_string (value);
+	eel_gconf_value_free (value);
+	
+	return result;
+}
+
+void
+eel_preferences_set_string_array (const char  *name,
+				  char       **strv_value)
+{
+	GSList *slist;
+	int i;
+	char *key;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	slist = NULL;
+	if (strv_value != NULL) {
+		for (i = 0; strv_value[i] != NULL; i++) {
+			slist = g_slist_prepend (slist, strv_value[i]);
+		}
+		slist = g_slist_reverse (slist);
+	}
+
+	key = preferences_key_make (name);
+	eel_gconf_set_string_list (key, slist);
+	g_free (key);
+
+	g_slist_free (slist);
+}
+
+static gboolean
+string_array_is_valid (char **strv, const char *enumeration_id)
+{
+	guint i;
+	gboolean res;
+
+	g_assert (strv != NULL);
+	g_assert (enumeration_id != NULL);
+
+	res = TRUE;
+	for (i = 0; strv[i] != NULL; i++) {
+		const EelEnumeration *enumeration;
+
+		enumeration = eel_enumeration_lookup (enumeration_id);
+		if (!enumeration) {
+			res = FALSE;
+			break;
+		}
+
+		if (!eel_enumeration_contains_name (enumeration, strv[i])) {
+			res = FALSE;
+			break;
+		}
+	}
+
+	return res;
+}
+
+char **
+eel_preferences_get_string_array (const char *name)
+{
+ 	char **result;
+	GConfValue *value;
+	PreferencesEntry *entry;
+	GConfValue *default_value;
+
+	g_return_val_if_fail (name != NULL, NULL);
+	g_return_val_if_fail (preferences_is_initialized (), NULL);
+
+	value = preferences_get_value (name);
+	result = preferences_gconf_value_get_string_array (value);
+	eel_gconf_value_free (value);
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	/* No enumeration_id so we're done */
+	if (entry->enumeration_id == NULL) {
+		return result;
+	}
+
+	/* Do a sanity check on the validity of the values */
+	if (string_array_is_valid (result, entry->enumeration_id)) {
+		return result;
+	}
+
+	/* Forget the bad value and use the default instead */
+	g_strfreev (result);
+
+	default_value = preferences_get_default_value (name);
+	if (default_value) {		
+		result = preferences_gconf_value_get_string_array (default_value);
+		gconf_value_free (default_value);
+	}
+
+	return result;
+}
+
+void
+eel_preferences_unset (const char *name)
+{
+	char *key;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	key = preferences_key_make (name);
+	
+	eel_gconf_unset (key);
+
+	g_free (key);
+}
+
+gboolean
+eel_preferences_key_is_writable (const char *name)
+{
+	gboolean result;
+	char *key;
+	
+	g_return_val_if_fail (name != NULL, 0);
+	g_return_val_if_fail (preferences_is_initialized (), 0);
+
+	key = preferences_key_make (name);
+	result = eel_gconf_key_is_writable (key);
+	g_free (key);
+
+	return result;
+}
+
+/**
+ * preferences_callback_entry_invoke_function
+ *
+ * A function that invokes a callback from the given struct.  It is meant to be fed to 
+ * g_list_foreach ()
+ * @data: The list data privately maintained by the GList.
+ * @callback_data: The callback_data privately maintained by the GList.
+ **/
+static void
+preferences_callback_entry_invoke_function (gpointer data,
+					    gpointer callback_data)
+{
+	PreferencesCallbackEntry *callback_entry;
+	
+	g_assert (data != NULL);
+	
+	callback_entry = data;
+
+ 	(* callback_entry->callback) (callback_entry->callback_data);
+}
+
+static void
+preferences_entry_invoke_callbacks (PreferencesEntry *entry)
+{
+	g_assert (entry != NULL);
+
+	/* Update the auto storage preferences */
+	if (entry->auto_storage_list != NULL) {
+		preferences_entry_update_auto_storage (entry);			
+	}
+	
+	/* Invoke callbacks for this entry if any */
+	if (entry->callback_list != NULL) {
+		g_list_foreach (entry->callback_list,
+				preferences_callback_entry_invoke_function,
+				NULL);
+	}
+}
+
+static void
+update_auto_string (gpointer data, gpointer callback_data)
+{
+	char **storage;
+	const char *value;
+
+	g_assert (data != NULL);
+	g_assert (callback_data != NULL);
+
+	storage = (char **)data;
+	value = (const char *)callback_data;
+
+	g_free (*storage);
+	*(char **)storage = g_strdup (value);
+}
+
+static void
+update_auto_string_array (gpointer data, gpointer callback_data)
+{
+	char ***storage;
+	char **value;
+	
+	g_assert (data != NULL);
+	g_assert (callback_data != NULL);
+
+	storage = (char ***)data;
+	value = (char **)callback_data;
+
+	g_strfreev (*storage);
+	*(char ***)storage = value ? g_strdupv (value) : NULL;
+}
+
+static void
+update_auto_string_array_as_quarks (gpointer data, gpointer callback_data)
+{
+	GQuark **storage;
+	char **value;
+	int i = 0;
+	
+	g_assert (data != NULL);
+	g_assert (callback_data != NULL);
+
+	storage = (GQuark **)data;
+	value = (char **)callback_data;
+
+	g_free (*storage);
+	*storage = g_new (GQuark, g_strv_length (value) + 1);
+
+	if (value != NULL) {
+		for (i = 0; value[i] != NULL; ++i) {
+			(*storage)[i] = g_quark_from_string (value[i]);
+		}
+	}
+	(*storage)[i] = 0;
+}
+
+static void
+update_auto_integer_or_boolean (gpointer data, gpointer callback_data)
+{
+	g_assert (data != NULL);
+
+	*(int *)data = GPOINTER_TO_INT (callback_data);
+}
+
+static void
+preferences_entry_update_auto_storage (PreferencesEntry *entry)
+{
+	char *new_string_value;
+	char **new_string_array_value;
+	int new_int_value;
+	guint new_uint_value;
+	gboolean new_boolean_value;
+
+	switch (entry->type) {
+	case PREFERENCE_STRING:
+		if (entry->enumeration_id != NULL) {
+			new_uint_value = eel_preferences_get_enum (entry->name);
+			g_list_foreach (entry->auto_storage_list,
+					update_auto_integer_or_boolean,
+					GINT_TO_POINTER (new_uint_value));
+		} else {
+			new_string_value = eel_preferences_get (entry->name);
+			g_list_foreach (entry->auto_storage_list,
+					update_auto_string,
+					new_string_value);
+			g_free (new_string_value);
+		}
+		break;
+	case PREFERENCE_STRING_ARRAY:
+		new_string_array_value = eel_preferences_get_string_array (entry->name);
+		g_list_foreach (entry->auto_storage_list,
+				update_auto_string_array,
+				new_string_array_value);
+		g_strfreev (new_string_array_value);
+		break;
+	case PREFERENCE_STRING_ARRAY_AS_QUARKS:
+		new_string_array_value = eel_preferences_get_string_array (entry->name);
+		g_list_foreach (entry->auto_storage_list,
+				update_auto_string_array_as_quarks,
+				new_string_array_value);
+		g_strfreev (new_string_array_value);
+		break;
+	case PREFERENCE_INTEGER:
+		new_int_value = eel_preferences_get_integer (entry->name);
+		g_list_foreach (entry->auto_storage_list,
+				update_auto_integer_or_boolean,
+				GINT_TO_POINTER (new_int_value));
+		break;
+	case PREFERENCE_BOOLEAN:
+		new_boolean_value = eel_preferences_get_boolean (entry->name);
+		g_list_foreach (entry->auto_storage_list,
+				update_auto_integer_or_boolean,
+				GINT_TO_POINTER (new_boolean_value));
+		break;
+	default:
+		g_warning ("unexpected preferences type %d in preferences_entry_update_auto_storage", entry->type);
+	}
+}
+
+static void
+preferences_something_changed_notice (GConfClient *client, 
+				      guint connection_id, 
+				      GConfEntry *entry, 
+				      gpointer notice_data)
+{
+	g_assert (entry != NULL);
+	g_assert (entry->key != NULL);
+	g_assert (notice_data != NULL);
+
+	preferences_entry_invoke_callbacks (notice_data);
+}
+
+static void
+preferences_entry_ensure_gconf_connection (PreferencesEntry *entry)
+{
+	char *key;
+	
+	/*
+	 * We install only one gconf notification for each preference entry.
+	 * Otherwise, we would invoke the installed callbacks more than once
+	 * per registered callback.
+	 */
+	if (entry->gconf_connection_id != EEL_GCONF_UNDEFINED_CONNECTION) {
+		return;
+	}
+		
+	g_assert (entry->name != NULL);
+
+	key = preferences_key_make (entry->name);
+
+	entry->gconf_connection_id = eel_gconf_notification_add (key,
+								 preferences_something_changed_notice,
+								 entry);
+	g_free (key);
+
+	g_assert (entry->gconf_connection_id != EEL_GCONF_UNDEFINED_CONNECTION);
+}
+
+/**
+ * preferences_entry_add_callback
+ *
+ * Add a callback to a pref node.  Callbacks are fired whenever
+ * the pref value changes.
+ * @preferences_entry: The hash node.
+ * @callback: The user-supplied callback.
+ * @callback_data: The user-supplied closure.
+ **/
+static void
+preferences_entry_add_callback (PreferencesEntry *entry,
+				EelPreferencesCallback callback,
+				gpointer callback_data)
+{
+	PreferencesCallbackEntry *callback_entry;
+	GList *l;
+
+	g_assert (entry != NULL);
+	g_assert (callback != NULL);
+
+	callback_entry = g_new0 (PreferencesCallbackEntry, 1);
+	callback_entry->callback = callback;
+	callback_entry->callback_data = callback_data;
+
+	l = g_list_find_custom (entry->callback_list, callback_entry, preferences_callback_entry_compare);
+	if (l == NULL) {
+		entry->callback_list = g_list_append (entry->callback_list, callback_entry);
+		preferences_entry_ensure_gconf_connection (entry);
+	} else {
+		g_warning ("Trying to add a callback for %s that already exists.", entry->name);
+	}
+}
+
+/**
+ * preferences_entry_add_auto_storage
+ *
+ * Add an auto-storage variable to a pref node.  The variable will
+ * be updated to match the pref value whenever the pref 
+ * the pref value changes.
+ * @preferences_entry: The hash node.
+ * @storage: The user-supplied location at which to store the value.
+ * @type: Which type of variable this is.
+ **/
+static void
+preferences_entry_add_auto_storage (PreferencesEntry *entry,
+				    gpointer storage,
+				    PreferenceType type)
+{
+	g_assert (entry != NULL);
+	g_assert (storage != NULL);
+	g_assert (entry->type == 0 || entry->type == type);
+	if (g_list_find (entry->auto_storage_list, storage) != NULL) {
+		g_warning ("Trying to add an auto storage for %s that already exists.", entry->name);
+		return;
+	}
+
+	entry->type = type;
+	
+	entry->auto_storage_list = g_list_append (entry->auto_storage_list, storage);
+
+	preferences_entry_ensure_gconf_connection (entry);
+}
+
+static void
+preferences_entry_check_remove_connection (PreferencesEntry *entry)
+{
+	/*
+	 * If there are no callbacks or auto-storage variables left in the entry, 
+	 * remove the gconf notification.
+	 */
+	if (entry->callback_list != NULL || entry->auto_storage_list != NULL) {
+		return;
+	}
+
+	eel_gconf_notification_remove (entry->gconf_connection_id);
+	entry->gconf_connection_id = EEL_GCONF_UNDEFINED_CONNECTION;
+}
+
+/**
+ * preferences_entry_remove_callback
+ *
+ * remove a callback from a pref entry.  Both the callback and the callback_data must
+ * match in order for a callback to be removed from the entry.
+ * @preferences_entry: The hash entry.
+ * @callback: The user-supplied callback.
+ * @callback_data: The user-supplied closure.
+ **/
+static void
+preferences_entry_remove_callback (PreferencesEntry *entry,
+				   EelPreferencesCallback callback,
+				   gpointer callback_data)
+{
+	PreferencesCallbackEntry cb_entry;
+	GList *l;
+
+	g_assert (entry != NULL);
+	g_assert (callback != NULL);
+
+	cb_entry.callback = callback;
+	cb_entry.callback_data = callback_data;
+
+	l = g_list_find_custom (entry->callback_list, &cb_entry, preferences_callback_entry_compare);
+	if (l != NULL) {
+		preferences_callback_entry_free (l->data);
+		entry->callback_list = g_list_delete_link (entry->callback_list, l);
+		preferences_entry_check_remove_connection (entry);
+	} else {
+		g_warning ("Trying to remove a callback for %s without adding it first.", entry->name);
+	}
+
+	g_assert (g_list_find_custom (entry->callback_list, &cb_entry, preferences_callback_entry_compare) == NULL);
+}
+
+/**
+ * preferences_entry_remove_auto_storage
+ *
+ * remove an auto-storage variable from a pref entry.
+ * @preferences_entry: The hash entry.
+ * @storage: The user-supplied location.
+ **/
+static void
+preferences_entry_remove_auto_storage (PreferencesEntry *entry,
+				       gpointer storage)
+{
+	GList *new_list;
+	const GList *node;
+	gpointer storage_in_entry;
+
+	g_assert (entry != NULL);
+	g_assert (storage != NULL);
+	g_assert (entry->auto_storage_list != NULL);
+	
+	new_list = g_list_copy (entry->auto_storage_list);
+	
+	for (node = new_list; node != NULL; node = node->next) {
+		storage_in_entry = node->data;
+		
+		g_assert (storage_in_entry != NULL);
+		
+		if (storage_in_entry == storage) {
+			entry->auto_storage_list = g_list_remove (entry->auto_storage_list, 
+							          storage);
+
+			switch (entry->type) {
+			case PREFERENCE_STRING:
+				update_auto_string (storage, NULL);
+				break;
+			case PREFERENCE_STRING_ARRAY:
+				update_auto_string_array (storage, NULL);
+				break;
+			case PREFERENCE_STRING_ARRAY_AS_QUARKS:
+				update_auto_string_array_as_quarks (storage, NULL);
+				break;
+			case PREFERENCE_BOOLEAN:
+			case PREFERENCE_INTEGER:
+				update_auto_integer_or_boolean (storage, NULL);
+				break;
+			default:
+				g_warning ("unexpected preference type %d in preferences_entry_remove_auto_storage", entry->type);
+			}
+		}
+	}
+
+	g_list_free (new_list);
+
+	preferences_entry_check_remove_connection (entry);
+}
+
+/**
+ * preferences_callback_entry_free
+ *
+ * Free a callback info struct.
+ * @preferences_callback_entry: The struct to free.
+ **/
+static void
+preferences_callback_entry_free (PreferencesCallbackEntry *callback_entry)
+{
+	g_assert (callback_entry != NULL);
+
+	callback_entry->callback = NULL;
+	callback_entry->callback_data = NULL;
+
+	g_free (callback_entry);
+}
+
+/**
+ * preferences_callback_entry_free_func
+ *
+ * A function that frees a callback info struct.  It is meant to be fed to 
+ * g_list_foreach ()
+ * @data: The list data privately maintained by the GList.
+ * @callback_data: The callback_data privately maintained by the GList.
+ **/
+static void
+preferences_callback_entry_free_func (gpointer	data,
+				      gpointer	callback_data)
+{
+	g_assert (data != NULL);
+	
+	preferences_callback_entry_free (data);
+}
+
+/**
+ * preferences_entry_free
+ *
+ * Free a preference hash node's members along with the node itself.
+ * @preferences_hash_node: The node to free.
+ **/
+static void
+preferences_entry_free (PreferencesEntry *entry)
+{
+	g_assert (entry != NULL);
+
+	eel_gconf_notification_remove (entry->gconf_connection_id);
+	entry->gconf_connection_id = EEL_GCONF_UNDEFINED_CONNECTION;
+
+	g_list_free (entry->auto_storage_list);
+	eel_g_list_free_deep_custom (entry->callback_list,
+				     preferences_callback_entry_free_func,
+				     NULL);
+	
+	entry->auto_storage_list = NULL;
+	entry->callback_list = NULL;
+
+	g_free (entry->name);
+	g_free (entry->description);
+	g_free (entry->enumeration_id);
+
+	eel_gconf_value_free (entry->fallback);
+
+	g_free (entry);
+}
+
+/**
+ * preferences_entry_free_func
+ *
+ * A function that frees a pref hash node.  It is meant to be fed to 
+ * g_hash_table_foreach ()
+ * @key: The hash key privately maintained by the GHashTable.
+ * @value: The hash value privately maintained by the GHashTable.
+ * @callback_data: The callback_data privately maintained by the GHashTable.
+ **/
+static void
+preferences_entry_free_func (gpointer key,
+			     gpointer value,
+			     gpointer callback_data)
+{
+	g_assert (value != NULL);
+
+	preferences_entry_free (value);
+}
+
+static void
+preferences_global_table_free (void)
+{
+	if (global_table == NULL) {
+		return;
+	}
+	
+	g_hash_table_foreach (global_table, preferences_entry_free_func, NULL);
+	g_hash_table_destroy (global_table);
+	global_table = NULL;
+
+	g_free (storage_path);
+	storage_path = NULL;
+}
+
+static void
+preferences_uninitialize (void)
+{
+	initialized = FALSE;
+}
+
+static GHashTable *
+preferences_global_table_get_global (void)
+{
+	static gboolean at_exit_handler_added = FALSE;
+
+	if (global_table == NULL) {
+		global_table = g_hash_table_new (g_str_hash, g_str_equal);
+
+		if (!at_exit_handler_added) {
+			at_exit_handler_added = TRUE;
+			eel_debug_call_at_shutdown (preferences_global_table_free);
+			/* ensure that we catch calls to preferences functions after eel shutdown */
+			eel_debug_call_at_shutdown (preferences_uninitialize);
+		}
+	}
+	
+	return global_table;
+}
+
+static PreferencesEntry *
+preferences_global_table_lookup (const char *name)
+{
+	g_assert (name != NULL);
+	g_assert (preferences_global_table_get_global () != NULL);
+	
+	return g_hash_table_lookup (preferences_global_table_get_global (), name);
+}
+
+static PreferencesEntry *
+preferences_global_table_insert (const char *name)
+{
+	PreferencesEntry *entry;
+
+	g_assert (name != NULL);
+	g_assert (preferences_global_table_get_global () != NULL);
+	g_assert (preferences_global_table_lookup (name) == NULL);
+	
+	entry = g_new0 (PreferencesEntry, 1);
+	entry->name = g_strdup (name);
+
+	g_hash_table_insert (preferences_global_table_get_global (), entry->name, entry);
+
+	g_assert (entry == preferences_global_table_lookup (name));
+
+	return entry;
+}
+
+static PreferencesEntry *
+preferences_global_table_lookup_or_insert (const char *name)
+{
+	PreferencesEntry *entry;
+
+	g_assert (name != NULL);
+	
+	entry = preferences_global_table_lookup (name);
+
+	if (entry != NULL) {
+		return entry;
+	}
+
+	entry = preferences_global_table_insert (name);
+	g_assert (entry != NULL);
+
+	return entry;
+}
+
+void
+eel_preferences_add_callback (const char *name,
+			      EelPreferencesCallback callback,
+			      gpointer callback_data)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (callback != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	preferences_entry_add_callback (entry, callback, callback_data);
+}
+
+void
+eel_preferences_add_auto_string (const char *name,
+				 const char **storage)
+{
+	PreferencesEntry *entry;
+	char *value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	preferences_entry_add_auto_storage (entry, storage, PREFERENCE_STRING);
+
+	value = eel_preferences_get (entry->name);
+	update_auto_string (storage, value);
+	g_free (value);
+}
+
+void
+eel_preferences_add_auto_string_array (const char   *name,
+				       char       ***storage)
+{
+	PreferencesEntry *entry;
+	char **value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	preferences_entry_add_auto_storage (entry, storage, PREFERENCE_STRING_ARRAY);
+
+	value = eel_preferences_get_string_array (entry->name);
+	update_auto_string_array (storage, value);
+	g_strfreev (value);
+}
+
+void
+eel_preferences_add_auto_string_array_as_quarks (const char *name,
+						 GQuark **storage)
+{
+	PreferencesEntry *entry;
+	char **value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	preferences_entry_add_auto_storage (entry, storage, PREFERENCE_STRING_ARRAY_AS_QUARKS);
+
+	value = eel_preferences_get_string_array (entry->name);
+	update_auto_string_array_as_quarks (storage, value);
+	g_strfreev (value);
+}
+
+void
+eel_preferences_add_auto_integer (const char *name,
+				  int *storage)
+{
+	PreferencesEntry *entry;
+	int value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	preferences_entry_add_auto_storage (entry, storage, PREFERENCE_INTEGER);
+
+	value = eel_preferences_get_integer (entry->name);
+	update_auto_integer_or_boolean (storage, GINT_TO_POINTER (value));
+}
+
+
+void
+eel_preferences_add_auto_enum (const char *name,
+			       guint *storage)
+{
+	PreferencesEntry *entry;
+	guint value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+	g_assert (entry->enumeration_id != NULL);
+
+	preferences_entry_add_auto_storage (entry, storage, PREFERENCE_STRING);
+
+	value = eel_preferences_get_enum (entry->name);
+	update_auto_integer_or_boolean (storage, GINT_TO_POINTER (value));
+}
+
+void
+eel_preferences_add_auto_boolean (const char *name,
+				  gboolean *storage)
+{
+	PreferencesEntry *entry;
+	gboolean value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	preferences_entry_add_auto_storage (entry, storage, PREFERENCE_BOOLEAN);
+
+	value = eel_preferences_get_boolean (entry->name);
+	update_auto_integer_or_boolean (storage, GINT_TO_POINTER (value));
+}
+
+void
+eel_preferences_remove_auto_string (const char *name,
+				    const char **storage)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup (name);
+	if (entry == NULL) {
+		g_warning ("Trying to remove auto-string for %s without adding it first.", name);
+		return;
+	}
+
+	preferences_entry_remove_auto_storage (entry, storage);
+}
+
+void
+eel_preferences_remove_auto_string_array (const char *name,
+					  char ***storage)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup (name);
+	if (entry == NULL) {
+		g_warning ("Trying to remove auto-string for %s without adding it first.", name);
+		return;
+	}
+
+	preferences_entry_remove_auto_storage (entry, storage);
+}
+
+void
+eel_preferences_remove_auto_integer (const char *name,
+				     int *storage)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup (name);
+	if (entry == NULL) {
+		g_warning ("Trying to remove auto-integer for %s without adding it first.", name);
+		return;
+	}
+
+	preferences_entry_remove_auto_storage (entry, storage);
+}
+
+void
+eel_preferences_remove_auto_boolean (const char *name,
+				     gboolean *storage)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (storage != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup (name);
+	if (entry == NULL) {
+		g_warning ("Trying to remove auto-boolean for %s without adding it first.", name);
+		return;
+	}
+
+	preferences_entry_remove_auto_storage (entry, storage);
+}
+
+typedef struct
+{
+	char *name;
+	EelPreferencesCallback callback;
+	gpointer callback_data;
+} WhileAliveData;
+
+static void
+preferences_while_alive_disconnector (gpointer callback_data, GObject *where_object_was)
+{
+	WhileAliveData *data;
+
+	g_assert (callback_data != NULL);
+
+	data = callback_data;
+
+	/* we might have survived an eel shutdown, which
+	 * already cleared all the callbacks */
+	if (preferences_is_initialized ()) {
+		eel_preferences_remove_callback (data->name,
+						 data->callback,
+						 data->callback_data);
+	}
+
+	g_free (data->name);
+	g_free (data);
+}
+
+void
+eel_preferences_add_callback_while_alive (const char *name,
+					  EelPreferencesCallback callback,
+					  gpointer callback_data,
+					  GObject *alive_object)
+{
+	WhileAliveData *data;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (callback != NULL);
+	g_return_if_fail (G_IS_OBJECT (alive_object));
+	g_return_if_fail (preferences_is_initialized ());
+
+	data = g_new (WhileAliveData, 1);
+	data->name = g_strdup (name);
+	data->callback = callback;
+	data->callback_data = callback_data;
+
+	eel_preferences_add_callback (name, callback, callback_data);
+
+	g_object_weak_ref (alive_object,
+			   preferences_while_alive_disconnector,
+			   data);
+}
+
+void
+eel_preferences_remove_callback (const char *name,
+				 EelPreferencesCallback callback,
+				 gpointer callback_data)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (callback != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup (name);
+
+	if (entry == NULL) {
+		g_warning ("Trying to remove a callback for %s without adding it first.", name);
+		return;
+	}
+	
+	preferences_entry_remove_callback (entry, callback, callback_data);
+}
+
+void
+eel_preferences_set_description (const char *name,
+				 const char *description)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (description != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	g_free (entry->description);
+	entry->description = g_strdup (description);
+}
+
+char *
+eel_preferences_get_description (const char *name)
+{
+	PreferencesEntry *entry;
+
+	g_return_val_if_fail (name != NULL, NULL);
+	g_return_val_if_fail (preferences_is_initialized (), NULL);
+
+	entry = preferences_global_table_lookup_or_insert (name);
+
+	return g_strdup (entry->description ? entry->description : "");
+}
+
+void
+eel_preferences_set_enumeration_id (const char *name,
+				    const char *enumeration_id)
+{
+	PreferencesEntry *entry;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (enumeration_id != NULL);
+	g_return_if_fail (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	g_free (entry->enumeration_id);
+	entry->enumeration_id = g_strdup (enumeration_id);
+}
+
+char *
+eel_preferences_get_enumeration_id (const char *name)
+{
+	PreferencesEntry *entry;
+
+	g_return_val_if_fail (name != NULL, NULL);
+	g_return_val_if_fail (preferences_is_initialized (), NULL);
+
+	entry = preferences_global_table_lookup_or_insert (name);
+
+	return g_strdup (entry->enumeration_id);
+}
+
+static void
+preferences_set_emergency_fallback_stealing_value (const char *name,
+						   GConfValue *value)
+{
+	PreferencesEntry *entry;
+
+	g_assert (name != NULL);
+	g_assert (preferences_is_initialized ());
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	g_assert (entry != NULL);
+
+	if (entry->fallback)
+		gconf_value_free (entry->fallback);
+	entry->fallback = value; /* steal ownership of value */
+}
+
+void
+eel_preferences_set_emergency_fallback_string (const char *name,
+					       const char *value)
+{
+	GConfValue *gconf_value;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (value != NULL);
+	
+	gconf_value = gconf_value_new (GCONF_VALUE_STRING);
+
+	gconf_value_set_string (gconf_value, value);
+
+	preferences_set_emergency_fallback_stealing_value (name, gconf_value);
+}
+
+void
+eel_preferences_set_emergency_fallback_integer (const char *name,
+						int         value)
+{
+	GConfValue *gconf_value;
+
+	g_return_if_fail (name != NULL);
+	
+	gconf_value = gconf_value_new (GCONF_VALUE_INT);
+
+	gconf_value_set_int (gconf_value, value);
+
+	preferences_set_emergency_fallback_stealing_value (name, gconf_value);
+}
+
+void
+eel_preferences_set_emergency_fallback_boolean (const char *name,
+						gboolean    value)
+{
+	GConfValue *gconf_value;
+
+	g_return_if_fail (name != NULL);
+	
+	gconf_value = gconf_value_new (GCONF_VALUE_BOOL);
+
+	gconf_value_set_bool (gconf_value, value);
+
+	preferences_set_emergency_fallback_stealing_value (name, gconf_value);
+}
+
+
+void
+eel_preferences_set_emergency_fallback_string_array (const char  *name,
+						     char       **value)
+{
+	GConfValue *gconf_value;
+	GSList *list;
+	int i;
+
+	g_return_if_fail (name != NULL);
+	g_return_if_fail (value != NULL);
+
+	gconf_value = gconf_value_new (GCONF_VALUE_LIST);
+	gconf_value_set_list_type (gconf_value, GCONF_VALUE_STRING);
+
+	list = NULL;
+	for (i = 0; value[i] != NULL; ++i)
+	{
+		GConfValue *v;
+
+		v = gconf_value_new (GCONF_VALUE_STRING);
+		gconf_value_set_string (v, value[i]);
+
+		list = g_slist_prepend (list, v);
+	}
+
+	gconf_value_set_list_nocopy (gconf_value, g_slist_reverse (list));
+
+	preferences_set_emergency_fallback_stealing_value (name, gconf_value);
+}
+
+GConfValue*
+eel_preferences_get_emergency_fallback (const char *name)
+{
+	PreferencesEntry *entry;
+
+	g_return_val_if_fail (name != NULL, NULL);
+	g_return_val_if_fail (preferences_is_initialized (), NULL);
+
+	entry = preferences_global_table_lookup_or_insert (name);
+	
+	return entry->fallback ? gconf_value_copy (entry->fallback) : NULL;
+}
+
+gboolean
+eel_preferences_monitor_directory (const char *directory)
+{
+	g_return_val_if_fail (preferences_is_initialized (), FALSE);
+
+	return eel_gconf_monitor_add (directory);
+}
+
+gboolean
+eel_preferences_is_visible (const char *name)
+{
+	g_return_val_if_fail (name != NULL, FALSE);
+	g_return_val_if_fail (preferences_is_initialized (), FALSE);
+
+	return !preferences_global_table_lookup_or_insert (name)->invisible;
+}
+
+void
+eel_preferences_init (const char *path)
+{
+	g_return_if_fail (eel_strlen (path) > 0);
+	
+	if (initialized) {
+		return;
+	}
+
+	initialized = TRUE;
+
+	preferences_set_storage_path (path);
+}
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+#define CHECK_BOOLEAN(name__, value__)								\
+G_STMT_START {											\
+	eel_preferences_set_boolean ((name__), (value__));					\
+	EEL_CHECK_BOOLEAN_RESULT (eel_preferences_get_boolean (name__), (value__));	\
+} G_STMT_END
+
+#define CHECK_INTEGER(name__, value__)								\
+G_STMT_START {											\
+	eel_preferences_set_integer ((name__), (value__));					\
+	EEL_CHECK_INTEGER_RESULT (eel_preferences_get_integer (name__), (value__));	\
+} G_STMT_END
+
+#define CHECK_STRING(name__, value__)							\
+G_STMT_START {										\
+	eel_preferences_set ((name__), (value__));					\
+	EEL_CHECK_STRING_RESULT (eel_preferences_get (name__), (value__));		\
+} G_STMT_END
+
+void
+eel_self_check_preferences (void)
+{
+	/* Disabled until I can debug why these seemingly harmless tests 
+	 * dont work. -re
+	 */
+#if 0
+	int original_user_level;
+
+	original_user_level = eel_preferences_get_user_level ();
+
+ 	EEL_CHECK_INTEGER_RESULT (eel_preferences_get_integer ("self-check/neverset/i"), 0);
+ 	EEL_CHECK_STRING_RESULT (eel_preferences_get ("self-check/neverset/s"), "");
+ 	EEL_CHECK_BOOLEAN_RESULT (eel_preferences_get_boolean ("self-check/neverset/b"), FALSE);
+
+	eel_preferences_set_user_level (0);
+
+	/* FIXME: Fails if you add the commented-out lines. */
+	/* CHECK_INTEGER ("self-check/i", 0); */
+	CHECK_INTEGER ("self-check/i", 666);
+	/* CHECK_BOOLEAN ("self-check/b", FALSE); */
+	CHECK_BOOLEAN ("self-check/b", TRUE);
+	/* CHECK_STRING ("self-check/s", ""); */
+	CHECK_STRING ("self-check/s", "foo");
+
+	/* Restore the original user level */
+	eel_preferences_set_user_level (original_user_level);
+#endif
+}
+
+#endif /* !EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-preferences.h b/eel/eel-preferences.h
new file mode 100644
index 000000000..fa8779e23
--- /dev/null
+++ b/eel/eel-preferences.h
@@ -0,0 +1,157 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-preferences.c - Preference peek/poke/notify interface.
+
+   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_PREFERENCES_H
+#define EEL_PREFERENCES_H
+
+#include <glib.h>
+#include <eel/eel-gconf-extensions.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+/*
+ * A callback which you can register to to be notified when a particular
+ * preference changes.
+ */
+typedef void (*EelPreferencesCallback) (gpointer callback_data);
+
+/* Preferences getters and setters */
+gboolean       eel_preferences_get_boolean                     (const char              *name);
+void           eel_preferences_set_boolean                     (const char              *name,
+								gboolean                 boolean_value);
+int            eel_preferences_get_integer                     (const char              *name);
+void           eel_preferences_set_integer                     (const char              *name,
+								int                      int_value);
+guint          eel_preferences_get_uint                        (const char              *name);
+void           eel_preferences_set_uint                        (const char              *name,
+								guint                    uint_value);
+guint          eel_preferences_get_enum                        (const char              *name);
+void           eel_preferences_set_enum                        (const char              *name,
+								guint                   int_value);
+char *         eel_preferences_get                             (const char              *name);
+void           eel_preferences_set                             (const char              *name,
+								const char              *string_value);
+char **        eel_preferences_get_string_array                 (const char              *name);
+void           eel_preferences_set_string_array                 (const char              *name,
+								 char                   **strv_value);
+
+void           eel_preferences_unset                            (const char              *name);
+
+/* Writability of a key */
+gboolean       eel_preferences_key_is_writable                 (const char              *name);
+
+/* Callbacks */
+void           eel_preferences_add_callback                    (const char              *name,
+								EelPreferencesCallback   callback,
+								gpointer                 callback_data);
+void           eel_preferences_add_callback_while_alive        (const char              *name,
+								EelPreferencesCallback   callback,
+								gpointer                 callback_data,
+								GObject                 *alive_object);
+void           eel_preferences_remove_callback                 (const char              *name,
+								EelPreferencesCallback   callback,
+								gpointer                 callback_data);
+
+/* Variables that are automatically updated (lightweight "callbacks") */
+void           eel_preferences_add_auto_string                 (const char              *name,
+								const char             **storage);
+void           eel_preferences_add_auto_string_array           (const char              *name,
+								char                  ***storage);
+void           eel_preferences_add_auto_string_array_as_quarks (const char              *name,
+								GQuark                 **storage);
+void           eel_preferences_add_auto_integer                (const char              *name,
+								int                     *storage);
+void           eel_preferences_add_auto_enum                   (const char              *name,
+								guint                   *storage);
+void           eel_preferences_add_auto_boolean                (const char              *name,
+								gboolean                *storage);
+void           eel_preferences_remove_auto_string              (const char              *name,
+								const char             **storage);
+void           eel_preferences_remove_auto_string_array        (const char              *name,
+								char                  ***storage);
+void           eel_preferences_remove_auto_integer             (const char              *name,
+								int                     *storage);
+void           eel_preferences_remove_auto_boolean             (const char              *name,
+								int                     *storage);
+
+/* Preferences attributes */
+
+gboolean       eel_preferences_get_is_invisible                (const char              *name);
+void           eel_preferences_set_is_invisible                (const char              *name,
+								gboolean                 invisible);
+char *         eel_preferences_get_description                 (const char              *name);
+void           eel_preferences_set_description                 (const char              *name,
+								const char              *description);
+char *         eel_preferences_get_enumeration_id              (const char              *name);
+void           eel_preferences_set_enumeration_id              (const char              *name,
+								const char              *enumeration_id);
+
+void        eel_preferences_set_emergency_fallback_string      (const char    *name,
+								const char    *value);
+void        eel_preferences_set_emergency_fallback_integer     (const char    *name,
+								int            value);
+void        eel_preferences_set_emergency_fallback_boolean     (const char    *name,
+								gboolean       value);
+void        eel_preferences_set_emergency_fallback_string_array(const char    *name,
+								char         **value);
+GConfValue *eel_preferences_get_emergency_fallback             (const char    *name);
+
+
+gboolean       eel_preferences_monitor_directory               (const char              *directory);
+gboolean       eel_preferences_is_visible                      (const char              *name);
+void           eel_preferences_init                      (const char              *storage_path);
+
+void eel_preferences_builder_connect_bool		         (GtkBuilder *builder,
+								  const char  *component,
+								  const char  *key);
+void eel_preferences_builder_connect_bool_slave			 (GtkBuilder *builder,
+								  const char  *component,
+								  const char  *key);
+void eel_preferences_builder_connect_string_enum_combo_box	 (GtkBuilder *builder,
+								  const char  *component,
+								  const char  *key,
+								  const char **values);
+void eel_preferences_builder_connect_string_enum_combo_box_slave (GtkBuilder *builder,
+								  const char  *component,
+								  const char  *key);
+
+void eel_preferences_builder_connect_uint_enum			 (GtkBuilder *builder,
+								  const char  *component,
+								  const char  *key,
+								  const guint *values,
+								  int          num_values);
+void eel_preferences_builder_connect_string_enum_radio_button	 (GtkBuilder *builder,
+								  const char **components,
+								  const char  *key,
+								  const char **values);
+void eel_preferences_builder_connect_list_enum			 (GtkBuilder *builder,
+						   		  const char **components,
+								  const char  *key,
+								  const char **values);
+
+
+G_END_DECLS
+
+#endif /* EEL_PREFERENCES_H */
diff --git a/eel/eel-self-checks.c b/eel/eel-self-checks.c
new file mode 100644
index 000000000..f08358198
--- /dev/null
+++ b/eel/eel-self-checks.c
@@ -0,0 +1,221 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+   
+   eel-self-checks.c: The self-check framework.
+ 
+   Copyright (C) 1999 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+
+#if ! defined (EEL_OMIT_SELF_CHECK)
+
+#include "eel-self-checks.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static gboolean failed;
+
+static const char *current_expression;
+static const char *current_file_name;
+static int current_line_number;
+
+void
+eel_exit_if_self_checks_failed (void)
+{
+	if (!failed) {
+		return;
+	}
+
+	printf ("\n");
+
+	exit (EXIT_FAILURE);
+}
+
+void
+eel_report_check_failure (char *result, char *expected)
+{
+	if (!failed) {
+		fprintf (stderr, "\n");
+	}
+
+	fprintf (stderr, "FAIL: check failed in %s, line %d\n", current_file_name, current_line_number);
+	fprintf (stderr, "      evaluated: %s\n", current_expression);
+	fprintf (stderr, "       expected: %s\n", expected == NULL ? "NULL" : expected);
+	fprintf (stderr, "            got: %s\n", result == NULL ? "NULL" : result);
+	
+	failed = TRUE;
+
+	g_free (result);
+	g_free (expected);
+}
+
+static char *
+eel_strdup_boolean (gboolean boolean)
+{
+	if (boolean == FALSE) {
+		return g_strdup ("FALSE");
+	}
+	if (boolean == TRUE) {
+		return g_strdup ("TRUE");
+	}
+	return g_strdup_printf ("gboolean(%d)", boolean);
+}
+
+void
+eel_before_check (const char *expression,
+		  const char *file_name,
+		  int line_number)
+{
+	current_expression = expression;
+	current_file_name = file_name;
+	current_line_number = line_number;
+}
+
+void
+eel_after_check (void)
+{
+	/* It would be good to check here if there was a memory leak. */
+}
+
+void
+eel_check_boolean_result (gboolean result, gboolean expected)
+{
+	if (result != expected) {
+		eel_report_check_failure (eel_strdup_boolean (result),
+					  eel_strdup_boolean (expected));
+	}
+	eel_after_check ();
+}
+
+void
+eel_check_rectangle_result (EelIRect result,
+			    int expected_x0,
+			    int expected_y0,
+			    int expected_x1,
+			    int expected_y1)
+{
+	if (result.x0 != expected_x0
+	    || result.y0 != expected_y0
+	    || result.x1 != expected_x1
+	    || result.y1 != expected_y1) {
+		eel_report_check_failure (g_strdup_printf ("x0=%d, y0=%d, x1=%d, y1=%d",
+							   result.x0,
+							   result.y0,
+							   result.x1,
+							   result.y1),
+					  g_strdup_printf ("x0=%d, y0=%d, x1=%d, y1=%d",
+							   expected_x0,
+							   expected_y0,
+							   expected_x1,
+							   expected_y1));
+	}
+	eel_after_check ();
+}
+
+void
+eel_check_dimensions_result (EelDimensions result,
+			     int expected_width,
+			     int expected_height)
+{
+	if (result.width != expected_width
+	    || result.height != expected_height) {
+		eel_report_check_failure (g_strdup_printf ("width=%d, height=%d",
+							   result.width,
+							   result.height),
+					  g_strdup_printf ("width=%d, height=%d",
+							   expected_width,
+							   expected_height));
+	}
+	eel_after_check ();
+}
+
+void
+eel_check_point_result (EelIPoint result,
+			int expected_x,
+			int expected_y)
+{
+	if (result.x != expected_x
+	    || result.y != expected_y) {
+		eel_report_check_failure (g_strdup_printf ("x=%d, y=%d",
+							   result.x,
+							   result.y),
+					  g_strdup_printf ("x=%d, y=%d",
+							   expected_x,
+							   expected_y));
+	}
+	eel_after_check ();
+}
+
+void
+eel_check_integer_result (long result, long expected)
+{
+	if (result != expected) {
+		eel_report_check_failure (g_strdup_printf ("%ld", result),
+					  g_strdup_printf ("%ld", expected));
+	}
+	eel_after_check ();
+}
+
+void
+eel_check_double_result (double result, double expected)
+{
+	if (result != expected) {
+		eel_report_check_failure (g_strdup_printf ("%f", result),
+					  g_strdup_printf ("%f", expected));
+	}
+	eel_after_check ();
+}
+
+void
+eel_check_string_result (char *result, const char *expected)
+{
+	gboolean match;
+	
+	/* Stricter than eel_strcmp.
+	 * NULL does not match "" in this test.
+	 */
+	if (expected == NULL) {
+		match = result == NULL;
+	} else {
+		match = result != NULL && strcmp (result, expected) == 0;
+	}
+
+	if (!match) {
+		eel_report_check_failure (result, g_strdup (expected));
+	} else {
+		g_free (result);
+	}
+	eel_after_check ();
+}
+
+void
+eel_before_check_function (const char *name)
+{
+	fprintf (stderr, "running %s\n", name);
+}
+
+void
+eel_after_check_function (void)
+{
+}
+
+#endif /* ! EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-self-checks.h b/eel/eel-self-checks.h
new file mode 100644
index 000000000..7910febaf
--- /dev/null
+++ b/eel/eel-self-checks.h
@@ -0,0 +1,100 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+   
+   eel-self-checks.h: The self-check framework.
+ 
+   Copyright (C) 1999 Eazel, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+  
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Darin Adler <darin@eazel.com>
+*/
+
+#ifndef EEL_SELF_CHECKS_H
+#define EEL_SELF_CHECKS_H
+
+#include <glib.h>
+#include <eel/eel-art-extensions.h>
+
+#define EEL_CHECK_RESULT(type, expression, expected_value) \
+G_STMT_START { \
+	eel_before_check (#expression, __FILE__, __LINE__); \
+	eel_check_##type##_result (expression, expected_value); \
+} G_STMT_END
+
+#define EEL_CHECK_BOOLEAN_RESULT(expression, expected_value) \
+	EEL_CHECK_RESULT(boolean, expression, expected_value)
+#define EEL_CHECK_INTEGER_RESULT(expression, expected_value) \
+	EEL_CHECK_RESULT(integer, expression, expected_value)
+#define EEL_CHECK_DOUBLE_RESULT(expression, expected_value) \
+	EEL_CHECK_RESULT(double, expression, expected_value)
+#define EEL_CHECK_STRING_RESULT(expression, expected_value) \
+	EEL_CHECK_RESULT(string, expression, expected_value)
+#define EEL_CHECK_RECTANGLE_RESULT(expression, expected_x0, expected_y0, expected_x1, expected_y1) \
+G_STMT_START { \
+	eel_before_check (#expression, __FILE__, __LINE__); \
+	eel_check_rectangle_result (expression, expected_x0, expected_y0, expected_x1, expected_y1); \
+} G_STMT_END
+#define EEL_CHECK_DIMENSIONS_RESULT(expression, expected_width, expected_height) \
+G_STMT_START { \
+	eel_before_check (#expression, __FILE__, __LINE__); \
+	eel_check_dimensions_result (expression, expected_width, expected_height); \
+} G_STMT_END
+#define EEL_CHECK_POINT_RESULT(expression, expected_x, expected_y) \
+G_STMT_START { \
+	eel_before_check (#expression, __FILE__, __LINE__); \
+	eel_check_point_result (expression, expected_x, expected_y); \
+} G_STMT_END
+
+void eel_exit_if_self_checks_failed (void);
+void eel_before_check_function      (const char    *name);
+void eel_after_check_function       (void);
+void eel_before_check               (const char    *expression,
+				     const char    *file_name,
+				     int            line_number);
+void eel_after_check                (void);
+
+/* Both 'result' and 'expected' get freed with g_free */
+void eel_report_check_failure       (char          *result,
+				     char          *expected);
+void eel_check_boolean_result       (gboolean       result,
+				     gboolean       expected_value);
+void eel_check_integer_result       (long           result,
+				     long           expected_value);
+void eel_check_double_result        (double         result,
+				     double         expected_value);
+void eel_check_rectangle_result     (EelIRect       result,
+				     int            expected_x0,
+				     int            expected_y0,
+				     int            expected_x1,
+				     int            expected_y1);
+void eel_check_dimensions_result    (EelDimensions  result,
+				     int            expected_width,
+				     int            expected_height);
+void eel_check_point_result         (EelIPoint      result,
+				     int            expected_x,
+				     int            expected_y);
+void eel_check_string_result        (char          *result,
+				     const char    *expected_value);
+
+#define EEL_SELF_CHECK_FUNCTION_PROTOTYPE(function) \
+	void function (void);
+
+#define EEL_CALL_SELF_CHECK_FUNCTION(function) \
+	eel_before_check_function (#function); \
+	function (); \
+	eel_after_check_function ();
+
+#endif /* EEL_SELF_CHECKS_H */
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
new file mode 100644
index 000000000..e55f90f59
--- /dev/null
+++ b/eel/eel-stock-dialogs.c
@@ -0,0 +1,571 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-stock-dialogs.c: Various standard dialogs for Eel.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-stock-dialogs.h"
+
+#include "eel-alert-dialog.h"
+#include "eel-glib-extensions.h"
+#include "eel-gnome-extensions.h"
+#include "eel-string.h"
+#include "eel-i18n.h"
+#include <gtk/gtk.h>
+
+#define TIMED_WAIT_STANDARD_DURATION 2000
+#define TIMED_WAIT_MIN_TIME_UP 3000
+
+#define TIMED_WAIT_MINIMUM_DIALOG_WIDTH 300
+
+#define RESPONSE_DETAILS 1000
+
+typedef struct {
+	EelCancelCallback cancel_callback;
+	gpointer callback_data;
+
+	/* Parameters for creation of the window. */
+	char *wait_message;
+	GtkWindow *parent_window;
+
+	/* Timer to determine when we need to create the window. */
+	guint timeout_handler_id;
+	
+	/* Window, once it's created. */
+	GtkDialog *dialog;
+	
+	/* system time (microseconds) when dialog was created */
+	gint64 dialog_creation_time;
+
+} TimedWait;
+
+static GHashTable *timed_wait_hash_table;
+
+static void timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data);
+
+static guint
+timed_wait_hash (gconstpointer value)
+{
+	const TimedWait *wait;
+
+	wait = value;
+
+	return GPOINTER_TO_UINT (wait->cancel_callback)
+		^ GPOINTER_TO_UINT (wait->callback_data);
+}
+
+static gboolean
+timed_wait_hash_equal (gconstpointer value1, gconstpointer value2)
+{
+	const TimedWait *wait1, *wait2;
+
+	wait1 = value1;
+	wait2 = value2;
+
+	return wait1->cancel_callback == wait2->cancel_callback
+		&& wait1->callback_data == wait2->callback_data;
+}
+
+static void
+timed_wait_delayed_close_destroy_dialog_callback (GtkObject *object, gpointer callback_data)
+{
+	g_source_remove (GPOINTER_TO_UINT (callback_data));
+}
+
+static gboolean
+timed_wait_delayed_close_timeout_callback (gpointer callback_data)
+{
+	guint handler_id;
+
+	handler_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (callback_data),
+							  "eel-stock-dialogs/delayed_close_handler_timeout_id"));
+	
+	g_signal_handlers_disconnect_by_func (G_OBJECT (callback_data),
+					      G_CALLBACK (timed_wait_delayed_close_destroy_dialog_callback),
+					      GUINT_TO_POINTER (handler_id));
+	
+	gtk_object_destroy (GTK_OBJECT (callback_data));
+
+	return FALSE;
+}
+
+static void
+timed_wait_free (TimedWait *wait)
+{
+	guint delayed_close_handler_id;
+	guint64 time_up;
+
+	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) != NULL);
+
+	g_hash_table_remove (timed_wait_hash_table, wait);
+
+	g_free (wait->wait_message);
+	if (wait->parent_window != NULL) {
+		gtk_widget_unref (GTK_WIDGET (wait->parent_window));
+	}
+	if (wait->timeout_handler_id != 0) {
+		g_source_remove (wait->timeout_handler_id);
+	}
+	if (wait->dialog != NULL) {
+		/* Make sure to detach from the "destroy" signal, or we'll
+		 * double-free.
+		 */
+		g_signal_handlers_disconnect_by_func (G_OBJECT (wait->dialog),
+						      G_CALLBACK (timed_wait_dialog_destroy_callback),
+						      wait);
+
+		/* compute time up in milliseconds */
+		time_up = (eel_get_system_time () - wait->dialog_creation_time) / 1000;
+		
+		if (time_up < TIMED_WAIT_MIN_TIME_UP) {
+			delayed_close_handler_id = g_timeout_add (TIMED_WAIT_MIN_TIME_UP - time_up,
+			                                            timed_wait_delayed_close_timeout_callback,
+			                                            wait->dialog);
+			g_object_set_data (G_OBJECT (wait->dialog),
+					     "eel-stock-dialogs/delayed_close_handler_timeout_id",
+					     GUINT_TO_POINTER (delayed_close_handler_id));
+			g_signal_connect (wait->dialog, "destroy",
+					    G_CALLBACK (timed_wait_delayed_close_destroy_dialog_callback),
+					    GUINT_TO_POINTER (delayed_close_handler_id));
+		} else {
+			gtk_object_destroy (GTK_OBJECT (wait->dialog));
+		}
+	}
+
+	/* And the wait object itself. */
+	g_free (wait);
+}
+
+static void
+timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data)
+{
+	TimedWait *wait;
+
+	wait = callback_data;
+
+	g_assert (GTK_DIALOG (object) == wait->dialog);
+
+	wait->dialog = NULL;
+	
+	/* When there's no cancel_callback, the originator will/must
+	 * call eel_timed_wait_stop which will call timed_wait_free.
+	 */
+
+	if (wait->cancel_callback != NULL) {
+		(* wait->cancel_callback) (wait->callback_data);
+		timed_wait_free (wait);
+	}
+}
+
+static void
+trash_dialog_response_callback (GtkDialog *dialog,
+				int response_id,
+				TimedWait *wait)
+{
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static gboolean
+timed_wait_callback (gpointer callback_data)
+{
+	TimedWait *wait;
+	GtkDialog *dialog;
+	const char *button;
+
+	wait = callback_data;
+
+	/* Put up the timed wait window. */
+	button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK;
+	dialog = GTK_DIALOG (eel_alert_dialog_new (NULL,
+		                                   0,
+		                                   GTK_MESSAGE_INFO,
+		                                   GTK_BUTTONS_NONE,
+		                                   wait->wait_message,
+		                                   _("You can stop this operation by clicking cancel.")));
+							
+	gtk_dialog_add_button (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+	/* The contents are often very small, causing tiny little
+	 * dialogs with their titles clipped if you just let gtk
+	 * sizing do its thing. This enforces a minimum width to
+	 * make it more likely that the title won't be clipped.
+	 */
+	gtk_window_set_default_size (GTK_WINDOW (dialog),
+				     TIMED_WAIT_MINIMUM_DIALOG_WIDTH,
+				     -1);
+	wait->dialog_creation_time = eel_get_system_time ();
+	gtk_widget_show (GTK_WIDGET (dialog));
+
+	/* FIXME bugzilla.eazel.com 2441: 
+	 * Could parent here, but it's complicated because we
+	 * don't want this window to go away just because the parent
+	 * would go away first.
+	 */
+
+	/* Make the dialog cancel the timed wait when it goes away.
+	 * Connect to "destroy" instead of "response" since we want
+	 * to be called no matter how the dialog goes away.
+	 */
+	g_signal_connect (dialog, "destroy",
+			  G_CALLBACK (timed_wait_dialog_destroy_callback),
+			  wait);
+	g_signal_connect (dialog, "response",
+			  G_CALLBACK (trash_dialog_response_callback),
+			  wait);
+
+	wait->timeout_handler_id = 0;
+	wait->dialog = dialog;
+	
+	return FALSE;
+}
+
+void
+eel_timed_wait_start_with_duration (int duration,
+					 EelCancelCallback cancel_callback,
+					 gpointer callback_data,
+					 const char *wait_message,
+					 GtkWindow *parent_window)
+{
+	TimedWait *wait;
+	
+	g_return_if_fail (callback_data != NULL);
+	g_return_if_fail (wait_message != NULL);
+	g_return_if_fail (parent_window == NULL || GTK_IS_WINDOW (parent_window));
+
+	/* Create the timed wait record. */
+	wait = g_new0 (TimedWait, 1);
+	wait->wait_message = g_strdup (wait_message);
+	wait->cancel_callback = cancel_callback;
+	wait->callback_data = callback_data;
+	wait->parent_window = parent_window;
+	
+	if (parent_window != NULL) {
+		gtk_widget_ref (GTK_WIDGET (parent_window));
+	}
+
+	/* Start the timer. */
+	wait->timeout_handler_id = g_timeout_add (duration, timed_wait_callback, wait);
+
+	/* Put in the hash table so we can find it later. */
+	if (timed_wait_hash_table == NULL) {
+		timed_wait_hash_table = eel_g_hash_table_new_free_at_exit
+			(timed_wait_hash, timed_wait_hash_equal, __FILE__ ": timed wait");
+	}
+	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) == NULL);
+	g_hash_table_insert (timed_wait_hash_table, wait, wait);
+	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) == wait);
+}
+
+void
+eel_timed_wait_start (EelCancelCallback cancel_callback,
+			   gpointer callback_data,
+			   const char *wait_message,
+			   GtkWindow *parent_window)
+{
+	eel_timed_wait_start_with_duration
+		(TIMED_WAIT_STANDARD_DURATION,
+		 cancel_callback, callback_data,
+		 wait_message, parent_window);
+}
+
+void
+eel_timed_wait_stop (EelCancelCallback cancel_callback,
+			  gpointer callback_data)
+{
+	TimedWait key;
+	TimedWait *wait;
+
+	g_return_if_fail (callback_data != NULL);
+	
+	key.cancel_callback = cancel_callback;
+	key.callback_data = callback_data;
+	wait = g_hash_table_lookup (timed_wait_hash_table, &key);
+
+	g_return_if_fail (wait != NULL);
+
+	timed_wait_free (wait);
+}
+
+int
+eel_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
+		       GtkMessageType message_type, const char *primary_text,
+		       const char *secondary_text, ...)
+{
+	va_list button_title_args;
+	const char *button_title;
+        GtkWidget *dialog;
+        GtkWidget *top_widget, *chosen_parent;
+	int result;
+	int response_id;
+
+	/* Parent it if asked to. */
+	chosen_parent = NULL;
+        if (parent != NULL) {
+		top_widget = gtk_widget_get_toplevel (parent);
+		if (GTK_IS_WINDOW (top_widget)) {
+			chosen_parent = top_widget;
+		}
+	}
+	
+	/* Create the dialog. */
+	dialog = eel_alert_dialog_new (GTK_WINDOW (chosen_parent), 
+	                               0,
+	                               message_type,
+	                               GTK_BUTTONS_NONE,
+	                               primary_text,
+	                               secondary_text);
+	
+	va_start (button_title_args, secondary_text);
+	response_id = 0;
+	while (1) {
+		button_title = va_arg (button_title_args, const char *);
+		if (button_title == NULL) {
+			break;
+		}
+		gtk_dialog_add_button (GTK_DIALOG (dialog), button_title, response_id);
+		gtk_dialog_set_default_response (GTK_DIALOG (dialog), response_id);
+		response_id++;
+	}
+	va_end (button_title_args);
+
+	/* Run it. */
+        gtk_widget_show (dialog);
+        result = gtk_dialog_run (GTK_DIALOG (dialog));
+	while ((result == GTK_RESPONSE_NONE || result == GTK_RESPONSE_DELETE_EVENT) && ignore_close_box) {
+		gtk_widget_show (GTK_WIDGET (dialog));
+		result = gtk_dialog_run (GTK_DIALOG (dialog));
+	}
+	gtk_object_destroy (GTK_OBJECT (dialog));
+
+	return result;
+}
+
+static GtkDialog *
+create_message_dialog (const char *primary_text,
+		       const char *secondary_text,
+		       GtkMessageType type,
+		       GtkButtonsType buttons_type,
+		       GtkWindow *parent)
+{  
+	GtkWidget *dialog;
+
+	dialog = eel_alert_dialog_new (parent,
+	                               0,
+	                               type,
+	                               buttons_type,
+	                               primary_text,
+	                               secondary_text);
+	return GTK_DIALOG (dialog);
+}
+
+static GtkDialog *
+show_message_dialog (const char *primary_text,
+		     const char *secondary_text,
+		     GtkMessageType type,
+		     GtkButtonsType buttons_type,
+		     const char *details_text,
+		     GtkWindow *parent)
+{
+	GtkDialog *dialog;
+
+	dialog = create_message_dialog (primary_text, secondary_text, type, 
+					buttons_type, parent);
+	if (details_text != NULL) {
+		eel_alert_dialog_set_details_label (EEL_ALERT_DIALOG (dialog), details_text);
+	}
+	gtk_widget_show (GTK_WIDGET (dialog));
+
+	g_signal_connect (dialog, "response",
+			  G_CALLBACK (gtk_object_destroy), NULL);
+
+	return dialog;
+}
+
+static GtkDialog *
+show_ok_dialog (const char *primary_text,
+		const char *secondary_text,
+		GtkMessageType type,
+		GtkWindow *parent)
+{  
+	GtkDialog *dialog;
+
+	dialog = show_message_dialog (primary_text, secondary_text, type,
+				      GTK_BUTTONS_OK, NULL, parent);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+	
+	return dialog;
+}
+
+GtkDialog *
+eel_create_info_dialog (const char *primary_text,
+			const char *secondary_text,
+			GtkWindow *parent)
+{
+	return create_message_dialog (primary_text, secondary_text,
+				      GTK_MESSAGE_INFO,
+				      GTK_BUTTONS_OK,
+				      parent);
+}
+
+GtkDialog *
+eel_show_info_dialog (const char *primary_text,
+		      const char *secondary_text,
+		      GtkWindow *parent)
+{
+	return show_ok_dialog (primary_text, 
+			    secondary_text,
+			    GTK_MESSAGE_INFO, parent);
+}
+
+GtkDialog *
+eel_show_info_dialog_with_details (const char *primary_text,
+				   const char *secondary_text,
+				   const char *detailed_info,
+				   GtkWindow *parent)
+{
+	GtkDialog *dialog;
+
+	if (detailed_info == NULL
+	    || strcmp (primary_text, detailed_info) == 0) {
+		return eel_show_info_dialog (primary_text, secondary_text, parent);
+	}
+
+	dialog = show_message_dialog (primary_text,
+				      secondary_text,
+				      GTK_MESSAGE_INFO, 
+				      GTK_BUTTONS_OK,
+				      detailed_info,
+				      parent);
+
+	return dialog;
+
+}
+
+
+GtkDialog *
+eel_show_warning_dialog (const char *primary_text,
+			 const char *secondary_text,
+			 GtkWindow *parent)
+{
+	return show_ok_dialog (primary_text, 
+			       secondary_text,
+			       GTK_MESSAGE_WARNING, parent);
+}
+
+
+GtkDialog *
+eel_show_error_dialog (const char *primary_text,
+		       const char *secondary_text,
+		       GtkWindow *parent)
+{
+	return show_ok_dialog (primary_text,
+			       secondary_text,
+			       GTK_MESSAGE_ERROR, parent);
+}
+
+GtkDialog *
+eel_show_error_dialog_with_details (const char *primary_text,
+				    const char *secondary_text,
+				    const char *detailed_error_message,
+				    GtkWindow *parent)
+{
+	GtkDialog *dialog;
+
+	g_return_val_if_fail (primary_text != NULL, NULL);
+	g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
+
+	if (detailed_error_message == NULL
+	    || strcmp (primary_text, detailed_error_message) == 0) {
+		return eel_show_error_dialog (primary_text, secondary_text, parent);
+	}
+	
+	dialog = show_message_dialog (primary_text, 
+				      secondary_text,
+				      GTK_MESSAGE_ERROR,
+				      GTK_BUTTONS_OK, detailed_error_message,
+				      parent);
+	return dialog;
+}
+
+/**
+ * eel_show_yes_no_dialog:
+ * 
+ * Create and show a dialog asking a question with two choices.
+ * The caller needs to set up any necessary callbacks 
+ * for the buttons. Use eel_create_question_dialog instead
+ * if any visual changes need to be made, to avoid flashiness.
+ * @question: The text of the question.
+ * @yes_label: The label of the "yes" button.
+ * @no_label: The label of the "no" button.
+ * @parent: The parent window for this dialog.
+ */
+GtkDialog *
+eel_show_yes_no_dialog (const char *primary_text, 
+			const char *secondary_text,
+			const char *yes_label,
+			const char *no_label,
+			GtkWindow *parent)
+{
+	GtkDialog *dialog = NULL;
+	dialog = eel_create_question_dialog (primary_text,
+					     secondary_text,
+					     no_label, GTK_RESPONSE_CANCEL,
+					     yes_label, GTK_RESPONSE_YES,
+					     GTK_WINDOW (parent));
+	gtk_widget_show (GTK_WIDGET (dialog));
+	return dialog;
+}
+
+/**
+ * eel_create_question_dialog:
+ * 
+ * Create a dialog asking a question with at least two choices.
+ * The caller needs to set up any necessary callbacks 
+ * for the buttons. The dialog is not yet shown, so that the
+ * caller can add additional buttons or make other visual changes
+ * without causing flashiness.
+ * @question: The text of the question.
+ * @answer_0: The label of the leftmost button (index 0)
+ * @answer_1: The label of the 2nd-to-leftmost button (index 1)
+ * @parent: The parent window for this dialog.
+ */
+GtkDialog *
+eel_create_question_dialog (const char *primary_text,
+			    const char *secondary_text,
+			    const char *answer_1,
+			    int response_1,
+			    const char *answer_2,
+			    int response_2,
+			    GtkWindow *parent)
+{
+	GtkDialog *dialog;
+	
+	dialog = create_message_dialog (primary_text,
+					secondary_text,
+					GTK_MESSAGE_QUESTION,
+					GTK_BUTTONS_NONE,
+					parent);
+	gtk_dialog_add_buttons (dialog, answer_1, response_1, answer_2, response_2, NULL);
+	gtk_dialog_set_default_response (dialog, response_2);
+	return dialog;
+}
diff --git a/eel/eel-stock-dialogs.h b/eel/eel-stock-dialogs.h
new file mode 100644
index 000000000..0fb16f464
--- /dev/null
+++ b/eel/eel-stock-dialogs.h
@@ -0,0 +1,91 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-stock-dialogs.h: Various standard dialogs for Eel.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#ifndef EEL_STOCK_DIALOGS_H
+#define EEL_STOCK_DIALOGS_H
+
+#include <gtk/gtk.h>
+
+typedef void (* EelCancelCallback) (gpointer callback_data);
+
+/* Dialog for cancelling something that normally is fast enough not to need a dialog. */
+void       eel_timed_wait_start               (EelCancelCallback  cancel_callback,
+					       gpointer           callback_data,
+					       const char        *wait_message,
+					       GtkWindow         *parent_window);
+void       eel_timed_wait_start_with_duration (int                duration,
+					       EelCancelCallback  cancel_callback,
+					       gpointer           callback_data,
+					       const char        *wait_message,
+					       GtkWindow         *parent_window);
+void       eel_timed_wait_stop                (EelCancelCallback  cancel_callback,
+					       gpointer           callback_data);
+
+/* Basic dialog with buttons. */
+int        eel_run_simple_dialog              (GtkWidget         *parent,
+					       gboolean           ignore_close_box,
+					       GtkMessageType     message_type,
+					       const char        *primary_text,
+					       const char        *secondary_text,
+					       ...);
+
+/* Variations on gnome stock dialogs; these do line wrapping, we don't
+ * bother with non-parented versions, we allow setting the title,
+ * primary, and secondary messages, and we return GtkDialog pointers 
+ * instead of GtkWidget pointers.
+ */
+GtkDialog *eel_show_info_dialog               (const char        *primary_text,
+					       const char        *secondary_text,
+					       GtkWindow         *parent);
+GtkDialog *eel_show_info_dialog_with_details  (const char        *primary_text,
+					       const char        *secondary_text,
+					       const char        *detailed_informative_message,
+					       GtkWindow         *parent);
+GtkDialog *eel_show_warning_dialog            (const char        *primary_text,
+					       const char        *secondary_text,
+					       GtkWindow         *parent);
+GtkDialog *eel_show_error_dialog              (const char        *primary_text,
+					       const char        *secondary_text,
+					       GtkWindow         *parent);
+GtkDialog *eel_show_error_dialog_with_details (const char        *primary_text,
+					       const char        *secondary_text,
+					       const char        *detailed_error_message,
+					       GtkWindow         *parent);
+GtkDialog *eel_show_yes_no_dialog             (const char        *primary_text,
+					       const char        *secondary_text,
+					       const char        *yes_label,
+					       const char        *no_label,
+					       GtkWindow         *parent);
+GtkDialog *eel_create_question_dialog         (const char        *primary_text,
+					       const char        *secondary_text,
+					       const char        *answer_one,
+					       int                response_one,
+					       const char        *answer_two,
+					       int                response_two,
+					       GtkWindow         *parent);
+GtkDialog *eel_create_info_dialog             (const char        *primary_text,
+					       const char        *secondary_text,
+					       GtkWindow         *parent);
+
+#endif /* EEL_STOCK_DIALOGS_H */
diff --git a/eel/eel-string.c b/eel/eel-string.c
new file mode 100644
index 000000000..c72ab9535
--- /dev/null
+++ b/eel/eel-string.c
@@ -0,0 +1,1178 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-string.c: String routines to augment <string.h>.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-string.h"
+
+#include <errno.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+#include "eel-lib-self-check-functions.h"
+#endif
+
+size_t
+eel_strlen (const char *string)
+{
+	return string == NULL ? 0 : strlen (string);
+}
+
+char *
+eel_strchr (const char *haystack, char needle)
+{
+	return haystack == NULL ? NULL : strchr (haystack, needle);
+}
+
+int
+eel_strcmp (const char *string_a, const char *string_b)
+{
+	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
+	 * treat 'NULL < ""', or have a flavor that does that. If we
+	 * didn't have code that already relies on 'NULL == ""', I
+	 * would change it right now.
+	 */
+	return strcmp (string_a == NULL ? "" : string_a,
+		       string_b == NULL ? "" : string_b);
+}
+
+int
+eel_strcasecmp (const char *string_a, const char *string_b)
+{
+	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
+	 * treat 'NULL < ""', or have a flavor that does that. If we
+	 * didn't have code that already relies on 'NULL == ""', I
+	 * would change it right now.
+	 */
+	return g_ascii_strcasecmp (string_a == NULL ? "" : string_a,
+				   string_b == NULL ? "" : string_b);
+}
+
+int
+eel_strcmp_case_breaks_ties (const char *string_a, const char *string_b)
+{
+	int casecmp_result;
+
+	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
+	 * treat 'NULL < ""', or have a flavor that does that. If we
+	 * didn't have code that already relies on 'NULL == ""', I
+	 * would change it right now.
+	 */
+	casecmp_result = eel_strcasecmp (string_a, string_b);
+	if (casecmp_result != 0) {
+		return casecmp_result;
+	}
+	return eel_strcmp (string_a, string_b);
+}
+
+gboolean
+eel_str_is_empty (const char *string_or_null)
+{
+	return eel_strcmp (string_or_null, NULL) == 0;
+}
+
+gboolean
+eel_str_is_equal (const char *string_a, const char *string_b)
+{
+	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
+	 * treat 'NULL != ""', or have a flavor that does that. If we
+	 * didn't have code that already relies on 'NULL == ""', I
+	 * would change it right now.
+	 */
+	return eel_strcmp (string_a, string_b) == 0;
+}
+
+gboolean
+eel_istr_is_equal (const char *string_a, const char *string_b)
+{
+	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
+	 * treat 'NULL != ""', or have a flavor that does that. If we
+	 * didn't have code that already relies on 'NULL == ""', I
+	 * would change it right now.
+	 */
+	return eel_strcasecmp (string_a, string_b) == 0;
+}
+
+gboolean
+eel_str_has_prefix (const char *haystack, const char *needle)
+{
+	return g_str_has_prefix (haystack == NULL ? "" : haystack,
+				 needle == NULL ? "" : needle);
+}
+
+gboolean
+eel_str_has_suffix (const char *haystack, const char *needle)
+{
+	if (needle == NULL) {
+		return TRUE;
+	}
+	if (haystack == NULL) {
+		return needle[0] == '\0';
+	}
+		
+	return g_str_has_suffix (haystack, needle);
+}
+
+gboolean
+eel_istr_has_prefix (const char *haystack, const char *needle)
+{
+	const char *h, *n;
+	char hc, nc;
+
+	/* Eat one character at a time. */
+	h = haystack == NULL ? "" : haystack;
+	n = needle == NULL ? "" : needle;
+	do {
+		if (*n == '\0') {
+			return TRUE;
+		}
+		if (*h == '\0') {
+			return FALSE;
+		}
+		hc = *h++;
+		nc = *n++;
+		hc = g_ascii_tolower (hc);
+		nc = g_ascii_tolower (nc);
+	} while (hc == nc);
+	return FALSE;
+}
+
+gboolean
+eel_istr_has_suffix (const char *haystack, const char *needle)
+{
+	const char *h, *n;
+	char hc, nc;
+
+	if (needle == NULL) {
+		return TRUE;
+	}
+	if (haystack == NULL) {
+		return needle[0] == '\0';
+	}
+		
+	/* Eat one character at a time. */
+	h = haystack + strlen (haystack);
+	n = needle + strlen (needle);
+	do {
+		if (n == needle) {
+			return TRUE;
+		}
+		if (h == haystack) {
+			return FALSE;
+		}
+		hc = *--h;
+		nc = *--n;
+		hc = g_ascii_tolower (hc);
+		nc = g_ascii_tolower (nc);
+	} while (hc == nc);
+	return FALSE;
+}
+
+/**
+ * eel_str_get_prefix:
+ * Get a new string containing the first part of an existing string.
+ * 
+ * @source: The string whose prefix should be extracted.
+ * @delimiter: The string that marks the end of the prefix.
+ * 
+ * Return value: A newly-allocated string that that matches the first part
+ * of @source, up to but not including the first occurrence of
+ * @delimiter. If @source is NULL, returns NULL. If 
+ * @delimiter is NULL, returns a copy of @source.
+ * If @delimiter does not occur in @source, returns
+ * a copy of @source.
+ **/
+char *
+eel_str_get_prefix (const char *source, 
+			 const char *delimiter)
+{
+	char *prefix_start;
+
+	if (source == NULL) {
+		return NULL;
+	}
+
+	if (delimiter == NULL) {
+		return g_strdup (source);
+	}
+
+	prefix_start = strstr (source, delimiter);
+
+	if (prefix_start == NULL) {
+		return g_strdup ("");
+	}
+
+	return g_strndup (source, prefix_start - source);
+}
+
+gboolean
+eel_str_to_int (const char *string, int *integer)
+{
+	long result;
+	char *parse_end;
+
+	/* Check for the case of an empty string. */
+	if (string == NULL || *string == '\0') {
+		return FALSE;
+	}
+	
+	/* Call the standard library routine to do the conversion. */
+	errno = 0;
+	result = strtol (string, &parse_end, 0);
+
+	/* Check that the result is in range. */
+	if ((result == G_MINLONG || result == G_MAXLONG) && errno == ERANGE) {
+		return FALSE;
+	}
+	if (result < G_MININT || result > G_MAXINT) {
+		return FALSE;
+	}
+
+	/* Check that all the trailing characters are spaces. */
+	while (*parse_end != '\0') {
+		if (!g_ascii_isspace (*parse_end++)) {
+			return FALSE;
+		}
+	}
+
+	/* Return the result. */
+	*integer = result;
+	return TRUE;
+}
+
+char *
+eel_str_double_underscores (const char *string)
+{
+	int underscores;
+	const char *p;
+	char *q;
+	char *escaped;
+	
+	if (string == NULL) {
+		return NULL;
+	}
+	
+	underscores = 0;
+	for (p = string; *p != '\0'; p++) {
+		underscores += (*p == '_');
+	}
+	
+	if (underscores == 0) {
+		return g_strdup (string);
+	}
+
+	escaped = g_new (char, strlen (string) + underscores + 1);
+	for (p = string, q = escaped; *p != '\0'; p++, q++) {
+		/* Add an extra underscore. */
+		if (*p == '_') {
+			*q++ = '_';
+		}
+		*q = *p;
+	}
+	*q = '\0';
+	
+	return escaped;
+}
+
+char *
+eel_str_capitalize (const char *string)
+{
+	char *capitalized;
+
+	if (string == NULL) {
+		return NULL;
+	}
+
+	capitalized = g_strdup (string);
+
+	capitalized[0] = g_ascii_toupper (capitalized[0]);
+
+	return capitalized;
+}
+
+/* Note: eel_string_ellipsize_* that use a length in pixels
+ * rather than characters can be found in eel_gdk_extensions.h
+ * 
+ * FIXME bugzilla.eazel.com 5089: 
+ * we should coordinate the names of eel_string_ellipsize_*
+ * and eel_str_*_truncate so that they match better and reflect
+ * their different behavior.
+ */
+char *
+eel_str_middle_truncate (const char *string,
+			 guint truncate_length)
+{
+	char *truncated;
+	guint length;
+	guint num_left_chars;
+	guint num_right_chars;
+
+	const char delimter[] = "...";
+	const guint delimter_length = strlen (delimter);
+	const guint min_truncate_length = delimter_length + 2;
+
+	if (string == NULL) {
+		return NULL;
+	}
+
+	/* It doesnt make sense to truncate strings to less than
+	 * the size of the delimiter plus 2 characters (one on each
+	 * side)
+	 */
+	if (truncate_length < min_truncate_length) {
+		return g_strdup (string);
+	}
+
+	length = g_utf8_strlen (string, -1);
+
+	/* Make sure the string is not already small enough. */
+	if (length <= truncate_length) {
+		return g_strdup (string);
+	}
+
+	/* Find the 'middle' where the truncation will occur. */
+	num_left_chars = (truncate_length - delimter_length) / 2;
+	num_right_chars = truncate_length - num_left_chars - delimter_length;
+
+	truncated = g_new (char, strlen (string) + 1);
+
+	g_utf8_strncpy (truncated, string, num_left_chars);
+	strcat (truncated, delimter);
+	strcat (truncated, g_utf8_offset_to_pointer  (string, length - num_right_chars));
+	
+	return truncated;
+}
+
+char *
+eel_str_strip_substring_and_after (const char *string,
+					const char *substring)
+{
+	const char *substring_position;
+
+	g_return_val_if_fail (substring != NULL, g_strdup (string));
+	g_return_val_if_fail (substring[0] != '\0', g_strdup (string));
+
+	if (string == NULL) {
+		return NULL;
+	}
+
+	substring_position = strstr (string, substring);
+	if (substring_position == NULL) {
+		return g_strdup (string);
+	}
+
+	return g_strndup (string,
+			  substring_position - string);
+}
+
+char *
+eel_str_replace_substring (const char *string,
+				const char *substring,
+				const char *replacement)
+{
+	int substring_length, replacement_length, result_length, remaining_length;
+	const char *p, *substring_position;
+	char *result, *result_position;
+
+	g_return_val_if_fail (substring != NULL, g_strdup (string));
+	g_return_val_if_fail (substring[0] != '\0', g_strdup (string));
+
+	if (string == NULL) {
+		return NULL;
+	}
+
+	substring_length = strlen (substring);
+	replacement_length = eel_strlen (replacement);
+
+	result_length = strlen (string);
+	for (p = string; ; p = substring_position + substring_length) {
+		substring_position = strstr (p, substring);
+		if (substring_position == NULL) {
+			break;
+		}
+		result_length += replacement_length - substring_length;
+	}
+
+	result = g_malloc (result_length + 1);
+
+	result_position = result;
+	for (p = string; ; p = substring_position + substring_length) {
+		substring_position = strstr (p, substring);
+		if (substring_position == NULL) {
+			remaining_length = strlen (p);
+			memcpy (result_position, p, remaining_length);
+			result_position += remaining_length;
+			break;
+		}
+		memcpy (result_position, p, substring_position - p);
+		result_position += substring_position - p;
+		memcpy (result_position, replacement, replacement_length);
+		result_position += replacement_length;
+	}
+	g_assert (result_position - result == result_length);
+	result_position[0] = '\0';
+
+	return result;
+}
+
+/**************** Custom printf ***********/
+
+typedef struct {
+	const char *start;
+	const char *end;
+	GString *format;
+	int arg_pos;
+	int width_pos;
+	int width_format_index;
+	int precision_pos;  
+	int precision_format_index;
+} ConversionInfo;
+
+enum {
+	ARG_TYPE_INVALID,
+	ARG_TYPE_INT,
+	ARG_TYPE_LONG,
+	ARG_TYPE_LONG_LONG,
+	ARG_TYPE_SIZE,
+	ARG_TYPE_LONG_DOUBLE,
+	ARG_TYPE_DOUBLE,
+	ARG_TYPE_POINTER
+};
+
+typedef int ArgType; /* An int, because custom are < 0 */
+
+
+static const char *
+get_position (const char *format, int *i)
+{
+	const char *p;
+	
+	p = format;
+	
+	if (g_ascii_isdigit (*p)) {
+		p++;
+		
+		while (g_ascii_isdigit (*p)) {
+			p++;
+		}
+		
+		if (*p == '$') {
+			if (i != NULL) {
+				*i = atoi (format) - 1;
+			}
+			return p + 1;
+		}
+	}
+	
+	return format;
+}
+
+static gboolean
+is_flag (char c)
+{
+	return strchr ("#0- +'I", c) != NULL;
+}
+
+static gboolean
+is_length_modifier (char c)
+{
+	return strchr ("hlLjzt", c) != NULL;
+}
+
+
+static ArgType
+get_arg_type_from_format (EelPrintfHandler *custom_handlers,
+			  const char *format,
+			  int len)
+{
+	int i;
+	char c;
+	
+	c = format[len-1];
+	
+	if (custom_handlers != NULL) {
+		for (i = 0; custom_handlers[i].character != 0; i++) {
+			if (custom_handlers[i].character == c) {
+				return -(i + 1);
+			}
+		}
+	}
+	
+	switch (c) {
+	case 'd':
+	case 'i':
+	case 'o':
+	case 'u':
+	case 'x':
+	case 'X':
+		if (g_str_has_prefix (format, "ll")) {
+			return ARG_TYPE_LONG_LONG;
+		}
+		if (g_str_has_prefix (format, "l")) {
+			return ARG_TYPE_LONG;
+		}
+		if (g_str_has_prefix (format, "l")) {
+			return ARG_TYPE_LONG;
+		}
+		if (g_str_has_prefix (format, "z")) {
+			return ARG_TYPE_SIZE;
+		}
+		return ARG_TYPE_INT;
+	case 'e':
+	case 'E':
+	case 'f':
+	case 'F':
+	case 'g':
+	case 'G':
+	case 'a':
+	case 'A':
+		if (g_str_has_prefix (format, "L")) {
+			return ARG_TYPE_LONG_DOUBLE;
+		}
+		return ARG_TYPE_DOUBLE;
+	case 'c':
+		return ARG_TYPE_INT;
+	case 's':
+	case 'p':
+	case 'n':
+		return ARG_TYPE_POINTER;
+	}
+	return ARG_TYPE_INVALID;
+}
+
+static void
+skip_argv (va_list *va,
+	   ArgType type,
+	   EelPrintfHandler *custom_handlers)
+{
+	if (type < 0) {
+		custom_handlers[-type - 1].skip (va);
+		return;
+	}
+	
+	switch (type) {
+	default:
+	case ARG_TYPE_INVALID:
+		return;
+		
+	case ARG_TYPE_INT:
+		(void) va_arg (*va, int);
+		break;
+	case ARG_TYPE_LONG:
+		(void) va_arg (*va, long int);
+		break;
+	case ARG_TYPE_LONG_LONG:
+		(void) va_arg (*va, long long int);
+		break;
+	case ARG_TYPE_SIZE:
+		(void) va_arg (*va, gsize);
+		break;
+	case ARG_TYPE_LONG_DOUBLE:
+		(void) va_arg (*va, long double);
+		break;
+	case ARG_TYPE_DOUBLE:
+		(void) va_arg (*va, double);
+		break;
+	case ARG_TYPE_POINTER:
+		(void) va_arg (*va, void *);
+		break;
+	}
+}
+
+static void
+skip_to_arg (va_list *va,
+	     ArgType *types,
+	     EelPrintfHandler *custom_handlers,
+	     int n)
+{
+	int i;
+	for (i = 0; i < n; i++) {
+		skip_argv (va, types[i], custom_handlers);
+	}
+}
+
+char *
+eel_strdup_vprintf_with_custom (EelPrintfHandler *custom,
+				const char *format,
+				va_list va_orig)
+{
+	va_list va;
+	const char *p;
+	int num_args, i, j;
+	ArgType *args;
+	ArgType type;
+	ConversionInfo *conversions;
+	GString *f, *str;
+	const char *flags, *width, *prec, *mod, *pos;
+	char *s;
+	
+	num_args = 0;
+	for (p = format; *p != 0; p++) {
+		if (*p == '%') {
+			p++;
+			if (*p != '%') {
+				num_args++;
+			}
+		}
+	}
+	
+	args = g_new0 (ArgType, num_args * 3 + 1);
+	conversions = g_new0 (ConversionInfo, num_args);
+	
+	/* i indexes conversions, j indexes args */
+	i = 0; j = 0;
+	p = format;
+	while (*p != 0) {
+		if (*p != '%') {
+			p++;
+			continue;
+		}
+		p++;
+		if (*p == '%') {
+			p++;
+			continue;
+		}
+		
+		/* We got a real conversion: */
+		f = g_string_new ("%");
+		conversions[i].start = p - 1;
+		
+		/* First comes the positional arg */
+		
+		pos = p;
+		p = get_position (p, NULL);
+		
+		/* Then flags */
+		flags = p;
+		while (is_flag (*p)) {
+			p++;
+		}
+		g_string_append_len (f, flags, p - flags);
+		
+		/* Field width */
+		
+		if (*p == '*') {
+			p++;
+			p = get_position (p, &j);
+			args[j] = ARG_TYPE_INT;
+			conversions[i].width_pos = j++;
+			conversions[i].width_format_index = f->len;
+		} else {
+			conversions[i].width_pos = -1;
+			conversions[i].width_format_index = -1;
+			width = p;
+			while (g_ascii_isdigit (*p)) {
+				p++;
+			}      
+			g_string_append_len (f, width, p - width);
+		}
+		
+		/* Precision */
+		conversions[i].precision_pos = -1;
+		conversions[i].precision_format_index = -1;
+		if (*p == '.') {
+			g_string_append_c (f, '.');
+			p++;
+			
+			if (*p == '*') {
+				p++;
+				p = get_position (p, &j);
+				args[j] = ARG_TYPE_INT;
+				conversions[i].precision_pos = j++;
+				conversions[i].precision_format_index = f->len;
+			} else {
+				prec = p;
+				while (g_ascii_isdigit (*p) || *p == '-') {
+					p++;
+				}      
+				g_string_append_len (f, prec, p - prec);
+			}
+		}
+		
+		/* length modifier */
+		
+		mod = p;
+		
+		while (is_length_modifier (*p)) {
+			p++;
+		}
+		
+		/* conversion specifier */
+		if (*p != 0)
+			p++;
+		
+		g_string_append_len (f, mod, p - mod);
+		
+		get_position (pos, &j);
+		args[j] = get_arg_type_from_format (custom, mod, p - mod);
+		conversions[i].arg_pos = j++;
+		conversions[i].format = f;
+		conversions[i].end = p;
+		
+		i++;
+	}
+	
+	g_assert (i == num_args);
+	
+	str = g_string_new ("");
+	
+	p = format;
+	for (i = 0; i < num_args; i++) {
+		g_string_append_len (str, p, conversions[i].start - p);
+		p = conversions[i].end;
+		
+		if (conversions[i].precision_pos != -1) {
+			char *val;
+			
+			G_VA_COPY(va, va_orig);
+			skip_to_arg (&va, args, custom, conversions[i].precision_pos);
+			val = g_strdup_vprintf ("%d", va);
+			va_end (va);
+			
+			g_string_insert (conversions[i].format,
+					 conversions[i].precision_format_index,
+					 val);
+			
+			g_free (val);
+		}
+		
+		if (conversions[i].width_pos != -1) {
+			char *val;
+			
+			G_VA_COPY(va, va_orig);
+			skip_to_arg (&va, args, custom, conversions[i].width_pos);
+			val = g_strdup_vprintf ("%d", va);
+			va_end (va);
+			
+			g_string_insert (conversions[i].format,
+					 conversions[i].width_format_index,
+					 val);
+			
+			g_free (val);
+		}
+		
+		G_VA_COPY(va, va_orig);
+		skip_to_arg (&va, args, custom, conversions[i].arg_pos);
+		type = args[conversions[i].arg_pos];
+		if (type < 0) {
+			s = custom[-type - 1].to_string (conversions[i].format->str, va);
+			g_string_append (str, s);
+			g_free (s);
+		} else{
+			g_string_append_vprintf (str, conversions[i].format->str, va);
+		}
+		va_end (va);
+		
+		g_string_free (conversions[i].format, TRUE);
+	}
+	g_string_append (str, p);
+	
+	g_free (args);
+	g_free (conversions);
+	
+	return g_string_free (str, FALSE);
+}
+
+char *
+eel_strdup_printf_with_custom (EelPrintfHandler *handlers,
+			       const char *format,
+			       ...)
+{
+	va_list va;
+	char *res;
+	
+	va_start (va, format);
+	res = eel_strdup_vprintf_with_custom (handlers, format, va);
+	va_end (va);
+	
+	return res;
+}
+
+/*********** refcounted strings ****************/
+
+G_LOCK_DEFINE_STATIC (unique_ref_strs);
+static GHashTable *unique_ref_strs = NULL;
+
+static eel_ref_str
+eel_ref_str_new_internal (const char *string, int start_count)
+{
+	char *res;
+	volatile gint *count;
+	gsize len;
+
+	len = strlen (string);
+	res = g_malloc (sizeof (gint) + len + 1);
+	count = (volatile gint *)res;
+	*count = start_count;
+	res += sizeof(gint);
+	memcpy (res, string, len + 1);
+	return res;
+}
+
+eel_ref_str
+eel_ref_str_new (const char *string)
+{
+	if (string == NULL) {
+		return NULL;
+	}
+	
+	return eel_ref_str_new_internal (string, 1);
+}
+
+eel_ref_str
+eel_ref_str_get_unique (const char *string)
+{
+	eel_ref_str res;
+
+	if (string == NULL) {
+		return NULL;
+	}
+	
+	G_LOCK (unique_ref_strs);
+	if (unique_ref_strs == NULL) {
+		unique_ref_strs = g_hash_table_new (g_str_hash, g_str_equal);
+	}
+
+	res = g_hash_table_lookup (unique_ref_strs, string);
+	if (res != NULL) {
+		eel_ref_str_ref (res);
+	} else {
+		res = eel_ref_str_new_internal (string, 0x80000001);
+		g_hash_table_insert (unique_ref_strs, res, res);
+	}
+	
+	G_UNLOCK (unique_ref_strs);
+
+	return res;
+}
+
+eel_ref_str
+eel_ref_str_ref (eel_ref_str str)
+{
+	volatile gint *count;
+
+	count = (volatile gint *)((char *)str - sizeof (gint));
+	g_atomic_int_add (count, 1);
+
+	return str;
+}
+
+void
+eel_ref_str_unref (eel_ref_str str)
+{
+	volatile gint *count;
+	gint old_ref;
+
+	if (str == NULL)
+		return;
+	
+	count = (volatile gint *)((char *)str - sizeof (gint));
+
+	old_ref = g_atomic_int_get (count);
+	if (old_ref == 1) {
+		g_free ((char *)count);
+	} else if (old_ref == 0x80000001) {
+		G_LOCK (unique_ref_strs);
+		/* Need to recheck after taking lock to avoid races with _get_unique() */
+		if (g_atomic_int_exchange_and_add (count, -1) == 0x80000001) {
+			g_hash_table_remove (unique_ref_strs, (char *)str);
+			g_free ((char *)count);
+		} 
+		G_UNLOCK (unique_ref_strs);
+	} else {
+		g_atomic_int_exchange_and_add (count, -1);
+	}
+}
+
+
+#if !defined (EEL_OMIT_SELF_CHECK)
+
+static int
+call_str_to_int (const char *string)
+{
+	int integer;
+
+	integer = 9999;
+	eel_str_to_int (string, &integer);
+	return integer;
+}
+
+static void
+verify_printf (const char *format, ...)
+{
+	va_list va;
+	char *orig, *new;
+	
+	va_start (va, format);
+	orig = g_strdup_vprintf (format, va);
+	va_end (va);
+	
+	va_start (va, format);
+	new = eel_strdup_vprintf_with_custom (NULL, format, va);
+	va_end (va);
+	
+	EEL_CHECK_STRING_RESULT (new, orig);
+	
+	g_free (orig);
+}
+
+static char *
+custom1_to_string (char *format, va_list va)
+{
+	int i;
+	
+	i = va_arg (va, int);
+	
+	return g_strdup_printf ("c1-%d-", i);
+}
+
+static void
+custom1_skip (va_list *va)
+{
+	(void) va_arg (*va, int);
+}
+
+static char *
+custom2_to_string (char *format, va_list va)
+{
+	char *s;
+	
+	s = va_arg (va, char *);
+	
+	return g_strdup_printf ("c2-%s-", s);
+}
+
+static void
+custom2_skip (va_list *va)
+{
+	(void) va_arg (*va, char *);
+}
+
+static EelPrintfHandler handlers[] = {
+	{ 'N', custom1_to_string, custom1_skip },
+	{ 'Y', custom2_to_string, custom2_skip },
+	{ 0 }
+};
+
+static void
+verify_custom (const char *orig, const char *format, ...)
+{
+	char *new;
+	va_list va;
+	
+	va_start (va, format);
+	new = eel_strdup_vprintf_with_custom (handlers, format, va);
+	va_end (va);
+	
+	EEL_CHECK_STRING_RESULT (new, orig);
+}
+
+void
+eel_self_check_string (void)
+{
+	int integer;
+
+	EEL_CHECK_INTEGER_RESULT (eel_strlen (NULL), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_strlen (""), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_strlen ("abc"), 3);
+
+	EEL_CHECK_INTEGER_RESULT (eel_strcmp (NULL, NULL), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_strcmp (NULL, ""), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_strcmp ("", NULL), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_strcmp ("a", "a"), 0);
+	EEL_CHECK_INTEGER_RESULT (eel_strcmp ("aaab", "aaab"), 0);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp (NULL, "a") < 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("a", NULL) > 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("", "a") < 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("a", "") > 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("a", "b") < 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("a", "ab") < 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("ab", "a") > 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("aaa", "aaab") < 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_strcmp ("aaab", "aaa") > 0, TRUE);
+
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix (NULL, NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix (NULL, ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("", NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("a", "a"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("aaab", "aaab"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix (NULL, "a"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("a", NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("", "a"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("a", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("a", "b"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("a", "ab"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("ab", "a"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("aaa", "aaab"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_prefix ("aaab", "aaa"), TRUE);
+
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix (NULL, NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix (NULL, ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("", NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("a", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("", "a"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("a", "a"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("aaab", "aaab"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix (NULL, "a"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("a", NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("", "a"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("a", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("a", "b"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("a", "ab"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("ab", "a"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("ab", "b"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("aaa", "baaa"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_has_suffix ("baaa", "aaa"), TRUE);
+
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix (NULL, NULL), NULL);
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix (NULL, "foo"), NULL);
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("foo", NULL), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("", ""), "");
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("", "foo"), "");
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("foo", ""), "");
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("foo", "foo"), "");
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("foo:", ":"), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("foo:bar", ":"), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_get_prefix ("footle:bar", "tle:"), "foo");	
+
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores (NULL), NULL);
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores (""), "");
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores ("_"), "__");
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores ("foo"), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores ("foo_bar"), "foo__bar");
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores ("foo_bar_2"), "foo__bar__2");
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores ("_foo"), "__foo");
+	EEL_CHECK_STRING_RESULT (eel_str_double_underscores ("foo_"), "foo__");
+
+	EEL_CHECK_STRING_RESULT (eel_str_capitalize (NULL), NULL);
+	EEL_CHECK_STRING_RESULT (eel_str_capitalize (""), "");
+	EEL_CHECK_STRING_RESULT (eel_str_capitalize ("foo"), "Foo");
+	EEL_CHECK_STRING_RESULT (eel_str_capitalize ("Foo"), "Foo");
+
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 0), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 1), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 3), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 4), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 5), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 6), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("foo", 7), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 0), "a_much_longer_foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 1), "a_much_longer_foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 2), "a_much_longer_foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 3), "a_much_longer_foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 4), "a_much_longer_foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 5), "a...o");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 6), "a...oo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 7), "a_...oo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 8), "a_...foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("a_much_longer_foo", 9), "a_m...foo");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 8), "so...ven");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 8), "so...odd");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 9), "som...ven");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 9), "som...odd");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 10), "som...even");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 10), "som..._odd");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 11), "some...even");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 11), "some..._odd");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 12), "some..._even");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 12), "some...g_odd");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 13), "somet..._even");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 13), "something_odd");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_even", 14), "something_even");
+	EEL_CHECK_STRING_RESULT (eel_str_middle_truncate ("something_odd", 13), "something_odd");
+
+	#define TEST_INTEGER_CONVERSION_FUNCTIONS(string, boolean_result, integer_result) \
+		EEL_CHECK_BOOLEAN_RESULT (eel_str_to_int (string, &integer), boolean_result); \
+		EEL_CHECK_INTEGER_RESULT (call_str_to_int (string), integer_result);
+
+	TEST_INTEGER_CONVERSION_FUNCTIONS (NULL, FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("a", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS (".", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("0", TRUE, 0)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("1", TRUE, 1)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("+1", TRUE, 1)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("-1", TRUE, -1)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("2147483647", TRUE, 2147483647)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("2147483648", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("+2147483647", TRUE, 2147483647)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("+2147483648", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("-2147483648", TRUE, INT_MIN)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("-2147483649", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("1a", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("0.0", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("1e1", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("21474836470", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("+21474836470", FALSE, 9999)
+	TEST_INTEGER_CONVERSION_FUNCTIONS ("-21474836480", FALSE, 9999)
+
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_is_equal (NULL, NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_is_equal (NULL, ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_is_equal ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_is_equal ("", NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_is_equal ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_is_equal ("foo", "foo"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_str_is_equal ("foo", "bar"), FALSE);
+
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal (NULL, NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal (NULL, ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal ("", NULL), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal ("foo", "foo"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal ("foo", "bar"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal ("Foo", "foo"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (eel_istr_is_equal ("foo", "Foo"), TRUE);
+
+	EEL_CHECK_STRING_RESULT (eel_str_strip_substring_and_after (NULL, "bar"), NULL);
+	EEL_CHECK_STRING_RESULT (eel_str_strip_substring_and_after ("", "bar"), "");
+	EEL_CHECK_STRING_RESULT (eel_str_strip_substring_and_after ("foo", "bar"), "foo");
+	EEL_CHECK_STRING_RESULT (eel_str_strip_substring_and_after ("foo bar", "bar"), "foo ");
+	EEL_CHECK_STRING_RESULT (eel_str_strip_substring_and_after ("foo bar xxx", "bar"), "foo ");
+	EEL_CHECK_STRING_RESULT (eel_str_strip_substring_and_after ("bar", "bar"), "");
+
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring (NULL, "foo", NULL), NULL);
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring (NULL, "foo", "bar"), NULL);
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("bar", "foo", NULL), "bar");
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("", "foo", ""), "");
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("", "foo", "bar"), "");
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("bar", "foo", ""), "bar");
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("xxx", "x", "foo"), "foofoofoo");
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("fff", "f", "foo"), "foofoofoo");
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("foofoofoo", "foo", "f"), "fff");
+	EEL_CHECK_STRING_RESULT (eel_str_replace_substring ("foofoofoo", "f", ""), "oooooo");
+
+	verify_printf ("%.*s", 2, "foo");
+	verify_printf ("%*.*s", 2, 4, "foo");
+	verify_printf ("before %5$*1$.*2$s between %6$*3$.*4$d after",
+		       4, 5, 6, 7, "foo", G_PI);
+	verify_custom ("c1-42- c2-foo-","%N %Y", 42 ,"foo");
+	verify_custom ("c1-42- bar c2-foo-","%N %s %Y", 42, "bar" ,"foo");
+	verify_custom ("c1-42- bar c2-foo-","%3$N %2$s %1$Y","foo", "bar", 42);
+
+}
+
+#endif /* !EEL_OMIT_SELF_CHECK */
diff --git a/eel/eel-string.h b/eel/eel-string.h
new file mode 100644
index 000000000..a7c9796aa
--- /dev/null
+++ b/eel/eel-string.h
@@ -0,0 +1,120 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   eel-string.h: String routines to augment <string.h>.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#ifndef EEL_STRING_H
+#define EEL_STRING_H
+
+#include <glib.h>
+#include <string.h>
+#include <stdarg.h>
+
+/* We use the "str" abbrevation to mean char * string, since
+ * "string" usually means g_string instead. We use the "istr"
+ * abbreviation to mean a case-insensitive char *.
+ */
+
+
+/* NULL is allowed for all the str parameters to these functions. */
+
+/* Versions of basic string functions that allow NULL, and handle
+ * cases that the standard ones get a bit wrong for our purposes.
+ */
+size_t   eel_strlen                        (const char    *str);
+char *   eel_strchr                        (const char    *haystack,
+					    char           needle);
+int      eel_strcmp                        (const char    *str_a,
+					    const char    *str_b);
+int      eel_strcasecmp                    (const char    *str_a,
+					    const char    *str_b);
+int      eel_strcmp_case_breaks_ties       (const char    *str_a,
+					    const char    *str_b);
+
+/* Other basic string operations. */
+gboolean eel_str_is_empty                  (const char    *str_or_null);
+gboolean eel_str_is_equal                  (const char    *str_a,
+					    const char    *str_b);
+gboolean eel_istr_is_equal                 (const char    *str_a,
+					    const char    *str_b);
+gboolean eel_str_has_prefix                (const char    *target,
+					    const char    *prefix);
+char *   eel_str_get_prefix                (const char    *source,
+					    const char    *delimiter);
+gboolean eel_istr_has_prefix               (const char    *target,
+					    const char    *prefix);
+gboolean eel_str_has_suffix                (const char    *target,
+					    const char    *suffix);
+gboolean eel_istr_has_suffix               (const char    *target,
+					    const char    *suffix);
+
+/* Conversions to and from strings. */
+gboolean eel_str_to_int                    (const char    *str,
+					    int           *integer);
+
+/* Escape function for '_' character. */
+char *   eel_str_double_underscores        (const char    *str);
+
+/* Capitalize a string */
+char *   eel_str_capitalize                (const char    *str);
+
+/* Middle truncate a string to a maximum of truncate_length characters.
+ * The resulting string will be truncated in the middle with a "..."
+ * delimiter.
+ */
+char *   eel_str_middle_truncate           (const char    *str,
+					    guint          truncate_length);
+
+
+/* Remove all characters after the passed-in substring. */
+char *   eel_str_strip_substring_and_after (const char    *str,
+					    const char    *substring);
+
+/* Replace all occurrences of substring with replacement. */
+char *   eel_str_replace_substring         (const char    *str,
+					    const char    *substring,
+					    const char    *replacement);
+
+typedef char * eel_ref_str;
+
+eel_ref_str eel_ref_str_new        (const char  *string);
+eel_ref_str eel_ref_str_get_unique (const char  *string);
+eel_ref_str eel_ref_str_ref        (eel_ref_str  str);
+void        eel_ref_str_unref      (eel_ref_str  str);
+
+#define eel_ref_str_peek(__str) ((const char *)(__str))
+
+
+typedef struct {
+  char character;
+  char *(*to_string) (char *format, va_list va);
+  void (*skip) (va_list *va);
+} EelPrintfHandler;
+
+char *eel_strdup_printf_with_custom (EelPrintfHandler *handlers,
+				     const char *format,
+				     ...);
+char *eel_strdup_vprintf_with_custom (EelPrintfHandler *custom,
+				      const char *format,
+				      va_list va);
+
+#endif /* EEL_STRING_H */
diff --git a/eel/eel-types.c b/eel/eel-types.c
new file mode 100644
index 000000000..8a84e1374
--- /dev/null
+++ b/eel/eel-types.c
@@ -0,0 +1,73 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* eel-types.h - 
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Maciej Stachowiak <mjs@eazel.com>
+*/
+
+
+#include <config.h>
+#include <gtk/gtk.h>
+
+#define EEL_COMPILATION 1
+#include <eel/eel.h>
+
+#include "eel-type-builtins-vars.c"
+#include "eel-type-builtins-evals.c"
+
+void
+eel_type_init (void)
+{
+	int i;
+	GtkType type_id;
+	static gboolean initialized = FALSE;
+	
+	static struct {
+		const gchar *type_name;
+		GtkType *type_id;
+		GtkType parent;
+		gconstpointer pointer1;
+		gpointer pointer2;
+	} builtin_info[EEL_TYPE_N_BUILTINS] = {
+#include "eel-type-builtins-ids.c"
+	};
+
+	if (initialized) {
+		return;
+	}
+	initialized = TRUE;
+	
+	for (i = 0; i < EEL_TYPE_N_BUILTINS; i++) {
+		type_id = G_TYPE_INVALID;
+
+		if (builtin_info[i].parent == G_TYPE_ENUM) {
+			type_id = g_enum_register_static (builtin_info[i].type_name, 
+							  builtin_info[i].pointer1);
+		} else if (builtin_info[i].parent == G_TYPE_FLAGS) {
+			type_id = g_flags_register_static (builtin_info[i].type_name, 
+							   builtin_info[i].pointer1);
+		} else {
+			g_assert_not_reached ();
+		}
+
+		g_assert (type_id != G_TYPE_INVALID);
+		*builtin_info[i].type_id = type_id;
+	}
+}
+
diff --git a/eel/eel-types.h b/eel/eel-types.h
new file mode 100644
index 000000000..801a7370f
--- /dev/null
+++ b/eel/eel-types.h
@@ -0,0 +1,32 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* eel-types.h - 
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Maciej Stachowiak <mjs@eazel.com>
+*/
+
+#ifndef EEL_TYPES_H
+#define EEL_TYPES_H
+
+#include <eel/eel-type-builtins.h>
+
+void eel_type_init (void);
+
+#endif /* EEL_TYPES_H */
+
diff --git a/eel/eel-vfs-extensions.c b/eel/eel-vfs-extensions.c
new file mode 100644
index 000000000..c2dad3999
--- /dev/null
+++ b/eel/eel-vfs-extensions.c
@@ -0,0 +1,178 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-vfs-extensions.c - gnome-vfs extensions.  Its likely some of these will 
+                          be part of gnome-vfs in the future.
+
+   Copyright (C) 1999, 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+	    Pavel Cisler <pavel@eazel.com>
+	    Mike Fleming  <mfleming@eazel.com>
+            John Sullivan <sullivan@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-i18n.h"
+#include "eel-vfs-extensions.h"
+#include "eel-glib-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "eel-string.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+gboolean
+eel_uri_is_trash (const char *uri)
+{
+	return eel_istr_has_prefix (uri, "trash:");
+}
+
+gboolean
+eel_uri_is_search (const char *uri)
+{
+	return eel_istr_has_prefix (uri, EEL_SEARCH_URI);
+}
+
+gboolean
+eel_uri_is_desktop (const char *uri)
+{
+	return eel_istr_has_prefix (uri, EEL_DESKTOP_URI);
+}
+
+char *
+eel_make_valid_utf8 (const char *name)
+{
+	GString *string;
+	const char *remainder, *invalid;
+	int remaining_bytes, valid_bytes;
+
+	string = NULL;
+	remainder = name;
+	remaining_bytes = strlen (name);
+
+	while (remaining_bytes != 0) {
+		if (g_utf8_validate (remainder, remaining_bytes, &invalid)) {
+			break;
+		}
+		valid_bytes = invalid - remainder;
+
+		if (string == NULL) {
+			string = g_string_sized_new (remaining_bytes);
+		}
+		g_string_append_len (string, remainder, valid_bytes);
+		g_string_append_c (string, '?');
+
+		remaining_bytes -= valid_bytes + 1;
+		remainder = invalid + 1;
+	}
+
+	if (string == NULL) {
+		return g_strdup (name);
+	}
+
+	g_string_append (string, remainder);
+	g_string_append (string, _(" (invalid Unicode)"));
+	g_assert (g_utf8_validate (string->str, -1, NULL));
+
+	return g_string_free (string, FALSE);
+}
+
+/**
+ * eel_format_uri_for_display:
+ *
+ * Filter, modify, unescape and change URIs to make them appropriate
+ * to display to users. The conversion is done such that the roundtrip
+ * to UTf8 is reversible.
+ * 
+ * Rules:
+ * 	file: URI's without fragments should appear as local paths
+ * 	file: URI's with fragments should appear as file: URI's
+ * 	All other URI's appear as expected
+ *
+ * @uri: a URI
+ *
+ * returns a g_malloc'd UTF8 string
+ **/
+char *
+eel_format_uri_for_display (const char *uri) 
+{
+	GFile *file;
+	char *res;
+
+	file = g_file_new_for_uri (uri);
+	res = g_file_get_parse_name (file);
+	g_object_unref (file);
+	return res;
+}
+
+char *
+eel_filename_strip_extension (const char * filename_with_extension)
+{
+	char *filename, *end, *end2;
+
+	if (filename_with_extension == NULL) {
+		return NULL;
+	}
+	
+	filename = g_strdup (filename_with_extension);
+
+	end = strrchr (filename, '.');
+
+	if (end && end != filename) {
+		if (strcmp (end, ".gz") == 0 ||
+		    strcmp (end, ".bz2") == 0 ||
+		    strcmp (end, ".sit") == 0 ||
+		    strcmp (end, ".Z") == 0) {
+			end2 = end - 1;
+			while (end2 > filename &&
+			       *end2 != '.') {
+				end2--;
+			}
+			if (end2 != filename) {
+				end = end2;
+			}
+		}
+		*end = '\0';
+	}
+
+	return filename;
+}
+
+void
+eel_filename_get_rename_region (const char           *filename,
+				int                  *start_offset,
+				int                  *end_offset)
+{
+	char *filename_without_extension;
+
+	g_return_if_fail (start_offset != NULL);
+	g_return_if_fail (end_offset != NULL);
+
+	*start_offset = 0;
+	*end_offset = 0;
+
+	g_return_if_fail (filename != NULL);
+
+	filename_without_extension = eel_filename_strip_extension (filename);
+	*end_offset = g_utf8_strlen (filename_without_extension, -1);
+
+	g_free (filename_without_extension);
+}
diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h
new file mode 100644
index 000000000..96d811817
--- /dev/null
+++ b/eel/eel-vfs-extensions.h
@@ -0,0 +1,57 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-vfs-extensions.h - gnome-vfs extensions.  Its likely some of these will 
+                          be part of gnome-vfs in the future.
+
+   Copyright (C) 1999, 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+	    Pavel Cisler <pavel@eazel.com>
+	    Mike Fleming  <mfleming@eazel.com>
+            John Sullivan <sullivan@eazel.com>
+*/
+
+#ifndef EEL_VFS_EXTENSIONS_H
+#define EEL_VFS_EXTENSIONS_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#define	EEL_TRASH_URI "trash:"
+#define EEL_DESKTOP_URI "x-nautilus-desktop:"
+#define EEL_SEARCH_URI "x-nautilus-search:"
+
+gboolean           eel_uri_is_trash                      (const char           *uri);
+gboolean           eel_uri_is_trash_folder               (const char           *uri);
+gboolean           eel_uri_is_in_trash                   (const char           *uri);
+gboolean           eel_uri_is_desktop                    (const char           *uri);
+gboolean           eel_uri_is_search                     (const char           *uri);
+
+
+char *             eel_format_uri_for_display            (const char           *uri);
+char *             eel_make_valid_utf8                   (const char           *name);
+
+char *             eel_filename_strip_extension          (const char           *filename);
+void               eel_filename_get_rename_region        (const char           *filename,
+							  int                  *start_offset,
+							  int                  *end_offset);
+
+G_END_DECLS
+
+#endif /* EEL_VFS_EXTENSIONS_H */
diff --git a/eel/eel-wrap-table.c b/eel/eel-wrap-table.c
new file mode 100644
index 000000000..f2ddfe048
--- /dev/null
+++ b/eel/eel-wrap-table.c
@@ -0,0 +1,1053 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-wrap-box.c - A table that can wrap its contents as needed.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-wrap-table.h"
+
+#include "eel-art-extensions.h"
+#include "eel-art-gtk-extensions.h"
+#include "eel-gtk-extensions.h"
+#include "eel-gtk-macros.h"
+#include "eel-types.h"
+#include <gtk/gtk.h>
+
+/* Arguments */
+enum
+{
+	PROP_0,
+	PROP_X_SPACING,
+	PROP_Y_SPACING,
+	PROP_X_JUSTIFICATION,
+	PROP_Y_JUSTIFICATION,
+	PROP_HOMOGENEOUS
+};
+
+/* Detail member struct */
+struct EelWrapTableDetails
+{
+	guint x_spacing;
+	guint y_spacing;
+	EelJustification x_justification;
+	EelJustification y_justification;
+	gboolean homogeneous;
+	GList *children;
+
+	guint is_scrolled : 1;
+	guint cols;
+};
+
+static void          eel_wrap_table_class_init           (EelWrapTableClass   *wrap_table_class);
+static void          eel_wrap_table_init                 (EelWrapTable        *wrap);
+/* GObjectClass methods */
+static void          eel_wrap_table_finalize             (GObject             *object);
+static void          eel_wrap_table_set_property         (GObject             *object,
+							  guint                property_id,
+							  const GValue        *value,
+							  GParamSpec          *pspec);
+static void          eel_wrap_table_get_property         (GObject             *object,
+							  guint                property_id,
+							  GValue              *value,
+							  GParamSpec          *pspec);
+/* GtkWidgetClass methods */
+static void          eel_wrap_table_size_request         (GtkWidget           *widget,
+							  GtkRequisition      *requisition);
+static int           eel_wrap_table_expose_event         (GtkWidget           *widget,
+							  GdkEventExpose      *event);
+static void          eel_wrap_table_size_allocate        (GtkWidget           *widget,
+							  GtkAllocation       *allocation);
+static void          eel_wrap_table_map                  (GtkWidget           *widget);
+static void          eel_wrap_table_unmap                (GtkWidget           *widget);
+static void          eel_wrap_table_realize              (GtkWidget           *widget);
+
+/* GtkContainerClass methods */
+static void          eel_wrap_table_add                  (GtkContainer        *container,
+							  GtkWidget           *widget);
+static void          eel_wrap_table_remove               (GtkContainer        *container,
+							  GtkWidget           *widget);
+static void          eel_wrap_table_forall               (GtkContainer        *container,
+							  gboolean             include_internals,
+							  GtkCallback          callback,
+							  gpointer             callback_data);
+static GtkType       eel_wrap_table_child_type           (GtkContainer        *container);
+
+
+/* Private EelWrapTable methods */
+static EelDimensions wrap_table_irect_max_dimensions     (const EelDimensions *one,
+							  const EelDimensions *two);
+static EelDimensions wrap_table_get_max_child_dimensions (const EelWrapTable  *wrap_table);
+static EelDimensions wrap_table_get_content_dimensions   (const EelWrapTable  *wrap_table);
+static EelIRect      wrap_table_get_content_bounds       (const EelWrapTable  *wrap_table);
+static gboolean      wrap_table_child_focus_in           (GtkWidget           *widget,
+							  GdkEventFocus       *event,
+							  gpointer             data);
+static void          wrap_table_layout                   (EelWrapTable        *wrap_table);
+
+
+EEL_CLASS_BOILERPLATE (EelWrapTable, eel_wrap_table, GTK_TYPE_CONTAINER)
+
+/* Class init methods */
+static void
+eel_wrap_table_class_init (EelWrapTableClass *wrap_table_class)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (wrap_table_class);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (wrap_table_class);
+	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (wrap_table_class);
+
+	/* GObjectClass */
+	gobject_class->finalize = eel_wrap_table_finalize;
+	gobject_class->set_property = eel_wrap_table_set_property;
+	gobject_class->get_property = eel_wrap_table_get_property;
+	
+ 	/* GtkWidgetClass */
+ 	widget_class->size_request = eel_wrap_table_size_request;
+	widget_class->size_allocate = eel_wrap_table_size_allocate;
+ 	widget_class->expose_event = eel_wrap_table_expose_event;
+	widget_class->map = eel_wrap_table_map;
+	widget_class->unmap = eel_wrap_table_unmap;
+	widget_class->realize = eel_wrap_table_realize;
+
+ 	/* GtkContainerClass */
+	container_class->add = eel_wrap_table_add;
+	container_class->remove = eel_wrap_table_remove;
+	container_class->forall = eel_wrap_table_forall;
+	container_class->child_type = eel_wrap_table_child_type;
+
+	/* Register some the enum types we need */
+	eel_type_init ();
+
+	/* Arguments */
+	g_object_class_install_property
+		(gobject_class,
+		 PROP_X_SPACING,
+		 g_param_spec_uint ("x_spacing", NULL, NULL,
+                                    0, G_MAXINT, 0, G_PARAM_READWRITE));
+
+	g_object_class_install_property
+		(gobject_class,
+		 PROP_Y_SPACING,
+		 g_param_spec_uint ("y_spacing", NULL, NULL,
+				    0, G_MAXINT, 0, G_PARAM_READWRITE));
+	
+	g_object_class_install_property
+		(gobject_class,
+		 PROP_X_JUSTIFICATION,
+		 g_param_spec_enum ("x_justification", NULL, NULL,
+				    EEL_TYPE_JUSTIFICATION,
+				    EEL_JUSTIFICATION_BEGINNING,
+				    G_PARAM_READWRITE));
+				    
+	g_object_class_install_property
+		(gobject_class,
+		 PROP_Y_JUSTIFICATION,
+		 g_param_spec_enum ("y_justification", NULL, NULL,
+				    EEL_TYPE_JUSTIFICATION,
+				    EEL_JUSTIFICATION_BEGINNING,
+				    G_PARAM_READWRITE));
+				    
+	g_object_class_install_property
+		(gobject_class,
+		 PROP_HOMOGENEOUS,
+		 g_param_spec_boolean ("homogenous", NULL, NULL,
+				       FALSE, G_PARAM_READWRITE));
+}
+
+static void
+eel_wrap_table_init (EelWrapTable *wrap_table)
+{
+	GTK_WIDGET_SET_FLAGS (wrap_table, GTK_NO_WINDOW);
+
+	wrap_table->details = g_new0 (EelWrapTableDetails, 1);
+	wrap_table->details->x_justification = EEL_JUSTIFICATION_BEGINNING;
+	wrap_table->details->y_justification = EEL_JUSTIFICATION_END;
+	wrap_table->details->cols = 1;
+}
+
+static void
+eel_wrap_table_finalize (GObject *object)
+{
+ 	EelWrapTable *wrap_table;
+	
+	wrap_table = EEL_WRAP_TABLE (object);
+
+	g_list_free (wrap_table->details->children);
+	g_free (wrap_table->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+/* GObjectClass methods */
+
+static void
+eel_wrap_table_set_property (GObject      *object,
+			     guint         property_id,
+			     const GValue *value,
+			     GParamSpec   *pspec)
+{
+	EelWrapTable *wrap_table;
+	
+	g_assert (EEL_IS_WRAP_TABLE (object));
+
+ 	wrap_table = EEL_WRAP_TABLE (object);
+
+ 	switch (property_id)
+	{
+	case PROP_X_SPACING:
+		eel_wrap_table_set_x_spacing (wrap_table, g_value_get_uint (value));
+		break;
+
+	case PROP_Y_SPACING:
+		eel_wrap_table_set_y_spacing (wrap_table, g_value_get_uint (value));
+		break;
+
+	case PROP_X_JUSTIFICATION:
+		eel_wrap_table_set_x_justification (wrap_table, g_value_get_enum (value));
+		break;
+
+	case PROP_Y_JUSTIFICATION:
+		eel_wrap_table_set_y_justification (wrap_table, g_value_get_enum (value));
+		break;
+
+	case PROP_HOMOGENEOUS:
+		eel_wrap_table_set_homogeneous (wrap_table, g_value_get_boolean (value));
+		break;
+
+ 	default:
+		g_assert_not_reached ();
+	}
+}
+
+static void
+eel_wrap_table_get_property (GObject    *object,
+			     guint       property_id,
+			     GValue     *value,
+			     GParamSpec *pspec)
+{
+	EelWrapTable *wrap_table;
+
+	g_assert (EEL_IS_WRAP_TABLE (object));
+	
+	wrap_table = EEL_WRAP_TABLE (object);
+
+ 	switch (property_id)
+	{
+	case PROP_X_SPACING:
+		g_value_set_uint (value, eel_wrap_table_get_x_spacing (wrap_table));
+		break;
+
+	case PROP_Y_SPACING:
+		g_value_set_uint (value, eel_wrap_table_get_y_spacing (wrap_table));
+		break;
+
+	case PROP_X_JUSTIFICATION:
+		g_value_set_enum (value, eel_wrap_table_get_x_justification (wrap_table));
+		break;
+
+	case PROP_Y_JUSTIFICATION:
+		g_value_set_enum (value, eel_wrap_table_get_y_justification (wrap_table));
+		break;
+
+	case PROP_HOMOGENEOUS:
+		g_value_set_boolean (value, eel_wrap_table_get_homogeneous (wrap_table));
+		break;
+
+ 	default:
+		g_assert_not_reached ();
+	}
+}
+
+/* GtkWidgetClass methods */
+static void
+eel_wrap_table_size_request (GtkWidget *widget,
+				  GtkRequisition *requisition)
+{
+	EelWrapTable *wrap_table;
+	EelDimensions content_dimensions;
+
+ 	g_assert (EEL_IS_WRAP_TABLE (widget));
+ 	g_assert (requisition != NULL);
+
+  	wrap_table = EEL_WRAP_TABLE (widget);
+
+	content_dimensions = wrap_table_get_content_dimensions (wrap_table);
+
+	/* The -1 tells Satan to use as much space as is available */
+	requisition->width = -1;
+	requisition->height = content_dimensions.height + GTK_CONTAINER (widget)->border_width * 2;
+}
+
+static void
+eel_wrap_table_size_allocate (GtkWidget *widget,
+				   GtkAllocation *allocation)
+{
+	EelWrapTable *wrap_table;
+
+ 	g_assert (EEL_IS_WRAP_TABLE (widget));
+ 	g_assert (allocation != NULL);
+	
+  	wrap_table = EEL_WRAP_TABLE (widget);
+	
+	widget->allocation = *allocation;
+
+	wrap_table_layout (wrap_table);
+}
+
+static int
+eel_wrap_table_expose_event (GtkWidget *widget,
+			     GdkEventExpose *event)
+{
+	EelWrapTable *wrap_table;
+	GList *iterator;
+	
+	g_assert (EEL_IS_WRAP_TABLE (widget));
+	g_assert (GTK_WIDGET_REALIZED (widget));
+	g_assert (event != NULL);
+
+  	wrap_table = EEL_WRAP_TABLE (widget);
+
+	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
+		g_assert (GTK_IS_WIDGET (iterator->data));
+		gtk_container_propagate_expose (GTK_CONTAINER (widget),
+						GTK_WIDGET (iterator->data),
+						event);
+	}
+
+	return FALSE;
+}
+
+static void
+eel_wrap_table_map (GtkWidget *widget)
+{
+	EelWrapTable *wrap_table;
+	GList *iterator;
+
+	g_assert (EEL_IS_WRAP_TABLE (widget));
+	
+	wrap_table = EEL_WRAP_TABLE (widget);
+
+ 	GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+	
+	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
+		GtkWidget *item;
+
+		item = iterator->data;
+
+		if (GTK_WIDGET_VISIBLE (item) && !GTK_WIDGET_MAPPED (item)) {
+			gtk_widget_map (item);
+		}
+	}
+}
+
+static void
+eel_wrap_table_unmap (GtkWidget *widget)
+{
+	EelWrapTable *wrap_table;
+	GList *iterator;
+
+	g_assert (EEL_IS_WRAP_TABLE (widget));
+	
+	wrap_table = EEL_WRAP_TABLE (widget);
+
+	GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+
+	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
+		GtkWidget *item;
+
+		item = iterator->data;
+
+		if (GTK_WIDGET_VISIBLE (item) && GTK_WIDGET_MAPPED (item)) {
+			gtk_widget_unmap (item);
+		}
+	}
+}
+
+static void
+eel_wrap_table_realize (GtkWidget *widget)
+{
+	g_assert (EEL_IS_WRAP_TABLE (widget));
+
+	GTK_WIDGET_CLASS (parent_class)->realize (widget);
+
+	gtk_widget_queue_resize (widget);
+}
+
+/* GtkContainerClass methods */
+static void
+eel_wrap_table_add (GtkContainer *container,
+			GtkWidget *child)
+{
+	EelWrapTable *wrap_table;
+
+	g_assert (container != NULL);
+	g_assert (EEL_IS_WRAP_TABLE (container));
+	g_assert (GTK_IS_WIDGET (child));
+
+	wrap_table = EEL_WRAP_TABLE (container);
+
+	gtk_widget_set_parent (child, GTK_WIDGET (container));
+
+	wrap_table->details->children = g_list_append (wrap_table->details->children, child);
+
+	if (GTK_WIDGET_REALIZED (container)) {
+		gtk_widget_realize (child);
+	}
+
+	if (GTK_WIDGET_VISIBLE (container) && GTK_WIDGET_VISIBLE (child)) {
+		if (GTK_WIDGET_MAPPED (container)) {
+			gtk_widget_map (child);
+		}
+		
+		gtk_widget_queue_resize (child);
+	}
+
+	if (wrap_table->details->is_scrolled) {
+		g_signal_connect (child, "focus_in_event", 
+				  G_CALLBACK (wrap_table_child_focus_in), 
+				  wrap_table);
+	}
+}
+
+static void
+eel_wrap_table_remove (GtkContainer *container,
+			    GtkWidget *child)
+{
+	EelWrapTable *wrap_table;
+	gboolean child_was_visible;
+	
+	g_assert (EEL_IS_WRAP_TABLE (container));
+	g_assert (GTK_IS_WIDGET (child));
+	
+	wrap_table = EEL_WRAP_TABLE (container);;
+
+	child_was_visible = GTK_WIDGET_VISIBLE (child);
+	gtk_widget_unparent (child);
+	wrap_table->details->children = g_list_remove (wrap_table->details->children, child);
+
+	if (child_was_visible) {
+		gtk_widget_queue_resize (GTK_WIDGET (container));
+	}
+
+	if (wrap_table->details->is_scrolled) {
+		g_signal_handlers_disconnect_by_func (
+			child,
+			G_CALLBACK (wrap_table_child_focus_in), 
+			wrap_table);
+	}
+}
+
+static void
+eel_wrap_table_forall (GtkContainer *container,
+			    gboolean include_internals,
+			    GtkCallback callback,
+			    gpointer callback_data)
+{
+	EelWrapTable *wrap_table;
+	GList *node;
+	GList *next;
+	
+	g_assert (EEL_IS_WRAP_TABLE (container));
+	g_assert (callback != NULL);
+	
+	wrap_table = EEL_WRAP_TABLE (container);;
+	
+	for (node = wrap_table->details->children; node != NULL; node = next) {
+		g_assert (GTK_IS_WIDGET (node->data));
+		next = node->next;
+		(* callback) (GTK_WIDGET (node->data), callback_data);	
+	}
+}
+
+static GtkType
+eel_wrap_table_child_type (GtkContainer   *container)
+{
+	return GTK_TYPE_WIDGET;
+}
+
+/* Private EelWrapTable methods */
+static int
+wrap_table_get_num_fitting (int available,
+			    int spacing,
+			    int max_child_size)
+{
+	int num;
+
+  	g_assert (max_child_size > 0);
+  	g_assert (spacing >= 0);
+
+	available = MAX (available, 0);
+	
+	num = (available + spacing) / (max_child_size + spacing);
+	num = MAX (num, 1);
+
+	return num;
+}
+
+static void
+wrap_table_layout (EelWrapTable *wrap_table)
+{
+	GList *iterator;
+	EelIPoint pos;
+	EelDimensions max_child_dimensions;
+	EelIRect content_bounds;
+	guint num_cols;
+
+ 	g_assert (EEL_IS_WRAP_TABLE (wrap_table));
+
+	max_child_dimensions = wrap_table_get_max_child_dimensions (wrap_table);
+	content_bounds = wrap_table_get_content_bounds (wrap_table);
+	pos.x = content_bounds.x0;
+	pos.y = content_bounds.y0;
+
+	num_cols = wrap_table_get_num_fitting (GTK_WIDGET (wrap_table)->allocation.width -
+					       GTK_CONTAINER (wrap_table)->border_width * 2,
+					       wrap_table->details->x_spacing,
+					       max_child_dimensions.width);
+	if (num_cols != wrap_table->details->cols) {
+		wrap_table->details->cols = num_cols;
+		gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
+		return;
+	}
+
+	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
+		GtkWidget *item;
+
+		item = iterator->data;
+		
+		if (GTK_WIDGET_VISIBLE (item)) {
+			GtkAllocation item_allocation;
+
+			if (wrap_table->details->homogeneous) {
+				item_allocation.x = pos.x;
+				item_allocation.y = pos.y;
+				item_allocation.width = max_child_dimensions.width;
+				item_allocation.height = max_child_dimensions.height;
+				
+				if ((pos.x + max_child_dimensions.width) > content_bounds.x1) {
+					pos.x = content_bounds.x0 + wrap_table->details->x_spacing + max_child_dimensions.width;
+					pos.y += (max_child_dimensions.height + wrap_table->details->y_spacing);
+					item_allocation.x = content_bounds.x0;
+					item_allocation.y = pos.y;
+				} else {
+					pos.x += (wrap_table->details->x_spacing + max_child_dimensions.width);
+				}
+			} else {
+				GtkRequisition item_requisition;
+				
+				gtk_widget_size_request (item, &item_requisition);
+				
+				item_allocation.x = pos.x;
+				item_allocation.y = pos.y;
+				item_allocation.width = item_requisition.width;
+				item_allocation.height = item_requisition.height;
+				
+				g_assert (item_allocation.width <= max_child_dimensions.width);
+				g_assert (item_allocation.height <= max_child_dimensions.height);
+				
+				if ((pos.x + max_child_dimensions.width) > content_bounds.x1) {
+					pos.x = content_bounds.x0 + wrap_table->details->x_spacing + max_child_dimensions.width;
+					pos.y += (max_child_dimensions.height + wrap_table->details->y_spacing);
+					item_allocation.x = content_bounds.x0;
+					item_allocation.y = pos.y;
+				} else {
+					pos.x += (wrap_table->details->x_spacing + max_child_dimensions.width);
+				}
+				
+				switch (wrap_table->details->x_justification) {
+				case EEL_JUSTIFICATION_MIDDLE:
+					item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width) / 2;
+					break;
+				case EEL_JUSTIFICATION_END:
+					item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width);
+					break;
+				default:
+					break;
+				}
+				
+				switch (wrap_table->details->y_justification) {
+				case EEL_JUSTIFICATION_MIDDLE:
+					item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height) / 2;
+					break;
+				case EEL_JUSTIFICATION_END:
+					item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height);
+					break;
+				default:
+					break;
+				}
+			}
+			
+			gtk_widget_size_allocate (item, &item_allocation);
+		}
+	}
+}
+
+static EelDimensions
+wrap_table_irect_max_dimensions (const EelDimensions *one,
+				     const EelDimensions *two)
+{
+	EelDimensions max_dimensions;
+
+	g_assert (one != NULL);
+	g_assert (two != NULL);
+
+	max_dimensions.width = MAX (one->width, two->width);
+	max_dimensions.height = MAX (one->height, two->height);
+
+	return max_dimensions;
+}
+
+static EelDimensions
+wrap_table_get_max_child_dimensions (const EelWrapTable *wrap_table)
+{
+	EelDimensions max_dimensions;
+	GList *iterator;
+
+  	g_assert (EEL_IS_WRAP_TABLE (wrap_table));
+
+	max_dimensions = eel_dimensions_empty;
+
+	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
+		GtkWidget *child;
+		
+		child = iterator->data;
+		
+		if (GTK_WIDGET_VISIBLE (child)) {
+ 			GtkRequisition child_requisition;
+			EelDimensions child_dimensions;
+
+ 			gtk_widget_size_request (child, &child_requisition);
+
+			child_dimensions.width = (int) child_requisition.width;
+			child_dimensions.height = (int) child_requisition.height;
+
+			max_dimensions = wrap_table_irect_max_dimensions (&child_dimensions, &max_dimensions);
+		}
+	}
+
+	return max_dimensions;
+}
+
+static EelDimensions
+wrap_table_get_content_dimensions (const EelWrapTable *wrap_table)
+{
+	EelDimensions content_dimensions;
+	guint num_children;
+
+  	g_assert (EEL_IS_WRAP_TABLE (wrap_table));
+
+	content_dimensions = eel_dimensions_empty;
+	
+	num_children = g_list_length (wrap_table->details->children);
+
+	if (num_children > 0) {
+		EelDimensions max_child_dimensions;
+		EelDimensions dimensions;
+		int num_cols;
+		int num_rows;
+
+		dimensions = eel_gtk_widget_get_dimensions (GTK_WIDGET (wrap_table));
+		max_child_dimensions = wrap_table_get_max_child_dimensions (wrap_table);
+
+		max_child_dimensions.width = MAX (max_child_dimensions.width, 1);
+		max_child_dimensions.height = MAX (max_child_dimensions.height, 1);
+
+		num_cols = wrap_table_get_num_fitting (dimensions.width -
+						       GTK_CONTAINER (wrap_table)->border_width * 2,
+						       wrap_table->details->x_spacing,
+						       max_child_dimensions.width);
+		num_rows = num_children / num_cols;
+		num_rows = MAX (num_rows, 1);
+		
+		if ((num_children % num_rows) > 0) {
+			num_rows++;
+		}
+		
+		content_dimensions.width = dimensions.width;
+		content_dimensions.height = num_rows * max_child_dimensions.height;
+
+		content_dimensions.width += (num_cols - 1) * wrap_table->details->x_spacing;
+		content_dimensions.height += (num_rows - 1) * wrap_table->details->y_spacing;
+	}
+
+	return content_dimensions;
+}
+
+static EelIRect
+wrap_table_get_content_bounds (const EelWrapTable *wrap_table)
+{
+	EelIRect content_bounds;
+
+  	g_assert (EEL_IS_WRAP_TABLE (wrap_table));
+
+	content_bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (wrap_table));
+
+	content_bounds.x0 += GTK_CONTAINER (wrap_table)->border_width;
+	content_bounds.y0 += GTK_CONTAINER (wrap_table)->border_width;
+	content_bounds.x1 -= GTK_CONTAINER (wrap_table)->border_width;
+	content_bounds.y1 -= GTK_CONTAINER (wrap_table)->border_width;
+
+	return content_bounds;
+}
+
+static gboolean
+wrap_table_child_focus_in (GtkWidget *widget, 
+			   GdkEventFocus *event, 
+			   gpointer data)
+{
+	g_assert (widget->parent && widget->parent->parent);
+	g_assert (GTK_IS_VIEWPORT (widget->parent->parent));
+
+	eel_gtk_viewport_scroll_to_rect (GTK_VIEWPORT (widget->parent->parent), 
+					 &widget->allocation);
+	
+	return FALSE;
+}
+
+/**
+ * eel_wrap_table_new:
+ *
+ */
+GtkWidget*
+eel_wrap_table_new (gboolean homogeneous)
+{
+	EelWrapTable *wrap_table;
+
+	wrap_table = EEL_WRAP_TABLE (gtk_widget_new (eel_wrap_table_get_type (), NULL));
+
+	eel_wrap_table_set_homogeneous (wrap_table, homogeneous);
+	
+	return GTK_WIDGET (wrap_table);
+}
+
+/**
+ * eel_wrap_table_set_x_spacing:
+ * @wrap_table: A EelWrapTable.
+ * @x_spacing: The new horizontal spacing between wraps.
+ *
+ */
+void
+eel_wrap_table_set_x_spacing (EelWrapTable *wrap_table,
+				   guint x_spacing)
+{
+	g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+	
+	if (wrap_table->details->x_spacing == x_spacing) {
+		return;
+	}
+	
+	wrap_table->details->x_spacing = x_spacing;
+
+	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
+}
+
+/**
+ * eel_wrap_table_get_item_spacing:
+ * @wrap_table: A EelWrapTable.
+ *
+ * Returns: The horizontal spacing between wraps.
+ */
+guint
+eel_wrap_table_get_x_spacing (const EelWrapTable *wrap_table)
+{
+	g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), 0);
+	
+	return wrap_table->details->x_spacing;
+}
+
+/**
+ * eel_wrap_table_set_y_spacing:
+ * @wrap_table: A EelWrapTable.
+ * @y_spacing: The new horizontal spacing between wraps.
+ *
+ */
+void
+eel_wrap_table_set_y_spacing (EelWrapTable *wrap_table,
+				   guint y_spacing)
+{
+	g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+	
+	if (wrap_table->details->y_spacing == y_spacing) {
+		return;
+	}
+	
+	wrap_table->details->y_spacing = y_spacing;
+
+	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
+}
+
+/**
+ * eel_wrap_table_get_item_spacing:
+ * @wrap_table: A EelWrapTable.
+ *
+ * Returns: The horizontal spacing between wraps.
+ */
+guint
+eel_wrap_table_get_y_spacing (const EelWrapTable *wrap_table)
+{
+	g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), 0);
+	
+	return wrap_table->details->y_spacing;
+}
+
+
+/**
+ * eel_wrap_table_find_child_at_event_point:
+ * @wrap_table: A EelWrapTable.
+ * @x: Event x;
+ * @y: Event y;
+ *
+ * Returns: Child found at given coordinates or NULL of no child is found.
+ */
+GtkWidget *
+eel_wrap_table_find_child_at_event_point (const EelWrapTable *wrap_table,
+					  int x,
+					  int y)
+{
+	GList *iterator;
+	
+  	g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), NULL);
+
+	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
+		GtkWidget *child;
+		
+		child = iterator->data;
+		
+		if (GTK_WIDGET_VISIBLE (child)) {
+			EelIRect child_bounds;
+
+			child_bounds = eel_gtk_widget_get_bounds (child);
+ 			
+			if (eel_irect_contains_point (child_bounds, x, y)) {
+				return child;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * eel_wrap_table_set_x_justification:
+ * @wrap_table: A EelWrapTable.
+ * @x_justification: The new horizontal justification between wraps.
+ *
+ */
+void
+eel_wrap_table_set_x_justification (EelWrapTable *wrap_table,
+					 EelJustification x_justification)
+{
+	g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+	g_return_if_fail (x_justification >= EEL_JUSTIFICATION_BEGINNING);
+	g_return_if_fail (x_justification <= EEL_JUSTIFICATION_END);
+	
+	if (wrap_table->details->x_justification == x_justification) {
+		return;
+	}
+	
+	wrap_table->details->x_justification = x_justification;
+	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
+}
+
+/**
+ * eel_wrap_table_get_item_justification:
+ * @wrap_table: A EelWrapTable.
+ *
+ * Returns: The horizontal justification between wraps.
+ */
+EelJustification 
+eel_wrap_table_get_x_justification (const EelWrapTable *wrap_table)
+{
+	g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), 0);
+	
+	return wrap_table->details->x_justification;
+}
+
+/**
+ * eel_wrap_table_set_y_justification:
+ * @wrap_table: A EelWrapTable.
+ * @y_justification: The new horizontal justification between wraps.
+ *
+ */
+void
+eel_wrap_table_set_y_justification (EelWrapTable *wrap_table,
+					 EelJustification y_justification)
+{
+	g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+	g_return_if_fail (y_justification >= EEL_JUSTIFICATION_BEGINNING);
+	g_return_if_fail (y_justification <= EEL_JUSTIFICATION_END);
+	
+	if (wrap_table->details->y_justification == y_justification) {
+		return;
+	}
+	
+	wrap_table->details->y_justification = y_justification;
+	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
+}
+
+/**
+ * eel_wrap_table_get_item_justification:
+ * @wrap_table: A EelWrapTable.
+ *
+ * Returns: The horizontal justification between wraps.
+ */
+EelJustification 
+eel_wrap_table_get_y_justification (const EelWrapTable *wrap_table)
+{
+	g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), 0);
+	
+	return wrap_table->details->y_justification;
+}
+
+/**
+ * eel_wrap_table_set_homogeneous:
+ * @wrap_table: A EelWrapTable.
+ * @homogeneous: The new horizontal spacing between wraps.
+ *
+ */
+void
+eel_wrap_table_set_homogeneous (EelWrapTable *wrap_table,
+				     gboolean homogeneous)
+{
+	g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+	
+	if (wrap_table->details->homogeneous == homogeneous) {
+		return;
+	}
+	
+	wrap_table->details->homogeneous = homogeneous;
+
+	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
+}
+
+/**
+ * eel_wrap_table_get_item_spacing:
+ * @wrap_table: A EelWrapTable.
+ *
+ * Returns: The horizontal spacing between wraps.
+ */
+gboolean
+eel_wrap_table_get_homogeneous (const EelWrapTable *wrap_table)
+{
+	g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), FALSE);
+	
+	return wrap_table->details->homogeneous;
+}
+
+/**
+ * eel_wrap_table_reorder_child:
+ * @wrap_table: A EelWrapTable.
+ * @child: Child to reorder.
+ * @position: New position to put child at.
+ *
+ * Reorder the given chilren into the given position.
+ *
+ * Position is interpreted as follows:
+ *
+ *  0 - Place child at start of table.
+ * -1 - Place child at end of table.
+ *  n - Place child at nth position.  Count starts at 0.
+ */
+void
+eel_wrap_table_reorder_child (EelWrapTable *wrap_table,
+				   GtkWidget *child,
+				   int position)
+{
+	GList *node;
+	gboolean found_child = FALSE;
+
+	g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+	g_return_if_fail (g_list_length (wrap_table->details->children) > 0);
+
+	if (position == -1) {
+		position = g_list_length (wrap_table->details->children) - 1;
+	}
+
+	g_return_if_fail (position >= 0);
+	g_return_if_fail ((guint) position < g_list_length (wrap_table->details->children));
+
+	for (node = wrap_table->details->children; node != NULL; node = node->next) {
+		GtkWidget *next_child;
+		next_child = node->data;
+		
+		if (next_child == child) {
+			g_assert (found_child == FALSE);
+			found_child = TRUE;
+		}
+	}
+
+	g_return_if_fail (found_child);
+
+	wrap_table->details->children = g_list_remove (wrap_table->details->children, child);
+	wrap_table->details->children = g_list_insert (wrap_table->details->children, child, position);
+
+	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
+}
+
+/**
+ * eel_wrap_table_get_num_children:
+ * @wrap_table: A EelWrapTable.
+ *
+ * Returns: The number of children being managed by the wrap table.
+ */
+guint
+eel_wrap_table_get_num_children (const EelWrapTable *wrap_table)
+{
+	g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), 0);
+	
+	return g_list_length (wrap_table->details->children);
+}
+
+GtkWidget *
+eel_scrolled_wrap_table_new (gboolean homogenous,
+			     GtkWidget **wrap_table_out)
+{
+	GtkWidget *scrolled_window;
+	GtkWidget *wrap_table;
+	GtkWidget *viewport;
+	
+	g_return_val_if_fail (wrap_table_out != NULL, NULL);
+	
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+					GTK_POLICY_NEVER,
+					GTK_POLICY_AUTOMATIC);
+
+	viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window)),
+				     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport),
+				      GTK_SHADOW_NONE);
+	
+	gtk_container_add (GTK_CONTAINER (scrolled_window),
+			   viewport);
+	
+	wrap_table = eel_wrap_table_new (homogenous);
+	gtk_container_add (GTK_CONTAINER (viewport),
+			   wrap_table);
+
+	gtk_widget_show (wrap_table);
+	gtk_widget_show (viewport);
+
+	EEL_WRAP_TABLE (wrap_table)->details->is_scrolled = 1;
+
+	*wrap_table_out = wrap_table;
+	return scrolled_window;
+}
diff --git a/eel/eel-wrap-table.h b/eel/eel-wrap-table.h
new file mode 100644
index 000000000..ab04e2b2e
--- /dev/null
+++ b/eel/eel-wrap-table.h
@@ -0,0 +1,97 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-wrap-table.h - A table that can wrap its contents as needed.
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Ramiro Estrugo <ramiro@eazel.com>
+*/
+
+#ifndef EEL_WRAP_TABLE_H
+#define EEL_WRAP_TABLE_H
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define EEL_TYPE_WRAP_TABLE            (eel_wrap_table_get_type ())
+#define EEL_WRAP_TABLE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_WRAP_TABLE, EelWrapTable))
+#define EEL_WRAP_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_WRAP_TABLE, EelWrapTableClass))
+#define EEL_IS_WRAP_TABLE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_WRAP_TABLE))
+#define EEL_IS_WRAP_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_WRAP_TABLE))
+
+typedef struct EelWrapTable	       EelWrapTable;
+typedef struct EelWrapTableClass       EelWrapTableClass;
+typedef struct EelWrapTableDetails     EelWrapTableDetails;
+
+struct EelWrapTable
+{
+	/* Superclass */
+	GtkContainer container;
+
+	/* Private things */
+	EelWrapTableDetails *details;
+};
+
+struct EelWrapTableClass
+{
+	GtkContainerClass parent_class;
+};
+
+typedef enum
+{
+	EEL_JUSTIFICATION_BEGINNING,
+	EEL_JUSTIFICATION_MIDDLE,
+	EEL_JUSTIFICATION_END
+} EelJustification;
+
+/* Public GtkWrapTable methods */
+GtkType          eel_wrap_table_get_type                  (void);
+GtkWidget *      eel_wrap_table_new                       (gboolean            homogeneous);
+void             eel_wrap_table_set_x_spacing             (EelWrapTable       *wrap_table,
+							   guint               x_spacing);
+guint            eel_wrap_table_get_x_spacing             (const EelWrapTable *wrap_table);
+void             eel_wrap_table_set_y_spacing             (EelWrapTable       *wrap_table,
+							   guint               y_spacing);
+guint            eel_wrap_table_get_y_spacing             (const EelWrapTable *wrap_table);
+GtkWidget *      eel_wrap_table_find_child_at_event_point (const EelWrapTable *wrap_table,
+							   int                 x,
+							   int                 y);
+void             eel_wrap_table_set_x_justification       (EelWrapTable       *wrap_table,
+							   EelJustification    justification);
+EelJustification eel_wrap_table_get_x_justification       (const EelWrapTable *wrap_table);
+void             eel_wrap_table_set_y_justification       (EelWrapTable       *wrap_table,
+							   EelJustification    justification);
+EelJustification eel_wrap_table_get_y_justification       (const EelWrapTable *wrap_table);
+void             eel_wrap_table_set_homogeneous           (EelWrapTable       *wrap_table,
+							   gboolean            homogeneous);
+gboolean         eel_wrap_table_get_homogeneous           (const EelWrapTable *wrap_table);
+void             eel_wrap_table_reorder_child             (EelWrapTable       *wrap_table,
+							   GtkWidget          *child,
+							   int                 position);
+guint            eel_wrap_table_get_num_children          (const EelWrapTable *wrap_table);
+
+GtkWidget *      eel_scrolled_wrap_table_new              (gboolean            homogenous, 
+							   GtkWidget         **wrap_table_out);
+
+G_END_DECLS
+
+#endif /* EEL_WRAP_TABLE_H */
+
+
diff --git a/eel/eel-xml-extensions.c b/eel/eel-xml-extensions.c
new file mode 100644
index 000000000..7a89edd83
--- /dev/null
+++ b/eel/eel-xml-extensions.c
@@ -0,0 +1,184 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-xml-extensions.c - functions that extend gnome-xml
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#include <config.h>
+#include "eel-xml-extensions.h"
+
+#include "eel-string.h"
+#include "eel-i18n.h"
+#include <glib.h>
+#include <libxml/parser.h>
+#include <stdlib.h>
+
+xmlNodePtr
+eel_xml_get_children (xmlNodePtr parent)
+{
+	if (parent == NULL) {
+		return NULL;
+	}
+	return parent->children;
+}
+
+xmlNodePtr
+eel_xml_get_root_children (xmlDocPtr document)
+{
+	return eel_xml_get_children (xmlDocGetRootElement (document));
+}
+
+xmlNodePtr
+eel_xml_get_child_by_name_and_property (xmlNodePtr parent,
+					     const char *child_name,
+					     const char *property_name,
+					     const char *property_value)
+{
+	xmlNodePtr child;
+	xmlChar *property;
+	gboolean match;
+
+	if (parent == NULL) {
+		return NULL;
+	}
+	for (child = eel_xml_get_children (parent); child != NULL; child = child->next) {
+		if (strcmp (child->name, child_name) == 0) {
+			property = xmlGetProp (child, property_name);
+			match = eel_strcmp (property, property_value) == 0;
+			xmlFree (property);
+			if (match) {
+				return child;
+			}
+		}
+	}
+	return NULL;
+}
+
+/* return a child of the passed-in node with a matching name */
+
+xmlNodePtr
+eel_xml_get_child_by_name (xmlNodePtr parent,
+					     const char *child_name)
+{
+	xmlNodePtr child;
+
+	if (parent == NULL) {
+		return NULL;
+	}
+	for (child = eel_xml_get_children (parent); child != NULL; child = child->next) {
+		if (strcmp (child->name, child_name) == 0) {
+			return child;
+		}
+	}
+	return NULL;
+}
+
+
+xmlNodePtr
+eel_xml_get_root_child_by_name_and_property (xmlDocPtr document,
+						  const char *child_name,
+						  const char *property_name,
+						  const char *property_value)
+{
+	return eel_xml_get_child_by_name_and_property
+		(xmlDocGetRootElement (document),
+		 child_name,
+		 property_name,
+		 property_value);
+}
+
+/**
+ * eel_xml_get_property_for_children
+ * 
+ * Returns a list of the values for the specified property for all
+ * children of the node that have the specified name.
+ *
+ * @parent:     xmlNodePtr representing the node in question.
+ * @child_name: child element name to look for
+ * @property:   name of propety to reutnr for matching children that have the property
+ * 
+ * Returns: A list of keywords.
+ * 
+ **/
+GList *
+eel_xml_get_property_for_children (xmlNodePtr parent,
+					const char *child_name,
+					const char *property_name)
+{
+	GList *properties;
+	xmlNode *child;
+	xmlChar *property;
+	
+	properties = NULL;
+	
+	for (child = eel_xml_get_children (parent);
+	     child != NULL;
+	     child = child->next) {
+		if (strcmp (child->name, child_name) == 0) {
+			property = xmlGetProp (child, property_name);
+			if (property != NULL) {
+				properties = g_list_prepend (properties,
+							     g_strdup (property));
+				xmlFree (property);
+			}
+		}
+	}
+
+	/* Reverse so you get them in the same order as the XML file. */
+	return g_list_reverse (properties);
+}
+
+xmlChar *
+eel_xml_get_property_translated (xmlNodePtr parent,
+				      const char *property_name)
+{
+	xmlChar *property, *untranslated_property;
+	char *untranslated_property_name;
+	const char *translated_property;
+
+	/* Try for the already-translated version. */
+	property = xmlGetProp (parent, property_name);
+	if (property != NULL) {
+		return property;
+	}
+
+	/* Try for the untranslated version. */
+	untranslated_property_name = g_strconcat ("_", property_name, NULL);
+	untranslated_property = xmlGetProp (parent, untranslated_property_name);
+	g_free (untranslated_property_name);
+	if (untranslated_property == NULL) {
+		return NULL;
+	}
+
+	/* Try to translate. */
+	translated_property = gettext (untranslated_property);
+
+	/* If not translation is found, return untranslated property as-is. */
+	if (translated_property == (char *) untranslated_property) {
+		return untranslated_property;
+	}
+	
+	/* If a translation happened, make a copy to match the normal
+	 * behavior of this function (returning a string you xmlFree).
+	 */
+	xmlFree (untranslated_property);
+	return xmlStrdup (translated_property);
+}
diff --git a/eel/eel-xml-extensions.h b/eel/eel-xml-extensions.h
new file mode 100644
index 000000000..e789dc6de
--- /dev/null
+++ b/eel/eel-xml-extensions.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel-xml-extensions.h - functions that extend gnome-xml
+
+   Copyright (C) 2000 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Darin Adler <darin@eazel.com>
+*/
+
+#ifndef EEL_XML_EXTENSIONS_H
+#define EEL_XML_EXTENSIONS_H
+
+#include <libxml/tree.h>
+#include <glib.h>
+
+xmlNodePtr eel_xml_get_children                        (xmlNodePtr  parent);
+xmlNodePtr eel_xml_get_root_children                   (xmlDocPtr   document);
+xmlNodePtr eel_xml_get_child_by_name                   (xmlNodePtr  parent,
+							const char *child_name);
+xmlNodePtr eel_xml_get_child_by_name_and_property      (xmlNodePtr  parent,
+							const char *child_name,
+							const char *property_name,
+							const char *property_value);
+xmlNodePtr eel_xml_get_root_child_by_name_and_property (xmlDocPtr   document,
+							const char *child_name,
+							const char *property_name,
+							const char *property_value);
+GList     *eel_xml_get_property_for_children           (xmlNodePtr  parent,
+							const char *child_name,
+							const char *property_name);
+xmlChar   *eel_xml_get_property_translated             (xmlNodePtr  parent,
+							const char *property_name);
+
+#endif /* EEL_XML_EXTENSIONS_H */
diff --git a/eel/eel.h b/eel/eel.h
new file mode 100644
index 000000000..69e49c54c
--- /dev/null
+++ b/eel/eel.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* eel.h
+
+   Copyright (C) 2001 Eazel, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Maciej Stachowiak <mjs@eazel.com>
+*/
+
+#ifndef EEL_H
+#define EEL_H
+
+#include <eel/eel-art-extensions.h>
+#include <eel/eel-art-gtk-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-enumeration.h>
+#include <eel/eel-gconf-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-graphic-effects.h>
+#include <eel/eel-gtk-container.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image-table.h>
+#include <eel/eel-labeled-image.h>
+#include <eel/eel-pango-extensions.h>
+#include <eel/eel-preferences.h>
+#include <eel/eel-self-checks.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-types.h>
+#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-wrap-table.h>
+#include <eel/eel-xml-extensions.h>
+
+#endif /* EEL_H */
diff --git a/eel/eelmarshal.list b/eel/eelmarshal.list
new file mode 100644
index 000000000..3974c4b77
--- /dev/null
+++ b/eel/eelmarshal.list
@@ -0,0 +1,13 @@
+BOOLEAN:BOOLEAN
+BOOLEAN:BOXED
+BOOLEAN:POINTER,POINTER
+BOOLEAN:VOID
+ENUM:INT,INT
+INT:INT
+INT:POINTER,STRING
+STRING:POINTER
+STRING:VOID
+VOID:ENUM,INT
+VOID:ENUM,INT,BOOLEAN
+VOID:INT,INT,INT,INT
+VOID:OBJECT,POINTER
diff --git a/eel/makeenums.pl b/eel/makeenums.pl
new file mode 100755
index 000000000..95a4816cf
--- /dev/null
+++ b/eel/makeenums.pl
@@ -0,0 +1,220 @@
+#!/usr/bin/perl -w
+
+# This script snarfs the enums from header files and writes them out into
+# a .defs file (gnome.defs, for example). From there, the sister script
+# maketypes.awk converts the defs into a *typebuiltins.h, as well as
+# *typebuiltins_vals.c, *typebuiltins_ids.c and *typebuiltins_evals.c.
+
+# Information about the current enumeration
+
+my $flags;			# Is enumeration a bitmask
+my $seenbitshift;			# Have we seen bitshift operators?
+my $prefix;			# Prefix for this enumeration
+my $enumname;			# Name for this enumeration
+my $firstenum = 1;		# Is this the first enumeration in file?
+my @entries;			# [ $name, $val ] for each entry
+
+sub parse_options {
+    my $opts = shift;
+    my @opts;
+
+    for $opt (split /\s*,\s*/, $opts) {
+	my ($key,$val) = $opt =~ /\s*(\w+)(?:=(\S+))?/;
+	defined $val or $val = 1;
+	push @opts, $key, $val;
+    }
+    @opts;
+}
+sub parse_entries {
+    my $file = shift;
+
+    while (<$file>) {
+	# Read lines until we have no open comments
+	while (m@/\*
+	       ([^*]|\*(?!/))*$
+	       @x) {
+	    my $new;
+	    defined ($new = <$file>) || die "Unmatched comment";
+	    $_ .= $new;
+	}
+	# Now strip comments
+	s@/\*(?!<)
+	    ([^*]+|\*(?!/))*
+	   \*/@@gx;
+	
+	s@\n@ @;
+	
+	next if m@^\s*$@;
+
+	# Handle include files
+	if (/^\#include\s*<([^>]*)>/ ) {
+            my $file= "../$1";
+	    open NEWFILE, $file or die "Cannot open include file $file: $!\n";
+	    
+	    if (parse_entries (\*NEWFILE)) {
+		return 1;
+	    } else {
+		next;
+	    }
+	}
+	
+	if (/^\s*\}\s*(\w+)/) {
+	    $enumname = $1;
+	    return 1;
+	}
+
+	if (m@^\s*
+              (\w+)\s*		         # name
+              (?:=(                      # value
+                   (?:[^,/]|/(?!\*))*
+                  ))?,?\s*
+              (?:/\*<		         # options 
+                (([^*]|\*(?!/))*)
+               >\*/)?
+              \s*$
+             @x) {
+	    my ($name, $value, $options) = ($1,$2,$3);
+
+	    if (!defined $flags && defined $value && $value =~ /<</) {
+		$seenbitshift = 1;
+	    }
+	    if (defined $options) {
+		my %options = parse_options($options);
+		if (!defined $options{skip}) {
+		    push @entries, [ $name, $options{nick} ];
+		}
+	    } else {
+		push @entries, [ $name ];
+	    }
+	} else {
+	    print STDERR "Can't understand: $_\n";
+	}
+    }
+    return 0;
+}
+
+
+my $gen_arrays = 0;
+my $gen_defs = 0;
+
+# Parse arguments
+
+if (@ARGV) {
+    if ($ARGV[0] eq "arrays") {
+	shift @ARGV;
+	$gen_arrays = 1;
+    } elsif ($ARGV[0] eq "defs") {
+	shift @ARGV;
+	$gen_defs = 1;
+    } else {
+	$gen_defs = 1;
+    }
+    
+}
+
+if ($gen_defs) {
+    print ";; generated by makeenums.pl  ; -*- scheme -*-\n\n";
+} else {
+    print "/* Generated by makeenums.pl */\n\n";
+}
+
+ENUMERATION:
+while (<>) {
+    if (eof) {
+	close (ARGV);		# reset line numbering
+	$firstenum = 1;		# Flag to print filename at next enum
+    }
+
+    if (m@^\s*typedef\s+enum\s*
+           ({)?\s*
+           (?:/\*<
+             (([^*]|\*(?!/))*)
+            >\*/)?
+         @x) {
+	if (defined $2) {
+	    my %options = parse_options($2);
+	    $prefix = $options{prefix};
+	    $flags = $options{flags};
+	} else {
+	    $prefix = undef;
+	    $flags = undef;
+	}
+	# Didn't have trailing '{' look on next lines
+	if (!defined $1) {
+	    while (<>) {
+		if (s/^\s*\{//) {
+		    last;
+		}
+	    }
+	}
+
+	$seenbitshift = 0;
+	@entries = ();
+
+	# Now parse the entries
+	parse_entries (\*ARGV);
+
+	# figure out if this was a flags or enums enumeration
+
+	if (!defined $flags) {
+	    $flags = $seenbitshift;
+	}
+
+	# Autogenerate a prefix
+
+	if (!defined $prefix) {
+	    for (@entries) {
+		my $name = $_->[0];
+		if (defined $prefix) {
+		    my $tmp = ~ ($name ^ $prefix);
+		    ($tmp) = $tmp =~ /(^\xff*)/;
+		    $prefix = $prefix & $tmp;
+		} else {
+		    $prefix = $name;
+		}
+	    }
+	    # Trim so that it ends in an underscore
+	    $prefix =~ s/_[^_]*$/_/;
+	}
+	
+	for $entry (@entries) {
+	    my ($name,$nick) = @{$entry};
+            if (!defined $nick) {
+ 	        ($nick = $name) =~ s/^$prefix//;
+	        $nick =~ tr/_/-/;
+	        $nick = lc($nick);
+	        @{$entry} = ($name, $nick);
+            }
+	}
+
+	# Spit out the output
+
+	if ($gen_defs) {
+	    if ($firstenum) {
+		print qq(\n; enumerations from "$ARGV"\n);
+		$firstenum = 0;
+	    }
+	    
+	    print "\n(define-".($flags ? "flags" : "enum")." $enumname";
+
+	    for (@entries) {
+		my ($name,$nick) = @{$_};
+		print "\n   ($nick $name)";
+	    }
+	    print ")\n";
+
+	} else {
+	    ($valuename = $enumname) =~ s/([A-Z][a-z])/_$1/g;
+	    $valuename =~ s/([a-z])([A-Z])/$1_$2/g;
+	    $valuename = lc($valuename);
+
+	    print "static const GEnumValue $ {valuename}_values[] = {\n";
+	    for (@entries) {
+		my ($name,$nick) = @{$_};
+		print qq(  { $name, "$name", "$nick" },\n);
+	    }
+	    print "  { 0, NULL, NULL }\n";
+	    print "};\n";
+	}
+    }
+}
diff --git a/eel/maketypes.awk b/eel/maketypes.awk
new file mode 100755
index 000000000..4284eddd9
--- /dev/null
+++ b/eel/maketypes.awk
@@ -0,0 +1,155 @@
+
+BEGIN {
+  type_name = "";	# GtkEnumType
+  type_macro = "";	# GTK_TYPE_ENUM_TYPE
+  type_ident = "";	# _gtk_enum_type
+  type_counter = 0;
+  gen_macros = 0;
+  gen_entries = 0;
+  gen_vars = 0;
+  boxed_copy = "";
+  boxed_free = "";
+  
+  for (i = 2; i < ARGC; i++)
+    {
+      if (ARGV[i] == "macros")
+	gen_macros = 1;
+      else if (ARGV[i] == "entries")
+	gen_entries = 1;
+      else if (ARGV[i] == "variables")
+	gen_vars = 1;
+      ARGV[i] = "";
+    }
+  
+  if (gen_macros)
+    {
+      printf ("/* type macros, generated by maketypes.awk */\n");
+      printf ("\n");
+      printf ("#ifdef G_OS_WIN32\n");
+      printf ("#  ifdef EEL_COMPILATION\n");
+      printf ("#    define EELTYPEBUILTINS_VAR __declspec(dllexport)\n");
+      printf ("#  else\n");
+      printf ("#    define EELTYPEBUILTINS_VAR extern __declspec(dllimport)\n");
+      printf ("#  endif\n");
+      printf ("#else\n");
+      printf ("#  ifdef EEL_COMPILATION\n");
+      printf ("#    define EELTYPEBUILTINS_VAR\n");
+      printf ("#  else\n");
+      printf ("#    define EELTYPEBUILTINS_VAR extern\n");
+      printf ("#  endif\n");
+      printf ("#endif\n");
+      printf ("\n");
+    }
+  else if (gen_entries)
+    printf ("/* type entries, generated by maketypes.awk */\n\n");
+  else if (gen_vars)
+    printf ("/* type variables, generated by maketypes.awk */\n\n");
+  else
+    {
+      printf ("hm? what do you want me to do?\n") > "/dev/stderr";
+      exit 1;
+    }
+}
+
+function set_type (set_type_1)
+{
+  type_counter += 1;
+  type_name = set_type_1;
+  type_macro = "EEL_TYPE_";
+  
+  tmp = type_name;
+# OK, the following is ridiculous, and sed s///g would be far easier
+  gsub ("[A-Z]", "@&", tmp);
+  gsub ("[^A-Z]@", "&_", tmp);
+  gsub ("@", "", tmp);
+  gsub ("[A-Z][A-Z][A-Z][0-9a-z]", "@&", tmp);
+  gsub ("@..", "&_", tmp);
+  gsub ("@", "", tmp);
+  type_macro = type_macro toupper (tmp);
+  type_ident = "_" tolower (tmp);
+
+  sub ("^EEL_TYPE_EEL_", "EEL_TYPE_", type_macro);
+}
+
+function generate (generate_what)
+{
+  if (gen_macros)
+    {
+      printf ("EELTYPEBUILTINS_VAR GType %s;\n", type_macro);
+    }
+  if (gen_entries)
+    {
+      printf ("  { \"%s\", &%s,\n", type_name, type_macro);
+      if (generate_what == "BOXED")
+	printf ("    G_TYPE_%s, %s, %s, },\n", generate_what, boxed_copy, boxed_free);
+      else
+	printf ("    G_TYPE_%s, %s_values },\n", generate_what, type_ident);
+    }
+  if (gen_vars)
+    {
+      printf ("EELTYPEBUILTINS_VAR GType %s = 0;\n", type_macro);
+    }
+}
+
+# skip scheme comments
+";" {
+  sub (";.*", "");
+}
+
+# parse keywords
+
+/\(define-enum/ {
+  if ($2 == "")
+    printf ("huh? define-enum keyword without arg?\n") > "/dev/stderr";
+  else
+    {
+      set_type($2);
+      generate("ENUM");
+    }
+}
+
+/\(define-flags/ {
+  if ($2 == "")
+    printf ("huh? define-flags keyword without arg?\n") > "/dev/stderr";
+  else
+    {
+      set_type($2);
+      generate("FLAGS");
+    }
+}
+
+/\(define-boxed/ {
+  if ($2 == "")
+    printf ("huh? define-boxed keyword without arg?\n") > "/dev/stderr";
+  else
+      {
+	  boxed_copy = "NULL";
+	  boxed_free = "NULL";
+	  set_type($2);
+	  do {
+	      getline;
+	      sub (";.*", "", $0);
+	  } while ($0 ~ /^[ \t]*$/);
+	  tmp_var1 = $1;
+	  if ($0 ~ /\)/) { generate("BOXED"); next; }
+	  do {
+	      getline;
+	      sub (";.*", "", $0);
+	  } while ($0 ~ /^[ \t]*$/);
+	  tmp_var2 = $1;
+	  sub (/\).*/, "", tmp_var2);
+	  if (tmp_var1 ~ /^[_A-Za-z][_A-Za-z0-9]*$/ &&
+	      tmp_var2 ~ /^[_A-Za-z][_A-Za-z0-9]*$/)
+	      {
+		  boxed_copy = tmp_var1;
+		  boxed_free = tmp_var2;
+		  # printf ("read boxed funcs: %s %s\n", boxed_copy, boxed_free) > "/dev/stderr";
+	      }
+	  generate("BOXED");
+      }
+}
+
+END {
+  if (gen_macros)
+    printf("\n#define\tEEL_TYPE_N_BUILTINS\t(%u)\n", type_counter);
+}
diff --git a/eel/update-from-egg.sh b/eel/update-from-egg.sh
new file mode 100755
index 000000000..9be68a9b4
--- /dev/null
+++ b/eel/update-from-egg.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+function die() {
+  echo $*
+  exit 1
+}
+
+if test -z "$EGGDIR"; then
+   echo "Must set EGGDIR"
+   exit 1
+fi
+
+if test -z "$EGGFILES"; then
+   echo "Must set EGGFILES"
+   exit 1
+fi
+
+for FILE in $EGGFILES; do
+  if cmp -s $EGGDIR/$FILE $FILE; then
+     echo "File $FILE is unchanged"
+  else
+     cp $EGGDIR/$FILE $FILE || die "Could not move $EGGDIR/$FILE to $FILE"
+     echo "Updated $FILE"
+  fi
+done
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 6b90a18c4..5a2f25fcf 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -30,6 +30,7 @@ libnautilus_private_la_LIBADD =		\
 	$(SELINUX_LIBS)			\
 	$(BEAGLE_LIBS)			\
 	$(TRACKER_LIBS)			\
+	$(top_builddir)/eel/libeel-2.la \
 	$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
 	$(CORE_LIBS)			\
 	$(NULL)
diff --git a/po/ChangeLog b/po/ChangeLog
index 627ab7799..49babed2b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-15  Alexander Larsson  <alexl@redhat.com>
+
+        * POTFILES.in:
+	* *.po:
+	Imported eel pofiles
+
 2008-12-08  Yair Hershkovitz  <yairhr@gmail.com>
 
 	* he.po: Updated Hebrew translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 790eb2752..3fe0b54ce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,6 +5,14 @@ cut-n-paste-code/libegg/eggdesktopfile.c
 cut-n-paste-code/libegg/eggsmclient.c
 data/browser.xml
 data/nautilus.xml.in
+eel/eel-alert-dialog.c
+eel/eel-canvas.c
+eel/eel-editable-label.c
+eel/eel-gconf-extensions.c
+eel/eel-glib-extensions.c
+eel/eel-gnome-extensions.c
+eel/eel-stock-dialogs.c
+eel/eel-vfs-extensions.c
 libnautilus-extension/nautilus-column.c
 libnautilus-extension/nautilus-menu-item.c
 libnautilus-extension/nautilus-property-page.c
diff --git a/po/am.po b/po/am.po
index e2ca56c93..4c1560edf 100644
--- a/po/am.po
+++ b/po/am.po
@@ -1,11 +1,20 @@
+# #-#-#-#-#  am.po (nautilus)  #-#-#-#-#
 # Translations into the Amharic Language.
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Nautilus package.
 # Ge'ez Frontier Foundation <locales@geez.org>, 2002.
 #
 #
+# #-#-#-#-#  am.po (eel VERSION)  #-#-#-#-#
+# Translations into the Amharic Language.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+# Ge'ez Frontier Foundation <locales@geez.org>, 2002.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  am.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -15,6 +24,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  am.po (eel VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: eel VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2003-01-07 10:33+EDT\n"
+"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
+"Language-Team: Amharic <locales@geez.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -503,9 +522,13 @@ msgid "Tooltip for the menu item"
 msgstr ""
 
 #: libnautilus-extension/nautilus-menu-item.c:227
+#: eel/eel-mime-application-chooser.c:237
 #, fuzzy
 msgid "Icon"
-msgstr "ምልክቶች"
+msgstr ""
+"#-#-#-#-#  am.po (nautilus)  #-#-#-#-#\n"
+"ምልክቶች\n"
+"#-#-#-#-#  am.po (eel VERSION)  #-#-#-#-#\n"
 
 #: libnautilus-extension/nautilus-menu-item.c:228
 msgid "Name of the icon to display in the menu item"
@@ -4276,10 +4299,13 @@ msgstr ""
 msgid "Couldn't Show Help"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3305
+#: src/file-manager/fm-properties-window.c:3305 eel/eel-open-with-dialog.c:793
 #, fuzzy
 msgid "Open With"
-msgstr "በ... ክፈት (_h)"
+msgstr ""
+"#-#-#-#-#  am.po (nautilus)  #-#-#-#-#\n"
+"በ... ክፈት (_h)\n"
+"#-#-#-#-#  am.po (eel VERSION)  #-#-#-#-#\n"
 
 #: src/file-manager/fm-properties-window.c:3643
 msgid "Cancel Showing Properties Window?"
@@ -5975,6 +6001,223 @@ msgstr "የመረብ ሰርቨር"
 msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ጽሑፍ"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:126
+#, fuzzy
+msgid "The type of alert"
+msgstr "የጽሑፉ መለያ።"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr ""
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "የጽሑፉ መለያ።"
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr ""
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr ""
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "ጠቋሚው ባለበት ቦታ"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr ""
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr ""
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "ሁሉንም ምረጡ"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "ዘገባ የማስትገባት ዘዴዎች"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"የGConf ብልሽት፦\n"
+" %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr ""
+"የGConf ብልሽት፦\n"
+" %s"
+
+#: eel/eel-gconf-extensions.c:90
+#, fuzzy
+msgid "All further errors shown only on terminal."
+msgstr ""
+"የGConf ብልሽት፦\n"
+" %s\n"
+"የወደፊት ስህተቶች በሙሉ በመስታወቱ ላይ ብቻ ይታያሉ"
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 AM"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr ""
+
+#: eel/eel-gnome-extensions.c:285
+#, fuzzy
+msgid "You must click on an image to select it."
+msgstr "ምንም ምስል አልተመረጠም።  ምስሉን ለመምረጥ ምስሉ ላይ ይምቱ።"
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr ""
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr ""
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr ""
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (ዩኒኮድ ተቀብሏል)"
+
 #~ msgid "Allaire"
 #~ msgstr "Allaire"
 
@@ -6106,9 +6349,6 @@ msgstr ""
 #~ msgid "Nautilus Emblem view"
 #~ msgstr "የNautilus አርማ ዕይታ"
 
-#~ msgid "Text"
-#~ msgstr "ጽሑፍ"
-
 #~ msgid "Text Viewer"
 #~ msgstr "የጽሑፍ ተመልካች"
 
@@ -6696,3 +6936,22 @@ msgstr ""
 
 #~ msgid "_Remove Theme..."
 #~ msgstr "ጭብጥ አጥፋ... (_R)"
+
+#~ msgid "GConf Error"
+#~ msgstr "የGConf ብልሽት"
+
+#, fuzzy
+#~ msgid "No Selection Made"
+#~ msgstr "ምርጫ አልተደረገም"
+
+#~ msgid "Info"
+#~ msgstr "መረጃ"
+
+#~ msgid "Warning"
+#~ msgstr "ማስጠንቀቂያ"
+
+#~ msgid "Error"
+#~ msgstr "ስህተት"
+
+#~ msgid "Question"
+#~ msgstr "ጥያቄ"
diff --git a/po/ar.po b/po/ar.po
index 34abb6b26..12e67bc3a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ar.po (nautilus.HEAD)  #-#-#-#-#
 # translation of nautilus.HEAD.po to Arabic
 # This file is distributed under the same license as the nautilus.HEAD.ar package.
 # Copyright (C) 2004 THE nautilus.HEAD.ar'S COPYRIGHT HOLDER.
@@ -8,8 +9,23 @@
 # Ayman Hourieh <aymanh@gmail.com>, 2004.
 # Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008.
 # Abdelmonam Kouka <abdelmonam.kouka@ubuntume.com>, 2008.
+# #-#-#-#-#  ar.po (eel.HEAD.ar)  #-#-#-#-#
+# translation of eel.HEAD.ar.po to Arabic
+# translation of eel.HEAD.ar.po to
+# translation of eel.po to
+# Copyright (C) 2001,2002,2003, 2004, 2006, 2008 Free Software Foundation, Inc.
+#
+# Mohammed Gamal <f2c2001@yahoo.com>, 2001.
+# Isam Bayazidi <bayazidi@arabeyes.org>, 2002.
+# Arafat Medini <lumina@silverpen.de>, 2003.
+# l <lumina@silverpen.de>, 2004.
+# Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
+# Djihed Afifi <djihed@gmail.com>, 2006.
+# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ar.po (nautilus.HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-14 10:17+0000\n"
@@ -20,8 +36,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,282,-1\n"
+"#-#-#-#-#  ar.po (eel.HEAD.ar)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.ar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-14 11:08+0100\n"
+"PO-Revision-Date: 2008-01-20 18:06+0200\n"
+"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
+"Language-Team: Arabic <doc@arabeyes.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
+"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -128,8 +158,7 @@ msgid "Envy"
 msgstr "حسد"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28
-#: ../src/nautilus-emblem-sidebar.c:931
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:931
 #: ../src/nautilus-property-browser.c:1770
 msgid "Erase"
 msgstr "فسخ"
@@ -305,13 +334,52 @@ msgstr "البحث المحفوظ"
 #. Translators: date_modified - mtime, the last time file contents were changed
 #. date_changed  - ctime, the last time file meta-information changed
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Possible values are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and \"mime_type\"."
-msgstr "قائمة للعناوين الفرعية تحت الأيقونات في منظور الأيقونات وسطح المكتب. يتوقف العدد الحقيقي للعناوين المعروضة على مستوى التكبير. القيم الممكنة هي: \"size\" (الحجم) و \"type\" (النوع) و \"date_modified\" (تاريخ التعديل) و \"date_changed\" (تاريخ التغيير) و \"date_accessed\" (تاريخ النفاذ) و \"owner\" (المالك) و \"group\" (المجموعة) و \"permissions\" (التصاريح) و \"octal_permissions\" (التصاريح الثمانية) و \"mime_type\" (نوع mime)."
+msgid ""
+"A list of captions below an icon in the icon view and the desktop. The "
+"actual number of captions shown depends on the zoom level. Possible values "
+"are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed"
+"\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
+"\"mime_type\"."
+msgstr ""
+"قائمة للعناوين الفرعية تحت الأيقونات في منظور الأيقونات وسطح المكتب. يتوقف "
+"العدد الحقيقي للعناوين المعروضة على مستوى التكبير. القيم الممكنة هي: \"size"
+"\" (الحجم) و \"type\" (النوع) و \"date_modified\" (تاريخ التعديل) و "
+"\"date_changed\" (تاريخ التغيير) و \"date_accessed\" (تاريخ النفاذ) و \"owner"
+"\" (المالك) و \"group\" (المجموعة) و \"permissions\" (التصاريح) و "
+"\"octal_permissions\" (التصاريح الثمانية) و \"mime_type\" (نوع mime)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 #, no-c-format
-msgid "A string specifying how parts of overlong file names should be replaced by ellipses, depending on the zoom level. Each of the list entries is of the form \"Zoom Level:Integer\". For each specified zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form \"Integer\" without any specified zoom level is also allowed. It defines the maximum number of lines for all other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level \"smallest\". Shorten file names if they exceed four lines for zoom level \"smaller\". Do not shorten file names for other zoom levels. Available zoom levels: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
-msgstr "قيمة نصيّة تحدد كيفية إبدال الأجزاء الطويلة من أسماء الملفات بأقواس، بالاعتماد على مستوى التكبير. إن كل قيمة في القائمة هي من الشكل \"Zoom Level:Integer\" (مستوى التكبير:عدد صحيح). لكل مستوى تكبير، إذا كان العدد الصحيح أكبر من 0، لن يتجاوز اسم الملف الرقم المعطى من الأسطر. إذا كان العدد 0 أو أصغر، لن تطبق أية حدود على مستوى التكبير المحدد. القيمة الافتراضية لصيغة \"Integer\" دون تحديد أي مستوى تقريب أيضاً مسموحة. وهي تعرّف العدد الأعلى للأسطر لجميع مستويات التكبير الأخرى. أمثلة: 0- أعرض اسماء الملفات الطويلة دائماً؛ 3- اختصر اسماء الملفات في حال تجاوزها ثلاثة أسطر؛ smallest:5,smaller:4,0 - اختصر اسماء الملفات في حال تجاوزها خمسة أسطر لمستوى التكبير \"smallest\" (الأصغر). اختصر أسماء الملفات في حال تجاوزها أربعة أسطر لمستوى التكبير \"smaller\" (أصغر). لا تختصر أسماء الملفات لمستويات التكبير الأخرى. مستويات التكبير المتوفّرة هي: الأصغر (smallest)  (33%)، أصغر (smaller) (50%) ، صغير (small) (66%)، قياسي (standard) (100%)، كبير (large) (150%)، أكبر (larger) (200%)، الأكبر (400%) (largest)."
+msgid ""
+"A string specifying how parts of overlong file names should be replaced by "
+"ellipses, depending on the zoom level. Each of the list entries is of the "
+"form \"Zoom Level:Integer\". For each specified zoom level, if the given "
+"integer is larger than 0, the file name will not exceed the given number of "
+"lines. If the integer is 0 or smaller, no limit is imposed on the specified "
+"zoom level. A default entry of the form \"Integer\" without any specified "
+"zoom level is also allowed. It defines the maximum number of lines for all "
+"other zoom levels. Examples: 0 - always display overlong file names; 3 - "
+"shorten file names if they exceed three lines; smallest:5,smaller:4,0 - "
+"shorten file names if they exceed five lines for zoom level \"smallest\". "
+"Shorten file names if they exceed four lines for zoom level \"smaller\". Do "
+"not shorten file names for other zoom levels. Available zoom levels: "
+"smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
+"larger (200%), largest (400%)"
+msgstr ""
+"قيمة نصيّة تحدد كيفية إبدال الأجزاء الطويلة من أسماء الملفات بأقواس، "
+"بالاعتماد على مستوى التكبير. إن كل قيمة في القائمة هي من الشكل \"Zoom Level:"
+"Integer\" (مستوى التكبير:عدد صحيح). لكل مستوى تكبير، إذا كان العدد الصحيح "
+"أكبر من 0، لن يتجاوز اسم الملف الرقم المعطى من الأسطر. إذا كان العدد 0 أو "
+"أصغر، لن تطبق أية حدود على مستوى التكبير المحدد. القيمة الافتراضية لصيغة "
+"\"Integer\" دون تحديد أي مستوى تقريب أيضاً مسموحة. وهي تعرّف العدد الأعلى "
+"للأسطر لجميع مستويات التكبير الأخرى. أمثلة: 0- أعرض اسماء الملفات الطويلة "
+"دائماً؛ 3- اختصر اسماء الملفات في حال تجاوزها ثلاثة أسطر؛ smallest:5,"
+"smaller:4,0 - اختصر اسماء الملفات في حال تجاوزها خمسة أسطر لمستوى التكبير "
+"\"smallest\" (الأصغر). اختصر أسماء الملفات في حال تجاوزها أربعة أسطر لمستوى "
+"التكبير \"smaller\" (أصغر). لا تختصر أسماء الملفات لمستويات التكبير الأخرى. "
+"مستويات التكبير المتوفّرة هي: الأصغر (smallest)  (33%)، أصغر (smaller) (50%) "
+"، صغير (small) (66%)، قياسي (standard) (100%)، كبير (large) (150%)، أكبر "
+"(larger) (200%)، الأكبر (400%) (largest)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -322,11 +390,19 @@ msgid "Always use the location entry, instead of the pathbar"
 msgstr "استخدم دائما مُدخل الموقع بدلا من شريط المسار."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
-msgid "An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines."
-msgstr "عدد صحيح يحدد كيفية إبدال الأقواس مكان الأجزاء الطويلة من أسماء الملفات على سطح المكتب. إذا كان الرقم أكبر من 0، لن يتجاوز اسم الملف الرقم المعطى من السطور. إذا كان الرقم 0 أو أصغر، لن يتم تطبيق قيود على عدد الأسطر المعروضة."
+msgid ""
+"An integer specifying how parts of overlong file names should be replaced by "
+"ellipses on the desktop. If the number is larger than 0, the file name will "
+"not exceed the given number of lines. If the number is 0 or smaller, no "
+"limit is imposed on the number of displayed lines."
+msgstr ""
+"عدد صحيح يحدد كيفية إبدال الأقواس مكان الأجزاء الطويلة من أسماء الملفات على "
+"سطح المكتب. إذا كان الرقم أكبر من 0، لن يتجاوز اسم الملف الرقم المعطى من "
+"السطور. إذا كان الرقم 0 أو أصغر، لن يتم تطبيق قيود على عدد الأسطر المعروضة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr "لون ملف خلفية المجلد المبدئي. يستخدم فقط إذا ضبط background_set كصحيح."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
@@ -338,8 +414,16 @@ msgid "Criteria for search bar searching"
 msgstr "معايير البحث في شريط البحث"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
-msgid "Criteria when matching files searched for in the search bar. If set to \"search_by_text\", then Nautilus will Search for files by file name only. If set to \"search_by_text_and_properties\", then Nautilus will search for files by file name and file properties."
-msgstr "معايير مطابقة الملفات التي يبحث عنها في شريط البحث. إذا ضبط لـ \"search_by_text\"، فسيبحث نوتلس عن الملفات بحسب اسم الملف فقط. إذا ضبط لـ \"search_by_text_and_properties\"، فسيبحث نوتلس عن الملفات بحسب اسم وخصائص الملف."
+msgid ""
+"Criteria when matching files searched for in the search bar. If set to "
+"\"search_by_text\", then Nautilus will Search for files by file name only. "
+"If set to \"search_by_text_and_properties\", then Nautilus will search for "
+"files by file name and file properties."
+msgstr ""
+"معايير مطابقة الملفات التي يبحث عنها في شريط البحث. إذا ضبط لـ "
+"\"search_by_text\"، فسيبحث نوتلس عن الملفات بحسب اسم الملف فقط. إذا ضبط لـ "
+"\"search_by_text_and_properties\"، فسيبحث نوتلس عن الملفات بحسب اسم وخصائص "
+"الملف."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Current Nautilus theme (deprecated)"
@@ -446,31 +530,55 @@ msgid "Enables the classic Nautilus behavior, where all windows are browsers"
 msgstr "يُفَعّل سلوك نوتلس التقليدي، حيث كل النوافذ متصفحات"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid "Filename for the default folder background. Only used if background_set is true."
-msgstr "اسم ملف خلفية المجلد المبدئية. يستخدم فقط إذا ضبط background_set كصخيح."
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"اسم ملف خلفية المجلد المبدئية. يستخدم فقط إذا ضبط background_set كصخيح."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid "Filename for the default side pane background. Only used if side_pane_background_set is true."
-msgstr "اسم ملف خلفية اللوح الجانبي المبدئية. يستخدم فقط إذا ضبط side_pane_background_set كصحيح."
+msgid ""
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
+msgstr ""
+"اسم ملف خلفية اللوح الجانبي المبدئية. يستخدم فقط إذا ضبط "
+"side_pane_background_set كصحيح."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
-msgid "Folders over this size will be truncated to around this size. The purpose of this is to avoid unintentionally blowing the heap and killing Nautilus on massive folders. A negative value denotes no limit. The limit is approximate due to the reading of folders chunk-wise."
-msgstr "ستُقتَضَب المجلدات التي تزيد عن هذا الحجم. هدف هذا تجنب قتل نوتلس بلا قصد عند عرض المجلدات العظيمة. قيمة سلبية تعني لا حدود. الحد تقريبي بسبب قراءة المجلدات على أجزاء."
+msgid ""
+"Folders over this size will be truncated to around this size. The purpose of "
+"this is to avoid unintentionally blowing the heap and killing Nautilus on "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"ستُقتَضَب المجلدات التي تزيد عن هذا الحجم. هدف هذا تجنب قتل نوتلس بلا قصد عند "
+"عرض المجلدات العظيمة. قيمة سلبية تعني لا حدود. الحد تقريبي بسبب قراءة "
+"المجلدات على أجزاء."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid "Home icon visible on desktop"
 msgstr "أيقونة المنزل مرئية على سطح المكتب"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
-msgid "If set to \"after_current_tab\", then new tabs are inserted after the current tab. If set to \"end\", then new tabs are appended to the end of the tab list."
-msgstr "إذا ضبط إلى \"after_current_tab\" فستدرج الألسنة الجديدة بعد اللسان الحالي، إذا ضبط إلى \"end\" فستلحق الألسنة الجديدة بآخر قائمة الألسنة."
+msgid ""
+"If set to \"after_current_tab\", then new tabs are inserted after the "
+"current tab. If set to \"end\", then new tabs are appended to the end of the "
+"tab list."
+msgstr ""
+"إذا ضبط إلى \"after_current_tab\" فستدرج الألسنة الجديدة بعد اللسان الحالي، "
+"إذا ضبط إلى \"end\" فستلحق الألسنة الجديدة بآخر قائمة الألسنة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
-msgid "If set to true, Nautilus will only show folders in the tree side pane. Otherwise it will show both folders and files."
-msgstr "إذا ضبط كصحيح، فسيعرض نوتلس المجلدات فقط في لوح الشجرة الجانبي. خلافا لذلك سيعرض المجلدات و الملفات."
+msgid ""
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
+msgstr ""
+"إذا ضبط كصحيح، فسيعرض نوتلس المجلدات فقط في لوح الشجرة الجانبي. خلافا لذلك "
+"سيعرض المجلدات و الملفات."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "إذا ضبط كصحيح، فسيظهر شريط الموقع في النوافذ التي ستفتح جديدا."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -486,99 +594,186 @@ msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr "إذا ضبط كصحيح، فسيظهر شريط الأدوات في النوافذ التي ستفتح جديدا."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
-msgstr "إذا ضبط كصحيح، فستستخدم دائما نوافذ متصفح نوتلس عنصر دَخِْل نصي لشريط أدوات الموقع بدلا من شريط المسار. "
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
+msgstr ""
+"إذا ضبط كصحيح، فستستخدم دائما نوافذ متصفح نوتلس عنصر دَخِْل نصي لشريط أدوات "
+"الموقع بدلا من شريط المسار. "
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
-msgstr "إذا ضبط كصحيح، فسيسمح لك نوتلس بعرض وتحرير صلاحيات الملفات بطريقة أكثر شبها بيونكس، سامحة بالنفاذ إلى خيارات خَفِيّة أكثر."
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
+msgstr ""
+"إذا ضبط كصحيح، فسيسمح لك نوتلس بعرض وتحرير صلاحيات الملفات بطريقة أكثر شبها "
+"بيونكس، سامحة بالنفاذ إلى خيارات خَفِيّة أكثر."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views."
-msgstr "إذا ضبط كصحيح، فسيعرض نوتلس المجلدات قبل عرض الملفات في منظوري الأيقونات و القوائم."
+msgid ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr ""
+"إذا ضبط كصحيح، فسيعرض نوتلس المجلدات قبل عرض الملفات في منظوري الأيقونات و "
+"القوائم."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash."
-msgstr "إذا ضبط كصحيح، فسيسأل متصفح الملفات (نوتلس) عن التأكيد عند محاولتك وضع ملفات في المهملات."
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"delete files, or empty the Trash."
+msgstr ""
+"إذا ضبط كصحيح، فسيسأل متصفح الملفات (نوتلس) عن التأكيد عند محاولتك وضع ملفات "
+"في المهملات."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "If set to true, then Nautilus will automatically mount media such as user-visible hard disks and removable media on start-up and media insertion."
-msgstr "إذا وُضعت كصحيح، فسيقوم نوتلس آليا بوصل الوسائط مثل القرص الثابت المرئي للمستخدم و الوسائط القابلة للإزالة عند البدء و إدخال الوسائط."
+msgid ""
+"If set to true, then Nautilus will automatically mount media such as user-"
+"visible hard disks and removable media on start-up and media insertion."
+msgstr ""
+"إذا وُضعت كصحيح، فسيقوم نوتلس آليا بوصل الوسائط مثل القرص الثابت المرئي "
+"للمستخدم و الوسائط القابلة للإزالة عند البدء و إدخال الوسائط."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
-msgid "If set to true, then Nautilus will automatically open a folder when media is automounted. This only applies to media where no known x-content/* type was detected; for media where a known x-content type is detected, the user configurable action will be taken instead."
-msgstr "إذا وُضعت كصحيح، فسيقوم نوتلس آليا بفتح مجلد عند الوصل الآلي للوسائط. يُطَبَّقُ هذا فقط للوسائط عندما يتم اكتشاف نوع من x-content/* غير معروف؛ بالنسبة للوسائط التي يتم فيها اكتشاف نوع معروف من x-content/* ، يتم اعتماد الإجراء المُشَكَّل للمستعمل بدلا عن ذلك."
+msgid ""
+"If set to true, then Nautilus will automatically open a folder when media is "
+"automounted. This only applies to media where no known x-content/* type was "
+"detected; for media where a known x-content type is detected, the user "
+"configurable action will be taken instead."
+msgstr ""
+"إذا وُضعت كصحيح، فسيقوم نوتلس آليا بفتح مجلد عند الوصل الآلي للوسائط. يُطَبَّقُ "
+"هذا فقط للوسائط عندما يتم اكتشاف نوع من x-content/* غير معروف؛ بالنسبة "
+"للوسائط التي يتم فيها اكتشاف نوع معروف من x-content/* ، يتم اعتماد الإجراء "
+"المُشَكَّل للمستعمل بدلا عن ذلك."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "إذا ضبط كصحيح، فسيرسم نوتلس أيقونات على سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
-msgid "If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
-msgstr "إذا ضبط هذا كصحيح سيكون لنوتلس ميزة تسمح لك بحذف ملف حالا وفي مكانه، عوضا عن نقله إلى المهملات. قد تكون هذه الميزة خطيرة، فالرجاء توخي الحذر."
+msgid ""
+"If set to true, then Nautilus will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"إذا ضبط هذا كصحيح سيكون لنوتلس ميزة تسمح لك بحذف ملف حالا وفي مكانه، عوضا عن "
+"نقله إلى المهملات. قد تكون هذه الميزة خطيرة، فالرجاء توخي الحذر."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted."
-msgstr "إذا ضبط كصحيح، فلن يسأل نوتلس أبدا أو يُشَغِّل تلقائيا/يعيد التشغيل التلقائي للبرامج عندما إدراج وسيط."
+msgid ""
+"If set to true, then Nautilus will never prompt nor autorun/autostart "
+"programs when a medium is inserted."
+msgstr ""
+"إذا ضبط كصحيح، فلن يسأل نوتلس أبدا أو يُشَغِّل تلقائيا/يعيد التشغيل التلقائي "
+"للبرامج عندما إدراج وسيط."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-msgid "If set to true, then Nautilus will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "إذا ضبط كصحيح، فسيستخدم نوتلس مجلد المستخدم المنزلي كسطح المكتب. إذا كان خطأ، فسيستخدم ‪~/Desktop‬ كسطح المكتب."
+msgid ""
+"If set to true, then Nautilus will use the user's home folder as the "
+"desktop. If it is false, then it will use ~/Desktop as the desktop."
+msgstr ""
+"إذا ضبط كصحيح، فسيستخدم نوتلس مجلد المستخدم المنزلي كسطح المكتب. إذا كان "
+"خطأ، فسيستخدم ‪~/Desktop‬ كسطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "If set to true, then all Nautilus windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior."
-msgstr "إذا ضبط كصحيح، فستكون جميع نوافذ نوتلس نوافذ تصفح. هكذا كان نوتلس يتصرّف قبل إصدارة 2.6، و بعض الناس يحبذون هذا السلوك."
+msgid ""
+"If set to true, then all Nautilus windows will be browser windows. This is "
+"how Nautilus used to behave before version 2.6, and some people prefer this "
+"behavior."
+msgstr ""
+"إذا ضبط كصحيح، فستكون جميع نوافذ نوتلس نوافذ تصفح. هكذا كان نوتلس يتصرّف قبل "
+"إصدارة 2.6، و بعض الناس يحبذون هذا السلوك."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "If set to true, then backup files such as those created by Emacs are displayed. Currently, only files ending in a tilde (~) are considered backup files."
-msgstr "إذا ضبط كصحيح، فستعرض الملفات النسخ الاحتياطي كتلك المنشأة من قبل Emacs. حاليا، تعتبر فقط الملفات التي تنتهي بمَدّة (~) ملفات احتياطية."
+msgid ""
+"If set to true, then backup files such as those created by Emacs are "
+"displayed. Currently, only files ending in a tilde (~) are considered backup "
+"files."
+msgstr ""
+"إذا ضبط كصحيح، فستعرض الملفات النسخ الاحتياطي كتلك المنشأة من قبل Emacs. "
+"حاليا، تعتبر فقط الملفات التي تنتهي بمَدّة (~) ملفات احتياطية."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
-msgid "If set to true, then hidden files are shown in the file manager. Hidden files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "إذا ضبط كصحيح، فستعرض الملفات المخفية في مدير الملفات. الملفات المخفية هي إما ملفات تبدأ بنقطة أو ملفات مسردة في ملف ‪.hidden‬ للمجلد."
+msgid ""
+"If set to true, then hidden files are shown in the file manager. Hidden "
+"files are either dotfiles or are listed in the folder's .hidden file."
+msgstr ""
+"إذا ضبط كصحيح، فستعرض الملفات المخفية في مدير الملفات. الملفات المخفية هي "
+"إما ملفات تبدأ بنقطة أو ملفات مسردة في ملف ‪.hidden‬ للمجلد."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
-msgid "If set to true, then multiple views can be opened in one browser window, each in a separate tab."
-msgstr "إذا ضبط لصحيح فسيمكن فتح أكثر من منظور في نفس النافذة، كل في لسان منفصل"
+msgid ""
+"If set to true, then multiple views can be opened in one browser window, "
+"each in a separate tab."
+msgstr ""
+"إذا ضبط لصحيح فسيمكن فتح أكثر من منظور في نفس النافذة، كل في لسان منفصل"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the Network Servers view will be "
+"put on the desktop."
 msgstr "إذا ضبط كصحيح، ستوضع أيقونة تصل بخواديم الشبكة فوق سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "If this is set to true, an icon linking to the computer location will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
 msgstr "إذا ضبط كصحيح، ستوضع أيقونة تصل بالحاسوب فوق سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
+"the desktop."
 msgstr "إذا ضبط كصحيح، ستوضع أيقونة تصل بالمجلد المنزلي فوق سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
-msgid "If this is set to true, an icon linking to the trash will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the trash will be put on the "
+"desktop."
 msgstr "إذا ضبط كصحيح، ستوضع أيقونة تصل بالمهملات فوق سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop."
-msgstr "إذا ضبط كصحيح، فستوضع على سطح المكتب أيقوناتٌ تشير إلى الأجزاء الموصولة."
+msgid ""
+"If this is set to true, icons linking to mounted volumes will be put on the "
+"desktop."
+msgstr ""
+"إذا ضبط كصحيح، فستوضع على سطح المكتب أيقوناتٌ تشير إلى الأجزاء الموصولة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
-msgid "If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately."
-msgstr "إذا ضبط هذا التفضيل قسيكون لكل الأعمدة في المنظور المتضام نفس العرض. وإلا فسيحدد عرض كل عمود على حدة."
+msgid ""
+"If this preference is set, all columns in the compact view have the same "
+"width. Otherwise, the width of each column is determined seperately."
+msgstr ""
+"إذا ضبط هذا التفضيل قسيكون لكل الأعمدة في المنظور المتضام نفس العرض. وإلا "
+"فسيحدد عرض كل عمود على حدة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"."
-msgstr "إذا ضبط كصحيح، سترتب الملفات في النوافذ الجديدة بالإتجاه المعاكس. مثلا، عند الترتيب حسب الاسم سترتب الملفات من \"ي\" إلى \"ا\" عوض أن ترتّب من \"ا\" إلى \"ي\"."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"."
+msgstr ""
+"إذا ضبط كصحيح، سترتب الملفات في النوافذ الجديدة بالإتجاه المعاكس. مثلا، عند "
+"الترتيب حسب الاسم سترتب الملفات من \"ي\" إلى \"ا\" عوض أن ترتّب من \"ا\" إلى "
+"\"ي\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally."
-msgstr "إذا ضبط كصحيح، سترتب الملفات في النوافذ الجديدة بالإتجاه المعاكس. مثلا، عند الترتيب حسب الاسم سترتب الملفات من \"ي\" إلى \"ا\" عوض أن ترتّب من \"ا\" إلى \"ي\". إذا رتبت بحسب الحجم فسترتب تنازليتا عوضا عن أن ترتب تصاعديا."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"incrementally they will be sorted decrementally."
+msgstr ""
+"إذا ضبط كصحيح، سترتب الملفات في النوافذ الجديدة بالإتجاه المعاكس. مثلا، عند "
+"الترتيب حسب الاسم سترتب الملفات من \"ي\" إلى \"ا\" عوض أن ترتّب من \"ا\" إلى "
+"\"ي\". إذا رتبت بحسب الحجم فسترتب تنازليتا عوضا عن أن ترتب تصاعديا."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "إذا ضبط كصحيح، فسترصّ الأيقونات أضيق مبدئيا في النوافذ الجديدة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "إذا ضبط كصحيح، ستوضع التسميات بجانب الأيقونات عوضا عن أن توضع تحتها."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
@@ -586,24 +781,46 @@ msgid "If true, new windows will use manual layout by default."
 msgstr "إذا ضبط كصحيح، ستستخدم النوافذ الجديدة النسق اليدوي مبدئيا."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory."
-msgstr "لن تستعرض صور ذات حجم أكبر من هذا الحجم (بالبايت). هدف هذا الإعداد تجنب استعراض الصور الكبيرة التي قد تستغرق وقتا طويلا لتحميلها أو قد تستهلك الكثير من الذاكرة."
+msgid ""
+"Images over this size (in bytes) won't be thumbnailed. The purpose of this "
+"setting is to avoid thumbnailing large images that may take a long time to "
+"load or use lots of memory."
+msgstr ""
+"لن تستعرض صور ذات حجم أكبر من هذا الحجم (بالبايت). هدف هذا الإعداد تجنب "
+"استعراض الصور الكبيرة التي قد تستغرق وقتا طويلا لتحميلها أو قد تستهلك الكثير "
+"من الذاكرة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "List of possible captions on icons"
 msgstr "قائمة للعناوين الممكنة للأيقونات"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
-msgid "List of x-content/* types for which the user have chosen \"Do Nothing\" in the preference capplet. No prompt will be shown nor will any matching application be started on insertion of media matching these types."
-msgstr "قائمة أنواع x-content/* التي اختار المستخدم لها \"لا تفعل شيء\" في مربع الخصائص. لن يتم عرض أي تنبيه ولن يتم تشغيل  أي تطبيق عند إدخال الوسائط التي تطابق هذه الأنواع."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Do Nothing\" in "
+"the preference capplet. No prompt will be shown nor will any matching "
+"application be started on insertion of media matching these types."
+msgstr ""
+"قائمة أنواع x-content/* التي اختار المستخدم لها \"لا تفعل شيء\" في مربع "
+"الخصائص. لن يتم عرض أي تنبيه ولن يتم تشغيل  أي تطبيق عند إدخال الوسائط التي "
+"تطابق هذه الأنواع."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
-msgid "List of x-content/* types for which the user have chosen \"Open Folder\" in the preferences capplet. A folder window will be opened on insertion of media matching these types."
-msgstr "قائمة أنواع x-content/* التي اختار لها المستخدم \"افتح المجلد\" في مربع الخصائص. سيتم فتح نافذة مجلد عند إدخال وسائط تطابق هذه الأنواع."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Open Folder\" in "
+"the preferences capplet. A folder window will be opened on insertion of "
+"media matching these types."
+msgstr ""
+"قائمة أنواع x-content/* التي اختار لها المستخدم \"افتح المجلد\" في مربع "
+"الخصائص. سيتم فتح نافذة مجلد عند إدخال وسائط تطابق هذه الأنواع."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
-msgid "List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types."
-msgstr "قائمة أنواع x-content/* التي اختار المستخدم لها تشغيل تطبيق في مربع الخصائص. سيتم تشغيل التطبيق المفضّل للنوع المدخل عند إدخال وسائط تطابق هذه الأنواع."
+msgid ""
+"List of x-content/* types for which the user have chosen to start an "
+"application in the preference capplet. The preferred application for the "
+"given type will be started on insertion on media matching these types."
+msgstr ""
+"قائمة أنواع x-content/* التي اختار المستخدم لها تشغيل تطبيق في مربع الخصائص. "
+"سيتم تشغيل التطبيق المفضّل للنوع المدخل عند إدخال وسائط تطابق هذه الأنواع."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -614,7 +831,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "قائمة أنواع x-content/* التي تم ضبطها إلى \"افتح المجلد\""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "قائمة أنواع x-content/* التي سيتم تشغيل التطبيق المفضّل"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -626,8 +844,12 @@ msgid "Maximum image size for thumbnailing"
 msgstr "حجم الصور الأقصى عند الاستعراض"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Name of the Nautilus theme to use. This has been deprecated as of Nautilus 2.2. Please use the icon theme instead."
-msgstr "اسم سِمة نوتلس التي ستستخدم. ألغي هذا منذ إصدارة 2.2 لنوتلس. استخدم سِمة الأيقونات عوضا عن ذلك."
+msgid ""
+"Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
+"2.2. Please use the icon theme instead."
+msgstr ""
+"اسم سِمة نوتلس التي ستستخدم. ألغي هذا منذ إصدارة 2.2 لنوتلس. استخدم سِمة "
+"الأيقونات عوضا عن ذلك."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "Nautilus handles drawing the desktop"
@@ -647,15 +869,20 @@ msgstr "اسم أيقونة خواديم الشبكة"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid "Never prompt or autorun/autostart programs when media are inserted"
-msgstr "لا تسأل أبدا أو تُشَغِّل تلقائيا/تعيد التشغيل التلقائي للبرامج عندم إدراج وسيط"
+msgstr ""
+"لا تسأل أبدا أو تُشَغِّل تلقائيا/تعيد التشغيل التلقائي للبرامج عندم إدراج وسيط"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "Only show folders in the tree side pane"
 msgstr "اعرض المجلدات فقط في الشريط الشجري الجانبي"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click."
-msgstr "القيم الممكنة هي \"single\" (مفرد) لبدء الملفات بنقرة واحدة، أو \"double\" (مزدوج) لبدئها بنقر ثنائي."
+msgid ""
+"Possible values are \"single\" to launch files on a single click, or \"double"
+"\" to launch them on a double click."
+msgstr ""
+"القيم الممكنة هي \"single\" (مفرد) لبدء الملفات بنقرة واحدة، أو \"double"
+"\" (مزدوج) لبدئها بنقر ثنائي."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Put labels beside icons"
@@ -705,20 +932,54 @@ msgid "Side pane view"
 msgstr "منظور اللوح الجانبي"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
-msgid "Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to \"always\" then always plays the sound, even if the file is on a remote server. If set to \"local_only\" then only plays previews on local file systems. If set to \"never\" then it never previews sound."
-msgstr "عند معاينة ملف صوتي عند مرور الفأرة فوق أيقونة الملف. إذا ضبط لـ \"always\" (دائما) فسيعزف الصوت دائما حتى و إن كان المجلد عند خادوم عن بعد. إذا ضبط لـ \"local_only\" (محلي فقط) فلن تعزف المعاينات إلا على نُظم الملفات المحلية أما إذا ضبط لـ \"never\" (أبدا) فلن يعزف الصوت أبدا."
+msgid ""
+"Speed tradeoff for when to preview a sound file when mousing over a files "
+"icon. If set to \"always\" then always plays the sound, even if the file is "
+"on a remote server. If set to \"local_only\" then only plays previews on "
+"local file systems. If set to \"never\" then it never previews sound."
+msgstr ""
+"عند معاينة ملف صوتي عند مرور الفأرة فوق أيقونة الملف. إذا ضبط لـ \"always"
+"\" (دائما) فسيعزف الصوت دائما حتى و إن كان المجلد عند خادوم عن بعد. إذا ضبط "
+"لـ \"local_only\" (محلي فقط) فلن تعزف المعاينات إلا على نُظم الملفات المحلية "
+"أما إذا ضبط لـ \"never\" (أبدا) فلن يعزف الصوت أبدا."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
-msgid "Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to \"always\" then always show previews, even if the folder is on a remote server. If set to \"local_only\" then only show previews for local file systems. If set to \"never\" then never bother to read preview data."
-msgstr "عند معاينة محتويات ملف نصي في أيقونة الملف. إذا ضبط لـ \"always\" فستعرض دائما معاينات حتى و إن كان المجلد عند خادوم عن بعد. إذا ضبط لـ \"local_only\" فلن تعرض معاينات إلا على نظم الملفات المحلية أما إذا ضبط لـ \"never\" فلن تقرأ بيانات المعاينة."
+msgid ""
+"Speed tradeoff for when to show a preview of text file contents in the "
+"file's icon. If set to \"always\" then always show previews, even if the "
+"folder is on a remote server. If set to \"local_only\" then only show "
+"previews for local file systems. If set to \"never\" then never bother to "
+"read preview data."
+msgstr ""
+"عند معاينة محتويات ملف نصي في أيقونة الملف. إذا ضبط لـ \"always\" فستعرض "
+"دائما معاينات حتى و إن كان المجلد عند خادوم عن بعد. إذا ضبط لـ \"local_only"
+"\" فلن تعرض معاينات إلا على نظم الملفات المحلية أما إذا ضبط لـ \"never\" فلن "
+"تقرأ بيانات المعاينة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
-msgid "Speed tradeoff for when to show an image file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local_only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail images, just use a generic icon."
-msgstr "عند عرض صورة ملف كمُصغّرة. إذا ضبط لـ \"always\" فستعرض مُصغّرة دائما حتى و إن كان المجلد عند خادوم عن بعد. إذا ضبط لـ \"local_only\" فلن تعرض مُصغّرات إلا على نظم الملفات المحلية أما إذا ضبط لـ \"never\" فلن تُعرض مُصغّرات أبد، استخدم فقط أيقونة عامة."
+msgid ""
+"Speed tradeoff for when to show an image file as a thumbnail. If set to "
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"If set to \"local_only\" then only show thumbnails for local file systems. "
+"If set to \"never\" then never bother to thumbnail images, just use a "
+"generic icon."
+msgstr ""
+"عند عرض صورة ملف كمُصغّرة. إذا ضبط لـ \"always\" فستعرض مُصغّرة دائما حتى و إن "
+"كان المجلد عند خادوم عن بعد. إذا ضبط لـ \"local_only\" فلن تعرض مُصغّرات إلا "
+"على نظم الملفات المحلية أما إذا ضبط لـ \"never\" فلن تُعرض مُصغّرات أبد، استخدم "
+"فقط أيقونة عامة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local_only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts."
-msgstr "عند عرض عدد العناصر في مجلد. إذا ضبط لـ \"always\" فسيعرض دائما تعداد العناصر حتى و أن كان المجلد عند خادوم عن بعد. إذا ضبط لـ \"local_only\" فلن يظهر التعداد إلا لنظم الملفات المحلية أما إذا ضبط لـ \"never\" فلن يحسب تعداد العناصر أبدا."
+msgid ""
+"Speed tradeoff for when to show the number of items in a folder. If set to "
+"\"always\" then always show item counts, even if the folder is on a remote "
+"server. If set to \"local_only\" then only show counts for local file "
+"systems. If set to \"never\" then never bother to compute item counts."
+msgstr ""
+"عند عرض عدد العناصر في مجلد. إذا ضبط لـ \"always\" فسيعرض دائما تعداد "
+"العناصر حتى و أن كان المجلد عند خادوم عن بعد. إذا ضبط لـ \"local_only\" فلن "
+"يظهر التعداد إلا لنظم الملفات المحلية أما إذا ضبط لـ \"never\" فلن يحسب "
+"تعداد العناصر أبدا."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid "Text Ellipsis Limit"
@@ -729,12 +990,21 @@ msgid "The default size of an icon for a thumbnail in the icon view."
 msgstr "الحجم المبدئي لأيقونة المُصغّرات في منظور الأيقونات."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:112
-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-msgstr "ترتيب التصنيف المبدئي للعناصر في منظور الأيقونات. القيم الممكنة هي \"name\" (الاسم) و \"size\" (الحجم) و \"type\" (النوع) و \"modification_date\" (تاريخ التعديل) و \"emblems\" (الشعارات)."
+msgid ""
+"The default sort-order for items in the icon view. Possible values are \"name"
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
+msgstr ""
+"ترتيب التصنيف المبدئي للعناصر في منظور الأيقونات. القيم الممكنة هي \"name"
+"\" (الاسم) و \"size\" (الحجم) و \"type\" (النوع) و \"modification_date"
+"\" (تاريخ التعديل) و \"emblems\" (الشعارات)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
-msgid "The default sort-order for the items in the list view. Possible values are \"name\", \"size\", \"type\", and \"modification_date\"."
-msgstr "ترتيب التصنيف المبدئي للعناصر في منظور القائمة. القيم الممكنة هي \"name\" (الاسم) و \"size\" (الحجم) و \"modification_date\" (تاريخ التعديل)."
+msgid ""
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
+msgstr ""
+"ترتيب التصنيف المبدئي للعناصر في منظور القائمة. القيم الممكنة هي \"name"
+"\" (الاسم) و \"size\" (الحجم) و \"modification_date\" (تاريخ التعديل)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
 msgid "The default width of the side pane in new windows."
@@ -745,28 +1015,45 @@ msgid "The font description used for the icons on the desktop."
 msgstr "الوصف الخطي المستخدم للأيقونات على سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:116
-msgid "The format of file dates. Possible values are \"locale\", \"iso\", and \"informal\"."
-msgstr "تنسيق تواريخ الملفّات. القيم الممكنة هي \"locale\" (محلّي) و \"iso\" و \"informal\" (غير رسمي)."
+msgid ""
+"The format of file dates. Possible values are \"locale\", \"iso\", and "
+"\"informal\"."
+msgstr ""
+"تنسيق تواريخ الملفّات. القيم الممكنة هي \"locale\" (محلّي) و \"iso\" و "
+"\"informal\" (غير رسمي)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
 msgstr "منظور اللوح الجانبي الذي سيعرض في النوافذ المفتوحة حديثا."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
-msgid "This name can be set if you want a custom name for the computer icon on the desktop."
-msgstr "يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة الحاسوب على سطح المكتب."
+msgid ""
+"This name can be set if you want a custom name for the computer icon on the "
+"desktop."
+msgstr ""
+"يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة الحاسوب على سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:119
-msgid "This name can be set if you want a custom name for the home icon on the desktop."
-msgstr "يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة المنزل على سطح المكتب."
+msgid ""
+"This name can be set if you want a custom name for the home icon on the "
+"desktop."
+msgstr ""
+"يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة المنزل على سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:120
-msgid "This name can be set if you want a custom name for the network servers icon on the desktop."
-msgstr "يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة خواديم الشبكة على سطح المكتب."
+msgid ""
+"This name can be set if you want a custom name for the network servers icon "
+"on the desktop."
+msgstr ""
+"يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة خواديم الشبكة على سطح "
+"المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:121
-msgid "This name can be set if you want a custom name for the trash icon on the desktop."
-msgstr "يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة المهملات على سطح المكتب."
+msgid ""
+"This name can be set if you want a custom name for the trash icon on the "
+"desktop."
+msgstr ""
+"يمكن ضبط هذا الاسم إذا كنت تريد اسما خاصا لأيقونة المهملات على سطح المكتب."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
 msgid "Trash icon visible on desktop"
@@ -789,12 +1076,25 @@ msgid "What to do with executable text files when activated"
 msgstr "ما الذي سيفعل بالملفات التنفيذية عند تنشيطها"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files."
-msgstr "ما الذي سيفعل بالملفات التنفيذية عند تنشيطها (بنقرة بسيطة أو ثنائية). القيم الممكنة هي \"launch\" لإطلاقها كبرامج و \"ask\" للسؤال عما يفعله عن طريق حوار و \"display\" لعرضها كملفات نصيّة."
+msgid ""
+"What to do with executable text files when they are activated (single or "
+"double clicked). Possible values are \"launch\" to launch them as programs, "
+"\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
+"text files."
+msgstr ""
+"ما الذي سيفعل بالملفات التنفيذية عند تنشيطها (بنقرة بسيطة أو ثنائية). القيم "
+"الممكنة هي \"launch\" لإطلاقها كبرامج و \"ask\" للسؤال عما يفعله عن طريق "
+"حوار و \"display\" لعرضها كملفات نصيّة."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list_view\", \"icon_view\" and \"compact_view\"."
-msgstr "سيستخدم هذا العارض عند زيارة مجلد إلا إذا كنت قد أنتقيت منظورا آخر لذلك المجلد. القيم الممكنة هي \"list_view\" (منظور قائمة) و \"icon_view\" (منظور أيقونات) و \"compact_view\" (منظور متضام)"
+msgid ""
+"When a folder is visited this viewer is used unless you have selected "
+"another view for that particular folder. Possible values are \"list_view\", "
+"\"icon_view\" and \"compact_view\"."
+msgstr ""
+"سيستخدم هذا العارض عند زيارة مجلد إلا إذا كنت قد أنتقيت منظورا آخر لذلك "
+"المجلد. القيم الممكنة هي \"list_view\" (منظور قائمة) و \"icon_view\" (منظور "
+"أيقونات) و \"compact_view\" (منظور متضام)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "When to show number of items in a folder"
@@ -822,7 +1122,9 @@ msgstr "فيما إذا ضبطت خلفية مبدئية مخصصة للوح ا�
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "فيما إذا كان سيسأل عن التأكيد عند نقل الملفات إلى المهملات أو إفراغ سلة المهملات"
+msgstr ""
+"فيما إذا كان سيسأل عن التأكيد عند نقل الملفات إلى المهملات أو إفراغ سلة "
+"المهملات"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Whether to automatically mount media"
@@ -937,7 +1239,9 @@ msgid "You have just inserted a digital audio player."
 msgstr "أدخلت للتَّوِ قارئ صوتيات رقمي."
 
 #: ../libnautilus-private/nautilus-autorun.c:917
-msgid "You have just inserted a medium with software intended to be automatically started."
+msgid ""
+"You have just inserted a medium with software intended to be automatically "
+"started."
 msgstr "أدخلت للتَّوِ وسيطا به برمجيات مُعَدَّة للتشغيل الآلي. "
 
 #. fallback to generic greeting
@@ -951,8 +1255,12 @@ msgstr "اختر أيَّ تطبيق تريد تنفيذه."
 
 #: ../libnautilus-private/nautilus-autorun.c:931
 #, c-format
-msgid "Select how to open \"%s\" and whether to perform this action in the future for other media of type \"%s\"."
-msgstr "اختر كيفية فتح \"%s\" وما إذا كان يجب القيام بهذا الإجراء في المستقبل للوسائط الأخرى من نوع \"%s\"."
+msgid ""
+"Select how to open \"%s\" and whether to perform this action in the future "
+"for other media of type \"%s\"."
+msgstr ""
+"اختر كيفية فتح \"%s\" وما إذا كان يجب القيام بهذا الإجراء في المستقبل "
+"للوسائط الأخرى من نوع \"%s\"."
 
 #: ../libnautilus-private/nautilus-autorun.c:953
 msgid "_Always perform this action"
@@ -1121,11 +1429,15 @@ msgid "You cannot move the volume \"%s\" to the trash."
 msgstr "لا يمكنك نقل الجزء \"%s\" للمهملات."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:111
-msgid "If you want to eject the volume, please use \"Eject\" in the popup menu of the volume."
+msgid ""
+"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"the volume."
 msgstr "إذا كنت تريد إخراج الجزء فاستخدم \"أخرج\" من القائمة المنبثقة للجزء."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
-msgid "If you want to unmount the volume, please use \"Unmount Volume\" in the popup menu of the volume."
+msgid ""
+"If you want to unmount the volume, please use \"Unmount Volume\" in the "
+"popup menu of the volume."
 msgstr "إذا كنت تريد فصْل الجزء فاستخدم \"افْصل\" من القائمة المنبثقة للجزء."
 
 #: ../libnautilus-private/nautilus-dnd.c:748
@@ -1170,8 +1482,11 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "عفوا، يجب أن تحدد كلمة مفتاحية غير فارغة للشعار الجديد."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "عفوا، لكن الكلمات المفتاحية للشعارات لا يمكن أن تحوي سوى حروفا وفراغات وأرقام فقط."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"عفوا، لكن الكلمات المفتاحية للشعارات لا يمكن أن تحوي سوى حروفا وفراغات "
+"وأرقام فقط."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1416,8 +1731,12 @@ msgstr "أمتأكد أنك تريد حذف \"%B\" نهائيا من المهم�
 
 #: ../libnautilus-private/nautilus-file-operations.c:1211
 #, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items from the trash?"
+msgid ""
+"Are you sure you want to permanently delete the %'d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items from the "
+"trash?"
 msgstr[0] "أمتأكد أنّك تريد حذف العنصر المختار نهائيًّا من المهملات؟"
 msgstr[1] "أمتأكد أنّك تريد حذف العنصر المختار نهائيًّا من المهملات؟"
 msgstr[2] "أمتأكد أنّك تريد حذف العنصرين المختارين نهائيًّا من المهملات؟"
@@ -1435,14 +1754,17 @@ msgid "Empty all of the items from the trash?"
 msgstr "أأحذف كل العناصر من المهملات؟"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1245
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "إذا اخترت إفراغ المهملات، ستضيع محتوياتها نهائيا. لاحظ أيضا أنه يمكن حذفها منفصلة."
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"إذا اخترت إفراغ المهملات، ستضيع محتوياتها نهائيا. لاحظ أيضا أنه يمكن حذفها "
+"منفصلة."
 
 #. Empty Trash menu item
 #: ../libnautilus-private/nautilus-file-operations.c:1250
 #: ../libnautilus-private/nautilus-file-operations.c:2076
-#: ../src/nautilus-places-sidebar.c:2035
-#: ../src/nautilus-trash-bar.c:125
+#: ../src/nautilus-places-sidebar.c:2035 ../src/nautilus-trash-bar.c:125
 msgid "Empty _Trash"
 msgstr "أفرغ ال_مهملات"
 
@@ -1453,7 +1775,8 @@ msgstr "أمتأكد من أنك تريد حذف \"%B\" نهائيا؟"
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "أمتأكدٌ أنّك تريد حذف العنصر المختار نهائيًّا؟"
 msgstr[1] "أمتأكدٌ أنّك تريد حذف العنصر المختار نهائيًّا؟"
 msgstr[2] "أمتأكدٌ أنّك تريد حذف العنصرين المختارين نهائيًّا؟"
@@ -1496,13 +1819,18 @@ msgid "Error while deleting."
 msgstr "خطأ أثناء الحذف."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1404
-msgid "Files in the folder \"%B\" cannot be deleted because you do not have permissions to see them."
-msgstr "لا يمكن حذف الملفات الموجودة بالمجلد \"%B\" لأنك لا تملك التصاريح الكافية لقراءتها."
+msgid ""
+"Files in the folder \"%B\" cannot be deleted because you do not have "
+"permissions to see them."
+msgstr ""
+"لا يمكن حذف الملفات الموجودة بالمجلد \"%B\" لأنك لا تملك التصاريح الكافية "
+"لقراءتها."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr "حدث خطأ في الحصول على معلومات حول الملفات في المجلد \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
@@ -1511,7 +1839,9 @@ msgid "_Skip files"
 msgstr "ت_خطى الملفات"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1437
-msgid "The folder \"%B\" cannot be deleted because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"read it."
 msgstr "لا يمكن حذف المجلد \"%B\" لأنك لا تملك التصاريح الكافية لقراءته."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
@@ -1564,8 +1894,12 @@ msgid "Do you want to empty the trash before you unmount?"
 msgstr "أترغب في إفراغ المهملات قبل الفصْل؟"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2068
-msgid "In order to regain the free space on this volume the trash must be emptied. All trashed items on the volume will be permanently lost."
-msgstr "لتستعيد المساحة الخالية على هذا الجزء يجب إفراغ المهملات. كل الملفات في المهملات ستُفقد للأبد."
+msgid ""
+"In order to regain the free space on this volume the trash must be emptied. "
+"All trashed items on the volume will be permanently lost."
+msgstr ""
+"لتستعيد المساحة الخالية على هذا الجزء يجب إفراغ المهملات. كل الملفات في "
+"المهملات ستُفقد للأبد."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2074
 msgid "Do _not Empty Trash"
@@ -1638,15 +1972,24 @@ msgid "Error while moving files to trash."
 msgstr "حدث خطأ أثناء نقل الملفات إلى المهملات."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2359
-msgid "Files in the folder \"%B\" cannot be handled because you do not have permissions to see them."
-msgstr "لا يمكن التعامل مع الملفات الموجودة بالمجلد \"%B\" لأنك لا تملك التصاريح الكافية لقراءتها ."
+msgid ""
+"Files in the folder \"%B\" cannot be handled because you do not have "
+"permissions to see them."
+msgstr ""
+"لا يمكن التعامل مع الملفات الموجودة بالمجلد \"%B\" لأنك لا تملك التصاريح "
+"الكافية لقراءتها ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2398
-msgid "The folder \"%B\" cannot be handled because you do not have permissions to read it."
-msgstr "لا يمكن التعامل مع المجلد \"%B\" لأنك لا تملك التصاريح الكافية لقراءته."
+msgid ""
+"The folder \"%B\" cannot be handled because you do not have permissions to "
+"read it."
+msgstr ""
+"لا يمكن التعامل مع المجلد \"%B\" لأنك لا تملك التصاريح الكافية لقراءته."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2475
-msgid "The file \"%B\" cannot be handled because you do not have permissions to read it."
+msgid ""
+"The file \"%B\" cannot be handled because you do not have permissions to "
+"read it."
 msgstr "لا يمكن التعامل مع الملف \"%B\" لأنك لا تملك التصاريح الكافية لقراءته."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
@@ -1673,7 +2016,9 @@ msgid "The destination is not a folder."
 msgstr "الوجهة ليست مجلدا."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2654
-msgid "There is not enough space on the destination. Try to remove files to make space."
+msgid ""
+"There is not enough space on the destination. Try to remove files to make "
+"space."
 msgstr "لا توجد مساحة كافية في الوجهة. حاول إزالة ملفات لإفراغ مساحة."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2656
@@ -1772,19 +2117,29 @@ msgid "%S of %S — %T left (%S/sec)"
 msgstr "%S من %S — باقِ %T (%S/ثانية)"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3177
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to create it in the destination."
-msgstr "لا يمكن نسخ المجلد \"%B\" لأنك لا تملك التصاريح الكافية لإنشائه في الوجهة المقصودة."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"create it in the destination."
+msgstr ""
+"لا يمكن نسخ المجلد \"%B\" لأنك لا تملك التصاريح الكافية لإنشائه في الوجهة "
+"المقصودة."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3180
 msgid "There was an error creating the folder \"%B\"."
 msgstr "حدث خطأ أثناء إنشاء المجلد \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3301
-msgid "Files in the folder \"%B\" cannot be copied because you do not have permissions to see them."
-msgstr "لا يمكن نسخ الملفات الموجودة بالمجلد \"%B\" لأنك لا تملك التصاريح الكافية لقراءتها."
+msgid ""
+"Files in the folder \"%B\" cannot be copied because you do not have "
+"permissions to see them."
+msgstr ""
+"لا يمكن نسخ الملفات الموجودة بالمجلد \"%B\" لأنك لا تملك التصاريح الكافية "
+"لقراءتها."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3346
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"read it."
 msgstr "لا يمكن نسخ المجلد \"%B\" لأنك لا تملك التصاريح الكافية لقراءته."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3389
@@ -1832,12 +2187,19 @@ msgstr "المجلد الوِجهة داخل المجلد المصدر."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3807
 #: ../libnautilus-private/nautilus-file-operations.c:4378
-msgid "A folder named \"%B\" already exists.  Do you want to merge the source folder?"
+msgid ""
+"A folder named \"%B\" already exists.  Do you want to merge the source "
+"folder?"
 msgstr "يوجد بالفعل مجلد بالاسم \"%B\". أترغب في دمجه مع المجلد المصدر؟"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3809
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied."
-msgstr "المجلد المصدر موجود بالفعل في \"%B\". الدمج سيسأل التأكيد قبل استبدال أي ملفات في المجلد تتعارض مع الملفات الجاري نسخها."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being copied."
+msgstr ""
+"المجلد المصدر موجود بالفعل في \"%B\". الدمج سيسأل التأكيد قبل استبدال أي "
+"ملفات في المجلد تتعارض مع الملفات الجاري نسخها."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3814
 #: ../libnautilus-private/nautilus-file-operations.c:4385
@@ -1847,7 +2209,9 @@ msgstr "يوجد بالفعل مجلد بالاسم \"%B\". أترغب في اس
 #: ../libnautilus-private/nautilus-file-operations.c:3816
 #: ../libnautilus-private/nautilus-file-operations.c:4387
 #, c-format
-msgid "The folder already exists in \"%F\".  Replacing it will remove all files in the folder."
+msgid ""
+"The folder already exists in \"%F\".  Replacing it will remove all files in "
+"the folder."
 msgstr "المجلد موجود بالفعل في \"%F\". استبداله سيحذف كل الملفات داخل المجلد."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3821
@@ -1858,7 +2222,8 @@ msgstr "يوجد بالفعل ملف بالاسم \"%B\". أترغب في است
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr "الملف موجود بالفعل في \"%F\". استبداله سيستبدل محتواه."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3913
@@ -1887,8 +2252,13 @@ msgstr[4] "يجري التحضير لنقل %I'd ملفا"
 msgstr[5] "يجري التحضير لنقل %I'd ملف"
 
 #: ../libnautilus-private/nautilus-file-operations.c:4380
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being moved."
-msgstr "المجلد المصدر موجود بالفعل في \"%B\". الدمج سيسأل التأكيد قبل استبدال أي ملفات في المجلد تتعارض مع الملفات الجاري نقلها."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being moved."
+msgstr ""
+"المجلد المصدر موجود بالفعل في \"%B\". الدمج سيسأل التأكيد قبل استبدال أي "
+"ملفات في المجلد تتعارض مع الملفات الجاري نقلها."
 
 #: ../libnautilus-private/nautilus-file-operations.c:4470
 #, c-format
@@ -2441,8 +2811,7 @@ msgid "Computer"
 msgstr "الحاسوب"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:571
-#: ../src/nautilus-places-sidebar.c:483
-#: ../src/nautilus-trash-bar.c:121
+#: ../src/nautilus-places-sidebar.c:483 ../src/nautilus-trash-bar.c:121
 msgid "Trash"
 msgstr "المهملات"
 
@@ -2700,8 +3069,12 @@ msgstr "فشل الفتح، أتريد اختيار تطبيق آخر؟"
 #: ../libnautilus-private/nautilus-program-choosing.c:81
 #: ../libnautilus-private/nautilus-program-choosing.c:112
 #, c-format
-msgid "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" locations."
-msgstr "لا يستطيع \"%s\" فتح \"%s\" لأن \"%s\" لا يستطيع النفاذ إلى الملفات في الأماكن \"%s\"."
+msgid ""
+"\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
+"locations."
+msgstr ""
+"لا يستطيع \"%s\" فتح \"%s\" لأن \"%s\" لا يستطيع النفاذ إلى الملفات في "
+"الأماكن \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:86
 msgid "Open Failed, would you like to choose another action?"
@@ -2710,16 +3083,28 @@ msgstr "فشل الفتح، أتريد اختيار إجراء آخر؟"
 #: ../libnautilus-private/nautilus-program-choosing.c:87
 #: ../libnautilus-private/nautilus-program-choosing.c:119
 #, c-format
-msgid "The default action cannot open \"%s\" because it cannot access files at \"%s\" locations."
-msgstr "لا يمكن للإجراء المبدئي فتح \"%s\" لأنه لا يستطيع النفاذ إلى الملفات في الأماكن \"%s\"."
+msgid ""
+"The default action cannot open \"%s\" because it cannot access files at \"%s"
+"\" locations."
+msgstr ""
+"لا يمكن للإجراء المبدئي فتح \"%s\" لأنه لا يستطيع النفاذ إلى الملفات في "
+"الأماكن \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
-msgid "No other applications are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "لا يوجد تطبيقات أخرى لعرض هذا الملف. ربما ستتمكن من فتح هذا الملف إذا نسخته إلى حاسوبك."
+msgid ""
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
+msgstr ""
+"لا يوجد تطبيقات أخرى لعرض هذا الملف. ربما ستتمكن من فتح هذا الملف إذا نسخته "
+"إلى حاسوبك."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:121
-msgid "No other actions are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "لا يوجد إجراءات أخرى لعرض هذا الملف. قد يمكنك فتح هذا الملف إذا نسخته إلى حاسوبك."
+msgid ""
+"No other actions are available to view this file.  If you copy this file "
+"onto your computer, you may be able to open it."
+msgstr ""
+"لا يوجد إجراءات أخرى لعرض هذا الملف. قد يمكنك فتح هذا الملف إذا نسخته إلى "
+"حاسوبك."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:360
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -2740,12 +3125,17 @@ msgid "This drop target only supports local files."
 msgstr "هدف الإفلات هذا لا يدعم إلا الملفات المحلية."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr "لفتح ملفات غير محلية انسخها لمجلد محلي ثم أفلتها مرة أخرى."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:410
-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened."
-msgstr "لفتح ملفات غير محلية انسخها لمجلد محلي ثم أفلتها مرة أخرى. الملفات المحلية التي أفلتها فتحت بالفعل."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them "
+"again. The local files you dropped have already been opened."
+msgstr ""
+"لفتح ملفات غير محلية انسخها لمجلد محلي ثم أفلتها مرة أخرى. الملفات المحلية "
+"التي أفلتها فتحت بالفعل."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:439
 msgid "Details: "
@@ -2809,9 +3199,9 @@ msgid "Autorun Prompt"
 msgstr "محث التنفيذ التلقائي"
 
 #. tooltip
-#: ../nautilus-computer.desktop.in.in.h:1
-#: ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
+#: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "تصفّح كل الأقراص والمجلّدات المحلّية والبعيدة المتاحة لهذا الحاسوب"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2822,14 +3212,12 @@ msgstr "غيّر سلوك ومظهر نافذة مدير الملفات"
 msgid "File Management"
 msgstr "إدارة الملفات"
 
-#: ../nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1341
+#: ../nautilus-home.desktop.in.in.h:1 ../src/file-manager/fm-tree-view.c:1341
 msgid "Home Folder"
 msgstr "المجلد المنزل"
 
 #. tooltip
-#: ../nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-window-menus.c:858
+#: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:858
 msgid "Open your personal folder"
 msgstr "افتح مجلّدك الشخصي"
 
@@ -2858,8 +3246,10 @@ msgid "Nautilus metafile factory"
 msgstr "مصنع ملفات نوتلس الملخصة"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
-msgstr "عمليات نوتلس التي يمكن القيام بها عن طريق الاستحضارات التالية من سطر الأوامر"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
+msgstr ""
+"عمليات نوتلس التي يمكن القيام بها عن طريق الاستحضارات التالية من سطر الأوامر"
 
 #: ../src/Nautilus_shell.server.in.h:6
 msgid "Produces metafile objects for accessing Nautilus metadata"
@@ -2898,7 +3288,8 @@ msgstr "غيّر _خلفية سطح المكتب"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "اعرض نافذة تمكنك من ضبط نمط و لون خلفية سطح مكتبك"
 
 #. label, accelerator
@@ -3110,18 +3501,25 @@ msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "ستظهر جميع الملفات التنفيذية في هذا المجلد في قائمة النصوص الشفرية."
 
 #: ../src/file-manager/fm-directory-view.c:5519
-msgid "Choosing a script from the menu will run that script with any selected items as input."
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
 msgstr "اختيار نص شفري من القائمة سيشغله بأي عنصر مختار كدَخْل."
 
 #: ../src/file-manager/fm-directory-view.c:5521
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
-"When executed from a local folder, scripts will be passed the selected file names. When executed from a remote folder (e.g. a folder showing web or ftp content), scripts will be passed no parameters.\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
 "\n"
-"In all cases, the following environment variables will be set by Nautilus, which the scripts may use:\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected files (only if local)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
 "\n"
@@ -3129,13 +3527,18 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"كل الملفات القابلة للتشغيل في هذا المجلد ستظهر في قائمة النصوص الشفرية. اختيار نص شفري من القائمة سيُشغله.\n"
+"كل الملفات القابلة للتشغيل في هذا المجلد ستظهر في قائمة النصوص الشفرية. "
+"اختيار نص شفري من القائمة سيُشغله.\n"
 "\n"
-"حينما يتم تشغيلهم من مجلد محلي، فإن النصوص البرمجية سيمرر لها أسماء الملفات المختارة. حينما يتم تشغيلهم من مجلد عن بعد (مجلد يظهر محتويات ويب أو ftp مثلا)، فسوف لن يتم تمرير أي معاملات لها.\n"
+"حينما يتم تشغيلهم من مجلد محلي، فإن النصوص البرمجية سيمرر لها أسماء الملفات "
+"المختارة. حينما يتم تشغيلهم من مجلد عن بعد (مجلد يظهر محتويات ويب أو ftp "
+"مثلا)، فسوف لن يتم تمرير أي معاملات لها.\n"
 "\n"
-"في كل الحالات، سيتم تعيين المتغيرات البيئية التالية بواسطة ناوتيلاس، والتي قد تستخدمها النصوص البرمجية:\n"
+"في كل الحالات، سيتم تعيين المتغيرات البيئية التالية بواسطة ناوتيلاس، والتي "
+"قد تستخدمها النصوص البرمجية:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: مسارات مفصولة بسطر جديد للملفات المختارة(فقط في المحلية)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: مسارات مفصولة بسطر جديد للملفات المختارة"
+"(فقط في المحلية)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: مجموعة URI مفصولة بسطر جديد للملفات المختارة\n"
 "\n"
@@ -3158,7 +3561,8 @@ msgstr "سيُنسخ \"%s\" إذا اخترت أمر اللصق"
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] "سينقل العنصر المختار إذا اخترت أمر اللصق"
 msgstr[1] "سينقل العنصر المختار إذا اخترت أمر اللصق"
 msgstr[2] "سينقل العنصرين المختارين إذا اخترت أمر اللصق"
@@ -3169,7 +3573,8 @@ msgstr[5] "سينقل الـ%I'd عنصر المختار إذا اخترت أم�
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] "سينسخ العنصر المختار إذا اخترت أمر اللصق"
 msgstr[1] "سينسخ العنصر المختار إذا اخترت أمر اللصق"
 msgstr[2] "سينسخ العنصرين المختارين إذا اخترت أمر اللصق"
@@ -3372,7 +3777,9 @@ msgstr "ال_صق في المجلد"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6650
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
 msgstr "انقل أو انسخ الملفات المختارة سابقا بأمر قص أو انسخ إلى المجلد المختار"
 
 #. tooltip
@@ -3629,7 +4036,9 @@ msgstr "حضّر هذا المجلد لينسخ بأمر لصق"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6776
-msgid "Move or copy files previously selected by a Cut or Copy command into this folder"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into this "
+"folder"
 msgstr "انقل أو انسخ الملفات المختارة سابقا بأمر قص أو انسخ إلى هذا المجلد"
 
 #. tooltip
@@ -3901,7 +4310,8 @@ msgstr "الأمر"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "لا تملك التصاريح الكافية لعرض محتويات \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -3920,12 +4330,14 @@ msgstr "لا يمكن عرض محتويات المجلد."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "الاسم \"%s\" مستخدم في هذا المجلد سابقا. فضلا استخدم اسما آخر."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "لا وجود لـ \"%s\" في هذا المجلد. رُبّما نقل أو حذف؟"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -3935,7 +4347,9 @@ msgstr "لا تملك التصاريح الكافية لتغيير اسم \"%s\"
 
 #: ../src/file-manager/fm-error-reporting.c:118
 #, c-format
-msgid "The name \"%s\" is not valid because it contains the character \"/\". Please use a different name."
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
 msgstr "الاسم \"%s\" غير صالح لاحتوائه الرمز \"/\". رجاء استخدم اسما آخر."
 
 #: ../src/file-manager/fm-error-reporting.c:122
@@ -3955,7 +4369,8 @@ msgstr "لا يمكن تغيير اسم العنصر."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "لا تملك التصاريح الكافية لتغيير مجموعة \"%s\"."
 
 #. fall through
@@ -4185,8 +4600,7 @@ msgid "(Empty)"
 msgstr "(فارغ)"
 
 #: ../src/file-manager/fm-list-model.c:375
-#: ../src/file-manager/fm-tree-model.c:1266
-#: ../src/nautilus-window-slot.c:191
+#: ../src/file-manager/fm-tree-model.c:1266 ../src/nautilus-window-slot.c:191
 msgid "Loading..."
 msgstr "يجري التحميل..."
 
@@ -4584,8 +4998,12 @@ msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "لم يتمكن نوتلس من إنشاء المجلد المطلوب \"%s\"."
 
 #: ../src/nautilus-application.c:325
-msgid "Before running Nautilus, please create the following folder, or set permissions such that Nautilus can create it."
-msgstr "رجاء أنشئ المجلد التالي قبل تشغيل نوتلس أو قم بضبط التصاريح حتى يتمكن نوتلس من إنشائه."
+msgid ""
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
+msgstr ""
+"رجاء أنشئ المجلد التالي قبل تشغيل نوتلس أو قم بضبط التصاريح حتى يتمكن نوتلس "
+"من إنشائه."
 
 #: ../src/nautilus-application.c:328
 #, c-format
@@ -4593,8 +5011,12 @@ msgid "Nautilus could not create the following required folders: %s."
 msgstr "لم يتمكن نوتلس من إنشاء المجلدات التالية المطلوبة: %s."
 
 #: ../src/nautilus-application.c:330
-msgid "Before running Nautilus, please create these folders, or set permissions such that Nautilus can create them."
-msgstr "رجاء قم بإنشاء هذه المجلدات قبل تشغيل نوتلس، أو بضبط التصاريح حتى يتمكن نوتلس من انشائها."
+msgid ""
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+"رجاء قم بإنشاء هذه المجلدات قبل تشغيل نوتلس، أو بضبط التصاريح حتى يتمكن "
+"نوتلس من انشائها."
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -4607,29 +5029,49 @@ msgstr "رجاء قم بإنشاء هذه المجلدات قبل تشغيل ن�
 #. * since neither of the above causes explain it.
 #.
 #: ../src/nautilus-application.c:597
-msgid "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again."
-msgstr "لا يمكن استخدام نوتلس الآن. تنفيذ الأمر \"bonobo-slay\" من الطرفية قد يساعد في حل المشكلة. إن لم يحدث ذلك، يمكنك إعادة تشغيل الحاسوب أو تثبيت نوتلس مرة أخرى."
+msgid ""
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again."
+msgstr ""
+"لا يمكن استخدام نوتلس الآن. تنفيذ الأمر \"bonobo-slay\" من الطرفية قد يساعد "
+"في حل المشكلة. إن لم يحدث ذلك، يمكنك إعادة تشغيل الحاسوب أو تثبيت نوتلس مرة "
+"أخرى."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:603
 msgid ""
-"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again.\n"
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again.\n"
 "\n"
-"Bonobo could not locate the Nautilus_shell.server file. One cause of this seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation library's directory. Another possible cause would be bad install with a missing Nautilus_Shell.server file.\n"
+"Bonobo could not locate the Nautilus_shell.server file. One cause of this "
+"seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation "
+"library's directory. Another possible cause would be bad install with a "
+"missing Nautilus_Shell.server file.\n"
 "\n"
-"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, which may be needed by other applications.\n"
+"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
-"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but we do not know why.\n"
+"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but "
+"we do not know why.\n"
 "\n"
-"We have also seen this error when a faulty version of bonobo-activation was installed."
+"We have also seen this error when a faulty version of bonobo-activation was "
+"installed."
 msgstr ""
-"لا يمكن استخدام نوتلس الآن. القيام بتشغيل الأمر \"bonobo-slay\" منطرفية قد يساعد في حل المشكلة. إن لم يحدث ذلك، يمكنك إعادة تشغيل الحاسوب أو تثبيت نوتلس مرة أخرى.\n"
+"لا يمكن استخدام نوتلس الآن. القيام بتشغيل الأمر \"bonobo-slay\" منطرفية قد "
+"يساعد في حل المشكلة. إن لم يحدث ذلك، يمكنك إعادة تشغيل الحاسوب أو تثبيت "
+"نوتلس مرة أخرى.\n"
 "\n"
-"لم يتمكن بونوبو من العثور على ملف Nautilus_shell.server. يبدو أن أحد أسباب هذا هو أن LD_LIBRARY_PATH لا يحوي دليل مكتبة bonobo-activation. الاحتمال الآخر هو أن التثبيت لم يكن سليما بسبب فقدان ملف Nautilus_Shell.server.\n"
+"لم يتمكن بونوبو من العثور على ملف Nautilus_shell.server. يبدو أن أحد أسباب "
+"هذا هو أن LD_LIBRARY_PATH لا يحوي دليل مكتبة bonobo-activation. الاحتمال "
+"الآخر هو أن التثبيت لم يكن سليما بسبب فقدان ملف Nautilus_Shell.server.\n"
 "\n"
-"تشغيل \"bonobo-slay\" سيقتل كل أنشطة بونوبو وعمليات GConf، ما قد يكون ضروريا لتطبيقات أخرى.\n"
+"تشغيل \"bonobo-slay\" سيقتل كل أنشطة بونوبو وعمليات GConf، ما قد يكون ضروريا "
+"لتطبيقات أخرى.\n"
 "\n"
-"قتل bonobo-activation-server و gconfd يحل المشكل في بعض الأحيان، ولكننا لا نعلم لماذا.\n"
+"قتل bonobo-activation-server و gconfd يحل المشكل في بعض الأحيان، ولكننا لا "
+"نعلم لماذا.\n"
 "\n"
 "لاحظنا هذا الخطأ كذلك عند تنصيب إصدارة bonobo-activation معطوبة."
 
@@ -4642,28 +5084,41 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:633
-#: ../src/nautilus-application.c:651
+#: ../src/nautilus-application.c:633 ../src/nautilus-application.c:651
 #: ../src/nautilus-application.c:658
 msgid "Nautilus cannot be used now, due to an unexpected error."
 msgstr "لا يمكن استخدام نوتلس الآن لحدوث خطأ غير متوقع."
 
 #: ../src/nautilus-application.c:634
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to register the file manager view server."
-msgstr "لا يمكن استخدام نوتلس الآن لحدوث خطأ غير متوقع من بونوبو أثناء محاولة تسجيل خادوم منظور مدير الملفات."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to register the file manager view server."
+msgstr ""
+"لا يمكن استخدام نوتلس الآن لحدوث خطأ غير متوقع من بونوبو أثناء محاولة تسجيل "
+"خادوم منظور مدير الملفات."
 
 #: ../src/nautilus-application.c:652
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the factory. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "لا يمكن استخدام (نوتلس) الآن لحدوث خطأ غير متوقع من قبل بونوبو أثناء محاولة تحديد مكان المصنع. قتل bonobo-activation-server ثم إعادة تشغيل نوتلس قد يساعد في حل المشكلة."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the factory. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"لا يمكن استخدام (نوتلس) الآن لحدوث خطأ غير متوقع من قبل بونوبو أثناء محاولة "
+"تحديد مكان المصنع. قتل bonobo-activation-server ثم إعادة تشغيل نوتلس قد "
+"يساعد في حل المشكلة."
 
 #: ../src/nautilus-application.c:659
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the shell object. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "لا يمكن استخدام نوتلس الآن لحدوث خطأ غير متوقع من قبل بونوبو أثناء محاولة تحديد موقع جسم الصدفة. قتل bonobo-activation-server ثم إعادة تشغيل نوتلس قد يساعد في حل المشكلة."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the shell object. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"لا يمكن استخدام نوتلس الآن لحدوث خطأ غير متوقع من قبل بونوبو أثناء محاولة "
+"تحديد موقع جسم الصدفة. قتل bonobo-activation-server ثم إعادة تشغيل نوتلس قد "
+"يساعد في حل المشكلة."
 
-#: ../src/nautilus-application.c:1369
-#: ../src/nautilus-places-sidebar.c:1682
-#: ../src/nautilus-places-sidebar.c:1705
-#: ../src/nautilus-places-sidebar.c:1728
+#: ../src/nautilus-application.c:1369 ../src/nautilus-places-sidebar.c:1682
+#: ../src/nautilus-places-sidebar.c:1705 ../src/nautilus-places-sidebar.c:1728
 #, c-format
 msgid "Unable to eject %s"
 msgstr "تعذّر إخراج %s"
@@ -4684,24 +5139,29 @@ msgid "<big><b>Error autorunning software</b></big>"
 msgstr "<big><b>خطأ أثناء بدء البرنامج تلقائيا</b></big>"
 
 #: ../src/nautilus-autorun-software.c:194
-msgid "<big><b>This medium contains software intended to be automatically started. Would you like to run it?</b></big>"
-msgstr "<big><b> يحتوي هذا الوسيط على برمجيات مُعَدَّة للتشغيل التلقائي. هل ترغب في تشغيلها؟</b></big>"
+msgid ""
+"<big><b>This medium contains software intended to be automatically started. "
+"Would you like to run it?</b></big>"
+msgstr ""
+"<big><b> يحتوي هذا الوسيط على برمجيات مُعَدَّة للتشغيل التلقائي. هل ترغب في "
+"تشغيلها؟</b></big>"
 
 #: ../src/nautilus-autorun-software.c:196
 #, c-format
 msgid ""
-"The software will run directly from the medium \"%s\". You should never run software that you don't trust.\n"
+"The software will run directly from the medium \"%s\". You should never run "
+"software that you don't trust.\n"
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"ستشتغل البرمجية مباشرة من الوسيط \"%s\". من المستحسن أن لا تقوم أبدا بتشغيل برمجية لا تثق فيها.\n"
+"ستشتغل البرمجية مباشرة من الوسيط \"%s\". من المستحسن أن لا تقوم أبدا بتشغيل "
+"برمجية لا تثق فيها.\n"
 "\n"
 "إذا كان لديك شك، اضغط على زر الإلغاء."
 
 #: ../src/nautilus-bookmarks-window.c:160
 #: ../src/nautilus-file-management-properties.c:206
-#: ../src/nautilus-property-browser.c:1527
-#: ../src/nautilus-window-menus.c:619
+#: ../src/nautilus-property-browser.c:1527 ../src/nautilus-window-menus.c:619
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4835,8 +5295,7 @@ msgstr "أ_ضِف علامة"
 msgid "C_onnect"
 msgstr "اتّ_صل"
 
-#: ../src/nautilus-desktop-window.c:243
-#: ../src/nautilus-pathbar.c:1244
+#: ../src/nautilus-desktop-window.c:243 ../src/nautilus-pathbar.c:1244
 #: ../src/nautilus-places-sidebar.c:310
 msgid "Desktop"
 msgstr "سطح المكتب"
@@ -4846,9 +5305,10 @@ msgstr "سطح المكتب"
 msgid "Could not remove emblem with name '%s'."
 msgstr "تعذّر حذف الشعار ذو الاسم '%s'."
 
-#: ../src/nautilus-emblem-sidebar.c:227
-#: ../src/nautilus-emblem-sidebar.c:261
-msgid "This is probably because the emblem is a permanent one, and not one that you added yourself."
+#: ../src/nautilus-emblem-sidebar.c:227 ../src/nautilus-emblem-sidebar.c:261
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr "ربما لأن الشعار دائم و لست أنت من أضافه."
 
 #: ../src/nautilus-emblem-sidebar.c:260
@@ -4873,19 +5333,26 @@ msgid "Add Emblems..."
 msgstr "أضِف شعارات..."
 
 #: ../src/nautilus-emblem-sidebar.c:544
-msgid "Enter a descriptive name next to each emblem.  This name will be used in other places to identify the emblem."
-msgstr "أكتب اسما واصفا إلى جانب كل شعار. سيستخدم هذا الاسم في مواقع أخرى لتعريف الشعار."
+msgid ""
+"Enter a descriptive name next to each emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"أكتب اسما واصفا إلى جانب كل شعار. سيستخدم هذا الاسم في مواقع أخرى لتعريف "
+"الشعار."
 
 #: ../src/nautilus-emblem-sidebar.c:546
-msgid "Enter a descriptive name next to the emblem.  This name will be used in other places to identify the emblem."
-msgstr "أكتب اسما واصفا إلى جانب الشعار. سيستخدم هذا الاسم في مواقع أخرى لتعريف الشعار."
+msgid ""
+"Enter a descriptive name next to the emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"أكتب اسما واصفا إلى جانب الشعار. سيستخدم هذا الاسم في مواقع أخرى لتعريف "
+"الشعار."
 
 #: ../src/nautilus-emblem-sidebar.c:767
 msgid "Some of the files could not be added as emblems."
 msgstr "تعذّر إضافة بعض الملفات كشعارات."
 
-#: ../src/nautilus-emblem-sidebar.c:767
-#: ../src/nautilus-emblem-sidebar.c:769
+#: ../src/nautilus-emblem-sidebar.c:767 ../src/nautilus-emblem-sidebar.c:769
 msgid "The emblems do not appear to be valid images."
 msgstr "يبدو أن الشعارات ليست صورا سليمة."
 
@@ -4893,8 +5360,7 @@ msgstr "يبدو أن الشعارات ليست صورا سليمة."
 msgid "None of the files could be added as emblems."
 msgstr "تعذّر إضافة أي من الملفات كشعارات."
 
-#: ../src/nautilus-emblem-sidebar.c:806
-#: ../src/nautilus-emblem-sidebar.c:861
+#: ../src/nautilus-emblem-sidebar.c:806 ../src/nautilus-emblem-sidebar.c:861
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "يبدو أن الملف '%s' ليس صورة سليمة."
@@ -4903,8 +5369,7 @@ msgstr "يبدو أن الملف '%s' ليس صورة سليمة."
 msgid "The dragged file does not appear to be a valid image."
 msgstr "يبدو أن الملف المسحوب ليس صورة سليمة."
 
-#: ../src/nautilus-emblem-sidebar.c:811
-#: ../src/nautilus-emblem-sidebar.c:862
+#: ../src/nautilus-emblem-sidebar.c:811 ../src/nautilus-emblem-sidebar.c:862
 msgid "The emblem cannot be added."
 msgstr "لا يمكن إضافة الشعار."
 
@@ -5071,15 +5536,20 @@ msgid "CD _Audio:"
 msgstr "اسطوانة صوتية:"
 
 #: ../src/nautilus-file-management-properties.glade.h:49
-msgid "Choose the order of information to appear beneath icon names. More information will appear when zooming in closer."
-msgstr "اختر ترتيب ظهور المعلومات بجانب أسماء الأيقونات. ستظهر المزيد من المعلومات عند التكبير."
+msgid ""
+"Choose the order of information to appear beneath icon names. More "
+"information will appear when zooming in closer."
+msgstr ""
+"اختر ترتيب ظهور المعلومات بجانب أسماء الأيقونات. ستظهر المزيد من المعلومات "
+"عند التكبير."
 
 #: ../src/nautilus-file-management-properties.glade.h:50
 msgid "Choose the order of information to appear in the list view."
 msgstr "اختر ترتيب ظهور المعلومات في منظور القائمة."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr "اختر ماذا يحدث عند إدخال الوسائط أو ربط الأجهزة بالنظام"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
@@ -5410,7 +5880,9 @@ msgid "Only create windows for explicitly specified URIs."
 msgstr "أنشئ نوافذ فقط للعناوين المحددة صراحة."
 
 #: ../src/nautilus-main.c:397
-msgid "Do not manage the desktop (ignore the preference set in the preferences dialog)."
+msgid ""
+"Do not manage the desktop (ignore the preference set in the preferences "
+"dialog)."
 msgstr "لا تدِر سطح المكتب (تجاهل مجموعة التفضيلات في حوار التفضيلات)."
 
 #: ../src/nautilus-main.c:399
@@ -5431,7 +5903,9 @@ msgstr "[مسار...]"
 
 #. Translators: --no-default-window is a nautilus command line parameter, don't modify it.
 #: ../src/nautilus-main.c:407
-msgid "Load a saved session from the specified file. Implies \"--no-default-window\"."
+msgid ""
+"Load a saved session from the specified file. Implies \"--no-default-window"
+"\"."
 msgstr "حمّل واحفظ الجلسة من الملف المحدد. يتطلب \"--no-default-window\"."
 
 #: ../src/nautilus-main.c:407
@@ -5453,16 +5927,13 @@ msgstr ""
 "تصفح نظام الملفات بمدير الملفات"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:478
-#: ../src/nautilus-spatial-window.c:389
-#: ../src/nautilus-window-menus.c:560
-#: ../src/nautilus-window.c:154
+#: ../src/nautilus-main.c:478 ../src/nautilus-spatial-window.c:389
+#: ../src/nautilus-window-menus.c:560 ../src/nautilus-window.c:154
 msgid "Nautilus"
 msgstr "نوتلس"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:519
-#: ../src/nautilus-main.c:528
+#: ../src/nautilus-main.c:519 ../src/nautilus-main.c:528
 #: ../src/nautilus-main.c:533
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
@@ -5721,8 +6192,7 @@ msgstr "‏%s - متصفح الملفات"
 msgid "Close tab"
 msgstr "أغلق اللسان"
 
-#: ../src/nautilus-notes-viewer.c:385
-#: ../src/nautilus-notes-viewer.c:499
+#: ../src/nautilus-notes-viewer.c:385 ../src/nautilus-notes-viewer.c:499
 msgid "Notes"
 msgstr "ملاحظات"
 
@@ -5730,8 +6200,7 @@ msgstr "ملاحظات"
 msgid "Show Notes"
 msgstr "أظهر الملاحظات"
 
-#: ../src/nautilus-places-sidebar.c:332
-#: ../src/network-scheme.desktop.in.h:2
+#: ../src/nautilus-places-sidebar.c:332 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
 msgstr "الشبكة"
 
@@ -6084,7 +6553,9 @@ msgid "provides visual status"
 msgstr "يوفر حالة مرئية"
 
 #: ../src/nautilus-window-bookmarks.c:96
-msgid "Do you want to remove any bookmarks with the non-existing location from your list?"
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "هل تريد حذف أي علامات موقعها غير موجود من قائمتك؟"
 
 #: ../src/nautilus-window-bookmarks.c:101
@@ -6148,7 +6619,8 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "تعذر عرض \"%s\"، لأنه لم يمكن إيجاد المستضيف."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "تثبت من صحة الإملاء و صحة إعدادات الوسيط."
 
 #: ../src/nautilus-window-manage-views.c:1947
@@ -6165,21 +6637,42 @@ msgid "Go to the location specified by this bookmark"
 msgstr "اذهب إلى الموقع الذي تحدده هذه علامة"
 
 #: ../src/nautilus-window-menus.c:542
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "نوتلس برمجية حرة؛ بإمكانك إعادة توزيعه و/أو تعديله تحت شروط الرخصة العمومية العامة لجنو والتي نشرتها منظمة البرمجيات الحرة؛ سواء الإصدارة 2 من الرخصة أو أي إصدارة بعدها حسب رغبتك."
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"نوتلس برمجية حرة؛ بإمكانك إعادة توزيعه و/أو تعديله تحت شروط الرخصة العمومية "
+"العامة لجنو والتي نشرتها منظمة البرمجيات الحرة؛ سواء الإصدارة 2 من الرخصة أو "
+"أي إصدارة بعدها حسب رغبتك."
 
 #: ../src/nautilus-window-menus.c:546
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "يوزّع نوتلس على أمل أن يكون مفيدًا لمن يستخدمه دون أدنى مسؤولية؛ ولا حتى أيضمان يضمن صلاحية العرض في السوق أو توافقه مع أي استخدام محدد. يمكنك مراجعةالرخصة العمومية العامة لجنو لمزيد من التفاصيل."
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"يوزّع نوتلس على أمل أن يكون مفيدًا لمن يستخدمه دون أدنى مسؤولية؛ ولا حتى "
+"أيضمان يضمن صلاحية العرض في السوق أو توافقه مع أي استخدام محدد. يمكنك "
+"مراجعةالرخصة العمومية العامة لجنو لمزيد من التفاصيل."
 
 #: ../src/nautilus-window-menus.c:550
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
-"من المفترض أن تكون قد استلمت نسخة من رخصة جنو العامة مع نوتلس؛ في حال عدم استلامك لذلك، يمكنك مكاتبة:\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"من المفترض أن تكون قد استلمت نسخة من رخصة جنو العامة مع نوتلس؛ في حال عدم "
+"استلامك لذلك، يمكنك مكاتبة:\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301 USA"
 
 #: ../src/nautilus-window-menus.c:562
-msgid "Nautilus is a graphical shell for GNOME that makes it easy to manage your files and the rest of your system."
+msgid ""
+"Nautilus is a graphical shell for GNOME that makes it easy to manage your "
+"files and the rest of your system."
 msgstr "نوتلس صدفة رسومية لجنوم تسهل لك إدارة ملفاتك و بقية نظامك."
 
 #: ../src/nautilus-window-menus.c:566
@@ -6242,7 +6735,9 @@ msgid "_Backgrounds and Emblems..."
 msgstr "_خلفيات و شعارات..."
 
 #: ../src/nautilus-window-menus.c:797
-msgid "Display patterns, colors, and emblems that can be used to customize appearance"
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
 msgstr "اعرض الأنماط و الألوان و الشعارات التي يمكن استخدامها لتخصيص المظهر"
 
 #: ../src/nautilus-window-menus.c:800
@@ -6322,8 +6817,7 @@ msgid "Zoom _In"
 msgstr "_قرّب"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:830
-#: ../src/nautilus-zoom-control.c:92
+#: ../src/nautilus-window-menus.c:830 ../src/nautilus-zoom-control.c:92
 #: ../src/nautilus-zoom-control.c:347
 msgid "Increase the view size"
 msgstr "كبّر حجم المنظور"
@@ -6335,8 +6829,7 @@ msgid "Zoom _Out"
 msgstr "_بعّد"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:842
-#: ../src/nautilus-zoom-control.c:93
+#: ../src/nautilus-window-menus.c:842 ../src/nautilus-zoom-control.c:93
 #: ../src/nautilus-zoom-control.c:296
 msgid "Decrease the view size"
 msgstr "صغّر حجم المنظور"
@@ -6348,8 +6841,7 @@ msgid "Normal Si_ze"
 msgstr "ال_حجم عادي"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:850
-#: ../src/nautilus-zoom-control.c:94
+#: ../src/nautilus-window-menus.c:850 ../src/nautilus-zoom-control.c:94
 #: ../src/nautilus-zoom-control.c:309
 msgid "Use the normal view size"
 msgstr "استخدم الحجم العادي للمنظور"
@@ -6384,8 +6876,7 @@ msgid "_Network"
 msgstr "ال_شبكة"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:866
-#: ../src/network-scheme.desktop.in.h:1
+#: ../src/nautilus-window-menus.c:866 ../src/network-scheme.desktop.in.h:1
 msgid "Browse bookmarked and local network locations"
 msgstr "تصفح مواقع الشبكة والمحلّية المعلّمة"
 
@@ -6507,54 +6998,215 @@ msgstr "تقريب"
 msgid "Set the zoom level of the current view"
 msgstr "اضبط مستوى التقريب في المنظور الحالي"
 
+#: ../eel/eel-alert-dialog.c:109
+msgid "Image/label border"
+msgstr "حدود الصّورة/العلامة"
+
+#: ../eel/eel-alert-dialog.c:110
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "عرض الحدود حول العلامة و الصّورة في حوار التّنبيه"
+
+#: ../eel/eel-alert-dialog.c:119
+msgid "Alert Type"
+msgstr "نوع التّنبيه"
+
+#: ../eel/eel-alert-dialog.c:120
+msgid "The type of alert"
+msgstr "نوع التّنبيه"
+
+#: ../eel/eel-alert-dialog.c:128
+msgid "Alert Buttons"
+msgstr "أزرار التّنبيه"
+
+#: ../eel/eel-alert-dialog.c:129
+msgid "The buttons shown in the alert dialog"
+msgstr "الأزرار المعروضة في حوار التّنبيه"
+
+#: ../eel/eel-alert-dialog.c:193
+msgid "Show more _details"
+msgstr "أظهر _تفاصيل أكثر"
+
+#: ../eel/eel-canvas.c:1219 ../eel/eel-canvas.c:1220
+msgid "X"
+msgstr "س"
+
+#: ../eel/eel-canvas.c:1226 ../eel/eel-canvas.c:1227
+msgid "Y"
+msgstr "ص"
+
+#: ../eel/eel-editable-label.c:353
+msgid "Text"
+msgstr "النّص"
+
+#: ../eel/eel-editable-label.c:354
+msgid "The text of the label."
+msgstr "نص العلامة."
+
+#: ../eel/eel-editable-label.c:360
+msgid "Justification"
+msgstr "المساواة"
+
+#: ../eel/eel-editable-label.c:361
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"محاذاة السّطور في نص العلامة نسبةً لبعضها البعض. هذا لا يؤثّر على محاذاة "
+"العلامة ضمن موقعها. راجع GtkMisc::xalign للمزيد من المعلومات."
+
+#: ../eel/eel-editable-label.c:369
+msgid "Line wrap"
+msgstr "طيّ السّطور"
+
+#: ../eel/eel-editable-label.c:370
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "في حال تمكينه، فستُطوى السّطور إذا أصبح النّص عريضًا جدًّا."
+
+#: ../eel/eel-editable-label.c:377
+msgid "Cursor Position"
+msgstr "موقع المؤشّر"
+
+#: ../eel/eel-editable-label.c:378
+msgid "The current position of the insertion cursor in chars."
+msgstr "الموقع الحالي لمؤشّر الإدراج في الرّموز."
+
+#: ../eel/eel-editable-label.c:387
+msgid "Selection Bound"
+msgstr "التحديد مثبّت"
+
+#: ../eel/eel-editable-label.c:388
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "موقع الطّرف المقابل للتحديد عن المؤشر في الرّموز."
+
+#: ../eel/eel-editable-label.c:3217
+msgid "Select All"
+msgstr "اختر الكل"
+
+#: ../eel/eel-editable-label.c:3228
+msgid "Input Methods"
+msgstr "طرق الإدخال"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"خطأ ‪GConf‬‏:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "خطأ ‪GConf‬‏: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ستعرض جميع الأخطاء القادمة في الطّرفيّة فقط."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "لم تختر أيّة صورة."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "عليك أن تنقر على صورةٍ لاختيارها."
+
+#: ../eel/eel-stock-dialogs.c:209
+msgid "You can stop this operation by clicking cancel."
+msgstr "يمكنك إيقاف هذه العمليّة بنقر الغِ."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (يونيكود غير صحيح)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "أدخل كلمة السر"
+
 #~ msgid "Create Folder"
 #~ msgstr "أنشئ مجلدا"
+
 #~ msgid "Move to Trash"
 #~ msgstr "انقل إلى المهملات"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "أمتأكد أنك تريد نسيان التأريخ؟"
+
 #~ msgid "If you do, you will be doomed to repeat it."
 #~ msgstr "إذا فعلت فستلعن إذا أعدتها."
+
 #~ msgid ""
 #~ "If you clear the list of locations, they will be permanently deleted."
 #~ msgstr "ستحذف قائمة المواقع نهائيا إذا مسحتها."
+
 #~ msgid "E_ject"
 #~ msgstr "أ_خرِج"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "قرص Blu-Ray فارغ"
+
 #~ msgid "Blank CD Disc"
 #~ msgstr "اسطوانة فارغة"
+
 #~ msgid "Blank DVD Disc"
 #~ msgstr "قرص ديڤيدي فارغ "
+
 #~ msgid "Blank HD DVD Disc"
 #~ msgstr "قرص HD DVD فارغ"
+
 #~ msgid "Blu-Ray Video"
 #~ msgstr "‏Blu-Ray فيديو"
+
 #~ msgid "Compact Disc Audio"
 #~ msgstr "اسطوانة صوتية"
+
 #~ msgid "DVD Audio"
 #~ msgstr "ديڤيدي صوتي"
+
 #~ msgid "DVD Video"
 #~ msgstr "ديڤيدي فيديو"
+
 #~ msgid "Digital Photos"
 #~ msgstr "صور رقمية"
+
 #~ msgid "HD DVD Video"
 #~ msgstr "‏HD DVD فيديو"
+
 #~ msgid "Picture CD"
 #~ msgstr "اسطوانة صور"
+
 #~ msgid "Portable Audio Player"
 #~ msgstr "قارئ صوتي محمول"
+
 #~ msgid "Super Video CD"
 #~ msgstr "اسطوانة فيديو فائقة"
+
 #~ msgid "Video CD"
 #~ msgstr "اسطوانة فيديو"
+
 #~ msgid "List of x-content/* types to ask the user what to do on insertion."
 #~ msgstr "قائمة أنواع x-content/* التي يُسأل المستعمل عمَّ يفعل بها عند إدخالها."
+
 #~ msgid ""
 #~ "List of x-content/* types where a folder window should be opened on "
 #~ "insertion."
 #~ msgstr ""
 #~ "قائمة أنواع x-content/* عندما يُفتَرض بنافذة مجلّد أن تُفتح عند الإدخال."
+
 #~ msgid "List of x-content/* where to prompt the user on insertion"
 #~ msgstr "قائمة أنواع x-content/* عندما يُحَثُّ المستعمل عند الإدخال"
 
+#~ msgid "Opening %s"
+#~ msgstr "يفتح %s"
+
+#~ msgid "Opening %d Item"
+#~ msgid_plural "Opening %d Items"
+#~ msgstr[0] "لا يفتح أي عناصر"
+#~ msgstr[1] "يفتح عنصرا واحدا"
+#~ msgstr[2] "يفتح عنصرين"
+#~ msgstr[3] "يفتح %Id عناصر"
+#~ msgstr[4] "يفتح %Id عنصرًا"
+#~ msgstr[5] "يفتح %Id عنصر"
diff --git a/po/as.po b/po/as.po
index cdc790653..08fc69a96 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,10 +1,19 @@
+# #-#-#-#-#  as.po (as)  #-#-#-#-#
 # translation of as.po to Assamese
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Amitakhya Phukan <amitakhya@svn.gnome.org>, 2007.
+# #-#-#-#-#  as.po (as)  #-#-#-#-#
+# translation of as.po to Assamese
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Amitakhya Phukan <amitakhya@svn.gnome.org>, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-16 15:14+0100\n"
@@ -16,6 +25,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
+"Project-Id-Version: as\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-01 03:57+0000\n"
+"PO-Revision-Date: 2008-03-10 17:33+0530\n"
+"Last-Translator: Amitakhya Phukan <amitakhya@svn.gnome.org>\n"
+"Language-Team: Assamese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -113,7 +134,8 @@ msgstr ""
 
 #: ../data/browser.xml.h:24
 msgid "Drag an emblem to an object to add it to the object"
-msgstr "প্ৰতীক যোগ কৰাৰ জন্য পছন্দসই প্ৰতীক নিৰ্বাচন কৰে চিহ্নিত বস্তুৰ উপৰ টেনে এনে ফেলুন"
+msgstr ""
+"প্ৰতীক যোগ কৰাৰ জন্য পছন্দসই প্ৰতীক নিৰ্বাচন কৰে চিহ্নিত বস্তুৰ উপৰ টেনে এনে ফেলুন"
 
 #: ../data/browser.xml.h:25
 msgid "Eclipse"
@@ -473,7 +495,8 @@ msgstr ""
 "প্ৰদৰ্শন কৰা হবে। অন্যথা, ফোল্ডাৰ ও ফাইল উভয় প্ৰদৰ্শন কৰা হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "মান সত্য (true) হলে নতুন উইন্ডোতে অবস্থানসূচক বাৰ প্ৰদৰ্শিত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
@@ -604,7 +627,8 @@ msgstr ""
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
-msgstr "মান সত্য (true) হলে, মাউন্ট কৰা ভলিউম উল্লেখকাৰী আইকনগুলি ডেস্কটপে স্থাপিত হবে।"
+msgstr ""
+"মান সত্য (true) হলে, মাউন্ট কৰা ভলিউম উল্লেখকাৰী আইকনগুলি ডেস্কটপে স্থাপিত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
@@ -635,14 +659,16 @@ msgstr ""
 "হ্ৰাস কৰা হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "মান সত্য (true) হলে, আইকনগুলিৰ নীচে লেবেল স্থাপন না কৰে পাৰ্শ্ববৰ্তী অবস্থানে সেগুলি "
 "প্ৰদৰ্শিত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid "If true, new windows will use manual layout by default."
-msgstr "মান সত্য (true) হলে, নতুন উইন্ডোৰ ক্ষেত্ৰে ডিফল্টৰূপে মেনুয়েল বিন্যাস ব্যবহৃত হবে।"
+msgstr ""
+"মান সত্য (true) হলে, নতুন উইন্ডোৰ ক্ষেত্ৰে ডিফল্টৰূপে মেনুয়েল বিন্যাস ব্যবহৃত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
@@ -835,7 +861,8 @@ msgstr "ডেস্কটপেৰ আইকনেৰ জন্য ব্যব
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "ফাইলেৰ তাৰিখেৰ বৰ্ণনা। সম্ভাব্য মান হল \"locale\", \"iso\" ও \"informal\"।"
+msgstr ""
+"ফাইলেৰ তাৰিখেৰ বৰ্ণনা। সম্ভাব্য মান হল \"locale\", \"iso\" ও \"informal\"।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid "The side pane view to show in newly opened windows."
@@ -862,8 +889,8 @@ msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
 msgstr ""
-"ডেস্কটপে অবস্থিত নেটওয়াৰ্ক সাৰ্ভাৰ আইকনেৰ জন্য স্বনিৰ্বাচিত নাম ব্যবহাৰেৰ জন্য তা ধাৰ্য "
-"কৰা যাবে।"
+"ডেস্কটপে অবস্থিত নেটওয়াৰ্ক সাৰ্ভাৰ আইকনেৰ জন্য স্বনিৰ্বাচিত নাম ব্যবহাৰেৰ জন্য তা "
+"ধাৰ্য কৰা যাবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
 msgid ""
@@ -1165,7 +1192,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "দুঃখিত, নতুন প্ৰতীকটিৰ জন্য নিৰ্দেশক-শব্দ ফাঁকা ৰাখা যাবে না।"
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:204
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "দুঃখিত, প্ৰতীকেৰ নিৰ্দেশক-শব্দে শুধুমাত্ৰ অক্ষৰ, শূণ্যস্থান ও সংখ্যা লেখা যাবে।"
 
 #. this really should never happen, as a user has no idea
@@ -1435,12 +1463,14 @@ msgstr "\"%s\" নামক একটি ফাইল বৰ্তমানে �
 msgid ""
 "The folder already exists in \"%s\".  Replacing it will overwrite any files "
 "in the folder that conflict with the files being copied."
-msgstr "The folder already exists in \"%s\".  Replacing it will overwrite any files "
+msgstr ""
+"The folder already exists in \"%s\".  Replacing it will overwrite any files "
 "in the folder that conflict with the files being copied."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "\"%s\"-ৰ মধ্যে ফাইলটি উপস্থিত ৰয়েছে।  পুনৰায় স্থাপিত হলে এৰ মধ্যে উপস্থিত বিষয়বস্তু "
 "পৰিবৰ্তিত হবে।"
@@ -2345,9 +2375,14 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:489
 #: ../libnautilus-private/nautilus-program-choosing.c:731
-#, c-format
+#: ../eel/eel-app-launch-context.c:404
+#, fuzzy, c-format
 msgid "Opening %s"
-msgstr "%s খোলা হচ্ছে"
+msgstr ""
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
+"%s খোলা হচ্ছে\n"
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
+"%s খোলা হৈছে"
 
 #. TODO: These strings suck pretty badly, but we're in string-freeze,
 #. * and I found these in other places to reuse. We should make them
@@ -2392,7 +2427,8 @@ msgstr "\"%s\" প্ৰদৰ্শন কৰতে ব্যৰ্থ, কা�
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1538
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "বানান এবং প্ৰক্সিৰ বৈশিষ্ট্যাবলী সঠিক কিনা তা পৰীক্ষা কৰুন।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:616
@@ -2417,11 +2453,20 @@ msgid "Couldn't find \"%s\"."
 msgstr "\"%s\" পাওয়া যায়নি।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:734
-#, c-format
+#: ../eel/eel-app-launch-context.c:407
+#, fuzzy, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
-msgstr[0] "%d-টি বস্তু খোলা হচ্ছে"
-msgstr[1] "%d-টি বস্তু খোলা হচ্ছে"
+msgstr[0] ""
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
+"%d-টি বস্তু খোলা হচ্ছে\n"
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
+"%d বস্তু খোলা হৈছে"
+msgstr[1] ""
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
+"%d-টি বস্তু খোলা হচ্ছে\n"
+"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
+"%d বস্তু খোলা হৈছে"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:899
 msgid "Sorry, but you can't execute commands from a remote site."
@@ -2442,7 +2487,8 @@ msgid "This drop target only supports local files."
 msgstr "টেনে এনে ফেলে দেওয়াৰ এই প্ৰক্ৰিয়া শুধুমাত্ৰ স্থানীয় ফাইলেৰ ক্ষেত্ৰে প্ৰযোজ্য।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "দূৰবৰ্তী ফাইল খোলাৰ জন্য প্ৰথমে সেগুলি স্থানীয় ফোল্ডাৰে কপি কৰে পুনৰায় টেনে এনে "
 "ফেলাৰ প্ৰচেষ্টা কৰুন।"
@@ -2483,7 +2529,8 @@ msgstr "পুনৰায় সৰ্বশেষ সম্পাদনা কৰ
 
 #. label, accelerator
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:658
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2573,7 +2620,8 @@ msgstr "ডেস্কটপেৰ পটভূমি পৰিবৰ্তন
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "ডেস্কটপ পটভূমিৰ বিন্যাস অথবা ৰঙ নিৰ্ধাৰণে সহায়ক উইন্ডো প্ৰদৰ্শন কৰা হবে"
 
 #. tooltip
@@ -2631,7 +2679,8 @@ msgstr "আপনি কি নিশ্চিতৰূপে \"%s\" স্থ�
 #: ../src/file-manager/fm-directory-view.c:1006
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] "আপনি কি নিশ্চিতৰূপে নিৰ্বাচিত %d-টি সামগ্ৰী স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
 msgstr[1] "আপনি কি নিশ্চিতৰূপে নিৰ্বাচিত %d-টি সামগ্ৰী স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
 
@@ -2749,7 +2798,9 @@ msgstr "%s%s, %s"
 #: ../src/file-manager/fm-directory-view.c:2377
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
-msgstr "Nautilus দ্বাৰা পৰিচালনযোগ্য ফাইলেৰ সংখ্যাৰ অধিক ফাইল \"%s\" ফোল্ডাৰেৰ মধ্যে উপস্থিত ৰয়েছে।"
+msgstr ""
+"Nautilus দ্বাৰা পৰিচালনযোগ্য ফাইলেৰ সংখ্যাৰ অধিক ফাইল \"%s\" ফোল্ডাৰেৰ মধ্যে "
+"উপস্থিত ৰয়েছে।"
 
 #: ../src/file-manager/fm-directory-view.c:2383
 msgid "Some files will not be displayed."
@@ -2776,8 +2827,11 @@ msgstr[0] "নিৰ্ব্বাচিত বস্তুটো আবৰ্�
 msgstr[1] "নিৰ্ব্বাচিত %d বস্তু আবৰ্জনাৰ বাক্সলৈ লৈ যাব নোৱাৰি"
 
 #: ../src/file-manager/fm-directory-view.c:3852
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
-msgstr "কয়েকটি বস্তু আবৰ্জনাৰ বাক্সে ফাইল স্থানান্তৰ কৰতে ব্যৰ্থ, এই মুহূৰ্তে সেগুলি মুছে ফেলতে ইচ্ছুক কি?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr ""
+"কয়েকটি বস্তু আবৰ্জনাৰ বাক্সে ফাইল স্থানান্তৰ কৰতে ব্যৰ্থ, এই মুহূৰ্তে সেগুলি মুছে ফেলতে "
+"ইচ্ছুক কি?"
 
 #: ../src/file-manager/fm-directory-view.c:3853
 #, c-format
@@ -2797,8 +2851,10 @@ msgid ""
 msgid_plural ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "trash?"
-msgstr[0] "আপনি কি নিশ্চিতৰূপে আবৰ্জনাৰ বাক্সে নিৰ্বাচিত %d-টি বস্তু স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
-msgstr[1] "আপনি কি নিশ্চিতৰূপে আবৰ্জনাৰ বাক্সে নিৰ্বাচিত %d-টি বস্তু স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
+msgstr[0] ""
+"আপনি কি নিশ্চিতৰূপে আবৰ্জনাৰ বাক্সে নিৰ্বাচিত %d-টি বস্তু স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
+msgstr[1] ""
+"আপনি কি নিশ্চিতৰূপে আবৰ্জনাৰ বাক্সে নিৰ্বাচিত %d-টি বস্তু স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
 
 #: ../src/file-manager/fm-directory-view.c:3906
 msgid "If you delete an item, it will be permanently lost."
@@ -2854,7 +2910,8 @@ msgid ""
 "file from a trusted source. To open the file, rename the file to the correct "
 "extension for \"%s\", then open the file normally. Alternatively, use the "
 "Open With menu to choose a specific application for the file. "
-msgstr "The filename \"%s\" indicates that this file is of type \"%s\". The contents "
+msgstr ""
+"The filename \"%s\" indicates that this file is of type \"%s\". The contents "
 "of the file indicate that the file is of type \"%s\". If you open this file, "
 "the file might present a security risk to your system.\n"
 "\n"
@@ -2875,7 +2932,9 @@ msgstr "\"%s\" টেমপ্লেট প্ৰয়োগ কৰে ডকু�
 
 #: ../src/file-manager/fm-directory-view.c:5937
 msgid "All executable files in this folder will appear in the Scripts menu."
-msgstr "চিহ্নিত ফোল্ডাৰেৰ মধ্যে উপস্থিত সব এক্সেকিউটেবল ফঅইলগুলি স্ক্ৰিপ্ট মেনুৰ মধ্যে প্ৰদৰ্শিত হবে।"
+msgstr ""
+"চিহ্নিত ফোল্ডাৰেৰ মধ্যে উপস্থিত সব এক্সেকিউটেবল ফঅইলগুলি স্ক্ৰিপ্ট মেনুৰ মধ্যে প্ৰদৰ্শিত "
+"হবে।"
 
 #: ../src/file-manager/fm-directory-view.c:5939
 msgid ""
@@ -2920,14 +2979,16 @@ msgstr "পেস্ট কমান্ড নিৰ্বাচন কৰা �
 #: ../src/file-manager/fm-directory-view.c:6116
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
 msgstr[0] "পেস্ট কমান্ড নিৰ্বাচন কৰা হলে %d-টি নিৰ্বাচিত বস্তু স্থানান্তৰ কৰা হবে"
 msgstr[1] "পেস্ট কমান্ড নিৰ্বাচন কৰা হলে %d-টি নিৰ্বাচিত বস্তু স্থানান্তৰ কৰা হবে"
 
 #: ../src/file-manager/fm-directory-view.c:6123
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
 msgstr[0] "পেস্ট কমান্ড নিৰ্বাচন কৰা হলে %d-টি নিৰ্বাচিত বস্তু কপি কৰা হবে"
 msgstr[1] "পেস্ট কমান্ড নিৰ্বাচন কৰা হলে %d-টি নিৰ্বাচিত বস্তু কপি কৰা হবে"
 
@@ -3069,7 +3130,8 @@ msgstr "নিৰ্বাচিত ফাইলগুলি পেস্ট ক
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6958
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "কাট অথবা কপি কমান্ডেৰ সাহায্যে পূৰ্বে নিৰ্বাচিত ফাইল যথাক্ৰমে স্থানান্তৰ অথবা কপি কৰুন"
+msgstr ""
+"কাট অথবা কপি কমান্ডেৰ সাহায্যে পূৰ্বে নিৰ্বাচিত ফাইল যথাক্ৰমে স্থানান্তৰ অথবা কপি কৰুন"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3084,7 +3146,9 @@ msgstr "ফোল্ডাৰেৰ মধ্যে পেস্ট কৰুন
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
-msgstr "কাট অথবা কপি কমান্ডেৰ সাহায্যে পূৰ্বে নিৰ্বাচিত ফাইল বাছাইত কৰাৰ ফোল্ডাৰেৰ মধ্যে যথাক্ৰমে স্থানান্তৰ অথবা কপি কৰুন"
+msgstr ""
+"কাট অথবা কপি কমান্ডেৰ সাহায্যে পূৰ্বে নিৰ্বাচিত ফাইল বাছাইত কৰাৰ ফোল্ডাৰেৰ মধ্যে "
+"যথাক্ৰমে স্থানান্তৰ অথবা কপি কৰুন"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6968
@@ -3099,7 +3163,8 @@ msgstr "বিন্যাস নিৰ্বাচন কৰুন (_P)"
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6972
 msgid "Select items in this window matching a given pattern"
-msgstr "বৰ্তমান উইন্ডোৰ মধ্যে উপস্থিত, সুনিৰ্দিষ্ট বিন্যাসেৰ সাথে সুসংগত বস্তুগুলি নিৰ্বাচন কৰুন"
+msgstr ""
+"বৰ্তমান উইন্ডোৰ মধ্যে উপস্থিত, সুনিৰ্দিষ্ট বিন্যাসেৰ সাথে সুসংগত বস্তুগুলি নিৰ্বাচন কৰুন"
 
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6975
@@ -3383,7 +3448,8 @@ msgstr "গন্তব্যস্থল উল্লিখিত না হও
 #: ../src/file-manager/fm-directory-view.c:8231
 #, c-format
 msgid "This link can't be used, because its target \"%s\" doesn't exist."
-msgstr "উল্লিখিত গন্তব্যস্থল \"%s\" উপস্থিত না হওয়াৰ ফলে এই লিঙ্কটি ব্যবহাৰ কৰা সম্ভব নয়।"
+msgstr ""
+"উল্লিখিত গন্তব্যস্থল \"%s\" উপস্থিত না হওয়াৰ ফলে এই লিঙ্কটি ব্যবহাৰ কৰা সম্ভব নয়।"
 
 #: ../src/file-manager/fm-directory-view.c:8882
 #, c-format
@@ -3457,8 +3523,10 @@ msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
-msgstr "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:64
 #, c-format
@@ -3476,13 +3544,17 @@ msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 
 #: ../src/file-manager/fm-error-reporting.c:118
 #, c-format
@@ -3494,7 +3566,8 @@ msgstr ""
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
-msgstr "The name \"%s\" is not valid because it contains the character \"/\". Please "
+msgstr ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 
 #: ../src/file-manager/fm-error-reporting.c:127
@@ -3518,8 +3591,10 @@ msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
-msgstr "You do not have the permissions necessary to change the group of \"%s\""
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
+msgstr ""
+"You do not have the permissions necessary to change the group of \"%s\""
 
 #: ../src/file-manager/fm-error-reporting.c:173
 #, c-format
@@ -3551,8 +3626,10 @@ msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
-msgstr "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 
 #: ../src/file-manager/fm-error-reporting.c:246
 #, c-format
@@ -4719,7 +4796,8 @@ msgid ""
 "has been presented.\n"
 "\n"
 "You can manually erase this file to present the druid again.\n"
-msgstr "Existence of this file indicates that the Nautilus configuration druid\n"
+msgstr ""
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
 "You can manually erase this file to present the druid again.\n"
@@ -4935,7 +5013,8 @@ msgid ""
 "\n"
 "\n"
 "Browse the file system with the file manager"
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "Browse the file system with the file manager"
 
@@ -5850,3 +5929,132 @@ msgstr ""
 msgid "Set the zoom level of the current view"
 msgstr "সর্বমোট"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ছবি/লেবেলৰ প্ৰান্তৰেখা"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "সতৰ্কবাৰ্তা প্ৰদৰ্শনকাৰী সম্বাদ বক্সৰ লেবেল আৰু ছবিৰ প্ৰান্তৰেখাৰ প্ৰস্থ"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "সতৰ্কবাৰ্তাৰ ধৰন"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "সতৰ্কবাৰ্তাৰ ধৰন"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "সতৰ্কতামূলক বুটাম"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "সতৰ্কবাৰ্তাৰ সম্বাদ-বক্সত প্ৰদৰ্শিত বুটাম"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "অতিৰিক্ত বিৱৰণ প্ৰদৰ্শন কৰা হ'ব (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "টেক্সট"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "লেবেলত প্ৰদৰ্শিত টেক্সট ।"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "সমপ্ৰান্ত নিৰ্ধাৰণ"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"লেবেলৰ প্ৰদৰ্শিত টেক্সটৰ পংক্তিৰ পাৰস্পৰিক অৱস্থান অনুসাৰে দিশা । ইয়াৰ ফলত চিহ্নিত "
+"স্থানত লেবেলৰ দিশ প্ৰভাবিত ন'হ'ব । লেবেলৰ দিশ পৰিবৰ্তন সম্পৰ্কে জানিবলৈ GtkMisc::"
+"xalign চাওক ।"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Line wrap"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"মান নিৰ্ধাৰিত হ'লে, পংক্তি অত্যাধিক দীঘল হ'লে সেইসমূহ বিভাজন কৰি প্ৰদৰ্শন কৰা হ'ব ।"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "কাৰ্ছাৰৰ অৱস্থান"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "সন্নিবেশ কৰাৰ সময় প্ৰদৰ্শিত কাৰ্ছাৰৰ অৱস্থান, অক্ষৰ অনুসাৰে নিৰ্ধাৰিত ।"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "নিৰ্বাচিত অংশৰ সীমা"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "কাৰ্ছাৰৰ অৱস্থানৰ পৰা নিৰ্বাচিত অংশৰ বিপৰীত প্ৰান্ত, অক্ষৰ অনুসাৰে নিৰ্ধাৰিত ।"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "সমস্ত নিৰ্ব্বাচন কৰক"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "নিবেশ পদ্ধতি"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf ত্ৰুটি:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf ত্ৰুটি: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ভৱিষ্যতে উৎপন্ন ত্ৰুটি অকল টাৰ্মিনেলত প্ৰদৰ্শিত হ'ব ।"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "ছবি নিৰ্বাচিত নহয় ।"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "নিৰ্ব্বাচন কৰাৰ বাবে ছবিৰ ওপৰত ক্লিক কৰক ।"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "বাতিল ক্লিক কৰি বৰ্তমান কৰ্ম বন্ধ কৰা যাব ।"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (অবৈধ ইউনিকোড)"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "গুপ্তশব্দ লিখক"
diff --git a/po/az.po b/po/az.po
index e6f2b5a26..929eec5df 100644
--- a/po/az.po
+++ b/po/az.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  az.po (nautilus.HEAD.az)  #-#-#-#-#
 # translation of nautilus.HEAD.az.po to Azerbaijani
 # translation of nautilus.HEAD.po to Azerbaijani Turkish
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
@@ -5,8 +6,17 @@
 # Mətin Əmirov <metin@karegen.com>, 2003, 2004.
 # Metin Amiroff <metin@karegen.com>, 2004.
 #
+# #-#-#-#-#  az.po (eel.HEAD.az)  #-#-#-#-#
+# translation of eel.HEAD.az.po to Azerbaijani
+# translation of eel.HEAD.po to Azerbaijani Turkish
+# Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+# Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2001.
+# Mətin Əmirov <metin@karegen.com>, 2003, 2004.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  az.po (nautilus.HEAD.az)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.az\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -19,6 +29,18 @@ msgstr ""
 "net>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.3.1\n"
+"#-#-#-#-#  az.po (eel.HEAD.az)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.az\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2004-08-18 19:48+0300\n"
+"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
+"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"net>\n"
+"X-Generator: KBabel 1.3.1\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -445,9 +467,14 @@ msgstr "Bu örtü fotoqrafik həqiqətdə qovluqlar işlədir."
 #: libnautilus-extension/nautilus-menu-item.c:206
 #: libnautilus-extension/nautilus-property-page.c:176
 #: libnautilus-private/nautilus-column-utilities.c:43
-#: src/file-manager/fm-list-view.c:1107
+#: src/file-manager/fm-list-view.c:1107 eel/eel-mime-application-chooser.c:246
+#, fuzzy
 msgid "Name"
-msgstr "Proqramın Adı"
+msgstr ""
+"#-#-#-#-#  az.po (nautilus.HEAD.az)  #-#-#-#-#\n"
+"Proqramın Adı\n"
+"#-#-#-#-#  az.po (eel.HEAD.az)  #-#-#-#-#\n"
+"Ad"
 
 #: libnautilus-extension/nautilus-column.c:176
 msgid "Name of the column"
@@ -4402,7 +4429,7 @@ msgstr "Yardım göstərilərkən xəta oldu."
 msgid "Couldn't Show Help"
 msgstr "Yardım Göstərilə Bilmədi"
 
-#: src/file-manager/fm-properties-window.c:3305
+#: src/file-manager/fm-properties-window.c:3305 eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Fərqli Aç"
 
@@ -6111,6 +6138,225 @@ msgstr "Şəbəkə Vericiləri"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Nautilus fayl idarəçisində şəbəkə vericilərinizi görün"
 
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Mətn"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Rəsm/etiket kənarı"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Xəbərdarlıq dialoqunda rəsmin və etiketin ətrafındakı kənarın eni"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Xəbərdarlıq Növü"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Xəbərdarlığın növü"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Xəbərdarlıq Düymələri"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Xəbərdarlıq dialoqunda göstərilən düymələr"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Daha çox _təfərruat göstər"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Etiketin mətni."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "İki yönlü hizalama"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Etiket mətninin içindəki sətrlərin bir birinə səviyələməsi nisbidir. Bu "
+"etiketin öz yerindəki səviyələməsinə təsir göstərmir. Bunun üçün bax: "
+"GtkMisc::xalign."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Sətri qırması"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Seçilibsə, mətn çox geniş olduğu zaman yazılar büküləcək."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Ox Mövqeyi"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Xarakter ədədində oxun hazırkı mövqeyi "
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Seçilmək Üzrə"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Seçimin tam tərs tərəfinin oxdan xarakter ədədində mövqeyi"
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Hamısını Seç"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Giriş Üsulları"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf xətası:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf xətası: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Bütün başqa xətalar sadəcə olaraq terminalda göstəriləcəkdir."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Heç bir rəsm seçilməyib."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Seçmək üçün rəsmi tıqlamalısınız."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Ön Qurğulu"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Heç bir proqram seçili deyil</i>"
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr "%s sənədi"
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Namə'lum"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+"<i>%s</i> faylını və \"%s\" növündəki digər faylları açmaq üçün program seç"
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Proqram işə salına bilmədi"
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' tapıla bilmədi"
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Proqram tapıla bilmədi"
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Proqram əlavə edilə bilmədi"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Proqram məlumat bazasına əlavə edilə bilmədi"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Proqram Seç"
+
+#: eel/eel-open-with-dialog.c:830
+#, fuzzy
+msgid "Select an application to view its description."
+msgstr ""
+"<i>%s</i> faylını və \"%s\" növündəki digər faylları açmaq üçün program seç"
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr "_Gəz..."
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "<i>%s</i> faylını və \"%s\" növündəki digər faylları bununla aç: "
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr "Ə_lavə et"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr "Proqram Əlavə Et"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Bu gedişatı ləğv düyməsinə basaraq dayandıra bilərsiniz."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (hökmsüz Yunikod)"
+
 #~ msgid "Allaire"
 #~ msgstr "Allaire"
 
@@ -6382,9 +6628,6 @@ msgstr "Nautilus fayl idarəçisində şəbəkə vericilərinizi görün"
 #~ msgid "Factory for text view"
 #~ msgstr "Mətn nümayişi e'malatxanası"
 
-#~ msgid "Text"
-#~ msgstr "Mətn"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Mətn Nümayişçisi"
 
@@ -6606,3 +6849,21 @@ msgstr "Nautilus fayl idarəçisində şəbəkə vericilərinizi görün"
 
 #~ msgid "Try to fit in window"
 #~ msgstr "Pəncərəyə yaraşdır"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf Xətası"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Heçnə Seçilməyib"
+
+#~ msgid "Info"
+#~ msgstr "Mə'lumat"
+
+#~ msgid "Warning"
+#~ msgstr "Xabərdarlıq"
+
+#~ msgid "Error"
+#~ msgstr "Xəta"
+
+#~ msgid "Question"
+#~ msgstr "Sual"
diff --git a/po/be.po b/po/be.po
index 636440888..34572b302 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#
 # translation of nautilus.HEAD.be.po to Belarusian
 # Беларускі пераклад nautilus.HEAD.
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -6,8 +7,18 @@
 # Vital Khilko <vk@altlinux.ru>, 2005.
 # Ihar Hrachyshka <boox.svaboda2006@gmail.com>, 2006
 #
+# #-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#
+# Беларускі пераклад eel
+# Copyright (C) 2002,2003 Free Software Foundation, Inc.
+# Ales Nyakhaychyk <i18n@infonet.by>, 2002, 2005
+# Vital Khilko <dojlid@mova.org>, 2003, 2004
+# Vital Khilko <dojlid@mova.org>, 2005.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.be\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-02-26 09:23+0000\n"
@@ -19,6 +30,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"#-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-29 06:20+0200\n"
+"PO-Revision-Date: 2006-06-30 00:55+0300\n"
+"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
+"Language-Team: Belarusian <i18n@mova.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -398,8 +419,8 @@ msgstr "Заўсёды выкарыстоўваць радок разьмяшч�
 msgid ""
 "Color for the default folder background. Only used if background_set is true."
 msgstr ""
-"Назва прадвызначанага тла тэчкі. Выкарыстоўваецца толькі "
-"тады, калі background_set мае значэньне \"ісьціна\"."
+"Назва прадвызначанага тла тэчкі. Выкарыстоўваецца толькі тады, калі "
+"background_set мае значэньне \"ісьціна\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "Computer icon visible on desktop"
@@ -615,8 +636,8 @@ msgid ""
 "If set to true, then Nautilus will automatically mount media such as user-"
 "visible hard disks and removable media on start-up and and media insertion."
 msgstr ""
-"Калі ісьціна, Наўтылюс будзе аўтаматычна мантаваць носьбіты (вонкавыя дыскі і т.п.) "
-"ў час запуску й далучэньня носьбіта."
+"Калі ісьціна, Наўтылюс будзе аўтаматычна мантаваць носьбіты (вонкавыя дыскі "
+"і т.п.) ў час запуску й далучэньня носьбіта."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
@@ -644,8 +665,9 @@ msgstr ""
 msgid ""
 "If set to true, then Nautilus will never prompt nor autorun/autostart "
 "programs when media is inserted."
-msgstr "Калі ісьціна, Nautilus ніколі ня будзе пытацца пра аўтазапуск "
-"праграм з вонкавых носьбітаў."
+msgstr ""
+"Калі ісьціна, Nautilus ніколі ня будзе пытацца пра аўтазапуск праграм з "
+"вонкавых носьбітаў."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
@@ -1003,8 +1025,8 @@ msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
 msgstr ""
-"Гэтую назву можна ўсталяваць, калі вы хочаце зьмяніць назву значкі сеткавых паслужнікаў "
-"на стальцы."
+"Гэтую назву можна ўсталяваць, калі вы хочаце зьмяніць назву значкі сеткавых "
+"паслужнікаў на стальцы."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid ""
@@ -1079,7 +1101,9 @@ msgstr "Ці было ўсталявана адмысловае прадвызн
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:123
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "Ці трэба пытацца пацьверджаньня ў час выдаленьня файлаў, ці спусташэньня Сьметніцы."
+msgstr ""
+"Ці трэба пытацца пацьверджаньня ў час выдаленьня файлаў, ці спусташэньня "
+"Сьметніцы."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:124
 msgid "Whether to automatically mount media"
@@ -1282,6 +1306,7 @@ msgstr "У_жыць прадвызначаны"
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:290
 #: ../src/file-manager/fm-list-view.c:1399
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Назва"
 
@@ -1690,11 +1715,14 @@ msgid_plural ""
 "Are you sure you want to permanently delete the %'d selected items from the "
 "trash?"
 msgstr[0] ""
-"Вы насамрэч жадаеце выдаліць назаўжды выдаліць %'d вылучаны элемэнт із Сьметніцы?"
+"Вы насамрэч жадаеце выдаліць назаўжды выдаліць %'d вылучаны элемэнт із "
+"Сьметніцы?"
 msgstr[1] ""
-"Вы насамрэч жадаеце выдаліць назаўжды выдаліць %'d вылучаныя элемэнты із Сьметніцы?"
+"Вы насамрэч жадаеце выдаліць назаўжды выдаліць %'d вылучаныя элемэнты із "
+"Сьметніцы?"
 msgstr[2] ""
-"Вы насамрэч жадаеце выдаліць назаўжды выдаліць %'d вылучаных элемэнтаў із Сьметніцы?"
+"Вы насамрэч жадаеце выдаліць назаўжды выдаліць %'d вылучаных элемэнтаў із "
+"Сьметніцы?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1107
 #: ../libnautilus-private/nautilus-file-operations.c:1173
@@ -1759,16 +1787,14 @@ msgstr "Памылка выдаленьня."
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
-msgstr ""
-"Нельга выдаліць файлы ў тэчцы \"%B\", бо вы ня маеце на яе правоў."
+msgstr "Нельга выдаліць файлы ў тэчцы \"%B\", бо вы ня маеце на яе правоў."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1290
 #: ../libnautilus-private/nautilus-file-operations.c:2168
 #: ../libnautilus-private/nautilus-file-operations.c:2941
 msgid ""
 "There was an error getting information about the files in the folder \"%B\"."
-msgstr ""
-"Узьнікла памылка атрыманьня зьвестак пра файлы ў тэчцы \"%B\"."
+msgstr "Узьнікла памылка атрыманьня зьвестак пра файлы ў тэчцы \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1298
 #: ../libnautilus-private/nautilus-file-operations.c:2949
@@ -1834,8 +1860,8 @@ msgid ""
 "In order to regain the free space on this volume the trash must be emptied. "
 "All trashed items on the volume will be permanently lost."
 msgstr ""
-"Каб вызваліць месца на гэтай прыладзе, трэба спустошыць Сьметніцу. "
-"Усе файлы із Сьметніцы будуць выдалены назаўжды."
+"Каб вызваліць месца на гэтай прыладзе, трэба спустошыць Сьметніцу. Усе файлы "
+"із Сьметніцы будуць выдалены назаўжды."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1938
 msgid "Don't Empty Trash"
@@ -1906,24 +1932,24 @@ msgid ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
 msgstr ""
-"З файламі ў тэчцы \"%B\" нельга нічога зрабіць, бо вы ня маеце правоў, "
-"каб убачыць іх."
+"З файламі ў тэчцы \"%B\" нельга нічога зрабіць, бо вы ня маеце правоў, каб "
+"убачыць іх."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2203
 msgid ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
-"З тэчкай \"%B\" нельга нічога зрабіць, бо вы ня маеце правоў, "
-"каб прачытаць яе зьмест."
+"З тэчкай \"%B\" нельга нічога зрабіць, бо вы ня маеце правоў, каб прачытаць "
+"яе зьмест."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2277
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
-"З файлам \"%B\" нельга нічога зрабіць, бо вы ня маеце правоў, "
-"каб прачытаць яго."
+"З файлам \"%B\" нельга нічога зрабіць, бо вы ня маеце правоў, каб прачытаць "
+"яго."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2280
 msgid "There was an error getting information about \"%B\"."
@@ -2813,10 +2839,17 @@ msgid "Could not set as default application"
 msgstr "Немагчыма зрабіць дастасаваньне прадвызначаным"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:273
+#: ../eel/eel-mime-application-chooser.c:229
+#, fuzzy
 msgid "Default"
-msgstr "Прадвызначана"
+msgstr ""
+"#-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#\n"
+"Прадвызначана\n"
+"#-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#\n"
+"Дапомна"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:281
+#: ../eel/eel-mime-application-chooser.c:237
 msgid "Icon"
 msgstr "Значка"
 
@@ -2825,17 +2858,20 @@ msgid "Could not remove application"
 msgstr "Немагчыма выдаліць дастасаваньне"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:580
+#: ../eel/eel-mime-application-chooser.c:478
 msgid "No applications selected"
 msgstr "Дастасаваньне ня вылучана"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:608
 #: ../libnautilus-private/nautilus-open-with-dialog.c:920
+#: ../eel/eel-mime-application-chooser.c:526 ../eel/eel-open-with-dialog.c:967
 #, c-format
 msgid "%s document"
 msgstr "%s дакумэнт"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:615
 #: ../libnautilus-private/nautilus-open-with-dialog.c:926
+#: ../eel/eel-mime-application-chooser.c:536 ../eel/eel-open-with-dialog.c:980
 msgid "Unknown"
 msgstr "Невядома"
 
@@ -2851,17 +2887,34 @@ msgid "Open all files of type \"%s\" with:"
 msgstr ""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:162
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+#, fuzzy
 msgid "Could not run application"
-msgstr "Немагчыма выканаць дастасаваньне"
+msgstr ""
+"#-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#\n"
+"Немагчыма выканаць дастасаваньне\n"
+"#-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#\n"
+"Немагыма запусьціць дастасаваньне"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:174
-#, c-format
+#: ../eel/eel-open-with-dialog.c:187
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "Немагчыма знайсьці \"%s\""
+msgstr ""
+"#-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#\n"
+"Немагчыма знайсьці \"%s\"\n"
+"#-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#\n"
+"Немагчыма адшукаць \"%s\""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:177
+#: ../eel/eel-open-with-dialog.c:190
+#, fuzzy
 msgid "Could not find application"
-msgstr "Немагчыма знайсьці дастасаваньне"
+msgstr ""
+"#-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#\n"
+"Немагчыма знайсьці дастасаваньне\n"
+"#-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#\n"
+"Немагчыма адшукаць дастасаваньне"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:250
 #, c-format
@@ -2869,56 +2922,66 @@ msgid "Could not add application to the application database: %s"
 msgstr ""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:251
+#: ../eel/eel-open-with-dialog.c:287
 msgid "Could not add application"
 msgstr "Немагчыма дадаць дастасаваньне"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:391
+#: ../eel/eel-open-with-dialog.c:401
 msgid "Select an Application"
 msgstr "Вылучэньне дастасаваньня"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:743
 #: ../src/file-manager/fm-properties-window.c:5012
+#: ../eel/eel-open-with-dialog.c:793
+#, fuzzy
 msgid "Open With"
-msgstr "Адкрыць у"
+msgstr ""
+"#-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#\n"
+"Адкрыць у\n"
+"#-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#\n"
+"Адчыніць з"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:780
+#: ../eel/eel-open-with-dialog.c:830
 msgid "Select an application to view its description."
-msgstr ""
+msgstr "Вылучыце дастасаваньне, каб убачыць яго апісаньне."
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:805
+#: ../eel/eel-open-with-dialog.c:855
 msgid "_Use a custom command"
-msgstr ""
+msgstr "Ужыць ад_мысловы загад"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:822
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:872
 msgid "_Browse..."
-msgstr "_Выдаліць..."
+msgstr "_Агляд..."
 
+#. #-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:844
 #: ../src/file-manager/fm-directory-view.c:6249
 #: ../src/file-manager/fm-directory-view.c:7104
 #: ../src/file-manager/fm-tree-view.c:1103
-#: ../src/nautilus-places-sidebar.c:1677
+#: ../src/nautilus-places-sidebar.c:1677 ../eel/eel-open-with-dialog.c:894
+#, fuzzy
 msgid "_Open"
-msgstr "_Адкрыць"
+msgstr ""
+"#-#-#-#-#  be.po (nautilus.HEAD.be)  #-#-#-#-#\n"
+"_Адкрыць\n"
+"#-#-#-#-#  be.po (eel HEAD)  #-#-#-#-#\n"
+"_Адчыніць"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:935
+#: ../eel/eel-open-with-dialog.c:987
 #, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr ""
+msgstr "Адчыніць %s і іншыя файлы тыпу \"%s\" з дапамогай:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:971
-#: ../libnautilus-private/nautilus-open-with-dialog.c:986
+#: ../eel/eel-open-with-dialog.c:1019
 msgid "_Add"
-msgstr ""
+msgstr "_Дадаць"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:972
-#: ../libnautilus-private/nautilus-open-with-dialog.c:987
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:1020
 msgid "Add Application"
-msgstr "Здань"
+msgstr "Дадаць дастасаваньне"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:126
 msgid "Open Failed, would you like to choose another application?"
@@ -6646,6 +6709,157 @@ msgstr "Усталяваць маштаб бягучага рэжыму"
 msgid "Network"
 msgstr "Сетка"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Мяжа відарыса/адмеціны"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Шырыня мяжы вакол адмеціны і відарыс у дыялёгу трывогі"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Тып трывогі"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Тып трывогі"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Кнопкі трывогі"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Кнопкі, якія бачны ў дыялёгу трывогі"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Паказаць больш д_эталяў"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Тэкст"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Тэкст адмеціны."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Раўнаньне"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Раўнаньне радкоў тэкста ў адмеціне адносна любога іншага. Гэта НЯ ДЗЕЙНІЧАЕ "
+"на раўнаньне адмеціны бяз вызначана мейсца. Глядзіце GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Перанос"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Калі ўсталявана, вельмі шырокія радкі пераносяцца."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Пазыцыя курсора"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Бягучая пазыцыя ўстаўкі курсора ў знаках."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Мяжа вызначэньня"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Знаходжаньне супрацьлеглага боку вылучэньня ад курсора ў знаках."
+
+#: ../eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Адзначыць усё"
+
+#: ../eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Мэтады ўводу"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Памылка GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Памылка GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Усе далейшыя памылкі будуць бачны толькі ў акне тэрмінала."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Відарыс ня вылучаны."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Вы мусіце пстрыкнуць па відарысе, каб вылучыць яго."
+
+#: ../eel/eel-mime-application-chooser.c:544
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr "Вылучыце дастасаваньне, каб адчыніць %s і іншыя файлы тыпу \"%s\""
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Немагчыма дадаць дастасаваньне ў базу даньняў дастасаваньняў"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Вы можаце спыніць гэтую апэрацыю, пстрыкнуўшы Скасаваць."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (нерэчаісны Unicode)"
+
 #~ msgid "%s %ld of %ld %s"
 #~ msgstr "%s %ld з %ld %s"
 
@@ -7350,3 +7564,21 @@ msgstr "Сетка"
 
 #~ msgid "View Failed"
 #~ msgstr "Збой прагляду"
+
+#~ msgid "GConf Error"
+#~ msgstr "Памылка GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Нічога ня вылучана"
+
+#~ msgid "Info"
+#~ msgstr "Зьвесткі"
+
+#~ msgid "Warning"
+#~ msgstr "Увага"
+
+#~ msgid "Error"
+#~ msgstr "Памылка"
+
+#~ msgid "Question"
+#~ msgstr "Пытаньне"
diff --git a/po/bg.po b/po/bg.po
index dfcad8f6f..0c31ad3ed 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  bg.po (nautilus trunk)  #-#-#-#-#
 # Bulgarian translation of nautilus po-file.
 # Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2002.
@@ -5,8 +6,20 @@
 # Rostislav "zbrox" Raykov <zbrox@i-space.org>, 2005.
 # Alexander Shopov <ash@contact.bg>, 2006, 2007, 2008.
 #
+# #-#-#-#-#  bg.po (eel trunk)  #-#-#-#-#
+# Bulgarian translation of eel po-file.
+# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2002.
+# Alexander Shopov <ash@contact.bg>, 2002, 2006, 2007.
+# Rostislav Raykov <zbrox@i-space.org>, 2004, 2006.
+# Vladimir Petkov <vpetkov@i-space.org>, 2005.
+# Yavor Doganov <yavor@gnu.org>, 2008.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  bg.po (nautilus trunk)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus trunk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-01 23:05+0300\n"
@@ -17,6 +30,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"#-#-#-#-#  bg.po (eel trunk)  #-#-#-#-#\n"
+"Project-Id-Version: eel trunk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-21 23:03+0200\n"
+"PO-Revision-Date: 2008-03-20 16:46+0200\n"
+"Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6891,3 +6915,146 @@ msgstr "Мащаб"
 #: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "Задаване на ниво на мащабиране за текущия преглед"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Граница на изображение/етикет"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Широчина на границата около етикета и изображението в прозореца за "
+"предупреждение"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Вид на предупреждението"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Видът на предупреждението"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Бутони на предупреждението"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Бутони показани в прозореца за предупреждение"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "_Повече информация"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Текст"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Текстът на етикета."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Подравняване"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Подравняването на редовете на текста на етикета, един спрямо друг. Това НЕ "
+"влияе върху подравняването на етикета в рамките на заделеното му място. За "
+"това погледнете GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Прехвърляне"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ако е зададено, думите от дълъг ред се прехвърлят на следващия."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Положение на курсора"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Текущото положение на курсора за вмъкване в знаци."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Граници на избора"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Положението на другия край на избраното от курсора в знаци."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Избиране на всичко"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Методи за въвеждане"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Грешка в GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Грешка в GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Всички останали грешки са показани само в конзолата."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Няма избрано изображение."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Трябва да натиснете върху изображението, за да го изберете."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Може да прекратите тази операция като натиснете „Отказване“."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (невалиден Уникод)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Отваряне на %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Отваряне на %d обект"
+msgstr[1] "Отваряне на %d обекта"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Въведете парола"
diff --git a/po/bn.po b/po/bn.po
index fc18b110e..dfe99b568 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,10 +1,20 @@
+# #-#-#-#-#  bn.po (Nautilus HEAD)  #-#-#-#-#
 # Bangla Translation of the Nautilus pot file.
 # Copyright (C) 2003-2006 The Nautilus Authors.
 # This file is distributed under the same license as the Nautilus package.
 # Progga <progga@BengaLinux.Org>, 2003-2006.
 #
+# #-#-#-#-#  bn.po (eel)  #-#-#-#-#
+# Bangla translation for eel.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+# Jamil Ahmed <jamil@bengalinux.org>, 2003.
+# Samia Niamatullah <mailsamia2001@yahoo.com>, 2005.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  bn.po (Nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-03-12 23:34+0100\n"
@@ -15,6 +25,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"#-#-#-#-#  bn.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-18 07:53+0100\n"
+"PO-Revision-Date: 2007-09-18 15:17+0600\n"
+"Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n"
+"Language-Team: Bangla <gnome-translation@bengalinux.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 # Number of untranslated string = 1
 #: ../data/browser.xml.h:1
@@ -1015,6 +1035,7 @@ msgstr "ডিফল্ট ব্যবহার করো (_ব)"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1310
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "নাম"
 
@@ -3039,12 +3060,18 @@ msgstr "ফাইল ফাঁকা করো (_ফ)"
 msgid "Create a new empty file inside this folder"
 msgstr "এই ফোল্ডারের ভেতর একটি নতুন ফাঁকা ফাইল তৈরি করো"
 
+#. #-#-#-#-#  bn.po (Nautilus HEAD)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6621
 #: ../src/file-manager/fm-directory-view.c:7350
-#: ../src/file-manager/fm-tree-view.c:1103
+#: ../src/file-manager/fm-tree-view.c:1103 ../eel/eel-open-with-dialog.c:993
+#, fuzzy
 msgid "_Open"
-msgstr "খোলা (_খ)"
+msgstr ""
+"#-#-#-#-#  bn.po (Nautilus HEAD)  #-#-#-#-#\n"
+"খোলা (_খ)\n"
+"#-#-#-#-#  bn.po (eel)  #-#-#-#-#\n"
+"খোলা (_O)"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6622
@@ -4059,8 +4086,14 @@ msgid "There was an error displaying help."
 msgstr "সহায়িকা প্রদর্শনে সমস্যা: %s।"
 
 #: ../src/file-manager/fm-properties-window.c:3297
+#: ../eel/eel-open-with-dialog.c:892
+#, fuzzy
 msgid "Open With"
-msgstr "যে প্রোগ্রামের সাহায্যে খোলা হবে"
+msgstr ""
+"#-#-#-#-#  bn.po (Nautilus HEAD)  #-#-#-#-#\n"
+"যে প্রোগ্রামের সাহায্যে খোলা হবে\n"
+"#-#-#-#-#  bn.po (eel)  #-#-#-#-#\n"
+"এটি দিয়ে খুলুন"
 
 #: ../src/file-manager/fm-properties-window.c:3637
 msgid "Creating Properties window."
@@ -5834,6 +5867,208 @@ msgstr "বর্তমান দৃশ্যের জুম মাত্রা
 msgid "View your network servers in the Nautilus file manager"
 msgstr "আপনার ব্যবহৃত নেটওয়ার্ক সার্ভারগুলোকে নটিলাস ফাইল ব্যবস্থাপক থেকে দেখুন"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ইমেজ/লেবেলের বর্ডার"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "সতর্কীকরণ ডায়ালগে লেবেল এবং ইমেজের চারিদিকের বর্ডারের প্রস্থ "
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "সতর্কীকরণের ধরণ"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "সতর্কীকরণের ধরণ"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "সতর্কীকরণ বাটন "
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "সতর্কীকরণ ডায়ালগে প্রদর্শিত বাটন"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "আরও বিস্তারিত দেখাও (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "টেক্সট"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "লেবেলের টেক্সট।"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "বিন্যাস"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"লেবেলের টেক্সটগুলোর বাক্য বিন্যাস একে অপরের সাপেক্ষিক। এটা লেবেলের বন্টনের মাঝে এর "
+"বিন্যাসকে প্রভাবিত করবে না। এর জন্য GtkMisc::xalign দেখুন।"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "বাক্য গুটানো"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "নির্বাচন করলে, অনেক বেশী শব্দের জন্য বাক্য গুটানো হবে।"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "কার্সার এর অবস্থান"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "অক্ষরগুলোর মাঝে কার্সার এর বর্তমান অবস্থান।"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "নির্বাচন সীমা"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "কার্সার থেকে নির্বাচিত অংশের অন্য প্রান্তের আক্ষরিক অবস্থান।"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "সবকিছু নির্বাচন করো"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "ইনপুট পদ্ধতি"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf ত্রুটি:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf ত্রুটি: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "বাকি ত্রুটি গুলো শুধুমাত্র টার্মিনালে দেখানো হয়েছে।"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "কোন ইমেজ নির্বাচন করা হয়নি।"
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "নির্বাচন করতে চাইলে ছবিটির উপর ক্লিক করতে হবে।"
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "ডিফল্ট"
+
+#: ../eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "আইকন"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "অ্যাপ্লিকেশন নির্বাচন করা হয়নি"
+
+#: ../eel/eel-mime-application-chooser.c:528
+#: ../eel/eel-open-with-dialog.c:1067
+#, c-format
+msgid "%s document"
+msgstr "%s ডকুমেন্ট"
+
+#: ../eel/eel-mime-application-chooser.c:538
+#: ../eel/eel-open-with-dialog.c:1080
+msgid "Unknown"
+msgstr "অজানা"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and other files of type \"%s\""
+msgstr "%s ও \"%s\" প্রকৃতির অন্যান্য ফাইল খোলার জন্য একটি অ্যাপ্লিকেশন নির্বাচন করুন"
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "অ্যাপ্লিকেশন চালু করা সম্ভব হয়নি"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' পাওয়া যায়নি"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "অ্যাপ্লিকেশন পাওয়া যায়নি"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "অ্যাপ্লিকেশন যোগ করা সম্ভব হয়নি"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "অ্যাপ্লিকেশন ডাটাবেসে অ্যাপ্লিকেশন যোগ করা সম্ভব হয়নি"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "একটি অ্যাপ্লিকেশন নির্বাচন করুন"
+
+#: ../eel/eel-open-with-dialog.c:929
+msgid "Select an application to view its description."
+msgstr "বিস্তারিত তথ্য জানতে চাইলে অ্যাপ্লিকেশনটি নির্বাচন করুন।  "
+
+#: ../eel/eel-open-with-dialog.c:954
+msgid "_Use a custom command"
+msgstr "নিজের পছন্দসই কমান্ড ব্যবহার করুন (_U)"
+
+#: ../eel/eel-open-with-dialog.c:971
+msgid "_Browse..."
+msgstr "ব্রাউজ... (_B)"
+
+#: ../eel/eel-open-with-dialog.c:1087
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "%s ও \"%s\" প্রকৃতির অন্যান্য ফাইল খুলতে ব্যবহৃত হবে:"
+
+#: ../eel/eel-open-with-dialog.c:1119
+msgid "_Add"
+msgstr "যোগ (_A)"
+
+#: ../eel/eel-open-with-dialog.c:1120
+msgid "Add Application"
+msgstr "অ্যাপ্লিকেশন যোগ করুন"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "বাতিল ক্লিক করে এই কাজটি বন্ধ করতে পারেন।"
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (বাতিল ইউনিকোড)"
+
 #~ msgid "Art"
 #~ msgstr "শিল্প"
 
@@ -6156,3 +6391,30 @@ msgstr "আপনার ব্যবহৃত নেটওয়ার্ক সা
 
 #~ msgid "View Failed"
 #~ msgstr "প্রদর্শন করার যায় নি"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "০১/০১/০০, ০১:০০ AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "১/১/০০, ১:০০ AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " ১/ ১/০০,  ১:০০ AM"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf ত্রুটি"
+
+#~ msgid "No Selection Made"
+#~ msgstr "কিছুই নির্বাচন করা হয়নি"
+
+#~ msgid "Info"
+#~ msgstr "তথ্য"
+
+#~ msgid "Warning"
+#~ msgstr "সতর্কীকরণ"
+
+#~ msgid "Error"
+#~ msgstr "সমস্যা"
+
+#~ msgid "Question"
+#~ msgstr "প্রশ্ন"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index b6eef4a81..9c91fce6f 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  bn_IN.po (bn_IN)  #-#-#-#-#
 # translation of bn_IN.po to Bengali INDIA
 # Bengali India Translation of the Nautilus.
 # Copyright (C) 2003-2006 The Nautilus Authors.
@@ -6,8 +7,20 @@
 # Progga <progga@BengaLinux.Org>, 2003-2006.
 # Runa Bhattacharjee <runabh@gmail.com>, 2006.
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2008.
+# #-#-#-#-#  bn_IN.po (bn_IN)  #-#-#-#-#
+# translation of bn_IN.po to Bengali INDIA
+# Bengali India translation for eel.
+# Copyright (C) 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+#
+# Jamil Ahmed <jamil@bengalinux.org>, 2003.
+# Samia Niamatullah <mailsamia2001@yahoo.com>, 2005.
+# Runa Bhattacharjee <runabh@gmail.com>, 2007.
+# Runa Bhattacharjee <runab@fedoraproject.org>, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  bn_IN.po (bn_IN)  #-#-#-#-#\n"
 "Project-Id-Version: bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-03-08 04:01+0000\n"
@@ -23,6 +36,19 @@ msgstr ""
 "\n"
 "\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  bn_IN.po (bn_IN)  #-#-#-#-#\n"
+"Project-Id-Version: bn_IN\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-07 03:44+0000\n"
+"PO-Revision-Date: 2008-03-03 17:42+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab@fedoraproject.org>\n"
+"Language-Team: Bengali INDIA <discuss@ankur.co.in>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
 
 # Number of untranslated string = 1
 #: ../data/browser.xml.h:1
@@ -126,7 +152,8 @@ msgstr ""
 
 #: ../data/browser.xml.h:24
 msgid "Drag an emblem to an object to add it to the object"
-msgstr "প্রতীক যোগ করার জন্য পছন্দসই প্রতীক নির্বাচন করে চিহ্নিত বস্তুর উপর টেনে এনে ফেলুন"
+msgstr ""
+"প্রতীক যোগ করার জন্য পছন্দসই প্রতীক নির্বাচন করে চিহ্নিত বস্তুর উপর টেনে এনে ফেলুন"
 
 #: ../data/browser.xml.h:25
 msgid "Eclipse"
@@ -413,7 +440,8 @@ msgstr "পাথ-বারের বদলে সর্বদা অবস্�
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 #, fuzzy
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "ফোল্ডারের ডিফল্ট পটভূমির জন্য ফাইল। শুধুমাত্র background_set সত্য (true) হলেই এটি "
 "ব্যবহৃত হয়।"
@@ -576,7 +604,8 @@ msgstr ""
 "প্রদর্শন করা হবে। অন্যথা, ফোল্ডার ও ফাইল উভয় প্রদর্শন করা হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "মান সত্য (true) হলে নতুন উইন্ডোতে অবস্থানসূচক বার প্রদর্শিত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
@@ -732,7 +761,8 @@ msgstr ""
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
-msgstr "মান সত্য (true) হলে, মাউন্ট করা ভলিউম উল্লেখকারী আইকনগুলি ডেস্কটপে স্থাপিত হবে।"
+msgstr ""
+"মান সত্য (true) হলে, মাউন্ট করা ভলিউম উল্লেখকারী আইকনগুলি ডেস্কটপে স্থাপিত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid ""
@@ -763,14 +793,16 @@ msgstr ""
 "হ্রাস করা হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "মান সত্য (true) হলে, আইকনগুলির নীচে লেবেল স্থাপন না করে পার্শ্ববর্তী অবস্থানে সেগুলি "
 "প্রদর্শিত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid "If true, new windows will use manual layout by default."
-msgstr "মান সত্য (true) হলে, নতুন উইন্ডোর ক্ষেত্রে ডিফল্টরূপে মেনুয়েল বিন্যাস ব্যবহৃত হবে।"
+msgstr ""
+"মান সত্য (true) হলে, নতুন উইন্ডোর ক্ষেত্রে ডিফল্টরূপে মেনুয়েল বিন্যাস ব্যবহৃত হবে।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid ""
@@ -992,7 +1024,8 @@ msgstr "ডেস্কটপের আইকনের জন্য ব্যব
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "ফাইলের তারিখের বর্ণনা। সম্ভাব্য মান হল \"locale\", \"iso\" ও \"informal\"।"
+msgstr ""
+"ফাইলের তারিখের বর্ণনা। সম্ভাব্য মান হল \"locale\", \"iso\" ও \"informal\"।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
 msgid "The side pane view to show in newly opened windows."
@@ -1090,7 +1123,8 @@ msgstr "পার্শ্ববর্তী পেইনের জন্য স
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:123
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "আবর্জনার বাক্সে ফাইল সরিয়ে নেওয়ার পূর্বে নিশ্চিত হওয়ার জন্য জিজ্ঞাসা করা হবে কি না"
+msgstr ""
+"আবর্জনার বাক্সে ফাইল সরিয়ে নেওয়ার পূর্বে নিশ্চিত হওয়ার জন্য জিজ্ঞাসা করা হবে কি না"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:124
 msgid "Whether to automatically mount media"
@@ -1455,7 +1489,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "দুঃখিত, নতুন প্রতীকটির জন্য নির্দেশক-শব্দ ফাঁকা রাখা যাবে না।"
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:209
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "দুঃখিত, প্রতীকের নির্দেশক-শব্দে শুধুমাত্র অক্ষর, শূণ্যস্থান ও সংখ্যা লেখা যাবে।"
 
 #. this really should never happen, as a user has no idea
@@ -1695,7 +1730,8 @@ msgid ""
 msgid_plural ""
 "Are you sure you want to permanently delete the %'d selected items from the "
 "trash?"
-msgstr[0] "আপনি কি নিশ্চিতরূপে আবর্জনার বাক্সে নির্বাচিত %d-টি বস্তু স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
+msgstr[0] ""
+"আপনি কি নিশ্চিতরূপে আবর্জনার বাক্সে নির্বাচিত %d-টি বস্তু স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
 msgstr[1] ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1107
@@ -1723,7 +1759,8 @@ msgstr "আপনি কি নিশ্চিতরূপে \"%s\" স্থ�
 #: ../libnautilus-private/nautilus-file-operations.c:1164
 #, fuzzy, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "আপনি কি নিশ্চিতরূপে নির্বাচিত %d-টি সামগ্রী স্থায়ীভাবে মুছে ফেলতে ইচ্ছুক?"
 msgstr[1] ""
 
@@ -1763,7 +1800,8 @@ msgstr "পর্যাপ্ত অনুমতি উপস্থিত না
 #: ../libnautilus-private/nautilus-file-operations.c:1290
 #: ../libnautilus-private/nautilus-file-operations.c:2169
 #: ../libnautilus-private/nautilus-file-operations.c:2942
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1298
@@ -2127,7 +2165,8 @@ msgstr "\"%s\" নামক একটি ফাইল বর্তমানে �
 #: ../libnautilus-private/nautilus-file-operations.c:3324
 #: ../libnautilus-private/nautilus-file-operations.c:3771
 #, fuzzy, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr ""
 "\"%s\"-র মধ্যে ফাইলটি উপস্থিত রয়েছে।  পুনরায় স্থাপিত হলে এর মধ্যে উপস্থিত বিষয়বস্তু "
 "পরিবর্তিত হবে।"
@@ -2187,7 +2226,8 @@ msgstr "\"%s\"-এ লিঙ্ক তৈরি করতে সমস্যা�
 #: ../libnautilus-private/nautilus-file-operations.c:4207
 #, fuzzy
 msgid "Symbolic links only supported for local files"
-msgstr "টেনে এনে ফেলে দেওয়ার প্রক্রিয়া শুধুমাত্র স্থানীয় ফাইল সিস্টেমের ক্ষেত্রে প্রযোজ্য।"
+msgstr ""
+"টেনে এনে ফেলে দেওয়ার প্রক্রিয়া শুধুমাত্র স্থানীয় ফাইল সিস্টেমের ক্ষেত্রে প্রযোজ্য।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:4210
 #, fuzzy
@@ -2720,7 +2760,8 @@ msgstr "গন্তব্যস্থল উল্লিখিত না হও
 #: ../libnautilus-private/nautilus-mime-actions.c:603
 #, c-format
 msgid "This link can't be used, because its target \"%s\" doesn't exist."
-msgstr "উল্লিখিত গন্তব্যস্থল \"%s\" উপস্থিত না হওয়ার ফলে এই লিঙ্কটি ব্যবহার করা সম্ভব নয়।"
+msgstr ""
+"উল্লিখিত গন্তব্যস্থল \"%s\" উপস্থিত না হওয়ার ফলে এই লিঙ্কটি ব্যবহার করা সম্ভব নয়।"
 
 #. name, stock id
 #. label, accelerator
@@ -2996,7 +3037,8 @@ msgstr "টেনে এনে ফেলে দেওয়ার এই প্র�
 
 # FIXME: ভাল শোনাচ্ছে না ;-(
 #: ../libnautilus-private/nautilus-program-choosing.c:426
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "দূরবর্তী ফাইল খোলার জন্য প্রথমে সেগুলি স্থানীয় ফোল্ডারে কপি করে পুনরায় টেনে এনে "
 "ফেলার প্রচেষ্টা করুন।"
@@ -3066,7 +3108,8 @@ msgstr ""
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:669
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -3113,7 +3156,8 @@ msgstr "Nautilus metafile factory"
 
 #: ../src/Nautilus_shell.server.in.h:5
 #, fuzzy
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr "কমান্ড-লাইন প্রয়োগ করে যে সমস্ত Nautilus shell কর্ম সঞ্চালন করা সম্ভব"
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -3153,7 +3197,8 @@ msgstr "ডেস্কটপের পটভূমি পরিবর্তন
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:702
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "ডেস্কটপ পটভূমির বিন্যাস অথবা রঙ নির্ধারণে সহায়ক উইন্ডো প্রদর্শন করা হবে"
 
 #. tooltip
@@ -3406,14 +3451,16 @@ msgstr "পেস্ট কমান্ড নির্বাচন করা �
 #: ../src/file-manager/fm-directory-view.c:5568
 #, fuzzy, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] "পেস্ট কমান্ড নির্বাচন করা হলে %d-টি নির্বাচিত বস্তু স্থানান্তর করা হবে"
 msgstr[1] ""
 
 #: ../src/file-manager/fm-directory-view.c:5575
 #, fuzzy, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] "পেস্ট কমান্ড নির্বাচন করা হলে %d-টি নির্বাচিত বস্তু কপি করা হবে"
 msgstr[1] ""
 
@@ -3572,7 +3619,8 @@ msgstr "নির্বাচিত ফাইলগুলি পেস্ট ক
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6311
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "কাট অথবা কপি কমান্ডের সাহায্যে পূর্বে নির্বাচিত ফাইল যথাক্রমে স্থানান্তর অথবা কপি করুন"
+msgstr ""
+"কাট অথবা কপি কমান্ডের সাহায্যে পূর্বে নির্বাচিত ফাইল যথাক্রমে স্থানান্তর অথবা কপি করুন"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3606,7 +3654,8 @@ msgstr "বিন্যাস নির্বাচন করুন (_P)"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6325
 msgid "Select items in this window matching a given pattern"
-msgstr "বর্তমান উইন্ডোর মধ্যে উপস্থিত, সুনির্দিষ্ট বিন্যাসের সাথে সুসংগত বস্তুগুলি নির্বাচন করুন"
+msgstr ""
+"বর্তমান উইন্ডোর মধ্যে উপস্থিত, সুনির্দিষ্ট বিন্যাসের সাথে সুসংগত বস্তুগুলি নির্বাচন করুন"
 
 #. name, stock id
 #. label, accelerator
@@ -3897,7 +3946,8 @@ msgstr "এখান থেকে ডাউনলোড করা হবে ক�
 
 #: ../src/file-manager/fm-directory-view.c:8334
 msgid "You can download it or make a link to it."
-msgstr "আপনি এটি ডাউনলোড করতে পারেন অথবা এটি নির্দেশকারী একটি লিঙ্ক তৈরি করতে পারেন।"
+msgstr ""
+"আপনি এটি ডাউনলোড করতে পারেন অথবা এটি নির্দেশকারী একটি লিঙ্ক তৈরি করতে পারেন।"
 
 #: ../src/file-manager/fm-directory-view.c:8337
 msgid "Make a _Link"
@@ -3916,7 +3966,8 @@ msgstr "টেনে এনে ফেলে দেওয়ার প্রক্�
 # FIXME:  I am not satisfied with this "টেনে এনে ফেলে দেওয়া" ;-(
 #: ../src/file-manager/fm-directory-view.c:8404
 msgid "Drag and drop is only supported on local file systems."
-msgstr "টেনে এনে ফেলে দেওয়ার প্রক্রিয়া শুধুমাত্র স্থানীয় ফাইল সিস্টেমের ক্ষেত্রে প্রযোজ্য।"
+msgstr ""
+"টেনে এনে ফেলে দেওয়ার প্রক্রিয়া শুধুমাত্র স্থানীয় ফাইল সিস্টেমের ক্ষেত্রে প্রযোজ্য।"
 
 #: ../src/file-manager/fm-directory-view.c:8469
 #: ../src/file-manager/fm-directory-view.c:8574
@@ -3957,7 +4008,8 @@ msgstr "লঞ্চার"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\"-র মধ্যে অন্তর্ভুক্ত সামগ্রী পড়ার প্রয়োজনীয় অনুমতি আপনার নেই।"
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -3976,12 +4028,15 @@ msgstr "ফোল্ডারের মধ্যে উপস্থিত সা
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "বর্তমান ফোল্ডারের মধ্যে \"%s\" নামটি ব্যবহৃত হয়েছে। অনুগ্রহ করে পৃথক নাম নির্বাচন করুন।"
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"বর্তমান ফোল্ডারের মধ্যে \"%s\" নামটি ব্যবহৃত হয়েছে। অনুগ্রহ করে পৃথক নাম নির্বাচন করুন।"
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "\"%s\" নামে এই ফোল্ডারে কিছু নেই। সম্ভবত এটিকে কিছুক্ষণ পূর্বে স্থানান্তর কিংবা মুছে "
 "ফেলা হয়েছে।"
@@ -4017,7 +4072,8 @@ msgstr "চিহ্নিত বস্তুর নাম পরিবর্ত
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\"-র দল পরিবর্তনের জন্য আপনার প্রয়োজনীয় অনুমতি নেই।"
 
 #. fall through
@@ -4586,7 +4642,8 @@ msgstr "টেক্সট প্রদর্শন:"
 
 #: ../src/file-manager/fm-properties-window.c:4699
 msgid "You are not the owner, so you can't change these permissions."
-msgstr "আপনার মালিকানাধীন না হওয়ার ফলে এই অনুমতিগুলি আপনি পরিবর্তন করতে পারবেন না।"
+msgstr ""
+"আপনার মালিকানাধীন না হওয়ার ফলে এই অনুমতিগুলি আপনি পরিবর্তন করতে পারবেন না।"
 
 #: ../src/file-manager/fm-properties-window.c:4723
 #, fuzzy
@@ -5207,7 +5264,8 @@ msgid "Choose the order of information to appear in the list view."
 msgstr ""
 
 #: ../src/nautilus-file-management-properties.glade.h:49
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr ""
 
 #: ../src/nautilus-file-management-properties.glade.h:50
@@ -5890,7 +5948,8 @@ msgstr "দুঃখিত, কিন্তু %s বিন্যাসটি �
 
 #: ../src/nautilus-property-browser.c:977
 msgid "Check that you have permission to delete the pattern."
-msgstr "চিহ্নিত বিন্যাস মুছে ফেলার জন্য প্রয়োজনীয় অনুমতি আপনার রয়েছে কি না তা পরীক্ষা করুন।"
+msgstr ""
+"চিহ্নিত বিন্যাস মুছে ফেলার জন্য প্রয়োজনীয় অনুমতি আপনার রয়েছে কি না তা পরীক্ষা করুন।"
 
 #: ../src/nautilus-property-browser.c:1005
 #, c-format
@@ -5899,7 +5958,8 @@ msgstr "দুঃখিত, %s প্রতীকটি মুছে ফেল�
 
 #: ../src/nautilus-property-browser.c:1006
 msgid "Check that you have permission to delete the emblem."
-msgstr "চিহ্নিত প্রতীক মুছে ফেলার জন্য প্রয়োজনীয় অনুমতি আপনার রয়েছে কি না তা পরীক্ষা করুন।"
+msgstr ""
+"চিহ্নিত প্রতীক মুছে ফেলার জন্য প্রয়োজনীয় অনুমতি আপনার রয়েছে কি না তা পরীক্ষা করুন।"
 
 #: ../src/nautilus-property-browser.c:1052
 msgid "Create a New Emblem"
@@ -6197,7 +6257,8 @@ msgstr "চিত্রের সাহায্যে অবস্থা প্
 msgid ""
 "Do you want to remove any bookmarks with the non-existing location from your "
 "list?"
-msgstr "অস্তিত্বহীন অবস্থান নির্দেশককারী বুকমার্ক কি আপনি তালিকা থেকে মুছে ফেলতে ইচ্ছুক?"
+msgstr ""
+"অস্তিত্বহীন অবস্থান নির্দেশককারী বুকমার্ক কি আপনি তালিকা থেকে মুছে ফেলতে ইচ্ছুক?"
 
 #: ../src/nautilus-window-bookmarks.c:101
 msgid "Bookmark for Nonexistent Location"
@@ -6222,7 +6283,8 @@ msgstr "বর্তমান ফোল্ডারের প্রদর্শ�
 
 #: ../src/nautilus-window-manage-views.c:1695
 msgid "Nautilus has no installed viewer capable of displaying the folder."
-msgstr "বর্তমান ফোল্ডার প্রদর্শন করার উদ্দেশ্যে প্রযোজ্য প্রদর্শন ব্যবস্থা Nautilus-এ উপস্থিত নেই।"
+msgstr ""
+"বর্তমান ফোল্ডার প্রদর্শন করার উদ্দেশ্যে প্রযোজ্য প্রদর্শন ব্যবস্থা Nautilus-এ উপস্থিত নেই।"
 
 #: ../src/nautilus-window-manage-views.c:1701
 msgid "The location is not a folder."
@@ -6265,7 +6327,8 @@ msgid "Couldn't display \"%s\", because the host could be found."
 msgstr "\"%s\" প্রদর্শন করতে ব্যর্থ, কারণ \"%s\" নাম হোস্ট পাওয়া যায়নি।"
 
 #: ../src/nautilus-window-manage-views.c:1745
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "বানান এবং প্রক্সির বৈশিষ্ট্যাবলী সঠিক কিনা তা পরীক্ষা করুন।"
 
 #: ../src/nautilus-window-manage-views.c:1759
@@ -6634,3 +6697,145 @@ msgstr "বর্তমান প্রদর্শন ব্যবস্থা�
 msgid "Network"
 msgstr "নেটওয়ার্ক"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ছবি/লেবেলের প্রান্তরেখা"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "সতর্কবার্তা প্রদর্শনকারী ডায়লগ বক্সের লেবেল ও ছবির প্রান্তরেখার প্রস্থ"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "সতর্কবার্তার ধরন"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "সতর্কবার্তার ধরন"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "সতর্কতামূলক বাটন"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "সতর্কবার্তার ডায়লগ-বক্সে প্রদর্শিত বাটন"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "অতিরিক্ত বিবরণ প্রদর্শন করা হবে (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "টেক্সট"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "লেবেলে প্রদর্শিত টেক্সট।"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "দিশা"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"লেবেলের প্রদর্শিত টেক্সটের পংক্তির পারস্পরিক অবস্থান অনুসারে দিশা। এর ফলে চিহ্নিত "
+"স্থানের মধ্যে লেবেলের দিশা প্রভাবিত হবে না। লেবেলের দিশা পরিবর্তন সম্পর্কে জানতে "
+"GtkMisc::xalign দেখুন।"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "পংক্তি বিভাজন"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"মান নির্ধারিত হলে, পংক্তি অত্যাধিক লম্বা হলে সেগুলি বিভাজন করে প্রদর্শন করা হবে।"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "কার্সারের অবস্থান"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "সন্নিবেশ করার সময় প্রদর্শিত কার্সারের অবস্থান, অক্ষর অনুসারে নির্ধারিত।"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "নির্বাচিত অংশের সীমা"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"কার্সারের অবস্থান থেকে নির্বাচিত অংশের বিপরীত প্রান্ত, অক্ষর অনুসারে নির্ধারিত।"
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "সমগ্র নির্বাচন করুন"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "ইনপুট পদ্ধতি"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf ত্রুটি:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf ত্রুটি: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ভবিষ্যতে উৎপন্ন ত্রুটি শুধুমাত্র টার্মিনালে প্রদর্শিত হবে।"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "ছবি নির্বাচিত হয়নি।"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "নির্বাচন করার জন্য ছবির উপরে ক্লিক করুন।"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "বাতিল ক্লিক করে বর্তমান কর্ম বন্ধ করা যাবে।"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (অবৈধ ইউনিকোড)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "%s খোলা হচ্ছে"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d-টি বস্তু খোলা হচ্ছে"
+msgstr[1] "%d-টি বস্তু খোলা হচ্ছে"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "পাসওয়ার্ড লিখুন"
diff --git a/po/br.po b/po/br.po
index 16869eeed..44896deab 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,10 +1,22 @@
+# #-#-#-#-#  br.po (nautilus)  #-#-#-#-#
 # Breton translation for nautilus
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the nautilus package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
 #
+# #-#-#-#-#  br.po (eel-HEAD)  #-#-#-#-#
+# Breton translation for eel.
+# Copyright (C) 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnome-desktop package.
+# Jérémy Ar Floc'h <jeremy.lefloch@gmail.com>, 2006
+# Ubuntu translators <https://launchpad.net/distros/ubuntu/dapper/+lang/br>, 2006
+# Francis Tyers <francis.tyers@hp.com>, 2003.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  br.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-13 14:44-0500\n"
@@ -15,6 +27,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1\n"
+"#-#-#-#-#  br.po (eel-HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel-HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2003-09-19 11:07+0100\n"
+"Last-Translator: Jérémy Ar Floc'h <jeremy.lefloch@gmail.com>\n"
+"Language-Team: GNOME Breton Team <jeremy.lefloch@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -890,6 +912,7 @@ msgstr "Implij an hini dre-ziouer"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1310
+#: eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Anv"
 
@@ -2861,12 +2884,18 @@ msgstr "Restr _goullo"
 msgid "Create a new empty file inside this folder"
 msgstr "Krouiñ ur restr goullo nevez e-diabarzh ar renkell-mañ"
 
+#. #-#-#-#-#  br.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6767
 #: ../src/file-manager/fm-directory-view.c:7644
-#: ../src/file-manager/fm-tree-view.c:1104
+#: ../src/file-manager/fm-tree-view.c:1104 eel/eel-open-with-dialog.c:894
+#, fuzzy
 msgid "_Open"
-msgstr "_Digeriñ"
+msgstr ""
+"#-#-#-#-#  br.po (nautilus)  #-#-#-#-#\n"
+"_Digeriñ\n"
+"#-#-#-#-#  br.po (eel-HEAD)  #-#-#-#-#\n"
+"Digeriñ"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6768
@@ -3893,6 +3922,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
 #: ../src/file-manager/fm-properties-window.c:3297
+#: eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Digeriñ gant"
 
@@ -5653,8 +5683,257 @@ msgstr "Dibab live zoom ar sell red"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Gwelout ho servijerioù rouedad"
 
+#: eel/eel-alert-dialog.c:115
+#, fuzzy
+msgid "Image/label border"
+msgstr "Skeudenn/mod ar bord"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Doare Diwall"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "An doare diwall"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Boutonioù Diwall"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Boutonioù diskouezet 'barzh ar skrammig diwall"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "diskouez muioc'h a draouigoù"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Skrid"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Testenn al label"
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justifiañs"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Skweraj al linennoù e testenn al label 'zo liammet an eil re gant ar re all. "
+"Ne vo KET kemmet skweraj al label en e ziabarzh. Sellit ouzh GtkMisc::xalign "
+"evit an dra se."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Linennoù livet"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"Ma dibabet, lak liv war al linennoù ma krog an destenn da vezañ re stank"
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Lec'h ar Reder"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Lec'h a vremañ ar reder evit ouzhpennañ lizherennoù"
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Termenoù an dibab"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Lec'h penn all an Dibab adalek ar reder el lizherennoù"
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Dibab An Holl draoù"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Doare Seziz"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Fazi GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr ""
+"Fazi GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr ""
+"Holl fazioù da zont diskouzet nemet war termenell.\n"
+"  %s\n"
+"Holl fazi war termenell"
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "%d/%m/%y, %I:%M %p"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "%-d/%-m/%-y, %-I:%M %p"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " %_d/%_m/%_y, %_I:%M %p"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Skeudenn ebet bet dibabet"
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Red eo klikañ war ur skeudenn 'benn dibab anezhi"
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Dre ziouer"
+
+#: eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "Arlun"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Meziant dibabet ebet</i>"
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr "%s diell"
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Dianav"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+"Dibab ur meziant 'benn digeriñ <i>%s</i> ha traoù all gant doare \"%s\""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Dic'houest da gregiñ ar meziant"
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Dic'houest da gavout '%s'"
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Dic'houest da gavout ar meziant"
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Dic'houest da ouzhpennañ ar meziant"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Dic'houest da ouzhpennañ renkell elfennoù ar meziant gant ar meziant"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Dibab ur meziant"
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr "Dibab ur meziant 'benn gwelet e zanvez"
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr "Furchal"
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Digeriñ <i>%s</i> ha fichennaouegoù all gant doare \"%s\" gant:"
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr "Ouzhpennañ"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr "Ouzhpennañ ur meziant"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Tu 'zo ehanañ an urzh en ur klikañ nullañ"
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (Unikod direizh)"
+
 #~ msgid "Desktop documents icon name"
 #~ msgstr "Anv arlun dielloù ar burev"
 
 #~ msgid "Documents icon visible on desktop"
 #~ msgstr "Arlunioù an dielloù hewel war ar burev"
+
+#~ msgid "GConf Error"
+#~ msgstr "Fazi GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Dibab ebet"
+
+#~ msgid "Use a _custom command"
+#~ msgstr "Implij un urzh resis"
+
+#~ msgid "Info"
+#~ msgstr "Kel"
+
+#~ msgid "Warning"
+#~ msgstr "Diwall"
+
+#~ msgid "Error"
+#~ msgstr "Fazi"
+
+#~ msgid "Question"
+#~ msgstr "Goulenn"
diff --git a/po/bs.po b/po/bs.po
index 163b18297..ebf2ca453 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,10 +1,21 @@
+# #-#-#-#-#  bs.po (nautilus.HEAD.bs)  #-#-#-#-#
 # translation of nautilus.HEAD.bs.po to Bosnian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2004.
 # Kenan Hadžiavdić <kenan@bgnett.no>, 2004.
 #
+# #-#-#-#-#  bs.po (eel.HEAD.bs)  #-#-#-#-#
+# translation of eel.HEAD.bs.po to Bosnian
+# translation of eel.gnome-2-6.bs.po to Bosnian
+# translation of eel-2.0.po to
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2004.
+# Kenan Hadžiavdić <kenan@bgnett.no>, 2004.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  bs.po (nautilus.HEAD.bs)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.bs\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -17,6 +28,17 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"#-#-#-#-#  bs.po (eel.HEAD.bs)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.bs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2004-07-30 02:04+0200\n"
+"Last-Translator: Kenan Hadžiavdić <kenan@bgnett.no>\n"
+"Language-Team: Bosnian <lokal@linux.org.ba>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -443,7 +465,7 @@ msgstr "Ova tema koristi foto-realistične direktorije."
 #: libnautilus-extension/nautilus-menu-item.c:206
 #: libnautilus-extension/nautilus-property-page.c:176
 #: libnautilus-private/nautilus-column-utilities.c:43
-#: src/file-manager/fm-list-view.c:1107
+#: src/file-manager/fm-list-view.c:1107 eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Ime"
 
@@ -4475,7 +4497,7 @@ msgstr "Dogodila se greška tokom prikazivanja pomoći."
 msgid "Couldn't Show Help"
 msgstr "Nisam mogao pokazati pomoć"
 
-#: src/file-manager/fm-properties-window.c:3305
+#: src/file-manager/fm-properties-window.c:3305 eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Otvori pomoću"
 
@@ -6191,6 +6213,226 @@ msgstr "Mrežni serveri"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Pregledajte vaše mrežne servere u Nautilusovom upravitelju datoteka"
 
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekst"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Rub slike/oznake"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Širina ruba oko oznake i slike u dijalogu upozorenja"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tip upozorenja"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Tip upozorenja"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Dugmad upozorenja"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Dugmad koja su prikazana u dijalogu upozorenja"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Pokaži više _detalja"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Tekst oznake."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Ravnanje"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Međusobno ravnanje linija teksta oznake. Ovo NE utječe na ravnanje etikete "
+"unutar lokacije. Pogledajte GtkMisc::xalign za više detalja o tome."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Prekid linije"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ako je postavljeno, prekini linije kada tekst postane preširok."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Pozicija kursora"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Trenutna pozicija kursora za unos izraženo u broju znakova."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Ograničenje izbora"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Pozicija suprotnog kraja izabranog u odnosu na kursor izražena u broju "
+"znakova."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Izaberi sve"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Načini unosa"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf greška:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf greška: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Sve naredne greške se prikazuju samo u terminalu."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 AM"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Nijedna slika nije izabrana."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Morate kliknuti na sliku da bi je izabrali."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Uobičajeno"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Aplikacija nije izabrana</i>"
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr "%s dokument"
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Nepoznat"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+"Izaberite aplikaciju da otvorite <i>%s</i> i druge datoteke tipa \"%s\""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Nisam mogao pokrenuti aplikaciju"
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Nisam mogao pronaći '%s'"
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Nisam mogao pronaći aplikaciju"
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Nisam mogao dodati aplikaciju"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Nisam mogao dodati aplikaciju u bazu podataka o aplikacijama"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Izaberi aplikaciju"
+
+#: eel/eel-open-with-dialog.c:830
+#, fuzzy
+msgid "Select an application to view its description."
+msgstr ""
+"Izaberite aplikaciju da otvorite <i>%s</i> i druge datoteke tipa \"%s\""
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr "_Pregledaj..."
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Otvori <i>%s</i> i druge datoteke tipa \"%s\" pomoću:"
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr "Dodaj aplikaciju"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Možete zaustaviti ovu radnju pritiskom na Odustani."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (nevažeći Unicode)"
+
 #~ msgid "Allaire"
 #~ msgstr "Allaire"
 
@@ -6468,9 +6710,6 @@ msgstr "Pregledajte vaše mrežne servere u Nautilusovom upravitelju datoteka"
 #~ msgid "Factory for text view"
 #~ msgstr "Tvornica za pregled teksta"
 
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Preglednik teksta"
 
@@ -6864,3 +7103,21 @@ msgstr "Pregledajte vaše mrežne servere u Nautilusovom upravitelju datoteka"
 
 #~ msgid "Example:"
 #~ msgstr "Primjer:"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf greška"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Nije učinjen izbor"
+
+#~ msgid "Info"
+#~ msgstr "Podaci"
+
+#~ msgid "Warning"
+#~ msgstr "Upozorenje"
+
+#~ msgid "Error"
+#~ msgstr "Greška"
+
+#~ msgid "Question"
+#~ msgstr "Pitanje"
diff --git a/po/ca.po b/po/ca.po
index c9b2c7460..cb9ed027d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ca.po (nautilus)  #-#-#-#-#
 # Traducció del nautilus de l'equip de Softcatalà.
 # Copyright © 2000-2008 Free Software Foundation, Inc.
 # Softcatalà <info@softcatala.org>, 2000, 2001.
@@ -8,8 +9,16 @@
 # Josep Puigdemont <josep.puigdemont@gmail.com>, 2006, 2007.
 # Joan Duran <jodufi@gmail.com>, 2008.
 #
+# #-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#
+# eel translation to Catalan.
+# Copyright © 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Valentín Trilles <vtrilles@yahoo.es>, 2000, 2001.
+# Jordi Mallach <jordi@sindominio.net, 2002, 2004, 2005, 2006.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-05 21:13+0200\n"
@@ -20,6 +29,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.9.90\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-16 00:44+0100\n"
+"PO-Revision-Date: 2008-02-16 00:44+0100\n"
+"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
+"Language-Team: Catalan <tradgnome@softcatala.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2933,10 +2953,16 @@ msgstr "No s'ha pogut establir l'aplicació com a predeterminada: %s"
 msgid "Could not set as default application"
 msgstr "No s'ha pogut establir com a aplicació predeterminada"
 
+# #-#-#-#-#  ca.po (nautilus)  #-#-#-#-#
 #
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "Predeterminada"
+msgstr ""
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
+"Predeterminada\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"Per defecte"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
 msgid "Icon"
@@ -2947,8 +2973,13 @@ msgid "Could not remove application"
 msgstr "No s'ha pogut suprimir l'aplicació"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "No hi ha cap aplicació seleccionada"
+msgstr ""
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
+"No hi ha cap aplicació seleccionada\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"No hi ha aplicacions seleccionades"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2962,10 +2993,13 @@ msgid "Unknown"
 msgstr "Desconegut"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
 msgstr ""
-"Seleccioneu una aplicació per a obrir %s i altres fitxers del tipus «%s»"
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
+"Seleccioneu una aplicació per a obrir %s i altres fitxers del tipus «%s»\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"Seleccioneu una aplicació per a obrir %s i d'altres fitxer de tipus «%s»"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -3005,17 +3039,28 @@ msgid "Open With"
 msgstr "Obre amb"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Seleccioneu una aplicació per a veure'n la descripció."
+msgstr ""
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
+"Seleccioneu una aplicació per a veure'n la descripció.\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"Seleccioneu una aplicació per a visualitzar la seva descripció."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "_Utilitzeu una ordre personalitzada"
+msgstr ""
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
+"_Utilitzeu una ordre personalitzada\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"_Usa una ordre personalitzada"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Navega..."
 
+#. #-#-#-#-#  ca.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -3027,9 +3072,13 @@ msgid "_Open"
 msgstr "_Obre"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "Obre %s i altres fitxers del tipus «%s» amb:"
+msgstr ""
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
+"Obre %s i altres fitxers del tipus «%s» amb:\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"Obre %s i d'altres fitxers de tipus «%s» amb:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
@@ -3038,8 +3087,13 @@ msgstr "_Afegeix"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "Afegeix una aplicació"
+msgstr ""
+"#-#-#-#-#  ca.po (nautilus)  #-#-#-#-#\n"
+"Afegeix una aplicació\n"
+"#-#-#-#-#  ca.po (eel 2.9.90)  #-#-#-#-#\n"
+"Afegeix l'aplicació"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -6989,6 +7043,148 @@ msgstr "Ampliació"
 msgid "Set the zoom level of the current view"
 msgstr "Estableix el nivell d'ampliació de la vista actual"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Contorn de la imatge/etiqueta"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Amplada del contorn al voltant de l'etiqueta i la imatge al diàleg d'alerta"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tipus d'alerta"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "El tipus d'alerta"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Botons d'alerta"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Els botons mostrats en el diàleg d'alerta"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Mostra més _detalls"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "El text de l'etiqueta."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justificació"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"La posició de les línies en el text de l'etiqueta relatives entre elles. "
+"Això no afecta l'alineament de l'etiqueta dins de la seva ubicació. Vegeu "
+"GtkMisc::xalign per a això."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Ajustament de línies"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Si s'estableix, s'ajustaran les línies si el text es fa massa ample."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Posició del cursor"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "La posició actual del cursor d'inserció en caràcters."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Marges de la selecció"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "La posició de l'extrem oposat de la selecció del cursor en caràcters."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Selecciona-ho tot"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Mètodes d'entrada"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"S'ha produït un error de GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "S'ha produït un error de GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Els següents errors es mostraran només en el terminal."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "No s'ha seleccionat cap imatge."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Heu de fer clic en una imatge per a seleccionar-la."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Podeu aturar aquesta operació fent clic a «Cancel·la»."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode invàlid)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "S'està obrint %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "S'està obrint %d element"
+msgstr[1] "S'estan obrint %d elements"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Introduïu la contrasenya"
+
 #~ msgid "Create Folder"
 #~ msgstr "Crea una carpeta"
 
@@ -7068,3 +7264,33 @@ msgstr "Estableix el nivell d'ampliació de la vista actual"
 
 #~ msgid "_Show"
 #~ msgstr "Mo_stra"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "No s'ha pogut afegir l'aplicació a la base de dades d'aplicacions"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "GConf Error"
+#~ msgstr "Error de GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "No s'ha fet cap selecció"
+
+#~ msgid "Info"
+#~ msgstr "Informació"
+
+#~ msgid "Warning"
+#~ msgstr "Avís"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Question"
+#~ msgstr "Pregunta"
diff --git a/po/cs.po b/po/cs.po
index 2b85ba158..a95eb7a58 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  cs.po (nautilus)  #-#-#-#-#
 # Czech translation of Nautilus.
 # Copyright (C) 2001, 2003, 2006, 2007, 2008 the author(s) of Nautilus.
 # Copyright (C) 2004, 2005 Miloslav Trmac <mitr@volny.cz>.
@@ -13,8 +14,18 @@
 # Petr Kovar <pknbe@volny.cz>, 2008.
 # Lukas Lommer <llommer@svn.gnome.org>, 2008.
 #
+# #-#-#-#-#  cs.po (eel)  #-#-#-#-#
+# Czech translation of eel.
+# Copyright (C) 2004, 2005, 2006 Miloslav Trmac <mitr@volny.cz>.
+# George Lebl <jirka@5z.com>, 2001.
+# Miloslav Trmac <mitr@volny.cz>, 2004, 2005, 2006.
+# Lucas Lommer <llommer@svn.gnome.org>, 2008.
+# Petr Kovar <pknbe@volny.cz>, 2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  cs.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-09 21:01+0100\n"
@@ -26,6 +37,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  cs.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-11 19:33+0100\n"
+"PO-Revision-Date: 2008-02-11 19:31+0100\n"
+"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
+"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6658,6 +6680,147 @@ msgstr "Zvětšení"
 msgid "Set the zoom level of the current view"
 msgstr "Nastavit úroveň zvětšení aktuálního pohledu"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Okraj obrázku/jmenovky"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Šířka okraje okolo jmenovky a obrázku v dialogu upozornění"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Typ upozornění"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Typ upozornění"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Tlačítka upozornění"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Tlačítka zobrazovaná v dialogu upozornění"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Zobrazit více _detailů"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Text jmenovky."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Zarovnání"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Relativní zarovnání řádků textu jmenovky navzájem. Toto NEMÁ vliv na "
+"zarovnání jmenovky v její alokaci. K tomu použijte GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Lámání řádků"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Je-li nastaveno, zalamovat řádky, je-li text příliš široký."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Pozice kurzoru"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Aktuální pozice vkládacího kurzoru ve znacích."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Hranice výběru"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Pozice konce výběru vzdálenějšího od kurzoru ve znacích."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Vybrat vše"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Vstupní metody"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Chyba GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Chyba GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Všechny další chyby jsou zobrazovány jen na terminálu."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Nebyl vybrán žádný obrázek."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Abyste vybrali obrázek, musíte na nějaký kliknout."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Tuto operaci můžete zastavit kliknutím na Zrušit."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (neplatný Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Otevírám %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Otevírání %d položky"
+msgstr[1] "Otevírání %d položek"
+msgstr[2] "Otevírání %d položek"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Vložte heslo"
+
 #~ msgid "Browse the file system with the file manager"
 #~ msgstr "Procházet systém souborů správcem souborů"
 
diff --git a/po/cy.po b/po/cy.po
index f2b560fb8..b44ad3339 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  cy.po (nautilus)  #-#-#-#-#
 # nautilus yn Gymraeg.
 # This file is distributed under the same license as the nautilus package.
 # Chris Jackson <chris@www.linux.org.uk>, 2003.
@@ -43,8 +44,18 @@
 # [Newidiwyd gan rhysj]
 #
 #
+# #-#-#-#-#  cy.po (eel)  #-#-#-#-#
+# eel yn Gymraeg.
+# Copyright (C) 2003 gnome-cy translation team.
+# This file is distributed under the same license as the eel package.
+# Dafydd Harries <daf@muse.19inch.net>, 2003 2004.
+# Bryn Salisbury <bryn@randomlyevil.org.uk>, 2004.
+#
+# rhysj: Wedi gyrru'r cyfan drwy Cysill, 2005-08-22.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  cy.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-03-28 13:39+0100\n"
@@ -55,6 +66,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1)?1:(n==2)?2:(n==8||n==11)?3:0;\n"
+"#-#-#-#-#  cy.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2006-03-02 12:06-0000\n"
+"Last-Translator: Bryn Salisbury <bryn@randomlyevil.org.uk>\n"
+"Language-Team: Welsh <gnome-cy@pengwyn.linux.org.uk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -1038,6 +1059,7 @@ msgstr "_Defnyddio'r Rhagosodiad"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1310
+#: eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Enw"
 
@@ -3118,12 +3140,18 @@ msgstr "Ffeil _Wag"
 msgid "Create a new empty file inside this folder"
 msgstr "Creu dogfen wag newydd o fewn y blygell hon"
 
+#. #-#-#-#-#  cy.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6643
 #: ../src/file-manager/fm-directory-view.c:7372
-#: ../src/file-manager/fm-tree-view.c:1103
+#: ../src/file-manager/fm-tree-view.c:1103 eel/eel-open-with-dialog.c:894
+#, fuzzy
 msgid "_Open"
-msgstr "_Agor"
+msgstr ""
+"#-#-#-#-#  cy.po (nautilus)  #-#-#-#-#\n"
+"_Agor\n"
+"#-#-#-#-#  cy.po (eel)  #-#-#-#-#\n"
+"A_gor"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6644
@@ -4130,6 +4158,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "Ni ellir pennu beth yw caniatadau'r ffeil sydd wedi'i dewis."
 
 #: ../src/file-manager/fm-properties-window.c:3297
+#: eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Agor Gyda"
 
@@ -5899,6 +5928,231 @@ msgstr "Gosod lefel chwyddo'r olwg gyfredol"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 
+#: eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "Eicon"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Testun"
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Amlinell delwedd/label"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Lled yr amlinell o gwmpas y label a'r ddelwedd yn y deialog hysbysiad"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Math Hysbysiad"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Y math o hysbysiad"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Botymau Hysbysiad"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Y botymau a ddangosir yn y deialog hysbysiad"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Dangos mwy o _fanylion"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Testun y label."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Unioni"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Cyfuniad y llinellau yn nhestun y label yn gymharol i'w gilydd. Dydy hyn "
+"DDIM yn effeithio ar gyfuniad y label o fewn ei ddyraniad. Gweler GtkMisc::"
+"xalign ar gyfer hynny."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Amlapio llinellau"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Os gosodir, amlapio llinell os aiff y testun yn rhy llydan"
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Lleoliad y Cyrchwr"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Lleoliad cyfredol y cyrchwr mewnosod mewn nodau."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Cyfwng y Dewis"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Lleoliad ochr pell y dewis o'r cyrchwr mewn nodau."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Dewis Popeth"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Moddau Mewnbwn"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Gwall GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Gwall GConf: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Pob gwall pellach wedi eu dangos ar y derfynell yn unig."
+
+# EFALLAI
+# %p doesn't seem to do anything
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 "
+
+# EFALLAI
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 "
+
+# EFALLAI
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1  1/00,  1:00 "
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Ni chafodd delwedd ei dewis."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Mae'n rhaid i chi glicio ar ddelwedd er mwyn ei dewis."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Rhagosodiad"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Dim rhaglenni wedi eu dewis</i>"
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr "dogfen %s"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+"Dewiswch raglen i'w ddefnyddio agor <i>%s</i> ac eraill o'r math \"%s\""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Methwyd rhedeg y rhaglen"
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Methwyd canfod '%s'"
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Methwyd canfod y rhaglen"
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Methwyd ychwanegu'r rhaglen"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Methwyd ychwanegu'r rhaglen i'r gronfa data rhaglenni"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Dewis Rhaglen"
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr "Dewiswch raglen i weld ei ddisgrifiad"
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr "Defnyddio gorchymyn _addasedig"
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr "_Pori..."
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Agor <i>%s</i> a ffeiliau eraill o'r math \"%s\" gyda:"
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr "_Ychwanegu"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr "Ychwanegu Rhaglen"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Gallwch atal y weithred hon gan glicio \"Diddymu\"."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (Unicode annilys)"
+
 # 48x48/emblems/emblem-art.icon.in.h:1
 #~ msgid "Art"
 #~ msgstr "Celf"
@@ -6270,9 +6524,6 @@ msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 #~ msgid "Tooltip for the menu item"
 #~ msgstr "Awgrym ar gyfer yr eitem ddewislen"
 
-#~ msgid "Icon"
-#~ msgstr "Eicon"
-
 #~ msgid "Name of the icon to display in the menu item"
 #~ msgstr "Enw'r eicon i'w ddangos yn yr eitem ddewislen"
 
@@ -6809,9 +7060,6 @@ msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 #~ msgid "Factory for text view"
 #~ msgstr "Ffatri ar gyfer golwg testun"
 
-#~ msgid "Text"
-#~ msgstr "Testun"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Gwelydd Destun"
 
@@ -8398,9 +8646,6 @@ msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 #~ msgid "Nautilus is searching your disks for trash folders."
 #~ msgstr "Mae Nautilus yn chwilio eich disgiau ar gyfer plygellau sbwriel."
 
-#~ msgid "Unknown"
-#~ msgstr "Anhysbys"
-
 #~ msgid "Floppy"
 #~ msgstr "Disgen Hyblyg"
 
@@ -8711,3 +8956,21 @@ msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 
 #~ msgid "New _Window"
 #~ msgstr "_Ffenestr Newydd"
+
+#~ msgid "GConf Error"
+#~ msgstr "Gwall GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Dim Dewisiad Wedi ei Wneud"
+
+#~ msgid "Info"
+#~ msgstr "Gwybodaeth"
+
+#~ msgid "Warning"
+#~ msgstr "Rhybudd"
+
+#~ msgid "Error"
+#~ msgstr "Gwall"
+
+#~ msgid "Question"
+#~ msgstr "Cwestiwn"
diff --git a/po/da.po b/po/da.po
index c06ba7279..815c05fed 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  da.po (nautilus)  #-#-#-#-#
 # Danish translation of Nautilus.
 # Copyright (C) 2000-2008
 # This file is distributed under the same license as the nautilus package.
@@ -31,8 +32,21 @@
 #
 # Husk at tilføje dig i credit-listen (msgid "translator-credits")
 #
+# #-#-#-#-#  da.po (eel)  #-#-#-#-#
+# Danish translation of eel
+# Copyright (C) 2000-07 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+# Kenneth Christiansen <kenneth@gnu.org>, 2000, 2001.
+# Keld Simonsen <keld@dkuug.dk>, 2000.
+# Ole Laursen <olau@hardworking.dk>, 2001, 02, 03, 05, 06.
+# Martin Willemoes Hansen <mwh@sysrq.dk>, 2004.
+# Peter Bach <bach.peter@gmail.com>, 2007.
+# Kenneth Nielsen <k.nielsen81@gmail.com>, 2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-22 00:22+0200\n"
@@ -43,6 +57,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-02 12:36+0100\n"
+"PO-Revision-Date: 2008-03-02 10:28+0100\n"
+"Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2924,8 +2949,13 @@ msgid "Could not set as default application"
 msgstr "Kunne ikke gøre til forvalgt program"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "Forvalgt"
+msgstr ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
+"Forvalgt\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Forvalg"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
 msgid "Icon"
@@ -2936,8 +2966,13 @@ msgid "Could not remove application"
 msgstr "Kunne ikke fjerne programmet"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "Ingen programmer valgt"
+msgstr ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
+"Ingen programmer valgt\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Der er ikke valgt nogen programmer"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2951,9 +2986,13 @@ msgid "Unknown"
 msgstr "Ukendt"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "Vælg et program hvormed %s og andre filer af typen \"%s\" skal åbnes"
+msgstr ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
+"Vælg et program hvormed %s og andre filer af typen \"%s\" skal åbnes\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Vælg et program til at åbne %s og andre filer af typen \"%s\""
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2966,9 +3005,13 @@ msgid "Could not run application"
 msgstr "Kunne ikke køre programmet"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "Kunne ikke finde \"%s\""
+msgstr ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
+"Kunne ikke finde \"%s\"\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Kunne ikke finde '%s'"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
 msgid "Could not find application"
@@ -2997,13 +3040,19 @@ msgid "Select an application to view its description."
 msgstr "Vælg et program for at se dets beskrivelse."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "_Brug en brugertilpasset kommando"
+msgstr ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
+"_Brug en brugertilpasset kommando\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Benyt en _brugerdefineret kommando"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Gennemse..."
 
+#. #-#-#-#-#  da.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -6929,6 +6978,154 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Angiv zoomniveauet for den aktuelle visning"
 
+#: ../eel/eel-app-launch-context.c:407
+#, fuzzy, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
+"Åbner %d objekt\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Åbner %d element"
+msgstr[1] ""
+"#-#-#-#-#  da.po (nautilus)  #-#-#-#-#\n"
+"Åbner %d objekter\n"
+"#-#-#-#-#  da.po (eel)  #-#-#-#-#\n"
+"Åbner %d elementer"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Billede-/etiketkant"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Bredde af kanten rund om etiketten og billedet i meddelelsesvinduet"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Meddelelsestype"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Meddelelsestypen"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Meddelelsesknapper"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "De knapper som vises i meddelelsesvinduet"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Vis flere _detaljer"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "x"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "y"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Teksten i etiketten"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justering"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Justeringen af linjerne i teksten i forhold til hinanden. Dette påvirker "
+"IKKE justeringen af etiketten i dens allokering. Se GtkMisc::xalign for det."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Linjeombrydning"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Hvis sat, bryd linjerne hvis teksten bliver for bred."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Markørposition"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Den aktuelle placering af indsætningsmarkøren i tegn"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Markeringsgrænse"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Positionen af den modsatte ende af markeringen fra markøren i tegn"
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Marker alt"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Indtastningsmetoder"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf-fejl:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-fejl: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Alle yderligere fejl vises kun i terminalen"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Intet billede blev valgt."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Du skal klikke på et billede for at vælge det."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Du kan stoppe denne operation ved at klikke på annullér."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (ugyldig Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Åbner %s"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Indtast kodeord"
+
 #~ msgid "Create Folder"
 #~ msgstr "Opret mappe"
 
@@ -7314,11 +7511,6 @@ msgstr "Angiv zoomniveauet for den aktuelle visning"
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "\"%s\" er ikke en gyldig placering."
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "Åbner %d objekt"
-#~ msgstr[1] "Åbner %d objekter"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "Hvis du sletter et objekt, er det gået tabt permanent."
 
@@ -8365,9 +8557,6 @@ msgstr "Angiv zoomniveauet for den aktuelle visning"
 #~ msgid "Factory for text view"
 #~ msgstr "Fabrik for tekstvisning"
 
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Tekstviser"
 
@@ -9597,3 +9786,33 @@ msgstr "Angiv zoomniveauet for den aktuelle visning"
 #~ "\n"
 #~ "/sbin/chkconfig --level 345 crond on\n"
 #~ "/etc/rc.d/init.d/cron start\n"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Kunne ikke tilføje programmet til program-databasen"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01-00 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1-00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr "1/ 1-00,  1:00"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf-fejl"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Intet markeret"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Warning"
+#~ msgstr "Advarsel"
+
+#~ msgid "Error"
+#~ msgstr "Fejl"
+
+#~ msgid "Question"
+#~ msgstr "Spørgsmål"
diff --git a/po/de.po b/po/de.po
index 11f714f3b..1ff024430 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  de.po (de)  #-#-#-#-#
 # translation of de.po to
 # German Nautilus translation
 # Copyright (C) 2000-2004, 2007 Free Software Foundation, Inc.
@@ -35,8 +36,21 @@
 # "Es ist jedermann gestattet, diese Lizenzurkunde zu vervielfältigen und
 #  unveränderte Kopien zu verbreiten; Änderungen sind jedoch nicht erlaubt."
 #
+# #-#-#-#-#  de.po (eel)  #-#-#-#-#
+# eel German translation file.
+# Copyright (C) 2000-2002 Free Software Foundation, Inc.
+#
+# Matthias Warkus <mawa@iname.com>, 2000.
+# Benedikt Roth <Benedikt.Roth@gmx.net>, 2000.
+# Christian Meyer <chrisime@gnome.org>, 2000, 2002.
+# Christian Neumair <chris@gnome-de.org>, 2002, 2003, 2004.
+# Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007.
+# Andre Klapper <ak-47@gmx.net>, 2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  de.po (de)  #-#-#-#-#\n"
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-11 08:27+0200\n"
@@ -47,6 +61,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  de.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-13 01:37+0100\n"
+"PO-Revision-Date: 2008-01-13 01:40+0100\n"
+"Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -7024,6 +7049,149 @@ msgstr "Vergrößerung"
 msgid "Set the zoom level of the current view"
 msgstr "Die Vergrößerungsstufe der aktuellen Ansicht festlegen"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bild-/Beschriftungsrand"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Breite des Rands um die Beschriftung und das Bild im Alarmdialog"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Alarmtyp"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Der Alarmtyp"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Alarmknöpfe"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Die im Alarmdialog angezeigten Knöpfe"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Weitere _Details anzeigen"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Der Beschriftungstext."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Ausrichtung"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Die Ausrichtung der Zeilen des Beschriftungstextes relativ zueinander. Dies "
+"beeinflusst NICHT die Ausrichtung der Beschriftung innerhalb des ihr "
+"zugewiesenen Bereichs. Siehe hierzu auch GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Zeilenumbruch"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Sollen Zeilen umgebrochen werden, wenn der Text zu lang wird?"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Cursor-Position"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Die aktuelle Position des Eingabecursors in Zeichen."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Markierungsgrenze"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Die Position des gegenüberliegenden Endes der Markierung relativ zum Cursor "
+"in Zeichen."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Alles markieren"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Eingabemethoden"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf-Fehler:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-Fehler: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Alle weiteren Fehler werden nur im Terminal angezeigt."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Sie haben kein Bild gewählt."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Sie müssen auf ein Bild klicken, um es auszuwählen."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Sie können diese Aktion abbrechen, indem Sie Abbrechen anklicken."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode ungültig)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "%s wird geöffnet"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d Objekt wird geöffnet"
+msgstr[1] "%d Objekte werden geöffnet"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Passwort eingeben"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "Sind sie sicher, dass Sie die Chronik leeren wollen?"
 
diff --git a/po/dz.po b/po/dz.po
index c081370e4..6267310e4 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,9 +1,17 @@
+# #-#-#-#-#  dz.po (nautilus.HEAD.dz)  #-#-#-#-#
 # Dzongkha translation of nautilus.
 # Copyright @ 2006 Free software foundation, Inc.
 # Mindu Dorji.
 #
+# #-#-#-#-#  dz.po (eel.HEAD.dz)  #-#-#-#-#
+# Dzongkha translation of eel
+# Copyright @ 2006 Free Software Foundation, Inc.
+# Mindu Dorji.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  dz.po (nautilus.HEAD.dz)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.dz\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-04-13 03:45+0100\n"
@@ -17,6 +25,20 @@ msgstr ""
 "X-Poedit-Language: Dzongkha\n"
 "X-Poedit-Country: BHUTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"#-#-#-#-#  dz.po (eel.HEAD.dz)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.dz\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-29 03:54+0000\n"
+"PO-Revision-Date: 2008-08-18 14:20+0530\n"
+"Last-Translator: Dawa pemo <daws_403@hotmail.com>\n"
+"Language-Team: DZONGKHA <pgeyleg@dit.gov.bt>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2;plural=(n!=1);\n"
+"X-Poedit-Language: Dzongkha\n"
+"X-Poedit-Country: BHUTAN\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -112,7 +134,8 @@ msgstr "དཔེ་ཚད་མགོ་མིང་ཅིག་ བསྒྱ�
 
 #: ../data/browser.xml.h:24
 msgid "Drag an emblem to an object to add it to the object"
-msgstr "ལས་རྟགས་ཅིག་ དངོས་པོ་ཅིག་གུ་ ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ ལས་རྟགས་དེ་འདྲུད་དེ་ དངོས་པོ་ཅིག་གུ་སྐྱེལ།"
+msgstr ""
+"ལས་རྟགས་ཅིག་ དངོས་པོ་ཅིག་གུ་ ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ ལས་རྟགས་དེ་འདྲུད་དེ་ དངོས་པོ་ཅིག་གུ་སྐྱེལ།"
 
 #: ../data/browser.xml.h:25
 msgid "Eclipse"
@@ -123,8 +146,7 @@ msgid "Envy"
 msgstr "ཕྲག་དོག"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28
-#: ../src/nautilus-emblem-sidebar.c:940
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:940
 #: ../src/nautilus-property-browser.c:1824
 msgid "Erase"
 msgstr "ཀྲེག་གཏང་།"
@@ -298,8 +320,17 @@ msgid "Saved search"
 msgstr "བསྲུངས་ཡོད་པའི་འཚོལ་ཞིབ།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Possible values are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and \"mime_type\"."
-msgstr "ངོས་དཔར་མཐོང་སྣང་དང་ ཌེཀསི་ཊོཔ་ནང་ལུ་ ངོས་དཔར་ཅིག་གི་འོག་གི་ པར་བཤད་ཀྱི་ཐོ་ཡིག་ཅིག  པར་བཤད་ཀྱི་གྱངས་ཁ་ངོ་མ་སྟོན་ནི་དེ་ རྒྱས་ཟུམ་གནས་རིམ་དང་འཁྲིལ་དགོ སྲིད་པའི་བེ་ལུསི་: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" དང \"mime_type\"ཚུ་ཨིན།"
+msgid ""
+"A list of captions below an icon in the icon view and the desktop. The "
+"actual number of captions shown depends on the zoom level. Possible values "
+"are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed"
+"\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
+"\"mime_type\"."
+msgstr ""
+"ངོས་དཔར་མཐོང་སྣང་དང་ ཌེཀསི་ཊོཔ་ནང་ལུ་ ངོས་དཔར་ཅིག་གི་འོག་གི་ པར་བཤད་ཀྱི་ཐོ་ཡིག་ཅིག  པར་བཤད་ཀྱི་"
+"གྱངས་ཁ་ངོ་མ་སྟོན་ནི་དེ་ རྒྱས་ཟུམ་གནས་རིམ་དང་འཁྲིལ་དགོ སྲིད་པའི་བེ་ལུསི་: \"size\", \"type\", "
+"\"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group"
+"\", \"permissions\", \"octal_permissions\" དང \"mime_type\"ཚུ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
 msgid "Always use the location entry, instead of the pathbar"
@@ -314,8 +345,16 @@ msgid "Criteria for search bar searching"
 msgstr "འཚོལ་ཞིབ་ཕྲ་རིང་ འཚོལ་ཞིབ་འབད་ནིའི་དོན་ལུ་ཁྱད་ཚད།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
-msgid "Criteria when matching files searched for in the search bar. If set to \"search_by_text\", then Nautilus will Search for files by file name only. If set to \"search_by_text_and_properties\", then Nautilus will search for files by file name and file properties."
-msgstr "འཚོལ་ཞིབ་ཕྲ་རིང་ནང་ འཚོལ་ཞིབ་འབད་མི་ཡིག་སྣོད་ཚུ་ མཐུན་སྒྲིག་འབད་སྐབས་ཀྱི་ཁྱད་ཚད། \"search_by_text\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་སྣོད་མིང་རྐྱངམ་གཅིག་གི་ཐོག་ལས་ འཚོལ་ཞིབ་འབད་འོང་། \"search_by_text_and_properties\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་སྣོད་མིང་དང་ ཡིག་སྣོད་རྒྱུ་དངོས་ཐོག་ལས་ འཚོལ་ཞིབ་འབད་འོང་།"
+msgid ""
+"Criteria when matching files searched for in the search bar. If set to "
+"\"search_by_text\", then Nautilus will Search for files by file name only. "
+"If set to \"search_by_text_and_properties\", then Nautilus will search for "
+"files by file name and file properties."
+msgstr ""
+"འཚོལ་ཞིབ་ཕྲ་རིང་ནང་ འཚོལ་ཞིབ་འབད་མི་ཡིག་སྣོད་ཚུ་ མཐུན་སྒྲིག་འབད་སྐབས་ཀྱི་ཁྱད་ཚད། "
+"\"search_by_text\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་སྣོད་མིང་རྐྱངམ་གཅིག་གི་ཐོག་ལས་ "
+"འཚོལ་ཞིབ་འབད་འོང་། \"search_by_text_and_properties\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་"
+"གིས་ ཡིག་སྣོད་མིང་དང་ ཡིག་སྣོད་རྒྱུ་དངོས་ཐོག་ལས་ འཚོལ་ཞིབ་འབད་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "Current Nautilus theme (deprecated)"
@@ -414,28 +453,50 @@ msgid "Enables the classic Nautilus behavior, where all windows are browsers"
 msgstr "སྒོ་སྒྲིག་ཆ་མཉམ་ བརྡ་འཚོལ་འབད་མི་ཨིན་པའི་སྐབས་ ནའུ་ཊི་ལཱསི་གི་སྤྱོད་ལམ་ ལྕོགས་ཅན་བཟོཝ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
-msgid "Filename for the default folder background. Only used if background_set is true."
-msgstr "སྔོན་སྒྲིག་སྣོད་འཛིན་རྒྱབ་གཞིའི་དོན་ལུ་ ཡིག་སྣོད་ཀྱི་མིང་། རྒྱབ་གཞིའི་ཆ་ཚན་ བདེན་པ་ཨིན་པ་ཅིན ལག་ལེན་འཐབ་་ཨིན།(_s"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"སྔོན་སྒྲིག་སྣོད་འཛིན་རྒྱབ་གཞིའི་དོན་ལུ་ ཡིག་སྣོད་ཀྱི་མིང་། རྒྱབ་གཞིའི་ཆ་ཚན་ བདེན་པ་ཨིན་པ་ཅིན ལག་ལེན་འཐབ་་"
+"ཨིན།(_s"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
-msgid "Filename for the default side pane background. Only used if side_pane_background_set is true."
-msgstr "སྔོན་སྒྲིག་ཅན་གྱི་ ཟུར་ཁའི་པེན་རྒྱབ་གཞིའི་ ཡིག་སྣོད་མིང་། ཟུར་ཁའི་པེན་རྒྱབ་གཞི་ཆ་ཚན་ བདེན་པ་ཨིན་པ་ཅིན ལག་ལེན་འཐབ་ཨིན།"
+msgid ""
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
+msgstr ""
+"སྔོན་སྒྲིག་ཅན་གྱི་ ཟུར་ཁའི་པེན་རྒྱབ་གཞིའི་ ཡིག་སྣོད་མིང་། ཟུར་ཁའི་པེན་རྒྱབ་གཞི་ཆ་ཚན་ བདེན་པ་ཨིན་པ་ཅིན "
+"ལག་ལེན་འཐབ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
-msgid "Folders over this size will be truncated to around this size. The purpose of this is to avoid unintentionally blowing the heap and killing Nautilus on massive folders. A negative value denotes no limit. The limit is approximate due to the reading of folders chunk-wise."
-msgstr "ཚད་འདི་ལས་ལྷག་མི་སྣོད་འཛིན་ཚུ་ འདི་བཟུམ་ཅིག་ལུ་ ཆུང་ཀུ་བཟོ་ནི་ཨིན། འདི་གི་དགོས་པ་དེ་ བསམ་མེད་ཐོག་ལུ་ རྒྱ་ཆེའི་སྣོད་འཛིན་ཚུ་གུ་ཡོད་པའི་ བརྩེགས་ཕུང་གཏོར་བཏང་སྟེ་  ནའུ་ཊི་ལཱསི་ གསད་ནིའི་ཉེན་ཁ་ལས་ བཀག་ཐབས་ལུ་ཨིན། མེད་ཆའི་བེ་ལུསི་ཅིག་གིས་ ཚད་མེད་པའི་བརྡ་སྟོནམ་ཨིན། ཚད་དེ་ཕོག་ཚོད་འཚམས་ཅིག་ཨིན་མི་དེ་ སྣོད་འཛིན་ཚུ་  ལེ་ཤ་སྦེ་་ལྷག་ནི་དེ་གིས་ཨིན།"
+msgid ""
+"Folders over this size will be truncated to around this size. The purpose of "
+"this is to avoid unintentionally blowing the heap and killing Nautilus on "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"ཚད་འདི་ལས་ལྷག་མི་སྣོད་འཛིན་ཚུ་ འདི་བཟུམ་ཅིག་ལུ་ ཆུང་ཀུ་བཟོ་ནི་ཨིན། འདི་གི་དགོས་པ་དེ་ བསམ་མེད་ཐོག་"
+"ལུ་ རྒྱ་ཆེའི་སྣོད་འཛིན་ཚུ་གུ་ཡོད་པའི་ བརྩེགས་ཕུང་གཏོར་བཏང་སྟེ་  ནའུ་ཊི་ལཱསི་ གསད་ནིའི་ཉེན་ཁ་ལས་ བཀག་"
+"ཐབས་ལུ་ཨིན། མེད་ཆའི་བེ་ལུསི་ཅིག་གིས་ ཚད་མེད་པའི་བརྡ་སྟོནམ་ཨིན། ཚད་དེ་ཕོག་ཚོད་འཚམས་ཅིག་ཨིན་མི་དེ་ "
+"སྣོད་འཛིན་ཚུ་  ལེ་ཤ་སྦེ་་ལྷག་ནི་དེ་གིས་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "Home icon visible on desktop"
 msgstr "ཌེཀསི་ཊོཔ་གུ་མཐོང་ཚུགས་པའི་ ཁྱིམ་གྱི་ངོས་དཔར།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
-msgid "If set to true, Nautilus will only show folders in the tree side pane. Otherwise it will show both folders and files."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ རྩ་བའི་ཟུར་ཁའི་པེན་ནང་གི་ སྣོད་འཛིན་ཚུ་རྐྱངམ་གཅིག་སྟོན་འོང་། དེ་མིན་པ་ཅིན་ སྣོད་འཛིན་དང་ ཡིག་སྣོད་གཉིས་ཆ་རང་སྟོན་འོང་།"
+msgid ""
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ རྩ་བའི་ཟུར་ཁའི་པེན་ནང་གི་ སྣོད་འཛིན་ཚུ་རྐྱངམ་གཅིག་སྟོན་"
+"འོང་། དེ་མིན་པ་ཅིན་ སྣོད་འཛིན་དང་ ཡིག་སྣོད་གཉིས་ཆ་རང་སྟོན་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
-msgid "If set to true, newly opened windows will have the location bar visible."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་་འབད་བ་ཅིན་ སྒོ་སྒྲིག་གསརཔ་ ཁ་ཕྱེ་མི་ཚུ་གི་ གནས་ཁོངས་་ཕྲ་རིང་མཐོང་ཚུགསཔ་ཨིན།"
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་་འབད་བ་ཅིན་ སྒོ་སྒྲིག་གསརཔ་ ཁ་ཕྱེ་མི་ཚུ་གི་ གནས་ཁོངས་་ཕྲ་རིང་མཐོང་ཚུགསཔ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid "If set to true, newly opened windows will have the side pane visible."
@@ -447,91 +508,174 @@ msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ སྒོ་སྒྲིག་གསརཔ་ ཁ་ཕྱེ་མི་ཚུ་གི་ ལག་ཆས་ཕྲ་རིང་ཚུ་མཐོང་ཚུགསཔ་ཨིན།"
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ སྒོ་སྒྲིག་གསརཔ་ ཁ་ཕྱེ་མི་ཚུ་གི་ ལག་ཆས་ཕྲ་རིང་ཚུ་མཐོང་ཚུགསཔ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
-msgstr "ངེས་བདེན་གུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའི་ཊི་ལཱསི་ བརའུ་ཟར་སྒོ་སྒྲིག་གིས་ ཨ་རྟག་ར་ གནས་ཁོངས་ལག་ཆས་ཕྲ་རིང་གི་དོན་ལུ་ འགྲུལ་ལམ་ཕྲ་རིང་གི་ཚབ་ལུ་ ཚིག་ཡིག་གི་ཨིན་པུཊི་ ཐོ་བཀོད་ཅིག་ ལག་ལེན་འཐབ་འོང་།"
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
+msgstr ""
+"ངེས་བདེན་གུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའི་ཊི་ལཱསི་ བརའུ་ཟར་སྒོ་སྒྲིག་གིས་ ཨ་རྟག་ར་ གནས་ཁོངས་ལག་ཆས་ཕྲ་"
+"རིང་གི་དོན་ལུ་ འགྲུལ་ལམ་ཕྲ་རིང་གི་ཚབ་ལུ་ ཚིག་ཡིག་གི་ཨིན་པུཊི་ ཐོ་བཀོད་ཅིག་ ལག་ལེན་འཐབ་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཁྱོད་ལུ་ ཡུ་ནིགསི་བཟུམ་གྱི་ ལམ་ལུགས་ནང་ གསང་བའི་གདམ་ཁ་མང་སུ་ལུ་ འཛུལ་སྤྱོད་འབད་བའི་ཐོག་ལས་ ཡིག་སྣོད་ཀྱི་གནང་བ་ཚུ་ ཞུན་དག་དང་བཀྲམ་སྟོན་བཅུགཔ་ཨིན།"
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཁྱོད་ལུ་ ཡུ་ནིགསི་བཟུམ་གྱི་ ལམ་ལུགས་ནང་ གསང་བའི་གདམ་"
+"ཁ་མང་སུ་ལུ་ འཛུལ་སྤྱོད་འབད་བའི་ཐོག་ལས་ ཡིག་སྣོད་ཀྱི་གནང་བ་ཚུ་ ཞུན་དག་དང་བཀྲམ་སྟོན་བཅུགཔ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ངོས་དཔར་དང་ ཐོ་ཡིག་མཐོང་སྣང་ནང་ ཡིག་སྣོད་ཚུ་མ་སྟོནམ་ལས་རང་ སྣོད་འཛིན་ཚུ་སྟོནམ་ཨིན།"
+msgid ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ངོས་དཔར་དང་ ཐོ་ཡིག་མཐོང་སྣང་ནང་ ཡིག་སྣོད་ཚུ་མ་སྟོནམ་"
+"ལས་རང་ སྣོད་འཛིན་ཚུ་སྟོནམ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to put files in the trash."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་སྣོད་ཚུ་ཕྱགས་ཧོད་ནང་བཙུགསཔ་ད་ ངེས་དཔྱད་འབདཝ་ཨིན།"
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"put files in the trash."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་སྣོད་ཚུ་ཕྱགས་ཧོད་ནང་བཙུགསཔ་ད་ ངེས་དཔྱད་འབདཝ་"
+"ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཌེཀསི་ཊོཔ་གུ་གི་ ངོས་དཔར་ཚུ་འབྲིཝ་ཨིན"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
-msgid "If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་སྣོད་ཅིག་ ཕྱགས་ཧོད་ནང་ སྤོ་བཤུད་འབད་མ་དགོ་པར་ དེ་འཕྲལ་ལས་བཏོན་གཏང་ཚུགས་པའི་ ཁྱད་རྣམ་ཅིག་བྱིན་འོང་། ཁྱད་རྣམ་དེ་ཉེན་ཁ་ཅན་ཨིནམ་ལས་ དྲན་པ་བཏོན་དགོ"
+msgid ""
+"If set to true, then Nautilus will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་སྣོད་ཅིག་ ཕྱགས་ཧོད་ནང་ སྤོ་བཤུད་འབད་མ་དགོ་པར་ "
+"དེ་འཕྲལ་ལས་བཏོན་གཏང་ཚུགས་པའི་ ཁྱད་རྣམ་ཅིག་བྱིན་འོང་། ཁྱད་རྣམ་དེ་ཉེན་ཁ་ཅན་ཨིནམ་ལས་ དྲན་པ་བཏོན་དགོ"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, then Nautilus will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཌེཀསི་ཊོཔ་སྦེ་ ལག་ལེན་པའི་ཁྱིམ་སྣོད་འཛིན་དེ་ ལག་ལེན་འཐབ་འོང་། དེ་རྫུན་པ་ཨིན་པ་ཅིན་ དེ་གིས་ཌེཀསི་ཊོཔ་བཟུམ་ཅིག་སྦེ་ ~/ཌེཀསི་ཊོཔ་དེ་ ལག་ལེན་འཐབ་འོང་།"
+msgid ""
+"If set to true, then Nautilus will use the user's home folder as the "
+"desktop. If it is false, then it will use ~/Desktop as the desktop."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཌེཀསི་ཊོཔ་སྦེ་ ལག་ལེན་པའི་ཁྱིམ་སྣོད་འཛིན་དེ་ ལག་ལེན་"
+"འཐབ་འོང་། དེ་རྫུན་པ་ཨིན་པ་ཅིན་ དེ་གིས་ཌེཀསི་ཊོཔ་བཟུམ་ཅིག་སྦེ་ ~/ཌེཀསི་ཊོཔ་དེ་ ལག་ལེན་འཐབ་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
-msgid "If set to true, then all Nautilus windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་ སྒོ་སྒྲིག་ཆ་མཉམ་རང་ རགས་ལྟའི་སྒོ་སྒྲིག་ལུ་འགྱུར་འོང་། ཐོན་རིམ་༢.༦ གི་ཧེ་མར་  ནའུ་ཊི་ལཱསི་གིས་ དེ་སྦེ་འགྱུར་དོ་ཡོདཔ་ལས་ མི་ལ་ལོ་ཅིག་གིས་ སྤྱོད་པ་དེ་ལུ་དགའཝ་ཨིན།"
+msgid ""
+"If set to true, then all Nautilus windows will be browser windows. This is "
+"how Nautilus used to behave before version 2.6, and some people prefer this "
+"behavior."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནའུ་ཊི་ལཱསི་ སྒོ་སྒྲིག་ཆ་མཉམ་རང་ རགས་ལྟའི་སྒོ་སྒྲིག་ལུ་འགྱུར་འོང་། ཐོན་རིམ་"
+"༢.༦ གི་ཧེ་མར་  ནའུ་ཊི་ལཱསི་གིས་ དེ་སྦེ་འགྱུར་དོ་ཡོདཔ་ལས་ མི་ལ་ལོ་ཅིག་གིས་ སྤྱོད་པ་དེ་ལུ་དགའཝ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
-msgid "If set to true, then backup files such as those created by Emacs are displayed. Currently, only files ending in a tilde (~) are considered backup files."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཨི་མེཀསི་གིས་བཟོ་བསྐྲུན་འབད་མི་ རྒྱབ་ཐག་ཡིག་སྣོད་ཚུ་ བཀྲམ་སྟོན་འབདཝ་ཨིན། ད་ལྟོ་ (~) གིས་མཇུག་བསྡུ་མི་ ཡིག་སྣོད་ཚུ་རྐྱངམ་གཅིག་ རྒྱབ་ཐག་ཡིག་སྣོད་སྦེ་ ཆ་བཞགཔ་ཨིན།"
+msgid ""
+"If set to true, then backup files such as those created by Emacs are "
+"displayed. Currently, only files ending in a tilde (~) are considered backup "
+"files."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཨི་མེཀསི་གིས་བཟོ་བསྐྲུན་འབད་མི་ རྒྱབ་ཐག་ཡིག་སྣོད་ཚུ་ བཀྲམ་སྟོན་འབདཝ་"
+"ཨིན། ད་ལྟོ་ (~) གིས་མཇུག་བསྡུ་མི་ ཡིག་སྣོད་ཚུ་རྐྱངམ་གཅིག་ རྒྱབ་ཐག་ཡིག་སྣོད་སྦེ་ ཆ་བཞགཔ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
-msgid "If set to true, then hidden files are shown in the file manager. Hidden files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ སྦ་སྟེ་ཡོད་མི་ཡིག་སྣོད་ཚུ་ ཡིག་སྣོད་འཛིན་སྐྱོང་པའི་ནང་སྟོནམ་ཨིན། སྦ་སྟེ་ཡོད་མི་ཡིག་སྣོད་ཚུ་ ཡང་ཅིན་ ཌོཊི་ཡིག་སྣོད་དང་ ཡང་ཅིན་ གསང་བའི་སྣོད་འཛིན་ཡིག་སྣོད་ནང་ ཐོ་བཀོད་འབད་དེ་ཡོད་མི་ཚུ་ཨིན།"
+msgid ""
+"If set to true, then hidden files are shown in the file manager. Hidden "
+"files are either dotfiles or are listed in the folder's .hidden file."
+msgstr ""
+"བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ སྦ་སྟེ་ཡོད་མི་ཡིག་སྣོད་ཚུ་ ཡིག་སྣོད་འཛིན་སྐྱོང་པའི་ནང་སྟོནམ་ཨིན། སྦ་སྟེ་ཡོད་"
+"མི་ཡིག་སྣོད་ཚུ་ ཡང་ཅིན་ ཌོཊི་ཡིག་སྣོད་དང་ ཡང་ཅིན་ གསང་བའི་སྣོད་འཛིན་ཡིག་སྣོད་ནང་ ཐོ་བཀོད་འབད་དེ་ཡོད་"
+"མི་ཚུ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop."
-msgstr "འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཡོངས་འབྲེལ་སར་བར་མཐོང་སྣང་ལུ་ འབྲེལ་རམ་བཟོ་མི་ ངོས་དཔར་ཅིག་ ཌེཀསི་ཊོཔ་གུ་བཀལཝ་ཨིན།"
+msgid ""
+"If this is set to true, an icon linking to the Network Servers view will be "
+"put on the desktop."
+msgstr ""
+"འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཡོངས་འབྲེལ་སར་བར་མཐོང་སྣང་ལུ་ འབྲེལ་རམ་བཟོ་མི་ ངོས་དཔར་ཅིག་ "
+"ཌེཀསི་ཊོཔ་གུ་བཀལཝ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If this is set to true, an icon linking to the computer location will be put on the desktop."
-msgstr "འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ གློག་རིག་གནས་ཁོངས་ལུ་འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཅིག་ ཌེཀསི་ཊོཔ་གུ་བཀལཝ་ཨིན།"
+msgid ""
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
+msgstr ""
+"འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ གློག་རིག་གནས་ཁོངས་ལུ་འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཅིག་ ཌེཀསི་ཊོཔ་གུ་"
+"བཀལཝ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop."
-msgstr "འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཁྱིམ་གྱི་སྣོད་འཛིན་ལུ་ འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཅིག་ ཌེཀསི་ཊོཔ་གུ་བཀལཝ་ཨིན།"
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
+"the desktop."
+msgstr ""
+"འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཁྱིམ་གྱི་སྣོད་འཛིན་ལུ་ འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཅིག་ ཌེཀསི་ཊོཔ་གུ་"
+"བཀལཝ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
-msgid "If this is set to true, an icon linking to the trash will be put on the desktop."
-msgstr "འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཕྱགས་ཧོད་ལུ་འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཅིག་ ཌེཀསི་ཊོཔ་གུ་བཀལཝ་ཨིན།"
+msgid ""
+"If this is set to true, an icon linking to the trash will be put on the "
+"desktop."
+msgstr ""
+"འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ཕྱགས་ཧོད་ལུ་འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཅིག་ ཌེཀསི་ཊོཔ་གུ་བཀལཝ་"
+"ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop."
-msgstr "འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ སྦྱར་བརྩེགས་སྦུང་ཚད་ལུ་ འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཚུ་ ཌེཀསི་ཊོཔ་གུ་བཀལཝ་ཨིན།"
+msgid ""
+"If this is set to true, icons linking to mounted volumes will be put on the "
+"desktop."
+msgstr ""
+"འདི་བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ སྦྱར་བརྩེགས་སྦུང་ཚད་ལུ་ འབྲེལ་ལམ་ཡོད་པའི་ ངོས་དཔར་ཚུ་ ཌེཀསི་ཊོཔ་གུ་"
+"བཀལཝ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"."
-msgstr "བདེན་པ་ཨིན་པ་ཅིན སྒོ་སྒྲིག་གསར་པའི་ནང་ཡོད་མི་ ཡིག་སྣོད་ཚུ་ རྒྱབ་ལོག་སྦེ་ དབྱེ་སེལ་འབད་མི་དེ་ཡང་ དཔེར་ན་ མིང་གི་ཐོག་ལས་ དབྱེ་སེལ་འབད་བ་ཅིན་ \"a\" ལས \"z\"ལུ་ དབྱེ་སེལ་འབད་ནིའི་ཚབ་ལུ་ \"z\"  ལས \"a\" ལུ་ དབྱེ་སེལ་འབདཝ་ཨིན།"
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"."
+msgstr ""
+"བདེན་པ་ཨིན་པ་ཅིན སྒོ་སྒྲིག་གསར་པའི་ནང་ཡོད་མི་ ཡིག་སྣོད་ཚུ་ རྒྱབ་ལོག་སྦེ་ དབྱེ་སེལ་འབད་མི་དེ་ཡང་ དཔེར་"
+"ན་ མིང་གི་ཐོག་ལས་ དབྱེ་སེལ་འབད་བ་ཅིན་ \"a\" ལས \"z\"ལུ་ དབྱེ་སེལ་འབད་ནིའི་ཚབ་ལུ་ \"z\"  ལས "
+"\"a\" ལུ་ དབྱེ་སེལ་འབདཝ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally."
-msgstr "བདེན་པ་ཨིན་པ་ཅིན སྒོ་སྒྲིག་གསར་པའི་ནང་ཡོད་མི་ ཡིག་སྣོད་ཚུ་ རྒྱབ་ལོག་སྦེ་ དབྱེ་སེལ་འབད་མི་དེ་ཡང་ དཔེར་ན་ མིང་གི་ཐོག་ལས་ དབྱེ་སེལ་འབད་བ་ཅིན་ \"a\" ལས \"z\",ལུ་ དབྱེ་སེལ་འབད་ནིའི་ཚབ་ལུ་ \"z\" ལས \"a\" ལུ་ དབྱེ་སེལ་འབདཝ་ཨིན། ཚད་ཀྱི་ཐོག་ལས་ དབྱེ་སེལ་འབད་བ་ཅིན་ ཡར་འཕར་གྱི་ཚབ་ལུ་ མར་འབབ་ཐོག་ལུ་ དབྱེ་སེལ་འབད་འོང་།"
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"incrementally they will be sorted decrementally."
+msgstr ""
+"བདེན་པ་ཨིན་པ་ཅིན སྒོ་སྒྲིག་གསར་པའི་ནང་ཡོད་མི་ ཡིག་སྣོད་ཚུ་ རྒྱབ་ལོག་སྦེ་ དབྱེ་སེལ་འབད་མི་དེ་ཡང་ དཔེར་"
+"ན་ མིང་གི་ཐོག་ལས་ དབྱེ་སེལ་འབད་བ་ཅིན་ \"a\" ལས \"z\",ལུ་ དབྱེ་སེལ་འབད་ནིའི་ཚབ་ལུ་ \"z\" ལས "
+"\"a\" ལུ་ དབྱེ་སེལ་འབདཝ་ཨིན། ཚད་ཀྱི་ཐོག་ལས་ དབྱེ་སེལ་འབད་བ་ཅིན་ ཡར་འཕར་གྱི་ཚབ་ལུ་ མར་འབབ་ཐོག་"
+"ལུ་ དབྱེ་སེལ་འབད་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "བདེན་པ་ཨིན་པ་ཅིན ངོས་དཔར་ཚུ་ སྒོ་སྒྲིག་གསར་པའི་ནང་ སྔོན་སྒྲིག་ཐོག་ལུ་ དམ་དམ་སྦེ་ བཞག་ནི་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If true, labels will be placed beside icons rather than underneath them."
-msgstr "བདེན་པ་ཨིན་པ་ཅིན ཁ་ཡིག་ཚུ་ ངོས་དཔར་གྱི་འོག་ལུ་མིན་པར་ ངོས་དཔར་གྱི་ནང་ན་ བཙུགས་བཞག་འོང་།"
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
+msgstr ""
+"བདེན་པ་ཨིན་པ་ཅིན ཁ་ཡིག་ཚུ་ ངོས་དཔར་གྱི་འོག་ལུ་མིན་པར་ ངོས་དཔར་གྱི་ནང་ན་ བཙུགས་བཞག་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid "If true, new windows will use manual layout by default."
 msgstr "བདེན་པ་ཨིན་པ་ཅིན སྒོ་སྒྲིག་གསརཔ་ཚུ་གིས་ སྔོན་སྒྲིག་ཐོག་ལུ་ ལག་ཐོག་སྒྲིག་བཀོད་ ལག་ལེན་འཐབ་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory."
-msgstr "ཚད་འདི་(བའིཊི་ནང་) ལས་ལྷག་པའི་ གཟུགས་བརྙན་ཚུ་ མཐེབ་གཟེར་མི་བརྡབ། སྒྲིག་སྟངས་འདི་གི་དགོས་དོན་འདི་ མངོན་གསལ་འབད་ནི་ལུ་ ཡུན་རིང་འགོར་མིའམ་  དྲན་ཚད་ལེ་ཤ་ལག་ལེན་འཐབ་མི་ གཟུགས་བརྙན་ཆེ་བ་ཚུ་ལུ་ མཐེབ་གཟེར་བརྡབ་ནི་ལས་ སྤང་ཐབས་ལུ་ཨིན།"
+msgid ""
+"Images over this size (in bytes) won't be thumbnailed. The purpose of this "
+"setting is to avoid thumbnailing large images that may take a long time to "
+"load or use lots of memory."
+msgstr ""
+"ཚད་འདི་(བའིཊི་ནང་) ལས་ལྷག་པའི་ གཟུགས་བརྙན་ཚུ་ མཐེབ་གཟེར་མི་བརྡབ། སྒྲིག་སྟངས་འདི་གི་དགོས་དོན་འདི་ "
+"མངོན་གསལ་འབད་ནི་ལུ་ ཡུན་རིང་འགོར་མིའམ་  དྲན་ཚད་ལེ་ཤ་ལག་ལེན་འཐབ་མི་ གཟུགས་བརྙན་ཆེ་བ་ཚུ་ལུ་ "
+"མཐེབ་གཟེར་བརྡབ་ནི་ལས་ སྤང་ཐབས་ལུ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid "List of possible captions on icons"
@@ -546,8 +690,12 @@ msgid "Maximum image size for thumbnailing"
 msgstr "མཐེབ་གཟེར་བརྡབ་ནིའི་དོན་ལུ་ གཟུགས་བརྙན་ཚད་ཀྱི་མང་མཐའ།།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-msgid "Name of the Nautilus theme to use. This has been deprecated as of Nautilus 2.2. Please use the icon theme instead."
-msgstr "ལག་ལེན་འཐབ་ནིའི་ ནའུ་ཊི་ལཱསི་ བརྗོད་དོན་གྱི་མིང་། འདི་ནའུ་ཊི་ལཱསི་ ༢.༢ ཚུན་ ངོས་ལེན་མེདཔ་བཟོ་ཡོདཔ་ལས་ དེ་གི་ཚབ་ལུ་ ངོས་དཔར་བརྗོད་དོན་ ལག་ལེན་འཐབ།"
+msgid ""
+"Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
+"2.2. Please use the icon theme instead."
+msgstr ""
+"ལག་ལེན་འཐབ་ནིའི་ ནའུ་ཊི་ལཱསི་ བརྗོད་དོན་གྱི་མིང་། འདི་ནའུ་ཊི་ལཱསི་ ༢.༢ ཚུན་ ངོས་ལེན་མེདཔ་བཟོ་ཡོདཔ་"
+"ལས་ དེ་གི་ཚབ་ལུ་ ངོས་དཔར་བརྗོད་དོན་ ལག་ལེན་འཐབ།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid "Nautilus handles drawing the desktop"
@@ -566,8 +714,12 @@ msgid "Only show folders in the tree sidebar"
 msgstr "རྩ་བའི་ཟུར་ཁའི་ཕྲ་རིང་ནང་ སྣོད་འཛིན་ཚུ་རྐྱངམ་གཅིག་སྟོན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click."
-msgstr "སྲིད་པའི་བེ་ལུསི་ཚུ་ ཨེབ་གཏང་ཐེངས་གཅིག་ལུ་ ཡིག་སྣོད་གསར་བཙུགས་འབད་ནི་ལུ་ \"single\" དང་ ཨེབ་གཏང་ཐེངས་གཉིས་ལུ་ ཡིག་སྣོད་གསར་བཙུགས་འབད་ནི་ལུ་ \"double\"ཨིན།"
+msgid ""
+"Possible values are \"single\" to launch files on a single click, or \"double"
+"\" to launch them on a double click."
+msgstr ""
+"སྲིད་པའི་བེ་ལུསི་ཚུ་ ཨེབ་གཏང་ཐེངས་གཅིག་ལུ་ ཡིག་སྣོད་གསར་བཙུགས་འབད་ནི་ལུ་ \"single\" དང་ ཨེབ་"
+"གཏང་ཐེངས་གཉིས་ལུ་ ཡིག་སྣོད་གསར་བཙུགས་འབད་ནི་ལུ་ \"double\"ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid "Put labels beside icons"
@@ -617,32 +769,76 @@ msgid "Side pane view"
 msgstr "ཟུར་ཁའི་པེན་གྱི་མཐོང་སྣང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
-msgid "Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to \"always\" then always plays the sound, even if the file is on a remote server. If set to \"local_only\" then only plays previews on local file systems. If set to \"never\" then it never previews sound."
-msgstr "ཡིག་སྣོད་ཚུ་གི་ ངོས་དཔར་ཅིག་གུ་ལས་ཕར་ མཱའུསི་བཀལ་བའི་སྐབས་ སྒྲ་སྐད་ཡིག་སྣོད་ ནམ་སྔོན་ལྟ་འབད་ནི་ཨིན་ན་གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། \"always\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཡིག་སྣོད་དེ་ཐག་རིང་ སར་བར་ཅིག་གུ་ཨིན་རུང་ ཨ་རྟག་ར་སྒྲ་སྐད་བཏོན་འོང་།  \"local_only\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་རིམ་ལུགས་རྐྱངམ་གཅིག་ལུ་ སྒྲ་སྐད་སྔོན་ལྟ་གཏང་འོང་། \"never\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནམ་ཡང་སྒྲ་སྐད་སྔོན་ལྟ་མི་གཏང་།"
+msgid ""
+"Speed tradeoff for when to preview a sound file when mousing over a files "
+"icon. If set to \"always\" then always plays the sound, even if the file is "
+"on a remote server. If set to \"local_only\" then only plays previews on "
+"local file systems. If set to \"never\" then it never previews sound."
+msgstr ""
+"ཡིག་སྣོད་ཚུ་གི་ ངོས་དཔར་ཅིག་གུ་ལས་ཕར་ མཱའུསི་བཀལ་བའི་སྐབས་ སྒྲ་སྐད་ཡིག་སྣོད་ ནམ་སྔོན་ལྟ་འབད་ནི་ཨིན་ན་"
+"གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། \"always\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཡིག་སྣོད་དེ་ཐག་རིང་ སར་བར་ཅིག་གུ་ཨིན་"
+"རུང་ ཨ་རྟག་ར་སྒྲ་སྐད་བཏོན་འོང་།  \"local_only\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་རིམ་"
+"ལུགས་རྐྱངམ་གཅིག་ལུ་ སྒྲ་སྐད་སྔོན་ལྟ་གཏང་འོང་། \"never\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནམ་ཡང་སྒྲ་སྐད་སྔོན་"
+"ལྟ་མི་གཏང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to \"always\" then always show previews, even if the folder is on a remote server. If set to \"local_only\" then only show previews for local file systems. If set to \"never\" then never bother to read preview data."
-msgstr "ཡིག་སྣོད་ཀྱི་ངོས་དཔར་ནང་ ཚིག་དོན་ཡིག་སྣོད་ཀྱི་ནང་དོན་གྱི་ སྔོན་ལྟ་ནམ་སྟོན་ནི་ཨིན་ན་གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། \"always\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ སྣོད་འཛིན་དེ་ ཐག་རིང་སར་བར་ཅིག་གུ་ཨིན་རུང་ ཨ་རྟག་ར་སྔོན་ལྟ་སྟོན་འོང་། \"local_only\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་རིམ་ལུགས་ཀྱི་ སྔོན་ལྟ་རྐྱངམ་གཅིག་སྟོན་འོང་། \"never\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནམ་ཡང་སྔོན་ལྟའི་གནད་སྡུད་མི་ལྷག"
+msgid ""
+"Speed tradeoff for when to show a preview of text file contents in the "
+"file's icon. If set to \"always\" then always show previews, even if the "
+"folder is on a remote server. If set to \"local_only\" then only show "
+"previews for local file systems. If set to \"never\" then never bother to "
+"read preview data."
+msgstr ""
+"ཡིག་སྣོད་ཀྱི་ངོས་དཔར་ནང་ ཚིག་དོན་ཡིག་སྣོད་ཀྱི་ནང་དོན་གྱི་ སྔོན་ལྟ་ནམ་སྟོན་ནི་ཨིན་ན་གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། "
+"\"always\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ སྣོད་འཛིན་དེ་ ཐག་རིང་སར་བར་ཅིག་གུ་ཨིན་རུང་ ཨ་རྟག་ར་སྔོན་ལྟ་"
+"སྟོན་འོང་། \"local_only\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་རིམ་ལུགས་ཀྱི་ སྔོན་ལྟ་རྐྱངམ་"
+"གཅིག་སྟོན་འོང་། \"never\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནམ་ཡང་སྔོན་ལྟའི་གནད་སྡུད་མི་ལྷག"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
-msgid "Speed tradeoff for when to show an image file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local_only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail images, just use a generic icon."
-msgstr "གཟུགས་བརྙན་ཡིག་སྣོད་ཅིག་ མཐེ་གཟེར་བཟུམ་ཅིག་སྦེ་ ནམ་སྟོན་ནི་ཨིན་ན་གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། \"always\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ སྣོད་འཛིན་དེ་ཐག་རིང་ སར་བར་ཅིག་གུ་ཨིན་རུང་ ཨ་རྟག་ར་ མཐེ་གཟེར་བརྡབ་འོང་།  \"local_only\" ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ ཡིག་སྣོད་རིམ་ལུགས་དོན་ལུ་རྐྱངམ་གཅིག་ མཐེ་གཟེར་སྟོན་འོང་། \"never\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ གཟུགས་བརྙན་གུ་ ནམ་ཡང་མཐེ་གཟེར་མ་བརྡབས་པར་ དབྱེ་རིགས་ངོས་དཔར་ཅིག་ ལག་ལེན་འཐབ་འོང་།"
+msgid ""
+"Speed tradeoff for when to show an image file as a thumbnail. If set to "
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"If set to \"local_only\" then only show thumbnails for local file systems. "
+"If set to \"never\" then never bother to thumbnail images, just use a "
+"generic icon."
+msgstr ""
+"གཟུགས་བརྙན་ཡིག་སྣོད་ཅིག་ མཐེ་གཟེར་བཟུམ་ཅིག་སྦེ་ ནམ་སྟོན་ནི་ཨིན་ན་གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། \"always"
+"\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ སྣོད་འཛིན་དེ་ཐག་རིང་ སར་བར་ཅིག་གུ་ཨིན་རུང་ ཨ་རྟག་ར་ མཐེ་གཟེར་བརྡབ་འོང་"
+"།  \"local_only\" ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ ཡིག་སྣོད་རིམ་ལུགས་དོན་ལུ་རྐྱངམ་གཅིག་ མཐེ་"
+"གཟེར་སྟོན་འོང་། \"never\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ གཟུགས་བརྙན་གུ་ ནམ་ཡང་མཐེ་གཟེར་མ་བརྡབས་པར་ "
+"དབྱེ་རིགས་ངོས་དཔར་ཅིག་ ལག་ལེན་འཐབ་འོང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local_only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts."
-msgstr "སྣོད་འཛིན་ཅིག་ནང་གི་ རྣམ་གྲངས་ཀྱི་གྱངས་ཁ་ ནམ་སྟོན་ནི་ཨིན་ན་གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། \"always\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ སྣོད་འཛིན་དེ་ཐག་རིང་ སར་བར་ཅིག་གུ་ཨིན་རུང་ ཨ་རྟག་ར་རྣམ་གྲངས་ཀྱི་གྱངས་ཁ་སྟོན་འོང་།  \"local_only\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ ཡིག་སྣོད་རིམ་ལུགས་དོན་ལུ་རྐྱངམ་གཅིག་ གྱངས་ཁ་སྟོན་འོང་། \"never\" ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནམ་ཡང་གྱངས་ཁ་མི་རྐྱབ།"
+msgid ""
+"Speed tradeoff for when to show the number of items in a folder. If set to "
+"\"always\" then always show item counts, even if the folder is on a remote "
+"server. If set to \"local_only\" then only show counts for local file "
+"systems. If set to \"never\" then never bother to compute item counts."
+msgstr ""
+"སྣོད་འཛིན་ཅིག་ནང་གི་ རྣམ་གྲངས་ཀྱི་གྱངས་ཁ་ ནམ་སྟོན་ནི་ཨིན་ན་གི་ སི་པིཌི་ ཊེཌི་ཨོཕ། \"always\"ལུ་ གཞི་"
+"སྒྲིག་འབད་བ་ཅིན་ སྣོད་འཛིན་དེ་ཐག་རིང་ སར་བར་ཅིག་གུ་ཨིན་རུང་ ཨ་རྟག་ར་རྣམ་གྲངས་ཀྱི་གྱངས་ཁ་སྟོན་འོང་"
+"།  \"local_only\"ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ཉེ་གནས་ཀྱི་ ཡིག་སྣོད་རིམ་ལུགས་དོན་ལུ་རྐྱངམ་གཅིག་ གྱངས་"
+"ཁ་སྟོན་འོང་། \"never\" ལུ་ གཞི་སྒྲིག་འབད་བ་ཅིན་ ནམ་ཡང་གྱངས་ཁ་མི་རྐྱབ།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid "The default size of an icon for a thumbnail thumbnail in the icon view."
 msgstr "དངོས་དཔར་མཐོང་སྣང་གི་མཐེ་གཟེར་གྱི་དོན་ལུ་དངོས་དཔར་གྱི་སྔོན་སྒྲིག་ཚད"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-msgstr "ངོས་དཔར་མཐོང་སྣང་ནང་ རྣམ་གྲངས་ཀྱི་དོན་ལུ་ སྔོན་སྒྲིག་དབྱེ་སེལ་གོ་རིམ། སྲིད་པའི་བེ་ལུསི་ \"name\", \"size\", \"type\", \"modification_date\" དང་ \"emblems\" ཚུ་ཨིན།"
+msgid ""
+"The default sort-order for items in the icon view. Possible values are \"name"
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
+msgstr ""
+"ངོས་དཔར་མཐོང་སྣང་ནང་ རྣམ་གྲངས་ཀྱི་དོན་ལུ་ སྔོན་སྒྲིག་དབྱེ་སེལ་གོ་རིམ། སྲིད་པའི་བེ་ལུསི་ \"name\", "
+"\"size\", \"type\", \"modification_date\" དང་ \"emblems\" ཚུ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
-msgid "The default sort-order for the items in the list view. Possible values are \"name\", \"size\", \"type\", and \"modification_date\"."
-msgstr "ཐོ་ཡིག་མཐོང་སྣང་ནང་ རྣམ་གྲངས་ཀྱི་དོན་ལུ་ སྔོན་སྒྲིག་དབྱེ་སེལ་གོ་རིམ། སྲིད་པའི་བེ་ལུསི་ \"name\", \"size\", \"type\" དང་ \"type\"ཚུ་ཨིན།"
+msgid ""
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
+msgstr ""
+"ཐོ་ཡིག་མཐོང་སྣང་ནང་ རྣམ་གྲངས་ཀྱི་དོན་ལུ་ སྔོན་སྒྲིག་དབྱེ་སེལ་གོ་རིམ། སྲིད་པའི་བེ་ལུསི་ \"name\", \"size"
+"\", \"type\" དང་ \"type\"ཚུ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "The default width of the side pane in new windows."
@@ -653,24 +849,37 @@ msgid "The font description used for the icons on the desktop."
 msgstr "ཌེཀསི་ཊོཔ་གུའི་ ངོས་དཔར་ཚུ་གི་དོན་ལུ་ལག་ལེན་འཐབ་མི་ ཡིག་གཟུགས་འགྲེལ་བཤད།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
-msgid "The format of file dates. Possible values are \"locale\", \"iso\", and \"informal\"."
-msgstr "ཡིག་སྣོད་ཚེས་གྲངས་ཀྱི་རྩ་སྒྲིག སྲིད་པའི་བེ་ལུསི་ \"locale\", \"iso\" དང་ \"informal\"ཚུ་ཨིན།"
+msgid ""
+"The format of file dates. Possible values are \"locale\", \"iso\", and "
+"\"informal\"."
+msgstr ""
+"ཡིག་སྣོད་ཚེས་གྲངས་ཀྱི་རྩ་སྒྲིག སྲིད་པའི་བེ་ལུསི་ \"locale\", \"iso\" དང་ \"informal\"ཚུ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "The side pane view to show in newly opened windows."
 msgstr "གསརཔ་སྒོ་ཕྱེ་མི་ སྒོ་སྒྲིག་ཚུ་ནང་སྟོན་ནིའི་ ཟུར་ཁའི་པེན་མཐོང་སྣང་།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
-msgid "This name can be set if you want a custom name for the computer icon on the desktop."
-msgstr "ཁྱོད་ལུ་ཌེཀསི་ཊོཔ་གུ་ གློག་རིག་གི་དོན་ལས་ སྲོལ་སྒྲིག་གི་མིང་ཅིག་དགོ་པ་ཅིན་ མིང་དེ་གཞི་སྒྲིག་འབད་ཚུགས།"
+msgid ""
+"This name can be set if you want a custom name for the computer icon on the "
+"desktop."
+msgstr ""
+"ཁྱོད་ལུ་ཌེཀསི་ཊོཔ་གུ་ གློག་རིག་གི་དོན་ལས་ སྲོལ་སྒྲིག་གི་མིང་ཅིག་དགོ་པ་ཅིན་ མིང་དེ་གཞི་སྒྲིག་འབད་ཚུགས།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
-msgid "This name can be set if you want a custom name for the home icon on the desktop."
-msgstr "ཁྱོད་ལུ་ཌེཀསི་ཊོཔ་གུ་ ཁྱིམ་ངོས་དཔར་གྱི་དོན་ལས་ སྲོལ་སྒྲིག་གི་མིང་ཅིག་དགོ་པ་ཅིན་ མིང་དེ་གཞི་སྒྲིག་འབད་ཚུགས།"
+msgid ""
+"This name can be set if you want a custom name for the home icon on the "
+"desktop."
+msgstr ""
+"ཁྱོད་ལུ་ཌེཀསི་ཊོཔ་གུ་ ཁྱིམ་ངོས་དཔར་གྱི་དོན་ལས་ སྲོལ་སྒྲིག་གི་མིང་ཅིག་དགོ་པ་ཅིན་ མིང་དེ་གཞི་སྒྲིག་འབད་ཚུགས།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
-msgid "This name can be set if you want a custom name for the trash icon on the desktop."
-msgstr "ཁྱོད་ལུ་ཌེཀསི་ཊོཔ་གུ་ ཕྱགས་ཧོད་ངོས་དཔར་གྱི་དོན་ལས་ སྲོལ་སྒྲིག་གི་མིང་ཅིག་དགོ་པ་ཅིན་ མིང་དེ་གཞི་སྒྲིག་འབད་ཚུགས།"
+msgid ""
+"This name can be set if you want a custom name for the trash icon on the "
+"desktop."
+msgstr ""
+"ཁྱོད་ལུ་ཌེཀསི་ཊོཔ་གུ་ ཕྱགས་ཧོད་ངོས་དཔར་གྱི་དོན་ལས་ སྲོལ་སྒྲིག་གི་མིང་ཅིག་དགོ་པ་ཅིན་ མིང་དེ་གཞི་སྒྲིག་འབད་"
+"ཚུགས།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
 msgid "Trash icon visible on desktop"
@@ -693,12 +902,26 @@ msgid "What to do with executable text files when activated"
 msgstr "ལག་ལེན་འཐབ་བཏུབ་པའི་ ཚིག་དོན་ཡིག་སྣོད་ཚུ་ ལྕོགས་ཅན་བཟོ་ཞིནམ་ལས་ དེ་ཚུ་གིས་ག་ཅི་འབད་ནི།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files."
-msgstr "ལག་ལེན་འཐབ་བཏུབ་པའི་ ཚིག་དོན་ཡིག་སྣོད་ཚུ་ ལྕོགས་ཅན་བཟོ་ཞིནམ་ལས་ དེ་ཚུ་གིས་ག་ཅི་འབད་ནི། (ཨེབ་གཏང་རྐྱང་པོའམ་ གཉིས་རྡེབ) སྲིད་པའི་བེ་ལུསི་ ལས་རིམ་སྦེ་ གསར་བཙུགས་འབད་ནི་ལུ་ \"launch\" དང་ ཌའི་ལོག་བརྒྱུད་དེ་ ག་ཅི་འབདན་ན་འདྲི་ནི་ལུ་ \"ask\" དེ་ལས་ ཚིག་དོན་ཡིག་སྣོད་སྦེ་སྟོན་ནི་ལུ་ \"display\"ཚུ་ཨིན།"
+msgid ""
+"What to do with executable text files when they are activated (single or "
+"double clicked). Possible values are \"launch\" to launch them as programs, "
+"\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
+"text files."
+msgstr ""
+"ལག་ལེན་འཐབ་བཏུབ་པའི་ ཚིག་དོན་ཡིག་སྣོད་ཚུ་ ལྕོགས་ཅན་བཟོ་ཞིནམ་ལས་ དེ་ཚུ་གིས་ག་ཅི་འབད་ནི། (ཨེབ་གཏང་"
+"རྐྱང་པོའམ་ གཉིས་རྡེབ) སྲིད་པའི་བེ་ལུསི་ ལས་རིམ་སྦེ་ གསར་བཙུགས་འབད་ནི་ལུ་ \"launch\" དང་ ཌའི་ལོག་"
+"བརྒྱུད་དེ་ ག་ཅི་འབདན་ན་འདྲི་ནི་ལུ་ \"ask\" དེ་ལས་ ཚིག་དོན་ཡིག་སྣོད་སྦེ་སྟོན་ནི་ལུ་ \"display\"ཚུ་"
+"ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list_view\" and \"icon_view\"."
-msgstr "སྣོད་འཛིན་ཅིག་ལུ་ ལྟ་སྤྱོད་འབད་བའི་སྐབས་ ཁྱོད་ཀྱི་སྣོད་འཛིན་དེ་གི་དོན་ལས་ མཐོང་སྣང་གཞན་ཅིག་ གདམ་ཁ་རྐྱབ་ཡོདན་མ་གཏོགས་ དེ་མིན་མཐོང་བྱེད་འདི་ ལག་ལེན་འཐབ་ཨིན། སྲིད་པའི་བེ་ལུསི་ \"list_view\" དང་ \"icon_view\"ཚུ་ཨིན།"
+msgid ""
+"When a folder is visited this viewer is used unless you have selected "
+"another view for that particular folder. Possible values are \"list_view\" "
+"and \"icon_view\"."
+msgstr ""
+"སྣོད་འཛིན་ཅིག་ལུ་ ལྟ་སྤྱོད་འབད་བའི་སྐབས་ ཁྱོད་ཀྱི་སྣོད་འཛིན་དེ་གི་དོན་ལས་ མཐོང་སྣང་གཞན་ཅིག་ གདམ་ཁ་རྐྱབ་"
+"ཡོདན་མ་གཏོགས་ དེ་མིན་མཐོང་བྱེད་འདི་ ལག་ལེན་འཐབ་ཨིན། སྲིད་པའི་བེ་ལུསི་ \"list_view\" དང་ "
+"\"icon_view\"ཚུ་ཨིན།"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
 msgid "When to show number of items in a folder"
@@ -901,12 +1124,20 @@ msgid "You cannot move the volume \"%s\" to the trash."
 msgstr "སྦུང་ཚད་\"%s\" དེ་ ཕྱགས་ཧོད་ནང་ སྤོ་བཤུད་མི་ཚུགས།"
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:125
-msgid "If you want to eject the volume, please use \"Eject\" in the popup menu of the volume."
-msgstr "ཁྱོད་ཀྱིས་སྦུང་ཚད་ ཕྱིར་བཏོན་འབད་དགོ་པ་ཅིན་ སྦུང་ཚད་ཀྱི་པོཔ་ཨཔ་དཀར་ཆག་ནང་\"Eject\"  ལག་ལེན་འཐབ་གནང་།"
+msgid ""
+"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"the volume."
+msgstr ""
+"ཁྱོད་ཀྱིས་སྦུང་ཚད་ ཕྱིར་བཏོན་འབད་དགོ་པ་ཅིན་ སྦུང་ཚད་ཀྱི་པོཔ་ཨཔ་དཀར་ཆག་ནང་\"Eject\"  ལག་ལེན་"
+"འཐབ་གནང་།"
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:134
-msgid "If you want to unmount the volume, please use \"Unmount Volume\" in the popup menu of the volume."
-msgstr "ཁྱོད་ཀྱིས་སྦུང་ཚད་དེ་ བརྩེགས་བཤོལ་འབད་ནི་ཨིན་པ་ཅིན་ སྦུང་ཚད་ཀྱི་པོཔ་ཨཔ་དཀར་ཆག་ནང་གི་ \"Unmount Volume\" དེ་ ལག་ལེན་འཐབ།"
+msgid ""
+"If you want to unmount the volume, please use \"Unmount Volume\" in the "
+"popup menu of the volume."
+msgstr ""
+"ཁྱོད་ཀྱིས་སྦུང་ཚད་དེ་ བརྩེགས་བཤོལ་འབད་ནི་ཨིན་པ་ཅིན་ སྦུང་ཚད་ཀྱི་པོཔ་ཨཔ་དཀར་ཆག་ནང་གི་ \"Unmount "
+"Volume\" དེ་ ལག་ལེན་འཐབ།"
 
 #: ../libnautilus-private/nautilus-desktop-link.c:179
 msgid "Network Servers"
@@ -950,11 +1181,14 @@ msgstr "ལས་རྟགས་དེ་ གསར་བཙུགས་འབ�
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:199
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
-msgstr "དགོངསམ་མ་ཁྲེལ་ ཁྱོད་ཀྱིས་ལས་རྟགས་གསར་པའི་དོན་ལུ་ སྟོངམ་མིན་པའི་གཙོ་ཚིག་ཅིག་ གསལ་བཀོད་འབད་དགོ"
+msgstr ""
+"དགོངསམ་མ་ཁྲེལ་ ཁྱོད་ཀྱིས་ལས་རྟགས་གསར་པའི་དོན་ལུ་ སྟོངམ་མིན་པའི་གཙོ་ཚིག་ཅིག་ གསལ་བཀོད་འབད་དགོ"
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:204
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "དགོངསམ་མ་ཁྲེལ་ ལས་རྟགས་ཀྱི་གཙོ་ཚིག་ནང་ ཡི་གུ་དང་ བར་སྟོང་ ཨང་གྲངས་ཚུ་རྐྱངམ་གཅིག་བཞག་བཏུབ།"
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"དགོངསམ་མ་ཁྲེལ་ ལས་རྟགས་ཀྱི་གཙོ་ཚིག་ནང་ ཡི་གུ་དང་ བར་སྟོང་ ཨང་གྲངས་ཚུ་རྐྱངམ་གཅིག་བཞག་བཏུབ།"
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1029,8 +1263,12 @@ msgstr "བཏོན་གཏང་བའི་སྐབས་ལུ་འཛོ
 
 #: ../libnautilus-private/nautilus-file-operations.c:683
 #, c-format
-msgid "\"%s\" cannot be deleted because you do not have permissions to modify its parent folder."
-msgstr "\"%s\" དེ་ བཏོན་གཏང་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཁྱོད་ལུ་དེ་གི་ རྩ་ལག་སྣོད་འཛིན་དེ་ ལེགས་བཅོས་འབད་ནིའི་ གནང་བ་མིན་འདུག"
+msgid ""
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
+msgstr ""
+"\"%s\" དེ་ བཏོན་གཏང་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཁྱོད་ལུ་དེ་གི་ རྩ་ལག་སྣོད་འཛིན་དེ་ ལེགས་བཅོས་འབད་"
+"ནིའི་ གནང་བ་མིན་འདུག"
 
 #: ../libnautilus-private/nautilus-file-operations.c:689
 #, c-format
@@ -1039,18 +1277,29 @@ msgstr "\"%s\" དེ་ བཏོན་གཏང་མི་ཚུགས། ག
 
 #: ../libnautilus-private/nautilus-file-operations.c:720
 #, c-format
-msgid "\"%s\" cannot be moved because you do not have permissions to change it or its parent folder."
-msgstr "\"%s\" དེ་ སྤོ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཁྱོད་ལུ་དེའམ་ དེ་གི་རྩ་ལག་སྣོད་འཛིན་ བསྒྱུར་བཅོས་འབད་ནིའི་ གནང་བ་མིན་འདུག"
+msgid ""
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
+msgstr ""
+"\"%s\" དེ་ སྤོ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཁྱོད་ལུ་དེའམ་ དེ་གི་རྩ་ལག་སྣོད་འཛིན་ བསྒྱུར་བཅོས་འབད་ནིའི་ "
+"གནང་བ་མིན་འདུག"
 
 #: ../libnautilus-private/nautilus-file-operations.c:725
 #, c-format
-msgid "Cannot move \"%s\" because it or its parent folder are contained in the destination."
-msgstr "\"%s\" དེ་ སྤོ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེའམ་དེ་གི་རྩ་ལག་སྣོད་འཛིན་ཚུ་ འགྲོ་ཡུལ་དེ་ནང་འདུག"
+msgid ""
+"Cannot move \"%s\" because it or its parent folder are contained in the "
+"destination."
+msgstr ""
+"\"%s\" དེ་ སྤོ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེའམ་དེ་གི་རྩ་ལག་སྣོད་འཛིན་ཚུ་ འགྲོ་ཡུལ་དེ་ནང་འདུག"
 
 #: ../libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid "Cannot move \"%s\" to the trash because you do not have permissions to change it or its parent folder."
-msgstr "\"%s\" དེ་ ཕྱགས་ཧོད་ནང་ སྤོ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཁྱོད་ལུ་དེའམ་དེ་གི་ རྩ་ལག་སྣོད་འཛིན་ བསྒྱུར་བཅོས་འབད་ནིའི་ གནང་བ་མིན་འདུག"
+msgid ""
+"Cannot move \"%s\" to the trash because you do not have permissions to "
+"change it or its parent folder."
+msgstr ""
+"\"%s\" དེ་ ཕྱགས་ཧོད་ནང་ སྤོ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཁྱོད་ལུ་དེའམ་དེ་གི་ རྩ་ལག་སྣོད་འཛིན་ བསྒྱུར་"
+"བཅོས་འབད་ནིའི་ གནང་བ་མིན་འདུག"
 
 #: ../libnautilus-private/nautilus-file-operations.c:757
 msgid "Error while copying."
@@ -1176,8 +1425,12 @@ msgid "Could not move \"%s\" to the new location."
 msgstr "\"%s\"  གནས་ཁོངས་གསརཔ་ལུ་ སྤོ་བཤུད་འབད་མ་ཚུགས།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1140
-msgid "The name is already used for a special item that cannot be removed or replaced.  If you still want to move the item, rename it and try again."
-msgstr "མིང་དེ་ རྩ་བསྐྲད་གཏང་མི་ཚུགས་པའམ་ ཚབ་མ་བཙུགས་མི་བཏུབ་པའི་ དམིགས་བསལ་རྣམ་གྲངས་ཅིག་གི་དོན་ལུ་ ལག་ལེན་འཐབ་ནུག ཁྱོད་ཀྱིས་རྣམ་གྲངས་དེ་ སྤོ་རང་སྤོ་དགོ་པ་ཅིན་ མིང་ཚབ་བཏགས་ཏེ་ ལོག་འབད་རྩོལ་སྐྱེད།"
+msgid ""
+"The name is already used for a special item that cannot be removed or "
+"replaced.  If you still want to move the item, rename it and try again."
+msgstr ""
+"མིང་དེ་ རྩ་བསྐྲད་གཏང་མི་ཚུགས་པའམ་ ཚབ་མ་བཙུགས་མི་བཏུབ་པའི་ དམིགས་བསལ་རྣམ་གྲངས་ཅིག་གི་དོན་ལུ་ ལག་"
+"ལེན་འཐབ་ནུག ཁྱོད་ཀྱིས་རྣམ་གྲངས་དེ་ སྤོ་རང་སྤོ་དགོ་པ་ཅིན་ མིང་ཚབ་བཏགས་ཏེ་ ལོག་འབད་རྩོལ་སྐྱེད།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1144
 #, c-format
@@ -1185,8 +1438,13 @@ msgid "Could not copy \"%s\" to the new location."
 msgstr "\"%s\"  གནས་ཁོངས་གསརཔ་ལུ་ འདྲ་བཤུས་རྐྱབ་མ་ཚུགས།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1147
-msgid "The name is already used for a special item that cannot be removed or replaced.  If you still want to copy the item, rename it and try again."
-msgstr "མིང་དེ་ རྩ་བསྐྲད་གཏང་མི་ཚུགས་པའམ་ ཚབ་མ་བཙུགས་མི་བཏུབ་པའི་ དམིགས་བསལ་རྣམ་གྲངས་ཅིག་གི་དོན་ལུ་ ལག་ལེན་འཐབ་ནུག ཁྱོད་ཀྱིས་རྣམ་གྲངས་དེ་ འདྲ་བཤུས་རྐྱབ་རང་རྐྱབ་དགོ་པ་ཅིན་ མིང་ཚབ་བཏགས་ཏེ་ ལོག་འབད་རྩོལ་སྐྱེད།"
+msgid ""
+"The name is already used for a special item that cannot be removed or "
+"replaced.  If you still want to copy the item, rename it and try again."
+msgstr ""
+"མིང་དེ་ རྩ་བསྐྲད་གཏང་མི་ཚུགས་པའམ་ ཚབ་མ་བཙུགས་མི་བཏུབ་པའི་ དམིགས་བསལ་རྣམ་གྲངས་ཅིག་གི་དོན་ལུ་ ལག་"
+"ལེན་འཐབ་ནུག ཁྱོད་ཀྱིས་རྣམ་གྲངས་དེ་ འདྲ་བཤུས་རྐྱབ་རང་རྐྱབ་དགོ་པ་ཅིན་ མིང་ཚབ་བཏགས་ཏེ་ ལོག་འབད་རྩོལ་"
+"སྐྱེད།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1172
 #, c-format
@@ -1200,13 +1458,19 @@ msgstr "ཡིག་སྣོད་མིང་ \"%s\"འབད་མི་ཅ�
 
 #: ../libnautilus-private/nautilus-file-operations.c:1194
 #, c-format
-msgid "The folder already exists in \"%s\".  Replacing it will overwrite any files in the folder that conflict with the files being copied."
-msgstr "སྣོད་འཛིན་དེ་ ཧེ་མ་ལས་རང་\"%s\"ནང་འདུག དེ་གི་ཚབ་མ་བཙུགས་པ་ཅིན་ འདྲ་བཤུས་རྐྱབ་མི་ཡིག་སྣོད་ཚུ་དང་ མི་མཐུན་པའི་སྣོད་འཛིན་ནང་གི་ཡིག་སྣོད་ཚུ་ ཚབ་སྲུང་འབད་འོང་།"
+msgid ""
+"The folder already exists in \"%s\".  Replacing it will overwrite any files "
+"in the folder that conflict with the files being copied."
+msgstr ""
+"སྣོད་འཛིན་དེ་ ཧེ་མ་ལས་རང་\"%s\"ནང་འདུག དེ་གི་ཚབ་མ་བཙུགས་པ་ཅིན་ འདྲ་བཤུས་རྐྱབ་མི་ཡིག་སྣོད་ཚུ་དང་ "
+"མི་མཐུན་པའི་སྣོད་འཛིན་ནང་གི་ཡིག་སྣོད་ཚུ་ ཚབ་སྲུང་འབད་འོང་།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "ཡིག་སྣོད་དེ་ཧེ་མ་ལས་ར་\"%s\"ནང་འདུག དེ་གི་ཚབ་བཙུགས་པ་ཅིན་ དེ་གི་ནང་དོན་ཚུ་ཚབ་སྲུང་འབད་འོང་།"
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+"ཡིག་སྣོད་དེ་ཧེ་མ་ལས་ར་\"%s\"ནང་འདུག དེ་གི་ཚབ་བཙུགས་པ་ཅིན་ དེ་གི་ནང་དོན་ཚུ་ཚབ་སྲུང་འབད་འོང་།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
 #: ../libnautilus-private/nautilus-file-operations.c:1233
@@ -1468,7 +1732,9 @@ msgstr "ཁྱོད་ཀྱིས་ཕྱགས་ཧོད་ཀྱི་ས
 
 #: ../libnautilus-private/nautilus-file-operations.c:2208
 msgid "A trash folder is used for storing items moved to the trash."
-msgstr "ཕྱགས་ཧོད་ཀྱི་སྣོད་འཛིན་དེ་ ཕྱགས་ཧོད་ནང་སྤོ་མི་ རྣམ་གྲངས་ཚུ་ གསོག་འཇོག་འབད་ནིའི་དོན་ལུ་ ལག་ལེན་འཐབ་ཨིན།"
+msgstr ""
+"ཕྱགས་ཧོད་ཀྱི་སྣོད་འཛིན་དེ་ ཕྱགས་ཧོད་ནང་སྤོ་མི་ རྣམ་གྲངས་ཚུ་ གསོག་འཇོག་འབད་ནིའི་དོན་ལུ་ ལག་ལེན་འཐབ་"
+"ཨིན།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2232
 msgid "You cannot move a folder into itself."
@@ -1562,8 +1828,12 @@ msgid "Empty all of the items from the trash?"
 msgstr "ཕྱགས་ཧོད་ནང་ལས་ རྣམ་གྲངས་ཆ་མཉམ་ བཏོན་གཏང་ནི་ཨིན་ན?།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2891
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "ཁྱོད་ཀྱིས་ཕྱགས་ཧོད་སྟོངམ་བཏོན་པ་ཅིན་ དེ་ནང་ཡོད་པའི་རྣམ་གྲངས་ཆ་མཉམ་ རྟག་བརྟན་སྦེ་ བརླག་སྟོར་འགྱོཝ་ཨིན། ཁྱོད་ཀྱིས་རེ་རེ་སྦེ་ བཏོན་གཏང་རུང་བཏུབ།"
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"ཁྱོད་ཀྱིས་ཕྱགས་ཧོད་སྟོངམ་བཏོན་པ་ཅིན་ དེ་ནང་ཡོད་པའི་རྣམ་གྲངས་ཆ་མཉམ་ རྟག་བརྟན་སྦེ་ བརླག་སྟོར་འགྱོཝ་ཨིན། "
+"ཁྱོད་ཀྱིས་རེ་རེ་སྦེ་ བཏོན་གཏང་རུང་བཏུབ།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2913
 msgid "_Empty Trash"
@@ -1574,8 +1844,12 @@ msgid "Do you want to empty the trash before you umount?"
 msgstr "ཁྱོད་ བརྩེགས་བཤོལ་མ་འབད་བའི་ཧེ་མ་་ཕྱགས་ཧོད་སྟོངམ་བཏོན་ནི་ཨིན་ན?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3020
-msgid "In order to regain the free space on this device the trash must be emptied. All items in the trash will be permanently lost. "
-msgstr "ཐབས་འཕྲུལ་འདི་འགུ་ས་སྟོང་བཏོན་ནི་གི་དོན་ལུ་ཕྱགས་ཧོད་སྟོངམ་བཏོན་དགོ། ཕྱགས་ཧོད་ནང་ལུ་ཡོད་མི་རྣམས་གྲངས་ཚུ་ཆ་མཉམ་རྟག་བརྟན་བརླག་སྟོར་ཞུགས་འོངཧ།"
+msgid ""
+"In order to regain the free space on this device the trash must be emptied. "
+"All items in the trash will be permanently lost. "
+msgstr ""
+"ཐབས་འཕྲུལ་འདི་འགུ་ས་སྟོང་བཏོན་ནི་གི་དོན་ལུ་ཕྱགས་ཧོད་སྟོངམ་བཏོན་དགོ། ཕྱགས་ཧོད་ནང་ལུ་ཡོད་མི་རྣམས་གྲངས་"
+"ཚུ་ཆ་མཉམ་རྟག་བརྟན་བརླག་སྟོར་ཞུགས་འོངཧ།"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3026
 msgid "Don't Empty Trash"
@@ -1825,13 +2099,21 @@ msgid "program"
 msgstr "ལས་རིམ།"
 
 #: ../libnautilus-private/nautilus-file.c:4802
-msgid "Can't find description even for \"x-directory/normal\". This probably means that your gnome-vfs.keys file is in the wrong place or isn't being found for some other reason."
-msgstr "ཐ་ན་\"x-directory/normal\" གི་དོན་ལུ་ཡང་ འགྲེལ་བཤད་འཚོལ་མ་ཐོབ། འདི་གི་དོན་དག་ ཁྱོད་ཀྱི"
+msgid ""
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
+msgstr ""
+"ཐ་ན་\"x-directory/normal\" གི་དོན་ལུ་ཡང་ འགྲེལ་བཤད་འཚོལ་མ་ཐོབ། འདི་གི་དོན་དག་ ཁྱོད་ཀྱི"
 
 #: ../libnautilus-private/nautilus-file.c:4806
 #, c-format
-msgid "No description found for mime type \"%s\" (file is \"%s\"), please tell the gnome-vfs mailing list."
-msgstr "མ་ཡིམ་དབྱེ་བ་ \"%s\" གི་དོན་ལུ་ འགྲེལ་བཤད་འཚོལ་མ་ཐོབ། (ཡིག་སྣོད་དེ་ \"%s\" ཨིན) ཇི་ནོམ་-ཝི་ཨེཕ་ཨེསི་ ཡིག་གཏང་ཐོ་ཡིག་ལུ་སླབ་གནང་།"
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), please tell the "
+"gnome-vfs mailing list."
+msgstr ""
+"མ་ཡིམ་དབྱེ་བ་ \"%s\" གི་དོན་ལུ་ འགྲེལ་བཤད་འཚོལ་མ་ཐོབ། (ཡིག་སྣོད་དེ་ \"%s\" ཨིན) ཇི་ནོམ་-ཝི་ཨེཕ་"
+"ཨེསི་ ཡིག་གཏང་ཐོ་ཡིག་ལུ་སླབ་གནང་།"
 
 #: ../libnautilus-private/nautilus-file.c:4822
 msgid "link"
@@ -1844,8 +2126,7 @@ msgstr "འབྲེལ་ལམ་(ཆད་པ)"
 #: ../libnautilus-private/nautilus-file.c:6369
 #: ../libnautilus-private/nautilus-global-preferences.c:536
 #: ../libnautilus-private/nautilus-trash-directory.c:353
-#: ../src/nautilus-places-sidebar.c:358
-#: ../src/nautilus-trash-bar.c:137
+#: ../src/nautilus-places-sidebar.c:358 ../src/nautilus-trash-bar.c:137
 msgid "Trash"
 msgstr "ཕྱགས་ཧོད།"
 
@@ -2051,8 +2332,12 @@ msgstr "ཁ་ཕྱེ་མ་བཏུབ། གློག་རིམ་ག�
 #: ../libnautilus-private/nautilus-program-choosing.c:137
 #: ../libnautilus-private/nautilus-program-choosing.c:168
 #, c-format
-msgid "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" locations."
-msgstr "\"%s\" གིས་ \"%s\"ཁ་ཕྱེ་མི་ཚུགས་པས། ག་ཅི་ཨིནམ་ཟེར་བ་ཅིན་\"%s\"གིས་ གནས་ཁོངས་\"%s\"ནང་ ཡིག་སྣོད་ཚུ་ལུ་ འཛུལ་སྤྱོད་འབད་མི་ཚུགས་པས།"
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations."
+msgstr ""
+"\"%s\" གིས་ \"%s\"ཁ་ཕྱེ་མི་ཚུགས་པས། ག་ཅི་ཨིནམ་ཟེར་བ་ཅིན་\"%s\"གིས་ གནས་ཁོངས་\"%s\"ནང་ "
+"ཡིག་སྣོད་ཚུ་ལུ་ འཛུལ་སྤྱོད་འབད་མི་ཚུགས་པས།"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:142
 msgid "Open Failed, would you like to choose another action?"
@@ -2061,22 +2346,39 @@ msgstr "ཁ་ཕྱེ་མ་བཏུབ། བྱ་བ་གཞན་ཅ�
 #: ../libnautilus-private/nautilus-program-choosing.c:143
 #: ../libnautilus-private/nautilus-program-choosing.c:175
 #, c-format
-msgid "The default action can't open \"%s\" because it can't access files at \"%s\" locations."
-msgstr "སྔོན་སྒྲིག་བྱ་བ་དེ་གིས་\"%s\" ཁ་ཕྱེ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་གིས་གནས་ཁོངས་\"%s\" ལུ་ ཡིག་སྣོད་ནང་ འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
+msgid ""
+"The default action can't open \"%s\" because it can't access files at \"%s\" "
+"locations."
+msgstr ""
+"སྔོན་སྒྲིག་བྱ་བ་དེ་གིས་\"%s\" ཁ་ཕྱེ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་གིས་གནས་ཁོངས་\"%s\" ལུ་ ཡིག་སྣོད་"
+"ནང་ འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:171
-msgid "No other applications are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "ཡིག་སྣོད་འདི་བལྟ་ནིའི་དོན་ལུ་ གློག་རིམ་གཞན་ ག་ནི་ཡང་མི་འཐོབ་པས། ཡིག་སྣོད་འདི་ ཁྱོད་རའི་གློག་རིག་གུ་ འདྲ་བཤུས་རྐྱབ་པ་ཅིན་ ཁ་ཕྱེ་ཚུགསཔ་འོང་།"
+msgid ""
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
+msgstr ""
+"ཡིག་སྣོད་འདི་བལྟ་ནིའི་དོན་ལུ་ གློག་རིམ་གཞན་ ག་ནི་ཡང་མི་འཐོབ་པས། ཡིག་སྣོད་འདི་ ཁྱོད་རའི་གློག་རིག་གུ་ འདྲ་"
+"བཤུས་རྐྱབ་པ་ཅིན་ ཁ་ཕྱེ་ཚུགསཔ་འོང་།"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:177
-msgid "No other actions are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "ཡིག་སྣོད་འདི་བལྟ་ནིའི་དོན་ལུ་ བྱ་བ་གཞན་ ག་ནི་ཡང་མི་འཐོབ་པས། ཡིག་སྣོད་འདི་ ཁྱོད་རའི་གློག་རིག་གུ་ འདྲ་བཤུས་རྐྱབ་པ་ཅིན་ ཁ་ཕྱེ་ཚུགསཔ་འོང་།"
+msgid ""
+"No other actions are available to view this file.  If you copy this file "
+"onto your computer, you may be able to open it."
+msgstr ""
+"ཡིག་སྣོད་འདི་བལྟ་ནིའི་དོན་ལུ་ བྱ་བ་གཞན་ ག་ནི་ཡང་མི་འཐོབ་པས། ཡིག་སྣོད་འདི་ ཁྱོད་རའི་གློག་རིག་གུ་ འདྲ་"
+"བཤུས་རྐྱབ་པ་ཅིན་ ཁ་ཕྱེ་ཚུགསཔ་འོང་།"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:489
 #: ../libnautilus-private/nautilus-program-choosing.c:731
-#, c-format
+#: ../eel/eel-app-launch-context.c:404
+#, fuzzy, c-format
 msgid "Opening %s"
-msgstr "%s ཁ་ཕྱེ་དོ།"
+msgstr ""
+"#-#-#-#-#  dz.po (nautilus.HEAD.dz)  #-#-#-#-#\n"
+"%s ཁ་ཕྱེ་དོ།\n"
+"#-#-#-#-#  dz.po (eel.HEAD.dz)  #-#-#-#-#\n"
+"%s  ཁ་ཕྱེ་དོ། "
 
 #. TODO: These strings suck pretty badly, but we're in string-freeze,
 #. * and I found these in other places to reuse. We should make them
@@ -2120,8 +2422,10 @@ msgstr "\"%s\" བཀྲམ་སྟོན་འབད་མ་ཚུགས། �
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1522
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "ཁྱོད་ཀྱི་ཡིག་སྡེབ་འཛོལ་མ་འཛོལ་དང་ ཁྱོད་རའི་པོརོག་སི་ སྒྲིག་སྟངས་ཚུ་ ངེས་བདེན་ཨིན་མིན་ ཞིབ་དཔྱད་འབད།"
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"ཁྱོད་ཀྱི་ཡིག་སྡེབ་འཛོལ་མ་འཛོལ་དང་ ཁྱོད་རའི་པོརོག་སི་ སྒྲིག་སྟངས་ཚུ་ ངེས་བདེན་ཨིན་མིན་ ཞིབ་དཔྱད་འབད།"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:616
 #: ../src/nautilus-window-manage-views.c:1480
@@ -2145,11 +2449,20 @@ msgid "Couldn't find \"%s\"."
 msgstr "\"%s\" འཚོལ་མ་ཐོབ།"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:734
-#, c-format
+#: ../eel/eel-app-launch-context.c:407
+#, fuzzy, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
-msgstr[0] "རྣམ་གྲངས་%dཁ་ཕྱེ་དོ།"
-msgstr[1] "རྣམ་གྲངས་%dཁ་ཕྱེ་དོ།"
+msgstr[0] ""
+"#-#-#-#-#  dz.po (nautilus.HEAD.dz)  #-#-#-#-#\n"
+"རྣམ་གྲངས་%dཁ་ཕྱེ་དོ།\n"
+"#-#-#-#-#  dz.po (eel.HEAD.dz)  #-#-#-#-#\n"
+"%d རྣམ་གྲངས་ ཁ་ཕྱེ་དོ་"
+msgstr[1] ""
+"#-#-#-#-#  dz.po (nautilus.HEAD.dz)  #-#-#-#-#\n"
+"རྣམ་གྲངས་%dཁ་ཕྱེ་དོ།\n"
+"#-#-#-#-#  dz.po (eel.HEAD.dz)  #-#-#-#-#\n"
+"%d རྣམ་གྲངས་ཚུ་ ཁ་ཕྱེ་དོ་"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:899
 msgid "Sorry, but you can't execute commands from a remote site."
@@ -2170,12 +2483,19 @@ msgid "This drop target only supports local files."
 msgstr "བཀོག་བཞག་གི་ དམིགས་གཏད་འདི་གིས་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་ཚུ་རྐྱངམ་གཅིག་ལུ་ རྒྱབ་སྐྱོར་འབདཝ་ཨིན།"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "ཉེ་གནས་མིན་པའི་ཡིག་སྣོད་ཚུ་ ཁ་ཕྱེ་ནིའི་དོན་ལུ་ དེ་ཚུ་ཉེ་གནས་སྣོད་འཛིན་ཅིག་ནང་ འདྲ་བཤུས་རྐྱབ་ཞིནམ་ལས་ ལོག་སྟེ་བཀོག་བཞག"
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"ཉེ་གནས་མིན་པའི་ཡིག་སྣོད་ཚུ་ ཁ་ཕྱེ་ནིའི་དོན་ལུ་ དེ་ཚུ་ཉེ་གནས་སྣོད་འཛིན་ཅིག་ནང་ འདྲ་བཤུས་རྐྱབ་ཞིནམ་ལས་ "
+"ལོག་སྟེ་བཀོག་བཞག"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:954
-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened."
-msgstr "ཉེ་གནས་མིན་པའི་ཡིག་སྣོད་ཚུ་ ཁ་ཕྱེ་ནིའི་དོན་ལུ་ དེ་ཚུ་ཉེ་གནས་སྣོད་འཛིན་ཅིག་ནང་ འདྲ་བཤུས་རྐྱབ་ཞིནམ་ལས་ ལོག་སྟེ་བཀོག་བཞག ཁྱོད་ཀྱིས་བཀོག་བཞག་འབད་མི་ཡིག་སྣོད་ཚུ་ ཧེ་མ་ལས་རང་ ཁ་ཕྱེ་སྟེ་འདུག"
+msgid ""
+"To open non-local files copy them to a local folder and then drop them "
+"again. The local files you dropped have already been opened."
+msgstr ""
+"ཉེ་གནས་མིན་པའི་ཡིག་སྣོད་ཚུ་ ཁ་ཕྱེ་ནིའི་དོན་ལུ་ དེ་ཚུ་ཉེ་གནས་སྣོད་འཛིན་ཅིག་ནང་ འདྲ་བཤུས་རྐྱབ་ཞིནམ་ལས་ "
+"ལོག་སྟེ་བཀོག་བཞག ཁྱོད་ཀྱིས་བཀོག་བཞག་འབད་མི་ཡིག་སྣོད་ཚུ་ ཧེ་མ་ལས་རང་ ཁ་ཕྱེ་སྟེ་འདུག"
 
 #: ../libnautilus-private/nautilus-query.c:138
 #, c-format
@@ -2204,10 +2524,12 @@ msgid "Redo the edit"
 msgstr "ཞུན་དག་དེ་ལོག་འབད།"
 
 #. label, accelerator
-#: ../nautilus-computer.desktop.in.in.h:1
-#: ../src/nautilus-window-menus.c:663
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "འ་ནི་གློག་རིག་འདི་ལས་འཛུལ་སྤྱོད་འབད་བཏུབ་པའི་ ཉེ་གནས་དང་ཐག་རིང་གི་ཌིཀསི་དང་ སྣོད་འཛིན་ཚུ་ བརྡ་འཚོལ་འབད་"
+#: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:663
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"འ་ནི་གློག་རིག་འདི་ལས་འཛུལ་སྤྱོད་འབད་བཏུབ་པའི་ ཉེ་གནས་དང་ཐག་རིང་གི་ཌིཀསི་དང་ སྣོད་འཛིན་ཚུ་ བརྡ་འཚོལ་"
+"འབད་"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
@@ -2221,14 +2543,12 @@ msgstr "ཡིག་སྣོད་འཛིན་སྐྱོང་།"
 msgid "Open Folder"
 msgstr "སྣོད་འཛིན་ཁ་ཕྱེ།"
 
-#: ../nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1394
+#: ../nautilus-home.desktop.in.in.h:1 ../src/file-manager/fm-tree-view.c:1394
 msgid "Home Folder"
 msgstr "ཁྱིམ་གྱི་སྣོད་འཛིན།"
 
 #. label, accelerator
-#: ../nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-window-menus.c:659
+#: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:659
 msgid "Open your personal folder"
 msgstr "ཁྱོད་རའི་རང་དོན་གྱི་སྣོད་འཛིན་ཁ་ཕྱེ་"
 
@@ -2257,7 +2577,9 @@ msgid "Nautilus shell"
 msgstr "ནའུ་ཊི་ལཱསི་ཤལ།"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus shell operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
 msgstr "ཤུལ་གྱི་བཀོད་ལམ་ ལས་བཀོལ་ནང་ལས་འབད་ཚུགས་པའི་ ནའུ་ཊི་ལཱསི་ཤལ་གྱི་བསྟར་སྤྱོད།"
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -2296,7 +2618,8 @@ msgstr "ཌེཀསི་ཊོཔ་གི་རྒྱབ་གཞི་སོ
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "ཁྱོད་རའི་ཌེཀསི་ཊོཔ་གི་ དཔེ་ཚད་དམ་ཚོས་གཞི་ གཞི་སྒྲིག་འབད་བཅུག་མི་ སྒོ་སྒྲིག་ཅིག་སྟོན།"
 
 #. tooltip
@@ -2308,8 +2631,7 @@ msgid "Delete all items in the Trash"
 msgstr "ཕྱགས་ཧོད་ནང་ཡོད་མི་ རྣམ་གྲངས་ཆ་མཉམ་ བཏོན་གཏང་།"
 
 #: ../src/file-manager/fm-desktop-icon-view.c:797
-#: ../src/nautilus-desktop-window.c:246
-#: ../src/nautilus-pathbar.c:1121
+#: ../src/nautilus-desktop-window.c:246 ../src/nautilus-pathbar.c:1121
 #: ../src/nautilus-places-sidebar.c:259
 msgid "Desktop"
 msgstr "ཌེསིཀ་ཊོཔ།"
@@ -2355,7 +2677,8 @@ msgstr "ཁྱོད་ཀྱིས་ \"%s\" རྟག་བརྟན་སྦ�
 #: ../src/file-manager/fm-directory-view.c:1006
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] "ཁྱོད་ཀྱིས་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 msgstr[1] "ཁྱོད་ཀྱིས་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d  ཚུ་རྟག་བརྟན་སྦེ་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
@@ -2467,7 +2790,9 @@ msgstr "%s%s, %s"
 #: ../src/file-manager/fm-directory-view.c:2362
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
-msgstr "སྣོད་འཛིན་\"%s\"  ནང་ལུ་ ནའུ་ཊི་ལཱསི་གིས་ ལེགས་སྐྱོང་འཐབ་ཚུགས་པའི་ ལྕོགས་ཚད་ལས་མང་བའི་ ཡིག་སྣོད་ཚུ་འདུག"
+msgstr ""
+"སྣོད་འཛིན་\"%s\"  ནང་ལུ་ ནའུ་ཊི་ལཱསི་གིས་ ལེགས་སྐྱོང་འཐབ་ཚུགས་པའི་ ལྕོགས་ཚད་ལས་མང་བའི་ ཡིག་སྣོད་ཚུ་"
+"འདུག"
 
 #: ../src/file-manager/fm-directory-view.c:2368
 msgid "Some files will not be displayed."
@@ -2492,7 +2817,8 @@ msgid "None of the %d selected items can be moved to the Trash"
 msgstr "སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་%d ཚུ་གཅིག་ཡང་ ཕྱགས་ཧོད་ནང་སྤོ་མི་ཚུགས"
 
 #: ../src/file-manager/fm-directory-view.c:3834
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "རྣམ་གྲངས་ལ་ལོ་ཅིག་ ཕྱགས་ཧོད་ནང་ སྤོ་མི་ཚུགས། དེ་ཚུ་དེ་འཕྲལ་ལས་ བཏོན་གཏང་ནི་ཨིན་ན?"
 
 #: ../src/file-manager/fm-directory-view.c:3835
@@ -2507,10 +2833,18 @@ msgstr "ཁྱོད་ཀྱིས་ \"%s\" དེ་ ཕྱགས་ཧོད
 
 #: ../src/file-manager/fm-directory-view.c:3877
 #, c-format
-msgid "Are you sure you want to permanently delete the %d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items from the trash?"
-msgstr[0] "ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་ ཕྱགས་ཧོད་ནང་ལས་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
-msgstr[1] "ཁྱོད་ཀྱིས་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d ཚུ་ ཕྱགས་ཧོད་ནང་ལས་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
+msgid ""
+"Are you sure you want to permanently delete the %d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items from the "
+"trash?"
+msgstr[0] ""
+"ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་ ཕྱགས་ཧོད་ནང་ལས་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་"
+"ན?"
+msgstr[1] ""
+"ཁྱོད་ཀྱིས་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d ཚུ་ ཕྱགས་ཧོད་ནང་ལས་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་"
+"ན?"
 
 #: ../src/file-manager/fm-directory-view.c:3888
 msgid "If you delete an item, it will be permanently lost."
@@ -2558,13 +2892,23 @@ msgstr "%s ཁ་ཕྱེ་མི་ཚུགས་པས།"
 #: ../src/file-manager/fm-directory-view.c:4982
 #, c-format
 msgid ""
-"The filename \"%s\" indicates that this file is of type \"%s\". The contents of the file indicate that the file is of type \"%s\". If you open this file, the file might present a security risk to your system.\n"
+"The filename \"%s\" indicates that this file is of type \"%s\". The contents "
+"of the file indicate that the file is of type \"%s\". If you open this file, "
+"the file might present a security risk to your system.\n"
 "\n"
-"Do not open the file unless you created the file yourself, or received the file from a trusted source. To open the file, rename the file to the correct extension for \"%s\", then open the file normally. Alternatively, use the Open With menu to choose a specific application for the file. "
+"Do not open the file unless you created the file yourself, or received the "
+"file from a trusted source. To open the file, rename the file to the correct "
+"extension for \"%s\", then open the file normally. Alternatively, use the "
+"Open With menu to choose a specific application for the file. "
 msgstr ""
-"ཡིག་སྣོད་མིང་ \"%s\"  དེ་གིས་ ཡིག་སྣོད་འདི་གི་དབྱེ་བ་ \"%s\" ཨིན་པའི་བརྡ་སྟོནམ་ཨིན་མས། ཡིག་སྣོད་ཀྱི་ནང་དོན་གྱིས་ ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ \"%s\" ཨིན་པའི་བརྡ་སྟོནམ་ཨིན་མས། ཁྱོད་ཀྱིས་ཡིག་སྣོད་དེ་ ཁ་ཕྱེ་བ་ཅིན་ ཁྱོད་རའི་རིམ་ལུགས་ལུ་ ཉེན་ཁ་བཀལ་སྲིད་འོང་།\n"
+"ཡིག་སྣོད་མིང་ \"%s\"  དེ་གིས་ ཡིག་སྣོད་འདི་གི་དབྱེ་བ་ \"%s\" ཨིན་པའི་བརྡ་སྟོནམ་ཨིན་མས། ཡིག་སྣོད་ཀྱི་"
+"ནང་དོན་གྱིས་ ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ \"%s\" ཨིན་པའི་བརྡ་སྟོནམ་ཨིན་མས། ཁྱོད་ཀྱིས་ཡིག་སྣོད་དེ་ ཁ་ཕྱེ་བ་ཅིན་ "
+"ཁྱོད་རའི་རིམ་ལུགས་ལུ་ ཉེན་ཁ་བཀལ་སྲིད་འོང་།\n"
 "\n"
-"ཁྱོད་ཀྱིས་ཡིག་སྣོད་གསར་བཟོ་མ་འབད་བའམ་ བློ་གཏད་ཅན་གྱི་འབྱུང་ཁུངས་ཅིག་ལས་ ཡིག་སྣོད་དེ་མ་ཐོབ་པར་ ཡིག་སྣོད་དེ་ཁ་མ་ཕྱེ། ཡིག་སྣོད་དེ་ཁ་ཕྱེ་ནི་ལུ་ \"%s\" གི་དོན་ལས་ རྒྱ་བསྐྱེད་ངོ་མ་ལུ་ ཡིག་སྣོད་ལུ་སླར་མིང་བཏགས་ཞིནམ་ལས་ ཨ་རྟག་བཟུམ་སྦེ་ཁ་ཕྱེ། དེ་མིན་རུང་ ཡིག་སྣོད་དེ་གི་དོན་ལུ་ དམིགས་བསལ་གློག་རིམ་ཅིག་ གདམ་ཁ་བརྐྱབ་ནིའི་དོན་ལུ་ ཨོ་པཱན་ཝིཐ་ཟེར་མི་དཀར་ཆག་དེ་ ལག་ལེན་འཐབ།"
+"ཁྱོད་ཀྱིས་ཡིག་སྣོད་གསར་བཟོ་མ་འབད་བའམ་ བློ་གཏད་ཅན་གྱི་འབྱུང་ཁུངས་ཅིག་ལས་ ཡིག་སྣོད་དེ་མ་ཐོབ་པར་ ཡིག་"
+"སྣོད་དེ་ཁ་མ་ཕྱེ། ཡིག་སྣོད་དེ་ཁ་ཕྱེ་ནི་ལུ་ \"%s\" གི་དོན་ལས་ རྒྱ་བསྐྱེད་ངོ་མ་ལུ་ ཡིག་སྣོད་ལུ་སླར་མིང་བཏགས་"
+"ཞིནམ་ལས་ ཨ་རྟག་བཟུམ་སྦེ་ཁ་ཕྱེ། དེ་མིན་རུང་ ཡིག་སྣོད་དེ་གི་དོན་ལུ་ དམིགས་བསལ་གློག་རིམ་ཅིག་ གདམ་ཁ་"
+"བརྐྱབ་ནིའི་དོན་ལུ་ ཨོ་པཱན་ཝིཐ་ཟེར་མི་དཀར་ཆག་དེ་ ལག་ལེན་འཐབ།"
 
 #: ../src/file-manager/fm-directory-view.c:5408
 #, c-format
@@ -2578,21 +2922,31 @@ msgstr "ཊེམ་པེལེཊི་ \"%s\" ནང་ལས་ ཡིག་
 
 #: ../src/file-manager/fm-directory-view.c:5863
 msgid "All executable files in this folder will appear in the Scripts menu."
-msgstr "སྣོད་འཛིན་འདི་ནང་ཡོད་མི་ ལག་ལེན་འཐབ་བཏུབ་པའི་ ཡིག་སྣོད་ཆ་མཉམ་ ཡིག་ཚུགས་དཀར་ཆག་ནང་འཐོན་འོང་།"
+msgstr ""
+"སྣོད་འཛིན་འདི་ནང་ཡོད་མི་ ལག་ལེན་འཐབ་བཏུབ་པའི་ ཡིག་སྣོད་ཆ་མཉམ་ ཡིག་ཚུགས་དཀར་ཆག་ནང་འཐོན་འོང་།"
 
 #: ../src/file-manager/fm-directory-view.c:5865
-msgid "Choosing a script from the menu will run that script with any selected items as input."
-msgstr "དཀར་ཆག་དེ་ནང་ལས་ ཡིག་ཚུགས་ཅིག་གདམ་ཁ་རྐྱབ་པ་ཅིན་ ཡིག་ཚུགས་དེ་ སེལ་འཐུ་འབད་མི་ རྣམ་གྲངས་གང་རུང་དང་ཅིག་ཁར་ ཨིན་པུཊི་སྦེ་ གཡོག་བཀོལ་བཏུབ།"
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+"དཀར་ཆག་དེ་ནང་ལས་ ཡིག་ཚུགས་ཅིག་གདམ་ཁ་རྐྱབ་པ་ཅིན་ ཡིག་ཚུགས་དེ་ སེལ་འཐུ་འབད་མི་ རྣམ་གྲངས་གང་རུང་"
+"དང་ཅིག་ཁར་ ཨིན་པུཊི་སྦེ་ གཡོག་བཀོལ་བཏུབ།"
 
 #: ../src/file-manager/fm-directory-view.c:5867
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
-"When executed from a local folder, scripts will be passed the selected file names. When executed from a remote folder (e.g. a folder showing web or ftp content), scripts will be passed no parameters.\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
 "\n"
-"In all cases, the following environment variables will be set by Nautilus, which the scripts may use:\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected files (only if local)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
 "\n"
@@ -2600,15 +2954,21 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"སྣོད་འཛིན་འདི་ནང་ཡོད་མི་ ལག་ལེན་འཐབ་བཏུབ་པའི་ ཡིག་སྣོད་ཆ་མཉམ་ ཡིག་ཚུགས་དཀར་ཆག་ནང་འཐོན་འོང་། དཀར་ཆག་ནང་ལས་ ཡིག་ཚུགས་ཅིག་གདམ་ཁ་རྐྱབ་ད་ ཡིག་ཚུགས་དེ་ གཡོག་བཀོལ་འོང་། \n"
+"སྣོད་འཛིན་འདི་ནང་ཡོད་མི་ ལག་ལེན་འཐབ་བཏུབ་པའི་ ཡིག་སྣོད་ཆ་མཉམ་ ཡིག་ཚུགས་དཀར་ཆག་ནང་འཐོན་འོང་། "
+"དཀར་ཆག་ནང་ལས་ ཡིག་ཚུགས་ཅིག་གདམ་ཁ་རྐྱབ་ད་ ཡིག་ཚུགས་དེ་ གཡོག་བཀོལ་འོང་། \n"
 "\n"
-"ཉེ་གནས་ཀྱི་སྣོད་འཛིན་ཅིག་ནང་ལས་ ལག་ལེན་འཐབ་པའི་སྐབས་ ཡིག་ཚུགས་ཚུ་ སེལ་འཐུ་འབད་མི་ ཡིག་སྣོད་མིང་ནང་གཏང་འོང་། ཐག་རིང་སྣོད་འཛིན་(དཔེར་ན་ ཝེབ་བམ་ཨེཕ་ཊི་པི་ནང་དོན་སྟོན་མི་སྣོད་འཛིན)ཅིག་ནང་ལས་ ལག་ལེན་འཐབ་པའི་སྐབས་ ཡིག་ཚུགས་ཚུ་ ཚད་བཟུང་བརྒྱུད་དེ་མི་འགྱོ། \n"
+"ཉེ་གནས་ཀྱི་སྣོད་འཛིན་ཅིག་ནང་ལས་ ལག་ལེན་འཐབ་པའི་སྐབས་ ཡིག་ཚུགས་ཚུ་ སེལ་འཐུ་འབད་མི་ ཡིག་སྣོད་མིང་"
+"ནང་གཏང་འོང་། ཐག་རིང་སྣོད་འཛིན་(དཔེར་ན་ ཝེབ་བམ་ཨེཕ་ཊི་པི་ནང་དོན་སྟོན་མི་སྣོད་འཛིན)ཅིག་ནང་ལས་ ལག་"
+"ལེན་འཐབ་པའི་སྐབས་ ཡིག་ཚུགས་ཚུ་ ཚད་བཟུང་བརྒྱུད་དེ་མི་འགྱོ། \n"
 "\n"
-"འབྲེལ་གནད་ཆ་མཉམ་ནང་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་ཚུགས་ཚུ་གིས་ལག་ལེན་འཐབ་ནིའི་ གཤམ་གསལ་གནས་སྟངས་ཀྱི་ ཁྱད་འགྱུར་ཚུ་ གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
+"འབྲེལ་གནད་ཆ་མཉམ་ནང་ ནའུ་ཊི་ལཱསི་གིས་ ཡིག་ཚུགས་ཚུ་གིས་ལག་ལེན་འཐབ་ནིའི་ གཤམ་གསལ་གནས་སྟངས་ཀྱི་ "
+"ཁྱད་འགྱུར་ཚུ་ གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ གྱལ་རིམ་གསརཔ་-དབྱེ་རྟགས་ཅན་གྱི་འགྲུལ་ལམ། (ཉེ་གནས་ཨིན་པ་ཅིན་རྐྱངམ་གཅིག) \n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ གྱལ་རིམ་གསརཔ་-"
+"དབྱེ་རྟགས་ཅན་གྱི་འགྲུལ་ལམ། (ཉེ་གནས་ཨིན་པ་ཅིན་རྐྱངམ་གཅིག) \n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ གྱལ་རིམ་གསརཔ་-དབྱེ་རྟགས་ཅན་གྱི་ཡུ་ཨར་ཨའི་ཨེསི།\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ གྱལ་རིམ་གསརཔ་-དབྱེ་"
+"རྟགས་ཅན་གྱི་ཡུ་ཨར་ཨའི་ཨེསི།\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: ད་ལྟོའི་གནས་ཁོངས་ཀྱི་དོན་ལུ་ ཡུ་ཨར་ཨའི།\n"
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: ད་ལྟོའི་སྒོ་སྒྲིག་གི་གནས་ས་དང་ཚད།"
@@ -2628,16 +2988,23 @@ msgstr "ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བརྡ་
 #: ../src/file-manager/fm-directory-view.c:6042
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
-msgstr[0] "ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བརྡ་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་སྤོ་བཤུད་འབད་འོང་།"
-msgstr[1] "ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བརྡ་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་སྤོ་བཤུད་འབད་འོང་།"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བརྡ་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་སྤོ་བཤུད་འབད་འོང་།"
+msgstr[1] ""
+"ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བརྡ་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་སྤོ་བཤུད་འབད་འོང་།"
 
 #: ../src/file-manager/fm-directory-view.c:6049
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
-msgstr[0] "ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་ འདྲ་བཤུས་བརྐྱབ་འོང་།"
-msgstr[1] "ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བརྡ་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d ཚུ་འདྲ་བཤུས་བརྐྱབ་འོང་།"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d དེ་ འདྲ་བཤུས་བརྐྱབ་འོང་།"
+msgstr[1] ""
+"ཁྱོད་ཀྱིས་སྦྱར་ནིའི་བརྡ་བཀོད་དེ་ སེལ་འཐུ་འབད་བ་ཅིན་ སེལ་འཐུ་འབད་མི་རྣམ་གྲངས་ %d ཚུ་འདྲ་བཤུས་བརྐྱབ་འོང་"
+"།"
 
 #: ../src/file-manager/fm-directory-view.c:6143
 #: ../src/file-manager/fm-tree-view.c:1044
@@ -2713,6 +3080,7 @@ msgstr "ཡིག་སྣོད་སྟོངམ།(_E)"
 msgid "Create a new empty file inside this folder"
 msgstr "སྣོད་འཛིན་འདི་གི་ནང་ན་ ཡིག་སྣོད་གསརཔ་སྟོངམ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
+#. #-#-#-#-#  dz.po (nautilus.HEAD.dz)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6847
 #: ../src/file-manager/fm-directory-view.c:7726
@@ -2777,7 +3145,9 @@ msgstr "སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6884
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "ཧེ་མ་ བཏོག་ནིའམ་ འདྲ་བཤུས་བརྐྱབ་ནིའི་བརྡ་བཀོད་ཅིག་གིས་ སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་ སྤོ་བཤུད་འབད་ ཡང་ན་ འདྲ་བཤུས་རྐྱབས།"
+msgstr ""
+"ཧེ་མ་ བཏོག་ནིའམ་ འདྲ་བཤུས་བརྐྱབ་ནིའི་བརྡ་བཀོད་ཅིག་གིས་ སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་ སྤོ་བཤུད་འབད་ ཡང་"
+"ན་ འདྲ་བཤུས་རྐྱབས།"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -2789,8 +3159,12 @@ msgstr "སྣོད་འཛིན་ནང་སྦྱར།(_P)"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6890
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "ཧེ་མ་ བཏོག་ནིའམ་ འདྲ་བཤུས་བརྐྱབ་ནིའི་བརྡ་བཀོད་ཅིག་གིས་ སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་ སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་ནང་ སྤོ་བཤུད་འབད་ ཡང་ན་ འདྲ་བཤུས་རྐྱབས།"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"ཧེ་མ་ བཏོག་ནིའམ་ འདྲ་བཤུས་བརྐྱབ་ནིའི་བརྡ་བཀོད་ཅིག་གིས་ སེལ་འཐུ་འབད་མི་ཡིག་སྣོད་ཚུ་ སེལ་འཐུ་འབད་མི་"
+"སྣོད་འཛིན་དེ་ནང་ སྤོ་བཤུད་འབད་ ཡང་ན་ འདྲ་བཤུས་རྐྱབས།"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6894
@@ -2877,7 +3251,8 @@ msgstr "མཐོང་སྣང་སྔོན་སྒྲིག་ལུ་ �
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6926
 msgid "Reset sorting order and zoom level to match preferences for this view"
-msgstr "དབྱེ་སེལ་གོ་རིམ་དང་ རྒྱས་ཟུམ་གནས་རིམ་ཚུ་ མཐོང་སྣང་འདི་གི་ དགའ་གདམ་དང་མཐུན་ནི་ལུ་ སླར་སྒྲིག་འབད།"
+msgstr ""
+"དབྱེ་སེལ་གོ་རིམ་དང་ རྒྱས་ཟུམ་གནས་རིམ་ཚུ་ མཐོང་སྣང་འདི་གི་ དགའ་གདམ་དང་མཐུན་ནི་ལུ་ སླར་སྒྲིག་འབད།"
 
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6929
@@ -3089,7 +3464,8 @@ msgstr "འབྲེལ་ལམ་འདི་ ལག་ལེན་འཐབ�
 #: ../src/file-manager/fm-directory-view.c:8157
 #, c-format
 msgid "This link can't be used, because its target \"%s\" doesn't exist."
-msgstr "འབྲེལ་ལམ་འདི་ ལག་ལེན་འཐབ་མི་བཏུབ། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་གི་དམིགས་གཏད་ \"%s\" དེ་མིན་འདུག "
+msgstr ""
+"འབྲེལ་ལམ་འདི་ ལག་ལེན་འཐབ་མི་བཏུབ། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་གི་དམིགས་གཏད་ \"%s\" དེ་མིན་འདུག "
 
 #: ../src/file-manager/fm-directory-view.c:8808
 #, c-format
@@ -3162,7 +3538,8 @@ msgstr "གསར་བཙུགས་འབད་མི།"
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "ཁྱོད་ལུ་ \"%s\" གི་ནང་དོན་ བལྟ་ནི་ལུ་མཁོ་བའི་ གནང་བ་མིན་འདུག"
 
 #: ../src/file-manager/fm-error-reporting.c:64
@@ -3181,12 +3558,16 @@ msgstr "སྣོད་འཛིན་གྱི་ནང་དོན་ཚུ་
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "མིང་ \"%s\" དེ་ སྣོད་འཛིན་འདི་ནང་ ཧེ་མ་ལས་རང་ ལག་ལེན་འཐབ་སྟེ་འདུག མིང་གཞན་ཅིག་ལག་ལེན་འཐབ་གནང་།"
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"མིང་ \"%s\" དེ་ སྣོད་འཛིན་འདི་ནང་ ཧེ་མ་ལས་རང་ ལག་ལེན་འཐབ་སྟེ་འདུག མིང་གཞན་ཅིག་ལག་ལེན་འཐབ་"
+"གནང་།"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "སྣོད་འཛིན་འདི་ནང་ \"%s\" མིན་འདུག དེ་སྤོ་་ཡོད་པའམ་ བཏོན་བཏང་གདའཔ་ཨིན་ན?"
 
 #: ../src/file-manager/fm-error-reporting.c:118
@@ -3196,8 +3577,12 @@ msgstr "ཁྱོད་ལུ་ \"%s\" ལུ་ བསྐྱར་མིང་
 
 #: ../src/file-manager/fm-error-reporting.c:123
 #, c-format
-msgid "The name \"%s\" is not valid because it contains the character \"/\". Please use a different name."
-msgstr "མིང་ \"%s\" དེ་ ནུས་མེད་ཨིན་པས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ནང་ཡིག་འབྲུ་ \"/\" འདུག མིང་གཞན་ཅིག་ ལག་ལེན་འཐབ་གནང་།"
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+"མིང་ \"%s\" དེ་ ནུས་མེད་ཨིན་པས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ནང་ཡིག་འབྲུ་ \"/\" འདུག མིང་གཞན་ཅིག་ "
+"ལག་ལེན་འཐབ་གནང་།"
 
 #: ../src/file-manager/fm-error-reporting.c:127
 #, c-format
@@ -3220,13 +3605,15 @@ msgstr "རྣམ་གྲངས་འདི་ལུ་ བསྐྱར་མ�
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "ཁྱོད་ལུ་ \"%s\" གི་སྡེ་ཚན་ བསྒྱུར་བཅོས་འབད་ནི་ལུ་མཁོ་བའི་ གནང་བ་མིན་འདུག"
 
 #: ../src/file-manager/fm-error-reporting.c:173
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
-msgstr "\"%s\"  གི་སྡེ་ཚན་བསྒྱུར་བཅོས་འབད་མ་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ལྷག་ནི་ཙམ་གྱི་ ཌིཀསི་ཅིག་གུ་ཨིན་པས།"
+msgstr ""
+"\"%s\"  གི་སྡེ་ཚན་བསྒྱུར་བཅོས་འབད་མ་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ལྷག་ནི་ཙམ་གྱི་ ཌིཀསི་ཅིག་གུ་ཨིན་པས།"
 
 #: ../src/file-manager/fm-error-reporting.c:181
 #, c-format
@@ -3240,7 +3627,9 @@ msgstr "སྡེ་ཚན་དེ་བསྒྱུར་བཅོས་འབ
 #: ../src/file-manager/fm-error-reporting.c:207
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
-msgstr "\"%s\"  གི་ཇོ་བདག་ བསྒྱུར་བཅོས་འབད་མ་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ལྷག་ནི་ཙམ་གྱི་ ཌིཀསི་ཅིག་གུ་ཨིན་པས།"
+msgstr ""
+"\"%s\"  གི་ཇོ་བདག་ བསྒྱུར་བཅོས་འབད་མ་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ལྷག་ནི་ཙམ་གྱི་ ཌིཀསི་ཅིག་གུ་ཨིན་"
+"པས།"
 
 #: ../src/file-manager/fm-error-reporting.c:214
 #, c-format
@@ -3253,8 +3642,11 @@ msgstr "ཇོ་བདག་དེ་ བསྒྱུར་བཅོས་འ�
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
-msgstr "\"%s\"  གི་གནང་བ་ཚུ་ བསྒྱུར་བཅོས་འབད་མ་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ལྷག་ནི་ཙམ་གྱི་ ཌིཀསི་ཅིག་གུ་ཨིན་པས།"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr ""
+"\"%s\"  གི་གནང་བ་ཚུ་ བསྒྱུར་བཅོས་འབད་མ་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་ལྷག་ནི་ཙམ་གྱི་ ཌིཀསི་ཅིག་གུ་"
+"ཨིན་པས།"
 
 #: ../src/file-manager/fm-error-reporting.c:246
 #, c-format
@@ -3349,7 +3741,9 @@ msgstr "མིང་གི་ཐོག་ལས་ གཙང་དག་བཟ�
 #. label, accelerator
 #: ../src/file-manager/fm-icon-view.c:1450
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "ངོས་དཔར་ཚུ་ སྒོ་སྒྲིག་ནང་ ལེགས་ཤོམ་སྦེ་ཚུད་ནིའི་དོན་ལུ་ གནས་ས་སླར་སྒྲིག་འབད་དེ་ གཅིག་གིས་གཅིག་ལུ་མཐའ་མནན་མ་བཅུག"
+msgstr ""
+"ངོས་དཔར་ཚུ་ སྒོ་སྒྲིག་ནང་ ལེགས་ཤོམ་སྦེ་ཚུད་ནིའི་དོན་ལུ་ གནས་ས་སླར་སྒྲིག་འབད་དེ་ གཅིག་གིས་གཅིག་ལུ་མཐའ་"
+"མནན་མ་བཅུག"
 
 #. name, stock id
 #: ../src/file-manager/fm-icon-view.c:1456
@@ -3809,8 +4203,13 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "ལེས་འཐུ་འབད་མི་ཡིག་སྣོད་ཀྱི་ གནང་བ་ཚུ་ ངོས་འཛིན་འབད་མ་ཚུགས།"
 
 #: ../src/file-manager/fm-properties-window.c:4443
+#, fuzzy
 msgid "Open With"
-msgstr "ཐོག་ལས་ཁ་ཕྱེ།"
+msgstr ""
+"#-#-#-#-#  dz.po (nautilus.HEAD.dz)  #-#-#-#-#\n"
+"ཐོག་ལས་ཁ་ཕྱེ།\n"
+"#-#-#-#-#  dz.po (eel.HEAD.dz)  #-#-#-#-#\n"
+"འདི་གི་ཐོག་ལས་ཁ་ཕྱེ།"
 
 #: ../src/file-manager/fm-properties-window.c:4783
 msgid "Creating Properties window."
@@ -3856,8 +4255,12 @@ msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "ནའུ་ཊི་ལཱསི་གིས་ ཉེར་མཁོ་བའི་སྣོད་འཛིན་ \"%s\" གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
 #: ../src/nautilus-application.c:278
-msgid "Before running Nautilus, please create the following folder, or set permissions such that Nautilus can create it."
-msgstr "ནའུ་ཊི་ལཱསི་ གཡོག་མ་བཀོལ་གོང་ལས་ འོག་གི་སྣོད་འཛིན་དེ་ གསར་བསྐྲུན་འབད་གནང་། ཡང་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ དེ་གསར་བསྐྲུན་འབད་ཚུགས་པའི་ གནང་བ་ཚུ་ གཞི་སྒྲིག་འབད།"
+msgid ""
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
+msgstr ""
+"ནའུ་ཊི་ལཱསི་ གཡོག་མ་བཀོལ་གོང་ལས་ འོག་གི་སྣོད་འཛིན་དེ་ གསར་བསྐྲུན་འབད་གནང་། ཡང་ཅིན་ ནའུ་ཊི་ལཱསི་"
+"གིས་ དེ་གསར་བསྐྲུན་འབད་ཚུགས་པའི་ གནང་བ་ཚུ་ གཞི་སྒྲིག་འབད།"
 
 #: ../src/nautilus-application.c:281
 #, c-format
@@ -3865,8 +4268,12 @@ msgid "Nautilus could not create the following required folders: %s."
 msgstr "ནའུ་ཊི་ལཱསི་གིས་ ཉེར་མཁོ་ཡོད་པའི་ འོག་གི་སྣོད་འཛིན་  %s ཚུ་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
 #: ../src/nautilus-application.c:283
-msgid "Before running Nautilus, please create these folders, or set permissions such that Nautilus can create them."
-msgstr "ནའུ་ཊི་ལཱསི་ གཡོག་མ་བཀོལ་གོང་ལས་ འོག་གི་སྣོད་འཛིན་ཚུ་ གསར་བསྐྲུན་འབད་གནང་། ཡང་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ དེ་ཚུ་གསར་བསྐྲུན་འབད་ཚུགས་པའི་ གནང་བ་ཚུ་ གཞི་སྒྲིག་འབད།"
+msgid ""
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+"ནའུ་ཊི་ལཱསི་ གཡོག་མ་བཀོལ་གོང་ལས་ འོག་གི་སྣོད་འཛིན་ཚུ་ གསར་བསྐྲུན་འབད་གནང་། ཡང་ཅིན་ ནའུ་ཊི་ལཱསི་"
+"གིས་ དེ་ཚུ་གསར་བསྐྲུན་འབད་ཚུགས་པའི་ གནང་བ་ཚུ་ གཞི་སྒྲིག་འབད།"
 
 #: ../src/nautilus-application.c:342
 msgid "Link To Old Desktop"
@@ -3877,8 +4284,12 @@ msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
 msgstr "ཌེཀསི་ཊོཔ་གུ་ \"Link To Old Desktop\" ཟེར་མི་འབྲེལ་ལམ་ཅིག་ གསར་བསྐྲུན་འབད་དེ་ཡོད།"
 
 #: ../src/nautilus-application.c:359
-msgid "The location of the desktop directory has changed in GNOME 2.4. You can open the link and move over the files you want, then delete the link."
-msgstr "ཇི་ནོམ་༢.༤ ནང་ལུ་ ཌེཀསི་ཊོཔ་གི་ སྣོད་ཐོ་ཀྱི་གནས་ཁོངས་དེ་ བསྒྱུར་བཅོས་ཡར་སོ་ནུག ཁྱོད་ཀྱིས་འབྲེལ་ལམ་ཁ་ཕྱེ་ཞིནམ་ལས་ ཁྱོད་རང་དགོ་པའི་ ཡིག་སྣོད་ཚུ་གི་གུ་ལས་ཕར་ སྤོ་བཤུད་འབད་དེ་ འབྲེལ་ལམ་དེ་བཏོན་གཏང་།"
+msgid ""
+"The location of the desktop directory has changed in GNOME 2.4. You can open "
+"the link and move over the files you want, then delete the link."
+msgstr ""
+"ཇི་ནོམ་༢.༤ ནང་ལུ་ ཌེཀསི་ཊོཔ་གི་ སྣོད་ཐོ་ཀྱི་གནས་ཁོངས་དེ་ བསྒྱུར་བཅོས་ཡར་སོ་ནུག ཁྱོད་ཀྱིས་འབྲེལ་ལམ་ཁ་ཕྱེ་"
+"ཞིནམ་ལས་ ཁྱོད་རང་དགོ་པའི་ ཡིག་སྣོད་ཚུ་གི་གུ་ལས་ཕར་ སྤོ་བཤུད་འབད་དེ་ འབྲེལ་ལམ་དེ་བཏོན་གཏང་།"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -3891,22 +4302,39 @@ msgstr "ཇི་ནོམ་༢.༤ ནང་ལུ་ ཌེཀསི་ཊོ
 #. * since neither of the above causes explain it.
 #.
 #: ../src/nautilus-application.c:555
-msgid "Nautilus can't be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again."
-msgstr "ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། མ་སྒྲོམ་ནང་ལས་ བརྡ་བཀོད་ \"bonobo-slay\"  གཡོག་བཀོལ་བ་ཅིན་ དཀའ་ངལ་སེལ་ཚུགསཔ་འོང་། དེ་མིན་པ་ཅིན་ གློག་རིག་རི་བུ་ཊིང་འབད་ ཡངན་ ནའུ་ཊི་ལཱསི་ ལོག་སྟེ་གསར་བཙུགས་འབད་དེ་བལྟ།"
+msgid ""
+"Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again."
+msgstr ""
+"ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། མ་སྒྲོམ་ནང་ལས་ བརྡ་བཀོད་ \"bonobo-slay\"  གཡོག་"
+"བཀོལ་བ་ཅིན་ དཀའ་ངལ་སེལ་ཚུགསཔ་འོང་། དེ་མིན་པ་ཅིན་ གློག་རིག་རི་བུ་ཊིང་འབད་ ཡངན་ ནའུ་ཊི་ལཱསི་ ལོག་"
+"སྟེ་གསར་བཙུགས་འབད་དེ་བལྟ།"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:561
 msgid ""
-"Nautilus can't be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again.\n"
+"Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again.\n"
 "\n"
-"Bonobo couldn't locate the Nautilus_shell.server file. One cause of this seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation library's directory. Another possible cause would be bad install with a missing Nautilus_Shell.server file.\n"
+"Bonobo couldn't locate the Nautilus_shell.server file. One cause of this "
+"seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation "
+"library's directory. Another possible cause would be bad install with a "
+"missing Nautilus_Shell.server file.\n"
 "\n"
-"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, which may be needed by other applications.\n"
+"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
-"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but we don't know why.\n"
+"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but "
+"we don't know why.\n"
 "\n"
-"We have also seen this error when a faulty version of bonobo-activation was installed."
-msgstr "ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། མ་སྒྲོམ་ནང་ལས་ བརྡ་བཀོད་ \"bonobo-slay\"  གཡོག་བཀོལ་བ་ཅིན་ དཀའ་ངལ་སེལ་ཚུགསཔ་འོང་། དེ་མིན་པ་ཅིན་ གློག་རིག་རི་བུ་ཊིང་འབད་ ཡངན་ ནའུ་ཊི་ལཱསི་ ལོག་གསར་བཙུགས་འབད་དེ་བལྟ།"
+"We have also seen this error when a faulty version of bonobo-activation was "
+"installed."
+msgstr ""
+"ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། མ་སྒྲོམ་ནང་ལས་ བརྡ་བཀོད་ \"bonobo-slay\"  གཡོག་"
+"བཀོལ་བ་ཅིན་ དཀའ་ངལ་སེལ་ཚུགསཔ་འོང་། དེ་མིན་པ་ཅིན་ གློག་རིག་རི་བུ་ཊིང་འབད་ ཡངན་ ནའུ་ཊི་ལཱསི་ ལོག་"
+"གསར་བཙུགས་འབད་དེ་བལྟ།"
 
 #. Some misc. error (can never happen with current
 #. * version of bonobo-activation). Show dialog and terminate the
@@ -3917,28 +4345,42 @@ msgstr "ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེ�
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:591
-#: ../src/nautilus-application.c:609
+#: ../src/nautilus-application.c:591 ../src/nautilus-application.c:609
 #: ../src/nautilus-application.c:616
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "རེ་བ་མེད་པའི་ འཛོལ་བ་ཅིག་ལུ་བརྟེན་ཏེ་ ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས།"
 
 #: ../src/nautilus-application.c:592
-msgid "Nautilus can't be used now, due to an unexpected error from Bonobo when attempting to register the file manager view server."
-msgstr "ཡིག་སྣོད་འཛིན་སྐྱོང་པའི་མཐོང་སྣང་སར་བར་ ཐོ་བཀོད་འབད་ནིའི་རྩིས་རྐྱབ་ད་ བོ་ནོ་བོ་ནང་ལས་ རེ་བ་མེད་པའི་འཛོལ་བ་ཅིག་བྱུངམ་ལས་བརྟེན་ ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས།"
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from Bonobo when "
+"attempting to register the file manager view server."
+msgstr ""
+"ཡིག་སྣོད་འཛིན་སྐྱོང་པའི་མཐོང་སྣང་སར་བར་ ཐོ་བཀོད་འབད་ནིའི་རྩིས་རྐྱབ་ད་ བོ་ནོ་བོ་ནང་ལས་ རེ་བ་མེད་པའི་"
+"འཛོལ་བ་ཅིག་བྱུངམ་ལས་བརྟེན་ ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས།"
 
 #: ../src/nautilus-application.c:610
-msgid "Nautilus can't be used now, due to an unexpected error from Bonobo when attempting to locate the factory.Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "འཕྲུལ་ཁང་འཚོལ་ནིའི་རྩིས་རྐྱབ་ད་ བོ་ནོ་བོ་ནང་ལས་ རེ་བ་མེད་པའི་འཛོལ་བ་ཅིག་བྱུངམ་ལས་བརྟེན་ ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། བོ་ནོ་བོ་-ཤུགས་ལྡན་བཟོ་ནིའི་-སར་བར་ བསད་བཏང་ཞིནམ་ལས་ ནའུ་ཊི་ལཱསི་ ལོག་འགོ་བཙུགས་པ་ཅིན་ དཀའ་ངལ་དེ་ སེལ་ཚུགསཔ་འོང་།"
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the factory.Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"འཕྲུལ་ཁང་འཚོལ་ནིའི་རྩིས་རྐྱབ་ད་ བོ་ནོ་བོ་ནང་ལས་ རེ་བ་མེད་པའི་འཛོལ་བ་ཅིག་བྱུངམ་ལས་བརྟེན་ ད་ལྟོ་ནའུ་ཊི་"
+"ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། བོ་ནོ་བོ་-ཤུགས་ལྡན་བཟོ་ནིའི་-སར་བར་ བསད་བཏང་ཞིནམ་ལས་ ནའུ་ཊི་ལཱསི་ "
+"ལོག་འགོ་བཙུགས་པ་ཅིན་ དཀའ་ངལ་དེ་ སེལ་ཚུགསཔ་འོང་།"
 
 #: ../src/nautilus-application.c:617
-msgid "Nautilus can't be used now, due to an unexpected error from Bonobo when attempting to locate the shell object. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "ཤལ་གྱི་དངོས་པོ་འཚོལ་ནིའི་རྩིས་རྐྱབ་ད་ བོ་ནོ་བོ་ནང་ལས་ རེ་བ་མེད་པའི་འཛོལ་བ་ཅིག་བྱུངམ་ལས་བརྟེན་ ད་ལྟོ་ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། བོ་ནོ་བོ་-ཤུགས་ལྡན་བཟོ་ནིའི་-སར་བར་ བསད་བཏང་ཞིནམ་ལས་ ནའུ་ཊི་ལཱསི་ ལོག་འགོ་བཙུགས་པ་ཅིན་ དཀའ་ངལ་དེ་ སེལ་ཚུགསཔ་འོང་།"
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the shell object. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"ཤལ་གྱི་དངོས་པོ་འཚོལ་ནིའི་རྩིས་རྐྱབ་ད་ བོ་ནོ་བོ་ནང་ལས་ རེ་བ་མེད་པའི་འཛོལ་བ་ཅིག་བྱུངམ་ལས་བརྟེན་ ད་ལྟོ་"
+"ནའུ་ཊི་ལཱསི་ ལག་ལེན་འཐབ་མི་བཏུབ་པས། བོ་ནོ་བོ་-ཤུགས་ལྡན་བཟོ་ནིའི་-སར་བར་ བསད་བཏང་ཞིནམ་ལས་ ནའུ་"
+"ཊི་ལཱསི་ ལོག་འགོ་བཙུགས་པ་ཅིན་ དཀའ་ངལ་དེ་ སེལ་ཚུགསཔ་འོང་།"
 
 #: ../src/nautilus-bookmarks-window.c:158
 #: ../src/nautilus-file-management-properties.c:216
-#: ../src/nautilus-property-browser.c:1562
-#: ../src/nautilus-window-menus.c:500
+#: ../src/nautilus-property-browser.c:1562 ../src/nautilus-window-menus.c:500
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4080,9 +4522,10 @@ msgstr "མཐུད།(_o)"
 msgid "Couldn't remove emblem with name '%s'."
 msgstr "མིང་ '%s' གི་ཐོག་ལས་ ལས་རྟགས་རྩ་བསྐྲད་བཏང་མ་ཚུགས།"
 
-#: ../src/nautilus-emblem-sidebar.c:242
-#: ../src/nautilus-emblem-sidebar.c:276
-msgid "This is probably because the emblem is a permanent one, and not one that you added yourself."
+#: ../src/nautilus-emblem-sidebar.c:242 ../src/nautilus-emblem-sidebar.c:276
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr "ལས་རྟགས་དེ་ ཁྱོད་ཀྱིས་ཁ་སྐོང་བརྐྱསབ་བརྐྱབ་ཧམིན་པར་ རྟག་བརྟན་ཅིག་ཨིནམ་འོང་ནི་མས།"
 
 #: ../src/nautilus-emblem-sidebar.c:275
@@ -4107,19 +4550,26 @@ msgid "Add Emblems..."
 msgstr "ལས་རྟགས་ཁ་སྐོང་རྐྱབས་..."
 
 #: ../src/nautilus-emblem-sidebar.c:556
-msgid "Enter a descriptive name next to each emblem.  This name will be used in other places to identify the emblem."
-msgstr "ལས་རྟགས་རེ་རེའི་ཤུལ་ལུ་ འགྲེལ་བཤད་ཀྱི་མིང་རེ་བཙུགས། མིང་དེ་ལས་རྟགས་དེ་ངོས་འཛིན་འབད་ནི་ལུ་ ས་གནས་གཞན་ནང་ཡང་ ལག་ལེན་འཐབ་ནི་ཨིན།"
+msgid ""
+"Enter a descriptive name next to each emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"ལས་རྟགས་རེ་རེའི་ཤུལ་ལུ་ འགྲེལ་བཤད་ཀྱི་མིང་རེ་བཙུགས། མིང་དེ་ལས་རྟགས་དེ་ངོས་འཛིན་འབད་ནི་ལུ་ ས་གནས་"
+"གཞན་ནང་ཡང་ ལག་ལེན་འཐབ་ནི་ཨིན།"
 
 #: ../src/nautilus-emblem-sidebar.c:558
-msgid "Enter a descriptive name next to the emblem.  This name will be used in other places to identify the emblem."
-msgstr "ལས་རྟགས་ཀྱི་ཤུལ་ལུ་ འགྲེལ་བཤད་ཀྱི་མིང་ཅིག་བཙུགས། མིང་དེ་ལས་རྟགས་དེ་ངོས་འཛིན་འབད་ནི་ལུ་ ས་གནས་གཞན་ནང་ཡང་ ལག་ལེན་འཐབ་ནི་ཨིན།"
+msgid ""
+"Enter a descriptive name next to the emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"ལས་རྟགས་ཀྱི་ཤུལ་ལུ་ འགྲེལ་བཤད་ཀྱི་མིང་ཅིག་བཙུགས། མིང་དེ་ལས་རྟགས་དེ་ངོས་འཛིན་འབད་ནི་ལུ་ ས་གནས་གཞན་"
+"ནང་ཡང་ ལག་ལེན་འཐབ་ནི་ཨིན།"
 
 #: ../src/nautilus-emblem-sidebar.c:777
 msgid "Some of the files could not be added as emblems."
 msgstr "ཡིག་སྣོད་ལ་ལོ་ཅིག་ ལས་རྟགས་སྦེ་ ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
 
-#: ../src/nautilus-emblem-sidebar.c:777
-#: ../src/nautilus-emblem-sidebar.c:779
+#: ../src/nautilus-emblem-sidebar.c:777 ../src/nautilus-emblem-sidebar.c:779
 msgid "The emblems do not appear to be valid images."
 msgstr "ལས་རྟགས་ཚུ་ ནུས་ལྡན་གྱི་གཟུགས་བརྙན་མིནམ་བཟུམ་ཅིག་འདུག"
 
@@ -4127,8 +4577,7 @@ msgstr "ལས་རྟགས་ཚུ་ ནུས་ལྡན་གྱི་�
 msgid "None of the files could be added as emblems."
 msgstr "ཡིག་སྣོད་གཅིག་ཡང་ ལས་རྟགས་སྦེ་ ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
 
-#: ../src/nautilus-emblem-sidebar.c:800
-#: ../src/nautilus-emblem-sidebar.c:825
+#: ../src/nautilus-emblem-sidebar.c:800 ../src/nautilus-emblem-sidebar.c:825
 #: ../src/nautilus-emblem-sidebar.c:874
 msgid "The emblem cannot be added."
 msgstr "ལས་རྟགས་དེ་ ཁ་སྐོང་རྐྱབ་མི་བཏུབ།"
@@ -4137,8 +4586,7 @@ msgstr "ལས་རྟགས་དེ་ ཁ་སྐོང་རྐྱབ་�
 msgid "The dragged text was not a valid file location."
 msgstr "འཐེན་འདྲུད་འབད་མི་ཚིག་ཡིག་དེ་ ནུས་ལྡན་ཡིག་སྣོད་ཀྱི་ གནས་ཁོངས་ཅིག་མིན་པས།"
 
-#: ../src/nautilus-emblem-sidebar.c:820
-#: ../src/nautilus-emblem-sidebar.c:873
+#: ../src/nautilus-emblem-sidebar.c:820 ../src/nautilus-emblem-sidebar.c:873
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "ཡིག་སྣོད་ '%s' དེ་ ནུས་ལྡན་གྱི་གཟུགས་བརྙན་མིནམ་བཟུམ་ཅིག་འདུག"
@@ -4287,7 +4735,9 @@ msgstr ""
 "ལས་རྟགས་ཐོག་ལས།"
 
 #: ../src/nautilus-file-management-properties.glade.h:43
-msgid "Choose the order of information to appear beneath icon names. More information will appear when zooming in closer."
+msgid ""
+"Choose the order of information to appear beneath icon names. More "
+"information will appear when zooming in closer."
 msgstr "ངོས་དཔར་མིང་གི་འོག་ལུ་འཐོན་ནིའི་ བརྡ་དོན་གྱི་གོ་རིམ་ གདམ་ཁ་རྐྱབས།"
 
 #: ../src/nautilus-file-management-properties.glade.h:44
@@ -4563,11 +5013,16 @@ msgstr "འཇལ་རྩིས།"
 
 #: ../src/nautilus-main.c:381
 msgid "Only create windows for explicitly specified URIs."
-msgstr "ཡུ་ཨར་ཨའི་ཨེསི་གི་དོན་ལུ་ དམིགས་བསལ་གྱིས་ གསལ་བཀོད་འབད་མི་ སྒོ་སྒྲིག་ཚུ་གི་དོན་ལུ་རྐྱངམ་གཅིག་ སྒོ་སྒྲིག་གསར་བསྐྲུན་འབད།"
+msgstr ""
+"ཡུ་ཨར་ཨའི་ཨེསི་གི་དོན་ལུ་ དམིགས་བསལ་གྱིས་ གསལ་བཀོད་འབད་མི་ སྒོ་སྒྲིག་ཚུ་གི་དོན་ལུ་རྐྱངམ་གཅིག་ སྒོ་སྒྲིག་"
+"གསར་བསྐྲུན་འབད།"
 
 #: ../src/nautilus-main.c:383
-msgid "Do not manage the desktop (ignore the preference set in the preferences dialog)."
-msgstr "ཌེཀསི་ཊོཔ་ འཛིན་སྐྱོང་མ་འཐབ། (དགའ་གདམ་ཌའི་ལོག་ནང་ གཞི་སྒྲིག་འབད་མི་ དགའ་གདམ་ཚུ་སྣང་མེད་སྦེ་བཞག)"
+msgid ""
+"Do not manage the desktop (ignore the preference set in the preferences "
+"dialog)."
+msgstr ""
+"ཌེཀསི་ཊོཔ་ འཛིན་སྐྱོང་མ་འཐབ། (དགའ་གདམ་ཌའི་ལོག་ནང་ གཞི་སྒྲིག་འབད་མི་ དགའ་གདམ་ཚུ་སྣང་མེད་སྦེ་བཞག)"
 
 #: ../src/nautilus-main.c:385
 msgid "open a browser window."
@@ -4587,8 +5042,12 @@ msgstr "(ཡུ་ཨར་ཨའི་...)"
 
 #. Translators: --no-default-window is a nautilus command line parameter, don't modify it.
 #: ../src/nautilus-main.c:393
-msgid "Load a saved session from the specified file. Implies \"--no-default-window\"."
-msgstr "གསལ་བཀོད་འབད་མི་ཡིག་སྣོད་ནང་ལས་ བསྲུངས་ཏེ་ཡོད་པའི་ལཱ་ཡུན་ཅིག་ མངོན་གསལ་འབད།  \"--no-default-window\"འཇུགཔ་ཨིན།"
+msgid ""
+"Load a saved session from the specified file. Implies \"--no-default-window"
+"\"."
+msgstr ""
+"གསལ་བཀོད་འབད་མི་ཡིག་སྣོད་ནང་ལས་ བསྲུངས་ཏེ་ཡོད་པའི་ལཱ་ཡུན་ཅིག་ མངོན་གསལ་འབད།  \"--no-"
+"default-window\"འཇུགཔ་ཨིན།"
 
 #: ../src/nautilus-main.c:393
 msgid "FILENAME"
@@ -4609,16 +5068,13 @@ msgstr ""
 "ཡིག་སྣོད་རིམ་ལུགས་དེ་ ཡིག་སྣོད་འཛིན་སྐྱོང་པ་གིས་ བརྡ་འཚོལ་འབད།"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:440
-#: ../src/nautilus-spatial-window.c:414
-#: ../src/nautilus-window-menus.c:441
-#: ../src/nautilus-window.c:167
+#: ../src/nautilus-main.c:440 ../src/nautilus-spatial-window.c:414
+#: ../src/nautilus-window-menus.c:441 ../src/nautilus-window.c:167
 msgid "Nautilus"
 msgstr "ནའུ་ཊི་ལཱསི།"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:473
-#: ../src/nautilus-main.c:482
+#: ../src/nautilus-main.c:473 ../src/nautilus-main.c:482
 #: ../src/nautilus-main.c:487
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
@@ -4632,7 +5088,8 @@ msgstr "ནའུ་ཊི་ལཱསི་:--ཞིབ་དཔྱད་དེ
 #: ../src/nautilus-main.c:492
 #, c-format
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
-msgstr "ནའུ་ཊི་ལཱསི་: --འཇལ་རྩིས་དེ་ ཡུ་ཨར་ཨའི་གཅིག་ལས་ལྷག་མི་དང་གཅིག་ཁར་ ལག་ལེན་འཐབ་མི་བཏུབ། \n"
+msgstr ""
+"ནའུ་ཊི་ལཱསི་: --འཇལ་རྩིས་དེ་ ཡུ་ཨར་ཨའི་གཅིག་ལས་ལྷག་མི་དང་གཅིག་ཁར་ ལག་ལེན་འཐབ་མི་བཏུབ། \n"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
@@ -4823,8 +5280,7 @@ msgstr "ཨེབ་རྟ་དང་ཚིག་ཡིག་ལུ་བརྟ
 msgid "%s - File Browser"
 msgstr "%s -ཡིག་སྣོད་བརའུ་ཟར།"
 
-#: ../src/nautilus-notes-viewer.c:388
-#: ../src/nautilus-notes-viewer.c:498
+#: ../src/nautilus-notes-viewer.c:388 ../src/nautilus-notes-viewer.c:498
 msgid "Notes"
 msgstr "དྲན་ཐོ།"
 
@@ -4853,8 +5309,7 @@ msgid "_Unmount"
 msgstr "སྦྱར་བརྩེགས་བཤོལ།(_U)"
 
 #. Empty Trash menu item
-#: ../src/nautilus-places-sidebar.c:1513
-#: ../src/nautilus-trash-bar.c:141
+#: ../src/nautilus-places-sidebar.c:1513 ../src/nautilus-trash-bar.c:141
 msgid "Empty _Trash"
 msgstr "ཕྱགས་ཧོད་སྟོངམ་བཏོན།(_T)"
 
@@ -4965,7 +5420,9 @@ msgstr "ཚོས་གཞི་དེ་ གསར་བཙུགས་འབ�
 
 #: ../src/nautilus-property-browser.c:1311
 msgid "Sorry, but you must specify an unused color name for the new color."
-msgstr "དགོངསམ་མ་ཁྲེལ། ཁྱོད་ཀྱིས་ཚོས་གཞི་གསར་པའི་དོན་ལུ་ ལག་ལེན་མ་འཐབ་པའི་ཚོས་གཞི་མིང་ཅིག་ གསལ་བཀོད་འབད་དགོ"
+msgstr ""
+"དགོངསམ་མ་ཁྲེལ། ཁྱོད་ཀྱིས་ཚོས་གཞི་གསར་པའི་དོན་ལུ་ ལག་ལེན་མ་འཐབ་པའི་ཚོས་གཞི་མིང་ཅིག་ གསལ་བཀོད་འབད་"
+"དགོ"
 
 #: ../src/nautilus-property-browser.c:1342
 msgid "Sorry, but you must specify a non-blank name for the new color."
@@ -5182,8 +5639,12 @@ msgid "provides visual status"
 msgstr "མཐོང་བའི་གནས་ཚད་བྱིནམ་ཨིན།"
 
 #: ../src/nautilus-window-bookmarks.c:94
-msgid "Do you want to remove any bookmarks with the non-existing location from your list?"
-msgstr "ཁྱོད་ཀྱི་ཐོ་ཡིག་ནང་ལས་ གནས་བཞིན་མེད་པའི་ གནས་ཁོངས་དང་གཅིག་ཁར་ཡོད་པའི་ དེབ་རྟགས་གང་རུང་ རྩ་བསྐྲད་གཏང་ནི་ཨིན་ན? "
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr ""
+"ཁྱོད་ཀྱི་ཐོ་ཡིག་ནང་ལས་ གནས་བཞིན་མེད་པའི་ གནས་ཁོངས་དང་གཅིག་ཁར་ཡོད་པའི་ དེབ་རྟགས་གང་རུང་ རྩ་བསྐྲད་"
+"གཏང་ནི་ཨིན་ན? "
 
 #: ../src/nautilus-window-bookmarks.c:99
 msgid "Bookmark for Nonexistent Location"
@@ -5224,8 +5685,12 @@ msgstr "ཁྱོད་རའི་པོ་རོག་སི་ གཞི་�
 
 #: ../src/nautilus-window-manage-views.c:1534
 #, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot contact the SMB master browser."
-msgstr "\"%s\"བཀྲམ་སྟོན་འབད་མི་ཚུགས་པས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཨེསི་ཨེམ་བི་ བརའུ་ཟར་གཙོ་བོ་ལུ་ འབྲེལ་བ་འཐབ་མི་ཚུགས་པས།"
+msgid ""
+"Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
+"browser."
+msgstr ""
+"\"%s\"བཀྲམ་སྟོན་འབད་མི་ཚུགས་པས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ནའུ་ཊི་ལཱསི་གིས་ ཨེསི་ཨེམ་བི་ བརའུ་ཟར་གཙོ་བོ་"
+"ལུ་ འབྲེལ་བ་འཐབ་མི་ཚུགས་པས།"
 
 #: ../src/nautilus-window-manage-views.c:1537
 msgid "Check that an SMB server is running in the local network."
@@ -5245,20 +5710,45 @@ msgid "Go to the location specified by this bookmark"
 msgstr "དེབ་རྟགས་འདི་གིས་ གསལ་བཀོད་འབད་མི་ གནས་ཁོངས་ལུ་འགྱོ།"
 
 #: ../src/nautilus-window-menus.c:423
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "ནའུ་ཊི་ལཱསི་འདི་ སྟོང་མར་ཐོབ་པའི་མཉེན་ཆས་ཅིག་ཨིནམ་ལས་ ཁྱོད་ཀྱིས་ རང་དབང་མཉེན་ཆས་གཞི་ཚོགས་ཀྱིས་ དཔེ་བསྐྲུན་འབད་མི་ ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་གྱི་ ཐོན་རིམ་ ༢ ཡང་ན་ ཁྱོད་རའི་བློ་འདོད་བཞིན་དུ་ ཤུལ་ལས་ཀྱི་ཐོན་རིམ་གང་རུང་གི་ ཁ་ཚིག་དང་འཁྲིལ་ཏེ་ བསྐྱར་འགྲེམ་འབད་བ་ ཡང་ན་ ལེགས་བཅོས་འབད་ཆོག"
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"ནའུ་ཊི་ལཱསི་འདི་ སྟོང་མར་ཐོབ་པའི་མཉེན་ཆས་ཅིག་ཨིནམ་ལས་ ཁྱོད་ཀྱིས་ རང་དབང་མཉེན་ཆས་གཞི་ཚོགས་ཀྱིས་ དཔེ་"
+"བསྐྲུན་འབད་མི་ ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་གྱི་ ཐོན་རིམ་ ༢ ཡང་ན་ ཁྱོད་རའི་བློ་འདོད་བཞིན་དུ་ ཤུལ་"
+"ལས་ཀྱི་ཐོན་རིམ་གང་རུང་གི་ ཁ་ཚིག་དང་འཁྲིལ་ཏེ་ བསྐྱར་འགྲེམ་འབད་བ་ ཡང་ན་ ལེགས་བཅོས་འབད་ཆོག"
 
 #: ../src/nautilus-window-menus.c:427
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "ནའི་ཊི་ལཱསི་འདི་ ཀུན་ལུ་ཕན་པའི་རེ་བ་བསྐྱེད་དེ་འགྲེམ་སྤེལ་འབདཝ་ཨིན། དེ་འབདཝ་དང་ ཉེན་ལེན་ག་ནི་ཡང་མེད་པའི་ནང་ལས་ ཐ་ན་སྐྱེལ་འདྲེན་ ཡང་ན་ དམིགས་བསལ་དགོས་དོན་ཅིག་གི་དོན་ལུ་ ཚུད་སྒྲིག་ཡོད་མེད་ཀྱི་ཉེན་ལེན་ཙམ་ཡང་མེད། རྒྱས་བཤད་ཀྱི་དོན་ལུ་ ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་ལུ་བལྟ།ཁ་གསལ་གྱི་དོན་ལུ་ ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་ལུ་བལྟ། "
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"ནའི་ཊི་ལཱསི་འདི་ ཀུན་ལུ་ཕན་པའི་རེ་བ་བསྐྱེད་དེ་འགྲེམ་སྤེལ་འབདཝ་ཨིན། དེ་འབདཝ་དང་ ཉེན་ལེན་ག་ནི་ཡང་མེད་"
+"པའི་ནང་ལས་ ཐ་ན་སྐྱེལ་འདྲེན་ ཡང་ན་ དམིགས་བསལ་དགོས་དོན་ཅིག་གི་དོན་ལུ་ ཚུད་སྒྲིག་ཡོད་མེད་ཀྱི་ཉེན་ལེན་"
+"ཙམ་ཡང་མེད། རྒྱས་བཤད་ཀྱི་དོན་ལུ་ ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་ལུ་བལྟ།ཁ་གསལ་གྱི་དོན་ལུ་ ཇི་ཨེན་"
+"ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་ལུ་བལྟ། "
 
 #: ../src/nautilus-window-menus.c:431
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
-msgstr "ཁྱོད་ཀྱིས་ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་ཅིག་ ནའུ་ཊི་ལཱསི་དང་གཅིག་ཁར་ཐོབ་ཐོབ་འོང་། གལ་སྲིད་མ་ཐོབ་ཅིན་ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA ལུ་ཡི་གུ་གཏང་།"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA  02111-1307  USA"
+msgstr ""
+"ཁྱོད་ཀྱིས་ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་ཅིག་ ནའུ་ཊི་ལཱསི་དང་གཅིག་ཁར་ཐོབ་ཐོབ་འོང་། གལ་སྲིད་མ་ཐོབ་"
+"ཅིན་ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  "
+"02111-1307  USA ལུ་ཡི་གུ་གཏང་།"
 
 #: ../src/nautilus-window-menus.c:443
-msgid "Nautilus is a graphical shell for GNOME that makes it easy to manage your files and the rest of your system."
-msgstr "ནའུ་ཊི་ལཱསི་དེ་ ཇི་ནོམ་གྱི་དོན་ལུ་ ཁྱོད་ཀྱི་ཡིག་སྣོད་དང་ རིམ་ལུགས་གཞན་ཚུ་ འཇམ་ཏོང་ཏོ་སྦེ་ འཛན་སྐྱོང་འཐབ་ནི་ལུ་ཕན་པའི་ ཚད་རིས་ཀྱི་ཤལ་ཅིག་ཨིན།"
+msgid ""
+"Nautilus is a graphical shell for GNOME that makes it easy to manage your "
+"files and the rest of your system."
+msgstr ""
+"ནའུ་ཊི་ལཱསི་དེ་ ཇི་ནོམ་གྱི་དོན་ལུ་ ཁྱོད་ཀྱི་ཡིག་སྣོད་དང་ རིམ་ལུགས་གཞན་ཚུ་ འཇམ་ཏོང་ཏོ་སྦེ་ འཛན་སྐྱོང་འཐབ་"
+"ནི་ལུ་ཕན་པའི་ ཚད་རིས་ཀྱི་ཤལ་ཅིག་ཨིན།"
 
 #: ../src/nautilus-window-menus.c:447
 msgid "Copyright © 1999-2007 The Nautilus authors"
@@ -5270,7 +5760,9 @@ msgstr "འདྲ་བཤུས་བདག་དབང་དེ་ © ༡༩�
 #.
 #: ../src/nautilus-window-menus.c:457
 msgid "translator-credits"
-msgstr "ཨའི་ཌི་ཨར་སི་གི་མ་དངུལ་རྒྱབ་སྐྱོར་ཐོག་ལས་ བརྡ་དོན་འཕྲུལ་རིག་ལས་ཁུངས་ནང་ སྐད་བསྒྱུར་འབད་ཡི། ཁ་གསལ་གྱི་དོན་ལུ་ འབྲེལ་བ་འཐབ་ས་: <pema_geyleg@druknet.bt>/<pgeyleg@dit.gov.bt>"
+msgstr ""
+"ཨའི་ཌི་ཨར་སི་གི་མ་དངུལ་རྒྱབ་སྐྱོར་ཐོག་ལས་ བརྡ་དོན་འཕྲུལ་རིག་ལས་ཁུངས་ནང་ སྐད་བསྒྱུར་འབད་ཡི། ཁ་གསལ་གྱི་"
+"དོན་ལུ་ འབྲེལ་བ་འཐབ་ས་: <pema_geyleg@druknet.bt>/<pgeyleg@dit.gov.bt>"
 
 #: ../src/nautilus-window-menus.c:588
 msgid "_File"
@@ -5307,8 +5799,11 @@ msgid "_Backgrounds and Emblems..."
 msgstr "རྒྱབ་གཞི་དང་ ལས་རྟགས་ཚུ་...(_B)"
 
 #: ../src/nautilus-window-menus.c:598
-msgid "Display patterns, colors, and emblems that can be used to customize appearance"
-msgstr "བྱུང་སྣང་སྲོལ་སྒྲིག་འབད་ནི་ལུ་ ལག་ལེན་འཐབ་བཏུབ་པའི་ དཔེ་གཞི་དང་ ཚོས་གཞི་ ལས་རྟགས་ཚུ་ བཀྲམ་སྟོན་འབད།"
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+"བྱུང་སྣང་སྲོལ་སྒྲིག་འབད་ནི་ལུ་ ལག་ལེན་འཐབ་བཏུབ་པའི་ དཔེ་གཞི་དང་ ཚོས་གཞི་ ལས་རྟགས་ཚུ་ བཀྲམ་སྟོན་འབད།"
 
 #: ../src/nautilus-window-menus.c:601
 msgid "Prefere_nces"
@@ -5372,8 +5867,7 @@ msgid "Zoom _In"
 msgstr "ཕྱིར་རྒྱས།(_I)"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:631
-#: ../src/nautilus-zoom-control.c:96
+#: ../src/nautilus-window-menus.c:631 ../src/nautilus-zoom-control.c:96
 msgid "Show the contents in more detail"
 msgstr "ནང་དོན་ཚུ་ ལྷག་པར་རྒྱས་བཤད་ནང་སྟོན།"
 
@@ -5383,8 +5877,7 @@ msgid "Zoom _Out"
 msgstr "ནང་ན་ཟུམ།(_O)"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:643
-#: ../src/nautilus-zoom-control.c:97
+#: ../src/nautilus-window-menus.c:643 ../src/nautilus-zoom-control.c:97
 msgid "Show the contents in less detail"
 msgstr "ནང་དོན་ཚུ་ རྒྱས་བཤད་བསྡུས་སུ་ཅིག་ནང་སྟོན།"
 
@@ -5424,8 +5917,7 @@ msgid "_Network"
 msgstr "ཡོངས་འབྲེལ།(_N)"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:667
-#: ../src/network-scheme.desktop.in.h:1
+#: ../src/nautilus-window-menus.c:667 ../src/network-scheme.desktop.in.h:1
 msgid "Browse bookmarked and local network locations"
 msgstr "དེབ་རྟགས་བཀལ་ཡོད་མི་དང་ ཉེ་གནས་ཡོངས་འབྲེལ་གནས་ཁོངས་ཚུ་ བརྡ་འཚོལ་འབད་"
 
@@ -5457,7 +5949,9 @@ msgstr "སི་ཌི་/ཌི་བི་ཌི་ གསར་བསྐྲ�
 #. label, accelerator
 #: ../src/nautilus-window-menus.c:679
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr "ཁྱོད་ཀྱིས་ཡིག་སྣོད་ཚུ་ སི་ཌི་ཡང་ན་ཌི་ཝི་ཌི་ཅིག་ལུ་ བཙུགས་སྤྱོད་འབད་ནིའི་དོན་་ལས་ འདྲུད་བཏུབ་པའི་སྣོད་འཛིན་ཅིག་ཁ་ཕྱེ་"
+msgstr ""
+"ཁྱོད་ཀྱིས་ཡིག་སྣོད་ཚུ་ སི་ཌི་ཡང་ན་ཌི་ཝི་ཌི་ཅིག་ལུ་ བཙུགས་སྤྱོད་འབད་ནིའི་དོན་་ལས་ འདྲུད་བཏུབ་པའི་སྣོད་འཛིན་"
+"ཅིག་ཁ་ཕྱེ་"
 
 #: ../src/nautilus-window-menus.c:705
 msgid "_Up"
@@ -5491,488 +5985,917 @@ msgstr "རྒྱས་ཟུམ།"
 msgid "Set the zoom level of the current view"
 msgstr "ད་ལྟོའི་སྒོ་སྒྲིག་གི་ རྒྱས་ཟུམ་གནས་རིམ་ གཞི་སྒྲིག་འབད།"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "གཟུགས་བརྙན/ཁ་ཡིག་གི་མཐའ་མཚམས།"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "དྲན་བརྡའི་ཌའི་ལོག་ནང་ ཁ་ཡིག་དང་གཟུགས་བརྙན་གྱི་མཐའ་སྐོར་ལུ་ མཐའ་མཚམས་ཀྱི་རྒྱ་ཚད།"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "དྲན་བརྡའི་དབྱེ་བ།"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "དྲན་བརྡའི་དབྱེ་བ།"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "དྲན་བརྡའི་ཨེབ་རྟ།"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "དྲན་བརྡའི་ཌའི་ལོག་ནང་སྟོན་མི་ གཡེབ་རྟ་ཚུ།"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "རྒྱས་བཤད་ཧེང་བཀལ་སྟོན།(_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "ཨེགསི།"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "ཝའི།"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ཚིག་དོན།"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ཁ་ཡིག་གི་ཚིག་དོན།"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "ལྟེམས་བཅོས།"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"ཁ་ཡིག་་གི་ཚིག་དོན་ནང་ ཕན་ཚུན་འབྲེལ་བ་ཡོད་པའི་གྱལ་རིམ་ཚུ་གི་ཕྲང་སྒྲིག འདི་གིས་གནས་ཁོངས་དེ་གི་ནང་འཁོད་"
+"ཀྱི་ ཕྲང་སྒྲིག་ལུ་ ཕན་གནོད་མི་འོང་།  དེ་གི་དོན་ལུ་ GtkMisc::xalign ལུ་བལྟ"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "གྱལ་རིམ་ལོག་མཚམས།"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "གཞི་སྒྲིག་ཨིན་པའི་སྐབས་ ཚིག་དོན་རྒྱ་ཆེ་དྲགས་འགྱོ་བ་ཅིན་ གྱལ་རིམ་ཚུ་ ལོག་མཚམས་བཟོཝ་ཨིན།"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "འོད་རྟགས་གནས་ས།"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "ཡིག་འབྲུ་ནང་ བཙུགས་སའི་འོད་་རྟགས་ ད་ལྟོའི་གནས་ས།"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "སེལ་འཐུའི་བཅད་མཚམས།"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "ཡིག་འབྲུའི་ནང་གི་འོད་རྟགས་ནང་ལས་ སེལ་འཐུའི་འགལ་ཕྱོགས་མཐའ་མའི་གནས་ས།"
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "ཆ་མཉམ་སེལ་འཐུ་འབད།"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "ཨིན་པུཊི་ཐབས་ལམ།"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"ཇི་ཀཱོནཕ་གི་འཛོལ་བ་:\n"
+"%s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "ཇི་ཀཱོནཕ་གི་འཛོལ་བ་: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "འཛོལ་བ་ཧེང་བཀལ་ཆ་མཉམ་ ཊར་མི་ནཱལ་ལུ་རྐྱངམ་གཅིག་སྟོན་ཡོདཔ།"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "གཟུགས་བརྙན་ག་ནི་ཡང་ སེལ་འཐུ་མ་འབད་བས།"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "འདི་སེལ་འཐུ་འབད་ནི་ལུ་ ཁྱོད་ཀྱིས་གཟུགས་བརྙན་ཅིག་གུ་ གཡེབ་གཏང་འབད་དགོ"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "ཁྱོད་ཀྱིས་ཆ་མེད་གཏང་ནི་གུ་ གཡེབ་གཏང་འབད་ཐོག་ལས་ བཀོལ་སྤྱོད་འདི་བཀག་ཚུགས།"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(ནུས་མེད་ཡུ་ནི་ཀོཌི)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "ཆོག་ཡིག་ བཙུགས།"
+
 #~ msgid "Normal Alpha"
 #~ msgstr "སྤྱིར་བཏང་གི་ཨཱལ་ཕ།"
+
 #~ msgid "Opacity of the normal icons if frame_text is set"
 #~ msgstr "གཞི་ཁྲམ་ཚིག་ཡིག་ གཞི་སྒྲིག་འབད་བ་ཅིན་ སྤྱིར་བཏང་ངོས་དཔར་ཚུ་གི་དྭངས་སྒྲིབ།"
+
 #~ msgid "Prelight Alpha"
 #~ msgstr "སྔོན་འོད་ཨཱལ་ཕ་"
+
 #~ msgid "Opacity of the prelight icons if frame_text is set"
 #~ msgstr "གཞི་ཁྲམ་ཚིག་ཡིག་ གཞི་སྒྲིག་འབད་བ་ཅིན་ སྔོན་འོད་ངོས་དཔར་ཚུ་གི་དྭངས་སྒྲིབ་ (_t)"
+
 #~ msgid "CD/_DVD"
 #~ msgstr "སི་ཌི་/ཌི་བི་ཌི་ (_D)"
+
 #~ msgid "View your computer storage"
 #~ msgstr "ཁྱོད་རའི་གློག་རིག་གི་བསག་མཛོད་ལུ་བལྟ།"
+
 #~ msgid "Change how files are managed"
 #~ msgstr "ཡིག་སྣོད་འཛིན་སྐྱོང་འཐབ་ཐངས་ བསྒྱུར་བཅོས་འབད།"
+
 #~ msgid "View your home folder in the Nautilus file manager"
 #~ msgstr "ནའུ་ཊི་ལཱསི་ ཡིག་སྣོད་འཛིན་སྐྱོང་ནང་ ཁྱོད་རའི་ཁྱིམ་གྱི་སྣོད་འཛིན་སྟོན།"
+
 #~ msgid "<b>Image Type:</b> %s (%s)\n"
 #~ msgstr "<b> གཟུགས་བརྙན་དབྱེ་བ་:</b> %s (%s)\n"
+
 #~ msgid "Unable to launch the cd burner application."
 #~ msgstr "སི་ཌི་ནང་ བཙུགས་སྤྱོད་གློག་རིམ་ གསར་བཙུགས་འབད་མ་ཚུགས།"
+
 #~ msgid "_Write contents to CD"
 #~ msgstr "ནང་དོན་ཚུ་ སི་ཌི་ནང་བྲིས།(_W)"
+
 #~ msgid "<b>Search:</b>"
 #~ msgstr "<b>འཚོལ་ཞིབ་:</b>"
+
 #~ msgid "Set up a connection to a network server"
 #~ msgstr "ཡོངས་འབྲེལ་སར་བར་ཅིག་ལུ་ མཐུད་ལམ་ཅིག་ གཞི་སྒྲིག་འབད།"
+
 #~ msgid "Go to the home folder"
 #~ msgstr "ཁྱིམ་གྱི་སྣོད་འཛིན་ལུ་འགྱོ།"
+
 #~ msgid "Go to the computer location"
 #~ msgstr "གློག་རིག་གནས་ཁོངས་ལུ་འགྱོ།"
+
 #~ msgid "Go to the network location"
 #~ msgstr "ཡོངས་འབྲེལ་གནས་ཁོངས་ལུ་འགྱོ།"
+
 #~ msgid "Go to the trash folder"
 #~ msgstr "ཕྱགས་ཧོད་སྣོད་འཛིན་ལུ་འགྱོ།"
+
 #~ msgid "Go to the CD/DVD Creator"
 #~ msgstr "སི་ཌི་/ཌི་བི་ཌི་ གསར་བསྐྲུན་པ་ལུ་འགྱོ།"
+
 #~ msgid "View your network servers in the Nautilus file manager"
 #~ msgstr "ཁྱོད་རའི་ཡོངས་འབྲེལ་སར་བར་ཚུ་ ནའུ་ཊི་ལཱསི་ ཡིག་སྣོད་འཛིན་སྐྱོང་པའི་ནང་ལུ་བལྟ།"
+
 #~ msgid "Always use _text-entry location bar"
 #~ msgstr "ཨ་རྟག་ར་ ཚིག་ཡིག་ཐོ་བཀོད་ཀྱི་ གནས་ཁོངས་ཕྲ་རིང་ལག་ལེན་འཐབ།(_t)"
+
 #~ msgid "Enable 'special' flags in file preferences dialog"
 #~ msgstr "ཡིག་སྣོད་གདམ་ཁའི་ཌའི་ལོག་ནང་ དམིགས་བསལ་ཟུར་རྟགས་ཚུ་ ལྕོགས་ཅན་བཟོ།"
+
 #~ msgid "File _owner:"
 #~ msgstr "ཡིག་སྣོད་ཇོ་བདག་:(_o)"
+
 #~ msgid "File owner:"
 #~ msgstr "ཡིག་སྣོད་ཇོ་བདག་:"
+
 #~ msgid "_File group:"
 #~ msgstr "ཡིག་སྣོད་སྡེ་ཚན་:(_F)"
+
 #~ msgid "File group:"
 #~ msgstr "ཡིག་སྣོད་སྡེ་ཚན་:"
+
 #~ msgid "Number view:"
 #~ msgstr "ཨང་གྲངས་མཐོང་སྣང་:"
+
 #~ msgid "Art"
 #~ msgstr "རྒྱུ་རྩལ།"
+
 #~ msgid "Camera"
 #~ msgstr "པར་ཆས་།"
+
 #~ msgid "Certified"
 #~ msgstr "ངོ་སྦྱོར་གྲུབ་པ།"
+
 #~ msgid "Cool"
 #~ msgstr "བསིལ་བ།"
+
 #~ msgid "Danger"
 #~ msgstr "ཉེན་ཁ།"
+
 #~ msgid "Distinguished"
 #~ msgstr "ཁྱད་འཕགས་ཅན།"
+
 #~ msgid "Draft"
 #~ msgstr "ཟིན་འབྲི།"
+
 #~ msgid "Favorite"
 #~ msgstr "དགའ་མི།"
+
 #~ msgid "Important"
 #~ msgstr "གལ་ཅན།"
+
 #~ msgid "Mail"
 #~ msgstr "ཡིག་འཕྲིན།"
+
 #~ msgid "Multimedia"
 #~ msgstr "སྣ་མང་བརྡ་ལམ།"
+
 #~ msgid "New"
 #~ msgstr "གསརཔ།"
+
 #~ msgid "OK"
 #~ msgstr "བཏུབ།"
+
 #~ msgid "Oh No"
 #~ msgstr "དབྱའི་ མེན།"
+
 #~ msgid "Package"
 #~ msgstr "ཐུམ་སྒྲིལ།"
+
 #~ msgid "Personal"
 #~ msgstr "རང་དོན།"
+
 #~ msgid "Sound"
 #~ msgstr "སྒྲ་སྐད།"
+
 #~ msgid "Special"
 #~ msgstr "དམིགས་བསལ།"
+
 #~ msgid "Urgent"
 #~ msgstr "འཕྲལ་མཁོ།"
+
 #~ msgid "Web"
 #~ msgstr "ཝེབ།"
+
 #~ msgid "Couldn't Install Emblem"
 #~ msgstr "ལས་རྟགས་གསར་བཙུགས་འབད་མ་ཚུགས།"
+
 #~ msgid "Couldn't install emblem"
 #~ msgstr "ལས་རྟགས་གསར་བཙུགས་འབད་མ་ཚུགས།"
+
 #~ msgid "Error While Copying"
 #~ msgstr "འདྲ་བཤུས་རྐྱབ་པའི་སྐབས་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error While Moving"
 #~ msgstr "སྤོ་བའི་སྐབས་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error While Linking"
 #~ msgstr "འབྲེལ་ལམ་བཟོ་བའི་སྐབས་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error While Deleting"
 #~ msgstr "བཏོན་གཏང་བའི་སྐབས་ལུ་འཛོལ་བ།"
+
 #~ msgid "Unable to Replace File"
 #~ msgstr "ཡིག་སྣོད་ཚབ་མ་ བཙུགས་མི་ཚུགས་པས།"
+
 #~ msgid "If you replace an existing file, its contents will be overwritten."
 #~ msgstr ""
 #~ "ཁྱོད་ཀྱིས་ཡོད་བཞིན་པའི་ ཡིག་སྣོད་ཅིག་གི་ཚབ་བཙུགས་པ་ཅིན་ དེ་ནང་ཡོད་མི་ནང་དོན་ཚུ་ མེདཔ་བཏང་སྟེ་ "
 #~ "སླར་སྲུང་འབད་འོང་།"
+
 #~ msgid "Conflict While Copying"
 #~ msgstr "འདྲ་བཤུས་རྐྱབ་པའི་སྐབས་ལུ་མ་མཐུན།"
+
 #~ msgid "Can't Change Trash Location"
 #~ msgstr "ཕྱགས་ཧོད་ཀྱི་གནས་ཁོངས་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུགས།"
+
 #~ msgid "Can't Copy Trash"
 #~ msgstr "ཕྱགས་ཧོད་འདྲ་བཤུས་བརྐྱབ་མི་ཚུགས།"
+
 #~ msgid "Can't Move Into Self"
 #~ msgstr "རང་ཉིད་ནང་ལུ་ སྤོ་མི་ཚུགས།"
+
 #~ msgid "Can't Copy Into Self"
 #~ msgstr "རང་ཉིད་ལུ་ འདྲ་བཤུས་བརྐྱབ་མི་ཚུགས།"
+
 #~ msgid "Can't Copy Over Self"
 #~ msgstr "རང་ཉིད་གུ་ལུ་ འདྲ་བཤུས་བརྐྱབ་མི་ཚུགས།"
+
 #~ msgid "Error Creating New Folder"
 #~ msgstr "སྣོད་འཛིན་གསར་བསྐྲུན་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error Creating New Document"
 #~ msgstr "ཡིག་ཆ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Switch"
 #~ msgstr "སོར་བསྒྱུར།"
+
 #~ msgid "Can't Open Location"
 #~ msgstr "གནས་ཁོངས་་ཁ་ཕྱེ་མི་ཚུགས་པས།"
+
 #~ msgid ""
 #~ "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
 #~ "locations."
 #~ msgstr ""
 #~ "\"%s\" གིས་ \"%s\"ཁ་ཕྱེ་མི་ཚུགས་པས། ག་ཅི་ཨིནམ་ཟེར་བ་ཅིན་\"%s\"གིས་ གནས་ཁོངས་\"%s\"ལུ་ "
 #~ "ཡིག་སྣོད་ལུ་འཛུལ་སྤྱོད་འབད་མི་ཚུགས་པས།"
+
 #~ msgid ""
 #~ "The default action can't open \"%s\" because it can't access files at \"%s"
 #~ "\".locations."
 #~ msgstr ""
 #~ "སྔོན་སྒྲིག་བྱ་བ་དེ་གིས་\"%s\" ཁ་ཕྱེ་མི་ཚུགས། ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ དེ་གིས་གནས་ཁོངས་\"%s\" ལུ་ ཡིག་"
 #~ "སྣོད་ནང་ འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
+
 #~ msgid "Can't Display Location"
 #~ msgstr "གནས་ཁོངས་བཀྲམ་སྟོན་འབད་མ་ཚུགས།"
+
 #~ msgid "Can't Execute Remote Links"
 #~ msgstr "ཐག་རིང་གི་འབྲེལ་ལམ་ཚུ་ ལག་ལེན་འཐབ་མི་ཚུགས།"
+
 #~ msgid "Error Launching Application"
 #~ msgstr "གློག་རིམ་གསར་བཙུགས་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Drop Target Only Supports Local Files"
 #~ msgstr "བཀོག་བཞག་དམིགས་གཏད་ཀྱིས་ ཉེ་གནས་ཀྱི་ཡིག་སྣོད་ཚུ་རྐྱངམ་གཅིག་ལུ་ རྒྱབ་སྐྱོར་འབདཝ་ཨིན།"
+
 #~ msgid "Open %d Window?"
 #~ msgid_plural "Open %d Windows?"
 #~ msgstr[0] "སྒོ་སྒྲིག་ %d ཁ་ཕྱེ་ནི་ཨིན་ན?"
 #~ msgstr[1] "སྒོ་སྒྲིག་ %d ཁ་ཕྱེ་ནི་ཨིན་ན?"
+
 #~ msgid "Delete?"
 #~ msgstr "བཏོན་གཏང་ག?"
+
 #~ msgid "Too Many Files"
 #~ msgstr "ཡིག་སྣོད་མང་དྲགས་པས།"
+
 #~ msgid "Delete Immediately?"
 #~ msgstr "དེ་འཕྲལ་ལས་ བཏོན་གཏང་ནི་ཨིན་ན?"
+
 #~ msgid "Delete From Trash?"
 #~ msgstr "ཕྱགས་ཧོད་ནང་ལས་བཏོན་གཏང་ག?"
+
 #~ msgid "Run or Display?"
 #~ msgstr "གཡོག་བཀོལ་ནི་ཨིན་ན་ བཀྲམ་སྟོན་འབད་ནི་ཨིན་ན?"
+
 #~ msgid "About Scripts"
 #~ msgstr "ཡིག་ཚུགས་ཀྱི་སྐོར་ལས།"
+
 #~ msgid "Mount Error"
 #~ msgstr "སྦྱར་བརྩེགས་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Unmount Error"
 #~ msgstr "སྦྱར་བརྩེགས་བཤོལ་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Eject Error"
 #~ msgstr "ཕྱིར་བཏོན་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Broken Link"
 #~ msgstr "རྒྱུན་ཆད་འབྲེལ་ལམ།"
+
 #~ msgid "Cancel Open?"
 #~ msgstr "ཁ་ཕྱེ་ནི་ཆ་མེད་གཏང་ག?།"
+
 #~ msgid "Drag and Drop Error"
 #~ msgstr "འདྲུད་དེ་བཀོག་བཞག་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error Displaying Folder"
 #~ msgstr "སྣོད་འཛིན་བཀྲམ་སྟོན་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Renaming Error"
 #~ msgstr "བསྐྱར་མིང་བཏགས་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error Setting Group"
 #~ msgstr "སྡེ་ཚན་གཞི་སྒྲིག་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error Setting Owner"
 #~ msgstr "ཇོ་བདག་དེ་ བསྒྱུར་བཅོས་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Error Setting Permissions"
 #~ msgstr "གནང་བ་ཚུ་ བསྒྱུར་བཅོས་འབད་ནི་ལུ་འཛོལ་བ།"
+
 #~ msgid "Cancel Rename?"
 #~ msgstr "བསྐྱར་མིང་བཏགས་ནི་ ཆ་མེད་གཏང་ག?"
+
 #~ msgid "More Than One Image"
 #~ msgstr "གཟུགས་བརྙན་གཅིག་ལས་མངམ།"
+
 #~ msgid "Local Images Only"
 #~ msgstr "ཉེ་གནས་ཀྱི་ གཟུགས་བརྙན་ཚུ་རྐྱངམ་གཅིག"
+
 #~ msgid "Images Only"
 #~ msgstr "གཟུགས་བརྙན་ཚུ་རྐྱངམ་གཅིག"
+
 #~ msgid "Changing group."
 #~ msgstr "སྡེ་ཚན་བསྒྱུར་བཅོས་འབད་དོ།"
+
 #~ msgid "Changing owner."
 #~ msgstr "ཇོ་བདག་བསྒྱུར་བཅོས་འབད་དོ།"
+
 #~ msgid "_Remove Custom Icon"
 #~ msgstr "སྲོལ་སྒྲིག་ངོས་དཔར་ རྩ་བསྐྲད་གཏང་།(_R)"
+
 #~ msgid "Couldn't Show Help"
 #~ msgstr "གྲོགས་རམ་སྟོན་མི་ཚུགས་པས།"
+
 #~ msgid "Cancel Showing Properties Window?"
 #~ msgstr "རྒྱུ་དངོས་ཀྱི་སྒོ་སྒྲིག་སྟོན་ནི་ ཆ་མེད་གཏང་ནི་ཨིན་ན?"
+
 #~ msgid "Select an icon"
 #~ msgstr "ངོས་དཔར་ཅིག་ སེལ་འཐུ་འབད།"
+
 #~ msgid "Couldn't Create Required Folder"
 #~ msgstr "ཉེར་མཁོ་བའི་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+
 #~ msgid "Couldn't Create Required Folders"
 #~ msgstr "ཉེར་མཁོ་བའི་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+
 #~ msgid "Migrated Old Desktop"
 #~ msgstr "གནས་སྤོ་སོང་ཡོད་མི་ ཌེཀསི་ཊོཔ་རྙིངམ།"
+
 #~ msgid "Can't Connect to Server"
 #~ msgstr "སར་བར་ལུ་ མཐུད་མི་ཚུགས་པས།"
+
 #~ msgid "Couldn't Remove Emblem"
 #~ msgstr "ལས་རྟགས་རྩ་བསྐྲད་བཏང་མ་ཚུགས།"
+
 #~ msgid "Couldn't Rename Emblem"
 #~ msgstr "ལས་རྟགས་ལུ་ བསྐྱར་མིང་བཏགས་མ་ཚུགས།"
+
 #~ msgid "Couldn't Add Emblems"
 #~ msgstr "ལས་རྟགས་ཚུ་ ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
+
 #~ msgid "Couldn't Add Emblem"
 #~ msgstr "ལས་རྟགས་ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
+
 #~ msgid "1 GB"
 #~ msgstr "ཇི་བི་ ༡།"
+
 #~ msgid "100 KB"
 #~ msgstr "ཀེ་བི་ ༡༠༠།"
+
 #~ msgid "500 KB"
 #~ msgstr "ཀེ་བི་ ༥༠༠།"
+
 #~ msgid "Always"
 #~ msgstr "ཨ་རྟག་རང་།"
+
 #~ msgid "MIME type"
 #~ msgstr "མ་ཡིམ་གྱི་དབྱེ་བ།"
+
 #~ msgid "Never"
 #~ msgstr "ནམ་ཡང་།"
+
 #~ msgid "date accessed"
 #~ msgstr "ཚེས་གྲངས་ནང་ འཛུལ་སྤྱོད་འབད་ཡི།"
+
 #~ msgid "date modified"
 #~ msgstr "ཚེས་གྲངས་བསྒྱུར་བཅོས་འབད་ཡི།"
+
 #~ msgid "group"
 #~ msgstr "སྡེ་ཚན།"
+
 #~ msgid "informal"
 #~ msgstr "སྒྲིགས་མིན།"
+
 #~ msgid "iso"
 #~ msgstr "ཨའི་ཨེསི་ཨོ།"
+
 #~ msgid "locale"
 #~ msgstr "ལོ་ཀེལ།"
+
 #~ msgid "none"
 #~ msgstr "ཅི་མེད་།"
+
 #~ msgid "octal permissions"
 #~ msgstr "ཨོཀ་ཊཱལ་གྱི་གནང་བ་ཚུ།"
+
 #~ msgid "owner"
 #~ msgstr "ཇོ་བདག"
+
 #~ msgid "permissions"
 #~ msgstr "གནང་བ་ཚུ།"
+
 #~ msgid "size"
 #~ msgstr "ཚད།"
+
 #~ msgid "type"
 #~ msgstr "དབྱེ་བ།"
+
 #~ msgid "Can't Launch CD Burner"
 #~ msgstr "སི་ཌི་ནང་བཙུགས་སྤྱོད་ གསར་བཙུགས་འབད་མི་ཚུགས་པས།"
+
 #~ msgid "View in Multiple Windows?"
 #~ msgstr "སྣ་མང་སྒོ་སྒྲིག་ནང་བལྟ།"
+
 #~ msgid "Clear History"
 #~ msgstr "ལོ་རྒྱུས་བསལ་གཏང་།"
+
 #~ msgid "Home"
 #~ msgstr "ཁྱིམ།"
+
 #~ msgid "Couldn't Delete Pattern"
 #~ msgstr "དཔེ་གཞི་བཏོན་གཏང་མ་ཚུགས།"
+
 #~ msgid "Couldn't Delete Emblem"
 #~ msgstr "ལས་རིམ་དེ་ བཏོན་གཏང་མ་ཚུགས།"
+
 #~ msgid "Couldn't Install Pattern"
 #~ msgstr "དཔེ་གཞི་ གསར་བཙུགས་འབད་མ་ཚུགས།"
+
 #~ msgid "Not an Image"
 #~ msgstr "གཟུགས་བརྙན་ཅིག་མིན་པས།"
+
 #~ msgid "Couldn't Install Color"
 #~ msgstr "ཚོས་གཞི་ གསར་བཙུགས་འབད་མ་ཚུགས།"
+
 #~ msgid "View Failed"
 #~ msgstr "མཐོང་སྣང་མ་བཏུབ།"
+
 #~ msgid "Applications"
 #~ msgstr "གློག་རིམ་ཚུ།"
+
 #~ msgid "Browse available software"
 #~ msgstr "འཐོབ་ཚུགས་པའི་མཉེན་ཆས་ཚུ་ བརྡ་འཚོལ་འབད།"
+
 #~ msgid "Favorite applications"
 #~ msgstr "དགའ་མི་གློག་རིམ།"
+
 #~ msgid "Favorites"
 #~ msgstr "དགའ་མི་ཚུ།"
+
 #~ msgid "An Eggplant variation of the Crux theme."
 #~ msgstr "གནད་འགག་བརྗོད་དོན་གྱི་ ཨེག་པ་ལཱནཊི་ཅིག་གི་ཁྱད་འགྱུར།"
+
 #~ msgid "Crux-Eggplant"
 #~ msgstr "གནད་འགག་-ཨེག་པ་ལཱནཊི།"
+
 #~ msgid "A Teal variation of the Crux theme."
 #~ msgstr "གནད་འགག་བརྗོད་དོན་གྱི་ སྔོ་ལྗང་གི་ཁྱད་འགྱུར་ཅིག"
+
 #~ msgid "Crux-Teal"
 #~ msgstr "གནད་འགག་སྔོ་ལྗང་།"
+
 #~ msgid "Eazel"
 #~ msgstr "ཨི་འ་ཛེལ།"
+
 #~ msgid "This is the default theme for Nautilus."
 #~ msgstr "ནའུ་ཊི་ལཱསི་གི་དོན་ལུ་ སྔོན་སྒྲིག་བརྗོད་དོན་འདི་ཨིན།"
+
 #~ msgid "A theme designed to fit well with the classic GNOME environment."
 #~ msgstr "ལེགས་ལྡན་ཇི་ནོམ་མཐའ་འཁོར་ནང་ ལེགས་ཚུད་ཀྱི་དོན་ལུ་ བཟོ་བཀོད་འབད་མི་བརྗོད་དོན་ཅིག"
+
 #~ msgid "Sierra"
 #~ msgstr "སི་ར།"
+
 #~ msgid "Uses manila folders and gray-green backgrounds."
 #~ msgstr "མ་ནི་ལ་ཡིག་སྣོད་དང་ ལྗང་སྐྱའི་རྒྱབ་གཞི་ ལག་ལེན་འཐབ་ཨིན།"
+
 #~ msgid "Tahoe"
 #~ msgstr "ཏ་ཧོའི།"
+
 #~ msgid "This theme uses photo-realistic folders."
 #~ msgstr "བརྗོད་དོན་འདི་གིས་ དངོས་མཐོང་པར་གྱི་སྣོད་འཛིན་ཚུ་ ལག་ལེན་འཐབ་ཨིན།"
+
 #~ msgid "Name of the column"
 #~ msgstr "ཀེར་ཐིག་གི་མིང་།"
+
 #~ msgid "Attribute"
 #~ msgstr "ཁྱད་ཆོས།"
+
 #~ msgid "The attribute name to display"
 #~ msgstr "བཀྲམ་སྟོན་འབད་ནིའི་ ཁྱད་ཆོས་ཀྱི་མིང་།"
+
 #~ msgid "Label"
 #~ msgstr "ཁ་ཡིག"
+
 #~ msgid "Label to display in the column"
 #~ msgstr "ཀེར་ཐིག་ནང་ བཀྲམ་སྟོན་འབད་ནིའི་ཁ་ཡིག"
+
 #~ msgid "A user-visible description of the column"
 #~ msgstr "ལག་ལེན་པ་གིས་མཐོང་ཚུགསཔའི་ ཀེར་ཐིག་གི་འགྲེལ་བཤད་ཅིག"
+
 #~ msgid "xalign"
 #~ msgstr "ཨེགསི་ཕྲང་སྒྲིག"
+
 #~ msgid "The x-alignment of the column"
 #~ msgstr "ཀེར་ཐིག་གི་ཨེགསི་ཕྲང་སྒྲིག"
+
 #~ msgid "Name of the item"
 #~ msgstr "རྣམ་གྲངས་ཀྱི་མིང་།"
+
 #~ msgid "Label to display to the user"
 #~ msgstr "ལག་ལེན་པ་ལུ་ བཀྲམ་སྟོན་འབད་ནིའི་ཁ་ཡིག"
+
 #~ msgid "Tip"
 #~ msgstr "ཕན་བསླབ།"
+
 #~ msgid "Tooltip for the menu item"
 #~ msgstr "དཀར་ཆག་རྣམ་གྲངས་ཀྱི་ ལག་ཆས་ཕན་བསླབ།"
+
 #~ msgid "Icon"
 #~ msgstr "ངོས་དཔར།"
+
 #~ msgid "Name of the icon to display in the menu item"
 #~ msgstr "དཀར་ཆག་རྣམ་གྲངས་ནང་ བཀྲམ་སྟོན་འབད་ནིའི་ ངོས་དཔར་གྱི་མིང་།"
+
 #~ msgid "Sensitive"
 #~ msgstr "དྲན་ཚོར་ཅན་།"
+
 #~ msgid "Whether the menu item is sensitive"
 #~ msgstr "དཀར་ཆག་རྣམ་གྲངས་དེ་ དྲན་ཤེས་ཅན་ཨིན་ན་མེན།"
+
 #~ msgid "Priority"
 #~ msgstr "གཙོ་རིམ།"
+
 #~ msgid "Show priority text in toolbars"
 #~ msgstr "ལག་ཆས་ཕྲ་རིང་ནང་ལུ་ གཙོ་རིམ་ཅན་གྱི་ཚིག་དོན་སྟོན།"
+
 #~ msgid "Name of the page"
 #~ msgstr "ཤོག་ལེབ་ཀྱི་མིང་།"
+
 #~ msgid "Label widget to display in the notebook tab"
 #~ msgstr "འབྲི་དེབ་མཆོང་ལྡེ་ནང་ལུ་ བཀྲམ་སྟོན་འབད་ནིའི་ ཝི་གེཊི་གི་ཁ་ཡིག"
+
 #~ msgid "Page"
 #~ msgstr "ཤོག་ལེབ།"
+
 #~ msgid "Widget for the property page"
 #~ msgstr "རྒྱུ་དངོས་ཤོག་ལེབ་ཀྱི་དོན་ལུ་ཝི་གེཊི།"
+
 #~ msgid "Bring up a new window for every opened file"
 #~ msgstr "ཡིག་སྣོད་རེ་རེ་ཁ་ཕྱེ་སྟེ་ཡོད་སར་ སྒོ་སྒྲིག་གསརཔ་རེ་འབག་ཤོག"
+
 #~ msgid ""
 #~ "If set to true, then Nautilus will bring up a new Nautilus window by "
 #~ "default whenever an item is opened."
 #~ msgstr ""
 #~ "བདེན་པ་གུ་གཞི་སྒྲིག་འབད་བ་ཅིན་ ནམ་རང་འབད་རུང་ ཚིག་དོན་ཅིག་ཁ་ཕྱེ་བའི་སྐབས་ ནའུ་ཊི་ལཱསི་གིས་ ནའུ་"
 #~ "ཊི་ལཱསི་སྒོ་སྒྲིག་གསརཔ་ཅིག་ སྔོན་སྒྲིག་སྦེ་་སྟོནམ་ཨིན"
+
 #~ msgid "Cut _Text"
 #~ msgstr "ཚིག་དོན་བཏོག(_T)"
+
 #~ msgid "_Copy Text"
 #~ msgstr "ཚིག་དོན་འདྲ་བཤུས་རྐྱབས།(_C)"
+
 #~ msgid "_Paste Text"
 #~ msgstr "ཚིག་དོན་སྦྱར།(_P)"
+
 #~ msgid "You cannot delete a volume icon."
 #~ msgstr "ཁྱོད་ཀྱིས་སྦུང་ཚད་ཀྱི་ངོས་དཔར་ཅིག་ བཏོན་གཏང་མི་ཚུགས།"
+
 #~ msgid "Can't Delete Volume"
 #~ msgstr "སྦུང་ཚད་བཏོན་གཏང་མི་ཚུགས།"
+
 #~ msgid "editable text"
 #~ msgstr "ཞུན་དག་འབད་བཏུབ་པའི་ཚིག་ཡིག"
+
 #~ msgid "the editable label"
 #~ msgstr "ཞུན་དག་འབད་བཏུབ་པའི་ཁ་ཡིག"
+
 #~ msgid "additional text"
 #~ msgstr "ཚིག་ཡིག་ཁ་སྐོང་།"
+
 #~ msgid "some more text"
 #~ msgstr "ཚིག་ཡིག་ཧེང་བཀལ་དུམ་གྲ་ཅིག"
+
 #~ msgid "highlighted for selection"
 #~ msgstr "སེལ་འཐུའི་དོན་ལུ་ གཙོ་དམིགས་འབད་ཡོདཔ།"
+
 #~ msgid "whether we are highlighted for a selection"
 #~ msgstr "ང་བཅས་སེལ་འཐུའི་དོན་ལུ་ གཙོ་དམིགས་འབད་ག་མ་འབད།"
+
 #~ msgid "highlighted as keyboard focus"
 #~ msgstr "ལྡེ་སྒྲོམ་གྱི་ཆེད་དམིགས་བཟུམ་ཅིག་སྦེ་ གཙོ་དམིགས་འབད་ཡི།"
+
 #~ msgid "whether we are highlighted to render keyboard focus"
 #~ msgstr "ང་བཅས་ལྡེ་སྒྲོམ་གྱི་ཆེད་དམིགས་ ལྷག་སྟོན་འབད་ནི་ལུ་ གཙོ་དམིགས་འབད་ག་འབད།"
+
 #~ msgid "highlighted for drop"
 #~ msgstr "བཀོག་བཞག་དོན་ལུ་ གཙོ་དམིགས་འབད་ཡི།"
+
 #~ msgid "whether we are highlighted for a D&D drop"
 #~ msgstr "ང་བཅས་ཌི་དང་ཌི་ བཀོག་བཞག་གི་དོན་ལུ་ གཙོ་དམིགས་འབད་ག་མ་འབད།"
+
 #~ msgid "Frame Text"
 #~ msgstr "ཚིག་ཡིག་གཞི་ཁྲམ་ནང་བཙུགས།"
+
 #~ msgid "Draw a frame around unselected text"
 #~ msgstr "སེལ་འཐུ་མ་འབད་མི་ ཚིག་ཡིག་གི་མཐའ་བསྐོར་ཏེ་ གཞི་ཁྲམ་ཅིག་བྲིས།"
+
 #~ msgid "Selection Box Color"
 #~ msgstr "སེལ་འཐུའི་སྒྲོམ་གྱི་ཚོས་གཞི།"
+
 #~ msgid "Color of the selection box"
 #~ msgstr "སེལ་འཐུའི་སྒྲོམ་གྱི་ཚོས་གཞི།"
+
 #~ msgid "Selection Box Alpha"
 #~ msgstr "སེལ་འཐུའི་སྒྲོམ་གྱི་ཨཱལ་ཕ།"
+
 #~ msgid "Opacity of the selection box"
 #~ msgstr "སེལ་འཐུའི་སྒྲོམ་གྱི་སྒྲིབ་ཆ།"
+
 #~ msgid "Opacity of the highlight for selected icons"
 #~ msgstr "སེལ་འཐུ་འབད་མི་ངོས་དཔར་གྱི་དོན་ལུ་ གཙོ་དམིགས་ཀྱི་སྒྲིབ་ཆ།"
+
 #~ msgid "Light Info Color"
 #~ msgstr "བརྡ་དོན་གྱི་ཚོས་གཞི་ཡམ་ཡམ།"
+
 #~ msgid "Color used for information text against a dark background"
 #~ msgstr "རྒྱབ་གཞི་གནགཔོ་ཅིག་ལུ་ ཚིག་ཡིག་བརྡ་དོན་གྱི་དོན་ལུ་ ལག་ལེན་འཐབ་མི་ཚོས་གཞི།"
+
 #~ msgid "Dark Info Color"
 #~ msgstr "བརྡ་དོན་གྱི་ཚོས་གཞི་གྲིབ་ནག"
+
 #~ msgid "Color used for information text against a light background"
 #~ msgstr "རྒྱབ་གཞི་ཡམ་ཡམ་ཅིག་ལུ་ ཚིག་ཡིག་བརྡ་དོན་གྱི་དོན་ལུ་ ལག་ལེན་འཐབ་མི་ཚོས་གཞི།"
+
 #~ msgid ""
 #~ "Do you want to switch to manual layout and leave this item where you "
 #~ "dropped it? This will clobber the stored manual layout."
 #~ msgstr ""
 #~ "ཁྱོད་ཀྱིས་ལག་ཐོག་སྒྲིག་བཀོད་ལུ་ སོར་བསྒྱུར་འབད་དེ་ རྣམ་གྲངས་འདི་ ག་ཏེ་བཀོག་བཞག་ས་རང་ བཞག་ནི་ཨིན་"
 #~ "ན? འདི་གིས་བསགས་བཞག་མི་ ལག་ཐོག་སྒྲིག་བཀོད་ལུ་གནོད་འོང་།"
+
 #~ msgid "This folder uses automatic layout."
 #~ msgstr "སྣོད་འཛིན་འདི་གིས་ རང་བཞིན་གྱི་སྒྲིག་བཀོད་ ལག་ལེན་འཐབ་ཨིན།"
+
 #~ msgid ""
 #~ "Do you want to switch to manual layout and leave these items where you "
 #~ "dropped them? This will clobber the stored manual layout."
 #~ msgstr ""
 #~ "ཁྱོད་ཀྱིས་ལག་ཐོག་སྒྲིག་བཀོད་ལུ་ སོར་བསྒྱུར་འབད་དེ་ རྣམ་གྲངས་འདི་ཚུ་ ག་ཏེ་བཀོག་བཞག་ས་རང་ བཞག་ནི་"
 #~ "ཨིན་ན? བསགས་ཏེ་ཡོད་མི་ ལག་ཐོག་སྒྲིག་བཀོད་ལུ་གནོད་འོང་།"
+
 #~ msgid ""
 #~ "Do you want to switch to manual layout and leave this item where you "
 #~ "dropped it?"
 #~ msgstr ""
 #~ "ཁྱོད་ཀྱིས་ལག་ཐོག་སྒྲིག་བཀོད་ལུ་ སོར་བསྒྱུར་འབད་དེ་ རྣམ་གྲངས་འདི་ ག་ཏེ་བཀོག་བཞག་ས་རང་ བཞག་ནི་ཨིན་"
 #~ "ན?"
+
 #~ msgid ""
 #~ "Do you want to switch to manual layout and leave these items where you "
 #~ "dropped them?"
 #~ msgstr ""
 #~ "ཁྱོད་ཀྱིས་ལག་ཐོག་སྒྲིག་བཀོད་ལུ་ སོར་བསྒྱུར་འབད་དེ་ རྣམ་གྲངས་འདི་ཚུ་ ག་ཏེ་བཀོག་བཞག་ས་རང་ བཞག་ནི་"
 #~ "ཨིན་ན?"
+
 #~ msgid "Open a new GNOME terminal window"
 #~ msgstr "ཇི་ནོམ་ཊར་མི་ནཱལ་གྱི་ སྒོ་སྒྲིག་གསརཔ་ཅིག་ཁ་ཕྱེ།"
+
 #~ msgid "_Desktop"
 #~ msgstr "ཌེསིཀ་ཊོཔ།(_D)"
+
 #~ msgid "Cu_t Files"
 #~ msgstr "ཡིག་སྣོད་ཚུ་བཏོག(_t)"
+
 #~ msgid "_Copy Files"
 #~ msgstr "ཡིག་སྣོད་ཚུ་ འདྲ་བཤུས་རྐྱབས།(_C)"
+
 #~ msgid "_Paste Files"
 #~ msgstr "ཡིག་སྣོད་ཚུ་སྦྱར།(_P)"
+
 #~ msgid "Select _All Files"
 #~ msgstr "ཡིག་སྣོད་ཆ་མཉམ་སེལ་འཐུ་འབད།(_A)"
+
 #~ msgid "_Browse Folders"
 #~ msgstr "སྣོད་འཛིན་ཚུ་ བརྡ་འཚོལ་འབད།(_B)"
+
 #~ msgid "Ma_ke Links"
 #~ msgstr "འབྲེལ་ལམ་བཟོ།(_k)"
+
 #~ msgid "Cu_t File"
 #~ msgstr "ཡིག་སྣོདབཏོག(_t)"
+
 #~ msgid "_Copy File"
 #~ msgstr "ཡིག་སྣོད་འདྲ་བཤུས་རྐྱབས།(_C)"
+
 #~ msgid "_Icons"
 #~ msgstr "ངོས་དཔར་ཚུ།(_I)"
+
 #~ msgid "_List"
 #~ msgstr "ཐོ་ཡིག(_L)"
+
 #~ msgid "_Names:"
 #~ msgstr "མིང་ཚུ་:(_N)"
+
 #~ msgid "Open"
 #~ msgstr "ཁ་ཕྱེ།"
+
 #~ msgid "Cut Folder"
 #~ msgstr "སྣོད་འཛིན་བཏོག"
+
 #~ msgid "Copy Folder"
 #~ msgstr "སྣོད་འཛིན་འདྲ་བཤུས་རྐྱབས།"
+
 #~ msgid "Paste Files into Folder"
 #~ msgstr "ཡིག་སྣོད་ཚུ་ སྣོད་འཛིན་ནང་སྦྱར།"
+
 #~ msgid ""
 #~ "This is probably because the emblem is a permanent one, and not one you "
 #~ "added yourself."
 #~ msgstr "ལས་རྟགས་དེ་ ཁྱོད་ཀྱིས་ཁ་སྐོང་བརྐྱབ་བརྐྱབས་མིན་པར་ རྟག་བརྟན་ཅིག་ཨིནམ་འོང་ནི་མས།"
+
 #~ msgid "The %s view encountered an error and can't continue."
 #~ msgstr "མཐོང་སྣང་ %s ལུ་ འཛོལ་བ་ཅིག་བྱུངམ་ལས་ འཕྲོ་མཐུད་མ་ཚུགས།"
+
 #~ msgid "Application"
 #~ msgstr "གློག་རིམ།"
+
 #~ msgid "The NautilusApplication associated with this window."
 #~ msgstr "སྒོ་སྒྲིག་འདི་དང་འབྲེལ་བའི་ ནའུ་ཊི་ལཱསི་གློག་རིམ།"
 
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "༠༡/༠༡/༠༠,༠༡:༠༠ སྔ་ཆ།"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "༡/༡/༠༠, ༡:༠༠ སྔ་ཆ།"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr "༡/ ༡/༠༠, ༡:༠༠ སྔ་ཆ།"
+
+#~ msgid "Default"
+#~ msgstr "སྔོན་སྒྲིག"
+
+#~ msgid "No applications selected"
+#~ msgstr "གློག་རིམ་ག་ནི་ཡང་ སེལ་འཐུ་མ་འབད་བས།"
+
+#~ msgid "%s document"
+#~ msgstr "ཡིག་ཆ་%s "
+
+#~ msgid "Unknown"
+#~ msgstr "མ་ཤེསཔ།"
+
+#~ msgid "Select an application to open %s and other files of type \"%s\""
+#~ msgstr "%s དང་ གཞན་མི་ \"%s\" འབད་མི་ཁ་ཕྱེ་ནི་ལུ་ འཇུག་སྤྱོད་ཅིག་གདམ་ཁ་རྐྱབས"
+
+#~ msgid "Could not run application"
+#~ msgstr "གློག་རིམ་གཡོག་བཀོལ་མ་ཚུགས།"
+
+#~ msgid "Could not find '%s'"
+#~ msgstr "'%s' འཚོལ་མ་ཐོབ།"
+
+#~ msgid "Could not find application"
+#~ msgstr "གློག་རིམ་འཚོལ་མ་ཐོབ།"
+
+#~ msgid "Could not add application"
+#~ msgstr "གློག་རིམ་ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "གློག་རིམ་གཞི་རྟེན་གནད་སྡུད་ལུ་ གློག་རིམ་ཁ་སྐོང་བརྐྱབ་མ་ཚུགས།"
+
+#~ msgid "Select an Application"
+#~ msgstr "གློག་རིམ་ཅིག་ སེལ་འཐུ་འབད།"
+
+#~ msgid "Select an application to view its description."
+#~ msgstr "འདི་གི་འགྲེལ་བཤད་མཐོང་ནིའི་དོན་ལུ་ གློག་རིམ་ཅིག་སེལ་འཐུ་འབད།"
+
+#~ msgid "_Use a custom command"
+#~ msgstr "སྲོལ་སྒྲིག་བརྡ་བཀོད་ཅིག་ ལག་ལེན་འཐབ།(_U)"
+
+#~ msgid "_Browse..."
+#~ msgstr "བརྡ་འཚོལ།...(_B)"
+
+#~ msgid "Open %s and other files of type \"%s\" with:"
+#~ msgstr "%s དང་ \"%s\" འབད་མི་ཡིག་སྣོད་གཞན་ཚུ་ འདི་གི་ཐོག་ལས་ཁ་ཕྱེ།"
+
+#~ msgid "_Add"
+#~ msgstr "ཁ་སྐོང་རྐྱབས།(_A)"
+
+#~ msgid "Add Application"
+#~ msgstr "གློག་རིམ་ཁ་སྐོང་རྐྱབས།"
+
+#~ msgid "GConf Error"
+#~ msgstr "ཇི་ཀཱོནཕ་གི་འཛོལ་བ།"
+
+#~ msgid "No Selection Made"
+#~ msgstr "སེལ་འཐུ་མ་འབད་བས།"
+
+#~ msgid "Info"
+#~ msgstr "བརྡ་དོན།"
+
+#~ msgid "Warning"
+#~ msgstr "ཉེན་བརྡ།"
+
+#~ msgid "Error"
+#~ msgstr "འཛོལ་བ།"
+
+#~ msgid "Question"
+#~ msgstr "དྲི་བ"
diff --git a/po/el.po b/po/el.po
index 3770bbd3e..7be21de59 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  el.po (el)  #-#-#-#-#
 # translation of el.po to Greek
 # translation of nautilus to Greek
 # Copyright (C) 2000 - 2008 Free Software Foundation, Inc.
@@ -40,8 +41,34 @@
 # Nikos:06Jun2004, review
 # Nikos:25Jun2004, review
 # Nikos:26Aug2004, update
+# #-#-#-#-#  el.po (el)  #-#-#-#-#
+# translation of el.po to Greek
+# Greek translation of Nautilus.
+# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
+# Clean messages should be ok.
+#
+# Initialized from Translation Memory, 2001.
+# simos: 652 messages, 19Feb2001, more messages remaining.
+# simos: 713 messages, 20Feb2001, more messages remaining.
+# simos: 935 messages, 20Feb2001, more messages remaining.
+# simos: 1341 messages, 23Feb2001, more messages remaining.
+# simos: 1488 messages, 23Feb2001, more messages remaining.
+# simos: 1579 messages, 25Feb2001, more messages remaining.
+# simos: 1853 messages, 26Feb2001, 79 messages remaining.
+# simos: 1870 messages, 27Feb2001, 79 messages remaining.
+# simos: 1926 messages, 01Mar2001, 86 messages remaining.
+# simos: 2009 messages, 02Mar2001, full translation.
+# simos: 38 messages,04Jun2001, drawn from nautilus.
+# simos: 17 messages,19Aug2002, full translation and UTF-8 conversion.
+# kostas: 37 messages,25Jan2004.
+# Nikos: 52 messages, 4aug2004, update.
+# Simos Xenitellis <simos@hellug.gr>, 2001, 2002.
+# Kostas Papadimas <pkst@gnome.org>, 2004, 2006, 2008.
+# Nikos Charonitakis <charosn@her.forthnet.gr>, 2004, 2005.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  el.po (el)  #-#-#-#-#\n"
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-02 04:17+0000\n"
@@ -53,6 +80,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  el.po (el)  #-#-#-#-#\n"
+"Project-Id-Version: el\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-09 20:01+0200\n"
+"PO-Revision-Date: 2008-03-09 20:02+0200\n"
+"Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
+"Language-Team: Greek <team@gnome.gr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -7140,3 +7179,146 @@ msgstr "Μεγέθυνση"
 #: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "Ορισμός του επιπέδου εστίασης της τρέχουσας προβολής"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Περίγραμμα εικόνας/ετικέτας"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Πλάτος του περιγράμματος γύρω από την ετικέτα και την εικόνα στο διάλογο "
+"προειδοποίησης"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Τύπος προειδοποίησης"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Ο τύπος της προειδοποίησης"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Κουμπιά προειδοποίησης"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Τα κουμπιά που θα εμφανίζονται στο διάλογο προειδοποίησης"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Εμφάνιση περισσότερων λεπτο_μερειών"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Κείμενο"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Το κείμενο της ετικέτας."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Στοίχιση"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Η στοίχιση των γραμμών στο κείμενο της ετικέτας μεταξύ τους. Αυτό ΔΕΝ "
+"επηρεάζει τη στοίχιση της ετικέτας στο χώρο της. Βλέπε για αυτό GtkMisc::"
+"xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Αναδίπλωση γραμμής"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Αν ορισθεί, θα αναδιπλώνονται γραμμές αν το κείμενο γίνει πολύ πλατύ."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Θέση δρομέα"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Η τρέχουσα θέση του δρομέα εισαγωγής σε χαρακτήρες."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Όριο Επιλογής"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Η θέση του αντίθετου άκρου της επιλογής από το δρομέα σε χαρακτήρες."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Επιλογή όλων"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Μέθοδοι εισαγωγής"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Σφάλμα GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Σφάλμα GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Τα περαιτέρω σφάλματα θα εμφανιστούν μόνο στο τερματικό."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Δεν επιλέχθηκε εικόνα."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Πρέπει να κάνετε κλικ στην εικόνα για να την επιλέξετε."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Μπορείτε να διακόψετε αυτή τη λειτουργία αν πατήσετε ακύρωση."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(μη έγκυρο Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Άνοιγμα %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Άνοιγμα  %d αντικειμένου"
+msgstr[1] "Άνοιγμα  %d αντικειμένων"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Εισαγωγή κωδικού"
diff --git a/po/en_CA.po b/po/en_CA.po
index b37aa7b7a..64c11d4ef 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,11 +1,21 @@
+# #-#-#-#-#  en_CA.po (nautilus)  #-#-#-#-#
 # English/Canada translation of nautilus.
 # Copyright (C) 2004-2006 Adam Weinberger and the GNOME Foundation
 # This file is distributed under the same licence as the nautilus package.
 # Adam Weinberger <adamw@gnome.org>, 2004, 2005, 2006.
-# 
-# 
+#
+#
+# #-#-#-#-#  en_CA.po (eel)  #-#-#-#-#
+# English/Canada translations for eel
+# Copyright (C) 2004-2005 Adam Weinberger and the GNOME foundation
+# This file is distributed under the same licence as the eel package.
+# Adam Weinberger <adamw@gnome.org>, 2004, 2005.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  en_CA.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-08-15 16:49-0400\n"
@@ -16,6 +26,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  en_CA.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-15 17:52-0400\n"
+"PO-Revision-Date: 2005-01-25 18:50-0400\n"
+"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
+"Language-Team: Canadian English <adamw@gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -1011,6 +1032,7 @@ msgstr "Use De_fault"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1375
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Name"
 
@@ -3063,11 +3085,12 @@ msgstr "_Empty File"
 msgid "Create a new empty file inside this folder"
 msgstr "Create a new empty file inside this folder"
 
+#. #-#-#-#-#  en_CA.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6916
 #: ../src/file-manager/fm-directory-view.c:7795
 #: ../src/file-manager/fm-tree-view.c:1253
-#: ../src/nautilus-places-sidebar.c:1448
+#: ../src/nautilus-places-sidebar.c:1448 ../eel/eel-open-with-dialog.c:993
 msgid "_Open"
 msgstr "_Open"
 
@@ -4195,6 +4218,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "The permissions of the selected file could not be determined."
 
 #: ../src/file-manager/fm-properties-window.c:4824
+#: ../eel/eel-open-with-dialog.c:892
 msgid "Open With"
 msgstr "Open With"
 
@@ -6018,3 +6042,207 @@ msgstr "Zoom"
 #: ../src/nautilus-zoom-control.c:894
 msgid "Set the zoom level of the current view"
 msgstr "Set the zoom level of the current view"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Image/label border"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Width of border around the label and image in the alert dialogue"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Alert Type"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "The type of alert"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Alert Buttons"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "The buttons shown in the alert dialogue"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Show more _details"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "The text of the label."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justification"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Line wrap"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "If set, wrap lines if the text becomes too wide."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Cursor Position"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "The current position of the insertion cursor in chars."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Selection Bound"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"The position of the opposite end of the selection from the cursor in chars."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Select All"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Input Methods"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf error:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf error: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "All further errors shown only on terminal."
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "No image was selected."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "You must click on an image to select it."
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Default"
+
+#: ../eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "Icon"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "No applications selected"
+
+#: ../eel/eel-mime-application-chooser.c:528
+#: ../eel/eel-open-with-dialog.c:1067
+#, c-format
+msgid "%s document"
+msgstr "%s document"
+
+#: ../eel/eel-mime-application-chooser.c:538
+#: ../eel/eel-open-with-dialog.c:1080
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and other files of type \"%s\""
+msgstr "Select an application to open %s and other files of type \"%s\""
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Could not run application"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Could not find '%s'"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Could not find application"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Could not add application"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Could not add application to the application database"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Select an Application"
+
+#: ../eel/eel-open-with-dialog.c:929
+msgid "Select an application to view its description."
+msgstr "Select an application to view its description."
+
+#: ../eel/eel-open-with-dialog.c:954
+msgid "_Use a custom command"
+msgstr "_Use a custom command"
+
+#: ../eel/eel-open-with-dialog.c:971
+msgid "_Browse..."
+msgstr "_Browse..."
+
+#: ../eel/eel-open-with-dialog.c:1087
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "Open %s and other files of type \"%s\" with:"
+
+#: ../eel/eel-open-with-dialog.c:1119
+msgid "_Add"
+msgstr "_Add"
+
+#: ../eel/eel-open-with-dialog.c:1120
+msgid "Add Application"
+msgstr "Add Application"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "You can stop this operation by clicking cancel."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (invalid Unicode)"
diff --git a/po/en_GB.po b/po/en_GB.po
index e90ea0d21..063314b8e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  en_GB.po (nautilus)  #-#-#-#-#
 # English (British) translation.
 # Copyright (C) 2003 The GNOME Foundation
 # This file is distributed under the same license as the nautilus package.
@@ -6,8 +7,17 @@
 #
 #
 #
+# #-#-#-#-#  en_GB.po (nautilus CVS)  #-#-#-#-#
+# English (Commonwealth) translation of Nautilus
+# Robert Brady <rwb197@zepler.org>, 2000.
+# Gareth Owen <gowen72@yahoo.com>, 2004.
+# Gareth Owen <gowen72@yahoo.com>, 2004.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  en_GB.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-06 15:15+0100\n"
@@ -18,6 +28,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=( n != 1 );\n"
+"#-#-#-#-#  en_GB.po (nautilus CVS)  #-#-#-#-#\n"
+"Project-Id-Version: nautilus CVS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-03 07:19+0000\n"
+"PO-Revision-Date: 2008-03-02 22:58+0000\n"
+"Last-Translator: David Lodge <dave@cirt.net>\n"
+"Language-Team: English/GB <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2949,6 +2970,7 @@ msgstr "_Use a custom command"
 msgid "_Browse..."
 msgstr "_Browse..."
 
+#. #-#-#-#-#  en_GB.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -6830,6 +6852,148 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Set the zoom level of the current view"
 
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Opening %d Item"
+msgstr[1] "Opening %d Items"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Image/label border"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Width of border around the label and image in the alert dialogue"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Alert Type"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "The type of alert"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Alert Buttons"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "The buttons shown in the alert dialogue"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Show more _details"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "The text of the label."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justification"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Line wrap"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "If set, wrap lines if the text becomes too wide."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Cursor Position"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "The current position of the insertion cursor in chars."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Selection Bound"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"The position of the opposite end of the selection from the cursor in chars."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Select All"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Input Methods"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf error:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf error: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "All further errors shown only on terminal."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "No image was selected."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "You must click on an image to select it."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "You can stop this operation by clicking cancel."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (invalid Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Opening %s"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Enter Password"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Blank Blu-Ray Disc"
 
@@ -7227,11 +7391,6 @@ msgstr "Set the zoom level of the current view"
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "\"%s\" is not a valid location."
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "Opening %d Item"
-#~ msgstr[1] "Opening %d Items"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "If you delete an item, it is permanently lost."
 
@@ -7414,3 +7573,36 @@ msgstr "Set the zoom level of the current view"
 
 #~ msgid "View your network servers in the Nautilus file manager"
 #~ msgstr "View your network servers in the Nautilus file manager"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 AM"
+
+#~ msgid "Select an application to open %s and others of type \"%s\""
+#~ msgstr "Select an application to open %s and others of type \"%s\""
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Could not add application to the application database"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf Error"
+
+#~ msgid "No Selection Made"
+#~ msgstr "No Selection Made"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Warning"
+#~ msgstr "Warning"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Question"
+#~ msgstr "Question"
diff --git a/po/es.po b/po/es.po
index e61663480..5ac2b7d9a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  es.po (nautilus.HEAD)  #-#-#-#-#
 # translation of nautilus.HEAD.po to Español
 # translation of nautilus to Spanish
 # Copyright © 2000-2003, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -9,8 +10,18 @@
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003-2006.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>, 2000-2004.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008.
+# #-#-#-#-#  es.po (eel.HEAD.es)  #-#-#-#-#
+# translation of eel to Spanish
+# Copyright (C) 2000,2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# Pablo Gonzalo del Campo <pablodc@bigfoot.com>, 2000-2002.
+# Carlos Perelló Marín <carlos@hispalinux.es>, 2000.
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
+# Jorge González <jorgegonz@svn.gnome.org>, 2007.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  es.po (nautilus.HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-07 15:02+0100\n"
@@ -22,6 +33,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  es.po (eel.HEAD.es)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.es\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-09 18:58+0000\n"
+"PO-Revision-Date: 2007-12-09 19:35+0100\n"
+"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
+"Language-Team: Spanish <traductores@es.gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 # components/help/hyperbola-filefmt.c:398
 # components/help/hyperbola-filefmt.c:671
@@ -7340,6 +7363,152 @@ msgstr "Ampliación"
 msgid "Set the zoom level of the current view"
 msgstr "Establece el nivel de ampliación de la vista actual"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Borde de imagen/etiqueta"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Anchura del borde alrededor de la etiqueta e imagen en el diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tipo de alerta"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "El tipo de alerta"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Botones de alerta"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Los botones mostrados en el diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Mostrar más _detalles"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Texto"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "El texto de la etiqueta."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justificación"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"La alineación de las líneas en el texto de la etiqueta relativa a cada otra. "
+"Esto NO afecta a la alineación de la etiqueta dentro de su asignación. Vea "
+"GtkMisc::xalign para hacer eso."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Ajuste de línea"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"Si está activado ajusta la líneas si el texto se vuelve demasiado ancho."
+
+# components/rpmview/nautilus-rpm-view.c:336
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Posición del cursor"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "La posición actual en caracteres del cursor de inserción."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Límite de la selección"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"La posición en caracteres del extremo opuesto de la selección desde el "
+"cursor ."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Métodos de entrada"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Error de GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Error de GConf:  %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Todos los demás errores sólo se muestran en el terminal."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "No se seleccionó ninguna imagen."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Debe pulsar sobre la imagen para seleccionarla."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Puede parar esta operación pulsando cancelar."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode inválido)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Abriendo %d elemento"
+msgstr[1] "Abriendo %d elementos"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Introduzca contraseña"
+
 #~ msgid "Browse the file system with the file manager"
 #~ msgstr "Navegue por el sistema de archivos con el gestor de archivos"
 
diff --git a/po/et.po b/po/et.po
index 084b77263..241878e73 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  et.po (nautilus HEAD)  #-#-#-#-#
 # Nautiluse eesti tõlge.
 # Estonian translation of Nautilus.
 #
@@ -15,8 +16,23 @@
 # FIXME - selles tõlkes tuleks kontrollida, et failirekvisiitide "modified" ja
 # "changed" poleks omavahel sassi aetud.
 #
+# #-#-#-#-#  et.po (eel HEAD)  #-#-#-#-#
+# Eazel'i laiendusteegi eesti keele tõlge.
+# Estonian translation of Eazel Extensions Library.
+#
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 The GNOME Project.
+# This file is distributed under the same license as the eel package.
+#
+# Ilmar Kerm <ikerm@hot.ee>, 2002.
+# Allan Sims <allsi@eau.ee>, 2003.
+# Priit Laes <amd store20.com>, 2005, 2006.
+# Ivar Smolin <okul@linux.ee>, 2005-2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  et.po (nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-01 12:20+0000\n"
@@ -27,6 +43,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  et.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-02-23 11:43+0200\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"Language-Team: Estonian <gnome-et@linux.ee>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6848,6 +6875,146 @@ msgstr "Suurendus"
 msgid "Set the zoom level of the current view"
 msgstr "Praeguse vaate suurendusastme seadmine"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Pildi/sildi ääris"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Äärisjoone laius, mis ümbritseb hoiatusdialoogi silti ja pilti."
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Hoiatuse liik"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Hoiatuse liik"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Hoiatuse nupud"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Hoiatusdialoogi nupud"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "_Näita üksikasjalisemalt"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Sildi tekst"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Joondamine"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Sildi tekstis sõltuvad ridade joondused üksteisest. See EI mõjuta siltide "
+"paigutuse joondust. Tutvu GtkMisc::xalign'iga lähemalt."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Reamurdmine"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Vastava seade korral murtakse ridu, kui tekst on liiga pikk."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Kursori asukoht"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Sisestuskursori käesolev asukoht märkides."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Valiku piirid"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Vastasasukoht kursorist valiku lõpus tähtedes."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Vali kõik"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Sisestusmeetodid"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf'i viga:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf'i viga: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Edasised vead väljastatakse ainult terminali."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Ühtegi pilti pole valitud."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Pildi valimiseks pead sa sellel klõpsama."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Seda tegevust saab peatada vajutades nupule \"Loobu\"."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (vigane Unicode)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "Kirje %s avamine"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d kirje avamine"
+msgstr[1] "%d kirje avamine"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Sisesta parool"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "Oled kindel, et soovid ajaloo unustada?"
 
diff --git a/po/eu.po b/po/eu.po
index c1625212d..c7da436cb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,11 +1,21 @@
+# #-#-#-#-#  eu.po (eu)  #-#-#-#-#
 # translation of eu.po to Basque
 # Copyright (C) 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2004, 2005, 2006, 2008.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2007.
+# #-#-#-#-#  eu.po (eu)  #-#-#-#-#
+# translation of eel.HEAD.po to Basque
+# Copyright (C) 2001, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2004, 2005, 2006.
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2007.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  eu.po (eu)  #-#-#-#-#\n"
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-08 14:28+0100\n"
@@ -17,6 +27,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"#-#-#-#-#  eu.po (eu)  #-#-#-#-#\n"
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-31 15:34+0100\n"
+"PO-Revision-Date: 2007-12-31 15:35+0100\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -373,7 +395,8 @@ msgstr ""
 "zaio mugarik jarriko bistaratutako lerro kopuruari."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "Karpetaren atzeko plano lehenetsiaren kolorea. 'background_set' egia denean "
 "bakarrik erabiltzen da."
@@ -518,7 +541,8 @@ msgstr "Mahaigaineko zakarrontzi-ikonoaren izena"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "Gaitu Nautilus klasikoaren portaera, non leiho guztiak arakatzaileak diren"
+msgstr ""
+"Gaitu Nautilus klasikoaren portaera, non leiho guztiak arakatzaileak diren"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid ""
@@ -573,20 +597,25 @@ msgstr ""
 "erakutsiko ditu."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
-msgid "If set to true, newly opened windows will have the location bar visible."
-msgstr "Egia ezartzen bada, leiho ireki berriek helbide-barra ikusgai edukiko dute."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
+msgstr ""
+"Egia ezartzen bada, leiho ireki berriek helbide-barra ikusgai edukiko dute."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid "If set to true, newly opened windows will have the side pane visible."
-msgstr "Egia ezartzen bada, leiho ireki berriek albo-panela ikusgai edukiko dute."
+msgstr ""
+"Egia ezartzen bada, leiho ireki berriek albo-panela ikusgai edukiko dute."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid "If set to true, newly opened windows will have the status bar visible."
-msgstr "Egia ezartzen bada, leiho ireki berriek egoera-barra ikusgai edukiko dute."
+msgstr ""
+"Egia ezartzen bada, leiho ireki berriek egoera-barra ikusgai edukiko dute."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr "Egia ezartzen bada, leiho ireki berriek tresna-barra ikusgai edukiko dute."
+msgstr ""
+"Egia ezartzen bada, leiho ireki berriek tresna-barra ikusgai edukiko dute."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid ""
@@ -785,11 +814,14 @@ msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "If true, icons will be laid out tighter by default in new windows."
-msgstr "Egia bada, ikonoak lehenespenez estuago aurkeztuko dira leiho berrietan."
+msgstr ""
+"Egia bada, ikonoak lehenespenez estuago aurkeztuko dira leiho berrietan."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
-msgid "If true, labels will be placed beside icons rather than underneath them."
-msgstr "Egia bada, etiketak ikonoen ondoan ezarriko dira haien azpian ezarri ordez."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
+msgstr ""
+"Egia bada, etiketak ikonoen ondoan ezarriko dira haien azpian ezarri ordez."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid "If true, new windows will use manual layout by default."
@@ -848,7 +880,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "x-content/* moten zerrenda (\"Ireki karpeta\"-rekin ezarritakoa)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "x-content/* moten zerrenda aplikazio hobetsia abiarazteko"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
@@ -875,7 +908,8 @@ msgstr "Nautilus-ek mahaigaineko marrazkia kudeatzen du"
 #
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid "Nautilus uses the users home folder as the desktop"
-msgstr "Nautilus-ek erabiltzaileen etxeko direktorioa mahaigain gisa erabiltzen du"
+msgstr ""
+"Nautilus-ek erabiltzaileen etxeko direktorioa mahaigain gisa erabiltzen du"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 msgid "Network Servers icon visible on the desktop"
@@ -922,7 +956,8 @@ msgstr "Sans 10"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
 msgid "Show advanced permissions in the file property dialog"
-msgstr "Erakutsi baimen aurreratuak fitxategien propietateen elkarrizketa-koadroan"
+msgstr ""
+"Erakutsi baimen aurreratuak fitxategien propietateen elkarrizketa-koadroan"
 
 #
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
@@ -1167,7 +1202,8 @@ msgstr "Arakatzailearen leihoetan ireki berri diren fitxak non kokatu."
 #
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:134
 msgid "Whether a custom default folder background has been set."
-msgstr "Direktorioaren atzeko plano lehenetsi pertsonalizatua ezarri den ala ez"
+msgstr ""
+"Direktorioaren atzeko plano lehenetsi pertsonalizatua ezarri den ala ez"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Whether a custom default side pane background has been set."
@@ -1185,7 +1221,8 @@ msgstr "Euskarria automatikoki muntatuko den ala ez"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:138
 msgid "Whether to automatically open a folder for automounted media"
-msgstr "Automatikoki muntatutako euskarriaren karpeta automatikoki irekiko den ala ez"
+msgstr ""
+"Automatikoki muntatutako euskarriaren karpeta automatikoki irekiko den ala ez"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:139
 msgid "Whether to enable immediate deletion"
@@ -1496,7 +1533,8 @@ msgstr "Ezin duzu \"%s\" bolumena zakarrontzira bota."
 msgid ""
 "If you want to eject the volume, please use \"Eject\" in the popup menu of "
 "the volume."
-msgstr "Bolumena egoztea nahi baduzu, erabili \"Egotzi\" bolumenaren laster-menuan."
+msgstr ""
+"Bolumena egoztea nahi baduzu, erabili \"Egotzi\" bolumenaren laster-menuan."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
 msgid ""
@@ -1554,8 +1592,10 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Ikur berriarentzat hutsa ez den gako-hitz bat zehaztu behar duzu."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "Ikurren gako-hitzek letrak, zuriuneak eta zenbakiak bakarrik izan ditzakete."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"Ikurren gako-hitzek letrak, zuriuneak eta zenbakiak bakarrik izan ditzakete."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1830,7 +1870,8 @@ msgstr "Ziur zaude \"%B\" behin betiko ezabatu nahi duzula?"
 #: ../libnautilus-private/nautilus-file-operations.c:1283
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "Ziur zaude hautatutako elementu %'d betiko ezabatu nahi duzula?"
 msgstr[1] "Ziur zaude hautatutako %'d elementuak betiko ezabatu nahi dituzula?"
 
@@ -1871,8 +1912,10 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:1410
 #: ../libnautilus-private/nautilus-file-operations.c:2365
 #: ../libnautilus-private/nautilus-file-operations.c:3323
-msgid "There was an error getting information about the files in the folder \"%B\"."
-msgstr "Errorea gertatu da \"%B\" karpetako fitxategien informazioa eskuratzean."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
+msgstr ""
+"Errorea gertatu da \"%B\" karpetako fitxategien informazioa eskuratzean."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1419
 #: ../libnautilus-private/nautilus-file-operations.c:3332
@@ -2191,7 +2234,8 @@ msgstr "Helburuko karpeta iturburuaren barruan kokatuta dago."
 msgid ""
 "A folder named \"%B\" already exists.  Do you want to merge the source "
 "folder?"
-msgstr "\"%B\" izeneko karpeta badago lehendik. Iturburuko karpeta batzea nahi duzu?"
+msgstr ""
+"\"%B\" izeneko karpeta badago lehendik. Iturburuko karpeta batzea nahi duzu?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3835
 msgid ""
@@ -2226,7 +2270,8 @@ msgstr " \"%B\" izeneko fitxategia badago lehendik. Ordeztea nahi duzu?"
 #: ../libnautilus-private/nautilus-file-operations.c:3849
 #: ../libnautilus-private/nautilus-file-operations.c:4431
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr ""
 "\"%F\"(e)n badago fitxategia lehendik. Hau ordeztean bere eduki guztia "
 "gainidatziko da."
@@ -2235,7 +2280,8 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:3939
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
-msgstr "Ezin izan da existitzen den fitxategia ezabatu (%F(e)n izen berdina duena)."
+msgstr ""
+"Ezin izan da existitzen den fitxategia ezabatu (%F(e)n izen berdina duena)."
 
 #
 #: ../libnautilus-private/nautilus-file-operations.c:4012
@@ -2707,7 +2753,8 @@ msgstr "Bilatu fitxategiak fitxategi-izenaren arabera"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:133
 msgid "Search for files by file name and file properties"
-msgstr "Bilatu fitxategiak fitxategi-izenaren eta fitxategi-propietateen arabera"
+msgstr ""
+"Bilatu fitxategiak fitxategi-izenaren eta fitxategi-propietateen arabera"
 
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
@@ -2983,7 +3030,8 @@ msgstr "Ezezaguna"
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:608
 #, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "Hautatu aplikazio bat %s eta \"%s\" motako beste fitxategiak irekitzeko"
+msgstr ""
+"Hautatu aplikazio bat %s eta \"%s\" motako beste fitxategiak irekitzeko"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:676
 #: ../libnautilus-private/nautilus-open-with-dialog.c:962
@@ -3126,7 +3174,8 @@ msgid "This drop target only supports local files."
 msgstr "Honek jaregiteko helburuak fitxategi lokalak bakarrik onartzen ditu."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Lokalak ez diren fitxategiak irekitzeko, kopiatu karpeta lokal batera eta "
 "berriro jaregin."
@@ -3198,7 +3247,8 @@ msgstr "Autoexekuzioaren galdera"
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:860
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 "Ordenagailu honek atzi ditzazkeen lokaleko eta urruneko disko eta karpeta "
 "guztiak arakatu"
@@ -3263,7 +3313,8 @@ msgstr "Aldatu _mahaigainaren atzeko planoa"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:700
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Zure mahaigaineko atzeko planoaren eredua edo kolorea ezartzeko aukera "
 "ematen dizun leihoa erakusten du"
@@ -3413,7 +3464,8 @@ msgstr "%s%s, %s"
 #: ../src/file-manager/fm-directory-view.c:2309
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
-msgstr "\"%s\" karpetak Nautilus-ek kudea ditzakeenak baino fitxategi gehiago ditu."
+msgstr ""
+"\"%s\" karpetak Nautilus-ek kudea ditzakeenak baino fitxategi gehiago ditu."
 
 #: ../src/file-manager/fm-directory-view.c:2315
 msgid "Some files will not be displayed."
@@ -3512,7 +3564,8 @@ msgstr "\"%s\" kopiatu egingo da 'Itsatsi' komandoa hautatzen baduzu"
 #: ../src/file-manager/fm-directory-view.c:5700
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] ""
 "Hautatutako elementua (%'d) lekuz aldatuko da 'Itsatsi' komandoa hautatzen "
 "baduzu"
@@ -3523,7 +3576,8 @@ msgstr[1] ""
 #: ../src/file-manager/fm-directory-view.c:5707
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] ""
 "Hautatutako elementua (%'d) kopiatu egingo da 'Itsatsi' komandoa hautatzen "
 "baduzu"
@@ -4218,7 +4272,8 @@ msgstr "Arrastatu eta jaregitea ez dago onartuta."
 
 #: ../src/file-manager/fm-directory-view.c:9264
 msgid "Drag and drop is only supported on local file systems."
-msgstr "Arrastatu eta jaregitea fitxategi-sistema lokalekin bakarrik egin daiteke."
+msgstr ""
+"Arrastatu eta jaregitea fitxategi-sistema lokalekin bakarrik egin daiteke."
 
 #: ../src/file-manager/fm-directory-view.c:9329
 #: ../src/file-manager/fm-directory-view.c:9434
@@ -4251,7 +4306,8 @@ msgstr "Komandoa"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Ez duzu behar adinako baimenik \"%s\"(r)en edukia ikusteko."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4270,15 +4326,18 @@ msgstr "Ezin izan dira karpetako edukiak bistaratu."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Karpeta honetan lehendik ere badago \"%s\" izeneko bat. Erabili beste izen "
 "bat."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "Karpeta honetan ez dago \"%s\"(r)ik. Lekuz aldatu edo ezabatu egin duzu?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+"Karpeta honetan ez dago \"%s\"(r)ik. Lekuz aldatu edo ezabatu egin duzu?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
@@ -4311,7 +4370,8 @@ msgstr "Ezin izan da elementua berrizendatu."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Ez duzu behar adinako baimenik \"%s\"(r)en taldea aldatzeko."
 
 #. fall through
@@ -4595,7 +4655,8 @@ msgstr "Bistaratu helbidea zerrenda-ikuspegiarekin."
 
 #: ../src/file-manager/fm-properties-window.c:511
 msgid "You cannot assign more than one custom icon at a time!"
-msgstr "Ezin dituzu ikono pertsonalizatu bat baino gehiago aldi berean esleitu."
+msgstr ""
+"Ezin dituzu ikono pertsonalizatu bat baino gehiago aldi berean esleitu."
 
 #: ../src/file-manager/fm-properties-window.c:512
 #: ../src/nautilus-information-panel.c:494
@@ -5110,7 +5171,8 @@ msgstr "WebDAV segurua (HTTPS)"
 
 #: ../src/nautilus-connect-server-dialog.c:193
 msgid "Cannot Connect to Server. You must enter a name for the server."
-msgstr "Ezin da zerbitzariarekin konektatu. Zerbitzariaren izena sartu behar duzu."
+msgstr ""
+"Ezin da zerbitzariarekin konektatu. Zerbitzariaren izena sartu behar duzu."
 
 #: ../src/nautilus-connect-server-dialog.c:194
 msgid "Please enter a name and try again."
@@ -5380,7 +5442,8 @@ msgid "Choose the order of information to appear in the list view."
 msgstr "Aukeratu informazioaren ordena zerrendako ikuspegian agertzeko."
 
 #: ../src/nautilus-file-management-properties.ui.h:27
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr ""
 "Aukeratu zer gertatuko den euskarria sartzean edo gailuak sistemarekin "
 "konektatzean."
@@ -5674,7 +5737,8 @@ msgstr "Erabili _atzeko plano lehenetsia"
 
 #: ../src/nautilus-information-panel.c:493
 msgid "You cannot assign more than one custom icon at a time."
-msgstr "Ezin dituzu ikono pertsonalizatu bat baino gehiago aldi berean esleitu."
+msgstr ""
+"Ezin dituzu ikono pertsonalizatu bat baino gehiago aldi berean esleitu."
 
 #: ../src/nautilus-information-panel.c:523
 msgid "You can only use images as custom icons."
@@ -6413,7 +6477,8 @@ msgstr "egoera bisualki adierazten du"
 msgid ""
 "Do you want to remove any bookmarks with the non-existing location from your "
 "list?"
-msgstr "Existitzen ez diren helbideen laster-markak kendu nahi dituzu zerrendatik?"
+msgstr ""
+"Existitzen ez diren helbideen laster-markak kendu nahi dituzu zerrendatik?"
 
 #: ../src/nautilus-window-bookmarks.c:102
 msgid "Bookmark for Nonexistent Location"
@@ -6439,7 +6504,8 @@ msgstr "Ikusi uneko karpeta"
 
 #: ../src/nautilus-window-manage-views.c:1883
 msgid "Nautilus has no installed viewer capable of displaying the folder."
-msgstr "Nautilus-ek ez du karpeta bistaratzeko gauza den ikustailerik instalatuta."
+msgstr ""
+"Nautilus-ek ez du karpeta bistaratzeko gauza den ikustailerik instalatuta."
 
 #: ../src/nautilus-window-manage-views.c:1889
 msgid "The location is not a folder."
@@ -6482,8 +6548,10 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "Ezin izan da \"%s\" bistaratu, ostalaria ez delako aurkitu."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "Egiaztatu ondo idatzita dagoela eta zure proxy-ezarpenak zuzenak direla."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"Egiaztatu ondo idatzita dagoela eta zure proxy-ezarpenak zuzenak direla."
 
 #: ../src/nautilus-window-manage-views.c:1947
 #, c-format
@@ -6536,8 +6604,8 @@ msgid ""
 "Nautilus lets you organize files and folders, both on your computer and "
 "online."
 msgstr ""
-"Nautilus-ek zure fitxategi eta karpetak antolatzea uzten dizu, bai ordenagailu "
-"lokalean bai sarean."
+"Nautilus-ek zure fitxategi eta karpetak antolatzea uzten dizu, bai "
+"ordenagailu lokalean bai sarean."
 
 #: ../src/nautilus-window-menus.c:564
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6872,3 +6940,147 @@ msgstr "Zooma"
 msgid "Set the zoom level of the current view"
 msgstr "Ezarri uneko ikuspegiaren zoom-maila"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Irudiaren/etiketaren ertza"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Abisuen elkarrizketa-koadroko etiketa eta irudiaren inguruko ertzaren "
+"zabalera"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Abisu mota"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Abisu mota"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Abisu-botoiak"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Abisuaren elkarrizketa-koadroan erakutsiko diren botoiak"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Erakutsi _xehetasun gehiago"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Testua"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Etiketako testua."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justifikazioa"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Elkarri dagokien etiketako testuko lerroak lerrokatzea. Horrek EZ dio "
+"eragiten bere esleipenaren barruko etiketaren lerrokatzeari. Ikus GtkMisc::"
+"xalign horretarako."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Lerro-itzulbira"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ezarriz gero, lerroak itzulbiratuko ditu testua zabalegia bada."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Kurtsorearen posizioa"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Txertatzeko kurtsorearen uneko posizioa (karakteretan)."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Hautapen-muga"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Hautapenaren bukaeraren aurkako kokapenaren posizioa kurtsoretik hasita "
+"(karakteretan)."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Hautatu dena"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Sarrerako metodoak"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf errorea:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf errorea: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Gainerako erroreak terminalean bakarrik agertuko dira."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Ez dago irudirik hautatuta."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Egin klik irudiaren gainean hautatzeko."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Eragiketa hau geldiarazi dezakezu 'Utzi' botoian klik eginez."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode baliogabea)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "%s irekitzen"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Elementu %d irekitzen"
+msgstr[1] "%d elementu irekitzen"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Sartu pasahitza"
diff --git a/po/fa.po b/po/fa.po
index e948eb972..8c65efbd1 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  fa.po (nautilus HEAD)  #-#-#-#-#
 # Persian translation of nautilus.
 # Copyright (C) 2003, 2004, 2005, 2008 Sharif FarsiWeb, Inc.
 # Roozbeh Pournader <roozbeh@farsiweb.info>, 2003, 2005.
@@ -5,8 +6,16 @@
 # Behnam Pournader <bp@farsiweb.info>, 2005.
 # Elnaz Sarbar <elnaz.s@gmail.com>, 2005, 2008.
 #
+# #-#-#-#-#  fa.po (eel HEAD)  #-#-#-#-#
+# Persian translation of eel.
+# Copyright (C) 2002, 2003, 2004, 2006 Sharif FarsiWeb, Inc.
+# Roozbeh Pournader <roozbeh@farsiweb.info>, 2002, 2003, 2006.
+# Meelad Zakaria <meelad@bamdad.org>, 2004, 2006.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  fa.po (nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-05-28 19:11+0000\n"
@@ -17,6 +26,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"#-#-#-#-#  fa.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-03 07:17+0200\n"
+"PO-Revision-Date: 2006-09-04 16:57+0330\n"
+"Last-Translator: Roozbeh Pournader <roozbeh@farsiweb.info>\n"
+"Language-Team: Persian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -1312,6 +1331,7 @@ msgstr "استفاده از پیش‌فرض"
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:274
 #: ../src/file-manager/fm-list-view.c:1401
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "نام"
 
@@ -2848,33 +2868,37 @@ msgstr ""
 msgid "Could not set as default application"
 msgstr "جابه‌جایی «%s» به مکان جدید ممکن نیست."
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:257
-#, fuzzy
+#: ../eel/eel-mime-application-chooser.c:229
 msgid "Default"
-msgstr "استفاده از پیش‌فرض"
+msgstr "پیش‌فرض"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
+#: ../eel/eel-mime-application-chooser.c:237
+#, fuzzy
 msgid "Icon"
-msgstr "شمایل‌"
+msgstr ""
+"#-#-#-#-#  fa.po (nautilus HEAD)  #-#-#-#-#\n"
+"شمایل‌\n"
+"#-#-#-#-#  fa.po (eel HEAD)  #-#-#-#-#\n"
+"شمایل"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:327
 #, fuzzy
 msgid "Could not remove application"
 msgstr "جابه‌جایی «%s» به مکان جدید ممکن نیست."
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:564
-#, fuzzy
+#: ../eel/eel-mime-application-chooser.c:479
 msgid "No applications selected"
-msgstr "برنامه‌های محبوب"
+msgstr "برنامه‌ای انتخاب نشد"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:592
-#: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, fuzzy, c-format
+#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:984
+#, c-format
 msgid "%s document"
-msgstr "نوشتارها"
+msgstr "%s نوشتار"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:910
+#: ../eel/eel-mime-application-chooser.c:538 ../eel/eel-open-with-dialog.c:997
 msgid "Unknown"
 msgstr "نامعلوم"
 
@@ -2889,80 +2913,73 @@ msgstr ""
 msgid "Open all files of type \"%s\" with:"
 msgstr ""
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:145
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
 msgid "Could not run application"
-msgstr "برنامه‌های محبوب"
+msgstr "برنامه اجرا نشد"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, fuzzy, c-format
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
 msgid "Could not find '%s'"
-msgstr "«%s» پیدا نشد."
+msgstr "'%s' پیدا نشد"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:160
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:190
 msgid "Could not find application"
-msgstr "خطا در راه‌اندازی برنامه"
+msgstr "برنامه پیدا نشد"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
 msgid "Could not add application to the application database: %s"
 msgstr ""
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:235
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:287
 msgid "Could not add application"
-msgstr "برنامه‌های محبوب"
+msgstr "افزودن برنامه ممکن نیست"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:375
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:401
 msgid "Select an Application"
-msgstr "یک شمایل انتخاب کنید"
+msgstr "یک برنامه انتخاب کنید"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5062
+#: ../eel/eel-open-with-dialog.c:809
 msgid "Open With"
 msgstr "باز کردن با"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#: ../eel/eel-open-with-dialog.c:846
 msgid "Select an application to view its description."
-msgstr ""
+msgstr "برنامه‌ای انتخاب کنید تا شرحش نمایش داده شود."
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:789
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:871
 msgid "_Use a custom command"
-msgstr "_حذف شمایل سفارشی"
+msgstr "است_فاده از فرمان سفارشی"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:806
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:888
 msgid "_Browse..."
-msgstr "_حذف..."
+msgstr "_مرور..."
 
+#. #-#-#-#-#  fa.po (nautilus HEAD)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
 #: ../src/file-manager/fm-directory-view.c:6411
 #: ../src/file-manager/fm-directory-view.c:7369
 #: ../src/file-manager/fm-tree-view.c:1067
-#: ../src/nautilus-places-sidebar.c:1653
+#: ../src/nautilus-places-sidebar.c:1653 ../eel/eel-open-with-dialog.c:910
 msgid "_Open"
 msgstr "_باز کردن"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:919
+#: ../eel/eel-open-with-dialog.c:1004
 #, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr ""
+msgstr "باز کردن %s و دیگر پرونده‌های نوع «%s» با:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:955
-#: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#: ../eel/eel-open-with-dialog.c:1036
 msgid "_Add"
-msgstr ""
+msgstr "ا_ضافه کردن"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:956
-#: ../libnautilus-private/nautilus-open-with-dialog.c:971
-#, fuzzy
+#: ../eel/eel-open-with-dialog.c:1037
 msgid "Add Application"
-msgstr "برنامه"
+msgstr "اضافه کردن برنامه"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:81
 msgid "Open Failed, would you like to choose another application?"
@@ -5894,8 +5911,7 @@ msgstr "نشان دادن یادداشت"
 
 #: ../src/nautilus-places-sidebar.c:290 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
-msgstr ""
-"شبکه"
+msgstr "شبکه"
 
 #: ../src/nautilus-places-sidebar.c:1565
 #, c-format
@@ -6735,6 +6751,158 @@ msgstr "زوم"
 msgid "Set the zoom level of the current view"
 msgstr "تنظیم سطح زوم نمای فعلی"
 
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "متن"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "حاشیهٔ تصویر/برچسب"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "عرض حاشیهٔ دور برچسب و تصویر در محاورهٔ آژیر"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "نوع آژیر"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "نوع آژیر"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "دکمه‌های آژیر"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "دکمه‌های نشان داده شده در محاورهٔ آژیر"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "نشان دادن _جزئیات بیشتر"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "متن برچسب"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "تراز"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"ردیف سطرهای متن برچسب نسبت به یکدیگر. این گزینهٔ تأثیری بر ردیف کردن برچسب در "
+"فضای تخصیص یافته به آن ندارد. برای این کار GtkMisc::xalign را ببینید."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "پیچش سطرها"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "اگر یک شود، اگر سطرها خیلی عریض شوند می‌پیچند."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "موقعیت مکان‌نما"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "موقعیت فعلی مکان‌نمای درج در نویسه‌ها."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "محدودهٔ انتخاب"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "موقعیت طرف دیگر انتخاب نسبت به مکان‌نما به نویسه."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "انتخاب همه"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "روش‌های ورودی"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"خطای GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "خطای GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "همهٔ خطاهای بعدی فقط روی پایانه نمایش می‌یابند."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 AM"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "تصویری انتخاب نشد."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "برای انتخاب یک تصویر باید رویش کلیک کنید."
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr ""
+"برنامه‌ای برای باز کردن <i>%s</i> و دیگر پرونده‌های از نوع «%s» انتخاب کنید"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "افزودن برنامه به پایگاه دادهٔ برنامه ممکن نیست"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "می‌توانید با کلیک کردن روی انصراف، این عملیات را متوقف کنید."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (یونی‌کد نامعتبر)"
+
 #~ msgid "Art"
 #~ msgstr "هنر"
 
@@ -7863,9 +8031,6 @@ msgstr "تنظیم سطح زوم نمای فعلی"
 #~ msgid "Factory for text view"
 #~ msgstr "کارخانه‌ای برای نمایش متن"
 
-#~ msgid "Text"
-#~ msgstr "متن"
-
 #~ msgid "Text Viewer"
 #~ msgstr "نمایشگر متن"
 
@@ -8033,3 +8198,21 @@ msgstr "تنظیم سطح زوم نمای فعلی"
 
 #~ msgid "CD-ROM"
 #~ msgstr "سی‌دی"
+
+#~ msgid "GConf Error"
+#~ msgstr "خطای GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "انتخابی انجام نشد"
+
+#~ msgid "Info"
+#~ msgstr "اطلاعات"
+
+#~ msgid "Warning"
+#~ msgstr "هشدار"
+
+#~ msgid "Error"
+#~ msgstr "خطا"
+
+#~ msgid "Question"
+#~ msgstr "سؤال"
diff --git a/po/fi.po b/po/fi.po
index e8911e71b..36f08c4fe 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  fi.po (nautilus)  #-#-#-#-#
 # Nautilus Finnish translation.
 # Copyright (C) 2002-2008 Free Software Foundation, Inc.
 # Pauli Virtanen <pauli.virtanen@hut.fi>, 2000-2005.
@@ -19,8 +20,18 @@
 #
 # script = komentojono
 #
+# #-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#
+# Eel Finnish translation.
+# Suomennos: http://gnome-fi.sourceforge.net/
+#
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Pauli Virtanen <pauli.virtanen@hut.fi>, 2000-2005.
+# Ilkka Tuohela <hile@iki.fi>, 2005.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-22 12:24+0300\n"
@@ -31,6 +42,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Project-Id-Version: eel 1.1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-10 23:06+0300\n"
+"PO-Revision-Date: 2006-06-29 20:38+0200\n"
+"Last-Translator: Ilkka Tuohela <hile@hut.fi>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2885,8 +2907,13 @@ msgid "Could not remove application"
 msgstr "Ohjelmaa ei voitu poistaa"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "Ohjelmaa ei ole valittu"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Ohjelmaa ei ole valittu\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Sovelluksia ei ole valittu"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2900,9 +2927,13 @@ msgid "Unknown"
 msgstr "Tuntematon"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "Valitse ohjelma, jolla %s ja muut \"%s\"-tiedostot avataan"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Valitse ohjelma, jolla %s ja muut \"%s\"-tiedostot avataan\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Valitse sovellus, jolla %s ja muut tyypin \"%s\" tiedostot avataan"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2911,17 +2942,31 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "Avaa kaikki \"%s\"-tyyppiset tiedostot ohjelmalla:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#, fuzzy
 msgid "Could not run application"
-msgstr "Ohjelmaa ei voitu suorittaa"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Ohjelmaa ei voitu suorittaa\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Sovelluksen käynnistäminen ei onnistunut"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "kohdetta \"%s\" ei löytynyt"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"kohdetta \"%s\" ei löytynyt\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Kohdetta \"%s\" ei löytynyt"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#, fuzzy
 msgid "Could not find application"
-msgstr "Ohjelmaa ei löytynyt"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Ohjelmaa ei löytynyt\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Sovellusta ei löytynyt"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2929,30 +2974,56 @@ msgid "Could not add application to the application database: %s"
 msgstr "Sovellusta ei voitu liittää sovellustietokantaan: %s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
+#, fuzzy
 msgid "Could not add application"
-msgstr "Ohjelmaa ei voitu lisätä"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Ohjelmaa ei voitu lisätä\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Sovelluksen lisääminen ei onnistunut"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "Valitse ohjelma"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Valitse ohjelma\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Valitse sovellus"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5104
+#, fuzzy
 msgid "Open With"
-msgstr "Avaa ohjelmalla"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Avaa ohjelmalla\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Avaa sovelluksella"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Valitse ohjelma, jos haluat nähdä sen kuvauksen."
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Valitse ohjelma, jos haluat nähdä sen kuvauksen.\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Valitse sovellus, jonka kuvausta katsellaan."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "_Käytä omaa komentoa"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"_Käytä omaa komentoa\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Käytä _omaa komentoa"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Selaa..."
 
+#. #-#-#-#-#  fi.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2964,9 +3035,13 @@ msgid "_Open"
 msgstr "_Avaa"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "Avaa %s ja muut \"%s\"-tiedostot ohjelmalla:"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Avaa %s ja muut \"%s\"-tiedostot ohjelmalla:\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Avaa tiedosto %s ja muut tyypin \"%s\" tiedostot sovelluksella:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
@@ -2975,8 +3050,13 @@ msgstr "_Lisää"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "Lisää ohjelma"
+msgstr ""
+"#-#-#-#-#  fi.po (nautilus)  #-#-#-#-#\n"
+"Lisää ohjelma\n"
+"#-#-#-#-#  fi.po (eel 1.1.2)  #-#-#-#-#\n"
+"Lisää sovellus"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -6835,6 +6915,146 @@ msgstr "Mittakaava"
 msgid "Set the zoom level of the current view"
 msgstr "Aseta nykyisen näkymän mittakaava"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Kuvan ja nimiön reunus"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Nimiön ja kuvan ympärillä olevan reunuksen leveys ilmoitusikkunassa"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Ilmoitustyyppi"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Ilmoituksen tyyppi"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Ilmoituspainikkeet"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Ilmoitusikkunassa näkyvät painikkeet"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Näytä _lisätietoja"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Teksti"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Nimiön teksti."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Tasaus"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Nimiön tekstirivien tasaus toisiinsa nähden. Tämä EI vaikuta nimiön "
+"tasaukseen sen alueen sisällä. (Katso GtkMisc::xalign tätä varten.)"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Rivitys"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Jos asetettu, rivitä liian pitkät rivit."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Kohdistimen sijainti"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Syöttökohdistimen nykyinen sijainti merkkeinä."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Valinnan raja"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Valinnan vastakkaisen pään sijainti merkkeinä kohdistimesta lukien."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Syöttötavat"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf-virhe:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-virhe: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Seuraavat virheet näkyvät vain päätteessä."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Kuvaa ei valittu."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Kuvaa pitää napsauttaa sen valitsemiseksi."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Voit pysäyttää tämän toiminnon napsauttamalla peru."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (virheellistä Unicodea)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Avataan %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Avataan %d kohta"
+msgstr[1] "Avataan %d kohtaa"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Anna salasana"
+
 #~ msgid "Create Folder"
 #~ msgstr "Luo kansio"
 
@@ -6850,3 +7070,33 @@ msgstr "Aseta nykyisen näkymän mittakaava"
 #~ msgid ""
 #~ "If you clear the list of locations, they will be permanently deleted."
 #~ msgstr "Jos tyhjennät sijaintiluettelon, sen sisältö häviää pysyvästi."
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Sovelluksen lisääminen tietokantaan ei onnistunut"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf-virhe"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Mitään ei valittu"
+
+#~ msgid "Info"
+#~ msgstr "Info-sivut"
+
+#~ msgid "Warning"
+#~ msgstr "Varoitus"
+
+#~ msgid "Error"
+#~ msgstr "Virhe"
+
+#~ msgid "Question"
+#~ msgstr "Kysymys"
diff --git a/po/fr.po b/po/fr.po
index d0ddf5e60..e22c9a8b4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  fr.po (nautilus HEAD)  #-#-#-#-#
 # French translation of nautilus.
 # Copyright (C) 2000-2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nautilus package.
@@ -16,8 +17,23 @@
 # Bruno Brouard <annoa.b@gmail.com>, 2008.
 # Claude Paroz <claude@2xlibre.net>, 2008.
 #
+# #-#-#-#-#  fr.po (eel 2.15.91)  #-#-#-#-#
+# French translation of eel.
+# Copyright (C) 2000-2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+#
+# Christophe Merlet <redfox@redfoxcenter.org>, 2001-2006.
+# Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
+# Baptiste Mille-Mathias (crevette) <bmm80@free.fr>, 2004.
+# Yannick Tailliez <yannickta@yahoo.com>, 2005.
+# Laurent Richard <laurent.richard@ael.be>, 2006.
+# Robert-André Mauchin <zebob.m@pengzone.org>, 2006-2008.
+# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  fr.po (nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 16:44+0200\n"
@@ -28,6 +44,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
+"#-#-#-#-#  fr.po (eel 2.15.91)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.15.91\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-08 18:17+0100\n"
+"PO-Revision-Date: 2008-02-08 18:18+0100\n"
+"Last-Translator: Robert-André Mauchin <zebob.m@pengzone.org>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -344,18 +371,19 @@ msgstr ""
 "Une chaîne indiquant la manière de raccourcir l'affichage de très longs noms "
 "de fichiers par des points de suspension, selon le niveau de zoom. Chaque "
 "élément de la liste est de la forme « Niveau de zoom:Nombre entier ». Pour "
-"chaque niveau de zoom indiqué, si le nombre entier correspondant est plus grand "
-"que 0, le nom de fichier ne dépassera pas ce nombre de lignes. Si le nombre est "
-"plus petit ou égal à 0, aucune limite ne s'applique au niveau de zoom indiqué. "
-"Il est permis d'ajouter un élément sous la forme « Nombre entier » sans préciser "
-"de niveau de zoom. Cela indique le nombre maximum de lignes pour tous les autres "
-"niveaux de zoom. Exemples : 0 - affiche toujours les noms en entier ; 3 - "
-"abrège les noms de fichiers s'ils dépassent trois lignes ; smallest:5, smaller:4"
-",0 - abrège les noms de fichiers s'ils dépassent respectivement cinq et quatre "
-"lignes pour les niveaux de zoom « smallest » et « smaller », mais n'abrège pas "
-"les noms de fichiers pour les autres niveaux de zoom. Les niveaux de zoom "
-"disponibles sont : smallest (33%), smaller (50%), small (66%), standard (100%), "
-"large (150%), larger (200%), largest (400%)"
+"chaque niveau de zoom indiqué, si le nombre entier correspondant est plus "
+"grand que 0, le nom de fichier ne dépassera pas ce nombre de lignes. Si le "
+"nombre est plus petit ou égal à 0, aucune limite ne s'applique au niveau de "
+"zoom indiqué. Il est permis d'ajouter un élément sous la forme « Nombre "
+"entier » sans préciser de niveau de zoom. Cela indique le nombre maximum de "
+"lignes pour tous les autres niveaux de zoom. Exemples : 0 - affiche toujours "
+"les noms en entier ; 3 - abrège les noms de fichiers s'ils dépassent trois "
+"lignes ; smallest:5, smaller:4,0 - abrège les noms de fichiers s'ils "
+"dépassent respectivement cinq et quatre lignes pour les niveaux de zoom "
+"« smallest » et « smaller », mais n'abrège pas les noms de fichiers pour les "
+"autres niveaux de zoom. Les niveaux de zoom disponibles sont : smallest "
+"(33%), smaller (50%), small (66%), standard (100%), large (150%), larger "
+"(200%), largest (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -374,10 +402,11 @@ msgid ""
 "not exceed the given number of lines. If the number is 0 or smaller, no "
 "limit is imposed on the number of displayed lines."
 msgstr ""
-"Un nombre entier indiquant la manière de raccourcir l'affichage de très longs noms "
-"de fichiers par des points de suspension sur le bureau. Si le nombre est plus grand "
-"que 0, le nom de fichier ne dépassera pas ce nombre de lignes. Si le nombre est plus "
-"petit ou égal à 0, aucune limite n'est appliquée au nombre de lignes affichées."
+"Un nombre entier indiquant la manière de raccourcir l'affichage de très "
+"longs noms de fichiers par des points de suspension sur le bureau. Si le "
+"nombre est plus grand que 0, le nom de fichier ne dépassera pas ce nombre de "
+"lignes. Si le nombre est plus petit ou égal à 0, aucune limite n'est "
+"appliquée au nombre de lignes affichées."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid ""
@@ -6964,6 +6993,150 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Définit le niveau de zoom de la vue actuelle"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bordure de l'image/étiquette"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Largeur de la bordure autour de l'étiquette et de l'image dans la boîte de "
+"dialogue d'alerte"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Type d'alerte"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Le type d'alerte"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Boutons d'alerte"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Les boutons affichés dans la boîte de dialogue d'alerte"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Afficher plus de _détails"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Texte"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Le texte de l'étiquette."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justification"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"L'alignement des lignes dans le texte de l'étiquette relativement aux "
+"autres. Cela n'affecte pas l'alignement de l'étiquette à l'intérieur de son "
+"allocation. Voir GtkMisc::xalign pour cela."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Coupure des lignes"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Si défini, coupe les lignes si le texte devient trop grand."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Position du curseur"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "La position actuelle du curseur d'insertion, en caractères."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Limite de la sélection"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"La position du coin opposé de la sélection depuis le curseur, en caractères."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Méthodes de saisie"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Erreur GConf :\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erreur GConf : %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Toutes les autres erreurs ne seront indiquées que dans le terminal."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Aucune image n'a été sélectionnée."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Vous devez cliquer sur une image pour la sélectionner."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Vous pouvez arrêter cette opération en cliquant sur annuler."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode non valide)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Ouverture de %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Ouverture d'un élément"
+msgstr[1] "Ouverture de %d éléments"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Saisissez le mot de passe"
+
 #~ msgid "Create Folder"
 #~ msgstr "Créer un dossier"
 
diff --git a/po/ga.po b/po/ga.po
index d9fc6cf0b..bac69f72d 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,11 +1,20 @@
+# #-#-#-#-#  ga.po (nautilus HEAD)  #-#-#-#-#
 # Irish translations for nautilus package.
 # Copyright (C) 2000-2008 Free Software Foundation, Inc.
 # Alastair McKinstry <mckinstry@computer.org>, 2000.
 # Paul Duffy <dubhthach@frink.nuigalway.ie>, 2003.
 # Seán de Búrca <leftmostcat@gmail.com>, 2007-2008.
 #
+# #-#-#-#-#  ga.po (eel HEAD)  #-#-#-#-#
+# Irish language translations for Nautilus.
+# Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+# Paul Duffy <dubhthach@zion.nuigalway.ie>, 2003
+# Alastair McKinstry <mckinstry@computer.org>, 2000 
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ga.po (nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-31 22:13-0400\n"
@@ -17,6 +26,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
 "10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"#-#-#-#-#  ga.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2004-02-16 07:35+0100\n"
+"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
+"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2799,15 +2818,18 @@ msgid "Open all files of type \"%s\" with:"
 msgstr ""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
 msgid "Could not run application"
 msgstr ""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
+#: eel/eel-open-with-dialog.c:187
 #, c-format
 msgid "Could not find '%s'"
 msgstr ""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#: eel/eel-open-with-dialog.c:190
 msgid "Could not find application"
 msgstr ""
 
@@ -2830,6 +2852,7 @@ msgid "Open With"
 msgstr "Oscail Le"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#: eel/eel-open-with-dialog.c:830
 msgid "Select an application to view its description."
 msgstr ""
 
@@ -6722,3 +6745,185 @@ msgstr "Súmáil"
 #: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr ""
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr ""
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Téacs"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "An téacs ar an lipéad"
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Comhfhadú"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Tá an Ailíniú atá ag na línte coibhnesta le chéile. Ní dheanainn é seo aon "
+"difríocht leis an ailíniú atá ag an lipéad sa lipéad féin. Feach ar GtkMisc::"
+"xalign le haighaidh é sin."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Líne a fhilleadh"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"Mar bhfuil sé ag siúl, cuir na línte ag fhilleadh nuair a bhíonn an téacs ró-"
+"fhada"
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Áit an Cursor"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "An áit a bhfuil an cursor i chars."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Ag triall ar an rogha"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "An áit ar deireadh an rogha ón an cursor i chars."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Roghnaigh gach rud"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Modhanna le haighaidh ionchur"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Earraidh GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Earraidh GConf: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Beidh tú in an na earraidh eile a feachaint sa terminal"
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 IN"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 IN"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00, 1:00 IN"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr ""
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Níl bhfuil aon íomha roghnach agat. Caithfidh tú íomha a cniog"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr ""
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr ""
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr ""
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (Unicód mícheart)"
+
+#~ msgid "GConf Error"
+#~ msgstr "Earraidh GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Níl aon roghnach deanta"
+
+#~ msgid "Info"
+#~ msgstr "Eolas"
+
+#~ msgid "Warning"
+#~ msgstr "Fógairt"
+
+#~ msgid "Error"
+#~ msgstr "Earraidh"
+
+#~ msgid "Question"
+#~ msgstr "Ceist"
diff --git a/po/gl.po b/po/gl.po
index 5f158d876..bed0a473b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  gl.po (gl)  #-#-#-#-#
 # translation of gl.po to Galego
 # Galician translation of nautilus.
 # Copyright (C) 2000-2004 Jesús Bravo Álvarez.
@@ -12,8 +13,23 @@
 # Ignacio Casal Quinteiro <icq@cvs.gnome.org>, 2007.
 # Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007, 2008.
 # Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2008.
+# #-#-#-#-#  gl.po (gl)  #-#-#-#-#
+# translation of gl.po to Galego
+# Galician translation of eel.
+# Copyright (C) 2000-2002 Jesús Bravo Álvarez.
+#
+# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
+# colaborar connosco, podes atopar máis información en http://www.trasno.net
+#
+# First Version: 2000-05-06 20:53+0200
+#
+# Jesús Bravo Álvarez <suso@trasno.net>, 2000-2002.
+# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005, 2006.
+# Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  gl.po (gl)  #-#-#-#-#\n"
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-01 21:26+0200\n"
@@ -25,6 +41,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  gl.po (gl)  #-#-#-#-#\n"
+"Project-Id-Version: gl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-24 12:44+0100\n"
+"PO-Revision-Date: 2008-01-24 12:47+0100\n"
+"Last-Translator: Ignacio Casal Quinteiro <icq@svn.gnome.org>\n"
+"Language-Team: Galego <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6908,6 +6936,148 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Establecer o nivel de zoom para a visualización actual"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bordo de imaxe/etiqueta"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Anchura do bordo arrededor da etiqueta e imaxe no diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tipo de alerta"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "O tipo de alerta"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Botóns de alerta"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Os botóns mostrados no diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Mostrar máis _detalles"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Texto"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "O texto da etiqueta."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Xustificación"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"A aliñación das liñas de texto da etiqueta relativa a cada outra. Isto NON "
+"afecta á aliñación da etiqueta dentro da súa asignación. Vexa GtkMisc::"
+"xalign para facer iso."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Axuste de liña"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Se está activado, axusta as liñas se o texto se vólve demasiado ancho."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Posición do cursor"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "A posición actual en caracteres do cursor de inserción."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Límite da selección"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"A posición en caracteres do extremo oposto da selección desde o cursor."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Métodos de entrada"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Erro do GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erro do GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Os erros posteriores aparecerán só no terminal."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Non se seleccionou ningunha imaxe."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Ten que premer nunha imaxe para seleccionala."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Pode deter esta operación premendo cancelar."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode non válido)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Abrindo %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Abrindo %d elemento"
+msgstr[1] "Abrindo %d elementos"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Introduza o contrasinal"
+
 #~ msgid "Create Folder"
 #~ msgstr "Crear cartafol"
 
diff --git a/po/gu.po b/po/gu.po
index 727010d6e..0d6d94300 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,8 +1,17 @@
+# #-#-#-#-#  gu.po (nautilus.HEAD.gu)  #-#-#-#-#
 # translation of nautilus.HEAD.gu.po to Gujarati
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
 # Ankit Patel <ankit@redhat.com>, 2005, 2006, 2007.
+# #-#-#-#-#  gu.po (eel.HEAD.gu)  #-#-#-#-#
+# translation of eel.HEAD.gu.po to Gujarati
+# MagNet <magnet@magnet-i.com>, 2004.
+# Ankit Patel <ankit@redhat.com>, 2004, 2005, 2007, 2008.
+# Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  gu.po (nautilus.HEAD.gu)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.gu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-08-14 03:46+0100\n"
@@ -13,7 +22,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -37,6 +48,25 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"#-#-#-#-#  gu.po (eel.HEAD.gu)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.gu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-03-05 12:14+0530\n"
+"Last-Translator: Ankit Patel <ankit@redhat.com>\n"
+"Language-Team: Gujarati <fedora-trans-gu@redhat.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"<magnet@magnet-i.com>\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
 "\n"
 
 #: ../data/browser.xml.h:1
@@ -491,7 +521,8 @@ msgstr ""
 "નહિતર તે ડિરેક્ટરી અને ફાઇલો બંને બતાવશે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "જો ખરા તરીકે સુયોજિત કરેલ હોય તો, નવી ખૂલેલી વિન્ડોમાં સ્થાન દર્શક પટ્ટી દેખાશે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -604,7 +635,8 @@ msgstr "જો ખરા તરીકે સુયોજિત કરેલ હ�
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
-msgstr "જો ખરા તરીકે સુયોજિત કરેલ હોય તો, ઘર ડિરેક્ટરી સાથે જોડતા ચિહ્નને ડૅસ્કટોપ પર મૂકાશે."
+msgstr ""
+"જો ખરા તરીકે સુયોજિત કરેલ હોય તો, ઘર ડિરેક્ટરી સાથે જોડતા ચિહ્નને ડૅસ્કટોપ પર મૂકાશે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid ""
@@ -616,7 +648,8 @@ msgstr "જો ખરા તરીકે સુયોજિત કરેલ હ�
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
-msgstr "જો આ ખરા તરીકે સુયોજિત કરેલ હોય તો, માઉન્ટ થયેલ વોલ્યુમને જોડતા ચિહ્નને ડૅસ્કટોપ પર મૂકાશે."
+msgstr ""
+"જો આ ખરા તરીકે સુયોજિત કરેલ હોય તો, માઉન્ટ થયેલ વોલ્યુમને જોડતા ચિહ્નને ડૅસ્કટોપ પર મૂકાશે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
@@ -645,7 +678,8 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "જો ખરુ હોય તો, મૂળભૂત રીતે નવી વિન્ડોમાં બધા ચિહ્નો સજ્જડ રીતે ગોઠવાયેલા હશે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "જો ખરુ હોય તો, લેબલ ચિહ્નની નીચે મૂકાવાની જગ્યાએ તેની પાછળ મૂકાશે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
@@ -843,7 +877,8 @@ msgstr "ડૅસ્કટોપ પર ઉપયોગમાં લેવાય
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "ફાઈલની તારીખોનું બંધારણ. \"સ્થાનિય\", \"iso\", અને \"informal\" શક્ય કિંમતો છે."
+msgstr ""
+"ફાઈલની તારીખોનું બંધારણ. \"સ્થાનિય\", \"iso\", અને \"informal\" શક્ય કિંમતો છે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "The side pane view to show in newly opened windows."
@@ -861,7 +896,8 @@ msgstr ""
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
-msgstr "જો તમારે ડૅસ્કટોપ પર ઘરના ચિહ્ન માટે કસ્ટમ નામ જોઇતુ હોય તો આ નામને સુયોજિત કરી શકાશે."
+msgstr ""
+"જો તમારે ડૅસ્કટોપ પર ઘરના ચિહ્ન માટે કસ્ટમ નામ જોઇતુ હોય તો આ નામને સુયોજિત કરી શકાશે."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
 msgid ""
@@ -1176,11 +1212,14 @@ msgstr "સાંકેતિક ચિહ્નો સ્થાપિત કર
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:199
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
-msgstr "માફ કરજો, પણ નવા સાંકેતિક ચિહ્ન માટે તમારે ખાલી ન હોય તેવો મુખ્ય-શબ્દ સ્પષ્ટ કરવો પડશે."
+msgstr ""
+"માફ કરજો, પણ નવા સાંકેતિક ચિહ્ન માટે તમારે ખાલી ન હોય તેવો મુખ્ય-શબ્દ સ્પષ્ટ કરવો પડશે."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:204
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "માફ કરજો, પણ સાંકેતિક ચિહ્ન માટેનો મુખ્ય-શબ્દ ફક્ત અક્ષરો, આંકડા અને ખાલી જગ્યા સમાવી શકે."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"માફ કરજો, પણ સાંકેતિક ચિહ્ન માટેનો મુખ્ય-શબ્દ ફક્ત અક્ષરો, આંકડા અને ખાલી જગ્યા સમાવી શકે."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1261,7 +1300,8 @@ msgstr "કાઢતી વખતે ભૂલ."
 msgid ""
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
-msgstr "\"%s\" ને કાઢી શકાતુ નથી કારણકે તેના પિતૃ ફોલ્ડરને બદલવા માટે તમારી પાસે પરવાનગી નથી."
+msgstr ""
+"\"%s\" ને કાઢી શકાતુ નથી કારણકે તેના પિતૃ ફોલ્ડરને બદલવા માટે તમારી પાસે પરવાનગી નથી."
 
 #: ../libnautilus-private/nautilus-file-operations.c:689
 #, c-format
@@ -1460,7 +1500,8 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "\"%s\" માં ફાઈલ પહેલાથી જ હાજર છે.  તેને બદલવાનું તેના સમાવિષ્ટો પર ફરીથી લખશે."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
@@ -2365,9 +2406,14 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:489
 #: ../libnautilus-private/nautilus-program-choosing.c:731
-#, c-format
+#: ../eel/eel-app-launch-context.c:405
+#, fuzzy, c-format
 msgid "Opening %s"
-msgstr "\"%s\" ખોલી રહ્યા છે"
+msgstr ""
+"#-#-#-#-#  gu.po (nautilus.HEAD.gu)  #-#-#-#-#\n"
+"\"%s\" ખોલી રહ્યા છે\n"
+"#-#-#-#-#  gu.po (eel.HEAD.gu)  #-#-#-#-#\n"
+"%s ખોલી રહ્યા છીએ"
 
 #. TODO: These strings suck pretty badly, but we're in string-freeze,
 #. * and I found these in other places to reuse. We should make them
@@ -2412,7 +2458,8 @@ msgstr "\"%s\" પ્રદર્શિત કરી શકાતુ નથી,
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1522
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "તેની જોડણી અને પ્રોક્સી સુયોજના બરાબર છે કે નહી તે ચકાસો."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:616
@@ -2437,6 +2484,7 @@ msgid "Couldn't find \"%s\"."
 msgstr "\"%s\" શોધી શકાયુ નહિ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:734
+#: ../eel/eel-app-launch-context.c:408
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
@@ -2462,8 +2510,10 @@ msgid "This drop target only supports local files."
 msgstr "ત્યાં છોડેલ લક્ષ્ય ફક્ત સ્થાનિક ફાઇલોને આધાર આપે છે."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "સ્થાનીય ન હોય તેવી ફાઇલ ખોલવા તેને સ્થાનિક ફોલ્ડરમાં નકલ કરો અને ફરીથી તેને ત્યાં મુકો."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"સ્થાનીય ન હોય તેવી ફાઇલ ખોલવા તેને સ્થાનિક ફોલ્ડરમાં નકલ કરો અને ફરીથી તેને ત્યાં મુકો."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:954
 msgid ""
@@ -2501,7 +2551,8 @@ msgstr "છેલ્લે કરેલા ફેરફારને ફરીથ
 
 #. label, accelerator
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:658
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "આ કમ્પ્યૂટરમાંથી સુલભ બધી સ્થાનિક અને દૂરસ્થ ડિસ્કો અને ફોલ્ડરો બ્રાઉઝ કરો"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2591,7 +2642,8 @@ msgstr "ડેસ્કટોપનો પાશ્વ ભાગ બદલો (_
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "તમને તમારી ડેસ્કટોપના પાશ્વ ભાગની ભાત અથવા રંગનુ સુયોજન કરવા દે તે વિન્ડો દર્શાવો"
 
 #. tooltip
@@ -2649,7 +2701,8 @@ msgstr "શું ખરેખર તમે \"%s\" ને હંમેશ મા
 #: ../src/file-manager/fm-directory-view.c:1006
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] "શું ખરેખર તમે પસંદિત વસ્તુ %d ને હંમેશ માટે કાઢી નાખવા માગો છો?"
 msgstr[1] "શું ચોક્કસ તમે પસંદિત વસ્તુ %d ને હંમેશ માટે કાઢી નાખવા માગો છો?"
 
@@ -2794,8 +2847,10 @@ msgstr[0] "પસંદ થયેલ વસ્તુ કચારાપેટી
 msgstr[1] "પસંદ થયેલ વસ્તુઓમાંની %d કચારાપેટીમાં ખસેડી શકાતી નથી"
 
 #: ../src/file-manager/fm-directory-view.c:3852
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
-msgstr "અમુક વસ્તુઓ કચરાપેટીમાં મોકલી શકાતી નથી. શું તમે તેને તાત્કાલીક કાઢી નાંખવા માગો છો?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr ""
+"અમુક વસ્તુઓ કચરાપેટીમાં મોકલી શકાતી નથી. શું તમે તેને તાત્કાલીક કાઢી નાંખવા માગો છો?"
 
 #: ../src/file-manager/fm-directory-view.c:3853
 #, c-format
@@ -2900,7 +2955,8 @@ msgstr "આ ફોલ્ડરમાંની બધી ચલાવી શક�
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
-msgstr "મેનુમાંથી કોઇપણ લિપિ પસંદ કરતા તે લિપિને કોઈપણ પસંદ કરેલ ઇનપુટ વસ્તુ સાથે ચલાવી શકાય છે."
+msgstr ""
+"મેનુમાંથી કોઇપણ લિપિ પસંદ કરતા તે લિપિને કોઈપણ પસંદ કરેલ ઇનપુટ વસ્તુ સાથે ચલાવી શકાય છે."
 
 #: ../src/file-manager/fm-directory-view.c:5936
 msgid ""
@@ -2956,14 +3012,16 @@ msgstr "જો તમે ચોંટાડો આદેશ પસંદ કર�
 #: ../src/file-manager/fm-directory-view.c:6111
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
 msgstr[0] "જો તમે ચોંટાડો આદેશ પસંદ કરો તો %d પસંદિત વસ્તુ ખસેડાઈ જશે"
 msgstr[1] "જો તમે ચોંટાડો આદેશ પસંદ કરો તો %d પસંદિત વસ્તુઓ ખસેડાઈ જશે"
 
 #: ../src/file-manager/fm-directory-view.c:6118
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
 msgstr[0] "જો તમે ચોંટાડો આદેશ પસંદ કરો તો %d પસંદિત વસ્તુની નકલ થશે"
 msgstr[1] "જો તમે ચોંટાડો આદેશ પસંદ કરો તો %d પસંદિત વસ્તુઓની નકલ થશે"
 
@@ -3120,7 +3178,8 @@ msgstr "ફોલ્ડરમાં ચોંટાડો (_P)"
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
-msgstr "કાપો અથવા નકલ કરો આદેશ દ્વારા પસંદ થયેલ ફાઈલો પસંદિત ફોલ્ડરમાં ખસેડો અથવા નકલ કરો"
+msgstr ""
+"કાપો અથવા નકલ કરો આદેશ દ્વારા પસંદ થયેલ ફાઈલો પસંદિત ફોલ્ડરમાં ખસેડો અથવા નકલ કરો"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6963
@@ -3495,7 +3554,8 @@ msgstr "શરૂ કરનાર"
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\"માંની સમાવિષ્ટ વસ્તુઓ જોવા માટે તમારી પાસે પરવાનગી નથી."
 
 #: ../src/file-manager/fm-error-reporting.c:64
@@ -3514,12 +3574,14 @@ msgstr "ફોલ્ડરના સમાવિષ્ટો દર્શાવ�
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "આ ફોલ્ડરમાં \"%s\" નામ પહેલેથી જ વપરાયેલ છે. મહેરબાની કરીને અલગ નામ વાપરો."
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "આ ફોલ્ડરમાં કોઇ \"%s\" નથી. કદાચ તે હમણાં જ તેની ખસેડી છે કે કાઢી નાખ્યુ છે?"
 
 #: ../src/file-manager/fm-error-reporting.c:118
@@ -3532,7 +3594,8 @@ msgstr "\"%s\" ને ફરીથી નામ આપવા માટે તમ
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
-msgstr "\"%s\" નામ યોગ્ય નથી કારણકે તે \"/\" અક્ષર ધરાવે છે. મહેરબાની કરીને બીજુ નામ વાપરો."
+msgstr ""
+"\"%s\" નામ યોગ્ય નથી કારણકે તે \"/\" અક્ષર ધરાવે છે. મહેરબાની કરીને બીજુ નામ વાપરો."
 
 #: ../src/file-manager/fm-error-reporting.c:127
 #, c-format
@@ -3555,7 +3618,8 @@ msgstr "વસ્તુનું નામ બદલી શકાયું ન�
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\"નો જૂથ બદલવા તમારી પાસે જરુરી પરવાનગી નથી."
 
 #: ../src/file-manager/fm-error-reporting.c:173
@@ -3588,7 +3652,8 @@ msgstr "માલિક બદલી શકાયો નથી."
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" ની પરવાનગીઓ બદલી શકાઈ નથી કારણકે તે ફક્ત વાંચી શક્ય તેવી ડિસ્ક પર છે"
 
 #: ../src/file-manager/fm-error-reporting.c:246
@@ -5661,7 +5726,8 @@ msgstr "ચકાસો કે તમારા પ્રોક્સી સુ�
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
 "browser."
-msgstr "\"%s\" પ્રદર્શિત કરી શકતા નથી, કારણ કે નોટિલસ SMB મુખ્ય બ્રાઉઝરનો સંપર્ક કરી શકતુ નથી."
+msgstr ""
+"\"%s\" પ્રદર્શિત કરી શકતા નથી, કારણ કે નોટિલસ SMB મુખ્ય બ્રાઉઝરનો સંપર્ક કરી શકતુ નથી."
 
 #: ../src/nautilus-window-manage-views.c:1537
 msgid "Check that an SMB server is running in the local network."
@@ -5970,3 +6036,130 @@ msgstr "નાનુમોટુ"
 msgid "Set the zoom level of the current view"
 msgstr "વર્તમાન દ્રશ્ય માટે નાનુમોટુ કરવાનુ સ્તર સુયોજિત કરો"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ચિત્ર/લેબલ કિનારી"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "ચેતવણી સંવાદમાં લેબલ અને ચિત્રની ફરતેની કિનારીની પહોળાઈ"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "ચેતવણી પ્રકાર"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "ચેતવણાનો પ્રકાર"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "ચેતવણી બટનો"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "ચેતવણી સંવાદમાં દેખાતા બટનો"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "વધુ વિગતો બતાવો (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "લખાણ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "લેબલ પરનું લખાણ."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "સમર્થન"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"લેબલ પરના લખાણમાં લીટીઓની એક-બીજાને અનુલક્ષીને કતારબંધ ગોઠવણી.આ તેની ફાળવણીમાં લેબલની "
+"કતારબંધ ગોઠવણીને અસર કરતુ નથી. તેના માટે GtkMisc::xalign જૂઓ."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "લીટી લપેટો"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "જો સુયોજિત હોય અને લખાણ બહુ મોટું થઈ જાય તો લીટી લપેટી દો."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "કર્સરની જગ્યા"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "દાખલ કરવા માટેના કર્સરની અક્ષરોમાં વર્તમાન સ્થિતિ."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "પસંદગી સીમા"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "કર્સરથી અક્ષરોમાં પસંદગીની વિરુદ્ધ દિશામાં સ્થિતિ."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "બધુ પસંદ કરો"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "ઈનપુટની પધ્ધિતઓ"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"જીકોન્ફ ભૂલ:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "જીકોન્ફ ભૂલ: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "હવે પછીની ભૂલો ફક્ત ટર્મિનલ પર દર્શાવવામાં આવશે."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "કોઈ ચિત્ર પસંદ થયેલ નથી."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "ચિત્ર પસંદ કરવા તેના પર ક્લિક કરવુ જ પડશે."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "તમે આ પ્રક્રિયા રદ કરો બટન પર ક્લિક કરીને અટકાવી શકો છો."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (અયોગ્ય યુનીકોડ)"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "પાસવર્ડ દાખલ કરો"
diff --git a/po/he.po b/po/he.po
index b14c71f63..c1c2239ad 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,11 +1,23 @@
+# #-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#
 # translation of nautilus.HEAD.he.po to Hebrew
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
 # Gil 'Dolfin' Osher <dolfin@rpg.org.il>, 2002,2003.
 # Gil Osher <dolfin@rpg.org.il>, 2004, 2005.
 #
+# #-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#
+# translation of eel.HEAD.he.po to Hebrew
+# translation of eel.he.po to Hebrew
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Gil Osher <dolfin@rpg.org.il>, 2002, 2004.
+# Gil 'Dolfin' Osher <dolfin@rpg.org.il>, 2002,2003.
+# Yuval Tanny, 2005.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.he\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=nautilus&amp;component=general\n"
@@ -17,6 +29,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.he\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2005-07-31 03:30+0300\n"
+"Last-Translator: Yuval Tanny\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../cut-n-paste-code/libegg/eggdesktopfile.c:165
 #, c-format
@@ -2905,20 +2929,35 @@ msgid "Could not set as default application"
 msgstr "לא ניתן לקבוע כיישום ברירת המחדל"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "בברירת מחדל"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"בברירת מחדל\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"ברירת מחדל"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:266
+#, fuzzy
 msgid "Icon"
-msgstr "איקון"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"איקון\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"סמל"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:328
 msgid "Could not remove application"
 msgstr "לא ניתן להסיר את היישום"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:540
+#, fuzzy
 msgid "No applications selected"
-msgstr "לא נבחרו יישומים"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"לא נבחרו יישומים\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"‏לא נבחר יישום"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:568
 #: ../libnautilus-private/nautilus-open-with-dialog.c:944
@@ -2932,9 +2971,13 @@ msgid "Unknown"
 msgstr "לא ידוע"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:608
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "בחר יישום לפתיחת %s וקבצים אחרים מסוג \"%s\""
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"בחר יישום לפתיחת %s וקבצים אחרים מסוג \"%s\"\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"בחר ביישום לפתוח את %s וקבצים אחרים מסוג \"%s\""
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:676
 #: ../libnautilus-private/nautilus-open-with-dialog.c:962
@@ -2943,17 +2986,31 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "פתח את כל הקבצים מסוג \"%s\" עם:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:146
+#, fuzzy
 msgid "Could not run application"
-msgstr "לא ניתן להריץ את היישום"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"לא ניתן להריץ את היישום\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"לא ניתן להריץ יישום"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:158
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "לא ניתן למצוא את '%s'."
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"לא ניתן למצוא את '%s'.\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"לא ניתן למצוא '%s'"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:161
+#, fuzzy
 msgid "Could not find application"
-msgstr "היישום לא נימצא"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"היישום לא נימצא\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"לא ניתן למצוא יישום"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
 #, c-format
@@ -2961,8 +3018,13 @@ msgid "Could not add application to the application database: %s"
 msgstr "לא ניתן להוסיף את היישום למסד נתוני היישומים: %s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:236
+#, fuzzy
 msgid "Could not add application"
-msgstr "לא ניתן להוסיף את היישום"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"לא ניתן להוסיף את היישום\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"לא ניתן להוסיף יישום"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:403
 msgid "Select an Application"
@@ -2970,21 +3032,42 @@ msgstr "בחר יישום"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:761
 #: ../src/file-manager/fm-properties-window.c:5104
+#, fuzzy
 msgid "Open With"
-msgstr "פתיחה באמצעות"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"פתיחה באמצעות\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"פתח עם"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:798
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "בחר יישום כדי לצפות בתיאור שלו."
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"בחר יישום כדי לצפות בתיאור שלו.\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"בחר ביישום כדי לראות את הפרוט שלו"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:823
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "_השתמש בפקודה מותאמת אישית"
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"_השתמש בפקודה מותאמת אישית\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"השתמש ב_פקודה מותאמת אישית"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:840
+#, fuzzy
 msgid "_Browse..."
-msgstr "_עיון..."
+msgstr ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"_עיון...\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"_דפדף..."
 
+#. #-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:869
@@ -6289,8 +6372,7 @@ msgstr ""
 msgid ""
 "Nautilus lets you organize files and folders, both on your computer and "
 "online."
-msgstr ""
-"‏Nautilus מאפשר לך לארגן את הקבצים והתיקיות שלך, הן במחשב שלך והן ברשת."
+msgstr "‏Nautilus מאפשר לך לארגן את הקבצים והתיקיות שלך, הן במחשב שלך והן ברשת."
 
 #: ../src/nautilus-window-menus.c:564
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6613,6 +6695,154 @@ msgstr "זום"
 msgid "Set the zoom level of the current view"
 msgstr "קבע את רמת הקירוב של התצוגה הנוכחית"
 
+#: ../eel/eel-app-launch-context.c:408
+#, fuzzy, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"פותח פריט %d\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"פותח פריט אחד"
+msgstr[1] ""
+"#-#-#-#-#  he.po (nautilus.HEAD.he)  #-#-#-#-#\n"
+"פותח %d פריטים\n"
+"#-#-#-#-#  he.po (eel.HEAD.he)  #-#-#-#-#\n"
+"פותח %d פריטים"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "גבול תמונה/תווית"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "רוחב הגבול סביב התווית והתמונה בדו-שיח התרעה"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "סוג התרעה"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "סוג ההתרעה"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "כפתורי התרעה"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "הכפתורים שיוצגו בדו-שיח ההתרעה"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "הצג עוד _פרטים"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "טקסט"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "טקסט התווית."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "יישור"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"יישור הקווים בטקסט של התווית ביחס אחד לשני. זה לא משפיע על היישור של התווית "
+"בתוך השטח שלה. ראה GtkMisc::xalign לזה."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "גלישת שורות"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "אם נקבע, גלוש לשורה הבאה, אם הטקסט ניהיה רחב מידי."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "מיקום הסמן"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "המיקום הנוכחי של סמן ההכנסה בתווים."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "תחום הבחירה"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "המיקום של סוף הבחירה הנגדי מהסמן בתווים."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "בחר הכל"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "שיטות קלט"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"שגיאת GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "שגיאת GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "כל שאר השגיאות מופיעות רק במסוף."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "אף תמונה לא נבחרה."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "אתה חייב ללחוץ על תמונה כדי לבחור אותה."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "אתה יכול לעצור פעולה זו על-ידי לחיצה על ביטול."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (יוניקוד לא תקני)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "פותח את %s"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "הכנס סיסמה"
+
 #~ msgid "Factory for Nautilus shell and file manager"
 #~ msgstr "יצרן למעטפת Nautilus ולמנהל הקבצים"
 
@@ -7212,11 +7442,6 @@ msgstr "קבע את רמת הקירוב של התצוגה הנוכחית"
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "\"%s\" אינו מיקום תקני."
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "פותח פריט %d"
-#~ msgstr[1] "פותח %d פריטים"
-
 # msgid "Are you sure you want to permanently delete the %d selected item?"
 # "Are you sure you want to permanently delete the %d selected items?"
 # msgstr "אתה בטוח שברצונך למחוק לצמיתות את הפריט ה-%d שנבחר?"
@@ -8160,3 +8385,33 @@ msgstr "קבע את רמת הקירוב של התצוגה הנוכחית"
 
 #~ msgid "Nautilus file manager search results list view"
 #~ msgstr "מנהל הקבצים של נאוטילוס תצוגת סמלים של תוצאות חיפוש"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "לא ניתן להוסיף את היישום למסד נתונים של היישומים"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 AM"
+
+#~ msgid "GConf Error"
+#~ msgstr "שגיאת GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "לא נבחר דבר"
+
+#~ msgid "Info"
+#~ msgstr "מידע"
+
+#~ msgid "Warning"
+#~ msgstr "אזהרה"
+
+#~ msgid "Error"
+#~ msgstr "שגיאה"
+
+#~ msgid "Question"
+#~ msgstr "שאלה"
diff --git a/po/hi.po b/po/hi.po
index b928b3b74..5f61ea5e3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  hi.po (nautilus.HEAD.hi)  #-#-#-#-#
 # translation of hi.po to Hindi
 # translation of nautilus.HEAD.hi.po to Hindi
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,8 +6,18 @@
 # Ravishankar Shrivastava <raviratlami@yahoo.com>, 2004.
 # Rajesh Ranjan <rranjan@redhat.com>, 2005, 2006.
 #
+# #-#-#-#-#  hi.po (eel.HEAD.hi)  #-#-#-#-#
+# translation of hi.po to Hindi
+# translation of eel.HEAD.hi.po to Hindi
+# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# G Karunakar <karunakar@freedomink.org>, 2004.
+# Ravishankar Shrivastava <raviratlami@yahoo.com>, 2004.
+# Rajesh Ranjan <rranjan@redhat.com>, 2005, 2006.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  hi.po (nautilus.HEAD.hi)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.hi\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-31 11:44+0200\n"
@@ -17,12 +28,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
+"\n"
+"\n"
 "\n"
 "\n"
 "\n"
 "\n"
 "\n"
+"#-#-#-#-#  hi.po (eel.HEAD.hi)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.hi\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-29 07:28+0200\n"
+"PO-Revision-Date: 2006-08-29 15:52+0530\n"
+"Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
+"Language-Team: Hindi <fedora-trans-hi@redhat.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
 
@@ -473,7 +499,8 @@ msgstr ""
 "यह फोल्डर व फाइल में दिखायेगा."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "यदि सत्य पर नियत किया जाता है, नए खुले विंडोज़ में स्थान पट्टी दिखाई देंगे."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
@@ -571,7 +598,8 @@ msgstr ""
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
-msgstr "यदि यह सत्य पर नियत किया जाता है, संजाल सेवा पर लिंक करता आइकन डेस्कटॉप पर रखा जायेगा"
+msgstr ""
+"यदि यह सत्य पर नियत किया जाता है, संजाल सेवा पर लिंक करता आइकन डेस्कटॉप पर रखा जायेगा"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
@@ -585,13 +613,15 @@ msgstr ""
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
-msgstr "अगर इसे सही पर सेट किया जाता है, घर फोल्डर पर लिंक किया चिह्न डेस्कटॉप पर रखा जायेगा."
+msgstr ""
+"अगर इसे सही पर सेट किया जाता है, घर फोल्डर पर लिंक किया चिह्न डेस्कटॉप पर रखा जायेगा."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr "यदि यह सत्य पर नियत किया जाता है, रद्दी को लिंक करता चिह्न डेस्कटॉप पर रखा जाएगा."
+msgstr ""
+"यदि यह सत्य पर नियत किया जाता है, रद्दी को लिंक करता चिह्न डेस्कटॉप पर रखा जाएगा."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid ""
@@ -628,7 +658,8 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "यदि सत्य है, डिफ़ॉल्ट से चिह्नों को नए विंडोज़ में सघन रखा जाएगा."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "यदि सत्य है, लेबल चिह्नों के बाजू में रखे जाएंगे बजाए उनके नीचे."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
@@ -981,6 +1012,7 @@ msgstr "डिफ़ॉल्ट उपयोग करें (_f)"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1319
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "नाम"
 
@@ -1147,7 +1179,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "क्षमा करें, परन्तु नए प्रतीक हेतु आपको नॉन-ब्लैंक कुंजी शब्द निर्दिष्ट करना होगा."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:203
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "क्षमा करें, परन्तु प्रतीक कुंजीशब्द में सिर्फ अक्षर, रिक्त स्थान तथा अंक ही हो सकते हैं."
 
 #  this really should never happen, as a user has no idea
@@ -1245,7 +1278,8 @@ msgstr "\"%s\" को मिटाया नहीं जा सकता क्
 msgid ""
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
-msgstr "\"%s\" को खिसका नहीं सकता चूंकि इसे या इसके मूल फ़ोल्डर को बदलने की अनुमति आपको नहीं है."
+msgstr ""
+"\"%s\" को खिसका नहीं सकता चूंकि इसे या इसके मूल फ़ोल्डर को बदलने की अनुमति आपको नहीं है."
 
 #: ../libnautilus-private/nautilus-file-operations.c:724
 #, c-format
@@ -1422,11 +1456,14 @@ msgstr "\"%s\" नामक फाइल पहले से मौजूद ह
 msgid ""
 "The folder already exists in \"%s\".  Replacing it will overwrite any files "
 "in the folder that conflict with the files being copied."
-msgstr "फोल्डर पहले से \"%s\" में है. इसका प्रतिस्थापन फोल्डर के किसी फाइल पर लिख देगा जो कि कॉपी किये गये फाइल से विरोध में है."
+msgstr ""
+"फोल्डर पहले से \"%s\" में है. इसका प्रतिस्थापन फोल्डर के किसी फाइल पर लिख देगा जो कि "
+"कॉपी किये गये फाइल से विरोध में है."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1196
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "\"%s\" में फाइल पहले से मौजूद है.  इसे हटाना सामग्री को अध्यारोहित करेगा."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1213
@@ -2356,7 +2393,8 @@ msgstr "खोलना असफल, क्या आप अन्य अनु
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations."
-msgstr "\"%s\" नहीं खोल पाया \"%s\" चूंकि \"%s\" फ़ाइलों पर  \"%s\" स्थानों पर पहुँच नहीं सका."
+msgstr ""
+"\"%s\" नहीं खोल पाया \"%s\" चूंकि \"%s\" फ़ाइलों पर  \"%s\" स्थानों पर पहुँच नहीं सका."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:142
 msgid "Open Failed, would you like to choose another action?"
@@ -2440,7 +2478,8 @@ msgstr "\"%s\" को प्रदर्शित करने में अस�
 
 #: ../libnautilus-private/nautilus-program-choosing.c:613
 #: ../src/nautilus-window-manage-views.c:1481
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "जांच लें कि वर्तनी सही है और आपके प्रॉक्सी विन्यास सही हैं."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:618
@@ -2490,7 +2529,8 @@ msgid "This drop target only supports local files."
 msgstr "यह ड्राप लक्ष्य सिर्फ स्थानीय फ़ाइलों को समर्थित करता है."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:945
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "अ-स्थानीय फ़ाइलों को खोलने हेतु पहले इन्हें स्थानीय फ़ोल्डर में प्रतिलिपि करें फिर उन्हें फिर से "
 "ड्राप करें."
@@ -2619,7 +2659,8 @@ msgstr "डेस्कटॉप पृष्ठभूमि बदलें (_B
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "एक विंडो दिखाएँ जो आपके डेस्कटॉप पृष्ठभूमि के पैटर्न या रंग को नियत करने देती है"
 
 #. label, accelerator
@@ -2680,7 +2721,8 @@ msgstr "क्या आप सुनिश्चित हैं कि आप
 #: ../src/file-manager/fm-directory-view.c:995
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] "क्या आप सुनिश्चित हैं कि आप %d  चयनित मद को स्थायी तौर पर मिटाना चाहते हैं?"
 msgstr[1] "क्या आप सुनिश्चित हैं कि आप %d  चयनित मदों को स्थायी तौर पर मिटाना चाहते हैं?"
 
@@ -2830,7 +2872,8 @@ msgid "None of the %d selected items can be moved to the Trash"
 msgstr "कोई भी चयनित मद %d रद्दी में भेजा नहीं जा सका"
 
 #: ../src/file-manager/fm-directory-view.c:3796
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "कुछ वस्तुओं को रद्दी पर नहीं खिसका सका, क्या आप इन्हें तत्काल ही मिटाना चाहेंगे?"
 
 #: ../src/file-manager/fm-directory-view.c:3797
@@ -2936,7 +2979,8 @@ msgstr "इस फ़ोल्डर की सभी चलानेयोग�
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
-msgstr "मेनू में से स्क्रिप्ट चुनने पर वह स्क्रिप्ट किसी भी चयनित वस्तु के साथ इनपुट के रूप में चलेगी."
+msgstr ""
+"मेनू में से स्क्रिप्ट चुनने पर वह स्क्रिप्ट किसी भी चयनित वस्तु के साथ इनपुट के रूप में चलेगी."
 
 #: ../src/file-manager/fm-directory-view.c:5822
 msgid ""
@@ -2993,14 +3037,16 @@ msgstr "यदि आप चिपकाएँ कमांड चुनें�
 #: ../src/file-manager/fm-directory-view.c:5994
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
 msgstr[0] "यदि आप चिपकाएँ कमांड चुनेंगे तो %d चयनित मद खिसका दी जाएगी"
 msgstr[1] "यदि आप चिपकाएँ कमांड चुनेंगे तो %d चयनित मद खिसका दी जाएगी"
 
 #: ../src/file-manager/fm-directory-view.c:6001
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
 msgstr[0] "यदि आप चिपकाएँ कमांड चुनेंगे तो %d चयनित मद कॉपी की जाएगी"
 msgstr[1] "यदि आप चिपकाएँ कमांड चुनेंगे तो %d चयनित मद कॉपी की जाएगी"
 
@@ -3078,10 +3124,11 @@ msgstr "रिक्त फ़ाइल (_E)"
 msgid "Create a new empty file inside this folder"
 msgstr "इस फ़ोल्डर के भीतर एक रिक्त फ़ाइल बनाएँ"
 
+#. #-#-#-#-#  hi.po (nautilus.HEAD.hi)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6794
 #: ../src/file-manager/fm-directory-view.c:7673
-#: ../src/file-manager/fm-tree-view.c:1104
+#: ../src/file-manager/fm-tree-view.c:1104 ../eel/eel-open-with-dialog.c:910
 msgid "_Open"
 msgstr "खोलें (_O)"
 
@@ -3141,7 +3188,8 @@ msgstr "चयनित फ़ाइलों को फ़ाइलें च�
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6831
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "फ़ाइलें काटें या फ़ाइलें प्रतिलिपि कमांड से पहले चयनित फ़ाइलों को खिसकाएँ या प्रतिलिपि करें"
+msgstr ""
+"फ़ाइलें काटें या फ़ाइलें प्रतिलिपि कमांड से पहले चयनित फ़ाइलों को खिसकाएँ या प्रतिलिपि करें"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3531,7 +3579,8 @@ msgstr "लान्चर"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\" के विषयवस्तुओं को देखने हेतु आवश्यक अनुमतियाँ आपके पास नहीं हैं."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -3550,12 +3599,15 @@ msgstr "फ़ोल्डर विषयवस्तु प्रदर्श�
 
 #: ../src/file-manager/fm-error-reporting.c:107
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "इस फ़ोल्डर में नाम \"%s\" का उपयोग पहले से ही हो रहा है. कृपया भिन्न नाम उपयोग करें."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"इस फ़ोल्डर में नाम \"%s\" का उपयोग पहले से ही हो रहा है. कृपया भिन्न नाम उपयोग करें."
 
 #: ../src/file-manager/fm-error-reporting.c:112
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "इस फ़ोल्डर में कोई \"%s\" नहीं है. शायद यह अभी ही वहाँ से खिसकाया गया या मिटाया गया "
 "है?"
@@ -3593,7 +3645,8 @@ msgstr "वस्तु का नाम बदला नहीं जा सक
 
 #: ../src/file-manager/fm-error-reporting.c:168
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\" का समूह परिवर्तित करने हेतु आवश्यक अनुमतियाँ आपके पास नहीं हैं."
 
 #: ../src/file-manager/fm-error-reporting.c:172
@@ -3626,7 +3679,8 @@ msgstr "मालिक बदला नहीं जा सका."
 
 #: ../src/file-manager/fm-error-reporting.c:238
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" की अनुमतियाँ बदल नहीं सका क्योंकि यह सिर्फ पढ़ने-योग्य डिस्क पर है"
 
 #: ../src/file-manager/fm-error-reporting.c:245
@@ -3722,7 +3776,8 @@ msgstr "नाम के अनुसार साफ करें (_U)"
 #. label, accelerator
 #: ../src/file-manager/fm-icon-view.c:1431
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "विंडो में ठीक से फिट होने के लिये चिह्न को फिर नया स्थान दें ताकि एक दूसरे पर नहीं आये."
+msgstr ""
+"विंडो में ठीक से फिट होने के लिये चिह्न को फिर नया स्थान दें ताकि एक दूसरे पर नहीं आये."
 
 #. name, stock id
 #: ../src/file-manager/fm-icon-view.c:1437
@@ -4189,8 +4244,14 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "चयनित फ़ाइल की अनुमतियाँ निर्धारित नहीं की जा सकीं."
 
 #: ../src/file-manager/fm-properties-window.c:4435
+#: ../eel/eel-open-with-dialog.c:809
+#, fuzzy
 msgid "Open With"
-msgstr "के साथ खोलें"
+msgstr ""
+"#-#-#-#-#  hi.po (nautilus.HEAD.hi)  #-#-#-#-#\n"
+"के साथ खोलें\n"
+"#-#-#-#-#  hi.po (eel.HEAD.hi)  #-#-#-#-#\n"
+"इससे खोलें"
 
 #: ../src/file-manager/fm-properties-window.c:4775
 msgid "Creating Properties window."
@@ -5073,9 +5134,7 @@ msgstr "[URI...]"
 msgid ""
 "Load a saved session from the specified file. Implies \"--no-default-window"
 "\"."
-msgstr ""
-"निर्दिष्ट फाइल से सहेजा सत्र लोड करता है. Implies \"--no-default-window"
-"\"."
+msgstr "निर्दिष्ट फाइल से सहेजा सत्र लोड करता है. Implies \"--no-default-window\"."
 
 #: ../src/nautilus-main.c:225
 msgid "FILENAME"
@@ -5134,7 +5193,8 @@ msgstr "यदि आप ऐसा करेंगे, तो आपकी न�
 
 #: ../src/nautilus-navigation-window-menus.c:119
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "क्या आप सुनिश्चित हैं कि आप उन स्थानों की सूची साफ करना चाहते हैं जिनमें आप सैर कर चुके हैं?"
+msgstr ""
+"क्या आप सुनिश्चित हैं कि आप उन स्थानों की सूची साफ करना चाहते हैं जिनमें आप सैर कर चुके हैं?"
 
 #: ../src/nautilus-navigation-window-menus.c:121
 msgid "If you clear the list of locations, they will be permanently deleted."
@@ -6012,3 +6072,225 @@ msgstr "वर्तमान दृश्य का ज़ूम स्तर �
 msgid "View your network servers in the Nautilus file manager"
 msgstr "नॉटिलस फ़ाइल प्रबंधक में अपने नेटवर्क सर्वर्स देखें"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "छवि/लेबल किनारा"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "चेतावनी संवाद में लेबल तथा छवि के चारों ओर किनारों की चौड़ाई"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "चेतावनी प्रकार"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "चेतावनी प्रकार"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "चेतावनी बटन"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "चेतावनी संवाद में प्रदर्शित बटन"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "अधिक विवरण दिखाएँ (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "एक्स"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "वाई"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "पाठ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "लेबल का पाठ."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "औचित्य"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"एक दूसरे के सापेक्ष, लेबल के पाठ की पंक्तियों की पंक्तिबद्धता. यह लेबल की पंक्तिबद्धता को उसके "
+"एलोकेशन के भीतर प्रभावित नहीं करता. इस हेतु देखें GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "पंक्ति व्रेप"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "यदि नियत है, जब पाठ ज्यादा चौड़ा हो तो पंक्तियाँ व्रेप करें"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "संकेतक स्थिति"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "प्रविष्टि संकेतक की अक्षरों में वर्तमान स्थिति"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "चयन सीमा"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "संकेतक से चयन के विपरीत सिरे की अक्षरों में स्थिति."
+
+#: ../eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "सभी चुनें"
+
+#: ../eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "इनपुट पद्धति"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"जीकान्फ त्रुटि:\n"
+" %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "जीकान्फ त्रुटि: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "आगे की सभी त्रुटियां सिर्फ टर्मिनल पर दिखाएँ."
+
+#  localizers: These strings are part of the strftime
+#  * self-check code and must be changed to match what strtfime
+#  * yields. The first one is "%m/%d/%y, %I:%M %p".
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 पूर्वाह्न"
+
+#  The second one is "%-m/%-d/%-y, %-I:%M %p".
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 पूर्वाह्न"
+
+#  The third one is "%_m/%_d/%_y, %_I:%M %p".
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 पूर्वाह्न"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "कोई छवि चयनित नहीं."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "छवि चयनित करने हेतु उसपर क्लिक करें."
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "डिफ़ॉल्ट"
+
+#: ../eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "आइकन"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "कोइ अनुप्रयोग चयनित नहीं"
+
+#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:984
+#, c-format
+msgid "%s document"
+msgstr "%s दस्तावेज़"
+
+#: ../eel/eel-mime-application-chooser.c:538 ../eel/eel-open-with-dialog.c:997
+msgid "Unknown"
+msgstr "अज्ञात"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr "%s को तथा अन्य प्रकार \"%s\" को खोलने हेतु एक अनुप्रयोग चुनें"
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "अनुप्रयोग चला नहीं सका"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' नहीं ढूंढ सका"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "अनुप्रयोग नहीं ढूंढ सका"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "अनुप्रयोग नहीं जोड़ सका"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "अनुप्रयोग डेटाबेस में अनुप्रयोग नहीं जोड़ सका"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "अनुप्रयोग चुनें"
+
+#: ../eel/eel-open-with-dialog.c:846
+msgid "Select an application to view its description."
+msgstr "इसके विवरण को जानने के लिये एक अनुप्रयोग चुनें."
+
+#: ../eel/eel-open-with-dialog.c:871
+msgid "_Use a custom command"
+msgstr "एक कस्टम कमांड का उपयोग करें (_U)"
+
+#: ../eel/eel-open-with-dialog.c:888
+msgid "_Browse..."
+msgstr "ब्राउज़ (_B)..."
+
+#: ../eel/eel-open-with-dialog.c:1004
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "%s को तथा अन्य फ़ाइल प्रकार \"%s\" को इससे खोलें:"
+
+#: ../eel/eel-open-with-dialog.c:1036
+msgid "_Add"
+msgstr "जोडें (_A)"
+
+#: ../eel/eel-open-with-dialog.c:1037
+msgid "Add Application"
+msgstr "अनुप्रयोग जोडें"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "आप इस ऑपरेशन को रद्द पर क्लिक कर रोक सकते हैं."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr "(अवैध यूनिकोड)"
diff --git a/po/hr.po b/po/hr.po
index 05a9fb609..7ce8562f9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,8 +1,15 @@
+# #-#-#-#-#  hr.po (nautilus 0)  #-#-#-#-#
 # Translation of nautilus to Croatiann
 # Copyright (C) Croatiann team
 # Translators: Automatski Prijevod <>,Boris Tudan <boris.tudan@ka.htnet.hr>,Danijel Studen <dstuden@vuka.hr>,Denis Lackovic <delacko@fly.srk.fer.hr>,Mato Kutlić <mate@iskraemeco.hr>,Nikola Planinac <>,pr pr <delacko@192.168.0.1>,Robert Sedak <robert.sedak@sk.tel.hr>,Robert Vuković <robi@surfer.hr>,Sinisa Habek <sinisa_habek@inet.hr>,
+# #-#-#-#-#  hr.po (eel 0)  #-#-#-#-#
+# Translation of eel to Croatiann
+# Copyright (C) Croatiann team
+# Translators: Automatski Prijevod <>,Denis Lackovic <delacko@fly.srk.fer.hr>,Robert Sedak <robert.sedak@sk.t-com.hr>,
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  hr.po (nautilus 0)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus 0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-09 18:14+0200\n"
@@ -17,6 +24,21 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2008-05-28 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"#-#-#-#-#  hr.po (eel 0)  #-#-#-#-#\n"
+"Project-Id-Version: eel 0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-07 22:35+0200\n"
+"PO-Revision-Date: 2008-03-30 12:18+0000\n"
+"Last-Translator: Launchpad Translations Administrators <rosetta@launchpad."
+"net>\n"
+"Language-Team: Croatian <lokalizacija@linux.hr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2008-05-28 09:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6809,6 +6831,147 @@ msgstr "Uvećaj/Umanji"
 msgid "Set the zoom level of the current view"
 msgstr "Postavi razinu uvećanja trenutnog pogleda"
 
+#: ../eel/eel-alert-dialog.c:109
+msgid "Image/label border"
+msgstr "Rub slike/oznake"
+
+#: ../eel/eel-alert-dialog.c:110
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Širina okvira oko naziva i slike u dijalogu upozorenja."
+
+#: ../eel/eel-alert-dialog.c:119
+msgid "Alert Type"
+msgstr "Vrsta upozorenja"
+
+#: ../eel/eel-alert-dialog.c:120
+msgid "The type of alert"
+msgstr "Vrsta upozorenja"
+
+#: ../eel/eel-alert-dialog.c:128
+msgid "Alert Buttons"
+msgstr "Gumbi upozorenja"
+
+#: ../eel/eel-alert-dialog.c:129
+msgid "The buttons shown in the alert dialog"
+msgstr "Gumbi koji se prikazuju u dijalogu upozorenja."
+
+#: ../eel/eel-alert-dialog.c:193
+msgid "Show more _details"
+msgstr "Prikaži više _detalja"
+
+#: ../eel/eel-canvas.c:1219 ../eel/eel-canvas.c:1220
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1226 ../eel/eel-canvas.c:1227
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:353
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-editable-label.c:354
+msgid "The text of the label."
+msgstr "Tekst oznake."
+
+#: ../eel/eel-editable-label.c:360
+msgid "Justification"
+msgstr "Obostrano poravnanje"
+
+#: ../eel/eel-editable-label.c:361
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Poravnanje linija u tekstu oznake. Ovo ne utječe na poravnanje oznake unutar "
+"njene alokacije. Za to pogledajte GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:369
+msgid "Line wrap"
+msgstr "Omatanje linija"
+
+#: ../eel/eel-editable-label.c:370
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ako je postavljeno, linije se omataju ako tekst postane preširok."
+
+#: ../eel/eel-editable-label.c:377
+msgid "Cursor Position"
+msgstr "Položaj pokazivača"
+
+#: ../eel/eel-editable-label.c:378
+msgid "The current position of the insertion cursor in chars."
+msgstr "Trenutni položaj pokazivača ubacivanja u znakovima."
+
+#: ../eel/eel-editable-label.c:387
+msgid "Selection Bound"
+msgstr "Vezano označavanje"
+
+#: ../eel/eel-editable-label.c:388
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Trenutni položaj pokazivača ubacivanja u znakovima, sa suprotne strane."
+
+#: ../eel/eel-editable-label.c:3217
+msgid "Select All"
+msgstr "Označi sve"
+
+#: ../eel/eel-editable-label.c:3228
+msgid "Input Methods"
+msgstr "Ulazne metode"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf greška:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf greška: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Sve daljnje greške biti će prikazane samo u terminalu."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Niti jedna slika nije označena."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Za odabir slike morate kliknuti na nju."
+
+#: ../eel/eel-stock-dialogs.c:209
+msgid "You can stop this operation by clicking cancel."
+msgstr "Možete zaustaviti ovu radnju pritiskom na \"Odustani\"."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (neispravni Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr ""
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr ""
+
 #~ msgid "_Show"
 #~ msgstr "_Prikaži"
 
diff --git a/po/hu.po b/po/hu.po
index 22fd79cc9..3a9208a4e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  hu.po (nautilus HEAD)  #-#-#-#-#
 # Hungarian translation of nautilus.
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nautilus package.
@@ -9,8 +10,20 @@
 # Laszlo Dvornik <dvornik@gnome.hu>, 2004.
 # Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005, 2006, 2007, 2008.
 # Mate Ory <orymate@gmail.com>, 2006, 2008.
+# #-#-#-#-#  hu.po (eel)  #-#-#-#-#
+# Hungarian translation of eel.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+#
+# Szabolcs Ban <shooby@gnome.hu>, 2000, 2001.
+# Emese Kovacs <emese@gnome.hu>, 2000, 2001.
+# Andras Timar <timar@gnome.hu>, 2002, 2004.
+# Laszlo Dvornik <dvornik@gnome.hu>, 2004.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005, 2006, 2007, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  hu.po (nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 04:27+0000\n"
@@ -22,6 +35,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  hu.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-01-16 01:52+0100\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"Language-Team: Hungarian <gnome@gnome.hu>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -337,8 +362,20 @@ msgid ""
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
 msgstr ""
-"A túl hosszú fájlnevek nagyítási szinttől függő csonkításának módját megadó karakterlánc. A lista minden eleme „Nagyítási szint:Egész” alakú. Minden megadott nagyítási szint esetén, ha a megadott egész nagyobb mint 0, akkor a fájlnév nem lesz hosszabb az adott számú sornál. Ha az egész 0 vagy kisebb, akkor a megadott nagyítási szinten nincs korlátozva a hossz. Engedélyezett az alapértelmezett „Egész” alakú bejegyzés is, nagyítási szint megadása nélkül. Ez megadja a maximális sorok számát az összes további nagyítási szinten. Például: 0 - mindig jelenjenek meg a túl hosszú fájlnevek; 3 - fájlnevek rövidítése ha három sornál hosszabbak; smallest:5,smaller:4,0 - fájlnevek rövidítése ha öt sornál hosszabbak a „smallest” nagyítási szinten és ha négy sornál hosszabbak a „smaller” nagyítási szinten. Nincs rövidítés a többi nagyítási szinten. A lehetséges nagyítási szintek: smallest (33%), smaller (50 %), small (66 %), standard (100 %), large (150 %), "
-"larger (200 %), largest (400 %)."
+"A túl hosszú fájlnevek nagyítási szinttől függő csonkításának módját megadó "
+"karakterlánc. A lista minden eleme „Nagyítási szint:Egész” alakú. Minden "
+"megadott nagyítási szint esetén, ha a megadott egész nagyobb mint 0, akkor a "
+"fájlnév nem lesz hosszabb az adott számú sornál. Ha az egész 0 vagy kisebb, "
+"akkor a megadott nagyítási szinten nincs korlátozva a hossz. Engedélyezett "
+"az alapértelmezett „Egész” alakú bejegyzés is, nagyítási szint megadása "
+"nélkül. Ez megadja a maximális sorok számát az összes további nagyítási "
+"szinten. Például: 0 - mindig jelenjenek meg a túl hosszú fájlnevek; 3 - "
+"fájlnevek rövidítése ha három sornál hosszabbak; smallest:5,smaller:4,0 - "
+"fájlnevek rövidítése ha öt sornál hosszabbak a „smallest” nagyítási szinten "
+"és ha négy sornál hosszabbak a „smaller” nagyítási szinten. Nincs rövidítés "
+"a többi nagyítási szinten. A lehetséges nagyítási szintek: smallest (33%), "
+"smaller (50 %), small (66 %), standard (100 %), large (150 %), larger (200 "
+"%), largest (400 %)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -354,10 +391,15 @@ msgid ""
 "ellipses on the desktop. If the number is larger than 0, the file name will "
 "not exceed the given number of lines. If the number is 0 or smaller, no "
 "limit is imposed on the number of displayed lines."
-msgstr "Egész szám, amely megadja hogy a túl hosszú fájlnevek hogyan legyenek csonkítva. Ha az érték nagyobb mint 0, akkor a fájlnév nem lesz hosszabb a megadott számú sornál. Ha az érték 0 vagy kisebb, a megjelenő sorok száma nem lesz korlátozva."
+msgstr ""
+"Egész szám, amely megadja hogy a túl hosszú fájlnevek hogyan legyenek "
+"csonkítva. Ha az érték nagyobb mint 0, akkor a fájlnév nem lesz hosszabb a "
+"megadott számú sornál. Ha az érték 0 vagy kisebb, a megjelenő sorok száma "
+"nem lesz korlátozva."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "Az alapértelmezett mappaháttér színe. Csak akkor kerül felhasználásra, ha a "
 "background_set be van kapcsolva."
@@ -484,7 +526,8 @@ msgstr "Az asztali Kuka ikon neve"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "A klasszikus Nautilus viselkedés engedélyezése, ahol minden ablak böngésző"
+msgstr ""
+"A klasszikus Nautilus viselkedés engedélyezése, ahol minden ablak böngésző"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid ""
@@ -536,7 +579,8 @@ msgstr ""
 "oldalsávján. Ellenkező esetben a mappákat és a fájlokat is megjeleníti."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 "Ha ez igazra van állítva, akkor az újonnan megnyitott ablakokban a helysáv "
 "látható."
@@ -616,7 +660,8 @@ msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
-msgstr "Ha ez igazra van állítva, akkor a Nautilus jeleníti meg az asztal ikonjait."
+msgstr ""
+"Ha ez igazra van állítva, akkor a Nautilus jeleníti meg az asztal ikonjait."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
@@ -759,7 +804,8 @@ msgstr ""
 "új ablakokban."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "Ha ez igazra van állítva, akkor a címkék az ikonok mellett lesznek "
 "elhelyezve, ahelyett, hogy alattuk lennének."
@@ -789,33 +835,50 @@ msgid ""
 "List of x-content/* types for which the user have chosen \"Do Nothing\" in "
 "the preference capplet. No prompt will be shown nor will any matching "
 "application be started on insertion of media matching these types."
-msgstr "Azon x-content/* típusok listája, amelyekhez a felhasználó a „Ne tegyen semmit” lehetőséget választotta a beállítóablakban. Nem jelenik meg kérdés, és a megfelelő alkalmazás sem indul el az ilyen típusú adathordozók behelyezésekor."
+msgstr ""
+"Azon x-content/* típusok listája, amelyekhez a felhasználó a „Ne tegyen "
+"semmit” lehetőséget választotta a beállítóablakban. Nem jelenik meg kérdés, "
+"és a megfelelő alkalmazás sem indul el az ilyen típusú adathordozók "
+"behelyezésekor."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
 "List of x-content/* types for which the user have chosen \"Open Folder\" in "
 "the preferences capplet. A folder window will be opened on insertion of "
 "media matching these types."
-msgstr "Azon x-content/* típusok listája, amelyekhez a felhasználó a „Mappa megnyitása” lehetőséget választotta a beállítóablakban. Az ilyen típusú adathordozók behelyezésekor megjelenik egy mappaablak."
+msgstr ""
+"Azon x-content/* típusok listája, amelyekhez a felhasználó a „Mappa "
+"megnyitása” lehetőséget választotta a beállítóablakban. Az ilyen típusú "
+"adathordozók behelyezésekor megjelenik egy mappaablak."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "List of x-content/* types for which the user have chosen to start an "
 "application in the preference capplet. The preferred application for the "
 "given type will be started on insertion on media matching these types."
-msgstr "Azon x-content/* típusok listája, amelyekhez a felhasználó egy alkalmazás elindítását választotta a beállítóablakban. Az ilyen típusú adathordozók behelyezésekor elindul az adott típushoz előnyben részesített alkalmazás."
+msgstr ""
+"Azon x-content/* típusok listája, amelyekhez a felhasználó egy alkalmazás "
+"elindítását választotta a beállítóablakban. Az ilyen típusú adathordozók "
+"behelyezésekor elindul az adott típushoz előnyben részesített alkalmazás."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
-msgstr "Az x-content/* típusok listája, amelyekhez a kiválasztott művelet a „Ne tegyen semmit”"
+msgstr ""
+"Az x-content/* típusok listája, amelyekhez a kiválasztott művelet a „Ne "
+"tegyen semmit”"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid "List of x-content/* types set to \"Open Folder\""
-msgstr "Az x-content/* típusok listája, amelyekhez a kiválasztott művelet a „Mappa megnyitása”"
+msgstr ""
+"Az x-content/* típusok listája, amelyekhez a kiválasztott művelet a „Mappa "
+"megnyitása”"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
-msgstr "Az x-content/* típusok listája, amelyekhez az előnyben részesített alkalmazás kerül elindításra"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
+msgstr ""
+"Az x-content/* típusok listája, amelyekhez az előnyben részesített "
+"alkalmazás kerül elindításra"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Maximum handled files in a folder"
@@ -830,8 +893,8 @@ msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
 msgstr ""
-"A használandó Nautilus téma neve. Ez elavult a Nautilus 2.2 óta. "
-"Használja helyette az ikontémát."
+"A használandó Nautilus téma neve. Ez elavult a Nautilus 2.2 óta. Használja "
+"helyette az ikontémát."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "Nautilus handles drawing the desktop"
@@ -884,7 +947,8 @@ msgstr "Sans 10"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
 msgid "Show advanced permissions in the file property dialog"
-msgstr "Speciális jogosultságok megjelenítése a fájl tulajdonságai párbeszédablakban"
+msgstr ""
+"Speciális jogosultságok megjelenítése a fájl tulajdonságai párbeszédablakban"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
 msgid "Show folders first in windows"
@@ -1007,7 +1071,8 @@ msgstr "Az asztal ikonjaihoz használandó betűkészlet-leírás."
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "A fájldátumok formátuma. Lehetséges értékek: „locale”, „iso” és „informal”."
+msgstr ""
+"A fájldátumok formátuma. Lehetséges értékek: „locale”, „iso” és „informal”."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
@@ -1041,7 +1106,8 @@ msgstr ""
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
-msgstr "Ezen kulcs segítségével egyéni név adható az asztalon található Kuka ikonnak."
+msgstr ""
+"Ezen kulcs segítségével egyéni név adható az asztalon található Kuka ikonnak."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
 msgid "Trash icon visible on desktop"
@@ -1475,8 +1541,10 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Elnézést, a matrica kulcsszava nem lehet üres."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "Elnézést, a matrica kulcsszavában csak betűk, szóközök és számok lehetnek."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"Elnézést, a matrica kulcsszavában csak betűk, szóközök és számok lehetnek."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1745,7 +1813,8 @@ msgstr "Biztosan véglegesen törölni akarja a következőt: „%B”?"
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "Biztosan véglegesen törölni akarja a kijelölt %'d elemet?"
 msgstr[1] "Biztosan véglegesen törölni akarja a kijelölt %'d elemet?"
 
@@ -1779,13 +1848,16 @@ msgstr "Hiba törléskor."
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
-msgstr "A(z) „%B” mappa fájljai nem törölhetők, mert nincs jogosultsága látni azokat."
+msgstr ""
+"A(z) „%B” mappa fájljai nem törölhetők, mert nincs jogosultsága látni azokat."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
-msgstr "Hiba történt a(z) „%B” mappa fájljaival kapcsolatos információk lekérésekor."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
+msgstr ""
+"Hiba történt a(z) „%B” mappa fájljaival kapcsolatos információk lekérésekor."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
 #: ../libnautilus-private/nautilus-file-operations.c:3313
@@ -1909,7 +1981,8 @@ msgstr "Hiba a fájlok áthelyezésekor a Kukába."
 msgid ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
-msgstr "A(z) „%B” mappa fájljai nem másolhatók, mert nincs jogosultsága látni azokat."
+msgstr ""
+"A(z) „%B” mappa fájljai nem másolhatók, mert nincs jogosultsága látni azokat."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2398
 msgid ""
@@ -2039,7 +2112,8 @@ msgstr "Hiba történt a(z) „%B” mappa létrehozásakor."
 msgid ""
 "Files in the folder \"%B\" cannot be copied because you do not have "
 "permissions to see them."
-msgstr "A(z) „%B” mappa fájljai nem másolhatók, mert nincs jogosultsága látni azokat."
+msgstr ""
+"A(z) „%B” mappa fájljai nem másolhatók, mert nincs jogosultsága látni azokat."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3346
 msgid ""
@@ -2130,7 +2204,8 @@ msgstr "Már létezik „%B” nevű fájl. Lecseréli?"
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr "A fájl már létezik „%F” alatt. A cseréjével felülírja a tartalmát."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3913
@@ -3000,7 +3075,8 @@ msgid "This drop target only supports local files."
 msgstr "Az ejtés célja csak helyi fájlokat támogat."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:400
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "A nem helyi fájlok megnyitásához másolja ezeket egy helyi mappába, majd "
 "próbálja onnan kihúzni."
@@ -3072,8 +3148,10 @@ msgstr "Automatikus futtatás"
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "A számítógépről elérhető összes helyi és távoli lemez és mappa tallózása"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"A számítógépről elérhető összes helyi és távoli lemez és mappa tallózása"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
@@ -3117,7 +3195,8 @@ msgid "Nautilus metafile factory"
 msgstr "Nautilus metafájl factory"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr ""
 "Nautilus műveletek, amelyeket meg lehet oldani egymást követő parancssori "
 "utasításokkal"
@@ -3159,7 +3238,8 @@ msgstr "Asztal _hátterének megváltoztatása"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Egy olyan ablak megjelenítése, amelyben beállíthatja a háttér mintáját vagy "
 "színét"
@@ -3405,7 +3485,8 @@ msgstr "„%s” másolására a Beillesztés parancs kiválasztásakor kerül s
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] ""
 "A(z) %'d kijelölt elem áthelyezésére a Beillesztés parancs kiválasztásakor "
 "kerül sor"
@@ -3416,7 +3497,8 @@ msgstr[1] ""
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] ""
 "A(z) %'d kijelölt elem másolására a Beillesztés parancs kiválasztásakor "
 "kerül sor"
@@ -3573,7 +3655,8 @@ msgstr "Megnyitás egyéb _alkalmazással…"
 #: ../src/file-manager/fm-directory-view.c:6620
 #: ../src/file-manager/fm-directory-view.c:6624
 msgid "Choose another application with which to open the selected item"
-msgstr "Válasszon egy másik alkalmazást, amivel megnyithatja a kiválasztott elemet"
+msgstr ""
+"Válasszon egy másik alkalmazást, amivel megnyithatja a kiválasztott elemet"
 
 #. name, stock id
 #. label, accelerator
@@ -3591,7 +3674,8 @@ msgstr "Ebben a menüben szereplő parancsfájlok mappájának megnyitása"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6636
 msgid "Prepare the selected files to be moved with a Paste command"
-msgstr "A kijelölt fájlok előkészítése áthelyezésre egy „Beillesztés” paranccsal"
+msgstr ""
+"A kijelölt fájlok előkészítése áthelyezésre egy „Beillesztés” paranccsal"
 
 #. name, stock id
 #. label, accelerator
@@ -3653,7 +3737,8 @@ msgstr "Kijelölés megf_ordítása"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6662
 msgid "Select all and only the items that are not currently selected"
-msgstr "Azon, és csak azon elemek kijelölése, melyek jelenleg nincsenek kijelölve"
+msgstr ""
+"Azon, és csak azon elemek kijelölése, melyek jelenleg nincsenek kijelölve"
 
 #. name, stock id
 #. label, accelerator
@@ -4112,7 +4197,8 @@ msgstr "Parancs"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Nem jogosult a(z) „%s” tartalmának megtekintésére."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4131,12 +4217,14 @@ msgstr "A mappa tartalma nem jeleníthető meg."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "„%s” nevű elem már létezik ebben a mappában. Használjon másik nevet."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "Nincs „%s” ebben a mappában. Lehet, hogy áthelyezték vagy törölték?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -4170,7 +4258,8 @@ msgstr "Az elem nem nevezhető át."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Nem jogosult a(z) „%s” csoportjának megváltoztatására."
 
 #. fall through
@@ -4288,7 +4377,8 @@ msgstr "Ikonok elren_dezése név szerint"
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1495
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "Ikonok rendezése, hogy jobban elférjenek az ablakban és ne fedjék egymást"
+msgstr ""
+"Ikonok rendezése, hogy jobban elférjenek az ablakban és ne fedjék egymást"
 
 #. name, stock id
 #. label, accelerator
@@ -5105,7 +5195,8 @@ msgstr "A(z) „%s” nevű matrica nem törölhető."
 msgid ""
 "This is probably because the emblem is a permanent one, and not one that you "
 "added yourself."
-msgstr "Ez valószínűleg azért lehet, mert a matrica állandó és nem Ön hozta létre."
+msgstr ""
+"Ez valószínűleg azért lehet, mert a matrica állandó és nem Ön hozta létre."
 
 #: ../src/nautilus-emblem-sidebar.c:260
 #, c-format
@@ -5342,10 +5433,12 @@ msgstr ""
 
 #: ../src/nautilus-file-management-properties.glade.h:50
 msgid "Choose the order of information to appear in the list view."
-msgstr "Adja meg, hogy milyen sorrendben jelenjenek meg az adatok a listanézetben."
+msgstr ""
+"Adja meg, hogy milyen sorrendben jelenjenek meg az adatok a listanézetben."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr ""
 "Válassza ki, mit történjen adathordozó behelyezésekor vagy eszközök a "
 "rendszerhez csatlakoztatásakor"
@@ -5458,7 +5551,8 @@ msgstr "_Zenelejátszó:"
 
 #: ../src/nautilus-file-management-properties.glade.h:80
 msgid "_Never prompt or start programs on media insertion"
-msgstr "Soha _ne kérdezzen vagy indítson programokat adathordozó behelyezésekor"
+msgstr ""
+"Soha _ne kérdezzen vagy indítson programokat adathordozó behelyezésekor"
 
 #: ../src/nautilus-file-management-properties.glade.h:81
 msgid "_Only for files smaller than:"
@@ -5843,7 +5937,9 @@ msgstr "Köny_vjelzők szerkesztése…"
 #: ../src/nautilus-navigation-window-menus.c:796
 #: ../src/nautilus-spatial-window.c:903
 msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr "Megjelenít egy ablakot, amelyből szerkesztheti a menühöz tartozó könyvjelzőket"
+msgstr ""
+"Megjelenít egy ablakot, amelyből szerkesztheti a menühöz tartozó "
+"könyvjelzőket"
 
 #. name, stock id, label
 #: ../src/nautilus-navigation-window-menus.c:798
@@ -5854,7 +5950,8 @@ msgstr "_Fájlok keresése…"
 #: ../src/nautilus-navigation-window-menus.c:799
 #: ../src/nautilus-spatial-window.c:906
 msgid "Locate documents and folders on this computer by name or content"
-msgstr "Dokumentumok és mappák keresése név vagy tartalom szerint a számítógépen"
+msgstr ""
+"Dokumentumok és mappák keresése név vagy tartalom szerint a számítógépen"
 
 #: ../src/nautilus-navigation-window-menus.c:802
 msgid "_Previous Tab"
@@ -6411,7 +6508,8 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "„%s” nem jeleníthető meg, mivel a gép nem található."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Ellenőrizze, hogy nem gépelt-e el valamit és hogy helyesek-e a proxy "
 "beállításai."
@@ -6532,7 +6630,8 @@ msgstr "_Hátterek és matricák…"
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
-msgstr "Minták, színek és matricák megjelenítése. Ezekkel teheti egyénivé a Nautilust"
+msgstr ""
+"Minták, színek és matricák megjelenítése. Ezekkel teheti egyénivé a Nautilust"
 
 #: ../src/nautilus-window-menus.c:800
 msgid "Prefere_nces"
@@ -6792,3 +6891,144 @@ msgstr "Nagyítás"
 msgid "Set the zoom level of the current view"
 msgstr "A jelenlegi ablak nagyításának beállítása"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Kép/felirat szegélye"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"A feliratot és a képet körülvevő szegély szélessége a figyelmeztető "
+"párbeszédablakon"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Figyelmeztetés típusa"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "A figyelmeztetés típusa"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Figyelmeztetés gombok"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "A figyelmeztető párbeszédablakon megjelenő gombok"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Több _részlet megjelenítése"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Szöveg"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "A címke szövege."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Sorkizárás"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"A címke szövege sorainak igazítása egymáshoz. Ez NINCS hatással a címke "
+"elhelyezkedésére. Erre lásd a GtkMisc::xalign-t."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Sorok tördelése"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ha be van állítva, a sorok törnek, ha a szöveg túl hosszú."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Kurzorpozíció"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "A beszúrási kurzor jelenlegi helyzete karakterben mérve."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Kijelölés mérete"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "A kijelölés másik végének távolsága a kurzortól karakterben mérve."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Mindent kijelöl"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Beviteli módok"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf-hiba:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-hiba: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Minden további hiba csak a terminálon jelenik meg."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Nincs kijelölve kép."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Kattintson egy képre annak kijelöléséhez."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "A művelet megszakítható a Mégsem gomb megnyomásával."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (érvénytelen Unicode)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "%s megnyitása"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d elem megnyitása"
+msgstr[1] "%d elem megnyitása"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Adja meg a jelszót"
diff --git a/po/id.po b/po/id.po
index 81603a1d6..0613b39ce 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  id.po (Nautilus HEAD)  #-#-#-#-#
 # Indonesia translation of Nautilus.
 # Copyright (C) 2004 THE Nautilus'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Nautilus package.
@@ -6,8 +7,17 @@
 # Ahmad Riza H Nst  <rizahnst@gnome.org>, 2006
 #
 #
+# #-#-#-#-#  id.po (eel HEAD)  #-#-#-#-#
+# Indonesia translation of eel.
+# Copyright (C) 2004 THE eel's COPYRIGHT HOLDER
+# This file is distributed under the same license as the eel package.
+# Mohammad DAMT <mdamt@bisnisweb.com>, 2004.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  id.po (Nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-28 19:38+0200\n"
@@ -19,6 +29,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1;plural=0;\n"
 "X-Poedit-Bookmarks: 1073,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"#-#-#-#-#  id.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2005-03-01 21:40+0700\n"
+"Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
+"Language-Team: Indonesia <sukarelawan@gnome.linux.or.id>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -1032,6 +1052,7 @@ msgstr "Konfig_urasi Awal"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1375
+#: eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Nama"
 
@@ -3094,11 +3115,12 @@ msgstr "B_erkas Kosong"
 msgid "Create a new empty file inside this folder"
 msgstr "Buat berkas kosong baru dalam folder ini"
 
+#. #-#-#-#-#  id.po (Nautilus HEAD)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6921
 #: ../src/file-manager/fm-directory-view.c:7800
 #: ../src/file-manager/fm-tree-view.c:1253
-#: ../src/nautilus-places-sidebar.c:1448
+#: ../src/nautilus-places-sidebar.c:1448 eel/eel-open-with-dialog.c:894
 msgid "_Open"
 msgstr "_Buka"
 
@@ -4231,6 +4253,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "Ukuran berkas terpilih tidak bisa ditentukan."
 
 #: ../src/file-manager/fm-properties-window.c:4824
+#: eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Buka Dengan"
 
@@ -6062,6 +6085,227 @@ msgstr "Perbesaran"
 msgid "Set the zoom level of the current view"
 msgstr "Tetapkan tingkat perbesaran tampilan saat ini"
 
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Gambar/batas label"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Lebar batas disekeliling label dan gambar pada dialog peringatan"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Jenis Peringatan"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Jenis peringatan"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Tombol Peringatan"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Tombol yang ditampilkan pada dialog peringatan"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Tampilkan _detil"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Teks"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Teks untuk label"
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Rata"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Penyelarasan garis pada label teks saling relatif terhadap label lain. Ini "
+"tidak berpengaruh pada penyelarasan label pada letak label. Silakan baca "
+"GtkMisc::xalign untuk informasi lebih lanjut."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Potong baris"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Jika ini diset, baris akan dipotong bila terlalu lebar."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Posisi Kursor"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Posisi kursor saat kursor dimasukkan ke dalam kalimat."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Batas Seleksi"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Posisi ujung seleksi sejak dari kursor pada kalimat."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Pilih Semua"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Metode Input"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Error GConf:\n"
+" %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Error GConf: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Error yang lain berikutnya akan ditampilkan pada terminal saja."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00, 1:00"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Gambar belum dipilih."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Anda harus mengklik pada gambar untuk memilihnya."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Utama"
+
+#: eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "Icon"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Tidak ada aplikasi yang dipilih</i>"
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr "%s dokumen"
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Tidak diketahui"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr "PIlih aplikasi untuk membuka <i>%s</i> file lainnya dari jenis \"%s\""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Aplikasi tidak dapat dijalankan"
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' tidak dapat ditemukan"
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Aplikasi tidak dapat ditemukan"
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Aplikasi tidak dapat ditambahkan"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Aplikasi tidak dapat ditambahkan dalam basis data aplikasi"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Pilih Aplikasi"
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr "PIlih aplikasi untuk melihat penjelasannya."
+
+#: eel/eel-open-with-dialog.c:855
+#, fuzzy
+msgid "_Use a custom command"
+msgstr "Gunakan suatu perintah _custom"
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr "_Cari..."
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Buka <i>%s</i> dan file lainnya dari jenis \"%s\" dengan:"
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr "T_ambah"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr "Tambah Aplikasi"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Anda dapat menghentikan operasi ini dengan menekan tombol batal."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (Unicode tidak valid)"
+
 #~ msgid "Normal Alpha"
 #~ msgstr "Alfa Normal"
 
@@ -6116,3 +6360,21 @@ msgstr "Tetapkan tingkat perbesaran tampilan saat ini"
 
 #~ msgid "View your network servers in the Nautilus file manager"
 #~ msgstr "Lihat server jaringan Anda menggunakan pengatur berkas Nautilus"
+
+#~ msgid "GConf Error"
+#~ msgstr "Error GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Belum Ada yang Dipilih"
+
+#~ msgid "Info"
+#~ msgstr "Informasi"
+
+#~ msgid "Warning"
+#~ msgstr "Peringatan"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Question"
+#~ msgstr "Pertanyaan"
diff --git a/po/is.po b/po/is.po
index 054b0b95e..df1a87e6b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,10 +1,19 @@
+# #-#-#-#-#  is.po (Nautilus)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR Samúel Jón Gunnarsson <sammi@techattack.nu>, 2003.
 #
+# #-#-#-#-#  is.po (eel)  #-#-#-#-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Samúel Jón Gunnarsson <sammi@techattack.nu>, 2003.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  is.po (Nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -14,6 +23,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  is.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2004-03-13 06:27-0000\n"
+"Last-Translator: helgi <helgi@trance.is>\n"
+"Language-Team: Icelandic <gnome@techattack.nu>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -4527,10 +4546,13 @@ msgstr "Villa kom upp þegar sýna átti hjálp: %s"
 msgid "Couldn't Show Help"
 msgstr "Ekki tókst að sýna hjálp"
 
-#: src/file-manager/fm-properties-window.c:3305
+#: src/file-manager/fm-properties-window.c:3305 eel/eel-open-with-dialog.c:793
 #, fuzzy
 msgid "Open With"
-msgstr "Opna me_ð"
+msgstr ""
+"#-#-#-#-#  is.po (Nautilus)  #-#-#-#-#\n"
+"Opna me_ð\n"
+"#-#-#-#-#  is.po (eel)  #-#-#-#-#\n"
 
 #: src/file-manager/fm-properties-window.c:3643
 msgid "Cancel Showing Properties Window?"
@@ -6284,6 +6306,222 @@ msgstr "Netþjónar"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Skoða netþjóna í Nautilus skráarstjóranum"
 
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Texti"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tegund Viðvörunar"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Tegund viðvörunarinnar"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Viðvörunar Takki"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Sýna frekari _upplýsingar"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Texti á miða."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Jöfnun"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Staðsetning á línum textans sem staðsettur er á miðanum eru í beinu "
+"hlutfalli með hvort annað. Þetta hefur EKKI áhrif á staðsetningu miðans á "
+"gluggaviðmótinu. Sjá GtkMisc::xalign í sambandi við það."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Línu umbrot"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ef virkt, þá umbrjótið línur ef texti verður of breiður."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Staðsetning bendils"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Núverandi staðsetning á innsetningarbendli í fjölda rittákna."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Valrammi bendils"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Staðsetning á hinum enda valsvæðis í fjölda rittákna."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Velja _allt"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Innsláttaraðferðir"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf villa:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf villa: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Allar frekari villur verða sýndar í skel."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00 01:00"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Engin mynd var valin."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Þú verður að klikka á mynd til að velja hana."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr ""
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr ""
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Þú getur stoppað þessa aðgerð með því að ýta á hætta við"
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr "(ógildur Unikóði)"
+
 #~ msgid "Allaire"
 #~ msgstr "Allaire"
 
@@ -6548,9 +6786,6 @@ msgstr "Skoða netþjóna í Nautilus skráarstjóranum"
 #~ msgid "Factory for text view"
 #~ msgstr "Verksmiðja fyrir textasýn"
 
-#~ msgid "Text"
-#~ msgstr "Texti"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Textarýnir"
 
@@ -7226,3 +7461,21 @@ msgstr "Skoða netþjóna í Nautilus skráarstjóranum"
 
 #~ msgid "Find:"
 #~ msgstr "Leita:"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf Villa"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Ekkert var valið"
+
+#~ msgid "Info"
+#~ msgstr "Upplýsingar"
+
+#~ msgid "Warning"
+#~ msgstr "Viðvörun"
+
+#~ msgid "Error"
+#~ msgstr "Villa"
+
+#~ msgid "Question"
+#~ msgstr "Spurning"
diff --git a/po/it.po b/po/it.po
index a5462e494..d68fd096a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  it.po (nautilus 2.23.x)  #-#-#-#-#
 # Italian translation of Nautilus
 # This file is distributed under the same license as nautilus package
 # Copyright (C) 2000-2008 Free Software Foundation, Inc.
@@ -5,8 +6,17 @@
 # Pier Luigi Fiorini      <plfiorini@supereva.it>, 2001-2002.
 # Luca Ferretti           <elle.uca@libero.it>,    2002-2008.
 #
+# #-#-#-#-#  it.po (eel 2.21.x)  #-#-#-#-#
+# Italian translation for EEL
+# This file is distributed under the same license as eel package
+# Copyright (C) 2000-2008 Free Software Foundation, Inc.
+# Christopher R. Gabriel <cgabriel@pluto.linux.it>, 2000
+# Luca Ferretti <elle.uca@libero.it>, 2003-2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  it.po (nautilus 2.23.x)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus 2.23.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-06 20:19+0100\n"
@@ -17,6 +27,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"#-#-#-#-#  it.po (eel 2.21.x)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.21.x\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-15 14:15+0100\n"
+"PO-Revision-Date: 2008-02-15 14:16+0100\n"
+"Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2140,8 +2161,8 @@ msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
-"Non è possibile gestire il file «%B» perché non si hanno permessi "
-"sufficienti per leggerlo."
+"Non è possibile gestire il file «%B» perché non si hanno permessi sufficienti "
+"per leggerlo."
 
 # GNOME-2-22
 #: ../libnautilus-private/nautilus-file-operations.c:2481
@@ -2375,9 +2396,9 @@ msgid ""
 "confirmation before replacing any files in the folder that conflict with the "
 "files being copied."
 msgstr ""
-"La cartella sorgente è già presente in «%B». Unendola, verrà chiesta "
-"conferma prima di sostituire ogni file nella cartella che va in conflitto "
-"con quelli che stanno per essere copiati."
+"La cartella sorgente è già presente in «%B». Unendola, verrà chiesta conferma "
+"prima di sostituire ogni file nella cartella che va in conflitto con quelli "
+"che stanno per essere copiati."
 
 # GNOME-2-22
 #: ../libnautilus-private/nautilus-file-operations.c:3840
@@ -2443,9 +2464,9 @@ msgid ""
 "confirmation before replacing any files in the folder that conflict with the "
 "files being moved."
 msgstr ""
-"La cartella sorgente è già presente in «%B». Unendola, verrà chiesta "
-"conferma prima di sostituire ogni file nella cartella che va in conflitto "
-"con quelli che stanno per essere spostati."
+"La cartella sorgente è già presente in «%B». Unendola, verrà chiesta conferma "
+"prima di sostituire ogni file nella cartella che va in conflitto con quelli "
+"che stanno per essere spostati."
 
 # GNOME-2-22
 #: ../libnautilus-private/nautilus-file-operations.c:4507
@@ -3294,8 +3315,8 @@ msgid ""
 "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
 "locations."
 msgstr ""
-"«%s» non può aprire «%s» perché «%s» non può accedere ai file nelle "
-"posizioni «%s»."
+"«%s» non può aprire «%s» perché «%s» non può accedere ai file nelle posizioni «%"
+"s»."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:86
 msgid "Open Failed, would you like to choose another action?"
@@ -3643,8 +3664,7 @@ msgstr "%s%s, %s"
 #: ../src/file-manager/fm-directory-view.c:2309
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
-msgstr ""
-"La cartella «%s» contiene più file di quanti Nautilus ne possa gestire."
+msgstr "La cartella «%s» contiene più file di quanti Nautilus ne possa gestire."
 
 #: ../src/file-manager/fm-directory-view.c:2315
 msgid "Some files will not be displayed."
@@ -3942,8 +3962,7 @@ msgstr "Mostra la cartella contenente gli script che appaiono in questo menù"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6632
 msgid "Prepare the selected files to be moved with a Paste command"
-msgstr ""
-"Prepara i file selezionati per essere spostati con un comando «Incolla»"
+msgstr "Prepara i file selezionati per essere spostati con un comando «Incolla»"
 
 #. name, stock id
 #. label, accelerator
@@ -6795,7 +6814,9 @@ msgstr ""
 msgid ""
 "Nautilus lets you organize files and folders, both on your computer and "
 "online."
-msgstr "Nautilus consente di organizzare i propri file, sia sul proprio computer che in rete."
+msgstr ""
+"Nautilus consente di organizzare i propri file, sia sul proprio computer che "
+"in rete."
 
 #: ../src/nautilus-window-menus.c:564
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -7150,6 +7171,154 @@ msgstr "Ingrandimento"
 msgid "Set the zoom level of the current view"
 msgstr "Imposta il livello di ingrandimento della vista corrente"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bordo dell'immagine/etichetta"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Larghezza del bordo intorno all'etichetta e all'immagine nella finestra di "
+"dialogo di allerta"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tipo di allerta"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Il tipo di allerta"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Pulsanti di allerta"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "I pulsanti mostrati nella finestra di dialogo di allerta"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Mostra maggiori _dettagli"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Testo"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Il testo dell'etichetta."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Giustificazione"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"L'allineamento reciproco delle righe nel testo dell'etichetta. NON influisce "
+"sull'allineamento dell'etichetta. Si veda GtkMisc::xalign per questo."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "A capo automatico"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Se impostato, va a capo se il testo diventa troppo lungo."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Posizione cursore"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "La posizione attuale, in caratteri, del cursore di inserimento."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Limite della selezione"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"La posizione, in caratteri, del lato opposto della selezione rispetto al "
+"cursore."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Seleziona tutto"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Metodi di input"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Errore GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Errore GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Tutti gli ulteriori errori sono mostrati solo su terminale."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Non è stata selezionata alcuna immagine."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Fare clic su un'immagine per selezionarla."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "È possibile fermare questa operazione facendo clic su «Annulla»."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode non valido)"
+
+# GNOME-2-22
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Apertura di «%s»"
+
+# GNOME-2-22
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Apertura di %d oggetto"
+msgstr[1] "Apertura di %d oggetti"
+
+# GNOME-2-22
+# titolo dialogo
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Inserimento password"
+
 #~ msgid "Browse the file system with the file manager"
 #~ msgstr "Esplora il file system con il file manager"
 
@@ -7226,8 +7395,8 @@ msgstr "Imposta il livello di ingrandimento della vista corrente"
 #~ "GConf, che possono essere necessari alle altre applicazioni, verranno "
 #~ "terminati.\n"
 #~ "\n"
-#~ "A volte terminare i processi «bonobo-activation-server» e «gconfd» "
-#~ "risolve il problema, ma non se ne conosce il motivo.\n"
+#~ "A volte terminare i processi «bonobo-activation-server» e «gconfd» risolve "
+#~ "il problema, ma non se ne conosce il motivo.\n"
 #~ "\n"
 #~ "Questo errore si presenta anche quando una versione difettosa di bonobo-"
 #~ "activation è stata installata."
@@ -7254,8 +7423,8 @@ msgstr "Imposta il livello di ingrandimento della vista corrente"
 #~ msgstr ""
 #~ "Non è possibile usare Nautilus adesso, a causa di un errore imprevisto di "
 #~ "Bonobo durante il tentativo di individuare la fabbrica. Per risolvere il "
-#~ "problema, potrebbe essere d'aiuto terminare il processo «bonobo-"
-#~ "activation-server» e riavviare Nautilus."
+#~ "problema, potrebbe essere d'aiuto terminare il processo «bonobo-activation-"
+#~ "server» e riavviare Nautilus."
 
 # GNOME-2-22
 #~ msgid ""
diff --git a/po/ja.po b/po/ja.po
index aa979965c..56469f408 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ja.po (nautilus trunk)  #-#-#-#-#
 # nautilus ja.po.
 # Copyright (C) 2000-2008 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2002.
@@ -8,8 +9,18 @@
 # KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>, 2003.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2003-2008.
 #
+# #-#-#-#-#  ja.po (eel trunk)  #-#-#-#-#
+# nautilus ja.po.
+# Copyright (C) 2000-2005,2007,2008 Free Software Foundation, Inc.
+# Akira TAGOH <tagoh@gnome.gr.jp>, 2000,2001.
+# Takuo Kitame <kitame@debian.org>, 2001.
+# Yukihiro Nakai <nakai@gnome.gr.jp>, 2001.
+# Takeshi AIHANA <takeshi.aihana@gmail.com>, 2003-2005,2007,2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ja.po (nautilus trunk)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus trunk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-20 23:08+0900\n"
@@ -20,6 +31,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  ja.po (eel trunk)  #-#-#-#-#\n"
+"Project-Id-Version: eel trunk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-03 18:27+0900\n"
+"PO-Revision-Date: 2008-02-03 18:27+0900\n"
+"Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6830,3 +6852,145 @@ msgstr "ズーム"
 #: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "現在のビューのズーム・レベルを設定します"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "画像/ラベルの境界"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "警告ダイアログのラベルと画像の外側にある境界の幅"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "警告の種類"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "警告の種類です"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "警告ボタン"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "警告ダイアログの中に表示するボタンです"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "詳細を表示する(_D)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "Ｘ"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Ｙ"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "文字列"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ラベルの文字列です"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "行端揃え"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"相互に関連するラベルのテキストの中にある行の調整です。これはラベルの中の調整"
+"には効果がありません。詳細は GtkMisc::xalign を参照して下さい。"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "行ラップ"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"これをセットした場合、テキストが長くなった場合に行を分割して残りを次の行に表"
+"示します"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "カーソル位置"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "挿入カーソルの現在位置です"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "選択範囲の境界線"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "カーソル位置から選択範囲の終点です"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "全て選択"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "入力メソッド"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf エラー:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf エラー: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "更に多くのエラーは端末にのみ表示されます。"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "画像が選択されていません。"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "画像を選択する場合はその画像をクリックして下さい。"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "[キャンセル] をクリックすると、この操作を取り消せます。"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode が正しくありません)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "%s を開いています"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] " %d個のアイテムを開いています"
+msgstr[1] " %d個のアイテムを開いています"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "パスワードの入力"
diff --git a/po/ka.po b/po/ka.po
index 6ffb3e078..93836baea 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,21 +1,44 @@
+# #-#-#-#-#  ka.po (ka)  #-#-#-#-#
 # Copyright © 2007 Gnome i18n Project for Georgia, 2008.
 # Georgian Translation for Nautilus, 2008, 2008.
 #
 # Vladimer Sichinava  ვლადიმერ სიჭინავა <vsichi@gnome.org>, 2008.
+# #-#-#-#-#  ka.po (eel.HEAD)  #-#-#-#-#
+# translation of eel.HEAD.po to Georgian
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Vladimer Sichinava <alinux@siena.linux.it>, 2006.
+# Vladimer Sichinava <vlsichinava@gmail.com>, 2006.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ka.po (ka)  #-#-#-#-#\n"
 "Project-Id-Version: ka\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-02 22:36+0200\n"
 "PO-Revision-Date: 2008-10-20 21:18+0200\n"
 "Last-Translator: Vladimer Sichinava  ვლადიმერ სიჭინავა <vsichi@gnome.org>\n"
-"Language-Team: Georgian <http://mail.gnome.org/mailman/listinfo/gnome-ge-list>\n"
+"Language-Team: Georgian <http://mail.gnome.org/mailman/listinfo/gnome-ge-"
+"list>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: KBabel 1.11.4\n"
 "X-Rosetta-Export-Date: 2007-06-29 21:08:16+0000\n"
+"#-#-#-#-#  ka.po (eel.HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-27 16:05+0200\n"
+"PO-Revision-Date: 2006-09-11 00:29+0200\n"
+"Last-Translator: Vladimer Sichinava <vlsichinava@gmail.com>\n"
+"Language-Team: Georgian <www.gia.ge>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -1222,6 +1245,7 @@ msgstr "ნა_გულისხმევის მოხმარება"
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:274
 #: ../src/file-manager/fm-list-view.c:1454
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "სახელი"
 
@@ -2739,10 +2763,12 @@ msgid "Could not set as default application"
 msgstr "შეუძლებელია ნაგულისხმევ პროგრამად მითითება"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#: ../eel/eel-mime-application-chooser.c:229
 msgid "Default"
 msgstr "ნაგულისხმევი"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
+#: ../eel/eel-mime-application-chooser.c:237
 msgid "Icon"
 msgstr "ხატულა"
 
@@ -2751,17 +2777,29 @@ msgid "Could not remove application"
 msgstr "შეულებელია პროგრამის ამოღება"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#: ../eel/eel-mime-application-chooser.c:479
+#, fuzzy
 msgid "No applications selected"
-msgstr "არავითარი ამორჩეული პროგრამა"
+msgstr ""
+"#-#-#-#-#  ka.po (ka)  #-#-#-#-#\n"
+"არავითარი ამორჩეული პროგრამა\n"
+"#-#-#-#-#  ka.po (eel.HEAD)  #-#-#-#-#\n"
+"<i>პროგრამა არ არის ამორჩეული</i>"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, c-format
+#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:984
+#, fuzzy, c-format
 msgid "%s document"
-msgstr "%s დოკუმენტი"
+msgstr ""
+"#-#-#-#-#  ka.po (ka)  #-#-#-#-#\n"
+"%s დოკუმენტი\n"
+"#-#-#-#-#  ka.po (eel.HEAD)  #-#-#-#-#\n"
+"%s "
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:910
+#: ../eel/eel-mime-application-chooser.c:538 ../eel/eel-open-with-dialog.c:997
 msgid "Unknown"
 msgstr "უცნობი"
 
@@ -2777,15 +2815,18 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "ყველა \"%s\" ტიპის ფაილების გახსნა:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
 msgid "Could not run application"
 msgstr "შეუძლებელია პროგრამის გაშვება"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
+#: ../eel/eel-open-with-dialog.c:187
 #, c-format
 msgid "Could not find '%s'"
 msgstr "შეუძლებელია '%s' -ის პოვნა"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#: ../eel/eel-open-with-dialog.c:190
 msgid "Could not find application"
 msgstr "შეუძლებელია პროგრამის პოვნა"
 
@@ -2795,52 +2836,72 @@ msgid "Could not add application to the application database: %s"
 msgstr "შეუძლებელი გახდა პროგრამის, პროგრამების მონაცემთა ბაზაში დამატება: %s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
+#: ../eel/eel-open-with-dialog.c:287
 msgid "Could not add application"
 msgstr "შეუძლებელია პროგრამის დამატება"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#: ../eel/eel-open-with-dialog.c:401
 msgid "Select an Application"
 msgstr "პროგრამის ამორჩევა"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5104
+#: ../eel/eel-open-with-dialog.c:809
+#, fuzzy
 msgid "Open With"
-msgstr "პროგრამაში გახსნა"
+msgstr ""
+"#-#-#-#-#  ka.po (ka)  #-#-#-#-#\n"
+"პროგრამაში გახსნა\n"
+"#-#-#-#-#  ka.po (eel.HEAD)  #-#-#-#-#\n"
+"გახსნა პროგრამით..."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#: ../eel/eel-open-with-dialog.c:846
 msgid "Select an application to view its description."
 msgstr "შეარჩიეთ პროგრამა მისი აღწერილობის სანახავად."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#: ../eel/eel-open-with-dialog.c:871
 msgid "_Use a custom command"
 msgstr "_საკუთარი ბრძანების გამოყენება"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
+#: ../eel/eel-open-with-dialog.c:888
 msgid "_Browse..."
 msgstr "_ნუსხა..."
 
+#. #-#-#-#-#  ka.po (ka)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
 #: ../src/file-manager/fm-directory-view.c:6599
 #: ../src/file-manager/fm-directory-view.c:7799
 #: ../src/file-manager/fm-tree-view.c:1174
-#: ../src/nautilus-places-sidebar.c:1954
+#: ../src/nautilus-places-sidebar.c:1954 ../eel/eel-open-with-dialog.c:910
 msgid "_Open"
 msgstr "_გახსნა"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
+#: ../eel/eel-open-with-dialog.c:1004
 #, c-format
 msgid "Open %s and other files of type \"%s\" with:"
 msgstr "გახსენი %s და სხვა ტიპის \"%s\" ფაილები კი:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#: ../eel/eel-open-with-dialog.c:1036
+#, fuzzy
 msgid "_Add"
-msgstr "_დამატება"
+msgstr ""
+"#-#-#-#-#  ka.po (ka)  #-#-#-#-#\n"
+"_დამატება\n"
+"#-#-#-#-#  ka.po (eel.HEAD)  #-#-#-#-#\n"
+"_დაამატე"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#: ../eel/eel-open-with-dialog.c:1037
 msgid "Add Application"
 msgstr "პროგრამის დამატება"
 
@@ -6619,6 +6680,157 @@ msgstr "გადიდება"
 msgid "Set the zoom level of the current view"
 msgstr "მიმდინარე ხედისთვის მაშტაბის შესაბამება"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ნახატის/წარწერის კონტური"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "ჩარჩოს სიგანე წარწერისა და ნახატის გარშემო, განგაშის დიალოგ ფანჯარაში"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "გაფრთხილების ტიპი"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "განგაშის ტიპი"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "გაფრთხილების ღილაკები"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "ღილაკები რომლებიც ჩნდებიან განგაშის შეტყობინებებში"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "დამატებითი _დეტალების ჩვენება"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ტექსტი"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ეტიკეტის ტექსტი."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "მორგება"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"წარწერის ტექსტის ურთიერთგანთავსება.  არ მოქმედებს წარწერის მისთვის გამოყოფილ "
+"ადგილას განთავსებაზე.  იხ. აგრეთვე, GtkMisc::x-განთავსება."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "სტრიქონების გადატანა"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "თუ ჩართულია, გადაიტანს ტექსტს თუ იგი ძალზედ განიერია."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "კურსორის პოზიცია"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "სიმბოლოების შეყვანის კურსორის მიმდინარე პოზიცია."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "მონიშნულის საზღვრები"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "ასოებში მონიშნულის უკიდურესობების მდებარეობა კურსორიდან."
+
+#: ../eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "ყველას მონიშვნა"
+
+#: ../eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "შეყვანის მეთოდები"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf შეცდომა:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GCont შეცდომა: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "დამატებითი შეცდომების გამონატანის ტერმინალში ჩვენება."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00,·01:00·AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00,·1:00·AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr "·1/·1/00,··1:00·AM"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "არავითარი ამორჩეული სურათი."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "დაუწკაპუნეთ სურათს მონიშვნისთვის"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr "გასახსნელი პროგრამის ამორჩევა %s და სხვა \"%s\" ტიპის"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "ვერ ვამატებ პროგრამას, პროგრამათა მონაცემთა ბაზაში"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "თქვენ შეგიძლიათ შეწყვიტოთ"
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr "(მცდარი უნიკოდი)"
+
 #~ msgid "Create Folder"
 #~ msgstr "დასტის შექმნა"
 
diff --git a/po/kn.po b/po/kn.po
index 5aa02d6d6..f550af335 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,10 +1,20 @@
+# #-#-#-#-#  kn.po (kn)  #-#-#-#-#
 # translation of kn.po to Kannada
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Shankar Prasad <svenkate@redhat.com>, 2007, 2008.
+# #-#-#-#-#  kn.po (eel.HEAD.kn)  #-#-#-#-#
+# translation of eel.HEAD.kn.po to Kannada
+# Pramod <rpramod@postmaster.co.uk>, 2002.
+# Vikram Vincent <vincentvikram@swatantra.org>, 2008.
+# Shankar Prasad <svenkate@redhat.com>, 2008.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  kn.po (kn)  #-#-#-#-#\n"
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-13 11:40+0000\n"
@@ -16,6 +26,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  kn.po (eel.HEAD.kn)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.kn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-06-03 06:35+0000\n"
+"PO-Revision-Date: 2008-08-12 15:21+0530\n"
+"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
+"Language-Team: Kannada <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -111,7 +133,8 @@ msgstr "ಒಂದು ಆಬ್ಜೆಕ್ಟನ್ನು ಬದಲಾಯಿಸ�
 
 #: ../data/browser.xml.h:24
 msgid "Drag an emblem to an object to add it to the object"
-msgstr "ಒಂದು ಆಬ್ಜೆಕ್ಟ್‍ಗೆ ಒಂದು ಲಾಂಛನವನ್ನು ಸೇರಿಸಲು ಅದನ್ನು ಎಳೆದು ತಂದು ಆಬ್ಜೆಕ್ಟಿಗೆ ತಂದು ಹಾಕಿರಿ"
+msgstr ""
+"ಒಂದು ಆಬ್ಜೆಕ್ಟ್‍ಗೆ ಒಂದು ಲಾಂಛನವನ್ನು ಸೇರಿಸಲು ಅದನ್ನು ಎಳೆದು ತಂದು ಆಬ್ಜೆಕ್ಟಿಗೆ ತಂದು ಹಾಕಿರಿ"
 
 #: ../data/browser.xml.h:25
 msgid "Eclipse"
@@ -320,10 +343,10 @@ msgid "Always use the location entry, instead of the pathbar"
 msgstr "ಮಾರ್ಗಪಟ್ಟಿಯ ಬದಲು ಎಲ್ಲಾ ಸಮಯದಲ್ಲೂ ಸ್ಥಳ ನಮೂದನ್ನು ಬಳಸು"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
-"ಕಡತಕೋಶದ ಹಿನ್ನಲೆಗಾಗಿನ ಡೀಫಾಲ್ಟ್‍ ಬಣ್ಣ. background_set ನಿಜ ಎಂದಾದಲ್ಲಿ ಮಾತ್ರ "
-"ಬಳಸಲ್ಪಡುತ್ತದೆ."
+"ಕಡತಕೋಶದ ಹಿನ್ನಲೆಗಾಗಿನ ಡೀಫಾಲ್ಟ್‍ ಬಣ್ಣ. background_set ನಿಜ ಎಂದಾದಲ್ಲಿ ಮಾತ್ರ ಬಳಸಲ್ಪಡುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "Computer icon visible on desktop"
@@ -340,8 +363,10 @@ msgid ""
 "If set to \"search_by_text_and_properties\", then Nautilus will search for "
 "files by file name and file properties."
 msgstr ""
-"ಹುಡುಕು ಸ್ಥಳದಲ್ಲಿ ಕಡತಗಳನ್ನು ಹುಡುಕುವಾಗ ನಮೂದಿಸಬೇಕಿರುವ ಆಧಾರ. \"ಪಠ್ಯದ ಆಧಾರದಲ್ಲಿ ಹುಡುಕು\" ಎಂದು ಹೊಂದಿಸಿದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತಗಳನ್ನು ಕೇವಲ ಅವುಗಳ ಹೆಸರಿನ ಆಧಾರದಲ್ಲಿ ಹುಡುಕುತ್ತದೆ. "
-"\"ಪಠ್ಯ ಹಾಗು ಗುಣಲಕ್ಷಣಗಳ ಆಧಾರದಲ್ಲಿ ಹುಡುಕು\" ಎಂದು ಹೊಂದಿಸಿದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತಗಳನ್ನು ಅವುಗಳ ಹೆಸರು ಹಾಗು ಗುಣಗಳ ಆಧಾರದಲ್ಲಿ ಹುಡುಕುತ್ತದೆ."
+"ಹುಡುಕು ಸ್ಥಳದಲ್ಲಿ ಕಡತಗಳನ್ನು ಹುಡುಕುವಾಗ ನಮೂದಿಸಬೇಕಿರುವ ಆಧಾರ. \"ಪಠ್ಯದ ಆಧಾರದಲ್ಲಿ ಹುಡುಕು"
+"\" ಎಂದು ಹೊಂದಿಸಿದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತಗಳನ್ನು ಕೇವಲ ಅವುಗಳ ಹೆಸರಿನ ಆಧಾರದಲ್ಲಿ ಹುಡುಕುತ್ತದೆ. "
+"\"ಪಠ್ಯ ಹಾಗು ಗುಣಲಕ್ಷಣಗಳ ಆಧಾರದಲ್ಲಿ ಹುಡುಕು\" ಎಂದು ಹೊಂದಿಸಿದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತಗಳನ್ನು "
+"ಅವುಗಳ ಹೆಸರು ಹಾಗು ಗುಣಗಳ ಆಧಾರದಲ್ಲಿ ಹುಡುಕುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Current Nautilus theme (deprecated)"
@@ -445,7 +470,8 @@ msgstr "ಗಣಕತೆರೆಯ ಕಸದ ಬುಟ್ಟಿಯ ಲಾಂಛನ
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "ಎಲ್ಲಾ ವಿಂಡೋಗಳು ವೀಕ್ಷಕಗಳಾಗಿ ಕಾಣಿಸುವ, ಸಾಂಪ್ರದಾಯಿಕ ನಾಟಿಲಸ್ ವರ್ತನೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ"
+msgstr ""
+"ಎಲ್ಲಾ ವಿಂಡೋಗಳು ವೀಕ್ಷಕಗಳಾಗಿ ಕಾಣಿಸುವ, ಸಾಂಪ್ರದಾಯಿಕ ನಾಟಿಲಸ್ ವರ್ತನೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -460,8 +486,8 @@ msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
-"ಡೀಫಾಲ್ಟ್‍ ಬಲ ಫಲಕದ ಹಿನ್ನಲೆಗಾಗಿನ ಕಡತದ ಹೆಸರು. side_pane_background_set ನಿಜ "
-"ಎಂದಾದಲ್ಲಿ ಮಾತ್ರ ಬಳಸಲ್ಪಡುತ್ತದೆ."
+"ಡೀಫಾಲ್ಟ್‍ ಬಲ ಫಲಕದ ಹಿನ್ನಲೆಗಾಗಿನ ಕಡತದ ಹೆಸರು. side_pane_background_set ನಿಜ ಎಂದಾದಲ್ಲಿ "
+"ಮಾತ್ರ ಬಳಸಲ್ಪಡುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid ""
@@ -469,7 +495,12 @@ msgid ""
 "this is to avoid unintentionally blowing the heap and killing Nautilus on "
 "massive folders. A negative value denotes no limit. The limit is approximate "
 "due to the reading of folders chunk-wise."
-msgstr "ಈ ಗಾತ್ರಕ್ಕಿಂತ ದೊಡ್ಡದಾದ ಕೋಶಗಳನ್ನು ಈ ಗಾತ್ರಕ್ಕೆ ನಿಲ್ಲಿಸಲಾಗುವುದು. ದೊಡ್ಡದಾದ ಕೋಶಗಳಲ್ಲಿ ತಿಳಿಯದೆ ಕಡತಗಳನ್ನು ರಾಶಿ ಹಾಕುವುದನ್ನು ಹಾಗು ಆ ಮೂಲಕ ನಾಟಿಲಸ್ ಅನ್ನು ಕೊಲ್ಲುವುದನ್ನು ತಪ್ಪಿಸುವುದು ಇದರ ಉದ್ದೇಶವಾಗಿದೆ. ಋಣಾತ್ಮಕ ಮೌಲ್ಯವು ಗಾತ್ರಕ್ಕೆ ಯಾವುದೆ ಮಿತಿ ಇಲ್ಲ ಎಂದು ಸೂಚಿಸುತ್ತದೆ. ಕೋಶಗಳನ್ನು ಬಿಡಿ ಬಿಡಿಯಾಗಿ ಓದುಲಾಗುವುದರಿಂದ ಇಲ್ಲಿ ಸೂಚಿಸಲಾದ ಮಿತಿಯು ಅಂದಾಜು ಮಾತ್ರ ನೀಡಲಾಗುತ್ತದೆ."
+msgstr ""
+"ಈ ಗಾತ್ರಕ್ಕಿಂತ ದೊಡ್ಡದಾದ ಕೋಶಗಳನ್ನು ಈ ಗಾತ್ರಕ್ಕೆ ನಿಲ್ಲಿಸಲಾಗುವುದು. ದೊಡ್ಡದಾದ ಕೋಶಗಳಲ್ಲಿ "
+"ತಿಳಿಯದೆ ಕಡತಗಳನ್ನು ರಾಶಿ ಹಾಕುವುದನ್ನು ಹಾಗು ಆ ಮೂಲಕ ನಾಟಿಲಸ್ ಅನ್ನು ಕೊಲ್ಲುವುದನ್ನು "
+"ತಪ್ಪಿಸುವುದು ಇದರ ಉದ್ದೇಶವಾಗಿದೆ. ಋಣಾತ್ಮಕ ಮೌಲ್ಯವು ಗಾತ್ರಕ್ಕೆ ಯಾವುದೆ ಮಿತಿ ಇಲ್ಲ ಎಂದು "
+"ಸೂಚಿಸುತ್ತದೆ. ಕೋಶಗಳನ್ನು ಬಿಡಿ ಬಿಡಿಯಾಗಿ ಓದುಲಾಗುವುದರಿಂದ ಇಲ್ಲಿ ಸೂಚಿಸಲಾದ ಮಿತಿಯು "
+"ಅಂದಾಜು ಮಾತ್ರ ನೀಡಲಾಗುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid "Home icon visible on desktop"
@@ -480,7 +511,10 @@ msgid ""
 "If set to \"after_current_tab\", then new tabs are inserted after the "
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
 "tab list."
-msgstr "\"ಈಗಿನ ಹಾಳೆಯ ನಂತರ\" ಗೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಹೊಸ ಹಾಳೆಗಳು ಈಗಿನ ಹಾಳೆಗಳ ನಂತರ ಸೇರಿಸಲ್ಪಡುತ್ತದೆ. \"ಕೊನೆ\" ಗೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಹೊಸ ಹಾಳೆಗಳು ಹಾಳೆ ಪಟ್ಟಿಯ ಕೊನೆಯಲ್ಲಿ ಸೇರಿಸಲ್ಪಡುತ್ತದೆ."
+msgstr ""
+"\"ಈಗಿನ ಹಾಳೆಯ ನಂತರ\" ಗೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಹೊಸ ಹಾಳೆಗಳು ಈಗಿನ ಹಾಳೆಗಳ ನಂತರ "
+"ಸೇರಿಸಲ್ಪಡುತ್ತದೆ. \"ಕೊನೆ\" ಗೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಹೊಸ ಹಾಳೆಗಳು ಹಾಳೆ ಪಟ್ಟಿಯ ಕೊನೆಯಲ್ಲಿ "
+"ಸೇರಿಸಲ್ಪಡುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
@@ -491,7 +525,8 @@ msgstr ""
 "ಕಡತಕೋಶ ಹಾಗು ಕಡತಗಳೆರಡನ್ನೂ ತೋರಿಸುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಹೊಸದಾಗಿ ತೆರೆಯಲಾದ ವಿಂಡೋಗಳ ಸ್ಥಳ ಪಟ್ಟಿಯು ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
@@ -518,7 +553,9 @@ msgstr ""
 msgid ""
 "If set to true, then Nautilus lets you edit and display file permissions in "
 "a more unix-like way, accessing some more esoteric options."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತದ ಅನುಮತಿಗಳನ್ನು ಇನ್ನಷ್ಟು ಗೂಢವಾದ ಆಯ್ಕೆಗಳನ್ನು ಒದಗಿಸುವ ಮೂಲಕ ಯುನಿಕ್ಸ್‍ ಮಾದರಿಯಲ್ಲಿ ಸಂಪಾದಿಸಲು ಹಾಗು ತೋರಿಸಲು ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ, "
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತದ ಅನುಮತಿಗಳನ್ನು ಇನ್ನಷ್ಟು ಗೂಢವಾದ ಆಯ್ಕೆಗಳನ್ನು ಒದಗಿಸುವ ಮೂಲಕ "
+"ಯುನಿಕ್ಸ್‍ ಮಾದರಿಯಲ್ಲಿ ಸಂಪಾದಿಸಲು ಹಾಗು ತೋರಿಸಲು ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ, "
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid ""
@@ -532,13 +569,18 @@ msgstr ""
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಕಡತಗಳನ್ನು ಅಳಿಸುವಾಗ, ಅಥವ ಕಸದಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡುವಾಗ ನೀವು ಹೊರಟಾಗ ನಾಟಿಲಸ್ ಖಚಿತಪಡಿಸಲು ಕೇಳುತ್ತದೆ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ಕಡತಗಳನ್ನು ಅಳಿಸುವಾಗ, ಅಥವ ಕಸದಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡುವಾಗ ನೀವು ಹೊರಟಾಗ "
+"ನಾಟಿಲಸ್ ಖಚಿತಪಡಿಸಲು ಕೇಳುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid ""
 "If set to true, then Nautilus will automatically mount media such as user-"
 "visible hard disks and removable media on start-up and media insertion."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಗಣಕವನ್ನು ಆರಂಭಿಸಿದಾಗ ಹಾಗು ಮಾಧ್ಯಮವನ್ನು ತೂರಿಸಿದಾಗ ತಾನಾಗಿಯೆ ಬಳಕೆದಾರರಿಗೆ ಕಾಣಿಸುವಂತಹ ಮಾಧ್ಯಮಗಳಾದ ಹಾರ್ಡ್ ಡಿಸ್ಕ್‍  ಹಾಗು ತೆಗೆಯ ಬಹುದಾದಂತಹ ಮಾಧ್ಯಮಗಳನ್ನು ಆರೋಹಿಸುತ್ತದೆ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಗಣಕವನ್ನು ಆರಂಭಿಸಿದಾಗ ಹಾಗು ಮಾಧ್ಯಮವನ್ನು ತೂರಿಸಿದಾಗ ತಾನಾಗಿಯೆ "
+"ಬಳಕೆದಾರರಿಗೆ ಕಾಣಿಸುವಂತಹ ಮಾಧ್ಯಮಗಳಾದ ಹಾರ್ಡ್ ಡಿಸ್ಕ್‍  ಹಾಗು ತೆಗೆಯ ಬಹುದಾದಂತಹ ಮಾಧ್ಯಮಗಳನ್ನು "
+"ಆರೋಹಿಸುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
@@ -546,7 +588,11 @@ msgid ""
 "automounted. This only applies to media where no known x-content/* type was "
 "detected; for media where a known x-content type is detected, the user "
 "configurable action will be taken instead."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಮಾಧ್ಯಮವು ತಾನಾಗಿಯೆ ಆರೋಹಿತಗೊಂಡಾಗ ನಾಟಿಲಸ್ ತಾನಾಗಿಯೆ ಒಂದು ಕಡತಕೋಶವನ್ನು ತೆರೆಯುತ್ತದೆ. ಇದು ಗೊತ್ತಿರುವ ಯಾವುದೆ x-content/* ಅನ್ನು ಹೊಂದಿಲ್ಲದ ಮಾಧ್ಯಮಕ್ಕೆ ಮಾತ್ರ ಅನ್ವಯಿಸುತ್ತದೆ; ಗೊತ್ತಿರುವ x-content ಬಗೆಯು ಕಂಡುಬಂದಂತಹ ಯಾವುದೆ ಮಾಧ್ಯಮಗಳಿಗೆ, ಬಳಕೆದಾರರು ಸಂರಚಿಸಬಲ್ಲಂತಹ ಕಾರ್ಯವನ್ನು ಒದಗಿಸಲಾಗುವುದು."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ಮಾಧ್ಯಮವು ತಾನಾಗಿಯೆ ಆರೋಹಿತಗೊಂಡಾಗ ನಾಟಿಲಸ್ ತಾನಾಗಿಯೆ ಒಂದು ಕಡತಕೋಶವನ್ನು "
+"ತೆರೆಯುತ್ತದೆ. ಇದು ಗೊತ್ತಿರುವ ಯಾವುದೆ x-content/* ಅನ್ನು ಹೊಂದಿಲ್ಲದ ಮಾಧ್ಯಮಕ್ಕೆ ಮಾತ್ರ "
+"ಅನ್ವಯಿಸುತ್ತದೆ; ಗೊತ್ತಿರುವ x-content ಬಗೆಯು ಕಂಡುಬಂದಂತಹ ಯಾವುದೆ ಮಾಧ್ಯಮಗಳಿಗೆ, "
+"ಬಳಕೆದಾರರು ಸಂರಚಿಸಬಲ್ಲಂತಹ ಕಾರ್ಯವನ್ನು ಒದಗಿಸಲಾಗುವುದು."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
@@ -557,88 +603,121 @@ msgid ""
 "If set to true, then Nautilus will have a feature allowing you to delete a "
 "file immediately and in-place, instead of moving it to the trash. This "
 "feature can be dangerous, so use caution."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತವನ್ನು ಕಸದ ಬುಟ್ಟಿಗೆ ವರ್ಗಾಯಿಸದೆ, ತಕ್ಷಣ ಹಾಗು ಆ ಜಾಗದಲ್ಲೆ ಅಳಿಸಿ ಹಾಕುವ ಸವಲತ್ತನ್ನು ಹೊಂದಿರುತ್ತದೆ. ಈ ಸವಲತ್ತು ಅಪಾಯಕಾರಿಯಾಗಬಹುದು, ಆದ್ದರಿಂದ ಎಚ್ಚರದಿಂದಿರಿ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಕಡತವನ್ನು ಕಸದ ಬುಟ್ಟಿಗೆ ವರ್ಗಾಯಿಸದೆ, ತಕ್ಷಣ ಹಾಗು ಆ ಜಾಗದಲ್ಲೆ "
+"ಅಳಿಸಿ ಹಾಕುವ ಸವಲತ್ತನ್ನು ಹೊಂದಿರುತ್ತದೆ. ಈ ಸವಲತ್ತು ಅಪಾಯಕಾರಿಯಾಗಬಹುದು, ಆದ್ದರಿಂದ "
+"ಎಚ್ಚರದಿಂದಿರಿ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
 "If set to true, then Nautilus will never prompt nor autorun/autostart "
 "programs when a medium is inserted."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಒಂದು ಮಾಧ್ಯಮವನ್ನು ತೂರಿಸಿದಾಗ ನಾಟಿಲಸ್ ಎಂದಿಗೂ ಅದರಲ್ಲಿರಬಹುದಾದ ಪ್ರೊಗ್ರಾಂ ಅನ್ನು ತೋರಿಸುವುದು ಅಥವ ಸ್ವಯಂಚಾಲನೆ/ಸ್ವಯಂಆರಂಭಗೊಳಿಸುವುದಿಲ್ಲ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ಒಂದು ಮಾಧ್ಯಮವನ್ನು ತೂರಿಸಿದಾಗ ನಾಟಿಲಸ್ ಎಂದಿಗೂ ಅದರಲ್ಲಿರಬಹುದಾದ ಪ್ರೊಗ್ರಾಂ "
+"ಅನ್ನು ತೋರಿಸುವುದು ಅಥವ ಸ್ವಯಂಚಾಲನೆ/ಸ್ವಯಂಆರಂಭಗೊಳಿಸುವುದಿಲ್ಲ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid ""
 "If set to true, then Nautilus will use the user's home folder as the "
 "desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಬಳಕೆದಾರರ ನೆಲೆ ಕಡತಕೋಶವನ್ನು ಗಣಕತೆರೆಯನ್ನಾಗಿ ಬಳಸುತ್ತದೆ. ಇದು ಅಲ್ಲ ಎಂದಾದಲ್ಲಿ, ~/Desktop ಅನ್ನು ಗಣಕತೆರೆಯನ್ನಾಗಿ ಬಳಸುತ್ತದೆ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ನಾಟಿಲಸ್ ಬಳಕೆದಾರರ ನೆಲೆ ಕಡತಕೋಶವನ್ನು ಗಣಕತೆರೆಯನ್ನಾಗಿ ಬಳಸುತ್ತದೆ. ಇದು "
+"ಅಲ್ಲ ಎಂದಾದಲ್ಲಿ, ~/Desktop ಅನ್ನು ಗಣಕತೆರೆಯನ್ನಾಗಿ ಬಳಸುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
 "If set to true, then all Nautilus windows will be browser windows. This is "
 "how Nautilus used to behave before version 2.6, and some people prefer this "
 "behavior."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಎಲ್ಲಾ ನಾಟಿಲಸ್ ವಿಂಡೋಗಳು ವೀಕ್ಷಕ ವಿಂಡೋಗಳಾಗಿರುತ್ತವೆ. ನಾಟಿಲಸ್ ತನ್ನ ೨.೬ ಆವೃತ್ತಿಗಿಂತ ಮೊದಲು ಹೀಗೆಯೆ ಇತ್ತು, ಅಲ್ಲದೆ ಕೆಲವರು ಇದರ ಈ ವರ್ತನೆಯನ್ನು ಇಷ್ಟ ಪಡುತ್ತಾರೆ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ಎಲ್ಲಾ ನಾಟಿಲಸ್ ವಿಂಡೋಗಳು ವೀಕ್ಷಕ ವಿಂಡೋಗಳಾಗಿರುತ್ತವೆ. ನಾಟಿಲಸ್ ತನ್ನ ೨.೬ "
+"ಆವೃತ್ತಿಗಿಂತ ಮೊದಲು ಹೀಗೆಯೆ ಇತ್ತು, ಅಲ್ಲದೆ ಕೆಲವರು ಇದರ ಈ ವರ್ತನೆಯನ್ನು ಇಷ್ಟ ಪಡುತ್ತಾರೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid ""
 "If set to true, then backup files such as those created by Emacs are "
 "displayed. Currently, only files ending in a tilde (~) are considered backup "
 "files."
-msgstr "ನಿಜವೆಂದಾದಲ್ಲಿ, ಎಮಾಕ್ಸಿನಿಂದ(Emacs) ನಿರ್ಮಿಸಲ್ಪಟ್ಟ ಬ್ಯಾಕ್ಅಪ್ ಕಡತಗಳು ತೋರಿಸಲ್ಪಡುತ್ತವೆ. ಸದ್ಯದಲ್ಲಿ, ಕೇವಲ ಟಿಲ್ಡೆಯಿಂದ(~) ಅಂತ್ಯಗೊಳ್ಳುವ ಕಡತಗಳನ್ನು ಮಾತ್ರ ಬ್ಯಾಕ್ಅಪ್ ಕಡತಗಳೆಂದು ಪರಿಗಣಿಸಲಾಗುವುದು."
+msgstr ""
+"ನಿಜವೆಂದಾದಲ್ಲಿ, ಎಮಾಕ್ಸಿನಿಂದ(Emacs) ನಿರ್ಮಿಸಲ್ಪಟ್ಟ ಬ್ಯಾಕ್ಅಪ್ ಕಡತಗಳು ತೋರಿಸಲ್ಪಡುತ್ತವೆ. "
+"ಸದ್ಯದಲ್ಲಿ, ಕೇವಲ ಟಿಲ್ಡೆಯಿಂದ(~) ಅಂತ್ಯಗೊಳ್ಳುವ ಕಡತಗಳನ್ನು ಮಾತ್ರ ಬ್ಯಾಕ್ಅಪ್ ಕಡತಗಳೆಂದು "
+"ಪರಿಗಣಿಸಲಾಗುವುದು."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
 "files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಅಡಗಿಸಲಾದ ಕಡತಗಳು ಕಡತ ವ್ಯವಸ್ಥಾಪಕದಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ. ಅಡಗಿಸಲಾದ ಕಡತಗಳೆಂದರೆ, ಒಂದೊ ಚುಕ್ಕಿಯಿಂದ ಆರಂಭಗೊಳ್ಳುವ ಕಡತಗಳಾಗಿರುತ್ತವೆ ಅಥವ .hidden ಕಡತದಲ್ಲಿ ಪಟ್ಟಿ ಮಾಡಲಾಗಿದ್ದು ಆಗಿರುತ್ತದೆ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ಅಡಗಿಸಲಾದ ಕಡತಗಳು ಕಡತ ವ್ಯವಸ್ಥಾಪಕದಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ. ಅಡಗಿಸಲಾದ "
+"ಕಡತಗಳೆಂದರೆ, ಒಂದೊ ಚುಕ್ಕಿಯಿಂದ ಆರಂಭಗೊಳ್ಳುವ ಕಡತಗಳಾಗಿರುತ್ತವೆ ಅಥವ .hidden ಕಡತದಲ್ಲಿ "
+"ಪಟ್ಟಿ ಮಾಡಲಾಗಿದ್ದು ಆಗಿರುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 msgid ""
 "If set to true, then multiple views can be opened in one browser window, "
 "each in a separate tab."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಒಂದು ವೀಕ್ಷಕ ವಿಂಡೋದಲ್ಲಿ ಅನೇಕ ನೋಟಗಳನ್ನು ಪ್ರತ್ಯೇಕ ಹಾಳೆಗಳಲ್ಲಿ ತೆರೆಯಬಹುದಾಗಿದೆ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ಒಂದು ವೀಕ್ಷಕ ವಿಂಡೋದಲ್ಲಿ ಅನೇಕ ನೋಟಗಳನ್ನು ಪ್ರತ್ಯೇಕ ಹಾಳೆಗಳಲ್ಲಿ "
+"ತೆರೆಯಬಹುದಾಗಿದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
-msgstr "ನಿಜ ಎಂದಾದಲ್ಲಿ, ಜಾಲ ಬಂಧ ಪರಿಚಾರಕಕ್ಕೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯು ಗಣಕತೆರೆಯಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
+msgstr ""
+"ನಿಜ ಎಂದಾದಲ್ಲಿ, ಜಾಲ ಬಂಧ ಪರಿಚಾರಕಕ್ಕೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯು ಗಣಕತೆರೆಯಲ್ಲಿ "
+"ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
-msgstr "ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ಗಣಕದ ತಾಣಕ್ಕೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯು ಗಣಕತೆರೆಯಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
+msgstr ""
+"ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ಗಣಕದ ತಾಣಕ್ಕೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯು ಗಣಕತೆರೆಯಲ್ಲಿ "
+"ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
-msgstr "ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ನೆಲೆ ಕಡತಕೋಶಕ್ಕೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯನ್ನು ಗಣಕತೆರೆಯಲ್ಲಿ ಇರಿಸಲಾಗುತ್ತದೆ."
+msgstr ""
+"ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ನೆಲೆ ಕಡತಕೋಶಕ್ಕೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯನ್ನು ಗಣಕತೆರೆಯಲ್ಲಿ "
+"ಇರಿಸಲಾಗುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr "ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ಕಸದ ಬುಟ್ಟಿಗೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯನ್ನು ಗಣಕತೆರೆಯಲ್ಲಿ ಇರಿಸಲಾಗುತ್ತದೆ."
+msgstr ""
+"ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ಕಸದ ಬುಟ್ಟಿಗೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯನ್ನು ಗಣಕತೆರೆಯಲ್ಲಿ "
+"ಇರಿಸಲಾಗುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
-msgstr "ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ಆರೋಹಿಸಲಾದ ಪರಿಮಾಣಗಳಿಗೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯನ್ನು ಗಣಕತೆರೆಯಲ್ಲಿ ಇರಿಸಲಾಗುತ್ತದೆ."
+msgstr ""
+"ಇದು ನಿಜ ಎಂದಾಗಿದ್ದಲ್ಲಿ, ಆರೋಹಿಸಲಾದ ಪರಿಮಾಣಗಳಿಗೆ ಕೊಂಡಿ ಜೋಡಿಸುವ ಒಂದು ಚಿಹ್ನೆಯನ್ನು "
+"ಗಣಕತೆರೆಯಲ್ಲಿ ಇರಿಸಲಾಗುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid ""
 "If this preference is set, all columns in the compact view have the same "
 "width. Otherwise, the width of each column is determined seperately."
-msgstr "ಈ ಆದ್ಯತೆಯನ್ನು ಹೊಂದಿಸಿದಲ್ಲಿ, ಸಾಂದ್ರ ನೋಟದಲ್ಲಿನ ಎಲ್ಲಾ ಕಾಲಂಗಳು ಒಂದೇ ಅಗಲವನ್ನು ಹೊಂದಿರುತ್ತವೆ. ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ, ಪ್ರತಿಯೊಂದು ಕಾಲಂಗಳ ಅಗಲವನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿ ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ."
+msgstr ""
+"ಈ ಆದ್ಯತೆಯನ್ನು ಹೊಂದಿಸಿದಲ್ಲಿ, ಸಾಂದ್ರ ನೋಟದಲ್ಲಿನ ಎಲ್ಲಾ ಕಾಲಂಗಳು ಒಂದೇ ಅಗಲವನ್ನು "
+"ಹೊಂದಿರುತ್ತವೆ. ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ, ಪ್ರತಿಯೊಂದು ಕಾಲಂಗಳ ಅಗಲವನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿ "
+"ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
 msgid ""
 "If true, files in new windows will be sorted in reverse order. ie, if sorted "
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
 "sorted from \"z\" to \"a\"."
-msgstr "ನಿಜವಾದಲ್ಲಿ, ಹೊಸ ವಿಂಡೋಗಳಲ್ಲಿನ ಕಡತಗಳು ಹಿಂದು ಮುಂದಾದ ಅನುಕ್ರಮದಲ್ಲಿ ಜೋಡಿಸಲ್ಪಡುತ್ತದೆ. ಅಂದರೆ, ಹೆಸರಿನ ಆಧಾರಲ್ಲಿ ವಿಂಗಡಿಸಿದಲ್ಲಿ, ಕಡತಗಳು \"a\" ಯಿಂದ \"z\" ಅನುಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸಲ್ಪಡುವ ಬದಲಿಗೆ,\"z\" ಯಿಂದ \"a\" ಅನುಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸಲ್ಪಡುತ್ತದೆ."
+msgstr ""
+"ನಿಜವಾದಲ್ಲಿ, ಹೊಸ ವಿಂಡೋಗಳಲ್ಲಿನ ಕಡತಗಳು ಹಿಂದು ಮುಂದಾದ ಅನುಕ್ರಮದಲ್ಲಿ ಜೋಡಿಸಲ್ಪಡುತ್ತದೆ. "
+"ಅಂದರೆ, ಹೆಸರಿನ ಆಧಾರಲ್ಲಿ ವಿಂಗಡಿಸಿದಲ್ಲಿ, ಕಡತಗಳು \"a\" ಯಿಂದ \"z\" ಅನುಕ್ರಮದಲ್ಲಿ "
+"ವಿಂಗಡಿಸಲ್ಪಡುವ ಬದಲಿಗೆ,\"z\" ಯಿಂದ \"a\" ಅನುಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸಲ್ಪಡುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid ""
@@ -646,15 +725,22 @@ msgid ""
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
 "sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
-msgstr "ನಿಜವಾದಲ್ಲಿ, ಹೊಸ ವಿಂಡೋಗಳಲ್ಲಿನ ಕಡತಗಳು ಹಿಂದು ಮುಂದಾದ ಅನುಕ್ರಮದಲ್ಲಿ ಜೋಡಿಸಲ್ಪಡುತ್ತದೆ. ಅಂದರೆ, ಹೆಸರಿನ ಆಧಾರಲ್ಲಿ ವಿಂಗಡಿಸಿದಲ್ಲಿ, ಕಡತಗಳು \"a\" ಯಿಂದ \"z\" ಅನುಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸಲ್ಪಡುವ ಬದಲಿಗೆ,\"z\" ಯಿಂದ \"a\" ಅನುಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸಲ್ಪಡುತ್ತದೆ. ಎಲ್ಲಿಯಾದರೂ, ಗಾತ್ರದ ಆಧಾರದಲ್ಲಿ ವಿಂಗಡಿಸಿದರೆ, ಅವು ಆರೋಹಣ ಕ್ರಮದ ಬದಲಿಗೆ ಅವರೋಹಣ ಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸಲ್ಪಡುತ್ತವೆ. "
+msgstr ""
+"ನಿಜವಾದಲ್ಲಿ, ಹೊಸ ವಿಂಡೋಗಳಲ್ಲಿನ ಕಡತಗಳು ಹಿಂದು ಮುಂದಾದ ಅನುಕ್ರಮದಲ್ಲಿ ಜೋಡಿಸಲ್ಪಡುತ್ತದೆ. "
+"ಅಂದರೆ, ಹೆಸರಿನ ಆಧಾರಲ್ಲಿ ವಿಂಗಡಿಸಿದಲ್ಲಿ, ಕಡತಗಳು \"a\" ಯಿಂದ \"z\" ಅನುಕ್ರಮದಲ್ಲಿ "
+"ವಿಂಗಡಿಸಲ್ಪಡುವ ಬದಲಿಗೆ,\"z\" ಯಿಂದ \"a\" ಅನುಕ್ರಮದಲ್ಲಿ ವಿಂಗಡಿಸಲ್ಪಡುತ್ತದೆ. ಎಲ್ಲಿಯಾದರೂ, "
+"ಗಾತ್ರದ ಆಧಾರದಲ್ಲಿ ವಿಂಗಡಿಸಿದರೆ, ಅವು ಆರೋಹಣ ಕ್ರಮದ ಬದಲಿಗೆ ಅವರೋಹಣ ಕ್ರಮದಲ್ಲಿ "
+"ವಿಂಗಡಿಸಲ್ಪಡುತ್ತವೆ. "
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
 msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "ನಿಜವಾದಲ್ಲಿ, ಚಿಹ್ನೆಗಳು ಹೊಸ ವಿಂಡೋಗಳಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಆಗಿ ಒತ್ತೊತ್ತಾಗಿ ಜೋಡಿಸಲ್ಪಡುತ್ತವೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-msgid "If true, labels will be placed beside icons rather than underneath them."
-msgstr "ನಿಜವಾದಲ್ಲಿ, ಲೇಬಲ್‌ಗಳನ್ನು ಚಿಹ್ನೆಗಳ ಕೆಳಗಡೆ ಇರಿಸುವ ಬದಲು ಅವುಗಳ ಒಳಗೆ ಇರಿಸಲಾಗುತ್ತದೆ."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
+msgstr ""
+"ನಿಜವಾದಲ್ಲಿ, ಲೇಬಲ್‌ಗಳನ್ನು ಚಿಹ್ನೆಗಳ ಕೆಳಗಡೆ ಇರಿಸುವ ಬದಲು ಅವುಗಳ ಒಳಗೆ ಇರಿಸಲಾಗುತ್ತದೆ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid "If true, new windows will use manual layout by default."
@@ -665,7 +751,9 @@ msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
-msgstr "ಈ ಇದಕ್ಕಿಂತ ದೊಡ್ಡ ಗಾತ್ರದ(ಬೈಟ್‌ಗಳಲ್ಲಿ) ಚಿತ್ರಗಳು ತಂಬ್‌ನೈಲ್‌ ಮಾಡಲ್ಪಡುವುದಿಲ್ಲ. ಏಕೆಂದರೆ, ದೊಡ್ಡ ಗಾತ್ರದ ಚಿತ್ರಗಳನ್ನು ತಂಬ್‌ನೈಲ್‌ ಮಾಡಲು ಬಹಳ ಸಮಯ ಹಿಡಿಯಬಹುದು ಅಥವ ಬಹಳ ಮೆಮೊರಿಯು ಬೇಕಾಗಬಹುದು."
+msgstr ""
+"ಈ ಇದಕ್ಕಿಂತ ದೊಡ್ಡ ಗಾತ್ರದ(ಬೈಟ್‌ಗಳಲ್ಲಿ) ಚಿತ್ರಗಳು ತಂಬ್‌ನೈಲ್‌ ಮಾಡಲ್ಪಡುವುದಿಲ್ಲ. ಏಕೆಂದರೆ, ದೊಡ್ಡ "
+"ಗಾತ್ರದ ಚಿತ್ರಗಳನ್ನು ತಂಬ್‌ನೈಲ್‌ ಮಾಡಲು ಬಹಳ ಸಮಯ ಹಿಡಿಯಬಹುದು ಅಥವ ಬಹಳ ಮೆಮೊರಿಯು ಬೇಕಾಗಬಹುದು."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "List of possible captions on icons"
@@ -701,7 +789,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
@@ -716,7 +805,9 @@ msgstr "ತಂಬ್‌ನೈಲಿಂಗ್‌ ಮಾಡಬಹುದಾದ ಚ�
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
-msgstr "ಬಳಕೆಗೆ ನಾಟಿಲಸ್ ಥೀಮ್‌ನ ಹೆಸರು. ಇದನ್ನು ನಾಟಿಲಸ್ ೨.೨ ರ ನಂತರ ತೆಗೆಹಾಕಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಬದಲಿಗೆ ಚಿಹ್ನೆ ಥೀಮ್ ಅನ್ನು ಬಳಸಿ."
+msgstr ""
+"ಬಳಕೆಗೆ ನಾಟಿಲಸ್ ಥೀಮ್‌ನ ಹೆಸರು. ಇದನ್ನು ನಾಟಿಲಸ್ ೨.೨ ರ ನಂತರ ತೆಗೆಹಾಕಲಾಗಿದೆ. ದಯವಿಟ್ಟು "
+"ಬದಲಿಗೆ ಚಿಹ್ನೆ ಥೀಮ್ ಅನ್ನು ಬಳಸಿ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Nautilus handles drawing the desktop"
@@ -736,7 +827,9 @@ msgstr "ಜಾಲಬಂಧ ಪರಿಚಾರಕಗಳ ಲಾಂಛನ ಹೆಸ
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
 msgid "Never prompt or autorun/autostart programs when media are inserted"
-msgstr "ಮಾಧ್ಯಮವನ್ನು ತೂರಿಸಿದಾಗ ಅದರಲ್ಲಿನ ಪ್ರೊಗ್ರಾಂಗಳನ್ನು ತೋರಿಸುವುದಾಗಲಿ ಅಥವ ತಾನಾಗಿಯೆ ಚಲಾಯಿಸುವುದಾಗಲಿ/ಆರಂಭಿಸುವುದಾಗಲಿ ಮಾಡುವುದಿಲ್ಲ"
+msgstr ""
+"ಮಾಧ್ಯಮವನ್ನು ತೂರಿಸಿದಾಗ ಅದರಲ್ಲಿನ ಪ್ರೊಗ್ರಾಂಗಳನ್ನು ತೋರಿಸುವುದಾಗಲಿ ಅಥವ ತಾನಾಗಿಯೆ "
+"ಚಲಾಯಿಸುವುದಾಗಲಿ/ಆರಂಭಿಸುವುದಾಗಲಿ ಮಾಡುವುದಿಲ್ಲ"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid "Only show folders in the tree side pane"
@@ -837,13 +930,17 @@ msgstr "ಚಿಹ್ನೆ ನೋಟದಲ್ಲಿನ ಒಂದು ತಂಬ್
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-msgstr "ಚಿಹ್ನೆಯ ನೋಟದಲ್ಲಿ ಅಂಶಗಳ ಡೀಫಾಲ್ಟ್ ವಿಂಗಡಣಾ-ಕ್ರಮ. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳು \"ಹೆಸರು\", \"ಗಾತ್ರ\", \"ಬಗೆ\", \"ಮಾರ್ಪಡಿಸಲಾದ_ದಿನಾಂಕ\", ಹಾಗು \"ಲಾಂಛನಗಳು\"."
+msgstr ""
+"ಚಿಹ್ನೆಯ ನೋಟದಲ್ಲಿ ಅಂಶಗಳ ಡೀಫಾಲ್ಟ್ ವಿಂಗಡಣಾ-ಕ್ರಮ. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳು \"ಹೆಸರು\", \"ಗಾತ್ರ"
+"\", \"ಬಗೆ\", \"ಮಾರ್ಪಡಿಸಲಾದ_ದಿನಾಂಕ\", ಹಾಗು \"ಲಾಂಛನಗಳು\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
 msgid ""
 "The default sort-order for the items in the list view. Possible values are "
 "\"name\", \"size\", \"type\", and \"modification_date\"."
-msgstr "ಪಟ್ಟಿ ನೋಟದಲ್ಲಿ ಅಂಶಗಳ ಡೀಫಾಲ್ಟ್ ವಿಂಗಡಣಾ-ಕ್ರಮ. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳು \"ಹೆಸರು\", \"ಗಾತ್ರ\", \"ಬಗೆ\", ಹಾಗು \"ಮಾರ್ಪಡಿಸಲಾದ_ದಿನಾಂಕ\"."
+msgstr ""
+"ಪಟ್ಟಿ ನೋಟದಲ್ಲಿ ಅಂಶಗಳ ಡೀಫಾಲ್ಟ್ ವಿಂಗಡಣಾ-ಕ್ರಮ. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳು \"ಹೆಸರು\", \"ಗಾತ್ರ\", "
+"\"ಬಗೆ\", ಹಾಗು \"ಮಾರ್ಪಡಿಸಲಾದ_ದಿನಾಂಕ\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid "The default width of the side pane in new windows."
@@ -869,25 +966,33 @@ msgstr "ಹೊಸದಾಗಿ ತೆರೆಯಲಾದ ವಿಂಡೋಗಳನ�
 msgid ""
 "This name can be set if you want a custom name for the computer icon on the "
 "desktop."
-msgstr "ಗಣಕತೆರೆಯಲ್ಲಿರುವ ಗಣಕದ ಚಿಹ್ನೆಯು ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು ಬಯಸಿದಲ್ಲಿ ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
+msgstr ""
+"ಗಣಕತೆರೆಯಲ್ಲಿರುವ ಗಣಕದ ಚಿಹ್ನೆಯು ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು ಬಯಸಿದಲ್ಲಿ "
+"ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:115
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
-msgstr "ಗಣಕತೆರೆಯಲ್ಲಿರುವ ನೆಲೆಯ ಚಿಹ್ನೆಯು ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು ಬಯಸಿದಲ್ಲಿ ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
+msgstr ""
+"ಗಣಕತೆರೆಯಲ್ಲಿರುವ ನೆಲೆಯ ಚಿಹ್ನೆಯು ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು ಬಯಸಿದಲ್ಲಿ "
+"ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:116
 msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
-msgstr "ಗಣಕತೆರೆಯಲ್ಲಿರುವ ಜಾಲಬಂಧ ಪರಿಚಾರಕಗಳ ಚಿಹ್ನೆಗೆ ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು ಬಯಸಿದಲ್ಲಿ ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
+msgstr ""
+"ಗಣಕತೆರೆಯಲ್ಲಿರುವ ಜಾಲಬಂಧ ಪರಿಚಾರಕಗಳ ಚಿಹ್ನೆಗೆ ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು "
+"ಬಯಸಿದಲ್ಲಿ ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
-msgstr "ಗಣಕತೆರೆಯಲ್ಲಿರುವ ಕಸದಬುಟ್ಟಿ ಚಿಹ್ನೆಯು ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು ಬಯಸಿದಲ್ಲಿ ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
+msgstr ""
+"ಗಣಕತೆರೆಯಲ್ಲಿರುವ ಕಸದಬುಟ್ಟಿ ಚಿಹ್ನೆಯು ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಹೆಸರನ್ನು ನೀಡಲು ನೀವು ಬಯಸಿದಲ್ಲಿ "
+"ಇದನ್ನು ಹೊಂದಿಸಬಹುದು."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
 msgid "Trash icon visible on desktop"
@@ -950,7 +1055,8 @@ msgstr "ಒಂದು ಕಸ್ಟಮ್ ಡೀಫಾಲ್ಟ್ ಆದಂತಹ
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:131
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "ಕಡತಗಳನ್ನು ಅಳಿಸುವ ಮೊದಲು, ಅಥವ ಕಸದಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡುವ ಮೊದಲು ಖಚಿತಪಡಿಸಲು ಕೇಳಬೇಕೆ"
+msgstr ""
+"ಕಡತಗಳನ್ನು ಅಳಿಸುವ ಮೊದಲು, ಅಥವ ಕಸದಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡುವ ಮೊದಲು ಖಚಿತಪಡಿಸಲು ಕೇಳಬೇಕೆ"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:132
 msgid "Whether to automatically mount media"
@@ -1067,7 +1173,9 @@ msgstr "ನೀವು ಈಗ ತಾನೆ ಒಂದು ಡಿಜಿಟಲ್ ಆ�
 msgid ""
 "You have just inserted a medium with software intended to be automatically "
 "started."
-msgstr "ತಾನಾಗಿ ಆರಂಭಗೊಳ್ಳುವಂತಹ ತಂತ್ರಾಂಶವನ್ನು ಹೊಂದಿರುವ ಒಂದು ಮಾಧ್ಯಮವನ್ನು ನೀವು ಈಗ ತಾನೆ ಹಾಕಿದ್ದೀರಿ."
+msgstr ""
+"ತಾನಾಗಿ ಆರಂಭಗೊಳ್ಳುವಂತಹ ತಂತ್ರಾಂಶವನ್ನು ಹೊಂದಿರುವ ಒಂದು ಮಾಧ್ಯಮವನ್ನು ನೀವು ಈಗ ತಾನೆ "
+"ಹಾಕಿದ್ದೀರಿ."
 
 #. fallback to generic greeting
 #: ../libnautilus-private/nautilus-autorun.c:920
@@ -1083,7 +1191,9 @@ msgstr "ಯಾವ ಅನ್ವಯವನ್ನು ಚಲಾಯಿಸಬೇಕೆ�
 msgid ""
 "Select how to open \"%s\" and whether to perform this action in the future "
 "for other media of type \"%s\"."
-msgstr "\"%s\" ಅನ್ನು ಹೇಗೆ ತೆರೆಯ ಬೇಕು ಹಾಗು ಮುಂದೆ \"%s\" ಬಗೆಯ ಇತರ ಮಾಧ್ಯಮಗಳಿಗೆ ಈ ಕಾರ್ಯವನ್ನು ನಿರ್ವಹಿಸಬೇಕು ಎಂದು ಆರಿಸಿ."
+msgstr ""
+"\"%s\" ಅನ್ನು ಹೇಗೆ ತೆರೆಯ ಬೇಕು ಹಾಗು ಮುಂದೆ \"%s\" ಬಗೆಯ ಇತರ ಮಾಧ್ಯಮಗಳಿಗೆ ಈ ಕಾರ್ಯವನ್ನು "
+"ನಿರ್ವಹಿಸಬೇಕು ಎಂದು ಆರಿಸಿ."
 
 #: ../libnautilus-private/nautilus-autorun.c:953
 msgid "_Always perform this action"
@@ -1255,13 +1365,17 @@ msgstr "\"%s\" ಪರಿಮಾಣವನ್ನು ನೀವು ಕಸದಬುಟ
 msgid ""
 "If you want to eject the volume, please use \"Eject\" in the popup menu of "
 "the volume."
-msgstr "ನೀವು ಪರಿಮಾಣವನ್ನು ಹೊರ ತಳ್ಳಲು ಬಯಸಿದಲ್ಲಿ, ದಯವಿಟ್ಟು ಪುಟಿಕೆ(ಪಾಪ್ಅಪ್) ಮೆನುವಿನಲ್ಲಿರುವ \"ಹೊರ ತಳ್ಳು\" ಅನ್ನು ಬಳಸಿ."
+msgstr ""
+"ನೀವು ಪರಿಮಾಣವನ್ನು ಹೊರ ತಳ್ಳಲು ಬಯಸಿದಲ್ಲಿ, ದಯವಿಟ್ಟು ಪುಟಿಕೆ(ಪಾಪ್ಅಪ್) ಮೆನುವಿನಲ್ಲಿರುವ "
+"\"ಹೊರ ತಳ್ಳು\" ಅನ್ನು ಬಳಸಿ."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
 msgid ""
 "If you want to unmount the volume, please use \"Unmount Volume\" in the "
 "popup menu of the volume."
-msgstr "ನೀವು ಪರಿಮಾಣವನ್ನು ಅವರೋಹಿಸಲು ಬಯಸಿದಲ್ಲಿ, ದಯವಿಟ್ಟು ಪುಟಿಕೆ(ಪಾಪ್ಅಪ್) ಮೆನುವಿನಲ್ಲಿರುವ \"ಪರಿಮಾಣವನ್ನು ಆರೋಹಿಸು\" ಅನ್ನು ಬಳಸಿ."
+msgstr ""
+"ನೀವು ಪರಿಮಾಣವನ್ನು ಅವರೋಹಿಸಲು ಬಯಸಿದಲ್ಲಿ, ದಯವಿಟ್ಟು ಪುಟಿಕೆ(ಪಾಪ್ಅಪ್) ಮೆನುವಿನಲ್ಲಿರುವ "
+"\"ಪರಿಮಾಣವನ್ನು ಆರೋಹಿಸು\" ಅನ್ನು ಬಳಸಿ."
 
 #: ../libnautilus-private/nautilus-dnd.c:748
 msgid "_Move Here"
@@ -1305,8 +1419,11 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "ಕ್ಷಮಿಸಿ, ಹೊಸ ಲಾಂಛನಕ್ಕಾಗಿ ಒಂದು ಖಾಲಿಯಲ್ಲದ ಮುಖ್ಯಪದವನ್ನು ಸೂಚಿಸಬೇಕು."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "ಕ್ಷಮಿಸಿ, ಲಾಂಛನದ ಮುಖ್ಯಪದಗಳು ಕೇವಲ ಅಕ್ಷರಗಳನ್ನು, ಖಾಲಿ ಜಾಗಗಳನ್ನು(ಸ್ಪೇಸ್) ಹಾಗು ಅಂಕೆಗಳನ್ನು ಮಾತ್ರ ಹೊಂದಿರಬಹುದು."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"ಕ್ಷಮಿಸಿ, ಲಾಂಛನದ ಮುಖ್ಯಪದಗಳು ಕೇವಲ ಅಕ್ಷರಗಳನ್ನು, ಖಾಲಿ ಜಾಗಗಳನ್ನು(ಸ್ಪೇಸ್) ಹಾಗು ಅಂಕೆಗಳನ್ನು "
+"ಮಾತ್ರ ಹೊಂದಿರಬಹುದು."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1541,8 +1658,10 @@ msgid ""
 msgid_plural ""
 "Are you sure you want to permanently delete the %'d selected items from the "
 "trash?"
-msgstr[0] "ಆರಿಸಲ್ಪಟ್ಟ %'d ಅಂಶವನ್ನು ಕಸದ ಬುಟ್ಟಿಯಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಬೇಕೆಂದು ನೀವು ಖಾತ್ರಿಯೆ?"
-msgstr[1] "ಆರಿಸಲ್ಪಟ್ಟ %'d ಅಂಶಗಳನ್ನು ಕಸದ ಬುಟ್ಟಿಯಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಬೇಕೆಂದು ನೀವು ಖಾತ್ರಿಯೆ?"
+msgstr[0] ""
+"ಆರಿಸಲ್ಪಟ್ಟ %'d ಅಂಶವನ್ನು ಕಸದ ಬುಟ್ಟಿಯಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಬೇಕೆಂದು ನೀವು ಖಾತ್ರಿಯೆ?"
+msgstr[1] ""
+"ಆರಿಸಲ್ಪಟ್ಟ %'d ಅಂಶಗಳನ್ನು ಕಸದ ಬುಟ್ಟಿಯಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಬೇಕೆಂದು ನೀವು ಖಾತ್ರಿಯೆ?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1221
 #: ../libnautilus-private/nautilus-file-operations.c:1289
@@ -1557,7 +1676,9 @@ msgstr "ಕಸದ ಬುಟ್ಟಿಯಲ್ಲಿನ ಎಲ್ಲಾ ಅಂಶ
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
-msgstr "ಕಸದ ಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡಿದರೆ, ಅದರಲ್ಲಿನ ಎಲ್ಲಾ ಅಂಶಗಳೂ ಶಾಶ್ವತವಾಗಿ ಇಲ್ಲವಾಗುತ್ತದೆ. ಅವನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿಯೂ ಸಹ ಅಳಿಸಬಹುದು ಎನ್ನುವುದನ್ನು ದಯವಿಟ್ಟು ನೆನಪಿಡಿ."
+msgstr ""
+"ಕಸದ ಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡಿದರೆ, ಅದರಲ್ಲಿನ ಎಲ್ಲಾ ಅಂಶಗಳೂ ಶಾಶ್ವತವಾಗಿ ಇಲ್ಲವಾಗುತ್ತದೆ. ಅವನ್ನು "
+"ಪ್ರತ್ಯೇಕವಾಗಿಯೂ ಸಹ ಅಳಿಸಬಹುದು ಎನ್ನುವುದನ್ನು ದಯವಿಟ್ಟು ನೆನಪಿಡಿ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1277
 msgid "Are you sure you want to permanently delete \"%B\"?"
@@ -1566,7 +1687,8 @@ msgstr "\"%B\" ವನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಬೇ
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "ಆರಿಸಲ್ಪಟ್ಟ %'d ಅಂಶವನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಬೇಕೆಂದು ನೀವು ಖಾತ್ರಿಯೆ?"
 msgstr[1] "ಆರಿಸಲ್ಪಟ್ಟ %'d ಅಂಶಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಬೇಕೆಂದು ನೀವು ಖಾತ್ರಿಯೆ?"
 
@@ -1600,12 +1722,15 @@ msgstr "ಅಳಿಸುವಾಗ ದೋಷ."
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
-msgstr "\"%B\" ಕಡತಕೋಶದಲ್ಲಿನ ಕಡತಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅವುಗಳನ್ನು ನೋಡಲು ಬೇಕಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
+msgstr ""
+"\"%B\" ಕಡತಕೋಶದಲ್ಲಿನ ಕಡತಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅವುಗಳನ್ನು ನೋಡಲು "
+"ಬೇಕಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr "\"%B\" ಕಡತಕೋಶದಲ್ಲಿನ ಕಡತಗಳ ಬಗ್ಗೆ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
@@ -1617,7 +1742,9 @@ msgstr "ಕಡತಗಳನ್ನು ಉಪೇಕ್ಷಿಸಿ (_S)"
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
-msgstr "\"%B\" ಕಡತಕೋಶವನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅದನ್ನು ಓದಲು ಬೇಕಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
+msgstr ""
+"\"%B\" ಕಡತಕೋಶವನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅದನ್ನು ಓದಲು ಬೇಕಿರುವ "
+"ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
 #: ../libnautilus-private/nautilus-file-operations.c:2401
@@ -1638,7 +1765,6 @@ msgid "Moving files to trash"
 msgstr "ಕಡತಗಳನ್ನು ಕಸದ ಬುಟ್ಟಿಗೆ ಸ್ಥಳಾಂತರಿಸಲಾಗುತ್ತಿದೆ"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1639
-#, c-format
 #, fuzzy
 msgid "%'d file left to trash"
 msgid_plural "%'d files left to trash"
@@ -1669,7 +1795,9 @@ msgstr "ಅವರೋಹಿಸುವ ಮೊದಲು ನೀವು ಕಸದಬು
 msgid ""
 "In order to regain the free space on this volume the trash must be emptied. "
 "All trashed items on the volume will be permanently lost."
-msgstr "ಈ ಪರಿಮಾಣದಲ್ಲಿ ಖಾಳಿ ಜಾಗವನ್ನು ಮರಳಿ ಪಡೆಯಲು ಕಸದ ಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡಿಬೇಕಾಗುತ್ತದೆ. ಕಸದ ಬುಟ್ಟಿಗೆ ಕಳುಹಿಸಲಾದ ಈ ಪರಿಮಾಣದಲ್ಲಿನ ಎಲ್ಲಾ ವಸ್ತುಗಳು ಶಾಶ್ವತವಾಗಿ ಇಲ್ಲವಾಗುತ್ತವೆ."
+msgstr ""
+"ಈ ಪರಿಮಾಣದಲ್ಲಿ ಖಾಳಿ ಜಾಗವನ್ನು ಮರಳಿ ಪಡೆಯಲು ಕಸದ ಬುಟ್ಟಿಯನ್ನು ಖಾಲಿ ಮಾಡಿಬೇಕಾಗುತ್ತದೆ. ಕಸದ "
+"ಬುಟ್ಟಿಗೆ ಕಳುಹಿಸಲಾದ ಈ ಪರಿಮಾಣದಲ್ಲಿನ ಎಲ್ಲಾ ವಸ್ತುಗಳು ಶಾಶ್ವತವಾಗಿ ಇಲ್ಲವಾಗುತ್ತವೆ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2074
 msgid "Do not Empty Trash"
@@ -1741,13 +1869,17 @@ msgstr "\"%s\" ನ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ನಿ�
 msgid ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
-msgstr "\"%B\" ಕಡತಕೋಶವನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅದನ್ನು ಓದಲು ಬೇಕಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
+msgstr ""
+"\"%B\" ಕಡತಕೋಶವನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅದನ್ನು ಓದಲು ಬೇಕಿರುವ "
+"ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2475
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
-msgstr "\"%B\" ಕಡತವನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅದನ್ನು ಓದಲು ಬೇಕಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
+msgstr ""
+"\"%B\" ಕಡತವನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮ್ಮಲ್ಲಿ ಅದನ್ನು ಓದಲು ಬೇಕಿರುವ "
+"ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
 msgid "There was an error getting information about \"%B\"."
@@ -1776,7 +1908,9 @@ msgstr "ಉದ್ದೇಶಿತ ಸ್ಥಳವು ಒಂದು ಕಡತಕೋ
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
-msgstr "ಉದ್ದೇಶಿತ ಸ್ಥಳದಲ್ಲಿ ಸಾಕಷ್ಟು ಜಾಗವಿಲ್ಲ. ಒಂದಿಷ್ಟು ಕಡತಗಳನ್ನು ತೆಗೆದು ಹಾಕಿ ನಂತರ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
+msgstr ""
+"ಉದ್ದೇಶಿತ ಸ್ಥಳದಲ್ಲಿ ಸಾಕಷ್ಟು ಜಾಗವಿಲ್ಲ. ಒಂದಿಷ್ಟು ಕಡತಗಳನ್ನು ತೆಗೆದು ಹಾಕಿ ನಂತರ ಇನ್ನೊಮ್ಮೆ "
+"ಪ್ರಯತ್ನಿಸಿ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2656
 #, c-format
@@ -1853,7 +1987,9 @@ msgstr "%S, %S ಯಲ್ಲಿ — %T ಬಾಕಿ ಇದೆ (%S/ಸೆಕೆಂ
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
-msgstr "ಕಡತಕೋಶ \"%B\" ಅನ್ನು ಕಾಪಿ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮಲ್ಲಿ ಅದನ್ನು ಉದ್ದೇಶಿತ ಸ್ಥಳದಲ್ಲಿ ನಿರ್ಮಿಸಲು ಅಗತ್ಯವಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
+msgstr ""
+"ಕಡತಕೋಶ \"%B\" ಅನ್ನು ಕಾಪಿ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮಲ್ಲಿ ಅದನ್ನು ಉದ್ದೇಶಿತ ಸ್ಥಳದಲ್ಲಿ "
+"ನಿರ್ಮಿಸಲು ಅಗತ್ಯವಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3180
 msgid "There was an error creating the folder \"%B\"."
@@ -1863,13 +1999,17 @@ msgstr "\"%B\" ಕಡತಕೋಶವನ್ನು ರಚಿಸುವಾಗ ದೋ
 msgid ""
 "Files in the folder \"%B\" cannot be copied because you do not have "
 "permissions to see them."
-msgstr "\"%B\" ಕಡತಕೋಶದಲ್ಲಿನ ಕಡತಗಳನ್ನು ಕಾಪಿ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮಲ್ಲಿ ಇದಕ್ಕೆ ಅಗತ್ಯವಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
+msgstr ""
+"\"%B\" ಕಡತಕೋಶದಲ್ಲಿನ ಕಡತಗಳನ್ನು ಕಾಪಿ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮಲ್ಲಿ ಇದಕ್ಕೆ "
+"ಅಗತ್ಯವಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3346
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "read it."
-msgstr "ಕಡತಕೋಶ \"%B\" ಅನ್ನು ಕಾಪಿ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮಲ್ಲಿ ಇದಕ್ಕೆ ಅಗತ್ಯವಿರುವ ಅನುಮತಿಗಳಿಲ್ಲ."
+msgstr ""
+"ಕಡತಕೋಶ \"%B\" ಅನ್ನು ಕಾಪಿ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನಿಮಲ್ಲಿ ಇದಕ್ಕೆ ಅಗತ್ಯವಿರುವ "
+"ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3389
 #: ../libnautilus-private/nautilus-file-operations.c:3909
@@ -1920,15 +2060,18 @@ msgid ""
 "A folder named \"%B\" already exists.  Do you want to merge the source "
 "folder?"
 msgstr ""
-"\"%B\" ಹೆಸರಿನ ಒಂದು ಕಡತಕೋಶವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.  ಮೂಲ ಕಡತಕೋಶವನ್ನು ಒಗ್ಗೂಡಿಸಲು ನೀವು"
-"ಬಯಸುತ್ತಿರೆ?"
+"\"%B\" ಹೆಸರಿನ ಒಂದು ಕಡತಕೋಶವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.  ಮೂಲ ಕಡತಕೋಶವನ್ನು ಒಗ್ಗೂಡಿಸಲು "
+"ನೀವುಬಯಸುತ್ತಿರೆ?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3809
 msgid ""
 "The source folder already exists in \"%B\".  Merging will ask for "
 "confirmation before replacing any files in the folder that conflict with the "
 "files being copied."
-msgstr "\"%B\" ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಒಗ್ಗೂಡಿಸುವಾಗ ಕಡತಕೋಶದಲ್ಲಿರುವ ಯಾವುದೆ ಕಡತಗಳನ್ನು ಬದಲಾಯಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಕಾಪಿ ಮಾಡುತ್ತಿರುವ ಕಡತಗಳಲ್ಲಿ ಎನಾದರೂ ವಿವಾದ ಎದುರಾದರೆ ನಿಮ್ಮ ಅನುಮತಿಯನ್ನು ಕೇಳುತ್ತದೆ."
+msgstr ""
+"\"%B\" ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಒಗ್ಗೂಡಿಸುವಾಗ ಕಡತಕೋಶದಲ್ಲಿರುವ "
+"ಯಾವುದೆ ಕಡತಗಳನ್ನು ಬದಲಾಯಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಕಾಪಿ ಮಾಡುತ್ತಿರುವ ಕಡತಗಳಲ್ಲಿ ಎನಾದರೂ ವಿವಾದ "
+"ಎದುರಾದರೆ ನಿಮ್ಮ ಅನುಮತಿಯನ್ನು ಕೇಳುತ್ತದೆ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3814
 #: ../libnautilus-private/nautilus-file-operations.c:4385
@@ -1943,17 +2086,21 @@ msgstr ""
 msgid ""
 "The folder already exists in \"%F\".  Replacing it will remove all files in "
 "the folder."
-msgstr "\"%F\" ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.  ನೀವದನ್ನು ಬದಲಿ ಮಾಡಿದರೆ ಅದರಲ್ಲಿನ ಕಡತಗಳು ತೆಗೆದು ಹಾಕಲ್ಪಡುತ್ತವೆ."
+msgstr ""
+"\"%F\" ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.  ನೀವದನ್ನು ಬದಲಿ ಮಾಡಿದರೆ ಅದರಲ್ಲಿನ "
+"ಕಡತಗಳು ತೆಗೆದು ಹಾಕಲ್ಪಡುತ್ತವೆ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3821
 #: ../libnautilus-private/nautilus-file-operations.c:4392
 msgid "A file named \"%B\" already exists.  Do you want to replace it?"
-msgstr "\"%B\" ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.  ನೀವದನ್ನು ಬದಲಿ ಮಾಡಲು ಬಯಸುತ್ತಿರೆ?"
+msgstr ""
+"\"%B\" ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.  ನೀವದನ್ನು ಬದಲಿ ಮಾಡಲು ಬಯಸುತ್ತಿರೆ?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr ""
 "\"%F\" ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.  ನೀವದನ್ನು ಬದಲಿ ಮಾಡಿದರೆ ಅದು "
 "ತಿದ್ದಿಬರೆಯಲ್ಪಡುತ್ತದೆ."
@@ -1961,7 +2108,8 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:3913
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
-msgstr "%F ಯಲ್ಲಿ ಇದೇ ಹೆಸರಿನೊಂದಿಗೆ ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಕಡತವನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಲಿಲ್ಲ."
+msgstr ""
+"%F ಯಲ್ಲಿ ಇದೇ ಹೆಸರಿನೊಂದಿಗೆ ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಕಡತವನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಲಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3985
 #, c-format
@@ -1984,7 +2132,10 @@ msgid ""
 "The source folder already exists in \"%B\".  Merging will ask for "
 "confirmation before replacing any files in the folder that conflict with the "
 "files being moved."
-msgstr "\"%B\" ಹೆಸರಿನ ಮೂಲ ಕಡತಕೋಶವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಒಗ್ಗೂಡಿಸುವಾಗ ಕಡತಕೋಶದಲ್ಲಿರುವ ಯಾವುದೆ ಕಡತಗಳನ್ನು ಬದಲಾಯಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ವರ್ಗಾಯಿಸುತ್ತಿರುವ ಕಡತಗಳಲ್ಲಿ ಎನಾದರೂ ವಿವಾದ ಎದುರಾದರೆ ನಿಮ್ಮ ಅನುಮತಿಯನ್ನು ಕೇಳುತ್ತದೆ."
+msgstr ""
+"\"%B\" ಹೆಸರಿನ ಮೂಲ ಕಡತಕೋಶವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಒಗ್ಗೂಡಿಸುವಾಗ ಕಡತಕೋಶದಲ್ಲಿರುವ "
+"ಯಾವುದೆ ಕಡತಗಳನ್ನು ಬದಲಾಯಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ವರ್ಗಾಯಿಸುತ್ತಿರುವ ಕಡತಗಳಲ್ಲಿ ಎನಾದರೂ ವಿವಾದ "
+"ಎದುರಾದರೆ ನಿಮ್ಮ ಅನುಮತಿಯನ್ನು ಕೇಳುತ್ತದೆ."
 
 #: ../libnautilus-private/nautilus-file-operations.c:4470
 #, c-format
@@ -2768,7 +2919,9 @@ msgstr "ತೆರೆಯುವಲ್ಲಿ ವಿಫಲತೆ, ಬೇರೊಂದ
 msgid ""
 "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
 "locations."
-msgstr "\"%s\" \"%s\" ಅನ್ನು ತೆಗೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ \"%s\" \"%s\" ಸ್ಥಳಗಳಲ್ಲಿ ಕಡತಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr ""
+"\"%s\" \"%s\" ಅನ್ನು ತೆಗೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ \"%s\" \"%s\" ಸ್ಥಳಗಳಲ್ಲಿ ಕಡತಗಳನ್ನು "
+"ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:87
 msgid "Open Failed, would you like to choose another action?"
@@ -2780,19 +2933,25 @@ msgstr "ತೆರೆಯುವಲ್ಲಿ ವಿಫಲತೆ, ಬೇರೊಂದ
 msgid ""
 "The default action cannot open \"%s\" because it cannot access files at \"%s"
 "\" locations."
-msgstr "ಡೀಫಾಲ್ಟ್ ಕಾರ್ಯವು \"%s\" ಅನ್ನು ತೆಗೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ಅದು \"%s\" ಸ್ಥಳಗಳಲ್ಲಿ ಕಡತಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr ""
+"ಡೀಫಾಲ್ಟ್ ಕಾರ್ಯವು \"%s\" ಅನ್ನು ತೆಗೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ಅದು \"%s\" ಸ್ಥಳಗಳಲ್ಲಿ "
+"ಕಡತಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:116
 msgid ""
 "No other applications are available to view this file.  If you copy this "
 "file onto your computer, you may be able to open it."
-msgstr "ಈ ಕಡತವನ್ನು ನೋಡಲು ಯಾವುದೆ ಅನ್ವಯಗಳು ಲಭ್ಯವಿಲ್ಲ. ನೀವು ಈ ಕಡತವನ್ನು ನಿಮ್ಮ ಗಣಕಕ್ಕೆ ಕಾಪಿ ಮಾಡಿದಲ್ಲಿ ಬಹುಷಃ ಇದನ್ನು ತೆರೆಯಬಹುದಾಗಿದೆ."
+msgstr ""
+"ಈ ಕಡತವನ್ನು ನೋಡಲು ಯಾವುದೆ ಅನ್ವಯಗಳು ಲಭ್ಯವಿಲ್ಲ. ನೀವು ಈ ಕಡತವನ್ನು ನಿಮ್ಮ ಗಣಕಕ್ಕೆ ಕಾಪಿ "
+"ಮಾಡಿದಲ್ಲಿ ಬಹುಷಃ ಇದನ್ನು ತೆರೆಯಬಹುದಾಗಿದೆ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:122
 msgid ""
 "No other actions are available to view this file.  If you copy this file "
 "onto your computer, you may be able to open it."
-msgstr "ಈ ಕಡತವನ್ನು ನೋಡಲು ಯಾವುದೆ ಕಾರ್ಯಗಳು ಲಭ್ಯವಿಲ್ಲ. ನೀವು ಈ ಕಡತವನ್ನು ನಿಮ್ಮ ಗಣಕಕ್ಕೆ ಕಾಪಿ ಮಾಡಿದಲ್ಲಿ ಬಹುಷಃ ಇದನ್ನು ತೆರೆಯಬಹುದಾಗಿದೆ."
+msgstr ""
+"ಈ ಕಡತವನ್ನು ನೋಡಲು ಯಾವುದೆ ಕಾರ್ಯಗಳು ಲಭ್ಯವಿಲ್ಲ. ನೀವು ಈ ಕಡತವನ್ನು ನಿಮ್ಮ ಗಣಕಕ್ಕೆ ಕಾಪಿ "
+"ಮಾಡಿದಲ್ಲಿ ಬಹುಷಃ ಇದನ್ನು ತೆರೆಯಬಹುದಾಗಿದೆ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:308
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -2813,14 +2972,19 @@ msgid "This drop target only supports local files."
 msgstr "ಸೇರಿಸಬಹುದಾದ ಈ ಸ್ಥಳವು ಕೇವಲ ಸ್ಥಳೀಯ ಕಡತಗಳನ್ನು ಮಾತ್ರ ಬೆಂಬಲಿಸುತ್ತದೆ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:347
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "ಸ್ಥಳೀಯವಲ್ಲದ ಕಡತಗಳನ್ನು ತೆರೆಯಲು, ಅವನ್ನು ಒಂದು ಸ್ಥಳೀಯ ಕಡತಕೋಶಕ್ಕೆ ಕಾಪಿ ಮಾಡಿ ಹಾಗು ಪುನಃ ಅವನ್ನು ಇಲ್ಲಿಗೆ ಸೇರಿಸಿ."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"ಸ್ಥಳೀಯವಲ್ಲದ ಕಡತಗಳನ್ನು ತೆರೆಯಲು, ಅವನ್ನು ಒಂದು ಸ್ಥಳೀಯ ಕಡತಕೋಶಕ್ಕೆ ಕಾಪಿ ಮಾಡಿ ಹಾಗು ಪುನಃ "
+"ಅವನ್ನು ಇಲ್ಲಿಗೆ ಸೇರಿಸಿ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:358
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
-msgstr "ಸ್ಥಳೀಯವಲ್ಲದ ಕಡತಗಳನ್ನು ತೆರೆಯಲು, ಅವನ್ನು ಒಂದು ಸ್ಥಳೀಯ ಕಡತಕೋಶಕ್ಕೆ ಕಾಪಿ ಮಾಡಿ ಹಾಗು ಪುನಃ ಅವನ್ನು ಇಲ್ಲಿಗೆ ಸೇರಿಸಿ. ನೀವು ಸೇರಿಸಿದ ಸ್ಥಳೀಯ ಕಡತಗಳು ಈಗಾಗಲೆ ತೆರೆಯಲ್ಪಟ್ಟಿವೆ."
+msgstr ""
+"ಸ್ಥಳೀಯವಲ್ಲದ ಕಡತಗಳನ್ನು ತೆರೆಯಲು, ಅವನ್ನು ಒಂದು ಸ್ಥಳೀಯ ಕಡತಕೋಶಕ್ಕೆ ಕಾಪಿ ಮಾಡಿ ಹಾಗು ಪುನಃ "
+"ಅವನ್ನು ಇಲ್ಲಿಗೆ ಸೇರಿಸಿ. ನೀವು ಸೇರಿಸಿದ ಸ್ಥಳೀಯ ಕಡತಗಳು ಈಗಾಗಲೆ ತೆರೆಯಲ್ಪಟ್ಟಿವೆ."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:387
 msgid "Details: "
@@ -2881,8 +3045,11 @@ msgstr "ತಾನಾಗಿಯೆ ಚಲಾಯಿಸುವ ಪ್ರಾಪ್ಟ�
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "ಈ ಗಣಕಿದಿಂದ ನಿಲುಕಿಸಿಕೊಳ್ಳಬಹುದಾದಂತಹ ಸ್ಥಳೀಯ ಹಾಗು ದೂರಸ್ಥ ಡಿಸ್ಕುಗಳನ್ನು ಮತ್ತು ಕಡತಕೋಶಗಳನ್ನು ವೀಕ್ಷಿಸು"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"ಈ ಗಣಕಿದಿಂದ ನಿಲುಕಿಸಿಕೊಳ್ಳಬಹುದಾದಂತಹ ಸ್ಥಳೀಯ ಹಾಗು ದೂರಸ್ಥ ಡಿಸ್ಕುಗಳನ್ನು ಮತ್ತು "
+"ಕಡತಕೋಶಗಳನ್ನು ವೀಕ್ಷಿಸು"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
@@ -2926,7 +3093,8 @@ msgid "Nautilus metafile factory"
 msgstr "ನಾಟಿಲಸ್ ಮೆಟಾಫೈಲ್ ಫ್ಯಾಕ್ಟರಿ"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr "ಆಜ್ಞಾ-ಸಾಲಿನಲ್ಲಿನ ಮನವಿಗಳ ಉತ್ತರವಾಗಿ ನಡೆಯುವ ನಾಟಿಲಸ್ ಕಾರ್ಯಗಳು"
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -2966,8 +3134,11 @@ msgstr "ಗಣಕತೆರೆಯ ಹಿನ್ನಲೆಯನ್ನು ಬದಲ�
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:700
-msgid "Show a window that lets you set your desktop background's pattern or color"
-msgstr "ನಿಮ್ಮ ಗಣಕತೆರೆಯ ಹಿನ್ನಲೆಯ ವಿನ್ಯಾಸವನ್ನು ಅಥವ ಬಣ್ಣವನ್ನು ಬದಲಾಯಿಸಲು ಅನುವು ಮಾಡುವ ಒಂದು ವಿಂಡೋವನ್ನು ತೋರಿಸಲಾಗುತ್ತದೆ"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+"ನಿಮ್ಮ ಗಣಕತೆರೆಯ ಹಿನ್ನಲೆಯ ವಿನ್ಯಾಸವನ್ನು ಅಥವ ಬಣ್ಣವನ್ನು ಬದಲಾಯಿಸಲು ಅನುವು ಮಾಡುವ ಒಂದು "
+"ವಿಂಡೋವನ್ನು ತೋರಿಸಲಾಗುತ್ತದೆ"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:707
@@ -3137,13 +3308,17 @@ msgstr "\"%s\" ನಮೂನೆಯಿಂದ ದಸ್ತಾವೇಜನ್ನು
 
 #: ../src/file-manager/fm-directory-view.c:5512
 msgid "All executable files in this folder will appear in the Scripts menu."
-msgstr "ಈ ಕಡತಕೋಶದಲ್ಲಿರುವ ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದಂತಹ ಎಲ್ಲಾ ಕಡತಗಳು ಸ್ಕ್ರಿಪ್ಟುಗಳ ಮೆನುವಿಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
+msgstr ""
+"ಈ ಕಡತಕೋಶದಲ್ಲಿರುವ ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದಂತಹ ಎಲ್ಲಾ ಕಡತಗಳು ಸ್ಕ್ರಿಪ್ಟುಗಳ ಮೆನುವಿಲ್ಲಿ "
+"ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
 
 #: ../src/file-manager/fm-directory-view.c:5514
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
-msgstr "ಮೆನುವಿನಿಂದ ಒಂದು ಸ್ಕ್ರಿಪ್ಟನ್ನು ಆರಿಸಿದಾಗ, ಆ ಸ್ಕ್ರಿಪ್ಟ್ ಆರಿಸಲಾದ ಯಾವುದಾದರು ಅಂಶಗಳನ್ನು ಇನ್‌ಪುಟ್‌ಗಳೆಂದು ಪರಿಗಣಿಸಿ ಅವುಗಳೊಂದಿಗೆ ಚಲಾಯಿಸಲ್ಪಡುತ್ತದೆ."
+msgstr ""
+"ಮೆನುವಿನಿಂದ ಒಂದು ಸ್ಕ್ರಿಪ್ಟನ್ನು ಆರಿಸಿದಾಗ, ಆ ಸ್ಕ್ರಿಪ್ಟ್ ಆರಿಸಲಾದ ಯಾವುದಾದರು ಅಂಶಗಳನ್ನು "
+"ಇನ್‌ಪುಟ್‌ಗಳೆಂದು ಪರಿಗಣಿಸಿ ಅವುಗಳೊಂದಿಗೆ ಚಲಾಯಿಸಲ್ಪಡುತ್ತದೆ."
 
 #: ../src/file-manager/fm-directory-view.c:5516
 msgid ""
@@ -3166,16 +3341,23 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"ಈ ಕಡತಕೋಶದಲ್ಲಿರು ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದಂತಹ ಎಲ್ಲಾ ಕಡತಗಳು ಸ್ಕ್ರಿಪ್ಟುಗಳ ಮೆನುವಿನಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ. "
-"ಮೆನುವಿನಿಂದ ಒಂದು ಸ್ಕ್ರಿಪ್ಟನ್ನು ಆರಿಸುವದರಿಂದ ಆ ಸ್ಕ್ರಿಪ್ಟ್ ಚಲಾಯಿಸಲ್ಪಡುತ್ತದೆ.\n"
+"ಈ ಕಡತಕೋಶದಲ್ಲಿರು ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದಂತಹ ಎಲ್ಲಾ ಕಡತಗಳು ಸ್ಕ್ರಿಪ್ಟುಗಳ ಮೆನುವಿನಲ್ಲಿ "
+"ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ. ಮೆನುವಿನಿಂದ ಒಂದು ಸ್ಕ್ರಿಪ್ಟನ್ನು ಆರಿಸುವದರಿಂದ ಆ ಸ್ಕ್ರಿಪ್ಟ್ "
+"ಚಲಾಯಿಸಲ್ಪಡುತ್ತದೆ.\n"
 "\n"
-"ಒಂದು ಸ್ಥಳೀಯ ಕಡತಕೋಶದಿಂದ ಕಾರ್ಯಗತಗೊಳಿಸಿದಾಗ, ಸ್ಕ್ರಿಪ್ಟುಗಳಿಗೆ ಆರಿಸಲಾದ ಕಡತಗಳ ಹೆಸರನ್ನು ಒದಗಿಸಲಾಗುತ್ತದೆ. ಒಂದು ದೂರಸ್ಥ ಕಡತಕೋಶದಿಂದ ಕಾರ್ಯಗತಗೊಳಿಸಿದಾಗ (ಉದಾ. ಜಾಲ ಅಥವ ಎಫ್‌ಟಿಪಿ ವಿಷಯಗಳನ್ನು ತೋರಿಸುವ ಕಡತಕೋಶ), ಸ್ಕ್ರಿಪ್ಟುಗಳಿಗೆ ಯಾವುದೆ ನಿಯತಾಂಕಗಳನ್ನು ಒದಗಿಸಲಾಗುವುದಿಲ್ಲ.\n"
+"ಒಂದು ಸ್ಥಳೀಯ ಕಡತಕೋಶದಿಂದ ಕಾರ್ಯಗತಗೊಳಿಸಿದಾಗ, ಸ್ಕ್ರಿಪ್ಟುಗಳಿಗೆ ಆರಿಸಲಾದ ಕಡತಗಳ ಹೆಸರನ್ನು "
+"ಒದಗಿಸಲಾಗುತ್ತದೆ. ಒಂದು ದೂರಸ್ಥ ಕಡತಕೋಶದಿಂದ ಕಾರ್ಯಗತಗೊಳಿಸಿದಾಗ (ಉದಾ. ಜಾಲ ಅಥವ ಎಫ್‌ಟಿಪಿ "
+"ವಿಷಯಗಳನ್ನು ತೋರಿಸುವ ಕಡತಕೋಶ), ಸ್ಕ್ರಿಪ್ಟುಗಳಿಗೆ ಯಾವುದೆ ನಿಯತಾಂಕಗಳನ್ನು "
+"ಒದಗಿಸಲಾಗುವುದಿಲ್ಲ.\n"
 "\n"
-"ಎಲ್ಲಾ ಸಂದರ್ಭಗಳಲ್ಲೂ, ಸ್ಕ್ರಿಪ್ಟುಗಳು ಬಳಸುವಂತೆ, ನಾಟಿಲಸ್ ಈ ಕೆಳಗಿನ ಚರಮೌಲ್ಯಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ:\n"
+"ಎಲ್ಲಾ ಸಂದರ್ಭಗಳಲ್ಲೂ, ಸ್ಕ್ರಿಪ್ಟುಗಳು ಬಳಸುವಂತೆ, ನಾಟಿಲಸ್ ಈ ಕೆಳಗಿನ ಚರಮೌಲ್ಯಗಳನ್ನು "
+"ಒದಗಿಸುತ್ತದೆ:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: ಆರಿಸಲಾದ ಕಡತಗಳಿಗಾಗಿ (ಸ್ಥಳೀಯವಾಗಿದ್ದಲ್ಲಿ ಮಾತ್ರ) ಹೊಸ ಸಾಲಿನ-ಡಿಲಿಮಿಟ್ ಆದಂತಹ ಮಾರ್ಗಗಳು\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: ಆರಿಸಲಾದ ಕಡತಗಳಿಗಾಗಿ (ಸ್ಥಳೀಯವಾಗಿದ್ದಲ್ಲಿ "
+"ಮಾತ್ರ) ಹೊಸ ಸಾಲಿನ-ಡಿಲಿಮಿಟ್ ಆದಂತಹ ಮಾರ್ಗಗಳು\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: ಆರಿಸಲಾದ ಕಡತಗಳಿಗಾಗಿ ಸಾಲಿನ-ಡಿಲಿಮಿಟ್ ಆದಂತಹ URI ಗಳು\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: ಆರಿಸಲಾದ ಕಡತಗಳಿಗಾಗಿ ಸಾಲಿನ-ಡಿಲಿಮಿಟ್ ಆದಂತಹ URI "
+"ಗಳು\n"
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: ಪ್ರಸ್ತುತ ಸ್ಥಳಕ್ಕಾಗಿ URI\n"
 "\n"
@@ -3196,16 +3378,24 @@ msgstr "ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿ
 #: ../src/file-manager/fm-directory-view.c:5699
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
-msgstr[0] "ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶವು ಸ್ಥಳಾಂತರಗೊಳ್ಳುತ್ತವೆ ಮಾಡಲ್ಪಡುತ್ತದೆ"
-msgstr[1] "ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶಗಳು ಸ್ಥಳಾಂತರಗೊಳ್ಳುತ್ತವೆ ಮಾಡಲ್ಪಡುತ್ತವೆ"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶವು ಸ್ಥಳಾಂತರಗೊಳ್ಳುತ್ತವೆ "
+"ಮಾಡಲ್ಪಡುತ್ತದೆ"
+msgstr[1] ""
+"ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶಗಳು ಸ್ಥಳಾಂತರಗೊಳ್ಳುತ್ತವೆ "
+"ಮಾಡಲ್ಪಡುತ್ತವೆ"
 
 #: ../src/file-manager/fm-directory-view.c:5706
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶವು ಕಾಪಿ ಮಾಡಲ್ಪಡುತ್ತದೆ"
-msgstr[1] "ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶಗಳು ಕಾಪಿ ಮಾಡಲ್ಪಡುತ್ತವೆ"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶವು ಕಾಪಿ ಮಾಡಲ್ಪಡುತ್ತದೆ"
+msgstr[1] ""
+"ಅಂಟಿಸು ಆಜ್ಞೆಯನ್ನು ನೀವು ಆರಿಸಿದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ %'d ಅಂಶಗಳು ಕಾಪಿ ಮಾಡಲ್ಪಡುತ್ತವೆ"
 
 #: ../src/file-manager/fm-directory-view.c:5762
 #: ../src/file-manager/fm-tree-view.c:1013
@@ -3386,7 +3576,9 @@ msgstr "ಆರಿಸಲಾದ ಕಡತಗಳನ್ನು 'ಅಂಟಿಸು' �
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6619
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "ಈ ಹಿಂದೆ ಆರಿಸಲಾದ ಕಡತಗಳನ್ನು 'ಕತ್ತರಿಸು' ಅಥವ 'ಕಾಪಿ ಮಾಡು' ಆಜ್ಞೆಯಿಂದ ಸ್ಥಳಾಂತರಿಸು ಅಥವ ಕಾಪಿ ಮಾಡು"
+msgstr ""
+"ಈ ಹಿಂದೆ ಆರಿಸಲಾದ ಕಡತಗಳನ್ನು 'ಕತ್ತರಿಸು' ಅಥವ 'ಕಾಪಿ ಮಾಡು' ಆಜ್ಞೆಯಿಂದ ಸ್ಥಳಾಂತರಿಸು ಅಥವ "
+"ಕಾಪಿ ಮಾಡು"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3403,7 +3595,9 @@ msgstr "ಕಡತಕೋಶಕ್ಕೆ ಅಂಟಿಸು(_P)"
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
-msgstr "ಈ ಹಿಂದೆ ಆರಿಸಲಾದ ಕಡತಗಳನ್ನು 'ಕತ್ತರಿಸು' ಅಥವ 'ಕಾಪಿ ಮಾಡು' ಆಜ್ಞೆಯಿಂದ ಈ ಕಡತಕೋಶಕ್ಕೆ ಸ್ಥಳಾಂತರಿಸು ಅಥವ ಕಾಪಿ ಮಾಡು"
+msgstr ""
+"ಈ ಹಿಂದೆ ಆರಿಸಲಾದ ಕಡತಗಳನ್ನು 'ಕತ್ತರಿಸು' ಅಥವ 'ಕಾಪಿ ಮಾಡು' ಆಜ್ಞೆಯಿಂದ ಈ ಕಡತಕೋಶಕ್ಕೆ "
+"ಸ್ಥಳಾಂತರಿಸು ಅಥವ ಕಾಪಿ ಮಾಡು"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6629
@@ -3511,7 +3705,9 @@ msgstr "ನೋಟಗಳನ್ನು ಡೀಫಾಲ್ಟಿಗೆ ಮರು ಹ
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6675
 msgid "Reset sorting order and zoom level to match preferences for this view"
-msgstr "ಈ ನೋಟಕ್ಕೆ ಆದ್ಯತೆಗಳು ತಾಳೆಯಾಗುವಂತೆ ವಿಂಗಡಣಾ ಕ್ರಮ ಹಾಗು ಗಾತ್ರಬದಲಿಸುವ ಮಟ್ಟವನ್ನು ಮರು ಹೊಂದಿಸು"
+msgstr ""
+"ಈ ನೋಟಕ್ಕೆ ಆದ್ಯತೆಗಳು ತಾಳೆಯಾಗುವಂತೆ ವಿಂಗಡಣಾ ಕ್ರಮ ಹಾಗು ಗಾತ್ರಬದಲಿಸುವ ಮಟ್ಟವನ್ನು ಮರು "
+"ಹೊಂದಿಸು"
 
 #. name, stock id
 #. label, accelerator
@@ -3659,7 +3855,9 @@ msgstr "'ಅಂಟಿಸು' ಆಜ್ಞೆಯನ್ನು ಬಳಸಿಕೊ�
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into this "
 "folder"
-msgstr "ಈ ಹಿಂದೆ ಆರಿಸಲಾದ ಕಡತಗಳನ್ನು 'ಕತ್ತರಿಸು' ಅಥವ 'ಕಾಪಿ ಮಾಡು' ಆಜ್ಞೆಯಿಂದ ಈ ಕಡತಕೋಶಕ್ಕೆ ಸ್ಥಳಾಂತರಿಸು ಅಥವ ಕಾಪಿ ಮಾಡು"
+msgstr ""
+"ಈ ಹಿಂದೆ ಆರಿಸಲಾದ ಕಡತಗಳನ್ನು 'ಕತ್ತರಿಸು' ಅಥವ 'ಕಾಪಿ ಮಾಡು' ಆಜ್ಞೆಯಿಂದ ಈ ಕಡತಕೋಶಕ್ಕೆ "
+"ಸ್ಥಳಾಂತರಿಸು ಅಥವ ಕಾಪಿ ಮಾಡು"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6756
@@ -3854,7 +4052,8 @@ msgstr "ಆದೇಶ"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\" ನ ಒಳ ಅಂಶಗಳನ್ನು ವೀಕ್ಷಿಸಲು ನಿಮಗೆ ಅಗತ್ಯ ಅನುಮತಿಗಳಿಲ್ಲ."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -3873,13 +4072,17 @@ msgstr "ಕಡತ ಕೋಶದಲ್ಲಿನ ಒಳ ಅಂಶಗಳನ್ನು
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "\"%s\" ಎಂಬ ಹೆಸರು ಈಗಾಗಲೆ ಈ ಕಡತದಲ್ಲಿ ಬಳಸಲ್ಪಟ್ಟಿದೆ. ದಯವಿಟ್ಟು ಒಂದು ಬೇರೆ ಹೆಸರನ್ನು ಬಳಸಿ."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"\"%s\" ಎಂಬ ಹೆಸರು ಈಗಾಗಲೆ ಈ ಕಡತದಲ್ಲಿ ಬಳಸಲ್ಪಟ್ಟಿದೆ. ದಯವಿಟ್ಟು ಒಂದು ಬೇರೆ ಹೆಸರನ್ನು ಬಳಸಿ."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "ಈ ಕಡತದಲ್ಲಿ \"%s\" ವು ಇಲ್ಲ. ಬಹುಷಃ ಅದು ಸ್ಥಳಾಂತರಿತಗೊಂಡಿರಬೇಕು ಅಥವ ಅಳಿಸಲ್ಪಟ್ಟಿರಬೇಕು?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+"ಈ ಕಡತದಲ್ಲಿ \"%s\" ವು ಇಲ್ಲ. ಬಹುಷಃ ಅದು ಸ್ಥಳಾಂತರಿತಗೊಂಡಿರಬೇಕು ಅಥವ ಅಳಿಸಲ್ಪಟ್ಟಿರಬೇಕು?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
@@ -3912,7 +4115,8 @@ msgstr "ಅಂಶದ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲಾಗಿ�
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\" ನ ಸಮೂಹವನ್ನು ಬದಲಾಯಿಸಲು ಅಗತ್ಯವಿರುವ ಅನುಮತಿಗಳು ನಿಮ್ಮಲ್ಲಿಲ್ಲ ."
 
 #. fall through
@@ -4030,7 +4234,9 @@ msgstr "ಹೆಸರಿನ ಮೇರೆಗೆ ಸ್ವಚ್ಛಗೊಳಿಸ�
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1510
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "ವಿಂಡೋದ ಒಳಗೆ ಸರಿಯಾಗಿ ಕೂರುವಂತೆ ಹಾಗು ಒಂದರ ಮೇಲೆ ಇನ್ನೊಂದು ಹೇರದಂತೆ ಚಿಹ್ನೆಗಳ ಸ್ಥಾನದ ಸರಿಪಡಿಸುವಿಕೆ"
+msgstr ""
+"ವಿಂಡೋದ ಒಳಗೆ ಸರಿಯಾಗಿ ಕೂರುವಂತೆ ಹಾಗು ಒಂದರ ಮೇಲೆ ಇನ್ನೊಂದು ಹೇರದಂತೆ ಚಿಹ್ನೆಗಳ ಸ್ಥಾನದ "
+"ಸರಿಪಡಿಸುವಿಕೆ"
 
 #. name, stock id
 #. label, accelerator
@@ -4571,7 +4777,10 @@ msgid ""
 "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
 "installing Nautilus again."
-msgstr "ನಾಟಿಲಸ್ ಅನ್ನು ಈಗ ಬಳಸಲಾಗುವುದಿಲ್ಲ. ಕನ್ಸೋಲಿನಲ್ಲಿ \"bonobo-slay\" ಎನ್ನು ಆಜ್ಞೆಯನ್ನು ಚಲಾಯಿಸಿದಲ್ಲಿ ಈ ತೊಂದರೆಗೆ ಪರಿಹಾರ ಒದಗಬಹುದು. ಇಲ್ಲದೆ ಹೋದರೆ, ಗಣಕವನ್ನು ಮರಳಿ ಬೂಟ್ ಮಾಡಿಯೋ ಅಥವ ನಾಟಿಲಸ್ ಅನ್ನು ಮರಳಿ ಅನುಸ್ಥಾಪಿಸಿ ನೋಡಿ."
+msgstr ""
+"ನಾಟಿಲಸ್ ಅನ್ನು ಈಗ ಬಳಸಲಾಗುವುದಿಲ್ಲ. ಕನ್ಸೋಲಿನಲ್ಲಿ \"bonobo-slay\" ಎನ್ನು ಆಜ್ಞೆಯನ್ನು "
+"ಚಲಾಯಿಸಿದಲ್ಲಿ ಈ ತೊಂದರೆಗೆ ಪರಿಹಾರ ಒದಗಬಹುದು. ಇಲ್ಲದೆ ಹೋದರೆ, ಗಣಕವನ್ನು ಮರಳಿ ಬೂಟ್ ಮಾಡಿಯೋ "
+"ಅಥವ ನಾಟಿಲಸ್ ಅನ್ನು ಮರಳಿ ಅನುಸ್ಥಾಪಿಸಿ ನೋಡಿ."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:603
@@ -4594,13 +4803,21 @@ msgid ""
 "We have also seen this error when a faulty version of bonobo-activation was "
 "installed."
 msgstr ""
-"ನಾಟಿಲಸ್ ಅನ್ನು ಈಗ ಬಳಸಲಾಗುವುದಿಲ್ಲ. ಕನ್ಸೋಲಿನಲ್ಲಿ \"bonobo-slay\" ಎನ್ನು ಆಜ್ಞೆಯನ್ನು ಚಲಾಯಿಸಿದಲ್ಲಿ ಈ ತೊಂದರೆಗೆ ಪರಿಹಾರ ಒದಗಬಹುದು. ಇಲ್ಲದೆ ಹೋದರೆ, ಗಣಕವನ್ನು ಮರಳಿ ಬೂಟ್ ಮಾಡಿಯೋ ಅಥವ ನಾಟಿಲಸ್ ಅನ್ನು ಮರಳಿ ಅನುಸ್ಥಾಪಿಸಿ ನೋಡಿ.\n"
+"ನಾಟಿಲಸ್ ಅನ್ನು ಈಗ ಬಳಸಲಾಗುವುದಿಲ್ಲ. ಕನ್ಸೋಲಿನಲ್ಲಿ \"bonobo-slay\" ಎನ್ನು ಆಜ್ಞೆಯನ್ನು "
+"ಚಲಾಯಿಸಿದಲ್ಲಿ ಈ ತೊಂದರೆಗೆ ಪರಿಹಾರ ಒದಗಬಹುದು. ಇಲ್ಲದೆ ಹೋದರೆ, ಗಣಕವನ್ನು ಮರಳಿ ಬೂಟ್ ಮಾಡಿಯೋ "
+"ಅಥವ ನಾಟಿಲಸ್ ಅನ್ನು ಮರಳಿ ಅನುಸ್ಥಾಪಿಸಿ ನೋಡಿ.\n"
 "\n"
-"ಬೊನೊಬೊಗೆ Nautilus_shell.server ಕಡತವು ಕಂಡುಬಂದಿಲ್ಲ. ಇದಕ್ಕಿರಬಹುದಾದ ಒಂದು ಕಾರಣವೆಂದರೆ LD_LIBRARY_PATH ವು ಬೊನೊಬೊ-ಸಕ್ರಿಯಗೊಳಿಕಾ ಲೈಬ್ರರಿಯ ಕೋಶವನ್ನು ಹೊಂದಿಲ್ಲದೆ ಇರುವುದು ಆಗಿರಬಹುದು. ಸಾಧ್ಯವಿರುವ ಇನ್ನೊಂದು ಕಾರಣವು, Nautilus_Shell.server ಕಡತವು ಇಲ್ಲದ ಒಂದು ಅಸಮರ್ಪಕ ಅನುಸ್ಥಾಪನೆ ಇಂದಾಗಿರಬಹುದು.\n"
+"ಬೊನೊಬೊಗೆ Nautilus_shell.server ಕಡತವು ಕಂಡುಬಂದಿಲ್ಲ. ಇದಕ್ಕಿರಬಹುದಾದ ಒಂದು "
+"ಕಾರಣವೆಂದರೆ LD_LIBRARY_PATH ವು ಬೊನೊಬೊ-ಸಕ್ರಿಯಗೊಳಿಕಾ ಲೈಬ್ರರಿಯ ಕೋಶವನ್ನು ಹೊಂದಿಲ್ಲದೆ "
+"ಇರುವುದು ಆಗಿರಬಹುದು. ಸಾಧ್ಯವಿರುವ ಇನ್ನೊಂದು ಕಾರಣವು, Nautilus_Shell.server ಕಡತವು "
+"ಇಲ್ಲದ ಒಂದು ಅಸಮರ್ಪಕ ಅನುಸ್ಥಾಪನೆ ಇಂದಾಗಿರಬಹುದು.\n"
 "\n"
-"\"bonobo-slay\" ಅನ್ನು ಚಲಾಯಿಸಿದಾಗ, ಬೇರೆ ಅನ್ವಯಗಳಿಗೆ ಬೇಕಾಗಿರಬಹುದಾದಂತಹ ಎಲ್ಲಾ ಬೊನೊಬೊ ಸಕ್ರಿಯಗೊಳಿಕೆ ಹಾಗು GConf ಪ್ರಕ್ರಿಯಗಳನ್ನು ಸ್ಥಗಿತಗೊಳ್ಳುತ್ತದೆ.\n"
+"\"bonobo-slay\" ಅನ್ನು ಚಲಾಯಿಸಿದಾಗ, ಬೇರೆ ಅನ್ವಯಗಳಿಗೆ ಬೇಕಾಗಿರಬಹುದಾದಂತಹ ಎಲ್ಲಾ ಬೊನೊಬೊ "
+"ಸಕ್ರಿಯಗೊಳಿಕೆ ಹಾಗು GConf ಪ್ರಕ್ರಿಯಗಳನ್ನು ಸ್ಥಗಿತಗೊಳ್ಳುತ್ತದೆ.\n"
 "\n"
-"ಕಲವು ಬಾರಿ ಬೊನೊಬೊ-ಸಕ್ರಿಯಗೊಳಿಕಾ-ಪರಿಚಾರಕವನ್ನು ಹಾಗು gconfd  ಅನ್ನು ಸ್ಥಗಿತಗೊಳಿಸುವುದರಿಂದ ಈ ತೊಂದರೆಗೆ ಪರಿಹಾರ ದೊರೆಯುತ್ತಾದರೂ ನಮಗೆ ಇದರ ಹಿಂದಿನ ಕಾರಣವು ತಿಳಿದಿಲ್ಲ.\n"
+"ಕಲವು ಬಾರಿ ಬೊನೊಬೊ-ಸಕ್ರಿಯಗೊಳಿಕಾ-ಪರಿಚಾರಕವನ್ನು ಹಾಗು gconfd  ಅನ್ನು "
+"ಸ್ಥಗಿತಗೊಳಿಸುವುದರಿಂದ ಈ ತೊಂದರೆಗೆ ಪರಿಹಾರ ದೊರೆಯುತ್ತಾದರೂ ನಮಗೆ ಇದರ ಹಿಂದಿನ ಕಾರಣವು "
+"ತಿಳಿದಿಲ್ಲ.\n"
 "\n"
 "We have also seen this error when a faulty version of bonobo-activation was "
 "installed."
@@ -4617,7 +4834,8 @@ msgstr ""
 #: ../src/nautilus-application.c:633 ../src/nautilus-application.c:651
 #: ../src/nautilus-application.c:658
 msgid "Nautilus cannot be used now, due to an unexpected error."
-msgstr "ನಾಟಿಲಸ್ ಅನ್ನು ಈಗ ಬಳಸಲಾಗುವುದಿಲ್ಲ, ಏಕೆಂದರೆ ಒಂದು ಅನಿರೀಕ್ಷಿತ ದೋಷವು ಕಂಡು ಬಂದಿದೆ."
+msgstr ""
+"ನಾಟಿಲಸ್ ಅನ್ನು ಈಗ ಬಳಸಲಾಗುವುದಿಲ್ಲ, ಏಕೆಂದರೆ ಒಂದು ಅನಿರೀಕ್ಷಿತ ದೋಷವು ಕಂಡು ಬಂದಿದೆ."
 
 #: ../src/nautilus-application.c:634
 msgid ""
@@ -4684,7 +4902,8 @@ msgid ""
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"ತಂತ್ರಾಂಶವು ನೇರವಾಗಿ \"%s\" ಮಾಧ್ಯಮದಿಂದ ಚಲಾಯಿಸಲ್ಪಡುತ್ತದೆ. ನೀವು ನಂಬದೆ ಇರುವಂತಹ ತಂತ್ರಾಂಶವನ್ನು ಎಂದಿಗೂ ಸಹ ಚಲಾಯಿಸಬಾರದು.\n"
+"ತಂತ್ರಾಂಶವು ನೇರವಾಗಿ \"%s\" ಮಾಧ್ಯಮದಿಂದ ಚಲಾಯಿಸಲ್ಪಡುತ್ತದೆ. ನೀವು ನಂಬದೆ ಇರುವಂತಹ "
+"ತಂತ್ರಾಂಶವನ್ನು ಎಂದಿಗೂ ಸಹ ಚಲಾಯಿಸಬಾರದು.\n"
 "\n"
 "ಸಂದೇಹಗಳಿದ್ದಲ್ಲಿ, ರದ್ದುಗೊಳಿಸು ಅನ್ನು ಕ್ಲಿಕ್ಕಿಸಿ."
 
@@ -4770,7 +4989,8 @@ msgstr "ಸುರಕ್ಷಿತ WebDAV (HTTPS)"
 
 #: ../src/nautilus-connect-server-dialog.c:194
 msgid "Cannot Connect to Server. You must enter a name for the server."
-msgstr "ಕ್ಷಮಿಸಿ ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕ ಜೋಡಿಸಲಾಗಿಲ್ಲ, ಪರಿಚಾರಕ್ಕೆ ಒಂದು ಹೆಸರನ್ನು ನಮೂದಿಸಬೇಕು."
+msgstr ""
+"ಕ್ಷಮಿಸಿ ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕ ಜೋಡಿಸಲಾಗಿಲ್ಲ, ಪರಿಚಾರಕ್ಕೆ ಒಂದು ಹೆಸರನ್ನು ನಮೂದಿಸಬೇಕು."
 
 #: ../src/nautilus-connect-server-dialog.c:195
 msgid "Please enter a name and try again."
@@ -5078,8 +5298,10 @@ msgid "Choose the order of information to appear in the list view."
 msgstr "ಪಟ್ಟಿ ನೋಟದಲ್ಲಿ ಕಾಣಿಸಬೇಕಿರುವ ಮಾಹಿತಿಯ ಅನುಕ್ರಮವನ್ನು ಆರಿಸಿ."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
-msgstr "ಮಾಧ್ಯಮವನ್ನು ತೋರಿಸಿದಾಗ ಅಥವ ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸಿದಾಗ ಹೇಗೆ ವರ್ತಿಸಬೇಕೆಂದು ಆರಿಸಿ"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
+msgstr ""
+"ಮಾಧ್ಯಮವನ್ನು ತೋರಿಸಿದಾಗ ಅಥವ ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸಿದಾಗ ಹೇಗೆ ವರ್ತಿಸಬೇಕೆಂದು ಆರಿಸಿ"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
 msgid "Count _number of items:"
@@ -5112,8 +5334,7 @@ msgid ""
 "Compact View"
 msgstr ""
 "ಲಾಂಛನ ನೋಟ\n"
-"ಪಟ್ಟಿ ನೋಟ "
-"ಸಾಂದ್ರ ನೋಟ"
+"ಪಟ್ಟಿ ನೋಟ ಸಾಂದ್ರ ನೋಟ"
 
 #: ../src/nautilus-file-management-properties.glade.h:61
 msgid "Less common media formats can be configured here"
@@ -5189,7 +5410,9 @@ msgstr "ಸಂಗೀತದ ಪ್ಲೇಯರ್(_M):"
 
 #: ../src/nautilus-file-management-properties.glade.h:80
 msgid "_Never prompt or start programs on media insertion"
-msgstr "ಮಾಧ್ಯಮವನ್ನು ತೋರಿಸಿದ ತಕ್ಷಣ ಪ್ರೊಗ್ರಾಂ ಅನ್ನು ಆರಂಭಿಸಲು ಕೇಳುವುದಾಗಲಿ ಅಥವ ಆರಂಭಿಸುವುದಾಗಲಿ ಮಾಡಬೇಡ(_N)"
+msgstr ""
+"ಮಾಧ್ಯಮವನ್ನು ತೋರಿಸಿದ ತಕ್ಷಣ ಪ್ರೊಗ್ರಾಂ ಅನ್ನು ಆರಂಭಿಸಲು ಕೇಳುವುದಾಗಲಿ ಅಥವ ಆರಂಭಿಸುವುದಾಗಲಿ "
+"ಮಾಡಬೇಡ(_N)"
 
 #: ../src/nautilus-file-management-properties.glade.h:81
 msgid "_Only for files smaller than:"
@@ -5400,7 +5623,9 @@ msgstr "ಸ್ಪಷ್ಟವಾಗಿ ತಿಳಿಸಿದ ಯುಆರ್ಐ�
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
-msgstr "ಗಣಕತೆರೆಯನ್ನು ವ್ಯವಸ್ಥಾಪಿಸಬೇಡಿ (ಆದ್ಯತೆಗಳ ಸಂವಾದದಲ್ಲಿ ಹೊಂದಿಸಲಾದ ಆದ್ಯತೆಗಳತ್ತ ಗಮನ ಕೊಡಬೇಡಿ)."
+msgstr ""
+"ಗಣಕತೆರೆಯನ್ನು ವ್ಯವಸ್ಥಾಪಿಸಬೇಡಿ (ಆದ್ಯತೆಗಳ ಸಂವಾದದಲ್ಲಿ ಹೊಂದಿಸಲಾದ ಆದ್ಯತೆಗಳತ್ತ ಗಮನ "
+"ಕೊಡಬೇಡಿ)."
 
 #: ../src/nautilus-main.c:397
 msgid "open a browser window."
@@ -5423,7 +5648,9 @@ msgstr "[URI...]"
 msgid ""
 "Load a saved session from the specified file. Implies \"--no-default-window"
 "\"."
-msgstr "ಸೂಚಿಸಲಾದ ಕಡತದಲ್ಲಿ ಉಳಿಸಲಾಗಿರುವ ಒಂದು ಅಧಿವೇಶನವನ್ನಿ ಲೋಡ್ ಮಾಡು. \"--no-default-window \" ಎಂದು ಸೂಚಿಸುತ್ತದೆ."
+msgstr ""
+"ಸೂಚಿಸಲಾದ ಕಡತದಲ್ಲಿ ಉಳಿಸಲಾಗಿರುವ ಒಂದು ಅಧಿವೇಶನವನ್ನಿ ಲೋಡ್ ಮಾಡು. \"--no-default-"
+"window \" ಎಂದು ಸೂಚಿಸುತ್ತದೆ."
 
 #: ../src/nautilus-main.c:405
 msgid "FILENAME"
@@ -5586,7 +5813,8 @@ msgstr "ಬುಕ್ಮಾರ್ಕುಗಳನ್ನು ಸಂಪಾದಿಸ�
 #: ../src/nautilus-navigation-window-menus.c:815
 #: ../src/nautilus-spatial-window.c:903
 msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಸಂಪಾದಿಸಲು ಅನುವು ಮಾಡಿಕೊಡುವ ಒಂದು ವಿಂಡೋವನ್ನು ಈ ಮೆನುವಿನಲ್ಲಿ ತೋರಿಸು"
+msgstr ""
+"ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಸಂಪಾದಿಸಲು ಅನುವು ಮಾಡಿಕೊಡುವ ಒಂದು ವಿಂಡೋವನ್ನು ಈ ಮೆನುವಿನಲ್ಲಿ ತೋರಿಸು"
 
 #. name, stock id, label
 #: ../src/nautilus-navigation-window-menus.c:817
@@ -5597,7 +5825,8 @@ msgstr "ಕಡತಗಳಿಗಾಗಿ ಹುಡುಕು(_S)..."
 #: ../src/nautilus-navigation-window-menus.c:818
 #: ../src/nautilus-spatial-window.c:906
 msgid "Locate documents and folders on this computer by name or content"
-msgstr "ಹೆಸರು ಅಥವ ವಿಷಯದ ಆಧಾರದಲ್ಲಿ ಈ ಗಣಕದಲ್ಲಿನ ದಸ್ತಾವೇಜುಗಳನ್ನು ಹಾಗು ಕಡತಕೋಶಗಳನ್ನು ಪತ್ತೆ ಮಾಡು"
+msgstr ""
+"ಹೆಸರು ಅಥವ ವಿಷಯದ ಆಧಾರದಲ್ಲಿ ಈ ಗಣಕದಲ್ಲಿನ ದಸ್ತಾವೇಜುಗಳನ್ನು ಹಾಗು ಕಡತಕೋಶಗಳನ್ನು ಪತ್ತೆ ಮಾಡು"
 
 #: ../src/nautilus-navigation-window-menus.c:821
 msgid "_Previous Tab"
@@ -6159,8 +6388,10 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "\"%s\" ಅನ್ನು ತೋರಿಸಲಾಗಿಲ್ಲ, ಏಕೆಂದರೆ ಅತಿಥೇಯವನ್ನು ಪತ್ತೆ ಮಾಡಲಾಗಿಲ್ಲ."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "ಕಾಗುಣಿತವು ಸರಿ ಇದೆಯೆ ಹಾಗು ನಿಮ್ಮ ಪ್ರಾಕ್ಸಿ ಸಂಯೋಜನೆಗಳು ಸರಿ ಇವೆಯೆ ಎಂದು ಪರೀಕ್ಷಿಸಿ."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"ಕಾಗುಣಿತವು ಸರಿ ಇದೆಯೆ ಹಾಗು ನಿಮ್ಮ ಪ್ರಾಕ್ಸಿ ಸಂಯೋಜನೆಗಳು ಸರಿ ಇವೆಯೆ ಎಂದು ಪರೀಕ್ಷಿಸಿ."
 
 #: ../src/nautilus-window-manage-views.c:1947
 #, c-format
@@ -6447,7 +6678,8 @@ msgstr "CD/_DVD ನಿರ್ಮಾತೃ"
 #. tooltip
 #: ../src/nautilus-window-menus.c:878
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr "ಒಂದು ಸೀಡಿ ಅಥವ ಡಿವಿಡಿಗೆ ಬರೆಯಲು ಕಡತಗಳನ್ನು ಸೇರಿಸಲು ಒಂದು ಕಡತಕೋಶವನ್ನು ತೆರೆಯಿರಿ"
+msgstr ""
+"ಒಂದು ಸೀಡಿ ಅಥವ ಡಿವಿಡಿಗೆ ಬರೆಯಲು ಕಡತಗಳನ್ನು ಸೇರಿಸಲು ಒಂದು ಕಡತಕೋಶವನ್ನು ತೆರೆಯಿರಿ"
 
 #. name, stock id
 #. label, accelerator
@@ -6534,3 +6766,140 @@ msgstr "ಹಿಗ್ಗಿಸು"
 msgid "Set the zoom level of the current view"
 msgstr "ಪ್ರಸಕ್ತ ನೋಟದ ಹಿಗ್ಗಿಸುವ ಮಟ್ಟವನ್ನು ಹೊಂದಿಸು"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ಚಿತ್ರ/ಲೇಬಲ್ ಅಂಚು"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "ಎಚ್ಚರಿಕಾ ಸಂವಾದದಲ್ಲಿನ ಲೇಬಲ್‌ನ ಹಾಗು ಚಿತ್ರದ ಸುತ್ತಮುತ್ತಲಿನ ಅಂಚಿನ ಅಗಲ"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "ಎಚ್ಚರಿಕೆ ಬಗೆ"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "ಎಚ್ಚರಿಕೆಯ ಬಗೆ"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "ಎಚ್ಚರಿಕೆ ಗುಂಡಿಗಳು"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "ಎಚ್ಚರಿಕೆ ಸಂವಾದದಲ್ಲಿ ತೋರಿಸಲಾದ ಗುಂಡಿಗಳು"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "ಇನ್ನಷ್ಟು ವಿವರಗಳನ್ನು ತೋರಿಸು (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ಪಠ್ಯ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ಶೀರ್ಷಿಕೆಯ ಪಠ್ಯ."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "ಜಸ್ಟಿಫಿಕೇಶನ್"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "ಸಾಲು ಆವರಿಕೆ(ವ್ರಾಪ್)"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "ಹೊಂದಿಸಿದಲ್ಲಿ, ಪಠ್ಯವು ಅಂತ್ಯಂತ ಅಗಲವಾಗಿದ್ದಲ್ಲಿ ಸಾಲುಗಳನ್ನು ವ್ರಾಪ್ ಮಾಡುತ್ತದೆ."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "ತೆರೆ ಸೂಚಕದ ಸ್ಥಾನ"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "ಸೇರಿಸುವ ಕರ್ಸರಿನ ಈಗಿನ ಸ್ಥಳ, ಅಕ್ಷರಗಳಲ್ಲಿ"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "ಆಯ್ಕೆಯ ಮಿತಿ"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "ತೆರೆಸೂಚಕದಿಂದ ಆಯ್ಕೆಯ ವಿರುದ್ಧ ತುದಿಯಲ್ಲಿನ ಸ್ಥಾನ, ಅಕ್ಷರಗಳಲ್ಲಿ."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "ಎಲ್ಲವನ್ನೂ ಅಯ್ಕೆಮಾಡು"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "ಆದಾನ ಕ್ರಮಗಳು"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf ದೋಷ:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf ದೋಷ: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ಮುಂದೆ ಅಗುವ ಎಲ್ಲ ತಪ್ಪುಗಳನ್ನು ಟರ್ಮಿನಲ್‍ನಲ್ಲಿ ಮಾತ್ರ ತೋರಿಸಲಾಗುವುದು."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "ಯಾವುದೆ ಚಿತ್ರವು ಆರಿಸಲ್ಪಟ್ಟಿಲ್ಲ."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "ನೀವು ಚಿತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಅದರ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಬೇಕು."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "ಈ ಕಾರ್ಯಾಚರಣೆವನ್ನು ನಿಲ್ಲಿಸಲು ರದ್ದು ಮಾಡು ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(ಅಮಾನ್ಯ ಯುನಿಕೋಡ್)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "%s ಅನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d ಅಂಶವನ್ನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
+msgstr[1] "%d ಅಂಶಗಳನ್ನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ"
diff --git a/po/ko.po b/po/ko.po
index 078d9891c..972bf35cd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ko.po (nautilus)  #-#-#-#-#
 # nautilus ko.po
 # Young-Ho Cha <ganadist@mizi.com>, 2000~2002, 2004, 2006~2008.
 # Eunju Kim <eukim@redhat.com>, 2007.
@@ -5,8 +6,16 @@
 # Changwoo Ryu <cwryu@debian.org>, 2007, 2008.
 #
 #
+# #-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#
+# eel ko.po
+# Young-ho, Cha <ganadist@dacome.co.kr>, 2000, 2001.
+# Changwoo Ryu <cwryu@debian.org>, 2002, 2004, 2005, 2006.
+# Young-Ho, Cha <ganadist@gmail.com> 2003, 2006, 2008
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ko.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-08 14:10+0900\n"
@@ -17,6 +26,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"#-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: eel $VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-02 01:39+0900\n"
+"PO-Revision-Date: 2008-02-02 01:40+0900\n"
+"Last-Translator: Young-Ho Cha <ganadist@gmail.com>\n"
+"Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -355,7 +375,10 @@ msgid ""
 "ellipses on the desktop. If the number is larger than 0, the file name will "
 "not exceed the given number of lines. If the number is 0 or smaller, no "
 "limit is imposed on the number of displayed lines."
-msgstr "바탕 화면에서 매우 긴 파일 이름의 일부분을 말줄임표로 바꾸도록 지정하는 정수값. 0보다 크면 파일 이름은 지정한 값까지 줄을 사용합니다. 0보다 작으면 표시줄에 제한이 없어집니다."
+msgstr ""
+"바탕 화면에서 매우 긴 파일 이름의 일부분을 말줄임표로 바꾸도록 지정하는 정수"
+"값. 0보다 크면 파일 이름은 지정한 값까지 줄을 사용합니다. 0보다 작으면 표시줄"
+"에 제한이 없어집니다."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid ""
@@ -2808,9 +2831,13 @@ msgid "Could not run application"
 msgstr "프로그램을 실행할 수 없습니다"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "\"%s\"(을)를 찾을 수 없습니다"
+msgstr ""
+"#-#-#-#-#  ko.po (nautilus)  #-#-#-#-#\n"
+"\"%s\"(을)를 찾을 수 없습니다\n"
+"#-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#\n"
+"'%s'을(를) 찾을 수 없습니다"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
 msgid "Could not find application"
@@ -2831,21 +2858,37 @@ msgstr "프로그램 선택"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5070
+#, fuzzy
 msgid "Open With"
-msgstr "다른 프로그램으로 열기"
+msgstr ""
+"#-#-#-#-#  ko.po (nautilus)  #-#-#-#-#\n"
+"다른 프로그램으로 열기\n"
+"#-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#\n"
+"프로그램으로 열기"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "설명을 보기 위한 프로그램을 선택합니다."
+msgstr ""
+"#-#-#-#-#  ko.po (nautilus)  #-#-#-#-#\n"
+"설명을 보기 위한 프로그램을 선택합니다.\n"
+"#-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#\n"
+"이 설명을 볼 때 사용할 프로그램을 선택하십시오."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "사용자 지정 명령 사용(_U)"
+msgstr ""
+"#-#-#-#-#  ko.po (nautilus)  #-#-#-#-#\n"
+"사용자 지정 명령 사용(_U)\n"
+"#-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#\n"
+"사용자 설정 명령어 사용(_U)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "찾아보기(_B)..."
 
+#. #-#-#-#-#  ko.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2857,9 +2900,13 @@ msgid "_Open"
 msgstr "열기(_O)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "%s와(과) \"%s\" 형식의 다른 파일을 여는 프로그램:"
+msgstr ""
+"#-#-#-#-#  ko.po (nautilus)  #-#-#-#-#\n"
+"%s와(과) \"%s\" 형식의 다른 파일을 여는 프로그램:\n"
+"#-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#\n"
+"%s 및 \"%s\" 종류의 기타 파일을 열 프로그램:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
@@ -2868,8 +2915,13 @@ msgstr "더하기(_A)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "프로그램 더하기"
+msgstr ""
+"#-#-#-#-#  ko.po (nautilus)  #-#-#-#-#\n"
+"프로그램 더하기\n"
+"#-#-#-#-#  ko.po (eel $VERSION)  #-#-#-#-#\n"
+"프로그램을 더합니다"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -6679,6 +6731,145 @@ msgstr "확대/축소"
 msgid "Set the zoom level of the current view"
 msgstr "현재 보기의 확대수준을 설정합니다"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "그림/레이블 테두리"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "알림 대화 상자의 레이블 및 그림 주위의 테두리 너비"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "알림 종류"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "알림의 종류"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "알림 단추"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "알림 대화 상자에 표시할 단추"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "자세히 보기(_D)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "글자"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "라벨의 글자."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "칸 맞춤"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"라벨의 글자들은 서로 영향을 끼치면서 정렬됩니다.이는 이미 배치된 라벨 자체의 "
+"위치에는 영향을 주지 않습니다.이 부분에 대해서는 GtkMisc::xalign을 보십시오."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "줄 넘김"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "설정해두면, 줄이 너무 길어질 때 줄을 넘깁니다."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "커서 위치"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "입력 커서의 현재 위치 (char 단위)."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "선택 경계"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "글자에 있는 커서에서 선택 반대방향 끝의 위치."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "모두 선택"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "입력기"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf 오류:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 오류: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "이후의 모든 오류 메세지는 터미널에서만 볼 수 있습니다."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "그림을 선택하지 않았습니다."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "그림을 눌러서 선택해야 합니다."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "취소를 눌러 이 작업을 중단할 수 있습니다."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (잘못된 유니코드)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "%s 여는 중"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d개의 항목 여는 중"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "암호를 입력하십시오"
+
 #~ msgid "Create Folder"
 #~ msgstr "폴더 만들기"
 
@@ -6694,3 +6885,18 @@ msgstr "현재 보기의 확대수준을 설정합니다"
 #~ msgid ""
 #~ "If you clear the list of locations, they will be permanently deleted."
 #~ msgstr "위치 목록을 비우면 완전히 지워지게 됩니다."
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "00/01/01, 오전 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "00/1/1, 오전 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr "00/ 1/ 1, 오전  1:00"
+
+#~ msgid "Select an application to open %s and others of type \"%s\""
+#~ msgstr "%s 및 \"%s\" 종류의 다른 파일을 열 프로그램을 선택하십시오"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "프로그램을 데이터베이스에 더할 수 없습니다"
diff --git a/po/ku.po b/po/ku.po
index 70715e459..8d99307f1 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -1,11 +1,22 @@
+# #-#-#-#-#  ku.po (nautilus.HEAD)  #-#-#-#-#
 # translation of nautilus.HEAD.po to Kurdish
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
 # Erdal Ronahi <erdal.ronahi@gmail.com, pckurd@hotmail.com>, 2005.
 #
 #
+# #-#-#-#-#  ku.po (eel2)  #-#-#-#-#
+# Kurdish translation for eel2
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the eel2 package.
+# Erdal Ronahi <erdal.ronahi@gmail.com>, 2006.
+# , fuzzy
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ku.po (nautilus.HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-03-04 21:45+0100\n"
@@ -20,6 +31,17 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.10.2\n"
 "X-Rosetta-Export-Date: 2007-02-07 06:54+0000\n"
+"#-#-#-#-#  ku.po (eel2)  #-#-#-#-#\n"
+"Project-Id-Version: eel2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-03-15 01:26+0100\n"
+"PO-Revision-Date: 2007-03-15 01:27+0100\n"
+"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
+"Language-Team: Kurdish <ku@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Rosetta-Export-Date: 2007-03-14 16:38+0000\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -131,8 +153,7 @@ msgid "Envy"
 msgstr "Yê Dihesidîne"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28
-#: ../src/nautilus-emblem-sidebar.c:940
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:940
 #: ../src/nautilus-property-browser.c:1824
 msgid "Erase"
 msgstr "Jê bibe"
@@ -306,8 +327,18 @@ msgid "Saved search"
 msgstr "Lêgeranina tomarkirî"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Possible values are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and \"mime_type\"."
-msgstr "Li sermaseyê û nîşandana îkonan de, nivîsên ku wê di bin îkonan de were xuyanî. Hejmara nivîsên bingehîn wê gora asta nêzîkkirinê were diyarkirin. Nirxên derbasdar \"siz\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permission\" û \"mime_type\" ye."
+msgid ""
+"A list of captions below an icon in the icon view and the desktop. The "
+"actual number of captions shown depends on the zoom level. Possible values "
+"are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed"
+"\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
+"\"mime_type\"."
+msgstr ""
+"Li sermaseyê û nîşandana îkonan de, nivîsên ku wê di bin îkonan de were "
+"xuyanî. Hejmara nivîsên bingehîn wê gora asta nêzîkkirinê were diyarkirin. "
+"Nirxên derbasdar \"siz\", \"type\", \"date_modified\", \"date_changed\", "
+"\"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permission"
+"\" û \"mime_type\" ye."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
 msgid "Always use the location entry, instead of the pathbar"
@@ -322,7 +353,11 @@ msgid "Criteria for search bar searching"
 msgstr "Krîterên lêgerînê yên di darikê lêgerînê de ye"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
-msgid "Criteria when matching files searched for in the search bar. If set to \"search_by_text\", then Nautilus will Search for files by file name only. If set to \"search_by_text_and_properties\", then Nautilus will search for files by file name and file properties."
+msgid ""
+"Criteria when matching files searched for in the search bar. If set to "
+"\"search_by_text\", then Nautilus will Search for files by file name only. "
+"If set to \"search_by_text_and_properties\", then Nautilus will search for "
+"files by file name and file properties."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
@@ -415,18 +450,31 @@ msgstr "Navê nîşana sergoyê sermasê"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "Karkirina Nautilusa klasîk ya hemû pace wekî gerokan dixebite çalak bike"
+msgstr ""
+"Karkirina Nautilusa klasîk ya hemû pace wekî gerokan dixebite çalak bike"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
-msgid "Filename for the default folder background. Only used if background_set is true."
-msgstr "Ji bo rûerdê peldanka standard navê pel. Tenê dema background_set hatibe hilbijartin tê bikaranîn"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"Ji bo rûerdê peldanka standard navê pel. Tenê dema background_set hatibe "
+"hilbijartin tê bikaranîn"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
-msgid "Filename for the default side pane background. Only used if side_pane_background_set is true."
-msgstr "Ji bo rûerdê panela kêlekê ya standard navê pel. Tenê dema side_pane_background_set hatine hilbijartin tê bikaranîn"
+msgid ""
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
+msgstr ""
+"Ji bo rûerdê panela kêlekê ya standard navê pel. Tenê dema "
+"side_pane_background_set hatine hilbijartin tê bikaranîn"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
-msgid "Folders over this size will be truncated to around this size. The purpose of this is to avoid unintentionally blowing the heap and killing Nautilus on massive folders. A negative value denotes no limit. The limit is approximate due to the reading of folders chunk-wise."
+msgid ""
+"Folders over this size will be truncated to around this size. The purpose of "
+"this is to avoid unintentionally blowing the heap and killing Nautilus on "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
@@ -434,91 +482,149 @@ msgid "Home icon visible on desktop"
 msgstr "Sembola malê li sermasê dixwûye"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
-msgid "If set to true, Nautilus will only show folders in the tree side pane. Otherwise it will show both folders and files."
-msgstr "Heke hatibe hilbijartin, nautilus peldankan tenê di panela kêlekê ya darê de nişan dide. Yan na jî him peldankan û him jî pelan nîşan dide."
+msgid ""
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
+msgstr ""
+"Heke hatibe hilbijartin, nautilus peldankan tenê di panela kêlekê ya darê de "
+"nişan dide. Yan na jî him peldankan û him jî pelan nîşan dide."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
-msgid "If set to true, newly opened windows will have the location bar visible."
-msgstr "Heke hatibe hilbijartin, darikên cih yên paceyên nû hatine vekirin di rewşa dixuye de tê nîşandan."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
+msgstr ""
+"Heke hatibe hilbijartin, darikên cih yên paceyên nû hatine vekirin di rewşa "
+"dixuye de tê nîşandan."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid "If set to true, newly opened windows will have the side pane visible."
-msgstr "Heke hatibe hilbijartin, wê panela kêlekê ya paceyên ku nû hatine vekirin were nîşandan."
+msgstr ""
+"Heke hatibe hilbijartin, wê panela kêlekê ya paceyên ku nû hatine vekirin "
+"were nîşandan."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid "If set to true, newly opened windows will have the status bar visible."
-msgstr "Heke hatibe hilbijartin, wê darikê rewşê ya paceyên ku nû hatine vekirin were nîşandan."
+msgstr ""
+"Heke hatibe hilbijartin, wê darikê rewşê ya paceyên ku nû hatine vekirin "
+"were nîşandan."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr "Heke hatine hilbijartin, wê darikê amûran ya paceyên ku nû hatine vekirin were nîşandan."
+msgstr ""
+"Heke hatine hilbijartin, wê darikê amûran ya paceyên ku nû hatine vekirin "
+"were nîşandan."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views."
+msgid ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to put files in the trash."
-msgstr "Ger hibijartî be, dema Nautilus pelekî bişîne sergo pirsa erêkirinê dipirse."
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"put files in the trash."
+msgstr ""
+"Ger hibijartî be, dema Nautilus pelekî bişîne sergo pirsa erêkirinê dipirse."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "Ger hibijartî be, Nautilus sembolên sermasê bicîh dike."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
-msgid "If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
+msgid ""
+"If set to true, then Nautilus will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
-msgid "If set to true, then Nautilus will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop."
+msgid ""
+"If set to true, then Nautilus will use the user's home folder as the "
+"desktop. If it is false, then it will use ~/Desktop as the desktop."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, then all Nautilus windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior."
+msgid ""
+"If set to true, then all Nautilus windows will be browser windows. This is "
+"how Nautilus used to behave before version 2.6, and some people prefer this "
+"behavior."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
-msgid "If set to true, then backup files such as those created by Emacs are displayed. Currently, only files ending in a tilde (~) are considered backup files."
+msgid ""
+"If set to true, then backup files such as those created by Emacs are "
+"displayed. Currently, only files ending in a tilde (~) are considered backup "
+"files."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
-msgid "If set to true, then hidden files are shown in the file manager. Hidden files are either dotfiles or are listed in the folder's .hidden file."
+msgid ""
+"If set to true, then hidden files are shown in the file manager. Hidden "
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the Network Servers view will be "
+"put on the desktop."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid "If this is set to true, an icon linking to the computer location will be put on the desktop."
-msgstr "Heke ev hatibe hilbijartin, girêdana îkonê ya girêdayî cihê kompîturê ye wê here ser maseyê."
+msgid ""
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
+msgstr ""
+"Heke ev hatibe hilbijartin, girêdana îkonê ya girêdayî cihê kompîturê ye wê "
+"here ser maseyê."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop."
-msgstr "Heke ev hatibe hilbijartin, girêdana îkonê ya girêdayî peldanka malê ye wê here sermaseyê."
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
+"the desktop."
+msgstr ""
+"Heke ev hatibe hilbijartin, girêdana îkonê ya girêdayî peldanka malê ye wê "
+"here sermaseyê."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid "If this is set to true, an icon linking to the trash will be put on the desktop."
-msgstr "Heke ev hatibe hilbijartin, girêdana îkonê ya girêdayî çopê ye wê here sermaseyê."
+msgid ""
+"If this is set to true, an icon linking to the trash will be put on the "
+"desktop."
+msgstr ""
+"Heke ev hatibe hilbijartin, girêdana îkonê ya girêdayî çopê ye wê here "
+"sermaseyê."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop."
+msgid ""
+"If this is set to true, icons linking to mounted volumes will be put on the "
+"desktop."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"incrementally they will be sorted decrementally."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
@@ -526,7 +632,8 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
@@ -534,7 +641,10 @@ msgid "If true, new windows will use manual layout by default."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory."
+msgid ""
+"Images over this size (in bytes) won't be thumbnailed. The purpose of this "
+"setting is to avoid thumbnailing large images that may take a long time to "
+"load or use lots of memory."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
@@ -550,7 +660,9 @@ msgid "Maximum image size for thumbnailing"
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
-msgid "Name of the Nautilus theme to use. This has been deprecated as of Nautilus 2.2. Please use the icon theme instead."
+msgid ""
+"Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
+"2.2. Please use the icon theme instead."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
@@ -570,7 +682,9 @@ msgid "Only show folders in the tree sidebar"
 msgstr "Li ser panela dara kêlekê de tenê peldankan nîşan bide"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click."
+msgid ""
+"Possible values are \"single\" to launch files on a single click, or \"double"
+"\" to launch them on a double click."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
@@ -621,27 +735,49 @@ msgid "Side pane view"
 msgstr "Nîşandana panela kêlekê"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
-msgid "Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to \"always\" then always plays the sound, even if the file is on a remote server. If set to \"local_only\" then only plays previews on local file systems. If set to \"never\" then it never previews sound."
+msgid ""
+"Speed tradeoff for when to preview a sound file when mousing over a files "
+"icon. If set to \"always\" then always plays the sound, even if the file is "
+"on a remote server. If set to \"local_only\" then only plays previews on "
+"local file systems. If set to \"never\" then it never previews sound."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
-msgid "Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to \"always\" then always show previews, even if the folder is on a remote server. If set to \"local_only\" then only show previews for local file systems. If set to \"never\" then never bother to read preview data."
+msgid ""
+"Speed tradeoff for when to show a preview of text file contents in the "
+"file's icon. If set to \"always\" then always show previews, even if the "
+"folder is on a remote server. If set to \"local_only\" then only show "
+"previews for local file systems. If set to \"never\" then never bother to "
+"read preview data."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Speed tradeoff for when to show an image file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local_only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail images, just use a generic icon."
+msgid ""
+"Speed tradeoff for when to show an image file as a thumbnail. If set to "
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"If set to \"local_only\" then only show thumbnails for local file systems. "
+"If set to \"never\" then never bother to thumbnail images, just use a "
+"generic icon."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local_only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts."
+msgid ""
+"Speed tradeoff for when to show the number of items in a folder. If set to "
+"\"always\" then always show item counts, even if the folder is on a remote "
+"server. If set to \"local_only\" then only show counts for local file "
+"systems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
+msgid ""
+"The default sort-order for items in the icon view. Possible values are \"name"
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
-msgid "The default sort-order for the items in the list view. Possible values are \"name\", \"size\", \"type\", and \"modification_date\"."
+msgid ""
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
@@ -653,24 +789,39 @@ msgid "The font description used for the icons on the desktop."
 msgstr "Daxuyaniya curenivîsên ku di îkonên sermaseyê de têne bikaranîn."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
-msgid "The format of file dates. Possible values are \"locale\", \"iso\", and \"informal\"."
-msgstr "Celebê dîrokên pelan. Nirxên derbasdar \"locale\", \"iso\" û \"informal\" e."
+msgid ""
+"The format of file dates. Possible values are \"locale\", \"iso\", and "
+"\"informal\"."
+msgstr ""
+"Celebê dîrokên pelan. Nirxên derbasdar \"locale\", \"iso\" û \"informal\" e."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 msgid "The side pane view to show in newly opened windows."
 msgstr "Panela kêlekê ya di paceyên nû de têne vekirin."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
-msgid "This name can be set if you want a custom name for the computer icon on the desktop."
-msgstr "Heke tu dixwazî navekî taybet bide îkona komputera ya li ser sermaseyê ji vê derê binasîne."
+msgid ""
+"This name can be set if you want a custom name for the computer icon on the "
+"desktop."
+msgstr ""
+"Heke tu dixwazî navekî taybet bide îkona komputera ya li ser sermaseyê ji vê "
+"derê binasîne."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
-msgid "This name can be set if you want a custom name for the home icon on the desktop."
-msgstr "Heke tu dixwazî navekî taybet bide îkona malê ya li ser sermaseyê ji vê derê binasîne."
+msgid ""
+"This name can be set if you want a custom name for the home icon on the "
+"desktop."
+msgstr ""
+"Heke tu dixwazî navekî taybet bide îkona malê ya li ser sermaseyê ji vê derê "
+"binasîne."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
-msgid "This name can be set if you want a custom name for the trash icon on the desktop."
-msgstr "Heke tu dixwazî navekî taybet bide îkona qutiya çopê ya li ser sermaseyê ji vê derê binasîne."
+msgid ""
+"This name can be set if you want a custom name for the trash icon on the "
+"desktop."
+msgstr ""
+"Heke tu dixwazî navekî taybet bide îkona qutiya çopê ya li ser sermaseyê ji "
+"vê derê binasîne."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "Trash icon visible on desktop"
@@ -693,11 +844,18 @@ msgid "What to do with executable text files when activated"
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files."
+msgid ""
+"What to do with executable text files when they are activated (single or "
+"double clicked). Possible values are \"launch\" to launch them as programs, "
+"\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
+"text files."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list_view\" and \"icon_view\"."
+msgid ""
+"When a folder is visited this viewer is used unless you have selected "
+"another view for that particular folder. Possible values are \"list_view\" "
+"and \"icon_view\"."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
@@ -795,6 +953,7 @@ msgstr "Yên _asayî bi kar bîne"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1374
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Nav"
 
@@ -901,11 +1060,17 @@ msgid "You cannot move the volume \"%s\" to the trash."
 msgstr "Tu nikarî pergala \"%s\" biavêjî çopê."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:125
-msgid "If you want to eject the volume, please use \"Eject\" in the popup menu of the volume."
-msgstr "Heke tu dixwazî pergalê derxî, ji kerema xwe re biçe ser pergalê û bişkoka rastê ya mişk bitikîne û pêl \"Derxe\" bike."
+msgid ""
+"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"the volume."
+msgstr ""
+"Heke tu dixwazî pergalê derxî, ji kerema xwe re biçe ser pergalê û bişkoka "
+"rastê ya mişk bitikîne û pêl \"Derxe\" bike."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:134
-msgid "If you want to unmount the volume, please use \"Unmount Volume\" in the popup menu of the volume."
+msgid ""
+"If you want to unmount the volume, please use \"Unmount Volume\" in the "
+"popup menu of the volume."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-desktop-link.c:179
@@ -953,8 +1118,11 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:204
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "Xemgîn im, lê divê di peyva mifteyî ya amblemê de tenê tîp, reqem û valahî hebe."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"Xemgîn im, lê divê di peyva mifteyî ya amblemê de tenê tîp, reqem û valahî "
+"hebe."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -963,7 +1131,8 @@ msgstr "Xemgîn im, lê divê di peyva mifteyî ya amblemê de tenê tîp, reqem
 #: ../libnautilus-private/nautilus-emblem-utils.c:214
 #, c-format
 msgid "Sorry, but there is already an emblem named \"%s\"."
-msgstr "Amblema bi navê \"%s\" jixwe heye. Ji kerema xwe re navekî cuda hilbijêrî."
+msgstr ""
+"Amblema bi navê \"%s\" jixwe heye. Ji kerema xwe re navekî cuda hilbijêrî."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
 msgid "Please choose a different emblem name."
@@ -1029,7 +1198,9 @@ msgstr "Di jêbirinê de çewtî."
 
 #: ../libnautilus-private/nautilus-file-operations.c:683
 #, c-format
-msgid "\"%s\" cannot be deleted because you do not have permissions to modify its parent folder."
+msgid ""
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:689
@@ -1039,17 +1210,23 @@ msgstr "Ji ber ku \"%s\" li ser dîska tenê tê xwendin de ye nehate jêbirin."
 
 #: ../libnautilus-private/nautilus-file-operations.c:720
 #, c-format
-msgid "\"%s\" cannot be moved because you do not have permissions to change it or its parent folder."
+msgid ""
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:725
 #, c-format
-msgid "Cannot move \"%s\" because it or its parent folder are contained in the destination."
+msgid ""
+"Cannot move \"%s\" because it or its parent folder are contained in the "
+"destination."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid "Cannot move \"%s\" to the trash because you do not have permissions to change it or its parent folder."
+msgid ""
+"Cannot move \"%s\" to the trash because you do not have permissions to "
+"change it or its parent folder."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:757
@@ -1176,7 +1353,9 @@ msgid "Could not move \"%s\" to the new location."
 msgstr "\"%s\" neçû cihê xwe yê nû."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1140
-msgid "The name is already used for a special item that cannot be removed or replaced.  If you still want to move the item, rename it and try again."
+msgid ""
+"The name is already used for a special item that cannot be removed or "
+"replaced.  If you still want to move the item, rename it and try again."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1144
@@ -1185,7 +1364,9 @@ msgid "Could not copy \"%s\" to the new location."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1147
-msgid "The name is already used for a special item that cannot be removed or replaced.  If you still want to copy the item, rename it and try again."
+msgid ""
+"The name is already used for a special item that cannot be removed or "
+"replaced.  If you still want to copy the item, rename it and try again."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1172
@@ -1200,13 +1381,18 @@ msgstr "Bi navê \"%s\" jixwe pelek heye. Tu dixwazî wê têxe şûna wê?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1194
 #, c-format
-msgid "The folder already exists in \"%s\".  Replacing it will overwrite any files in the folder that conflict with the files being copied."
+msgid ""
+"The folder already exists in \"%s\".  Replacing it will overwrite any files "
+"in the folder that conflict with the files being copied."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "Ev pel jixwe ji berê ve di  hundirê \"%s\" de heye. Heke tu biguherîne dê li ser naveroka pelê berê were nivisandin."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+"Ev pel jixwe ji berê ve di  hundirê \"%s\" de heye. Heke tu biguherîne dê li "
+"ser naveroka pelê berê were nivisandin."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
 #: ../libnautilus-private/nautilus-file-operations.c:1233
@@ -1562,8 +1748,12 @@ msgid "Empty all of the items from the trash?"
 msgstr "Tu bawer î ku hemû hêmanên di çopê de ye vala bike?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2891
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "Heke tu valakirina çopê hilbijêrî; dê hemû hêmanên tê de biçin.Tu dikarî vana yeko yeko jî jê bibî."
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Heke tu valakirina çopê hilbijêrî; dê hemû hêmanên tê de biçin.Tu dikarî "
+"vana yeko yeko jî jê bibî."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2913
 msgid "_Empty Trash"
@@ -1574,7 +1764,9 @@ msgid "Do you want to empty the trash before you umount?"
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:3020
-msgid "In order to regain the free space on this device the trash must be emptied. All items in the trash will be permanently lost. "
+msgid ""
+"In order to regain the free space on this device the trash must be emptied. "
+"All items in the trash will be permanently lost. "
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:3026
@@ -1825,12 +2017,17 @@ msgid "program"
 msgstr "bername"
 
 #: ../libnautilus-private/nautilus-file.c:4802
-msgid "Can't find description even for \"x-directory/normal\". This probably means that your gnome-vfs.keys file is in the wrong place or isn't being found for some other reason."
+msgid ""
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file.c:4806
 #, c-format
-msgid "No description found for mime type \"%s\" (file is \"%s\"), please tell the gnome-vfs mailing list."
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), please tell the "
+"gnome-vfs mailing list."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-file.c:4822
@@ -2050,7 +2247,9 @@ msgstr "Karê vekirinê bi ser neket, tu dixwazî nîşandereke din veke?"
 #: ../libnautilus-private/nautilus-program-choosing.c:137
 #: ../libnautilus-private/nautilus-program-choosing.c:168
 #, c-format
-msgid "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" locations."
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:142
@@ -2060,15 +2259,21 @@ msgstr "Karê Vekirinê bi ser neket, tu dixwazî çalakiyeke din hilbijêrî?"
 #: ../libnautilus-private/nautilus-program-choosing.c:143
 #: ../libnautilus-private/nautilus-program-choosing.c:175
 #, c-format
-msgid "The default action can't open \"%s\" because it can't access files at \"%s\" locations."
+msgid ""
+"The default action can't open \"%s\" because it can't access files at \"%s\" "
+"locations."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:171
-msgid "No other applications are available to view this file.  If you copy this file onto your computer, you may be able to open it."
+msgid ""
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:177
-msgid "No other actions are available to view this file.  If you copy this file onto your computer, you may be able to open it."
+msgid ""
+"No other actions are available to view this file.  If you copy this file "
+"onto your computer, you may be able to open it."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:489
@@ -2119,7 +2324,8 @@ msgstr "\"%s\" nayê nîşandan, ji ber ku makîneya \"%s\" nehate dîtin."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1519
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "Çewtiyên nivîsînê û rastbûna mîhengên cîgir kontrol bike."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:616
@@ -2169,11 +2375,14 @@ msgid "This drop target only supports local files."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:954
-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them "
+"again. The local files you dropped have already been opened."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-query.c:138
@@ -2203,9 +2412,9 @@ msgid "Redo the edit"
 msgstr "Guherandinê dubare bike"
 
 #. label, accelerator
-#: ../nautilus-computer.desktop.in.in.h:1
-#: ../src/nautilus-window-menus.c:661
-msgid "Browse all local and remote disks and folders accessible from this computer"
+#: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:661
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2220,14 +2429,12 @@ msgstr "Rêvebirina Pelan"
 msgid "Open Folder"
 msgstr "Peldankê Veke"
 
-#: ../nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1394
+#: ../nautilus-home.desktop.in.in.h:1 ../src/file-manager/fm-tree-view.c:1394
 msgid "Home Folder"
 msgstr "Peldanka Mal"
 
 #. label, accelerator
-#: ../nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-window-menus.c:657
+#: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:657
 msgid "Open your personal folder"
 msgstr "Peldanka şexsî veke"
 
@@ -2256,7 +2463,9 @@ msgid "Nautilus shell"
 msgstr ""
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus shell operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
 msgstr ""
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -2295,7 +2504,8 @@ msgstr "Zemîna Sermaseyê Biguherîne"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 
 #. tooltip
@@ -2307,8 +2517,7 @@ msgid "Delete all items in the Trash"
 msgstr "Hemû tiştên di sergoyî de jê bibe"
 
 #: ../src/file-manager/fm-desktop-icon-view.c:797
-#: ../src/nautilus-desktop-window.c:246
-#: ../src/nautilus-pathbar.c:1121
+#: ../src/nautilus-desktop-window.c:246 ../src/nautilus-pathbar.c:1121
 #: ../src/nautilus-places-sidebar.c:250
 msgid "Desktop"
 msgstr "Sermase"
@@ -2354,7 +2563,8 @@ msgstr "Tu bawer î ku pelê \"%s\" mayinde jê bibî?"
 #: ../src/file-manager/fm-directory-view.c:1004
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2466,7 +2676,8 @@ msgstr "%s%s, %s"
 #: ../src/file-manager/fm-directory-view.c:2360
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
-msgstr "Di hundirê \"%s\" de ewqasî pel heye ku Nautilus nikare gişî bixebitîne."
+msgstr ""
+"Di hundirê \"%s\" de ewqasî pel heye ku Nautilus nikare gişî bixebitîne."
 
 #: ../src/file-manager/fm-directory-view.c:2366
 msgid "Some files will not be displayed."
@@ -2491,7 +2702,8 @@ msgid "None of the %d selected items can be moved to the Trash"
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:3832
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "Hin hêman naçe çopê, tu dixwazî wan rasterast jê bibe?"
 
 #: ../src/file-manager/fm-directory-view.c:3833
@@ -2506,8 +2718,12 @@ msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:3875
 #, c-format
-msgid "Are you sure you want to permanently delete the %d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items from the trash?"
+msgid ""
+"Are you sure you want to permanently delete the %d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items from the "
+"trash?"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2557,9 +2773,14 @@ msgstr "%s nayê vekirin"
 #: ../src/file-manager/fm-directory-view.c:4980
 #, c-format
 msgid ""
-"The filename \"%s\" indicates that this file is of type \"%s\". The contents of the file indicate that the file is of type \"%s\". If you open this file, the file might present a security risk to your system.\n"
+"The filename \"%s\" indicates that this file is of type \"%s\". The contents "
+"of the file indicate that the file is of type \"%s\". If you open this file, "
+"the file might present a security risk to your system.\n"
 "\n"
-"Do not open the file unless you created the file yourself, or received the file from a trusted source. To open the file, rename the file to the correct extension for \"%s\", then open the file normally. Alternatively, use the Open With menu to choose a specific application for the file. "
+"Do not open the file unless you created the file yourself, or received the "
+"file from a trusted source. To open the file, rename the file to the correct "
+"extension for \"%s\", then open the file normally. Alternatively, use the "
+"Open With menu to choose a specific application for the file. "
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:5406
@@ -2577,18 +2798,25 @@ msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:5863
-msgid "Choosing a script from the menu will run that script with any selected items as input."
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:5865
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
-"When executed from a local folder, scripts will be passed the selected file names. When executed from a remote folder (e.g. a folder showing web or ftp content), scripts will be passed no parameters.\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
 "\n"
-"In all cases, the following environment variables will be set by Nautilus, which the scripts may use:\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected files (only if local)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
 "\n"
@@ -2612,14 +2840,18 @@ msgstr "Heke tu fermana Pê ve Bike hilbijêrî wê \"%s\" were jibergirtin."
 #: ../src/file-manager/fm-directory-view.c:6040
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
-msgstr[0] "Heke tu fermana Pê Ve Bike hilbijêrî dê %d hêmanên hilbijarî were kişandin"
-msgstr[1] "Heke tu fermana Pê Ve Bike hilbijêrî dê %d hêmanên hilbijarî were kişandin"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"Heke tu fermana Pê Ve Bike hilbijêrî dê %d hêmanên hilbijarî were kişandin"
+msgstr[1] ""
+"Heke tu fermana Pê Ve Bike hilbijêrî dê %d hêmanên hilbijarî were kişandin"
 
 #: ../src/file-manager/fm-directory-view.c:6047
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2697,10 +2929,11 @@ msgstr "Pelê _Vala"
 msgid "Create a new empty file inside this folder"
 msgstr "Di hundirê vê peldankê de pelekî vala çêbike"
 
+#. #-#-#-#-#  ku.po (nautilus.HEAD)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6845
 #: ../src/file-manager/fm-directory-view.c:7724
-#: ../src/file-manager/fm-tree-view.c:1253
+#: ../src/file-manager/fm-tree-view.c:1253 ../eel/eel-open-with-dialog.c:918
 msgid "_Open"
 msgstr "_Veke"
 
@@ -2760,7 +2993,9 @@ msgstr ""
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6882
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Pelên ku te bi fermana \"Jê Bike\" yan jî \"Ji Ber Bigire\" hilbijartiye yan veguhezîne yan jî ji ber bigire"
+msgstr ""
+"Pelên ku te bi fermana \"Jê Bike\" yan jî \"Ji Ber Bigire\" hilbijartiye yan "
+"veguhezîne yan jî ji ber bigire"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -2772,7 +3007,9 @@ msgstr "_Bi Peldankê Ve Ke"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6888
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
 msgstr ""
 
 #. label, accelerator
@@ -3145,8 +3382,11 @@ msgstr "Destpêker"
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
-msgstr "Ji bo ku tu karibî li naveroka \"%s\" binihêre têra xwe mafê te yê gihiştinê tuneye."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr ""
+"Ji bo ku tu karibî li naveroka \"%s\" binihêre têra xwe mafê te yê gihiştinê "
+"tuneye."
 
 #: ../src/file-manager/fm-error-reporting.c:64
 #, c-format
@@ -3164,12 +3404,14 @@ msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:118
@@ -3179,7 +3421,9 @@ msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:123
 #, c-format
-msgid "The name \"%s\" is not valid because it contains the character \"/\". Please use a different name."
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
 msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:127
@@ -3203,8 +3447,11 @@ msgstr "Hêman ji nû ve nehate binavkirin."
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
-msgstr "Ji bo ku tu karibî navê koma \"%s\" biguherîne têra xwe mafê te yê gihiştinê tuneye."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
+msgstr ""
+"Ji bo ku tu karibî navê koma \"%s\" biguherîne têra xwe mafê te yê gihiştinê "
+"tuneye."
 
 #: ../src/file-manager/fm-error-reporting.c:173
 #, c-format
@@ -3236,7 +3483,8 @@ msgstr "Xwediyê pel nehate guherandin."
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:246
@@ -3485,7 +3733,8 @@ msgstr "Bi carekê re tu nikarî gelek îkonên taybet tayîn bike!"
 #: ../src/file-manager/fm-properties-window.c:505
 #: ../src/nautilus-information-panel.c:502
 msgid "Please drag just one image to set a custom icon."
-msgstr "Ji kerema xwe re ji bo mîhengkirina îkoneke taybet tenê wêneyekî bikşîne."
+msgstr ""
+"Ji kerema xwe re ji bo mîhengkirina îkoneke taybet tenê wêneyekî bikşîne."
 
 #: ../src/file-manager/fm-properties-window.c:513
 #: ../src/nautilus-information-panel.c:521
@@ -3792,6 +4041,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "Mafê gihiştinê pelê ku hatiye hilbijartin nehate diyarkirin."
 
 #: ../src/file-manager/fm-properties-window.c:4443
+#: ../eel/eel-open-with-dialog.c:817
 msgid "Open With"
 msgstr "Veke bi"
 
@@ -3839,8 +4089,12 @@ msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus peldanka pêwist ya \"%s\" çênekir."
 
 #: ../src/nautilus-application.c:278
-msgid "Before running Nautilus, please create the following folder, or set permissions such that Nautilus can create it."
-msgstr "Berî ku tu Nautilusê bixebitîne, ji kerema xwe peldanka jêr ava bike, yan jî bi awayê ku wê Nautilus bikaribe pêk bîne mafên gihiştinê mîheng bike."
+msgid ""
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
+msgstr ""
+"Berî ku tu Nautilusê bixebitîne, ji kerema xwe peldanka jêr ava bike, yan jî "
+"bi awayê ku wê Nautilus bikaribe pêk bîne mafên gihiştinê mîheng bike."
 
 #: ../src/nautilus-application.c:281
 #, c-format
@@ -3848,8 +4102,12 @@ msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus peldankên pêwist yên li jêr pêk neanî: %s"
 
 #: ../src/nautilus-application.c:283
-msgid "Before running Nautilus, please create these folders, or set permissions such that Nautilus can create them."
-msgstr "Berî ku tu Nautilusê bixebitîne, ji kerema xwe peldanka jêr ava bike, yan jî bi awayê ku wê Nautilus bikaribe pêk bîne mafên gihiştinê mîheng bike."
+msgid ""
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+"Berî ku tu Nautilusê bixebitîne, ji kerema xwe peldanka jêr ava bike, yan jî "
+"bi awayê ku wê Nautilus bikaribe pêk bîne mafên gihiştinê mîheng bike."
 
 #: ../src/nautilus-application.c:342
 msgid "Link To Old Desktop"
@@ -3857,10 +4115,14 @@ msgstr "Li Sermaseya Kevn Girê Bide"
 
 #: ../src/nautilus-application.c:358
 msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
-msgstr "Girêdana bi navê \"Li Sermaseya Kevn Girê Bide\" li sermaseya te hate avakirin."
+msgstr ""
+"Girêdana bi navê \"Li Sermaseya Kevn Girê Bide\" li sermaseya te hate "
+"avakirin."
 
 #: ../src/nautilus-application.c:359
-msgid "The location of the desktop directory has changed in GNOME 2.4. You can open the link and move over the files you want, then delete the link."
+msgid ""
+"The location of the desktop directory has changed in GNOME 2.4. You can open "
+"the link and move over the files you want, then delete the link."
 msgstr ""
 
 #. Can't register myself due to trouble locating the
@@ -3874,21 +4136,32 @@ msgstr ""
 #. * since neither of the above causes explain it.
 #.
 #: ../src/nautilus-application.c:555
-msgid "Nautilus can't be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again."
+msgid ""
+"Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again."
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:561
 msgid ""
-"Nautilus can't be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again.\n"
+"Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again.\n"
 "\n"
-"Bonobo couldn't locate the Nautilus_shell.server file. One cause of this seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation library's directory. Another possible cause would be bad install with a missing Nautilus_Shell.server file.\n"
+"Bonobo couldn't locate the Nautilus_shell.server file. One cause of this "
+"seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation "
+"library's directory. Another possible cause would be bad install with a "
+"missing Nautilus_Shell.server file.\n"
 "\n"
-"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, which may be needed by other applications.\n"
+"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
-"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but we don't know why.\n"
+"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but "
+"we don't know why.\n"
 "\n"
-"We have also seen this error when a faulty version of bonobo-activation was installed."
+"We have also seen this error when a faulty version of bonobo-activation was "
+"installed."
 msgstr ""
 
 #. Some misc. error (can never happen with current
@@ -3900,28 +4173,34 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:591
-#: ../src/nautilus-application.c:609
+#: ../src/nautilus-application.c:591 ../src/nautilus-application.c:609
 #: ../src/nautilus-application.c:616
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus ji ber çewtiyeke nenas nayç bikaranîn."
 
 #: ../src/nautilus-application.c:592
-msgid "Nautilus can't be used now, due to an unexpected error from Bonobo when attempting to register the file manager view server."
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from Bonobo when "
+"attempting to register the file manager view server."
 msgstr ""
 
 #: ../src/nautilus-application.c:610
-msgid "Nautilus can't be used now, due to an unexpected error from Bonobo when attempting to locate the factory.Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the factory.Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
 msgstr ""
 
 #: ../src/nautilus-application.c:617
-msgid "Nautilus can't be used now, due to an unexpected error from Bonobo when attempting to locate the shell object. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the shell object. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
 msgstr ""
 
 #: ../src/nautilus-bookmarks-window.c:158
 #: ../src/nautilus-file-management-properties.c:216
-#: ../src/nautilus-property-browser.c:1562
-#: ../src/nautilus-window-menus.c:498
+#: ../src/nautilus-property-browser.c:1562 ../src/nautilus-window-menus.c:498
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4063,9 +4342,10 @@ msgstr "_Girê Bide"
 msgid "Couldn't remove emblem with name '%s'."
 msgstr "Amblema bi navê '%s' nehate jêbirin."
 
-#: ../src/nautilus-emblem-sidebar.c:242
-#: ../src/nautilus-emblem-sidebar.c:276
-msgid "This is probably because the emblem is a permanent one, and not one that you added yourself."
+#: ../src/nautilus-emblem-sidebar.c:242 ../src/nautilus-emblem-sidebar.c:276
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
 #: ../src/nautilus-emblem-sidebar.c:275
@@ -4090,19 +4370,26 @@ msgid "Add Emblems..."
 msgstr "Amblemekê Lê Zêde Bike..."
 
 #: ../src/nautilus-emblem-sidebar.c:556
-msgid "Enter a descriptive name next to each emblem.  This name will be used in other places to identify the emblem."
-msgstr "Li kêleka her amblemê navê raveker binivîse. Ev nav ji bo ku tu karibî amblemê nas bike wê were bikaranîn."
+msgid ""
+"Enter a descriptive name next to each emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Li kêleka her amblemê navê raveker binivîse. Ev nav ji bo ku tu karibî "
+"amblemê nas bike wê were bikaranîn."
 
 #: ../src/nautilus-emblem-sidebar.c:558
-msgid "Enter a descriptive name next to the emblem.  This name will be used in other places to identify the emblem."
-msgstr "Li kêleka her amblemê navê raveker binivîse. Ev nav ji bo ku tu karibî amblemê nas bike wê were bikaranîn."
+msgid ""
+"Enter a descriptive name next to the emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Li kêleka her amblemê navê raveker binivîse. Ev nav ji bo ku tu karibî "
+"amblemê nas bike wê were bikaranîn."
 
 #: ../src/nautilus-emblem-sidebar.c:777
 msgid "Some of the files could not be added as emblems."
 msgstr "Hin pel wekî amblem nehate lêzêdekirin."
 
-#: ../src/nautilus-emblem-sidebar.c:777
-#: ../src/nautilus-emblem-sidebar.c:779
+#: ../src/nautilus-emblem-sidebar.c:777 ../src/nautilus-emblem-sidebar.c:779
 msgid "The emblems do not appear to be valid images."
 msgstr "Amblem wekî wêneyên derbasdar dixuye."
 
@@ -4110,8 +4397,7 @@ msgstr "Amblem wekî wêneyên derbasdar dixuye."
 msgid "None of the files could be added as emblems."
 msgstr "Tu pel wekî ambleman lê nehate zêdekirin."
 
-#: ../src/nautilus-emblem-sidebar.c:800
-#: ../src/nautilus-emblem-sidebar.c:825
+#: ../src/nautilus-emblem-sidebar.c:800 ../src/nautilus-emblem-sidebar.c:825
 #: ../src/nautilus-emblem-sidebar.c:874
 msgid "The emblem cannot be added."
 msgstr "Amblem lê nehate zêdekirin."
@@ -4120,8 +4406,7 @@ msgstr "Amblem lê nehate zêdekirin."
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: ../src/nautilus-emblem-sidebar.c:820
-#: ../src/nautilus-emblem-sidebar.c:873
+#: ../src/nautilus-emblem-sidebar.c:820 ../src/nautilus-emblem-sidebar.c:873
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Pelê '%s' wekî wêneyekî derbasdar naxuye."
@@ -4270,7 +4555,9 @@ msgstr ""
 "Bi Ambleman"
 
 #: ../src/nautilus-file-management-properties.glade.h:43
-msgid "Choose the order of information to appear beneath icon names. More information will appear when zooming in closer."
+msgid ""
+"Choose the order of information to appear beneath icon names. More "
+"information will appear when zooming in closer."
 msgstr ""
 
 #: ../src/nautilus-file-management-properties.glade.h:44
@@ -4544,7 +4831,9 @@ msgid "Only create windows for explicitly specified URIs."
 msgstr "Tenê ji bo URIyên ku wekî vekirî hatine destnîşankirin pêk bîne."
 
 #: ../src/nautilus-main.c:383
-msgid "Do not manage the desktop (ignore the preference set in the preferences dialog)."
+msgid ""
+"Do not manage the desktop (ignore the preference set in the preferences "
+"dialog)."
 msgstr ""
 
 #: ../src/nautilus-main.c:385
@@ -4565,7 +4854,9 @@ msgstr "[URI...]"
 
 #. Translators: --no-default-window is a nautilus command line parameter, don't modify it.
 #: ../src/nautilus-main.c:393
-msgid "Load a saved session from the specified file. Implies \"--no-default-window\"."
+msgid ""
+"Load a saved session from the specified file. Implies \"--no-default-window"
+"\"."
 msgstr ""
 
 #: ../src/nautilus-main.c:393
@@ -4587,16 +4878,13 @@ msgstr ""
 "Bi rêveberê pelan re çav li pergala pelan bigerîne"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:440
-#: ../src/nautilus-spatial-window.c:414
-#: ../src/nautilus-window-menus.c:441
-#: ../src/nautilus-window.c:167
+#: ../src/nautilus-main.c:440 ../src/nautilus-spatial-window.c:414
+#: ../src/nautilus-window-menus.c:441 ../src/nautilus-window.c:167
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:473
-#: ../src/nautilus-main.c:482
+#: ../src/nautilus-main.c:473 ../src/nautilus-main.c:482
 #: ../src/nautilus-main.c:487
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
@@ -4801,8 +5089,7 @@ msgstr ""
 msgid "%s - File Browser"
 msgstr "%s - Geroka Pelan"
 
-#: ../src/nautilus-notes-viewer.c:388
-#: ../src/nautilus-notes-viewer.c:498
+#: ../src/nautilus-notes-viewer.c:388 ../src/nautilus-notes-viewer.c:498
 msgid "Notes"
 msgstr "Têbinî"
 
@@ -5154,7 +5441,9 @@ msgid "provides visual status"
 msgstr "rewşa grafîkî hal dike"
 
 #: ../src/nautilus-window-bookmarks.c:94
-msgid "Do you want to remove any bookmarks with the non-existing location from your list?"
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "Tu dixwazî bijareyên ku cihên wan tuneye jê bibî?"
 
 #: ../src/nautilus-window-bookmarks.c:99
@@ -5196,7 +5485,9 @@ msgstr "Kontrol bike bê ka mîhengên te yên cîgiriyê rast e yan na."
 
 #: ../src/nautilus-window-manage-views.c:1531
 #, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot contact the SMB master browser."
+msgid ""
+"Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
+"browser."
 msgstr "\"%s\" nayê nîşandan, ji ber ku Nautilus SMB xwe nagihîne geroka mak."
 
 #: ../src/nautilus-window-manage-views.c:1534
@@ -5217,20 +5508,35 @@ msgid "Go to the location specified by this bookmark"
 msgstr "Biçe cihê ku vê bijareyê diyar kiriye."
 
 #: ../src/nautilus-window-menus.c:423
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
 
 #: ../src/nautilus-window-menus.c:427
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
 msgstr ""
 
 #: ../src/nautilus-window-menus.c:431
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
 
 #: ../src/nautilus-window-menus.c:443
-msgid "Nautilus is a graphical shell for GNOME that makes it easy to manage your files and the rest of your system."
-msgstr "Nautilus, sepaneke GNOME ye, ev sepan rê li ber vedike ku tu bi hêsanî xwe bigihîne pel û pelrêçan."
+msgid ""
+"Nautilus is a graphical shell for GNOME that makes it easy to manage your "
+"files and the rest of your system."
+msgstr ""
+"Nautilus, sepaneke GNOME ye, ev sepan rê li ber vedike ku tu bi hêsanî xwe "
+"bigihîne pel û pelrêçan."
 
 #: ../src/nautilus-window-menus.c:447
 msgid "Copyright © 1999-2006 The Nautilus authors"
@@ -5279,8 +5585,11 @@ msgid "_Backgrounds and Emblems..."
 msgstr "_Rûerd û Amblem..."
 
 #: ../src/nautilus-window-menus.c:596
-msgid "Display patterns, colors, and emblems that can be used to customize appearance"
-msgstr "Nîgar, reng û logoyên ku rê li ber guherandina bergehê vedike nîşan dide"
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+"Nîgar, reng û logoyên ku rê li ber guherandina bergehê vedike nîşan dide"
 
 #: ../src/nautilus-window-menus.c:599
 msgid "Prefere_nces"
@@ -5344,8 +5653,7 @@ msgid "Zoom _In"
 msgstr "Nê_zîk bibe"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:629
-#: ../src/nautilus-zoom-control.c:96
+#: ../src/nautilus-window-menus.c:629 ../src/nautilus-zoom-control.c:96
 msgid "Show the contents in more detail"
 msgstr "Kîtekîtên naverokê nîşan bide"
 
@@ -5355,8 +5663,7 @@ msgid "Zoom _Out"
 msgstr "Dûr bi_keve"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:641
-#: ../src/nautilus-zoom-control.c:97
+#: ../src/nautilus-window-menus.c:641 ../src/nautilus-zoom-control.c:97
 msgid "Show the contents in less detail"
 msgstr "Naverokê bi kîtekîtên hindik nîşan bide"
 
@@ -5396,8 +5703,7 @@ msgid "_Network"
 msgstr "_Tor"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:665
-#: ../src/network-scheme.desktop.in.h:1
+#: ../src/nautilus-window-menus.c:665 ../src/network-scheme.desktop.in.h:1
 msgid "Browse bookmarked and local network locations"
 msgstr ""
 
@@ -5463,160 +5769,464 @@ msgstr "Mezinahî"
 msgid "Set the zoom level of the current view"
 msgstr "Mîhengî asta mezinkirina xuyeneka rojane bike"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Nexşeya dorê ya wêne/etîketê"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Stûriya nexşeyê dora wêne û etîketa ku di paceya hişyariyan de ye."
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Cureyê Hişyariyê"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Cureyê hişyariyê"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Bişkokên Hişyariyê"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Bişkokên ku di paceya hişyariyan de xuyanî dibe"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Hîn zêde _kîtekîtan nîşan bide"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Nivîs"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Nivîsa di etîketê de ye."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Paldan"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr ""
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Heke hatibe hilbijartin, dema rêzik pir mezin be têne perçekirin."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr ""
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Sînorên Hilbijartinê"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Hemûyan Hilbijêre"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Awayên Têketinê"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Çewtiya Gconf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Çewtiya Gconf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Hemû çewtiyên din tenê di termînalê de xuya dibin."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 BN"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 BN"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 01/01/00, 01:00 BN"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Wêneyek nehat hilbijartin."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Ji bo hilbijartina wêneyekî divê tu ser wê bitikîne."
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Standart"
+
+#: ../eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "Îkon"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "Tu sepan nehate hilbijartin"
+
+#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:992
+#, c-format
+msgid "%s document"
+msgstr "%s belge"
+
+#: ../eel/eel-mime-application-chooser.c:538
+#: ../eel/eel-open-with-dialog.c:1005
+msgid "Unknown"
+msgstr "Nenas"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr ""
+"Ji bo vekirina %s û pelên ku di cureyê \"%s\" de ye, sepanekê hilbijêre"
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Sepan nehate xebitandin"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' nehate dîtin"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Sepan nehate dîtin"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Sepan lê nehate zêdekirin"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Sepan li danegira sepanan nehate zêdekirin"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Sepanekê Hilbijêre"
+
+#: ../eel/eel-open-with-dialog.c:854
+msgid "Select an application to view its description."
+msgstr "Ji bo nîşandana danasîna wê sepanekê hilbijêre."
+
+#: ../eel/eel-open-with-dialog.c:879
+msgid "_Use a custom command"
+msgstr "Fermana taybet _bikar bîne"
+
+#: ../eel/eel-open-with-dialog.c:896
+msgid "_Browse..."
+msgstr "_Bigere..."
+
+#: ../eel/eel-open-with-dialog.c:1012
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "%s û pelên din yên di cureyê \"%s\" de ye, bi hev re veke"
+
+#: ../eel/eel-open-with-dialog.c:1044
+msgid "_Add"
+msgstr "_Têxe"
+
+#: ../eel/eel-open-with-dialog.c:1045
+msgid "Add Application"
+msgstr "Sepanekê Lê Zêde Bike"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Tu dikarî pêl bişkoka betalkirinê bike û vî karî rawestîne."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (Unikoda nederbasdar)"
+
 #~ msgid "Desktop documents icon name"
 #~ msgstr "Navê îkona belgeyên min yên sermaseyê"
+
 #~ msgid "Documents icon visible on desktop"
 #~ msgstr "Nîşanên dokumana li sermasê dixûye."
+
 #~ msgid ""
 #~ "This name can be set if you want a custom name for the documents icon on "
 #~ "the desktop."
 #~ msgstr ""
 #~ "Heke tu dixwazî navekî taybet bide îkona pelgeyên yên li ser sermaseyê ji "
 #~ "vê derê binasîne."
+
 #~ msgid "Normal Alpha"
 #~ msgstr "Alfaya Normal"
+
 #~ msgid "Browse your computer drives"
 #~ msgstr "Çav li ajokerên xwe yên kompîturê bigerîne"
+
 #~ msgid "Change how files are managed"
 #~ msgstr "Rêveberina pelan biguherîne."
+
 #~ msgid "View your home folder"
 #~ msgstr "peldanka home nîşan bide"
+
 #~ msgid "Removing device"
 #~ msgstr "Cîhaz tê veqetandin"
+
 #~ msgid "<b>Writing data to storage device %s</b>"
 #~ msgstr "<b>%s li amûra depokirinê dane tê nivîsîn</b>"
+
 #~ msgid "Please do not remove the device while this operation is in progress."
 #~ msgstr "Ji kerema xwe re di dema meşa vê pêvajoyê de cîhazê dernexe."
+
 #~ msgid "<b>Image Type:</b> %s (%s)\n"
 #~ msgstr "<b>Cureyê Wêneyê:</b> %s (%s)\n"
+
 #~ msgid "Unable to launch the cd burner application."
 #~ msgstr "Sepana nivîsîna CD'yan nehate destpêkirin."
+
 #~ msgid "_Write contents to CD"
 #~ msgstr "Naverokê binivîse CD'yê"
+
 #~ msgid "<b>Search:</b>"
 #~ msgstr "<b>Lêgerîn:</b>"
+
 #~ msgid "Set up a connection to a network server"
 #~ msgstr "Girêdanekê bi pêşkêşkereke torê pêk bîne"
+
 #~ msgid "Go to the home folder"
 #~ msgstr "Here peldanka malê"
+
 #~ msgid "Go to the computer location"
 #~ msgstr "Here cihê komputerê"
+
 #~ msgid "Go to the network location"
 #~ msgstr "Here cihê torê"
+
 #~ msgid "Go to the trash folder"
 #~ msgstr "Biçe peldanka çopê"
+
 #~ msgid "Go to the CD/DVD Creator"
 #~ msgstr "Biçe afirandinêrê CD/DVD"
+
 #~ msgid "View your network servers"
 #~ msgstr "Pêşkêşkerên xwe yên torê bibîne"
+
 #~ msgid "File _owner:"
 #~ msgstr "_Xwediya/ê dosiyê:"
+
 #~ msgid "File owner:"
 #~ msgstr "Xwediya/ê dosiyê:"
+
 #~ msgid "_File group:"
 #~ msgstr "_Koma dosiyan:"
+
 #~ msgid "File group:"
 #~ msgstr "Koma dosiyan:"
+
 #~ msgid "Number view:"
 #~ msgstr "Dîtina hejmaran:"
+
 #~ msgid "Copyright © 1999-2005 The Nautilus authors"
 #~ msgstr "Copyright © 1999-2005 Nivîskarên Nautilus"
+
 #~ msgid "Art"
 #~ msgstr "Huner"
+
 #~ msgid "Camera"
 #~ msgstr "Kamera"
+
 #~ msgid "Mail"
 #~ msgstr "Peyam"
+
 #~ msgid "Multimedia"
 #~ msgstr "Multîmedya"
+
 #~ msgid "New"
 #~ msgstr "Nû"
+
 #~ msgid "OK"
 #~ msgstr "Temam"
+
 #~ msgid "Package"
 #~ msgstr "Paket"
+
 #~ msgid "Sound"
 #~ msgstr "Deng"
+
 #~ msgid "Special"
 #~ msgstr "Taybet"
+
 #~ msgid "Web"
 #~ msgstr "Tor"
+
 #~ msgid "Delete?"
 #~ msgstr "Rake?"
+
 #~ msgid "Too Many Files"
 #~ msgstr "Zêde Dosya"
+
 #~ msgid "About Scripts"
 #~ msgstr "Der barê skriptan"
+
 #~ msgid "1 GB"
 #~ msgstr "1 GB"
+
 #~ msgid "100 KB"
 #~ msgstr "100 KB"
+
 #~ msgid "500 KB"
 #~ msgstr "500 KB"
+
 #~ msgid "Always"
 #~ msgstr "Her dem"
+
 #~ msgid "MIME type"
 #~ msgstr "Cureyê MIME"
+
 #~ msgid "Never"
 #~ msgstr "Tu car"
+
 #~ msgid "date modified"
 #~ msgstr "serastkirina dawî"
+
 #~ msgid "group"
 #~ msgstr "kom"
+
 #~ msgid "iso"
 #~ msgstr "iso"
+
 #~ msgid "none"
 #~ msgstr "tune"
+
 #~ msgid "owner"
 #~ msgstr "xwedî"
+
 #~ msgid "permissions"
 #~ msgstr "maf"
+
 #~ msgid "size"
 #~ msgstr "mezinahî"
+
 #~ msgid "type"
 #~ msgstr "cure"
+
 #~ msgid "Clear History"
 #~ msgstr "Dîrokê Jê Bibe"
+
 #~ msgid "Home"
 #~ msgstr "Mal"
+
 #~ msgid "Not an Image"
 #~ msgstr "Ne wêne ye"
+
 #~ msgid "Cool"
 #~ msgstr "Sar"
+
 #~ msgid "Danger"
 #~ msgstr "Xeter"
+
 #~ msgid "Favorite"
 #~ msgstr "Bijare"
+
 #~ msgid "Important"
 #~ msgstr "Girîng"
+
 #~ msgid "Personal"
 #~ msgstr "Şexsî"
+
 #~ msgid "Pictures"
 #~ msgstr "Wêne"
+
 #~ msgid "_Move here"
 #~ msgstr "_Tevbigere vê derê"
+
 #~ msgid "_Copy here"
 #~ msgstr "_Ji ber bigire vir"
+
 #~ msgid "_Link here"
 #~ msgstr "_Girêbide vê derê"
+
 #~ msgid "Error Creating New Folder"
 #~ msgstr "Çewtiya di Afirandina Peldanka Nû de"
+
 #~ msgid "Error Creating New Document"
 #~ msgstr "Çewtiya di Afirandina Pelgeya nû de"
+
 #~ msgid "Can't Display Location"
 #~ msgstr "Cih nayê nîşandan."
+
 #~ msgid "Mount Error"
 #~ msgstr "Çewtiya mountkirinê"
+
 #~ msgid "Unmount Error"
 #~ msgstr "Çewtiya unmountkirinê"
+
 #~ msgid "Eject Error"
 #~ msgstr "Çewtiya avêtinê"
+
 #~ msgid "Cancel Open?"
 #~ msgstr "Vekirinê betal bike?"
+
 #~ msgid "Images Only"
 #~ msgstr "Bi tenê Wêneyan"
+
 #~ msgid "Changing owner."
 #~ msgstr "Xwedî tê guherandin."
+
 #~ msgid "Select an icon"
 #~ msgstr "Dawerekê hilbijêre"
 
+#~ msgid "<i>No applications selected</i>"
+#~ msgstr "<i>Sepan nehatin hilbijartin</i>"
+
+#~ msgid "Info"
+#~ msgstr "Agahî"
+
+#~ msgid "Error"
+#~ msgstr "Çewtî"
+
+#~ msgid "Question"
+#~ msgstr "Pirs"
diff --git a/po/li.po b/po/li.po
index 300092211..2a728860f 100644
--- a/po/li.po
+++ b/po/li.po
@@ -1,9 +1,17 @@
+# #-#-#-#-#  li.po (Nautilus)  #-#-#-#-#
 # Limburgish Translation of Nautilus
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Mathieu van Woerkom <mathieu@brabants.org>, 2003
 #
+# #-#-#-#-#  li.po (eel HEAD)  #-#-#-#-#
+# Limburgish Translation of Nautilus
+# Copyright (C) 2000 Free Software Foundation, Inc.
+# Mathieu van Woerkom <mathieu@brabants.org>, 2003.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  li.po (Nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -13,6 +21,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  li.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2003-06-05 12:05+0100\n"
+"Last-Translator: Mathieu van Woerkom <mathieu@brabants.org>\n"
+"Language-Team: Limburgish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -503,9 +521,13 @@ msgid "Tooltip for the menu item"
 msgstr ""
 
 #: libnautilus-extension/nautilus-menu-item.c:227
+#: eel/eel-mime-application-chooser.c:237
 #, fuzzy
 msgid "Icon"
-msgstr "Piktogramme"
+msgstr ""
+"#-#-#-#-#  li.po (Nautilus)  #-#-#-#-#\n"
+"Piktogramme\n"
+"#-#-#-#-#  li.po (eel HEAD)  #-#-#-#-#\n"
 
 #: libnautilus-extension/nautilus-menu-item.c:228
 msgid "Name of the icon to display in the menu item"
@@ -4725,10 +4747,13 @@ msgstr "'t goof eine faeler bie 't tuine van hulpteks: %s."
 msgid "Couldn't Show Help"
 msgstr "Kèn hulpteks neet tuine"
 
-#: src/file-manager/fm-properties-window.c:3305
+#: src/file-manager/fm-properties-window.c:3305 eel/eel-open-with-dialog.c:793
 #, fuzzy
 msgid "Open With"
-msgstr "Äöpene _mit"
+msgstr ""
+"#-#-#-#-#  li.po (Nautilus)  #-#-#-#-#\n"
+"Äöpene _mit\n"
+"#-#-#-#-#  li.po (eel HEAD)  #-#-#-#-#\n"
 
 #: src/file-manager/fm-properties-window.c:3643
 msgid "Cancel Showing Properties Window?"
@@ -6537,6 +6562,229 @@ msgstr "Netwirkservers"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Eure netwirkservers tuine mit Nautilus Besjtandjwirtsjaf"
 
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Teks"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:126
+#, fuzzy
+msgid "The type of alert"
+msgstr "De teks op 't label"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr ""
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "De teks op 't label"
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Oetliening"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"De oetliening van de regele teks van 't label relatief tót einanger. Dit "
+"haet geine invlood op de oetliening van 't label in zien toegeweze ruumde. "
+"Zuug hieveur: GtkMisc::xalign"
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Regeltrökloup"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Teks geit automatis wiejer op de naekste regel wen deze te lank weurt."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Kursorposisie"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "De huijige posisie van de invoegkursor in booksjtaafteikes"
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Seleksiesjeit"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"De posisie van 't angere ènj van de seleksie van de kursor, in "
+"booksjtaafteikes "
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Alles selektere"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Inveurmetodes"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf faeler:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr ""
+"GConf faeler:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:90
+#, fuzzy
+msgid "All further errors shown only on terminal."
+msgstr ""
+"GConf faeler:\n"
+"  %s\n"
+"Alle naekste waere allein in ein terminal getuind"
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 AM"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr ""
+
+#: eel/eel-gnome-extensions.c:285
+#, fuzzy
+msgid "You must click on an image to select it."
+msgstr ""
+"Gein aafbiljing geselekteerd. Klik op ein aafbiljing veur dees te selektere."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr ""
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr ""
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr ""
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (óngeljige Unicode)"
+
 #~ msgid "Allaire"
 #~ msgstr "Allaire"
 
@@ -6811,9 +7059,6 @@ msgstr "Eure netwirkservers tuine mit Nautilus Besjtandjwirtsjaf"
 #~ msgid "Factory for text view"
 #~ msgstr "Febrik veur 't teksvinster"
 
-#~ msgid "Text"
-#~ msgstr "Teks"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Teksweergaaf"
 
@@ -8662,3 +8907,22 @@ msgstr "Eure netwirkservers tuine mit Nautilus Besjtandjwirtsjaf"
 
 #~ msgid "Copy selected text to the clipboard"
 #~ msgstr "De geselekteerde tekst nao 't klaadbord kopjere"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf faeler"
+
+#, fuzzy
+#~ msgid "No Selection Made"
+#~ msgstr "Niks geselekteerd"
+
+#~ msgid "Info"
+#~ msgstr "Infermasie"
+
+#~ msgid "Warning"
+#~ msgstr "Waarsjoewing"
+
+#~ msgid "Error"
+#~ msgstr "Faeler"
+
+#~ msgid "Question"
+#~ msgstr "Vraog"
diff --git a/po/lt.po b/po/lt.po
index d91de8c3a..7382fe4b7 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  lt.po (lt)  #-#-#-#-#
 # translation of lt.po to Lithuanian
 # Lithuanian translation of Nautilus.
 # Copyright (C) 2001-2008 Free Software Foundation, Inc.
@@ -9,8 +10,19 @@
 # Žygimantas Beručka <zygis@gnome.org>, 2004-2008.
 # Justina Klingaitė <justina.klingaite@gmail.com>, 2005.
 # Gintautas Miliauskas <gintas@akl.lt>, 2007.
+# #-#-#-#-#  lt.po (lt)  #-#-#-#-#
+# translation of lt.po to Lithuanian
+# Lithuanian translation for the Eel library
+# Copyright (C) 2000-2006, 2008 Free Software Foundation, Inc.
+#
+#
+# Gediminas Paulauskas <menesis@delfi.lt>, 2001,2003.
+# Žygimantas Beručka <zygis@gnome.org>, 2004-2006.
+# Gintautas Miliauskas <gintas@akl.lt>, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  lt.po (lt)  #-#-#-#-#\n"
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-15 16:35+0300\n"
@@ -22,6 +34,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
+"#-#-#-#-#  lt.po (lt)  #-#-#-#-#\n"
+"Project-Id-Version: lt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-02 13:49+0200\n"
+"PO-Revision-Date: 2008-03-02 13:49+0200\n"
+"Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
+"Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -334,20 +359,20 @@ msgid ""
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
 msgstr ""
-"Eilutė, nurodanti kaip atsižvelgiant į mąstelį turėtų būti pakeičiamos "
-"per ilgų failų vardų dalys. Kiekvieno šio sąrašo įrašo forma – "
-"„Mastelis:Sveikasis skaičius“. Kiekvienam nurodytam masteliui, jei nurodytas "
-"sveikasis skaičius didesnis už 0, failo vardas neviršys nurodyto eilučių "
-"skaičiaus. Jeigu šis skaičius yra 0 ar mažesnis, nurodytas mastelis "
-"neribojamas. Taip pat leidžiamas numatytasis įrašas, kurio forma yra – "
-"„Sveikasis skaičius“, be nurodyto mastelio. Jis nurodo didžiausią galimą "
-"visų kitų mastelių eilučių skaičių. Pavyzdžiai: 0 – visada rodyti per ilgus "
-"failų vardus; 3 – trumpinti failų vardus, jei jie viršija 3 eilutes; "
-"smallest:5,smaller:4,0 – trumpinti failų vardus, jei jie viršija penkias "
-"eilutes, naudojant mastelį „smallest“, trumpinti, jei failų vardai viršija "
-"keturias eilutes, naudojant mastelį „smaller“. Netrumpinti failų vardų "
-"naudojant kitus mastelius. Galimi masteliai: smallest (33%), smaller (50%), "
-"small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
+"Eilutė, nurodanti kaip atsižvelgiant į mąstelį turėtų būti pakeičiamos per "
+"ilgų failų vardų dalys. Kiekvieno šio sąrašo įrašo forma – „Mastelis:"
+"Sveikasis skaičius“. Kiekvienam nurodytam masteliui, jei nurodytas sveikasis "
+"skaičius didesnis už 0, failo vardas neviršys nurodyto eilučių skaičiaus. "
+"Jeigu šis skaičius yra 0 ar mažesnis, nurodytas mastelis neribojamas. Taip "
+"pat leidžiamas numatytasis įrašas, kurio forma yra – „Sveikasis skaičius“, "
+"be nurodyto mastelio. Jis nurodo didžiausią galimą visų kitų mastelių "
+"eilučių skaičių. Pavyzdžiai: 0 – visada rodyti per ilgus failų vardus; 3 – "
+"trumpinti failų vardus, jei jie viršija 3 eilutes; smallest:5,smaller:4,0 – "
+"trumpinti failų vardus, jei jie viršija penkias eilutes, naudojant mastelį "
+"„smallest“, trumpinti, jei failų vardai viršija keturias eilutes, naudojant "
+"mastelį „smaller“. Netrumpinti failų vardų naudojant kitus mastelius. Galimi "
+"masteliai: smallest (33%), smaller (50%), small (66%), standard (100%), "
+"large (150%), larger (200%), largest (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -365,8 +390,8 @@ msgid ""
 "limit is imposed on the number of displayed lines."
 msgstr ""
 "Sveikasis skaičius, nurodantis kaip per ilgų failų vardų dalys turėtų būti "
-"darbastalyje pakeistos elipsėmis. Jeigu skaičius didesnis už 0, tuomet "
-"failo vardas neviršys nurodyto eilučių skaičiaus. Jeigu šis skaičius yra 0 ar "
+"darbastalyje pakeistos elipsėmis. Jeigu skaičius didesnis už 0, tuomet failo "
+"vardas neviršys nurodyto eilučių skaičiaus. Jeigu šis skaičius yra 0 ar "
 "mažesnis, rodomų eilučių skaičius – neribojamas."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
@@ -728,9 +753,9 @@ msgid ""
 "If this preference is set, all columns in the compact view have the same "
 "width. Otherwise, the width of each column is determined seperately."
 msgstr ""
-"Jei nustatytas šis parametras, visi stulpeliai glaustame rodinyje bus "
-"to paties pločio. Priešingu atveju, kiekvieno stulpelio plotis bus "
-"nurodomas atskirai."
+"Jei nustatytas šis parametras, visi stulpeliai glaustame rodinyje bus to "
+"paties pločio. Priešingu atveju, kiekvieno stulpelio plotis bus nurodomas "
+"atskirai."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid ""
@@ -790,10 +815,9 @@ msgid ""
 "the preference capplet. No prompt will be shown nor will any matching "
 "application be started on insertion of media matching these types."
 msgstr ""
-"x-content/* tipų, kuriems naudotojas nustatymuose pasirinko "
-"parametrą „Nedaryti nieko“, sąrašas. Įdėjus šiuos tipus atitinkančią "
-"laikmeną, nebus nei rodomas koks raginimas, nei paleidžiama kokia "
-"atitinkanti programa."
+"x-content/* tipų, kuriems naudotojas nustatymuose pasirinko parametrą "
+"„Nedaryti nieko“, sąrašas. Įdėjus šiuos tipus atitinkančią laikmeną, nebus "
+"nei rodomas koks raginimas, nei paleidžiama kokia atitinkanti programa."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
@@ -826,7 +850,8 @@ msgstr "x-content/* tipų, nustatytų į „Atverti aplanką“, sąrašas"
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid ""
 "List of x-content/* types where the preferred application will be launched"
-msgstr "x-content/* tipų, kur bus paleidžiamos pageidaujamos programos, sąrašas"
+msgstr ""
+"x-content/* tipų, kur bus paleidžiamos pageidaujamos programos, sąrašas"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Maximum handled files in a folder"
@@ -932,10 +957,10 @@ msgid ""
 "on a remote server. If set to \"local_only\" then only plays previews on "
 "local file systems. If set to \"never\" then it never previews sound."
 msgstr ""
-"Kuomet, užvedus pelės žymeklį ant failo, groti garsus. Jei nustatyta „always“,"
-" garsai bus grojami visada, net jei failas yra nutolusiame serveryje. Jei "
-"nustatyta „local_only“ – atkuriami tik vietiniai failai. Jei nustatyta "
-"„never“ – niekada."
+"Kuomet, užvedus pelės žymeklį ant failo, groti garsus. Jei nustatyta "
+"„always“, garsai bus grojami visada, net jei failas yra nutolusiame "
+"serveryje. Jei nustatyta „local_only“ – atkuriami tik vietiniai failai. Jei "
+"nustatyta „never“ – niekada."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
 msgid ""
@@ -3041,8 +3066,8 @@ msgid ""
 "The default action cannot open \"%s\" because it cannot access files at \"%s"
 "\" locations."
 msgstr ""
-"Numatytasis veiksmas negali atverti „%s“, kadangi jis negali pasiekti "
-"failų „%s“ vietose."
+"Numatytasis veiksmas negali atverti „%s“, kadangi jis negali pasiekti failų "
+"„%s“ vietose."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
 msgid ""
@@ -5038,8 +5063,8 @@ msgid ""
 "restarting Nautilus may help fix the problem."
 msgstr ""
 "Dabar negalima naudoti Nautilus, dėl netikėtos Bonobo klaidos bandant "
-"surasti gamyklą. Nutraukus procesą bonobo-activation-server ir "
-"paleidus Nautilus iš naujo, ši problema gali išsispręsti."
+"surasti gamyklą. Nutraukus procesą bonobo-activation-server ir paleidus "
+"Nautilus iš naujo, ši problema gali išsispręsti."
 
 #: ../src/nautilus-application.c:659
 msgid ""
@@ -6605,8 +6630,8 @@ msgid ""
 "Street, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 "Turėjote gauti GNU bendrosios viešosios licencijos kopiją kartu su Nautilus; "
-"jeigu negavote, rašykite Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"jeigu negavote, rašykite Free Software Foundation, Inc., 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301 USA"
 
 #: ../src/nautilus-window-menus.c:562
 msgid ""
@@ -6854,8 +6879,7 @@ msgstr "CD / _DVD kūrimas"
 #. tooltip
 #: ../src/nautilus-window-menus.c:878
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr ""
-"Atverti aplanką, į kurį nuvilkę failus galite juos įrašyti į CD ar DVD"
+msgstr "Atverti aplanką, į kurį nuvilkę failus galite juos įrašyti į CD ar DVD"
 
 #. name, stock id
 #. label, accelerator
@@ -6941,3 +6965,145 @@ msgstr "Keisti mastelį"
 #: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "Nustatyti esamo rodinio mastelį"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Paveikslėlio/etiketės rėmelis"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Rėmelio aplink etiketę ir peveikslėlį plotis, aliarmo dialoge"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Aliarmo tipas"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Aliarmo tipas"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Aliarmo mygtukai"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Mygtukai rodomi aliarmo dialoge"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Ro_dyti išsamiau"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekstas"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Etiketės tekstas"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Lygiavimas"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Eilučių lygiuotė etiketės tekste susijusių viena su kita. Tai nepaveikia "
+"etiketės lygiuotės jos priskyrime. Tam žiūrėk GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Eilučių perkėlimas"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Jeigu nustatyta, laužyti eilutes jeigu tekstas tampa per platus."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Kursoriaus pozicija"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Dabartinė įterpimo kursoriaus pozicija matuojama simboliais."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Pasirinkimo riba"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Priešingo pažymėjimo krašto pozicija matuojama simboliais nuo kursoriaus."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Pažymėti viską"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Įvesties metodai"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf klaida:\n"
+" %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf klaida: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Tolimesni klaidų pranešimai bus rodomi tik terminale."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Nepasirinktas joks paveikslėlis."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Norėdami pasirinkti paveikslėlį, Jūs turite ant jo spragtelėti."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Jūs galite sustabdyti šią operaciją paspausdami „atšaukti\"."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (netinkamas Unikodas)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Atveriama %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Atveriamas %d elementas"
+msgstr[1] "Atveriami %d elementai"
+msgstr[2] "Atveriama %d elementų"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Įveskite slaptažodį"
diff --git a/po/lv.po b/po/lv.po
index c7ed4f289..3e12e8d0e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,8 +2,10 @@
 # Copyright (C) 2006 Free Software Foundation, Inc.
 #
 # Raivis Dejus <orvils@gmail.com>, 2006.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  lv.po (lv)  #-#-#-#-#\n"
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-12-24 15:53+0200\n"
@@ -14,7 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+"#-#-#-#-#  lv.po (lv)  #-#-#-#-#\n"
+"Project-Id-Version: lv\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-07 19:17+0200\n"
+"PO-Revision-Date: 2006-12-07 19:19+0200\n"
+"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
+"Language-Team: Latvian <locale@lakalv>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -427,7 +443,8 @@ msgstr "Aktivizē Nautilus klasisko uzvedību, kurā visi logi ir pārlūki"
 msgid ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
-msgstr "Noklusētā fona faila vārds. Tiek lietots tikai, ja background_set ir patiess."
+msgstr ""
+"Noklusētā fona faila vārds. Tiek lietots tikai, ja background_set ir patiess."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid ""
@@ -456,10 +473,12 @@ msgstr "\"Mājas\" ikona redzama uz darbvirsmas"
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
-msgstr "Ja patiess, Nautilus sānu panelī rādīs tikai mapes. Citādi rādīs arī failus."
+msgstr ""
+"Ja patiess, Nautilus sānu panelī rādīs tikai mapes. Citādi rādīs arī failus."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "Ja patiess, tikko atvērtajiem logiem būs redzama adreses josla."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
@@ -500,7 +519,8 @@ msgstr "Ja patiess, Nautilus ikonu un saraksta skatā rāda mapes pirms failiem.
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
-msgstr "Ja patiess, Nautilus pārjautās, kad mēģināsiet pārvietot failus miskastē."
+msgstr ""
+"Ja patiess, Nautilus pārjautās, kad mēģināsiet pārvietot failus miskastē."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
@@ -598,15 +618,18 @@ msgstr "Ja patiess, faili jaunos logos tiks kārtoti pretējā secībā."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If true, icons will be laid out tighter by default in new windows."
-msgstr "Ja patiess, ikonas pēc noklusējuma jaunos logos tiks izkārtotas ciešāk."
+msgstr ""
+"Ja patiess, ikonas pēc noklusējuma jaunos logos tiks izkārtotas ciešāk."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "Ja patiess, uzraksti tiks novietoti blakus ikonām nevis zem tām."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid "If true, new windows will use manual layout by default."
-msgstr "Ja patiess, jaunos logos pēc noklusējuma tiks lietots manuālais izklājums."
+msgstr ""
+"Ja patiess, jaunos logos pēc noklusējuma tiks lietots manuālais izklājums."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
@@ -799,19 +822,22 @@ msgstr "Sānu paneļa skats, kuru lietot tikko atvērtos logos."
 msgid ""
 "This name can be set if you want a custom name for the computer icon on the "
 "desktop."
-msgstr "Šo var uzstādīt, ja vēlaties pielāgotu nosaukumu datora ikonai darbvirsmā."
+msgstr ""
+"Šo var uzstādīt, ja vēlaties pielāgotu nosaukumu datora ikonai darbvirsmā."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
-msgstr "Šo var uzstādīt, ja vēlaties pielāgotu nosaukumu \"Mājas\" ikonai darbvirsmā."
+msgstr ""
+"Šo var uzstādīt, ja vēlaties pielāgotu nosaukumu \"Mājas\" ikonai darbvirsmā."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
-msgstr "Šo var uzstādīt, ja vēlaties pielāgotu nosaukumu miskastes ikonai darbvirsmā."
+msgstr ""
+"Šo var uzstādīt, ja vēlaties pielāgotu nosaukumu miskastes ikonai darbvirsmā."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "Trash icon visible on desktop"
@@ -950,6 +976,7 @@ msgstr "Lietot _noklusēto"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1374
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Nosaukums"
 
@@ -1115,7 +1142,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Piedodiet, bet jums jāpiešķir kāds atslēgvārds jaunajai emblēmai."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:203
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "Piedodiet, bet emblēmu atslēgvārdi var saturēt tikai burtus, tukšumus un "
 "skaitļus."
@@ -1406,8 +1434,10 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "Fails jau eksistē iekš \"%s\".  Tā pārrakstīšana aizstās visu tā saturu."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+"Fails jau eksistē iekš \"%s\".  Tā pārrakstīšana aizstās visu tā saturu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
 #: ../libnautilus-private/nautilus-file-operations.c:1233
@@ -2350,7 +2380,8 @@ msgstr "Nevarēju attēlot \"%s\", jo nevarēju atrast resursdatoru \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1519
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Pārbaudiet, ka rakstība ir pareiza un ka starpniekservera uzstādījumi ir "
 "pareizi."
@@ -2403,7 +2434,8 @@ msgid "This drop target only supports local files."
 msgstr "Nomešanas mērķis atbalsta tikai vietējos failus."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Lai atvērtu ne-vietējus failus, iekopējiet tos vietējā mapē un tad nometiet "
 "tos vēlreiz."
@@ -2444,7 +2476,8 @@ msgstr "Atcelt rediģēšanu"
 
 #. label, accelerator
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:661
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "Pārlūkot visus no šīs mašīnas pieejamos attālinātos diskus un mapes"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2536,8 +2569,10 @@ msgstr "Mainīt darbavirsmas _fonu"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
-msgstr "Parādīt logu, kas ļauj jums iestatīt jūsu darba virsmas rakstu vai krāsu"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+"Parādīt logu, kas ļauj jums iestatīt jūsu darba virsmas rakstu vai krāsu"
 
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:706
@@ -2599,10 +2634,14 @@ msgstr "Vai esat pārliesināts, ka vēlaties pavisam izdzēst \"%s\"?"
 #: ../src/file-manager/fm-directory-view.c:1004
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
-msgstr[0] "Vai esat pārliecināts, ka vēlaties pavisam izdzēst %d izvēlēto vienību?"
-msgstr[1] "Vai esat pārliecināts, ka vēlaties pavisam izdzēst %d izvēlētās vienības?"
-msgstr[2] "Vai esat pārliecināts, ka vēlaties pavisam izdzēst %d izvēlēto vienību?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
+msgstr[0] ""
+"Vai esat pārliecināts, ka vēlaties pavisam izdzēst %d izvēlēto vienību?"
+msgstr[1] ""
+"Vai esat pārliecināts, ka vēlaties pavisam izdzēst %d izvēlētās vienības?"
+msgstr[2] ""
+"Vai esat pārliecināts, ka vēlaties pavisam izdzēst %d izvēlēto vienību?"
 
 #: ../src/file-manager/fm-directory-view.c:1015
 #: ../src/file-manager/fm-tree-view.c:1149
@@ -2727,7 +2766,8 @@ msgstr "Daži faili netiks parādīti."
 
 #: ../src/file-manager/fm-directory-view.c:3824
 msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "Nevar pārvietot uz Atkritumkasti. Vai vēlaties to izdzēst nekavējoties?"
+msgstr ""
+"Nevar pārvietot uz Atkritumkasti. Vai vēlaties to izdzēst nekavējoties?"
 
 #: ../src/file-manager/fm-directory-view.c:3825
 #, c-format
@@ -2746,7 +2786,8 @@ msgid "None of the %d selected items can be moved to the Trash"
 msgstr "Nevienu no %d izvēlētajām vienībām nevar pārvietot uz Atkritumkasti"
 
 #: ../src/file-manager/fm-directory-view.c:3832
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "Dažas vienības nevar pārvietot uz Atkritumkasti, vai vēlaties tās izdzēst "
 "nekavējoties?"
@@ -2759,7 +2800,8 @@ msgstr "%d no izvēlētajām vienībām nevar pārvietot uz Atkritumkasti"
 #: ../src/file-manager/fm-directory-view.c:3871
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
-msgstr "Vai esat pārliecināts, ka vēlaties pavisam izdzēst \"%s\" no Atkritumkastes?"
+msgstr ""
+"Vai esat pārliecināts, ka vēlaties pavisam izdzēst \"%s\" no Atkritumkastes?"
 
 #: ../src/file-manager/fm-directory-view.c:3875
 #, c-format
@@ -2922,8 +2964,10 @@ msgstr "\"%s\" tiks kopēts, ja izvēlēsieties Ievietot Failus komandu"
 #: ../src/file-manager/fm-directory-view.c:6038
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
-msgstr[0] "%d izvēlētā vienība tiks pārvietota, ja izvēlēsieties Ievietot Failus komandu"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"%d izvēlētā vienība tiks pārvietota, ja izvēlēsieties Ievietot Failus komandu"
 msgstr[1] ""
 "%d izvēlētās vienības tiks pārvietota, ja izvēlēsieties Ievietot Failus "
 "komandu"
@@ -2934,10 +2978,14 @@ msgstr[2] ""
 #: ../src/file-manager/fm-directory-view.c:6045
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
-msgstr[0] "%d izvēlētā vienība tiks kopēta, ja izvēlēsieties Ievietot Failus komandu"
-msgstr[1] "%d izvēlētās vienības tiks kopēta, ja izvēlēsieties Ievietot Failus komandu"
-msgstr[2] "%d izvēlētās vienības tiks kopēta, ja izvēlēsieties Ievietot Failus komandu"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"%d izvēlētā vienība tiks kopēta, ja izvēlēsieties Ievietot Failus komandu"
+msgstr[1] ""
+"%d izvēlētās vienības tiks kopēta, ja izvēlēsieties Ievietot Failus komandu"
+msgstr[2] ""
+"%d izvēlētās vienības tiks kopēta, ja izvēlēsieties Ievietot Failus komandu"
 
 #: ../src/file-manager/fm-directory-view.c:6139
 #: ../src/file-manager/fm-tree-view.c:1044
@@ -3013,10 +3061,11 @@ msgstr "_Tukšs fails"
 msgid "Create a new empty file inside this folder"
 msgstr "Izveidot jaunu tukšo mapi failu šajā mapē"
 
+#. #-#-#-#-#  lv.po (lv)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6838
 #: ../src/file-manager/fm-directory-view.c:7717
-#: ../src/file-manager/fm-tree-view.c:1252
+#: ../src/file-manager/fm-tree-view.c:1252 ../eel/eel-open-with-dialog.c:918
 msgid "_Open"
 msgstr "_Atvērt"
 
@@ -3183,7 +3232,9 @@ msgstr "Pārstatīt skatu uz _noklusējumiem"
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6917
 msgid "Reset sorting order and zoom level to match preferences for this view"
-msgstr "Pārstatīt kārtošanas secību un izmēra līmeni, lai atbilstu šī skata iestatījumiem"
+msgstr ""
+"Pārstatīt kārtošanas secību un izmēra līmeni, lai atbilstu šī skata "
+"iestatījumiem"
 
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6920
@@ -3388,7 +3439,8 @@ msgstr "Saite \"%s\" ir nederīga."
 #: ../src/file-manager/fm-directory-view.c:8136
 #, c-format
 msgid "The Link \"%s\" is Broken. Move it to Trash?"
-msgstr "Saite \"%s\" ir nederīga. Vai vēlaties pārvietot šo saiti uz Atkritumkasti?"
+msgstr ""
+"Saite \"%s\" ir nederīga. Vai vēlaties pārvietot šo saiti uz Atkritumkasti?"
 
 #: ../src/file-manager/fm-directory-view.c:8142
 msgid "This link can't be used, because it has no target."
@@ -3471,7 +3523,8 @@ msgstr "Palaidējs"
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Jums nav nepieciešamo atļauju, lai apskatītu \"%s\" saturu."
 
 #: ../src/file-manager/fm-error-reporting.c:64
@@ -3490,12 +3543,14 @@ msgstr "Mapes saturu nevar parādīt."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Nosaukums \"%s\" jau ir lietots šajā mapē. Lūdzu lieto citu nosaukumu."
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "Šajā mapē nav \"%s\". Varbūt tas tika nesen pārvietots vai izdzēsts?"
 
 #: ../src/file-manager/fm-error-reporting.c:118
@@ -3535,7 +3590,8 @@ msgstr "Nevarēja pārsaukt vienību."
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Jums nav nepieciešamo atļauju, lai mainītu \"%s\" grupu."
 
 #: ../src/file-manager/fm-error-reporting.c:173
@@ -3572,7 +3628,8 @@ msgstr "Nevarēja nomainīt īpašnieku."
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nevarēju mainīt \"%s\" atļaujas, jo tas atrodas uz tikai nolasīšanai "
 "paredzēta diska"
@@ -4134,6 +4191,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "Nevarēju noteikt izvēlētā faila pieejas tiesības."
 
 #: ../src/file-manager/fm-properties-window.c:4451
+#: ../eel/eel-open-with-dialog.c:817
 msgid "Open With"
 msgstr "Atvērt ar"
 
@@ -4967,7 +5025,9 @@ msgstr "Izveido tikai logus ar speciāli norādītiem URI."
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
-msgstr "Nepārvaldīt darbavirsmu (ignorēt iestatījumus, kas uzstādīti iestatījumu logā)."
+msgstr ""
+"Nepārvaldīt darbavirsmu (ignorēt iestatījumus, kas uzstādīti iestatījumu "
+"logā)."
 
 #: ../src/nautilus-main.c:385
 msgid "open a browser window."
@@ -4990,7 +5050,8 @@ msgstr "[URI...]"
 msgid ""
 "Load a saved session from the specified file. Implies \"--no-default-window"
 "\"."
-msgstr "Ielādēt saglabātu sesiju no norādītā faila. Nozīmē \"--no-default-window\"."
+msgstr ""
+"Ielādēt saglabātu sesiju no norādītā faila. Nozīmē \"--no-default-window\"."
 
 #: ../src/nautilus-main.c:393
 msgid "FILENAME"
@@ -5915,3 +5976,221 @@ msgstr "Mainīt izmēru"
 msgid "Set the zoom level of the current view"
 msgstr "Uzstādīt izmēra līmeni pašreizējam skatam"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Attēla/etiķetes robeža"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Robežas lielums ap etiķetēm vai attēliem paziņojumu dialoglogos"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Paziņojuma tips"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Paziņojuma tips"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Paziņojuma pogas"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Pogas, kas būs redzamas paziņojuma dialoglogā"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Parādīt sīkākas _detaļas"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Teksts"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Iezīmes teksts."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Izlīdzināšana"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Rindu izlīdzinājums iezīmes tekstā attiecībā vienam pret otru. Šis neietekmē "
+"iezīmju izlīdziājumu to iedalījumā. Skatīt GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Rindu aplaušana"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ja iestatīts, aplauzt rindiņas, ja teksts kļūst pārāk plašs."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Kursora Pozīcija"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Pašreizējā ievietošanas kursora pozīcija rakstzimēs."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Izvēles Ierobežojums"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Pozīcija uz otru izvēles galu no kursora rakstzīmēs."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Izvēlēties Visu"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Ievades Metodes"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf kļūda:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf kļūda: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Visas tālākās kļūdas tiks parādītas terminālī."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 AM"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Neviens attēls nav izvēlēts."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Jums jānoklikšķina uz attēla, lai to izvelētos."
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Noklusētais"
+
+#: ../eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "Ikona"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "Neviena programma nav izvēlēta"
+
+#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:992
+#, c-format
+msgid "%s document"
+msgstr "%s dokuments"
+
+#: ../eel/eel-mime-application-chooser.c:538
+#: ../eel/eel-open-with-dialog.c:1005
+msgid "Unknown"
+msgstr "Nezināms"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr "Izvēlieties programmu ar kuru atvētr %s un citus \"%s\" tipus"
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Nevarēju palaist programmu"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Nevarēju atrast '%s'"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Nevarēju atrast programmu"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Nevarēju pievienot programmu"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Nevarēju pievienot programmu visu programmu datubāzei"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Izvēlies programmu"
+
+#: ../eel/eel-open-with-dialog.c:854
+msgid "Select an application to view its description."
+msgstr "Izvēlies programmu, lai aplūkotu tās aprakstu."
+
+#: ../eel/eel-open-with-dialog.c:879
+msgid "_Use a custom command"
+msgstr "Izmantot cit_u komandu"
+
+#: ../eel/eel-open-with-dialog.c:896
+msgid "_Browse..."
+msgstr "_Pārlūkot..."
+
+#: ../eel/eel-open-with-dialog.c:1012
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "Atvērt %s un citus \"%s\" tipa failus ar:"
+
+#: ../eel/eel-open-with-dialog.c:1044
+msgid "_Add"
+msgstr "_Pievienot"
+
+#: ../eel/eel-open-with-dialog.c:1045
+msgid "Add Application"
+msgstr "Pievienot programmu"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Jūs varat atcelt šo darbību nospiežot Atcelt."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr "(nepareizs Unicode)"
diff --git a/po/mk.po b/po/mk.po
index 7103a76b6..b528c3d65 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  mk.po (nautilus.HEAD.mk)  #-#-#-#-#
 # translation of nautilus.HEAD.mk.po to Macedonian
 # translation of nautilus.HEAD.mk.po to
 # translation of nautilus.HEAD.po to
@@ -23,8 +24,23 @@
 # Арангел Ангов <ufo@linux.net.mk>, 2005.
 # Jovan Naumovski <jovan@lugola.net>, 2006, 2007, 2008.
 # Arangel Angov <arangel@linux.net.mk>, 2007.
+# #-#-#-#-#  mk.po (mk)  #-#-#-#-#
+# translation of mk.po to Macedonian
+# translation of eel.HEAD.mk.po to
+# eel.HEAD.pot.
+# Copyright (C) 2002,2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+#
+# Ivan Stojmirov <stojmir@linux.net.mk>, 2002.
+# Darko Nikolovski <darkon@macedonia.homelinux.org>, 2003.
+# Ivan Stevkovski <ivan_tph@hotmail.com>, 2003.
+#  <tome@users.ossm.org.mk>, 2004.
+# Arangel Angov <ufo@linux.net.mk>, 2005, 2006, 2008.
+# Arangel Angov <arangel@linux.net.mk>, 2007.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  mk.po (nautilus.HEAD.mk)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.mk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 04:27+0000\n"
@@ -36,6 +52,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  mk.po (mk)  #-#-#-#-#\n"
+"Project-Id-Version: mk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-02-03 16:56+0100\n"
+"Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
+"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -386,7 +413,8 @@ msgstr ""
 "Ако бројот е 0 или помал, нема да има лимит на бројот на прикажани линии."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "Датотека за стандардна позадина на папките. Се користи единствено доколку "
 "background_set е штиклирано."
@@ -568,7 +596,8 @@ msgstr ""
 "страничната површина. Инаку ќе ги покаже и папките и датотеките."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 "Ако е поставено на true,новоотворените прозорци ќе имаат видлива лентата за "
 "локација"
@@ -648,7 +677,8 @@ msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
-msgstr "Ако е вклучено,тогаш Nautilus ќе ги црта иконите на работната површина."
+msgstr ""
+"Ако е вклучено,тогаш Nautilus ќе ги црта иконите на работната површина."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
@@ -791,7 +821,8 @@ msgstr ""
 "прозорци."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "Ако е поставено на true, ознаките ќе бидат поставени странично од иконите "
 "наместо под нив."
@@ -853,7 +884,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "Листа на типови x-content/* поставени на „отвори ја папката“"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "Листа на типови x-content/* каде ќе се пушти преферираната апликација"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -1516,7 +1548,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Извинете, но мора да внесете не-празен клучен збор за новиот амблем."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "Извинете, но важните зборови за амблем можат да содржат само букви, празни "
 "места и бројки."
@@ -1758,9 +1791,12 @@ msgid ""
 msgid_plural ""
 "Are you sure you want to permanently delete the %'d selected items from the "
 "trash?"
-msgstr[0] "Дали сте сигурни дека сакате трајно да ја отстранитe %'d предмет од ѓубрето?"
-msgstr[1] "Дали сте сигурни дека сакате трајно да отстранитe %'d предмети од ѓубрето?"
-msgstr[2] "Дали сте сигурни дека сакате трајно да отстранитe %'d предмети од ѓубрето?"
+msgstr[0] ""
+"Дали сте сигурни дека сакате трајно да ја отстранитe %'d предмет од ѓубрето?"
+msgstr[1] ""
+"Дали сте сигурни дека сакате трајно да отстранитe %'d предмети од ѓубрето?"
+msgstr[2] ""
+"Дали сте сигурни дека сакате трајно да отстранитe %'d предмети од ѓубрето?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1221
 #: ../libnautilus-private/nautilus-file-operations.c:1289
@@ -1794,10 +1830,14 @@ msgstr "Дали сте сигурни дека сакате перманент�
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Дали сте сигурни дека сакате перманентно да избришете %'d избран предмет?"
-msgstr[1] "Дали сте сигурни дека сакате перманентно да избришете %'d избрани предмети?"
-msgstr[2] "Дали сте сигурни дека сакате перманентно да избришете %'d избрани предмети?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
+msgstr[0] ""
+"Дали сте сигурни дека сакате перманентно да избришете %'d избран предмет?"
+msgstr[1] ""
+"Дали сте сигурни дека сакате перманентно да избришете %'d избрани предмети?"
+msgstr[2] ""
+"Дали сте сигурни дека сакате перманентно да избришете %'d избрани предмети?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1323
 msgid "Deleting files"
@@ -1838,7 +1878,8 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr ""
 "Се појави грешка при собирање на информациите за датотеките во папката \"%B"
 "\"."
@@ -1852,7 +1893,8 @@ msgstr "_Прескокни"
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
-msgstr "Папката \"$B\" не може да се копира бидејќи немате пермисии да ја прочитате."
+msgstr ""
+"Папката \"$B\" не може да се копира бидејќи немате пермисии да ја прочитате."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
 #: ../libnautilus-private/nautilus-file-operations.c:2401
@@ -1988,7 +2030,8 @@ msgstr ""
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
-msgstr "Датотеката %B не може да се копира бидејќи немате пермисии да ја прочитате."
+msgstr ""
+"Датотеката %B не може да се копира бидејќи немате пермисии да ја прочитате."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
 msgid "There was an error getting information about \"%B\"."
@@ -2102,7 +2145,8 @@ msgstr "%S од %S — %T преостануваат (%S/сек)"
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
-msgstr "Папката %B не може да се копира бидејќи немате пермисии да ја прочитате."
+msgstr ""
+"Папката %B не може да се копира бидејќи немате пермисии да ја прочитате."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3180
 msgid "There was an error creating the folder \"%B\"."
@@ -2120,7 +2164,8 @@ msgstr ""
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "read it."
-msgstr "Папката %B не може да се копира бидејќи немате пермисии да ја прочитате."
+msgstr ""
+"Папката %B не може да се копира бидејќи немате пермисии да ја прочитате."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3389
 #: ../libnautilus-private/nautilus-file-operations.c:3909
@@ -2204,7 +2249,8 @@ msgstr "Датотеката %B веќе постои. Дали сакате д�
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr ""
 "Датотеката веќе постои во \"%F\".  Заменувањето ќе запише врз нејзината "
 "содржина."
@@ -3089,7 +3135,8 @@ msgid "This drop target only supports local files."
 msgstr "Целта за спуштање подржува само локални датотеки."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:400
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "За да отворите не-локални датотеки копирајте ги во локална папка и пуштете "
 "ги повторно."
@@ -3162,14 +3209,16 @@ msgstr "Автоматско извршување"
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 "Разгледај ги сите локални, далечни дискови и папки пристапливи од овој "
 "компјутер"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
-msgstr "Смени го однесувањето и изгледот на прозорците на менаџерот за датотеки"
+msgstr ""
+"Смени го однесувањето и изгледот на прозорците на менаџерот за датотеки"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:2
 msgid "File Management"
@@ -3209,7 +3258,8 @@ msgid "Nautilus metafile factory"
 msgstr "Фабрика за метадатотеки на Nautilus"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr ""
 "Операции на Nautilus школката кои можат да се извршуваат од последователна "
 "командна линија."
@@ -3251,7 +3301,8 @@ msgstr "Промени ја _позадината"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Покажи прозорец кој ти овозможува да ја подесиш позадината на работната "
 "околина"
@@ -3437,7 +3488,8 @@ msgstr "Направи документ според мострата %s"
 
 #: ../src/file-manager/fm-directory-view.c:5517
 msgid "All executable files in this folder will appear in the Scripts menu."
-msgstr "Сите извршливи датотеки во оваа папка ќе се појават во мени за скрипти."
+msgstr ""
+"Сите извршливи датотеки во оваа папка ќе се појават во мени за скрипти."
 
 #: ../src/file-manager/fm-directory-view.c:5519
 msgid ""
@@ -3502,18 +3554,26 @@ msgstr "%s ќе биде ископирана ако ја изберете ко�
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
-msgstr[0] "%'d избран предмет ќе биде преместен ако ја изберете командата Вменти"
-msgstr[1] "%'d избрани предмети ќе бидат преместени ако ја изберете командата Вметни"
-msgstr[2] "%'d избрани предмети ќе бидат преместени ако ја изберете командата Вметни"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"%'d избран предмет ќе биде преместен ако ја изберете командата Вменти"
+msgstr[1] ""
+"%'d избрани предмети ќе бидат преместени ако ја изберете командата Вметни"
+msgstr[2] ""
+"%'d избрани предмети ќе бидат преместени ако ја изберете командата Вметни"
 
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "%'d избран предмет ќе биде ископиран ако ја изберете командата Вметни"
-msgstr[1] "%'d избрани предмети ќе бидат ископирани ако ја изберете командата Вметни"
-msgstr[2] "%'d избрани предмети ќе бидат ископирани ако ја изберете командата Вметни"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"%'d избран предмет ќе биде ископиран ако ја изберете командата Вметни"
+msgstr[1] ""
+"%'d избрани предмети ќе бидат ископирани ако ја изберете командата Вметни"
+msgstr[2] ""
+"%'d избрани предмети ќе бидат ископирани ако ја изберете командата Вметни"
 
 #: ../src/file-manager/fm-directory-view.c:5767
 #: ../src/file-manager/fm-tree-view.c:1013
@@ -3664,7 +3724,8 @@ msgstr "Отвори со _друга апликација..."
 #: ../src/file-manager/fm-directory-view.c:6620
 #: ../src/file-manager/fm-directory-view.c:6624
 msgid "Choose another application with which to open the selected item"
-msgstr "Изберете друга апликација со која што сакате да го отворите саканиот предмет"
+msgstr ""
+"Изберете друга апликација со која што сакате да го отворите саканиот предмет"
 
 #. name, stock id
 #. label, accelerator
@@ -3682,7 +3743,8 @@ msgstr "Покажи ја папката што ги содржи скрипти
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6636
 msgid "Prepare the selected files to be moved with a Paste command"
-msgstr "Припреми ги избраните датотеки да бидат преместени со командата „Вметни“"
+msgstr ""
+"Припреми ги избраните датотеки да бидат преместени со командата „Вметни“"
 
 #. name, stock id
 #. label, accelerator
@@ -3733,7 +3795,8 @@ msgstr "Избери ги _предметите кои се совпаѓаат �
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6658
 msgid "Select items in this window matching a given pattern"
-msgstr "Избери ги сите предмети во овој прозорец што се совпаѓаат со даден шаблон..."
+msgstr ""
+"Избери ги сите предмети во овој прозорец што се совпаѓаат со даден шаблон..."
 
 #. name, stock id
 #. label, accelerator
@@ -4215,7 +4278,8 @@ msgstr "Команда"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Немаш пермисии да пристапиш до содржината на %s."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4234,12 +4298,14 @@ msgstr "Содржината на папката не може да се при�
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Името %s\" веќе постои во оваа папка. Те молам пробај со друго име."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "Нема %s во оваа папка. Изгледа дека е преместен или избришан?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -4273,7 +4339,8 @@ msgstr "Предметот не може да се преименува."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Немаш пермисии за да ја смениш групата на %s."
 
 #. fall through
@@ -4391,7 +4458,8 @@ msgstr "Исчис_ти по име"
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1495
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "Распореди ги иконите за да одговараат подобро и за да се одбегне преклопување"
+msgstr ""
+"Распореди ги иконите за да одговараат подобро и за да се одбегне преклопување"
 
 #. name, stock id
 #. label, accelerator
@@ -4843,7 +4911,8 @@ msgstr "Поглед на текст:"
 
 #: ../src/file-manager/fm-properties-window.c:4773
 msgid "You are not the owner, so you cannot change these permissions."
-msgstr "Вие не сте сопственикот и затоа не можете да ги менувате овие пермисии."
+msgstr ""
+"Вие не сте сопственикот и затоа не можете да ги менувате овие пермисии."
 
 #: ../src/file-manager/fm-properties-window.c:4797
 msgid "SELinux context:"
@@ -5456,8 +5525,10 @@ msgstr ""
 "листата."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
-msgstr "Одберете што да се случи при внесување на медиуми или уреди на системот"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
+msgstr ""
+"Одберете што да се случи при внесување на медиуми или уреди на системот"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
 msgid "Count _number of items:"
@@ -5481,7 +5552,8 @@ msgstr "Преференции за работа со датотеки"
 
 #: ../src/nautilus-file-management-properties.glade.h:57
 msgid "I_nclude a Delete command that bypasses Trash"
-msgstr "_Вклучи команда за бришење што не преместува во ѓубрето (трајно бришење)"
+msgstr ""
+"_Вклучи команда за бришење што не преместува во ѓубрето (трајно бришење)"
 
 #: ../src/nautilus-file-management-properties.glade.h:58
 msgid ""
@@ -5853,7 +5925,8 @@ msgstr "nautilus: --геометријата неможе да се корист
 
 #: ../src/nautilus-navigation-window-menus.c:123
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "Сигурно ли сакате Nautilus да ги заборави сите локации кои сте ги посетиле?"
+msgstr ""
+"Сигурно ли сакате Nautilus да ги заборави сите локации кои сте ги посетиле?"
 
 #: ../src/nautilus-navigation-window-menus.c:317
 #: ../src/nautilus-window-bookmarks.c:98
@@ -6523,8 +6596,10 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "Не можам да прикажам „%s“, затоа што хостот не е пронајден."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "Проверете дали е точно спелувањето и проверете ги поставувањата за прокси."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"Проверете дали е точно спелувањето и проверете ги поставувањата за прокси."
 
 #: ../src/nautilus-window-manage-views.c:1947
 #, c-format
@@ -6641,7 +6716,8 @@ msgstr "_Позадини и амблеми..."
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
-msgstr "Прикажи шари, бои, и амблеми што можат да се користат за сопствен изглед"
+msgstr ""
+"Прикажи шари, бои, и амблеми што можат да се користат за сопствен изглед"
 
 #: ../src/nautilus-window-menus.c:800
 msgid "Prefere_nces"
@@ -6903,3 +6979,145 @@ msgstr "Зум"
 msgid "Set the zoom level of the current view"
 msgstr "Наместете го нивото на зум"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Слика/ознака на граница"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Дебелина на границата околу насловот и сликата во дијалогот за известување"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Тип на известување"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Тип на известување"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Копчиња за известување"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Копчината што се прикажани во дијалогот за известување"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Покажи по_веќе детали"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Текст"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Текстот на ознаката"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Порамнување"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Подредувањето на линиите во текстот на насловот релативни една на друга. Ова "
+"нема влијание врз подредувањето на насловот во неговиоата алокација. "
+"Погледнете го GtkNisc::xaling за тоа."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Пренос на линија"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Доколку е избрано, префрли ги линиите ако текстот е премногу широк."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Позиција на покажувачот"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Позиција на вметнување. "
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Не не направен избор"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Позиција од спротивниот крај на изборот."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Одбери сѐ"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Методи на Внесување"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf грешка:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf грешка: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Сите наредни грешки ќе бидат прикажани само во терминал."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Ниту една слика не е означена"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Мора да кликнете на некоја слика за да ја означите."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Кликнете „Откажи“ за да ја запрете оваа операција."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (неважечки Unicode)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "Отворам %s"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Отворам %d предмет"
+msgstr[1] "Отворам %d предмети"
+msgstr[2] "Отворам %d предмети"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Внесете лозинка"
diff --git a/po/ml.po b/po/ml.po
index f1fc84c67..60fde37df 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ml.po (nautilus.HEAD.ml)  #-#-#-#-#
 # translation of nautilus.HEAD.ml.po to Malayalam
 # This file is distributed under the same license as the nautilus package.
 # Copyright (C) 2003-2008 nautilus' COPYRIGHT HOLDER.
@@ -5,8 +6,19 @@
 # Santhosh Thottingal <santhosh.thottingal@gmail.com>, 2008.
 # Ani Peter <apeter@redhat.com>, 2006, 2007, 2008.
 # പ്രവീണ്‍ അരിമ്പ്രത്തൊടിയില്‍ <pravi.a@gmail.com>, 2008.
+# #-#-#-#-#  ml.po (eel.HEAD.ml)  #-#-#-#-#
+# translation of eel.HEAD.ml.po to Malayalam
+# Malayalam translation of eel
+# This file is distributed under the same license as the eel package.
+# Copyright (C) 2003-2008 eel'S COPYRIGHT HOLDER.
+# FSF-India <locale@gnu.org.in>, 2003.
+# Ani Peter <apeter@redhat.com>, 2006
+# Manu S Madhav <manusmad@gmail.com>, 2008.
+# Reviewed by മണിലാല്‍ കെ.എം|Manilal K M <libregeek@gmail.com>, 2008
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ml.po (nautilus.HEAD.ml)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.ml\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-14 04:03+0000\n"
@@ -19,6 +31,19 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Country: INDIA\n"
+"#-#-#-#-#  ml.po (eel.HEAD.ml)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.ml\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-08-20 14:52+0530\n"
+"Last-Translator: മണിലാല്‍ കെ.എം|Manilal K M <libregeek@gmail.com>\n"
+"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
+"discuss@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -331,19 +356,19 @@ msgid ""
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
 msgstr ""
-"വളരെ നീണ്ട പേരുകളുള്ള ഫയലുകള്‍ പണിയിടത്തില്‍ വലിപ്പതിന്റെ തോതനുസരിച്ചു് എലിപ്സിസുപയോഗിച്ചു് മാറ്റേണ്ടതു് "
-"എങ്ങനെയാണെന്നു് വ്യക്തമാക്കുന്ന എണ്ണല്‍ സംഖ്യ. പട്ടികയിലെ ഓരോ വിലയും \"വലിപ്പത്തിന്റെ തോതു്:എണ്ണല്‍ സംഖ്യ\" "
-"എന്ന രുപത്തിലാണു്. സംഖ്യ 0 ത്തിനേക്കാള്‍ വലുതാണെങ്കില്‍ ഫയലിന്റെ പേരു് നല്‍കിയ വരികളില്‍ കൂടില്ല. സംഖ്യ "
-"പൂജ്യമോ അതില്‍ ചെറുതോ ആണെങ്കില്‍ കാണിയ്ക്കുന്ന വരികള്‍ക്കു് ഒരു പരിധിയും വയ്ക്കുന്നതായിരിയ്ക്കില്ല. "
-"\"എണ്ണല്‍ സംഖ്യ\" എന്ന രൂപത്തില്‍ ഒരു പ്രത്യേക വലിപ്പത്തിന്റെ തോതു് നല്‍കാതെ സഹജമായ വിലയായി നല്‍കാവുന്നതാണു്."
-" ഇതു് മറ്റെല്ലാ വലിപ്പത്തിന്റെ തോതുകള്‍ക്കും ഏറ്റവും കൂടിയ വരികളുടെ എണ്ണം നിര്‍വ്വചിയ്ക്കുന്നു. ഉദാഹരണങ്ങള്‍ "
-": 0 - എല്ലായ്പോഴും വളരെ നീണ്ട ഫയലിന്റെ പേരുകള്‍ കാണിയ്ക്കുന്നു; 3 - മൂന്നു് വരിയില്‍ കവിയുകയാണെങ്കില്‍ "
-"ഫയലിന്റെ പേരുകള്‍ ചുരുക്കുക; smallest:5,smaller:4,0 - \"smallest\" എന്ന വലിപ്പത്തിന്റെ തോതില്‍ അഞ്ചു് "
-"വരിയില്‍ കവിഞ്ഞാല്‍ ഫയലിന്റെ പേരുകള്‍ ചുരുക്കുക. \"smaller\" എന്ന വലിപ്പത്തിന്റെ തോതില്‍ നാലു് വരിയില്‍ "
-"കവിഞ്ഞാല്‍ ഫയലിന്റെ പേരുകള്‍ ചുരുക്കുക. മറ്റു് വലിപ്പത്തിന്റെ തോതുകള്‍ക്കു് ഫയലുകളുടെ പേരുകള്‍ ചുരുക്കേണ്ട. "
-"ലഭ്യമായ വലിപ്പത്തിന്റെ തോതുകള്‍: "
-"smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
-"larger (200%), largest (400%)"
+"വളരെ നീണ്ട പേരുകളുള്ള ഫയലുകള്‍ പണിയിടത്തില്‍ വലിപ്പതിന്റെ തോതനുസരിച്ചു് എലിപ്സിസുപയോഗിച്ചു് "
+"മാറ്റേണ്ടതു് എങ്ങനെയാണെന്നു് വ്യക്തമാക്കുന്ന എണ്ണല്‍ സംഖ്യ. പട്ടികയിലെ ഓരോ വിലയും \"വലിപ്പത്തിന്റെ "
+"തോതു്:എണ്ണല്‍ സംഖ്യ\" എന്ന രുപത്തിലാണു്. സംഖ്യ 0 ത്തിനേക്കാള്‍ വലുതാണെങ്കില്‍ ഫയലിന്റെ പേരു് നല്‍കിയ "
+"വരികളില്‍ കൂടില്ല. സംഖ്യ പൂജ്യമോ അതില്‍ ചെറുതോ ആണെങ്കില്‍ കാണിയ്ക്കുന്ന വരികള്‍ക്കു് ഒരു പരിധിയും "
+"വയ്ക്കുന്നതായിരിയ്ക്കില്ല. \"എണ്ണല്‍ സംഖ്യ\" എന്ന രൂപത്തില്‍ ഒരു പ്രത്യേക വലിപ്പത്തിന്റെ തോതു് "
+"നല്‍കാതെ സഹജമായ വിലയായി നല്‍കാവുന്നതാണു്. ഇതു് മറ്റെല്ലാ വലിപ്പത്തിന്റെ തോതുകള്‍ക്കും ഏറ്റവും കൂടിയ "
+"വരികളുടെ എണ്ണം നിര്‍വ്വചിയ്ക്കുന്നു. ഉദാഹരണങ്ങള്‍ : 0 - എല്ലായ്പോഴും വളരെ നീണ്ട ഫയലിന്റെ പേരുകള്‍ "
+"കാണിയ്ക്കുന്നു; 3 - മൂന്നു് വരിയില്‍ കവിയുകയാണെങ്കില്‍ ഫയലിന്റെ പേരുകള്‍ ചുരുക്കുക; smallest:5,"
+"smaller:4,0 - \"smallest\" എന്ന വലിപ്പത്തിന്റെ തോതില്‍ അഞ്ചു് വരിയില്‍ കവിഞ്ഞാല്‍ ഫയലിന്റെ "
+"പേരുകള്‍ ചുരുക്കുക. \"smaller\" എന്ന വലിപ്പത്തിന്റെ തോതില്‍ നാലു് വരിയില്‍ കവിഞ്ഞാല്‍ ഫയലിന്റെ "
+"പേരുകള്‍ ചുരുക്കുക. മറ്റു് വലിപ്പത്തിന്റെ തോതുകള്‍ക്കു് ഫയലുകളുടെ പേരുകള്‍ ചുരുക്കേണ്ട. ലഭ്യമായ "
+"വലിപ്പത്തിന്റെ തോതുകള്‍: smallest (33%), smaller (50%), small (66%), standard "
+"(100%), large (150%), larger (200%), largest (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -361,11 +386,13 @@ msgid ""
 "limit is imposed on the number of displayed lines."
 msgstr ""
 "വളരെ നീണ്ട പേരുകളുള്ള ഫയലുകള്‍ പണിയിടത്തില്‍ എലിപ്സിസുപയോഗിച്ചു് മാറ്റേണ്ടതു് എങ്ങനെയാണെന്നു് "
-"വ്യക്തമാക്കുന്ന എണ്ണല്‍ സംഖ്യ. സംഖ്യ 0 ത്തിനേക്കാള്‍ വലുതാണെങ്കില്‍ ഫയലിന്റെ പേരു് നല്‍കിയ വരികളില്‍ കൂടില്ല."
-" സംഖ്യ പൂജ്യമോ അതില്‍ ചെറുതോ ആണെങ്കില്‍ കാണിയ്ക്കുന്ന വരികള്‍ക്കു് ഒരു പരിധിയും വയ്ക്കുന്നതായിരിയ്ക്കില്ല."
+"വ്യക്തമാക്കുന്ന എണ്ണല്‍ സംഖ്യ. സംഖ്യ 0 ത്തിനേക്കാള്‍ വലുതാണെങ്കില്‍ ഫയലിന്റെ പേരു് നല്‍കിയ വരികളില്‍ "
+"കൂടില്ല. സംഖ്യ പൂജ്യമോ അതില്‍ ചെറുതോ ആണെങ്കില്‍ കാണിയ്ക്കുന്ന വരികള്‍ക്കു് ഒരു പരിധിയും "
+"വയ്ക്കുന്നതായിരിയ്ക്കില്ല."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "ഫോള്‍ഡറിന് പശ്ചാത്തലത്തില്‍ സ്വതവേയുള്ള നിറം. background_set=true ആണെങ്കില്‍‌ മാത്രം ഇതു്  "
 "ഉപയോഗിക്കുന്നു."
@@ -531,9 +558,9 @@ msgid ""
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
 "tab list."
 msgstr ""
-"\"after_current_tab\" എന്നാണു് സജ്ജീകരിച്ചതെങ്കില്‍, പുതിയ കിളിവാതിലുകള്‍ ഇപ്പോഴത്തെ കിളിവാതിലിനു് ശേഷമാണു് "
-"ചേര്‍ക്കുന്നതു്. \"end\" എന്നാണു് സജ്ജീകരിച്ചിരിയ്ക്കുന്നതെങ്കില്‍ കിളിവാതിലുകളുടെ പട്ടികയില്‍ ഏറ്റവും "
-"അവസാനമാണു് പുതിയ കിളിവാതിലുകള്‍ ചേര്‍ക്കുന്നതു്."
+"\"after_current_tab\" എന്നാണു് സജ്ജീകരിച്ചതെങ്കില്‍, പുതിയ കിളിവാതിലുകള്‍ ഇപ്പോഴത്തെ "
+"കിളിവാതിലിനു് ശേഷമാണു് ചേര്‍ക്കുന്നതു്. \"end\" എന്നാണു് സജ്ജീകരിച്ചിരിയ്ക്കുന്നതെങ്കില്‍ "
+"കിളിവാതിലുകളുടെ പട്ടികയില്‍ ഏറ്റവും അവസാനമാണു് പുതിയ കിളിവാതിലുകള്‍ ചേര്‍ക്കുന്നതു്."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
@@ -544,7 +571,8 @@ msgstr ""
 "അല്ലെങ്കില്‍ കൂടുകളും ഫയലുകളും കാണിക്കുന്നതാണു്."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "ഇതു്  ശരി എങ്കില്‍, പുതുതായി തുറന്ന ജാലകങ്ങളില്‍ സ്ഥാനസൂചനാപട്ട ദൃശ്യമായിരിയ്ക്കും"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -607,9 +635,9 @@ msgid ""
 "configurable action will be taken instead."
 msgstr ""
 "ശരി എന്നു് സജ്ജീകരിച്ചാല്‍ മാധ്യമം സ്വയം മൌണ്ടു് ചെയ്യുമ്പോള്‍ നോട്ടിലസ് സ്വയം ഒരു അറ "
-"തുറക്കുന്നതായിരിയ്ക്കും. x-content/* തരം കണ്ടുപിടിയ്ക്കാന്‍ കഴിയാത്ത മാധ്യമത്തിനു് മാത്രമേ ഇതു് ബാധകമുള്ളൂ; "
-"അറിയാവുന്ന x-content തരം കണ്ടുപിടിച്ചാല്‍ ഉപയോക്താവും ക്രമീകരിച്ച നടപടിയായിരിയ്ക്കും ഇതിനു് "
-"പകരമെടുക്കുന്നതു്."
+"തുറക്കുന്നതായിരിയ്ക്കും. x-content/* തരം കണ്ടുപിടിയ്ക്കാന്‍ കഴിയാത്ത മാധ്യമത്തിനു് മാത്രമേ ഇതു് "
+"ബാധകമുള്ളൂ; അറിയാവുന്ന x-content തരം കണ്ടുപിടിച്ചാല്‍ ഉപയോക്താവും ക്രമീകരിച്ച "
+"നടപടിയായിരിയ്ക്കും ഇതിനു് പകരമെടുക്കുന്നതു്."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
@@ -672,8 +700,8 @@ msgid ""
 "If set to true, then multiple views can be opened in one browser window, "
 "each in a separate tab."
 msgstr ""
-"ശരിയെന്നും സജ്ജീകരിച്ചാല്‍ ഓരോ കാഴ്ചയും ഓരോ കിളിവാതിലിലായി ഒന്നിലധികം കാഴ്ചകള്‍ ഒരു പരതാനുള്ള ജാലകത്തില്‍ "
-"തന്നെ തുറക്കാവുന്നതാണു്."
+"ശരിയെന്നും സജ്ജീകരിച്ചാല്‍ ഓരോ കാഴ്ചയും ഓരോ കിളിവാതിലിലായി ഒന്നിലധികം കാഴ്ചകള്‍ ഒരു "
+"പരതാനുള്ള ജാലകത്തില്‍ തന്നെ തുറക്കാവുന്നതാണു്."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid ""
@@ -703,7 +731,8 @@ msgstr ""
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr "ഇതു്  ശരി എന്നു ക്രമീകരിച്ചാല്‍, ചവറ്റുകുട്ടയെ സൂചിപ്പിക്കുന്ന സൂചനാചിത്രങ്ങള്‍ പണിയിടത്തിലാവും കാണുക"
+msgstr ""
+"ഇതു്  ശരി എന്നു ക്രമീകരിച്ചാല്‍, ചവറ്റുകുട്ടയെ സൂചിപ്പിക്കുന്ന സൂചനാചിത്രങ്ങള്‍ പണിയിടത്തിലാവും കാണുക"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid ""
@@ -718,8 +747,8 @@ msgid ""
 "If this preference is set, all columns in the compact view have the same "
 "width. Otherwise, the width of each column is determined seperately."
 msgstr ""
-"ഈ മുന്‍ഗണന സജ്ജീകരിച്ചാല്‍ ചുരുങ്ങിയ കാഴ്ചയില്‍ എല്ലാ കളങ്ങള്‍ക്കും തുല്ല്യ വീതിയായിരിയ്ക്കും. അതല്ലെങ്കില്‍ "
-"ഒരോ കളത്തിനുമുള്ള വീതി വെവ്വേറെ തീരുമാനിയ്ക്കുന്നതായിരിയ്ക്കും."
+"ഈ മുന്‍ഗണന സജ്ജീകരിച്ചാല്‍ ചുരുങ്ങിയ കാഴ്ചയില്‍ എല്ലാ കളങ്ങള്‍ക്കും തുല്ല്യ വീതിയായിരിയ്ക്കും. "
+"അതല്ലെങ്കില്‍ ഒരോ കളത്തിനുമുള്ള വീതി വെവ്വേറെ തീരുമാനിയ്ക്കുന്നതായിരിയ്ക്കും."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid ""
@@ -749,7 +778,8 @@ msgstr ""
 "വിന്യസിക്കുന്നതു്."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "ഇതു്  ശരി എന്നു ക്രമീകരിച്ചാല്‍, സൂചനാചിത്രങ്ങളുടെ അടിയില്‍ കാണിക്കുന്നതിനു പകരം വശത്തു്  ലേബലുകള്‍ "
 "സ്ഥാപിക്കുന്നു."
@@ -780,8 +810,8 @@ msgid ""
 "application be started on insertion of media matching these types."
 msgstr ""
 "മുന്‍ഗണനകള്‍ തെരഞ്ഞെടുക്കുന്നതിനുള്ള ലഘുപ്രയോഗത്തില്‍ \"ഒന്നും ചെയ്യേണ്ട\" എന്നു് ഉപയോക്താവു് തെരഞ്ഞെടുത്ത "
-"x-content/* തരങ്ങളുടെ പട്ടിക. ഇതുമായി പൊരുത്തമുള്ള മാധ്യമം ഇടുമ്പോള്‍ ഓര്‍മ്മപ്പെടുത്തുകയോ പൊരുത്തമുള്ള "
-"പ്രയോഗം തുടങ്ങുകയോ ചെയ്യുന്നതല്ല."
+"x-content/* തരങ്ങളുടെ പട്ടിക. ഇതുമായി പൊരുത്തമുള്ള മാധ്യമം ഇടുമ്പോള്‍ ഓര്‍മ്മപ്പെടുത്തുകയോ "
+"പൊരുത്തമുള്ള പ്രയോഗം തുടങ്ങുകയോ ചെയ്യുന്നതല്ല."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
@@ -789,9 +819,9 @@ msgid ""
 "the preferences capplet. A folder window will be opened on insertion of "
 "media matching these types."
 msgstr ""
-"മുന്‍ഗണനകള്‍ തെരഞ്ഞെടുക്കുന്നതിനുള്ള ലഘുപ്രയോഗത്തില്‍ \"അറ തുറക്കുക\" എന്നു് ഉപയോക്താവു് തെരഞ്ഞെടുത്ത "
-"x-content/* തരങ്ങളുടെ പട്ടിക. ഈ തരങ്ങളുമായി പൊരുത്തപ്പെടുന്ന മാധ്യമങ്ങള്‍ ഇടുന്ന സമയത്തു് അറയുടെ ജാലകം "
-"തുറക്കുന്നതായിരിയ്ക്കും."
+"മുന്‍ഗണനകള്‍ തെരഞ്ഞെടുക്കുന്നതിനുള്ള ലഘുപ്രയോഗത്തില്‍ \"അറ തുറക്കുക\" എന്നു് ഉപയോക്താവു് തെരഞ്ഞെടുത്ത x-"
+"content/* തരങ്ങളുടെ പട്ടിക. ഈ തരങ്ങളുമായി പൊരുത്തപ്പെടുന്ന മാധ്യമങ്ങള്‍ ഇടുന്ന സമയത്തു് അറയുടെ "
+"ജാലകം തുറക്കുന്നതായിരിയ്ക്കും."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
@@ -799,9 +829,9 @@ msgid ""
 "application in the preference capplet. The preferred application for the "
 "given type will be started on insertion on media matching these types."
 msgstr ""
-"മുന്‍ഗണനകള്‍ തെരഞ്ഞെടുക്കുന്നതിനുള്ള ലഘുപ്രയോഗത്തില്‍ ഒരു പ്രയോഗം തുടങ്ങാന്‍ ഉപയോക്താവു് തെരഞ്ഞെടുത്ത "
-"x-content/* തരങ്ങളുടെ പട്ടിക. ഈ തരങ്ങളുമായി പൊരുത്തപ്പെടുന്ന മാധ്യമങ്ങള്‍ ഇടുന്ന സമയത്തു് ആ തരത്തിനു് "
-"മുന്‍ഗണനയുള്ള പ്രയോഗം തുടങ്ങുന്നതായിരിയ്ക്കും."
+"മുന്‍ഗണനകള്‍ തെരഞ്ഞെടുക്കുന്നതിനുള്ള ലഘുപ്രയോഗത്തില്‍ ഒരു പ്രയോഗം തുടങ്ങാന്‍ ഉപയോക്താവു് തെരഞ്ഞെടുത്ത x-"
+"content/* തരങ്ങളുടെ പട്ടിക. ഈ തരങ്ങളുമായി പൊരുത്തപ്പെടുന്ന മാധ്യമങ്ങള്‍ ഇടുന്ന സമയത്തു് ആ "
+"തരത്തിനു് മുന്‍ഗണനയുള്ള പ്രയോഗം തുടങ്ങുന്നതായിരിയ്ക്കും."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -812,7 +842,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "\"അറ തുറക്കുക\" എന്നു് സജ്ജീകരിച്ച x-content/* തരങ്ങളുടെ പട്ടിക"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "മുന്‍ഗണനയുള്ള പ്രയോഗങ്ങള്‍ തുടങ്ങുന്ന x-content/* തരങ്ങളുടെ പട്ടിക"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -997,7 +1028,8 @@ msgstr "പണിയിടത്തിലുളള സൂചനാചിത്�
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "ഫയലിന്റെ തീയതികളെഴുതുന്ന രീതികള്‍. സാധ്യമായവ \"locale\", \"iso\",\"informal\"."
+msgstr ""
+"ഫയലിന്റെ തീയതികളെഴുതുന്ന രീതികള്‍. സാധ്യമായവ \"locale\", \"iso\",\"informal\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
@@ -1067,7 +1099,8 @@ msgid ""
 "\"icon_view\" and \"compact_view\"."
 msgstr ""
 "പ്രത്യേകം പ്രദര്‍ശനാരീതി ക്രമീകരിച്ചില്ലെങ്കില്‍ ഒരു അറ സന്ദര്‍ശിപ്പിക്കുമ്പോള്‍ ഈ രീതിയാണു് "
-"ഉപയോഗിക്കുക. സാധുവായവ \"പട്ടികയായുള്ള കാഴ്ച\", \"ചിഹ്നങ്ങളായുള്ള കാഴ്ച\", \"ചുരുങ്ങിയ കാഴ്ച\" എന്നിവയാണു്."
+"ഉപയോഗിക്കുക. സാധുവായവ \"പട്ടികയായുള്ള കാഴ്ച\", \"ചിഹ്നങ്ങളായുള്ള കാഴ്ച\", \"ചുരുങ്ങിയ കാഴ്ച"
+"\" എന്നിവയാണു്."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "When to show number of items in a folder"
@@ -1456,7 +1489,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "ക്ഷമിക്കണം, പുതിയ മുദ്രയ്ക്കു് ഒരു പേരു് വേണം."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "ക്ഷമിക്കണം, മുദ്രകളുടെ ശീര്‍ഷകങ്ങളില്‍ അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, വിടവുകള്‍ എന്നിവ മാത്രമേ പാടൂ."
 
 #. this really should never happen, as a user has no idea
@@ -1730,7 +1764,8 @@ msgstr "താങ്കള്‍ക്കു് \"%B\" എന്നെന്ന�
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "%'d തിരഞ്ഞെടുത്ത വസ്തു എന്നേക്കുമായി എടുത്തു്  കളയണമെന്നു് നിങ്ങള്‍ക്കു് ഉറപ്പോണോ?"
 msgstr[1] "%'d തിരഞ്ഞെടുത്ത വസ്തുക്കള്‍ എന്നേക്കുമായി എടുത്തു്  കളയണമെന്നു് നിങ്ങള്‍ക്കു് ഉറപ്പോണോ?"
 
@@ -1769,7 +1804,8 @@ msgstr "\"%B\" വായിക്കുവാനുളള അനുവാദം
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr "\"%B\" എന്ന അറയിലെ ഫയലുകളെക്കുറിച്ചുള്ള വിവരം ലഭിയ്ക്കുന്നതില്‍ ഒരു പിശകുണ്ടായി."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
@@ -1781,7 +1817,8 @@ msgstr "_ഉപേക്ഷിക്കുക"
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
-msgstr "\"%B\" വായിക്കുവാനുളള അനുവാദം നിങ്ങള്‍ക്കില്ലാത്തതിനാല്‍ ഇതു്  നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല."
+msgstr ""
+"\"%B\" വായിക്കുവാനുളള അനുവാദം നിങ്ങള്‍ക്കില്ലാത്തതിനാല്‍ ഇതു്  നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
 #: ../libnautilus-private/nautilus-file-operations.c:2401
@@ -1810,7 +1847,8 @@ msgstr[1] "%'d ഫയലുകള്‍ ചവറ്റുകുട്ടയി�
 
 #: ../libnautilus-private/nautilus-file-operations.c:1689
 msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "ഫയല്‍ ചവറ്റുകുട്ടയിലേക്കു് നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല, നിങ്ങള്‍ക്കു് ഉടന്‍ ഇതു്  നീക്കം ചെയ്യണമോ?"
+msgstr ""
+"ഫയല്‍ ചവറ്റുകുട്ടയിലേക്കു് നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല, നിങ്ങള്‍ക്കു് ഉടന്‍ ഇതു്  നീക്കം ചെയ്യണമോ?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1690
 msgid "The file \"%B\" cannot be moved to the trash."
@@ -2112,7 +2150,8 @@ msgstr "\"%B\" എന്ന ഫയല്‍ നിലവിലുണ്ട്. �
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr "നിലവില്‍ \"%F\"-ല്‍ ഫയലുണ്ട്.  അതു്  മാറ്റിയാല്‍ അതിന്റെ ഉളളടക്കം മാറ്റി എഴുതപ്പെടും."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3913
@@ -2943,8 +2982,8 @@ msgid ""
 "The default action cannot open \"%s\" because it cannot access files at \"%s"
 "\" locations."
 msgstr ""
-"സഹജമായ നടപടിയ്ക്കു് \"%s\" തുറക്കാന്‍ കഴിഞ്ഞില്ല. കാരണം അതിനു്  \"%s\" സ്ഥാനങ്ങളില്‍ ഉള്ള ഫയലുകള്‍ "
-"ലഭ്യമായില്ല."
+"സഹജമായ നടപടിയ്ക്കു് \"%s\" തുറക്കാന്‍ കഴിഞ്ഞില്ല. കാരണം അതിനു്  \"%s\" സ്ഥാനങ്ങളില്‍ ഉള്ള "
+"ഫയലുകള്‍ ലഭ്യമായില്ല."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
 msgid ""
@@ -2982,7 +3021,8 @@ msgid "This drop target only supports local files."
 msgstr "ഇതു്  ലോക്കല്‍ ഫയലുകളെ മാത്രം പിന്തുണയ്ക്കുന്നു."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "പ്രാദേശികമല്ലാത്ത ഫയലുകള്‍ തുറക്കാന്‍ ആദ്യം അവയെ പ്രാദേശിക അറയിലേയ്ക്കു് പകര്‍ത്തുക. എന്നിട്ടു് "
 "വലിച്ചിടുക."
@@ -3054,7 +3094,8 @@ msgstr "സ്വയം പ്രവര്‍ത്തിയ്ക്കാന�
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "ലഭ്യമായ പ്രാദേശികവും വിദൂരവുമായ എല്ലാ ഡിസ്ക്കുകളും അറകളും പരതുക."
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -3099,7 +3140,8 @@ msgid "Nautilus metafile factory"
 msgstr "നോട്ടിലസ് മെറ്റാഫയല്‍ ഫാക്ടറി"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr "ശേഷമുള്ള ആജ്ഞാസ്ഥാനത്തെ വിളികള്‍ കൊണ്ടു് ചെയ്യാവുന്ന നോട്ടിലസ്സിലെ ക്രിയകള്‍"
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -3139,7 +3181,8 @@ msgstr "പണിയിടപശ്ചാത്തലം മാറ്റുക"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "പണിയിടത്തിന്റെ നിറമോ പാറ്റേണോ മാറ്റാനുള്ള ജാലകം തുറക്കുക"
 
 #. label, accelerator
@@ -3382,7 +3425,8 @@ msgstr "നിങ്ങള്‍ ഒട്ടിക്കുന്നതിന�
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] ""
 "നിങ്ങള്‍ ഒട്ടിക്കുന്നതിനുളള നിര്‍‌ദ്ദേശം തിരഞ്ഞെടുത്താല്‍, %'d തിരഞ്ഞെടുത്ത വസ്തുവും അതിന്റെ സ്ഥാനത്തു്  "
 "നിന്നും നീക്കപ്പെടുന്നതാണു്."
@@ -3393,7 +3437,8 @@ msgstr[1] ""
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] ""
 "നിങ്ങള്‍ ഒട്ടിക്കുന്നതിനുളള നിര്‍‌ദ്ദേശം തിരഞ്ഞെടുത്താല്‍ %'d തിരഞ്ഞെടുത്ത വസ്തുവും പകര്‍ത്തുന്നതാണു്."
 msgstr[1] ""
@@ -4085,7 +4130,8 @@ msgstr "നിര്‍ദ്ദേശം "
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "നിങ്ങള്‍ക്കു് \"%s\" ന്റെ ഉള്ളടക്കം കാണുവാനുള്ള അനുവാദമില്ല."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4104,12 +4150,14 @@ msgstr "കൂടില്‍ ഉളള വസ്തുക്കള്‍ പ്
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "\"%s\" എന്ന പേരു് നിലവില്‍ ഉപയോഗത്തിലുണ്ട്, ദയവായി മറ്റൊരു പേരു് തിരഞ്ഞെടുക്കുക."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "ഈ കൂടില്‍ \"%s\" ലഭ്യമല്ല. ചിലപ്പോള്‍ അതു്  മാറ്റുകയോ എടുത്തു്  കളയുകയോ ചെയ്തിരിക്കാം?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -4141,7 +4189,8 @@ msgstr "വസ്തുവിന്റെ പേരു് മാറ്റുവ�
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "നിങ്ങള്‍ക്കു് \"%s\" ന്റെ കൂട്ടം മാറ്റാന്‍ അനുവാദമില്ല."
 
 #. fall through
@@ -4822,20 +4871,19 @@ msgid ""
 "We have also seen this error when a faulty version of bonobo-activation was "
 "installed."
 msgstr ""
-"നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല. \"bonobo-slay\" എന്ന ആജ്ഞ "
-"കണ്‍സോളില്‍ നിന്നും പ്രവര്‍ത്തിപ്പിച്ചാല്‍ ഇതു് ശരിയായേയ്ക്കാം. അല്ലെങ്കില്‍ നിങ്ങള്‍ക്കു് കമ്പ്യൂട്ടര്‍ "
-"വിണ്ടും "
-"തുടങ്ങിയോ നോട്ടിലസ് വീണ്ടും ഇന്‍സ്റ്റോള്‍ ചെയ്തോ നോക്കാം.\n"
+"നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല. \"bonobo-slay\" എന്ന ആജ്ഞ കണ്‍സോളില്‍ നിന്നും "
+"പ്രവര്‍ത്തിപ്പിച്ചാല്‍ ഇതു് ശരിയായേയ്ക്കാം. അല്ലെങ്കില്‍ നിങ്ങള്‍ക്കു് കമ്പ്യൂട്ടര്‍ വിണ്ടും തുടങ്ങിയോ "
+"നോട്ടിലസ് വീണ്ടും ഇന്‍സ്റ്റോള്‍ ചെയ്തോ നോക്കാം.\n"
 "\n"
-"ബൊണോബോയ്ക്കു് Nautilus_shell.server ഫയല്‍ കണ്ടുപിടിയ്ക്കാന്‍ സാധിച്ചില്ല. bonobo-activation "
-"ലൈബ്രറിയുടെ തട്ടു് ഉള്‍ക്കൊള്ളാത്ത ഒരു LD_LIBRARY_PATH ആവാം ഇതിനൊരു കാരണം.  "
+"ബൊണോബോയ്ക്കു് Nautilus_shell.server ഫയല്‍ കണ്ടുപിടിയ്ക്കാന്‍ സാധിച്ചില്ല. bonobo-"
+"activation ലൈബ്രറിയുടെ തട്ടു് ഉള്‍ക്കൊള്ളാത്ത ഒരു LD_LIBRARY_PATH ആവാം ഇതിനൊരു കാരണം.  "
 "സാധ്യതയുള്ള മറ്റൊരു കാരണം Nautilus_Shell.server ഫയലില്ലാത്ത കേടായ ഇന്‍സ്റ്റളേഷനാവാം.\n"
 "\n"
 "\"bonobo-slay\" പ്രവര്‍ത്തിപ്പിച്ചാല്‍ മറ്റു് പ്രയോഗങ്ങള്‍ക്കു് ആവശ്യമെങ്കില്‍ കൂടി ബൊണോബോ "
 "ആക്റ്റിവേഷനേയും ജികോണ്‍ഫ് പ്രക്രിയകളെയും ബലമായി നിര്‍ത്തും.\n"
 "\n"
-"ചിലപ്പോള്‍ bonobo-activation-server നേയും gconfd യേയും ബലമായി നിര്‍ത്തുന്നതു്, "
-"ഈ പ്രശ്നം പരിഹരിച്ചേയ്ക്കാം, പക്ഷേ എങ്ങനെയാണെന്നു് ഞങ്ങളോടു് ചോദിയ്ക്കരുതു്.\n"
+"ചിലപ്പോള്‍ bonobo-activation-server നേയും gconfd യേയും ബലമായി നിര്‍ത്തുന്നതു്, ഈ പ്രശ്നം "
+"പരിഹരിച്ചേയ്ക്കാം, പക്ഷേ എങ്ങനെയാണെന്നു് ഞങ്ങളോടു് ചോദിയ്ക്കരുതു്.\n"
 "\n"
 "bonobo-activation ന്റെ കേടായ പതിപ്പു് ഇന്‍സ്റ്റോള്‍ ചെയ്യുമ്പോഴും ഈ പിശകു് ഞങ്ങള്‍ കണ്ടിട്ടുണ്ടു്."
 
@@ -4858,8 +4906,8 @@ msgid ""
 "Nautilus cannot be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
-"ഫയലുകളുടെ നടത്തിപ്പുകാരന്റെ കാഴ്ചാ സേവകനില്‍ രെജിസ്റ്റര്‍ ചെയ്യാന്‍ ശ്രമിയ്ക്കുമ്പോള്‍ ബൊണോബോയില്‍ നിന്നുള്ള "
-"അപ്രതീക്ഷിതമായ പിശകു് കാരണം നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല."
+"ഫയലുകളുടെ നടത്തിപ്പുകാരന്റെ കാഴ്ചാ സേവകനില്‍ രെജിസ്റ്റര്‍ ചെയ്യാന്‍ ശ്രമിയ്ക്കുമ്പോള്‍ ബൊണോബോയില്‍ "
+"നിന്നുള്ള അപ്രതീക്ഷിതമായ പിശകു് കാരണം നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല."
 
 #: ../src/nautilus-application.c:652
 msgid ""
@@ -4867,9 +4915,9 @@ msgid ""
 "attempting to locate the factory. Killing bonobo-activation-server and "
 "restarting Nautilus may help fix the problem."
 msgstr ""
-"ഫാക്റ്ററി കണ്ടുപിടിയ്ക്കാന്‍ ശ്രമിയ്ക്കുമ്പോള്‍ ബൊണോബോയില്‍ നിന്നും അപ്രതീക്ഷിതമായി ഒരു പിശകു് പറ്റിയതിനാല്‍ "
-"നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല. bonobo-activation-server ബലമായി നിര്‍ത്തിയതിനു ശേഷം നോട്ടിലസ് "
-"വാണ്ടു് തുടങ്ങുന്നതു് ചിലപ്പോള്‍ പ്രശ്നം പരിഹരിച്ചേയ്ക്കാം."
+"ഫാക്റ്ററി കണ്ടുപിടിയ്ക്കാന്‍ ശ്രമിയ്ക്കുമ്പോള്‍ ബൊണോബോയില്‍ നിന്നും അപ്രതീക്ഷിതമായി ഒരു പിശകു് "
+"പറ്റിയതിനാല്‍ നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല. bonobo-activation-server "
+"ബലമായി നിര്‍ത്തിയതിനു ശേഷം നോട്ടിലസ് വാണ്ടു് തുടങ്ങുന്നതു് ചിലപ്പോള്‍ പ്രശ്നം പരിഹരിച്ചേയ്ക്കാം."
 
 #: ../src/nautilus-application.c:659
 msgid ""
@@ -4878,8 +4926,8 @@ msgid ""
 "restarting Nautilus may help fix the problem."
 msgstr ""
 "ഷെല്‍ ഒബ്ജക്റ്റിനെ കണ്ടുപിടിയ്ക്കാന്‍ ശ്രമിയ്ക്കുമ്പോള്‍ ബൊണോബോയില്‍ നിന്നും അപ്രതീക്ഷിതമായി ഒരു പിശകു് "
-"പറ്റിയതിനാല്‍ നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല. bonobo-activation-server ബലമായി നിര്‍ത്തിയതിനു "
-"ശേഷം നോട്ടിലസ് വാണ്ടു് തുടങ്ങുന്നതു് ചിലപ്പോള്‍ പ്രശ്നം പരിഹരിച്ചേയ്ക്കാം."
+"പറ്റിയതിനാല്‍ നോട്ടിലസ് ഇപ്പോള്‍ ഉപയോഗിയ്ക്കാന്‍ സാധ്യമല്ല. bonobo-activation-server "
+"ബലമായി നിര്‍ത്തിയതിനു ശേഷം നോട്ടിലസ് വാണ്ടു് തുടങ്ങുന്നതു് ചിലപ്പോള്‍ പ്രശ്നം പരിഹരിച്ചേയ്ക്കാം."
 
 #: ../src/nautilus-application.c:1369 ../src/nautilus-places-sidebar.c:1682
 #: ../src/nautilus-places-sidebar.c:1705 ../src/nautilus-places-sidebar.c:1728
@@ -5312,8 +5360,10 @@ msgid "Choose the order of information to appear in the list view."
 msgstr "പട്ടികാപ്രദര്‍ശനരീതിയില്‍ കാണപ്പെടേണ്ട വിവരങ്ങളുടെ ക്രമം തിരഞ്ഞെടുക്കുക."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
-msgstr "മാധ്യമങ്ങള്‍ വയ്ക്കുമ്പോളോ ഉപകരണങ്ങള്‍ ഘടിപ്പിയ്ക്കുമ്പോഴോ എന്താണു് ചെയ്യേണ്ടതെന്നു് തെരഞ്ഞെടുക്കുക"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
+msgstr ""
+"മാധ്യമങ്ങള്‍ വയ്ക്കുമ്പോളോ ഉപകരണങ്ങള്‍ ഘടിപ്പിയ്ക്കുമ്പോഴോ എന്താണു് ചെയ്യേണ്ടതെന്നു് തെരഞ്ഞെടുക്കുക"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
 msgid "Count _number of items:"
@@ -6374,7 +6424,8 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "\"%s\" പ്രദര്‍ശിപ്പിക്കുവാന്‍ സാധ്യമായില്ല, കാരണം ഹോസ്റ്റ് കണ്ടുപിടിയ്ക്കാന്‍ സാധിച്ചില്ല."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "അക്ഷരത്തെറ്റും നിങ്ങളുടെ പ്രോക്സി ക്രമീകരണങ്ങളും പരിശോധിക്കുക."
 
 #: ../src/nautilus-window-manage-views.c:1947
@@ -6421,8 +6472,8 @@ msgid ""
 msgstr ""
 "നിങ്ങള്‍ക്കു് നോട്ടിലസിനോടൊപ്പം ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പു് "
 "ലഭിച്ചിട്ടുണ്ടായിരിയ്ക്കണം; ഇല്ലെങ്കില്‍, ഈ വിലാസത്തിലേയ്ക്കെഴുതുക: Free Software "
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301, USA."
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+"USA."
 
 #: ../src/nautilus-window-menus.c:562
 msgid ""
@@ -6749,6 +6800,146 @@ msgstr "വലുതാക്കുക"
 msgid "Set the zoom level of the current view"
 msgstr "ഈ പ്രദര്‍ശനരീതിയുടെ വലുപ്പനിലവാരം നിശ്ചയിക്കുക"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ചിത്രം/ലേബല്‍ അതിര്‍ത്തി"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "അറിയിപ്പു് ചെറുജാലകത്തില്‍ ലേബലിന്റെയും ചിത്രത്തിന്റെയും ചുറ്റുമുള്ള അതിര്‍ത്തിയുടെ വണ്ണം"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "അറിയിപ്പു് തരം"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "ഏത് തരം അറിയിപ്പു്"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "അറിയിപ്പു് ബട്ടണുകള്‍"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "അറിയിപ്പു് ചെറുജാലകത്തില്‍ കാണിച്ചിരിക്കുന്ന ബട്ടണുകള്‍"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "കൂടുതല്‍ _വിവരങ്ങള്‍ കാണിക്കുക"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "പദാവലി"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ലേബലിലുളള പദാവലി."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "ഉഭയക്രമീകരണം"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"ലേബല്‍ പദാവലിയിലെ വരികള്‍ തമ്മിലുള്ള ചേര്‍ച്ച. ഇതു് ലേബലിന്റെ സ്ഥാനത്തുള്ള ചേര്‍ച്ചയെ ബാധിക്കില്ല, "
+"അതിനായി GtkMisc::xalign കാണുക."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "വരി ചുരുക്കല്‍"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "സജ്ജീകരിച്ചാല്‍, പദാവലിയുടെ വീതി കൂടിയാല്‍ വരികള്‍ ചുരുക്കുന്നു."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "കര്‍സര്‍ സ്ഥാനം"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "ഇടചേര്‍ക്കല്‍ കര്‍സറിന്റെ നിലവിലുള്ള സ്ഥാനം അക്ഷരങ്ങളുടെ തോതില്‍."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "തെരഞ്ഞെടുക്കല്‍ പരിധി"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "കര്‍സറില്‍ നിന്നും തെരഞ്ഞെടുത്തതിന്റെ എതിര്‍വശത്തേയ്ക്കുള്ള സ്ഥാനം അക്ഷരങ്ങളുടെ തോതില്‍."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "നിവേശകരീതികള്‍"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf പിശക്:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf പിശക്: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ഇനിയുളള എല്ലാ പിശകുകളും ടെര്‍മിനലില്‍ മാത്രമേ കാണിക്കൂ."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "ചിത്രം തെരഞ്ഞെടുത്തിട്ടില്ല."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "തിരഞ്ഞെടുക്കുന്നുതിനായി ചിത്രത്തില്‍ ക്ലിക്ക് ചെയ്യേണ്ടതാണ്."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "ഈ പ്രവര്‍ത്തനം നിര്‍ത്തുന്നതിനായി റദ്ദാക്കുക എന്നതു് ക്ലിക്ക് ചെയ്യുക."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(അസാധുവായ യുണികോഡ്)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "%s തുറക്കുന്നു"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d ഇനം തുറക്കുന്നു"
+msgstr[1] "%d ഇനങ്ങള്‍ തുറക്കുന്നു"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "അടയാളവാക്കു് നല്‍കുക"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "ശൂന്യമായ ബ്ലൂ-റേ ഡിസ്ക്"
 
@@ -6893,4 +7084,3 @@ msgstr "ഈ പ്രദര്‍ശനരീതിയുടെ വലുപ്�
 
 #~ msgid "Show in the default detail level"
 #~ msgstr "സ്വതവേയുള്ളുളള വിശദമായ നിലവാരം കാണിക്കുക"
-
diff --git a/po/mn.po b/po/mn.po
index ab224eda4..6afbc434a 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  mn.po (mn)  #-#-#-#-#
 # translation of mn.po to Mongolian
 # translation of nautilus.HEAD.po to Mongolian
 # This file is distributed under the same license as the PACKAGE package.
@@ -6,8 +7,20 @@
 # Sanlig Badral <Badral@openmn.org>, 2003-2004.
 # Sanlig Badral <badral@openmn.org>, 2004.
 #
+# #-#-#-#-#  mn.po (mn)  #-#-#-#-#
+# translation of mn.po to Mongolian
+# translation of eel.HEAD.po to Mongolian
+# translation of eel.HEAD.po to mongolian
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER.
+# Sanlig Badral <badral@chinggis.com>, 2003.
+# Sanlig Badral <Badral@openmn.org>, 2004.
+# Badral <badral@openmn.org>, 2006.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
 "Project-Id-Version: mn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -17,6 +30,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
+"Project-Id-Version: mn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 22:50+0200\n"
+"PO-Revision-Date: 2006-08-15 22:54+0200\n"
+"Last-Translator: Badral <badral@openmn.org>\n"
+"Language-Team: Mongolian <openmn-translation@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -450,6 +474,7 @@ msgstr "Энэ хэлбэр бодит гэрэл зургийнх мэт хав
 #: libnautilus-extension/nautilus-property-page.c:176
 #: libnautilus-private/nautilus-column-utilities.c:43
 #: src/file-manager/fm-list-view.c:1107
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Нэр"
 
@@ -509,8 +534,14 @@ msgid "Tooltip for the menu item"
 msgstr "Цэсний бичлэгийн бяцхан тусламж"
 
 #: libnautilus-extension/nautilus-menu-item.c:227
+#: ../eel/eel-mime-application-chooser.c:237
+#, fuzzy
 msgid "Icon"
-msgstr "Эмблем"
+msgstr ""
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
+"Эмблем\n"
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
+"Эмблэм"
 
 #: libnautilus-extension/nautilus-menu-item.c:228
 msgid "Name of the icon to display in the menu item"
@@ -558,9 +589,9 @@ msgid ""
 msgstr ""
 "Эмблем харагдалт ба ажлын тавцан дээрхи эмблемийн доохи текстүүдийн "
 "жагсаалт. Бичээс харагдалтын тоо томруулалтын төвшингөөс хамаарна. Боломжит "
-"утгууд: »size« (Хэмжээ), »type« (Төрөл), »date_modified« (Өөрчилөгдсөн "
-"огноо), »date_changed« (Өөрчилөгдсөн огноо), »date_accessed« (Хандсан "
-"огноо), »owner« (Эзэмшигч), »group« (Бүлэг), »permissions« (Хандалтын эрх), "
+"утгууд: »size« (Хэмжээ), »type« (Төрөл), »date_modified« (Өөрчилөгдсөн огноо), "
+"»date_changed« (Өөрчилөгдсөн огноо), »date_accessed« (Хандсан огноо), "
+"»owner« (Эзэмшигч), »group« (Бүлэг), »permissions« (Хандалтын эрх), "
 "»octal_permissions« (Наймт хандалтын эрх) болон »mime_type« (MIME-төрөл)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
@@ -1029,8 +1060,8 @@ msgid ""
 msgstr ""
 "Хэзээ лавлах доторх объектуудын тоог харуулах эсэхийг тогтоох. Боломжит "
 "утгууд: »always« (тэр алсын сервер дээр байсан ч хамаагүй үргэлж объектуудын "
-"тоог харуулана), »local_only« (зөвхөн дотоод файлын системд байгааг "
-"харуулна) болон »never« (харуулахгүй)."
+"тоог харуулана), »local_only« (зөвхөн дотоод файлын системд байгааг харуулна) "
+"болон »never« (харуулахгүй)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid ""
@@ -1469,8 +1500,8 @@ msgid ""
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"»%s« нь устгагдаж болохгүй. Учир нь танд түүний эх-хавтсанд өөрчлөлт хийх "
-"эрх байхгүй юм байна."
+"»%s« нь устгагдаж болохгүй. Учир нь танд түүний эх-хавтсанд өөрчлөлт хийх эрх "
+"байхгүй юм байна."
 
 #: libnautilus-private/nautilus-file-operations.c:577
 #, c-format
@@ -1483,8 +1514,8 @@ msgid ""
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"»%s« нь зөөгдөхгүй. Учир нь танд түүний эх-хавтсанд өөрчлөлт хийх эрх "
-"байхгүй юм байна."
+"»%s« нь зөөгдөхгүй. Учир нь танд түүний эх-хавтсанд өөрчлөлт хийх эрх байхгүй "
+"юм байна."
 
 #: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
@@ -2718,8 +2749,8 @@ msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations."
 msgstr ""
-"»%s« дараах файл »%s«-ийг нээж чадахгүй байна. Учир нь »%s« төрлийн "
-"файлуудыг »%s«-байршилд нээж чадахгүй байна."
+"»%s« дараах файл »%s«-ийг нээж чадахгүй байна. Учир нь »%s« төрлийн файлуудыг »%"
+"s«-байршилд нээж чадахгүй байна."
 
 #: libnautilus-private/nautilus-program-choosing.c:142
 msgid "Open Failed, would you like to choose another action?"
@@ -2745,8 +2776,8 @@ msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
 "locations."
 msgstr ""
-"»%s« дараах файл »%s«-ийг нээж чадахгүй байна. Учир нь »%s« төрлийн "
-"файлуудыг »%s«-байршилд нээж чадахгүй байна."
+"»%s« дараах файл »%s«-ийг нээж чадахгүй байна. Учир нь »%s« төрлийн файлуудыг »%"
+"s«-байршилд нээж чадахгүй байна."
 
 #: libnautilus-private/nautilus-program-choosing.c:172
 msgid ""
@@ -3471,11 +3502,17 @@ msgstr "Файл х_оослох"
 msgid "Create a new empty file inside this folder"
 msgstr "Энэ хавтас дотор нэгэн шинэ хоосон файл үүсгэх"
 
+#. #-#-#-#-#  mn.po (mn)  #-#-#-#-#
 #. name, stock id
 #: src/file-manager/fm-directory-view.c:5743
-#: src/file-manager/fm-directory-view.c:6220
+#: src/file-manager/fm-directory-view.c:6220 ../eel/eel-open-with-dialog.c:910
+#, fuzzy
 msgid "_Open"
-msgstr "Нэ_эх"
+msgstr ""
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
+"Нэ_эх\n"
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
+"_Нээх"
 
 #. label, accelerator
 #: src/file-manager/fm-directory-view.c:5744
@@ -4446,8 +4483,14 @@ msgid "Couldn't Show Help"
 msgstr "Туслалцаа зааврыг үзүүлж чадсангүй"
 
 #: src/file-manager/fm-properties-window.c:3305
+#: ../eel/eel-open-with-dialog.c:809
+#, fuzzy
 msgid "Open With"
-msgstr "-р хамт нээх"
+msgstr ""
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
+"-р хамт нээх\n"
+"#-#-#-#-#  mn.po (mn)  #-#-#-#-#\n"
+"Одоо нээ"
 
 #: src/file-manager/fm-properties-window.c:3643
 msgid "Cancel Showing Properties Window?"
@@ -6171,6 +6214,222 @@ msgstr "Сүлжээний серверүүд"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Наутилусын файл менежерээр дамжуулан Сүлжээний серверүүдийг харах."
 
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Текст"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Зураг/хаяг хүрээ"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Сонордуулга цонхон дахь зураг болон бичээсийн хүрээний өргөн"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Сонордуулах төрөл"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Сонордуулгын төрөл"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Сонордуулга товч"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Сонордуулага цонхон харагдах товчнууд"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Илүү _нарийвчлан харах"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Бичээсийн текст."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Чиглүүлэл"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Бичээсийн текстийн мөрүүдийн зэрэгцүүлэлт нь бие биетэйгээ харилцан "
+"хамааралтай. Энэ нь бичээс доторхи байрлалд огт НӨЛӨӨЛӨХГҮЙ. GtkMisc::xalign "
+"-г бас үзнэ үү."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Мөр таслагч"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Хэрвээ мөр хэт урт болбол мөрүүдийг таслах уу?"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Курсорын байрлал"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Тэмдэгтүүд дотор оруулах курсорын одоогийн байрлал."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Тэмдэглэлтийн хязгаар"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Тэмдэгтийн доторхи курсороос тэмдэглээний эсрэг талын төгсгөлийн байрлал."
+
+#: ../eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Бүгдийг сонгох"
+
+#: ../eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Оролтын методууд"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf-Алдаа:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-Алдаа: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Цаашхи бүх алдааг зөвхөн терминал дээр харуулна."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM "
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00, 1:00 AM"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Ямарч зураг тэмдэглэгдээгүй байна."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Та үүнийг сонгохын тулд ямар нэг зурган дээр товших ёстой."
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Стандарт"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "Ямар ч програм сонгогдсонгүй"
+
+#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:984
+#, c-format
+msgid "%s document"
+msgstr "%s документ"
+
+#: ../eel/eel-mime-application-chooser.c:538 ../eel/eel-open-with-dialog.c:997
+msgid "Unknown"
+msgstr "Тодорхой бус"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr "%s болон өөр төрлийн \"%s\" нээх програмыг сонгох"
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Програм ажиллахгүй байна"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' олдохгүй байна"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Програм олдохгүй байна"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Програм нэмж чадахгүй байна"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Програмын өгөгдлийн баазад програм нэмэгдсэнгүй"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Програмыг сонгох"
+
+#: ../eel/eel-open-with-dialog.c:846
+msgid "Select an application to view its description."
+msgstr "Түүний тайлбарыг харахын тулд програмыг сонгох"
+
+#: ../eel/eel-open-with-dialog.c:871
+msgid "_Use a custom command"
+msgstr "Хэвшмэл командыг _ашиглах"
+
+#: ../eel/eel-open-with-dialog.c:888
+msgid "_Browse..."
+msgstr "_Сонгох..."
+
+#: ../eel/eel-open-with-dialog.c:1004
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "%s болон бусад төрлийн \"%s\" файлуудын дараахаар нээх:"
+
+#: ../eel/eel-open-with-dialog.c:1036
+msgid "_Add"
+msgstr "_Нэмэх"
+
+#: ../eel/eel-open-with-dialog.c:1037
+msgid "Add Application"
+msgstr "Програм нэмэх"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Та болих дээр дараад энэ үйлдлийг зогсоож болно."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (хүчингүй юникод)"
+
 #~ msgid "Allaire"
 #~ msgstr "Allaire"
 
@@ -6447,9 +6706,6 @@ msgstr "Наутилусын файл менежерээр дамжуулан С
 #~ msgid "Factory for text view"
 #~ msgstr "Текст харах үйлдвэр"
 
-#~ msgid "Text"
-#~ msgstr "Текст"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Текст харагч"
 
@@ -6752,8 +7008,8 @@ msgstr "Наутилусын файл менежерээр дамжуулан С
 #~ "You can configure which programs are offered for which file types in the "
 #~ "File Types and Programs dialog."
 #~ msgstr ""
-#~ "Та дараах »Файлын төрөл болон програмууд«-диалог-цонхонд ямар "
-#~ "програмуудыг аль фалйын төрөлд хэрэглэхээр санал болгохыг тохируулна"
+#~ "Та дараах »Файлын төрөл болон програмууд«-диалог-цонхонд ямар програмуудыг "
+#~ "аль фалйын төрөлд хэрэглэхээр санал болгохыг тохируулна"
 
 #~ msgid "Open with Other Application"
 #~ msgstr "Өөр нэгэн х.програмын тусламжтайгаар нээх..."
@@ -6851,9 +7107,9 @@ msgstr "Наутилусын файл менежерээр дамжуулан С
 #~ "trash?Are you sure you want to permanently delete the %d selected items "
 #~ "from the trash?"
 #~ msgstr ""
-#~ "Та сонгосон »%d« объектыг хогийн савнаас бүрмөсөн устгахдаа итгэлтэй "
-#~ "байна уу?Та сонгосон »%d« объектыг хогийн савнаас бүрмөсөн устгахдаа "
-#~ "итгэлтэй байна уу?"
+#~ "Та сонгосон »%d« объектыг хогийн савнаас бүрмөсөн устгахдаа итгэлтэй байна "
+#~ "уу?Та сонгосон »%d« объектыг хогийн савнаас бүрмөсөн устгахдаа итгэлтэй "
+#~ "байна уу?"
 
 #~ msgid "_Other Application..."
 #~ msgstr "Өөр _Програм..."
diff --git a/po/mr.po b/po/mr.po
index 5a986e2cd..e8e61d9da 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,11 +1,21 @@
+# #-#-#-#-#  mr.po (mr)  #-#-#-#-#
 # translation of mr.po to marathi
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # sandeep shedmake <sandeep.shedmake@gmail.com>, 2008.
 # Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2008.
+# #-#-#-#-#  mr.po (eel.HEAD.mr)  #-#-#-#-#
+# translation of eel.HEAD.mr.po to marathi
+# Copyright (C) 2003 Jitendra Shah.
+#
+# Swapnil Hajare<dreamil1000a@yahoo.com>, 2003.
+# Priti Labde <priti_labde@yahoo.co.in>, 2006.
+# Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  mr.po (mr)  #-#-#-#-#\n"
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 04:27+0000\n"
@@ -17,6 +27,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  mr.po (eel.HEAD.mr)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.mr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-02-29 21:44+0530\n"
+"Last-Translator: Sandeep Shedmake <sandeep.shedmake@gmail.com>\n"
+"Language-Team: marathi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -329,11 +351,18 @@ msgid ""
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
 msgstr ""
-"झूम स्तरावरील आधारीत, मर्यादा पलीकडील फाइलची लांबी असल्यास एलीपसीशी बदलविले पाहिजे. यादीतील प्रत्येक नोंदणी \"झूम स्तर:इंटीजर\" नुरूप आहे. प्रत्येक झूम स्तर करीता, इंटीजर 0 पेक्षा जास्त असल्यास, फाइल नाव ठराविक ओळ क्रमांक मर्यादा पलीकडे जाणार नाही. इंटीजर 0 किंवा लहान असल्यावर, निर्देशीत झूम स्तरावर मर्यादा लागू केली जात नाही. विना झूम स्तराच्या \"इंटीजर\" नुरूप मुलभूत नोंदणी करीता सुद्धा परवानगी दिली जाते. ते सर्व झूम स्तर करीता कमाल ओळींची संख्या निश्चित करते. उदाहरण: 0 - नेहमी मर्यादा पलीकडील फाइल नाव दर्शविते; 3 - "
-"तीन ओळींपेक्षा जास्त असल्यास फाइल नाव लहान करा; सर्वात लहान:5,सर्वात लहान:4,0 - ओळी पाच पेक्षा जास्त असल्यावर झूम स्तर \"सर्वात लहान\" करीता फाइल नाव लहान करा. "
-"ओळी पाच पेक्षा जास्त असल्यावर झूम स्तर \"इतरांपेक्षा लहान\" करीता फाइल नाव लहान करा. अन्य झूम स्तर करीता फाइल नाव लहान करू नका. उपलब्ध झूम स्तर: "
-"सर्वात लहान (33%), इतरांपेक्षा लहान (50%), लहान (66%), मानक (100%), मोठे (150%), "
-"इतरांपेक्षा मोठे (200%), सर्वात मोठे (400%)"
+"झूम स्तरावरील आधारीत, मर्यादा पलीकडील फाइलची लांबी असल्यास एलीपसीशी बदलविले पाहिजे. "
+"यादीतील प्रत्येक नोंदणी \"झूम स्तर:इंटीजर\" नुरूप आहे. प्रत्येक झूम स्तर करीता, इंटीजर 0 "
+"पेक्षा जास्त असल्यास, फाइल नाव ठराविक ओळ क्रमांक मर्यादा पलीकडे जाणार नाही. इंटीजर 0 "
+"किंवा लहान असल्यावर, निर्देशीत झूम स्तरावर मर्यादा लागू केली जात नाही. विना झूम "
+"स्तराच्या \"इंटीजर\" नुरूप मुलभूत नोंदणी करीता सुद्धा परवानगी दिली जाते. ते सर्व झूम स्तर "
+"करीता कमाल ओळींची संख्या निश्चित करते. उदाहरण: 0 - नेहमी मर्यादा पलीकडील फाइल नाव "
+"दर्शविते; 3 - तीन ओळींपेक्षा जास्त असल्यास फाइल नाव लहान करा; सर्वात लहान:5,सर्वात "
+"लहान:4,0 - ओळी पाच पेक्षा जास्त असल्यावर झूम स्तर \"सर्वात लहान\" करीता फाइल नाव "
+"लहान करा. ओळी पाच पेक्षा जास्त असल्यावर झूम स्तर \"इतरांपेक्षा लहान\" करीता फाइल नाव "
+"लहान करा. अन्य झूम स्तर करीता फाइल नाव लहान करू नका. उपलब्ध झूम स्तर: सर्वात लहान "
+"(33%), इतरांपेक्षा लहान (50%), लहान (66%), मानक (100%), मोठे (150%), इतरांपेक्षा "
+"मोठे (200%), सर्वात मोठे (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -349,10 +378,15 @@ msgid ""
 "ellipses on the desktop. If the number is larger than 0, the file name will "
 "not exceed the given number of lines. If the number is 0 or smaller, no "
 "limit is imposed on the number of displayed lines."
-msgstr "मर्यादा पलीकडील फाइलनावाच्या रूंदीला डेस्कटॉपवरील एलीपसीस बदलविण्याकरीता इन्टीजर. संख्या 0 पेक्षा जास्त असल्यावर, फाइल नाव प्रविष्ट ओळींच्या संख्यापेक्षा जास्त वाढणार नाही. संख्या 0 किंवा त्यापेक्षा कमी असल्यावर, दर्शविण्याजोगी ओळींकरीता मर्यादा लागू केली जात नाही."
+msgstr ""
+"मर्यादा पलीकडील फाइलनावाच्या रूंदीला डेस्कटॉपवरील एलीपसीस बदलविण्याकरीता इन्टीजर. "
+"संख्या 0 पेक्षा जास्त असल्यावर, फाइल नाव प्रविष्ट ओळींच्या संख्यापेक्षा जास्त वाढणार नाही. "
+"संख्या 0 किंवा त्यापेक्षा कमी असल्यावर, दर्शविण्याजोगी ओळींकरीता मर्यादा लागू केली जात "
+"नाही."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "मुलभूत संचयीका पार्श्वभूमीकरीता फाइल नाव. तेंव्हाच वापरले जाते जेंव्हा background_set चे "
 "मुल्य खरे असते."
@@ -373,8 +407,8 @@ msgid ""
 "files by file name and file properties."
 msgstr ""
 "शोध पट्टीत जुळवणीकरीता फाइल शोधतेवेळी प्रमाण. जर \"पाठ्य_नुसारे_शोधा\" निश्चित केल्यास, "
-"Nautilus फाइलच्या नावानुसारेच फाइल्स करीता शोध घेईल. \"पाठ्य_नुसारे_व_गुणधर्मनुसारे_शोधा\" "
-"निश्चित केल्यास, Nautilus फाइलच्या नाव व गुणधर्मानुसारे फाइल्स करीता शोध घेईल."
+"Nautilus फाइलच्या नावानुसारेच फाइल्स करीता शोध घेईल. \"पाठ्य_नुसारे_व_गुणधर्मनुसारे_शोधा"
+"\" निश्चित केल्यास, Nautilus फाइलच्या नाव व गुणधर्मानुसारे फाइल्स करीता शोध घेईल."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Current Nautilus theme (deprecated)"
@@ -516,7 +550,9 @@ msgid ""
 "If set to \"after_current_tab\", then new tabs are inserted after the "
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
 "tab list."
-msgstr "\"after_current_tab\" असे निश्चित असल्यास, वर्तमान टॅब नंतर नविन टॅब अंतर्भूत होतात. \"end\" करीता निश्चित केल्यास, टॅब यादीच्या शेवटी नविन टॅब जोडले जातात."
+msgstr ""
+"\"after_current_tab\" असे निश्चित असल्यास, वर्तमान टॅब नंतर नविन टॅब अंतर्भूत होतात. "
+"\"end\" करीता निश्चित केल्यास, टॅब यादीच्या शेवटी नविन टॅब जोडले जातात."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
@@ -527,7 +563,8 @@ msgstr ""
 "दोन्ही संचयीका व फाइल दर्शविल्या जातील."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "मुल्य खरे निश्चित केल्यास, नुकतेच उघडलेल्या चौकटीत स्थान पट्टी दृश्यास येईल."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -555,16 +592,16 @@ msgid ""
 "If set to true, then Nautilus lets you edit and display file permissions in "
 "a more unix-like way, accessing some more esoteric options."
 msgstr ""
-"मुल्य खरे निश्चित केल्यास, Nautilus आपल्याला फाइल परवानगी अधिक unix-समान प्रकारे संपादन "
-"व दर्शवयास परवानगी देतो, काहिक गुपीत पर्याय वापरण्यास देखिल प्रवेश देतो."
+"मुल्य खरे निश्चित केल्यास, Nautilus आपल्याला फाइल परवानगी अधिक unix-समान प्रकारे "
+"संपादन व दर्शवयास परवानगी देतो, काहिक गुपीत पर्याय वापरण्यास देखिल प्रवेश देतो."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
 msgstr ""
-"मुल्य खरे निश्चित केल्यास, Nautilus आपल्याला संचयीका फाइल परवानगी अधिक unix-समान प्रकारे "
-"संपादन व दर्शवयास परवानगी देतो, काहिक गुपीत पर्याय वापरण्यास देखिल प्रवेश देतो."
+"मुल्य खरे निश्चित केल्यास, Nautilus आपल्याला संचयीका फाइल परवानगी अधिक unix-समान "
+"प्रकारे संपादन व दर्शवयास परवानगी देतो, काहिक गुपीत पर्याय वापरण्यास देखिल प्रवेश देतो."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid ""
@@ -629,8 +666,8 @@ msgid ""
 "how Nautilus used to behave before version 2.6, and some people prefer this "
 "behavior."
 msgstr ""
-"खरे निश्चित केल्यास, सर्व Nautilus चौकटी ब्राऊजर चौकटी होतील. अशा रिती Nautilus आवृत्ती "
-"2.6 च्या पूर्वी वागत असे, व काहीक लोक ही वागणूक पसंत करतात."
+"खरे निश्चित केल्यास, सर्व Nautilus चौकटी ब्राऊजर चौकटी होतील. अशा रिती Nautilus "
+"आवृत्ती 2.6 च्या पूर्वी वागत असे, व काहीक लोक ही वागणूक पसंत करतात."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid ""
@@ -653,7 +690,9 @@ msgstr ""
 msgid ""
 "If set to true, then multiple views can be opened in one browser window, "
 "each in a separate tab."
-msgstr "खरे निश्चित केल्यास, एकापेक्षा जास्त दृश्य संचारन चौकटीत, प्रत्येक वेगळे टॅब मध्ये उघडले जाऊ शकते."
+msgstr ""
+"खरे निश्चित केल्यास, एकापेक्षा जास्त दृश्य संचारन चौकटीत, प्रत्येक वेगळे टॅब मध्ये उघडले जाऊ "
+"शकते."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid ""
@@ -683,13 +722,16 @@ msgstr "मुल्य खरे निश्चित केल्यास, �
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
-msgstr "हे खरे असल्यास, आरोहीत खंडकरीता जुळवणी स्थापीत करणारी चिन्ह डेस्कटॉपवर दर्शविल्या जातील."
+msgstr ""
+"हे खरे असल्यास, आरोहीत खंडकरीता जुळवणी स्थापीत करणारी चिन्ह डेस्कटॉपवर दर्शविल्या जातील."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
 msgid ""
 "If this preference is set, all columns in the compact view have the same "
 "width. Otherwise, the width of each column is determined seperately."
-msgstr "ही प्राधान्यक्रम निश्चित केल्यावर, संक्षिप्त दृश्यातील सर्व स्तंभची रूंदी समान राहील. नाहीतर, प्रत्येक स्तंभची रूंदी वेगळेरित्या तपासली जाईल."
+msgstr ""
+"ही प्राधान्यक्रम निश्चित केल्यावर, संक्षिप्त दृश्यातील सर्व स्तंभची रूंदी समान राहील. "
+"नाहीतर, प्रत्येक स्तंभची रूंदी वेगळेरित्या तपासली जाईल."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid ""
@@ -718,8 +760,10 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "खरे असल्यास, नविन चौकटींमध्ये चिन्हांची मांडणी घट्टरीत्या केली जाईल."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
-msgstr "खरे असल्यास, लेबलची मांडणी चिन्हांच्या खालच्या बाजुस नसून त्यांच्या जवळ घट्टरीत्या केली जाईल."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
+msgstr ""
+"खरे असल्यास, लेबलची मांडणी चिन्हांच्या खालच्या बाजुस नसून त्यांच्या जवळ घट्टरीत्या केली जाईल."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid "If true, new windows will use manual layout by default."
@@ -744,21 +788,29 @@ msgid ""
 "List of x-content/* types for which the user have chosen \"Do Nothing\" in "
 "the preference capplet. No prompt will be shown nor will any matching "
 "application be started on insertion of media matching these types."
-msgstr "प्राधान्यक्रम कॅपलेट अंतर्गत वापरकर्ता द्वारे निवडलेले \"काहिच करू नका\" अशा x-अनुक्रम/* प्रकारांची यादी. या प्रकारचे मिडीया अंतर्भूत करतेवेळी प्रॉम्पट दर्शविले जाणार नाही किंवा कुठलेही अनुप्रयोग प्रारंभ होणार नाही."
+msgstr ""
+"प्राधान्यक्रम कॅपलेट अंतर्गत वापरकर्ता द्वारे निवडलेले \"काहिच करू नका\" अशा x-अनुक्रम/* "
+"प्रकारांची यादी. या प्रकारचे मिडीया अंतर्भूत करतेवेळी प्रॉम्पट दर्शविले जाणार नाही किंवा "
+"कुठलेही अनुप्रयोग प्रारंभ होणार नाही."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
 "List of x-content/* types for which the user have chosen \"Open Folder\" in "
 "the preferences capplet. A folder window will be opened on insertion of "
 "media matching these types."
-msgstr "प्राधान्यक्रम कॅपलेट अंतर्गत वापरकर्ता द्वारे निवडलेले \"संचयीका उघडा\" अशा x-अनुक्रम/* प्रकारांची यादी. या प्रकारचे मिडीया अंतर्भूत करतेवेळी संचयीका चौकट उघडली जाईल."
+msgstr ""
+"प्राधान्यक्रम कॅपलेट अंतर्गत वापरकर्ता द्वारे निवडलेले \"संचयीका उघडा\" अशा x-अनुक्रम/* "
+"प्रकारांची यादी. या प्रकारचे मिडीया अंतर्भूत करतेवेळी संचयीका चौकट उघडली जाईल."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "List of x-content/* types for which the user have chosen to start an "
 "application in the preference capplet. The preferred application for the "
 "given type will be started on insertion on media matching these types."
-msgstr "अनुप्रयोग सुरू करण्याकरीता प्राधान्यक्रम कॅपलेट अंतर्गत वापरकर्ता द्वारे निवडलेले x-अनुक्रम/* प्रकारांची यादी. या प्रकारचे मिडीया अंतर्भूत करतेवेळी प्रविष्ट प्रकार करीता प्राधान्यकृत अनुप्रयोग."
+msgstr ""
+"अनुप्रयोग सुरू करण्याकरीता प्राधान्यक्रम कॅपलेट अंतर्गत वापरकर्ता द्वारे निवडलेले x-अनुक्रम/* "
+"प्रकारांची यादी. या प्रकारचे मिडीया अंतर्भूत करतेवेळी प्रविष्ट प्रकार करीता प्राधान्यकृत "
+"अनुप्रयोग."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -769,7 +821,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "x-अनुक्रम/* प्रकार \"संचयीका उघडा\" करीता निश्चित केले गेले"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "अनुप्रयोग जेथे दाखल केली जाईल त्या x-अनुक्रम/* प्रकारांची यादी"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -785,8 +838,8 @@ msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
 msgstr ""
-"Nautilus सुत्रयोजना वापारायचे नाव. याचे वापर Nautilus 2.2 पासुन थांबविण्यात आले आहे. कृपया "
-"त्या ऐवजी चिन्ह सुत्रयोजना वापरा."
+"Nautilus सुत्रयोजना वापारायचे नाव. याचे वापर Nautilus 2.2 पासुन थांबविण्यात आले आहे. "
+"कृपया त्या ऐवजी चिन्ह सुत्रयोजना वापरा."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "Nautilus handles drawing the desktop"
@@ -806,7 +859,9 @@ msgstr "नेटवर्क सर्वर चिन्ह"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid "Never prompt or autorun/autostart programs when media are inserted"
-msgstr "मिडीया अंतर्भूत केल्यावर कधिही कार्यक्रम करीता विचारू नका किंवा स्वकार्य/स्वआरंभ करीता विचारू नका"
+msgstr ""
+"मिडीया अंतर्भूत केल्यावर कधिही कार्यक्रम करीता विचारू नका किंवा स्वकार्य/स्वआरंभ करीता "
+"विचारू नका"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "Only show folders in the tree side pane"
@@ -1029,7 +1084,8 @@ msgid ""
 "\"icon_view\" and \"compact_view\"."
 msgstr ""
 "जोपर्यंत त्या विशिष्ट संचयीकेकरीता तुम्ही अन्य दृश्याची निवड करत नाही तोपर्यंत संचयीका "
-"पहाण्याकरीता या दर्शकाचे वापर केले जाईल. स्वीकार्य मुल्य \"list_view\", \"icon_view\" व \"compact_view\" आहे."
+"पहाण्याकरीता या दर्शकाचे वापर केले जाईल. स्वीकार्य मुल्य \"list_view\", \"icon_view\" "
+"व \"compact_view\" आहे."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "When to show number of items in a folder"
@@ -1372,7 +1428,8 @@ msgstr ""
 msgid ""
 "If you want to unmount the volume, please use \"Unmount Volume\" in the "
 "popup menu of the volume."
-msgstr "खंड अनारोहन करायचे असल्यास, कृपया पॉपअप मेनुतील \"खंड अनारोहन करा\" चा वापर करा."
+msgstr ""
+"खंड अनारोहन करायचे असल्यास, कृपया पॉपअप मेनुतील \"खंड अनारोहन करा\" चा वापर करा."
 
 #: ../libnautilus-private/nautilus-dnd.c:748
 msgid "_Move Here"
@@ -1416,7 +1473,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "माफ करा, पण बिना-रिक्त मुख्यशब्द बोधचिन्हाकरीता नमुद केले पाहिजे."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "माफ करा, पण बिना-रिक्त मुख्यशब्द बोधचिन्हाकरीता नमुद केले पाहिजे."
 
 #. this really should never happen, as a user has no idea
@@ -1686,7 +1744,8 @@ msgstr "तुम्हाला नक्की नेहमीसाठी \"%
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "तुम्हाला नक्की कचरापेटीमधून निवडलेले %'d घटक कायमस्वरूपी काढून टाकायचे?"
 msgstr[1] "तुम्हाला नक्की कचरापेटीमधून निवडलेले %'d घटक कायमस्वरूपी काढून टाकायचे?"
 
@@ -1725,7 +1784,8 @@ msgstr "तुमच्याकडे वाचाण्याची परव�
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr "संचयीका \"%B\" मधील फाइलविषयी माहिती प्राप्त करतेवेळी त्रुटी."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
@@ -1850,7 +1910,8 @@ msgstr "फाइल कचरापेटीकडे हलवितेवे�
 msgid ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
-msgstr "तुमच्याकडे वाचाण्याची परवानगी नसल्याने संचयीका \"%B\" मधिल फाइल हाताळता येत नाही."
+msgstr ""
+"तुमच्याकडे वाचाण्याची परवानगी नसल्याने संचयीका \"%B\" मधिल फाइल हाताळता येत नाही."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2398
 msgid ""
@@ -2070,7 +2131,8 @@ msgstr "\"%B\" नावाची संचयीका आधिपासून
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr ""
 "\"%F\" नावाची फाइल आधिपासूनच अस्तित्वात आहे.  बदल केल्यास अनुक्रम खोडून पुन्हा लिहीले "
 "जातील."
@@ -2888,7 +2950,9 @@ msgstr "उघडा अपयशी, तुम्हाला इतर अन�
 msgid ""
 "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
 "locations."
-msgstr "\"%4$s\" स्थळावरील फाइल करीता \"%3$s\" ला प्रवेश नसल्यामुळे \"%2$s\" ला \"%1$s\" उघडू शकत नाही."
+msgstr ""
+"\"%4$s\" स्थळावरील फाइल करीता \"%3$s\" ला प्रवेश नसल्यामुळे \"%2$s\" ला \"%1$s\" "
+"उघडू शकत नाही."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:87
 msgid "Open Failed, would you like to choose another action?"
@@ -2900,7 +2964,8 @@ msgstr "उघडा अयशस्वी, तुम्हाला इतर �
 msgid ""
 "The default action cannot open \"%s\" because it cannot access files at \"%s"
 "\" locations."
-msgstr "\"%2$s\" स्थानावरील फाइल करीता प्रवेश नसल्यामुळे \"%1$s\" मुलभूत कृती उघडू शकत नाही."
+msgstr ""
+"\"%2$s\" स्थानावरील फाइल करीता प्रवेश नसल्यामुळे \"%1$s\" मुलभूत कृती उघडू शकत नाही."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:116
 msgid ""
@@ -2937,8 +3002,10 @@ msgid "This drop target only supports local files."
 msgstr "हे वगळण्याजोगी लक्ष्य्य फक्त स्थानिक फाइल समर्थित आहे."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:400
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "बिन-स्थानीय फाइल उघडण्याकरीता त्याची स्थानीय संचयीकेत प्रत बनवा व परत काढुन टाका."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"बिन-स्थानीय फाइल उघडण्याकरीता त्याची स्थानीय संचयीकेत प्रत बनवा व परत काढुन टाका."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:411
 msgid ""
@@ -3007,7 +3074,8 @@ msgstr "प्रॉमप्ट आपोआप चालवा"
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "सर्व स्थानीय व दुरस्थ डीस्क व या संगणकावरील प्रवेश प्राप्तीय संचयीकांचे संचार करा"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -3052,7 +3120,8 @@ msgid "Nautilus metafile factory"
 msgstr "नॉटीलस मेटाफाइल चिन्ह प्रणाली"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr "Nautilus पध्दती जे परस्पर आदेश-ओळीवरून कार्यान्वीत करता येते"
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -3092,7 +3161,8 @@ msgstr "डेस्कटॉप पार्श्वभूमी बदलव�
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "डेस्कटॉपची रचना किंवा रंग स्थापन करतायेण्याजोगी करण्याकरीता चौकट दर्शवा"
 
 #. label, accelerator
@@ -3331,14 +3401,16 @@ msgstr "तुम्ही चिकटवा हा आदेश निवड�
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] "चिकटवा आदेश निवडल्यास %'d निवडलेले घटक स्थानंतरीत केले जाईल"
 msgstr[1] "चिकटवा आदेश निवडल्यास %'d निवडलेले घटक स्थानंतरीत केले जाईल"
 
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] "चिकटवा आदेश निवडल्यास %'d निवडलेले घटकाचे प्रत बनविले जाईल"
 msgstr[1] "चिकटवा आदेश निवडल्यास %'d निवडलेले घटकाचे प्रत बनविले जाईल"
 
@@ -3523,7 +3595,8 @@ msgstr "चिकटवा या आदाशेद्वारे प्रत
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6644
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "कापा किंवा प्रतिकृत करा आदेशाद्वारे पूर्वी निवडलेल्या फाइलची प्रतिकृती करा किंवा त्यास हलवा"
+msgstr ""
+"कापा किंवा प्रतिकृत करा आदेशाद्वारे पूर्वी निवडलेल्या फाइलची प्रतिकृती करा किंवा त्यास हलवा"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3650,8 +3723,8 @@ msgstr "मुळस्वरूपात पाहण्याकरीता �
 #: ../src/file-manager/fm-directory-view.c:6700
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
-"छाननीची पध्दत व जुळणी पाहण्यासाठी पातळी या दृश्याच्या आवश्यकतेला जुळतील अशी "
-"पुर्वस्थापना करा"
+"छाननीची पध्दत व जुळणी पाहण्यासाठी पातळी या दृश्याच्या आवश्यकतेला जुळतील अशी पुर्वस्थापना "
+"करा"
 
 #. name, stock id
 #. label, accelerator
@@ -3799,7 +3872,9 @@ msgstr "ही संचयीका चिकटवा या आदेशा�
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into this "
 "folder"
-msgstr "कापा किंवा चिकटवा आदेश द्वारे पूर्वीपासून निवडलेले फाइल या संचयीका अंतर्गत स्थानांतरीत करा किंवा प्रतिकृत करा"
+msgstr ""
+"कापा किंवा चिकटवा आदेश द्वारे पूर्वीपासून निवडलेले फाइल या संचयीका अंतर्गत स्थानांतरीत करा "
+"किंवा प्रतिकृत करा"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6781
@@ -4026,7 +4101,8 @@ msgstr "आदेश"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\" मधील घटक बघण्यासाठी आवश्यक परवानगी तुम्हाला नाहीत."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4045,12 +4121,14 @@ msgstr "संचयीकेतील आशय प्रदर्शित क
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "\"%s\"  हे नाव आधीच या संचयीकेत वापरले गेलेले आहे. कृपया दुसऱ्या नावाचा वापर करा."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "\"%s\" हे या संचयीकेत नाही. कदाचित ते नुकतेच हलवले गेले किंवा काढून टाकले?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -4082,7 +4160,8 @@ msgstr "घटकाला नवीन नाव देता येत ना�
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\" चा गट बदलण्यासाठी आवश्यक परवानगी तुमच्याकडे नाहीत."
 
 #. fall through
@@ -4738,8 +4817,9 @@ msgid ""
 "console may fix the problem. If not, you can try rebooting the computer or "
 "installing Nautilus again."
 msgstr ""
-"Nautilus आता वापरू शकत नाही. कंसोल पासून \"bonobo-slay\" आदेश चालविल्यास अडचण सुटेल. "
-"तसे न झाल्यस, तुम्ही संगणक पुन्हा सुरू करू शकता किंवा नॉटीलसला पुन्हा प्रतिष्ठापीत करू शकता."
+"Nautilus आता वापरू शकत नाही. कंसोल पासून \"bonobo-slay\" आदेश चालविल्यास अडचण "
+"सुटेल. तसे न झाल्यस, तुम्ही संगणक पुन्हा सुरू करू शकता किंवा नॉटीलसला पुन्हा प्रतिष्ठापीत करू "
+"शकता."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:603
@@ -4762,8 +4842,8 @@ msgid ""
 "We have also seen this error when a faulty version of bonobo-activation was "
 "installed."
 msgstr ""
-"Nautilus आता वापरू शकत नाही. कंसोल पासून \"bonobo-slay\" आदेश चालविल्यास अडचण सुटेल. "
-"तसे न झाल्यस, तुम्ही संगणक पुन्हा सुरू करू शकता किंवा नॉटीलसला पुन्हा प्रतिष्ठापीत करू "
+"Nautilus आता वापरू शकत नाही. कंसोल पासून \"bonobo-slay\" आदेश चालविल्यास अडचण "
+"सुटेल. तसे न झाल्यस, तुम्ही संगणक पुन्हा सुरू करू शकता किंवा नॉटीलसला पुन्हा प्रतिष्ठापीत करू "
 "शकता.\n"
 "\n"
 "Bonobo Nautilus_shell.server फाइल शोधू शकले नाही. याचे एक कारण म्हणजे "
@@ -5243,14 +5323,16 @@ msgstr "CD ऑडिओ (_A):"
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
-msgstr "चिन्ह नामाखाली माहिती दर्शविण्याकरीता क्रमवारी निवडा. अधिक माहिती मोठे केल्यास दिसेल."
+msgstr ""
+"चिन्ह नामाखाली माहिती दर्शविण्याकरीता क्रमवारी निवडा. अधिक माहिती मोठे केल्यास दिसेल."
 
 #: ../src/nautilus-file-management-properties.glade.h:50
 msgid "Choose the order of information to appear in the list view."
 msgstr "यादी दृश्यात दिसण्याकरीता माहितीची क्रमवारी निवडा."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr "मिडीया अंतर्भूत केल्यावर किंवा साधन प्रणालीशी जुळवितेवेळी काय होते ते पहा"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
@@ -6308,7 +6390,8 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "यजमान न आढळल्यामुळे, \"%s\" प्रदर्शित करू शकत नाही."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "शब्दलेखन व आपली प्रॉक्सी संरचना बिनचुक आहे याची तपासनी करा."
 
 #: ../src/nautilus-window-manage-views.c:1947
@@ -6361,8 +6444,8 @@ msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
 msgstr ""
-"GNOME करीता Nautilus आलेखीय शेल आहे जे आपले फाइल व प्रणालीचा उर्वरीत भागाचे नियंत्रण सोपे "
-"करते."
+"GNOME करीता Nautilus आलेखीय शेल आहे जे आपले फाइल व प्रणालीचा उर्वरीत भागाचे नियंत्रण "
+"सोपे करते."
 
 #: ../src/nautilus-window-menus.c:566
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6679,3 +6762,142 @@ msgstr "लहान मोठे"
 msgid "Set the zoom level of the current view"
 msgstr "सद्याचे दृश्यकरीता लहान मोठे स्थर निश्चित करा"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "प्रतिमा/लेबल सीमा"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "प्रतिमा आणि लेबलच्या सीमेची रूंदी सावधगिरीच्या डाय़लॉगमध्ये"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "सावधगिरीचा प्रकार"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "सावधगिरीचा प्रकार."
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "सावधगिरीचे बटन"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "बटन सावधगिरीच्या डाय़लॉगमध्ये दाखविले आहे."
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "सखोल _माहिती दाखवा"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X "
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y "
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "गद्य"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "लेबलचे गद्य."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "समर्थन"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"लेबलच्या गद्यातील ओळींची मांडणी एकमेकांशी सापेक्ष आहे.याचा परिणाम विभाजनातील लेबलच्या "
+"अलाइनमेंटवर होणार नाही.त्याकरीता GtkMisc::xalign बघा."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "ओळ व्रॅप"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "जर स्थापित असेल, तर गद्य जास्त लांबल्यास ओळ व्रॅप करा"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "कर्सरची जागा"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "अक्षरांमध्ये प्रदेशन कर्सरची वर्तमान स्थिती"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "निवड सीमा"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "अक्षरांतील कर्सरच्या निवडीच्या विरुद्ध टोकाची स्थिती"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "सर्वांची निवड करा"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "आगत विधी"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"जीकॉन्फ त्रुटि:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "जीकॉन्फ त्रुटि:  %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "यापुढील सर्व त्रुटी केवळ टर्मिनलवर दाखविल्या जातील "
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "कुठलिही प्रतिमा निवडलेली नाही"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "निवडण्यासाठी एखाद्या प्रतिमेवर क्लिक करा"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "तुम्ही ही क्रिया कॅन्सल क्लिक करून थांबवू शकत नाही"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(अवैध युनिकोड)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "%s उघडत आहे"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d घटक उघडत आहे"
+msgstr[1] "%d घटक उघडत आहे"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "गुप्तशब्द प्रविष्ट करा"
diff --git a/po/ms.po b/po/ms.po
index ecb75eca6..2a17057da 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1,9 +1,17 @@
+# #-#-#-#-#  ms.po (Nautilus HEAD)  #-#-#-#-#
 # Nautilus Bahasa Melayu (ms)
 # Jika takut risiko, Jangan bicara tentang Perjuangan
 # Hasbullah Bin Pit (sebol) <sebol@ikhlas.com>, 2002
 #
+# #-#-#-#-#  ms.po (eel HEAD)  #-#-#-#-#
+# Eazel Extensions Library Bahasa Melayu/ Malay (ms)
+# cepat cepat !!! borang satu jek 1. Sapa cepat dia dapat. 
+# Hasbullah Bin Pit (sebol) <sebol@ikhlas.com>, 2001
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ms.po (Nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -14,6 +22,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  ms.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2004-08-12 02:04+0730\n"
+"Last-Translator: Hasbullah Bin Pit <sebol@my-penguin.org>\n"
+"Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -440,7 +458,7 @@ msgstr "Tema ini mengguna folder realistik-foto"
 #: libnautilus-extension/nautilus-menu-item.c:206
 #: libnautilus-extension/nautilus-property-page.c:176
 #: libnautilus-private/nautilus-column-utilities.c:43
-#: src/file-manager/fm-list-view.c:1107
+#: src/file-manager/fm-list-view.c:1107 eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Nama"
 
@@ -4330,7 +4348,7 @@ msgstr "Terdapat ralat memapar bantuan."
 msgid "Couldn't Show Help"
 msgstr "Tak Dapat Memapar Bantuan"
 
-#: src/file-manager/fm-properties-window.c:3305
+#: src/file-manager/fm-properties-window.c:3305 eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Buka Dengan"
 
@@ -6023,6 +6041,223 @@ msgstr "Pelayan Rangkaian"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Lihat pelayan rangkaian pada pengurus fail Nautilus"
 
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Teks"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Sempadan imej/label"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Lebar bagi sempadan sekeliling label dan imej pada dialog amaran"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Jenis Amaran"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Jenis bagi amaran"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Butang Amaran"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Butang dipaparkan pada dialog amaran"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Papar lebih _perician"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Teks bagi label."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justifikasi"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Jajaran baris pada teks label relatif semasa sendiri. Ini TIDAK memberi "
+"kesan pada jajaran label di dalam peruntukannya. Lihat GtkMisc::xalign untuk "
+"itu"
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Balutan baris"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Jika ditetapkan, balut baris jika teks terlalu lebar."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Posisi Kursor"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "posisi semasa bagi penyelitan kursor pada aksara."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Sempadan Pilihan"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Posisi hujung bertentangan pada pilihan daripada kursor dalam aksara."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Pilih Semua"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Kaedah input"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Ralat GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Ralat GConf: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Semua ralat lanjutan dipaparkan pada terminal"
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 AM"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Tiada imej dipilih."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Anda mesti klik pada imej untuk memilihnya."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Default"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Tiada aplikasi dipilih</i>"
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr "Dokumen %s"
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Entah"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr "Pilih aplikasi untuk membuka  <i>%s</i> dan jenis \"%s\" yang lain"
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Tak dapat melaksanakan aplikasi"
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Tak dapat menjumpai '%s'"
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Tidak menjumpai aplikasi"
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Tak dapat menambah aplikasi"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Tak dapat menambah aplikasi  ke pangkalan data aplikasi"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Pilih Aplikasi"
+
+#: eel/eel-open-with-dialog.c:830
+#, fuzzy
+msgid "Select an application to view its description."
+msgstr "Pilih aplikasi untuk membuka  <i>%s</i> dan jenis \"%s\" yang lain"
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr "_Lungsur..."
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Buka <i>%s</i> dan jenis fail lain \"%s\" menggunakan:"
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr "_Tambah"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr "Tambah Aplikasi"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Anda boleh menghentikan operasi ini dengan mengklik batal."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (Unicode tidak sah)"
+
 #~ msgid "Allaire"
 #~ msgstr "Allaire"
 
@@ -6293,9 +6528,6 @@ msgstr "Lihat pelayan rangkaian pada pengurus fail Nautilus"
 #~ msgid "Factory for text view"
 #~ msgstr "Kilang untuk melihat teks"
 
-#~ msgid "Text"
-#~ msgstr "Teks"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Pelihat Teks"
 
@@ -6504,3 +6736,21 @@ msgstr "Lihat pelayan rangkaian pada pengurus fail Nautilus"
 
 #~ msgid "Try to fit in window"
 #~ msgstr "Cuba supaya muat pada tetingkap"
+
+#~ msgid "GConf Error"
+#~ msgstr "Ralat GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Tiada Pilihan Dibuat"
+
+#~ msgid "Info"
+#~ msgstr "Maklumat"
+
+#~ msgid "Warning"
+#~ msgstr "Amaran"
+
+#~ msgid "Error"
+#~ msgstr "Ralat"
+
+#~ msgid "Question"
+#~ msgstr "Soalan"
diff --git a/po/nb.po b/po/nb.po
index 10f4e466f..d2838f9d3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,11 +1,19 @@
+# #-#-#-#-#  nb.po (nautilus 2.23.x)  #-#-#-#-#
 # Norwegian Bokmål translation of Nautilus.
 # Copyright (C) 2000-2005 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 2000-2008.
 # Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003.
 # Terance Edward Sola <terance@lyse.net>, 2005.
 # Øivind Hoel <ohoel@cvs.gnome.org>, 2006.
+# #-#-#-#-#  nb.po (eel 2.21.x)  #-#-#-#-#
+# Norwegian (bokmål) translation of eel.
+# Copyright (C) 2000-2003 Free Software Foundation, Inc.
+# Kjartan Maraas <kmaraas@gnome.org>, 2000-2007.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  nb.po (nautilus 2.23.x)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus 2.23.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-02 08:12+0200\n"
@@ -16,6 +24,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  nb.po (eel 2.21.x)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.21.x\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:58+0100\n"
+"PO-Revision-Date: 2007-12-06 19:58+0100\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6792,3 +6811,144 @@ msgstr "Zoom"
 #: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "Sett zoom-nivå for aktiv visning"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Kant for bilde/etikett"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Bredde på kant rundt etikett og bilde i varseldialogen"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Varseltype"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Type varsel"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Varselknapper"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Knapper vises i varseldialogen"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Vis flere _detaljer"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Etikettens tekst."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justering"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Justeringen av linjene i etikettens tekst relativ til hverandre. Dette "
+"påvirker IKKE justeringen av etiketten innenfor sin tilmålte plass. Se "
+"GtkMisc::xalign for dette."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Linjebryting"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Hvis satt vil linjene brytes hvis teksten blir for bred."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Markørposisjon"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Aktiv posisjon for innsettingsmarkøren i tegn."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Utvalgsgrense"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Posisjonen for motsatt ende av utvalget fra markøren målt i tegn."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Velg alt"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Inndatametoder"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf feil:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf feil: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Alle videre feil vises kun på kommandolinjen."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Ingen bilder ble valgt."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Du må klikke på et bilde for å velge det."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Du kan stoppe denne operasjonen ved å trykke avbryt."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (ugyldig Unicode)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "Åpner %s"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Åpner %d oppføring"
+msgstr[1] "Åpner %d oppføringer"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Oppgi passord"
diff --git a/po/ne.po b/po/ne.po
index 87d24d65a..9afeeedcf 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ne.po (nautilus.gnome-2-20.ne)  #-#-#-#-#
 # translation of nautilus.gnome-2-20.ne.po to Nepali
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
@@ -11,8 +12,24 @@
 # Mahesh Subedi <submanesh@hotmail.com>, 2006.
 # Shyam Krishna Bal <shyam@mpp.org.np>, 2006.
 # Narayan Kumar Magar <narayan@mpp.org.np>, 2007, 2008.
+# #-#-#-#-#  ne.po (eel.gnome-2-20.ne)  #-#-#-#-#
+# translation of eel.gnome-2-20.ne.po to Nepali
+#
+# Nepali translation of eel
+# This file is distributed under the same license as the eel package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
+# Pawan Chitrakar <pawan@nplinux.org>, 2004.
+# Kapil Timilsina <lipak21@gmail.com>, 2005.
+# Jyotshna Shrestha <jyotshna@mpp.org.np>, 2005.
+# Jaydeep Bhusal <zaydeep@hotmail.com>, 2005.
+# Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.
+# Narayan Kumar Magar <narayan@mpp.org.np>, 2007.
+# Nabin Gautam <nabin@mpp.org.np>, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ne.po (nautilus.gnome-2-20.ne)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.gnome-2-20.ne\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-19 03:43+0100\n"
@@ -24,6 +41,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  ne.po (eel.gnome-2-20.ne)  #-#-#-#-#\n"
+"Project-Id-Version: eel.gnome-2-20.ne\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 03:22+0100\n"
+"PO-Revision-Date: 2008-01-31 15:44+0545\n"
+"Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
+"Language-Team: Nepali <info@mpp.org.np>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"First-Translator: Pawan Chitrakar <pawan@nplinux.org>\n"
+"X-Poedit-Language: Nepali\n"
+"X-Poedit-Country: NEPAL\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n !=1\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -313,13 +346,10 @@ msgid ""
 "\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
 "\"mime_type\"."
 msgstr ""
-"प्रतिमा दृश्य र डेस्कटपमा प्रतिमाको मुनि क्याप्सनहरूको एउटा सूची छ । देखाइएको क्याप्सनहरूको वास्तविक सङ्ख्या जुम स्तरमा निर्भर "
-"हुन्छ । सम्भाव्य "
-"मानहरू: \"साइज\", \"प्रकार\", \"परिमार्जित मिति\", \"परिवर्तित मिति\", "
-"\"पहुँच गरिएको मिति "
-"\", \"मालिक\", \"समूह\", \"अनुमतिहरू\", \"अष्ठक अनुमतिहरू\" "
-"र "
-"\"माईम प्रकार\" हुन ।"
+"प्रतिमा दृश्य र डेस्कटपमा प्रतिमाको मुनि क्याप्सनहरूको एउटा सूची छ । देखाइएको क्याप्सनहरूको "
+"वास्तविक सङ्ख्या जुम स्तरमा निर्भर हुन्छ । सम्भाव्य मानहरू: \"साइज\", \"प्रकार\", "
+"\"परिमार्जित मिति\", \"परिवर्तित मिति\", \"पहुँच गरिएको मिति \", \"मालिक\", \"समूह"
+"\", \"अनुमतिहरू\", \"अष्ठक अनुमतिहरू\" र \"माईम प्रकार\" हुन ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
 msgid "Always use the location entry, instead of the pathbar"
@@ -340,10 +370,10 @@ msgid ""
 "If set to \"search_by_text_and_properties\", then Nautilus will search for "
 "files by file name and file properties."
 msgstr ""
-"खोजी पट्टीमा मिल्दो फाइलहरूका लागि खोजी गर्दा मापदण्ड । यदि \"search_by_text\" "
-"मा सेट गरेमा, नउटिलसले फाइलहरूका लागि फाइल नामद्वारा मात्र खोजी गर्नेछ । "
-"यदि \"search_by_text_and_properties\" मा सेट गरेमा, नउटिलसले फाइलहरूका लागि फाइल नाम र फाइल "
-"गुणद्वारा खोजी गर्नेछ ।"
+"खोजी पट्टीमा मिल्दो फाइलहरूका लागि खोजी गर्दा मापदण्ड । यदि \"search_by_text\" मा "
+"सेट गरेमा, नउटिलसले फाइलहरूका लागि फाइल नामद्वारा मात्र खोजी गर्नेछ । यदि "
+"\"search_by_text_and_properties\" मा सेट गरेमा, नउटिलसले फाइलहरूका लागि फाइल नाम "
+"र फाइल गुणद्वारा खोजी गर्नेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "Current Nautilus theme (deprecated)"
@@ -453,7 +483,9 @@ msgstr ""
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
-msgstr "पूर्वनिर्धारित साइड फलक पृष्ठभूमिका लागि फाइल नाम । यदि साइड फलक पृष्ठभूमि सेट ठीक भए मात्र प्रयोग गरिन्छ ।"
+msgstr ""
+"पूर्वनिर्धारित साइड फलक पृष्ठभूमिका लागि फाइल नाम । यदि साइड फलक पृष्ठभूमि सेट ठीक भए "
+"मात्र प्रयोग गरिन्छ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid ""
@@ -462,9 +494,10 @@ msgid ""
 "massive folders. A negative value denotes no limit. The limit is approximate "
 "due to the reading of folders chunk-wise."
 msgstr ""
-"यो साइज भन्दा बढीका फोल्डरहरू यो साइजको वरिपरि काटिने छन् । "
-"यसको उद्देश्य "
-"ठूला फोल्डरहरूमा काम नलाग्ने माथि आशाय बिना नै धक्का दिने र नटलसलाई नष्ट पार्नु हो । नकरात्मक मानले कुनै सीमा निर्दिष्ट गर्दैन । सीमा भनेको लगभग फोल्डरहरूको टुक्रागत पढाइको कारणले हो ।"
+"यो साइज भन्दा बढीका फोल्डरहरू यो साइजको वरिपरि काटिने छन् । यसको उद्देश्य ठूला "
+"फोल्डरहरूमा काम नलाग्ने माथि आशाय बिना नै धक्का दिने र नटलसलाई नष्ट पार्नु हो । "
+"नकरात्मक मानले कुनै सीमा निर्दिष्ट गर्दैन । सीमा भनेको लगभग फोल्डरहरूको टुक्रागत पढाइको "
+"कारणले हो ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid "Home icon visible on desktop"
@@ -474,10 +507,13 @@ msgstr "डेस्कटपमा गृह प्रतिमा दृश्
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
-msgstr "यदि ठीकसँग सेट गरेमा, नटलसले ट्रि छेउ फलक भित्र फोल्डरहरू मात्र देखाउनेछ । अन्यथा यसले फोल्डरहरू र फाइलहरू दुवै देखाउनेछ ।"
+msgstr ""
+"यदि ठीकसँग सेट गरेमा, नटलसले ट्रि छेउ फलक भित्र फोल्डरहरू मात्र देखाउनेछ । अन्यथा यसले "
+"फोल्डरहरू र फाइलहरू दुवै देखाउनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "यदि ठीकसँग सेट गरेमा, नयाँ खोलिएको सञ्झ्यालहरूको स्थानपट्टी दृश्यात्मक हुनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
@@ -497,8 +533,8 @@ msgid ""
 "If set to true, then Nautilus browser windows will always use a textual "
 "input entry for the location toolbar, instead of the pathbar."
 msgstr ""
-"यदि ठीकसँग सेट गरेमा, नटलस ब्राउजर सञ्झ्यालहरूले स्थान उपकरणपट्टीका लागि मार्ग पट्टीको सट्टामा सधै मौलिक "
-"आगत प्रविष्टि प्रयोग गर्नेछ ।"
+"यदि ठीकसँग सेट गरेमा, नटलस ब्राउजर सञ्झ्यालहरूले स्थान उपकरणपट्टीका लागि मार्ग पट्टीको "
+"सट्टामा सधै मौलिक आगत प्रविष्टि प्रयोग गर्नेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -513,8 +549,8 @@ msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
 msgstr ""
-"यदि ठीकसँग सेट गरेमा, नटलसले प्रतिमा र सूची दृश्यहरूमा फाइलहरू देखाउन फोल्डर "
-"प्राथमिकता देखाउँदछ ।"
+"यदि ठीकसँग सेट गरेमा, नटलसले प्रतिमा र सूची दृश्यहरूमा फाइलहरू देखाउन फोल्डर प्राथमिकता "
+"देखाउँदछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
@@ -535,8 +571,8 @@ msgid ""
 "feature can be dangerous, so use caution."
 msgstr ""
 "यदि सहि तरिकाले सेट गरेमा, नटलससँग यस्तो विशेषता हुन्छ जसले तपाईँलाई फाइल रद्दीटोकरीमा "
-"सार्नुको सट्टा फाइल तुरून्त मेट्न अनुमति दिन्छ । यो "
-"विशेषता खतरनाक हुनसक्दछ, त्यसैले सावधानी अपनाउनुहोस् ।"
+"सार्नुको सट्टा फाइल तुरून्त मेट्न अनुमति दिन्छ । यो विशेषता खतरनाक हुनसक्दछ, त्यसैले सावधानी "
+"अपनाउनुहोस् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
@@ -552,8 +588,9 @@ msgid ""
 "how Nautilus used to behave before version 2.6, and some people prefer this "
 "behavior."
 msgstr ""
-"यदि सहि तरिकाले सेट गरेमा, सबै नटलस सञ्झ्यालहरू ब्राउजर सञ्झ्यालहरू हुनेछन् । यसले संस्करण २.६ "
-"भन्दा पहिले नटलसले कस्तो व्यवहार र्ने गर्दथ्यो र केही मानिसहरूले यस्तो ब्यबहार रुचाउँथ्यो भन्ने देखाउँदछ ।"
+"यदि सहि तरिकाले सेट गरेमा, सबै नटलस सञ्झ्यालहरू ब्राउजर सञ्झ्यालहरू हुनेछन् । यसले संस्करण "
+"२.६ भन्दा पहिले नटलसले कस्तो व्यवहार र्ने गर्दथ्यो र केही मानिसहरूले यस्तो ब्यबहार रुचाउँथ्यो "
+"भन्ने देखाउँदछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
@@ -576,31 +613,41 @@ msgstr ""
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
-msgstr "यदि यो सहि तरिकाले सेट गरिएको छ भने, सञ्जाल सर्भर दृश्यसँग लिङ्क भएको एउटा प्रतिमा डेस्कटपमा राखिनेछ ।"
+msgstr ""
+"यदि यो सहि तरिकाले सेट गरिएको छ भने, सञ्जाल सर्भर दृश्यसँग लिङ्क भएको एउटा प्रतिमा "
+"डेस्कटपमा राखिनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
-msgstr "यदि यो सहि तरिकाले सेट गरिएको छ भने, कम्प्युटर स्थानसँग लिङ्क भएको एउटा प्रतिमा डेस्कटपमा राखिनेछ ।"
+msgstr ""
+"यदि यो सहि तरिकाले सेट गरिएको छ भने, कम्प्युटर स्थानसँग लिङ्क भएको एउटा प्रतिमा "
+"डेस्कटपमा राखिनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
-msgstr "यदि यो सहि तरिकाले सेट गरिएको छ भने, गृह फोल्डरसँग लिङ्क भएको एउटा प्रतिमा डेस्कटपमा राखिनेछ ।"
+msgstr ""
+"यदि यो सहि तरिकाले सेट गरिएको छ भने, गृह फोल्डरसँग लिङ्क भएको एउटा प्रतिमा डेस्कटपमा "
+"राखिनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr "यदि यो सहि तरिकाले सेट गरिएको छ भने, रद्दीटोकरीसँग लिङ्क भएको एउटा प्रतिमा डेस्कटपमा राखिनेछ ।"
+msgstr ""
+"यदि यो सहि तरिकाले सेट गरिएको छ भने, रद्दीटोकरीसँग लिङ्क भएको एउटा प्रतिमा डेस्कटपमा "
+"राखिनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
-msgstr "यदि यो सहि तरिकाले सेट गरिएको छ भने, माउन्ट गरिएको भोल्युमसँग लिङ्क भएको प्रतिमाहरू डेस्कटपमा राखिनेछन् ।"
+msgstr ""
+"यदि यो सहि तरिकाले सेट गरिएको छ भने, माउन्ट गरिएको भोल्युमसँग लिङ्क भएको प्रतिमाहरू "
+"डेस्कटपमा राखिनेछन् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
@@ -608,9 +655,9 @@ msgid ""
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
 "sorted from \"z\" to \"a\"."
 msgstr ""
-"यदि सहि छ भने, नयाँ सञ्झ्यालहरूमा रहेका फाइलहरू उल्टो क्रममा क्रमबद्ध गरिनेछ । जस्तै, यदि नामद्वारा "
-"क्रमबद्ध गरेमा, \"a\" देखि \"z\" सम्म फाइलहरू क्रमबद्ध गर्नुको सट्टा, \"z\" देखि \"a\" "
-"सम्म क्रमबद्ध गरिनेछ ।"
+"यदि सहि छ भने, नयाँ सञ्झ्यालहरूमा रहेका फाइलहरू उल्टो क्रममा क्रमबद्ध गरिनेछ । जस्तै, यदि "
+"नामद्वारा क्रमबद्ध गरेमा, \"a\" देखि \"z\" सम्म फाइलहरू क्रमबद्ध गर्नुको सट्टा, \"z\" "
+"देखि \"a\" सम्म क्रमबद्ध गरिनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid ""
@@ -619,15 +666,18 @@ msgid ""
 "sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
 msgstr ""
-"यदि सहि छ भने, नयाँ सञ्झ्यालहरूमा रहेका फाइलहरू उल्टो क्रममा क्रमबद्ध गरिनेछ । जस्तै, यदि नामद्वारा "
-"क्रमबद्ध गरिएमा, \"a\" देखि \"z\" सम्म फाइलहरू क्रमबद्ध गरिनुको सट्टा, \"z\" देखि \"a\" सम्म क्रमबद्ध गरिनेछ; यदि साइजद्वारा क्रमबद्ध गरिएमा बढोत्तरीको सट्टा तिनिहरू घट्दो तरिकाले क्रमबद्ध गरिनेनेछ ।"
+"यदि सहि छ भने, नयाँ सञ्झ्यालहरूमा रहेका फाइलहरू उल्टो क्रममा क्रमबद्ध गरिनेछ । जस्तै, यदि "
+"नामद्वारा क्रमबद्ध गरिएमा, \"a\" देखि \"z\" सम्म फाइलहरू क्रमबद्ध गरिनुको सट्टा, \"z\" "
+"देखि \"a\" सम्म क्रमबद्ध गरिनेछ; यदि साइजद्वारा क्रमबद्ध गरिएमा बढोत्तरीको सट्टा "
+"तिनिहरू घट्दो तरिकाले क्रमबद्ध गरिनेनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "यदि सहि भएमा, प्रतिमाहरू पूर्वनिर्धारितद्वारा नयाँ सञ्झ्यालमा दह्रोसँग राखिनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "यदि सहि भए, लेबुलहरू प्रतिमाहरूको मुनि भन्दा प्रतिमाकोसँगै राखिनेछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
@@ -639,7 +689,9 @@ msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
-msgstr "यस साइज (बाइट्समा) भन्दा बढीको छविहरूलाई थम्बनेल गरिने छैन । यो सेटिङको उद्देश्य ठूलो छविहरूलाई थम्बनेल गर्न बाट हटाउनु हो जसले लोड हुन धेरै समय लिन्छ र धेरै स्मृति प्रयोग गर्दछ ।"
+msgstr ""
+"यस साइज (बाइट्समा) भन्दा बढीको छविहरूलाई थम्बनेल गरिने छैन । यो सेटिङको उद्देश्य ठूलो "
+"छविहरूलाई थम्बनेल गर्न बाट हटाउनु हो जसले लोड हुन धेरै समय लिन्छ र धेरै स्मृति प्रयोग गर्दछ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid "List of possible captions on icons"
@@ -657,7 +709,9 @@ msgstr "थम्बनेल गर्नका लागि अधिकतम
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
-msgstr "प्रयोग गर्नलाई नटलस विषयवस्तुको नाम । यसलाई नटलस २.२ को विरूद्ध गरिएको छ । कृपया सट्टामा प्रतिमा प्रयोग गर्नुहोस् ।"
+msgstr ""
+"प्रयोग गर्नलाई नटलस विषयवस्तुको नाम । यसलाई नटलस २.२ को विरूद्ध गरिएको छ । कृपया "
+"सट्टामा प्रतिमा प्रयोग गर्नुहोस् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
 msgid "Nautilus handles drawing the desktop"
@@ -683,7 +737,9 @@ msgstr "ट्रि छेउ फलकमा फोल्डरहरू म�
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
-msgstr "सम्भाव्य मानहरू फाइललाई एकल क्लिकमा सुरुआत गर्न \"एकल\", वा फाइलहरूलाई डबल क्लिकमा सुरुआत गर्न \"डवल\" हुन ।"
+msgstr ""
+"सम्भाव्य मानहरू फाइललाई एकल क्लिकमा सुरुआत गर्न \"एकल\", वा फाइलहरूलाई डबल क्लिकमा "
+"सुरुआत गर्न \"डवल\" हुन ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "Put labels beside icons"
@@ -739,9 +795,11 @@ msgid ""
 "on a remote server. If set to \"local_only\" then only plays previews on "
 "local file systems. If set to \"never\" then it never previews sound."
 msgstr ""
-"फाइल प्रतिमा माथि माउस लग्दा ध्वनी फाइल कहिले पूर्वावलोकन गर्ने भन्नका लागि गति प्रस्ताव । यदि "
-"\"always\" मा सेट गरेमा, फाइल टाढाको सर्भरमा भएता पनि सधैँ ध्वनि बजाउँदछ । "
-"यदि \"local_only\" मा सेट गर्नुभयो भने, स्थानीय फाइल प्रणालीहरूमा पूर्वावलोकनत्रहरू बजाउँदछ । यदि \"never\" मा सेट गर्नुभयो भने यसले कहिले पनि ध्वनि पूर्वावलोकन गर्दैन ।"
+"फाइल प्रतिमा माथि माउस लग्दा ध्वनी फाइल कहिले पूर्वावलोकन गर्ने भन्नका लागि गति "
+"प्रस्ताव । यदि \"always\" मा सेट गरेमा, फाइल टाढाको सर्भरमा भएता पनि सधैँ ध्वनि "
+"बजाउँदछ । यदि \"local_only\" मा सेट गर्नुभयो भने, स्थानीय फाइल प्रणालीहरूमा "
+"पूर्वावलोकनत्रहरू बजाउँदछ । यदि \"never\" मा सेट गर्नुभयो भने यसले कहिले पनि ध्वनि "
+"पूर्वावलोकन गर्दैन ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid ""
@@ -751,11 +809,11 @@ msgid ""
 "previews for local file systems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
-"फाइलको प्रतिमामा पाठ फाइल सामग्रीहरूको पूर्वावलोकन कहिले देखाउने भन्नका लागि गति प्रस्ताव । यदि "
-"\"always\" मा सेट गरेमा, फाइल टाढाको सर्भरमा भएता पनि सधैँ पूर्वावलोकनहरू "
-"देखाउनुहोस् । यदि \"local_only\" मा सेट गरेमा, स्थानीय फाइल प्रणालीहरूका लागि "
-"पूर्वावलोकन मात्र देखाउनुहोस् । यदि \"never\" मा सेट गरेमा कहिले पनि पूर्वावलोकन डेटा "
-"पढ्न झञ्झट नगर्नुहोस् ।"
+"फाइलको प्रतिमामा पाठ फाइल सामग्रीहरूको पूर्वावलोकन कहिले देखाउने भन्नका लागि गति "
+"प्रस्ताव । यदि \"always\" मा सेट गरेमा, फाइल टाढाको सर्भरमा भएता पनि सधैँ "
+"पूर्वावलोकनहरू देखाउनुहोस् । यदि \"local_only\" मा सेट गरेमा, स्थानीय फाइल प्रणालीहरूका "
+"लागि पूर्वावलोकन मात्र देखाउनुहोस् । यदि \"never\" मा सेट गरेमा कहिले पनि पूर्वावलोकन "
+"डेटा पढ्न झञ्झट नगर्नुहोस् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 msgid ""
@@ -765,11 +823,11 @@ msgid ""
 "If set to \"never\" then never bother to thumbnail images, just use a "
 "generic icon."
 msgstr ""
-"थम्बनेलको रूपमा एउटा छवि फाइल कहिले देखाउने भन्नका लागि गति प्रस्ताव । यदि \"always\" मा सेट गरेमा "
-"भने, फोल्डर टाढाको सर्भरमा भएता पनि सधैँ थम्बनेल गर्नुहोस् । यदि \"local_only\" मा सेट "
-"गरेमा, स्थानीय फाइल प्रणालीहरूका लागि थप्बनेलहरू मात्र देखाउनुहोस् । यदि \"never\" मा सेट "
-"गरेमा कहिले पनि थम्बनेल छविलाई दिक्क नगर्नुहोस्, मात्र साधारण प्रतिमा प्रयोग "
-"गर्नुहोस् ।"
+"थम्बनेलको रूपमा एउटा छवि फाइल कहिले देखाउने भन्नका लागि गति प्रस्ताव । यदि \"always\" "
+"मा सेट गरेमा भने, फोल्डर टाढाको सर्भरमा भएता पनि सधैँ थम्बनेल गर्नुहोस् । यदि "
+"\"local_only\" मा सेट गरेमा, स्थानीय फाइल प्रणालीहरूका लागि थप्बनेलहरू मात्र देखाउनुहोस् "
+"। यदि \"never\" मा सेट गरेमा कहिले पनि थम्बनेल छविलाई दिक्क नगर्नुहोस्, मात्र साधारण "
+"प्रतिमा प्रयोग गर्नुहोस् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid ""
@@ -778,10 +836,10 @@ msgid ""
 "server. If set to \"local_only\" then only show counts for local file "
 "systems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
-"फोल्डरमा भएको वस्तुहरूको सङ्ख्या कहिले देखाउन भन्नका लागि गति प्रस्ताव । यदि \"always\" मा सेट गरिएमा "
-"फोल्डर टाढाको सर्भरमा भएता पनि जहिले पनि वस्तु गणनाहरू देखानुहोस् । यदि \"local_only\" सेट "
-"गरेमा स्थनिय फाइल प्रणालीहरूका लागि गणना मात्र देखाउनुहोस् । यदि \"never\" मा सेट "
-"गर्नुभयो भने वस्तु गणना गर्न झञ्झट नमान्नुहोस् ।"
+"फोल्डरमा भएको वस्तुहरूको सङ्ख्या कहिले देखाउन भन्नका लागि गति प्रस्ताव । यदि \"always\" "
+"मा सेट गरिएमा फोल्डर टाढाको सर्भरमा भएता पनि जहिले पनि वस्तु गणनाहरू देखानुहोस् । यदि "
+"\"local_only\" सेट गरेमा स्थनिय फाइल प्रणालीहरूका लागि गणना मात्र देखाउनुहोस् । यदि "
+"\"never\" मा सेट गर्नुभयो भने वस्तु गणना गर्न झञ्झट नमान्नुहोस् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "The default size of an icon for a thumbnail in the icon view."
@@ -792,18 +850,16 @@ msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
-"प्रतिमा दृश्यमा वस्तुहरूका लागि पूर्वनिर्धारित क्रमबद्ध-क्रम । सम्भाव्य "
-"मानहरू \"नाम "
-"\", \"साइज\", \"प्रकार\", \"परिमार्जन मिति\", र \"चिन्हहरू\" हुन ।"
+"प्रतिमा दृश्यमा वस्तुहरूका लागि पूर्वनिर्धारित क्रमबद्ध-क्रम । सम्भाव्य मानहरू \"नाम \", "
+"\"साइज\", \"प्रकार\", \"परिमार्जन मिति\", र \"चिन्हहरू\" हुन ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid ""
 "The default sort-order for the items in the list view. Possible values are "
 "\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"सूची दृश्यमा वस्तुहरूका लागि पूर्वनिर्धारित क्रमबद्ध-क्रम । सम्भाव्य "
-"मानहरू "
-"\"नाम\", \"साइज\", \"प्रकार\", र \"परिमार्जन मिति\" हुन ।"
+"सूची दृश्यमा वस्तुहरूका लागि पूर्वनिर्धारित क्रमबद्ध-क्रम । सम्भाव्य मानहरू \"नाम\", \"साइज"
+"\", \"प्रकार\", र \"परिमार्जन मिति\" हुन ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "The default width of the side pane in new windows."
@@ -817,7 +873,8 @@ msgstr "डेस्कटपमा प्रतिमाहरूका ला�
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "फाइल मितिहरूको ढाँचा । सम्भाव्य मानहरू \"लोक्याल\", \"iso\", र \"अनौपचारिक\" हुन् ।"
+msgstr ""
+"फाइल मितिहरूको ढाँचा । सम्भाव्य मानहरू \"लोक्याल\", \"iso\", र \"अनौपचारिक\" हुन् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid "The side pane view to show in newly opened windows."
@@ -835,7 +892,8 @@ msgstr ""
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
-msgstr "यदि तपाईँ डेस्कटपमा गृह प्रतिमाका लागि अनुकूल नाम चाहनुहुन्छ भने यो नाम सेट गर्न सकिन्छ ।"
+msgstr ""
+"यदि तपाईँ डेस्कटपमा गृह प्रतिमाका लागि अनुकूल नाम चाहनुहुन्छ भने यो नाम सेट गर्न सकिन्छ ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
 msgid ""
@@ -880,8 +938,10 @@ msgid ""
 "\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
 "text files."
 msgstr ""
-"कार्यान्वयन योग्य पाठ फाइलहरू सक्रिय (एकल वा दोहोरो क्लिक) पारिए पछि के गर्नु पर्दछ । सम्भाव्य मानहरू कार्यक्रमको रूपमा तिनिहरूको सुरुआत गर्न \"सुरुआत गर्नुहोस्\", संवाद मार्फत के गर्नु पर्दछ भन्ने "
-"सोध्नलाई \"सोध्नुहोस्\" र पाठ फाइलको रूपमा तिनिहरूलाई प्रदर्शन गर्न \"प्रदर्शन गर्नुहोस्\" हुन् ।"
+"कार्यान्वयन योग्य पाठ फाइलहरू सक्रिय (एकल वा दोहोरो क्लिक) पारिए पछि के गर्नु पर्दछ । "
+"सम्भाव्य मानहरू कार्यक्रमको रूपमा तिनिहरूको सुरुआत गर्न \"सुरुआत गर्नुहोस्\", संवाद मार्फत के "
+"गर्नु पर्दछ भन्ने सोध्नलाई \"सोध्नुहोस्\" र पाठ फाइलको रूपमा तिनिहरूलाई प्रदर्शन गर्न "
+"\"प्रदर्शन गर्नुहोस्\" हुन् ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
 msgid ""
@@ -987,6 +1047,7 @@ msgstr "पूर्वनिर्धारित प्रयोग गर्�
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1375
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "नाम"
 
@@ -1105,8 +1166,8 @@ msgid ""
 "If you want to unmount the volume, please use \"Unmount Volume\" in the "
 "popup menu of the volume."
 msgstr ""
-"यदि तपाईँ भोल्युम अनमाउण्ट गर्न चाहनुहुन्छ भने, कृपया भोल्युमको पपअप मेनुमा \"भोल्युम अनमाउण्ट गर्नुहोस्\" "
-"प्रयोग गर्नुहोस् ।"
+"यदि तपाईँ भोल्युम अनमाउण्ट गर्न चाहनुहुन्छ भने, कृपया भोल्युमको पपअप मेनुमा \"भोल्युम "
+"अनमाउण्ट गर्नुहोस्\" प्रयोग गर्नुहोस् ।"
 
 #: ../libnautilus-private/nautilus-dnd.c:619
 msgid "_Move Here"
@@ -1146,11 +1207,15 @@ msgstr "चिन्ह स्थापना गर्न सकिँदैन
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:199
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
-msgstr "माफ गर्नुहोस्, तर तपाईँले नयाँ चिन्हका लागि खाली नभएको शब्दकुञ्जी निर्दिष्ट गर्नु पर्दछ ।"
+msgstr ""
+"माफ गर्नुहोस्, तर तपाईँले नयाँ चिन्हका लागि खाली नभएको शब्दकुञ्जी निर्दिष्ट गर्नु पर्दछ ।"
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:204
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "माफ गर्नुहोस्, तर चिन्ह शब्दकुञ्जीहरूले अक्षरहरू, खाली स्थानहरू र सङ्ख्याहरू मात्र समाविष्ट गर्न सक्दछ ।"
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"माफ गर्नुहोस्, तर चिन्ह शब्दकुञ्जीहरूले अक्षरहरू, खाली स्थानहरू र सङ्ख्याहरू मात्र समाविष्ट "
+"गर्न सक्दछ ।"
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1257,8 +1322,8 @@ msgid ""
 "Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"\"%s\" लाई रद्दीटोकरीमा सार्न सकिँदैन किनभने तपाईँसँग यसलाई र यसको प्रमूल फोल्डरलाई परिवर्तन "
-"गर्ने अनुमति छैन ।"
+"\"%s\" लाई रद्दीटोकरीमा सार्न सकिँदैन किनभने तपाईँसँग यसलाई र यसको प्रमूल फोल्डरलाई "
+"परिवर्तन गर्ने अनुमति छैन ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:757
 msgid "Error while copying."
@@ -1407,24 +1472,31 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:1172
 #, c-format
 msgid "A folder named \"%s\" already exists.  Do you want to replace it?"
-msgstr "\"%s\" नामको एउटा फोल्डर पहिल्यै अवस्थित छ ।  तपाईँ यसलाई प्रतिस्थापन गर्न चाहनुहुन्छ?"
+msgstr ""
+"\"%s\" नामको एउटा फोल्डर पहिल्यै अवस्थित छ ।  तपाईँ यसलाई प्रतिस्थापन गर्न चाहनुहुन्छ?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1175
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "\"%s\" नामको एउटा फाइल पहिल्यै अवस्थित छ ।  तपाईँ यसलाई प्रतिस्थापन गर्न चाहनुहुन्छ?"
+msgstr ""
+"\"%s\" नामको एउटा फाइल पहिल्यै अवस्थित छ ।  तपाईँ यसलाई प्रतिस्थापन गर्न चाहनुहुन्छ?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1194
 #, c-format
 msgid ""
 "The folder already exists in \"%s\".  Replacing it will overwrite any files "
 "in the folder that conflict with the files being copied."
-msgstr "यो फोल्डर \"%s\" मा पहिल्यै अवस्थित छ ।  यसलाई प्रतिस्थापन गर्नाले फाइलहरू प्रतिलिपि गर्दा द्वन्द्व हुने फोल्डर भित्रका कुनै पनि फाइलहरू अधिलेखन हुनेछ ।"
+msgstr ""
+"यो फोल्डर \"%s\" मा पहिल्यै अवस्थित छ ।  यसलाई प्रतिस्थापन गर्नाले फाइलहरू प्रतिलिपि "
+"गर्दा द्वन्द्व हुने फोल्डर भित्रका कुनै पनि फाइलहरू अधिलेखन हुनेछ ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "यो फाइल \"%s\"मा पहिल्यै अवस्थित छ ।  यसलाई प्रतिस्थापन गर्दा यसका समाग्रीहरू अधिलेखन हुनेछन् ।"
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+"यो फाइल \"%s\"मा पहिल्यै अवस्थित छ ।  यसलाई प्रतिस्थापन गर्दा यसका समाग्रीहरू अधिलेखन "
+"हुनेछन् ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
 #: ../libnautilus-private/nautilus-file-operations.c:1233
@@ -1784,8 +1856,8 @@ msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
 msgstr ""
-"यदि तपाईँले रद्दीटोकरी खाली गर्न रोज्नुभयो भने, यसमा भएका सबै वस्तुहरू स्थायी रूपले नष्ट हुनेछन् । "
-"कृपया याद राख्नुहोस् तपाईँले तिनिहरू छुट्टाछुट्टै पनि मेट्न सक्नुहुन्छ ।"
+"यदि तपाईँले रद्दीटोकरी खाली गर्न रोज्नुभयो भने, यसमा भएका सबै वस्तुहरू स्थायी रूपले नष्ट "
+"हुनेछन् । कृपया याद राख्नुहोस् तपाईँले तिनिहरू छुट्टाछुट्टै पनि मेट्न सक्नुहुन्छ ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2913
 msgid "_Empty Trash"
@@ -1799,7 +1871,9 @@ msgstr "अनमाउन्ट गर्नु पहिले तपाईँ
 msgid ""
 "In order to regain the free space on this device the trash must be emptied. "
 "All items in the trash will be permanently lost. "
-msgstr "यो यन्त्रमा खाली स्थान पुन: प्राप्त गर्नका निम्ति रद्दीटोकरी खाली गर्नु पर्दछ । रद्दीटोकरीमा भएका सबै वस्तुहरू स्थायी रूपमा नष्ट हुनेछन् । "
+msgstr ""
+"यो यन्त्रमा खाली स्थान पुन: प्राप्त गर्नका निम्ति रद्दीटोकरी खाली गर्नु पर्दछ । "
+"रद्दीटोकरीमा भएका सबै वस्तुहरू स्थायी रूपमा नष्ट हुनेछन् । "
 
 #: ../libnautilus-private/nautilus-file-operations.c:3026
 msgid "Don't Empty Trash"
@@ -2054,8 +2128,8 @@ msgid ""
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
-"\"x-डाइरेक्टरी/सामान्य\" का लागि वर्णन फेला पार्न सक्दैन । यसको अर्थ सम्भवत तपाईँको gnome-"
-"vfs.keys फाइल गलत स्थानमा छ वा अन्य कुनै कारणले गर्दा फेला पार्न सकिएन ।"
+"\"x-डाइरेक्टरी/सामान्य\" का लागि वर्णन फेला पार्न सक्दैन । यसको अर्थ सम्भवत तपाईँको "
+"gnome-vfs.keys फाइल गलत स्थानमा छ वा अन्य कुनै कारणले गर्दा फेला पार्न सकिएन ।"
 
 #: ../libnautilus-private/nautilus-file.c:4809
 #, c-format
@@ -2063,8 +2137,8 @@ msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
-"\"%s\" (फाइल \"%s\") माइम प्रकारका लागि वर्णन फेला परेन, कृपया gnome-vfs "
-"पत्राचार सूचीलाई भन्नुहोस् ।"
+"\"%s\" (फाइल \"%s\") माइम प्रकारका लागि वर्णन फेला परेन, कृपया gnome-vfs पत्राचार "
+"सूचीलाई भन्नुहोस् ।"
 
 #: ../libnautilus-private/nautilus-file.c:4825
 msgid "link"
@@ -2290,7 +2364,8 @@ msgstr "खोल्न असफल भयो, तपाईँ अर्को
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations."
-msgstr "\"%s\"ले \"%s\" खोल्न सक्दैन किनभने \"%s\" ले \"%s\" स्थानहरूमा फाइलहरू पहुँच गर्न सक्दैन ।"
+msgstr ""
+"\"%s\"ले \"%s\" खोल्न सक्दैन किनभने \"%s\" ले \"%s\" स्थानहरूमा फाइलहरू पहुँच गर्न सक्दैन ।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:142
 msgid "Open Failed, would you like to choose another action?"
@@ -2371,7 +2446,8 @@ msgstr "\"%s\" प्रदर्शन गर्न सकेन, किनभ�
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1538
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "हिज्जे र तपाईँको प्रोक्सि सेटिङ सहि छन् भन्ने जाँच गर्नुहोस् ।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:616
@@ -2421,7 +2497,8 @@ msgid "This drop target only supports local files."
 msgstr "यस छोड्ने लक्ष्यले स्थानीय फाइलहरूलाई मात्र समर्थन गर्दछ ।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "गैर-स्थानीय फाइलहरू खोल्न तिनिहरूलाई स्थानीय फोल्डरमा प्रतिलिपि गर्नुहोस् र त्यसपछि "
 "तिनिहरूलाई फेरि छोड्नुहोस् ।"
@@ -2462,7 +2539,8 @@ msgstr "सम्पादन गरिएको रिडु गर्नुह
 
 #. label, accelerator
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:658
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "सबै स्थानीय र टाढाको डिस्कहरू र यो क्मप्युटरबाट पहुँचयोग्य फोल्डरहरू ब्राउज गर्नुहोस्"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2552,8 +2630,10 @@ msgstr "डेस्कटप पृष्ठभूमि परिवर्त�
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
-msgstr "सञ्झ्याल देखाउनुहोस् जसले तपाईँलाई आफ्नो डेस्कटप पृष्ठभूमिको बाँन्की वा रङ सेट गर्न अनुमति दिन्छ"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+"सञ्झ्याल देखाउनुहोस् जसले तपाईँलाई आफ्नो डेस्कटप पृष्ठभूमिको बाँन्की वा रङ सेट गर्न अनुमति दिन्छ"
 
 #. tooltip
 #. label, accelerator
@@ -2610,7 +2690,8 @@ msgstr "तपाईँ \"%s\" लाई स्थायीरूपमा म�
 #: ../src/file-manager/fm-directory-view.c:1006
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] "तपाईँ %d चयन गरिएको वस्तु स्थायीरूपमा मेट्न निश्चित हुनुहुन्छ?"
 msgstr[1] "तपाईँ %d चयन गरिएका वस्तुहरू स्थायी रूपमा मेट्न निश्चित हुनुहुन्छ?"
 
@@ -2755,7 +2836,8 @@ msgstr[0] "चयन गरिएको वस्तुहरू रद्दी
 msgstr[1] "%d चयन गरिएको वस्तुहरू रद्दीटोकरीमा सार्न सकिँदैन"
 
 #: ../src/file-manager/fm-directory-view.c:3852
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "केही वस्तुहरू रद्दीटोकरीमा सार्न सकिँदैन, तपाईँ यी फाइलहरू तुरून्तै मेट्न चाहनुहुन्छ?"
 
 #: ../src/file-manager/fm-directory-view.c:3853
@@ -2838,9 +2920,10 @@ msgstr ""
 "फाइल \"%s\" प्रकारको हो भनि इङ्गित गर्दछ । यदि तपाईँले यो फाइल खोल्नु भयो भने, फाइलले "
 "तपाईँको प्रणालीमा सुरक्षा जोखिम ल्याउन सक्दछ ।\n"
 "\n"
-"तपाईँ आफैले फाइल सिर्जना वा विश्वाशिलो स्रोतबाट फाइल प्राप्त नगरे सम्म फाइल नखोल्नुहोस् । फाइल खोल्न, \"%s\"का लागि फाइल सही विस्तारमा पुन: नामकरण "
-"गर्नुहोस्, त्यसपछि सामान्य रूपमा फाइल खोल्नुहोस् । वैकल्पिक तरिकाले, फाइलका लागि निर्दिष्ट "
-"अनुप्रयोग रोज्न 'मेनुसँग खोल्नुहोस्' प्रयोग गर्नुहोस् ।"
+"तपाईँ आफैले फाइल सिर्जना वा विश्वाशिलो स्रोतबाट फाइल प्राप्त नगरे सम्म फाइल नखोल्नुहोस् । "
+"फाइल खोल्न, \"%s\"का लागि फाइल सही विस्तारमा पुन: नामकरण गर्नुहोस्, त्यसपछि सामान्य "
+"रूपमा फाइल खोल्नुहोस् । वैकल्पिक तरिकाले, फाइलका लागि निर्दिष्ट अनुप्रयोग रोज्न 'मेनुसँग "
+"खोल्नुहोस्' प्रयोग गर्नुहोस् ।"
 
 #: ../src/file-manager/fm-directory-view.c:5431
 #, c-format
@@ -2860,7 +2943,8 @@ msgstr "यस फोल्डरमा रहेका सबै कार्�
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
-msgstr "मेनुबाट स्क्रिप्ट रोज्दा त्यो स्क्रिप्ट चयन गरिएको कुनै पनि वस्तुसँग आगतको रूपमा चालु हुनेछ ।"
+msgstr ""
+"मेनुबाट स्क्रिप्ट रोज्दा त्यो स्क्रिप्ट चयन गरिएको कुनै पनि वस्तुसँग आगतको रूपमा चालु हुनेछ ।"
 
 #: ../src/file-manager/fm-directory-view.c:5941
 msgid ""
@@ -2886,16 +2970,17 @@ msgstr ""
 "यस फोल्डरमा रहेका सबै कार्यान्वयन योग्य फाइलहरू स्क्रिप्ट मेनुमा देखापर्नेछ । मेनुबाट स्क्रिप्ट "
 "रोज्दा त्यो स्क्रिप्ट चालु गर्नेछ ।\n"
 "\n"
-"स्थानीय फोल्डरबाट कार्यान्वयन गर्दा, स्क्रिप्टहरूले चयन गरिएको फाइल नामहरू पठाइएको हुनेछ । टाढाको "
-"फोल्डर (उदाहरणका लागि वेब वा ftp सामग्रीहरू देखाइरहेको फोल्डर) बाट कार्यान्वयन गर्दा "
-"स्क्रिप्टहरू परामितिहरूमा पठाइनेछ ।\n"
+"स्थानीय फोल्डरबाट कार्यान्वयन गर्दा, स्क्रिप्टहरूले चयन गरिएको फाइल नामहरू पठाइएको हुनेछ "
+"। टाढाको फोल्डर (उदाहरणका लागि वेब वा ftp सामग्रीहरू देखाइरहेको फोल्डर) बाट "
+"कार्यान्वयन गर्दा स्क्रिप्टहरू परामितिहरूमा पठाइनेछ ।\n"
 "\n"
 "सबै केसहरूमा, स्क्रिप्टहरूले प्रयोग गर्न सक्ने निम्न परिवेश चलहरू नटलसद्वारा सेट गरिनेछ:\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: चयन गरिएको फाइलहरू (यदि स्थानीय भए मात्र) "
 "का लागि नयाँ लाइन सीमा निर्धारित मार्गहरू\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: चयन गरिएको फाइलहरूका लागि नयाँ लाइन सिमा निर्धारित URIs\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: चयन गरिएको फाइलहरूका लागि नयाँ लाइन सिमा "
+"निर्धारित URIs\n"
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: हालको स्थानका लागि URI\n"
 "\n"
@@ -2916,16 +3001,20 @@ msgstr "यदि तपाईँले 'टाँस्नुहोस्' आ�
 #: ../src/file-manager/fm-directory-view.c:6116
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
 msgstr[0] "यदि तपाईँले 'टाँस्नुहोस्' आदेश चयन गर्नुभयो भने %d चयन गरिएको वस्तु सारिनेछ"
 msgstr[1] "यदि तपाईँले 'टाँस्नुहोस्' आदेश चयन गर्नु भएमा %d चयन गरिएका वस्तुहरू सारिनेछ"
 
 #: ../src/file-manager/fm-directory-view.c:6123
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
-msgstr[0] "यदि तपाईँले 'टाँस्नुहोस्' आदेश चयन गर्नुभयो भने %d चयन गरिएको वस्तु प्रतिलिपि गरिनेछ"
-msgstr[1] "यदि तपाईँले 'टाँस्नुहोस्' आदेश चयन गर्नुभयो भने %d चयन गरिएको वस्तुहरू प्रतिलिपि गरिनेछ"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"यदि तपाईँले 'टाँस्नुहोस्' आदेश चयन गर्नुभयो भने %d चयन गरिएको वस्तु प्रतिलिपि गरिनेछ"
+msgstr[1] ""
+"यदि तपाईँले 'टाँस्नुहोस्' आदेश चयन गर्नुभयो भने %d चयन गरिएको वस्तुहरू प्रतिलिपि गरिनेछ"
 
 #: ../src/file-manager/fm-directory-view.c:6217
 #: ../src/file-manager/fm-tree-view.c:1044
@@ -3001,11 +3090,12 @@ msgstr "खाली फाइल"
 msgid "Create a new empty file inside this folder"
 msgstr "यस फोल्डरभित्र एउटा नयाँ खाली फाइल सिर्जना गर्नुहोस्"
 
+#. #-#-#-#-#  ne.po (nautilus.gnome-2-20.ne)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6921
 #: ../src/file-manager/fm-directory-view.c:7800
 #: ../src/file-manager/fm-tree-view.c:1253
-#: ../src/nautilus-places-sidebar.c:1448
+#: ../src/nautilus-places-sidebar.c:1448 ../eel/eel-open-with-dialog.c:993
 msgid "_Open"
 msgstr "खोल्नुहोस्"
 
@@ -3065,7 +3155,9 @@ msgstr "'टाँस्नुहोस्' आदेशसँग चयन ग�
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6958
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "'काट्नुहोस्' वा 'प्रतिलिपि बनाउनुहोस्' आदेशद्वारा पहिल्यै चयन गरिएका फाइलहरू सार्नुहोस् वा प्रतिलिपि बनाउनुहोस्"
+msgstr ""
+"'काट्नुहोस्' वा 'प्रतिलिपि बनाउनुहोस्' आदेशद्वारा पहिल्यै चयन गरिएका फाइलहरू सार्नुहोस् वा "
+"प्रतिलिपि बनाउनुहोस्"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3081,8 +3173,8 @@ msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
 msgstr ""
-"'काट्नुहोस्' वा फाइलहरू 'प्रतिलिपि बनाउनुहोस्' आदेशद्वारा पहिल्यै चयन गरिएका फाइलहरूलाई चयन "
-"गरिएको फोल्डर भित्र सार्नुहोस् वा प्रतिलिपि बनाउनुहोस्"
+"'काट्नुहोस्' वा फाइलहरू 'प्रतिलिपि बनाउनुहोस्' आदेशद्वारा पहिल्यै चयन गरिएका फाइलहरूलाई "
+"चयन गरिएको फोल्डर भित्र सार्नुहोस् वा प्रतिलिपि बनाउनुहोस्"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6968
@@ -3455,7 +3547,8 @@ msgstr "सुरुआतकर्ता"
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\" का सामग्रीहरू हेर्नलाई तपाईँसँग आवश्यक अनुमतिहरू छैनन् ।"
 
 #: ../src/file-manager/fm-error-reporting.c:64
@@ -3474,12 +3567,15 @@ msgstr "फोल्डर सामग्रीहरू प्रदर्श�
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "यस फोल्डरमा \"%s\" नाम पहिल्यै प्रयोग भइसकेको छ । कृपया फरक नाम प्रयोग गर्नुहोस् ।"
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"यस फोल्डरमा \"%s\" नाम पहिल्यै प्रयोग भइसकेको छ । कृपया फरक नाम प्रयोग गर्नुहोस् ।"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "यस फोल्डरमा \"%s\" छैन । सायद यो भर्खरै सारिएको वा मेटिएको थियो?"
 
 #: ../src/file-manager/fm-error-reporting.c:118
@@ -3493,9 +3589,8 @@ msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
-"\"%s\" नाम वैध छैन किनभने यसले "
-"\"/\" क्यारेक्टर समाविष्ट गर्दछ । कृपया "
-"फरक नाम प्रयोग गर्नुहोस् ।"
+"\"%s\" नाम वैध छैन किनभने यसले \"/\" क्यारेक्टर समाविष्ट गर्दछ । कृपया फरक नाम प्रयोग "
+"गर्नुहोस् ।"
 
 #: ../src/file-manager/fm-error-reporting.c:127
 #, c-format
@@ -3518,7 +3613,8 @@ msgstr "वस्तुलाई पुन: नामाकरण गर्न �
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\" को समूह परिवर्तन गर्न तपाईँसँग आवश्यक अनुमतिहरू छैनन् ।"
 
 #: ../src/file-manager/fm-error-reporting.c:173
@@ -3551,7 +3647,8 @@ msgstr "मालिक परिवर्तन गर्न सकिएन �
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" को अनुमतिहरू परिवर्तन गर्न सकेन किनभने यो पढ्न-मात्र मिल्ने डिस्कमा छ"
 
 #: ../src/file-manager/fm-error-reporting.c:246
@@ -3647,7 +3744,8 @@ msgstr "नामद्वारा खाली गर्नुहोस्"
 #. label, accelerator
 #: ../src/file-manager/fm-icon-view.c:1450
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "सञ्झ्यालमा राम्रोसँग मिलाउन र खप्टिएको हटाउन प्रतिमाहरूलाई पुन:स्थितिमा ल्याउनुहोस्"
+msgstr ""
+"सञ्झ्यालमा राम्रोसँग मिलाउन र खप्टिएको हटाउन प्रतिमाहरूलाई पुन:स्थितिमा ल्याउनुहोस्"
 
 #. name, stock id
 #: ../src/file-manager/fm-icon-view.c:1456
@@ -4123,6 +4221,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr "चयन गरिएका फाइलका अनुमतिहरू निर्धारित गर्न सकिएन ।"
 
 #: ../src/file-manager/fm-properties-window.c:4824
+#: ../eel/eel-open-with-dialog.c:892
 msgid "Open With"
 msgstr "यससँग खोल्नुहोस्"
 
@@ -4203,8 +4302,8 @@ msgid ""
 "The location of the desktop directory has changed in GNOME 2.4. You can open "
 "the link and move over the files you want, then delete the link."
 msgstr ""
-"डेस्कटप डाइरेक्टरीको स्थान जिनोम २.४ मा परिवर्तन गरिएको छ । तपाईँले लिङ्क खोल्न र तपाईँले "
-"चहानुभएको फाइलहरू माथी सार्न सक्नुहुन्छ, त्यसपछि लिङ्क मेट्न सक्नुहुन्छ ।"
+"डेस्कटप डाइरेक्टरीको स्थान जिनोम २.४ मा परिवर्तन गरिएको छ । तपाईँले लिङ्क खोल्न र "
+"तपाईँले चहानुभएको फाइलहरू माथी सार्न सक्नुहुन्छ, त्यसपछि लिङ्क मेट्न सक्नुहुन्छ ।"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -4222,7 +4321,8 @@ msgid ""
 "console may fix the problem. If not, you can try rebooting the computer or "
 "installing Nautilus again."
 msgstr ""
-"नटलस अहिले प्रयोग गर्न सकिँदैन । कन्सोलबाट आदेश \"bonobo-slay\" चलाउनाले समस्या स्थिर हुनसक्दछ । यदि भएन भने, तपाईँले कम्प्युटर फेरि बुट गर्न प्रयास गर्न सक्नुहुन्छ वा नटलस फेरि "
+"नटलस अहिले प्रयोग गर्न सकिँदैन । कन्सोलबाट आदेश \"bonobo-slay\" चलाउनाले समस्या स्थिर "
+"हुनसक्दछ । यदि भएन भने, तपाईँले कम्प्युटर फेरि बुट गर्न प्रयास गर्न सक्नुहुन्छ वा नटलस फेरि "
 "स्थापना गर्न सक्नुहुन्छ ।"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
@@ -4246,17 +4346,19 @@ msgid ""
 "We have also seen this error when a faulty version of bonobo-activation was "
 "installed."
 msgstr ""
-"नटलस अहिले प्रयोग गर्न सकिँदैन । कन्सोलबाट आदेश \"bonobo-slay\" चलाउनाले समस्या समाधान हुनसक्दछ । यदि भएन भने, तपाईँले कम्प्युटर फेरि बुट गर्न प्रयास गर्न सक्नुहुन्छ वा नटलस फेरि "
-"स्थापना गर्न सक्नुहुन्छ ।\n"
+"नटलस अहिले प्रयोग गर्न सकिँदैन । कन्सोलबाट आदेश \"bonobo-slay\" चलाउनाले समस्या "
+"समाधान हुनसक्दछ । यदि भएन भने, तपाईँले कम्प्युटर फेरि बुट गर्न प्रयास गर्न सक्नुहुन्छ वा नटलस "
+"फेरि स्थापना गर्न सक्नुहुन्छ ।\n"
 "\n"
-"बोनोबोले Nautilus_shell.server फाइल राख्न सकेन । यसको एउटा कारण एउटा LD_LIBRARY_PATH "
-"जस्तो देखिन्छ जुसले बोनोबो सक्रिय लाइब्रेरीको डाइरेक्टरी समावेश गर्दैन । अर्को सम्भावित कारण "
-"Nautilus_Shell.server फाइल जडान गर्दाको खराबी हुनसक्दछ ।\n"
+"बोनोबोले Nautilus_shell.server फाइल राख्न सकेन । यसको एउटा कारण एउटा "
+"LD_LIBRARY_PATH जस्तो देखिन्छ जुसले बोनोबो सक्रिय लाइब्रेरीको डाइरेक्टरी समावेश गर्दैन । "
+"अर्को सम्भावित कारण Nautilus_Shell.server फाइल जडान गर्दाको खराबी हुनसक्दछ ।\n"
 "\n"
-"\"bonobo-slay\" फाइल चालु गर्दा बोनोबो सक्रियता र जीकन्फ प्रक्रियालाई नष्ट गर्नेछ जुन अर्को "
-"अनुप्रयोगहरूद्वारा आवश्यक हुन सक्दछ ।\n"
+"\"bonobo-slay\" फाइल चालु गर्दा बोनोबो सक्रियता र जीकन्फ प्रक्रियालाई नष्ट गर्नेछ जुन "
+"अर्को अनुप्रयोगहरूद्वारा आवश्यक हुन सक्दछ ।\n"
 "\n"
-"कहिले काँही बोनोबो सक्रिय सर्भरलाई नष्ट गर्दा जीकन्फको समस्या समाधान हुनसक्दछ तर किन हुन्छ हामीलाई थाहा छैन ।\n"
+"कहिले काँही बोनोबो सक्रिय सर्भरलाई नष्ट गर्दा जीकन्फको समस्या समाधान हुनसक्दछ तर किन "
+"हुन्छ हामीलाई थाहा छैन ।\n"
 "\n"
 "बिनोबो-सक्रियताको गलत संस्करण स्थापना गर्दा पनि हामीले यस्ता त्रुटिहरू देखेका छौं ।"
 
@@ -4289,7 +4391,8 @@ msgid ""
 "restarting Nautilus may help fix the problem."
 msgstr ""
 "बोनोबोबाट कारखाना राख्न प्रयास गर्दा अनपेक्षित त्रुटिका कारणले गर्दा अहिले नटलसको "
-"प्रयोग गर्न सकिँदैन । बोनोबो सक्रिय सर्भर नष्ट गरेर नटलस पुन: सुरु गर्नाले समस्या समाधानमा मद्दत गर्न सक्दछ ।"
+"प्रयोग गर्न सकिँदैन । बोनोबो सक्रिय सर्भर नष्ट गरेर नटलस पुन: सुरु गर्नाले समस्या समाधानमा "
+"मद्दत गर्न सक्दछ ।"
 
 #: ../src/nautilus-application.c:623
 msgid ""
@@ -4298,7 +4401,8 @@ msgid ""
 "restarting Nautilus may help fix the problem."
 msgstr ""
 "शेल वस्तु राख्न प्रयास गर्दा बोनोबोबाट अनपेक्षित त्रुटिका कारणले गर्दा अहिले नटलसको प्रयोग "
-"गर्न सकिँदैन । बोनोबो सक्रिय सर्भर नष्ट गरेर नटलस पुन: सुरु गर्नाले समस्या समाधान गर्न मद्दत गर्न सक्दछ ।"
+"गर्न सकिँदैन । बोनोबो सक्रिय सर्भर नष्ट गरेर नटलस पुन: सुरु गर्नाले समस्या समाधान गर्न "
+"मद्दत गर्न सक्दछ ।"
 
 #: ../src/nautilus-bookmarks-window.c:158
 #: ../src/nautilus-file-management-properties.c:216
@@ -4661,8 +4765,8 @@ msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
 msgstr ""
-"प्रतिमा नामहरूको मुनि देखा पार्न सूचनाको क्रम रोज्नुहोस् । जब नजिकबाट जुम गरिन्छ धेरै "
-"सूचना देखा पर्दछ ।"
+"प्रतिमा नामहरूको मुनि देखा पार्न सूचनाको क्रम रोज्नुहोस् । जब नजिकबाट जुम गरिन्छ धेरै सूचना "
+"देखा पर्दछ ।"
 
 #: ../src/nautilus-file-management-properties.glade.h:44
 msgid "Choose the order of information to appear in the list view."
@@ -4985,8 +5089,8 @@ msgid ""
 "Load a saved session from the specified file. Implies \"--no-default-window"
 "\"."
 msgstr ""
-"निर्दिष्ट गरिएको फाइलबाट बचत गरिएको सत्र लोड गर्नुहोस् । \"--no-default-window"
-"\" सूचीत गर्दछ ।"
+"निर्दिष्ट गरिएको फाइलबाट बचत गरिएको सत्र लोड गर्नुहोस् । \"--no-default-window\" "
+"सूचीत गर्दछ ।"
 
 #: ../src/nautilus-main.c:397
 msgid "FILENAME"
@@ -5359,7 +5463,8 @@ msgstr "रङ स्थापना गर्न सकिँदैन ।"
 
 #: ../src/nautilus-property-browser.c:1311
 msgid "Sorry, but you must specify an unused color name for the new color."
-msgstr "माफ गर्नुहोस्, तर तपाईँले नयाँ रङका लागि प्रयोग नभएको रङ नाम निर्दिष्ट गर्नु पर्दछ ।"
+msgstr ""
+"माफ गर्नुहोस्, तर तपाईँले नयाँ रङका लागि प्रयोग नभएको रङ नाम निर्दिष्ट गर्नु पर्दछ ।"
 
 #: ../src/nautilus-property-browser.c:1342
 msgid "Sorry, but you must specify a non-blank name for the new color."
@@ -5619,7 +5724,8 @@ msgstr "तपाईँको प्रोक्सी सेटिङहरू
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
 "browser."
-msgstr "\"%s\" प्रदर्शन गर्न सकेन, किनभने नटलसले SMB मास्टर ब्राउजरलाई सम्पर्क गर्न सक्दैन ।"
+msgstr ""
+"\"%s\" प्रदर्शन गर्न सकेन, किनभने नटलसले SMB मास्टर ब्राउजरलाई सम्पर्क गर्न सक्दैन ।"
 
 #: ../src/nautilus-window-manage-views.c:1553
 msgid "Check that an SMB server is running in the local network."
@@ -5648,7 +5754,10 @@ msgid ""
 "the terms of the GNU General Public License as published by the Free "
 "Software Foundation; either version 2 of the License, or (at your option) "
 "any later version."
-msgstr "नटलस स्वतन्त्र सफ्टवेयर हो; तपाईँले यसलाई स्वतन्त्र सफ्टवेयर संस्थाद्वारा प्रकासशित GNU साधरण सार्वजनिक इजाजत पत्रको संस्करण २ वा (तपाईँको विकल्पमा) कुनै पनि नयाँ पछिल्लो संस्करण अन्तर्गत रहेर पुन: वितरण गर्न सक्नुहुन्छ र/वा परिमार्जन गर्न सक्नुहुन्छ ।"
+msgstr ""
+"नटलस स्वतन्त्र सफ्टवेयर हो; तपाईँले यसलाई स्वतन्त्र सफ्टवेयर संस्थाद्वारा प्रकासशित GNU "
+"साधरण सार्वजनिक इजाजत पत्रको संस्करण २ वा (तपाईँको विकल्पमा) कुनै पनि नयाँ पछिल्लो "
+"संस्करण अन्तर्गत रहेर पुन: वितरण गर्न सक्नुहुन्छ र/वा परिमार्जन गर्न सक्नुहुन्छ ।"
 
 #: ../src/nautilus-window-menus.c:418
 msgid ""
@@ -5656,7 +5765,10 @@ msgid ""
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
-msgstr "नटलस उपयोगी हुनेछ भन्ने आशामा, तर कुनै वारेन्टी बिना; कुनै निश्चित उद्देश्यका लागि ब्यापारिक वा मिलानको ब्यबाहरिक वारेन्टी बिना नै वितरण गरिएको छ ।  अरु विस्तृत विवरणका लागि GNU साधारण सार्वजनिक इजाजतपत्र हेर्नुहोस् ।"
+msgstr ""
+"नटलस उपयोगी हुनेछ भन्ने आशामा, तर कुनै वारेन्टी बिना; कुनै निश्चित उद्देश्यका लागि "
+"ब्यापारिक वा मिलानको ब्यबाहरिक वारेन्टी बिना नै वितरण गरिएको छ ।  अरु विस्तृत "
+"विवरणका लागि GNU साधारण सार्वजनिक इजाजतपत्र हेर्नुहोस् ।"
 
 #: ../src/nautilus-window-menus.c:422
 msgid ""
@@ -5664,7 +5776,8 @@ msgid ""
 "Nautilus; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"तपाईँले नटलससँगै GNU साधरण सार्वजनिक इजाजपत्रको प्रतिलिपि पनि प्राप्त गरेको हुनुपर्दछ; यदि नभएमा, Free Software Foundation, Inc., \n"
+"तपाईँले नटलससँगै GNU साधरण सार्वजनिक इजाजपत्रको प्रतिलिपि पनि प्राप्त गरेको हुनुपर्दछ; "
+"यदि नभएमा, Free Software Foundation, Inc., \n"
 "59 Temple Place, Suite 330, Boston, MA 02111-1307 USA लाई लेख्नुहोस् ।"
 
 #: ../src/nautilus-window-menus.c:438
@@ -5919,3 +6032,204 @@ msgstr "जुम"
 msgid "Set the zoom level of the current view"
 msgstr "हालको दृश्यको जुम तह सेट गर्नुहोस्"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "छवि/लेबुल किनारा"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "सचेत संवादका लेबुल र छवि वरिपरि किनाराको चौडाइ"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "सचेत प्रकार"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "सचेतकको प्रकार"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "सचेत बटनहरू"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "सचेत संवादमा देखाइएका बटनहरू"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "अरू धेरै विवरण देखाउनुहोस्"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "पाठ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "लेबुलको पाठ"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "समरेखन"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"एक अर्कासँग सम्बन्धित पाठका पङ्क्ति र लेबुलको पङ्क्तिबद्धता/स्थान र लेबुलले पङ्क्तिबद्धतालाई "
+"असर गर्दैन ।"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "रेखिक बेराइ"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "यदि सेट गरिएमा, पाठ धेरै फराकिलो हुँदा लाइन बेरिन्छ ।"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "कर्सरको स्थिति"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "क्यारेक्टरहरूमा घुसाउने कर्सरको हालको स्थिति ।"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "चयन सीमा"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "क्यारेक्टरहरूमा कर्सरबाट चयन भएको अर्को छेउको स्थिति ।"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "सबै चयन गर्नुहोस्"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "आगत विधि"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf त्रुटि:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf त्रुटि: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "टर्मिनलमा मात्र देखिने सबै पछिल्ला त्रुटिहरू ।"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "कुनै पनि छवि चयन गरिएको थिएन ।"
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "छविलाई चयन गर्न तपाईँले यसमा क्लिक गर्नु पर्दछ ।"
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "पूर्वनिर्धारित"
+
+#: ../eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "प्रतिमा"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "अनुप्रयोग चयन गरिएको छैन"
+
+#: ../eel/eel-mime-application-chooser.c:528
+#: ../eel/eel-open-with-dialog.c:1067
+#, c-format
+msgid "%s document"
+msgstr "%s कागजात"
+
+#: ../eel/eel-mime-application-chooser.c:538
+#: ../eel/eel-open-with-dialog.c:1080
+msgid "Unknown"
+msgstr "अज्ञात"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and other files of type \"%s\""
+msgstr "%s र \"%s\" प्रकारका अन्य फाइल खोल्न एउटा अनुप्रयोग चयन गर्नुहोस्"
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "अनुप्रयोग चलाउन सकेन"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' फेला पार्न सकेन"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "अनुप्रयोग फेला पार्न सकेन"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "अनुप्रयोग थप्न सकेन"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "अनुप्रयोग डाटाबेसमा अनुप्रयोग थप्न सकेन"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "अनुप्रयोग चयन गर्नुहोस्"
+
+#: ../eel/eel-open-with-dialog.c:929
+msgid "Select an application to view its description."
+msgstr "अनुप्रयोगको वर्णन हेर्न यसलाई चयन गर्नुहोस् ।"
+
+#: ../eel/eel-open-with-dialog.c:954
+msgid "_Use a custom command"
+msgstr "अनुकूल आदेश प्रयोग गर्नुहोस्"
+
+#: ../eel/eel-open-with-dialog.c:971
+msgid "_Browse..."
+msgstr "ब्राउज गर्नुहोस्..."
+
+#: ../eel/eel-open-with-dialog.c:1087
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "यससँग %s र \"%s\" प्रकारका अरू फाइलहरू खोल्नुहोस्:"
+
+#: ../eel/eel-open-with-dialog.c:1119
+msgid "_Add"
+msgstr "थप्नुहोस्"
+
+#: ../eel/eel-open-with-dialog.c:1120
+msgid "Add Application"
+msgstr "अनुप्रयोग थप्नुहोस्"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "तपाईँले 'रद्द गर्नुहोस्' क्लिक गरेर यो सञ्चालन रोक्न सक्नुहुन्छ ।"
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (अवैध युनिकोड)"
diff --git a/po/nl.po b/po/nl.po
index 1190784c7..d61122c89 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#
 # Dutch Translation for Nautilus
 #
 # This file is distributed under the same license as the Nautilus package.
@@ -25,8 +26,20 @@
 # --------------------------------------------------------------------------
 # sorted - geordend/gesorteerd/gerangschikt
 #
+# #-#-#-#-#  nl.po (eel)  #-#-#-#-#
+# Dutch translation of eel
+#
+# This file is licensed under the same terms as the eel package.
+#
+# Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
+# Tino Meinen <a.t.meinen@chello.nl>, 2006
+# Ronald van Engelen <ronalde@lacocina.nl>, 2007
+# Wouter Bolsterlee <wbolster@gnome.org>, 2008
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-07 21:51+0000\n"
@@ -37,6 +50,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-04 17:29+0100\n"
+"PO-Revision-Date: 2008-02-04 17:30+0100\n"
+"Last-Translator: Wouter Bolsterlee <wbolster@gnome.org>\n"
+"Language-Team: Dutch <vertaling@nl.linux.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # was: Verschijning. maar dat is geen goede kleurnaam.
 #: ../data/browser.xml.h:1
@@ -833,9 +857,10 @@ msgid ""
 "the preference capplet. No prompt will be shown nor will any matching "
 "application be started on insertion of media matching these types."
 msgstr ""
-"Lijst van x-content/*-types waarvoor de gebruiker \"Do Nothing\" heeft gekozen in "
-"het voorkeurenvenster. Geen vraag zal getoond worden noch zal een corresponderende "
-"toepassing gestart worden bij het invoeren van media overeenkomstig aan deze types."
+"Lijst van x-content/*-types waarvoor de gebruiker \"Do Nothing\" heeft "
+"gekozen in het voorkeurenvenster. Geen vraag zal getoond worden noch zal een "
+"corresponderende toepassing gestart worden bij het invoeren van media "
+"overeenkomstig aan deze types."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
@@ -843,9 +868,9 @@ msgid ""
 "the preferences capplet. A folder window will be opened on insertion of "
 "media matching these types."
 msgstr ""
-"Lijst van x-content/*-types waarvoor de gebruiker \"Map openen\" heeft gekozen in "
-"het voorkeurenvenster. Er zal een map geopend worden bij het invoeren van media "
-"overeenkomstig aan deze types."
+"Lijst van x-content/*-types waarvoor de gebruiker \"Map openen\" heeft "
+"gekozen in het voorkeurenvenster. Er zal een map geopend worden bij het "
+"invoeren van media overeenkomstig aan deze types."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
@@ -853,10 +878,10 @@ msgid ""
 "application in the preference capplet. The preferred application for the "
 "given type will be started on insertion on media matching these types."
 msgstr ""
-"Lijst van x-content/* types waarvoor de gebruiker een toepassing heeft gekozen om "
-"te starten in het voorkeurenvenster. De voorkeurstoepassing voor het gegeven type "
-"zal gestart worden bij het invoeren van media overeenkomstig aan deze types."
-
+"Lijst van x-content/* types waarvoor de gebruiker een toepassing heeft "
+"gekozen om te starten in het voorkeurenvenster. De voorkeurstoepassing voor "
+"het gegeven type zal gestart worden bij het invoeren van media "
+"overeenkomstig aan deze types."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -2950,6 +2975,7 @@ msgstr "Kon niet als standaardtoepassing instellen: %s"
 msgid "Could not set as default application"
 msgstr "Kon niet als standaardtoepassing instellen"
 
+# #-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#
 #  add the reset background item, possibly disabled
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
 msgid "Default"
@@ -2964,14 +2990,23 @@ msgid "Could not remove application"
 msgstr "Kon toepassing niet verwijderen"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "Geen toepassingen geselecteerd"
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"Geen toepassingen geselecteerd\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"Geen toepassingen gekozen"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, c-format
+#, fuzzy, c-format
 msgid "%s document"
-msgstr "%s-document"
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"%s-document\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"%s document"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:910
@@ -2979,11 +3014,14 @@ msgid "Unknown"
 msgstr "Onbekend"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
 msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
 "Selecteer een toepassing waarmee %s en andere bestanden van type ‘%s’ "
-"geopend kunnen worden"
+"geopend kunnen worden\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"Kies een toepassing om %s en andere bestanden van het type ‘%s’ te openen"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2992,13 +3030,22 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "Alle bestanden van type ‘%s’ openen met:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#, fuzzy
 msgid "Could not run application"
-msgstr "Kan de toepassing niet uitvoeren"
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"Kan de toepassing niet uitvoeren\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"Kon toepassing niet uitvoeren"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "Kon ‘%s’ niet vinden"
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"Kon ‘%s’ niet vinden\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"Kon '%s' niet vinden"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
 msgid "Could not find application"
@@ -3013,10 +3060,16 @@ msgstr "Kon toepassing niet toevoegen aan toepassingendatabase: %s"
 msgid "Could not add application"
 msgstr "Kon toepassing niet toevoegen"
 
+# #-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#
 # titel van bladervenster
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "Selecteer een toepassing"
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"Selecteer een toepassing\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"Kies een toepassing"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5070
@@ -3024,20 +3077,33 @@ msgid "Open With"
 msgstr "Openen met"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Selecteer een toepassing om de omschrijving ervan te bekijken."
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"Selecteer een toepassing om de omschrijving ervan te bekijken.\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"Selecteer een toepassing om de beschrijving ervan te zien"
 
+# #-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#
 # _a wordt gebruikt voor _Annuleren
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
 msgid "_Use a custom command"
 msgstr "_Gebruik een aangepaste opdracht"
 
+# #-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#
 # bladeren/verkennen/browsen/opzoeken (in dit geval)
 # bladeren naar andere programma's
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
+#, fuzzy
 msgid "_Browse..."
-msgstr "_Bladeren…"
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"_Bladeren…\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"_Bladeren..."
 
+#. #-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -3049,9 +3115,13 @@ msgid "_Open"
 msgstr "_Openen"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "%s en andere bestanden van type ‘%s’ openen met:"
+msgstr ""
+"#-#-#-#-#  nl.po (Nautilus)  #-#-#-#-#\n"
+"%s en andere bestanden van type ‘%s’ openen met:\n"
+"#-#-#-#-#  nl.po (eel)  #-#-#-#-#\n"
+"%s en andere bestanden van type \"%s\" openen met:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
@@ -7038,6 +7108,149 @@ msgstr "Zoomen"
 msgid "Set the zoom level of the current view"
 msgstr "Zoomfactor van huidige weergave instellen"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Afbeelding/label grens"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Breedte van grens om het label en de afbeelding in de waarschuwingsdialoog"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Soort waarschuwing"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Het soort waarschuwing"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Waarschuwingsknoppen"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "De knoppen die worden weergegeven in de waarschuwingsdialoog"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Meer _details weergeven"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "De tekst van het label."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Opvulling"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"De uitlijning van de regels in de tekst van het label, relatief tot elkaar. "
+"Dit beïnvloedt NIET de uitlijning van het label binnen de ruimte waar het in "
+"zit. Zie daarvoor GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Regelterugloop"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Als ingesteld, worden regels afgebroken als ze te lang worden."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Aanwijzerpositie"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "De huidige positie van de invoegaanwijzer in tekens."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Selectieband"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"De positie van het uiteinde van de selectie, in tekens vanaf de aanwijzer."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Alles selecteren"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Invoermethodes"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf fout:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf fout: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Alle verdere fouten worden alleen op een terminal weergegeven."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Er is geen afbeelding geselecteerd."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "U dient op een afbeelding te klikken om deze te selecteren."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "U kunt deze operatie stoppen door op annuleren te klikken."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (ongeldige Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "%s openen"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d item openen"
+msgstr[1] "%d items openen"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Wachtwoord invoeren"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Lege Blu-Ray-schijf"
 
@@ -7370,3 +7583,33 @@ msgstr "Zoomfactor van huidige weergave instellen"
 
 #~ msgid "CD/DVD Creator"
 #~ msgstr "Cd/dvd branden"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Kon toepassing niet toevoegen aan toepassingengegevensbank"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01-01-00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1-1-00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1- 1-00,  1:00 AM"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf Fout"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Geen selectie gemaakt"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
+
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#~ msgid "Question"
+#~ msgstr "Vraag"
diff --git a/po/nn.po b/po/nn.po
index 854411b29..80a79f446 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  nn.po (nn)  #-#-#-#-#
 # translation of nautilus.po to Norwegian Nynorsk
 # Norwegian nynorsk translation of Nautilus
 # Copyright (C) 2001, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
@@ -13,8 +14,16 @@
 # Eskild Hustvedt, <eskildh@gnome.org>, 2008
 #
 #
+# #-#-#-#-#  nn.po (nn)  #-#-#-#-#
+# translation of nn.po to Norwegian Nynorsk
+# Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
+# Kjartan Maraas  <kmaraas@gnome.org>, 2000,2001.
+# Åsmund Skjæveland <aasmunds@ulrik.uio.no>, 2004-2008.
+# Copyright (C) 2000 Gaute Hvoslef Kvalnes.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  nn.po (nn)  #-#-#-#-#\n"
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-03-31 11:35+0200\n"
@@ -26,6 +35,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: MagicPO 0.3\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  nn.po (nn)  #-#-#-#-#\n"
+"Project-Id-Version: nn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-01 12:45+0100\n"
+"PO-Revision-Date: 2008-03-01 12:46+0100\n"
+"Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 # panel/launcher.c:499 panel/launcher.c:693 panel/menu.c:1715
 #: ../data/browser.xml.h:1
@@ -313,75 +334,75 @@ msgstr "M_erker"
 msgid "_Patterns"
 msgstr "_Mønster"
 
+#
 #. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../data/nautilus.xml.in.h:2
-#
 msgid "Blank Blu-Ray Disc"
 msgstr "Tom Blu-Ray-plate"
 
+#
 #. http://en.wikipedia.org/wiki/Compact_Disc
 #: ../data/nautilus.xml.in.h:4
-#
 msgid "Blank CD Disc"
 msgstr "Tom CD-plate"
 
+#
 #. http://en.wikipedia.org/wiki/DVD
 #: ../data/nautilus.xml.in.h:6
-#
 msgid "Blank DVD Disc"
 msgstr "Tom DVD-plate"
 
+#
 #. http://en.wikipedia.org/wiki/HD_DVD
 #: ../data/nautilus.xml.in.h:8
-#
 msgid "Blank HD DVD Disc"
 msgstr "Tom HD-DVD-plate"
 
+#
 #. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../data/nautilus.xml.in.h:10
-#
 msgid "Blu-Ray Video"
 msgstr "Blu-Ray-video"
 
+#
 #. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
 #: ../data/nautilus.xml.in.h:12
-#
 msgid "Compact Disc Audio"
 msgstr "Lyd CD"
 
+#
 #. http://en.wikipedia.org/wiki/DVD-Audio
 #: ../data/nautilus.xml.in.h:14
-#
 msgid "DVD Audio"
 msgstr "DVD-lyd"
 
+#
 #. http://en.wikipedia.org/wiki/DVD-Video
 #: ../data/nautilus.xml.in.h:16
-#
 msgid "DVD Video"
 msgstr "DVD-video"
 
+#
 #. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
 #: ../data/nautilus.xml.in.h:18
-#
 msgid "Digital Photos"
 msgstr "Digitale bileta"
 
+#
 #. http://en.wikipedia.org/wiki/HD_DVD
 #: ../data/nautilus.xml.in.h:20
-#
 msgid "HD DVD Video"
 msgstr "HD-DVD-video"
 
+#
 #. http://en.wikipedia.org/wiki/Picture_CD
 #: ../data/nautilus.xml.in.h:22
-#
 msgid "Picture CD"
 msgstr "Bilete-CD"
 
+#
 #. see fd.o hal spec
 #: ../data/nautilus.xml.in.h:24
-#
 msgid "Portable Audio Player"
 msgstr "Portabel lydspelar"
 
@@ -395,15 +416,15 @@ msgstr "Lagra søk"
 msgid "Software"
 msgstr "Programvare"
 
+#
 #. http://en.wikipedia.org/wiki/Super_Video_CD
 #: ../data/nautilus.xml.in.h:29
-#
 msgid "Super Video CD"
 msgstr "Super Video-CD"
 
+#
 #. http://en.wikipedia.org/wiki/Video_CD
 #: ../data/nautilus.xml.in.h:31
-#
 msgid "Video CD"
 msgstr "Video-CD"
 
@@ -423,8 +444,8 @@ msgstr ""
 "«date_accessed», «owner», «group», «permissions», «octal_permissions» og "
 "«mime_type»."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
 msgid "All columns have same width"
 msgstr "Alle kolonner med samme breidd"
 
@@ -432,10 +453,13 @@ msgstr "Alle kolonner med samme breidd"
 msgid "Always use the location entry, instead of the pathbar"
 msgstr "Bruk alltid adresselinja, istedenfor stigelinja"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 #
-msgid "Color for the default folder background. Only used if background_set is true."
-msgstr "Farge for forvald bakgrunn for ei mappe. Brukast berre viss background_set er sett til «true»."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
+msgstr ""
+"Farge for forvald bakgrunn for ei mappe. Brukast berre viss background_set "
+"er sett til «true»."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "Computer icon visible on desktop"
@@ -461,8 +485,8 @@ msgstr ""
 msgid "Current Nautilus theme (deprecated)"
 msgstr "Noverande Nautilus-drakt (utgått)"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid "Custom Background"
 msgstr "Eigendefinert bakgrunn"
 
@@ -490,8 +514,8 @@ msgstr "Standard bakgrunnsfarge på sidestolpe"
 msgid "Default Side Pane Background Filename"
 msgstr "Filnamn for standardbakgrunn i sidestolpen"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Default Thumbnail Icon Size"
 msgstr "Forvald storleik for miniatyrikon"
 
@@ -625,15 +649,23 @@ msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr ""
 "Dersom denne er satt til sann, vil nyopna vindauge ha synlege verktøylinjer."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 #
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
-msgstr "Viss nøkkelen setjes til «true» vil Nautilus lesarvindauge alltid bruka eit tekstfelt til adressefelt i staden for stilinja."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
+msgstr ""
+"Viss nøkkelen setjes til «true» vil Nautilus lesarvindauge alltid bruka eit "
+"tekstfelt til adressefelt i staden for stilinja."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 #
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
-msgstr "Nautilus lèt deg rediger nokon av dei meir eksotiske eigenskapene ved ein fil i innstillingar-dialogen viss sett til «true»."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
+msgstr ""
+"Nautilus lèt deg rediger nokon av dei meir eksotiske eigenskapene ved ein "
+"fil i innstillingar-dialogen viss sett til «true»."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
@@ -643,20 +675,36 @@ msgstr ""
 "Dersom sann, vil Nautilus visa mapper før filer i liste- og "
 "ikonframsyningane."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 #
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash."
-msgstr "Nautilus spør om bekreftelse ved sletting av filer eller tømming av papirkorga viss sett til «true»."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"delete files, or empty the Trash."
+msgstr ""
+"Nautilus spør om bekreftelse ved sletting av filer eller tømming av "
+"papirkorga viss sett til «true»."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 #
-msgid "If set to true, then Nautilus will automatically mount media such as user-visible hard disks and removable media on start-up and and media insertion."
-msgstr "Viss denne setjes til «true» vil Nautilus montere medier som harddisker og avtagbare medier ved oppstart og innsetting av medie."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
+msgid ""
+"If set to true, then Nautilus will automatically mount media such as user-"
+"visible hard disks and removable media on start-up and and media insertion."
+msgstr ""
+"Viss denne setjes til «true» vil Nautilus montere medier som harddisker og "
+"avtagbare medier ved oppstart og innsetting av medie."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 #
-msgid "If set to true, then Nautilus will automatically open a folder when media is automounted. This only applies to media where no known x-content/* type was detected; for media where a known x-content type is detected, the user configurable action will be taken instead."
-msgstr "Viss denne slås på vil Nautilus automatisk opna ei mappe når eit medie blir automatisk montert. Dette gjeld berre for medier som ikkje har ein kjent x-content/* type; for medier med ein kjent x-content type vil brukar sett opp handling utførast i staden."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
+msgid ""
+"If set to true, then Nautilus will automatically open a folder when media is "
+"automounted. This only applies to media where no known x-content/* type was "
+"detected; for media where a known x-content type is detected, the user "
+"configurable action will be taken instead."
+msgstr ""
+"Viss denne slås på vil Nautilus automatisk opna ei mappe når eit medie blir "
+"automatisk montert. Dette gjeld berre for medier som ikkje har ein kjent x-"
+"content/* type; for medier med ein kjent x-content type vil brukar sett opp "
+"handling utførast i staden."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
@@ -671,10 +719,14 @@ msgstr ""
 "Dersom sann, vil Nautilus la deg sletta filer med ein gong, utan å flytta "
 "dei til papirkorga. Denne eigenskapen kan vera farleg, så ver varsam."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 #
-msgid "If set to true, then Nautilus will never prompt nor autorun/autostart programs when media is inserted."
-msgstr "Viss denne setjes til «true» vil Nautilus aldri spørre eller køyra program automatisk når medier setjes inn."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
+msgid ""
+"If set to true, then Nautilus will never prompt nor autorun/autostart "
+"programs when media is inserted."
+msgstr ""
+"Viss denne setjes til «true» vil Nautilus aldri spørre eller køyra program "
+"automatisk når medier setjes inn."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
@@ -749,10 +801,14 @@ msgstr ""
 "Dersom sann, vil ikon med lenkjer til monterte datalager setjast på "
 "skrivebordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 #
-msgid "If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately."
-msgstr "Viss denne instillinga er satt, vil alle kolonner i kompakt modus ha same breidd. Vis ikkje vil bredden bli kalkulert separat for kvar kolonne."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
+msgid ""
+"If this preference is set, all columns in the compact view have the same "
+"width. Otherwise, the width of each column is determined seperately."
+msgstr ""
+"Viss denne instillinga er satt, vil alle kolonner i kompakt modus ha same "
+"breidd. Vis ikkje vil bredden bli kalkulert separat for kvar kolonne."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid ""
@@ -804,28 +860,32 @@ msgstr ""
 msgid "List of possible captions on icons"
 msgstr "Liste over moglege ikontekstar"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "List of x-content/* types to ask the user what to do on insertion"
 msgstr "Liste med x-content/* typar som skal spørres om ved innsetting"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "List of x-content/* types to ask the user what to do on insertion."
 msgstr "Liste med x-content/* typar som skal spørres om ved innsetting."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid "List of x-content/* types where a folder window should be opened"
 msgstr "Liste med x-content/* typar kor eit mappevindauge skal vert opna"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 #
-msgid "List of x-content/* types where a folder window should be opened on insertion."
-msgstr "Liste med x-content/* typar kor eit mappevindauge skal vert opna ved innsetting."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+msgid ""
+"List of x-content/* types where a folder window should be opened on "
+"insertion."
+msgstr ""
+"Liste med x-content/* typar kor eit mappevindauge skal vert opna ved "
+"innsetting."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "List of x-content/* where to prompt the user on insertion"
 msgstr "Liste med x-content/* kor brukar skal spørres ved innsetting"
 
@@ -857,18 +917,18 @@ msgstr "Nautilus bruker heimemappa til brukaren som skrivebord"
 msgid "Network Servers icon visible on the desktop"
 msgstr "Nettverkstenarar-ikonet synleg på skrivebordet"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Network servers icon name"
 msgstr "Ikonnamn for nettverkstenarar"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 msgid "Never prompt or autorun/autostart programs when media is inserted"
 msgstr "Aldri spør eller køyr program automatisk når medie setjes inn"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 msgid "Only show folders in the tree side pane"
 msgstr "Vis berre mapper i treet i sidelinja"
 
@@ -895,8 +955,8 @@ msgstr "Sorter i omvendt rekkefølgje i nye vindauge"
 msgid "Sans 10"
 msgstr "Sans 10"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Show advanced permissions in the file property dialog"
 msgstr "Vis avanserte rettar i dialog for fileigenskapar"
 
@@ -980,8 +1040,8 @@ msgstr ""
 "Dersom verdien er «local_only», vert berre mapper som ligg lokalt på maskina "
 "telte opp. Dersom verdien er «never», vert mappene aldri telte opp."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
 msgid "The default size of an icon for a thumbnail in the icon view."
 msgstr "Forvald storleik på eit ikon for ein miniatyr i ikonvising."
 
@@ -1033,10 +1093,14 @@ msgid ""
 "desktop."
 msgstr "Sjølvvald namn på heime-ikonet på skrivebordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
 #
-msgid "This name can be set if you want a custom name for the network servers icon on the desktop."
-msgstr "Dette namnet kan setjes viss du ynskjer eit tilpassa namn for ikonet for nettverkstenarar på skrivebordet."
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
+msgid ""
+"This name can be set if you want a custom name for the network servers icon "
+"on the desktop."
+msgstr ""
+"Dette namnet kan setjes viss du ynskjer eit tilpassa namn for ikonet for "
+"nettverkstenarar på skrivebordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
 msgid ""
@@ -1107,18 +1171,20 @@ msgstr "Om det er sjølvvald bakgrunn i mappevisinga."
 msgid "Whether a custom default side pane background has been set."
 msgstr "Om det er sjølvvald bakgrunn i sidestolpen."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "Om det skal spørres om bekreftelse ved sletting av filer eller tømming av papirkorga"
+msgstr ""
+"Om det skal spørres om bekreftelse ved sletting av filer eller tømming av "
+"papirkorga"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
 msgid "Whether to automatically mount media"
 msgstr "Om medie skal monterast automatisk"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 #
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "Whether to automatically open a folder for automounted media"
 msgstr "Om ei mappe skal vert opna automatisk for automatisk montert medie"
 
@@ -1143,24 +1209,24 @@ msgstr "Om skjulte filer skal visast"
 msgid "Width of the side pane"
 msgstr "Breidde på sidestolpen"
 
-#: ../libnautilus-private/nautilus-autorun.c:335
 #
+#: ../libnautilus-private/nautilus-autorun.c:335
 msgid "No applications found"
 msgstr "Inga program funne"
 
-#: ../libnautilus-private/nautilus-autorun.c:351
 #
+#: ../libnautilus-private/nautilus-autorun.c:351
 msgid "Ask what to do"
 msgstr "Spør kva som skal gjerast"
 
-#: ../libnautilus-private/nautilus-autorun.c:367
 #
+#: ../libnautilus-private/nautilus-autorun.c:367
 msgid "Do Nothing"
 msgstr "Ikkje gjer noko"
 
+#
 #: ../libnautilus-private/nautilus-autorun.c:382
 #: ../nautilus-folder-handler.desktop.in.in.h:1
-#
 msgid "Open Folder"
 msgstr "Opna mappe"
 
@@ -1170,94 +1236,100 @@ msgstr "Opna mappe"
 msgid "Open %s"
 msgstr "Opna %s"
 
-#: ../libnautilus-private/nautilus-autorun.c:1076
 #
+#: ../libnautilus-private/nautilus-autorun.c:1076
 msgid "You have just inserted an Audio CD."
 msgstr "Du har sett inn ein lyd-CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1078
 #
+#: ../libnautilus-private/nautilus-autorun.c:1078
 msgid "You have just inserted an Audio DVD."
 msgstr "Du har sett inn ein lyd-DVD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1080
 #
+#: ../libnautilus-private/nautilus-autorun.c:1080
 msgid "You have just inserted a Video DVD."
 msgstr "Du har sett inn ein Video-DVD.c"
 
-#: ../libnautilus-private/nautilus-autorun.c:1082
 #
+#: ../libnautilus-private/nautilus-autorun.c:1082
 msgid "You have just inserted a Video CD."
 msgstr "Du har sett inn ein Video-CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1084
 #
+#: ../libnautilus-private/nautilus-autorun.c:1084
 msgid "You have just inserted a Super Video CD."
 msgstr "Du har sett inn ein Super Video-CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1086
 #
+#: ../libnautilus-private/nautilus-autorun.c:1086
 msgid "You have just inserted a blank CD."
 msgstr "Du har sett inn ein tom CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1088
 #
+#: ../libnautilus-private/nautilus-autorun.c:1088
 msgid "You have just inserted a blank DVD."
 msgstr "Du har sett inn ein tom DVD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1090
 #
+#: ../libnautilus-private/nautilus-autorun.c:1090
 msgid "You have just inserted a blank Blu-Ray disc."
 msgstr "Du har sett inn ein tom Blu-Ray-plate."
 
-#: ../libnautilus-private/nautilus-autorun.c:1092
 #
+#: ../libnautilus-private/nautilus-autorun.c:1092
 msgid "You have just inserted a blank HD DVD."
 msgstr "Du har sett inn ein tom HD-DVD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1094
 #
+#: ../libnautilus-private/nautilus-autorun.c:1094
 msgid "You have just inserted a Photo CD."
 msgstr "Du har sett inn ein Photo-CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1096
 #
+#: ../libnautilus-private/nautilus-autorun.c:1096
 msgid "You have just inserted a Picture CD."
 msgstr "Du har sett inn ein bilete-CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:1098
 #
+#: ../libnautilus-private/nautilus-autorun.c:1098
 msgid "You have just inserted media with digital photos."
 msgstr "Du har sett inn eit medie med digitale bilete."
 
-#: ../libnautilus-private/nautilus-autorun.c:1100
 #
+#: ../libnautilus-private/nautilus-autorun.c:1100
 msgid "You have just inserted a digital audio player."
 msgstr "Du har sett inn ein digital lydspelar."
 
-#: ../libnautilus-private/nautilus-autorun.c:1102
 #
-msgid "You have just inserted media with software intended to be automatically started."
+#: ../libnautilus-private/nautilus-autorun.c:1102
+msgid ""
+"You have just inserted media with software intended to be automatically "
+"started."
 msgstr "Du har sett inn medie med programvare som skal startast automatisk."
 
+#
 #. fallback to generic greeting
 #: ../libnautilus-private/nautilus-autorun.c:1105
-#
 msgid "You have just inserted media."
 msgstr "Du har sett inn medie."
 
-#: ../libnautilus-private/nautilus-autorun.c:1107
 #
+#: ../libnautilus-private/nautilus-autorun.c:1107
 msgid "Choose what application to launch."
 msgstr "Vel kva program som skal startast."
 
 #: ../libnautilus-private/nautilus-autorun.c:1116
 #, c-format
-msgid "Select how to open \"%s\" and whether to perform this action in the future for other media of type \"%s\"."
-msgstr "Vel korleis «%s» skal vert opna og om du vil ututføra denne hanglinga for medie av type «%s» i framtida."
+msgid ""
+"Select how to open \"%s\" and whether to perform this action in the future "
+"for other media of type \"%s\"."
+msgstr ""
+"Vel korleis «%s» skal vert opna og om du vil ututføra denne hanglinga for "
+"medie av type «%s» i framtida."
 
-#: ../libnautilus-private/nautilus-autorun.c:1138
 #
+#: ../libnautilus-private/nautilus-autorun.c:1138
 msgid "_Always perform this action"
 msgstr "_Alltid utfør denne handlinga"
 
@@ -1271,9 +1343,9 @@ msgstr "_Alltid utfør denne handlinga"
 msgid "_Eject"
 msgstr "Løys _ut"
 
+#
 #: ../libnautilus-private/nautilus-autorun.c:1165
 #: ../src/nautilus-places-sidebar.c:1729
-#
 msgid "_Unmount"
 msgstr "_Avmonter"
 
@@ -1416,13 +1488,13 @@ msgstr "MIME-type"
 msgid "The mime type of the file."
 msgstr "MIME-typen til fila."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:120
 #
+#: ../libnautilus-private/nautilus-column-utilities.c:120
 msgid "SELinux Context"
 msgstr "SELinux-kontekst"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:121
 #
+#: ../libnautilus-private/nautilus-column-utilities.c:121
 msgid "The SELinux security context of the file."
 msgstr "SELinux sikkerhetskontekst for fila."
 
@@ -1537,8 +1609,8 @@ msgstr "H_opp over alt"
 msgid "_Retry"
 msgstr "_Prøv på nytt"
 
-#: ../libnautilus-private/nautilus-file-operations.c:174
 #
+#: ../libnautilus-private/nautilus-file-operations.c:174
 msgid "Delete _All"
 msgstr "Slett _alle"
 
@@ -1550,13 +1622,13 @@ msgstr "_Bytt ut"
 msgid "Replace _All"
 msgstr "Bytt ut _alle"
 
-#: ../libnautilus-private/nautilus-file-operations.c:177
 #
+#: ../libnautilus-private/nautilus-file-operations.c:177
 msgid "_Merge"
 msgstr "_Flett"
 
-#: ../libnautilus-private/nautilus-file-operations.c:178
 #
+#: ../libnautilus-private/nautilus-file-operations.c:178
 msgid "Merge _All"
 msgstr "Flett _alle"
 
@@ -1729,17 +1801,24 @@ msgstr " ("
 msgid " (%'d"
 msgstr " (%'d"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1094
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1094
 msgid "Are you sure you want to permanently delete \"%B\" from the trash?"
 msgstr "Er du sikker på at du vil slette «%B» permanent frå papirkorga?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1097
 #, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items from the trash?"
-msgstr[0] "Er du sikker på at du vil slette %'d vald oppføring i papirkorga permanent?"
-msgstr[1] "Er du sikker på at du vil slette %'d valde oppføringar i papirkorga permanent?"
+msgid ""
+"Are you sure you want to permanently delete the %'d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items from the "
+"trash?"
+msgstr[0] ""
+"Er du sikker på at du vil slette %'d vald oppføring i papirkorga permanent?"
+msgstr[1] ""
+"Er du sikker på at du vil slette %'d valde oppføringar i papirkorga "
+"permanent?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1107
 #: ../libnautilus-private/nautilus-file-operations.c:1173
@@ -1758,15 +1837,16 @@ msgstr ""
 "Dersom du tømer papirkorga, vert elementa sletta for godt. Legg merke til at "
 "du kan velje kva for filer du vil slette."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1161
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1161
 msgid "Are you sure you want to permanently delete \"%B\"?"
 msgstr "Er du sikker på at du vil slette «%B» permanent?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1164
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "Er du sikker på at du vil slette %'d vald oppføring permanent?"
 msgstr[1] "Er du sikker på at du vil slette %'d valde oppføringar permanent?"
 
@@ -1781,9 +1861,9 @@ msgid_plural "%'d files left to delete"
 msgstr[0] "%'d fil att å slette"
 msgstr[1] "%'d filer att å slette"
 
+#
 #. To translators: %T will expand to a time like "2 minutes"
 #: ../libnautilus-private/nautilus-file-operations.c:1222
-#
 msgid "%'d file left to delete — %T left"
 msgid_plural "%'d files left to delete — %T left"
 msgstr[0] "%'d fil att å slette -- %T gjenstår"
@@ -1797,48 +1877,55 @@ msgstr[1] "%'d filer att å slette -- %T gjenstår"
 msgid "Error while deleting."
 msgstr "Feil under sletting."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1287
 #
-msgid "Files in the folder \"%B\" cannot be deleted because you do not have permissions to see them."
-msgstr "Filer i mappa «%B» kan ikkje slettast fordi du ikkje har rettar til å sjå dei."
+#: ../libnautilus-private/nautilus-file-operations.c:1287
+msgid ""
+"Files in the folder \"%B\" cannot be deleted because you do not have "
+"permissions to see them."
+msgstr ""
+"Filer i mappa «%B» kan ikkje slettast fordi du ikkje har rettar til å sjå dei."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:1290
 #: ../libnautilus-private/nautilus-file-operations.c:2169
 #: ../libnautilus-private/nautilus-file-operations.c:2942
-#
-msgid "There was an error getting information about the files in the folder \"%B\"."
-msgstr "Det oppsto ein feil under henting av informasjon om filene i mappe «%B»."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
+msgstr ""
+"Det oppsto ein feil under henting av informasjon om filene i mappe «%B»."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:1298
 #: ../libnautilus-private/nautilus-file-operations.c:2950
-#
 msgid "_Skip files"
 msgstr "_Hopp over filer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1319
 #
-msgid "The folder \"%B\" cannot be deleted because you do not have permissions to read it."
+#: ../libnautilus-private/nautilus-file-operations.c:1319
+msgid ""
+"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"read it."
 msgstr "Mappa «%B» kan ikkje slettast fordi du ikkje har rettar til å lesa den."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:1322
 #: ../libnautilus-private/nautilus-file-operations.c:2207
 #: ../libnautilus-private/nautilus-file-operations.c:2986
-#
 msgid "There was an error reading the folder \"%B\"."
 msgstr "Det oppsto ein feil under lesing av mappe «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1355
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1355
 msgid "Couldn't remove the folder %B."
 msgstr "Kunne ikkje fjerna mappe %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1437
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1437
 msgid "There was an error deleting %B."
 msgstr "Det oppsto ein feil under sletting av %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1513
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1513
 msgid "Moving files to trash"
 msgstr "Flytter filer til papirkurv"
 
@@ -1853,33 +1940,37 @@ msgstr[1] "%'d filer att å slette"
 msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Kan ikkje flytta fila til papirkorga. Vil du sletta fila for godt?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1565
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1565
 msgid "The file \"%B\" cannot be moved to the trash."
 msgstr "Fil «%B» kan ikkje flyttast til papirkorga."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1789
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1789
 msgid "Unable to eject %V"
 msgstr "Kan ikkje løyse ut %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1791
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1791
 msgid "Unable to unmount %V"
 msgstr "Kan ikkje avmontere %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1931
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1931
 msgid "Do you want to empty the trash before you unmount?"
 msgstr "Vil du tømme papirkorga før du avmonterer?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1933
 #
-msgid "In order to regain the free space on this volume the trash must be emptied. All trashed items on the volume will be permanently lost."
-msgstr "Papirkorga må tømmes for å få tilbake ledig plass på dette volumet. Alle oppføringar i papirkorga vil verta borte permanent."
+#: ../libnautilus-private/nautilus-file-operations.c:1933
+msgid ""
+"In order to regain the free space on this volume the trash must be emptied. "
+"All trashed items on the volume will be permanently lost."
+msgstr ""
+"Papirkorga må tømmes for å få tilbake ledig plass på dette volumet. Alle "
+"oppføringar i papirkorga vil verta borte permanent."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1939
 #
+#: ../libnautilus-private/nautilus-file-operations.c:1939
 msgid "Don't Empty Trash"
 msgstr "Ikkje tøm papirkurv"
 
@@ -1935,57 +2026,69 @@ msgstr "Feil under kopiering."
 msgid "Error while moving."
 msgstr "Feil under flytting"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2112
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2112
 msgid "Error while moving files to trash."
 msgstr "Feil under flytting av filer til papirkurv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2166
 #
-msgid "Files in the folder \"%B\" cannot be handled because you do not have permissions to see them."
-msgstr "Filer i mappe «%B» kan ikkje handterast fordi du ikkje har rettar til å sjå dei."
+#: ../libnautilus-private/nautilus-file-operations.c:2166
+msgid ""
+"Files in the folder \"%B\" cannot be handled because you do not have "
+"permissions to see them."
+msgstr ""
+"Filer i mappe «%B» kan ikkje handterast fordi du ikkje har rettar til å sjå "
+"dei."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2204
 #
-msgid "The folder \"%B\" cannot be handled because you do not have permissions to read it."
-msgstr "Mappe «%B» kan ikkje handterast fordi du ikkje har rettar til å lesa den."
+#: ../libnautilus-private/nautilus-file-operations.c:2204
+msgid ""
+"The folder \"%B\" cannot be handled because you do not have permissions to "
+"read it."
+msgstr ""
+"Mappe «%B» kan ikkje handterast fordi du ikkje har rettar til å lesa den."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2278
 #
-msgid "The file \"%B\" cannot be handled because you do not have permissions to read it."
-msgstr "Fila «%B» kan ikkje handterast fordi du ikkje har rettar til å lesa den."
+#: ../libnautilus-private/nautilus-file-operations.c:2278
+msgid ""
+"The file \"%B\" cannot be handled because you do not have permissions to "
+"read it."
+msgstr ""
+"Fila «%B» kan ikkje handterast fordi du ikkje har rettar til å lesa den."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2281
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2281
 msgid "There was an error getting information about \"%B\"."
 msgstr "Det oppsto ein feil under henting av informasjon om «%B»."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:2378
 #: ../libnautilus-private/nautilus-file-operations.c:2419
 #: ../libnautilus-private/nautilus-file-operations.c:2451
 #: ../libnautilus-private/nautilus-file-operations.c:2476
-#
 msgid "Error while copying to \"%B\"."
 msgstr "Feil under kopiering til «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2382
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2382
 msgid "You don't have permissions to access the destination folder."
 msgstr "Du har ikkje rettar til å få tilgang målmappa."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2384
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2384
 msgid "There was an error getting information about the destination."
 msgstr "Det oppsto ein feil under henting av informsjon om målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2420
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2420
 msgid "The destination is not a folder."
 msgstr "Målet er ikkje ei mappe."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2452
 #
-msgid "There is not enough space on the destination. Try to remove files to make space."
+#: ../libnautilus-private/nautilus-file-operations.c:2452
+msgid ""
+"There is not enough space on the destination. Try to remove files to make "
+"space."
 msgstr "Ikkje nok plass på målet. Prøve å fjerna filer for å frigjera plass."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2454
@@ -1993,56 +2096,56 @@ msgstr "Ikkje nok plass på målet. Prøve å fjerna filer for å frigjera plass
 msgid "There is %S available, but %S is required."
 msgstr "%S tilgjengeleg, men %S kreves."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2477
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2477
 msgid "The destination is read-only."
 msgstr "Målet er skriveverna."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2535
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2535
 msgid "Moving \"%B\" to \"%B\""
 msgstr "Flytter «%B» til «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2536
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2536
 msgid "Copying \"%B\" to \"%B\""
 msgstr "Kopierer «%B» til «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2541
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2541
 msgid "Duplicating \"%B\""
 msgstr "Dupliserer «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2549
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2549
 msgid "Moving %'d file (in \"%B\") to \"%B\""
 msgid_plural "Moving %'d files (in \"%B\") to \"%B\""
 msgstr[0] "Flytter %'d fil (i «%B») til «%B»"
 msgstr[1] "Flytter %'d filer (i «%B») til «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2553
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2553
 msgid "Copying %'d file (in \"%B\") to \"%B\""
 msgid_plural "Copying %'d files (in \"%B\") to \"%B\""
 msgstr[0] "Kopierer %'d fil (i «%B») til «%B»"
 msgstr[1] "Kopierer %'d filer (i «%B») til «B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2561
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2561
 msgid "Duplicating %'d file (in \"%B\")"
 msgid_plural "Duplicating %'d files (in \"%B\")"
 msgstr[0] "Dupliserer %'d fil (i «%B»)"
 msgstr[1] "Dupliserer %'d filer (i «%B»)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2571
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2571
 msgid "Moving %'d file to \"%B\""
 msgid_plural "Moving %'d files to \"%B\""
 msgstr[0] "Flytter %'d fil til «%B»"
 msgstr[1] "Flytter %'d filer til «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2575
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2575
 msgid "Copying %'d file to \"%B\""
 msgid_plural "Copying %'d files to \"%B\""
 msgstr[0] "Kopierer %'d fil til «%B»"
@@ -2061,51 +2164,62 @@ msgstr[1] "Dupliserer %'d filer"
 msgid "%S of %S"
 msgstr "%S av %S"
 
+#
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB", %T to a time duration like
 #. * "2 minutes". So the whole thing will be something like "2 kb of 4 MB -- 2 hours left (4kb/sec)"
 #.
 #: ../libnautilus-private/nautilus-file-operations.c:2610
-#
 msgid "%S of %S — %T left (%S/sec)"
 msgstr "%S av %S -- %T att (%S/sek)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2839
 #
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to create it in the destination."
-msgstr "Mappa «%B» kan ikkje kopierast fordi du ikkje har rettar til å oppretta den på målet."
+#: ../libnautilus-private/nautilus-file-operations.c:2839
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"create it in the destination."
+msgstr ""
+"Mappa «%B» kan ikkje kopierast fordi du ikkje har rettar til å oppretta den "
+"på målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2842
 #
+#: ../libnautilus-private/nautilus-file-operations.c:2842
 msgid "There was an error creating the folder \"%B\"."
 msgstr "Det oppsto ein feil under oppretting av mappe «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2939
 #
-msgid "Files in the folder \"%B\" cannot be copied because you do not have permissions to see them."
-msgstr "Filer i mappe «%B» kan ikkje kopierast fordi du ikkje har rettar til å sjå dei."
+#: ../libnautilus-private/nautilus-file-operations.c:2939
+msgid ""
+"Files in the folder \"%B\" cannot be copied because you do not have "
+"permissions to see them."
+msgstr ""
+"Filer i mappe «%B» kan ikkje kopierast fordi du ikkje har rettar til å sjå "
+"dei."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2983
 #
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to read it."
-msgstr "Mappe «%B» kan ikkje kopierast fordi du ikkje har rettar til å lesa den."
+#: ../libnautilus-private/nautilus-file-operations.c:2983
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"read it."
+msgstr ""
+"Mappe «%B» kan ikkje kopierast fordi du ikkje har rettar til å lesa den."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:3025
 #: ../libnautilus-private/nautilus-file-operations.c:3417
 #: ../libnautilus-private/nautilus-file-operations.c:3903
-#
 msgid "Error while moving \"%B\"."
 msgstr "Feil under flytting av «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3026
 #
+#: ../libnautilus-private/nautilus-file-operations.c:3026
 msgid "Couldn't remove the source folder."
 msgstr "Kunne ikkje fjerna kjeldemappa."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:3107
 #: ../libnautilus-private/nautilus-file-operations.c:3144
 #: ../libnautilus-private/nautilus-file-operations.c:3419
 #: ../libnautilus-private/nautilus-file-operations.c:3483
-#
 msgid "Error while copying \"%B\"."
 msgstr "Feil under kopiering av «%B»."
 
@@ -2119,40 +2233,54 @@ msgstr "Kunne ikkje fjerna filer frå allereie eksisterande mappe %F."
 msgid "Couldn't remove the already existing file %F."
 msgstr "Kunne ikkje fjerna allereie eksisterande fil %F."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:3316
 #: ../libnautilus-private/nautilus-file-operations.c:3813
-#
-msgid "A folder named \"%B\" already exists.  Do you want to merge the source folder?"
+msgid ""
+"A folder named \"%B\" already exists.  Do you want to merge the source "
+"folder?"
 msgstr "Ei mappe med namn «%B» eksisterer allereie. Vil du flette kjeldemappa?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3318
 #
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied."
-msgstr "Kjeldemappa finst allereie i «%B». Viss du vil flette mappene vil du verta spurd om bekreftelse før filer i mappa som er i konflikt vert kopiert."
+#: ../libnautilus-private/nautilus-file-operations.c:3318
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being copied."
+msgstr ""
+"Kjeldemappa finst allereie i «%B». Viss du vil flette mappene vil du verta "
+"spurd om bekreftelse før filer i mappa som er i konflikt vert kopiert."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:3323
 #: ../libnautilus-private/nautilus-file-operations.c:3820
-#
 msgid "A folder named \"%B\" already exists.  Do you want to replace it?"
 msgstr "Ei mappe med namn «%B» eksisterer allereie. Vil du byta den ut?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3325
 #: ../libnautilus-private/nautilus-file-operations.c:3822
 #, c-format
-msgid "The folder already exists in \"%F\".  Replacing it will remove all files in the folder."
-msgstr "Mappa finst allereie i \"%F\". Viss du byter ut den vil alle filene i mappa fjernes."
+msgid ""
+"The folder already exists in \"%F\".  Replacing it will remove all files in "
+"the folder."
+msgstr ""
+"Mappa finst allereie i \"%F\". Viss du byter ut den vil alle filene i mappa "
+"fjernes."
 
+#
 #: ../libnautilus-private/nautilus-file-operations.c:3330
 #: ../libnautilus-private/nautilus-file-operations.c:3827
-#
 msgid "A file named \"%B\" already exists.  Do you want to replace it?"
 msgstr "Ein fil med namn «%B» eksisterer allereie. Vil du byta ut den?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3332
 #: ../libnautilus-private/nautilus-file-operations.c:3829
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr "Fila finst allereie i «%F». Viss du byter ut den vil dette overskrive innhaldet."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgstr ""
+"Fila finst allereie i «%F». Viss du byter ut den vil dette overskrive "
+"innhaldet."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3421
 #, c-format
@@ -2164,8 +2292,8 @@ msgstr "Kunne ikkje fjerna eksisterande fil med same namn i %F."
 msgid "There was an error copying the file into %F."
 msgstr "Ein feil oppsto under kopiering av fila til %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3696
 #
+#: ../libnautilus-private/nautilus-file-operations.c:3696
 msgid "Preparing to Move to \"%B\""
 msgstr "Forbereder flytting til «%B»"
 
@@ -2176,18 +2304,23 @@ msgid_plural "Preparing to move %'d files"
 msgstr[0] "Forbereder flytting av %'d fil"
 msgstr[1] "Forbereder flytting av %'d filer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3815
 #
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being moved."
-msgstr "Kjeldemappa finst allereie i «%B». Ved fletting vil du verta spurd om å stadfesta erstatting av filer som er i konflikt med filene som flyttast."
+#: ../libnautilus-private/nautilus-file-operations.c:3815
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being moved."
+msgstr ""
+"Kjeldemappa finst allereie i «%B». Ved fletting vil du verta spurd om å "
+"stadfesta erstatting av filer som er i konflikt med filene som flyttast."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3904
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr "Det oppsto ein feil ved flytting av fila til %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4173
 #
+#: ../libnautilus-private/nautilus-file-operations.c:4173
 msgid "Creating links in \"%B\""
 msgstr "Opprettar lenkjer i «%B»"
 
@@ -2198,18 +2331,18 @@ msgid_plural "Making links to %'d files"
 msgstr[0] "Opprettar lenkja til %'d fil"
 msgstr[1] "Opprettar lenkjer til %'d filer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4251
 #
+#: ../libnautilus-private/nautilus-file-operations.c:4251
 msgid "Error while creating link to %B."
 msgstr "Feil under oppretting av lenkja til «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4253
 #
+#: ../libnautilus-private/nautilus-file-operations.c:4253
 msgid "Symbolic links only supported for local files"
 msgstr "Symbolske lenkjer er berre støtta for lokale filer."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4256
 #
+#: ../libnautilus-private/nautilus-file-operations.c:4256
 msgid "The target doesn't support symbolic links."
 msgstr "Målet støttar ikkje symbolske lenkjer."
 
@@ -2218,8 +2351,8 @@ msgstr "Målet støttar ikkje symbolske lenkjer."
 msgid "There was an error creating the symlink in %F."
 msgstr "Det oppsto ein feil ved oppretting av symbolsk lenkja i %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4548
 #
+#: ../libnautilus-private/nautilus-file-operations.c:4548
 msgid "Setting permissions"
 msgstr "Set rettar"
 
@@ -2235,13 +2368,13 @@ msgstr "mappe utan namn"
 msgid "new file"
 msgstr "ny fil"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4864
 #
+#: ../libnautilus-private/nautilus-file-operations.c:4864
 msgid "Error while creating directory %B."
 msgstr "Feil under oppretting av mappe %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4866
 #
+#: ../libnautilus-private/nautilus-file-operations.c:4866
 msgid "Error while creating file %B."
 msgstr "Feil under oppretting av fil «%B»."
 
@@ -2471,9 +2604,9 @@ msgid_plural "%'u files"
 msgstr[0] "%'u fil"
 msgstr[1] "%'u filer"
 
+#
 #. Do this in a separate stage so that we don't have to put G_GUINT64_FORMAT in the translated string
 #: ../libnautilus-private/nautilus-file.c:5018
-#
 msgid "%"
 msgstr "%"
 
@@ -2825,14 +2958,14 @@ msgstr[1] "Dette vil opna %d nye vindauge."
 msgid "Couldn't display \"%s\"."
 msgstr "Klarte ikkje å visa «%s»."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1205
 #
+#: ../libnautilus-private/nautilus-mime-actions.c:1205
 msgid "There is no application installed for this file type"
 msgstr "Inga program er installert for denne filtypen"
 
+#
 #: ../libnautilus-private/nautilus-mime-actions.c:1247
 #: ../libnautilus-private/nautilus-mime-actions.c:1488
-#
 msgid "Unable to mount location"
 msgstr "Kan ikkje montere stad"
 
@@ -2854,29 +2987,29 @@ msgstr[1] "Opnar %d element."
 msgid "Could not set application as the default: %s"
 msgstr "Kunne ikkje setja program som forvald: %s"
 
+#
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:184
 #: ../libnautilus-private/nautilus-open-with-dialog.c:272
-#
 msgid "Could not set as default application"
 msgstr "Kunne ikkje setja som forvald program"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:273
 #
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:273
 msgid "Default"
 msgstr "Forval"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:281
 #
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:281
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:343
 #
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:343
 msgid "Could not remove application"
 msgstr "Kunne ikkje fjerna program"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:580
 #
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:580
 msgid "No applications selected"
 msgstr "Inga program vald"
 
@@ -2886,9 +3019,9 @@ msgstr "Inga program vald"
 msgid "%s document"
 msgstr "%s dokument"
 
+#
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:615
 #: ../libnautilus-private/nautilus-open-with-dialog.c:926
-#
 msgid "Unknown"
 msgstr "Ukjend"
 
@@ -2903,8 +3036,8 @@ msgstr "Vel eit program for å opna %s og andre filer av type «%s»"
 msgid "Open all files of type \"%s\" with:"
 msgstr "Opna alle filer av type «%s» med:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:162
 #
+#: ../libnautilus-private/nautilus-open-with-dialog.c:162
 msgid "Could not run application"
 msgstr "Kunne ikkje køyra program"
 
@@ -2913,8 +3046,8 @@ msgstr "Kunne ikkje køyra program"
 msgid "Could not find '%s'"
 msgstr "Kunne ikkje finna «%s»"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:177
 #
+#: ../libnautilus-private/nautilus-open-with-dialog.c:177
 msgid "Could not find application"
 msgstr "Kunne ikkje finna program"
 
@@ -2923,13 +3056,13 @@ msgstr "Kunne ikkje finna program"
 msgid "Could not add application to the application database: %s"
 msgstr "Kunne ikkje leggje til program i programdatabasen: %s"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:251
 #
+#: ../libnautilus-private/nautilus-open-with-dialog.c:251
 msgid "Could not add application"
 msgstr "Kunne ikkje leggje til program"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:391
 #
+#: ../libnautilus-private/nautilus-open-with-dialog.c:391
 msgid "Select an Application"
 msgstr "Vel eit program"
 
@@ -2938,18 +3071,18 @@ msgstr "Vel eit program"
 msgid "Open With"
 msgstr "Opna med"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:780
 #
+#: ../libnautilus-private/nautilus-open-with-dialog.c:780
 msgid "Select an application to view its description."
 msgstr "Vel eit program for å visa skildringa."
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:805
 #
+#: ../libnautilus-private/nautilus-open-with-dialog.c:805
 msgid "_Use a custom command"
 msgstr "Br_uk eigendefinert kommando"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:822
 #
+#: ../libnautilus-private/nautilus-open-with-dialog.c:822
 msgid "_Browse..."
 msgstr "_Bla gjennom ..."
 
@@ -2968,15 +3101,15 @@ msgstr "_Opna"
 msgid "Open %s and other files of type \"%s\" with:"
 msgstr "Opna %s og andre filer med type «%s» med:"
 
+#
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
 #: ../libnautilus-private/nautilus-open-with-dialog.c:986
-#
 msgid "_Add"
 msgstr "_Legg til"
 
+#
 #: ../libnautilus-private/nautilus-open-with-dialog.c:972
 #: ../libnautilus-private/nautilus-open-with-dialog.c:987
-#
 msgid "Add Application"
 msgstr "Legg til program"
 
@@ -3077,9 +3210,9 @@ msgid_plural "%'d file operations active"
 msgstr[0] "%'d aktiv filoperasjon"
 msgstr[1] "%'d aktive filoperasjonar"
 
+#
 #: ../libnautilus-private/nautilus-progress-info.c:493
 #: ../libnautilus-private/nautilus-progress-info.c:511
-#
 msgid "Preparing"
 msgstr "Forbereder"
 
@@ -3117,19 +3250,22 @@ msgstr "Gjenopprett redigering"
 msgid "Redo the edit"
 msgstr "Gjenopprett angra redigering"
 
-#: ../nautilus-autorun-software.desktop.in.in.h:1
 #
+#: ../nautilus-autorun-software.desktop.in.in.h:1
 msgid "Autorun Prompt"
 msgstr "Dialog for automatisk køyring"
 
+#
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:669
-#
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "Bla gjennom alle lokale og eksterne diskar og mapper som kan nås frå denne datamaskinen"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"Bla gjennom alle lokale og eksterne diskar og mapper som kan nås frå denne "
+"datamaskinen"
 
-#: ../nautilus-file-management-properties.desktop.in.in.h:1
 #
+#: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
 msgstr "Endra oppførsel og utsjåande for filhandterervindauge"
 
@@ -3142,9 +3278,9 @@ msgstr "Filhandsaming"
 msgid "Home Folder"
 msgstr "Heimemappe"
 
+#
 #. tooltip
 #: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:665
-#
 msgid "Open your personal folder"
 msgstr "Opna din personlige mappe"
 
@@ -3164,8 +3300,8 @@ msgstr "Fabrikk for Nautilus-skalet og filhandsamaren"
 msgid "Nautilus factory"
 msgstr "Nautilus-fabrikk"
 
-#: ../src/Nautilus_shell.server.in.h:3
 #
+#: ../src/Nautilus_shell.server.in.h:3
 msgid "Nautilus instance"
 msgstr "Nautilus-instans"
 
@@ -3173,10 +3309,13 @@ msgstr "Nautilus-instans"
 msgid "Nautilus metafile factory"
 msgstr "Metafil-fabrikk for Nautilus"
 
-#: ../src/Nautilus_shell.server.in.h:5
 #
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
-msgstr "Nautilus-operasjonar som kan utførast frå etterfølgjande kommandolinjeinvokasjonar"
+#: ../src/Nautilus_shell.server.in.h:5
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
+msgstr ""
+"Nautilus-operasjonar som kan utførast frå etterfølgjande "
+"kommandolinjeinvokasjonar"
 
 #: ../src/Nautilus_shell.server.in.h:6
 msgid "Produces metafile objects for accessing Nautilus metadata"
@@ -3461,16 +3600,22 @@ msgstr "«%s» vert kopiert dersom du vel å lima inn"
 #: ../src/file-manager/fm-directory-view.c:5598
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
-msgstr[0] "%'d vald oppføring vil verta flytta viss du vel kommandoen «Lim inn filer»"
-msgstr[1] "%'d valde oppføringar vil verta flytta viss du vel kommandoen «Lim inn filer»"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"%'d vald oppføring vil verta flytta viss du vel kommandoen «Lim inn filer»"
+msgstr[1] ""
+"%'d valde oppføringar vil verta flytta viss du vel kommandoen «Lim inn filer»"
 
 #: ../src/file-manager/fm-directory-view.c:5605
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "%'d vald oppføring vil verta kopiert viss du vel kommandoen «Lim inn filer»"
-msgstr[1] "%'d valde oppføringar vil verta kopiert viss du vel kommandoen «Lim inn filer»"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"%'d vald oppføring vil verta kopiert viss du vel kommandoen «Lim inn filer»"
+msgstr[1] ""
+"%'d valde oppføringar vil verta kopiert viss du vel kommandoen «Lim inn filer»"
 
 #: ../src/file-manager/fm-directory-view.c:5699
 #: ../src/file-manager/fm-tree-view.c:979
@@ -3535,9 +3680,9 @@ msgstr "Lag _mappe"
 msgid "Create a new empty folder inside this folder"
 msgstr "Lag ei ny tom mappe inni denne mappa"
 
+#
 #. name, stock id, label
 #: ../src/file-manager/fm-directory-view.c:6301
-#
 msgid "No templates installed"
 msgstr "Inga malar er installert"
 
@@ -3573,17 +3718,17 @@ msgstr "Opna i navigasjonsvindauge"
 msgid "Open each selected item in a navigation window"
 msgstr "Opna kvart vald element i eit navigasjonsvindauge"
 
+#
 #. name, stock id
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6324
 #: ../src/file-manager/fm-directory-view.c:6457
-#
 msgid "Open in Folder Window"
 msgstr "Opna i mappevindauge"
 
+#
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6325
-#
 msgid "Open each selected item in a folder window"
 msgstr "Opna kvar vald oppføring i eit mappevindauge"
 
@@ -3671,16 +3816,16 @@ msgstr "Vel _mønster"
 msgid "Select items in this window matching a given pattern"
 msgstr "Vel dei elementa som stemmer med eit mønster i dette vindauget"
 
+#
 #. name, stock id
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6370
-#
 msgid "_Invert Selection"
 msgstr "_Inverter val"
 
+#
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6371
-#
 msgid "Select all and only the items that are not currently selected"
 msgstr "Velg alle og barr dei som ikkje allereie er vald"
 
@@ -3812,27 +3957,27 @@ msgstr "Format"
 msgid "Format the selected volume"
 msgstr "Formater det valde volumet"
 
+#
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6423
-#
 msgid "Mount the volume associated with the open folder"
 msgstr "Monter volum som er assosiert med den opna mappa"
 
+#
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6427
-#
 msgid "Unmount the volume associated with the open folder"
 msgstr "Avmonter volum som er assosiert med den opna mappa"
 
+#
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6431
-#
 msgid "Eject the volume associated with the open folder"
 msgstr "Laus ut volum assosiert med den opna mappa"
 
+#
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6435
-#
 msgid "Format the volume associated with the open folder"
 msgstr "Format volume assosiert med den opna mappa"
 
@@ -3869,9 +4014,9 @@ msgstr "Lagra det noverande søket som ei fil"
 msgid "Open this folder in a navigation window"
 msgstr "Opna denne mappa i eit navigasjonsvindauge"
 
+#
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6458
-#
 msgid "Open this folder in a folder window"
 msgstr "Opna denne mappa i eit mappevindauge"
 
@@ -3929,9 +4074,9 @@ msgstr "_Skript"
 msgid "Open in New Window"
 msgstr "Opna i nytt vindauge"
 
+#
 #: ../src/file-manager/fm-directory-view.c:6989
 #: ../src/file-manager/fm-directory-view.c:7193
-#
 msgid "Browse in New Window"
 msgstr "Bla gjennom i nytt vindauge"
 
@@ -4014,9 +4159,9 @@ msgstr "Dra-og-slepp er berre støtta på lokale filsystem."
 msgid "An invalid drag type was used."
 msgstr "Ein ugyldig dratype vart brukt."
 
+#
 #. Translator: This is the filename used for when you dnd text to a directory
 #: ../src/file-manager/fm-directory-view.c:8693
-#
 msgid "dropped text.txt"
 msgstr "slapp tekst.txt"
 
@@ -4480,25 +4625,25 @@ msgstr "(noko uleseleg innhald)"
 msgid "Contents:"
 msgstr "Innhald:"
 
+#
 #. Translators: "used" refers to the capacity of the filesystem
 #: ../src/file-manager/fm-properties-window.c:3053
-#
 msgid "used"
 msgstr "brukt"
 
+#
 #. Translators: "free" refers to the capacity of the filesystem
 #: ../src/file-manager/fm-properties-window.c:3058
-#
 msgid "free"
 msgstr "ledig"
 
-#: ../src/file-manager/fm-properties-window.c:3060
 #
+#: ../src/file-manager/fm-properties-window.c:3060
 msgid "Total capacity:"
 msgstr "Total kapasitet:"
 
-#: ../src/file-manager/fm-properties-window.c:3069
 #
+#: ../src/file-manager/fm-properties-window.c:3069
 msgid "Filesystem type:"
 msgstr "Type filsystem:"
 
@@ -4569,53 +4714,53 @@ msgstr "_Skriva"
 msgid "E_xecute"
 msgstr "_Køyra"
 
+#
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
 #.
 #: ../src/file-manager/fm-properties-window.c:4037
 #: ../src/file-manager/fm-properties-window.c:4048
 #: ../src/file-manager/fm-properties-window.c:4060
-#
 msgid "no "
 msgstr "nei"
 
-#: ../src/file-manager/fm-properties-window.c:4040
 #
+#: ../src/file-manager/fm-properties-window.c:4040
 msgid "list"
 msgstr "liste"
 
-#: ../src/file-manager/fm-properties-window.c:4042
 #
+#: ../src/file-manager/fm-properties-window.c:4042
 msgid "read"
 msgstr "les"
 
-#: ../src/file-manager/fm-properties-window.c:4051
 #
+#: ../src/file-manager/fm-properties-window.c:4051
 msgid "create/delete"
 msgstr "opprett/slett"
 
-#: ../src/file-manager/fm-properties-window.c:4053
 #
+#: ../src/file-manager/fm-properties-window.c:4053
 msgid "write"
 msgstr "skriv"
 
-#: ../src/file-manager/fm-properties-window.c:4062
 #
+#: ../src/file-manager/fm-properties-window.c:4062
 msgid "access"
 msgstr "tilgang"
 
-#: ../src/file-manager/fm-properties-window.c:4111
 #
+#: ../src/file-manager/fm-properties-window.c:4111
 msgid "Access:"
 msgstr "Tilgang:"
 
-#: ../src/file-manager/fm-properties-window.c:4113
 #
+#: ../src/file-manager/fm-properties-window.c:4113
 msgid "Folder access:"
 msgstr "Mappetilgang:"
 
-#: ../src/file-manager/fm-properties-window.c:4115
 #
+#: ../src/file-manager/fm-properties-window.c:4115
 msgid "File access:"
 msgstr "Filtilgang:"
 
@@ -4626,28 +4771,28 @@ msgstr "Filtilgang:"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/file-manager/fm-properties-window.c:4130
 #
+#: ../src/file-manager/fm-properties-window.c:4130
 msgid "List files only"
 msgstr "Vis berre filer"
 
-#: ../src/file-manager/fm-properties-window.c:4132
 #
+#: ../src/file-manager/fm-properties-window.c:4132
 msgid "Access files"
 msgstr "Aksesser filer"
 
-#: ../src/file-manager/fm-properties-window.c:4134
 #
+#: ../src/file-manager/fm-properties-window.c:4134
 msgid "Create and delete files"
 msgstr "Opprett og slett filer"
 
-#: ../src/file-manager/fm-properties-window.c:4141
 #
+#: ../src/file-manager/fm-properties-window.c:4141
 msgid "Read-only"
 msgstr "Skriveverna"
 
-#: ../src/file-manager/fm-properties-window.c:4143
 #
+#: ../src/file-manager/fm-properties-window.c:4143
 msgid "Read and write"
 msgstr "Skriv og les"
 
@@ -4668,9 +4813,9 @@ msgstr "Settt gr_uppe-ID"
 msgid "_Sticky"
 msgstr "Kli_strande"
 
+#
 #: ../src/file-manager/fm-properties-window.c:4293
 #: ../src/file-manager/fm-properties-window.c:4497
-#
 msgid "_Owner:"
 msgstr "_Eigar:"
 
@@ -4680,9 +4825,9 @@ msgstr "_Eigar:"
 msgid "Owner:"
 msgstr "Eigar:"
 
+#
 #: ../src/file-manager/fm-properties-window.c:4322
 #: ../src/file-manager/fm-properties-window.c:4517
-#
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -4692,18 +4837,18 @@ msgstr "_Gruppe:"
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/file-manager/fm-properties-window.c:4356
 #
+#: ../src/file-manager/fm-properties-window.c:4356
 msgid "Others"
 msgstr "Andre"
 
-#: ../src/file-manager/fm-properties-window.c:4373
 #
+#: ../src/file-manager/fm-properties-window.c:4373
 msgid "Execute:"
 msgstr "Køyr:"
 
-#: ../src/file-manager/fm-properties-window.c:4377
 #
+#: ../src/file-manager/fm-properties-window.c:4377
 msgid "Allow _executing file as program"
 msgstr "Tillat _køyring av fila som eit program"
 
@@ -4711,13 +4856,13 @@ msgstr "Tillat _køyring av fila som eit program"
 msgid "Others:"
 msgstr "Andre:"
 
-#: ../src/file-manager/fm-properties-window.c:4544
 #
+#: ../src/file-manager/fm-properties-window.c:4544
 msgid "Folder Permissions:"
 msgstr "Rettar for mappe:"
 
-#: ../src/file-manager/fm-properties-window.c:4556
 #
+#: ../src/file-manager/fm-properties-window.c:4556
 msgid "File Permissions:"
 msgstr "Rettar for fil:"
 
@@ -4730,8 +4875,8 @@ msgstr "Tekstframvising:"
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Du er ikkje eigaren, så du kan ikkje endra desse løyva."
 
-#: ../src/file-manager/fm-properties-window.c:4737
 #
+#: ../src/file-manager/fm-properties-window.c:4737
 msgid "SELinux context:"
 msgstr "SELinux kontekst:"
 
@@ -4740,8 +4885,8 @@ msgstr "SELinux kontekst:"
 msgid "Last changed:"
 msgstr "Sist endra:"
 
-#: ../src/file-manager/fm-properties-window.c:4756
 #
+#: ../src/file-manager/fm-properties-window.c:4756
 msgid "Apply Permissions to Enclosed Files"
 msgstr "Bruk rettar for underliggende filer"
 
@@ -4904,10 +5049,16 @@ msgstr ""
 "Nautilus kan ikkje brukast no pga. ein uventa feil frå Bonobo under "
 "freistnad på å registrera framvisingstenaren i filhandsamaren."
 
-#: ../src/nautilus-application.c:644
 #
-msgid "Nautilus can't be used now, due to an unexpected error from Bonobo when attempting to locate the factory. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "Nautilus kan ikkje brukast no pga. ein uventa feil frå Bonobo under forsøk på å finna factory. Du kan fikse problemet ved å terminere bonobo-activation-tenar og starta Nautilus på nytt."
+#: ../src/nautilus-application.c:644
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the factory. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"Nautilus kan ikkje brukast no pga. ein uventa feil frå Bonobo under forsøk "
+"på å finna factory. Du kan fikse problemet ved å terminere bonobo-activation-"
+"tenar og starta Nautilus på nytt."
 
 #: ../src/nautilus-application.c:651
 msgid ""
@@ -4936,24 +5087,30 @@ msgstr "Feil ved oppstart av program for automatisk køyring: %s"
 msgid "Cannot find the autorun program"
 msgstr "Kan ikkje finna program for automatisk køyring"
 
-#: ../src/nautilus-autorun-software.c:165
 #
+#: ../src/nautilus-autorun-software.c:165
 msgid "<big><b>Error autorunning software</b></big>"
 msgstr "<big><b>Feil ved automatisk køyring av program</b></big>"
 
-#: ../src/nautilus-autorun-software.c:191
 #
-msgid "<big><b>This media contains software intended to be automatically started. Would you like to run it?</b></big>"
-msgstr "<big><b>Dette mediet inneheld programvare som er skal køyrast automatisk. Vil du køyra programvaren?</b></big>"
+#: ../src/nautilus-autorun-software.c:191
+msgid ""
+"<big><b>This media contains software intended to be automatically started. "
+"Would you like to run it?</b></big>"
+msgstr ""
+"<big><b>Dette mediet inneheld programvare som er skal køyrast automatisk. "
+"Vil du køyra programvaren?</b></big>"
 
 #: ../src/nautilus-autorun-software.c:193
 #, c-format
 msgid ""
-"The software will run directly from the media \"%s\". You should never run software that you don't trust.\n"
+"The software will run directly from the media \"%s\". You should never run "
+"software that you don't trust.\n"
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"Programvaren vil køyra direkte frå medie «%s». Du bør aldri køyra program du ikkje stoler på.\n"
+"Programvaren vil køyra direkte frå medie «%s». Du bør aldri køyra program du "
+"ikkje stoler på.\n"
 "\n"
 "Trykk Avbryt viss du er i tvil."
 
@@ -4995,15 +5152,15 @@ msgstr "Rediger bokmerke"
 msgid "Can't display location \"%s\""
 msgstr "Kan ikkje visa adressa «%s»"
 
-#: ../src/nautilus-connect-server-dialog-main.c:165
 #
+#: ../src/nautilus-connect-server-dialog-main.c:165
 msgid "[URI]"
 msgstr "[URI]"
 
+#
 #. Translators: This is the --help description gor the connect to server app,
 #. the initial newlines are between the command line arg and the description
 #: ../src/nautilus-connect-server-dialog-main.c:176
-#
 msgid ""
 "\n"
 "\n"
@@ -5078,8 +5235,8 @@ msgstr "Br_ukarnamn:"
 msgid "_Domain Name:"
 msgstr "_Domenenamn:"
 
-#: ../src/nautilus-connect-server-dialog.c:603
 #
+#: ../src/nautilus-connect-server-dialog.c:603
 msgid "Bookmark _name:"
 msgstr "_Namn på bokmerke:"
 
@@ -5091,8 +5248,8 @@ msgstr "Kopla til tenar"
 msgid "Service _type:"
 msgstr "Teneste_type:"
 
-#: ../src/nautilus-connect-server-dialog.c:910
 #
+#: ../src/nautilus-connect-server-dialog.c:910
 msgid "Add _bookmark"
 msgstr "Legg til _bokmerke"
 
@@ -5219,98 +5376,98 @@ msgstr ""
 "200 %\n"
 "400 %"
 
-#: ../src/nautilus-file-management-properties.glade.h:17
 #
+#: ../src/nautilus-file-management-properties.glade.h:17
 msgid "<b>Behavior</b>"
 msgstr "<b>Oppførsel</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:18
 #
+#: ../src/nautilus-file-management-properties.glade.h:18
 msgid "<b>Compact View Defaults</b>"
 msgstr "<b>Forval for ikonvising</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:19
 #
+#: ../src/nautilus-file-management-properties.glade.h:19
 msgid "<b>Date</b>"
 msgstr "<b>Dato</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:20
 #
+#: ../src/nautilus-file-management-properties.glade.h:20
 msgid "<b>Default View</b>"
 msgstr "<b>Forvald vising</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:21
 #
+#: ../src/nautilus-file-management-properties.glade.h:21
 msgid "<b>Executable Text Files</b>"
 msgstr "<b>Kjørbare tekstfiler</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:22
 #
+#: ../src/nautilus-file-management-properties.glade.h:22
 msgid "<b>Folders</b>"
 msgstr "<b>Mapper</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:23
 #
+#: ../src/nautilus-file-management-properties.glade.h:23
 msgid "<b>Icon Captions</b>"
 msgstr "<b>Ikonsamandrag</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:24
 #
+#: ../src/nautilus-file-management-properties.glade.h:24
 msgid "<b>Icon View Defaults</b>"
 msgstr "<b>Forval for ikonvising</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:25
 #
+#: ../src/nautilus-file-management-properties.glade.h:25
 msgid "<b>List Columns</b>"
 msgstr "<b>Listekolonnar</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:26
 #
+#: ../src/nautilus-file-management-properties.glade.h:26
 msgid "<b>List View Defaults</b>"
 msgstr "<b>Forval for listevising</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:27
 #
+#: ../src/nautilus-file-management-properties.glade.h:27
 msgid "<b>Media Handling</b>"
 msgstr "<b>Mediehandtering</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:28
 #
+#: ../src/nautilus-file-management-properties.glade.h:28
 msgid "<b>Other Media</b>"
 msgstr "<b>Andre medier</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:29
 #
+#: ../src/nautilus-file-management-properties.glade.h:29
 msgid "<b>Other Previewable Files</b>"
 msgstr "<b>Andre filer som kan førehandsvises</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:30
 #
+#: ../src/nautilus-file-management-properties.glade.h:30
 msgid "<b>Sound Files</b>"
 msgstr "<b>Lydfiler</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:31
 #
+#: ../src/nautilus-file-management-properties.glade.h:31
 msgid "<b>Text Files</b>"
 msgstr "<b>Tekstfiler</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:32
 #
+#: ../src/nautilus-file-management-properties.glade.h:32
 msgid "<b>Trash</b>"
 msgstr "<b>Papirkurv</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:33
 #
+#: ../src/nautilus-file-management-properties.glade.h:33
 msgid "<b>Tree View Defaults</b>"
 msgstr "<b>Forval for trevising</b>"
 
-#: ../src/nautilus-file-management-properties.glade.h:34
 #
+#: ../src/nautilus-file-management-properties.glade.h:34
 msgid "A_ll columns have the same width"
 msgstr "A_lle kolonner har same breidd"
 
-#: ../src/nautilus-file-management-properties.glade.h:35
 #
+#: ../src/nautilus-file-management-properties.glade.h:35
 msgid "Acti_on:"
 msgstr "Han_dling:"
 
@@ -5332,8 +5489,8 @@ msgstr "Alltid opna i _nettlesarvindauge"
 msgid "Ask before _emptying the Trash or deleting files"
 msgstr "Spør før _papirkorga vert tømt eller filer vert sletta"
 
-#: ../src/nautilus-file-management-properties.glade.h:41
 #
+#: ../src/nautilus-file-management-properties.glade.h:41
 msgid "B_rowse media when inserted"
 msgstr "Bla gjennom medie nå_r det vert sett inn"
 
@@ -5355,8 +5512,8 @@ msgstr ""
 "Etter endringsdato\n"
 "Etter merke"
 
-#: ../src/nautilus-file-management-properties.glade.h:48
 #
+#: ../src/nautilus-file-management-properties.glade.h:48
 msgid "CD _Audio:"
 msgstr "CD-_lyd:"
 
@@ -5372,10 +5529,13 @@ msgstr ""
 msgid "Choose the order of information to appear in the list view."
 msgstr "Vel rekkjefølgja på informasjonen som skal visast i listeframsyninga."
 
-#: ../src/nautilus-file-management-properties.glade.h:51
 #
-msgid "Choose what happens when inserting media or connecting devices to the system"
-msgstr "Vel kva som skal skje når medie setjes inn eller når einingar kobles til systemet"
+#: ../src/nautilus-file-management-properties.glade.h:51
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
+msgstr ""
+"Vel kva som skal skje når medie setjes inn eller når einingar kobles til "
+"systemet"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
 msgid "Count _number of items:"
@@ -5413,8 +5573,8 @@ msgstr ""
 "Kompakt visning\n"
 "Listevisar"
 
-#: ../src/nautilus-file-management-properties.glade.h:61
 #
+#: ../src/nautilus-file-management-properties.glade.h:61
 msgid "Less common media formats can be configured here"
 msgstr "Mindre vanlege medieformat kan konfigurerast her"
 
@@ -5422,8 +5582,8 @@ msgstr "Mindre vanlege medieformat kan konfigurerast her"
 msgid "List Columns"
 msgstr "Listekolonner"
 
-#: ../src/nautilus-file-management-properties.glade.h:63
 #
+#: ../src/nautilus-file-management-properties.glade.h:63
 msgid "Media"
 msgstr "Medier"
 
@@ -5470,8 +5630,8 @@ msgstr "Framvisingar"
 msgid "_Arrange items:"
 msgstr "Pl_asser element:"
 
-#: ../src/nautilus-file-management-properties.glade.h:75
 #
+#: ../src/nautilus-file-management-properties.glade.h:75
 msgid "_DVD Video:"
 msgstr "_DVD-video:"
 
@@ -5480,8 +5640,8 @@ msgstr "_DVD-video:"
 msgid "_Default zoom level:"
 msgstr "_Standard forstørringsnivå:"
 
-#: ../src/nautilus-file-management-properties.glade.h:77
 #
+#: ../src/nautilus-file-management-properties.glade.h:77
 msgid "_Double click to open items"
 msgstr "_Dobbeltklikk for å opna oppføringar"
 
@@ -5489,13 +5649,13 @@ msgstr "_Dobbeltklikk for å opna oppføringar"
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/nautilus-file-management-properties.glade.h:79
 #
+#: ../src/nautilus-file-management-properties.glade.h:79
 msgid "_Music Player:"
 msgstr "_Musikkspeler:"
 
-#: ../src/nautilus-file-management-properties.glade.h:80
 #
+#: ../src/nautilus-file-management-properties.glade.h:80
 msgid "_Never prompt or start programs on media insertion"
 msgstr "A_ldri spør eller start program ved innsetting av medie"
 
@@ -5503,23 +5663,23 @@ msgstr "A_ldri spør eller start program ved innsetting av medie"
 msgid "_Only for files smaller than:"
 msgstr "_Berre for filer mindre enn:"
 
-#: ../src/nautilus-file-management-properties.glade.h:82
 #
+#: ../src/nautilus-file-management-properties.glade.h:82
 msgid "_Photos:"
 msgstr "_Bileta:"
 
-#: ../src/nautilus-file-management-properties.glade.h:83
 #
+#: ../src/nautilus-file-management-properties.glade.h:83
 msgid "_Run executable text files when they are opened"
 msgstr "K_jør kjørbare tekstfiler når dei vert opna"
 
-#: ../src/nautilus-file-management-properties.glade.h:84
 #
+#: ../src/nautilus-file-management-properties.glade.h:84
 msgid "_Single click to open items"
 msgstr "_Enkeltklikk for å opna oppføringar"
 
-#: ../src/nautilus-file-management-properties.glade.h:85
 #
+#: ../src/nautilus-file-management-properties.glade.h:85
 msgid "_Software:"
 msgstr "_Programvare:"
 
@@ -5528,8 +5688,8 @@ msgstr "_Programvare:"
 msgid "_Text beside icons"
 msgstr "_Tekst attmed ikon"
 
-#: ../src/nautilus-file-management-properties.glade.h:87
 #
+#: ../src/nautilus-file-management-properties.glade.h:87
 msgid "_Type:"
 msgstr "_Type:"
 
@@ -5537,8 +5697,8 @@ msgstr "_Type:"
 msgid "_Use compact layout"
 msgstr "_Bruk tett plassering"
 
-#: ../src/nautilus-file-management-properties.glade.h:89
 #
+#: ../src/nautilus-file-management-properties.glade.h:89
 msgid "_View executable text files when they are opened"
 msgstr "_Vis kjørbare tekstfiler når dei vert opna"
 
@@ -5575,8 +5735,8 @@ msgstr "Kameramodell"
 msgid "Date Taken"
 msgstr "Teken dato"
 
-#: ../src/nautilus-image-properties-page.c:238
 #
+#: ../src/nautilus-image-properties-page.c:238
 msgid "Date Digitized"
 msgstr "Digitaliseringsdato"
 
@@ -5615,28 +5775,28 @@ msgstr "Fokallengde"
 msgid "Location"
 msgstr "Stad"
 
-#: ../src/nautilus-image-properties-page.c:312
 #
+#: ../src/nautilus-image-properties-page.c:312
 msgid "Keywords"
 msgstr "Nøkkelord"
 
-#: ../src/nautilus-image-properties-page.c:313
 #
+#: ../src/nautilus-image-properties-page.c:313
 msgid "Creator"
 msgstr "Oppretta av"
 
-#: ../src/nautilus-image-properties-page.c:314
 #
+#: ../src/nautilus-image-properties-page.c:314
 msgid "Copyright"
 msgstr "Opphavsrett"
 
-#: ../src/nautilus-image-properties-page.c:315
 #
+#: ../src/nautilus-image-properties-page.c:315
 msgid "Rating"
 msgstr "Poeng"
 
-#: ../src/nautilus-image-properties-page.c:335
 #
+#: ../src/nautilus-image-properties-page.c:335
 msgid "Image Type:"
 msgstr "Bilettype:"
 
@@ -5748,19 +5908,22 @@ msgstr "Avslutt Nautilus."
 msgid "Restart Nautilus."
 msgstr "Start Nautilus om att."
 
-#: ../src/nautilus-main.c:404
 #
+#: ../src/nautilus-main.c:404
 msgid "[URI...]"
 msgstr "[URI ...]"
 
+#
 #. Translators: --no-default-window is a nautilus command line parameter, don't modify it.
 #: ../src/nautilus-main.c:407
-#
-msgid "Load a saved session from the specified file. Implies \"--no-default-window\"."
-msgstr "Last ein lagra sesjon frå oppgjeven fil. Impliserer «--no-default-window»."
+msgid ""
+"Load a saved session from the specified file. Implies \"--no-default-window"
+"\"."
+msgstr ""
+"Last ein lagra sesjon frå oppgjeven fil. Impliserer «--no-default-window»."
 
-#: ../src/nautilus-main.c:407
 #
+#: ../src/nautilus-main.c:407
 msgid "FILENAME"
 msgstr "FILNAMN"
 
@@ -5768,8 +5931,8 @@ msgstr "FILNAMN"
 msgid "File Manager"
 msgstr "Filhandsamar"
 
-#: ../src/nautilus-main.c:451
 #
+#: ../src/nautilus-main.c:451
 msgid ""
 "\n"
 "\n"
@@ -5848,9 +6011,9 @@ msgstr "_Gå"
 msgid "_Bookmarks"
 msgstr "_Bokmerke"
 
+#
 #. name, stock id, label
 #: ../src/nautilus-navigation-window-menus.c:475
-#
 msgid "New _Window"
 msgstr "Nytt _vindauge"
 
@@ -5858,14 +6021,14 @@ msgstr "Nytt _vindauge"
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Opna eit nytt Nautilus-vindauge for vist plassering"
 
+#
 #. name, stock id, label
 #: ../src/nautilus-navigation-window-menus.c:478
-#
 msgid "Open Folder W_indow"
 msgstr "Opna mappev_indu"
 
-#: ../src/nautilus-navigation-window-menus.c:479
 #
+#: ../src/nautilus-navigation-window-menus.c:479
 msgid "Open a folder window for the displayed location"
 msgstr "Opna eit mappevindauge for viste stad"
 
@@ -5923,16 +6086,16 @@ msgstr "R_ediger bokmerke"
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Vis eit vindauge som let deg redigera bokmerkene i denne menyen"
 
+#
 #. name, stock id, label
 #: ../src/nautilus-navigation-window-menus.c:496
 #: ../src/nautilus-spatial-window.c:897
-#
 msgid "_Search for Files..."
 msgstr "_Søk etter filer ..."
 
+#
 #: ../src/nautilus-navigation-window-menus.c:497
 #: ../src/nautilus-spatial-window.c:898
-#
 msgid "Locate documents and folders on this computer by name or content"
 msgstr "Finn dokument og mapper på denne datamaskinen etter namn eller innhald"
 
@@ -5954,9 +6117,9 @@ msgstr "Endra om adresselinja vert vist i dette vindauget"
 msgid "_Side Pane"
 msgstr "_Sidepanel"
 
+#
 #. tooltip
 #: ../src/nautilus-navigation-window-menus.c:510
-#
 msgid "Change the visibility of this window's side pane"
 msgstr "Endra synlegheten for dette vindaugets sidelinje"
 
@@ -6016,8 +6179,8 @@ msgstr "Framoverlogg"
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../src/nautilus-navigation-window.c:183
 #
+#: ../src/nautilus-navigation-window.c:183
 msgid "Toggle between button and text-based location bar"
 msgstr "Byt mellom knappar og tekst for adressefeltet"
 
@@ -6043,8 +6206,8 @@ msgstr "Nettverk"
 msgid "Unable to poll %s for media changes"
 msgstr "Kan ikkje sjekka %s for byte av medie"
 
-#: ../src/nautilus-places-sidebar.c:1695
 #
+#: ../src/nautilus-places-sidebar.c:1695
 msgid "Open in New _Window"
 msgstr "Opna i nytt _vindauge"
 
@@ -6058,13 +6221,13 @@ msgstr "Fjern"
 msgid "Rename..."
 msgstr "Gje nytt namn ..."
 
-#: ../src/nautilus-places-sidebar.c:1722
 #
+#: ../src/nautilus-places-sidebar.c:1722
 msgid "_Mount"
 msgstr "_Monter"
 
-#: ../src/nautilus-places-sidebar.c:1743
 #
+#: ../src/nautilus-places-sidebar.c:1743
 msgid "_Rescan"
 msgstr "_Les på nytt"
 
@@ -6277,8 +6440,8 @@ msgstr "Fje_rn eit merke ..."
 msgid "File Type"
 msgstr "Filtype"
 
-#: ../src/nautilus-query-editor.c:271
 #
+#: ../src/nautilus-query-editor.c:271
 msgid "Select folder to search in"
 msgstr "Vel mappa du vil søkja i"
 
@@ -6331,13 +6494,13 @@ msgstr "Kva som helst"
 msgid "Other Type..."
 msgstr "Annan type ..."
 
-#: ../src/nautilus-query-editor.c:939
 #
+#: ../src/nautilus-query-editor.c:939
 msgid "Remove this criterion from the search"
 msgstr "Fjern dette kriteriet frå søkjet"
 
-#: ../src/nautilus-query-editor.c:984
 #
+#: ../src/nautilus-query-editor.c:984
 msgid "Search Folder"
 msgstr "Søk i mappe"
 
@@ -6345,8 +6508,8 @@ msgstr "Søk i mappe"
 msgid "Edit the saved search"
 msgstr "Endra det lagra søket"
 
-#: ../src/nautilus-query-editor.c:1029
 #
+#: ../src/nautilus-query-editor.c:1029
 msgid "Add a new criterion to this search"
 msgstr "Legg til nytt kriterie for dette søkjet"
 
@@ -6362,8 +6525,8 @@ msgstr "Les på nytt"
 msgid "Perform or update the search"
 msgstr "Utfør eller oppdater søket"
 
-#: ../src/nautilus-query-editor.c:1061
 #
+#: ../src/nautilus-query-editor.c:1061
 msgid "_Search for:"
 msgstr "_Søk etter:"
 
@@ -6371,8 +6534,8 @@ msgstr "_Søk etter:"
 msgid "Search results"
 msgstr "Søkeresultat"
 
-#: ../src/nautilus-search-bar.c:143
 #
+#: ../src/nautilus-search-bar.c:143
 msgid "Search:"
 msgstr "Søk:"
 
@@ -6468,13 +6631,13 @@ msgstr "Klarte ikkje å finna «%s»."
 msgid "Nautilus cannot handle %s: locations."
 msgstr "Nautilus kan ikkje handsama «%s»-adresser."
 
-#: ../src/nautilus-window-manage-views.c:1721
 #
+#: ../src/nautilus-window-manage-views.c:1721
 msgid "Nautilus cannot handle this kind of locations."
 msgstr "Nautilus ikkje kan handtere denne type lokasjonar."
 
-#: ../src/nautilus-window-manage-views.c:1728
 #
+#: ../src/nautilus-window-manage-views.c:1728
 msgid "Unable to mount the location."
 msgstr "Kan ikkje montere lokasjonen."
 
@@ -6510,20 +6673,41 @@ msgstr ""
 msgid "Go to the location specified by this bookmark"
 msgstr "Gå til adressa i dette bokmerket"
 
-#: ../src/nautilus-window-menus.c:425
 #
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Nautilus er fri programvare. Du kan redistribuere og/eller endra programmet under betingelsene gjeven i GNU General Public License som utgjeven av Free Software Foundation; anten versjon 2 av lisensen, eller (viss du ynskjer det) ein kvar seinare versjon."
+#: ../src/nautilus-window-menus.c:425
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"Nautilus er fri programvare. Du kan redistribuere og/eller endra programmet "
+"under betingelsene gjeven i GNU General Public License som utgjeven av Free "
+"Software Foundation; anten versjon 2 av lisensen, eller (viss du ynskjer "
+"det) ein kvar seinare versjon."
 
-#: ../src/nautilus-window-menus.c:429
 #
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "Nautilus vert distribuert i håp om at programmet er nyttig, men utan NOKON GARANTI, ikkje eingong implisitt garanti om at det er SALGBART eller PASSER EIT BESTEMT FORMÅL. Sjå GNU General Public License for detaljar."
+#: ../src/nautilus-window-menus.c:429
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Nautilus vert distribuert i håp om at programmet er nyttig, men utan NOKON "
+"GARANTI, ikkje eingong implisitt garanti om at det er SALGBART eller PASSER "
+"EIT BESTEMT FORMÅL. Sjå GNU General Public License for detaljar."
 
-#: ../src/nautilus-window-menus.c:433
 #
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
-msgstr "Du skal ha motteken ein kopi av GNU General Public License saman med Nautilus. Viss dette ikkje er tilfelle, kan du skriva til Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
+#: ../src/nautilus-window-menus.c:433
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA  02111-1307  USA"
+msgstr ""
+"Du skal ha motteken ein kopi av GNU General Public License saman med "
+"Nautilus. Viss dette ikkje er tilfelle, kan du skriva til Free Software "
+"Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 
 #: ../src/nautilus-window-menus.c:449
 msgid ""
@@ -6533,8 +6717,8 @@ msgstr ""
 "Nautilus er eit grafisk skal for GNOME. Nautilus gjer det enkelt å handsama "
 "filene dine og styra resten av systemet."
 
-#: ../src/nautilus-window-menus.c:453
 #
+#: ../src/nautilus-window-menus.c:453
 msgid "Copyright © 1999-2007 The Nautilus authors"
 msgstr "Opphavsrett © 1999-2007 Nautilus-utviklerene"
 
@@ -6553,8 +6737,8 @@ msgstr ""
 "\n"
 "Send feilmeldingar og kommentarar til <i18n-nn@lister.ping.uio.no>"
 
-#: ../src/nautilus-window-menus.c:466
 #
+#: ../src/nautilus-window-menus.c:466
 msgid "Nautilus Web Site"
 msgstr "Nautilus sin nettstad"
 
@@ -6634,9 +6818,9 @@ msgstr "Opna foreldermappe"
 msgid "_Stop"
 msgstr "_Stopp"
 
+#
 #. tooltip
 #: ../src/nautilus-window-menus.c:621
-#
 msgid "Stop loading the current location"
 msgstr "Stopp lasting av aktiv stad"
 
@@ -6646,9 +6830,9 @@ msgstr "Stopp lasting av aktiv stad"
 msgid "_Reload"
 msgstr "_Les på ny"
 
+#
 #. tooltip
 #: ../src/nautilus-window-menus.c:625
-#
 msgid "Reload the current location"
 msgstr "Last aktiv stad på nytt"
 
@@ -6714,16 +6898,16 @@ msgstr "Vis innhaldet i normal storleik"
 msgid "Connect to _Server..."
 msgstr "Kopla til _tenar ...."
 
+#
 #. tooltip
 #: ../src/nautilus-window-menus.c:661
-#
 msgid "Connect to a remote computer or shared disk"
 msgstr "Kopla til ein ekstern datamaskin eller delt disk"
 
+#
 #. name, stock id
 #. label, accelerator
 #: ../src/nautilus-window-menus.c:664
-#
 msgid "_Home Folder"
 msgstr "_Heimemappe"
 
@@ -6739,9 +6923,9 @@ msgstr "_Datamaskin"
 msgid "_Network"
 msgstr "_Nettverk"
 
+#
 #. tooltip
 #: ../src/nautilus-window-menus.c:673 ../src/network-scheme.desktop.in.h:1
-#
 msgid "Browse bookmarked and local network locations"
 msgstr "Bla gjennom nettverkslokasjonar i bokmerke og lokalt"
 
@@ -6751,9 +6935,9 @@ msgstr "Bla gjennom nettverkslokasjonar i bokmerke og lokalt"
 msgid "T_emplates"
 msgstr "_Malar"
 
+#
 #. tooltip
 #: ../src/nautilus-window-menus.c:677
-#
 msgid "Open your personal templates folder"
 msgstr "Opna din personlige malmappe"
 
@@ -6764,9 +6948,9 @@ msgstr "Opna din personlige malmappe"
 msgid "_Trash"
 msgstr "_Papirkorg"
 
+#
 #. tooltip
 #: ../src/nautilus-window-menus.c:681
-#
 msgid "Open your personal trash folder"
 msgstr "Opna din personlige papirkurv"
 
@@ -6776,9 +6960,9 @@ msgstr "Opna din personlige papirkurv"
 msgid "CD/_DVD Creator"
 msgstr "CD/_DVD-brennar"
 
+#
 #. tooltip
 #: ../src/nautilus-window-menus.c:685
-#
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
 msgstr "Opna ei mappe kor du kan dra filer for å brenne ein CD eller DVD"
 
@@ -6790,53 +6974,53 @@ msgstr "_Opp"
 msgid "_Home"
 msgstr "_Heim"
 
-#: ../src/nautilus-x-content-bar.c:68
 #
+#: ../src/nautilus-x-content-bar.c:68
 msgid "These files are on an Audio CD."
 msgstr "Desse filene ligg på ein lyd-CD."
 
-#: ../src/nautilus-x-content-bar.c:70
 #
+#: ../src/nautilus-x-content-bar.c:70
 msgid "These files are on an Audio DVD."
 msgstr "Desse filene ligg på ein lyd-DVD."
 
-#: ../src/nautilus-x-content-bar.c:72
 #
+#: ../src/nautilus-x-content-bar.c:72
 msgid "These files are on a Video DVD."
 msgstr "Desse filene ligg på ein Video-DVD."
 
-#: ../src/nautilus-x-content-bar.c:74
 #
+#: ../src/nautilus-x-content-bar.c:74
 msgid "These files are on a Video CD."
 msgstr "Desse filene ligg på ein Video-CD."
 
-#: ../src/nautilus-x-content-bar.c:76
 #
+#: ../src/nautilus-x-content-bar.c:76
 msgid "These files are on a Super Video CD."
 msgstr "Desse filene ligg på ein Super Video-CD."
 
-#: ../src/nautilus-x-content-bar.c:78
 #
+#: ../src/nautilus-x-content-bar.c:78
 msgid "These files are on a Photo CD."
 msgstr "Desse filene ligg på ein Photo-CD."
 
-#: ../src/nautilus-x-content-bar.c:80
 #
+#: ../src/nautilus-x-content-bar.c:80
 msgid "These files are on a Picture CD."
 msgstr "Desse bileta ligg på ein bilete-CD."
 
-#: ../src/nautilus-x-content-bar.c:82
 #
+#: ../src/nautilus-x-content-bar.c:82
 msgid "The media contains digital photos."
 msgstr "Dette mediet inneheld digitale bilete."
 
-#: ../src/nautilus-x-content-bar.c:84
 #
+#: ../src/nautilus-x-content-bar.c:84
 msgid "These files are on a digital audio player."
 msgstr "Desse filene ligg på ein digital lydspelar."
 
-#: ../src/nautilus-x-content-bar.c:86
 #
+#: ../src/nautilus-x-content-bar.c:86
 msgid "The media contains software."
 msgstr "Dete mediet inneheld programvare."
 
@@ -6866,11 +7050,152 @@ msgstr "Vis forvald detaljeringsnivå"
 msgid "Zoom"
 msgstr "Vis større/mindre"
 
-#: ../src/nautilus-zoom-control.c:894
 #
+#: ../src/nautilus-zoom-control.c:894
 msgid "Set the zoom level of the current view"
 msgstr "Sett forstørring/forminsking av den noverande framvisinga"
 
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Opnar %d element"
+msgstr[1] "Opnar %d element"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bilete/merkelapp-ramme"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Breidda på ramma rundt merkelappen og biletet i varslingsdialogen"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Varlsingstype"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Typen varsling"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Varslingsknappar"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Knappane viste i varslingsdialogen"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Vis fleire _detaljar"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Teksten på merkelappen."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justering"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Justeringa av tekstlinjene i merkelappen i høve til kvarandre. Dette "
+"påverkar IKKJE korleis merkelappen vert plassert på sin tilmålte plass. Sjå "
+"GtkMisc::xalign for dette."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Linjebryting"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Dersom satt, vil linjer som vert for lange brytast."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Markørplassering"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Plasseringa til innsetjingsmarkøren, i teikn."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Merkegrense"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Avstanden frå den andre enden av merkinga til markøren, i teikn."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Vel alt"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Inndatametodar"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf-feil:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-feil: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Alle etterfølgjande feil vert berre viste i terminalen."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Ingen bilete valde."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Du må klikka på eit bilete for å velja det."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Du kan stoppa denne operasjonen ved å trykka avbryt."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (ugyldig Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Opnar %s"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Skriv passord"
+
 #~ msgid "%s %ld of %ld %s"
 #~ msgstr "%s %ld av %ld %s"
 
@@ -7233,11 +7558,6 @@ msgstr "Sett forstørring/forminsking av den noverande framvisinga"
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "«%s» er ikkje ei gyldig adresse."
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "Opnar %d element"
-#~ msgstr[1] "Opnar %d element"
-
 #~ msgid "View your computer storage"
 #~ msgstr "Vis datalageret ditt"
 
diff --git a/po/oc.po b/po/oc.po
index 4b5a4aff9..5724ec18f 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,10 +1,20 @@
+# #-#-#-#-#  oc.po (oc)  #-#-#-#-#
 # Occitan translation of nautilus.
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nautilus package.
 #
 # Yannig Marchegay (Kokoyaya) <yannig@marchegay.org>, 2007-2008.
+# #-#-#-#-#  oc.po (oc)  #-#-#-#-#
+# Translation of oc.po to Occitan
+# Occitan translation of eel.HEAD.pot.
+# Copyright (C) 2004, 2007, Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+#
+# Yannig Marchegay (Kokoyaya) <yannig@marchegay.org>, 2006-2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  oc.po (oc)  #-#-#-#-#\n"
 "Project-Id-Version: oc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-07-02 09:00+0200\n"
@@ -15,6 +25,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"#-#-#-#-#  oc.po (oc)  #-#-#-#-#\n"
+"Project-Id-Version: oc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-19 20:18+0100\n"
+"PO-Revision-Date: 2007-12-27 13:38+0100\n"
+"Last-Translator: Yannig Marchegay (Kokoyaya) <yannig@marchegay.org>\n"
+"Language-Team: Occitan <ubuntu-l10n-oci@lists.ubuntu.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2932,9 +2953,13 @@ msgid "Could not run application"
 msgstr "Impossible d'aviar l'aplicacion"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "Impossible de trobar '%s'."
+msgstr ""
+"#-#-#-#-#  oc.po (oc)  #-#-#-#-#\n"
+"Impossible de trobar '%s'.\n"
+"#-#-#-#-#  oc.po (oc)  #-#-#-#-#\n"
+"Impossible de trobar '%s'"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
 msgid "Could not find application"
@@ -2964,13 +2989,19 @@ msgid "Select an application to view its description."
 msgstr "Seleccionar una aplicacion per véser sa descripcion."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "_Utilizar una comanda personalizada"
+msgstr ""
+"#-#-#-#-#  oc.po (oc)  #-#-#-#-#\n"
+"_Utilizar una comanda personalizada\n"
+"#-#-#-#-#  oc.po (oc)  #-#-#-#-#\n"
+"_Utilizar una comanda personalisada"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Examinar..."
 
+#. #-#-#-#-#  oc.po (oc)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -6737,6 +6768,146 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Definir lo nivèl de zoom de la visualizacion actuala"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bordadura de l'imatge/etiqueta"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Largor de la bordadura a l'entorn de l'etiqueta e de l'imatge dins la "
+"brústia d'alèrta"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tipe d'alèrta"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Lo tipe d'alèrta"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Botons d'alèrta"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Los botons visualizats dins la brústia d'alèrta"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Visualizar mai de _detalhs"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "O"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tèxt"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Lo tèxt de l'etiqueta."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justificacion"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr ""
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr ""
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr ""
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Tot seleccionar"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr ""
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Error GConf :\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Error GConf : %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr ""
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr ""
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr ""
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr ""
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr ""
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Dobèrtura de %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Dobertura de %d element"
+msgstr[1] "Dobertura de %d elements"
+
+#: ../eel/eel-mount-operation.c:138
+msgid "Enter Password"
+msgstr "Picatz lo mot de pas"
+
 #~ msgid ""
 #~ "Are you sure you want to permanently delete the %'d selected item from "
 #~ "the trash?Are you sure you want to permanently delete the %'d selected "
@@ -6752,3 +6923,7 @@ msgstr "Definir lo nivèl de zoom de la visualizacion actuala"
 #~ msgstr ""
 #~ "Sètz segur que volèz suprimir per totjorn lo %'d element seleccionat ?"
 #~ "Sètz segur que volèz suprimir per totjorn los %'d elements seleccionats ?"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr ""
+#~ "Impossible d'apondre l'aplicacion a la basa de donadas d'aplicacions"
diff --git a/po/or.po b/po/or.po
index d3efbffb8..2a06e4919 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,10 +1,22 @@
+# #-#-#-#-#  or.po (nautilus.HEAD.or)  #-#-#-#-#
 # translation of nautilus.HEAD.or.po to Oriya
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Subhransu Behera <arya_subhransu@yahoo.co.in>, 2006, 2007.
+# #-#-#-#-#  or.po (eel.HEAD.or)  #-#-#-#-#
+# translation of eel.HEAD.or.po to Oriya
+# Oriya translation of eel.HEAD.pot.
+# Copyright (C) 2004, 2008, Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+# $Id: or.po,v 1.20 2006/03/14 20:42:48 gmohanty Exp $
+#
+# Gora Mohanty <gora_mohanty@yahoo.co.in>, 2004.
+# Manoj Kumar Giri <giri.manojkr@gmail.com>, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  or.po (nautilus.HEAD.or)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.or\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-06 03:43+0100\n"
@@ -14,10 +26,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  or.po (eel.HEAD.or)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.or\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-20 03:51+0000\n"
+"PO-Revision-Date: 2008-06-12 16:26+0530\n"
+"Last-Translator: Manoj Kumar Giri <giri.manojkr@gmail.com>\n"
+"Language-Team: Oriya\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -453,7 +478,8 @@ msgid ""
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -579,7 +605,8 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
@@ -1058,7 +1085,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:204
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 
 #. this really should never happen, as a user has no idea
@@ -1326,7 +1354,8 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "\"%s\" ରେ ଫାଇଲ ପୂର୍ବରୁ ଅଛି। ଏହାକୁ ବଦଳାଇଲେ, ତାହାର ସୂଚୀ ନବଲିଖିତ ହୋଇଯିବ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
@@ -2211,11 +2240,10 @@ msgid ""
 "onto your computer, you may be able to open it."
 msgstr ""
 
-#: ../libnautilus-private/nautilus-program-choosing.c:489
-#: ../libnautilus-private/nautilus-program-choosing.c:731
+#: ../eel/eel-app-launch-context.c:404
 #, c-format
 msgid "Opening %s"
-msgstr ""
+msgstr "%s ଖୋଲୁଅଛି"
 
 #. TODO: These strings suck pretty badly, but we're in string-freeze,
 #. * and I found these in other places to reuse. We should make them
@@ -2259,7 +2287,8 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1522
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:616
@@ -2283,12 +2312,12 @@ msgstr "ଦୟାକରି ବନାନକୁ ଦେଖନ୍ତୁ ଏବଂ �
 msgid "Couldn't find \"%s\"."
 msgstr ""
 
-#: ../libnautilus-private/nautilus-program-choosing.c:734
+#: ../eel/eel-app-launch-context.c:407
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ବସ୍ତୁ ଖୋଲୁଅଛି"
+msgstr[1] "%d ବସ୍ତୁଗୁଡିକୁ ଖୋଲୁଅଛି"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:899
 msgid "Sorry, but you can't execute commands from a remote site."
@@ -2309,7 +2338,8 @@ msgid "This drop target only supports local files."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:954
@@ -2346,7 +2376,8 @@ msgstr ""
 
 #. label, accelerator
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:663
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2436,7 +2467,8 @@ msgstr ""
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 
 #. tooltip
@@ -2494,7 +2526,8 @@ msgstr ""
 #: ../src/file-manager/fm-directory-view.c:1006
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2637,7 +2670,8 @@ msgid "None of the %d selected items can be moved to the Trash"
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:3849
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:3850
@@ -2774,14 +2808,16 @@ msgstr ""
 #: ../src/file-manager/fm-directory-view.c:6108
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/file-manager/fm-directory-view.c:6115
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -3310,7 +3346,8 @@ msgstr "ଲଞ୍ଚର"
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "ଆପଣଙ୍କ ନିକଟରେ \"%s\" ର ବିଷୟବସ୍ତୁକୁ ଦେଖିବା ପାଇଁ ଆବଶ୍ଯକ ଅନୁମତି ନାହିଁ।"
 
 #: ../src/file-manager/fm-error-reporting.c:64
@@ -3329,13 +3366,16 @@ msgstr "ଫୋଲଡରର ବିଷୟବସ୍ତୁକୁ ପ୍ରଦର୍�
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "\"%s\" ନାମ ପୂର୍ବରୁ ଏହି ଫୋଲଡରରେ ଅଛି। ଦୟାକରି ଗୋଟିଏ ଭିନ୍ନ ନାମ ବ୍ଯବହାର କରନ୍ତୁ।"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "ଏହି ଫୋଲଡରରେ କୌଣସି \"%s\" ନାହିଁ। ବୋଧହୁଏ ଏହାକୁ ବର୍ତ୍ତମାନ ଘୁଞ୍ଚାଯାଇଛି କିମ୍ବା ଅପସାରଣ କରାଯାଇଛି?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+"ଏହି ଫୋଲଡରରେ କୌଣସି \"%s\" ନାହିଁ। ବୋଧହୁଏ ଏହାକୁ ବର୍ତ୍ତମାନ ଘୁଞ୍ଚାଯାଇଛି କିମ୍ବା ଅପସାରଣ କରାଯାଇଛି?"
 
 #: ../src/file-manager/fm-error-reporting.c:118
 #, c-format
@@ -3347,7 +3387,9 @@ msgstr "ଆପଣଙ୍କ ନିକଟରେ \"%s\" ର ନାମ ପରିବ�
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
-msgstr "\"%s\" ନାମ ବୈଧ ନୁହେଁ କାରଣ ଏହା \"/\" ଅକ୍ଷରକୁ ଧାରଣ କରିଅଛି। ଦୟାକରି ଗୋଟିଏ ଭିନ୍ନ ନାମ ବ୍ଯବହାର କରନ୍ତୁ।"
+msgstr ""
+"\"%s\" ନାମ ବୈଧ ନୁହେଁ କାରଣ ଏହା \"/\" ଅକ୍ଷରକୁ ଧାରଣ କରିଅଛି। ଦୟାକରି ଗୋଟିଏ ଭିନ୍ନ ନାମ ବ୍ଯବହାର "
+"କରନ୍ତୁ।"
 
 #: ../src/file-manager/fm-error-reporting.c:127
 #, c-format
@@ -3370,7 +3412,8 @@ msgstr "ବସ୍ତୁର ନାମକୁ ବଦଳାଇ ହେଲା ନା�
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "ଆପଣଙ୍କ ନିକଟରେ \"%s\" ର ସମୂହକୁ ବଦଳାଇବା ପାଇଁ ଆବଶ୍ଯକ ଅନୁମତି ନାହିଁ।"
 
 #: ../src/file-manager/fm-error-reporting.c:173
@@ -3403,7 +3446,8 @@ msgstr "ମାଲିକକୁ ବଦାଳାଇ ହେଲା ନାହିଁ।
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" ର ଅନୁମତିକୁ ବଦଳାଇ ହେଲା ନାହିଁ କାରଣ ଏହା ଗୋଟିଏ କେବଳ ପଠନୀୟ ଡିସ୍କରେ ଅଛି"
 
 #: ../src/file-manager/fm-error-reporting.c:246
@@ -4459,7 +4503,8 @@ msgstr "ସବୁବେଳେ ବ୍ରାଉଜର ୱିଣ୍ଡୋରେ ଖ
 
 #: ../src/nautilus-file-management-properties.glade.h:36
 msgid "Ask before _emptying the Trash or deleting files"
-msgstr "ଆବର୍ଜନା ପାତ୍ରକୁ ଖାଲି କରିବା ପୂର୍ବରୁ କିମ୍ବା ଫାଇଲ ମାନଙ୍କୁ ଅପସାରଣ କରିବା ପୂର୍ବରୁ ପଚାରନ୍ତୁ (_e)"
+msgstr ""
+"ଆବର୍ଜନା ପାତ୍ରକୁ ଖାଲି କରିବା ପୂର୍ବରୁ କିମ୍ବା ଫାଇଲ ମାନଙ୍କୁ ଅପସାରଣ କରିବା ପୂର୍ବରୁ ପଚାରନ୍ତୁ (_e)"
 
 #: ../src/nautilus-file-management-properties.glade.h:37
 msgid "Behavior"
@@ -4842,7 +4887,8 @@ msgstr "ଯଦି ଆପଣ ଏପରି କରନ୍ତି, ତାହାହେ�
 
 #: ../src/nautilus-navigation-window-menus.c:119
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "ଆପଣ ନିଶ୍ଚିତକୁ ଆପଣ ପରିଦର୍ଶନ କରିଥିବା ସ୍ଥାନ ମାନଙ୍କର ତାଲିକାକୁ ଆପଣ ନିଷ୍କାସନ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
+msgstr ""
+"ଆପଣ ନିଶ୍ଚିତକୁ ଆପଣ ପରିଦର୍ଶନ କରିଥିବା ସ୍ଥାନ ମାନଙ୍କର ତାଲିକାକୁ ଆପଣ ନିଷ୍କାସନ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
 #: ../src/nautilus-navigation-window-menus.c:121
 msgid "If you clear the list of locations, they will be permanently deleted."
@@ -5382,7 +5428,8 @@ msgstr "ପ୍ରଦର୍ଶନ ସ୍ଥିତିକୁ ପ୍ରଦାନ କ
 msgid ""
 "Do you want to remove any bookmarks with the non-existing location from your "
 "list?"
-msgstr "ଆପଣ ଆପଣଙ୍କ ତାଲିକାରୁ ଅନୁପସ୍ଥିତ ସ୍ଥାନ ବିଶିଷ୍ଟ କୌଣସି ବୁକମାର୍କକୁ ଅପସାରିତ କରିବା ପାଇଁ ଚାହାଁନ୍ତି କି?"
+msgstr ""
+"ଆପଣ ଆପଣଙ୍କ ତାଲିକାରୁ ଅନୁପସ୍ଥିତ ସ୍ଥାନ ବିଶିଷ୍ଟ କୌଣସି ବୁକମାର୍କକୁ ଅପସାରିତ କରିବା ପାଇଁ ଚାହାଁନ୍ତି କି?"
 
 #: ../src/nautilus-window-bookmarks.c:99
 msgid "Bookmark for Nonexistent Location"
@@ -5671,8 +5718,8 @@ msgstr "CD/DVD ସ୍ରଷ୍ଟା"
 #: ../src/nautilus-window-menus.c:679
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
 msgstr ""
-"ଗୋଟିଏ ଫୋଲଡର ଖୋଲନ୍ତୁ ଯେଉଁଠାକୁ ଆପଣ ସି.ଡି. କିମ୍ବା ଡି.ଭି.ଡି. ରେ ଲିଖିବା ପାଇଁ ଫାଇଲ ମାନଙ୍କୁ "
-"ନେଇ ପାରିବେ।"
+"ଗୋଟିଏ ଫୋଲଡର ଖୋଲନ୍ତୁ ଯେଉଁଠାକୁ ଆପଣ ସି.ଡି. କିମ୍ବା ଡି.ଭି.ଡି. ରେ ଲିଖିବା ପାଇଁ ଫାଇଲ ମାନଙ୍କୁ ନେଇ "
+"ପାରିବେ।"
 
 #: ../src/nautilus-window-menus.c:705
 msgid "_Up"
@@ -5706,3 +5753,130 @@ msgstr "ସାନବଡ କରନ୍ତୁ"
 msgid "Set the zoom level of the current view"
 msgstr "ସାମ୍ପ୍ରତିକ ଦୃଶ୍ଯର ସାନବଡ ସ୍ତରକୁ ବିନ୍ଯାସ କରନ୍ତୁ"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ଚିତ୍ର/ଚିହ୍ନକ ଧାର"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "ଚେତାବନୀ ସଂଳାପରେ ଚିହ୍ନକ ଓ ଚିତ୍ର ଚାରିପାଖେ ଧାରର ଓସାର"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "ଚେତାବନୀ ପ୍ରକାର"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "ଚେତାବନୀ ପ୍ରକାର"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "ଚେତାବନୀ ଚାବିଗୁଡ଼ିକ"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "ଚେତାବନୀ ସଂଳାପରେ ପ୍ରଦର୍ଶିତ ଚାବିଗୁଡ଼ିକ"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "ଅଧିକ ବିସ୍ତୃତ ବିବରଣୀ ଦେଖାନ୍ତୁ (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ପାଠ୍ଯ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ଚିହ୍ନକର ପାଠ୍ଯ"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "ଦ୍ବିପାର୍ଶ୍ବୀ ସଜ୍ଜା"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"ଚିହ୍ନକର ପାଠ୍ଯରେ ଧାଡ଼ିଗୁଡ଼ିକର ଆପେକ୍ଷିକ ପାର୍ଶ୍ବ ସଜ୍ଜା. ଏହା ନିଜ ବଣ୍ଟନ ମଧ୍ଯରେ ଚିହ୍ନକର ପାର୍ଶ୍ବ ସଜ୍ଜାକୁ "
+"ପ୍ରଭାବିତ କରେ ନାହିଁ. ତାହା ପାଇଁ GtkMisc::xalign ଦେଖନ୍ତୁ."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "ଧାଡ଼ି ମୋଡ଼ା"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "ଏହା ବିନ୍ଯାସ କରାଯାଇଥିଲେ, ପାଠ୍ଯଟି ଅତି ଓସାରିଆ ହେଲେ ଧାଡ଼ି ମୋଡ଼ନ୍ତୁ"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "ଦର୍ଶିକା ସ୍ଥିତି"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "ଅକ୍ଷରରେ ଭରଣ ଦର୍ଶିକାର ସାମ୍ପ୍ରତିକ ସ୍ଥିତି"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "ବଚ୍ଛାର ସୀମା"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "ଅକ୍ଷରରେ ଦର୍ଶିକାଠାରୁ ବଚ୍ଛାର ବିପରୀତ ଆଡ଼ର ସ୍ଥିତି"
+
+#: ../eel/eel-editable-label.c:3230
+msgid "Select All"
+msgstr "ସବୁ ବାଚ୍ଛନ୍ତୁ"
+
+#: ../eel/eel-editable-label.c:3241
+msgid "Input Methods"
+msgstr "ନିବେଶ ଧାରାଗୁଡ଼ିକ"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"ଜିକନ୍ଫ ତ୍ରୁଟି:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "ଜିକନ୍ଫ ତ୍ରୁଟି: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ଭବିଷ୍ଯତରେ ସବୁ ତ୍ରୁଟିଗୁଡ଼ିକ କେବଳ ଟର୍ମିନାଲରେ ପ୍ରଦର୍ଶିତ କରାଯିବ"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "କୌଣସି ଚିତ୍ର ବଚ୍ଛାଯାଇ ନ ଥିଲା"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "ଚିତ୍ର ବାଚ୍ଛିବା ପାଇଂ ଆପଣଙ୍କୁ ତାହା ଉପରେ ମାଉସ୍ ଚାବି ଦବାଇବାକୁ ପଡ଼ିବ"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "ଆପଣ ବାତିଲ ଦବାଇ ଏହି ଚାଳନାକୁ ଅଟକାଇପାରନ୍ତି"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(ଅବୈଧ ୟୁନିକୋଡ୍)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଭରଣ କରନ୍ତୁ"
diff --git a/po/pa.po b/po/pa.po
index b7e6e5e4f..d5b9d01cd 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#
 # translation of nautilus.HEAD.po to Punjabi
 # Translation of nautilus.pa.po to Punjabi
 #
@@ -10,8 +11,19 @@
 # ASB <aalam@users.sf.net>, 2007.
 # Amanpreet Singh Alam <apreet.alam@gmail.com>, 2008.
 # Amanpreet Singh Alam <aalam@users.sf.net>, 2008.
+# #-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#
+# translation of eel.HEAD.po to Punjabi
+#
+#
+# Amanpreet Singh Alam <amanliunx@netscapet.net>, 2004.
+# Amanpreet Singh Alam <aalam@redhat.com>, 2004.
+# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005.
+# A S Alam <apbrar@gmail.com>, 2006.
+# ASB <aalam@users.sf.net>, 2007.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 04:27+0000\n"
@@ -23,6 +35,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: LoKalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-24 03:20+0100\n"
+"PO-Revision-Date: 2007-09-07 06:55+0530\n"
+"Last-Translator: ASB <aalam@users.sf.net>\n"
+"Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -353,8 +378,10 @@ msgid ""
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
-msgstr "ਡਿਫਾਲਟ ਫੋਲਡਰ ਬੈਕਗਰਾਊਂਡ ਲਈ ਰੰਗ। ਸਿਰਫ ਤਾਂ ਹੀ ਉਪਲਬੱਧ ਹੋਵੇਗਾ, ਜੇ background_set ਚੋਣ ਕੀਤੀ ਹੈ।"
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
+msgstr ""
+"ਡਿਫਾਲਟ ਫੋਲਡਰ ਬੈਕਗਰਾਊਂਡ ਲਈ ਰੰਗ। ਸਿਰਫ ਤਾਂ ਹੀ ਉਪਲਬੱਧ ਹੋਵੇਗਾ, ਜੇ background_set ਚੋਣ ਕੀਤੀ ਹੈ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Computer icon visible on desktop"
@@ -526,7 +553,8 @@ msgstr ""
 "ਫਾਇਲਾਂ ਦੋਵਾਂ ਨੂੰ ਵੇਖਾਵੇਗਾ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਨਵੀਆਂ ਵਿੰਡੋ ਵਿੱਚ ਟਿਕਾਣਾ ਪੱਟੀ ਵੀ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -569,7 +597,8 @@ msgstr ""
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
-msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਨਟੀਲਸ ਤੁਹਾਨੂੰ ਕੋਈ ਵੀ ਫਾਇਲਾਂ ਹਟਾਉਣ ਜਾਂ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁੱਛੇਗਾ।"
+msgstr ""
+"ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਨਟੀਲਸ ਤੁਹਾਨੂੰ ਕੋਈ ਵੀ ਫਾਇਲਾਂ ਹਟਾਉਣ ਜਾਂ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁੱਛੇਗਾ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
@@ -603,7 +632,8 @@ msgid ""
 "If set to true, then Nautilus will never prompt nor autorun/autostart "
 "programs when a medium is inserted."
 msgstr ""
-"ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਨਟੀਲਸ ਮੀਡਿਆ ਪਾਉਣ ਨਾਲ ਕਦੇ ਵੀ ਆਟੋ-ਰਨ/ਆਟੋ-ਸਟਾਰਟ ਪਰੋਗਰਾਮਾਂ ਨੂੰ ਚਲਾਉਣ ਲਈ ਪੁੱਛੇਗਾ ਨਹੀਂ।"
+"ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਨਟੀਲਸ ਮੀਡਿਆ ਪਾਉਣ ਨਾਲ ਕਦੇ ਵੀ ਆਟੋ-ਰਨ/ਆਟੋ-ਸਟਾਰਟ ਪਰੋਗਰਾਮਾਂ ਨੂੰ ਚਲਾਉਣ ਲਈ "
+"ਪੁੱਛੇਗਾ ਨਹੀਂ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
@@ -649,7 +679,8 @@ msgstr ""
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
-msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਆਈਕਾਨ, ਜੋ ਕਿ ਨੈੱਟਵਰਕ ਸਰਵਰ ਝਲਕ ਨਾਲ ਸਬੰਧਤ ਹੈ, ਡੈਸਕਟਾਪ ਵਿੱਚ ਆ ਜਾਵੇਗਾ।"
+msgstr ""
+"ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਆਈਕਾਨ, ਜੋ ਕਿ ਨੈੱਟਵਰਕ ਸਰਵਰ ਝਲਕ ਨਾਲ ਸਬੰਧਤ ਹੈ, ਡੈਸਕਟਾਪ ਵਿੱਚ ਆ ਜਾਵੇਗਾ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid ""
@@ -706,7 +737,8 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਨਵੀਂ ਵਿੰਡੋ ਵਿੱਚ ਆਈਕਾਨ ਡਿਫਾਲਟ ਤੌਰ ਤੇ ਕਸਵੇ ਹੋਣਗੇ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ, ਲੇਬਲ ਆਈਕਾਨ ਨਾਲ ਪਾਸੇ ਤੇ ਵੇਖਾਏ ਜਾਣਗੇ ਨਾ ਕਿ ਉਹਨਾਂ ਦੇ ਹੇਠਾਂ।"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
@@ -756,7 +788,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -1231,6 +1264,7 @@ msgstr "ਡਿਫਾਲਟ ਵਰਤੋਂ(_f)"
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:274
 #: ../src/file-manager/fm-list-view.c:1411
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "ਨਾਂ"
 
@@ -1339,7 +1373,8 @@ msgstr "ਤੁਸੀਂ ਵਾਲੀਅਮ \"%s\" ਨੂੰ ਰੱਦੀ ਵਿ�
 msgid ""
 "If you want to eject the volume, please use \"Eject\" in the popup menu of "
 "the volume."
-msgstr "ਜੇਕਰ ਤੁਸੀ ਵਾਲੀਅਮ ਬਾਹਰ ਕੱਢਣਾ ਹੈ ਤਾਂ ਆਈਕਾਨ 'ਤੇ ਸੱਜੇ ਕਲਿੱਕ ਦੀ ਮੇਨੂ ਵਿੱਚੋਂ \"ਬਾਹਰ ਕੱਢੋ\" ਵਰਤੋਂ।"
+msgstr ""
+"ਜੇਕਰ ਤੁਸੀ ਵਾਲੀਅਮ ਬਾਹਰ ਕੱਢਣਾ ਹੈ ਤਾਂ ਆਈਕਾਨ 'ਤੇ ਸੱਜੇ ਕਲਿੱਕ ਦੀ ਮੇਨੂ ਵਿੱਚੋਂ \"ਬਾਹਰ ਕੱਢੋ\" ਵਰਤੋਂ।"
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
 msgid ""
@@ -1391,7 +1426,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "ਅਫ਼ਸੋਸ, ਪਰ ਨਿਸ਼ਾਨ ਲਈ ਇਕ ਨਾ-ਖਾਲੀ ਅੱਖਰ ਹੀ ਚਾਹੀਦਾ ਹੈ।"
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "ਅਫ਼ਸੋਸ, ਪਰ ਨਿਸ਼ਾਨ ਅੱਖਰ ਕੇਵਲ ਅੱਖਰ. ਖਾਲੀ ਥਾਂ ਜਾਂ ਨੰਬਰ ਹੀ ਰੱਖਦੇ ਹਨ।"
 
 #. this really should never happen, as a user has no idea
@@ -1661,7 +1697,8 @@ msgstr "ਕੀ ਤੁਸੀਂ \"%B\" ਨੂੰ ਪੱਕੇ ਤੌਰ 'ਤੇ �
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "ਕੀ ਤੁਸੀਂ %'d ਚੁਣੀ ਆਈਟਮ ਨੂੰ ਪੱਕੇ ਤੌਰ 'ਤੇ ਖਤਮ ਕਰਨ ਲਈ ਤਿਆਰ ਹੋ?"
 msgstr[1] "ਕੀ ਤੁਸੀਂ %'d ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਨੂੰ ਪੱਕੇ ਤੌਰ 'ਤੇ ਖਤਮ ਕਰਨ ਲਈ ਤਿਆਰ ਹੋ?"
 
@@ -1695,12 +1732,14 @@ msgstr "ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
-msgstr "ਫੋਲਡਰ\"%B\" ਵਿਚੋਂ ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਨਹੀਂ ਜਾ ਸਕਦੀਆਂ ਹਨ, ਕਿਉਂਕਿ ਤੁਹਾਨੂੰ ਪੜ੍ਹਨ ਦੀ ਇਜ਼ਾਜਤ ਨਹੀਂ ਹੈ।"
+msgstr ""
+"ਫੋਲਡਰ\"%B\" ਵਿਚੋਂ ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਨਹੀਂ ਜਾ ਸਕਦੀਆਂ ਹਨ, ਕਿਉਂਕਿ ਤੁਹਾਨੂੰ ਪੜ੍ਹਨ ਦੀ ਇਜ਼ਾਜਤ ਨਹੀਂ ਹੈ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr "\"%B\" ਫੋਲਡਰ ਵਿੱਚ ਫਾਇਲਾਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲੈਣ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
@@ -1712,7 +1751,8 @@ msgstr "ਫਾਇਲਾਂ ਛੱਡੋ(_S)"
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
-msgstr "ਫੋਲਡਰ \"%B\"  ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਤੁਹਾਨੂੰ ਇਹ ਪੜ੍ਹਨ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
+msgstr ""
+"ਫੋਲਡਰ \"%B\"  ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਤੁਹਾਨੂੰ ਇਹ ਪੜ੍ਹਨ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
 #: ../libnautilus-private/nautilus-file-operations.c:2401
@@ -1833,13 +1873,15 @@ msgstr ""
 msgid ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
-msgstr "\"%B\" ਫੋਲਡਰ ਹੈਂਡਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਤੁਹਾਨੂੰ ਇਹ ਪੜ੍ਹਨ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
+msgstr ""
+"\"%B\" ਫੋਲਡਰ ਹੈਂਡਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਤੁਹਾਨੂੰ ਇਹ ਪੜ੍ਹਨ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2475
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
-msgstr "ਫਾਇਲ \"%B\"  ਹੈਂਡਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ ਤੁਹਾਨੂੰ ਇਹ ਪੜ੍ਹਨ ਦੀ ਇਜ਼ਾਜ਼ਤ ਨਹੀਂ ਹੈ।"
+msgstr ""
+"ਫਾਇਲ \"%B\"  ਹੈਂਡਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ ਤੁਹਾਨੂੰ ਇਹ ਪੜ੍ਹਨ ਦੀ ਇਜ਼ਾਜ਼ਤ ਨਹੀਂ ਹੈ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
 msgid "There was an error getting information about \"%B\"."
@@ -2049,8 +2091,10 @@ msgstr "ਇੱਕ ਫਾਇਲ \"%B\" ਨਾਂ ਨਾਲ ਪਹਿਲਾਂ ਹ
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr "\"%F\" ਵਿੱਚ ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।  ਇਸ ਨੂੰ ਬਦਲਣ ਨਾਲ ਇਸ ਦੀ ਸਮੱਗਰੀ ਖਤਮ ਹੋ ਜਾਵੇਗੀ।"
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgstr ""
+"\"%F\" ਵਿੱਚ ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।  ਇਸ ਨੂੰ ਬਦਲਣ ਨਾਲ ਇਸ ਦੀ ਸਮੱਗਰੀ ਖਤਮ ਹੋ ਜਾਵੇਗੀ।"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3913
 #, c-format
@@ -2750,12 +2794,15 @@ msgstr "ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਡਿਫਾਲਟ ਸੈੱਟ �
 msgid "Could not set as default application"
 msgstr "ਡਿਫਾਲਟ ਐਪਲੀਕੇਸ਼ਨ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
+# #-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#
 #  add the reset background item, possibly disabled
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#: ../eel/eel-mime-application-chooser.c:229
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
+#: ../eel/eel-mime-application-chooser.c:237
 msgid "Icon"
 msgstr "ਆਈਕਾਨ"
 
@@ -2764,24 +2811,43 @@ msgid "Could not remove application"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#: ../eel/eel-mime-application-chooser.c:479
+#, fuzzy
 msgid "No applications selected"
-msgstr "ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਚੁਣੀ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਚੁਣੀ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਕੋਈ ਕਾਰਜ ਨਹੀਂ ਚੁਣੇ"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, c-format
+#: ../eel/eel-mime-application-chooser.c:528
+#: ../eel/eel-open-with-dialog.c:1066
+#, fuzzy, c-format
 msgid "%s document"
-msgstr "%s ਡੌਕੂਮੈਂਟ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"%s ਡੌਕੂਮੈਂਟ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"%s ਦਸਤਾਵੇਜ਼"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:910
+#: ../eel/eel-mime-application-chooser.c:538
+#: ../eel/eel-open-with-dialog.c:1079
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#: ../eel/eel-mime-application-chooser.c:546
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "%s ਅਤੇ \"%s\" ਟਾਈਪ ਦੀਆਂ ਹੋਰ ਫਾਇਲਾਂ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਇੱਕ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"%s ਅਤੇ \"%s\" ਟਾਈਪ ਦੀਆਂ ਹੋਰ ਫਾਇਲਾਂ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਇੱਕ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"%s ਅਤੇ \"%s\" ਕਿਸਮ ਦੇ ਹੋਰਾਂ ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਕਾਰਜ ਚੁਣੋ"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2790,17 +2856,34 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "\"%s\" ਟਾਈਪ ਦੀਆਂ ਸਭ ਫਾਇਲਾਂ ਨੂੰ ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+#, fuzzy
 msgid "Could not run application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਈ ਨਹੀਂ ਜਾ ਸਕੀ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਈ ਨਹੀਂ ਜਾ ਸਕੀ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਕਾਰਜ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#: ../eel/eel-open-with-dialog.c:187
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "'%s' ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"'%s' ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"'%s' ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#: ../eel/eel-open-with-dialog.c:190
+#, fuzzy
 msgid "Could not find application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਐਪਲੀਕੇਸ਼ਨ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਕਾਰਜ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2808,54 +2891,93 @@ msgid "Could not add application to the application database: %s"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਐਪਲੀਕੇਸ਼ਨ ਡਾਟਾਬੇਸ ਵਿੱਚ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
+#: ../eel/eel-open-with-dialog.c:287
+#, fuzzy
 msgid "Could not add application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਐਪਲੀਕੇਸ਼ਨ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਕਾਰਜ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#: ../eel/eel-open-with-dialog.c:401
+#, fuzzy
 msgid "Select an Application"
-msgstr "ਇੱਕ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਇੱਕ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਇੱਕ ਕਾਰਜ ਚੁਣੋ"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5070
+#: ../eel/eel-open-with-dialog.c:891
 msgid "Open With"
 msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#: ../eel/eel-open-with-dialog.c:928
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਵੇਰਵਾ ਵੇਖਣ ਲਈ ਚੁਣੋ।"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਵੇਰਵਾ ਵੇਖਣ ਲਈ ਚੁਣੋ।\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਇਸ ਵੇਰਵੇ ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਕਾਰਜ ਚੁਣੋ"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#: ../eel/eel-open-with-dialog.c:953
 msgid "_Use a custom command"
 msgstr "ਇੱਕ ਕਸਟਮ ਕਮਾਂਡ ਵਰਤੋਂ(_U)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
+#: ../eel/eel-open-with-dialog.c:970
 msgid "_Browse..."
 msgstr "ਝਲਕ(_B)..."
 
+#. #-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
 #: ../src/file-manager/fm-directory-view.c:6599
 #: ../src/file-manager/fm-directory-view.c:7799
 #: ../src/file-manager/fm-tree-view.c:1174
-#: ../src/nautilus-places-sidebar.c:1954
+#: ../src/nautilus-places-sidebar.c:1954 ../eel/eel-open-with-dialog.c:992
 msgid "_Open"
 msgstr "ਖੋਲ੍ਹੋ(_O)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#: ../eel/eel-open-with-dialog.c:1086
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "%s ਅਤੇ \"%s\" ਟਾਈਪ ਦੀਆਂ ਹੋਰ ਫਾਇਲਾਂ ਨੂੰ ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ:"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"%s ਅਤੇ \"%s\" ਟਾਈਪ ਦੀਆਂ ਹੋਰ ਫਾਇਲਾਂ ਨੂੰ ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ:\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"%s ਅਤੇ \"%s\" ਕਿਸਮ ਦੀਆਂ ਹੋਰ ਫਾਇਲ਼ਾਂ ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#: ../eel/eel-open-with-dialog.c:1118
+#, fuzzy
 msgid "_Add"
-msgstr "ਸ਼ਾਮਲ(_A)"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਸ਼ਾਮਲ(_A)\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਸ਼ਾਮਲ(_A)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#: ../eel/eel-open-with-dialog.c:1119
+#, fuzzy
 msgid "Add Application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਸ਼ਾਮਲ"
+msgstr ""
+"#-#-#-#-#  pa.po (nautilus.HEAD)  #-#-#-#-#\n"
+"ਐਪਲੀਕੇਸ਼ਨ ਸ਼ਾਮਲ\n"
+"#-#-#-#-#  pa.po (eel.HEAD)  #-#-#-#-#\n"
+"ਕਾਰਜ ਸ਼ਾਮਿਲ ਕਰੋ"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:81
 msgid "Open Failed, would you like to choose another application?"
@@ -2920,7 +3042,8 @@ msgid "This drop target only supports local files."
 msgstr "ਸੁੱਟਣ ਦਾ ਨਿਸ਼ਾਨਾ ਕੇਵਲ ਲੋਕਲ ਫਾਇਲਾਂ ਲਈ ਹੈ।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:400
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr "ਗ਼ੈਰ-ਲੋਕਲ ਫਾਇਲਾਂ ਨੂੰ ਲੋਕਲ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ ਤੇ ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:411
@@ -2990,7 +3113,8 @@ msgstr "ਆਟੋ-ਰਨ ਸਵਾਲ"
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "ਸਭ ਲੋਕਲ ਅਤੇ ਰਿਮੋਟ ਡਿਸਕਾਂ ਅਤੇ ਇਸ ਕੰਪਿਊਟਰ ਤੋਂ ਵਰਤੋਂਯੋਗ ਫੋਲਡਰ ਦੀ ਝਲਕ"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -3035,7 +3159,8 @@ msgid "Nautilus metafile factory"
 msgstr "ਨਟੀਲਸ ਮੈਟਾਫਾਇਲ ਫੈਕਟਰੀ"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr "ਨਟੀਲਸ ਓਪਰੇਸ਼ਨ, ਜੋ ਕਿ ਕਮਾਂਡ ਲਾਈਨ ਨਾਲ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ"
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -3075,7 +3200,8 @@ msgstr "ਡੈਸਕਟਾਪ ਬੈਕਗਰਾਊਂਡ ਬਦਲੋ(_B)"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "ਉਹ ਵਿੰਡੋ ਖੋਲ੍ਹੋ, ਜੋ ਡੈਸਕਟਾਪ ਬੈਕ-ਗਰਾਊਂਡ ਦਾ ਪੈਟਰਨ ਜਾਂ ਰੰਗ ਬਦਲ ਸਕੇ"
 
 #. label, accelerator
@@ -3313,14 +3439,16 @@ msgstr "ਜੇਕਰ ਤੁਸੀਂ ਚੇਪੋ ਕਮਾਂਡ ਚਲਾਈ �
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] "ਜੇਕਰ ਤੁਸੀਂ ਚੇਪੋ ਕਮਾਂਡ ਚੁਣੀ ਤਾਂ %'d ਚੁਣੀ ਆਈਟਮ ਭੇਜੀ ਜਾਵੇਗੀ"
 msgstr[1] "ਜੇਕਰ ਤੁਸੀਂ ਚੇਪੋ ਕਮਾਂਡ ਚੁਣੀ ਤਾਂ %'d ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਭੇਜੀਆਂ ਜਾਣਗੀਆਂ"
 
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] "ਜੇਕਰ ਤੁਸੀਂ ਚੇਪੋ ਕਮਾਂਡ ਚੁਣੀ ਤਾਂ ਇਹ %'d ਚੁਣੀ ਆਈਟਮ ਦੀ ਕਾਪੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 msgstr[1] "ਜੇਕਰ ਤੁਸੀਂ ਚੇਪੋ ਕਮਾਂਡ ਚੁਣੀ ਤਾਂ ਇਹ %'d ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 
@@ -4004,7 +4132,8 @@ msgstr "ਕਮਾਂਡ"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "ਤੁਹਾਨੂੰ \"%s\" ਦੇ ਹਿੱਸੇ ਵੇਖਣ ਲਈ ਜਰੂਰੀ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4023,12 +4152,14 @@ msgstr "ਫੋਲਡਰ ਸਮੱਗਰੀ ਵੇਖਾਈ ਨਹੀਂ ਜਾ �
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "ਇਹ ਫੋਲਡਰ ਵਿੱਚ ਇਹ ਨਾਂ \"%s\" ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰਾ ਨਾਂ ਚੁਣੋ ਜੀ।"
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕੋਈ \"%s\" ਨਹੀਂ, ਸ਼ਾਇਦ ਕਿਤੇ ਭੇਜਿਆ ਜਾਂ ਹਟਾਇਆ ਗਿਆ ਹੋਵੇ?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -4060,7 +4191,8 @@ msgstr "ਆਈਟਮ ਦਾ ਨਾਂ ਨਹੀਂ ਬਦਲਿਆ ਜਾ ਸਕ
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "ਤੁਹਾਨੂੰ \"%s\" ਦਾ ਗਰੁੱਪ ਬਦਲਣ ਲਈ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
 #. fall through
@@ -4684,7 +4816,8 @@ msgstr "ਨਟੀਲਸ ਲੋੜੀਦਾ \"%s\" ਫੋਲਡਰ ਬਣਾ ਨ�
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
-msgstr "ਨਟੀਲਸ ਚਲਾਉਣ ਤੋਂ ਪਹਿਲਾਂ, ਇਹ ਫੋਲਡਰ ਬਣਾਓ ਜਾਂ ਅਧਿਕਾਰ ਬਦਲੋ ਤਾਂ ਕਿ ਨਟੀਲਸ ਇਸ ਨੂੰ ਬਣਾ ਸਕੇ।"
+msgstr ""
+"ਨਟੀਲਸ ਚਲਾਉਣ ਤੋਂ ਪਹਿਲਾਂ, ਇਹ ਫੋਲਡਰ ਬਣਾਓ ਜਾਂ ਅਧਿਕਾਰ ਬਦਲੋ ਤਾਂ ਕਿ ਨਟੀਲਸ ਇਸ ਨੂੰ ਬਣਾ ਸਕੇ।"
 
 #: ../src/nautilus-application.c:328
 #, c-format
@@ -4695,7 +4828,8 @@ msgstr "ਨਟੀਲਸ ਲੋੜੀਦਾ ਇਹ ਫੋਲਡਰ ਨਹੀਂ �
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
-msgstr "ਨਟੀਲਸ ਚਲਾਉਣ ਤੋਂ ਪਹਿਲਾਂ, ਇਹ ਫੋਲਡਰ ਬਣਾਓ ਜਾਂ ਅਧਿਕਾਰ ਬਦਲੋ ਤਾਂ ਕਿ ਨਟੀਲਸ ਇਸ ਨੂੰ ਬਣਾ ਸਕੋ।"
+msgstr ""
+"ਨਟੀਲਸ ਚਲਾਉਣ ਤੋਂ ਪਹਿਲਾਂ, ਇਹ ਫੋਲਡਰ ਬਣਾਓ ਜਾਂ ਅਧਿਕਾਰ ਬਦਲੋ ਤਾਂ ਕਿ ਨਟੀਲਸ ਇਸ ਨੂੰ ਬਣਾ ਸਕੋ।"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -4820,8 +4954,8 @@ msgid ""
 "<big><b>This medium contains software intended to be automatically started. "
 "Would you like to run it?</b></big>"
 msgstr ""
-"<big><b>ਇਸ ਮੀਡਿਅਮ ਵਿੱਚ ਸਾਫਟਵੇਅਰ ਹਨ, ਜੋ ਕਿ ਆਟੋਮੈਟਿਕ ਹੀ ਚੱਲਦੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</b><"
-"/big>"
+"<big><b>ਇਸ ਮੀਡਿਅਮ ਵਿੱਚ ਸਾਫਟਵੇਅਰ ਹਨ, ਜੋ ਕਿ ਆਟੋਮੈਟਿਕ ਹੀ ਚੱਲਦੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ "
+"ਹੋ?</b></big>"
 
 #: ../src/nautilus-autorun-software.c:196
 #, c-format
@@ -4831,8 +4965,8 @@ msgid ""
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"ਸਾਫਟਵੇਅਰ ਮੀਡਿਆ \"%s\" ਤੋਂ ਸਿੱਧਾ ਚੱਲੇਗਾ। ਤੁਹਾਨੂੰ ਉਹ ਸਾਫਟਵੇਅਰ ਨਹੀਂ ਚਲਾਉਣੇ ਚਾਹੀਦੇ, ਜਿੰਨ੍ਹਾਂ ਉੱਤੇ ਭਰੋਸਾ "
-"ਨਹੀਂ ਹੈ।\n"
+"ਸਾਫਟਵੇਅਰ ਮੀਡਿਆ \"%s\" ਤੋਂ ਸਿੱਧਾ ਚੱਲੇਗਾ। ਤੁਹਾਨੂੰ ਉਹ ਸਾਫਟਵੇਅਰ ਨਹੀਂ ਚਲਾਉਣੇ ਚਾਹੀਦੇ, ਜਿੰਨ੍ਹਾਂ ਉੱਤੇ "
+"ਭਰੋਸਾ ਨਹੀਂ ਹੈ।\n"
 "\n"
 "ਜੇ ਸ਼ੱਕ ਹੋਵੇ ਤਾਂ ਰੱਦ ਕਰੋ ਦੱਬੋ।"
 
@@ -5213,14 +5347,16 @@ msgstr "CD ਆਡੀਓ(_A):"
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
-msgstr "ਆਈਕਾਨ ਹੇਠ ਉਪਲਬੱਧ ਜਾਣਕਾਰੀ ਦਾ ਕ੍ਰਮ ਚੁਣੋ। ਜਦੋਂ ਜ਼ੂਮ ਬੰਦ ਹੋਵੇਗਾ ਤਾਂ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਉਪਲਬੱਧ ਹੋਵੇਗੀ।"
+msgstr ""
+"ਆਈਕਾਨ ਹੇਠ ਉਪਲਬੱਧ ਜਾਣਕਾਰੀ ਦਾ ਕ੍ਰਮ ਚੁਣੋ। ਜਦੋਂ ਜ਼ੂਮ ਬੰਦ ਹੋਵੇਗਾ ਤਾਂ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਉਪਲਬੱਧ ਹੋਵੇਗੀ।"
 
 #: ../src/nautilus-file-management-properties.glade.h:50
 msgid "Choose the order of information to appear in the list view."
 msgstr "ਕਰਮ ਚੁਣੋ, ਜਿਸ ਮੁਤਾਬਕ ਲਿਸਟ ਝਲਕ ਵਿੱਚ ਜਾਣਕਾਰੀ ਉਪਲਬੱਧ ਹੋਵੇਗੀ।"
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr "ਚੁਣੋ ਕਿ ਕੀ ਹੋਵੇ, ਜਦੋਂ ਮੀਡਿਆ ਪਾਇਆ ਜਾਵੇ ਜਾਂ ਜੰਤਰ ਸਿਸਟਮ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਵੇਗਾ"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
@@ -6279,7 +6415,8 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "\"%s\" ਵੇਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਹੋਸਟ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਸ਼ਬਦ-ਜੋੜ ਸਹੀ ਹੈ ਅਤੇ ਤੁਹਾਡਾ ਪਰਕਾਸੀ ਸੈਟਿੰਗ ਠੀਕ ਹੈ।"
 
 #: ../src/nautilus-window-manage-views.c:1947
@@ -6331,7 +6468,8 @@ msgstr ""
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
-msgstr "ਨਟੀਲਸ ਗਨੋਮ ਲਈ ਗਰਾਫਿਕਲ ਸੈੱਲ ਹੈ, ਜੋ ਫਾਇਲਾਂ ਅਤੇ ਬਾਕੀ ਸਿਸਟਮ ਨੂੰ ਸੌਖੀ ਤਰਾਂ ਸੰਭਾਲਣ ਵਿੱਚ ਸਹਾਇਕ ਹੈ।"
+msgstr ""
+"ਨਟੀਲਸ ਗਨੋਮ ਲਈ ਗਰਾਫਿਕਲ ਸੈੱਲ ਹੈ, ਜੋ ਫਾਇਲਾਂ ਅਤੇ ਬਾਕੀ ਸਿਸਟਮ ਨੂੰ ਸੌਖੀ ਤਰਾਂ ਸੰਭਾਲਣ ਵਿੱਚ ਸਹਾਇਕ ਹੈ।"
 
 #: ../src/nautilus-window-menus.c:566
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6654,6 +6792,134 @@ msgstr "ਜ਼ੂਮ"
 msgid "Set the zoom level of the current view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਲਈ ਜ਼ੂਮ ਲੈਵਲ ਸੈੱਟ ਕਰੋ"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ਚਿੱਤਰ/ਲੇਬਲ ਬਾਰਡਰ"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "ਲੇਬਲ ਅਤੇ ਚੇਤਾਵਨੀ ਡਾਈਲਾਗ ਦੁਆਲੇ ਬਾਰਡਰ ਦੀ ਚੌੜਾਈ"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "ਚੇਤਾਵਨੀ ਕਿਸਮ"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "ਚੇਤਾਵਨੀ ਦੀ ਕਿਸਮ"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "ਚੇਤਾਵਨੀ ਬਟਨ"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "ਚੇਤਾਵਨੀ ਡਾਈਲਾਗ ਵਿੱਚ ਦਿਸਣ ਵਾਲੇ ਬਟਨ"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "ਹੋਰ ਵੇਰਵਾ ਵੇਖਾਓ(_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ਟੈਕਸਟ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ਲੇਬਲ ਦਾ ਟੈਕਸਟ ਹੈ।"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "ਇਕਸਾਰ"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"ਲੇਬਲ ਦੇ ਪਾਠ ਵਿਚ ਲਾਈਨਾਂ ਦੀ ਇਕ ਦੂਜੇ ਦੇ ਅਨੁਸਾਰ ਇਕਸਾਰ ਕਰੋ। ਇਹ ਲੇਬਲ ਦੀ ਸਥਿਤੀ ਇਕਸਾਰ ਮੁਤਾਬਕ "
+"ਪਰਭਾਵਿਤ ਨਹੀਂ ਕਰੇਗਾ। ਇਸ ਲਈ ਵੇਖੋ GtkMisc::xalign"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "ਲਾਈਨ ਸਮੇਟੋ"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "ਜੇ ਸੈੱਟ ਕੀਤਾ ਤਾਂ ਜੇ ਟੈਕਸਟ ਬਹੁਤ ਲੰਮਾ ਹੋਣ ਨਾਲ ਲਾਈਨਾਂ ਸਮੇਟੋ।"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "ਕਰਸਰ ਸਥਿਤੀ"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "ਕਰਸਰ ਦੀ ਮੌਜੂਦਾ ਸਥਿਤੀ ਅੱਖਰਾਂ ਵਿੱਚ।"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "ਚੋਣ ਸੀਮਾ"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "ਚੋਣ ਦੀ ਸਥਿਤੀ ਤੋਂ ਉੱਲਟ ਤਕ ਕਰਸਰ ਦੀ ਅੱਖਰਾਂ ਵਿਚ ਸਥਿਤੀ।"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "ਸਭ ਚੁਣੋ"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"ਜੀ-ਕਾਨਫ ਗਲਤੀ:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "ਜੀ-ਕਾਨਫ ਗਲਤੀ: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ਅੱਗੇ ਤੋਂ ਸਭ ਗਲਤੀਆਂ ਟਰਮੀਨਲ 'ਤੇ ਹੀ ਦਿੱਸਣਗੀਆਂ।"
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ ਚੁਣਿਆ।"
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "ਕੋਈ ਚਿੱਤਰ ਚੁਣਨ ਲਈ ਚਿੱਤਰ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "ਕਾਰਜ ਡਾਟਾਬੇਸ ਵਿੱਚ ਕਾਰਜ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "ਰੱਦ ਕਰੋ ਨੂੰ ਦਬਾਕੇ ਤੁਸੀ ਕਾਰਵਾਈ ਰੋਕ ਸਕਦੇ ਹੋ।"
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (ਗਲਤ ਯੂਨੀਕੋਡ)"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "ਖਾਲੀ ਬਲਿਉ-ਰੇ ਡਿਸਕ"
 
@@ -6870,4 +7136,3 @@ msgstr "ਮੌਜੂਦਾ ਝਲਕ ਲਈ ਜ਼ੂਮ ਲੈਵਲ ਸੈੱ�
 
 #~ msgid "<span weight=\"bold\">Trash</span>"
 #~ msgstr "<span weight=\"bold\">ਰੱਦੀ</span>"
-
diff --git a/po/pl.po b/po/pl.po
index 212220c0b..d593d6054 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#
 # Copyright (C) 2001-2005 Free Software Foundation, Inc.
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # Aviary.pl
@@ -6,8 +7,21 @@
 # gnomepl@aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # Review całości pliku: 23.07.2008 Wadim Dziedzic
+# #-#-#-#-#  pl.po (eel)  #-#-#-#-#
+# translation of eel to Polish
+# Artur Flinta <aflinta@gmail.com>, 2006.
+# Tomasz Dominikowski <tdominikowski@aviary.pl>, 2008
+# Copyright (C) 2001-2008 Free Software Foundation, Inc.
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Aviary.pl
+# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
+# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
+# gnomepl@aviary.pl
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-21 19:44+0200\n"
@@ -17,10 +31,26 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-25 18:26+0200\n"
+"PO-Revision-Date: 2008-08-25 18:27+0100\n"
+"Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
+"Language-Team: Aviary.pl <gnomepl@aviary.pl>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Language: Polish\n"
+"X-Poedit-Country: Poland\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -127,8 +157,7 @@ msgid "Envy"
 msgstr "Zazdrość"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28
-#: ../src/nautilus-emblem-sidebar.c:931
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:931
 #: ../src/nautilus-property-browser.c:1770
 msgid "Erase"
 msgstr "Wyczyść"
@@ -304,13 +333,50 @@ msgstr "Zapisane wyszukiwanie"
 #. Translators: date_modified - mtime, the last time file contents were changed
 #. date_changed  - ctime, the last time file meta-information changed
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Possible values are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and \"mime_type\"."
-msgstr "Lista podpisów pod ikoną w widoku ikon lub na pulpicie. Liczba wyświetlanych podpisów zależy od stopnia powiększenia. Dopuszczalne wartości to: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" i \"mime_type\"."
+msgid ""
+"A list of captions below an icon in the icon view and the desktop. The "
+"actual number of captions shown depends on the zoom level. Possible values "
+"are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed"
+"\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
+"\"mime_type\"."
+msgstr ""
+"Lista podpisów pod ikoną w widoku ikon lub na pulpicie. Liczba wyświetlanych "
+"podpisów zależy od stopnia powiększenia. Dopuszczalne wartości to: \"size\", "
+"\"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", "
+"\"group\", \"permissions\", \"octal_permissions\" i \"mime_type\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 #, no-c-format
-msgid "A string specifying how parts of overlong file names should be replaced by ellipses, depending on the zoom level. Each of the list entries is of the form \"Zoom Level:Integer\". For each specified zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form \"Integer\" without any specified zoom level is also allowed. It defines the maximum number of lines for all other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level \"smallest\". Shorten file names if they exceed four lines for zoom level \"smaller\". Do not shorten file names for other zoom levels. Available zoom levels: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
-msgstr "Ciąg znaków określający jak w zależności od powiększenia zbyt długie nazwy plików będą zastępowane wielokropkiem. Dla każdej wartości powiększenia, jeśli dana liczba całkowita jest większa od 0 nazwa pliku nie przekroczy zadanej liczby linii. Wartość 0 lub mniejsza oznacza brak ograniczenia dla danego powiększenia. Dozwolona jest także domyślna wartość \"Integer\" bez podanego powiększenia. Określa ona maksymalną ilość linii dla wszystkich innych powiększeń. Na przykład: 0 - zawsze wyświetla zbyt długie nazwy plików; 3 - skraca nazwy plików jeśli przekraczają one trzy wiersze; smallest:5,smaller:4,0 - skraca nazwy plików jeśli przekraczają one pięć wierszy dla powiększenia \"najmniejsze\". Skraca nazwy plików jeśli przekraczają one cztery wiersze dla powiększenia \"mniejsze\". Nie skraca nazw plików dla innych powiększeń. Dostępne poziomy powiększenia: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)."
+msgid ""
+"A string specifying how parts of overlong file names should be replaced by "
+"ellipses, depending on the zoom level. Each of the list entries is of the "
+"form \"Zoom Level:Integer\". For each specified zoom level, if the given "
+"integer is larger than 0, the file name will not exceed the given number of "
+"lines. If the integer is 0 or smaller, no limit is imposed on the specified "
+"zoom level. A default entry of the form \"Integer\" without any specified "
+"zoom level is also allowed. It defines the maximum number of lines for all "
+"other zoom levels. Examples: 0 - always display overlong file names; 3 - "
+"shorten file names if they exceed three lines; smallest:5,smaller:4,0 - "
+"shorten file names if they exceed five lines for zoom level \"smallest\". "
+"Shorten file names if they exceed four lines for zoom level \"smaller\". Do "
+"not shorten file names for other zoom levels. Available zoom levels: "
+"smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
+"larger (200%), largest (400%)"
+msgstr ""
+"Ciąg znaków określający jak w zależności od powiększenia zbyt długie nazwy "
+"plików będą zastępowane wielokropkiem. Dla każdej wartości powiększenia, "
+"jeśli dana liczba całkowita jest większa od 0 nazwa pliku nie przekroczy "
+"zadanej liczby linii. Wartość 0 lub mniejsza oznacza brak ograniczenia dla "
+"danego powiększenia. Dozwolona jest także domyślna wartość \"Integer\" bez "
+"podanego powiększenia. Określa ona maksymalną ilość linii dla wszystkich "
+"innych powiększeń. Na przykład: 0 - zawsze wyświetla zbyt długie nazwy "
+"plików; 3 - skraca nazwy plików jeśli przekraczają one trzy wiersze; "
+"smallest:5,smaller:4,0 - skraca nazwy plików jeśli przekraczają one pięć "
+"wierszy dla powiększenia \"najmniejsze\". Skraca nazwy plików jeśli "
+"przekraczają one cztery wiersze dla powiększenia \"mniejsze\". Nie skraca "
+"nazw plików dla innych powiększeń. Dostępne poziomy powiększenia: smallest "
+"(33%), smaller (50%), small (66%), standard (100%), large (150%), larger "
+"(200%), largest (400%)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -321,12 +387,23 @@ msgid "Always use the location entry, instead of the pathbar"
 msgstr "Używanie wpisu położenia zamiast paska ścieżki"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
-msgid "An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines."
-msgstr "Liczba całkowita określająca jak zbyt długie nazwy plików na pulpicie będą skracane wielokropkiem. Jeśli liczba jest większa od 0, to nazwa pliku nie przekroczy zadanej liczby wierszy. Wartość 0 lub mniejsza oznacza brak ograniczenia ilości wyświetlanych wierszy."
+msgid ""
+"An integer specifying how parts of overlong file names should be replaced by "
+"ellipses on the desktop. If the number is larger than 0, the file name will "
+"not exceed the given number of lines. If the number is 0 or smaller, no "
+"limit is imposed on the number of displayed lines."
+msgstr ""
+"Liczba całkowita określająca jak zbyt długie nazwy plików na pulpicie będą "
+"skracane wielokropkiem. Jeśli liczba jest większa od 0, to nazwa pliku nie "
+"przekroczy zadanej liczby wierszy. Wartość 0 lub mniejsza oznacza brak "
+"ograniczenia ilości wyświetlanych wierszy."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
-msgstr "Kolor dla domyślnego tła katalogu. Opcja używana tylko gdy zmienna background_set jest ustawiona na \"true\"."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
+msgstr ""
+"Kolor dla domyślnego tła katalogu. Opcja używana tylko gdy zmienna "
+"background_set jest ustawiona na \"true\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Computer icon visible on desktop"
@@ -337,8 +414,16 @@ msgid "Criteria for search bar searching"
 msgstr "Kryteria dla przeszukiwania paska wyszukiwania"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
-msgid "Criteria when matching files searched for in the search bar. If set to \"search_by_text\", then Nautilus will Search for files by file name only. If set to \"search_by_text_and_properties\", then Nautilus will search for files by file name and file properties."
-msgstr "Kryteria wyszukiwania plików poprzez pasek wyszukiwania. Jeżeli jest ustawione \"search_by_text\", wtedy nautilus będzie wyszukiwał tylko pliki z pasującą nazwą. Jeżeli jest ustawione na \"search_by_text_and_properties\", to wyszukiwane będą pliki z pasującą nazwą i właściwościami."
+msgid ""
+"Criteria when matching files searched for in the search bar. If set to "
+"\"search_by_text\", then Nautilus will Search for files by file name only. "
+"If set to \"search_by_text_and_properties\", then Nautilus will search for "
+"files by file name and file properties."
+msgstr ""
+"Kryteria wyszukiwania plików poprzez pasek wyszukiwania. Jeżeli jest "
+"ustawione \"search_by_text\", wtedy nautilus będzie wyszukiwał tylko pliki z "
+"pasującą nazwą. Jeżeli jest ustawione na \"search_by_text_and_properties\", "
+"to wyszukiwane będą pliki z pasującą nazwą i właściwościami."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Current Nautilus theme (deprecated)"
@@ -442,34 +527,62 @@ msgstr "Nazwa ikony kosza na pulpicie"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "Włącza klasyczne zachowanie programu, gdzie wszystkie okna są przeglądarkami"
+msgstr ""
+"Włącza klasyczne zachowanie programu, gdzie wszystkie okna są przeglądarkami"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid "Filename for the default folder background. Only used if background_set is true."
-msgstr "Nazwa pliku dla domyślnego tła katalogu. Opcja używana tylko gdy zmienna background_set ma wartość true."
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"Nazwa pliku dla domyślnego tła katalogu. Opcja używana tylko gdy zmienna "
+"background_set ma wartość true."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid "Filename for the default side pane background. Only used if side_pane_background_set is true."
-msgstr "Nazwa pliku dla domyślnego tła panelu bocznego. Opcja używana tylko gdy zmienna side_pane_background_set ma wartość true."
+msgid ""
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
+msgstr ""
+"Nazwa pliku dla domyślnego tła panelu bocznego. Opcja używana tylko gdy "
+"zmienna side_pane_background_set ma wartość true."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
-msgid "Folders over this size will be truncated to around this size. The purpose of this is to avoid unintentionally blowing the heap and killing Nautilus on massive folders. A negative value denotes no limit. The limit is approximate due to the reading of folders chunk-wise."
-msgstr "Katalogi przekraczające podany rozmiar zostaną przycięte. Dzięki temu zapobiega się zaśmiecaniu stosu i awarii programu w wielkich katalogach. Wartość ujemna oznacza brak limitu. Limit jest przybliżony, ze względu na pakietowy odczyt katalogów."
+msgid ""
+"Folders over this size will be truncated to around this size. The purpose of "
+"this is to avoid unintentionally blowing the heap and killing Nautilus on "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Katalogi przekraczające podany rozmiar zostaną przycięte. Dzięki temu "
+"zapobiega się zaśmiecaniu stosu i awarii programu w wielkich katalogach. "
+"Wartość ujemna oznacza brak limitu. Limit jest przybliżony, ze względu na "
+"pakietowy odczyt katalogów."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid "Home icon visible on desktop"
 msgstr "Ikona katalogu domowego widoczna na pulpicie"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
-msgid "If set to \"after_current_tab\", then new tabs are inserted after the current tab. If set to \"end\", then new tabs are appended to the end of the tab list."
-msgstr "Jeśli ustawione na wartość \"after_current_tab\", to nowe tabulatory będą wstawiane za bieżącym tabluatorem. Jeśli ustawione na wartość \"end\", to nowe tabulatory zostaną dołączone na koniec listy tabulatorów."
+msgid ""
+"If set to \"after_current_tab\", then new tabs are inserted after the "
+"current tab. If set to \"end\", then new tabs are appended to the end of the "
+"tab list."
+msgstr ""
+"Jeśli ustawione na wartość \"after_current_tab\", to nowe tabulatory będą "
+"wstawiane za bieżącym tabluatorem. Jeśli ustawione na wartość \"end\", to "
+"nowe tabulatory zostaną dołączone na koniec listy tabulatorów."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
-msgid "If set to true, Nautilus will only show folders in the tree side pane. Otherwise it will show both folders and files."
-msgstr "Określa, czy program Nautilus ma wyświetlać same katalogi w drzewie paska bocznego, czy też katalogi i pliki."
+msgid ""
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
+msgstr ""
+"Określa, czy program Nautilus ma wyświetlać same katalogi w drzewie paska "
+"bocznego, czy też katalogi i pliki."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "Określa, czy nowo otwarte okna będą miały widoczny pasek położenia."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -485,124 +598,252 @@ msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr "Określa, czy nowo otwarte okna będą miały widoczny pasek narzędziowy."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
-msgstr "Określa, czy okna programu Nautilus będą zawsze używały tekstowego pola paska położenia zamiast paska ścieżki."
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
+msgstr ""
+"Określa, czy okna programu Nautilus będą zawsze używały tekstowego pola "
+"paska położenia zamiast paska ścieżki."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
-msgstr "Określa, czy można zmianiać prawa dostępu do plików w formie bardziej uniksowej, z dostępem do bardziej złożonych opcji."
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
+msgstr ""
+"Określa, czy można zmianiać prawa dostępu do plików w formie bardziej "
+"uniksowej, z dostępem do bardziej złożonych opcji."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views."
-msgstr "Określa, czy w widokach ikon i listy wyświetlane są najpierw katalogi, a potem pliki."
+msgid ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr ""
+"Określa, czy w widokach ikon i listy wyświetlane są najpierw katalogi, a "
+"potem pliki."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash."
-msgstr "Określa, czy podczas próby usunięcia plików lub opróżnienia kosza będzie wymagane potwierdzenie."
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"delete files, or empty the Trash."
+msgstr ""
+"Określa, czy podczas próby usunięcia plików lub opróżnienia kosza będzie "
+"wymagane potwierdzenie."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "If set to true, then Nautilus will automatically mount media such as user-visible hard disks and removable media on start-up and media insertion."
-msgstr "Określa, czy podczas rozruchu systemu oraz po wsunięciu nośnika będą automatycznie montowane widoczne dla użytkownika dyski twarde i wymienne."
+msgid ""
+"If set to true, then Nautilus will automatically mount media such as user-"
+"visible hard disks and removable media on start-up and media insertion."
+msgstr ""
+"Określa, czy podczas rozruchu systemu oraz po wsunięciu nośnika będą "
+"automatycznie montowane widoczne dla użytkownika dyski twarde i wymienne."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
-msgid "If set to true, then Nautilus will automatically open a folder when media is automounted. This only applies to media where no known x-content/* type was detected; for media where a known x-content type is detected, the user configurable action will be taken instead."
-msgstr "Określa, czy po automatycznym zamontowaniu nośnika katalog będzie automatycznie otwierany. Dotyczy to jedynie nośników, dla których nie został wykryty znany typ x-content/*; dla nośników z wykrytym typem x-content zostanie wykonane działanie skonfigurowane przez użytkownika."
+msgid ""
+"If set to true, then Nautilus will automatically open a folder when media is "
+"automounted. This only applies to media where no known x-content/* type was "
+"detected; for media where a known x-content type is detected, the user "
+"configurable action will be taken instead."
+msgstr ""
+"Określa, czy po automatycznym zamontowaniu nośnika katalog będzie "
+"automatycznie otwierany. Dotyczy to jedynie nośników, dla których nie został "
+"wykryty znany typ x-content/*; dla nośników z wykrytym typem x-content "
+"zostanie wykonane działanie skonfigurowane przez użytkownika."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "Określa, czy będą wyświetlane ikony na pulpicie."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
-msgid "If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
-msgstr "Określa, czy zamiast przeniesienia do kosza będzie możliwość natychmiastowego usunięcia pliku. Funkcja ta może być niebezpieczna, należy jej używać z rozwagą."
+msgid ""
+"If set to true, then Nautilus will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"Określa, czy zamiast przeniesienia do kosza będzie możliwość "
+"natychmiastowego usunięcia pliku. Funkcja ta może być niebezpieczna, należy "
+"jej używać z rozwagą."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted."
-msgstr "Określa, czy wyświetlać pytania i automatycznie uruchamiać programy po wsunięciu nośnika."
+msgid ""
+"If set to true, then Nautilus will never prompt nor autorun/autostart "
+"programs when a medium is inserted."
+msgstr ""
+"Określa, czy wyświetlać pytania i automatycznie uruchamiać programy po "
+"wsunięciu nośnika."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-msgid "If set to true, then Nautilus will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "Określa, czy katalog domowy użytkownika ma być użyty jako pulpit. Jeżeli nie, wówczas jako pulpit użyty zostanie katalog ~/Desktop."
+msgid ""
+"If set to true, then Nautilus will use the user's home folder as the "
+"desktop. If it is false, then it will use ~/Desktop as the desktop."
+msgstr ""
+"Określa, czy katalog domowy użytkownika ma być użyty jako pulpit. Jeżeli "
+"nie, wówczas jako pulpit użyty zostanie katalog ~/Desktop."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "If set to true, then all Nautilus windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior."
-msgstr "Określa, czy wszystkie okna programu Nautilus będą oknami przeglądarki. Jest zachowanie programu Nautilus sprzed wersji 2.6, część osób woli ten właśnie styl."
+msgid ""
+"If set to true, then all Nautilus windows will be browser windows. This is "
+"how Nautilus used to behave before version 2.6, and some people prefer this "
+"behavior."
+msgstr ""
+"Określa, czy wszystkie okna programu Nautilus będą oknami przeglądarki. Jest "
+"zachowanie programu Nautilus sprzed wersji 2.6, część osób woli ten właśnie "
+"styl."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "If set to true, then backup files such as those created by Emacs are displayed. Currently, only files ending in a tilde (~) are considered backup files."
-msgstr "Określa, czy są wyświetlane pliki kopii zapasowych takie jak np. tworzone przez Emacss. Obecnie, tylko pliki mające na końcu nazwy znak tyldy (~) są uważane za kopie zapasowe."
+msgid ""
+"If set to true, then backup files such as those created by Emacs are "
+"displayed. Currently, only files ending in a tilde (~) are considered backup "
+"files."
+msgstr ""
+"Określa, czy są wyświetlane pliki kopii zapasowych takie jak np. tworzone "
+"przez Emacss. Obecnie, tylko pliki mające na końcu nazwy znak tyldy (~) są "
+"uważane za kopie zapasowe."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
-msgid "If set to true, then hidden files are shown in the file manager. Hidden files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "Określa, czy pliki ukryte wyświetlane są w menedżerze plików. Plikami ukrytymi są zarówno pliki z kropką na początku nazwy jak i wymienione w pliku .hidden."
+msgid ""
+"If set to true, then hidden files are shown in the file manager. Hidden "
+"files are either dotfiles or are listed in the folder's .hidden file."
+msgstr ""
+"Określa, czy pliki ukryte wyświetlane są w menedżerze plików. Plikami "
+"ukrytymi są zarówno pliki z kropką na początku nazwy jak i wymienione w "
+"pliku .hidden."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
-msgid "If set to true, then multiple views can be opened in one browser window, each in a separate tab."
-msgstr "Określa, czy można otworzyć wiele widoków w kartach w jednym oknie przeglądarki."
+msgid ""
+"If set to true, then multiple views can be opened in one browser window, "
+"each in a separate tab."
+msgstr ""
+"Określa, czy można otworzyć wiele widoków w kartach w jednym oknie "
+"przeglądarki."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop."
-msgstr "Określa, czy na pulpicie będzie umieszczona ikona skrótu do widoku serwerów sieciowych."
+msgid ""
+"If this is set to true, an icon linking to the Network Servers view will be "
+"put on the desktop."
+msgstr ""
+"Określa, czy na pulpicie będzie umieszczona ikona skrótu do widoku serwerów "
+"sieciowych."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "If this is set to true, an icon linking to the computer location will be put on the desktop."
-msgstr "Określa, czy ikona odnosząca się do położenia komputera będzie widoczna na pulpicie."
+msgid ""
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
+msgstr ""
+"Określa, czy ikona odnosząca się do położenia komputera będzie widoczna na "
+"pulpicie."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop."
-msgstr "Określa, czy na pulpicie będzie umieszczana ikona z skrótu do katalogu domowego."
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
+"the desktop."
+msgstr ""
+"Określa, czy na pulpicie będzie umieszczana ikona z skrótu do katalogu "
+"domowego."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
-msgid "If this is set to true, an icon linking to the trash will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the trash will be put on the "
+"desktop."
 msgstr "Określa, czy na pulpicie będzie umieszczona ikona kosza."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop."
-msgstr "Określa, czy na pulpicie mają być umieszczane ikony dowiązań do zamontowanych woluminów."
+msgid ""
+"If this is set to true, icons linking to mounted volumes will be put on the "
+"desktop."
+msgstr ""
+"Określa, czy na pulpicie mają być umieszczane ikony dowiązań do "
+"zamontowanych woluminów."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
-msgid "If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately."
-msgstr "Jeśli preferencja ta jest ustawiona, to wszystkie kolumny widoku ciaśniejszego będą miały tę samą szerokość. W przeciwnym wypadku szerokość każdej kolumny określana będzie osobno."
+msgid ""
+"If this preference is set, all columns in the compact view have the same "
+"width. Otherwise, the width of each column is determined seperately."
+msgstr ""
+"Jeśli preferencja ta jest ustawiona, to wszystkie kolumny widoku "
+"ciaśniejszego będą miały tę samą szerokość. W przeciwnym wypadku szerokość "
+"każdej kolumny określana będzie osobno."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"."
-msgstr "Określa, czy pliki w nowych oknach będą uporządkowane w odwróconej kolejności. Na przykład, jeżeli są sortowane po nazwie, wówczas zamiast w kolejności od \"a\" do \"z\", zostaną uporządkowane od \"z\" do \"a\"."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"."
+msgstr ""
+"Określa, czy pliki w nowych oknach będą uporządkowane w odwróconej "
+"kolejności. Na przykład, jeżeli są sortowane po nazwie, wówczas zamiast w "
+"kolejności od \"a\" do \"z\", zostaną uporządkowane od \"z\" do \"a\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally."
-msgstr "Określa, czy pliki w nowych oknach będą uporządkowane w odwróconej kolejności. Na przykład, jeżeli są sortowane po nazwie, wówczas zamiast w kolejności od \"a\" do \"z\", zostaną uporządkowane od \"z\" do \"a\". Jeżeli pliki są sortowane według rozmiaru, wtedy zamiast rosnąco, będą sortowane malejąco."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"incrementally they will be sorted decrementally."
+msgstr ""
+"Określa, czy pliki w nowych oknach będą uporządkowane w odwróconej "
+"kolejności. Na przykład, jeżeli są sortowane po nazwie, wówczas zamiast w "
+"kolejności od \"a\" do \"z\", zostaną uporządkowane od \"z\" do \"a\". "
+"Jeżeli pliki są sortowane według rozmiaru, wtedy zamiast rosnąco, będą "
+"sortowane malejąco."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "If true, icons will be laid out tighter by default in new windows."
-msgstr "Określa, czy domyślnie ikony w nowych oknach mają być ciaśniej rozmieszczone."
+msgstr ""
+"Określa, czy domyślnie ikony w nowych oknach mają być ciaśniej rozmieszczone."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
-msgstr "Określa, czy etykiety mają być wyświetlane obok ikon, zamiast pod nimi."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
+msgstr ""
+"Określa, czy etykiety mają być wyświetlane obok ikon, zamiast pod nimi."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid "If true, new windows will use manual layout by default."
 msgstr "Określa, czy nowe okna będą używały domyślnie ręcznego rozmieszczenia."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory."
-msgstr "Obrazy powyżej tego rozmiaru (w bajtach) nie będą miały miniaturek. Ustawienie to zapobiega tworzeniu miniaturek dla bardzo dużych plików, co może zabierać dużo czasu i pamięci."
+msgid ""
+"Images over this size (in bytes) won't be thumbnailed. The purpose of this "
+"setting is to avoid thumbnailing large images that may take a long time to "
+"load or use lots of memory."
+msgstr ""
+"Obrazy powyżej tego rozmiaru (w bajtach) nie będą miały miniaturek. "
+"Ustawienie to zapobiega tworzeniu miniaturek dla bardzo dużych plików, co "
+"może zabierać dużo czasu i pamięci."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "List of possible captions on icons"
 msgstr "Lista możliwych podpisów na ikonach"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
-msgid "List of x-content/* types for which the user have chosen \"Do Nothing\" in the preference capplet. No prompt will be shown nor will any matching application be started on insertion of media matching these types."
-msgstr "Lista typów x-content/*, dla których użytkownik wybrał opcję \"Nic nie rób\" w aplecie preferencji. Po włożeniu nośnika tego typu nie zostanie wyświetlony monit, ani nie zostanie uruchomiony żaden program."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Do Nothing\" in "
+"the preference capplet. No prompt will be shown nor will any matching "
+"application be started on insertion of media matching these types."
+msgstr ""
+"Lista typów x-content/*, dla których użytkownik wybrał opcję \"Nic nie rób\" "
+"w aplecie preferencji. Po włożeniu nośnika tego typu nie zostanie "
+"wyświetlony monit, ani nie zostanie uruchomiony żaden program."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
-msgid "List of x-content/* types for which the user have chosen \"Open Folder\" in the preferences capplet. A folder window will be opened on insertion of media matching these types."
-msgstr "Lista typów x-content/*, dla których użytkownik wybrał opcję \"Otwórz katalog\" w aplecie preferencji. Po włożeniu nośnika tego typu zostanie otwarte okno katalogu."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Open Folder\" in "
+"the preferences capplet. A folder window will be opened on insertion of "
+"media matching these types."
+msgstr ""
+"Lista typów x-content/*, dla których użytkownik wybrał opcję \"Otwórz katalog"
+"\" w aplecie preferencji. Po włożeniu nośnika tego typu zostanie otwarte "
+"okno katalogu."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
-msgid "List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types."
-msgstr "Lista typów x-content/*, dla których użytkownik wybrał w aplecie preferencji uruchomienie programu. Po włożeniu nośnika tego typu zostanie uruchomiony określony program."
+msgid ""
+"List of x-content/* types for which the user have chosen to start an "
+"application in the preference capplet. The preferred application for the "
+"given type will be started on insertion on media matching these types."
+msgstr ""
+"Lista typów x-content/*, dla których użytkownik wybrał w aplecie preferencji "
+"uruchomienie programu. Po włożeniu nośnika tego typu zostanie uruchomiony "
+"określony program."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -613,8 +854,10 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "Lista typów x-content/*, dla których ustawiono \"Otwórz katalog\""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
-msgstr "Lista typów x-content/*, dla których uruchomiony zostanie preferowany program"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
+msgstr ""
+"Lista typów x-content/*, dla których uruchomiony zostanie preferowany program"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Maximum handled files in a folder"
@@ -625,8 +868,12 @@ msgid "Maximum image size for thumbnailing"
 msgstr "Maksymalny rozmiar obrazka do utworzenia miniaturki"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Name of the Nautilus theme to use. This has been deprecated as of Nautilus 2.2. Please use the icon theme instead."
-msgstr "Nazwa używanego motywu programu Nautilus. Ta opcja jest nieaktualna od wersji 2.2 programu. Zamiast tej opcji należy korzystać z motywu ikon."
+msgid ""
+"Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
+"2.2. Please use the icon theme instead."
+msgstr ""
+"Nazwa używanego motywu programu Nautilus. Ta opcja jest nieaktualna od "
+"wersji 2.2 programu. Zamiast tej opcji należy korzystać z motywu ikon."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "Nautilus handles drawing the desktop"
@@ -646,15 +893,21 @@ msgstr "Nazwa ikony serwerów sieciowych"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid "Never prompt or autorun/autostart programs when media are inserted"
-msgstr "Bez pytania i automatyczniego uruchamiania programów po wsunięciu nośnika"
+msgstr ""
+"Bez pytania i automatyczniego uruchamiania programów po wsunięciu nośnika"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "Only show folders in the tree side pane"
 msgstr "Tylko katalog w panelu bocznym drzewa"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click."
-msgstr "Możliwymi wartościami są \"single\", aby uruchamiać pliki za pomocą pojedynczego kliknięcia lub \"double\", aby uruchamiać pliki za pomocą podwójnego kliknięcia."
+msgid ""
+"Possible values are \"single\" to launch files on a single click, or \"double"
+"\" to launch them on a double click."
+msgstr ""
+"Możliwymi wartościami są \"single\", aby uruchamiać pliki za pomocą "
+"pojedynczego kliknięcia lub \"double\", aby uruchamiać pliki za pomocą "
+"podwójnego kliknięcia."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Put labels beside icons"
@@ -704,20 +957,58 @@ msgid "Side pane view"
 msgstr "Widok panelu bocznego"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
-msgid "Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to \"always\" then always plays the sound, even if the file is on a remote server. If set to \"local_only\" then only plays previews on local file systems. If set to \"never\" then it never previews sound."
-msgstr "Ustawienie wydajności odtwarzania pliku dźwiękowego podczas przesuwania kursora myszy nad ikonami plików. Jeżeli ustawiono \"always\", wtedy zawsze odtwarzany jest dźwięk, nawet jeśli plik jest na zdalnym serwerze. Jeżeli ustawiono \"local_only\", wtedy odtwarzany jest dźwięk z plików lokalnych. Jeżeli ustawiono \"never\", wtedy dźwięk nigdy nie jest odtwarzany."
+msgid ""
+"Speed tradeoff for when to preview a sound file when mousing over a files "
+"icon. If set to \"always\" then always plays the sound, even if the file is "
+"on a remote server. If set to \"local_only\" then only plays previews on "
+"local file systems. If set to \"never\" then it never previews sound."
+msgstr ""
+"Ustawienie wydajności odtwarzania pliku dźwiękowego podczas przesuwania "
+"kursora myszy nad ikonami plików. Jeżeli ustawiono \"always\", wtedy zawsze "
+"odtwarzany jest dźwięk, nawet jeśli plik jest na zdalnym serwerze. Jeżeli "
+"ustawiono \"local_only\", wtedy odtwarzany jest dźwięk z plików lokalnych. "
+"Jeżeli ustawiono \"never\", wtedy dźwięk nigdy nie jest odtwarzany."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
-msgid "Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to \"always\" then always show previews, even if the folder is on a remote server. If set to \"local_only\" then only show previews for local file systems. If set to \"never\" then never bother to read preview data."
-msgstr "Ustawienie wydajności wyświetlania zawartości plików tekstowych w ikonach. Jeżeli ustawiono \"always\", wtedy zawsze wyświetlana jest zawartość, nawet jeśli kaalog jest na zdalnym serwerze. Jeżeli ustawiono \"local_only\", wtedy wyświetlana jest zawartość plików lokalnych. Jeżeli ustawiono \"never\", wtedy nie są odczytywane żadne dane do podglądu."
+msgid ""
+"Speed tradeoff for when to show a preview of text file contents in the "
+"file's icon. If set to \"always\" then always show previews, even if the "
+"folder is on a remote server. If set to \"local_only\" then only show "
+"previews for local file systems. If set to \"never\" then never bother to "
+"read preview data."
+msgstr ""
+"Ustawienie wydajności wyświetlania zawartości plików tekstowych w ikonach. "
+"Jeżeli ustawiono \"always\", wtedy zawsze wyświetlana jest zawartość, nawet "
+"jeśli kaalog jest na zdalnym serwerze. Jeżeli ustawiono \"local_only\", "
+"wtedy wyświetlana jest zawartość plików lokalnych. Jeżeli ustawiono \"never"
+"\", wtedy nie są odczytywane żadne dane do podglądu."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
-msgid "Speed tradeoff for when to show an image file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local_only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail images, just use a generic icon."
-msgstr "Ustawienie wydajności wyświetlania miniatur plików graficznych. Jeżeli ustawiono \"always\", wtedy zawsze wyświetlana jest miniaturka, nawet jeśli katalog jest na zdalnym serwerze. Jeżeli ustawiono \"local_only\", wtedy wyświetlane są miniaturki plików lokalnych. Jeżeli ustawiono \"never\", wtedy zamiast miniaturek wyświetlane są standardowe ikony."
+msgid ""
+"Speed tradeoff for when to show an image file as a thumbnail. If set to "
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"If set to \"local_only\" then only show thumbnails for local file systems. "
+"If set to \"never\" then never bother to thumbnail images, just use a "
+"generic icon."
+msgstr ""
+"Ustawienie wydajności wyświetlania miniatur plików graficznych. Jeżeli "
+"ustawiono \"always\", wtedy zawsze wyświetlana jest miniaturka, nawet jeśli "
+"katalog jest na zdalnym serwerze. Jeżeli ustawiono \"local_only\", wtedy "
+"wyświetlane są miniaturki plików lokalnych. Jeżeli ustawiono \"never\", "
+"wtedy zamiast miniaturek wyświetlane są standardowe ikony."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local_only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts."
-msgstr "Ustawienie wydajności wyświetlania liczby elementów w katalogu. Jeżeli ustawiono \"always\", wtedy zawsze wyświetlany jest licznik elementów, nawet jeśli katalog jest na zdalnym serwerze. Jeżeli ustawiono \"local_only\", wtedy wyświetlane są liczniki dla lokalnego systemu plików. Jeżeli ustawiono \"never\", wtedy elementy nie są liczone."
+msgid ""
+"Speed tradeoff for when to show the number of items in a folder. If set to "
+"\"always\" then always show item counts, even if the folder is on a remote "
+"server. If set to \"local_only\" then only show counts for local file "
+"systems. If set to \"never\" then never bother to compute item counts."
+msgstr ""
+"Ustawienie wydajności wyświetlania liczby elementów w katalogu. Jeżeli "
+"ustawiono \"always\", wtedy zawsze wyświetlany jest licznik elementów, nawet "
+"jeśli katalog jest na zdalnym serwerze. Jeżeli ustawiono \"local_only\", "
+"wtedy wyświetlane są liczniki dla lokalnego systemu plików. Jeżeli ustawiono "
+"\"never\", wtedy elementy nie są liczone."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid "Text Ellipsis Limit"
@@ -728,12 +1019,22 @@ msgid "The default size of an icon for a thumbnail in the icon view."
 msgstr "Domyślny rozmiar ikon miniaturek w widoku ikon."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:112
-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-msgstr "Domyślny porządek sortowania elementów w widoku ikon. Dopuszczalne wartości to: \"name\" (nazwa), \"size\" (rozmiar), \"type\" (rodzaj), \"modification_date\" (data modyfikacji) i \"emblems\" (symbole)."
+msgid ""
+"The default sort-order for items in the icon view. Possible values are \"name"
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
+msgstr ""
+"Domyślny porządek sortowania elementów w widoku ikon. Dopuszczalne wartości "
+"to: \"name\" (nazwa), \"size\" (rozmiar), \"type\" (rodzaj), "
+"\"modification_date\" (data modyfikacji) i \"emblems\" (symbole)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
-msgid "The default sort-order for the items in the list view. Possible values are \"name\", \"size\", \"type\", and \"modification_date\"."
-msgstr "Domyślny porządek sortowania elementów w widoku listy. Dopuszczalne wartości to: \"name\" (nazwa), \"size\" (rozmiar), \"type\" (rodzaj) i \"modification_date\" (data modyfikacji)."
+msgid ""
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
+msgstr ""
+"Domyślny porządek sortowania elementów w widoku listy. Dopuszczalne wartości "
+"to: \"name\" (nazwa), \"size\" (rozmiar), \"type\" (rodzaj) i "
+"\"modification_date\" (data modyfikacji)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
 msgid "The default width of the side pane in new windows."
@@ -744,28 +1045,48 @@ msgid "The font description used for the icons on the desktop."
 msgstr "Opis czcionki używanej dla ikon pulpitu."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:116
-msgid "The format of file dates. Possible values are \"locale\", \"iso\", and \"informal\"."
-msgstr "Format dat plików. Dopuszczalne wartości to \"locale\", \"iso\" i \"informal\"."
+msgid ""
+"The format of file dates. Possible values are \"locale\", \"iso\", and "
+"\"informal\"."
+msgstr ""
+"Format dat plików. Dopuszczalne wartości to \"locale\", \"iso\" i \"informal"
+"\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
 msgstr "Widok paska bocznego wyświetlanego w nowootwartych oknach."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
-msgid "This name can be set if you want a custom name for the computer icon on the desktop."
-msgstr "Ta nazwa może zostać ustawiona, jeżeli potrzebna jest inna nazwa ikony komputera na pulpicie."
+msgid ""
+"This name can be set if you want a custom name for the computer icon on the "
+"desktop."
+msgstr ""
+"Ta nazwa może zostać ustawiona, jeżeli potrzebna jest inna nazwa ikony "
+"komputera na pulpicie."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:119
-msgid "This name can be set if you want a custom name for the home icon on the desktop."
-msgstr "Ta nazwa może zostać ustawiona, jeżeli potrzebna jest inna nazwa ikony katalogu domowego na pulpicie."
+msgid ""
+"This name can be set if you want a custom name for the home icon on the "
+"desktop."
+msgstr ""
+"Ta nazwa może zostać ustawiona, jeżeli potrzebna jest inna nazwa ikony "
+"katalogu domowego na pulpicie."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:120
-msgid "This name can be set if you want a custom name for the network servers icon on the desktop."
-msgstr "Ta nazwa może zostać ustawiona jeżeli potrzebna jest inna nazwa ikony serwerów sieciowych na pulpicie."
+msgid ""
+"This name can be set if you want a custom name for the network servers icon "
+"on the desktop."
+msgstr ""
+"Ta nazwa może zostać ustawiona jeżeli potrzebna jest inna nazwa ikony "
+"serwerów sieciowych na pulpicie."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:121
-msgid "This name can be set if you want a custom name for the trash icon on the desktop."
-msgstr "Ta nazwa może zostać ustawiona jeżeli potrzebna jest inna nazwa ikony kosza na pulpicie."
+msgid ""
+"This name can be set if you want a custom name for the trash icon on the "
+"desktop."
+msgstr ""
+"Ta nazwa może zostać ustawiona jeżeli potrzebna jest inna nazwa ikony kosza "
+"na pulpicie."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
 msgid "Trash icon visible on desktop"
@@ -788,12 +1109,26 @@ msgid "What to do with executable text files when activated"
 msgstr "Czynność po aktywacji wykonywalnych plików tekstowych"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files."
-msgstr "Co robić w wykonywalnymi plikami tekstowymi kiedy są aktywowane (pojedynczym lub podwójnym kliknięciem). Dopuszczalne wartości: \"launch\" - uruchomienie jako program, \"ask\" - pytanie co zrobić poprzez okno dialogowe, \"display\" - wyświetlanie jako pliki tekstowe."
+msgid ""
+"What to do with executable text files when they are activated (single or "
+"double clicked). Possible values are \"launch\" to launch them as programs, "
+"\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
+"text files."
+msgstr ""
+"Co robić w wykonywalnymi plikami tekstowymi kiedy są aktywowane (pojedynczym "
+"lub podwójnym kliknięciem). Dopuszczalne wartości: \"launch\" - uruchomienie "
+"jako program, \"ask\" - pytanie co zrobić poprzez okno dialogowe, \"display"
+"\" - wyświetlanie jako pliki tekstowe."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list_view\", \"icon_view\" and \"compact_view\"."
-msgstr "Przeglądarka używana do przeglądania zawartości katalogu, jeśli nie wybrano innego widoku dla danego katalogu. Dopuszczalne wartości to \"list_view\", \"icon_view\" oraz \"compact_view\"."
+msgid ""
+"When a folder is visited this viewer is used unless you have selected "
+"another view for that particular folder. Possible values are \"list_view\", "
+"\"icon_view\" and \"compact_view\"."
+msgstr ""
+"Przeglądarka używana do przeglądania zawartości katalogu, jeśli nie wybrano "
+"innego widoku dla danego katalogu. Dopuszczalne wartości to \"list_view\", "
+"\"icon_view\" oraz \"compact_view\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "When to show number of items in a folder"
@@ -821,7 +1156,8 @@ msgstr "Określa, czy zostało ustawione inne domyślne tło panelu bocznego."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "Określa, czy żądać potwierdzenia przy usuwaniu plików lub opróżnianiu kosza"
+msgstr ""
+"Określa, czy żądać potwierdzenia przy usuwaniu plików lub opróżnianiu kosza"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Whether to automatically mount media"
@@ -829,7 +1165,9 @@ msgstr "Określa, czy automatycznie montować nośniki"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:137
 msgid "Whether to automatically open a folder for automounted media"
-msgstr "Określa, czy automatycznie otwierać katalog dla automatycznie zamontowanego nośnika"
+msgstr ""
+"Określa, czy automatycznie otwierać katalog dla automatycznie zamontowanego "
+"nośnika"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:138
 msgid "Whether to enable immediate deletion"
@@ -837,11 +1175,14 @@ msgstr "Określa, czy włączyć natychmiastowe usuwanie"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:139
 msgid "Whether to enable tabs in Nautilus browser windows"
-msgstr "Określa, czy włączyć obsługę kart w oknach przeglądania programu Nautilus"
+msgstr ""
+"Określa, czy włączyć obsługę kart w oknach przeglądania programu Nautilus"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:140
 msgid "Whether to preview sounds when mousing over an icon"
-msgstr "Określa, czy odtwarzać dźwięki przy przesuwaniu kursora myszy nad ikonami plików dźwiękowych"
+msgstr ""
+"Określa, czy odtwarzać dźwięki przy przesuwaniu kursora myszy nad ikonami "
+"plików dźwiękowych"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:141
 msgid "Whether to show backup files"
@@ -935,8 +1276,11 @@ msgid "You have just inserted a digital audio player."
 msgstr "Wsunięto cyfrowy odtwarzacz muzyki."
 
 #: ../libnautilus-private/nautilus-autorun.c:918
-msgid "You have just inserted a medium with software intended to be automatically started."
-msgstr "Wsunięto nośnik z oprogramowaniem, które może być uruchomione automatycznie."
+msgid ""
+"You have just inserted a medium with software intended to be automatically "
+"started."
+msgstr ""
+"Wsunięto nośnik z oprogramowaniem, które może być uruchomione automatycznie."
 
 #. fallback to generic greeting
 #: ../libnautilus-private/nautilus-autorun.c:921
@@ -949,8 +1293,12 @@ msgstr "Proszę wybrać program do uruchomienia."
 
 #: ../libnautilus-private/nautilus-autorun.c:932
 #, c-format
-msgid "Select how to open \"%s\" and whether to perform this action in the future for other media of type \"%s\"."
-msgstr "Proszę określić jak otwierać nośnik\"%s\" i czy wykonywać te działanie w przyszłości dla innych nośników typu \"%s\"."
+msgid ""
+"Select how to open \"%s\" and whether to perform this action in the future "
+"for other media of type \"%s\"."
+msgstr ""
+"Proszę określić jak otwierać nośnik\"%s\" i czy wykonywać te działanie w "
+"przyszłości dla innych nośników typu \"%s\"."
 
 #: ../libnautilus-private/nautilus-autorun.c:954
 msgid "_Always perform this action"
@@ -1119,12 +1467,19 @@ msgid "You cannot move the volume \"%s\" to the trash."
 msgstr "Nie można przenieść woluminu \"%s\" do kosza."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:111
-msgid "If you want to eject the volume, please use \"Eject\" in the popup menu of the volume."
-msgstr "Aby wysunąć wolumin należy użyć pozycji \"Wysuń\" w menu podręcznym woluminu."
+msgid ""
+"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"the volume."
+msgstr ""
+"Aby wysunąć wolumin należy użyć pozycji \"Wysuń\" w menu podręcznym woluminu."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
-msgid "If you want to unmount the volume, please use \"Unmount Volume\" in the popup menu of the volume."
-msgstr "Aby odmontować wolumin należy użyć pozycji \"Odmontuj wolumin\" w menu podręcznym woluminu."
+msgid ""
+"If you want to unmount the volume, please use \"Unmount Volume\" in the "
+"popup menu of the volume."
+msgstr ""
+"Aby odmontować wolumin należy użyć pozycji \"Odmontuj wolumin\" w menu "
+"podręcznym woluminu."
 
 #: ../libnautilus-private/nautilus-dnd.c:748
 msgid "_Move Here"
@@ -1168,8 +1523,10 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Niestety słowo kluczowe dla nowego symbolu nie może być puste."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "Niestety słowa kluczowe symboli mogą zawierać tylko litery, spacje i cyfry."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"Niestety słowa kluczowe symboli mogą zawierać tylko litery, spacje i cyfry."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1402,8 +1759,12 @@ msgstr "Na pewno trwale usunąć element \"%B\" z kosza?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1211
 #, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items from the trash?"
+msgid ""
+"Are you sure you want to permanently delete the %'d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items from the "
+"trash?"
 msgstr[0] "Na pewno trwale usunąć %'d zaznaczony element z kosza?"
 msgstr[1] "Na pewno trwale usunąć %'d zaznaczone elementy z kosza?"
 msgstr[2] "Na pewno trwale usunąć %'d zaznaczonych elementów z kosza?"
@@ -1418,14 +1779,17 @@ msgid "Empty all of the items from the trash?"
 msgstr "Opróżnić kosz ze wszystkich elementów?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1245
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "Jeżeli zostanie wybrane opróżnienie kosza, wszystkie elementy zostaną z niego trwale usunięte. Można także usuwać elementy pojedynczo."
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Jeżeli zostanie wybrane opróżnienie kosza, wszystkie elementy zostaną z "
+"niego trwale usunięte. Można także usuwać elementy pojedynczo."
 
 #. Empty Trash menu item
 #: ../libnautilus-private/nautilus-file-operations.c:1250
 #: ../libnautilus-private/nautilus-file-operations.c:2076
-#: ../src/nautilus-places-sidebar.c:2035
-#: ../src/nautilus-trash-bar.c:125
+#: ../src/nautilus-places-sidebar.c:2035 ../src/nautilus-trash-bar.c:125
 msgid "Empty _Trash"
 msgstr "Opróżnij k_osz"
 
@@ -1436,7 +1800,8 @@ msgstr "Na pewno trwale usunąć element \"%B\"?"
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "Na pewno trwale usunąć %'d zaznaczony element?"
 msgstr[1] "Na pewno trwale usunąć %'d zaznaczone elementy?"
 msgstr[2] "Na pewno trwale usunąć %'d zaznaczonych elementów?"
@@ -1470,14 +1835,20 @@ msgid "Error while deleting."
 msgstr "Błąd podczas usuwania."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1404
-msgid "Files in the folder \"%B\" cannot be deleted because you do not have permissions to see them."
-msgstr "Nie można usunąć plików z katalogu \"%B\": brak uprawnień do ich wyświetlenia."
+msgid ""
+"Files in the folder \"%B\" cannot be deleted because you do not have "
+"permissions to see them."
+msgstr ""
+"Nie można usunąć plików z katalogu \"%B\": brak uprawnień do ich "
+"wyświetlenia."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
-msgstr "Wystąpił błąd podczas pobierania informacji o plikach w katalogu \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
+msgstr ""
+"Wystąpił błąd podczas pobierania informacji o plikach w katalogu \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
 #: ../libnautilus-private/nautilus-file-operations.c:3313
@@ -1485,7 +1856,9 @@ msgid "_Skip files"
 msgstr "_Pomiń pliki"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1437
-msgid "The folder \"%B\" cannot be deleted because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"read it."
 msgstr "Nie można usunąć plików z katalogu \"%B\": brak uprawnień do odczytu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
@@ -1535,8 +1908,12 @@ msgid "Do you want to empty the trash before you unmount?"
 msgstr "Opróżnić kosz przed odmontowaniem?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2068
-msgid "In order to regain the free space on this volume the trash must be emptied. All trashed items on the volume will be permanently lost."
-msgstr "Kosz musi zostać opróżniony, aby odzyskać wolne miejsce na tym urządzeniu. Wszystkie elementy w koszu zostaną bezpowrotnie utracone. "
+msgid ""
+"In order to regain the free space on this volume the trash must be emptied. "
+"All trashed items on the volume will be permanently lost."
+msgstr ""
+"Kosz musi zostać opróżniony, aby odzyskać wolne miejsce na tym urządzeniu. "
+"Wszystkie elementy w koszu zostaną bezpowrotnie utracone. "
 
 #: ../libnautilus-private/nautilus-file-operations.c:2074
 msgid "Do _not Empty Trash"
@@ -1597,15 +1974,23 @@ msgid "Error while moving files to trash."
 msgstr "Błąd podczas przenoszenia plików do kosza."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2359
-msgid "Files in the folder \"%B\" cannot be handled because you do not have permissions to see them."
-msgstr "Pliki w katalogu \"%B\" nie mogą być obsłużone: brak uprawnień do ich wyświetlenia."
+msgid ""
+"Files in the folder \"%B\" cannot be handled because you do not have "
+"permissions to see them."
+msgstr ""
+"Pliki w katalogu \"%B\" nie mogą być obsłużone: brak uprawnień do ich "
+"wyświetlenia."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2398
-msgid "The folder \"%B\" cannot be handled because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be handled because you do not have permissions to "
+"read it."
 msgstr "Katalog \"%B\" nie może być obsłużony: brak uprawnień do jego odczytu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2475
-msgid "The file \"%B\" cannot be handled because you do not have permissions to read it."
+msgid ""
+"The file \"%B\" cannot be handled because you do not have permissions to "
+"read it."
 msgstr "Plik \"%B\" nie może być obsłużony: brak uprawnień do jego odczytu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
@@ -1632,8 +2017,12 @@ msgid "The destination is not a folder."
 msgstr "Miejsce docelowe nie jest katalogiem."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2654
-msgid "There is not enough space on the destination. Try to remove files to make space."
-msgstr "Brak wystarczającej ilości miejsca w miejscu docelowym. Proszę spróbować usunąć pliki, aby zwolnić więcej miejsca."
+msgid ""
+"There is not enough space on the destination. Try to remove files to make "
+"space."
+msgstr ""
+"Brak wystarczającej ilości miejsca w miejscu docelowym. Proszę spróbować "
+"usunąć pliki, aby zwolnić więcej miejsca."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2656
 #, c-format
@@ -1713,20 +2102,31 @@ msgid "%S of %S — %T left (%S/sec)"
 msgstr "%S z %S — pozostało %T (%S/s)"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3177
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to create it in the destination."
-msgstr "Katalog \"%B\" nie może zostać skopiowany: brak uprawnień do jego utworzenia w miejscu docelowym."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"create it in the destination."
+msgstr ""
+"Katalog \"%B\" nie może zostać skopiowany: brak uprawnień do jego utworzenia "
+"w miejscu docelowym."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3180
 msgid "There was an error creating the folder \"%B\"."
 msgstr "Wystąpił błąd podczas tworzenia katalogu \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3301
-msgid "Files in the folder \"%B\" cannot be copied because you do not have permissions to see them."
-msgstr "Pliki w katalogu \"%B\" nie mogą zostać skopiowane: brak uprawnień do ich wyświetlenia."
+msgid ""
+"Files in the folder \"%B\" cannot be copied because you do not have "
+"permissions to see them."
+msgstr ""
+"Pliki w katalogu \"%B\" nie mogą zostać skopiowane: brak uprawnień do ich "
+"wyświetlenia."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3346
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to read it."
-msgstr "Katalog \"%B\" nie może zostać skopiowany: brak uprawnień do jego odczytu."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"read it."
+msgstr ""
+"Katalog \"%B\" nie może zostać skopiowany: brak uprawnień do jego odczytu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3389
 #: ../libnautilus-private/nautilus-file-operations.c:3909
@@ -1773,12 +2173,21 @@ msgstr "Folder docelowy znajduje się wewnątrz folderu źródłowego."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3807
 #: ../libnautilus-private/nautilus-file-operations.c:4378
-msgid "A folder named \"%B\" already exists.  Do you want to merge the source folder?"
-msgstr "Katalog o nazwie \"%B\" już istnieje. Połączyć go z katalogiem źródłowym?"
+msgid ""
+"A folder named \"%B\" already exists.  Do you want to merge the source "
+"folder?"
+msgstr ""
+"Katalog o nazwie \"%B\" już istnieje. Połączyć go z katalogiem źródłowym?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3809
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied."
-msgstr "Katalog źródłowy już istnieje w \"%B\". Połączenie będzie poprzedzone zapytaniem o potwierdzenie przed zamianą jakichkolwiek plików, które mogą być w konflikcie z kopiowanymi plikami."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being copied."
+msgstr ""
+"Katalog źródłowy już istnieje w \"%B\". Połączenie będzie poprzedzone "
+"zapytaniem o potwierdzenie przed zamianą jakichkolwiek plików, które mogą "
+"być w konflikcie z kopiowanymi plikami."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3814
 #: ../libnautilus-private/nautilus-file-operations.c:4385
@@ -1788,8 +2197,12 @@ msgstr "Katalog o nazwie \"%B\" już istnieje. Zastąpić go?"
 #: ../libnautilus-private/nautilus-file-operations.c:3816
 #: ../libnautilus-private/nautilus-file-operations.c:4387
 #, c-format
-msgid "The folder already exists in \"%F\".  Replacing it will remove all files in the folder."
-msgstr "Katalog już istnieje w \"%F\". Zamiana spowoduje usunięcie wszystkich plików w katalogu."
+msgid ""
+"The folder already exists in \"%F\".  Replacing it will remove all files in "
+"the folder."
+msgstr ""
+"Katalog już istnieje w \"%F\". Zamiana spowoduje usunięcie wszystkich plików "
+"w katalogu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3821
 #: ../libnautilus-private/nautilus-file-operations.c:4392
@@ -1799,8 +2212,10 @@ msgstr "Plik o nazwie \"%B\" już istnieje. Zastąpić go?"
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr "Plik już istnieje w \"%F\". Zamiana spowoduje nadpisanie jego zawartości."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgstr ""
+"Plik już istnieje w \"%F\". Zamiana spowoduje nadpisanie jego zawartości."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3913
 #, c-format
@@ -1825,8 +2240,14 @@ msgstr[1] "Przygotowywanie do przeniesienia %'d plików"
 msgstr[2] "Przygotowywanie do przeniesienia %'d plików"
 
 #: ../libnautilus-private/nautilus-file-operations.c:4380
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being moved."
-msgstr "Katalog źródłowy już istnieje w \"%B\". Połączenie będzie poprzedzone zapytaniem o potwierdzenie przed zamianą jakichkolwiek plików w katalogu, które mogą być w konflikcie z przenoszonymi plikami."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being moved."
+msgstr ""
+"Katalog źródłowy już istnieje w \"%B\". Połączenie będzie poprzedzone "
+"zapytaniem o potwierdzenie przed zamianą jakichkolwiek plików w katalogu, "
+"które mogą być w konflikcie z przenoszonymi plikami."
 
 #: ../libnautilus-private/nautilus-file-operations.c:4470
 #, c-format
@@ -2367,8 +2788,7 @@ msgid "Computer"
 msgstr "Komputer"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:571
-#: ../src/nautilus-places-sidebar.c:483
-#: ../src/nautilus-trash-bar.c:121
+#: ../src/nautilus-places-sidebar.c:483 ../src/nautilus-trash-bar.c:121
 msgid "Trash"
 msgstr "Kosz"
 
@@ -2401,7 +2821,8 @@ msgstr "Nie można użyć dowiązania, bo nie ma ono przypisanego celu."
 #: ../libnautilus-private/nautilus-mime-actions.c:605
 #, c-format
 msgid "This link cannot be used, because its target \"%s\" doesn't exist."
-msgstr "Nie można użyć dowiązania, bo jego element docelowy \"%s\" nie istnieje."
+msgstr ""
+"Nie można użyć dowiązania, bo jego element docelowy \"%s\" nie istnieje."
 
 #. name, stock id
 #. label, accelerator
@@ -2504,8 +2925,13 @@ msgid "Could not set as default application"
 msgstr "Nie można ustawić jako domyślny program"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "Domyślna"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Domyślna\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Domyślne"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
 msgid "Icon"
@@ -2516,14 +2942,23 @@ msgid "Could not remove application"
 msgstr "Nie można usunąć programu"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "Nie zaznaczono żadnego programu"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Nie zaznaczono żadnego programu\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Nie wybrano aplikacji"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, c-format
+#, fuzzy, c-format
 msgid "%s document"
-msgstr "Dokument %s"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Dokument %s\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"dokument %s"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:910
@@ -2531,9 +2966,13 @@ msgid "Unknown"
 msgstr "Nieznane"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "Proszę wybrać program do otwierania pliku %s i innych plików typu \"%s\""
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Proszę wybrać program do otwierania pliku %s i innych plików typu \"%s\"\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Wybierz aplikację do otwarcia %s i innych plików typu \"%s\""
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2542,8 +2981,13 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "Otwieranie wszystkich plików typu \"%s\" za pomocą:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#, fuzzy
 msgid "Could not run application"
-msgstr "Nie można uruchomić programu"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Nie można uruchomić programu\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Nie można uruchomić aplikacji"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
 #, c-format
@@ -2551,8 +2995,13 @@ msgid "Could not find '%s'"
 msgstr "Nie można odnaleźć \"%s\""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#, fuzzy
 msgid "Could not find application"
-msgstr "Nie można odnaleźć programu"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Nie można odnaleźć programu\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Nie można odnaleźć aplikacji"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2560,31 +3009,58 @@ msgid "Could not add application to the application database: %s"
 msgstr "Nie można dodać programu do bazy: %s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
+#, fuzzy
 msgid "Could not add application"
-msgstr "Nie można dodać programu"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Nie można dodać programu\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Nie można dodać aplikacji"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "Wybór programu"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Wybór programu\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Wybór aplikacji"
 
+# #-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#
 # wd: Nazwa karty we właściwosciach pliku
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5104
+#, fuzzy
 msgid "Open With"
-msgstr "Otwieranie"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Otwieranie\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Otwarcie z"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Proszę zaznaczyć program, aby wyświetlić jego opis."
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Proszę zaznaczyć program, aby wyświetlić jego opis.\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Wybierz aplikację aby zobaczyć jej opis."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "_Własne polecenie"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"_Własne polecenie\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Własne pole_cenie"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Przeglądaj..."
 
+#. #-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2596,19 +3072,33 @@ msgid "_Open"
 msgstr "_Otwórz"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "Otwieranie %s i innych plików typu \"%s\" za pomocą:"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Otwieranie %s i innych plików typu \"%s\" za pomocą:\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Otwarcie %s i innych plików typu \"%s\" za pomocą:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#, fuzzy
 msgid "_Add"
-msgstr "Dod_aj:"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Dod_aj:\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"_Dodaj"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "Dodaj program"
+msgstr ""
+"#-#-#-#-#  pl.po (Nautilus)  #-#-#-#-#\n"
+"Dodaj program\n"
+"#-#-#-#-#  pl.po (eel)  #-#-#-#-#\n"
+"Dodawanie aplikacji"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -2617,8 +3107,12 @@ msgstr "Otwarcie nie powiodło się. Czy wybrać inny program?"
 #: ../libnautilus-private/nautilus-program-choosing.c:81
 #: ../libnautilus-private/nautilus-program-choosing.c:112
 #, c-format
-msgid "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" locations."
-msgstr "Za pomocą \"%s\" nie można otworzyć \"%s\", ponieważ \"%s\" nie ma dostępu do położenia \"%s\"."
+msgid ""
+"\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
+"locations."
+msgstr ""
+"Za pomocą \"%s\" nie można otworzyć \"%s\", ponieważ \"%s\" nie ma dostępu "
+"do położenia \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:86
 msgid "Open Failed, would you like to choose another action?"
@@ -2627,16 +3121,28 @@ msgstr "Otwarcie nie powiodło się, wybrać inne działanie?"
 #: ../libnautilus-private/nautilus-program-choosing.c:87
 #: ../libnautilus-private/nautilus-program-choosing.c:119
 #, c-format
-msgid "The default action cannot open \"%s\" because it cannot access files at \"%s\" locations."
-msgstr "Nie można otworzyć \"%s\"za pomocą domyślnej akcji, ponieważ nie ma dostępu do położenia \"%s\"."
+msgid ""
+"The default action cannot open \"%s\" because it cannot access files at \"%s"
+"\" locations."
+msgstr ""
+"Nie można otworzyć \"%s\"za pomocą domyślnej akcji, ponieważ nie ma dostępu "
+"do położenia \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
-msgid "No other applications are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Brak innych programów do wyświetlenia tego pliku. Być może otwarcie go będzie możliwe po skopiowaniu go na lokalny komputer."
+msgid ""
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
+msgstr ""
+"Brak innych programów do wyświetlenia tego pliku. Być może otwarcie go "
+"będzie możliwe po skopiowaniu go na lokalny komputer."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:121
-msgid "No other actions are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Brak innych czynności do wyświetlenia tego pliku. Być może otwarcie będzie możliwe po skopiowaniu go na lokalny komputer."
+msgid ""
+"No other actions are available to view this file.  If you copy this file "
+"onto your computer, you may be able to open it."
+msgstr ""
+"Brak innych czynności do wyświetlenia tego pliku. Być może otwarcie będzie "
+"możliwe po skopiowaniu go na lokalny komputer."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:360
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -2657,12 +3163,20 @@ msgid "This drop target only supports local files."
 msgstr "Upuszczanie jest obsługiwane tylko dla plików lokalnych."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "Aby otworzyć plik dostępny zdalnie, należy skopiować go do katalogu lokalnego i ponownie przeciągnąć."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"Aby otworzyć plik dostępny zdalnie, należy skopiować go do katalogu "
+"lokalnego i ponownie przeciągnąć."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:410
-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened."
-msgstr "Aby otworzyć plik dostępny zdalnie, należy skopiować go do katalogu lokalnego i ponownie przeciągnąć. Upuszczone pliki lokalne zostały już otwarte."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them "
+"again. The local files you dropped have already been opened."
+msgstr ""
+"Aby otworzyć plik dostępny zdalnie, należy skopiować go do katalogu "
+"lokalnego i ponownie przeciągnąć. Upuszczone pliki lokalne zostały już "
+"otwarte."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:439
 msgid "Details: "
@@ -2723,10 +3237,12 @@ msgid "Autorun Prompt"
 msgstr "Pytanie o automatyczne uruchamianie"
 
 #. tooltip
-#: ../nautilus-computer.desktop.in.in.h:1
-#: ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "Przeglądanie wszystkich lokalnych i zdalnych dysków oraz katalogów dostępnych z tego komputera"
+#: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"Przeglądanie wszystkich lokalnych i zdalnych dysków oraz katalogów "
+"dostępnych z tego komputera"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
@@ -2736,14 +3252,12 @@ msgstr "Zmiana zachowania i wyglądu okien menedżera plików"
 msgid "File Management"
 msgstr "Zarządzanie plikami"
 
-#: ../nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1341
+#: ../nautilus-home.desktop.in.in.h:1 ../src/file-manager/fm-tree-view.c:1341
 msgid "Home Folder"
 msgstr "Katalog domowy"
 
 #. tooltip
-#: ../nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-window-menus.c:858
+#: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:858
 msgid "Open your personal folder"
 msgstr "Otwiera katalog osobisty"
 
@@ -2772,12 +3286,16 @@ msgid "Nautilus metafile factory"
 msgstr "Generator metaplików Nautilusa"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
-msgstr "Działania programu Nautilus, które mogą być wykonywane przy uruchomieniu z wiersza poleceń"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
+msgstr ""
+"Działania programu Nautilus, które mogą być wykonywane przy uruchomieniu z "
+"wiersza poleceń"
 
 #: ../src/Nautilus_shell.server.in.h:6
 msgid "Produces metafile objects for accessing Nautilus metadata"
-msgstr "Tworzy obiekty metaplików, dające dostęp do metadanych programu Nautilus"
+msgstr ""
+"Tworzy obiekty metaplików, dające dostęp do metadanych programu Nautilus"
 
 #: ../src/file-manager/fm-desktop-icon-view.c:617
 msgid "Background"
@@ -2812,8 +3330,10 @@ msgstr "Zmień _tło pulpitu"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
-msgstr "Wyświetla okno, które pozwala na ustawienie deseniu lub koloru tła pulpitu"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+"Wyświetla okno, które pozwala na ustawienie deseniu lub koloru tła pulpitu"
 
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:706
@@ -2965,7 +3485,8 @@ msgstr "%s%s, %s"
 #: ../src/file-manager/fm-directory-view.c:2313
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
-msgstr "Katalog \"%s\" zawiera więcej plików, niż program Nautilus może obsłużyć."
+msgstr ""
+"Katalog \"%s\" zawiera więcej plików, niż program Nautilus może obsłużyć."
 
 #: ../src/file-manager/fm-directory-view.c:2319
 msgid "Some files will not be displayed."
@@ -2996,21 +3517,32 @@ msgstr "Utworzenie dokumentu z szablonu \"%s\""
 
 #: ../src/file-manager/fm-directory-view.c:5517
 msgid "All executable files in this folder will appear in the Scripts menu."
-msgstr "Wszystkie pliki wykonywalne umieszczone w tym katalogu pojawią się w menu Skrypty."
+msgstr ""
+"Wszystkie pliki wykonywalne umieszczone w tym katalogu pojawią się w menu "
+"Skrypty."
 
 #: ../src/file-manager/fm-directory-view.c:5519
-msgid "Choosing a script from the menu will run that script with any selected items as input."
-msgstr "Wybranie skryptu z menu spowoduje uruchomienie go, wraz z przekazaniem na wejściezaznaczonych elementów."
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+"Wybranie skryptu z menu spowoduje uruchomienie go, wraz z przekazaniem na "
+"wejściezaznaczonych elementów."
 
 #: ../src/file-manager/fm-directory-view.c:5521
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
-"When executed from a local folder, scripts will be passed the selected file names. When executed from a remote folder (e.g. a folder showing web or ftp content), scripts will be passed no parameters.\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
 "\n"
-"In all cases, the following environment variables will be set by Nautilus, which the scripts may use:\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected files (only if local)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
 "\n"
@@ -3018,15 +3550,22 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"Wszystkie pliki wykonywalne umieszczone w tym katalogu pojawią się w menu Skrypty. Wybranie skryptu z menu spowoduje uruchomienie go.\n"
+"Wszystkie pliki wykonywalne umieszczone w tym katalogu pojawią się w menu "
+"Skrypty. Wybranie skryptu z menu spowoduje uruchomienie go.\n"
 "\n"
-"Przy uruchomieniu z lokalnego katalogu skryptowi przekazane zostaną nazwy zaznaczonych plików. Przy uruchomieniu ze zdalnego katalogu (np. przy wyświetlaniu zawartości serwera WWW lub FTP) nie będą przekazane żadne argumenty.\n"
+"Przy uruchomieniu z lokalnego katalogu skryptowi przekazane zostaną nazwy "
+"zaznaczonych plików. Przy uruchomieniu ze zdalnego katalogu (np. przy "
+"wyświetlaniu zawartości serwera WWW lub FTP) nie będą przekazane żadne "
+"argumenty.\n"
 "\n"
-"W każdym przypadku skrypt może wykorzystać zmienne środowiskowe, które zostaną ustawione przez przed jego uruchomieniem przez Nautilusa:\n"
+"W każdym przypadku skrypt może wykorzystać zmienne środowiskowe, które "
+"zostaną ustawione przez przed jego uruchomieniem przez Nautilusa:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: pełne ścieżki zaznaczonych plików, rozdzielone znakami końca wiersza (tylko w przypadku lokalnych katalogów)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: pełne ścieżki zaznaczonych plików, "
+"rozdzielone znakami końca wiersza (tylko w przypadku lokalnych katalogów)\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: URI zaznaczonych plików, rozdzielone znakami końca wiersza\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: URI zaznaczonych plików, rozdzielone znakami "
+"końca wiersza\n"
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: URI bieżącego położenia\n"
 "\n"
@@ -3047,18 +3586,27 @@ msgstr "\"%s\" zostanie skopiowany po wybraniu polecenia Wklej"
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
-msgstr[0] "%'d zaznaczony element zostanie przeniesiony po wybraniu polecenia Wklej"
-msgstr[1] "%d zaznaczone elementy zostaną przeniesione po wybraniu polecenia Wklej"
-msgstr[2] "%'d zaznaczonych elementów zostanie przeniesionych po wybraniu polecenia Wklej"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"%'d zaznaczony element zostanie przeniesiony po wybraniu polecenia Wklej"
+msgstr[1] ""
+"%d zaznaczone elementy zostaną przeniesione po wybraniu polecenia Wklej"
+msgstr[2] ""
+"%'d zaznaczonych elementów zostanie przeniesionych po wybraniu polecenia "
+"Wklej"
 
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "%'d zaznaczony element zostanie skopiowany po wybraniu polecenia Wklej"
-msgstr[1] "%'d zaznaczone elementy zostaną skopiowane po wybraniu polecenia Wklej"
-msgstr[2] "%'d zaznaczonych elementów zostanie skopiowanych po wybraniu polecenia Wklej"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"%'d zaznaczony element zostanie skopiowany po wybraniu polecenia Wklej"
+msgstr[1] ""
+"%'d zaznaczone elementy zostaną skopiowane po wybraniu polecenia Wklej"
+msgstr[2] ""
+"%'d zaznaczonych elementów zostanie skopiowanych po wybraniu polecenia Wklej"
 
 #: ../src/file-manager/fm-directory-view.c:5767
 #: ../src/file-manager/fm-tree-view.c:1013
@@ -3099,7 +3647,8 @@ msgstr "Otwórz za po_mocą"
 
 #: ../src/file-manager/fm-directory-view.c:6571
 msgid "Choose a program with which to open the selected item"
-msgstr "Proszę wybrać program, za pomocą którego ma zostać otwarty zaznaczony element"
+msgstr ""
+"Proszę wybrać program, za pomocą którego ma zostać otwarty zaznaczony element"
 
 #. name, stock id
 #. label, accelerator
@@ -3209,7 +3758,8 @@ msgstr "Otwórz _za pomocą innego programu..."
 #: ../src/file-manager/fm-directory-view.c:6620
 #: ../src/file-manager/fm-directory-view.c:6624
 msgid "Choose another application with which to open the selected item"
-msgstr "Wybór innego programu, za pomocą którego można otworzyć zaznaczony element"
+msgstr ""
+"Wybór innego programu, za pomocą którego można otworzyć zaznaczony element"
 
 #. name, stock id
 #. label, accelerator
@@ -3227,7 +3777,8 @@ msgstr "Wyświetla katalog zawierający skrypty pojawiające się w tym menu"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6636
 msgid "Prepare the selected files to be moved with a Paste command"
-msgstr "Przygotowuje zaznaczone pliki do przeniesienia za pomocą polecenia Wklej"
+msgstr ""
+"Przygotowuje zaznaczone pliki do przeniesienia za pomocą polecenia Wklej"
 
 #. name, stock id
 #. label, accelerator
@@ -3241,7 +3792,9 @@ msgstr "Przygotowuje zaznaczone pliki do skopiowania za pomocą polecenia Wklej"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6644
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocą polecenia Skopiuj lub Wytnij"
+msgstr ""
+"Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocą polecenia Skopiuj "
+"lub Wytnij"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3255,8 +3808,12 @@ msgstr "Wklej do _katalogu"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6650
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocą polecenia Skopiuj lub Wytnij do wybranego katalogu"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocą polecenia Skopiuj "
+"lub Wytnij do wybranego katalogu"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6654
@@ -3364,7 +3921,9 @@ msgstr "Przywróć _domyślne ustawienia widoku"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6700
 msgid "Reset sorting order and zoom level to match preferences for this view"
-msgstr "Przywraca porządek sortowania i powiększenie zgodne z preferencjami bieżącego widoku"
+msgstr ""
+"Przywraca porządek sortowania i powiększenie zgodne z preferencjami "
+"bieżącego widoku"
 
 #. name, stock id
 #. label, accelerator
@@ -3509,8 +4068,12 @@ msgstr "Przygotowuje katalog do skopiowania za pomocą polecenia Wklej"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6776
-msgid "Move or copy files previously selected by a Cut or Copy command into this folder"
-msgstr "Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocą polecenia Wytnij lub Skopiuj do tego katalogu"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into this "
+"folder"
+msgstr ""
+"Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocą polecenia Wytnij "
+"lub Skopiuj do tego katalogu"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6781
@@ -3715,7 +4278,9 @@ msgstr "Przeciąganie i upuszczanie obiektów nie jest obsługiwane."
 
 #: ../src/file-manager/fm-directory-view.c:9268
 msgid "Drag and drop is only supported on local file systems."
-msgstr "Przeciąganie i upuszczanie obiektów jest obsługiwane tylko w lokalnym systemie plików."
+msgstr ""
+"Przeciąganie i upuszczanie obiektów jest obsługiwane tylko w lokalnym "
+"systemie plików."
 
 #: ../src/file-manager/fm-directory-view.c:9333
 #: ../src/file-manager/fm-directory-view.c:9438
@@ -3748,7 +4313,8 @@ msgstr "Polecenie"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Brak wymaganych uprawnień do wyświetlenia zawartości \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -3767,13 +4333,18 @@ msgstr "Nie można wyświetlić zawartości katalogu."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "Nazwa \"%s\" została już użyta w tym katalogu. Proszę użyć innej nazwy."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"Nazwa \"%s\" została już użyta w tym katalogu. Proszę użyć innej nazwy."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "Katalog nie zawiera \"%s\". Może element ten został właśnie przeniesiony lub usunięty?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+"Katalog nie zawiera \"%s\". Może element ten został właśnie przeniesiony lub "
+"usunięty?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
@@ -3782,8 +4353,12 @@ msgstr "Brak uprawnień potrzebnych do zmiany nazwy \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:118
 #, c-format
-msgid "The name \"%s\" is not valid because it contains the character \"/\". Please use a different name."
-msgstr "Nazwa \"%s\" nie jest poprawna, ponieważ zawiera znak \"/\". Użyj innej nazwy."
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+"Nazwa \"%s\" nie jest poprawna, ponieważ zawiera znak \"/\". Użyj innej "
+"nazwy."
 
 #: ../src/file-manager/fm-error-reporting.c:122
 #, c-format
@@ -3802,7 +4377,8 @@ msgstr "Nie można zmienić nazwy elementu."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Brak uprawnień do zmiany grupy \"%s\"."
 
 #. fall through
@@ -3920,7 +4496,9 @@ msgstr "Uporządkuj w_edług nazwy"
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1495
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "Przemieszcza ikony, aby lepiej dopasować ich ikon do okna i uniknąć nakładania"
+msgstr ""
+"Przemieszcza ikony, aby lepiej dopasować ich ikon do okna i uniknąć "
+"nakładania"
 
 #. name, stock id
 #. label, accelerator
@@ -4032,8 +4610,7 @@ msgid "(Empty)"
 msgstr "(Pusty)"
 
 #: ../src/file-manager/fm-list-model.c:375
-#: ../src/file-manager/fm-tree-model.c:1266
-#: ../src/nautilus-window-slot.c:191
+#: ../src/file-manager/fm-tree-model.c:1266 ../src/nautilus-window-slot.c:191
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
@@ -4425,8 +5002,12 @@ msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nie można utworzyć żądanego katalogu \"%s\"."
 
 #: ../src/nautilus-application.c:325
-msgid "Before running Nautilus, please create the following folder, or set permissions such that Nautilus can create it."
-msgstr "Przed uruchomieniem programu Nautilus należy utworzyć następujący katalog lub ustalić uprawnienia tak, aby możliwe było jego utworzenie."
+msgid ""
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
+msgstr ""
+"Przed uruchomieniem programu Nautilus należy utworzyć następujący katalog "
+"lub ustalić uprawnienia tak, aby możliwe było jego utworzenie."
 
 #: ../src/nautilus-application.c:328
 #, c-format
@@ -4434,8 +5015,12 @@ msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nie można utworzyć następujących wymaganych katalogów: %s."
 
 #: ../src/nautilus-application.c:330
-msgid "Before running Nautilus, please create these folders, or set permissions such that Nautilus can create them."
-msgstr "Przed uruchomieniem programu Nautilus należy utworzyć te katalogi lub ustalić uprawnienia tak, aby możliwe było ich utworzenie."
+msgid ""
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+"Przed uruchomieniem programu Nautilus należy utworzyć te katalogi lub "
+"ustalić uprawnienia tak, aby możliwe było ich utworzenie."
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -4448,29 +5033,53 @@ msgstr "Przed uruchomieniem programu Nautilus należy utworzyć te katalogi lub
 #. * since neither of the above causes explain it.
 #.
 #: ../src/nautilus-application.c:597
-msgid "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again."
-msgstr "Korzystanie z programu Nautilus nie jest w tej chwili możliwe. W usunięciu problemu może pomóc uruchomienie z wiersza poleceń \"bonobo-slay\". Jeśli problem nadal będzie się pojawiał, należy ponownie uruchomić komputer lub ponownie zainstalować program Nautilus."
+msgid ""
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again."
+msgstr ""
+"Korzystanie z programu Nautilus nie jest w tej chwili możliwe. W usunięciu "
+"problemu może pomóc uruchomienie z wiersza poleceń \"bonobo-slay\". Jeśli "
+"problem nadal będzie się pojawiał, należy ponownie uruchomić komputer lub "
+"ponownie zainstalować program Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:603
 msgid ""
-"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again.\n"
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again.\n"
 "\n"
-"Bonobo could not locate the Nautilus_shell.server file. One cause of this seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation library's directory. Another possible cause would be bad install with a missing Nautilus_Shell.server file.\n"
+"Bonobo could not locate the Nautilus_shell.server file. One cause of this "
+"seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation "
+"library's directory. Another possible cause would be bad install with a "
+"missing Nautilus_Shell.server file.\n"
 "\n"
-"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, which may be needed by other applications.\n"
+"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
-"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but we do not know why.\n"
+"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but "
+"we do not know why.\n"
 "\n"
-"We have also seen this error when a faulty version of bonobo-activation was installed."
+"We have also seen this error when a faulty version of bonobo-activation was "
+"installed."
 msgstr ""
-"Korzystanie z programu Nautilus nie jest w tej chwili możliwe. W usunięciu problemu może pomóc uruchomienie z wiersza poleceń \"bonobo-slay\". Jeśli problem nadal będzie się pojawiał, należy ponownie uruchomić komputer lub ponownie zainstalować program Nautilus.\n"
+"Korzystanie z programu Nautilus nie jest w tej chwili możliwe. W usunięciu "
+"problemu może pomóc uruchomienie z wiersza poleceń \"bonobo-slay\". Jeśli "
+"problem nadal będzie się pojawiał, należy ponownie uruchomić komputer lub "
+"ponownie zainstalować program Nautilus.\n"
 "\n"
-"Program Bonobo nie może odnaleźć pliku Nautilus_shell.server. Jedną z możliwych przyczyn jest niepoprawna instalacja i brak tego pliku, inną zaś - brak katalogu mieszczącego bibliotekę bonobo-activation w zmiennej środowiskowej LD_LIBRARY_PATH.\n"
+"Program Bonobo nie może odnaleźć pliku Nautilus_shell.server. Jedną z "
+"możliwych przyczyn jest niepoprawna instalacja i brak tego pliku, inną zaś - "
+"brak katalogu mieszczącego bibliotekę bonobo-activation w zmiennej "
+"środowiskowej LD_LIBRARY_PATH.\n"
 "\n"
-"Uruchomienie \"bonobo-slay\" spowoduje usunięcie procesów bonobo-activation i GConf, które mogą być wykorzystywane przez inne programy. Z nieznanych jeszcze przyczyn postępowanie to czasem pomaga w usunięciu problemu.\n"
+"Uruchomienie \"bonobo-slay\" spowoduje usunięcie procesów bonobo-activation "
+"i GConf, które mogą być wykorzystywane przez inne programy. Z nieznanych "
+"jeszcze przyczyn postępowanie to czasem pomaga w usunięciu problemu.\n"
 "\n"
-"Problem ten może być również objawem zainstalowania w systemie niewłaściwej wersji programu bonobo-activation."
+"Problem ten może być również objawem zainstalowania w systemie niewłaściwej "
+"wersji programu bonobo-activation."
 
 #. Some misc. error (can never happen with current
 #. * version of bonobo-activation). Show dialog and terminate the
@@ -4481,28 +5090,46 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:633
-#: ../src/nautilus-application.c:651
+#: ../src/nautilus-application.c:633 ../src/nautilus-application.c:651
 #: ../src/nautilus-application.c:658
 msgid "Nautilus cannot be used now, due to an unexpected error."
-msgstr "Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu nieoczekiwanego błędu."
+msgstr ""
+"Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu "
+"nieoczekiwanego błędu."
 
 #: ../src/nautilus-application.c:634
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to register the file manager view server."
-msgstr "Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu nieoczekiwanego błędu zgłoszonego przez Bonobo przy próbie zarejestrowania serwera widoku menedżera plików."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to register the file manager view server."
+msgstr ""
+"Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu "
+"nieoczekiwanego błędu zgłoszonego przez Bonobo przy próbie zarejestrowania "
+"serwera widoku menedżera plików."
 
 #: ../src/nautilus-application.c:652
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the factory. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu nieoczekiwanego błędu zgłoszonego przez Bonobo przy próbie odnalezienia generatora obiektów. W naprawieniu problemu może pomóc usunięcie procesu bonobo-activation-server i ponowne uruchomienie programu Nautilus."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the factory. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu "
+"nieoczekiwanego błędu zgłoszonego przez Bonobo przy próbie odnalezienia "
+"generatora obiektów. W naprawieniu problemu może pomóc usunięcie procesu "
+"bonobo-activation-server i ponowne uruchomienie programu Nautilus."
 
 #: ../src/nautilus-application.c:659
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the shell object. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu nieoczekiwanego błędu zgłoszonego przez Bonobo przy próbie odnalezienia obiektu powłoki. W naprawieniu problemu może pomóc usunięcie procesu bonobo-activation-server i ponowne uruchomienie programu Nautilus."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the shell object. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"Korzystanie z programu Nautilus nie jest w tej chwili możliwe z powodu "
+"nieoczekiwanego błędu zgłoszonego przez Bonobo przy próbie odnalezienia "
+"obiektu powłoki. W naprawieniu problemu może pomóc usunięcie procesu bonobo-"
+"activation-server i ponowne uruchomienie programu Nautilus."
 
-#: ../src/nautilus-application.c:1369
-#: ../src/nautilus-places-sidebar.c:1682
-#: ../src/nautilus-places-sidebar.c:1705
-#: ../src/nautilus-places-sidebar.c:1728
+#: ../src/nautilus-application.c:1369 ../src/nautilus-places-sidebar.c:1682
+#: ../src/nautilus-places-sidebar.c:1705 ../src/nautilus-places-sidebar.c:1728
 #, c-format
 msgid "Unable to eject %s"
 msgstr "Wysunięcie %s nie jest możliwe"
@@ -4520,27 +5147,33 @@ msgstr "Nie można odnaleźć programu do automatycznego uruchomienia"
 
 #: ../src/nautilus-autorun-software.c:168
 msgid "<big><b>Error autorunning software</b></big>"
-msgstr "<big><b>Błąd podczas automatycznego uruchamiania oprogramowania</b></big>"
+msgstr ""
+"<big><b>Błąd podczas automatycznego uruchamiania oprogramowania</b></big>"
 
 #: ../src/nautilus-autorun-software.c:194
-msgid "<big><b>This medium contains software intended to be automatically started. Would you like to run it?</b></big>"
-msgstr "<big><b>Ten nośnik zawiera oprogramowanie do automatycznego uruchomienia. Uruchomić je?</b></big>"
+msgid ""
+"<big><b>This medium contains software intended to be automatically started. "
+"Would you like to run it?</b></big>"
+msgstr ""
+"<big><b>Ten nośnik zawiera oprogramowanie do automatycznego uruchomienia. "
+"Uruchomić je?</b></big>"
 
 #: ../src/nautilus-autorun-software.c:196
 #, c-format
 msgid ""
-"The software will run directly from the medium \"%s\". You should never run software that you don't trust.\n"
+"The software will run directly from the medium \"%s\". You should never run "
+"software that you don't trust.\n"
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"Oprogramowanie zostanie uruchomione bezpośrednio z nośnika \"%s\". Nigdy nie powinno się uruchamiać oprogramowania, któremu się nie ufa.\n"
+"Oprogramowanie zostanie uruchomione bezpośrednio z nośnika \"%s\". Nigdy nie "
+"powinno się uruchamiać oprogramowania, któremu się nie ufa.\n"
 "\n"
 "W razie wątpliwości proszę nacisnąć przycisk Anuluj."
 
 #: ../src/nautilus-bookmarks-window.c:160
 #: ../src/nautilus-file-management-properties.c:206
-#: ../src/nautilus-property-browser.c:1527
-#: ../src/nautilus-window-menus.c:619
+#: ../src/nautilus-property-browser.c:1527 ../src/nautilus-window-menus.c:619
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4674,8 +5307,7 @@ msgstr "_Dodaj zakładkę"
 msgid "C_onnect"
 msgstr "P_ołącz"
 
-#: ../src/nautilus-desktop-window.c:243
-#: ../src/nautilus-pathbar.c:1244
+#: ../src/nautilus-desktop-window.c:243 ../src/nautilus-pathbar.c:1244
 #: ../src/nautilus-places-sidebar.c:310
 msgid "Desktop"
 msgstr "Pulpit"
@@ -4685,10 +5317,13 @@ msgstr "Pulpit"
 msgid "Could not remove emblem with name '%s'."
 msgstr "Nie można usunąć symbolu o nazwie \"%s\"."
 
-#: ../src/nautilus-emblem-sidebar.c:227
-#: ../src/nautilus-emblem-sidebar.c:261
-msgid "This is probably because the emblem is a permanent one, and not one that you added yourself."
-msgstr "Oznacza to prawdopodobnie, że jest to symbol trwały, a nie utworzony samodzielnie."
+#: ../src/nautilus-emblem-sidebar.c:227 ../src/nautilus-emblem-sidebar.c:261
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr ""
+"Oznacza to prawdopodobnie, że jest to symbol trwały, a nie utworzony "
+"samodzielnie."
 
 #: ../src/nautilus-emblem-sidebar.c:260
 #, c-format
@@ -4712,19 +5347,26 @@ msgid "Add Emblems..."
 msgstr "Nowe symbole..."
 
 #: ../src/nautilus-emblem-sidebar.c:544
-msgid "Enter a descriptive name next to each emblem.  This name will be used in other places to identify the emblem."
-msgstr "Przy każdym symbolu proszę wprowadzić opisową nazwę. Będzie ona używana w różnych miejscach do identyfikacji symbolu."
+msgid ""
+"Enter a descriptive name next to each emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Przy każdym symbolu proszę wprowadzić opisową nazwę. Będzie ona używana w "
+"różnych miejscach do identyfikacji symbolu."
 
 #: ../src/nautilus-emblem-sidebar.c:546
-msgid "Enter a descriptive name next to the emblem.  This name will be used in other places to identify the emblem."
-msgstr "Przy symbolu proszę wprowadzić opisową nazwę. Będzie ona używana w różnych miejscach do identyfikacji symbolu."
+msgid ""
+"Enter a descriptive name next to the emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Przy symbolu proszę wprowadzić opisową nazwę. Będzie ona używana w różnych "
+"miejscach do identyfikacji symbolu."
 
 #: ../src/nautilus-emblem-sidebar.c:767
 msgid "Some of the files could not be added as emblems."
 msgstr "Niektórych z plików nie można dodać jako symboli."
 
-#: ../src/nautilus-emblem-sidebar.c:767
-#: ../src/nautilus-emblem-sidebar.c:769
+#: ../src/nautilus-emblem-sidebar.c:767 ../src/nautilus-emblem-sidebar.c:769
 msgid "The emblems do not appear to be valid images."
 msgstr "Symbole nie wyglądają na prawidłowe obrazy."
 
@@ -4732,8 +5374,7 @@ msgstr "Symbole nie wyglądają na prawidłowe obrazy."
 msgid "None of the files could be added as emblems."
 msgstr "Żadnego z plików nie można dodać jako symbolu."
 
-#: ../src/nautilus-emblem-sidebar.c:806
-#: ../src/nautilus-emblem-sidebar.c:861
+#: ../src/nautilus-emblem-sidebar.c:806 ../src/nautilus-emblem-sidebar.c:861
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Plik \"%s\" nie jest poprawnym obrazem."
@@ -4742,8 +5383,7 @@ msgstr "Plik \"%s\" nie jest poprawnym obrazem."
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Przeciągnięty plik nie jest poprawnym obrazem."
 
-#: ../src/nautilus-emblem-sidebar.c:811
-#: ../src/nautilus-emblem-sidebar.c:862
+#: ../src/nautilus-emblem-sidebar.c:811 ../src/nautilus-emblem-sidebar.c:862
 msgid "The emblem cannot be added."
 msgstr "Nie można dodać symbolu."
 
@@ -4911,16 +5551,24 @@ msgid "CD _Audio:"
 msgstr "CD-_Audio:"
 
 #: ../src/nautilus-file-management-properties.glade.h:49
-msgid "Choose the order of information to appear beneath icon names. More information will appear when zooming in closer."
-msgstr "Kolejność, w jakiej wyświetlane będą informacje pod nazwami ikon. Wraz ze wzrostem powiększenia pojawiać się będą kolejne informacje."
+msgid ""
+"Choose the order of information to appear beneath icon names. More "
+"information will appear when zooming in closer."
+msgstr ""
+"Kolejność, w jakiej wyświetlane będą informacje pod nazwami ikon. Wraz ze "
+"wzrostem powiększenia pojawiać się będą kolejne informacje."
 
 #: ../src/nautilus-file-management-properties.glade.h:50
 msgid "Choose the order of information to appear in the list view."
-msgstr "Określ kolejność, w jakiej powinny się pojawiać informacje w widoku listy. "
+msgstr ""
+"Określ kolejność, w jakiej powinny się pojawiać informacje w widoku listy. "
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
-msgstr "Proszę wybrać działanie po wsunięciu nośnika lub podłączaniu urządzenia, jakie ma podjąć system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
+msgstr ""
+"Proszę wybrać działanie po wsunięciu nośnika lub podłączaniu urządzenia, "
+"jakie ma podjąć system"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
 msgid "Count _number of items:"
@@ -5241,7 +5889,9 @@ msgid "Only create windows for explicitly specified URIs."
 msgstr "Tworzenie okien tylko dla podanych jawnie URI."
 
 #: ../src/nautilus-main.c:397
-msgid "Do not manage the desktop (ignore the preference set in the preferences dialog)."
+msgid ""
+"Do not manage the desktop (ignore the preference set in the preferences "
+"dialog)."
 msgstr "Nie obsługuje pulpitu (ignoruje ustawienia w oknie Preferencje)"
 
 #: ../src/nautilus-main.c:399
@@ -5262,8 +5912,11 @@ msgstr "[URI...]"
 
 #. Translators: --no-default-window is a nautilus command line parameter, don't modify it.
 #: ../src/nautilus-main.c:407
-msgid "Load a saved session from the specified file. Implies \"--no-default-window\"."
-msgstr "Wczytuje zapisaną sesję z podanego pliku. Wymusza \"--no-default-window\"."
+msgid ""
+"Load a saved session from the specified file. Implies \"--no-default-window"
+"\"."
+msgstr ""
+"Wczytuje zapisaną sesję z podanego pliku. Wymusza \"--no-default-window\"."
 
 #: ../src/nautilus-main.c:407
 msgid "FILENAME"
@@ -5284,16 +5937,13 @@ msgstr ""
 "Przegląda system plików za pomocą menedżera plików"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:478
-#: ../src/nautilus-spatial-window.c:389
-#: ../src/nautilus-window-menus.c:560
-#: ../src/nautilus-window.c:154
+#: ../src/nautilus-main.c:478 ../src/nautilus-spatial-window.c:389
+#: ../src/nautilus-window-menus.c:560 ../src/nautilus-window.c:154
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:519
-#: ../src/nautilus-main.c:528
+#: ../src/nautilus-main.c:519 ../src/nautilus-main.c:528
 #: ../src/nautilus-main.c:533
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
@@ -5424,7 +6074,8 @@ msgstr "Wy_szukiwanie plików..."
 #: ../src/nautilus-navigation-window-menus.c:799
 #: ../src/nautilus-spatial-window.c:906
 msgid "Locate documents and folders on this computer by name or content"
-msgstr "Lokalizowanie dokumentów i katalogów w tym komputerze wg nazwy lub zawartości"
+msgstr ""
+"Lokalizowanie dokumentów i katalogów w tym komputerze wg nazwy lub zawartości"
 
 #: ../src/nautilus-navigation-window-menus.c:802
 msgid "_Previous Tab"
@@ -5552,8 +6203,7 @@ msgstr "%s - Przeglądarka plików"
 msgid "Close tab"
 msgstr "Zamyka kartę"
 
-#: ../src/nautilus-notes-viewer.c:385
-#: ../src/nautilus-notes-viewer.c:499
+#: ../src/nautilus-notes-viewer.c:385 ../src/nautilus-notes-viewer.c:499
 msgid "Notes"
 msgstr "Notatki"
 
@@ -5561,8 +6211,7 @@ msgstr "Notatki"
 msgid "Show Notes"
 msgstr "Wyświetla notatki"
 
-#: ../src/nautilus-places-sidebar.c:332
-#: ../src/network-scheme.desktop.in.h:2
+#: ../src/nautilus-places-sidebar.c:332 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
 msgstr "Sieć"
 
@@ -5617,7 +6266,8 @@ msgstr "Niestety nie można usunąć deseniu %s."
 
 #: ../src/nautilus-property-browser.c:942
 msgid "Check that you have permission to delete the pattern."
-msgstr "Proszę sprawdzić czy użytkownik posiada uprawnienia do usunięcia desenia."
+msgstr ""
+"Proszę sprawdzić czy użytkownik posiada uprawnienia do usunięcia desenia."
 
 #: ../src/nautilus-property-browser.c:970
 #, c-format
@@ -5626,7 +6276,8 @@ msgstr "Niestety nie można usunąć symbolu %s."
 
 #: ../src/nautilus-property-browser.c:971
 msgid "Check that you have permission to delete the emblem."
-msgstr "Proszę sprawdzić czy użytkownik posiada uprawnienia do usunięcia symbolu."
+msgstr ""
+"Proszę sprawdzić czy użytkownik posiada uprawnienia do usunięcia symbolu."
 
 #: ../src/nautilus-property-browser.c:1017
 msgid "Create a New Emblem"
@@ -5683,7 +6334,8 @@ msgstr "Niestety nie można zastąpić obrazu czyszczącego."
 
 #: ../src/nautilus-property-browser.c:1170
 msgid "Reset is a special image that cannot be deleted."
-msgstr "Obraz czyszczący jest specjalnym rodzajem obrazu i nie może być usunięty."
+msgstr ""
+"Obraz czyszczący jest specjalnym rodzajem obrazu i nie może być usunięty."
 
 #: ../src/nautilus-property-browser.c:1200
 #, c-format
@@ -5915,7 +6567,9 @@ msgid "provides visual status"
 msgstr "prezentuje stan w postaci wizualnej"
 
 #: ../src/nautilus-window-bookmarks.c:96
-msgid "Do you want to remove any bookmarks with the non-existing location from your list?"
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "Usunąć z listy zakładki zawierające nieistniejące położenia?"
 
 #: ../src/nautilus-window-bookmarks.c:101
@@ -5979,8 +6633,11 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "Nie można wyświetlić \"%s\", ponieważ komputer nie został odnaleziony."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "Proszę sprawdzić, czy nazwa została poprawnie wprowadzona i czy ustawienia pośrednika są poprawne."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"Proszę sprawdzić, czy nazwa została poprawnie wprowadzona i czy ustawienia "
+"pośrednika są poprawne."
 
 #: ../src/nautilus-window-manage-views.c:1947
 #, c-format
@@ -5996,20 +6653,48 @@ msgid "Go to the location specified by this bookmark"
 msgstr "Przechodzi do położenia opisywanego przez tę pozycję zakładek"
 
 #: ../src/nautilus-window-menus.c:542
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Program Nautilus jest wolnym oprogramowaniem; można go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub którejś z późniejszych wersji. "
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"Program Nautilus jest wolnym oprogramowaniem; można go rozprowadzać dalej i/"
+"lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej "
+"przez Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji "
+"lub którejś z późniejszych wersji. "
 
 #: ../src/nautilus-window-menus.c:546
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "Program Nautilus rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU. "
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Program Nautilus rozpowszechniany jest z nadzieją, iż będzie on użyteczny - "
+"jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI "
+"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
+"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną "
+"GNU. "
 
 #: ../src/nautilus-window-menus.c:550
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
-msgstr "Z pewnością wraz z niniejszym programem dostarczono także egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie - proszę napisać do Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgstr ""
+"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz "
+"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie "
+"- proszę napisać do Free Software Foundation, Inc., 675 Mass Ave, Cambridge, "
+"MA 02139, USA"
 
 #: ../src/nautilus-window-menus.c:562
-msgid "Nautilus is a graphical shell for GNOME that makes it easy to manage your files and the rest of your system."
-msgstr "Nautilus to graficzna powłoką będąca częścią środowiska GNOME. Ułatwia ona zarządzanie plikami oraz innymi elementami systemu."
+msgid ""
+"Nautilus is a graphical shell for GNOME that makes it easy to manage your "
+"files and the rest of your system."
+msgstr ""
+"Nautilus to graficzna powłoką będąca częścią środowiska GNOME. Ułatwia ona "
+"zarządzanie plikami oraz innymi elementami systemu."
 
 #: ../src/nautilus-window-menus.c:566
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6063,8 +6748,12 @@ msgid "_Backgrounds and Emblems..."
 msgstr "_Tła i symbole..."
 
 #: ../src/nautilus-window-menus.c:797
-msgid "Display patterns, colors, and emblems that can be used to customize appearance"
-msgstr "Wyświetla desenie, kolory i symbole, które mogą być wykorzystane do dopasowania wyglądu"
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+"Wyświetla desenie, kolory i symbole, które mogą być wykorzystane do "
+"dopasowania wyglądu"
 
 #: ../src/nautilus-window-menus.c:800
 msgid "Prefere_nces"
@@ -6143,8 +6832,7 @@ msgid "Zoom _In"
 msgstr "Po_większ"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:830
-#: ../src/nautilus-zoom-control.c:92
+#: ../src/nautilus-window-menus.c:830 ../src/nautilus-zoom-control.c:92
 #: ../src/nautilus-zoom-control.c:347
 msgid "Increase the view size"
 msgstr "Zwiększa rozmiar widoku"
@@ -6156,8 +6844,7 @@ msgid "Zoom _Out"
 msgstr "Po_mniejsz"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:842
-#: ../src/nautilus-zoom-control.c:93
+#: ../src/nautilus-window-menus.c:842 ../src/nautilus-zoom-control.c:93
 #: ../src/nautilus-zoom-control.c:296
 msgid "Decrease the view size"
 msgstr "Zmniejsza rozmiar widoku"
@@ -6169,8 +6856,7 @@ msgid "Normal Si_ze"
 msgstr "Zwykły _rozmiar"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:850
-#: ../src/nautilus-zoom-control.c:94
+#: ../src/nautilus-window-menus.c:850 ../src/nautilus-zoom-control.c:94
 #: ../src/nautilus-zoom-control.c:309
 msgid "Use the normal view size"
 msgstr "Ustawia normalny rozmiar widoku"
@@ -6205,8 +6891,7 @@ msgid "_Network"
 msgstr "_Sieć"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:866
-#: ../src/network-scheme.desktop.in.h:1
+#: ../src/nautilus-window-menus.c:866 ../src/network-scheme.desktop.in.h:1
 msgid "Browse bookmarked and local network locations"
 msgstr "Przeglądanie zakładek i położeń w sieci lokalnej"
 
@@ -6241,7 +6926,9 @@ msgstr "Asystent CD/D_VD"
 #. tooltip
 #: ../src/nautilus-window-menus.c:878
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr "Otwiera katalog, do którego można przeciągać pliki do nagrania na płytach CD lub DVD"
+msgstr ""
+"Otwiera katalog, do którego można przeciągać pliki do nagrania na płytach CD "
+"lub DVD"
 
 #. name, stock id
 #. label, accelerator
@@ -6328,31 +7015,197 @@ msgstr "Powiększ"
 msgid "Set the zoom level of the current view"
 msgstr "Ustawia poziom powiększenia bieżącego widoku"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Krawędź obrazu/etykiety"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Szerokość krawędzi wokół etykiety i obrazu w oknie powiadomienia"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Typ powiadomienia"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Typ powiadomienia"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Przyciski powiadomienia"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Przyciski wyświetlane w oknie powiadomienia"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Wyświetl więcej _szczegółów"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Tekst na etykiecie."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justowanie"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Wzajemne wyrównanie wierszy tekstu etykiety względem siebie. Nie wpływa to "
+"na wyrównanie etykiety wewnątrz przydzielonego jej obszaru - to określa "
+"atrybut GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Zawijanie wierszy"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Określa, czy zbyt długie wiersze powinny być zawijane."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Pozycja kursora"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Bieżące położenie kursora wstawiania, liczone w znakach."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Granica zaznaczenia"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Położenie końca zaznaczenia przeciwnego w stosunku do kursora, liczone w "
+"znakach."
+
+#: ../eel/eel-editable-label.c:3230
+msgid "Select All"
+msgstr "Zaznacz wszystko"
+
+#: ../eel/eel-editable-label.c:3241
+msgid "Input Methods"
+msgstr "Metody wejściowe"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Błąd GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Błąd GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Wszystkie kolejne błędy będą tylko wypisywane na terminalu."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Nie wybrano obrazu."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Aby wybrać obraz, należy go kliknąć."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Można zatrzymać tę operację poprzez kliknięcie przycisku Anuluj."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (niepoprawne kodowanie Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Otwieranie %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Otwieranie %d elementu"
+msgstr[1] "Otwieranie %d elementów"
+msgstr[2] "Otwieranie %d elementów"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Proszę wprowadzić hasło"
+
 #~ msgid "E_ject"
 #~ msgstr "Wy_suń"
+
 #~ msgid "Create Folder"
 #~ msgstr "Utwórz katalog"
+
 #~ msgid "Move to Trash"
 #~ msgstr "Wyrzuć do kosza"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "Na pewno zapomnieć historię?"
+
 #~ msgid "If you do, you will be doomed to repeat it."
 #~ msgstr "Jeśli to zrobisz, skażesz się na jej powtórzenie."
+
 #~ msgid ""
 #~ "If you clear the list of locations, they will be permanently deleted."
 #~ msgstr ""
 #~ "Jeśli lista położeń zostanie wyczyszczona, jej zawartość zostanie "
 #~ "bezpowrotnie usunięta."
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Pusta płyta Blu-Ray"
+
 #~ msgid "Blank CD Disc"
 #~ msgstr "Pusta płyta CD"
+
 #~ msgid "Blank DVD Disc"
 #~ msgstr "Pusta płyta DVD"
+
 #~ msgid "Blank HD DVD Disc"
 #~ msgstr "Pusta płyta HD DVD"
+
 #~ msgid "Blu-Ray Video"
 #~ msgstr "Blu-Ray Video"
+
 #~ msgid "Compact Disc Audio"
 #~ msgstr "Dźwiękowa płyta CD"
 
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Nie można dodać aplikacji do bazy danych aplikacji"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
diff --git a/po/ps.po b/po/ps.po
index ba9ee1340..5e9748e5a 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -3,8 +3,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ps.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-04 12:45+0200\n"
@@ -17,6 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Pashto, Pushto\n"
 "X-Poedit-Country: AFGHANISTAN\n"
+"#-#-#-#-#  ps.po (eel.head)  #-#-#-#-#\n"
+"Project-Id-Version: eel.head\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-07-19 15:23+0200\n"
+"PO-Revision-Date: 2008-07-19 13:33-0800\n"
+"Last-Translator: Zabeeh Khan <zabeehkhan@gmail.com>\n"
+"Language-Team: Pashto <pathanisation@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Pashto, Pushto\n"
+"X-Poedit-Country: AFGHANISTAN\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6474,6 +6489,144 @@ msgstr "لوېول"
 msgid "Set the zoom level of the current view"
 msgstr ""
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "د انځور/نښکې بريد"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "په خبرونې کړکۍ کې د نښکې او د انځور شاوخوا د بريد پلنوالی"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "د خبرونې ډول"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "د خبرونې ډول"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "خبرونې تڼۍ"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "هغه تڼۍ چې په خبرونې کړکۍ کې ښودل کيږي"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "نورې _خبرتياوې ښودل"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ليکنه"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr ".د نښکې ليکنه"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "همجوليزتيا"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "ليکه نغاړل"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ".که ټاکل شوی وي، که ليکنه ډېره اوږده شي ليکې نغاړي"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "د ځري ځای"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr ".د ننويستن ځري اوسنی ځای په لوښو کې"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "تړلې ټاکنه"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ".د ټاکنې د مخامخ سر ځای له ځري نه په لوښو کې"
+
+#: ../eel/eel-editable-label.c:3230
+msgid "Select All"
+msgstr "ټول ټاکل"
+
+#: ../eel/eel-editable-label.c:3241
+msgid "Input Methods"
+msgstr "د ننوتۍ لېلې"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+":تېروتنه GConf\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "%s :تېروتنه GConf"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr ".ټولې نورې تېروتنې يوازې په پايالي کې ښودل کيږي"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "انځور نه وو ټاکل شوی"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr ".د انځور د ټاکلو لپاره په هغه انځور کېکاږل اړين دي"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr ".د بندول په وهلو سره تاسو دا چلښت تمولی شئ"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (ناسم يونيکوډ)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "پرانيستل کيږي %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "توکی پرانيستل کيږي %d"
+msgstr[1] "توکي پرانيستل کيږي %d"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "تېرنويې وليکئ"
+
 #~ msgid "Create Folder"
 #~ msgstr "پوښۍ جوړول"
 
diff --git a/po/pt.po b/po/pt.po
index e1b109790..efdf34187 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,10 +1,19 @@
+# #-#-#-#-#  pt.po (2.24)  #-#-#-#-#
 # nautilus's Portuguese Translation
 # Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Nautilus
 # Distributed under the same licence as the nautilus package
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
 #
+# #-#-#-#-#  pt.po (2.22)  #-#-#-#-#
+# eel's Portuguese Translation
+# Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 eel.
+# Distributed under the same licence as the eel package
+# Duarte Loreto <happyguy_pt@hotmail.com>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  pt.po (2.24)  #-#-#-#-#\n"
 "Project-Id-Version: 2.24\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-07 23:21+0100\n"
@@ -15,6 +24,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  pt.po (2.22)  #-#-#-#-#\n"
+"Project-Id-Version: 2.22\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-02 22:09+0000\n"
+"PO-Revision-Date: 2008-02-02 22:15+0000\n"
+"Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
+"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -333,17 +353,17 @@ msgstr ""
 "Cada uma das entradas da lista está no formato \"Nível de Zoom:Inteiro\". "
 "Para cada nível de zoom especificado, se o inteiro indicado for maior do que "
 "0, o nome do ficheiro não excederá o número indicado de linhas. Se o inteiro "
-"for 0 ou inferior, não é imposto nenhum limite no nível de zoom especificado. "
-"Uma entrada por omissão no formato \"Inteiro\" sem qualquer nível de zoom "
-"especificado é também permitido. Define o número máximo de linhas para todos "
-"os outros níveis de zoom. Exemplos: 0 - apresentar sempre nomes de ficheiros "
-"extensos; 3 - abreviar nomes de ficheiros se excederem três linhas; "
-"smallest:5,smaller:4,0 - abreviar os nomes dos ficheiros se excederem cinco "
-"linhas no nível de zoom \"smallest\". Abreviar os nomes dos ficheiros se "
-"excederem quatro linhas no nível de zoom \"smaller\". Não abreviar os nomes "
-"dos ficheiros nos restantes níveis de zoom. Níveis de zoom disponíveis: "
-"\"smallest\" (33%), \"smaller\" (50%), \"small\" (66%), \"standard\" (100%), "
-"\"large\" (150%), \"larger\" (200%), \"largest\" (400%)"
+"for 0 ou inferior, não é imposto nenhum limite no nível de zoom "
+"especificado. Uma entrada por omissão no formato \"Inteiro\" sem qualquer "
+"nível de zoom especificado é também permitido. Define o número máximo de "
+"linhas para todos os outros níveis de zoom. Exemplos: 0 - apresentar sempre "
+"nomes de ficheiros extensos; 3 - abreviar nomes de ficheiros se excederem "
+"três linhas; smallest:5,smaller:4,0 - abreviar os nomes dos ficheiros se "
+"excederem cinco linhas no nível de zoom \"smallest\". Abreviar os nomes dos "
+"ficheiros se excederem quatro linhas no nível de zoom \"smaller\". Não "
+"abreviar os nomes dos ficheiros nos restantes níveis de zoom. Níveis de zoom "
+"disponíveis: \"smallest\" (33%), \"smaller\" (50%), \"small\" (66%), "
+"\"standard\" (100%), \"large\" (150%), \"larger\" (200%), \"largest\" (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -2930,8 +2950,13 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "Abrir todos os ficheiros do tipo \"%s\" com:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#, fuzzy
 msgid "Could not run application"
-msgstr "Incapaz de executar a aplicação"
+msgstr ""
+"#-#-#-#-#  pt.po (2.24)  #-#-#-#-#\n"
+"Incapaz de executar a aplicação\n"
+"#-#-#-#-#  pt.po (2.22)  #-#-#-#-#\n"
+"Incapaz de iniciar a aplicação"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
 #, c-format
@@ -2972,6 +2997,7 @@ msgstr "_Utilizar um comando personalizado"
 msgid "_Browse..."
 msgstr "_Navegar..."
 
+#. #-#-#-#-#  pt.po (2.24)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2994,8 +3020,13 @@ msgstr "_Adicionar"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "Adicionar Aplicação"
+msgstr ""
+"#-#-#-#-#  pt.po (2.24)  #-#-#-#-#\n"
+"Adicionar Aplicação\n"
+"#-#-#-#-#  pt.po (2.22)  #-#-#-#-#\n"
+"Adicionar uma Aplicação"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -6871,6 +6902,148 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Definir o nível de zoom da vista actual"
 
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "A Abrir %d Item"
+msgstr[1] "A Abrir %d Itens"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Texto"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Margem da imagem/etiqueta"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Largura da margem em torno da etiqueta e imagem no diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tipo de Alerta"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "O tipo de alerta"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Botões de Alerta"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Os botões apresentados no diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Apresentar mais _detalhes"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "O texto da etiqueta."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Alinhamento"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"O alinhamento das linhas no texto da etiqueta relativamente umas às outras. "
+"Isto NÃO afecta o alinhamento da etiqueta dentro da sua alocação. Consulte "
+"GtkMisc::xalign para tal."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Quebra de linha"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Se definido, quebra as linhas se o texto ficar demasiado longo."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Posicionamento do Cursor"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "A posição actual do cursor de inserção, em caracteres."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Limite de Selecção"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"A posição do extremo oposto da selecção a partir do cursor, em caracteres."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Seleccionar Tudo"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Métodos de Inserção"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Erro GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erro GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Todos os erros seguintes serão apresentados apenas na consola."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Não foi seleccionada nenhuma imagem."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Tem de clicar numa imagem para a seleccionar."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Pode parar esta operação premindo cancelar."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode inválido)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "A abrir %s"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Introduza a Senha"
+
 #~ msgid "Create Folder"
 #~ msgstr "Criar Pasta"
 
@@ -7259,11 +7432,6 @@ msgstr "Definir o nível de zoom da vista actual"
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "\"%s\" não é uma localização válida."
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "A Abrir %d Item"
-#~ msgstr[1] "A Abrir %d Itens"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "Se apagar um item, este será definitivamente perdido."
 
@@ -8330,9 +8498,6 @@ msgstr "Definir o nível de zoom da vista actual"
 #~ msgid "Factory for text view"
 #~ msgstr "Fábrica para a vista de texto"
 
-#~ msgid "Text"
-#~ msgstr "Texto"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Visualizador de Texto"
 
@@ -9485,3 +9650,33 @@ msgstr "Definir o nível de zoom da vista actual"
 
 #~ msgid "Reveal in %d _New Windows"
 #~ msgstr "Revelar em %d _Novas Janelas"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Incapaz de adicionar a aplicação à base de dados de aplicações"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 AM"
+
+#~ msgid "GConf Error"
+#~ msgstr "Erro GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Nenhuma Selecção Efectuada"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Question"
+#~ msgstr "Questão"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4375e7265..f64104d29 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#
 # Brazilian Portuguese translation of nautilus.
 # Copyright (C) 2000-2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nautilus package.
@@ -12,8 +13,23 @@
 # Vladimir Melo <vladimirmelo.psi@gmail.com>, 2008.
 # Fabrício Godoy <skarllot@gmail.com>, 2008.
 #
+# #-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#
+# Brazilian Portuguese translation of eel (Eazel Extensions Library).
+# Copyright (C) 2001, 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+# Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2001.
+# Gustavo Noronha Silva <kov@debian.org>, 2002.
+# Alexandre Folle de Menezes <afmenez@terra.com.br>, 2003.
+# Goedson Teixeira Paixao <goedson@debian.org>, 2004.
+# Raphael Higino <raphaelh@uai.com.br>, 2004.
+# Afonso Celso Medina <medina@maua.br>, 2005.
+# Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006-2007.
+# Og Maciel <ogmaciel@gnome.org>, 2007.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-12 16:59+0000\n"
@@ -26,6 +42,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.pt_BR\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-08 21:41+0000\n"
+"PO-Revision-Date: 2008-07-22 00:27-0300\n"
+"Last-Translator: Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2919,9 +2946,13 @@ msgstr "Nenhum aplicativo selecionado"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:903
-#, c-format
+#, fuzzy, c-format
 msgid "%s document"
-msgstr "documento %s"
+msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"documento %s\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"documento do %s"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:909
@@ -2929,10 +2960,13 @@ msgid "Unknown"
 msgstr "Desconhecido"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
 msgstr ""
-"Selecionar um aplicativo para abrir %s e outros arquivos do tipo \"%s\""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"Selecionar um aplicativo para abrir %s e outros arquivos do tipo \"%s\"\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"Selecione um aplicativo para abrir %s e outros arquivos do tipo \"%s\""
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:921
@@ -2945,13 +2979,22 @@ msgid "Could not run application"
 msgstr "Não foi possível executar o aplicativo"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "Não foi possível localizar \"%s\""
+msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"Não foi possível localizar \"%s\"\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"Não foi possível encontrar '%s'"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#, fuzzy
 msgid "Could not find application"
-msgstr "Não foi possível localizar o aplicativo"
+msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"Não foi possível localizar o aplicativo\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"Não foi possível encontrar o aplicativo"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2964,26 +3007,47 @@ msgid "Could not add application"
 msgstr "Não foi possível adicionar o aplicativo"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "Selecionar um aplicativo"
+msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"Selecionar um aplicativo\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"Selecione um aplicativo"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5104
+#, fuzzy
 msgid "Open With"
-msgstr "Abrir com"
+msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"Abrir com\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"Abrir Com"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Selecionar um aplicativo para ver sua descrição."
+msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"Selecionar um aplicativo para ver sua descrição.\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"Selecione um aplicativo para exibir sua descrição."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "_Usar um comando personalizado"
+msgstr ""
+"#-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#\n"
+"_Usar um comando personalizado\n"
+"#-#-#-#-#  pt_BR.po (eel.HEAD.pt_BR)  #-#-#-#-#\n"
+"_Utilizar um comando personalizado"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Navegar..."
 
+#. #-#-#-#-#  pt_BR.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -6891,6 +6955,137 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Define o nível de zoom da visão atual"
 
+#: ../eel/eel-alert-dialog.c:109
+msgid "Image/label border"
+msgstr "Borda de imagem/rótulo"
+
+#: ../eel/eel-alert-dialog.c:110
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Largura da borda ao redor do rótulo e da imagem no diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:119
+msgid "Alert Type"
+msgstr "Tipo de alerta"
+
+#: ../eel/eel-alert-dialog.c:120
+msgid "The type of alert"
+msgstr "O tipo de alerta"
+
+#: ../eel/eel-alert-dialog.c:128
+msgid "Alert Buttons"
+msgstr "Botões de alerta"
+
+#: ../eel/eel-alert-dialog.c:129
+msgid "The buttons shown in the alert dialog"
+msgstr "Os botões mostrados no diálogo de alerta"
+
+#: ../eel/eel-alert-dialog.c:193
+msgid "Show more _details"
+msgstr "Mostrar mais _detalhes"
+
+#: ../eel/eel-canvas.c:1219 ../eel/eel-canvas.c:1220
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1226 ../eel/eel-canvas.c:1227
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:353
+msgid "Text"
+msgstr "Texto"
+
+#: ../eel/eel-editable-label.c:354
+msgid "The text of the label."
+msgstr "O texto do rótulo."
+
+#: ../eel/eel-editable-label.c:360
+msgid "Justification"
+msgstr "Justificação"
+
+#: ../eel/eel-editable-label.c:361
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"O alinhamento das linhas no texto do rótulo, umas em relação às outras. Isto "
+"NÃO afeta o alinhamento do rótulo dentro de sua alocação. Para informações a "
+"esse respeito, veja GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:369
+msgid "Line wrap"
+msgstr "Quebra de linha"
+
+#: ../eel/eel-editable-label.c:370
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Se ativada, quebra as linhas caso o texto se torne muito longo."
+
+#: ../eel/eel-editable-label.c:377
+msgid "Cursor Position"
+msgstr "Posição do cursor"
+
+#: ../eel/eel-editable-label.c:378
+msgid "The current position of the insertion cursor in chars."
+msgstr "A posição atual do cursor de inserção, em caracteres."
+
+#: ../eel/eel-editable-label.c:387
+msgid "Selection Bound"
+msgstr "Limites da seleção"
+
+#: ../eel/eel-editable-label.c:388
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"A posição em relação ao cursor da outra extremidade da seleção, em "
+"caracteres."
+
+#: ../eel/eel-editable-label.c:3217
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: ../eel/eel-editable-label.c:3228
+msgid "Input Methods"
+msgstr "Métodos de entrada"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Erro do GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erro do GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Todos os demais erros serão mostrados apenas no terminal."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Nenhuma imagem foi selecionada."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Você deve clicar em uma imagem para selecioná-la."
+
+#: ../eel/eel-stock-dialogs.c:209
+msgid "You can stop this operation by clicking cancel."
+msgstr "Você pode parar essa operação clicando em cancelar."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode inválido)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Digite a senha"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "Você tem certeza que quer esquecer o histórico?"
 
@@ -7051,3 +7246,42 @@ msgstr "Define o nível de zoom da visão atual"
 
 #~ msgid "(%d:%02d Remaining)"
 #~ msgstr "(%d:%02d Restantes)"
+
+#~ msgid "Opening %s"
+#~ msgstr "Abrindo %s"
+
+#~ msgid "Opening %d Item"
+#~ msgid_plural "Opening %d Items"
+#~ msgstr[0] "Abrindo %d Item"
+#~ msgstr[1] "Abrindo %d Itens"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr ""
+#~ "Não foi possível adicionar o aplicativo ao banco de dados de aplicativos"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "GConf Error"
+#~ msgstr "Erro do GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Nenhuma seleção foi feita"
+
+#~ msgid "Info"
+#~ msgstr "Informação"
+
+#~ msgid "Warning"
+#~ msgstr "Alerta"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Question"
+#~ msgstr "Pergunta"
diff --git a/po/ro.po b/po/ro.po
index 708a68d47..7b6fc997a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ro.po (nautilus.HEAD.ro)  #-#-#-#-#
 # translation of nautilus.HEAD.ro.po to Română
 # translation of nautilus.HEAD.ro.po to
 # nautilus RO translation
@@ -6,8 +7,17 @@
 #
 # Marius Andreiana <marius galuna.ro>, 2001, 2002, 2003.
 # Mugurel Tudor <mugurelu@gnome.ro>, 2003-2004, 2005, 2006, 2007.
+# #-#-#-#-#  ro.po (eel.HEAD.ro)  #-#-#-#-#
+# Romanian translation of eel.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Marius Andreiana <mandreiana@yahoo.com>, 2001.
+# Mugurel Tudor <mugurelu@gnome.ro>, 2004.
+# Sebastian Ivan <sebastian.ivan@ubuntu.ro>, 2005.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ro.po (nautilus.HEAD.ro)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.ro\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 04:27+0000\n"
@@ -20,6 +30,16 @@ msgstr ""
 "Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1))\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  ro.po (eel.HEAD.ro)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD.ro\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2006-03-09 21:17+0800\n"
+"Last-Translator: Sebastian Ivan <sebastian.ivan@ubuntu.ro>\n"
+"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -1301,6 +1321,7 @@ msgstr "_Folosește implicit"
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:274
 #: ../src/file-manager/fm-list-view.c:1411
+#: eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Nume"
 
@@ -2919,12 +2940,19 @@ msgid "Could not set as default application"
 msgstr "Nu am putut muta „%s” către noua locație."
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#: eel/eel-mime-application-chooser.c:229
 msgid "Default"
 msgstr "Implicit"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
+#: eel/eel-mime-application-chooser.c:237
+#, fuzzy
 msgid "Icon"
-msgstr "Iconiță"
+msgstr ""
+"#-#-#-#-#  ro.po (nautilus.HEAD.ro)  #-#-#-#-#\n"
+"Iconiță\n"
+"#-#-#-#-#  ro.po (eel.HEAD.ro)  #-#-#-#-#\n"
+"Iconiţă"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:327
 #, fuzzy
@@ -2936,17 +2964,14 @@ msgstr "Nu am putut muta „%s” către noua locație."
 msgid "No applications selected"
 msgstr "%d element selectat"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:592
-#: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, fuzzy, c-format
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
 msgid "%s document"
-msgstr "Documente"
+msgstr "Document %s"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:599
-#: ../libnautilus-private/nautilus-open-with-dialog.c:910
-#, fuzzy
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
 msgid "Unknown"
-msgstr "necunoscut"
+msgstr "Necunoscut"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
 #, c-format
@@ -2959,59 +2984,58 @@ msgstr ""
 msgid "Open all files of type \"%s\" with:"
 msgstr "Deschide toate fișierele de tip „%s” cu:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
 msgid "Could not run application"
-msgstr ""
+msgstr "Nu am putut rula aplicaţia"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, fuzzy, c-format
+#: eel/eel-open-with-dialog.c:187
+#, c-format
 msgid "Could not find '%s'"
-msgstr "Nu am putut găsi „%s”."
+msgstr "Nu am putut găsi „%s”"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#: eel/eel-open-with-dialog.c:190
 msgid "Could not find application"
-msgstr ""
+msgstr "Nu am putut găsi aplicaţia"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
 msgid "Could not add application to the application database: %s"
 msgstr ""
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:235
-#, fuzzy
+#: eel/eel-open-with-dialog.c:287
 msgid "Could not add application"
-msgstr "Transferați locația?"
+msgstr "Nu am putut adăuga aplicaţia"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:375
-#, fuzzy
+#: eel/eel-open-with-dialog.c:401
 msgid "Select an Application"
-msgstr "Selectează o categorie:"
+msgstr "Selectaţi o aplicaţie"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5070
+#: eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Deschide cu"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#: eel/eel-open-with-dialog.c:830
 msgid "Select an application to view its description."
-msgstr ""
+msgstr "Selectaţi o aplicaţie pentru a vizualiza descrierea sa."
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#: eel/eel-open-with-dialog.c:855
 msgid "_Use a custom command"
-msgstr ""
+msgstr "Foloseşte o _comandă personalizată"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:806
-#, fuzzy
+#: eel/eel-open-with-dialog.c:872
 msgid "_Browse..."
-msgstr "_Elimină..."
+msgstr "_Navighează..."
 
+#. #-#-#-#-#  ro.po (nautilus.HEAD.ro)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
 #: ../src/file-manager/fm-directory-view.c:6599
 #: ../src/file-manager/fm-directory-view.c:7799
 #: ../src/file-manager/fm-tree-view.c:1174
-#: ../src/nautilus-places-sidebar.c:1954
+#: ../src/nautilus-places-sidebar.c:1954 eel/eel-open-with-dialog.c:894
 msgid "_Open"
 msgstr "_Deschide"
 
@@ -3020,16 +3044,13 @@ msgstr "_Deschide"
 msgid "Open %s and other files of type \"%s\" with:"
 msgstr "Deschide %s și alte fișiere de tip „%s” cu:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:955
-#: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#: eel/eel-open-with-dialog.c:1017
 msgid "_Add"
-msgstr ""
+msgstr "_Adaugă"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:956
-#: ../libnautilus-private/nautilus-open-with-dialog.c:971
-#, fuzzy
+#: eel/eel-open-with-dialog.c:1018
 msgid "Add Application"
-msgstr "Apariție"
+msgstr "Adaugă aplicaţia"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:81
 msgid "Open Failed, would you like to choose another application?"
@@ -6968,6 +6989,170 @@ msgstr "Zoom"
 msgid "Set the zoom level of the current view"
 msgstr "Setează nivelul de zoom al vizualizării curente"
 
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Margine imagine/etichetă"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Lăţimea marginii din jurul etichetei şi imaginii din dialogul de alertă"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tipul de alertă"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Tipul alertei"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Butoane de alertă"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Butoanele afişate în dialogul de alertă"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Arată mai multe _detalii"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Textul etichetei."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Aliniere"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Alinierea liniilor din textul etichetei relativ una la cealaltă. Asta NU "
+"afectează alinierea alocată a etichetei. Vezi GtkMisc::xalign pentru mai "
+"multe detalii."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Formatare linie"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Dacă este setată, formatează liniile daca textul devine prea lung."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Poziţie cursor"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Poziţia curentă a cursorului de inserare."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Legătură de selecţie"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Poziţia capătului opus al selecţiei faţă de cursor."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Selectează tot"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Metode de intrare"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Eroare GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Eroare GConf: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Toate erorile următoare vor fi arătate doar în terminal."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 AM"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Nici o imagine nu a fost selectată."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Trebuie să faceţi clic pe o imagine pentru a o selecta."
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Nici o aplicaţie selectată</i>"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+"Selectaţi o aplicaţie pentru a deschide <i>%s</i> şi altele de tipul „%s”"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Nu am putut adăuga aplicaţia la baza de date a aplicaţiilor"
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Deschide <i>%s</i> şi alte fişiere de tipul „%s” cu:"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Puteţi opri această operaţie efectuând un clic pe anulare."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (Unicode invalid)"
+
 #~ msgid "_Show"
 #~ msgstr "_Afișează"
 
@@ -7419,3 +7604,21 @@ msgstr "Setează nivelul de zoom al vizualizării curente"
 
 #~ msgid "Show in the default detail level"
 #~ msgstr "Afișează în nivelul de detaliu implicit"
+
+#~ msgid "GConf Error"
+#~ msgstr "Eroare GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Nici o selecţie nu a fost făcută"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Warning"
+#~ msgstr "Avertizare"
+
+#~ msgid "Error"
+#~ msgstr "Eroare"
+
+#~ msgid "Question"
+#~ msgstr "Întrebare"
diff --git a/po/ru.po b/po/ru.po
index 185c8f26a..6938b3a50 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ru.po (nautilus trunk)  #-#-#-#-#
 # translation of nautilus to Russian
 # Copyright (C) 2000-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 #
@@ -7,8 +8,18 @@
 # Andrew W. Nosenko <awn@bcs.zp.ua>, 2003.
 # Leonid Kanter <leon@asplinux.ru>, 2003, 2004, 2005, 2006, 2007.
 # Vasiliy Faronov <qvvx@yandex.ru>, 2008.
+# #-#-#-#-#  ru.po (eel.HEAD)  #-#-#-#-#
+# translation of eel.HEAD.po to
+# Copyright (C) 2000-2003, 2005, 2006 Free Software Foundation, Inc.
+#
+# Valek Filippov <frob@df.ru>, 2000.
+# Dmitry G. Mastrukov <dmitry@taurussoft.org>, 2002-2004.
+# Leonid Kanter <leon@asplinux.ru>, 2005, 2006.
+# Alexander Sigachov <alexander.sigachov@gmail.com>, 2006.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ru.po (nautilus trunk)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus trunk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 04:27+0000\n"
@@ -18,8 +29,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Russian\n"
+"#-#-#-#-#  ru.po (eel.HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel.HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-22 00:25+0400\n"
+"PO-Revision-Date: 2006-08-16 16:39+0300\n"
+"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
+"Language-Team:  <gnome-cyr@gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -126,8 +151,7 @@ msgid "Envy"
 msgstr "Зависть"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28
-#: ../src/nautilus-emblem-sidebar.c:931
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:931
 #: ../src/nautilus-property-browser.c:1770
 msgid "Erase"
 msgstr "Стереть"
@@ -303,13 +327,49 @@ msgstr "Сохранённый поиск"
 #. Translators: date_modified - mtime, the last time file contents were changed
 #. date_changed  - ctime, the last time file meta-information changed
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Possible values are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and \"mime_type\"."
-msgstr "Список подписей к значкам для режима значков и для рабочего стола. Реальное количество подписей зависит от масштаба изображения. Возможные значения: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" и \"mime_type\"."
+msgid ""
+"A list of captions below an icon in the icon view and the desktop. The "
+"actual number of captions shown depends on the zoom level. Possible values "
+"are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed"
+"\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
+"\"mime_type\"."
+msgstr ""
+"Список подписей к значкам для режима значков и для рабочего стола. Реальное "
+"количество подписей зависит от масштаба изображения. Возможные значения: "
+"\"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", "
+"\"owner\", \"group\", \"permissions\", \"octal_permissions\" и \"mime_type\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 #, no-c-format
-msgid "A string specifying how parts of overlong file names should be replaced by ellipses, depending on the zoom level. Each of the list entries is of the form \"Zoom Level:Integer\". For each specified zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form \"Integer\" without any specified zoom level is also allowed. It defines the maximum number of lines for all other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level \"smallest\". Shorten file names if they exceed four lines for zoom level \"smaller\". Do not shorten file names for other zoom levels. Available zoom levels: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
-msgstr "Строка, определяющая, как будут опускаться части слишком длинных имён файлов, в зависимости от масштаба. Каждый элемент списка имеет вид «Масштаб:Число». Для каждого масштаба, если это число больше нуля, имя файла не будет превышать заданное число строк. Если число меньше или равно 0, предел для данного масштаба не устанавливается. Значение по умолчанию (вида «Число», без указания масштаба) также допускается. Оно определяет максимальное число строк для всех масштабов. Например, 0 — всегда отображать имя файла целиком; 3 — укорачивать имена файлов, если они не вмещаются в три строки, smallest:5,smaller:4,0 — укорачивать имена файлов, не вмещающихся в пять строк для масштаба \"smallest\", укорачивать имена файлов, не вмещающихся в четыре строки для масштаба \"smaller\" и не ограничивать длину имён файлов в других масштабах. Существующие масштабы: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
+msgid ""
+"A string specifying how parts of overlong file names should be replaced by "
+"ellipses, depending on the zoom level. Each of the list entries is of the "
+"form \"Zoom Level:Integer\". For each specified zoom level, if the given "
+"integer is larger than 0, the file name will not exceed the given number of "
+"lines. If the integer is 0 or smaller, no limit is imposed on the specified "
+"zoom level. A default entry of the form \"Integer\" without any specified "
+"zoom level is also allowed. It defines the maximum number of lines for all "
+"other zoom levels. Examples: 0 - always display overlong file names; 3 - "
+"shorten file names if they exceed three lines; smallest:5,smaller:4,0 - "
+"shorten file names if they exceed five lines for zoom level \"smallest\". "
+"Shorten file names if they exceed four lines for zoom level \"smaller\". Do "
+"not shorten file names for other zoom levels. Available zoom levels: "
+"smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
+"larger (200%), largest (400%)"
+msgstr ""
+"Строка, определяющая, как будут опускаться части слишком длинных имён "
+"файлов, в зависимости от масштаба. Каждый элемент списка имеет вид «Масштаб:"
+"Число». Для каждого масштаба, если это число больше нуля, имя файла не будет "
+"превышать заданное число строк. Если число меньше или равно 0, предел для "
+"данного масштаба не устанавливается. Значение по умолчанию (вида «Число», без "
+"указания масштаба) также допускается. Оно определяет максимальное число "
+"строк для всех масштабов. Например, 0 — всегда отображать имя файла целиком; "
+"3 — укорачивать имена файлов, если они не вмещаются в три строки, smallest:5,"
+"smaller:4,0 — укорачивать имена файлов, не вмещающихся в пять строк для "
+"масштаба \"smallest\", укорачивать имена файлов, не вмещающихся в четыре "
+"строки для масштаба \"smaller\" и не ограничивать длину имён файлов в других "
+"масштабах. Существующие масштабы: smallest (33%), smaller (50%), small "
+"(66%), standard (100%), large (150%), larger (200%), largest (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -320,12 +380,23 @@ msgid "Always use the location entry, instead of the pathbar"
 msgstr "Всегда использовать адресную строку вместо панели"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
-msgid "An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines."
-msgstr "Целое число, определяющее, как будут опускаться части слишком длинных имён файлов на рабочем столе. Если это число больше нуля, то имя файла не будет превышать заданное число строк. Если число меньше или равно нулю, ограничение на число строк не устанавливается."
+msgid ""
+"An integer specifying how parts of overlong file names should be replaced by "
+"ellipses on the desktop. If the number is larger than 0, the file name will "
+"not exceed the given number of lines. If the number is 0 or smaller, no "
+"limit is imposed on the number of displayed lines."
+msgstr ""
+"Целое число, определяющее, как будут опускаться части слишком длинных имён "
+"файлов на рабочем столе. Если это число больше нуля, то имя файла не будет "
+"превышать заданное число строк. Если число меньше или равно нулю, "
+"ограничение на число строк не устанавливается."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
-msgstr "Фоновый цвет папок по умолчанию. Используется только в том случае, если установлен ключ background_set."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
+msgstr ""
+"Фоновый цвет папок по умолчанию. Используется только в том случае, если "
+"установлен ключ background_set."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Computer icon visible on desktop"
@@ -336,8 +407,16 @@ msgid "Criteria for search bar searching"
 msgstr "Критерии поиска для поисковой панели"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
-msgid "Criteria when matching files searched for in the search bar. If set to \"search_by_text\", then Nautilus will Search for files by file name only. If set to \"search_by_text_and_properties\", then Nautilus will search for files by file name and file properties."
-msgstr "Критерии соответствия файлов при поиске через панель поиска. Если установлено \"search_by_text\", Nautilus будет искать файлы только по имени. Если установлено \"search_by_text_and_properties\", поиск файла будет производиться по имени и свойствам."
+msgid ""
+"Criteria when matching files searched for in the search bar. If set to "
+"\"search_by_text\", then Nautilus will Search for files by file name only. "
+"If set to \"search_by_text_and_properties\", then Nautilus will search for "
+"files by file name and file properties."
+msgstr ""
+"Критерии соответствия файлов при поиске через панель поиска. Если "
+"установлено \"search_by_text\", Nautilus будет искать файлы только по имени. "
+"Если установлено \"search_by_text_and_properties\", поиск файла будет "
+"производиться по имени и свойствам."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Current Nautilus theme (deprecated)"
@@ -401,7 +480,8 @@ msgstr "Перечень столбцов списка по умолчанию"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Default list of columns visible in the list view."
-msgstr "Перечень столбцов, показываемых по умолчанию при просмотре в виде списка."
+msgstr ""
+"Перечень столбцов, показываемых по умолчанию при просмотре в виде списка."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid "Default list zoom level"
@@ -444,164 +524,341 @@ msgid "Enables the classic Nautilus behavior, where all windows are browsers"
 msgstr "Включить классическое поведение Nautilus (все окна — обозреватели)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid "Filename for the default folder background. Only used if background_set is true."
-msgstr "Имя файла, содержащего фон для папок по умолчанию. Используется только в том случае, если установлен ключ background_set."
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"Имя файла, содержащего фон для папок по умолчанию. Используется только в том "
+"случае, если установлен ключ background_set."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid "Filename for the default side pane background. Only used if side_pane_background_set is true."
-msgstr "Имя файла, содержащего фон по умолчанию для боковой панели. Используется только в том случае, если установлен ключ side_pane_background_set."
+msgid ""
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
+msgstr ""
+"Имя файла, содержащего фон по умолчанию для боковой панели. Используется "
+"только в том случае, если установлен ключ side_pane_background_set."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
-msgid "Folders over this size will be truncated to around this size. The purpose of this is to avoid unintentionally blowing the heap and killing Nautilus on massive folders. A negative value denotes no limit. The limit is approximate due to the reading of folders chunk-wise."
-msgstr "Папки, размер которых превышает указанный, будут обрезаны примерно до этого размера. Это нужно для того, чтобы избежать непреднамеренного переполнения памяти и падения Nautilus на больших папках. Отрицательное значение означает отсутствие ограничения. Ограничение приблизительно, поскольку чтение папок производится фрагментами."
+msgid ""
+"Folders over this size will be truncated to around this size. The purpose of "
+"this is to avoid unintentionally blowing the heap and killing Nautilus on "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Папки, размер которых превышает указанный, будут обрезаны примерно до этого "
+"размера. Это нужно для того, чтобы избежать непреднамеренного переполнения "
+"памяти и падения Nautilus на больших папках. Отрицательное значение означает "
+"отсутствие ограничения. Ограничение приблизительно, поскольку чтение папок "
+"производится фрагментами."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid "Home icon visible on desktop"
 msgstr "Значок домашней папки присутствует на рабочем столе"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
-msgid "If set to \"after_current_tab\", then new tabs are inserted after the current tab. If set to \"end\", then new tabs are appended to the end of the tab list."
-msgstr "Если ключ имеет значение \"after_current_tab\", новые вкладки создаются после текущей; если \"end\" — новые вкладки добавляются в конец списка вкладок."
+msgid ""
+"If set to \"after_current_tab\", then new tabs are inserted after the "
+"current tab. If set to \"end\", then new tabs are appended to the end of the "
+"tab list."
+msgstr ""
+"Если ключ имеет значение \"after_current_tab\", новые вкладки создаются "
+"после текущей; если \"end\" — новые вкладки добавляются в конец списка "
+"вкладок."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
-msgid "If set to true, Nautilus will only show folders in the tree side pane. Otherwise it will show both folders and files."
-msgstr "Если этот ключ установлен, в боковой панели в режиме «Дерево» будут показываться только папки. В противном случае будут показываться и папки, и файлы."
+msgid ""
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
+msgstr ""
+"Если этот ключ установлен, в боковой панели в режиме «Дерево» будут "
+"показываться только папки. В противном случае будут показываться и папки, и "
+"файлы."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
-msgstr "Если этот ключ установлен, во вновь создаваемых окнах будет видна строка адреса."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
+msgstr ""
+"Если этот ключ установлен, во вновь создаваемых окнах будет видна строка "
+"адреса."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid "If set to true, newly opened windows will have the side pane visible."
-msgstr "Если этот ключ установлен, во вновь создаваемых окнах будет видна боковая панель."
+msgstr ""
+"Если этот ключ установлен, во вновь создаваемых окнах будет видна боковая "
+"панель."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid "If set to true, newly opened windows will have the status bar visible."
-msgstr "Если этот ключ установлен, во вновь создаваемых окнах будет видна строка состояния."
+msgstr ""
+"Если этот ключ установлен, во вновь создаваемых окнах будет видна строка "
+"состояния."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr "Если этот ключ установлен, во вновь создаваемых окнах будут видны панели инструментов."
+msgstr ""
+"Если этот ключ установлен, во вновь создаваемых окнах будут видны панели "
+"инструментов."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
-msgstr "Если этот ключ установлен, в окнах Nautilus всегда будет использоваться текстовая строка адреса вместо панели кнопок."
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
+msgstr ""
+"Если этот ключ установлен, в окнах Nautilus всегда будет использоваться "
+"текстовая строка адреса вместо панели кнопок."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
-msgstr "Если этот ключ установлен, Nautilus будет отображать и позволять изменять некоторые эзотерические параметры прав доступа в диалоге свойств файла, более точно следуя стилю Unix."
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
+msgstr ""
+"Если этот ключ установлен, Nautilus будет отображать и позволять изменять "
+"некоторые эзотерические параметры прав доступа в диалоге свойств файла, "
+"более точно следуя стилю Unix."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views."
-msgstr "Если этот ключ установлен, Nautilus будет показывать папки перед файлами в режимах просмотра в виде значков и в виде списка."
+msgid ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr ""
+"Если этот ключ установлен, Nautilus будет показывать папки перед файлами в "
+"режимах просмотра в виде значков и в виде списка."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash."
-msgstr "Если этот ключ установлен, Nautilus будет запрашивать подтверждение при попытке удалить файлы и при очистке корзины."
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"delete files, or empty the Trash."
+msgstr ""
+"Если этот ключ установлен, Nautilus будет запрашивать подтверждение при "
+"попытке удалить файлы и при очистке корзины."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "If set to true, then Nautilus will automatically mount media such as user-visible hard disks and removable media on start-up and media insertion."
-msgstr "Если этот ключ установлен, Nautilus будет автоматически присоединять носители — такие как видимые пользователю жёсткие диски или сменные носители — при запуске и при вставке носителя."
+msgid ""
+"If set to true, then Nautilus will automatically mount media such as user-"
+"visible hard disks and removable media on start-up and media insertion."
+msgstr ""
+"Если этот ключ установлен, Nautilus будет автоматически присоединять "
+"носители — такие как видимые пользователю жёсткие диски или сменные носители "
+"— при запуске и при вставке носителя."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
-msgid "If set to true, then Nautilus will automatically open a folder when media is automounted. This only applies to media where no known x-content/* type was detected; for media where a known x-content type is detected, the user configurable action will be taken instead."
-msgstr "Если этот ключ установлен, Nautilus будет автоматически открывать папку при автоприсоединении носителя. Это относится только к носителям, для которых не определён тип x-content/*; для тех, у которых есть известный тип x-content, будет вместо этого предпринято настраиваемое пользователем действие."
+msgid ""
+"If set to true, then Nautilus will automatically open a folder when media is "
+"automounted. This only applies to media where no known x-content/* type was "
+"detected; for media where a known x-content type is detected, the user "
+"configurable action will be taken instead."
+msgstr ""
+"Если этот ключ установлен, Nautilus будет автоматически открывать папку при "
+"автоприсоединении носителя. Это относится только к носителям, для которых не "
+"определён тип x-content/*; для тех, у которых есть известный тип x-content, "
+"будет вместо этого предпринято настраиваемое пользователем действие."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
-msgstr "Если этот ключ установлен, Nautilus будет показывать значки на рабочем столе."
+msgstr ""
+"Если этот ключ установлен, Nautilus будет показывать значки на рабочем столе."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
-msgid "If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
-msgstr "Если этот ключ установлен, Nautilus будет позволять удалять файлы немедленно, без перемещения их в корзину. В этом случае вы можете нечаянно потерять важные данные, поэтому будьте осторожны."
+msgid ""
+"If set to true, then Nautilus will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"Если этот ключ установлен, Nautilus будет позволять удалять файлы "
+"немедленно, без перемещения их в корзину. В этом случае вы можете нечаянно "
+"потерять важные данные, поэтому будьте осторожны."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted."
-msgstr "Если этот ключ установлен, Nautilus никогда не будет запрашивать действие или автоматически запускать программы при вставке носителей."
+msgid ""
+"If set to true, then Nautilus will never prompt nor autorun/autostart "
+"programs when a medium is inserted."
+msgstr ""
+"Если этот ключ установлен, Nautilus никогда не будет запрашивать действие "
+"или автоматически запускать программы при вставке носителей."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-msgid "If set to true, then Nautilus will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "Если этот ключ установлен, в качестве рабочего стола будет использоваться домашняя папка пользователя. В противном случае в качестве рабочего стола будет использоваться папка ~/Desktop."
+msgid ""
+"If set to true, then Nautilus will use the user's home folder as the "
+"desktop. If it is false, then it will use ~/Desktop as the desktop."
+msgstr ""
+"Если этот ключ установлен, в качестве рабочего стола будет использоваться "
+"домашняя папка пользователя. В противном случае в качестве рабочего стола "
+"будет использоваться папка ~/Desktop."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "If set to true, then all Nautilus windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior."
-msgstr "Если этот ключ установлен, все окна Nautilus будут окнами обозревателя. Так Nautilus вёл себя до версии 2.6, и некоторые предпочитают такое поведение."
+msgid ""
+"If set to true, then all Nautilus windows will be browser windows. This is "
+"how Nautilus used to behave before version 2.6, and some people prefer this "
+"behavior."
+msgstr ""
+"Если этот ключ установлен, все окна Nautilus будут окнами обозревателя. Так "
+"Nautilus вёл себя до версии 2.6, и некоторые предпочитают такое поведение."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "If set to true, then backup files such as those created by Emacs are displayed. Currently, only files ending in a tilde (~) are considered backup files."
-msgstr "Если этот ключ установлен, будут показываться файлы резервных копий, подобные создаваемым редактором Emacs. На данный момент резервными копиями считаются только файлы, чьи имена заканчиваются на тильду (~)."
+msgid ""
+"If set to true, then backup files such as those created by Emacs are "
+"displayed. Currently, only files ending in a tilde (~) are considered backup "
+"files."
+msgstr ""
+"Если этот ключ установлен, будут показываться файлы резервных копий, "
+"подобные создаваемым редактором Emacs. На данный момент резервными копиями "
+"считаются только файлы, чьи имена заканчиваются на тильду (~)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
-msgid "If set to true, then hidden files are shown in the file manager. Hidden files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "Если этот ключ установлен, в менеджере файлов будут показываться скрытые файлы. Скрытыми являются файлы, имя которых начинается с точки, а также файлы, перечисленные в файле .hidden в соответствующей папке."
+msgid ""
+"If set to true, then hidden files are shown in the file manager. Hidden "
+"files are either dotfiles or are listed in the folder's .hidden file."
+msgstr ""
+"Если этот ключ установлен, в менеджере файлов будут показываться скрытые "
+"файлы. Скрытыми являются файлы, имя которых начинается с точки, а также "
+"файлы, перечисленные в файле .hidden в соответствующей папке."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
-msgid "If set to true, then multiple views can be opened in one browser window, each in a separate tab."
-msgstr "Если этот ключ установлен, в окне обозревателя может быть открыто множество видов, каждый в отдельной вкладке."
+msgid ""
+"If set to true, then multiple views can be opened in one browser window, "
+"each in a separate tab."
+msgstr ""
+"Если этот ключ установлен, в окне обозревателя может быть открыто множество "
+"видов, каждый в отдельной вкладке."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop."
-msgstr "Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся на «Сетевые серверы»."
+msgid ""
+"If this is set to true, an icon linking to the Network Servers view will be "
+"put on the desktop."
+msgstr ""
+"Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся "
+"на «Сетевые серверы»."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "If this is set to true, an icon linking to the computer location will be put on the desktop."
-msgstr "Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся на «Компьютер»."
+msgid ""
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
+msgstr ""
+"Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся "
+"на «Компьютер»."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop."
-msgstr "Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся на домашнюю папку."
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
+"the desktop."
+msgstr ""
+"Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся "
+"на домашнюю папку."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
-msgid "If this is set to true, an icon linking to the trash will be put on the desktop."
-msgstr "Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся на корзину."
+msgid ""
+"If this is set to true, an icon linking to the trash will be put on the "
+"desktop."
+msgstr ""
+"Если этот ключ установлен, на рабочий стол будет помещён значок, ссылающийся "
+"на корзину."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop."
-msgstr "Если этот ключ установлен, на рабочий стол будут помещаться значки, ссылающиеся на присоединённые тома."
+msgid ""
+"If this is set to true, icons linking to mounted volumes will be put on the "
+"desktop."
+msgstr ""
+"Если этот ключ установлен, на рабочий стол будут помещаться значки, "
+"ссылающиеся на присоединённые тома."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
-msgid "If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately."
-msgstr "Если этот ключ установлен, все столбцы в компактном виде будут иметь одинаковую ширину. В противном случае ширина каждого столбца будет определяться отдельно."
+msgid ""
+"If this preference is set, all columns in the compact view have the same "
+"width. Otherwise, the width of each column is determined seperately."
+msgstr ""
+"Если этот ключ установлен, все столбцы в компактном виде будут иметь "
+"одинаковую ширину. В противном случае ширина каждого столбца будет "
+"определяться отдельно."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"."
-msgstr "Если этот ключ установлен, файлы в новых окнах будут сортироваться в обратном порядке.  Например, если включена сортировка по имени, то вместо сортировки файлов в порядке от «а» до «я» файлы будут отсортированы в порядке от «я» до «а»."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"."
+msgstr ""
+"Если этот ключ установлен, файлы в новых окнах будут сортироваться в "
+"обратном порядке.  Например, если включена сортировка по имени, то вместо "
+"сортировки файлов в порядке от «а» до «я» файлы будут отсортированы в порядке "
+"от «я» до «а»."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally."
-msgstr "Если этот ключ установлен, файлы в новых окнах будут сортироваться в обратном порядке.  Например, если включена сортировка по имени, то вместо сортировки файлов в порядке от «а» до «я» файлы будут отсортированы в порядке от «я» до «а»; если же включена сортировка по размеру, то вместо порядка от меньшего к большему будет использован порядок от большего к меньшему."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"incrementally they will be sorted decrementally."
+msgstr ""
+"Если этот ключ установлен, файлы в новых окнах будут сортироваться в "
+"обратном порядке.  Например, если включена сортировка по имени, то вместо "
+"сортировки файлов в порядке от «а» до «я» файлы будут отсортированы в порядке "
+"от «я» до «а»; если же включена сортировка по размеру, то вместо порядка от "
+"меньшего к большему будет использован порядок от большего к меньшему."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "If true, icons will be laid out tighter by default in new windows."
-msgstr "Если этот ключ установлен, по умолчанию новые окна будут использовать плотное размещение значков."
+msgstr ""
+"Если этот ключ установлен, по умолчанию новые окна будут использовать "
+"плотное размещение значков."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
-msgstr "Если этот ключ установлен, подписи будут размещены сбоку от значков, а не под ними."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
+msgstr ""
+"Если этот ключ установлен, подписи будут размещены сбоку от значков, а не "
+"под ними."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid "If true, new windows will use manual layout by default."
-msgstr "Если этот ключ установлен, новые окна будут по умолчанию использовать ручное размещение."
+msgstr ""
+"Если этот ключ установлен, новые окна будут по умолчанию использовать ручное "
+"размещение."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory."
-msgstr "Для изображений, чей размер превышает заданный здесь (в байтах), файлы миниатюр создаваться не будут. Цель этого параметра — избежать построения миниатюр для больших изображений, для которых может потребоваться много времени на загрузку или много памяти."
+msgid ""
+"Images over this size (in bytes) won't be thumbnailed. The purpose of this "
+"setting is to avoid thumbnailing large images that may take a long time to "
+"load or use lots of memory."
+msgstr ""
+"Для изображений, чей размер превышает заданный здесь (в байтах), файлы "
+"миниатюр создаваться не будут. Цель этого параметра — избежать построения "
+"миниатюр для больших изображений, для которых может потребоваться много "
+"времени на загрузку или много памяти."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "List of possible captions on icons"
 msgstr "Список возможных подписей к значкам"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
-msgid "List of x-content/* types for which the user have chosen \"Do Nothing\" in the preference capplet. No prompt will be shown nor will any matching application be started on insertion of media matching these types."
-msgstr "Список типов x-content/*, для которых пользователь выбрал «Ничего не делать». При вставке носителя с данными указанного типа не будут автоматически запускать приложения, не будет предложено выбрать то или иное приложение на усмотрение пользователя."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Do Nothing\" in "
+"the preference capplet. No prompt will be shown nor will any matching "
+"application be started on insertion of media matching these types."
+msgstr ""
+"Список типов x-content/*, для которых пользователь выбрал «Ничего не делать». "
+"При вставке носителя с данными указанного типа не будут автоматически "
+"запускать приложения, не будет предложено выбрать то или иное приложение на "
+"усмотрение пользователя."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
-msgid "List of x-content/* types for which the user have chosen \"Open Folder\" in the preferences capplet. A folder window will be opened on insertion of media matching these types."
-msgstr "Список типов x-content/*, для которых пользователь в параметрах программы выбрал «Открыть папку». Окно с папкой будет открыто при вставке носителя с данными указанного здесь типа."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Open Folder\" in "
+"the preferences capplet. A folder window will be opened on insertion of "
+"media matching these types."
+msgstr ""
+"Список типов x-content/*, для которых пользователь в параметрах программы "
+"выбрал «Открыть папку». Окно с папкой будет открыто при вставке носителя с "
+"данными указанного здесь типа."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
-msgid "List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types."
-msgstr "Список типов x-content/*, для которых пользователь в параметрах программы выбрал «Открыть папку». Предпочитаемое приложение будет открыто при вставке носителя с данными указанного здесь типа."
+msgid ""
+"List of x-content/* types for which the user have chosen to start an "
+"application in the preference capplet. The preferred application for the "
+"given type will be started on insertion on media matching these types."
+msgstr ""
+"Список типов x-content/*, для которых пользователь в параметрах программы "
+"выбрал «Открыть папку». Предпочитаемое приложение будет открыто при вставке "
+"носителя с данными указанного здесь типа."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -612,7 +869,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "Типы x-content/* для «Открыть папку»"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "Типы x-content/* для которых будет открыто предпочитаемое приложение"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -624,8 +882,12 @@ msgid "Maximum image size for thumbnailing"
 msgstr "Максимальный размер изображения для построения миниатюр"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Name of the Nautilus theme to use. This has been deprecated as of Nautilus 2.2. Please use the icon theme instead."
-msgstr "Имя темы, которую использует Nautilus. Этот параметр устарел начиная с версии 2.2. Используйте вместо этого тему значков."
+msgid ""
+"Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
+"2.2. Please use the icon theme instead."
+msgstr ""
+"Имя темы, которую использует Nautilus. Этот параметр устарел начиная с "
+"версии 2.2. Используйте вместо этого тему значков."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "Nautilus handles drawing the desktop"
@@ -652,8 +914,12 @@ msgid "Only show folders in the tree side pane"
 msgstr "Показывать только папки в боковой панели «Дерево»"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click."
-msgstr "Допустимыми значениями являются: \"single\" для запуска файлов одинарным щелчком и \"double\" для запуска файлов двойным щелчком."
+msgid ""
+"Possible values are \"single\" to launch files on a single click, or \"double"
+"\" to launch them on a double click."
+msgstr ""
+"Допустимыми значениями являются: \"single\" для запуска файлов одинарным "
+"щелчком и \"double\" для запуска файлов двойным щелчком."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Put labels beside icons"
@@ -703,20 +969,58 @@ msgid "Side pane view"
 msgstr "Режим боковой панели"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
-msgid "Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to \"always\" then always plays the sound, even if the file is on a remote server. If set to \"local_only\" then only plays previews on local file systems. If set to \"never\" then it never previews sound."
-msgstr "Критерий воспроизведения звуковых файлов при наведении на них курсора мыши. Если установлено \"always\", файлы будут воспроизводиться всегда, даже если они на удалённом сервере. Если установлено \"local_only\", будут воспроизводиться только локальные файлы. Если установлено \"never\", файлы никогда не будут воспроизводиться при наведении мыши."
+msgid ""
+"Speed tradeoff for when to preview a sound file when mousing over a files "
+"icon. If set to \"always\" then always plays the sound, even if the file is "
+"on a remote server. If set to \"local_only\" then only plays previews on "
+"local file systems. If set to \"never\" then it never previews sound."
+msgstr ""
+"Критерий воспроизведения звуковых файлов при наведении на них курсора мыши. "
+"Если установлено \"always\", файлы будут воспроизводиться всегда, даже если "
+"они на удалённом сервере. Если установлено \"local_only\", будут "
+"воспроизводиться только локальные файлы. Если установлено \"never\", файлы "
+"никогда не будут воспроизводиться при наведении мыши."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
-msgid "Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to \"always\" then always show previews, even if the folder is on a remote server. If set to \"local_only\" then only show previews for local file systems. If set to \"never\" then never bother to read preview data."
-msgstr "Критерий отображения образцов текстовых файлов. Если установлено \"always\", образцы будут отображаться всегда, даже если папка находится на удалённом сервере. Если установлено \"local_only\", образцы будут создаваться только для файлов на локальных файловых системах. Если установлено \"never\", вместо образцов всегда будет использоваться значок типа файла."
+msgid ""
+"Speed tradeoff for when to show a preview of text file contents in the "
+"file's icon. If set to \"always\" then always show previews, even if the "
+"folder is on a remote server. If set to \"local_only\" then only show "
+"previews for local file systems. If set to \"never\" then never bother to "
+"read preview data."
+msgstr ""
+"Критерий отображения образцов текстовых файлов. Если установлено \"always\", "
+"образцы будут отображаться всегда, даже если папка находится на удалённом "
+"сервере. Если установлено \"local_only\", образцы будут создаваться только "
+"для файлов на локальных файловых системах. Если установлено \"never\", "
+"вместо образцов всегда будет использоваться значок типа файла."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
-msgid "Speed tradeoff for when to show an image file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local_only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail images, just use a generic icon."
-msgstr "Критерий отображения миниатюр. Если установлено \"always\", миниатюры будут отображаться всегда, даже если папка находится на удалённом сервере. Если установлено \"local_only\", миниатюры будут создаваться только для файлов на локальных файловых системах. Если установлено \"never\", вместо миниатюр всегда будет использоваться значок типа файла."
+msgid ""
+"Speed tradeoff for when to show an image file as a thumbnail. If set to "
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"If set to \"local_only\" then only show thumbnails for local file systems. "
+"If set to \"never\" then never bother to thumbnail images, just use a "
+"generic icon."
+msgstr ""
+"Критерий отображения миниатюр. Если установлено \"always\", миниатюры будут "
+"отображаться всегда, даже если папка находится на удалённом сервере. Если "
+"установлено \"local_only\", миниатюры будут создаваться только для файлов на "
+"локальных файловых системах. Если установлено \"never\", вместо миниатюр "
+"всегда будет использоваться значок типа файла."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local_only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts."
-msgstr "Критерий отображения количества объектов в папке. Если установлено \"always\", количество объектов будет подсчитываться всегда, даже если папка находится на удалённом сервере. Если установлено \"local_only\", количество объектов будет подсчитываться только для локальных файловых систем. Если установлено \"never\", количество объектов никогда не будет подсчитываться."
+msgid ""
+"Speed tradeoff for when to show the number of items in a folder. If set to "
+"\"always\" then always show item counts, even if the folder is on a remote "
+"server. If set to \"local_only\" then only show counts for local file "
+"systems. If set to \"never\" then never bother to compute item counts."
+msgstr ""
+"Критерий отображения количества объектов в папке. Если установлено \"always"
+"\", количество объектов будет подсчитываться всегда, даже если папка "
+"находится на удалённом сервере. Если установлено \"local_only\", количество "
+"объектов будет подсчитываться только для локальных файловых систем. Если "
+"установлено \"never\", количество объектов никогда не будет подсчитываться."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid "Text Ellipsis Limit"
@@ -727,12 +1031,20 @@ msgid "The default size of an icon for a thumbnail in the icon view."
 msgstr "Размер миниатюры по умолчанию при просмотре в виде значков."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:112
-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-msgstr "Порядок сортировки объектов по умолчанию в режиме значков. Допустимые значения: \"name\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+msgid ""
+"The default sort-order for items in the icon view. Possible values are \"name"
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
+msgstr ""
+"Порядок сортировки объектов по умолчанию в режиме значков. Допустимые "
+"значения: \"name\", \"size\", \"type\", \"modification_date\", \"emblems\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
-msgid "The default sort-order for the items in the list view. Possible values are \"name\", \"size\", \"type\", and \"modification_date\"."
-msgstr "Порядок сортировки объектов по умолчанию в режиме списка. Допустимые значения: \"name\", \"size\", \"type\", \"modification_date\"."
+msgid ""
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
+msgstr ""
+"Порядок сортировки объектов по умолчанию в режиме списка. Допустимые "
+"значения: \"name\", \"size\", \"type\", \"modification_date\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
 msgid "The default width of the side pane in new windows."
@@ -740,31 +1052,53 @@ msgstr "Ширина боковой панели в новых окнах по �
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:115
 msgid "The font description used for the icons on the desktop."
-msgstr "Описание шрифта, использующегося для подписей к значкам на рабочем столе."
+msgstr ""
+"Описание шрифта, использующегося для подписей к значкам на рабочем столе."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:116
-msgid "The format of file dates. Possible values are \"locale\", \"iso\", and \"informal\"."
-msgstr "Формат даты файлов. Возможные значения: \"locale\", \"iso\" и \"informal\"."
+msgid ""
+"The format of file dates. Possible values are \"locale\", \"iso\", and "
+"\"informal\"."
+msgstr ""
+"Формат даты файлов. Возможные значения: \"locale\", \"iso\" и \"informal\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
-msgstr "Какой именно режим (компонент просмотра) использовать на боковой панели в новых окнах."
+msgstr ""
+"Какой именно режим (компонент просмотра) использовать на боковой панели в "
+"новых окнах."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
-msgid "This name can be set if you want a custom name for the computer icon on the desktop."
-msgstr "Это имя может быть установлено, если необходимо переименовать значок компьютера на рабочем столе."
+msgid ""
+"This name can be set if you want a custom name for the computer icon on the "
+"desktop."
+msgstr ""
+"Это имя может быть установлено, если необходимо переименовать значок "
+"компьютера на рабочем столе."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:119
-msgid "This name can be set if you want a custom name for the home icon on the desktop."
-msgstr "Это имя может быть установлено, если необходимо переименовать значок домашней папки на рабочем столе."
+msgid ""
+"This name can be set if you want a custom name for the home icon on the "
+"desktop."
+msgstr ""
+"Это имя может быть установлено, если необходимо переименовать значок "
+"домашней папки на рабочем столе."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:120
-msgid "This name can be set if you want a custom name for the network servers icon on the desktop."
-msgstr "Это имя может быть установлено, если необходимо переименовать значок сетевых серверов на рабочем столе."
+msgid ""
+"This name can be set if you want a custom name for the network servers icon "
+"on the desktop."
+msgstr ""
+"Это имя может быть установлено, если необходимо переименовать значок сетевых "
+"серверов на рабочем столе."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:121
-msgid "This name can be set if you want a custom name for the trash icon on the desktop."
-msgstr "Это имя может быть установлено, если необходимо переименовать значок корзины на рабочем столе."
+msgid ""
+"This name can be set if you want a custom name for the trash icon on the "
+"desktop."
+msgstr ""
+"Это имя может быть установлено, если необходимо переименовать значок корзины "
+"на рабочем столе."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
 msgid "Trash icon visible on desktop"
@@ -787,12 +1121,26 @@ msgid "What to do with executable text files when activated"
 msgstr "Что делать с исполняемыми текстовыми файлами при их активизации"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files."
-msgstr "Что делать с исполняемыми текстовыми файлами при их активизации (одиночным или двойным щелчком, например). Допустимые значения: \"launch\" — запускать их как программы; \"ask\" — запрашивать нужное действие через диалог; \"display\" — показывать их как текстовые файлы."
+msgid ""
+"What to do with executable text files when they are activated (single or "
+"double clicked). Possible values are \"launch\" to launch them as programs, "
+"\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
+"text files."
+msgstr ""
+"Что делать с исполняемыми текстовыми файлами при их активизации (одиночным "
+"или двойным щелчком, например). Допустимые значения: \"launch\" — запускать "
+"их как программы; \"ask\" — запрашивать нужное действие через диалог; "
+"\"display\" — показывать их как текстовые файлы."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list_view\", \"icon_view\" and \"compact_view\"."
-msgstr "При посещении папки будет использоваться этот режим просмотра, если только вы не выбрали другой режим именно для этой папки. Возможные варианты — \"list_view\", \"icon_view\" и \"compact_view\"."
+msgid ""
+"When a folder is visited this viewer is used unless you have selected "
+"another view for that particular folder. Possible values are \"list_view\", "
+"\"icon_view\" and \"compact_view\"."
+msgstr ""
+"При посещении папки будет использоваться этот режим просмотра, если только "
+"вы не выбрали другой режим именно для этой папки. Возможные варианты — "
+"\"list_view\", \"icon_view\" и \"compact_view\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "When to show number of items in a folder"
@@ -820,7 +1168,8 @@ msgstr "Установлен ли пользовательский фон по �
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "Надо ли запрашивать подтверждение при удалении файлов или очистке корзины"
+msgstr ""
+"Надо ли запрашивать подтверждение при удалении файлов или очистке корзины"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Whether to automatically mount media"
@@ -934,8 +1283,12 @@ msgid "You have just inserted a digital audio player."
 msgstr "Вы только что вставили цифровой аудио-плеер."
 
 #: ../libnautilus-private/nautilus-autorun.c:917
-msgid "You have just inserted a medium with software intended to be automatically started."
-msgstr "Вы только что вставили носитель, на котором есть программа, предназначенная для автоматического запуска."
+msgid ""
+"You have just inserted a medium with software intended to be automatically "
+"started."
+msgstr ""
+"Вы только что вставили носитель, на котором есть программа, предназначенная "
+"для автоматического запуска."
 
 #. fallback to generic greeting
 #: ../libnautilus-private/nautilus-autorun.c:920
@@ -948,8 +1301,12 @@ msgstr "Выберите, какое приложение запустить."
 
 #: ../libnautilus-private/nautilus-autorun.c:931
 #, c-format
-msgid "Select how to open \"%s\" and whether to perform this action in the future for other media of type \"%s\"."
-msgstr "Выберите, как открывать «%s» и надо ли выполнять это же действие в будущем для других носителей типа «%s»."
+msgid ""
+"Select how to open \"%s\" and whether to perform this action in the future "
+"for other media of type \"%s\"."
+msgstr ""
+"Выберите, как открывать «%s» и надо ли выполнять это же действие в будущем "
+"для других носителей типа «%s»."
 
 #: ../libnautilus-private/nautilus-autorun.c:953
 msgid "_Always perform this action"
@@ -1118,12 +1475,20 @@ msgid "You cannot move the volume \"%s\" to the trash."
 msgstr "Вы не можете отправить том «%s» в корзину."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:111
-msgid "If you want to eject the volume, please use \"Eject\" in the popup menu of the volume."
-msgstr "Если вы хотите извлечь том, используйте пункт «Извлечь» в контекстном меню этого тома."
+msgid ""
+"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"the volume."
+msgstr ""
+"Если вы хотите извлечь том, используйте пункт «Извлечь» в контекстном меню "
+"этого тома."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
-msgid "If you want to unmount the volume, please use \"Unmount Volume\" in the popup menu of the volume."
-msgstr "Если вы хотите отсоединить том, используйте пункт «Отсоединить том» в контекстном меню этого тома."
+msgid ""
+"If you want to unmount the volume, please use \"Unmount Volume\" in the "
+"popup menu of the volume."
+msgstr ""
+"Если вы хотите отсоединить том, используйте пункт «Отсоединить том» в "
+"контекстном меню этого тома."
 
 #: ../libnautilus-private/nautilus-dnd.c:748
 msgid "_Move Here"
@@ -1167,7 +1532,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Нужно указать непустое ключевое слово для новой эмблемы."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "Ключевые слова эмблемы могут содержать только буквы, пробелы и цифры."
 
 #. this really should never happen, as a user has no idea
@@ -1401,11 +1767,21 @@ msgstr "Вы действительно хотите окончательно у
 
 #: ../libnautilus-private/nautilus-file-operations.c:1211
 #, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items from the trash?"
-msgstr[0] "Вы действительно хотите окончательно удалить %'d выделенный элемент из корзины?"
-msgstr[1] "Вы действительно хотите окончательно удалить %'d выделенных элемента из корзины?"
-msgstr[2] "Вы действительно хотите окончательно удалить %'d выделенных элементов из корзины?"
+msgid ""
+"Are you sure you want to permanently delete the %'d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items from the "
+"trash?"
+msgstr[0] ""
+"Вы действительно хотите окончательно удалить %'d выделенный элемент из "
+"корзины?"
+msgstr[1] ""
+"Вы действительно хотите окончательно удалить %'d выделенных элемента из "
+"корзины?"
+msgstr[2] ""
+"Вы действительно хотите окончательно удалить %'d выделенных элементов из "
+"корзины?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1221
 #: ../libnautilus-private/nautilus-file-operations.c:1289
@@ -1417,14 +1793,17 @@ msgid "Empty all of the items from the trash?"
 msgstr "Очистить все элементы из корзины?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1245
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "Если вы очистите корзину, все элементы в ней будут удалены окончательно. Учтите, что вы можете также удалить их по одному."
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Если вы очистите корзину, все элементы в ней будут удалены окончательно. "
+"Учтите, что вы можете также удалить их по одному."
 
 #. Empty Trash menu item
 #: ../libnautilus-private/nautilus-file-operations.c:1250
 #: ../libnautilus-private/nautilus-file-operations.c:2076
-#: ../src/nautilus-places-sidebar.c:2035
-#: ../src/nautilus-trash-bar.c:125
+#: ../src/nautilus-places-sidebar.c:2035 ../src/nautilus-trash-bar.c:125
 msgid "Empty _Trash"
 msgstr "О_чистить корзину"
 
@@ -1435,10 +1814,14 @@ msgstr "Вы действительно хотите безвозвратно у
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Вы действительно хотите безвозвратно удалить %'d выделенный элемент?"
-msgstr[1] "Вы действительно хотите безвозвратно удалить %'d выделенных элемента?"
-msgstr[2] "Вы действительно хотите безвозвратно удалить %'d выделенных элементов?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
+msgstr[0] ""
+"Вы действительно хотите безвозвратно удалить %'d выделенный элемент?"
+msgstr[1] ""
+"Вы действительно хотите безвозвратно удалить %'d выделенных элемента?"
+msgstr[2] ""
+"Вы действительно хотите безвозвратно удалить %'d выделенных элементов?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1323
 msgid "Deleting files"
@@ -1469,13 +1852,17 @@ msgid "Error while deleting."
 msgstr "Произошла ошибка при удалении."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1404
-msgid "Files in the folder \"%B\" cannot be deleted because you do not have permissions to see them."
-msgstr "Нельзя удалить файлы в папке «%B», потому что у вас нет прав на их просмотр."
+msgid ""
+"Files in the folder \"%B\" cannot be deleted because you do not have "
+"permissions to see them."
+msgstr ""
+"Нельзя удалить файлы в папке «%B», потому что у вас нет прав на их просмотр."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr "Произошла ошибка при получении сведений о файлах в папке «%B»."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
@@ -1484,7 +1871,9 @@ msgid "_Skip files"
 msgstr "_Пропустить файлы"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1437
-msgid "The folder \"%B\" cannot be deleted because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"read it."
 msgstr "Нельзя удалить папку «%B», потому что у вас нет прав на её чтение."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
@@ -1534,8 +1923,12 @@ msgid "Do you want to empty the trash before you unmount?"
 msgstr "Очистить корзину перед отсоединением?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2068
-msgid "In order to regain the free space on this volume the trash must be emptied. All trashed items on the volume will be permanently lost."
-msgstr "Чтобы освободить место на этом томе, нужно очистить корзину. При этом все объекты, находящиеся в корзине на этом томе, будут безвозвратно утеряны."
+msgid ""
+"In order to regain the free space on this volume the trash must be emptied. "
+"All trashed items on the volume will be permanently lost."
+msgstr ""
+"Чтобы освободить место на этом томе, нужно очистить корзину. При этом все "
+"объекты, находящиеся в корзине на этом томе, будут безвозвратно утеряны."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2074
 msgid "Do _not Empty Trash"
@@ -1596,15 +1989,23 @@ msgid "Error while moving files to trash."
 msgstr "Произошла ошибка при удалении файлов в корзину."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2359
-msgid "Files in the folder \"%B\" cannot be handled because you do not have permissions to see them."
-msgstr "Нельзя обработать файлы в папке «%B», потому что у вас нет прав на их просмотр."
+msgid ""
+"Files in the folder \"%B\" cannot be handled because you do not have "
+"permissions to see them."
+msgstr ""
+"Нельзя обработать файлы в папке «%B», потому что у вас нет прав на их "
+"просмотр."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2398
-msgid "The folder \"%B\" cannot be handled because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be handled because you do not have permissions to "
+"read it."
 msgstr "Нельзя обработать папку «%B», потому что у вас нет прав на её чтение."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2475
-msgid "The file \"%B\" cannot be handled because you do not have permissions to read it."
+msgid ""
+"The file \"%B\" cannot be handled because you do not have permissions to "
+"read it."
 msgstr "Нельзя обработать файл «%B», потому что у вас нет прав на его чтение."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
@@ -1631,8 +2032,12 @@ msgid "The destination is not a folder."
 msgstr "Место назначения не является папкой."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2654
-msgid "There is not enough space on the destination. Try to remove files to make space."
-msgstr "Недостаточно места на устройстве назначения. Попробуйте удалить какие-нибудь файлы, чтобы освободить место."
+msgid ""
+"There is not enough space on the destination. Try to remove files to make "
+"space."
+msgstr ""
+"Недостаточно места на устройстве назначения. Попробуйте удалить какие-нибудь "
+"файлы, чтобы освободить место."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2656
 #, c-format
@@ -1712,19 +2117,29 @@ msgid "%S of %S — %T left (%S/sec)"
 msgstr "%S из %S — осталось %T (%S/с)"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3177
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to create it in the destination."
-msgstr "Нельзя скопировать папку «%B», потому что у вас нет прав на создание её в месте назначения."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"create it in the destination."
+msgstr ""
+"Нельзя скопировать папку «%B», потому что у вас нет прав на создание её в "
+"месте назначения."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3180
 msgid "There was an error creating the folder \"%B\"."
 msgstr "Произошла ошибка при создании папки «%B»."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3301
-msgid "Files in the folder \"%B\" cannot be copied because you do not have permissions to see them."
-msgstr "Нельзя скопировать файлы из папки «%B», потому что у вас нет прав на их просмотр."
+msgid ""
+"Files in the folder \"%B\" cannot be copied because you do not have "
+"permissions to see them."
+msgstr ""
+"Нельзя скопировать файлы из папки «%B», потому что у вас нет прав на их "
+"просмотр."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3346
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"read it."
 msgstr "Нельзя скопировать папку «%B», потому что у вас нет прав на её чтение."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3389
@@ -1772,12 +2187,19 @@ msgstr "Папка назначения находится внутри папк
 
 #: ../libnautilus-private/nautilus-file-operations.c:3807
 #: ../libnautilus-private/nautilus-file-operations.c:4378
-msgid "A folder named \"%B\" already exists.  Do you want to merge the source folder?"
+msgid ""
+"A folder named \"%B\" already exists.  Do you want to merge the source "
+"folder?"
 msgstr "Папка «%B» уже существует. Вы хотите совместить её с исходной папкой?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3809
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied."
-msgstr "В «%B» уже есть исходная папка. Если при совмещении возникнут конфликты с копируемыми файлами, вам будет предложено подтвердить замену."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being copied."
+msgstr ""
+"В «%B» уже есть исходная папка. Если при совмещении возникнут конфликты с "
+"копируемыми файлами, вам будет предложено подтвердить замену."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3814
 #: ../libnautilus-private/nautilus-file-operations.c:4385
@@ -1787,8 +2209,12 @@ msgstr "Папка «%B» уже существует. Вы хотите зам�
 #: ../libnautilus-private/nautilus-file-operations.c:3816
 #: ../libnautilus-private/nautilus-file-operations.c:4387
 #, c-format
-msgid "The folder already exists in \"%F\".  Replacing it will remove all files in the folder."
-msgstr "В «%F» уже есть такая папка. Если её заменить, то все файлы в ней будут удалены."
+msgid ""
+"The folder already exists in \"%F\".  Replacing it will remove all files in "
+"the folder."
+msgstr ""
+"В «%F» уже есть такая папка. Если её заменить, то все файлы в ней будут "
+"удалены."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3821
 #: ../libnautilus-private/nautilus-file-operations.c:4392
@@ -1798,8 +2224,11 @@ msgstr "Файл «%B» уже существует. Вы хотите заме�
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr "В «%F» уже есть такой файл. Если его заменить, то его содержимое будет перезаписано."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgstr ""
+"В «%F» уже есть такой файл. Если его заменить, то его содержимое будет "
+"перезаписано."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3913
 #, c-format
@@ -1824,8 +2253,13 @@ msgstr[1] "Идёт подготовка к перемещению %'d файл�
 msgstr[2] "Идёт подготовка к перемещению %'d файлов"
 
 #: ../libnautilus-private/nautilus-file-operations.c:4380
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being moved."
-msgstr "В «%B» уже есть исходная папка. Если при совмещении возникнут конфликты с перемещаемыми файлами, вам будет предложено подтвердить замену."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being moved."
+msgstr ""
+"В «%B» уже есть исходная папка. Если при совмещении возникнут конфликты с "
+"перемещаемыми файлами, вам будет предложено подтвердить замену."
 
 #: ../libnautilus-private/nautilus-file-operations.c:4470
 #, c-format
@@ -2366,8 +2800,7 @@ msgid "Computer"
 msgstr "Компьютер"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:571
-#: ../src/nautilus-places-sidebar.c:483
-#: ../src/nautilus-trash-bar.c:121
+#: ../src/nautilus-places-sidebar.c:483 ../src/nautilus-trash-bar.c:121
 msgid "Trash"
 msgstr "Корзина"
 
@@ -2615,8 +3048,12 @@ msgstr "Открыть не удалось, хотите выбрать друг
 #: ../libnautilus-private/nautilus-program-choosing.c:82
 #: ../libnautilus-private/nautilus-program-choosing.c:113
 #, c-format
-msgid "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" locations."
-msgstr "«%s» не может открыть «%s», потому что «%s» не имеет доступа к файлам по адресам «%s»."
+msgid ""
+"\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
+"locations."
+msgstr ""
+"«%s» не может открыть «%s», потому что «%s» не имеет доступа к файлам по "
+"адресам «%s»."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:87
 msgid "Open Failed, would you like to choose another action?"
@@ -2625,16 +3062,28 @@ msgstr "Открыть не удалось, хотите выбрать друг
 #: ../libnautilus-private/nautilus-program-choosing.c:88
 #: ../libnautilus-private/nautilus-program-choosing.c:120
 #, c-format
-msgid "The default action cannot open \"%s\" because it cannot access files at \"%s\" locations."
-msgstr "Действие по умолчанию не может открыть «%s», потому что не имеет доступа к файлам по адресам «%s»."
+msgid ""
+"The default action cannot open \"%s\" because it cannot access files at \"%s"
+"\" locations."
+msgstr ""
+"Действие по умолчанию не может открыть «%s», потому что не имеет доступа к "
+"файлам по адресам «%s»."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:116
-msgid "No other applications are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Нет других приложений для просмотра этого файла. Возможно, вы сможете открыть этот файл, если скопируете его на ваш компьютер."
+msgid ""
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
+msgstr ""
+"Нет других приложений для просмотра этого файла. Возможно, вы сможете "
+"открыть этот файл, если скопируете его на ваш компьютер."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:122
-msgid "No other actions are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Нет других действий для просмотра этого файла. Возможно, вы сможете открыть этот файл, если скопируете его на ваш компьютер."
+msgid ""
+"No other actions are available to view this file.  If you copy this file "
+"onto your computer, you may be able to open it."
+msgstr ""
+"Нет других действий для просмотра этого файла. Возможно, вы сможете открыть "
+"этот файл, если скопируете его на ваш компьютер."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:361
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -2655,12 +3104,19 @@ msgid "This drop target only supports local files."
 msgstr "Цель для перетаскивания поддерживает только локальные файлы."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:400
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "Чтобы открыть так файлы с сетевого ресурса, скопируйте их в локальную папку и перетащите их снова."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"Чтобы открыть так файлы с сетевого ресурса, скопируйте их в локальную папку "
+"и перетащите их снова."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:411
-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened."
-msgstr "Чтобы открыть так файлы с сетевого ресурса, скопируйте их в локальную папку и перетащите их снова. Перетащенные вами локальные файлы уже открыты."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them "
+"again. The local files you dropped have already been opened."
+msgstr ""
+"Чтобы открыть так файлы с сетевого ресурса, скопируйте их в локальную папку "
+"и перетащите их снова. Перетащенные вами локальные файлы уже открыты."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:440
 msgid "Details: "
@@ -2721,10 +3177,12 @@ msgid "Autorun Prompt"
 msgstr "Предложение автозапуска"
 
 #. tooltip
-#: ../nautilus-computer.desktop.in.in.h:1
-#: ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "Просмотреть все локальные и удалённые диски и папки, доступные с этого компьютера"
+#: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"Просмотреть все локальные и удалённые диски и папки, доступные с этого "
+"компьютера"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
@@ -2734,14 +3192,12 @@ msgstr "Изменить внешний вид и поведение окон ф
 msgid "File Management"
 msgstr "Управление файлами"
 
-#: ../nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1341
+#: ../nautilus-home.desktop.in.in.h:1 ../src/file-manager/fm-tree-view.c:1341
 msgid "Home Folder"
 msgstr "Домашняя папка"
 
 #. tooltip
-#: ../nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-window-menus.c:858
+#: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:858
 msgid "Open your personal folder"
 msgstr "Открыть вашу личную папку"
 
@@ -2770,8 +3226,11 @@ msgid "Nautilus metafile factory"
 msgstr "Фабрика метафайла Nautilus"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
-msgstr "Действия Nautilus, которые могут быть произведены путём последующих вызовов из командной строки"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
+msgstr ""
+"Действия Nautilus, которые могут быть произведены путём последующих вызовов "
+"из командной строки"
 
 #: ../src/Nautilus_shell.server.in.h:6
 msgid "Produces metafile objects for accessing Nautilus metadata"
@@ -2810,8 +3269,11 @@ msgstr "Изменить _фон рабочего стола"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
-msgstr "Показать окно, которое позволит вам установить орнамент или цвет фона вашего рабочего стола"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+"Показать окно, которое позволит вам установить орнамент или цвет фона вашего "
+"рабочего стола"
 
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:706
@@ -2999,18 +3461,27 @@ msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "Все исполняемые файлы из этой папки будут показаны в меню «Сценарии»."
 
 #: ../src/file-manager/fm-directory-view.c:5519
-msgid "Choosing a script from the menu will run that script with any selected items as input."
-msgstr "Если выбрать сценарий из меню, он будет запущен, и ему будут переданы все выделенные объекты."
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+"Если выбрать сценарий из меню, он будет запущен, и ему будут переданы все "
+"выделенные объекты."
 
 #: ../src/file-manager/fm-directory-view.c:5521
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
-"When executed from a local folder, scripts will be passed the selected file names. When executed from a remote folder (e.g. a folder showing web or ftp content), scripts will be passed no parameters.\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
 "\n"
-"In all cases, the following environment variables will be set by Nautilus, which the scripts may use:\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected files (only if local)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
 "\n"
@@ -3018,15 +3489,22 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"Все исполняемые файлы из этой папки появятся в меню «Сценарии». Если выбрать сценарий из меню, он будет запущен.\n"
+"Все исполняемые файлы из этой папки появятся в меню «Сценарии». Если выбрать "
+"сценарий из меню, он будет запущен.\n"
 "\n"
-"При запуске из локальной папки сценариям будут переданы имена выделенных файлов. При загрузке из удалённой папки (к примеру, из папки, отображающей содержимое файлового или FTP-сервера), сценариям не будут переданы параметры.\n"
+"При запуске из локальной папки сценариям будут переданы имена выделенных "
+"файлов. При загрузке из удалённой папки (к примеру, из папки, отображающей "
+"содержимое файлового или FTP-сервера), сценариям не будут переданы "
+"параметры.\n"
 "\n"
-"Во всех случаях Nautilus установит для сценариев следующие переменные окружения:\n"
+"Во всех случаях Nautilus установит для сценариев следующие переменные "
+"окружения:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: список выделенных файлов, разделённых переводом строки (только в локальном случае)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: список выделенных файлов, разделённых "
+"переводом строки (только в локальном случае)\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: список адресов (URI) выделенных файлов, разделённых переводом строки\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: список адресов (URI) выделенных файлов, "
+"разделённых переводом строки\n"
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: текущий адрес URI\n"
 "\n"
@@ -3047,18 +3525,27 @@ msgstr "Объект «%s» будет скопирован, когда вы в�
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
-msgstr[0] "%'d выделенный объект будет перемещён, когда вы выберете команду «Вставить»"
-msgstr[1] "%'d выделенных объекта будут перемещены, когда вы выберете команду «Вставить»"
-msgstr[2] "%'d выделенных объектов будет перемещено, когда вы выберете команду «Вставить»"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"%'d выделенный объект будет перемещён, когда вы выберете команду «Вставить»"
+msgstr[1] ""
+"%'d выделенных объекта будут перемещены, когда вы выберете команду «Вставить»"
+msgstr[2] ""
+"%'d выделенных объектов будет перемещено, когда вы выберете команду «Вставить»"
 
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "%'d выделенный объект будет скопирован, когда вы выберете команду «Вставить»"
-msgstr[1] "%'d выделенных объекта будут скопированы, когда вы выберете команду «Вставить»"
-msgstr[2] "%'d выделенных объектов будет скопировано, когда вы выберете команду «Вставить»"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"%'d выделенный объект будет скопирован, когда вы выберете команду «Вставить»"
+msgstr[1] ""
+"%'d выделенных объекта будут скопированы, когда вы выберете команду «Вставить»"
+msgstr[2] ""
+"%'d выделенных объектов будет скопировано, когда вы выберете команду "
+"«Вставить»"
 
 #: ../src/file-manager/fm-directory-view.c:5767
 #: ../src/file-manager/fm-tree-view.c:1013
@@ -3241,7 +3728,9 @@ msgstr "Подготовить выделенные файлы к копиров
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6644
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Переместить или скопировать файлы, выбранные ранее командой «Вырезать» или «Копировать»"
+msgstr ""
+"Переместить или скопировать файлы, выбранные ранее командой «Вырезать» или "
+"«Копировать»"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3255,8 +3744,12 @@ msgstr "Вст_авить в папку"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6650
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Переместить или скопировать файлы, выбранные ранее командой «Вырезать» или «Копировать», в выделенную папку"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Переместить или скопировать файлы, выбранные ранее командой «Вырезать» или "
+"«Копировать», в выделенную папку"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6654
@@ -3364,7 +3857,9 @@ msgstr "Сб_росить параметры просмотра"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6700
 msgid "Reset sorting order and zoom level to match preferences for this view"
-msgstr "Привести порядок сортировки и масштаб в соответствие с параметрами этого режима просмотра"
+msgstr ""
+"Привести порядок сортировки и масштаб в соответствие с параметрами этого "
+"режима просмотра"
 
 #. name, stock id
 #. label, accelerator
@@ -3509,8 +4004,12 @@ msgstr "Подготовить эту папку к копированию с п
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6776
-msgid "Move or copy files previously selected by a Cut or Copy command into this folder"
-msgstr "Переместить или скопировать файлы, выбранные ранее командой «Вырезать» или «Копировать», в выделенную папку"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into this "
+"folder"
+msgstr ""
+"Переместить или скопировать файлы, выбранные ранее командой «Вырезать» или "
+"«Копировать», в выделенную папку"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6781
@@ -3750,7 +4249,8 @@ msgstr "Команда"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Вам запрещено просматривать содержимое объекта «%s»."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -3769,13 +4269,17 @@ msgstr "Не удалось показать содержимое папки."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Имя «%s» уже используется в этой папке. Выберите другое имя."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "В этой папке нет объекта «%s». Возможно, он был только что перемещён или удалён?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+"В этой папке нет объекта «%s». Возможно, он был только что перемещён или "
+"удалён?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
@@ -3784,8 +4288,11 @@ msgstr "Вам запрещено переименовывать объект «
 
 #: ../src/file-manager/fm-error-reporting.c:118
 #, c-format
-msgid "The name \"%s\" is not valid because it contains the character \"/\". Please use a different name."
-msgstr "Имя «%s» недопустимо, потому что содержит символ «/». Выберите другое имя."
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+"Имя «%s» недопустимо, потому что содержит символ «/». Выберите другое имя."
 
 #: ../src/file-manager/fm-error-reporting.c:122
 #, c-format
@@ -3804,7 +4311,8 @@ msgstr "Не удалось переименовать этот объект."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Вам запрещено изменять группу объекта «%s»."
 
 #. fall through
@@ -3922,7 +4430,8 @@ msgstr "Выстроить по _имени"
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1495
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "Переставить значки для лучшего заполнения окна и предотвращения перекрывания"
+msgstr ""
+"Переставить значки для лучшего заполнения окна и предотвращения перекрывания"
 
 #. name, stock id
 #. label, accelerator
@@ -4034,8 +4543,7 @@ msgid "(Empty)"
 msgstr "(Пусто)"
 
 #: ../src/file-manager/fm-list-model.c:375
-#: ../src/file-manager/fm-tree-model.c:1266
-#: ../src/nautilus-window-slot.c:191
+#: ../src/file-manager/fm-tree-model.c:1266 ../src/nautilus-window-slot.c:191
 msgid "Loading..."
 msgstr "Идёт загрузка..."
 
@@ -4078,12 +4586,14 @@ msgstr "Показывать этот адрес в виде списка."
 
 #: ../src/file-manager/fm-properties-window.c:511
 msgid "You cannot assign more than one custom icon at a time!"
-msgstr "Вы не можете назначить более одного пользовательского значка одновременно!"
+msgstr ""
+"Вы не можете назначить более одного пользовательского значка одновременно!"
 
 #: ../src/file-manager/fm-properties-window.c:512
 #: ../src/nautilus-information-panel.c:495
 msgid "Please drag just one image to set a custom icon."
-msgstr "Перетащите только одно изображение, чтобы установить пользовательский значок."
+msgstr ""
+"Перетащите только одно изображение, чтобы установить пользовательский значок."
 
 #: ../src/file-manager/fm-properties-window.c:523
 #: ../src/nautilus-information-panel.c:517
@@ -4094,7 +4604,9 @@ msgstr "Файл, который вы перетащили, не являетс�
 #: ../src/file-manager/fm-properties-window.c:530
 #: ../src/nautilus-information-panel.c:518
 msgid "You can only use local images as custom icons."
-msgstr "Вы можете использовать только локальные изображения в качестве пользовательских значков."
+msgstr ""
+"Вы можете использовать только локальные изображения в качестве "
+"пользовательских значков."
 
 #: ../src/file-manager/fm-properties-window.c:529
 #: ../src/nautilus-information-panel.c:523
@@ -4427,8 +4939,12 @@ msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Программе Nautilus не удалось создать требуемую папку «%s»."
 
 #: ../src/nautilus-application.c:325
-msgid "Before running Nautilus, please create the following folder, or set permissions such that Nautilus can create it."
-msgstr "Перед запуском Nautilus создайте эту папку, либо установите права так, чтобы Nautilus мог её создать."
+msgid ""
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
+msgstr ""
+"Перед запуском Nautilus создайте эту папку, либо установите права так, чтобы "
+"Nautilus мог её создать."
 
 #: ../src/nautilus-application.c:328
 #, c-format
@@ -4436,8 +4952,12 @@ msgid "Nautilus could not create the following required folders: %s."
 msgstr "Программе Nautilus не удалось создать следующие необходимые папки: %s."
 
 #: ../src/nautilus-application.c:330
-msgid "Before running Nautilus, please create these folders, or set permissions such that Nautilus can create them."
-msgstr "Перед запуском Nautilus создайте эти папки, либо установите права так, чтобы Nautilus мог их создать."
+msgid ""
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+"Перед запуском Nautilus создайте эти папки, либо установите права так, чтобы "
+"Nautilus мог их создать."
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -4450,31 +4970,53 @@ msgstr "Перед запуском Nautilus создайте эти папки,
 #. * since neither of the above causes explain it.
 #.
 #: ../src/nautilus-application.c:597
-msgid "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again."
-msgstr "Сейчас невозможно использовать Nautilus. Вам может помочь выполнение команды «bonobo-slay» из консоли. Если нет, попробуйте перезагрузить компьютер или заново установить Nautilus."
+msgid ""
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again."
+msgstr ""
+"Сейчас невозможно использовать Nautilus. Вам может помочь выполнение команды "
+"«bonobo-slay» из консоли. Если нет, попробуйте перезагрузить компьютер или "
+"заново установить Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:603
 msgid ""
-"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again.\n"
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again.\n"
 "\n"
-"Bonobo could not locate the Nautilus_shell.server file. One cause of this seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation library's directory. Another possible cause would be bad install with a missing Nautilus_Shell.server file.\n"
+"Bonobo could not locate the Nautilus_shell.server file. One cause of this "
+"seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation "
+"library's directory. Another possible cause would be bad install with a "
+"missing Nautilus_Shell.server file.\n"
 "\n"
-"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, which may be needed by other applications.\n"
+"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
-"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but we do not know why.\n"
+"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but "
+"we do not know why.\n"
 "\n"
-"We have also seen this error when a faulty version of bonobo-activation was installed."
+"We have also seen this error when a faulty version of bonobo-activation was "
+"installed."
 msgstr ""
-"Сейчас невозможно использовать Nautilus. Вам может помочь выполнение команды «bonobo-slay» из консоли. Если нет, попробуйте перезагрузить компьютер или заново установить Nautilus.\n"
+"Сейчас невозможно использовать Nautilus. Вам может помочь выполнение команды "
+"«bonobo-slay» из консоли. Если нет, попробуйте перезагрузить компьютер или "
+"заново установить Nautilus.\n"
 "\n"
-"Система Bonobo не обнаружила файл Nautilus_shell.server. Одной из причин этого может быть то, что переменная LD_LIBRARY_PATH не содержит пути к библиотечному каталогу программы bonobo-activation. Другой причиной может быть неверная установка и отсутствие файла Nautilus_Shell.server.\n"
+"Система Bonobo не обнаружила файл Nautilus_shell.server. Одной из причин "
+"этого может быть то, что переменная LD_LIBRARY_PATH не содержит пути к "
+"библиотечному каталогу программы bonobo-activation. Другой причиной может "
+"быть неверная установка и отсутствие файла Nautilus_Shell.server.\n"
 "\n"
-"Запуск «bonobo-slay» уничтожит все процессы Bonobo Activation и GConf, которые могут быть необходимы другим приложениям.\n"
+"Запуск «bonobo-slay» уничтожит все процессы Bonobo Activation и GConf, "
+"которые могут быть необходимы другим приложениям.\n"
 "\n"
-"Иногда уничтожение процессов bonobo-activation-server и gconfd решает проблему, причины этого неизвестны.\n"
+"Иногда уничтожение процессов bonobo-activation-server и gconfd решает "
+"проблему, причины этого неизвестны.\n"
 "\n"
-"Также эта ошибка может появляться, если установлена сбойная версия программы bonobo-activation."
+"Также эта ошибка может появляться, если установлена сбойная версия программы "
+"bonobo-activation."
 
 #. Some misc. error (can never happen with current
 #. * version of bonobo-activation). Show dialog and terminate the
@@ -4485,28 +5027,41 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:633
-#: ../src/nautilus-application.c:651
+#: ../src/nautilus-application.c:633 ../src/nautilus-application.c:651
 #: ../src/nautilus-application.c:658
 msgid "Nautilus cannot be used now, due to an unexpected error."
 msgstr "Сейчас невозможно использовать Nautilus из-за неожиданной ошибки."
 
 #: ../src/nautilus-application.c:634
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to register the file manager view server."
-msgstr "Сейчас невозможно использовать Nautilus из-за неожиданной ошибки в системе Bonobo при попытке зарегистрировать сервер просмотра файлового менеджера."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to register the file manager view server."
+msgstr ""
+"Сейчас невозможно использовать Nautilus из-за неожиданной ошибки в системе "
+"Bonobo при попытке зарегистрировать сервер просмотра файлового менеджера."
 
 #: ../src/nautilus-application.c:652
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the factory. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "Сейчас невозможно использовать Nautilus из-за неожиданной ошибки в системе Bonobo при попытке найти фабрику. Уничтожение процесса bonobo-activation-server и перезапуск Nautilus может решить проблему."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the factory. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"Сейчас невозможно использовать Nautilus из-за неожиданной ошибки в системе "
+"Bonobo при попытке найти фабрику. Уничтожение процесса bonobo-activation-"
+"server и перезапуск Nautilus может решить проблему."
 
 #: ../src/nautilus-application.c:659
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the shell object. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "Сейчас невозможно использовать Nautilus из-за неожиданной ошибки в системе Bonobo при попытке найти объект оболочки. Уничтожение процесса bonobo-activation-server и перезапуск Nautilus может решить проблему."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the shell object. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"Сейчас невозможно использовать Nautilus из-за неожиданной ошибки в системе "
+"Bonobo при попытке найти объект оболочки. Уничтожение процесса bonobo-"
+"activation-server и перезапуск Nautilus может решить проблему."
 
-#: ../src/nautilus-application.c:1369
-#: ../src/nautilus-places-sidebar.c:1682
-#: ../src/nautilus-places-sidebar.c:1705
-#: ../src/nautilus-places-sidebar.c:1728
+#: ../src/nautilus-application.c:1369 ../src/nautilus-places-sidebar.c:1682
+#: ../src/nautilus-places-sidebar.c:1705 ../src/nautilus-places-sidebar.c:1728
 #, c-format
 msgid "Unable to eject %s"
 msgstr "Не удалось извлечь %s"
@@ -4524,27 +5079,33 @@ msgstr "Не удалось найти автоматически запуска
 
 #: ../src/nautilus-autorun-software.c:168
 msgid "<big><b>Error autorunning software</b></big>"
-msgstr "<big><b>Произошла ошибка при автоматическом запуске программы</b></big>"
+msgstr ""
+"<big><b>Произошла ошибка при автоматическом запуске программы</b></big>"
 
 #: ../src/nautilus-autorun-software.c:194
-msgid "<big><b>This medium contains software intended to be automatically started. Would you like to run it?</b></big>"
-msgstr "<big><b>На этом носителе есть программа, предназначенная для автоматического запуска. Вы хотите запустить её?</b></big>"
+msgid ""
+"<big><b>This medium contains software intended to be automatically started. "
+"Would you like to run it?</b></big>"
+msgstr ""
+"<big><b>На этом носителе есть программа, предназначенная для автоматического "
+"запуска. Вы хотите запустить её?</b></big>"
 
 #: ../src/nautilus-autorun-software.c:196
 #, c-format
 msgid ""
-"The software will run directly from the medium \"%s\". You should never run software that you don't trust.\n"
+"The software will run directly from the medium \"%s\". You should never run "
+"software that you don't trust.\n"
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"Эта программа будет запущена непосредственно с носителя «%s». Никогда не запускайте программы, которым вы не доверяете.\n"
+"Эта программа будет запущена непосредственно с носителя «%s». Никогда не "
+"запускайте программы, которым вы не доверяете.\n"
 "\n"
 "Если вы сомневаетесь, нажмите Отмена."
 
 #: ../src/nautilus-bookmarks-window.c:160
 #: ../src/nautilus-file-management-properties.c:206
-#: ../src/nautilus-property-browser.c:1527
-#: ../src/nautilus-window-menus.c:619
+#: ../src/nautilus-property-browser.c:1527 ../src/nautilus-window-menus.c:619
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4678,8 +5239,7 @@ msgstr "До_бавить закладку"
 msgid "C_onnect"
 msgstr "_Соединиться"
 
-#: ../src/nautilus-desktop-window.c:243
-#: ../src/nautilus-pathbar.c:1244
+#: ../src/nautilus-desktop-window.c:243 ../src/nautilus-pathbar.c:1244
 #: ../src/nautilus-places-sidebar.c:310
 msgid "Desktop"
 msgstr "Рабочий стол"
@@ -4689,9 +5249,10 @@ msgstr "Рабочий стол"
 msgid "Could not remove emblem with name '%s'."
 msgstr "Не удалось удалить эмблему с именем «%s»."
 
-#: ../src/nautilus-emblem-sidebar.c:227
-#: ../src/nautilus-emblem-sidebar.c:261
-msgid "This is probably because the emblem is a permanent one, and not one that you added yourself."
+#: ../src/nautilus-emblem-sidebar.c:227 ../src/nautilus-emblem-sidebar.c:261
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr "Это может означать, что эмблема — встроенная, а не добавленная вами."
 
 #: ../src/nautilus-emblem-sidebar.c:260
@@ -4716,19 +5277,26 @@ msgid "Add Emblems..."
 msgstr "Добавить эмблемы..."
 
 #: ../src/nautilus-emblem-sidebar.c:544
-msgid "Enter a descriptive name next to each emblem.  This name will be used in other places to identify the emblem."
-msgstr "Введите описательное имя для каждой эмблемы. Это имя будет использоваться в других местах для обозначения эмблемы."
+msgid ""
+"Enter a descriptive name next to each emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Введите описательное имя для каждой эмблемы. Это имя будет использоваться в "
+"других местах для обозначения эмблемы."
 
 #: ../src/nautilus-emblem-sidebar.c:546
-msgid "Enter a descriptive name next to the emblem.  This name will be used in other places to identify the emblem."
-msgstr "Введите описательное имя для эмблемы. Это имя будет использоваться в других местах для обозначения эмблемы."
+msgid ""
+"Enter a descriptive name next to the emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Введите описательное имя для эмблемы. Это имя будет использоваться в других "
+"местах для обозначения эмблемы."
 
 #: ../src/nautilus-emblem-sidebar.c:767
 msgid "Some of the files could not be added as emblems."
 msgstr "Некоторые из файлов не удалось добавить как эмблемы."
 
-#: ../src/nautilus-emblem-sidebar.c:767
-#: ../src/nautilus-emblem-sidebar.c:769
+#: ../src/nautilus-emblem-sidebar.c:767 ../src/nautilus-emblem-sidebar.c:769
 msgid "The emblems do not appear to be valid images."
 msgstr "Похоже, что эмблемы не являются допустимыми изображениями."
 
@@ -4736,8 +5304,7 @@ msgstr "Похоже, что эмблемы не являются допусти
 msgid "None of the files could be added as emblems."
 msgstr "Ни один из файлов не удалось добавить в качестве эмблемы."
 
-#: ../src/nautilus-emblem-sidebar.c:806
-#: ../src/nautilus-emblem-sidebar.c:861
+#: ../src/nautilus-emblem-sidebar.c:806 ../src/nautilus-emblem-sidebar.c:861
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Похоже, файл «%s» не является допустимым изображением."
@@ -4746,8 +5313,7 @@ msgstr "Похоже, файл «%s» не является допустимым
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Файлы, которые вы перетащили, не являются допустимыми изображениями."
 
-#: ../src/nautilus-emblem-sidebar.c:811
-#: ../src/nautilus-emblem-sidebar.c:862
+#: ../src/nautilus-emblem-sidebar.c:811 ../src/nautilus-emblem-sidebar.c:862
 msgid "The emblem cannot be added."
 msgstr "Не удалось добавить эмблему."
 
@@ -4915,16 +5481,23 @@ msgid "CD _Audio:"
 msgstr "_Звуковые CD:"
 
 #: ../src/nautilus-file-management-properties.glade.h:49
-msgid "Choose the order of information to appear beneath icon names. More information will appear when zooming in closer."
-msgstr "Выберите порядок, в котором будут возникать сведения под именами значков. Сведения возникают при увеличении масштаба."
+msgid ""
+"Choose the order of information to appear beneath icon names. More "
+"information will appear when zooming in closer."
+msgstr ""
+"Выберите порядок, в котором будут возникать сведения под именами значков. "
+"Сведения возникают при увеличении масштаба."
 
 #: ../src/nautilus-file-management-properties.glade.h:50
 msgid "Choose the order of information to appear in the list view."
 msgstr "Выберите порядок, в котором будут возникать сведения в режиме списка."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
-msgstr "Выберите, что должно происходить при вставке носителей или присоединении устройств к системе."
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
+msgstr ""
+"Выберите, что должно происходить при вставке носителей или присоединении "
+"устройств к системе."
 
 #: ../src/nautilus-file-management-properties.glade.h:52
 msgid "Count _number of items:"
@@ -5201,7 +5774,8 @@ msgstr "Нельзя назначить более одного пользова
 
 #: ../src/nautilus-information-panel.c:524
 msgid "You can only use images as custom icons."
-msgstr "В качестве пользовательских значков можно использовать только изображения."
+msgstr ""
+"В качестве пользовательских значков можно использовать только изображения."
 
 # "Открыть с помощью программы "%s" -- это слишком длинно и не помешается
 # на боковую панель даже без распаковки `%s'.
@@ -5247,8 +5821,11 @@ msgid "Only create windows for explicitly specified URIs."
 msgstr "Создавать окна только для явно заданных адресов (URI)."
 
 #: ../src/nautilus-main.c:397
-msgid "Do not manage the desktop (ignore the preference set in the preferences dialog)."
-msgstr "Не управлять рабочим столом (игнорировать параметры из диалога параметров)."
+msgid ""
+"Do not manage the desktop (ignore the preference set in the preferences "
+"dialog)."
+msgstr ""
+"Не управлять рабочим столом (игнорировать параметры из диалога параметров)."
 
 #: ../src/nautilus-main.c:399
 msgid "open a browser window."
@@ -5268,8 +5845,12 @@ msgstr "[URI...]"
 
 #. Translators: --no-default-window is a nautilus command line parameter, don't modify it.
 #: ../src/nautilus-main.c:407
-msgid "Load a saved session from the specified file. Implies \"--no-default-window\"."
-msgstr "Загрузить сохранённый сеанс из указанного файла. Подразумевает «--no-default-window»."
+msgid ""
+"Load a saved session from the specified file. Implies \"--no-default-window"
+"\"."
+msgstr ""
+"Загрузить сохранённый сеанс из указанного файла. Подразумевает «--no-default-"
+"window»."
 
 #: ../src/nautilus-main.c:407
 msgid "FILENAME"
@@ -5290,16 +5871,13 @@ msgstr ""
 "Просмотр файловой системы в файловом менеджере"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:478
-#: ../src/nautilus-spatial-window.c:389
-#: ../src/nautilus-window-menus.c:560
-#: ../src/nautilus-window.c:154
+#: ../src/nautilus-main.c:478 ../src/nautilus-spatial-window.c:389
+#: ../src/nautilus-window-menus.c:560 ../src/nautilus-window.c:154
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:519
-#: ../src/nautilus-main.c:528
+#: ../src/nautilus-main.c:519 ../src/nautilus-main.c:528
 #: ../src/nautilus-main.c:533
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
@@ -5308,12 +5886,16 @@ msgstr "nautilus: параметр %s нельзя использовать с �
 #: ../src/nautilus-main.c:524
 #, c-format
 msgid "nautilus: --check cannot be used with other options.\n"
-msgstr "nautilus: параметр --check нельзя использовать вместе с другими параметрами.\n"
+msgstr ""
+"nautilus: параметр --check нельзя использовать вместе с другими "
+"параметрами.\n"
 
 #: ../src/nautilus-main.c:538
 #, c-format
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
-msgstr "nautilus:  параметр --geometry нельзя использовать с больше чем одним адресом (URI).\n"
+msgstr ""
+"nautilus:  параметр --geometry нельзя использовать с больше чем одним "
+"адресом (URI).\n"
 
 #: ../src/nautilus-navigation-window-menus.c:123
 msgid "Are you sure you want to clear the list of locations you have visited?"
@@ -5558,8 +6140,7 @@ msgstr "%s — обозреватель файлов"
 msgid "Close tab"
 msgstr "Закрыть вкладку"
 
-#: ../src/nautilus-notes-viewer.c:385
-#: ../src/nautilus-notes-viewer.c:499
+#: ../src/nautilus-notes-viewer.c:385 ../src/nautilus-notes-viewer.c:499
 msgid "Notes"
 msgstr "Заметки"
 
@@ -5567,8 +6148,7 @@ msgstr "Заметки"
 msgid "Show Notes"
 msgstr "Показать заметки"
 
-#: ../src/nautilus-places-sidebar.c:332
-#: ../src/network-scheme.desktop.in.h:2
+#: ../src/nautilus-places-sidebar.c:332 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
 msgstr "Сеть"
 
@@ -5921,7 +6501,9 @@ msgid "provides visual status"
 msgstr "визуально оповещает о состоянии"
 
 #: ../src/nautilus-window-bookmarks.c:96
-msgid "Do you want to remove any bookmarks with the non-existing location from your list?"
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "Хотите удалить из вашего списка все закладки на несуществующие адреса?"
 
 #: ../src/nautilus-window-bookmarks.c:101
@@ -5946,7 +6528,9 @@ msgstr "Просмотр текущей папки"
 
 #: ../src/nautilus-window-manage-views.c:1883
 msgid "Nautilus has no installed viewer capable of displaying the folder."
-msgstr "В Nautilus не установлен ни один режим просмотра, с помощью которого можно было бы показать эту папку."
+msgstr ""
+"В Nautilus не установлен ни один режим просмотра, с помощью которого можно "
+"было бы показать эту папку."
 
 #: ../src/nautilus-window-manage-views.c:1889
 msgid "The location is not a folder."
@@ -5985,8 +6569,10 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "Не удалось показать «%s», потому что не был найден узел."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "Убедитесь, что адрес введён без ошибок, а параметры прокси-службы верны."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"Убедитесь, что адрес введён без ошибок, а параметры прокси-службы верны."
 
 #: ../src/nautilus-window-manage-views.c:1947
 #, c-format
@@ -6002,20 +6588,48 @@ msgid "Go to the location specified by this bookmark"
 msgstr "Перейти к адресу, указанному закладкой"
 
 #: ../src/nautilus-window-menus.c:542
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Nautilus — свободное программное обеспечение; вы можете распространять и/или изменять его на условиях лицензии GNU General Public License, опубликованной Фондом свободного программного обеспечения; либо версии 2 этой лицензии, либо (по вашему выбору) любой более поздней версии."
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"Nautilus — свободное программное обеспечение; вы можете распространять и/или "
+"изменять его на условиях лицензии GNU General Public License, опубликованной "
+"Фондом свободного программного обеспечения; либо версии 2 этой лицензии, "
+"либо (по вашему выбору) любой более поздней версии."
 
 #: ../src/nautilus-window-menus.c:546
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "Nautilus распространяется в надежде, что он может быть полезен, но БЕЗ КАКОГО-ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО НЕ ОГРАНИЧИВАЯСЬ ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений обратитесь к лицензии GNU General Public License."
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Nautilus распространяется в надежде, что он может быть полезен, но БЕЗ "
+"КАКОГО-ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО "
+"НЕ ОГРАНИЧИВАЯСЬ ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И "
+"ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений "
+"обратитесь к лицензии GNU General Public License."
 
 #: ../src/nautilus-window-menus.c:550
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
-msgstr "Вы должны были получить копию лицензии GNU General Public License c программой Nautilus. Если это не так, известите об этом Фонд свободного программного обеспечения по адресу Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgstr ""
+"Вы должны были получить копию лицензии GNU General Public License c "
+"программой Nautilus. Если это не так, известите об этом Фонд свободного "
+"программного обеспечения по адресу Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
 
 #: ../src/nautilus-window-menus.c:562
-msgid "Nautilus is a graphical shell for GNOME that makes it easy to manage your files and the rest of your system."
-msgstr "Nautilus — графическая оболочка для среды GNOME, которая позволяет легко управлять файлами и другими частями системы."
+msgid ""
+"Nautilus is a graphical shell for GNOME that makes it easy to manage your "
+"files and the rest of your system."
+msgstr ""
+"Nautilus — графическая оболочка для среды GNOME, которая позволяет легко "
+"управлять файлами и другими частями системы."
 
 #: ../src/nautilus-window-menus.c:566
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6076,8 +6690,12 @@ msgid "_Backgrounds and Emblems..."
 msgstr "_Фон и эмблемы..."
 
 #: ../src/nautilus-window-menus.c:797
-msgid "Display patterns, colors, and emblems that can be used to customize appearance"
-msgstr "Показать орнаменты, цвета и эмблемы, которые можно использовать для настройки внешнего вида"
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+"Показать орнаменты, цвета и эмблемы, которые можно использовать для "
+"настройки внешнего вида"
 
 #: ../src/nautilus-window-menus.c:800
 msgid "Prefere_nces"
@@ -6156,8 +6774,7 @@ msgid "Zoom _In"
 msgstr "У_величить"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:830
-#: ../src/nautilus-zoom-control.c:92
+#: ../src/nautilus-window-menus.c:830 ../src/nautilus-zoom-control.c:92
 #: ../src/nautilus-zoom-control.c:347
 msgid "Increase the view size"
 msgstr "Уменьшить масштаб"
@@ -6169,8 +6786,7 @@ msgid "Zoom _Out"
 msgstr "У_меньшить"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:842
-#: ../src/nautilus-zoom-control.c:93
+#: ../src/nautilus-window-menus.c:842 ../src/nautilus-zoom-control.c:93
 #: ../src/nautilus-zoom-control.c:296
 msgid "Decrease the view size"
 msgstr "Увеличить масштаб"
@@ -6182,8 +6798,7 @@ msgid "Normal Si_ze"
 msgstr "В обы_чном размере"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:850
-#: ../src/nautilus-zoom-control.c:94
+#: ../src/nautilus-window-menus.c:850 ../src/nautilus-zoom-control.c:94
 #: ../src/nautilus-zoom-control.c:309
 msgid "Use the normal view size"
 msgstr "Использовать нормальный масштаб вида"
@@ -6218,8 +6833,7 @@ msgid "_Network"
 msgstr "_Сеть"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:866
-#: ../src/network-scheme.desktop.in.h:1
+#: ../src/nautilus-window-menus.c:866 ../src/network-scheme.desktop.in.h:1
 msgid "Browse bookmarked and local network locations"
 msgstr "Просмотреть закладки и локальные сетевые адреса"
 
@@ -6254,7 +6868,8 @@ msgstr "Создание CD/_DVD"
 #. tooltip
 #: ../src/nautilus-window-menus.c:878
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr "Открыть папку, в которую вы можете перетащить файлы для записи на CD или DVD"
+msgstr ""
+"Открыть папку, в которую вы можете перетащить файлы для записи на CD или DVD"
 
 #. name, stock id
 #. label, accelerator
@@ -6341,84 +6956,249 @@ msgstr "Масштабировать"
 msgid "Set the zoom level of the current view"
 msgstr "Установить уровень масштабирования текущего вида"
 
+#: ../eel/eel-alert-dialog.c:109
+msgid "Image/label border"
+msgstr "Граница изображения/метки"
+
+#: ../eel/eel-alert-dialog.c:110
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Ширина границы вокруг метки или изображения в диалоге предупреждения"
+
+#: ../eel/eel-alert-dialog.c:119
+msgid "Alert Type"
+msgstr "Тип предупреждения"
+
+#: ../eel/eel-alert-dialog.c:120
+msgid "The type of alert"
+msgstr "Тип предупреждения"
+
+#: ../eel/eel-alert-dialog.c:128
+msgid "Alert Buttons"
+msgstr "Кнопки предупреждения"
+
+#: ../eel/eel-alert-dialog.c:129
+msgid "The buttons shown in the alert dialog"
+msgstr "Кнопки, показываемые в диалоге предупреждения"
+
+#: ../eel/eel-alert-dialog.c:193
+msgid "Show more _details"
+msgstr "Показать _подробности"
+
+#: ../eel/eel-canvas.c:1219 ../eel/eel-canvas.c:1220
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1226 ../eel/eel-canvas.c:1227
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:353
+msgid "Text"
+msgstr "Текст"
+
+#: ../eel/eel-editable-label.c:354
+msgid "The text of the label."
+msgstr "Текст метки"
+
+#: ../eel/eel-editable-label.c:360
+msgid "Justification"
+msgstr "Выравнивание"
+
+#: ../eel/eel-editable-label.c:361
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Выравнивание строк текста метки относительно друг друга. Эта настройка НЕ "
+"влияет на выравнивание самой метки, для этого используйте свойство GtkMisc::"
+"xalign."
+
+#: ../eel/eel-editable-label.c:369
+msgid "Line wrap"
+msgstr "Перенос строк"
+
+#: ../eel/eel-editable-label.c:370
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Если установлено, длинные строки переносятся."
+
+#: ../eel/eel-editable-label.c:377
+msgid "Cursor Position"
+msgstr "Положение курсора"
+
+#: ../eel/eel-editable-label.c:378
+msgid "The current position of the insertion cursor in chars."
+msgstr "Текущее положение курсора вставки в буквах."
+
+#: ../eel/eel-editable-label.c:387
+msgid "Selection Bound"
+msgstr "Границы выделения"
+
+#: ../eel/eel-editable-label.c:388
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Положение противоположных концов выделения от курсора в буквах."
+
+#: ../eel/eel-editable-label.c:3217
+msgid "Select All"
+msgstr "Выделить всё"
+
+#: ../eel/eel-editable-label.c:3228
+msgid "Input Methods"
+msgstr "Методы ввода"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Произошла ошибка системы GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Произошла ошибка системы GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Все остальные ошибки будут показаны только в окне терминала"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Изображение не выбрано."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Вы должны щёлкнуть на изображении, чтобы выбрать его."
+
+#: ../eel/eel-stock-dialogs.c:209
+msgid "You can stop this operation by clicking cancel."
+msgstr "Можно остановить выполнение нажатием кнопки «Отменить»."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (недопустимая последовательность Юникод)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Введите пароль"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Пустой диск Blu-Ray"
+
 #~ msgid "Blank CD Disc"
 #~ msgstr "Пустой CD-диск"
+
 #~ msgid "Blank DVD Disc"
 #~ msgstr "Пустой DVD-диск"
+
 #~ msgid "Blank HD DVD Disc"
 #~ msgstr "Пустой диск HD DVD"
+
 #~ msgid "Blu-Ray Video"
 #~ msgstr "Видео в формате Blu-Ray"
+
 #~ msgid "Compact Disc Audio"
 #~ msgstr "Звук в CD-формате"
+
 #~ msgid "DVD Audio"
 #~ msgstr "Звук в формате DVD-Audio"
+
 #~ msgid "DVD Video"
 #~ msgstr "Видео в формате DVD"
+
 #~ msgid "Digital Photos"
 #~ msgstr "Цифровые фотографии"
+
 #~ msgid "HD DVD Video"
 #~ msgstr "Видео в формате HD DVD"
+
 #~ msgid "Picture CD"
 #~ msgstr "CD-диск с изображениями"
+
 #~ msgid "Portable Audio Player"
 #~ msgstr "Переносной аудио-плеер"
+
 #~ msgid "Super Video CD"
 #~ msgstr "Super Video CD"
+
 #~ msgid "Video CD"
 #~ msgstr "Видео в CD-формате"
+
 #~ msgid "List of x-content/* types to ask the user what to do on insertion."
 #~ msgstr ""
 #~ "Перечень типов x-content/*, при вставке которых следует спрашивать "
 #~ "пользователя о действии."
+
 #~ msgid ""
 #~ "List of x-content/* types where a folder window should be opened on "
 #~ "insertion."
 #~ msgstr ""
 #~ "Перечень типов x-content/*, при вставке которых должно открываться окно "
 #~ "папки."
+
 #~ msgid "List of x-content/* where to prompt the user on insertion"
 #~ msgstr "Типы x-content/* с запросом пользователя при вставке"
+
 #~ msgid "_Show"
 #~ msgstr "_Показать"
+
 #~ msgid "Hi_de"
 #~ msgstr "_Скрыть"
+
 #~ msgid "View as Desktop"
 #~ msgstr "Режим просмотра: Рабочий стол"
+
 #~ msgid "View as _Desktop"
 #~ msgstr "Режим просмотра: _Рабочий стол"
+
 #~ msgid "Display this location with the desktop view."
 #~ msgstr "Показывать этот адрес в режиме рабочего стола"
+
 #~ msgid "Select Pattern"
 #~ msgstr "Выделить по шаблону"
+
 #~ msgid "Select _Pattern"
 #~ msgstr "Выделить по _шаблону"
+
 #~ msgid "Open in New Window"
 #~ msgstr "Открыть в новом окне"
+
 #~ msgid "_Delete from Trash"
 #~ msgstr "_Удалить из корзины"
+
 #~ msgid "Link"
 #~ msgstr "Ссылка"
+
 #~ msgid "Launcher"
 #~ msgstr "Значок запуска"
+
 #~ msgid "View as Icons"
 #~ msgstr "Режим просмотра: Значки"
+
 #~ msgid "View as _Icons"
 #~ msgstr "Просматривать в виде _значков"
+
 #~ msgid "View as List"
 #~ msgstr "Режим просмотра: Список"
+
 #~ msgid "View as _List"
 #~ msgstr "Просматривать в виде _списка"
+
 #~ msgid "MIME type:"
 #~ msgstr "Тип MIME:"
+
 #~ msgid "E_ject"
 #~ msgstr "И_звлечь"
+
 #~ msgid "Create Folder"
 #~ msgstr "Создать папку"
+
 #~ msgid "Move to Trash"
 #~ msgstr "Переместить в корзину"
+
 #~ msgid ""
 #~ "Existence of this file indicates that the Nautilus configuration druid\n"
 #~ "has been presented.\n"
@@ -6429,85 +7209,115 @@ msgstr "Установить уровень масштабирования те�
 #~ "уже вызывался ранее.\n"
 #~ "\n"
 #~ "Вы можете удалить этот файл вручную, чтобы снова запустить помощника.\n"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "Вы действительно хотите забыть историю?"
+
 #~ msgid "If you do, you will be doomed to repeat it."
 #~ msgstr "Если вы это сделаете, вы будете обречены повторять её."
+
 #~ msgid ""
 #~ "If you clear the list of locations, they will be permanently deleted."
 #~ msgstr "Если вы очистите список адресов, они будут удалены безвозвратно."
+
 #~ msgid "Show the contents in more detail"
 #~ msgstr "Показать содержимое более подробно"
+
 #~ msgid "Show the contents in less detail"
 #~ msgstr "Показать содержимое менее подробно"
+
 #~ msgid "Show the contents at the normal size"
 #~ msgstr "Показать содержимое в обычном размере"
+
 #~ msgid "Show in the default detail level"
 #~ msgstr "Показать содержимое с обычной степенью подробности"
+
 #~ msgid "%s %ld of %ld %s"
 #~ msgstr "%s %ld из %ld %s"
+
 #~ msgid "(%d:%02d:%02d Remaining)"
 #~ msgstr "(осталось %d:%02d:%02d)"
+
 #~ msgid "(%d:%02d Remaining)"
 #~ msgstr "(осталось %d:%02d)"
+
 #~ msgid "From:"
 #~ msgstr "Из:"
+
 #~ msgid "To:"
 #~ msgstr "В:"
+
 #~ msgid "\"%s\" cannot be moved because it is on a read-only disk."
 #~ msgstr ""
 #~ "«%s» не может быть перемещен, потому что находится на диске, "
 #~ "предназначенном только для чтения."
+
 #~ msgid ""
 #~ "\"%s\" cannot be deleted because you do not have permissions to modify "
 #~ "its parent folder."
 #~ msgstr ""
 #~ "«%s» не может быть удален, потому что у вас недостаточно прав для "
 #~ "изменения его родительской папки."
+
 #~ msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 #~ msgstr ""
 #~ "«%s» не может быть удален, потому что находится на диске, предназначенном "
 #~ "только для чтения."
+
 #~ msgid ""
 #~ "\"%s\" cannot be moved because you do not have permissions to change it "
 #~ "or its parent folder."
 #~ msgstr ""
 #~ "«%s» не может быть перемещен, потому что у вас недостаточно прав для "
 #~ "изменения элемента или его родительской папки."
+
 #~ msgid ""
 #~ "Cannot move \"%s\" because it or its parent folder are contained in the "
 #~ "destination."
 #~ msgstr ""
 #~ "Невозможно переместить «%s», потому что он или его родительский каталог "
 #~ "содержатся в месте назначения."
+
 #~ msgid ""
 #~ "Cannot move \"%s\" to the trash because you do not have permissions to "
 #~ "change it or its parent folder."
 #~ msgstr ""
 #~ "Невозможно переместить «%s», потому что у вас недостаточно прав для "
 #~ "изменения этого элемента или его родительской папки."
+
 #~ msgid "You do not have permissions to write to this folder."
 #~ msgstr "У вас недостаточно права записи в эту папку."
+
 #~ msgid "Error while creating links in \"%s\"."
 #~ msgstr "Ошибка при создании ссылок в «%s»."
+
 #~ msgid "Error \"%s\" while copying \"%s\"."
 #~ msgstr "Ошибка «%s» при перемещении «%s»."
+
 #~ msgid "Would you like to continue?"
 #~ msgstr "Продолжить?"
+
 #~ msgid "Error \"%s\" while moving \"%s\"."
 #~ msgstr "Ошибка «%s» при перемещении «%s»."
+
 #~ msgid "Error \"%s\" while creating a link to \"%s\"."
 #~ msgstr "Ошибка «%s» при создании ссылки на «%s»."
+
 #~ msgid "Error \"%s\" while deleting \"%s\"."
 #~ msgstr "Ошибка «%s» при удалении «%s»."
+
 #~ msgid "Error \"%s\" while copying."
 #~ msgstr "Ошибка «%s» при копировании."
+
 #~ msgid "Error \"%s\" while moving."
 #~ msgstr "Ошибка «%s» при перемещении."
+
 #~ msgid "Error \"%s\" while linking."
 #~ msgstr "Ошибка «%s» при создании ссылки."
+
 #~ msgid "Error \"%s\" while deleting."
 #~ msgstr "Ошибка «%s» при удалении."
+
 #~ msgid ""
 #~ "The name is already used for a special item that cannot be removed or "
 #~ "replaced.  If you still want to move the item, rename it and try again."
@@ -6515,8 +7325,10 @@ msgstr "Установить уровень масштабирования те�
 #~ "Это имя уже используется для специального элемента, который не может быть "
 #~ "перемещен или заменен. Если вы все еще хотите переместить элемент, "
 #~ "переименуйте его и попробуйте еще раз."
+
 #~ msgid "Could not copy \"%s\" to the new location."
 #~ msgstr "Не удалось скопировать «%s» на новое место."
+
 #~ msgid ""
 #~ "The name is already used for a special item that cannot be removed or "
 #~ "replaced.  If you still want to copy the item, rename it and try again."
@@ -6524,75 +7336,110 @@ msgstr "Установить уровень масштабирования те�
 #~ "Имя уже используется для специального элемента, который не может быть "
 #~ "удален или перемещен. Если вы все еще хотите скопировать элемент, "
 #~ "переименуйте его и попробуйте еще раз."
+
 #~ msgid "Unknown GnomeVFSXferProgressStatus %d"
 #~ msgstr "Неизвестный GnomeVFSXferProgressStatus %d"
+
 #~ msgid "Throwing out file:"
 #~ msgstr "Выбрасывается файл:"
+
 #~ msgid "Moving"
 #~ msgstr "Перемещается файл"
+
 #~ msgid "Moving file:"
 #~ msgstr "Перемещается файл:"
+
 #~ msgid "Finishing Move..."
 #~ msgstr "Завершается перемещение..."
+
 #~ msgid "Linking file:"
 #~ msgstr "Создаётся ссылка на файл:"
+
 #~ msgid "Linking"
 #~ msgstr "Создаётся ссылка на файл"
+
 #~ msgid "Preparing to Create Links..."
 #~ msgstr "Идёт подготовка к созданию ссылок..."
+
 #~ msgid "Finishing Creating Links..."
 #~ msgstr "Завершается создание ссылок..."
+
 #~ msgid "Copying file:"
 #~ msgstr "Копируется файл:"
+
 #~ msgid "Copying"
 #~ msgstr "Копируется файл"
+
 #~ msgid "Preparing To Copy..."
 #~ msgstr "Идёт подготовка к копированию..."
+
 #~ msgid "You cannot copy items into the trash."
 #~ msgstr "Вы не можете копировать элементы в корзину."
+
 #~ msgid "You cannot create links inside the trash."
 #~ msgstr "Вы не можете создавать ссылки внутрь корзины."
+
 #~ msgid "Files and folders can only be moved into the trash."
 #~ msgstr "Файлы и папки могут быть только перемещены в корзину."
+
 #~ msgid "You cannot copy this trash folder."
 #~ msgstr "Вы не можете cкопировать эту корзину."
+
 #~ msgid "A trash folder is used for storing items moved to the trash."
 #~ msgstr ""
 #~ "Папка корзины используется для хранения элементов, перемещенных в корзину."
+
 #~ msgid "You cannot copy a file over itself."
 #~ msgstr "Вы не можете скопировать файл сам в себя."
+
 #~ msgid "The destination and source are the same file."
 #~ msgstr "Источник и назначение являются одним и тем же файлом."
+
 #~ msgid "There is no space on the destination."
 #~ msgstr "Недостаточно места на устройстве назначения."
+
 #~ msgid "Error \"%s\" creating new folder."
 #~ msgstr "Ошибка «%s» создания новой папки."
+
 #~ msgid "Error creating new folder."
 #~ msgstr "Ошибка создания новой папки."
+
 #~ msgid "Error \"%s\" creating new document."
 #~ msgstr "Ошибка «%s» при создании нового документа."
+
 #~ msgid "Error creating new document."
 #~ msgstr "Ошибка при создании нового документа."
+
 #~ msgid "Files deleted:"
 #~ msgstr "Файлов удалено:"
+
 #~ msgid "Deleting"
 #~ msgstr "Удаляется файл"
+
 #~ msgid "Emptying the Trash"
 #~ msgstr "Очистка корзины"
+
 #~ msgid "Preparing to Empty the Trash..."
 #~ msgstr "Идёт подготовка к очистке корзины..."
+
 #~ msgid "_Empty Trash"
 #~ msgstr "О_чистить корзину"
+
 #~ msgid "Fonts"
 #~ msgstr "Шрифты"
+
 #~ msgid "Themes"
 #~ msgstr "Темы"
+
 #~ msgid "CD/DVD Creator"
 #~ msgstr "Создание CD/DVD"
+
 #~ msgid "Windows Network"
 #~ msgstr "Сеть Windows"
+
 #~ msgid "Services in"
 #~ msgstr "Сервисы в"
+
 #~ msgid ""
 #~ "Can't find description even for \"x-directory/normal\". This probably "
 #~ "means that your gnome-vfs.keys file is in the wrong place or isn't being "
@@ -6601,39 +7448,50 @@ msgstr "Установить уровень масштабирования те�
 #~ "Не удалось найти описание даже для \"x-directory/normal\". Видимо ваш "
 #~ "файл gnome-vfs.keys находится не там где надо или не был найден по каким-"
 #~ "то другим причинам."
+
 #~ msgid ""
 #~ "No description found for mime type \"%s\" (file is \"%s\"), please tell "
 #~ "the gnome-vfs mailing list."
 #~ msgstr ""
 #~ "Описание для типа MIME «%s» (файл «%s») не найдено. Сообщите пожалуйста в "
 #~ "список рассылки gnome-vfs."
+
 #~ msgid "The attempt to log in failed."
 #~ msgstr "Попытка регистрации не удалась."
+
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "«%s» не является допустимым адресом."
+
 #~ msgid "Opening %d Item"
 #~ msgid_plural "Opening %d Items"
 #~ msgstr[0] "Открывается %d элемент"
 #~ msgstr[1] "Открывается %d элемента"
 #~ msgstr[2] "Открывается %d элементов"
+
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "Если вы удалите элемент, он будет безвозвратно утрачен."
+
 #~ msgid "Cannot move items to trash, do you want to delete them immediately?"
 #~ msgstr "Не удалось переместить элементы в корзину, удалить их безвозвратно?"
+
 #~ msgid "The selected item could not be moved to the Trash"
 #~ msgid_plural "The %d selected items could not be moved to the Trash"
 #~ msgstr[0] "%d выделенный элемент не удалось переместить в корзину"
 #~ msgstr[1] "%d выделенных элемента не удалось переместить в корзину"
 #~ msgstr[2] "%d выделенных элемента не удалось переместить в корзину"
+
 #~ msgid ""
 #~ "Cannot move some items to trash, do you want to delete these immediately?"
 #~ msgstr ""
 #~ "Некоторые элементы не удалось переместить в корзину, удалить их "
 #~ "безвозвратно?"
+
 #~ msgid "%d of the selected items cannot be moved to the Trash"
 #~ msgstr "%d из выделенных элементов не могут быть перемещены в корзину"
+
 #~ msgid "Cannot open %s"
 #~ msgstr "Невозможно открыть файл \"%s\""
+
 #~ msgid ""
 #~ "The filename \"%s\" indicates that this file is of type \"%s\". The "
 #~ "contents of the file indicate that the file is of type \"%s\". If you "
@@ -6653,32 +7511,40 @@ msgstr "Установить уровень масштабирования те�
 #~ "имел правильное расширение для типа «%s», тогда откройте файл обычным "
 #~ "путём. Или используйте пункт меню \"Открыть в программе\" для выбора "
 #~ "приложения для этого файла. "
+
 #~ msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 #~ msgstr ""
 #~ "Невозможно изменить имя для «%s», потому что это диск только для чтения."
+
 #~ msgid ""
 #~ "Couldn't change the group of \"%s\" because it is on a read-only disk"
 #~ msgstr ""
 #~ "Невозможно изменить группу для «%s», потому что этот диск только для "
 #~ "чтения."
+
 #~ msgid ""
 #~ "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 #~ msgstr ""
 #~ "Невозможно изменить владельца для «%s», потому что этот диск только для "
 #~ "чтения."
+
 #~ msgid ""
 #~ "Couldn't change the permissions of \"%s\" because it is on a read-only "
 #~ "disk"
 #~ msgstr ""
 #~ "Извините, невозможно изменить права для «%s», потому что этот диск только "
 #~ "для чтения"
+
 #~ msgid "--"
 #~ msgstr "--"
+
 #~ msgid "Link To Old Desktop"
 #~ msgstr "Ссылка на старый рабочий стол"
+
 #~ msgid ""
 #~ "A link called \"Link To Old Desktop\" has been created on the desktop."
 #~ msgstr "На рабочем столе была создана ссылка \"Старый рабочий стол\"."
+
 #~ msgid ""
 #~ "The location of the desktop directory has changed in GNOME 2.4. You can "
 #~ "open the link and move over the files you want, then delete the link."
@@ -6686,50 +7552,69 @@ msgstr "Установить уровень масштабирования те�
 #~ "Адрес каталога, отвечающего за рабочий стол, в среде GNOME версии 2.4 "
 #~ "изменился. Вы можете открыть ссылку, переместить все необходимые файлы, "
 #~ "после чего удалить эту ссылку."
+
 #~ msgid "Can't Connect to Server. \"%s\" is not a valid location."
 #~ msgstr ""
 #~ "Невозможно подключится к серверу. «%s» не является допустимым адресом."
+
 #~ msgid "_Name to use for connection:"
 #~ msgstr "_Имя этого соединения:"
+
 #~ msgid "Browse _Network"
 #~ msgstr "Обзор _сети"
+
 #~ msgid "The dragged text was not a valid file location."
 #~ msgstr "Перенесённый текст не был допустимым адресом файла."
+
 #~ msgid "    "
 #~ msgstr "    "
+
 #~ msgid "<span weight=\"bold\">Behavior</span>"
 #~ msgstr "<span weight=\"bold\">Поведение</span>"
+
 #~ msgid "<span weight=\"bold\">Date</span>"
 #~ msgstr "<span weight=\"bold\">Дата</span>"
+
 #~ msgid "<span weight=\"bold\">Folders</span>"
 #~ msgstr "<span weight=\"bold\">Папки</span>"
+
 #~ msgid "<span weight=\"bold\">Icon Captions</span>"
 #~ msgstr "<span weight=\"bold\">Подписи к значкам</span>"
+
 #~ msgid "<span weight=\"bold\">List Columns</span>"
 #~ msgstr "<span weight=\"bold\">Видимые столбцы</span>"
+
 #~ msgid "<span weight=\"bold\">Text Files</span>"
 #~ msgstr "<span weight=\"bold\">Текстовые файлы</span>"
+
 #~ msgid "<span weight=\"bold\">Trash</span>"
 #~ msgstr "<span weight=\"bold\">Корзина</span>"
+
 #~ msgid "Check that your proxy settings are correct."
 #~ msgstr "Убедитесь, что параметры прокси верны."
+
 #~ msgid ""
 #~ "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
 #~ "browser."
 #~ msgstr ""
 #~ "Не удалось показать «%s», потому что Nautilus не может связаться с мастер-"
 #~ "браузером SMB."
+
 #~ msgid "Check that an SMB server is running in the local network."
 #~ msgstr "Убедитесь, что в локальной сети работает сервер SMB."
+
 #~ msgid "Check if the service is available."
 #~ msgstr "Проверить, доступен ли сервис."
+
 #~ msgid "Nautilus cannot display \"%s\"."
 #~ msgstr "Nautilus не может отобразить адрес «%s»."
+
 #~ msgid "\"%s\" selected (%s)"
 #~ msgstr "Элемент «%s» выделен (%s)"
+
 #~ msgid "None of the %d selected items can be moved to the Trash"
 #~ msgstr ""
 #~ "Ни один из %d выделенных элементов не может быть перемещен в корзину"
+
 #~ msgid "Shutter Speed"
 #~ msgstr "Выдержка затвора"
-
diff --git a/po/rw.po b/po/rw.po
index 8b1319c7d..c0217b275 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  rw.po (nautilus 2.12)  #-#-#-#-#
 # translation of nautilus to Kinyarwanda.
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nautilus package.
@@ -11,8 +12,24 @@
 # Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
 # Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005..
 #
+# #-#-#-#-#  rw.po (eel 2.12)  #-#-#-#-#
+# translation of eel to Kinyarwanda.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+# Steve Murphy <murf@e-tools.com>, 2005
+# Steve performed initial rough translation from compendium built from translations provided by the following translators:
+# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
+# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
+# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
+# Carole Karema <karemacarole@hotmail.com>, 2005.
+# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
+# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
+# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005..
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  rw.po (nautilus 2.12)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus 2.12\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-03-31 18:37-0700\n"
@@ -23,6 +40,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  rw.po (eel 2.12)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.12\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2005-03-28 19:34-0700\n"
+"Last-Translator: Steve Murphy <murf@e-tools.com>\n"
+"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: data/browser.xml.h:1
 msgid "Apparition"
@@ -462,7 +489,7 @@ msgstr "Yahagaritswe"
 #: libnautilus-extension/nautilus-menu-item.c:206
 #: libnautilus-extension/nautilus-property-page.c:176
 #: libnautilus-private/nautilus-column-utilities.c:43
-#: src/file-manager/fm-list-view.c:1113
+#: src/file-manager/fm-list-view.c:1113 eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Izina"
 
@@ -540,6 +567,7 @@ msgstr "kugirango Ibikubiyemo Ikintu"
 
 # sfx2/source\toolbox\tbxopdlg.src:TP_CONFIG_OBJECTBAR.STR_SYMBOL.text
 #: libnautilus-extension/nautilus-menu-item.c:227
+#: eel/eel-mime-application-chooser.c:237
 msgid "Icon"
 msgstr "Agashushondanga"
 
@@ -3797,9 +3825,10 @@ msgstr "a Gishya ubusa IDOSIYE Mo Imbere iyi Ububiko"
 # sfx2/source\dialog\cfg.src:STR_OPEN.text
 # #-#-#-#-#  sfx2.pot (Gnome 2.12)  #-#-#-#-#
 # sfx2/source\dialog\versdlg.src:DLG_VERSIONS.PB_OPEN.text
+#. #-#-#-#-#  rw.po (nautilus 2.12)  #-#-#-#-#
 #. name, stock id
 #: src/file-manager/fm-directory-view.c:5741
-#: src/file-manager/fm-directory-view.c:6226
+#: src/file-manager/fm-directory-view.c:6226 eel/eel-open-with-dialog.c:894
 #, fuzzy
 msgid "_Open"
 msgstr "Gufungura"
@@ -4904,7 +4933,7 @@ msgid "Couldn't Show Help"
 msgstr ""
 
 # 4427
-#: src/file-manager/fm-properties-window.c:3317
+#: src/file-manager/fm-properties-window.c:3317 eel/eel-open-with-dialog.c:793
 #, fuzzy
 msgid "Open With"
 msgstr "fungurana"
@@ -6912,5 +6941,265 @@ msgstr ""
 msgid "View your network servers in the Nautilus file manager"
 msgstr "urusobe in IDOSIYE Muyobozi"
 
+#: eel/eel-alert-dialog.c:115
+#, fuzzy
+msgid "Image/label border"
+msgstr "Akarango Imbibi"
+
+#: eel/eel-alert-dialog.c:116
+#, fuzzy
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Bya Imbibi Akarango Na Ishusho in Ikimenyetso Ikiganiro"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:126
+#, fuzzy
+msgid "The type of alert"
+msgstr "Ubwoko Bya Ikimenyetso"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr ""
+
+#: eel/eel-alert-dialog.c:135
+#, fuzzy
+msgid "The buttons shown in the alert dialog"
+msgstr "Utubuto in Ikimenyetso Ikiganiro"
+
+#: eel/eel-alert-dialog.c:199
+#, fuzzy
+msgid "Show more _details"
+msgstr "Birenzeho Birambuye"
+
+# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Font.Strikeout..6.text
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+# svx/source\engine3d\float3d.src:RID_SVXFLOAT3D_FIX_Y.text
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Umwandiko"
+
+#: eel/eel-editable-label.c:367
+#, fuzzy
+msgid "The text of the label."
+msgstr "Umwandiko Bya Akarango"
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr ""
+
+#: eel/eel-editable-label.c:374
+#, fuzzy
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Itunganya Bya Imirongo in Umwandiko Bya Akarango Bifitanye isano Kuri Ikindi "
+"Itunganya Bya Akarango muri kugirango"
+
+#: eel/eel-editable-label.c:382
+#, fuzzy
+msgid "Line wrap"
+msgstr "Gufunika"
+
+#: eel/eel-editable-label.c:383
+#, fuzzy
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Gushyiraho Gufunika Imirongo NIBA Umwandiko"
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr ""
+
+#: eel/eel-editable-label.c:391
+#, fuzzy
+msgid "The current position of the insertion cursor in chars."
+msgstr "KIGEZWEHO Ibirindiro Bya Iyinjizamo indanga in"
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr ""
+
+#: eel/eel-editable-label.c:401
+#, fuzzy
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Ibirindiro Bya Impera Bya Ihitamo Bivuye indanga in"
+
+# sfx2/sdi\sfxslots.src:SID_SELECTALL.text
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Guhitamo Byose"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr ""
+
+#: eel/eel-gconf-extensions.c:83
+#, fuzzy, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr "Ikosa"
+
+#: eel/eel-gconf-extensions.c:87
+#, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr "Ikosa"
+
+#: eel/eel-gconf-extensions.c:90
+#, fuzzy
+msgid "All further errors shown only on terminal."
+msgstr "Amakosa ku"
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+#, fuzzy
+msgid "01/01/00, 01:00 AM"
+msgstr "01 01 01"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+#, fuzzy
+msgid "1/1/00, 1:00 AM"
+msgstr "1. 1. 1."
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+#, fuzzy
+msgid " 1/ 1/00,  1:00 AM"
+msgstr "1. 1. 1."
+
+#: eel/eel-gnome-extensions.c:284
+#, fuzzy
+msgid "No image was selected."
+msgstr "Ishusho Byahiswemo"
+
+#: eel/eel-gnome-extensions.c:285
+#, fuzzy
+msgid "You must click on an image to select it."
+msgstr "Kanda ku Ishusho Kuri Guhitamo"
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Mburabuzi"
+
+#: eel/eel-mime-application-chooser.c:477
+#, fuzzy
+msgid "<i>No applications selected</i>"
+msgstr "<i Porogaramu Byahiswemo i"
+
+# sfx2/source\explorer\explorer.src:STR_SFX_NEWOFFICEDOC.text
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, fuzzy, c-format
+msgid "%s document"
+msgstr "%sInyandiko ya"
+
+# filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_UNKNOWN_APPLICATION.text
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Kitazwi"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, fuzzy, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr "Porogaramu Kuri Gufungura i i Na Ibindi Bya Ubwoko"
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+#, fuzzy
+msgid "Could not run application"
+msgstr "OYA Gukoresha Porogaramu"
+
+#: eel/eel-open-with-dialog.c:187
+#, fuzzy, c-format
+msgid "Could not find '%s'"
+msgstr "OYA Gushaka"
+
+#: eel/eel-open-with-dialog.c:190
+#, fuzzy
+msgid "Could not find application"
+msgstr "OYA Gushaka Porogaramu"
+
+#: eel/eel-open-with-dialog.c:287
+#, fuzzy
+msgid "Could not add application"
+msgstr "OYA Kongeramo Porogaramu"
+
+#: eel/eel-open-with-dialog.c:288
+#, fuzzy
+msgid "Could not add application to the application database"
+msgstr "OYA Kongeramo Porogaramu Kuri Porogaramu Ububikoshingiro"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:830
+#, fuzzy
+msgid "Select an application to view its description."
+msgstr "Porogaramu Kuri Kureba Isobanuramiterere"
+
+#: eel/eel-open-with-dialog.c:855
+#, fuzzy
+msgid "_Use a custom command"
+msgstr "a Kunoza Komandi:"
+
+#: eel/eel-open-with-dialog.c:872
+#, fuzzy
+msgid "_Browse..."
+msgstr "Gushakisha..."
+
+#: eel/eel-open-with-dialog.c:986
+#, fuzzy, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "i i Na Ikindi Idosiye Bya Ubwoko Na:"
+
+#: eel/eel-open-with-dialog.c:1017
+#, fuzzy
+msgid "_Add"
+msgstr "Kongeramo"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr ""
+
+#: eel/eel-stock-dialogs.c:214
+#, fuzzy
+msgid "You can stop this operation by clicking cancel."
+msgstr "Guhagarara iyi ku Kureka"
+
+#: eel/eel-vfs-extensions.c:650
+#, fuzzy
+msgid " (invalid Unicode)"
+msgstr "(Sibyo"
+
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Agenda.Save.TemplateInfo.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Letter.Save.TemplateInfo.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Save.TemplateInfo.text
+# #-#-#-#-#  officecfg.pot (Gnome 2.12)  #-#-#-#-#
+# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Save.TemplateInfo.text
+#~ msgid "Info"
+#~ msgstr "Ibisobanuro"
+
+#~ msgid "Warning"
+#~ msgstr "Iburira"
 
-# svtools/source\uno\unoifac2.src:RID_CONTEXTMENU.RID_OPEN_LINK_NEW.text
+#~ msgid "Error"
+#~ msgstr "Ikosa"
diff --git a/po/si.po b/po/si.po
index 584b925a4..59ffb3dbd 100644
--- a/po/si.po
+++ b/po/si.po
@@ -1,11 +1,20 @@
+# #-#-#-#-#  si.po (si)  #-#-#-#-#
 # translation of si.po to Sinhala
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Danishka Navin <snavin@redhat.com>, 2007.
 # Danishka Navin <danishka@gmail.com>, 2008.
+# #-#-#-#-#  si.po (eel.si)  #-#-#-#-#
+# translation of eel.si.po to Sinhala
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Danishka Navin <snavin@redhat.com>, 2007.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  si.po (si)  #-#-#-#-#\n"
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-05-16 03:36+0100\n"
@@ -17,6 +26,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  si.po (eel.si)  #-#-#-#-#\n"
+"Project-Id-Version: eel.si\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-05-06 03:21+0100\n"
+"PO-Revision-Date: 2007-05-27 18:26+0530\n"
+"Last-Translator: Danishka Navin <snavin@redhat.com>\n"
+"Language-Team: Sinhala <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -304,10 +325,10 @@ msgid ""
 "\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
 "\"mime_type\"."
 msgstr ""
-"අයිකන දසුනේ සහ මූලික තිරය තුළ අයිකනයක සිරස්තල ලැයිස්තුව පහත දැක්වේ. දර්ශනය "
-"වියහැකි සිරස්තල ගණන විශාලන මට්ටම මත පදනම් වේ. තිබියහැකි අගයන් වනුයේ: \"ප්‍රමාණය\", "
-"\"වර්‍ගය\", \"සකස් කළ දිනය (_m)\", \"වෙනස් කළ දිනය (_c)\", \"භාවිතා කළ දිනය (_a)"
-"\", \"හිමිකරු\", \"සමුහය\", \"අවසර\", \"octal_permissions\" සහ \"mime වර්‍ගය (_t)\"."
+"අයිකන දසුනේ සහ මූලික තිරය තුළ අයිකනයක සිරස්තල ලැයිස්තුව පහත දැක්වේ. දර්ශනය වියහැකි සිරස්තල ගණන "
+"විශාලන මට්ටම මත පදනම් වේ. තිබියහැකි අගයන් වනුයේ: \"ප්‍රමාණය\", \"වර්‍ගය\", \"සකස් කළ දිනය "
+"(_m)\", \"වෙනස් කළ දිනය (_c)\", \"භාවිතා කළ දිනය (_a)\", \"හිමිකරු\", \"සමුහය\", "
+"\"අවසර\", \"octal_permissions\" සහ \"mime වර්‍ගය (_t)\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
 msgid "Always use the location entry, instead of the pathbar"
@@ -328,10 +349,9 @@ msgid ""
 "If set to \"search_by_text_and_properties\", then Nautilus will search for "
 "files by file name and file properties."
 msgstr ""
-"ක්‍රමවේදය සමඟ ගැලපුනු ගොනු  සෙවීමෙ පුවරුව තුළ පිහිටයි. \"search_by_text\" "
-"ලෙස සැකසු විට Nautilus විසින් ගොනුවෙ නමින් ගොනු සෙවීම සිදු කරයි. "
-"\"search_by_text_and_properties\" ලෙස සැකසු විට Nautilus විසින් ගොනුවෙ නම "
-"සහ වත්කම් මඟින් සෙවීම සිදුකරයි."
+"ක්‍රමවේදය සමඟ ගැලපුනු ගොනු  සෙවීමෙ පුවරුව තුළ පිහිටයි. \"search_by_text\" ලෙස සැකසු විට "
+"Nautilus විසින් ගොනුවෙ නමින් ගොනු සෙවීම සිදු කරයි. \"search_by_text_and_properties\" "
+"ලෙස සැකසු විට Nautilus විසින් ගොනුවෙ නම සහ වත්කම් මඟින් සෙවීම සිදුකරයි."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "Current Nautilus theme (deprecated)"
@@ -460,7 +480,8 @@ msgid ""
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -586,7 +607,8 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
@@ -903,6 +925,7 @@ msgstr "ප්‍රකෘතිය භාවිතා කරන්න (_f)"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1374
+#: ../eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "නම"
 
@@ -1065,7 +1088,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:204
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 
 #. this really should never happen, as a user has no idea
@@ -1331,10 +1355,10 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-file-operations.c:1197
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
-"\"%s\" තුළ ගොනුව දැනට මත් භාවිතය සඳහා ඇත.  ආදේශ කිරීමෙදි එහි අන්තර්ගතය මත "
-"ලියවෙනු ඇත."
+"\"%s\" තුළ ගොනුව දැනට මත් භාවිතය සඳහා ඇත.  ආදේශ කිරීමෙදි එහි අන්තර්ගතය මත ලියවෙනු ඇත."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
 #: ../libnautilus-private/nautilus-file-operations.c:1233
@@ -2264,7 +2288,8 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:611
 #: ../src/nautilus-window-manage-views.c:1522
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:616
@@ -2314,7 +2339,8 @@ msgid "This drop target only supports local files."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:943
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:954
@@ -2351,7 +2377,8 @@ msgstr ""
 
 #. label, accelerator
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:663
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -2441,7 +2468,8 @@ msgstr ""
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 
 #. tooltip
@@ -2499,7 +2527,8 @@ msgstr "ඔබට විශ්වාසද? ඔබට \"%s\" ස්තිරව�
 #: ../src/file-manager/fm-directory-view.c:1006
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %d selected items?"
 msgstr[0] "ඔබට විශ්වාසද? ඔබට තෝරාගත්  අයිතම %d ස්තිරවම මැකීමට අවශ්‍යද?"
 msgstr[1] "ඔබට විශ්වාසද? ඔබට තෝරාගත්  අයිතම %d ස්තිරවම මැකීමට අවශ්‍යද?"
 
@@ -2617,9 +2646,7 @@ msgstr "%s%s, %s"
 #: ../src/file-manager/fm-directory-view.c:2379
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
-msgstr ""
-"Nautilus මඟින් හැසිර වියහැකි ප්‍රමාණයට වඩා වැඩි ගොනු ප්‍රමාණයක් "
-"\"%s\" බහලුම තුළ ඇත."
+msgstr "Nautilus මඟින් හැසිර වියහැකි ප්‍රමාණයට වඩා වැඩි ගොනු ප්‍රමාණයක් \"%s\" බහලුම තුළ ඇත."
 
 #: ../src/file-manager/fm-directory-view.c:2385
 msgid "Some files will not be displayed."
@@ -2644,7 +2671,8 @@ msgid "None of the %d selected items can be moved to the Trash"
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:3851
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 
 #: ../src/file-manager/fm-directory-view.c:3852
@@ -2781,14 +2809,16 @@ msgstr ""
 #: ../src/file-manager/fm-directory-view.c:6059
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
-msgid_plural "The %d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be moved if you select the Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/file-manager/fm-directory-view.c:6066
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
-msgid_plural "The %d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %d selected items will be copied if you select the Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2866,11 +2896,12 @@ msgstr "හිස් ගොනුව (_E)"
 msgid "Create a new empty file inside this folder"
 msgstr "මෙම බහලුම තුළ නව හිස් ගොනුවක් නිර්මාණය කරන්න"
 
+#. #-#-#-#-#  si.po (si)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6864
 #: ../src/file-manager/fm-directory-view.c:7743
 #: ../src/file-manager/fm-tree-view.c:1253
-#: ../src/nautilus-places-sidebar.c:1448
+#: ../src/nautilus-places-sidebar.c:1448 ../eel/eel-open-with-dialog.c:918
 msgid "_Open"
 msgstr "විවෘත කරන්න (_O)"
 
@@ -3317,7 +3348,8 @@ msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:60
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\" හි අන්තර්ගතය බැලීම සඳහා ඔබට අවශ්‍ය අවසර නොමැත."
 
 #: ../src/file-manager/fm-error-reporting.c:64
@@ -3336,14 +3368,14 @@ msgstr "බහලුමේ අන්තර්ගත පෙන්විය නො
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr ""
-"\"%s\" නම මෙම බහලුම තුලදී මීට පෙර භාවිතා කර ඇත. කරුණාකර වෙනස් නමක් "
-"භාවිතා කරන්න."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr "\"%s\" නම මෙම බහලුම තුලදී මීට පෙර භාවිතා කර ඇත. කරුණාකර වෙනස් නමක් භාවිතා කරන්න."
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:118
@@ -3379,7 +3411,8 @@ msgstr "අයිකනයේ නම වෙනස් කළ නොහැක."
 
 #: ../src/file-manager/fm-error-reporting.c:169
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\"සමූහයේ හි නම වෙනස් කිරීම සඳහා ඔබට අවශ්‍ය අවසර නොමැත.."
 
 #: ../src/file-manager/fm-error-reporting.c:173
@@ -3412,7 +3445,8 @@ msgstr "හිමිකරු වෙනස් කළ නොහැකි වි�
 
 #: ../src/file-manager/fm-error-reporting.c:239
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 
 #: ../src/file-manager/fm-error-reporting.c:246
@@ -3984,6 +4018,7 @@ msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
 #: ../src/file-manager/fm-properties-window.c:4814
+#: ../eel/eel-open-with-dialog.c:817
 msgid "Open With"
 msgstr "සමඟ විවෘත කරන්න"
 
@@ -5705,3 +5740,223 @@ msgstr "විශාලණය"
 msgid "Set the zoom level of the current view"
 msgstr "දැනට ඇති දසුනේ විශාලණය සකසන්න"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "පිළිඹිබුව/ලේබලය රාමුව"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "විපරම් සංවාද කොටුව තුළ වූ ලේබලය සහ පිළිඹිබුව වටා ඇති රාමුවේ ඝනකම"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "විපරම් වර්ගය"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "විපරමෙහි වර්ගය"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "විපරම් බොත්තම්"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "විපරම් සංවාද කොටුව තුළ පෙන්වන බොත්තම් වර්‍ග"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "වැඩි විස්තර පෙන්වන්න (_d)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "පෙළ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ලේබලයේ පෙළ"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "නිදොස් බව"
+
+#: ../eel/eel-editable-label.c:374
+#, fuzzy
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"රේඛාවල පෙළ ගැසුම්The alignment of the lines in the text of the label relative "
+"to each other. මෙය ලේබලයේ කෙරෙහි බලනොපානු ඇතThis does NOT affect the alignment "
+"of the label within its allocation. එය සඳහා GtkMisc::xalign බලන්න."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "රේඛාවේ වැස්ම"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "රේඛාවේ වැස්ම සැකසුව හොත්, පෙළ පුළුල් වේ."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "දර්ශකයේ පිහිටීම"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "ඇතුලත් කිරිමේ දර්ශකයේ දැන් පිහිටීම වචන වෙයි."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "තෝරා ගැනිමෙ සීමාව"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "සියල්ල තෝරන්න"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "ඇතුලත් කරන ක්‍රම"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf දෝෂය:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf දෝෂය: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "අනෙකුත් සියළුම දෝෂ පෙන්වනුයේ අග්‍රය මත පමණි.."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: ../eel/eel-glib-extensions.c:1193
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 පෙ.ව."
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: ../eel/eel-glib-extensions.c:1195
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 පෙ.ව."
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: ../eel/eel-glib-extensions.c:1197
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/00,  1:00 පෙ.ව."
+
+#: ../eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "කිසිඳු පිළිඹිබුවක් තෝරාගෙන නැත."
+
+#: ../eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "පිළිඹිබුවක් තෝරාගැනිමට එය මත ඔබ ක්ලික් කළයුතු වේ."
+
+#: ../eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "සාමාන්‍ය"
+
+#: ../eel/eel-mime-application-chooser.c:237
+msgid "Icon"
+msgstr "අයිකනය"
+
+#: ../eel/eel-mime-application-chooser.c:479
+msgid "No applications selected"
+msgstr "කිසිඳු යෙදුමක් තෝරා නැත"
+
+#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:992
+#, c-format
+msgid "%s document"
+msgstr "%s ලේඛනය"
+
+#: ../eel/eel-mime-application-chooser.c:538
+#: ../eel/eel-open-with-dialog.c:1005
+msgid "Unknown"
+msgstr "නොදන්නා"
+
+#: ../eel/eel-mime-application-chooser.c:546
+#, c-format
+msgid "Select an application to open %s and others of type \"%s\""
+msgstr "විවෘත කිරිම සඳහා යෙදුමක් තෝරන්න %s සහාය \"%s\" වර්‍ගයේ වෙනත්"
+
+#: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "යෙදුම ක්‍රියාකරවිය නොහැක"
+
+#: ../eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "'%s' සොයාගත නොහැකි විය"
+
+#: ../eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "යෙදුම සොයාගත නොහැකි විය"
+
+#: ../eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "යෙදුම එක්කල නොහැකි විය"
+
+#: ../eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "යෙදුම් දත්ත ගබඩාවට යෙදුම එක්කල නොහැකි විය"
+
+#: ../eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "යෙදුමක් තෝරන්න"
+
+#: ../eel/eel-open-with-dialog.c:854
+msgid "Select an application to view its description."
+msgstr "විස්තර බැලීමට යෙදුමක් තෝරන්න."
+
+#: ../eel/eel-open-with-dialog.c:879
+msgid "_Use a custom command"
+msgstr "විධානයක් භාවිතා කරන්න  _U"
+
+#: ../eel/eel-open-with-dialog.c:896
+msgid "_Browse..."
+msgstr "ගවේෂණය... (_B)"
+
+#: ../eel/eel-open-with-dialog.c:1012
+#, c-format
+msgid "Open %s and other files of type \"%s\" with:"
+msgstr "%s සහ \"%s\" ආකාරයෙ වෙනත් ගොනු අසමඟ විවෘත කරන්:"
+
+#: ../eel/eel-open-with-dialog.c:1044
+msgid "_Add"
+msgstr "එක් කරන්න (_A)"
+
+#: ../eel/eel-open-with-dialog.c:1045
+msgid "Add Application"
+msgstr "යෙදුමක් එක්කරන්න"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "අහෝසි කරන්න ක්ලික් කිරිමෙන් ඔබට මෙම මෙහෙයුම නැවැත්විය හැක."
+
+#: ../eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (සාවද්‍ය යුනිකෙතය)"
diff --git a/po/sk.po b/po/sk.po
index df37a18d4..5d94270d1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  sk.po (sk)  #-#-#-#-#
 # translation of sk.po to Slovak
 # Slovak translation of sk.po
 # Nautilus Slovak translation.
@@ -11,8 +12,20 @@
 # Stanislav Visnovsky <visnov@suse.cz>, 2003.
 # Marcel Telka <marcel@telka.sk>, 2005.
 # Peter Tuharsky <tuharsky@misbb.sk>, 2007.
+# #-#-#-#-#  sk.po (eel)  #-#-#-#-#
+# translation of eel.HEAD.po to Slovak
+# translation of sk.po to Slovak
+# eel Slovak translation.
+# Copyright (C) 2000-2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+# Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2000-2002,2003, 2004.
+# Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>, 2002.
+# Ivan Noris <vix@vazka.sk>, 2004, 2005.
+# Marcel Telka <marcel@telka.sk>, 2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sk.po (sk)  #-#-#-#-#\n"
 "Project-Id-Version: sk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-15 14:28+0200\n"
@@ -25,6 +38,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Country: SLOVAKIA\n"
+"#-#-#-#-#  sk.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-01 20:23+0100\n"
+"PO-Revision-Date: 2008-02-01 20:25+0100\n"
+"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2377,9 +2401,14 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:489
 #: ../libnautilus-private/nautilus-program-choosing.c:731
-#, c-format
+#: ../eel/eel-app-launch-context.c:404
+#, fuzzy, c-format
 msgid "Opening %s"
-msgstr "Otváram %s"
+msgstr ""
+"#-#-#-#-#  sk.po (sk)  #-#-#-#-#\n"
+"Otváram %s\n"
+"#-#-#-#-#  sk.po (eel)  #-#-#-#-#\n"
+"Otvára sa %s"
 
 #. TODO: These strings suck pretty badly, but we're in string-freeze,
 #. * and I found these in other places to reuse. We should make them
@@ -2451,12 +2480,25 @@ msgid "Couldn't find \"%s\"."
 msgstr "Nie je možné nájsť \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:734
-#, c-format
+#: ../eel/eel-app-launch-context.c:407
+#, fuzzy, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
-msgstr[0] "Otváram %d položiek."
-msgstr[1] "Otváram %d položku."
-msgstr[2] "Otváram %d položky."
+msgstr[0] ""
+"#-#-#-#-#  sk.po (sk)  #-#-#-#-#\n"
+"Otváram %d položiek.\n"
+"#-#-#-#-#  sk.po (eel)  #-#-#-#-#\n"
+"Otvára sa %d položiek"
+msgstr[1] ""
+"#-#-#-#-#  sk.po (sk)  #-#-#-#-#\n"
+"Otváram %d položku.\n"
+"#-#-#-#-#  sk.po (eel)  #-#-#-#-#\n"
+"Otvára sa %d položka"
+msgstr[2] ""
+"#-#-#-#-#  sk.po (sk)  #-#-#-#-#\n"
+"Otváram %d položky.\n"
+"#-#-#-#-#  sk.po (eel)  #-#-#-#-#\n"
+"Otvárajú sa %d položky"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:899
 msgid "Sorry, but you can't execute commands from a remote site."
@@ -6059,3 +6101,131 @@ msgstr "Zväčšiť"
 #: ../src/nautilus-zoom-control.c:894
 msgid "Set the zoom level of the current view"
 msgstr "Nastaví zväčšenie aktuálneho pohľadu"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Okraj obrázku/popisu"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Šírka okraja okolo textu a obrázku v dialógu upozornenia"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Typ upozornenia"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Typ upozornenia"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Tlačidlá upozornenia"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Tlačidlá zobrazené v dialógu upozornenia"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Zobraziť viac _detailov"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Text popisu."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Zarovnanie"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Zarovnanie riadkov textu popisu relatívne k sebe navzájom. Toto NEOVPLYVŇUJE "
+"zarovnanie popisu vzhľadom k jeho umiestneniu. Na to použite GtkMisc::xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Zalamovanie riadkov"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ak je nastavené, príliš dlhé riadky sa budú zalamovať."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Pozícia kurzoru"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Aktuálna pozuícia kurzoru pre vkladanie zadaná v znakoch."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Ohraničenie výberu"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Pozícia opačného konca výberu od kurzoru v znakoch."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Vybrať všetko"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Vstupné metódy"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Chyba GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Chyba GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Všetky ďalšie chyby budú zobrazené len v termináli."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Nevybraný žiadny obrázok."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Musíte kliknúť na obrázok, aby sa označil."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Túto operáciu môžete prerušiť stlačením Zrušiť."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (neplatné Unicode)"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Zadajte heslo"
diff --git a/po/sl.po b/po/sl.po
index 3c0809c07..4fa34ed30 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,11 +1,22 @@
+# #-#-#-#-#  sl.po (nautilus)  #-#-#-#-#
 # This file is distributed under the same license as the nautilus package.
 #
 # Andraz Tori <andraz.tori1@guest.arnes.si>, 2000.
 # Matjaž Horvat <m@owca.info>, 2006.
 # Matej Urbančič <mateju@svn.gnome.org> 2007- 2008.
 #
+# #-#-#-#-#  sl.po (eel)  #-#-#-#-#
+# Slovenian translation of eel.
+# Copyright (C) 2000-2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+#
+# Andraz Tori <andraz.tori1@guest.arnes.si>, 2000.
+# Matej Urbančič <mateju@svn.gnome.org>, 2006 - 2007.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sl.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-05 13:45+0000\n"
@@ -15,10 +26,26 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Language: Slovenian\n"
+"#-#-#-#-#  sl.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-10-22 17:06+0100\n"
+"PO-Revision-Date: 2007-12-20 15:09+0100\n"
+"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -125,8 +152,7 @@ msgid "Envy"
 msgstr "Zavistno zelena"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28
-#: ../src/nautilus-emblem-sidebar.c:931
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:931
 #: ../src/nautilus-property-browser.c:1770
 msgid "Erase"
 msgstr "Izbriši"
@@ -302,13 +328,51 @@ msgstr "Shranjeno iskanje"
 #. Translators: date_modified - mtime, the last time file contents were changed
 #. date_changed  - ctime, the last time file meta-information changed
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Possible values are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and \"mime_type\"."
-msgstr "Seznam oznak pod ikonami v pogledu ikon in na namizju. Dejansko število možnosti je odvisno od ravni povečave. Možne vrednosti so: \"velikost\", \"vrsta\", \"datum_spremembe\", \"datum_meta_spremembe\", \"datum_dostopa\", \"lastnik\", \"skupina\", \"dovoljenja\", \"osmiška_dovoljenja\" in \"mime_vrste\"."
+msgid ""
+"A list of captions below an icon in the icon view and the desktop. The "
+"actual number of captions shown depends on the zoom level. Possible values "
+"are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed"
+"\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
+"\"mime_type\"."
+msgstr ""
+"Seznam oznak pod ikonami v pogledu ikon in na namizju. Dejansko število "
+"možnosti je odvisno od ravni povečave. Možne vrednosti so: \"velikost\", "
+"\"vrsta\", \"datum_spremembe\", \"datum_meta_spremembe\", \"datum_dostopa\", "
+"\"lastnik\", \"skupina\", \"dovoljenja\", \"osmiška_dovoljenja\" in "
+"\"mime_vrste\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 #, no-c-format
-msgid "A string specifying how parts of overlong file names should be replaced by ellipses, depending on the zoom level. Each of the list entries is of the form \"Zoom Level:Integer\". For each specified zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form \"Integer\" without any specified zoom level is also allowed. It defines the maximum number of lines for all other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level \"smallest\". Shorten file names if they exceed four lines for zoom level \"smaller\". Do not shorten file names for other zoom levels. Available zoom levels: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
-msgstr "Število, ki določa kako bodo predolga imena datotek prikazana na namizju v oglatih oklepajih glede na raven povečave. Vsak vnos seznama je v obliki \"Povečava:številka\". Za vsako določeno raven povečave velja, da je v primeru, da je številka večja od 0, ime datoteke ne bo prešlo določene vrednosti vrstic. V primeru, da je številka manjša ali enaka 0, pri dolžini imena ni omejitev. Privzeti vnos \"Številke\" brez določene vrednosti povečave je prav tako dovoljen. Določa namreč največje število vrstic za vse ostale vrednosti povečave. Primer: 0 - vedno prikaži polno ime datoteke; 3 - skrajšaj ime, če je daljše od treh vrstic; najmanjše:5,manjše:4,0 - skrči ime, če je daljše od petih vrstic pri povečavi \"najmanjše\". Skrči tudi imena datotek, če so daljša od štirih vrstic pri povečavi \"manjše\". Ne skrči pa imen datotek, za druge vrednosti povečav. Na voljo so ravni povečave: najmanjše (33%), manjše (50%), majhno (66%), običajno (100%), veliko (150%), večje (200%), največje (400%)."
+msgid ""
+"A string specifying how parts of overlong file names should be replaced by "
+"ellipses, depending on the zoom level. Each of the list entries is of the "
+"form \"Zoom Level:Integer\". For each specified zoom level, if the given "
+"integer is larger than 0, the file name will not exceed the given number of "
+"lines. If the integer is 0 or smaller, no limit is imposed on the specified "
+"zoom level. A default entry of the form \"Integer\" without any specified "
+"zoom level is also allowed. It defines the maximum number of lines for all "
+"other zoom levels. Examples: 0 - always display overlong file names; 3 - "
+"shorten file names if they exceed three lines; smallest:5,smaller:4,0 - "
+"shorten file names if they exceed five lines for zoom level \"smallest\". "
+"Shorten file names if they exceed four lines for zoom level \"smaller\". Do "
+"not shorten file names for other zoom levels. Available zoom levels: "
+"smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
+"larger (200%), largest (400%)"
+msgstr ""
+"Število, ki določa kako bodo predolga imena datotek prikazana na namizju v "
+"oglatih oklepajih glede na raven povečave. Vsak vnos seznama je v obliki "
+"\"Povečava:številka\". Za vsako določeno raven povečave velja, da je v "
+"primeru, da je številka večja od 0, ime datoteke ne bo prešlo določene "
+"vrednosti vrstic. V primeru, da je številka manjša ali enaka 0, pri dolžini "
+"imena ni omejitev. Privzeti vnos \"Številke\" brez določene vrednosti "
+"povečave je prav tako dovoljen. Določa namreč največje število vrstic za vse "
+"ostale vrednosti povečave. Primer: 0 - vedno prikaži polno ime datoteke; 3 - "
+"skrajšaj ime, če je daljše od treh vrstic; najmanjše:5,manjše:4,0 - skrči "
+"ime, če je daljše od petih vrstic pri povečavi \"najmanjše\". Skrči tudi "
+"imena datotek, če so daljša od štirih vrstic pri povečavi \"manjše\". Ne "
+"skrči pa imen datotek, za druge vrednosti povečav. Na voljo so ravni "
+"povečave: najmanjše (33%), manjše (50%), majhno (66%), običajno (100%), "
+"veliko (150%), večje (200%), največje (400%)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -319,12 +383,23 @@ msgid "Always use the location entry, instead of the pathbar"
 msgstr "Vedno uporabi vnosno polje mesta namesto gumbov s potjo"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
-msgid "An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines."
-msgstr "Število, ki določa kako bodo predolga imena datotek prikazana na namizju v oglatih oklepajih. V primeru, da je številka večja od 0, ime ne bo daljše od določene vrednosti. V primeru, da je vrednost 0 ali pa manjša od 0, pa na dolžino imena ni omejitev."
+msgid ""
+"An integer specifying how parts of overlong file names should be replaced by "
+"ellipses on the desktop. If the number is larger than 0, the file name will "
+"not exceed the given number of lines. If the number is 0 or smaller, no "
+"limit is imposed on the number of displayed lines."
+msgstr ""
+"Število, ki določa kako bodo predolga imena datotek prikazana na namizju v "
+"oglatih oklepajih. V primeru, da je številka večja od 0, ime ne bo daljše od "
+"določene vrednosti. V primeru, da je vrednost 0 ali pa manjša od 0, pa na "
+"dolžino imena ni omejitev."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
-msgstr "Barva za privzeto ozadje map. Uporabljeno le, če je uporabljena možnost nastavljanja ozadja."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
+msgstr ""
+"Barva za privzeto ozadje map. Uporabljeno le, če je uporabljena možnost "
+"nastavljanja ozadja."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Computer icon visible on desktop"
@@ -335,8 +410,16 @@ msgid "Criteria for search bar searching"
 msgstr "Kriterij za iskanje v iskalni vrstici"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
-msgid "Criteria when matching files searched for in the search bar. If set to \"search_by_text\", then Nautilus will Search for files by file name only. If set to \"search_by_text_and_properties\", then Nautilus will search for files by file name and file properties."
-msgstr "Kriterij za iskanje datotek v iskalni vrstici. Če je nastavljen na \"search_by_text\", potem Nautilus išče datoteke le po njihovih imenih. Če je nastavljen na \"search_by_text_and_properties\", potem Nautilus išče datoteke po imenih in lastnostih."
+msgid ""
+"Criteria when matching files searched for in the search bar. If set to "
+"\"search_by_text\", then Nautilus will Search for files by file name only. "
+"If set to \"search_by_text_and_properties\", then Nautilus will search for "
+"files by file name and file properties."
+msgstr ""
+"Kriterij za iskanje datotek v iskalni vrstici. Če je nastavljen na "
+"\"search_by_text\", potem Nautilus išče datoteke le po njihovih imenih. Če "
+"je nastavljen na \"search_by_text_and_properties\", potem Nautilus išče "
+"datoteke po imenih in lastnostih."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Current Nautilus theme (deprecated)"
@@ -440,34 +523,64 @@ msgstr "Ime ikone Smeti na namizju"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "Omogoča običajno delovanje Nautilusa, tako da so vsa okna namenjena tudi brskanju."
+msgstr ""
+"Omogoča običajno delovanje Nautilusa, tako da so vsa okna namenjena tudi "
+"brskanju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid "Filename for the default folder background. Only used if background_set is true."
-msgstr "Ime datoteke za privzeto ozadje map. Uporabljeno le, če je ključ bacground_set resničen."
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"Ime datoteke za privzeto ozadje map. Uporabljeno le, če je ključ "
+"bacground_set resničen."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid "Filename for the default side pane background. Only used if side_pane_background_set is true."
-msgstr "Ime datoteke za privzeto ozadje stranskega pulta. Uporabljeno le, če je ključ side_panel_bacground_set nastavljen na resnično."
+msgid ""
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
+msgstr ""
+"Ime datoteke za privzeto ozadje stranskega pulta. Uporabljeno le, če je "
+"ključ side_panel_bacground_set nastavljen na resnično."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
-msgid "Folders over this size will be truncated to around this size. The purpose of this is to avoid unintentionally blowing the heap and killing Nautilus on massive folders. A negative value denotes no limit. The limit is approximate due to the reading of folders chunk-wise."
-msgstr "Mape nad to velikostjo bodo obrezane približno pri tej velikosti. Namen te možnosti je izogniti se nenamernemu povečanju porabe pomnilnika in posledično napake izvajanja Nautilusa pri ogromnih mapah. Negativna vrednost označuje, da ni omejitve. Omejitev je približna velikosti sklopov ob branju map."
+msgid ""
+"Folders over this size will be truncated to around this size. The purpose of "
+"this is to avoid unintentionally blowing the heap and killing Nautilus on "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Mape nad to velikostjo bodo obrezane približno pri tej velikosti. Namen te "
+"možnosti je izogniti se nenamernemu povečanju porabe pomnilnika in "
+"posledično napake izvajanja Nautilusa pri ogromnih mapah. Negativna vrednost "
+"označuje, da ni omejitve. Omejitev je približna velikosti sklopov ob branju "
+"map."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid "Home icon visible on desktop"
 msgstr "Ikona Dom vidna na namizju"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
-msgid "If set to \"after_current_tab\", then new tabs are inserted after the current tab. If set to \"end\", then new tabs are appended to the end of the tab list."
-msgstr "Izbrana možnost \"za trenutnim zavihkom\" omogoča, da bodo novo odprti zavihki postavljeni vedno za trenutno izbrani zavihek. Možnost \"na koncu\", pa odpre nov zavihek kot zadnji v vrsti."
+msgid ""
+"If set to \"after_current_tab\", then new tabs are inserted after the "
+"current tab. If set to \"end\", then new tabs are appended to the end of the "
+"tab list."
+msgstr ""
+"Izbrana možnost \"za trenutnim zavihkom\" omogoča, da bodo novo odprti "
+"zavihki postavljeni vedno za trenutno izbrani zavihek. Možnost \"na koncu\", "
+"pa odpre nov zavihek kot zadnji v vrsti."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
-msgid "If set to true, Nautilus will only show folders in the tree side pane. Otherwise it will show both folders and files."
-msgstr "Nautilus bo v drevesu stranskega panoja prikazal le mape. Sicer bodo prikazane tudi datoteke."
+msgid ""
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
+msgstr ""
+"Nautilus bo v drevesu stranskega panoja prikazal le mape. Sicer bodo "
+"prikazane tudi datoteke."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "Novo odprta okna imajo vidno vrstico mesta."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -483,99 +596,186 @@ msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr "Na novo odprta okna imajo vidne orodne vrstice"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
-msgstr "Nautilusova okna za brskanje bodo vedno uporabljala polje za besedilni vnos mesta namesto gumbov s potjo."
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
+msgstr ""
+"Nautilusova okna za brskanje bodo vedno uporabljala polje za besedilni vnos "
+"mesta namesto gumbov s potjo."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
-msgstr "Nautilus omogoči urejanje in prikaz dovoljenj datotek v \"unix\" načinu."
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
+msgstr ""
+"Nautilus omogoči urejanje in prikaz dovoljenj datotek v \"unix\" načinu."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views."
+msgid ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr "Nautilus v pogledu seznama in ikon prikaže mape pred datotekami."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash."
-msgstr "Možnost omogoča, da program Nautilus vedno pred brisanjem ali prestavljanjem predmetov v smeti, vpraša za potrditev."
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"delete files, or empty the Trash."
+msgstr ""
+"Možnost omogoča, da program Nautilus vedno pred brisanjem ali prestavljanjem "
+"predmetov v smeti, vpraša za potrditev."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "If set to true, then Nautilus will automatically mount media such as user-visible hard disks and removable media on start-up and media insertion."
-msgstr "Izbrana možnost omogoča samodejen priklop naprav kot sto trdi diski in ključki na uporabniku poznan način med zagonom ali ob vstavljanju."
+msgid ""
+"If set to true, then Nautilus will automatically mount media such as user-"
+"visible hard disks and removable media on start-up and media insertion."
+msgstr ""
+"Izbrana možnost omogoča samodejen priklop naprav kot sto trdi diski in "
+"ključki na uporabniku poznan način med zagonom ali ob vstavljanju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
-msgid "If set to true, then Nautilus will automatically open a folder when media is automounted. This only applies to media where no known x-content/* type was detected; for media where a known x-content type is detected, the user configurable action will be taken instead."
-msgstr "Izbrana možnost omogoča samodejno odpiranje mape ob vstavitvi medija. Možnost je na voljo le za medije, kjer je poznana vrsta x-content/*; Za medije neznane vrste bo uporabniku zastavljeno vprašanje o nadaljevanju."
+msgid ""
+"If set to true, then Nautilus will automatically open a folder when media is "
+"automounted. This only applies to media where no known x-content/* type was "
+"detected; for media where a known x-content type is detected, the user "
+"configurable action will be taken instead."
+msgstr ""
+"Izbrana možnost omogoča samodejno odpiranje mape ob vstavitvi medija. "
+"Možnost je na voljo le za medije, kjer je poznana vrsta x-content/*; Za "
+"medije neznane vrste bo uporabniku zastavljeno vprašanje o nadaljevanju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "Nautilus bo izrisoval ikone na namizju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
-msgid "If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
-msgstr "Nautilus bo omogočal neposredno brisanje datoteke, brez prenosa v smeti. Ta možnost je lahko nevarna, zato jo uporabljajte previdno."
+msgid ""
+"If set to true, then Nautilus will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"Nautilus bo omogočal neposredno brisanje datoteke, brez prenosa v smeti. Ta "
+"možnost je lahko nevarna, zato jo uporabljajte previdno."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted."
-msgstr "Izbrana možnost določa, da program Nautilus ne bo spraševal kaj storiti ob zagonu medija."
+msgid ""
+"If set to true, then Nautilus will never prompt nor autorun/autostart "
+"programs when a medium is inserted."
+msgstr ""
+"Izbrana možnost določa, da program Nautilus ne bo spraševal kaj storiti ob "
+"zagonu medija."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-msgid "If set to true, then Nautilus will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "Nautilus bo uporabil za namizje uporabnikovo domačo mapo. Sicer bo za namizje uporabil mapo ~/Desktop."
+msgid ""
+"If set to true, then Nautilus will use the user's home folder as the "
+"desktop. If it is false, then it will use ~/Desktop as the desktop."
+msgstr ""
+"Nautilus bo uporabil za namizje uporabnikovo domačo mapo. Sicer bo za "
+"namizje uporabil mapo ~/Desktop."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "If set to true, then all Nautilus windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior."
-msgstr "Vsa okna Nautilusa bodo vedno namenjena tudi brskanju. Tako je Nautilus deloval pred različico 2.6, kar je najljubša izbira nekaterih uporabnikov."
+msgid ""
+"If set to true, then all Nautilus windows will be browser windows. This is "
+"how Nautilus used to behave before version 2.6, and some people prefer this "
+"behavior."
+msgstr ""
+"Vsa okna Nautilusa bodo vedno namenjena tudi brskanju. Tako je Nautilus "
+"deloval pred različico 2.6, kar je najljubša izbira nekaterih uporabnikov."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "If set to true, then backup files such as those created by Emacs are displayed. Currently, only files ending in a tilde (~) are considered backup files."
-msgstr "V sistemu bodo prikazane varnostne kopije datotek, kot jih na primer ustvarja Emacs. Trenutno se za varnostne kopije datotek štejejo tiste, katerih ime se končuje s tildo (~)."
+msgid ""
+"If set to true, then backup files such as those created by Emacs are "
+"displayed. Currently, only files ending in a tilde (~) are considered backup "
+"files."
+msgstr ""
+"V sistemu bodo prikazane varnostne kopije datotek, kot jih na primer "
+"ustvarja Emacs. Trenutno se za varnostne kopije datotek štejejo tiste, "
+"katerih ime se končuje s tildo (~)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
-msgid "If set to true, then hidden files are shown in the file manager. Hidden files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "V upravitelju datotek bodo prikazane skrite datoteke. Skrite datoteke se začnejo s piko ali pa so naštete v datoteki .hidden."
+msgid ""
+"If set to true, then hidden files are shown in the file manager. Hidden "
+"files are either dotfiles or are listed in the folder's .hidden file."
+msgstr ""
+"V upravitelju datotek bodo prikazane skrite datoteke. Skrite datoteke se "
+"začnejo s piko ali pa so naštete v datoteki .hidden."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
-msgid "If set to true, then multiple views can be opened in one browser window, each in a separate tab."
-msgstr "Izbrana možnost omogoča prikaz več pogledov znotraj enega okna brskalnika v posameznih zavihkih."
+msgid ""
+"If set to true, then multiple views can be opened in one browser window, "
+"each in a separate tab."
+msgstr ""
+"Izbrana možnost omogoča prikaz več pogledov znotraj enega okna brskalnika v "
+"posameznih zavihkih."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the Network Servers view will be "
+"put on the desktop."
 msgstr "Na namizje bo postavljena ikona, ki bo kazala na omrežne strežnike."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "If this is set to true, an icon linking to the computer location will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
 msgstr "Na namizje bo postavljena ikona, ki bo kazala na računalnik."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
+"the desktop."
 msgstr "Na namizje bo postavljena ikona, ki bo kazala na domačo mapo."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
-msgid "If this is set to true, an icon linking to the trash will be put on the desktop."
+msgid ""
+"If this is set to true, an icon linking to the trash will be put on the "
+"desktop."
 msgstr "Na namizje bo postavljena ikona, ki bo povezovala smeti z namizjem."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop."
-msgstr "Na namizje bo postavljena ikona, ki bo povezovala na priklopljene naprave z namizjem."
+msgid ""
+"If this is set to true, icons linking to mounted volumes will be put on the "
+"desktop."
+msgstr ""
+"Na namizje bo postavljena ikona, ki bo povezovala na priklopljene naprave z "
+"namizjem."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
-msgid "If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately."
-msgstr "Možnost omogoča, da imajo vsi stolpci enako širino. Obratno pa ima vsak stolpec svojo širino, ki je določena posebej."
+msgid ""
+"If this preference is set, all columns in the compact view have the same "
+"width. Otherwise, the width of each column is determined seperately."
+msgstr ""
+"Možnost omogoča, da imajo vsi stolpci enako širino. Obratno pa ima vsak "
+"stolpec svojo širino, ki je določena posebej."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"."
-msgstr "Datoteke bodo v novih oknih razvrščene v obratnem vrstnem redu. Npr.: če so razvrščene po imenu, bodo namesto od \"a\" do \"ž\" razvrščene od \"ž\" do \"a\"."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"."
+msgstr ""
+"Datoteke bodo v novih oknih razvrščene v obratnem vrstnem redu. Npr.: če so "
+"razvrščene po imenu, bodo namesto od \"a\" do \"ž\" razvrščene od \"ž\" do "
+"\"a\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally."
-msgstr "Datoteke bodo v novih oknih razvrščene po obratnem vrstnem redu. Primer: če so razvrščene po imenu, bodo namesto od črke \"a\" do \"ž\" razvrščene od črke \"ž\" do črke \"a\". V primeru, da so urejene po velikosti bodo namesto od večje proti manjši urejene od manjše proti večji."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"incrementally they will be sorted decrementally."
+msgstr ""
+"Datoteke bodo v novih oknih razvrščene po obratnem vrstnem redu. Primer: če "
+"so razvrščene po imenu, bodo namesto od črke \"a\" do \"ž\" razvrščene od "
+"črke \"ž\" do črke \"a\". V primeru, da so urejene po velikosti bodo namesto "
+"od večje proti manjši urejene od manjše proti večji."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "Ikone bodo v novih oknih postavljene tesneje skupaj."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "Oznake bodo postavljene ob ikone namesto pod njih."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
@@ -583,35 +783,61 @@ msgid "If true, new windows will use manual layout by default."
 msgstr "Nova okna bodo uporabila ročno postavitev namesto privzete."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory."
-msgstr "Slike nad to velikostjo (v bajtih) ne bodo prikazane kot sličice. Namen teh nastavitev je izogniti se izdelavi sličic velikih datotek, kar bi lahko vzelo veliko časa in pomnilnika."
+msgid ""
+"Images over this size (in bytes) won't be thumbnailed. The purpose of this "
+"setting is to avoid thumbnailing large images that may take a long time to "
+"load or use lots of memory."
+msgstr ""
+"Slike nad to velikostjo (v bajtih) ne bodo prikazane kot sličice. Namen teh "
+"nastavitev je izogniti se izdelavi sličic velikih datotek, kar bi lahko "
+"vzelo veliko časa in pomnilnika."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "List of possible captions on icons"
 msgstr "Seznam mogočih oznak na ikonah"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
-msgid "List of x-content/* types for which the user have chosen \"Do Nothing\" in the preference capplet. No prompt will be shown nor will any matching application be started on insertion of media matching these types."
-msgstr "Seznam x-content/* vrste pri katerih bo uveljavljen ukaz \"Ne naredi ničesar\". S to izbiro onemogočite zagon programov in odpiranje oken. Možnost bo v veljavi vsakokrat, ko bo vstavljen medij z ustreznimi vrstami."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Do Nothing\" in "
+"the preference capplet. No prompt will be shown nor will any matching "
+"application be started on insertion of media matching these types."
+msgstr ""
+"Seznam x-content/* vrste pri katerih bo uveljavljen ukaz \"Ne naredi ničesar"
+"\". S to izbiro onemogočite zagon programov in odpiranje oken. Možnost bo v "
+"veljavi vsakokrat, ko bo vstavljen medij z ustreznimi vrstami."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
-msgid "List of x-content/* types for which the user have chosen \"Open Folder\" in the preferences capplet. A folder window will be opened on insertion of media matching these types."
-msgstr "Seznam x-content/* vrste pri katerih bo izveden ukaz \"Odpri mapo\". Okno mape se bo odprlo vsakokrat, ko bo vstavljen medij z ustreznimi vrstami."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Open Folder\" in "
+"the preferences capplet. A folder window will be opened on insertion of "
+"media matching these types."
+msgstr ""
+"Seznam x-content/* vrste pri katerih bo izveden ukaz \"Odpri mapo\". Okno "
+"mape se bo odprlo vsakokrat, ko bo vstavljen medij z ustreznimi vrstami."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
-msgid "List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types."
-msgstr "Seznam x-content/* vrste kjer bo zagnan prednostni program, ki ga je izbral uporabnik. Program bo zagnana vsakokrat, ko bo vstavljen medij z ustreznimi vrstami."
+msgid ""
+"List of x-content/* types for which the user have chosen to start an "
+"application in the preference capplet. The preferred application for the "
+"given type will be started on insertion on media matching these types."
+msgstr ""
+"Seznam x-content/* vrste kjer bo zagnan prednostni program, ki ga je izbral "
+"uporabnik. Program bo zagnana vsakokrat, ko bo vstavljen medij z ustreznimi "
+"vrstami."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
-msgstr "Seznam x-content/* vrste pri katerih bo uveljavljen ukaz \"Ne naredi ničesar\"."
+msgstr ""
+"Seznam x-content/* vrste pri katerih bo uveljavljen ukaz \"Ne naredi ničesar"
+"\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "Seznam x-content/* vrste pri katerih bo izveden ukaz \"Odpri mapo\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "Seznam x-content/* vrste kjer bo zagnan prednostni program."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -623,8 +849,12 @@ msgid "Maximum image size for thumbnailing"
 msgstr "Največja velikost slike za izdelavo sličic"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Name of the Nautilus theme to use. This has been deprecated as of Nautilus 2.2. Please use the icon theme instead."
-msgstr "Ime Nautilusove teme, ki naj se uporabi. Ta možnost je zastarela. Prosimo, namesto nje uporabljajte ikonsko temo."
+msgid ""
+"Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
+"2.2. Please use the icon theme instead."
+msgstr ""
+"Ime Nautilusove teme, ki naj se uporabi. Ta možnost je zastarela. Prosimo, "
+"namesto nje uporabljajte ikonsko temo."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "Nautilus handles drawing the desktop"
@@ -651,8 +881,12 @@ msgid "Only show folders in the tree side pane"
 msgstr "Mape pokaži le v drevesu stranskega pulta"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click."
-msgstr "Mogoče vrednosti so \"single\" za zagon datotek z enojnim klikom ali \"double\"za zagon datotek z dvojnim klikom."
+msgid ""
+"Possible values are \"single\" to launch files on a single click, or \"double"
+"\" to launch them on a double click."
+msgstr ""
+"Mogoče vrednosti so \"single\" za zagon datotek z enojnim klikom ali \"double"
+"\"za zagon datotek z dvojnim klikom."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Put labels beside icons"
@@ -702,20 +936,61 @@ msgid "Side pane view"
 msgstr "Pogled stranskega pulta"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
-msgid "Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to \"always\" then always plays the sound, even if the file is on a remote server. If set to \"local_only\" then only plays previews on local file systems. If set to \"never\" then it never previews sound."
-msgstr "Kdaj naj se predvajajo zvočne datoteke, ko je nad njimi miška. Če je nastavljeno na \"always\", potem se datoteka vedno predvaja, četudi je na oddaljenem strežniku. Če je nastavljeno na \"local_only\", se predvajajo le datoteke na krajevnih datotečnih sistemih. Če je nastavljeno na \"never\", potem se zvočne datoteke ne predvajajo nikoli."
+msgid ""
+"Speed tradeoff for when to preview a sound file when mousing over a files "
+"icon. If set to \"always\" then always plays the sound, even if the file is "
+"on a remote server. If set to \"local_only\" then only plays previews on "
+"local file systems. If set to \"never\" then it never previews sound."
+msgstr ""
+"Kdaj naj se predvajajo zvočne datoteke, ko je nad njimi miška. Če je "
+"nastavljeno na \"always\", potem se datoteka vedno predvaja, četudi je na "
+"oddaljenem strežniku. Če je nastavljeno na \"local_only\", se predvajajo le "
+"datoteke na krajevnih datotečnih sistemih. Če je nastavljeno na \"never\", "
+"potem se zvočne datoteke ne predvajajo nikoli."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
-msgid "Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to \"always\" then always show previews, even if the folder is on a remote server. If set to \"local_only\" then only show previews for local file systems. If set to \"never\" then never bother to read preview data."
-msgstr "Kdaj naj se prikaže predogled datotek z besedilom v ikoni datoteke. Če je nastavljeno na \"always\", potem se predolged prikaže vedno, četudi je datoteka na oddaljenem strežniku. Če je nastavljeno na \"local_only\", se predogled prikaže le za datoteke na krajevnih datotečnih sistemih. Če je nastavljeno na \"never\", potem se datoteke z besedilom nikoli ne prikažejo v predogledu."
+msgid ""
+"Speed tradeoff for when to show a preview of text file contents in the "
+"file's icon. If set to \"always\" then always show previews, even if the "
+"folder is on a remote server. If set to \"local_only\" then only show "
+"previews for local file systems. If set to \"never\" then never bother to "
+"read preview data."
+msgstr ""
+"Kdaj naj se prikaže predogled datotek z besedilom v ikoni datoteke. Če je "
+"nastavljeno na \"always\", potem se predolged prikaže vedno, četudi je "
+"datoteka na oddaljenem strežniku. Če je nastavljeno na \"local_only\", se "
+"predogled prikaže le za datoteke na krajevnih datotečnih sistemih. Če je "
+"nastavljeno na \"never\", potem se datoteke z besedilom nikoli ne prikažejo "
+"v predogledu."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
-msgid "Speed tradeoff for when to show an image file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local_only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail images, just use a generic icon."
-msgstr "Kdaj naj se prikaže predogled slikovnih datotek v ikoni datoteke. Če je nastavljeno na \"always\", potem se predogled pokaže vedno, četudi je datoteka na oddaljenem strežniku. Če je nastavljeno na \"local_only\", se predogled prikaže le za datoteke na krajevnih datotečnih sistemih. Če je nastavljeno na \"never\", potem se sploh ne ustvarijo sličice s predogledi, ampak se prikaže splošna ikona."
+msgid ""
+"Speed tradeoff for when to show an image file as a thumbnail. If set to "
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"If set to \"local_only\" then only show thumbnails for local file systems. "
+"If set to \"never\" then never bother to thumbnail images, just use a "
+"generic icon."
+msgstr ""
+"Kdaj naj se prikaže predogled slikovnih datotek v ikoni datoteke. Če je "
+"nastavljeno na \"always\", potem se predogled pokaže vedno, četudi je "
+"datoteka na oddaljenem strežniku. Če je nastavljeno na \"local_only\", se "
+"predogled prikaže le za datoteke na krajevnih datotečnih sistemih. Če je "
+"nastavljeno na \"never\", potem se sploh ne ustvarijo sličice s predogledi, "
+"ampak se prikaže splošna ikona."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local_only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts."
-msgstr "Kdaj naj se prikaže število predmetov v mapi. Če je nastavljeno na \"always\", potem se predmete vedno prešteje in pokaže njihovo število, čeprav je mapa na oddaljenem strežniku. Če je nastavljeno na \"local_only\", se število prikaže le za mape na krajevnih datotečnih sistemih. Če je nastavljeno na \"never\", potem se število predmetov v mapah nikoli ne prešteje."
+msgid ""
+"Speed tradeoff for when to show the number of items in a folder. If set to "
+"\"always\" then always show item counts, even if the folder is on a remote "
+"server. If set to \"local_only\" then only show counts for local file "
+"systems. If set to \"never\" then never bother to compute item counts."
+msgstr ""
+"Kdaj naj se prikaže število predmetov v mapi. Če je nastavljeno na \"always"
+"\", potem se predmete vedno prešteje in pokaže njihovo število, čeprav je "
+"mapa na oddaljenem strežniku. Če je nastavljeno na \"local_only\", se "
+"število prikaže le za mape na krajevnih datotečnih sistemih. Če je "
+"nastavljeno na \"never\", potem se število predmetov v mapah nikoli ne "
+"prešteje."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid "Text Ellipsis Limit"
@@ -726,12 +1001,20 @@ msgid "The default size of an icon for a thumbnail in the icon view."
 msgstr "Privzeta velikost sličic v pogledu ikon."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:112
-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-msgstr "Privzeta razvrstitev predmetov v pogledu ikon. Mogoče vrednosti so \"name\", \"size\", \"type\", \"modification_date\" in \"emblems\"."
+msgid ""
+"The default sort-order for items in the icon view. Possible values are \"name"
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
+msgstr ""
+"Privzeta razvrstitev predmetov v pogledu ikon. Mogoče vrednosti so \"name\", "
+"\"size\", \"type\", \"modification_date\" in \"emblems\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
-msgid "The default sort-order for the items in the list view. Possible values are \"name\", \"size\", \"type\", and \"modification_date\"."
-msgstr "Privzeta razvrstitev predmetov v pogledu seznama. Mogoče vrednosti so \"name\", \"size\", \"type\" in \"modification_date\"."
+msgid ""
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
+msgstr ""
+"Privzeta razvrstitev predmetov v pogledu seznama. Mogoče vrednosti so \"name"
+"\", \"size\", \"type\" in \"modification_date\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
 msgid "The default width of the side pane in new windows."
@@ -742,27 +1025,42 @@ msgid "The font description used for the icons on the desktop."
 msgstr "Opis pisave, ki naj se uporabi za ikone in na namizju"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:116
-msgid "The format of file dates. Possible values are \"locale\", \"iso\", and \"informal\"."
-msgstr "Oblika datumov datotek. Mogoče vrednosti so \"locale\", \"iso\" in \"informal\"."
+msgid ""
+"The format of file dates. Possible values are \"locale\", \"iso\", and "
+"\"informal\"."
+msgstr ""
+"Oblika datumov datotek. Mogoče vrednosti so \"locale\", \"iso\" in \"informal"
+"\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
 msgstr "Pogled stranskega pulta, ki naj se pokaže v novo odprtih oknih."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
-msgid "This name can be set if you want a custom name for the computer icon on the desktop."
-msgstr "Ime lahko nastavite, če želite prikrojeno ime ikone računalnika na namizju."
+msgid ""
+"This name can be set if you want a custom name for the computer icon on the "
+"desktop."
+msgstr ""
+"Ime lahko nastavite, če želite prikrojeno ime ikone računalnika na namizju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:119
-msgid "This name can be set if you want a custom name for the home icon on the desktop."
+msgid ""
+"This name can be set if you want a custom name for the home icon on the "
+"desktop."
 msgstr "Ime se lahko nastavi, če želite prikrojeno ime ikone doma na namizju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:120
-msgid "This name can be set if you want a custom name for the network servers icon on the desktop."
-msgstr "Ime se lahko nastavi, če želite prikrojeno ime ikone omrežnih strežnikov na namizju."
+msgid ""
+"This name can be set if you want a custom name for the network servers icon "
+"on the desktop."
+msgstr ""
+"Ime se lahko nastavi, če želite prikrojeno ime ikone omrežnih strežnikov na "
+"namizju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:121
-msgid "This name can be set if you want a custom name for the trash icon on the desktop."
+msgid ""
+"This name can be set if you want a custom name for the trash icon on the "
+"desktop."
 msgstr "Ime se lahko nastavi, če želite prikrojeno ime ikone smeti na namizju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
@@ -786,12 +1084,26 @@ msgid "What to do with executable text files when activated"
 msgstr "Kaj storiti z izvršljivimi besedilnimi datotekami, ko so aktivirane"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files."
-msgstr "Kaj storiti z izvršljivimi besedilnimi datotekami, ko so aktivirane (z enojnim oz. dvojnim klikom) Mogoče vrednosti so \"launch\" za zagon kot programa, \"ask\" za vprašanje uporabniku in \"display\" za prikaz kot besedilo."
+msgid ""
+"What to do with executable text files when they are activated (single or "
+"double clicked). Possible values are \"launch\" to launch them as programs, "
+"\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
+"text files."
+msgstr ""
+"Kaj storiti z izvršljivimi besedilnimi datotekami, ko so aktivirane (z "
+"enojnim oz. dvojnim klikom) Mogoče vrednosti so \"launch\" za zagon kot "
+"programa, \"ask\" za vprašanje uporabniku in \"display\" za prikaz kot "
+"besedilo."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list_view\", \"icon_view\" and \"compact_view\"."
-msgstr "Kadar je obiskana mapa, se uporabi ta pogled, razen če ste ravno tej mapi določili kakega drugega. Mogoči vrednosti sta \"list_view\", \"icon_view\" in\"compact_view\"."
+msgid ""
+"When a folder is visited this viewer is used unless you have selected "
+"another view for that particular folder. Possible values are \"list_view\", "
+"\"icon_view\" and \"compact_view\"."
+msgstr ""
+"Kadar je obiskana mapa, se uporabi ta pogled, razen če ste ravno tej mapi "
+"določili kakega drugega. Mogoči vrednosti sta \"list_view\", \"icon_view\" in"
+"\"compact_view\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "When to show number of items in a folder"
@@ -819,7 +1131,9 @@ msgstr "Ali je bilo nastavljeno prikrojeno privzeto ozadje stranskega pulta."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "Ali naj program zahteva potrditev pred prestavljanjem datotek v smeti ali pred brisanjem."
+msgstr ""
+"Ali naj program zahteva potrditev pred prestavljanjem datotek v smeti ali "
+"pred brisanjem."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Whether to automatically mount media"
@@ -839,7 +1153,8 @@ msgstr "Ali naj bodo zavihki v brskalniku Nautilus omogočeni"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:140
 msgid "Whether to preview sounds when mousing over an icon"
-msgstr "Ali naj se predvajajo zvočne datoteke, ko je nad njihovimi ikonami miška"
+msgstr ""
+"Ali naj se predvajajo zvočne datoteke, ko je nad njihovimi ikonami miška"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:141
 msgid "Whether to show backup files"
@@ -933,7 +1248,9 @@ msgid "You have just inserted a digital audio player."
 msgstr "Vstavili ste digitalni predvajalnik zvoka."
 
 #: ../libnautilus-private/nautilus-autorun.c:917
-msgid "You have just inserted a medium with software intended to be automatically started."
+msgid ""
+"You have just inserted a medium with software intended to be automatically "
+"started."
 msgstr "Vstavili ste medij s programsko opremo, ki bo samodejno zagnana."
 
 #. fallback to generic greeting
@@ -947,8 +1264,12 @@ msgstr "Izbor programa za zagon."
 
 #: ../libnautilus-private/nautilus-autorun.c:931
 #, c-format
-msgid "Select how to open \"%s\" and whether to perform this action in the future for other media of type \"%s\"."
-msgstr "Izbor za odpiranje \"%s\" in možnost vsakokratnega izvajanja tega ukaza za medije vrste \"%s\"."
+msgid ""
+"Select how to open \"%s\" and whether to perform this action in the future "
+"for other media of type \"%s\"."
+msgstr ""
+"Izbor za odpiranje \"%s\" in možnost vsakokratnega izvajanja tega ukaza za "
+"medije vrste \"%s\"."
 
 #: ../libnautilus-private/nautilus-autorun.c:953
 msgid "_Always perform this action"
@@ -1117,12 +1438,20 @@ msgid "You cannot move the volume \"%s\" to the trash."
 msgstr "Naprave \"%s\" ni mogoče vreči v Smeti."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:111
-msgid "If you want to eject the volume, please use \"Eject\" in the popup menu of the volume."
-msgstr "Če želite izvreči napravo, uporabite možnosti \"Izvrzi\" v pojavnem meniju naprave."
+msgid ""
+"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"the volume."
+msgstr ""
+"Če želite izvreči napravo, uporabite možnosti \"Izvrzi\" v pojavnem meniju "
+"naprave."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
-msgid "If you want to unmount the volume, please use \"Unmount Volume\" in the popup menu of the volume."
-msgstr "Če želite odklopiti napravo, uporabite možnosti \"Odklopi enoto\" v pojavnem meniju naprave."
+msgid ""
+"If you want to unmount the volume, please use \"Unmount Volume\" in the "
+"popup menu of the volume."
+msgstr ""
+"Če želite odklopiti napravo, uporabite možnosti \"Odklopi enoto\" v pojavnem "
+"meniju naprave."
 
 #: ../libnautilus-private/nautilus-dnd.c:748
 msgid "_Move Here"
@@ -1163,11 +1492,15 @@ msgstr "Značke ni mogoče namestiti."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:210
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
-msgstr "Oprostite, toda navesti je treba ključno besedo nove značke brez presledkov."
+msgstr ""
+"Oprostite, toda navesti je treba ključno besedo nove značke brez presledkov."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "Oprostite, ključne besede značke lahko vsebujejo le črke, presledke in številke."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"Oprostite, ključne besede značke lahko vsebujejo le črke, presledke in "
+"številke."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1404,12 +1737,20 @@ msgstr "Ali ste prepričani, da želite iz smeti trajno zbrisati \"%B\"?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1211
 #, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items from the trash?"
-msgstr[0] "Ste prepričani, da želite iz smeti trajno izbrisati %'d izbranih predmetov?"
-msgstr[1] "Ste prepričani, da želite iz smeti trajno izbrisati %'d izbran predmet?"
-msgstr[2] "Ste prepričani, da želite iz smeti trajno izbrisati %'d izbrana predmeta?"
-msgstr[3] "Ste prepričani, da želite iz smeti trajno izbrisati %'d izbrane predmete?"
+msgid ""
+"Are you sure you want to permanently delete the %'d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items from the "
+"trash?"
+msgstr[0] ""
+"Ste prepričani, da želite iz smeti trajno izbrisati %'d izbranih predmetov?"
+msgstr[1] ""
+"Ste prepričani, da želite iz smeti trajno izbrisati %'d izbran predmet?"
+msgstr[2] ""
+"Ste prepričani, da želite iz smeti trajno izbrisati %'d izbrana predmeta?"
+msgstr[3] ""
+"Ste prepričani, da želite iz smeti trajno izbrisati %'d izbrane predmete?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1221
 #: ../libnautilus-private/nautilus-file-operations.c:1289
@@ -1421,14 +1762,17 @@ msgid "Empty all of the items from the trash?"
 msgstr "Ali naj se izbrišejo vsi predmeti iz smeti?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1245
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "Če se odločite izprazniti smeti, bodo vsi predmeti trajno izgubljeni. Lahko jih izbrišete tudi posamično."
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Če se odločite izprazniti smeti, bodo vsi predmeti trajno izgubljeni. Lahko "
+"jih izbrišete tudi posamično."
 
 #. Empty Trash menu item
 #: ../libnautilus-private/nautilus-file-operations.c:1250
 #: ../libnautilus-private/nautilus-file-operations.c:2076
-#: ../src/nautilus-places-sidebar.c:2035
-#: ../src/nautilus-trash-bar.c:125
+#: ../src/nautilus-places-sidebar.c:2035 ../src/nautilus-trash-bar.c:125
 msgid "Empty _Trash"
 msgstr "Izprazni _Smeti"
 
@@ -1439,7 +1783,8 @@ msgstr "Ali ste prepričani, da želite trajno zbrisati \"%B\"?"
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "Ste prepričani, da želite trajno zbrisati %d izbranih predmetov?"
 msgstr[1] "Ste prepričani, da želite trajno zbrisati %d izbrani predmet?"
 msgstr[2] "Ste prepričani, da želite trajno zbrisati %d izbrana predmeta?"
@@ -1476,14 +1821,19 @@ msgid "Error while deleting."
 msgstr "Napaka ob brisanju."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1404
-msgid "Files in the folder \"%B\" cannot be deleted because you do not have permissions to see them."
-msgstr "Datotek v mapi \"%B\" ni mogoče izbrisati, ker nimate dovoljenja za ogled."
+msgid ""
+"Files in the folder \"%B\" cannot be deleted because you do not have "
+"permissions to see them."
+msgstr ""
+"Datotek v mapi \"%B\" ni mogoče izbrisati, ker nimate dovoljenja za ogled."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
-msgstr "Prišlo je do napake med pridobivanjem podrobnosti datotek v mapi \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
+msgstr ""
+"Prišlo je do napake med pridobivanjem podrobnosti datotek v mapi \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
 #: ../libnautilus-private/nautilus-file-operations.c:3313
@@ -1491,7 +1841,9 @@ msgid "_Skip files"
 msgstr "Pre_skoči datoteke"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1437
-msgid "The folder \"%B\" cannot be deleted because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"read it."
 msgstr "Mape \"%B\" ni mogoče izbrisati, ker nimate dovoljenja za branje."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
@@ -1542,8 +1894,12 @@ msgid "Do you want to empty the trash before you unmount?"
 msgstr "Ali želite izbrisati smeti preden napravo odklopite?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2068
-msgid "In order to regain the free space on this volume the trash must be emptied. All trashed items on the volume will be permanently lost."
-msgstr "Če želite pridobiti prostor na tej napravi morate izbrisati smeti. Vsi predmeti v smeteh bodo trajno izgubljeni. "
+msgid ""
+"In order to regain the free space on this volume the trash must be emptied. "
+"All trashed items on the volume will be permanently lost."
+msgstr ""
+"Če želite pridobiti prostor na tej napravi morate izbrisati smeti. Vsi "
+"predmeti v smeteh bodo trajno izgubljeni. "
 
 #: ../libnautilus-private/nautilus-file-operations.c:2074
 msgid "Do _not Empty Trash"
@@ -1608,16 +1964,25 @@ msgid "Error while moving files to trash."
 msgstr "Napaka medi premikanjem datotek v smeti."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2359
-msgid "Files in the folder \"%B\" cannot be handled because you do not have permissions to see them."
-msgstr "Z datotekami v mapi \"%B\" ni mogoče upravljati, ker nimate dovoljenja za ogled."
+msgid ""
+"Files in the folder \"%B\" cannot be handled because you do not have "
+"permissions to see them."
+msgstr ""
+"Z datotekami v mapi \"%B\" ni mogoče upravljati, ker nimate dovoljenja za "
+"ogled."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2398
-msgid "The folder \"%B\" cannot be handled because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be handled because you do not have permissions to "
+"read it."
 msgstr "Z mapo \"%B\" ni mogoče upravljati, ker nimate dovoljenja za branje."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2475
-msgid "The file \"%B\" cannot be handled because you do not have permissions to read it."
-msgstr "Z datoteko \"%B\" ni mogoče upravljati, ker nimate dovoljenja za branje."
+msgid ""
+"The file \"%B\" cannot be handled because you do not have permissions to "
+"read it."
+msgstr ""
+"Z datoteko \"%B\" ni mogoče upravljati, ker nimate dovoljenja za branje."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
 msgid "There was an error getting information about \"%B\"."
@@ -1643,7 +2008,9 @@ msgid "The destination is not a folder."
 msgstr "Ciljno mesto ni mapa."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2654
-msgid "There is not enough space on the destination. Try to remove files to make space."
+msgid ""
+"There is not enough space on the destination. Try to remove files to make "
+"space."
 msgstr "Na cilju ni dovolj prostora. Poskusite odstraniti nekaj datotek."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2656
@@ -1730,19 +2097,28 @@ msgid "%S of %S — %T left (%S/sec)"
 msgstr "%S od %S — %T ostalo (%S/sek)"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3177
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to create it in the destination."
-msgstr "Mape \"%B\" ni mogoče kopirati, ker nimate dovoljenj za pisanje na ciljnem mestu."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"create it in the destination."
+msgstr ""
+"Mape \"%B\" ni mogoče kopirati, ker nimate dovoljenj za pisanje na ciljnem "
+"mestu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3180
 msgid "There was an error creating the folder \"%B\"."
 msgstr "Prišlo je do napake med ustvarjanjem mape \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3301
-msgid "Files in the folder \"%B\" cannot be copied because you do not have permissions to see them."
-msgstr "Datotek v mapi \"%B\" ni mogoče kopirati, ker nimate dovoljenja za ogled."
+msgid ""
+"Files in the folder \"%B\" cannot be copied because you do not have "
+"permissions to see them."
+msgstr ""
+"Datotek v mapi \"%B\" ni mogoče kopirati, ker nimate dovoljenja za ogled."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3346
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to read it."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"read it."
 msgstr "Mape \"%B\" ni mogoče kopirati, ker nimate dovoljenj za branje."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3389
@@ -1790,12 +2166,19 @@ msgstr "Ciljna mapa je znotraj izvorne mape."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3807
 #: ../libnautilus-private/nautilus-file-operations.c:4378
-msgid "A folder named \"%B\" already exists.  Do you want to merge the source folder?"
+msgid ""
+"A folder named \"%B\" already exists.  Do you want to merge the source "
+"folder?"
 msgstr "Mapa z imenom \"%B\" že obstaja. Jo želite združiti vsebino?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3809
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied."
-msgstr "Izvorna mapa že obstaja v \"%B\". Med združevanjem map bo program zahteval potrditev pred zamenjavo obstoječih datotek v mapi."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being copied."
+msgstr ""
+"Izvorna mapa že obstaja v \"%B\". Med združevanjem map bo program zahteval "
+"potrditev pred zamenjavo obstoječih datotek v mapi."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3814
 #: ../libnautilus-private/nautilus-file-operations.c:4385
@@ -1805,8 +2188,12 @@ msgstr "Mapa z imenom \"%B\" že obstaja. Ali jo želite zamenjati?"
 #: ../libnautilus-private/nautilus-file-operations.c:3816
 #: ../libnautilus-private/nautilus-file-operations.c:4387
 #, c-format
-msgid "The folder already exists in \"%F\".  Replacing it will remove all files in the folder."
-msgstr "Datoteka že obstaja v \"%F\". V primeru, da jo zamenjate, bodo odstranjene vse datoteke v tej mapi."
+msgid ""
+"The folder already exists in \"%F\".  Replacing it will remove all files in "
+"the folder."
+msgstr ""
+"Datoteka že obstaja v \"%F\". V primeru, da jo zamenjate, bodo odstranjene "
+"vse datoteke v tej mapi."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3821
 #: ../libnautilus-private/nautilus-file-operations.c:4392
@@ -1816,8 +2203,11 @@ msgstr "Datoteka \"%B\" že obstaja. Ali jo želite zamenjati?"
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr "Datoteka že obstaja v \"%F\". V primeru, da jo zamenjate, bo prepisana celotna njena vsebina."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgstr ""
+"Datoteka že obstaja v \"%F\". V primeru, da jo zamenjate, bo prepisana "
+"celotna njena vsebina."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3913
 #, c-format
@@ -1843,8 +2233,13 @@ msgstr[2] "Pripravljanje na premikanje %'d datotek"
 msgstr[3] "Pripravljanje na premikanje %'d datotek"
 
 #: ../libnautilus-private/nautilus-file-operations.c:4380
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being moved."
-msgstr "Izvorna mapa že obstaja v \"%B\". Med združevanjem map bo program zahteval potrditev pred zamenjavo obstoječih datotek v mapi."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being moved."
+msgstr ""
+"Izvorna mapa že obstaja v \"%B\". Med združevanjem map bo program zahteval "
+"potrditev pred zamenjavo obstoječih datotek v mapi."
 
 #: ../libnautilus-private/nautilus-file-operations.c:4470
 #, c-format
@@ -2389,8 +2784,7 @@ msgid "Computer"
 msgstr "Računalnik"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:571
-#: ../src/nautilus-places-sidebar.c:483
-#: ../src/nautilus-trash-bar.c:121
+#: ../src/nautilus-places-sidebar.c:483 ../src/nautilus-trash-bar.c:121
 msgid "Trash"
 msgstr "Smeti"
 
@@ -2558,7 +2952,8 @@ msgstr "Neznano"
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
 #, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "Izberite program za odpiranje %s datotek in drugih datotek vrste \"%s\""
+msgstr ""
+"Izberite program za odpiranje %s datotek in drugih datotek vrste \"%s\""
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2641,8 +3036,12 @@ msgstr "Odpiranje ni uspelo. Želite uporabiti drug program?"
 #: ../libnautilus-private/nautilus-program-choosing.c:81
 #: ../libnautilus-private/nautilus-program-choosing.c:112
 #, c-format
-msgid "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" locations."
-msgstr "S programom \"%s\" ni mogoče odpreti \"%s\", ker \"%s\" nima dostopa do datotek na \"%s\"."
+msgid ""
+"\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
+"locations."
+msgstr ""
+"S programom \"%s\" ni mogoče odpreti \"%s\", ker \"%s\" nima dostopa do "
+"datotek na \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:86
 msgid "Open Failed, would you like to choose another action?"
@@ -2651,16 +3050,28 @@ msgstr "Neuspešno odpiranje. Ali želite izbrati drugo mesto?"
 #: ../libnautilus-private/nautilus-program-choosing.c:87
 #: ../libnautilus-private/nautilus-program-choosing.c:119
 #, c-format
-msgid "The default action cannot open \"%s\" because it cannot access files at \"%s\" locations."
-msgstr "S privzetim dejanjem ni mogoče odpreti \"%s\", saj ni mogoč dostop do datotek na \"%s\"."
+msgid ""
+"The default action cannot open \"%s\" because it cannot access files at \"%s"
+"\" locations."
+msgstr ""
+"S privzetim dejanjem ni mogoče odpreti \"%s\", saj ni mogoč dostop do "
+"datotek na \"%s\"."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
-msgid "No other applications are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Noben drug program ni na voljo za ogled te datoteke. Če datoteko skopirate na vaš računalnik, jo boste morda lahko odprli."
+msgid ""
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
+msgstr ""
+"Noben drug program ni na voljo za ogled te datoteke. Če datoteko skopirate "
+"na vaš računalnik, jo boste morda lahko odprli."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:121
-msgid "No other actions are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Nobeno drugo dejanje ni na voljo za ogled te datoteke. Če datoteko skopirate na vaš računalnik, jo boste morda lahko odprli."
+msgid ""
+"No other actions are available to view this file.  If you copy this file "
+"onto your computer, you may be able to open it."
+msgstr ""
+"Nobeno drugo dejanje ni na voljo za ogled te datoteke. Če datoteko skopirate "
+"na vaš računalnik, jo boste morda lahko odprli."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:360
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -2681,12 +3092,20 @@ msgid "This drop target only supports local files."
 msgstr "Cilj spuščanja podpira le krajevne datoteke."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "Če želite odpreti ne-krajevne datoteke, jih je treba kopirati v krajevno mapo in jih znova spustiti."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"Če želite odpreti ne-krajevne datoteke, jih je treba kopirati v krajevno "
+"mapo in jih znova spustiti."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:410
-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened."
-msgstr "Če želite odpreti ne-krajevne datoteke, jih je treba kopirati v krajevno mapo in jih znova spustiti. Krajevne datoteke, ki jih spustite, so že bile odprte."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them "
+"again. The local files you dropped have already been opened."
+msgstr ""
+"Če želite odpreti ne-krajevne datoteke, jih je treba kopirati v krajevno "
+"mapo in jih znova spustiti. Krajevne datoteke, ki jih spustite, so že bile "
+"odprte."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:439
 msgid "Details: "
@@ -2748,10 +3167,12 @@ msgid "Autorun Prompt"
 msgstr "Opozorilo samodejnega zagona"
 
 #. tooltip
-#: ../nautilus-computer.desktop.in.in.h:1
-#: ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "Brskanje po vseh lokalnih in oddaljenih diskih in mapah, ki so na voljo preko tega računalnika"
+#: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"Brskanje po vseh lokalnih in oddaljenih diskih in mapah, ki so na voljo "
+"preko tega računalnika"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
@@ -2761,14 +3182,12 @@ msgstr "Spremeni obnašanje in videz okna urejevalnika."
 msgid "File Management"
 msgstr "Upravljanje datotek"
 
-#: ../nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1341
+#: ../nautilus-home.desktop.in.in.h:1 ../src/file-manager/fm-tree-view.c:1341
 msgid "Home Folder"
 msgstr "Domača mapa"
 
 #. tooltip
-#: ../nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-window-menus.c:858
+#: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:858
 msgid "Open your personal folder"
 msgstr "Odprite osebne mape"
 
@@ -2797,8 +3216,10 @@ msgid "Nautilus metafile factory"
 msgstr "Tovarna Nautilusovih meta datotek"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
-msgstr "Dejavnosti Nautilusove lupine, ki so lahko izvedene preko ukazne vrstice"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
+msgstr ""
+"Dejavnosti Nautilusove lupine, ki so lahko izvedene preko ukazne vrstice"
 
 #: ../src/Nautilus_shell.server.in.h:6
 msgid "Produces metafile objects for accessing Nautilus metadata"
@@ -2837,8 +3258,10 @@ msgstr "Spremeni _ozadje namizja"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
-msgstr "Prikaži okno, ki omogoča nastavitev barve ali vzorca ozadja vašega namizja"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+"Prikaži okno, ki omogoča nastavitev barve ali vzorca ozadja vašega namizja"
 
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:706
@@ -3032,18 +3455,27 @@ msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "Vse izvedljive datoteke v tej mapi se bodo pojavile v meniju Skripte."
 
 #: ../src/file-manager/fm-directory-view.c:5519
-msgid "Choosing a script from the menu will run that script with any selected items as input."
-msgstr "Če izberete skripto iz menija, se bo le-ta pognala z izbranimi predmeti kot vhodom."
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+"Če izberete skripto iz menija, se bo le-ta pognala z izbranimi predmeti kot "
+"vhodom."
 
 #: ../src/file-manager/fm-directory-view.c:5521
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
-"When executed from a local folder, scripts will be passed the selected file names. When executed from a remote folder (e.g. a folder showing web or ftp content), scripts will be passed no parameters.\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
 "\n"
-"In all cases, the following environment variables will be set by Nautilus, which the scripts may use:\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected files (only if local)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
 "\n"
@@ -3051,15 +3483,21 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"Vse izvedljive datoteke v tej mapi se bodo pojavile v meniju Skripte. Z izborom skripte bo zagnan program.\n"
+"Vse izvedljive datoteke v tej mapi se bodo pojavile v meniju Skripte. Z "
+"izborom skripte bo zagnan program.\n"
 "\n"
-"Kadar bodo zagnane iz krajevne mape, bodo skriptam podana vsa imena izbranih datotek. Kadar bodo zagnane iz oddaljene mape (na primer mape, ki pokaže spletno stran ali vsebino ftp) jim ne bo podan noben parameter.\n"
+"Kadar bodo zagnane iz krajevne mape, bodo skriptam podana vsa imena izbranih "
+"datotek. Kadar bodo zagnane iz oddaljene mape (na primer mape, ki pokaže "
+"spletno stran ali vsebino ftp) jim ne bo podan noben parameter.\n"
 "\n"
-"V vseh primerih bo Nautilus nastavil sledeče okoljske spremenljivke, ki jih lahko skripte uporabijo:\n"
+"V vseh primerih bo Nautilus nastavil sledeče okoljske spremenljivke, ki jih "
+"lahko skripte uporabijo:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: poti do izbranih datotek, ločene z novimi vrsticami (le če so krajevne)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: poti do izbranih datotek, ločene z "
+"novimi vrsticami (le če so krajevne)\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: URI-ji do izbranih datotek, ločeni z novimi vrsticami\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: URI-ji do izbranih datotek, ločeni z novimi "
+"vrsticami\n"
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: URI trenutne lokacije\n"
 "\n"
@@ -3080,7 +3518,8 @@ msgstr "\"%s\" bo kopirana, če izberete ukaz Prilepi"
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] "%'d izbranih predmetov bo premaknjenih, če izberete ukaz Prilepi"
 msgstr[1] "%'d izbran predmet bo premaknjen, če izberete ukaz Prilepi"
 msgstr[2] "%'d izbrana predmeta bosta premaknjena, če izberete ukaz Prilepi"
@@ -3089,7 +3528,8 @@ msgstr[3] "%'d izbrani predmeti bodo premaknjeni, če izberete ukaz Prilepi"
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
 msgstr[0] "Če izberete ukaz prilepi, bo kopiranih %'d izbranih predmetov."
 msgstr[1] "Če izberete ukaz prilepi, bo kopiran %'d izbran predmet."
 msgstr[2] "Če izberete ukaz prilepi, bosta kopirana %'d izbrana predmeta."
@@ -3276,7 +3716,8 @@ msgstr "Pripravi izbrane datoteke, da bodo kopirane z ukazom Prilepi"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6644
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Premakni ali kopiraj datoteke, predhodno izbrane z ukazom Izreži ali Kopiraj"
+msgstr ""
+"Premakni ali kopiraj datoteke, predhodno izbrane z ukazom Izreži ali Kopiraj"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3290,8 +3731,12 @@ msgstr "_Prilepi v mapo"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6650
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Premakni ali kopiraj datoteke, predhodno izbrane z ukazom Izreži ali Kopiraj, v izbrano mapo"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Premakni ali kopiraj datoteke, predhodno izbrane z ukazom Izreži ali "
+"Kopiraj, v izbrano mapo"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6654
@@ -3400,7 +3845,9 @@ msgstr "Ponastavi pogled na _privzete vrednosti"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6700
 msgid "Reset sorting order and zoom level to match preferences for this view"
-msgstr "Ponastavi vrstni red in stopnjo povečave, da bo ustrezala nastavitvam za ta pogled"
+msgstr ""
+"Ponastavi vrstni red in stopnjo povečave, da bo ustrezala nastavitvam za ta "
+"pogled"
 
 #. name, stock id
 #. label, accelerator
@@ -3545,8 +3992,12 @@ msgstr "Pripravi mapo za kopiranje z ukazom Prilepi"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6776
-msgid "Move or copy files previously selected by a Cut or Copy command into this folder"
-msgstr "Premakni ali kopiraj datoteke izbrane z ukazom Izreži ali Kopiraj, v izbrano mapo"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into this "
+"folder"
+msgstr ""
+"Premakni ali kopiraj datoteke izbrane z ukazom Izreži ali Kopiraj, v izbrano "
+"mapo"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6781
@@ -3762,7 +4213,8 @@ msgstr "Metoda povleci in spusti ni podprta."
 
 #: ../src/file-manager/fm-directory-view.c:9268
 msgid "Drag and drop is only supported on local file systems."
-msgstr "Metoda povleci in spusti je podprta le na krajevnih datotečnih sistemih."
+msgstr ""
+"Metoda povleci in spusti je podprta le na krajevnih datotečnih sistemih."
 
 #: ../src/file-manager/fm-directory-view.c:9333
 #: ../src/file-manager/fm-directory-view.c:9438
@@ -3795,7 +4247,8 @@ msgstr "Ukaz"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Nimate ustreznih dovoljenj za pogled vsebine \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -3814,12 +4267,15 @@ msgstr "Vsebine map ni mogoče prikazati."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
-msgstr "Ime \"%s\" je v tej mapi že uporabljeno. Prosim uporabite drugačno ime."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+"Ime \"%s\" je v tej mapi že uporabljeno. Prosim uporabite drugačno ime."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "V tej mapi ni \"%s\". Morda je bila le prestavljena ali zbrisana?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -3829,8 +4285,12 @@ msgstr "Nimate ustreznih dovoljenj za preimenovanje \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:118
 #, c-format
-msgid "The name \"%s\" is not valid because it contains the character \"/\". Please use a different name."
-msgstr "Ime \"%s\" ni veljavno, ker vsebuje znak \"/\". Prosim uporabite drugačno ime."
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+"Ime \"%s\" ni veljavno, ker vsebuje znak \"/\". Prosim uporabite drugačno "
+"ime."
 
 #: ../src/file-manager/fm-error-reporting.c:122
 #, c-format
@@ -3849,7 +4309,8 @@ msgstr "Predmeta ni mogoče preimenovati."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Nimate potrebnih dovoljenj za spremenitev skupine od \"%s\"."
 
 #. fall through
@@ -4079,8 +4540,7 @@ msgid "(Empty)"
 msgstr "(prazno)"
 
 #: ../src/file-manager/fm-list-model.c:375
-#: ../src/file-manager/fm-tree-model.c:1266
-#: ../src/nautilus-window-slot.c:191
+#: ../src/file-manager/fm-tree-model.c:1266 ../src/nautilus-window-slot.c:191
 msgid "Loading..."
 msgstr "Nalaganje ..."
 
@@ -4474,8 +4934,12 @@ msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus ni mogel ustvariti zahtevane mape \"%s\"."
 
 #: ../src/nautilus-application.c:325
-msgid "Before running Nautilus, please create the following folder, or set permissions such that Nautilus can create it."
-msgstr "Pred uporabo Nautilusa ustvarite to mapo ali spremenite dovoljenja, tako da jo bo lahko ustvaril Nautilus sam."
+msgid ""
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
+msgstr ""
+"Pred uporabo Nautilusa ustvarite to mapo ali spremenite dovoljenja, tako da "
+"jo bo lahko ustvaril Nautilus sam."
 
 #: ../src/nautilus-application.c:328
 #, c-format
@@ -4483,8 +4947,12 @@ msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus ni mogel ustvariti naslednjih zahtevanih map: %s."
 
 #: ../src/nautilus-application.c:330
-msgid "Before running Nautilus, please create these folders, or set permissions such that Nautilus can create them."
-msgstr "Pred uporabo Nautilusa ustvarite te mape ali spremenite dovoljenja, tako da jih bo lahko ustvaril Nautilus sam."
+msgid ""
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+"Pred uporabo Nautilusa ustvarite te mape ali spremenite dovoljenja, tako da "
+"jih bo lahko ustvaril Nautilus sam."
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -4497,31 +4965,53 @@ msgstr "Pred uporabo Nautilusa ustvarite te mape ali spremenite dovoljenja, tako
 #. * since neither of the above causes explain it.
 #.
 #: ../src/nautilus-application.c:597
-msgid "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again."
-msgstr "Program Nautilus trenutno ne bo deloval. Zagon \"bonobo-slay\" iz ukazne vrstice bo morda pomagal. Sicer, poskusite s ponovnim zagonom računalnika ali ponovno namestitvijo Nautilusa."
+msgid ""
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again."
+msgstr ""
+"Program Nautilus trenutno ne bo deloval. Zagon \"bonobo-slay\" iz ukazne "
+"vrstice bo morda pomagal. Sicer, poskusite s ponovnim zagonom računalnika "
+"ali ponovno namestitvijo Nautilusa."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:603
 msgid ""
-"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the console may fix the problem. If not, you can try rebooting the computer or installing Nautilus again.\n"
+"Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
+"console may fix the problem. If not, you can try rebooting the computer or "
+"installing Nautilus again.\n"
 "\n"
-"Bonobo could not locate the Nautilus_shell.server file. One cause of this seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation library's directory. Another possible cause would be bad install with a missing Nautilus_Shell.server file.\n"
+"Bonobo could not locate the Nautilus_shell.server file. One cause of this "
+"seems to be an LD_LIBRARY_PATH that does not include the bonobo-activation "
+"library's directory. Another possible cause would be bad install with a "
+"missing Nautilus_Shell.server file.\n"
 "\n"
-"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, which may be needed by other applications.\n"
+"Running \"bonobo-slay\" will kill all Bonobo Activation and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
-"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but we do not know why.\n"
+"Sometimes killing bonobo-activation-server and gconfd fixes the problem, but "
+"we do not know why.\n"
 "\n"
-"We have also seen this error when a faulty version of bonobo-activation was installed."
+"We have also seen this error when a faulty version of bonobo-activation was "
+"installed."
 msgstr ""
-"Program Nautilus trenutno ne bo deloval. Zagon \"bonobo-slay\" iz ukazne vrstice bo morda pomagal. Sicer poskusite s ponovnim zagonom računalnika ali ponovno namestitvijo Nautilusa. \n"
+"Program Nautilus trenutno ne bo deloval. Zagon \"bonobo-slay\" iz ukazne "
+"vrstice bo morda pomagal. Sicer poskusite s ponovnim zagonom računalnika ali "
+"ponovno namestitvijo Nautilusa. \n"
 "\n"
-"Bonobo ni mogel najti datoteke Nautilus_Shell.server. Vzrok lahko leži v tem, da LD_LIBRARY_PATH ne vsebuje mape knjižnice bonobo-activation. Drug mogoč vzrok je lahko neuspešna namestitev z manjkajočo datoteko Nautilus_Shell.server.\n"
+"Bonobo ni mogel najti datoteke Nautilus_Shell.server. Vzrok lahko leži v "
+"tem, da LD_LIBRARY_PATH ne vsebuje mape knjižnice bonobo-activation. Drug "
+"mogoč vzrok je lahko neuspešna namestitev z manjkajočo datoteko "
+"Nautilus_Shell.server.\n"
 "\n"
-"Zagon \"bonobo-slay\" bo ubil vse procese bonobo-activation in GConf, ki jih morda potrebujejo drugi programi.\n"
+"Zagon \"bonobo-slay\" bo ubil vse procese bonobo-activation in GConf, ki jih "
+"morda potrebujejo drugi programi.\n"
 "\n"
-"Včasih pomaga, če ubijete bonobo-activation-server in gconfd, a ni znano zakaj.\n"
+"Včasih pomaga, če ubijete bonobo-activation-server in gconfd, a ni znano "
+"zakaj.\n"
 "\n"
-"Enaka napaka se lahko zgodi, če je nameščena napačna različica bonobo-activation."
+"Enaka napaka se lahko zgodi, če je nameščena napačna različica bonobo-"
+"activation."
 
 #. Some misc. error (can never happen with current
 #. * version of bonobo-activation). Show dialog and terminate the
@@ -4532,28 +5022,41 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:633
-#: ../src/nautilus-application.c:651
+#: ../src/nautilus-application.c:633 ../src/nautilus-application.c:651
 #: ../src/nautilus-application.c:658
 msgid "Nautilus cannot be used now, due to an unexpected error."
 msgstr "Nautilusa trenutno ni mogoče uporabljati zaradi nepričakovane napake."
 
 #: ../src/nautilus-application.c:634
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to register the file manager view server."
-msgstr "Nautilusa trenutno ni mogoče uporabljati zaradi nepričakovane napake  Bonoba med poskusom registracije upravitelja datotek na strežniku."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to register the file manager view server."
+msgstr ""
+"Nautilusa trenutno ni mogoče uporabljati zaradi nepričakovane napake  Bonoba "
+"med poskusom registracije upravitelja datotek na strežniku."
 
 #: ../src/nautilus-application.c:652
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the factory. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "Nautilusa trenutno ni mogoče uporabljati zaradi nepričakovane napake Bonoba med iskanjem predmeta tovarne. Prekinitev procesa bonobo-activation-server in ponoven zagon Nautilusa lahko odpravita težavo."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the factory. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"Nautilusa trenutno ni mogoče uporabljati zaradi nepričakovane napake Bonoba "
+"med iskanjem predmeta tovarne. Prekinitev procesa bonobo-activation-server "
+"in ponoven zagon Nautilusa lahko odpravita težavo."
 
 #: ../src/nautilus-application.c:659
-msgid "Nautilus cannot be used now, due to an unexpected error from Bonobo when attempting to locate the shell object. Killing bonobo-activation-server and restarting Nautilus may help fix the problem."
-msgstr "Nautilusa trenutno ni mogoče uporabljati zaradi nepričakovane napake Bonoba med iskanjem predmeta lupine. Prekinitev procesa bonobo-activation-server in ponoven zagon Nautilusa lahko odpravita težavo."
+msgid ""
+"Nautilus cannot be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the shell object. Killing bonobo-activation-server and "
+"restarting Nautilus may help fix the problem."
+msgstr ""
+"Nautilusa trenutno ni mogoče uporabljati zaradi nepričakovane napake Bonoba "
+"med iskanjem predmeta lupine. Prekinitev procesa bonobo-activation-server in "
+"ponoven zagon Nautilusa lahko odpravita težavo."
 
-#: ../src/nautilus-application.c:1369
-#: ../src/nautilus-places-sidebar.c:1682
-#: ../src/nautilus-places-sidebar.c:1705
-#: ../src/nautilus-places-sidebar.c:1728
+#: ../src/nautilus-application.c:1369 ../src/nautilus-places-sidebar.c:1682
+#: ../src/nautilus-places-sidebar.c:1705 ../src/nautilus-places-sidebar.c:1728
 #, c-format
 msgid "Unable to eject %s"
 msgstr "Ni mogoče izvreči %s"
@@ -4574,24 +5077,29 @@ msgid "<big><b>Error autorunning software</b></big>"
 msgstr "<big><b>Napaka med samodejnim zaganjanjem programov</b></big>"
 
 #: ../src/nautilus-autorun-software.c:194
-msgid "<big><b>This medium contains software intended to be automatically started. Would you like to run it?</b></big>"
-msgstr "<big><b>Medij vsebuje programsko opremo, ki se samodejno zažene. Ali želite zagnati medij?</b></big>"
+msgid ""
+"<big><b>This medium contains software intended to be automatically started. "
+"Would you like to run it?</b></big>"
+msgstr ""
+"<big><b>Medij vsebuje programsko opremo, ki se samodejno zažene. Ali želite "
+"zagnati medij?</b></big>"
 
 #: ../src/nautilus-autorun-software.c:196
 #, c-format
 msgid ""
-"The software will run directly from the medium \"%s\". You should never run software that you don't trust.\n"
+"The software will run directly from the medium \"%s\". You should never run "
+"software that you don't trust.\n"
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"Program se bo izvajal neposredno iz medija \"%s\". Nikoli ne izvajajte programske opreme, ki ji ne zaupate.\n"
+"Program se bo izvajal neposredno iz medija \"%s\". Nikoli ne izvajajte "
+"programske opreme, ki ji ne zaupate.\n"
 "\n"
 "Če ste v dvomih, prekličite dejanje."
 
 #: ../src/nautilus-bookmarks-window.c:160
 #: ../src/nautilus-file-management-properties.c:206
-#: ../src/nautilus-property-browser.c:1527
-#: ../src/nautilus-window-menus.c:619
+#: ../src/nautilus-property-browser.c:1527 ../src/nautilus-window-menus.c:619
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4725,8 +5233,7 @@ msgstr "_Dodaj zaznamek"
 msgid "C_onnect"
 msgstr "_Poveži se"
 
-#: ../src/nautilus-desktop-window.c:243
-#: ../src/nautilus-pathbar.c:1244
+#: ../src/nautilus-desktop-window.c:243 ../src/nautilus-pathbar.c:1244
 #: ../src/nautilus-places-sidebar.c:310
 msgid "Desktop"
 msgstr "Namizje"
@@ -4736,10 +5243,12 @@ msgstr "Namizje"
 msgid "Could not remove emblem with name '%s'."
 msgstr "Ni mogoče odstraniti značke z imenom '%s'."
 
-#: ../src/nautilus-emblem-sidebar.c:227
-#: ../src/nautilus-emblem-sidebar.c:261
-msgid "This is probably because the emblem is a permanent one, and not one that you added yourself."
-msgstr "Razlog za to je verjetno ta, da je značka trajna in je niste dodali vi sami."
+#: ../src/nautilus-emblem-sidebar.c:227 ../src/nautilus-emblem-sidebar.c:261
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr ""
+"Razlog za to je verjetno ta, da je značka trajna in je niste dodali vi sami."
 
 #: ../src/nautilus-emblem-sidebar.c:260
 #, c-format
@@ -4763,19 +5272,26 @@ msgid "Add Emblems..."
 msgstr "Dodaj značko ..."
 
 #: ../src/nautilus-emblem-sidebar.c:544
-msgid "Enter a descriptive name next to each emblem.  This name will be used in other places to identify the emblem."
-msgstr "Vnesite opisno ime ob vsaki znački. To ime bo uporabljeno na drugih mestih za navedbo značke."
+msgid ""
+"Enter a descriptive name next to each emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Vnesite opisno ime ob vsaki znački. To ime bo uporabljeno na drugih mestih "
+"za navedbo značke."
 
 #: ../src/nautilus-emblem-sidebar.c:546
-msgid "Enter a descriptive name next to the emblem.  This name will be used in other places to identify the emblem."
-msgstr "Vpišite opisno ime ob znački. To ime bo uporabljeno na drugih mestih za navedbo značke."
+msgid ""
+"Enter a descriptive name next to the emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Vpišite opisno ime ob znački. To ime bo uporabljeno na drugih mestih za "
+"navedbo značke."
 
 #: ../src/nautilus-emblem-sidebar.c:767
 msgid "Some of the files could not be added as emblems."
 msgstr "Nekaterih datotek ni mogoče dodati kot značk."
 
-#: ../src/nautilus-emblem-sidebar.c:767
-#: ../src/nautilus-emblem-sidebar.c:769
+#: ../src/nautilus-emblem-sidebar.c:767 ../src/nautilus-emblem-sidebar.c:769
 msgid "The emblems do not appear to be valid images."
 msgstr "Značke očitno niso veljavne slike."
 
@@ -4783,8 +5299,7 @@ msgstr "Značke očitno niso veljavne slike."
 msgid "None of the files could be added as emblems."
 msgstr "Nobene od datotek ni mogoče dodati kot značke."
 
-#: ../src/nautilus-emblem-sidebar.c:806
-#: ../src/nautilus-emblem-sidebar.c:861
+#: ../src/nautilus-emblem-sidebar.c:806 ../src/nautilus-emblem-sidebar.c:861
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Zdi se, da datoteka '%s' ni veljavna slika."
@@ -4793,8 +5308,7 @@ msgstr "Zdi se, da datoteka '%s' ni veljavna slika."
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Zdi se, da povčena datoteka ni veljavna slika."
 
-#: ../src/nautilus-emblem-sidebar.c:811
-#: ../src/nautilus-emblem-sidebar.c:862
+#: ../src/nautilus-emblem-sidebar.c:811 ../src/nautilus-emblem-sidebar.c:862
 msgid "The emblem cannot be added."
 msgstr "Značke ni mogoče dodati."
 
@@ -4962,15 +5476,20 @@ msgid "CD _Audio:"
 msgstr "_Zvočni CD:"
 
 #: ../src/nautilus-file-management-properties.glade.h:49
-msgid "Choose the order of information to appear beneath icon names. More information will appear when zooming in closer."
-msgstr "Izberite vrstni red podatkov, ki naj se pojavijo pod imeni ikon. Več podatkov se pojavi ob povečavi."
+msgid ""
+"Choose the order of information to appear beneath icon names. More "
+"information will appear when zooming in closer."
+msgstr ""
+"Izberite vrstni red podatkov, ki naj se pojavijo pod imeni ikon. Več "
+"podatkov se pojavi ob povečavi."
 
 #: ../src/nautilus-file-management-properties.glade.h:50
 msgid "Choose the order of information to appear in the list view."
 msgstr "Izberi vrstni red podatkov v pogledu seznama."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr "Izbor možnosti ob vstavitvi medija ali priklopu naprave v sistem"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
@@ -5295,7 +5814,9 @@ msgid "Only create windows for explicitly specified URIs."
 msgstr "Ustvari le okna za eksplicitno navedene URIje."
 
 #: ../src/nautilus-main.c:397
-msgid "Do not manage the desktop (ignore the preference set in the preferences dialog)."
+msgid ""
+"Do not manage the desktop (ignore the preference set in the preferences "
+"dialog)."
 msgstr "Na upravljaj namizja (ignoriraj nastavitve iz dialoga nastavitev)."
 
 #: ../src/nautilus-main.c:399
@@ -5316,8 +5837,11 @@ msgstr "[URI ...]"
 
 #. Translators: --no-default-window is a nautilus command line parameter, don't modify it.
 #: ../src/nautilus-main.c:407
-msgid "Load a saved session from the specified file. Implies \"--no-default-window\"."
-msgstr "Naloži shranjeno sejo iz določene datoteke. Vsebuje \"--no-default-window\"."
+msgid ""
+"Load a saved session from the specified file. Implies \"--no-default-window"
+"\"."
+msgstr ""
+"Naloži shranjeno sejo iz določene datoteke. Vsebuje \"--no-default-window\"."
 
 #: ../src/nautilus-main.c:407
 msgid "FILENAME"
@@ -5338,16 +5862,13 @@ msgstr ""
 "Brskaj datotečni sistem z upraviteljem datotek"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:478
-#: ../src/nautilus-spatial-window.c:389
-#: ../src/nautilus-window-menus.c:560
-#: ../src/nautilus-window.c:154
+#: ../src/nautilus-main.c:478 ../src/nautilus-spatial-window.c:389
+#: ../src/nautilus-window-menus.c:560 ../src/nautilus-window.c:154
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:519
-#: ../src/nautilus-main.c:528
+#: ../src/nautilus-main.c:519 ../src/nautilus-main.c:528
 #: ../src/nautilus-main.c:533
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
@@ -5361,11 +5882,13 @@ msgstr "nautilus: --check ne mroe biti uporabljen z drugimi možnostmi.\n"
 #: ../src/nautilus-main.c:538
 #, c-format
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
-msgstr "nautilus: --geometry ukaza ni mogoče uporabiti z več kot enim URI naslovom.\n"
+msgstr ""
+"nautilus: --geometry ukaza ni mogoče uporabiti z več kot enim URI naslovom.\n"
 
 #: ../src/nautilus-navigation-window-menus.c:123
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "Ste prepričani, da želite, da Nautilus pozabi katere lokacije ste obiskali?"
+msgstr ""
+"Ste prepričani, da želite, da Nautilus pozabi katere lokacije ste obiskali?"
 
 #: ../src/nautilus-navigation-window-menus.c:317
 #: ../src/nautilus-window-bookmarks.c:98
@@ -5606,8 +6129,7 @@ msgstr "%s - Brskalnik datotek"
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
-#: ../src/nautilus-notes-viewer.c:385
-#: ../src/nautilus-notes-viewer.c:499
+#: ../src/nautilus-notes-viewer.c:385 ../src/nautilus-notes-viewer.c:499
 msgid "Notes"
 msgstr "Opombe"
 
@@ -5615,8 +6137,7 @@ msgstr "Opombe"
 msgid "Show Notes"
 msgstr "Prikaži opombe"
 
-#: ../src/nautilus-places-sidebar.c:332
-#: ../src/network-scheme.desktop.in.h:2
+#: ../src/nautilus-places-sidebar.c:332 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
 msgstr "Omrežje"
 
@@ -5969,7 +6490,9 @@ msgid "provides visual status"
 msgstr "nudi prikaz stanja"
 
 #: ../src/nautilus-window-bookmarks.c:96
-msgid "Do you want to remove any bookmarks with the non-existing location from your list?"
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "Želite zbrisati vse zaznamke neobstoječih lokacij z vašega seznama?"
 
 #: ../src/nautilus-window-bookmarks.c:101
@@ -6033,8 +6556,10 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "Ni mogoče prikazati \"%s\", ker gostitelja ni mogoče najti."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "Preverite, ali so črkovanje in nastavitve posredovalnega strežnika pravilne."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"Preverite, ali so črkovanje in nastavitve posredovalnega strežnika pravilne."
 
 #: ../src/nautilus-window-manage-views.c:1947
 #, c-format
@@ -6050,20 +6575,45 @@ msgid "Go to the location specified by this bookmark"
 msgstr "Pojdi na lokacijo navedeno s tem zaznamkom"
 
 #: ../src/nautilus-window-menus.c:542
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Nautilus spada med prosto programje; lahko ga razširjate in/ali spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General PublicLicense), kot ga je objavila ustanova Free Software Foundation; bodisirazličice 2 ali (po vaši izbiri) katerekoli poznejše različice."
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"Nautilus spada med prosto programje; lahko ga razširjate in/ali spreminjate "
+"pod pogoji Splošnega dovoljenja GNU (GNU General PublicLicense), kot ga je "
+"objavila ustanova Free Software Foundation; bodisirazličice 2 ali (po vaši "
+"izbiri) katerekoli poznejše različice."
 
 #: ../src/nautilus-window-menus.c:546
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "Nautilus se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN.  Za podrobnosti glejte besedilo GNU General Public License."
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Nautilus se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
+"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
+"DOLOČEN NAMEN.  Za podrobnosti glejte besedilo GNU General Public License."
 
 #: ../src/nautilus-window-menus.c:550
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
-msgstr "Skupaj s programom bi morali prejeti kopijo GNU Splošne javne licence. V primeru, da je niste, pišite na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgstr ""
+"Skupaj s programom bi morali prejeti kopijo GNU Splošne javne licence. V "
+"primeru, da je niste, pišite na Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
 
 #: ../src/nautilus-window-menus.c:562
-msgid "Nautilus is a graphical shell for GNOME that makes it easy to manage your files and the rest of your system."
-msgstr "Nautilus je grafična lupina za GNOME, ki vam omogoči enostavno upravljanje vaših datotek in preostanka vašega sistema."
+msgid ""
+"Nautilus is a graphical shell for GNOME that makes it easy to manage your "
+"files and the rest of your system."
+msgstr ""
+"Nautilus je grafična lupina za GNOME, ki vam omogoči enostavno upravljanje "
+"vaših datotek in preostanka vašega sistema."
 
 #: ../src/nautilus-window-menus.c:566
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6119,8 +6669,12 @@ msgid "_Backgrounds and Emblems..."
 msgstr "O_zadja in značke ..."
 
 #: ../src/nautilus-window-menus.c:797
-msgid "Display patterns, colors, and emblems that can be used to customize appearance"
-msgstr "Prikaži vzorce, barve in značke, ki se jih lahko uporabi za prikrojitev videza"
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+"Prikaži vzorce, barve in značke, ki se jih lahko uporabi za prikrojitev "
+"videza"
 
 #: ../src/nautilus-window-menus.c:800
 msgid "Prefere_nces"
@@ -6199,8 +6753,7 @@ msgid "Zoom _In"
 msgstr "Po_večaj"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:830
-#: ../src/nautilus-zoom-control.c:92
+#: ../src/nautilus-window-menus.c:830 ../src/nautilus-zoom-control.c:92
 #: ../src/nautilus-zoom-control.c:347
 msgid "Increase the view size"
 msgstr "Povečaj velikost pogleda"
@@ -6212,8 +6765,7 @@ msgid "Zoom _Out"
 msgstr "Po_manjšaj"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:842
-#: ../src/nautilus-zoom-control.c:93
+#: ../src/nautilus-window-menus.c:842 ../src/nautilus-zoom-control.c:93
 #: ../src/nautilus-zoom-control.c:296
 msgid "Decrease the view size"
 msgstr "Zmanjšaj velikost pogleda"
@@ -6225,8 +6777,7 @@ msgid "Normal Si_ze"
 msgstr "Običajna _velikost"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:850
-#: ../src/nautilus-zoom-control.c:94
+#: ../src/nautilus-window-menus.c:850 ../src/nautilus-zoom-control.c:94
 #: ../src/nautilus-zoom-control.c:309
 msgid "Use the normal view size"
 msgstr "Uporabi običajno velikost pogleda"
@@ -6261,8 +6812,7 @@ msgid "_Network"
 msgstr "_Omrežje"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:866
-#: ../src/network-scheme.desktop.in.h:1
+#: ../src/nautilus-window-menus.c:866 ../src/network-scheme.desktop.in.h:1
 msgid "Browse bookmarked and local network locations"
 msgstr "Brskanje med mesti lokalnega omrežja"
 
@@ -6297,7 +6847,8 @@ msgstr "Zapisovalec CD/_DVD"
 #. tooltip
 #: ../src/nautilus-window-menus.c:878
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr "Odprite mapo v katero lahko povlečete datoteke za pisanje na CD ali DVD."
+msgstr ""
+"Odprite mapo v katero lahko povlečete datoteke za pisanje na CD ali DVD."
 
 #. name, stock id
 #. label, accelerator
@@ -6384,78 +6935,253 @@ msgstr "Povečava"
 msgid "Set the zoom level of the current view"
 msgstr "Določitev povečave trenutnega pogleda"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Obroba slike / oznake"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Širina obrobe okoli oznake in slika v opozorilnem oknu"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Tip opozorila"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Tip opozorila"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Opozorilni gumbi"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Gumbi prikazani v opozorilnem oknu."
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Prikaži več _podrobnosti"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Besedilo"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Besedilo oznake"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Poravnava"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Poravnava vrstic v besedilu oznake relativno druga na drugo. To ne vpliva na "
+"poravnavo oznake znotraj drugih elementov. Za to glej GtkMisc:xalign"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Lomljenje vrstic"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Če je nastavljeno, se vrstice lomijo, ko besedilo postane preširoko."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Položaj kazalca"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Trenutni položaj vstavitvenega kazalca v znakih."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Drugi konec izbire"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Mesto izbire na drugem koncu od kazalca v znakih."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Izberi vse"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Vnosne metode"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Napaka GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf napaka:  %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Nadaljnje napake so vidne le v terminalu."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Slika ni izbrana"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Klikniti morate na sliko, da bi jo izbrali."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Nalogo lahko prekinete s klikom na Prekliči."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (neveljaven Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Odpiranje %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Odpiranje %d predmetov"
+msgstr[1] "Odpiranje %d predmeta"
+msgstr[2] "Odpiranje %d predmetov"
+msgstr[3] "Odpiranje %d predmetov"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Vnos gesla"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Prazen Blu-Ray"
+
 #~ msgid "Blank CD Disc"
 #~ msgstr "Prazen CD"
+
 #~ msgid "Blank DVD Disc"
 #~ msgstr "Prazen DVD"
+
 #~ msgid "Blank HD DVD Disc"
 #~ msgstr "Prazen HD DVD"
+
 #~ msgid "Blu-Ray Video"
 #~ msgstr "Blu-Ray Video"
+
 #~ msgid "Compact Disc Audio"
 #~ msgstr "Zvočni CD"
+
 #~ msgid "DVD Audio"
 #~ msgstr "DVD Audio"
+
 #~ msgid "DVD Video"
 #~ msgstr "DVD Video"
+
 #~ msgid "Digital Photos"
 #~ msgstr "Digitalne fotografije"
+
 #~ msgid "HD DVD Video"
 #~ msgstr "HD DVD Video"
+
 #~ msgid "Picture CD"
 #~ msgstr "Slikovni CD"
+
 #~ msgid "Portable Audio Player"
 #~ msgstr "Prenosni predvajalnik zvoka"
+
 #~ msgid "Super Video CD"
 #~ msgstr "Super Video CD"
+
 #~ msgid "Video CD"
 #~ msgstr "Video CD"
+
 #~ msgid "List of x-content/* types to ask the user what to do on insertion."
 #~ msgstr "Seznam x-content/* vrste za vprašanje kaj storiti ob zagonu."
+
 #~ msgid ""
 #~ "List of x-content/* types where a folder window should be opened on "
 #~ "insertion."
 #~ msgstr ""
 #~ "Seznam x-content/* vrste kjer bi se moralo odpreti okno mape ob zagonu."
+
 #~ msgid "List of x-content/* where to prompt the user on insertion"
 #~ msgstr "Seznam vrste x-content/* kjer bo zastavljeno vprašanje uporabniku"
+
 #~ msgid "_Delete from Trash"
 #~ msgstr "_Zbriši iz Smeti"
+
 #~ msgid "--"
 #~ msgstr "--"
+
 #~ msgid "E_ject"
 #~ msgstr "I_zvrzi"
+
 #~ msgid "Create Folder"
 #~ msgstr "Ustvari mapo"
+
 #~ msgid "Move to Trash"
 #~ msgstr "Vrzi v Smeti"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "Ste prepričani, da želite pozabiti zgodovino?"
+
 #~ msgid "If you do, you will be doomed to repeat it."
 #~ msgstr "Če ste, boste obsojeni, da jo ponovite."
+
 #~ msgid ""
 #~ "If you clear the list of locations, they will be permanently deleted."
 #~ msgstr "Če počistite seznam mest, bodo za vedno zbrisana."
+
 #~ msgid "Show the contents in more detail"
 #~ msgstr "Prikaži vsebino podrobneje"
+
 #~ msgid "Show the contents in less detail"
 #~ msgstr "Prikaži vsebino manj podrobno"
+
 #~ msgid "Show the contents at the normal size"
 #~ msgstr "Prikaži vsebino ob normalni velikosti"
+
 #~ msgid "Show in the default detail level"
 #~ msgstr "Prikaži v privzeti stopnji povečave"
+
 #~ msgid "Select Pattern"
 #~ msgstr "Izberi vzorec"
+
 #~ msgid "Select _Pattern"
 #~ msgstr "Izberi _vzorec"
+
 #~ msgid "Open in New Window"
 #~ msgstr "Odpri v novem oknu"
+
 #~ msgid "Link"
 #~ msgstr "Povezava"
+
 #~ msgid "Launcher"
 #~ msgstr "Zaganjalnik"
+
 #~ msgid "MIME type:"
 #~ msgstr "Vrsta MIME:"
-
diff --git a/po/sq.po b/po/sq.po
index d6bb3903d..3aa4246ef 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,10 +1,18 @@
+# #-#-#-#-#  sq.po (nautilus HEAD)  #-#-#-#-#
 # Përkthimi i nautilus në shqip.
 # Copyright (C) 2002-2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as nautilus package
 #
 # Laurent Dhima <laurenti@alblinux.net>, 2002-2008.
+# #-#-#-#-#  sq.po (eel HEAD)  #-#-#-#-#
+# Përkthimi i mesazheve të eel në shqip
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# Laurent Dhima <laurenti@alblinux.net>, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sq.po (nautilus HEAD)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-25 15:21+0000\n"
@@ -15,6 +23,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  sq.po (eel HEAD)  #-#-#-#-#\n"
+"Project-Id-Version: eel HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-07 21:22+0100\n"
+"PO-Revision-Date: 2008-03-08 10:58+0100\n"
+"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
+"Language-Team: albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -367,7 +386,8 @@ msgstr ""
 "kufizim mbi numrin e rreshtave të shfaqur."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "Ngjyra për sfondin e paracaktuar të kartelave. Përdoret vetëm nëse "
 "background_set është TRUE."
@@ -450,11 +470,13 @@ msgstr "Niveli i zmadhimit i paracaktuar i ikonave"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Default list of columns visible in the list view"
-msgstr "Lista e paracaktuar e kollonave të dukshme tek paraqitja në formë liste"
+msgstr ""
+"Lista e paracaktuar e kollonave të dukshme tek paraqitja në formë liste"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Default list of columns visible in the list view."
-msgstr "Lista e paracaktuar e kollonave të dukshme tek paraqitja në formë liste."
+msgstr ""
+"Lista e paracaktuar e kollonave të dukshme tek paraqitja në formë liste."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid "Default list zoom level"
@@ -474,7 +496,8 @@ msgstr "Niveli i zmadhimit i paracaktuar i përdorur në paraqitjen me ikona."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "Default zoom level used by the list view."
-msgstr "Niveli i zmadhimit i paracaktuar i përdorur në paraqitjen në formë liste."
+msgstr ""
+"Niveli i zmadhimit i paracaktuar i përdorur në paraqitjen në formë liste."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid "Desktop computer icon name"
@@ -551,7 +574,8 @@ msgstr ""
 "file."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 "Nëse caktuar në E VËRTETË, dritaret e reja të hapura do ta kenë shtyllën e "
 "pozicionit të dukshme."
@@ -778,7 +802,8 @@ msgstr ""
 "të paracaktuar në dritaret e reja."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "Nëse caktuar në E VËRTETË, etiketat vendosen në krah të ikonave dhe jo "
 "poshtë tyre."
@@ -843,7 +868,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "Lista e llojeve x-content/* të caktuara tek \"Hap kartelën\""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "Lista e llojeve x-content/* për të cilët niset aplikativi i preferuar."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -1045,7 +1071,8 @@ msgstr ""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
-msgstr "Paraqitja e panelit anësor për tu shfaqur tek dritaret e reja të hapura."
+msgstr ""
+"Paraqitja e panelit anësor për tu shfaqur tek dritaret e reja të hapura."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
 msgid ""
@@ -1135,7 +1162,8 @@ msgstr "Kur të shfaqen miniaturat e figurave"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:132
 msgid "Where to position newly open tabs in browser windows."
-msgstr "Tregon ku duhet vendosur skeda e fundit e hapur në dritaret e shfletimit"
+msgstr ""
+"Tregon ku duhet vendosur skeda e fundit e hapur në dritaret e shfletimit"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:133
 msgid "Whether a custom default folder background has been set."
@@ -1143,11 +1171,13 @@ msgstr "Tregon nëse duhet përcaktuar një sfond i personalizuar për kartelat.
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:134
 msgid "Whether a custom default side pane background has been set."
-msgstr "Tregon nëse duhet përcaktuar një sfond i personalizuar për panelin anësor."
+msgstr ""
+"Tregon nëse duhet përcaktuar një sfond i personalizuar për panelin anësor."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "Tregon nëse duhet kërkuar konfermim kur eleminohen file, apo zbrazet koshi"
+msgstr ""
+"Tregon nëse duhet kërkuar konfermim kur eleminohen file, apo zbrazet koshi"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Whether to automatically mount media"
@@ -1155,7 +1185,8 @@ msgstr "Tregon nëse duhen montuar automatikisht suportet"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:137
 msgid "Whether to automatically open a folder for automounted media"
-msgstr "Tregon nëse duhet hapur automatikisht një kartelë për suportet e auto-montuar"
+msgstr ""
+"Tregon nëse duhet hapur automatikisht një kartelë për suportet e auto-montuar"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:138
 msgid "Whether to enable immediate deletion"
@@ -1163,7 +1194,8 @@ msgstr "Tregon nëse duhet aktivizuar eleminimi i menjëhershëm"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:139
 msgid "Whether to enable tabs in Nautilus browser windows"
-msgstr "Tregon nëse duhen aktivizuar skedat në dritaret e shfletimit të Nautilus"
+msgstr ""
+"Tregon nëse duhen aktivizuar skedat në dritaret e shfletimit të Nautilus"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:140
 msgid "Whether to preview sounds when mousing over an icon"
@@ -1512,7 +1544,8 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Është i nevojshëm specifikimi i një fjalëkyçi për simbolin e ri."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "Një fjalëkyç mund të përmbajë vetëm gërma, hapësira dhe numra."
 
 #. this really should never happen, as a user has no idea
@@ -1786,7 +1819,8 @@ msgstr "Eliminon me të vërtetë në menyrë të përhershme «%B»?"
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë %'d elementin e "
 "zgjedhur?"
@@ -1831,7 +1865,8 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr ""
 "U ndesh një gabim gjatë marrjes së informacioneve në lidhje me file në "
 "kartelën «%B»."
@@ -1998,7 +2033,8 @@ msgstr "Mungojnë të drejtat e duhura për tu futur në kartelën e destinuar."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2584
 msgid "There was an error getting information about the destination."
-msgstr "U ndesh një gabim gjatë marrjes së informacioneve në lidhje me objektivin."
+msgstr ""
+"U ndesh një gabim gjatë marrjes së informacioneve në lidhje me objektivin."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2621
 msgid "The destination is not a folder."
@@ -2159,7 +2195,8 @@ msgstr "Kartela e destinuar ndodhet në brendësi të kartelës buruese."
 msgid ""
 "A folder named \"%B\" already exists.  Do you want to merge the source "
 "folder?"
-msgstr "Një kartelë me emrin «%B» ekziston rregullisht. Bashkon me kartelën buruese?"
+msgstr ""
+"Një kartelë me emrin «%B» ekziston rregullisht. Bashkon me kartelën buruese?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3809
 msgid ""
@@ -2174,7 +2211,8 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:3814
 #: ../libnautilus-private/nautilus-file-operations.c:4385
 msgid "A folder named \"%B\" already exists.  Do you want to replace it?"
-msgstr "Një kartelë me emrin «%B» ekziston rregullisht.  Dëshiron ta zëvendësosh?"
+msgstr ""
+"Një kartelë me emrin «%B» ekziston rregullisht.  Dëshiron ta zëvendësosh?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3816
 #: ../libnautilus-private/nautilus-file-operations.c:4387
@@ -2194,7 +2232,8 @@ msgstr "Një file me emrin «%B» ekziston rregullisht.  Dëshiron ta zëvendës
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr ""
 "File ekziston rregullisht në «%F». Zëvendësimi do të mbishkruajë përmbajtjen "
 "e tij."
@@ -2202,7 +2241,8 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:3913
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
-msgstr "E pamundur heqja e file rregullisht ekzistues e me të njëjtin emër në «%F»."
+msgstr ""
+"E pamundur heqja e file rregullisht ekzistues e me të njëjtin emër në «%F»."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3985
 #, c-format
@@ -2951,7 +2991,8 @@ msgstr "E pamundur gjetja e aplikativit"
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
 msgid "Could not add application to the application database: %s"
-msgstr "I pamundur shtimi i aplikativit në bazën e të dhënave të aplikativëve: %s"
+msgstr ""
+"I pamundur shtimi i aplikativit në bazën e të dhënave të aplikativëve: %s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
 msgid "Could not add application"
@@ -3066,7 +3107,8 @@ msgid "This drop target only supports local files."
 msgstr "Objektivi i kësaj zvarritje suporton vetëm file lokalë."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Për të hapur file jo lokalë kopjoi në një kartelë lokale e pastaj zvarritini "
 "përsëri."
@@ -3138,7 +3180,8 @@ msgstr "Konfermo ekzekutimin automatik"
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
 "Shfleton të gjithë disqet dhe kartelat lokale dhe në distancë të arritshme "
 "nga ky kompjutër"
@@ -3185,7 +3228,8 @@ msgid "Nautilus metafile factory"
 msgstr "Fabrika e metafile për Nautilus"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr ""
 "Operacione të Nautilus që mund të kryhen nga thirrje të mëvonshme nga "
 "rreshti i komandës"
@@ -3227,7 +3271,8 @@ msgstr "Ndrysho s_fondin e desktop"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Shfaq një dritare që mundëson përcaktimin e ngjyrës apo motivit për sfondin "
 "e desktop"
@@ -3474,16 +3519,22 @@ msgstr "Zgjidh komandën «Ngjit» për të kopjuar «%s»"
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
-msgstr[0] "Elementi i zgjedhur (%'d) do të lëvizet po të zgjidhet komanda «Ngjit»"
-msgstr[1] "Elementët e zgjedhur (%'d) do të lëvizen po të zgjidhet komanda «Ngjit»"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"Elementi i zgjedhur (%'d) do të lëvizet po të zgjidhet komanda «Ngjit»"
+msgstr[1] ""
+"Elementët e zgjedhur (%'d) do të lëvizen po të zgjidhet komanda «Ngjit»"
 
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "Elementi i zgjedhur (%'d) do të kopjohet po të zgjidhet komanda «Ngjit»"
-msgstr[1] "Elementët e zgjedhur (%'d) do të kopjohen po të zgjidhet komanda «Ngjit»"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"Elementi i zgjedhur (%'d) do të kopjohet po të zgjidhet komanda «Ngjit»"
+msgstr[1] ""
+"Elementët e zgjedhur (%'d) do të kopjohen po të zgjidhet komanda «Ngjit»"
 
 #: ../src/file-manager/fm-directory-view.c:5767
 #: ../src/file-manager/fm-tree-view.c:1013
@@ -3772,7 +3823,8 @@ msgstr "_Elemino"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6686
 msgid "Delete each selected item, without moving to the Trash"
-msgstr "Eleminon secilin nga elementët e zgjedhur, pa e lëvizur paraprakisht në kosh "
+msgstr ""
+"Eleminon secilin nga elementët e zgjedhur, pa e lëvizur paraprakisht në kosh "
 
 #. name, stock id
 #. label, accelerator
@@ -4175,7 +4227,8 @@ msgstr "Komanda"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Të drejta të pamjaftueshme për të shikuar përmbajtjen e «%s»."
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4194,14 +4247,16 @@ msgstr "Përmbajtja e kartelës nuk mund të shfaqet."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Emri \"%s\" eshtë përdorur njëherë në këtë kartelë. Ju lutem përdorni një "
 "emër tjetër."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "Nuk ka \"%s\" në këtë kartelë. Mos e keni lëvizuar apo eleminuar?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -4235,7 +4290,8 @@ msgstr "Elementi nuk mund të riemërtohet."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Mungojnë të drejtat e nevojshme për të ndryshuar grupin e \"%s\"."
 
 #. fall through
@@ -5180,7 +5236,8 @@ msgstr "E pamundur heqja e simbolit me emrin «%s»."
 msgid ""
 "This is probably because the emblem is a permanent one, and not one that you "
 "added yourself."
-msgstr "Shkaku mund të jetë që simboli është i përhershëm, pra jo i krijuar nga ju."
+msgstr ""
+"Shkaku mund të jetë që simboli është i përhershëm, pra jo i krijuar nga ju."
 
 #: ../src/nautilus-emblem-sidebar.c:260
 #, c-format
@@ -5422,7 +5479,8 @@ msgstr ""
 "formë liste."
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr ""
 "Zgjidh veprimin për tu ndërmarrë kur futet një suport apo lidhen dispozitivë "
 "në sistem"
@@ -5933,7 +5991,8 @@ msgstr "_Kërko për file..."
 #: ../src/nautilus-navigation-window-menus.c:799
 #: ../src/nautilus-spatial-window.c:906
 msgid "Locate documents and folders on this computer by name or content"
-msgstr "Gjen dokumentë dhe kartela në këtë kompjuter sipas emrit apo përmbajtjes"
+msgstr ""
+"Gjen dokumentë dhe kartela në këtë kompjuter sipas emrit apo përmbajtjes"
 
 #: ../src/nautilus-navigation-window-menus.c:802
 msgid "_Previous Tab"
@@ -6046,7 +6105,8 @@ msgstr "_Kërko"
 
 #: ../src/nautilus-navigation-window.c:177
 msgid "Toggle between button and text-based location bar"
-msgstr "Shkëmben midis shtyllës së pozicionit me butonë dhe asaj të bazuar në tekst"
+msgstr ""
+"Shkëmben midis shtyllës së pozicionit me butonë dhe asaj të bazuar në tekst"
 
 #: ../src/nautilus-navigation-window.c:284
 msgid "_Close Tab"
@@ -6433,7 +6493,8 @@ msgstr "Libërshënues për një pozicion joekzistues"
 
 #: ../src/nautilus-window-manage-views.c:731
 msgid "You can choose another view or go to a different location."
-msgstr "Mund të zgjidhet një paraqitje tjetër ose të shkohet në një pozicion tjetër."
+msgstr ""
+"Mund të zgjidhet një paraqitje tjetër ose të shkohet në një pozicion tjetër."
 
 #: ../src/nautilus-window-manage-views.c:750
 msgid "The location cannot be displayed with this viewer."
@@ -6449,7 +6510,8 @@ msgstr "Paraqitja e kartelës aktuale"
 
 #: ../src/nautilus-window-manage-views.c:1883
 msgid "Nautilus has no installed viewer capable of displaying the folder."
-msgstr "Nautilus nuk ka një shikues të instaluar në gjendje të shfaqë këtë kartelë."
+msgstr ""
+"Nautilus nuk ka një shikues të instaluar në gjendje të shfaqë këtë kartelë."
 
 #: ../src/nautilus-window-manage-views.c:1889
 msgid "The location is not a folder."
@@ -6488,7 +6550,8 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "E pamundur shfaqja e «%s», pasi host nuk u gjet."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Sigurohu që është shkruar si duhet dhe që konfigurimi i proxy të jetë "
 "korrekt. "
@@ -6544,8 +6607,8 @@ msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
 msgstr ""
-"Nautilus është një shell grafik për GNOME që ju jep mundësi të administroni me "
-"lehtësi file dhe pjesën tjetër të sistemit tuaj."
+"Nautilus është një shell grafik për GNOME që ju jep mundësi të administroni "
+"me lehtësi file dhe pjesën tjetër të sistemit tuaj."
 
 #: ../src/nautilus-window-menus.c:566
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6866,3 +6929,147 @@ msgstr "Shkalla e zmadhimit"
 msgid "Set the zoom level of the current view"
 msgstr "Rregullo shkallën e zmadhimit për pamjen aktuale"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bordi i figurës/etiketës"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Gjerësia e kornizës rreth etiketës dhe figura në dritaren e dialogut të "
+"paralajmërimit"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Lloji i paralajmërimit"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Lloji i paralajmërimit"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Pulsantët paralajmërues"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Pulsantët e shfaqur në dritaren e dialogut të paralajmërimit"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Shfaq _detaje të tjerë"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Teksti"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Teksti i etiketës."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Orientimi"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Rreshtimi reciprok i rreshtave tek teksti i etiketës. NUK ka influencë mbi "
+"drejtimin e etiketës. Shiko GtkMisc::xalign për këtë."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Ndërprerja e rreshtit"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"Nëse zgjidhet, shkon në krye të rreshtit nëse teksti bëhet tepër i gjatë."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Pozicioni i kursorit"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Pozicioni aktual, në gërma, i kursorit të shtimit."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Kufiri i zgjedhjes"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Pozicioni, në gërma, i anës së kundërt të pjesës së zgjedhur, kundrejt "
+"kursorit."
+
+#: ../eel/eel-editable-label.c:3054
+msgid "Select All"
+msgstr "Zgjidh gjithçka"
+
+#: ../eel/eel-editable-label.c:3065
+msgid "Input Methods"
+msgstr "Metodat e shkrimit"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Gabim i GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Gabim i GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Të gjithë gabimet e mëtejshëm do të tregohen vetëm në terminal."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Nuk është zgjedhur asnjë figurë."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Duhet të klikoni mbi njërën nga figurat për t'a zgjedhur."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Mund t'a ndaloni këtë veprim duke klikuar tek «anullo»."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode i pavlefshëm)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Duke hapur %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Duke hapur %d element"
+msgstr[1] "Duke hapur %d elementë"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Shkruaj fjalëkalimin"
diff --git a/po/sr.po b/po/sr.po
index be2e98511..0f2d9b555 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  sr.po (nautilus)  #-#-#-#-#
 # Serbian translation of nautilus
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
 #
@@ -6,8 +7,18 @@
 # Maintainer: Данило Шеган <danilo@gnome.org>
 # Reviewed on 2005-07-09 by: Данило Шеган <danilo@gnome.org>
 #
+# #-#-#-#-#  sr.po (eel)  #-#-#-#-#
+# Serbian translation of eel
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007.
+# This file is distributed under the same license as the eel package.
+# Maintainer: Данило Шеган <dsegan@gmx.net>
+# Данило Шеган <danilo@prevod.org>, 2005.
+# Reviewed on 2005-07-16 by: Игор Несторовић <igor@prevod.org>
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sr.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-09 12:42+0100\n"
@@ -19,6 +30,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"#-#-#-#-#  sr.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-20 03:12+0200\n"
+"PO-Revision-Date: 2008-09-20 03:12+0100\n"
+"Last-Translator: Горан Ракић <grakic@devbase.net>\n"
+"Language-Team: Serbian (sr) <gnom@prevod.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 # note(danilo):
 # ПАЖЊА: користим 4 облика за множину како бих случај за један једини стављао
@@ -2931,8 +2952,13 @@ msgid "Could not set as default application"
 msgstr "Не могу да поставим као подразумевани програм"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "Подразумевани"
+msgstr ""
+"#-#-#-#-#  sr.po (nautilus)  #-#-#-#-#\n"
+"Подразумевани\n"
+"#-#-#-#-#  sr.po (eel)  #-#-#-#-#\n"
+"Подразумевано"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:266
 msgid "Icon"
@@ -6723,6 +6749,135 @@ msgstr "Увећај"
 msgid "Set the zoom level of the current view"
 msgstr "Постави ниво увећања текућег прегледа"
 
+#: ../eel/eel-alert-dialog.c:109
+msgid "Image/label border"
+msgstr "Ивица слике/ознаке"
+
+#: ../eel/eel-alert-dialog.c:110
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Ширина ивице око ознаке и слике у прозорчету упозорења"
+
+#: ../eel/eel-alert-dialog.c:119
+msgid "Alert Type"
+msgstr "Врста упозорења"
+
+#: ../eel/eel-alert-dialog.c:120
+msgid "The type of alert"
+msgstr "Врста упозорења"
+
+#: ../eel/eel-alert-dialog.c:128
+msgid "Alert Buttons"
+msgstr "Дугмад упозорења"
+
+#: ../eel/eel-alert-dialog.c:129
+msgid "The buttons shown in the alert dialog"
+msgstr "Дугмад приказана у прозорчету упозорења"
+
+#: ../eel/eel-alert-dialog.c:193
+msgid "Show more _details"
+msgstr "Прикажи више _детаља"
+
+#: ../eel/eel-canvas.c:1219 ../eel/eel-canvas.c:1220
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1226 ../eel/eel-canvas.c:1227
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:353
+msgid "Text"
+msgstr "Текст"
+
+#: ../eel/eel-editable-label.c:354
+msgid "The text of the label."
+msgstr "Садржај ознаке."
+
+#: ../eel/eel-editable-label.c:360
+msgid "Justification"
+msgstr "Поравнање"
+
+#: ../eel/eel-editable-label.c:361
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Поравнање линија текста ознаке у међусобном односу. Ово не утиче на "
+"поравнање ознаке на њој додељеном простору. Погледајте GtkMisc::xalign за то."
+
+#: ../eel/eel-editable-label.c:369
+msgid "Line wrap"
+msgstr "Прелом реда"
+
+#: ../eel/eel-editable-label.c:370
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"Уколико је постављено, када текст постане преширок вршиће се прелом реда."
+
+#: ../eel/eel-editable-label.c:377
+msgid "Cursor Position"
+msgstr "Позиција курзора"
+
+#: ../eel/eel-editable-label.c:378
+msgid "The current position of the insertion cursor in chars."
+msgstr "Текућа позиција курзора за унос као број знакова."
+
+#: ../eel/eel-editable-label.c:387
+msgid "Selection Bound"
+msgstr "Граница избора"
+
+#: ../eel/eel-editable-label.c:388
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Позиција супротног краја избора као број знакова од курзора."
+
+#: ../eel/eel-editable-label.c:3217
+msgid "Select All"
+msgstr "Изабери све"
+
+#: ../eel/eel-editable-label.c:3228
+msgid "Input Methods"
+msgstr "Методе уноса"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"ГКонф грешка:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "ГКонф грешка: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Све наредне грешке се приказују само на терминалу."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Слика није изабрана."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Морате притиснути слику да бисте је изабрали."
+
+#: ../eel/eel-stock-dialogs.c:209
+msgid "You can stop this operation by clicking cancel."
+msgstr "Можете зауставити ову операцију притиском на „откажи“."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (неисправан Уникод)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Унесите лозинку"
+
 #~ msgid "Browse the file system with the file manager"
 #~ msgstr "Разгледајте систем датотека помоћу управљача датотекама"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 1dc788515..b0e4e8031 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  sr@latin.po (nautilus)  #-#-#-#-#
 # Serbian translation of nautilus
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
 #
@@ -6,8 +7,18 @@
 # Maintainer: Danilo Šegan <danilo@gnome.org>
 # Reviewed on 2005-07-09 by: Danilo Šegan <danilo@gnome.org>
 #
+# #-#-#-#-#  sr@latin.po (eel)  #-#-#-#-#
+# Serbian translation of eel
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007.
+# This file is distributed under the same license as the eel package.
+# Maintainer: Danilo Šegan <dsegan@gmx.net>
+# Danilo Šegan <danilo@prevod.org>, 2005.
+# Reviewed on 2005-07-16 by: Igor Nestorović <igor@prevod.org>
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sr@latin.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-09 12:42+0100\n"
@@ -19,6 +30,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"#-#-#-#-#  sr@latin.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-20 03:12+0200\n"
+"PO-Revision-Date: 2008-09-20 03:12+0100\n"
+"Last-Translator: Goran Rakić <grakic@devbase.net>\n"
+"Language-Team: Serbian (sr) <gnom@prevod.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 # note(danilo):
 # PAŽNJA: koristim 4 oblika za množinu kako bih slučaj za jedan jedini stavljao
@@ -339,17 +360,17 @@ msgid ""
 "larger (200%), largest (400%)"
 msgstr ""
 "Lista kao niska koja određuje kako će biti skraćena imena datoteka koja se "
-"preklapaju, zavisno od stepena uvećanja. Svaki unos u listi razdvojen zapetom "
-"je oblika „Uvećanje:Ceo broj“. Za svaki stepen uvećanja (najmanje "
+"preklapaju, zavisno od stepena uvećanja. Svaki unos u listi razdvojen "
+"zapetom je oblika „Uvećanje:Ceo broj“. Za svaki stepen uvećanja (najmanje "
 "„smallest“ /33%/, manje „smaller“ /50%/, malo „small“ /66%/, obično "
 "„standard“ /100%/, veliko „large“ /150%/, veće „larger“ /200%/ i najveće "
 "„largest“ /400%/) ako je broj veći od 0 ime datoteke neće preći taj broj "
-"redova. Ako je broj 0 ili manje neće postojati limit na tom uvećanju. Dozvoljen "
-"je i unos samo celog broja što će biti primenjeno kao podrazumevana vrednost "
-"za sve stepene uvećanja. Na primer: „0“ — uvek prikaži dugačko ime; „3“ — "
-"uvek skrati ime ako prelazi tri reda; „smallest:5, smaller:4“ — skrati ime "
-"ako prelazi pet redova na najmanjem uvećanju, četiri na manjem uvećanju, inače "
-"ne skraćuj."
+"redova. Ako je broj 0 ili manje neće postojati limit na tom uvećanju. "
+"Dozvoljen je i unos samo celog broja što će biti primenjeno kao "
+"podrazumevana vrednost za sve stepene uvećanja. Na primer: „0“ — uvek "
+"prikaži dugačko ime; „3“ — uvek skrati ime ako prelazi tri reda; "
+"„smallest:5, smaller:4“ — skrati ime ako prelazi pet redova na najmanjem "
+"uvećanju, četiri na manjem uvećanju, inače ne skraćuj."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "All columns have same width"
@@ -524,10 +545,10 @@ msgid ""
 "massive folders. A negative value denotes no limit. The limit is approximate "
 "due to the reading of folders chunk-wise."
 msgstr ""
-"Fascikle veće od ovoga će biti odsečene na približno ovu veličinu. Cilj je da "
-"se izbegne slučajno prepunjavanje memorije i ubijanje Nautilusa u prevelikim "
-"fasciklama. Negativna vrednost označava da nema ograničenja. Granica je "
-"približna pošto se fascikle čitaju u blokovima."
+"Fascikle veće od ovoga će biti odsečene na približno ovu veličinu. Cilj je "
+"da se izbegne slučajno prepunjavanje memorije i ubijanje Nautilusa u "
+"prevelikim fasciklama. Negativna vrednost označava da nema ograničenja. "
+"Granica je približna pošto se fascikle čitaju u blokovima."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid "Home icon visible on desktop"
@@ -606,16 +627,17 @@ msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
 msgstr ""
-"Ukoliko je postavljeno, Nautilus će tražiti odobrenje pri brisanju datoteka ili "
-"pražnjenju smeća."
+"Ukoliko je postavljeno, Nautilus će tražiti odobrenje pri brisanju datoteka "
+"ili pražnjenju smeća."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
 "If set to true, then Nautilus will automatically mount media such as user-"
 "visible hard disks and removable media on start-up and media insertion."
 msgstr ""
-"Ukoliko je postavljeno, Nautilus će sam priključiti medijume kao što su čvrsti "
-"diskovi (dostupni korisniku) i uklonjivi medijumi nakon njihovog priključivanja."
+"Ukoliko je postavljeno, Nautilus će sam priključiti medijume kao što su "
+"čvrsti diskovi (dostupni korisniku) i uklonjivi medijumi nakon njihovog "
+"priključivanja."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid ""
@@ -624,10 +646,10 @@ msgid ""
 "detected; for media where a known x-content type is detected, the user "
 "configurable action will be taken instead."
 msgstr ""
-"Ukoliko je postavljeno, Nautilus će sam otvoriti fasciklu nakon priključitava "
-"medijuma. Ovo se odnosi samo na medijume za koje se ne zna sadržaj (x-"
-"content/*), dok za medijume sa poznatim sadržajem morate postaviti željenu "
-"radnju."
+"Ukoliko je postavljeno, Nautilus će sam otvoriti fasciklu nakon "
+"priključitava medijuma. Ovo se odnosi samo na medijume za koje se ne zna "
+"sadržaj (x-content/*), dok za medijume sa poznatim sadržajem morate "
+"postaviti željenu radnju."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
@@ -668,8 +690,8 @@ msgid ""
 "behavior."
 msgstr ""
 "Ukoliko je postavljeno, onda su svi prozori Nautilusa razgledački prozori. "
-"Ovako se Nautilus ponašao pre izdanja 2.6, a neki ljudi više vole ovakav način "
-"rada."
+"Ovako se Nautilus ponašao pre izdanja 2.6, a neki ljudi više vole ovakav "
+"način rada."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
@@ -695,8 +717,8 @@ msgid ""
 "If set to true, then multiple views can be opened in one browser window, "
 "each in a separate tab."
 msgstr ""
-"Ukoliko je postavljeno, možete otvoriti više listova u razgledaču sa zasebnim "
-"sadržajem."
+"Ukoliko je postavljeno, možete otvoriti više listova u razgledaču sa "
+"zasebnim sadržajem."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid ""
@@ -735,8 +757,8 @@ msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
 msgstr ""
-"Ukoliko je ovo postavljeno, ikona koja ukazuje na priključene diskove će biti "
-"stavljena na radnu površinu."
+"Ukoliko je ovo postavljeno, ikona koja ukazuje na priključene diskove će "
+"biti stavljena na radnu površinu."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid ""
@@ -778,7 +800,8 @@ msgstr ""
 msgid ""
 "If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
-"Ukoliko je postavljeno, oznake će biti smeštene pored ikona umesto ispod njih."
+"Ukoliko je postavljeno, oznake će biti smeštene pored ikona umesto ispod "
+"njih."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid "If true, new windows will use manual layout by default."
@@ -791,9 +814,9 @@ msgid ""
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
 msgstr ""
-"Za slike koje prelaze ovu veličinu (u bajtovima) neće biti prikazana umanjena "
-"slika. Svrha ovoga je da se izbegne umanjivanje velikih slika što može oduzeti "
-"mnogo vremena ili memorije."
+"Za slike koje prelaze ovu veličinu (u bajtovima) neće biti prikazana "
+"umanjena slika. Svrha ovoga je da se izbegne umanjivanje velikih slika što "
+"može oduzeti mnogo vremena ili memorije."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "List of possible captions on icons"
@@ -806,8 +829,8 @@ msgid ""
 "application be started on insertion of media matching these types."
 msgstr ""
 "Spisak vrsta sadržaja (x-content/*) za koje je izabrano „Ne radi ništa“ u "
-"postavkama. Nikakvo pitanje neće biti postavljeno niti će odgovarajući program "
-"biti pokrenut po ubacivanju medijuma sa ovim sadržajem."
+"postavkama. Nikakvo pitanje neće biti postavljeno niti će odgovarajući "
+"program biti pokrenut po ubacivanju medijuma sa ovim sadržajem."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
@@ -816,8 +839,8 @@ msgid ""
 "media matching these types."
 msgstr ""
 "Spisak vrsta sadržaja (x-content/*) za koje je izabrano „Otvori fasciklu“ u "
-"postavkama. Nakon ubacivanja ovakvog medijuma biće pokrenut prozor sa njegovim "
-"sadržajem."
+"postavkama. Nakon ubacivanja ovakvog medijuma biće pokrenut prozor sa "
+"njegovim sadržajem."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid ""
@@ -946,10 +969,10 @@ msgid ""
 "local file systems. If set to \"never\" then it never previews sound."
 msgstr ""
 "Gubitak brzine radi pregleda zvučnih datoteka pri prelasku miša preko ikona "
-"datoteka. Ukoliko je postavljeno na „always“ uvek se pušta zvuk, čak i ako je "
-"datoteka na udaljenom računaru. Ukoliko je postavljeno na „local_only“, pušta "
-"se zvuk samo za lokalne datoteke. Ukoliko je postavljeno na „never“, nikad se "
-"ne pušta zvuk."
+"datoteka. Ukoliko je postavljeno na „always“ uvek se pušta zvuk, čak i ako "
+"je datoteka na udaljenom računaru. Ukoliko je postavljeno na „local_only“, "
+"pušta se zvuk samo za lokalne datoteke. Ukoliko je postavljeno na „never“, "
+"nikad se ne pušta zvuk."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
 msgid ""
@@ -973,11 +996,11 @@ msgid ""
 "If set to \"never\" then never bother to thumbnail images, just use a "
 "generic icon."
 msgstr ""
-"Gubitak brzine radi pregleda umanjenih slika za slike. Ukoliko je postavljeno "
-"na „always“ uvek se prikazuje umanjena slika, čak i ako je fascikla na "
-"udaljenom računaru. Ukoliko je postavljeno na „local_only“, prikazuje se "
-"umanjena slika samo za lokalne datoteke. Ukoliko je postavljeno na „never“ "
-"koristi se opšta ikona."
+"Gubitak brzine radi pregleda umanjenih slika za slike. Ukoliko je "
+"postavljeno na „always“ uvek se prikazuje umanjena slika, čak i ako je "
+"fascikla na udaljenom računaru. Ukoliko je postavljeno na „local_only“, "
+"prikazuje se umanjena slika samo za lokalne datoteke. Ukoliko je postavljeno "
+"na „never“ koristi se opšta ikona."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid ""
@@ -989,8 +1012,8 @@ msgstr ""
 "Gubitak brzine radi prikazivanja broja stavki u fascikli. Ukoliko je "
 "postavljeno na „always“ uvek se prikazuje broj stavki, čak i ako je fascikla "
 "na udaljenom računaru. Ukoliko je postavljeno na „local_only“, prikazuje se "
-"broj stavki samo za lokalne fascikle. Ukoliko je postavljeno na „never“, onda "
-"se nikad ne prikazuje broj stavki."
+"broj stavki samo za lokalne fascikle. Ukoliko je postavljeno na „never“, "
+"onda se nikad ne prikazuje broj stavki."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:111
 msgid "Text Ellipsis Limit"
@@ -1094,10 +1117,10 @@ msgid ""
 "\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
 "text files."
 msgstr ""
-"Šta treba da uradi sa izvršnim tekstualnim datotekama pri njihovom aktiviranju "
-"(jednostruki ili dvostruki klik). Moguće vrednosti su „launch“ za pokretanje "
-"istih kao programa, „ask“ za postavljanje pitanja pomoću prozorčeta, i "
-"„display“ za prikazivanje kao tekstualnih datoteka."
+"Šta treba da uradi sa izvršnim tekstualnim datotekama pri njihovom "
+"aktiviranju (jednostruki ili dvostruki klik). Moguće vrednosti su „launch“ "
+"za pokretanje istih kao programa, „ask“ za postavljanje pitanja pomoću "
+"prozorčeta, i „display“ za prikazivanje kao tekstualnih datoteka."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid ""
@@ -1131,7 +1154,8 @@ msgstr "Da li je postavljena proizvoljna podrazumevana pozadina fascikle."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Whether a custom default side pane background has been set."
-msgstr "Da li je postavljena proizvoljna podrazumevana pozadina za bočnu površ."
+msgstr ""
+"Da li je postavljena proizvoljna podrazumevana pozadina za bočnu površ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
@@ -1269,8 +1293,8 @@ msgid ""
 "Select how to open \"%s\" and whether to perform this action in the future "
 "for other media of type \"%s\"."
 msgstr ""
-"Izaberite način za otvaranje „%s“ i da li da se ova radnja ponavlja za ostale „%"
-"s“ medijume."
+"Izaberite način za otvaranje „%s“ i da li da se ova radnja ponavlja za "
+"ostale „%s“ medijume."
 
 #: ../libnautilus-private/nautilus-autorun.c:954
 msgid "_Always perform this action"
@@ -1844,7 +1868,8 @@ msgstr "_Preskoči datoteke"
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
-msgstr "Ne mogu da obrišem fasciklu „%B“ jer nemate ovlašćenja za njeno čitanje."
+msgstr ""
+"Ne mogu da obrišem fasciklu „%B“ jer nemate ovlašćenja za njeno čitanje."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1443
 #: ../libnautilus-private/nautilus-file-operations.c:2404
@@ -2104,8 +2129,8 @@ msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
 msgstr ""
-"Ne mogu da umnožim fasciklu „%B“ zato što nemate ovlašćenja da je napravite u "
-"odredištu."
+"Ne mogu da umnožim fasciklu „%B“ zato što nemate ovlašćenja da je napravite "
+"u odredištu."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3196
 msgid "There was an error creating the folder \"%B\"."
@@ -2931,8 +2956,13 @@ msgid "Could not set as default application"
 msgstr "Ne mogu da postavim kao podrazumevani program"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "Podrazumevani"
+msgstr ""
+"#-#-#-#-#  sr@latin.po (nautilus)  #-#-#-#-#\n"
+"Podrazumevani\n"
+"#-#-#-#-#  sr@latin.po (eel)  #-#-#-#-#\n"
+"Podrazumevano"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:266
 msgid "Icon"
@@ -3236,8 +3266,8 @@ msgstr "Izmenite pozadinu _radne površine"
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
-"Prikazuje prozor koji omogućava da izbor obrasca za popunjavanja pozadine ili "
-"boju"
+"Prikazuje prozor koji omogućava da izbor obrasca za popunjavanja pozadine "
+"ili boju"
 
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:705
@@ -3467,8 +3497,8 @@ msgstr ""
 "datoteka kao parametre. Kada se izvrše iz udaljenih fascikli (npr. veb ili "
 "FTP), skripte neće dobiti nikakve parametre.\n"
 "\n"
-"U svim slučajevima, sledeće promenljive okruženja će postaviti Nautilus, koje "
-"skripte mogu koristiti:\n"
+"U svim slučajevima, sledeće promenljive okruženja će postaviti Nautilus, "
+"koje skripte mogu koristiti:\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: putanje izabranih datoteka u zasebnim "
 "redovima (samo ako je lokalno)\n"
@@ -6723,6 +6753,136 @@ msgstr "Uvećaj"
 msgid "Set the zoom level of the current view"
 msgstr "Postavi nivo uvećanja tekućeg pregleda"
 
+#: ../eel/eel-alert-dialog.c:109
+msgid "Image/label border"
+msgstr "Ivica slike/oznake"
+
+#: ../eel/eel-alert-dialog.c:110
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Širina ivice oko oznake i slike u prozorčetu upozorenja"
+
+#: ../eel/eel-alert-dialog.c:119
+msgid "Alert Type"
+msgstr "Vrsta upozorenja"
+
+#: ../eel/eel-alert-dialog.c:120
+msgid "The type of alert"
+msgstr "Vrsta upozorenja"
+
+#: ../eel/eel-alert-dialog.c:128
+msgid "Alert Buttons"
+msgstr "Dugmad upozorenja"
+
+#: ../eel/eel-alert-dialog.c:129
+msgid "The buttons shown in the alert dialog"
+msgstr "Dugmad prikazana u prozorčetu upozorenja"
+
+#: ../eel/eel-alert-dialog.c:193
+msgid "Show more _details"
+msgstr "Prikaži više _detalja"
+
+#: ../eel/eel-canvas.c:1219 ../eel/eel-canvas.c:1220
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1226 ../eel/eel-canvas.c:1227
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:353
+msgid "Text"
+msgstr "Tekst"
+
+#: ../eel/eel-editable-label.c:354
+msgid "The text of the label."
+msgstr "Sadržaj oznake."
+
+#: ../eel/eel-editable-label.c:360
+msgid "Justification"
+msgstr "Poravnanje"
+
+#: ../eel/eel-editable-label.c:361
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Poravnanje linija teksta oznake u međusobnom odnosu. Ovo ne utiče na "
+"poravnanje oznake na njoj dodeljenom prostoru. Pogledajte GtkMisc::xalign za "
+"to."
+
+#: ../eel/eel-editable-label.c:369
+msgid "Line wrap"
+msgstr "Prelom reda"
+
+#: ../eel/eel-editable-label.c:370
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+"Ukoliko je postavljeno, kada tekst postane preširok vršiće se prelom reda."
+
+#: ../eel/eel-editable-label.c:377
+msgid "Cursor Position"
+msgstr "Pozicija kurzora"
+
+#: ../eel/eel-editable-label.c:378
+msgid "The current position of the insertion cursor in chars."
+msgstr "Tekuća pozicija kurzora za unos kao broj znakova."
+
+#: ../eel/eel-editable-label.c:387
+msgid "Selection Bound"
+msgstr "Granica izbora"
+
+#: ../eel/eel-editable-label.c:388
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Pozicija suprotnog kraja izbora kao broj znakova od kurzora."
+
+#: ../eel/eel-editable-label.c:3217
+msgid "Select All"
+msgstr "Izaberi sve"
+
+#: ../eel/eel-editable-label.c:3228
+msgid "Input Methods"
+msgstr "Metode unosa"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GKonf greška:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GKonf greška: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Sve naredne greške se prikazuju samo na terminalu."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Slika nije izabrana."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Morate pritisnuti sliku da biste je izabrali."
+
+#: ../eel/eel-stock-dialogs.c:209
+msgid "You can stop this operation by clicking cancel."
+msgstr "Možete zaustaviti ovu operaciju pritiskom na „otkaži“."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (neispravan Unikod)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Unesite lozinku"
+
 #~ msgid "Browse the file system with the file manager"
 #~ msgstr "Razgledajte sistem datoteka pomoću upravljača datotekama"
 
@@ -6756,9 +6916,9 @@ msgstr "Postavi nivo uvećanja tekućeg pregleda"
 #~ "console may fix the problem. If not, you can try rebooting the computer "
 #~ "or installing Nautilus again."
 #~ msgstr ""
-#~ "Trenutno ne možete koristiti Nautilus. Izvršavanje naredbe „bonobo-slay“ u "
-#~ "Terminalu može otkloniti problem. Ukoliko to ne pomogne, ponovo pokrenite "
-#~ "računar ili ponovo instalirajte Nautilus."
+#~ "Trenutno ne možete koristiti Nautilus. Izvršavanje naredbe „bonobo-slay“ "
+#~ "u Terminalu može otkloniti problem. Ukoliko to ne pomogne, ponovo "
+#~ "pokrenite računar ili ponovo instalirajte Nautilus."
 
 #~ msgid ""
 #~ "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
@@ -6779,13 +6939,13 @@ msgstr "Postavi nivo uvećanja tekućeg pregleda"
 #~ "We have also seen this error when a faulty version of bonobo-activation "
 #~ "was installed."
 #~ msgstr ""
-#~ "Trenutno ne možete koristiti Nautilus. Izvršavanje naredbe „bonobo-slay“ u "
-#~ "Terminalu može otkloniti problem. Ukoliko to ne pomogne, ponovo pokrenite "
-#~ "računar ili ponovo instalirajte Nautilus.\n"
+#~ "Trenutno ne možete koristiti Nautilus. Izvršavanje naredbe „bonobo-slay“ "
+#~ "u Terminalu može otkloniti problem. Ukoliko to ne pomogne, ponovo "
+#~ "pokrenite računar ili ponovo instalirajte Nautilus.\n"
 #~ "\n"
 #~ "Bonobo ne može da pronađe datoteku Nautilus_shell.server. Jedan uzrok "
-#~ "ovoga je kada LD_LIBRARY_PATH ne uključuje direktorijum sa bibliotekama za "
-#~ "bonobo-activation. Drugi mogući uzrok je loša instalacija i nedostatak "
+#~ "ovoga je kada LD_LIBRARY_PATH ne uključuje direktorijum sa bibliotekama "
+#~ "za bonobo-activation. Drugi mogući uzrok je loša instalacija i nedostatak "
 #~ "Nautilus_Shell.server datoteke.\n"
 #~ "\n"
 #~ "Izvršavanje „bonobo-slay“ će ugasiti sve procese za Bonobo aktivaciju, i "
@@ -6822,8 +6982,8 @@ msgstr "Postavi nivo uvećanja tekućeg pregleda"
 #~ "and restarting Nautilus may help fix the problem."
 #~ msgstr ""
 #~ "Trenutno ne možete koristiti Nautilus, usled neočekivane greške Bonoba "
-#~ "pri pokušaju da pronađe objekat ljuske. Gašenje bonobo-activation-server-a "
-#~ "i ponovno pokretanje Nautilusa možda može otkloniti problem."
+#~ "pri pokušaju da pronađe objekat ljuske. Gašenje bonobo-activation-server-"
+#~ "a i ponovno pokretanje Nautilusa možda može otkloniti problem."
 
 #~ msgid ""
 #~ "100 KB\n"
diff --git a/po/sv.po b/po/sv.po
index 316334911..36f2e8091 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  sv.po (nautilus)  #-#-#-#-#
 # Swedish messages for nautilus.
 # Copyright (C) 2000-2008 Free Software Foundation, Inc.
 # Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
@@ -6,8 +7,21 @@
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2000, 2001.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008.
 #
+# #-#-#-#-#  sv.po (eel)  #-#-#-#-#
+# Swedish messages for eel.
+# Copyright (C) 2000-2007 Free Software Foundation, Inc.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007.
+# Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
+# Richard Hult <rhult@hem.passagen.se>, 2000.
+# Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003, 2004, 2005.
+# Martin Norbäck <d95mback@dtek.chalmers.se>, 2000, 2001.
+#
+# $Id: sv.po,v 1.87 2006/07/16 15:00:25 dnylande Exp $
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sv.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-28 22:00+0100\n"
@@ -18,6 +32,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  sv.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-20 01:12+0100\n"
+"PO-Revision-Date: 2007-12-20 01:13+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -131,8 +156,7 @@ msgid "Envy"
 msgstr "Avundsjuka"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28
-#: ../src/nautilus-emblem-sidebar.c:928
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:928
 #: ../src/nautilus-property-browser.c:1826
 msgid "Erase"
 msgstr "Ta bort"
@@ -308,14 +332,50 @@ msgstr "Sparad sökning"
 #. Translators: date_modified - mtime, the last time file contents were changed
 #. date_changed  - ctime, the last time file meta-information changed
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Possible values are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and \"mime_type\"."
-msgstr "En lista med rubriker under en ikon i ikonvyn och på skrivbordet. Det verkliga antalet rubriker beror på zoomnivån. Möjliga värden är: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" och \"mime_type\"."
+msgid ""
+"A list of captions below an icon in the icon view and the desktop. The "
+"actual number of captions shown depends on the zoom level. Possible values "
+"are: \"size\", \"type\", \"date_modified\", \"date_changed\", \"date_accessed"
+"\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
+"\"mime_type\"."
+msgstr ""
+"En lista med rubriker under en ikon i ikonvyn och på skrivbordet. Det "
+"verkliga antalet rubriker beror på zoomnivån. Möjliga värden är: \"size\", "
+"\"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", "
+"\"group\", \"permissions\", \"octal_permissions\" och \"mime_type\"."
 
 #. TRANSLATORS: don't translate the zoom levels between quotes
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 #, no-c-format
-msgid "A string specifying how parts of overlong file names should be replaced by ellipses, depending on the zoom level. Each of the list entries is of the form \"Zoom Level:Integer\". For each specified zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form \"Integer\" without any specified zoom level is also allowed. It defines the maximum number of lines for all other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level \"smallest\". Shorten file names if they exceed four lines for zoom level \"smaller\". Do not shorten file names for other zoom levels. Available zoom levels: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
-msgstr "En sträng som anger hur delar av allt för långa filnamn ska ersättas med ellipser, beroende på zoomnivån. Varje listpost är i formatet \"Zoomnivå:Heltal\". För varje angiven zoomnivå, om angivet heltal är större än 0, kommer filnamnet inte att överstiga angivet antal rader. Om heltalet är 0 eller mindre kommer ingen gräns att föreligga för angiven zoomnivå. En standardpost i formatet \"Heltal\" utan någon angiven zoomnivå tillåts också. Den definierar det maximala antalet rader för alla andra zoomnivåer. Exempel: 0 - visa alltid för långa filnamn; 3 - korta ner filnamn om de överstiger tre rader; smallest:5,smaller:4,0 - korta ner filnamn om de överstiger fem rader för zoomnivån \"smallest\". Korta ner filnamn om de överstiger fyra rader för zoomnivån \"smaller\". Korta inte ner filnamn för andra zoomnivåer. Tillgängliga zoomnivåer: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
+msgid ""
+"A string specifying how parts of overlong file names should be replaced by "
+"ellipses, depending on the zoom level. Each of the list entries is of the "
+"form \"Zoom Level:Integer\". For each specified zoom level, if the given "
+"integer is larger than 0, the file name will not exceed the given number of "
+"lines. If the integer is 0 or smaller, no limit is imposed on the specified "
+"zoom level. A default entry of the form \"Integer\" without any specified "
+"zoom level is also allowed. It defines the maximum number of lines for all "
+"other zoom levels. Examples: 0 - always display overlong file names; 3 - "
+"shorten file names if they exceed three lines; smallest:5,smaller:4,0 - "
+"shorten file names if they exceed five lines for zoom level \"smallest\". "
+"Shorten file names if they exceed four lines for zoom level \"smaller\". Do "
+"not shorten file names for other zoom levels. Available zoom levels: "
+"smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
+"larger (200%), largest (400%)"
+msgstr ""
+"En sträng som anger hur delar av allt för långa filnamn ska ersättas med "
+"ellipser, beroende på zoomnivån. Varje listpost är i formatet \"Zoomnivå:"
+"Heltal\". För varje angiven zoomnivå, om angivet heltal är större än 0, "
+"kommer filnamnet inte att överstiga angivet antal rader. Om heltalet är 0 "
+"eller mindre kommer ingen gräns att föreligga för angiven zoomnivå. En "
+"standardpost i formatet \"Heltal\" utan någon angiven zoomnivå tillåts "
+"också. Den definierar det maximala antalet rader för alla andra zoomnivåer. "
+"Exempel: 0 - visa alltid för långa filnamn; 3 - korta ner filnamn om de "
+"överstiger tre rader; smallest:5,smaller:4,0 - korta ner filnamn om de "
+"överstiger fem rader för zoomnivån \"smallest\". Korta ner filnamn om de "
+"överstiger fyra rader för zoomnivån \"smaller\". Korta inte ner filnamn för "
+"andra zoomnivåer. Tillgängliga zoomnivåer: smallest (33%), smaller (50%), "
+"small (66%), standard (100%), large (150%), larger (200%), largest (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "All columns have same width"
@@ -326,12 +386,22 @@ msgid "Always use the location entry, instead of the pathbar"
 msgstr "Använd alltid platsfältet istället för sökvägsraden"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines."
-msgstr "Ett heltal som anger hur delar av allt för långa filnamn ska ersättas med ellipser på skrivbordet. Om talet är större än 0 kommer filnamnet inte att överstiga det angivna antalet rader. Om talet är 0 eller mindre kommer ingen gräns att föreligga för antalet visade rader."
+msgid ""
+"An integer specifying how parts of overlong file names should be replaced by "
+"ellipses on the desktop. If the number is larger than 0, the file name will "
+"not exceed the given number of lines. If the number is 0 or smaller, no "
+"limit is imposed on the number of displayed lines."
+msgstr ""
+"Ett heltal som anger hur delar av allt för långa filnamn ska ersättas med "
+"ellipser på skrivbordet. Om talet är större än 0 kommer filnamnet inte att "
+"överstiga det angivna antalet rader. Om talet är 0 eller mindre kommer ingen "
+"gräns att föreligga för antalet visade rader."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
-msgid "Color for the default folder background. Only used if background_set is true."
-msgstr "Färg för standardmappbakgrunden. Används endast om background_set är sant."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
+msgstr ""
+"Färg för standardmappbakgrunden. Används endast om background_set är sant."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid "Computer icon visible on desktop"
@@ -342,8 +412,16 @@ msgid "Criteria for search bar searching"
 msgstr "Kriterium för sökradssökning"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
-msgid "Criteria when matching files searched for in the search bar. If set to \"search_by_text\", then Nautilus will Search for files by file name only. If set to \"search_by_text_and_properties\", then Nautilus will search for files by file name and file properties."
-msgstr "Kriterium för när filer som söks efter i sökraden matchas. Om detta är satt till \"search_by_text\" kommer Nautilus att söka efter filer endast efter namnet. Om detta är satt till \"search_by_text_and_properties\" kommer Nautilus att söka efter filer både efter namn och filegenskaper."
+msgid ""
+"Criteria when matching files searched for in the search bar. If set to "
+"\"search_by_text\", then Nautilus will Search for files by file name only. "
+"If set to \"search_by_text_and_properties\", then Nautilus will search for "
+"files by file name and file properties."
+msgstr ""
+"Kriterium för när filer som söks efter i sökraden matchas. Om detta är satt "
+"till \"search_by_text\" kommer Nautilus att söka efter filer endast efter "
+"namnet. Om detta är satt till \"search_by_text_and_properties\" kommer "
+"Nautilus att söka efter filer både efter namn och filegenskaper."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid "Current Nautilus theme (deprecated)"
@@ -447,34 +525,62 @@ msgstr "Namn på papperskorgsskrivbordsikonen"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "Aktiverar det klassiska Nautilus-beteendet där alla fönster är bläddrare"
+msgstr ""
+"Aktiverar det klassiska Nautilus-beteendet där alla fönster är bläddrare"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid "Filename for the default folder background. Only used if background_set is true."
-msgstr "Filnamn för standardmappbakgrunden. Används endast om background_set är sant."
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"Filnamn för standardmappbakgrunden. Används endast om background_set är sant."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
-msgid "Filename for the default side pane background. Only used if side_pane_background_set is true."
-msgstr "Filnamn för standardsidopanelsbakgrunden. Används endast om side_pane_background_set är sant."
+msgid ""
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
+msgstr ""
+"Filnamn för standardsidopanelsbakgrunden. Används endast om "
+"side_pane_background_set är sant."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
-msgid "Folders over this size will be truncated to around this size. The purpose of this is to avoid unintentionally blowing the heap and killing Nautilus on massive folders. A negative value denotes no limit. The limit is approximate due to the reading of folders chunk-wise."
-msgstr "Mappar över denna storlek kommer att trunkeras till ungefärligen denna storlek. Avsikten med detta är att undvika att oavsiktligen spåra ur och använda för mycket minne och döda Nautilus med mycket stora mappar. Ett negativt värde innebär att ingen gräns finns. Gränsen är ungefärlig på grund av den styckvisa inläsningen av mappar."
+msgid ""
+"Folders over this size will be truncated to around this size. The purpose of "
+"this is to avoid unintentionally blowing the heap and killing Nautilus on "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Mappar över denna storlek kommer att trunkeras till ungefärligen denna "
+"storlek. Avsikten med detta är att undvika att oavsiktligen spåra ur och "
+"använda för mycket minne och döda Nautilus med mycket stora mappar. Ett "
+"negativt värde innebär att ingen gräns finns. Gränsen är ungefärlig på grund "
+"av den styckvisa inläsningen av mappar."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid "Home icon visible on desktop"
 msgstr "Hemikon synlig på skrivbordet"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
-msgid "If set to \"after_current_tab\", then new tabs are inserted after the current tab. If set to \"end\", then new tabs are appended to the end of the tab list."
-msgstr "Om inställd till \"after_current_tab\" kommer nya flikar att infogas efter den aktuella fliken. Om inställd till \"end\" kommer nya flikar att läggas till på slutet av fliklistan."
+msgid ""
+"If set to \"after_current_tab\", then new tabs are inserted after the "
+"current tab. If set to \"end\", then new tabs are appended to the end of the "
+"tab list."
+msgstr ""
+"Om inställd till \"after_current_tab\" kommer nya flikar att infogas efter "
+"den aktuella fliken. Om inställd till \"end\" kommer nya flikar att läggas "
+"till på slutet av fliklistan."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, Nautilus will only show folders in the tree side pane. Otherwise it will show both folders and files."
-msgstr "Om detta är sant kommer Nautilus endast att visa mappar i trädsidopanelen. Annars kommer Nautilus att visa både mappar och filer."
+msgid ""
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
+msgstr ""
+"Om detta är sant kommer Nautilus endast att visa mappar i trädsidopanelen. "
+"Annars kommer Nautilus att visa både mappar och filer."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "Om detta är sant kommer nyöppnade fönster att ha adressraden synlig."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
@@ -487,127 +593,260 @@ msgstr "Om detta är sant kommer nyöppnade fönster att ha statusraden synlig."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr "Om detta är sant kommer nyöppnade fönster att ha verktygsrader synliga."
+msgstr ""
+"Om detta är sant kommer nyöppnade fönster att ha verktygsrader synliga."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar."
-msgstr "Om detta är sant kommer Nautilus-bläddrarfönster alltid att ha ett textinmatningsfält i platsverktygsraden, istället för sökvägsraden."
+msgid ""
+"If set to true, then Nautilus browser windows will always use a textual "
+"input entry for the location toolbar, instead of the pathbar."
+msgstr ""
+"Om detta är sant kommer Nautilus-bläddrarfönster alltid att ha ett "
+"textinmatningsfält i platsverktygsraden, istället för sökvägsraden."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid "If set to true, then Nautilus lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options."
-msgstr "Om detta är sant kommer Nautilus att låta dig redigera och visa filrättigheter på ett mer unix-liknande sätt genom att komma åt mer esoteriska alternativ."
+msgid ""
+"If set to true, then Nautilus lets you edit and display file permissions in "
+"a more unix-like way, accessing some more esoteric options."
+msgstr ""
+"Om detta är sant kommer Nautilus att låta dig redigera och visa "
+"filrättigheter på ett mer unix-liknande sätt genom att komma åt mer "
+"esoteriska alternativ."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views."
-msgstr "Om detta är sant visar Nautilus mappar innan filer i ikon- och listvyerna."
+msgid ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr ""
+"Om detta är sant visar Nautilus mappar innan filer i ikon- och listvyerna."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash."
-msgstr "Om detta är sant kommer Nautilus att fråga efter bekräftelse när du försöker ta bort filer eller tömma papperskorgen."
+msgid ""
+"If set to true, then Nautilus will ask for confirmation when you attempt to "
+"delete files, or empty the Trash."
+msgstr ""
+"Om detta är sant kommer Nautilus att fråga efter bekräftelse när du försöker "
+"ta bort filer eller tömma papperskorgen."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
-msgid "If set to true, then Nautilus will automatically mount media such as user-visible hard disks and removable media on start-up and media insertion."
-msgstr "Om detta är sant kommer Nautilus att automatiskt montera media såsom användarsynliga hårddiskar och flyttbara media vid uppstart och vid inmatning av media."
+msgid ""
+"If set to true, then Nautilus will automatically mount media such as user-"
+"visible hard disks and removable media on start-up and media insertion."
+msgstr ""
+"Om detta är sant kommer Nautilus att automatiskt montera media såsom "
+"användarsynliga hårddiskar och flyttbara media vid uppstart och vid "
+"inmatning av media."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "If set to true, then Nautilus will automatically open a folder when media is automounted. This only applies to media where no known x-content/* type was detected; for media where a known x-content type is detected, the user configurable action will be taken instead."
-msgstr "Om detta är sant kommer Nautilus att automatiskt öppna en mapp när media automatiskt monteras. Detta gäller endast för media där ingen känd x-content/* identifierades; för media där en känd x-content-typ identifierades kommer den användarkonfigurerade åtgärden att genomföras istället."
+msgid ""
+"If set to true, then Nautilus will automatically open a folder when media is "
+"automounted. This only applies to media where no known x-content/* type was "
+"detected; for media where a known x-content type is detected, the user "
+"configurable action will be taken instead."
+msgstr ""
+"Om detta är sant kommer Nautilus att automatiskt öppna en mapp när media "
+"automatiskt monteras. Detta gäller endast för media där ingen känd x-content/"
+"* identifierades; för media där en känd x-content-typ identifierades kommer "
+"den användarkonfigurerade åtgärden att genomföras istället."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "Om detta är sant kommer Nautilus att rita ikonerna på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
-msgstr "Om detta är sant kommer Nautilus att ha en funktion som låter dig ta bort en fil permanent och på stället, utan att flytta den till papperskorgen. Denna funktion kan vara farlig, så var försiktig."
+msgid ""
+"If set to true, then Nautilus will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"Om detta är sant kommer Nautilus att ha en funktion som låter dig ta bort en "
+"fil permanent och på stället, utan att flytta den till papperskorgen. Denna "
+"funktion kan vara farlig, så var försiktig."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-msgid "If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted."
-msgstr "Om detta är sant kommer Nautilus aldrig att fråga eller köra/starta program automatiskt när media matas in."
+msgid ""
+"If set to true, then Nautilus will never prompt nor autorun/autostart "
+"programs when a medium is inserted."
+msgstr ""
+"Om detta är sant kommer Nautilus aldrig att fråga eller köra/starta program "
+"automatiskt när media matas in."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "If set to true, then Nautilus will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "Om detta är sant kommer Nautilus att använda användarens hemmapp som skrivbord. Om det är falskt kommer det att använda ~/Desktop som skrivbord."
+msgid ""
+"If set to true, then Nautilus will use the user's home folder as the "
+"desktop. If it is false, then it will use ~/Desktop as the desktop."
+msgstr ""
+"Om detta är sant kommer Nautilus att använda användarens hemmapp som "
+"skrivbord. Om det är falskt kommer det att använda ~/Desktop som skrivbord."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "If set to true, then all Nautilus windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior."
-msgstr "Om detta är sant kommer alla Nautilus-fönster att vara bläddrarfönster. Detta är hur Nautilus brukade bete sig innan version 2.6, och en del användare föredrar detta beteende."
+msgid ""
+"If set to true, then all Nautilus windows will be browser windows. This is "
+"how Nautilus used to behave before version 2.6, and some people prefer this "
+"behavior."
+msgstr ""
+"Om detta är sant kommer alla Nautilus-fönster att vara bläddrarfönster. "
+"Detta är hur Nautilus brukade bete sig innan version 2.6, och en del "
+"användare föredrar detta beteende."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
-msgid "If set to true, then backup files such as those created by Emacs are displayed. Currently, only files ending in a tilde (~) are considered backup files."
-msgstr "Om detta är sant kommer säkerhetskopior som exempelvis de som skapas av Emacs att visas. För tillfället betraktas endast de filer som slutar med ett tildetecken (~) som säkerhetskopior."
+msgid ""
+"If set to true, then backup files such as those created by Emacs are "
+"displayed. Currently, only files ending in a tilde (~) are considered backup "
+"files."
+msgstr ""
+"Om detta är sant kommer säkerhetskopior som exempelvis de som skapas av "
+"Emacs att visas. För tillfället betraktas endast de filer som slutar med ett "
+"tildetecken (~) som säkerhetskopior."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
-msgid "If set to true, then hidden files are shown in the file manager. Hidden files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "Om detta är sant kommer dolda filer att visas i filhanteraren. Dolda filer är antingen punktfiler eller är listade i mappens .hidden-fil."
+msgid ""
+"If set to true, then hidden files are shown in the file manager. Hidden "
+"files are either dotfiles or are listed in the folder's .hidden file."
+msgstr ""
+"Om detta är sant kommer dolda filer att visas i filhanteraren. Dolda filer "
+"är antingen punktfiler eller är listade i mappens .hidden-fil."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-msgid "If set to true, then multiple views can be opened in one browser window, each in a separate tab."
-msgstr "Om inställd till sant kan multipla vyer öppnas i ett bläddrarfönster, var och en i separata flikar."
+msgid ""
+"If set to true, then multiple views can be opened in one browser window, "
+"each in a separate tab."
+msgstr ""
+"Om inställd till sant kan multipla vyer öppnas i ett bläddrarfönster, var "
+"och en i separata flikar."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop."
-msgstr "Om detta är sant kommer en ikon som länkar till nätverksservrar att placeras på skrivbordet."
+msgid ""
+"If this is set to true, an icon linking to the Network Servers view will be "
+"put on the desktop."
+msgstr ""
+"Om detta är sant kommer en ikon som länkar till nätverksservrar att placeras "
+"på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
-msgid "If this is set to true, an icon linking to the computer location will be put on the desktop."
-msgstr "Om detta är sant kommer en ikon som länkar till datorns plats att placeras på skrivbordet."
+msgid ""
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
+msgstr ""
+"Om detta är sant kommer en ikon som länkar till datorns plats att placeras "
+"på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop."
-msgstr "Om detta är sant kommer en ikon som länkar till hemmappen att placeras på skrivbordet."
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
+"the desktop."
+msgstr ""
+"Om detta är sant kommer en ikon som länkar till hemmappen att placeras på "
+"skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-msgid "If this is set to true, an icon linking to the trash will be put on the desktop."
-msgstr "Om detta är sant kommer en ikon som länkar till papperskorgen att placeras på skrivbordet."
+msgid ""
+"If this is set to true, an icon linking to the trash will be put on the "
+"desktop."
+msgstr ""
+"Om detta är sant kommer en ikon som länkar till papperskorgen att placeras "
+"på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop."
-msgstr "Om detta är sant kommer ikoner som länkar till de monterade volymerna att placeras på skrivbordet."
+msgid ""
+"If this is set to true, icons linking to mounted volumes will be put on the "
+"desktop."
+msgstr ""
+"Om detta är sant kommer ikoner som länkar till de monterade volymerna att "
+"placeras på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-msgid "If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately."
-msgstr "Om denna inställning är inställd kommer alla kolumner i kompakt vy att få samma bredd. Om inte kommer bredden för varje kolumn att bestämmas separat."
+msgid ""
+"If this preference is set, all columns in the compact view have the same "
+"width. Otherwise, the width of each column is determined seperately."
+msgstr ""
+"Om denna inställning är inställd kommer alla kolumner i kompakt vy att få "
+"samma bredd. Om inte kommer bredden för varje kolumn att bestämmas separat."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"."
-msgstr "Om detta är sant kommer filer i nya fönster att sorteras i omvänd ordning, dvs om de sorteras efter namn kommer de att istället för att sorteras från \"a\" till \"ö\" att sorteras från \"ö\" till \"a\"."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"."
+msgstr ""
+"Om detta är sant kommer filer i nya fönster att sorteras i omvänd ordning, "
+"dvs om de sorteras efter namn kommer de att istället för att sorteras från "
+"\"a\" till \"ö\" att sorteras från \"ö\" till \"a\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
-msgid "If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally."
-msgstr "Om detta är sant kommer filer i nya fönster att sorteras i omvänd ordning, dvs om de sorteras efter namn kommer de att istället för att sorteras från \"a\" till \"ö\" att sorteras från \"ö\" till \"a\", och om de istället sorteras efter storlek kommer de att sorteras efter ökande storlek istället för efter minskande storlek."
+msgid ""
+"If true, files in new windows will be sorted in reverse order. ie, if sorted "
+"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
+"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"incrementally they will be sorted decrementally."
+msgstr ""
+"Om detta är sant kommer filer i nya fönster att sorteras i omvänd ordning, "
+"dvs om de sorteras efter namn kommer de att istället för att sorteras från "
+"\"a\" till \"ö\" att sorteras från \"ö\" till \"a\", och om de istället "
+"sorteras efter storlek kommer de att sorteras efter ökande storlek istället "
+"för efter minskande storlek."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "If true, icons will be laid out tighter by default in new windows."
-msgstr "Om detta är sant kommer ikoner att placeras tätare som standard i nya fönster."
+msgstr ""
+"Om detta är sant kommer ikoner att placeras tätare som standard i nya "
+"fönster."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
-msgid "If true, labels will be placed beside icons rather than underneath them."
-msgstr "Om detta är sant kommer etiketter att placeras bredvid ikoner istället för under dem."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
+msgstr ""
+"Om detta är sant kommer etiketter att placeras bredvid ikoner istället för "
+"under dem."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid "If true, new windows will use manual layout by default."
-msgstr "Om detta är sant kommer nya fönster att använda manuell layout som standard."
+msgstr ""
+"Om detta är sant kommer nya fönster att använda manuell layout som standard."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory."
-msgstr "Bilder över denna storlek (i byte) kommer det inte att skapas miniatyrbilder för. Ändamålet med denna inställning är att undvika att skapa miniatyrbilder för stora bilder som tar lång tid att läsa in eller använder mycket minne."
+msgid ""
+"Images over this size (in bytes) won't be thumbnailed. The purpose of this "
+"setting is to avoid thumbnailing large images that may take a long time to "
+"load or use lots of memory."
+msgstr ""
+"Bilder över denna storlek (i byte) kommer det inte att skapas miniatyrbilder "
+"för. Ändamålet med denna inställning är att undvika att skapa miniatyrbilder "
+"för stora bilder som tar lång tid att läsa in eller använder mycket minne."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "List of possible captions on icons"
 msgstr "Lista med möjliga rubriker på ikoner"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
-msgid "List of x-content/* types for which the user have chosen \"Do Nothing\" in the preference capplet. No prompt will be shown nor will any matching application be started on insertion of media matching these types."
-msgstr "Lista över x-content/* för vilka användaren har valt \"Gör ingenting\" i inställningarna. Ingen fråga kommer att visas och inga matchande program kommer att startas vid inmatning av media som matchar dessa typer."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Do Nothing\" in "
+"the preference capplet. No prompt will be shown nor will any matching "
+"application be started on insertion of media matching these types."
+msgstr ""
+"Lista över x-content/* för vilka användaren har valt \"Gör ingenting\" i "
+"inställningarna. Ingen fråga kommer att visas och inga matchande program "
+"kommer att startas vid inmatning av media som matchar dessa typer."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
-msgid "List of x-content/* types for which the user have chosen \"Open Folder\" in the preferences capplet. A folder window will be opened on insertion of media matching these types."
-msgstr "Lista över x-content/* för vilka användaren har valt \"Öppna mapp\" i inställningarna. Ett mappfönster kommer att öppnas vid inmatning av media som matchar dessa typer."
+msgid ""
+"List of x-content/* types for which the user have chosen \"Open Folder\" in "
+"the preferences capplet. A folder window will be opened on insertion of "
+"media matching these types."
+msgstr ""
+"Lista över x-content/* för vilka användaren har valt \"Öppna mapp\" i "
+"inställningarna. Ett mappfönster kommer att öppnas vid inmatning av media "
+"som matchar dessa typer."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
-msgid "List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types."
-msgstr "Lista över x-content/* för vilka användaren har valt att starta ett program i inställningarna. Det föredragna programmet för den angivna typen kommer att startas vid inmatning av media som matchar dessa typer."
+msgid ""
+"List of x-content/* types for which the user have chosen to start an "
+"application in the preference capplet. The preferred application for the "
+"given type will be started on insertion on media matching these types."
+msgstr ""
+"Lista över x-content/* för vilka användaren har valt att starta ett program "
+"i inställningarna. Det föredragna programmet för den angivna typen kommer "
+"att startas vid inmatning av media som matchar dessa typer."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -618,7 +857,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "Lista över x-content/* inställda till \"Öppna mapp\""
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "Lista över x-content/* där det föredragna programmet ska startas"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
@@ -630,8 +870,12 @@ msgid "Maximum image size for thumbnailing"
 msgstr "Maximal bildstorlek för skapande av miniatyrbilder"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
-msgid "Name of the Nautilus theme to use. This has been deprecated as of Nautilus 2.2. Please use the icon theme instead."
-msgstr "Namnet på Nautilus-temat att använda. Denna inställningar har föråldrats sedan Nautilus 2.2. Använd ikontemat istället."
+msgid ""
+"Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
+"2.2. Please use the icon theme instead."
+msgstr ""
+"Namnet på Nautilus-temat att använda. Denna inställningar har föråldrats "
+"sedan Nautilus 2.2. Använd ikontemat istället."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
 msgid "Nautilus handles drawing the desktop"
@@ -658,8 +902,12 @@ msgid "Only show folders in the tree side pane"
 msgstr "Visa endast mappar i trädsidopanelen"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click."
-msgstr "Möjliga värden är \"single\" för att aktivera filer med enkelklick eller \"double\" för att aktivera dem med dubbelklicka."
+msgid ""
+"Possible values are \"single\" to launch files on a single click, or \"double"
+"\" to launch them on a double click."
+msgstr ""
+"Möjliga värden är \"single\" för att aktivera filer med enkelklick eller "
+"\"double\" för att aktivera dem med dubbelklicka."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Put labels beside icons"
@@ -709,20 +957,61 @@ msgid "Side pane view"
 msgstr "Sidopanelsvy"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
-msgid "Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to \"always\" then always plays the sound, even if the file is on a remote server. If set to \"local_only\" then only plays previews on local file systems. If set to \"never\" then it never previews sound."
-msgstr "Hastighetskompromiss för när en ljudfil ska förhandsvisas då muspekaren rör sig över en filikon. Om detta är satt till \"always\" kommer ljudet alltid att spelas, även om filen är på en fjärrserver. Om detta är satt till \"local_only\" kommer endast förhandsvisningar att spelas på lokala filsystem. Om detta är satt till \"never\" kommer förhandsvisningar aldrig att spelas."
+msgid ""
+"Speed tradeoff for when to preview a sound file when mousing over a files "
+"icon. If set to \"always\" then always plays the sound, even if the file is "
+"on a remote server. If set to \"local_only\" then only plays previews on "
+"local file systems. If set to \"never\" then it never previews sound."
+msgstr ""
+"Hastighetskompromiss för när en ljudfil ska förhandsvisas då muspekaren rör "
+"sig över en filikon. Om detta är satt till \"always\" kommer ljudet alltid "
+"att spelas, även om filen är på en fjärrserver. Om detta är satt till "
+"\"local_only\" kommer endast förhandsvisningar att spelas på lokala "
+"filsystem. Om detta är satt till \"never\" kommer förhandsvisningar aldrig "
+"att spelas."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
-msgid "Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to \"always\" then always show previews, even if the folder is on a remote server. If set to \"local_only\" then only show previews for local file systems. If set to \"never\" then never bother to read preview data."
-msgstr "Hastighetskompromiss för när en förhandsvisning av innehållet i en textfil ska visas i filens ikon. Om detta är satt till \"always\" kommer förhandsvisningar alltid att visas, även om mappen är på en fjärrserver. Om detta är satt till \"local_only\" kommer endast förhandsvisningar att visas för lokala filsystem. Om detta är satt till \"never\" kommer förhandsvisningsdata aldrig att läsas in."
+msgid ""
+"Speed tradeoff for when to show a preview of text file contents in the "
+"file's icon. If set to \"always\" then always show previews, even if the "
+"folder is on a remote server. If set to \"local_only\" then only show "
+"previews for local file systems. If set to \"never\" then never bother to "
+"read preview data."
+msgstr ""
+"Hastighetskompromiss för när en förhandsvisning av innehållet i en textfil "
+"ska visas i filens ikon. Om detta är satt till \"always\" kommer "
+"förhandsvisningar alltid att visas, även om mappen är på en fjärrserver. Om "
+"detta är satt till \"local_only\" kommer endast förhandsvisningar att visas "
+"för lokala filsystem. Om detta är satt till \"never\" kommer "
+"förhandsvisningsdata aldrig att läsas in."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
-msgid "Speed tradeoff for when to show an image file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local_only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail images, just use a generic icon."
-msgstr "Hastighetskompromiss för när en bildfil ska visas som en miniatyrbild. Om detta är satt till \"always\" kommer en miniatyrbild alltid att skapas, även om mappen är på en fjärrserver. Om detta är satt till \"local_only\" kommer endast miniatyrbilder att visas för lokala filsystem. Om detta är satt till \"never\" kommer miniatyrbilder aldrig att skapas utan endast en allmän ikon att användas."
+msgid ""
+"Speed tradeoff for when to show an image file as a thumbnail. If set to "
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"If set to \"local_only\" then only show thumbnails for local file systems. "
+"If set to \"never\" then never bother to thumbnail images, just use a "
+"generic icon."
+msgstr ""
+"Hastighetskompromiss för när en bildfil ska visas som en miniatyrbild. Om "
+"detta är satt till \"always\" kommer en miniatyrbild alltid att skapas, även "
+"om mappen är på en fjärrserver. Om detta är satt till \"local_only\" kommer "
+"endast miniatyrbilder att visas för lokala filsystem. Om detta är satt till "
+"\"never\" kommer miniatyrbilder aldrig att skapas utan endast en allmän ikon "
+"att användas."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local_only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts."
-msgstr "Hastighetskompromiss för när antalet objekt ska visas i en mapp. Om detta är satt till \"always\" kommer objektantal alltid att visas, även om mappen är på en fjärrserver. Om detta är satt till \"local_only\" kommer endast antal att visas för lokala filsystem. Om detta är satt till \"never\" kommer objektantal aldrig att beräknas."
+msgid ""
+"Speed tradeoff for when to show the number of items in a folder. If set to "
+"\"always\" then always show item counts, even if the folder is on a remote "
+"server. If set to \"local_only\" then only show counts for local file "
+"systems. If set to \"never\" then never bother to compute item counts."
+msgstr ""
+"Hastighetskompromiss för när antalet objekt ska visas i en mapp. Om detta är "
+"satt till \"always\" kommer objektantal alltid att visas, även om mappen är "
+"på en fjärrserver. Om detta är satt till \"local_only\" kommer endast antal "
+"att visas för lokala filsystem. Om detta är satt till \"never\" kommer "
+"objektantal aldrig att beräknas."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:111
 msgid "Text Ellipsis Limit"
@@ -733,12 +1022,20 @@ msgid "The default size of an icon for a thumbnail in the icon view."
 msgstr "Standardstorlek för en ikon för en miniatyrbild i ikonvyn."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-msgstr "Standardsorteringsordningen för objekt i ikonvyn. Möjliga värden är \"name\", \"size\", \"type\", \"modification_date\" och \"emblems\"."
+msgid ""
+"The default sort-order for items in the icon view. Possible values are \"name"
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
+msgstr ""
+"Standardsorteringsordningen för objekt i ikonvyn. Möjliga värden är \"name"
+"\", \"size\", \"type\", \"modification_date\" och \"emblems\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
-msgid "The default sort-order for the items in the list view. Possible values are \"name\", \"size\", \"type\", and \"modification_date\"."
-msgstr "Standardsorteringsordningen för objekten i listvyn. Möjliga värden är \"name\", \"size\", \"type\" och \"modification_date\"."
+msgid ""
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
+msgstr ""
+"Standardsorteringsordningen för objekten i listvyn. Möjliga värden är \"name"
+"\", \"size\", \"type\" och \"modification_date\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:115
 msgid "The default width of the side pane in new windows."
@@ -749,28 +1046,47 @@ msgid "The font description used for the icons on the desktop."
 msgstr "Typsnittsbeskrivningen som används för ikonerna på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
-msgid "The format of file dates. Possible values are \"locale\", \"iso\", and \"informal\"."
-msgstr "Formatet på fildatum. Möjliga värden är \"locale\", \"iso\" och \"informal\"."
+msgid ""
+"The format of file dates. Possible values are \"locale\", \"iso\", and "
+"\"informal\"."
+msgstr ""
+"Formatet på fildatum. Möjliga värden är \"locale\", \"iso\" och \"informal\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
 msgid "The side pane view to show in newly opened windows."
 msgstr "Sidopanelsvyn att visa i nyöppnade fönster."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:119
-msgid "This name can be set if you want a custom name for the computer icon on the desktop."
-msgstr "Detta namn kan ställas in om du vill ha ett anpassat namn på datorikonen på skrivbordet."
+msgid ""
+"This name can be set if you want a custom name for the computer icon on the "
+"desktop."
+msgstr ""
+"Detta namn kan ställas in om du vill ha ett anpassat namn på datorikonen på "
+"skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:120
-msgid "This name can be set if you want a custom name for the home icon on the desktop."
-msgstr "Detta namn kan ställas in om du vill ha ett anpassat namn på hemikonen på skrivbordet."
+msgid ""
+"This name can be set if you want a custom name for the home icon on the "
+"desktop."
+msgstr ""
+"Detta namn kan ställas in om du vill ha ett anpassat namn på hemikonen på "
+"skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:121
-msgid "This name can be set if you want a custom name for the network servers icon on the desktop."
-msgstr "Detta namn kan ställas in om du vill ha ett anpassat namn på ikonen för nätverksservrar på skrivbordet."
+msgid ""
+"This name can be set if you want a custom name for the network servers icon "
+"on the desktop."
+msgstr ""
+"Detta namn kan ställas in om du vill ha ett anpassat namn på ikonen för "
+"nätverksservrar på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
-msgid "This name can be set if you want a custom name for the trash icon on the desktop."
-msgstr "Detta namn kan ställas in om du vill ha ett anpassat namn på papperskorgsikonen på skrivbordet."
+msgid ""
+"This name can be set if you want a custom name for the trash icon on the "
+"desktop."
+msgstr ""
+"Detta namn kan ställas in om du vill ha ett anpassat namn på "
+"papperskorgsikonen på skrivbordet."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:123
 msgid "Trash icon visible on desktop"
@@ -793,12 +1109,26 @@ msgid "What to do with executable text files when activated"
 msgstr "Vad som ska göras med körbara textfiler när de aktiveras"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files."
-msgstr "Vad som ska göras med exekverbara textfiler när de aktiveras (via enkel- eller dubbelklick). Möjliga värden är \"launch\" för att starta dem som program, \"ask\" för att fråga vad som ska göras via ett dialogfönster och \"display\" för att visa dem som textfiler."
+msgid ""
+"What to do with executable text files when they are activated (single or "
+"double clicked). Possible values are \"launch\" to launch them as programs, "
+"\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
+"text files."
+msgstr ""
+"Vad som ska göras med exekverbara textfiler när de aktiveras (via enkel- "
+"eller dubbelklick). Möjliga värden är \"launch\" för att starta dem som "
+"program, \"ask\" för att fråga vad som ska göras via ett dialogfönster och "
+"\"display\" för att visa dem som textfiler."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list_view\", \"icon_view\" and \"compact_view\"."
-msgstr "När en mapp besöks används denna visare såvida du inte har valt en annan vy för denna mapp. Möjliga värden är \"list_view\", \"icon_view\" och \"compact_view\"."
+msgid ""
+"When a folder is visited this viewer is used unless you have selected "
+"another view for that particular folder. Possible values are \"list_view\", "
+"\"icon_view\" and \"compact_view\"."
+msgstr ""
+"När en mapp besöks används denna visare såvida du inte har valt en annan vy "
+"för denna mapp. Möjliga värden är \"list_view\", \"icon_view\" och "
+"\"compact_view\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:130
 msgid "When to show number of items in a folder"
@@ -826,7 +1156,9 @@ msgstr "Huruvida en standardsidopanelsbakgrund har ställts in."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
-msgstr "Huruvida det ska frågas efter bekräftelse när filer tas bort eller papperskorgen töms"
+msgstr ""
+"Huruvida det ska frågas efter bekräftelse när filer tas bort eller "
+"papperskorgen töms"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:137
 msgid "Whether to automatically mount media"
@@ -834,7 +1166,8 @@ msgstr "Huruvida mediet automatiskt ska monteras"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:138
 msgid "Whether to automatically open a folder for automounted media"
-msgstr "Huruvida en mapp automatiskt ska öppnas för automatiskt monterade media"
+msgstr ""
+"Huruvida en mapp automatiskt ska öppnas för automatiskt monterade media"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:139
 msgid "Whether to enable immediate deletion"
@@ -940,8 +1273,12 @@ msgid "You have just inserted a digital audio player."
 msgstr "Du har precis anslutet en digital ljudspelare."
 
 #: ../libnautilus-private/nautilus-autorun.c:918
-msgid "You have just inserted a medium with software intended to be automatically started."
-msgstr "Du har precis matat in ett media med programvara som är tänkt att startas automatiskt."
+msgid ""
+"You have just inserted a medium with software intended to be automatically "
+"started."
+msgstr ""
+"Du har precis matat in ett media med programvara som är tänkt att startas "
+"automatiskt."
 
 #. fallback to generic greeting
 #: ../libnautilus-private/nautilus-autorun.c:921
@@ -954,8 +1291,12 @@ msgstr "Välj vilket program som ska startas."
 
 #: ../libnautilus-private/nautilus-autorun.c:932
 #, c-format
-msgid "Select how to open \"%s\" and whether to perform this action in the future for other media of type \"%s\"."
-msgstr "Välj hur \"%s\" ska öppnas och huruvida denna åtgärd ska genomföras i framtiden för andra media av typen \"%s\"."
+msgid ""
+"Select how to open \"%s\" and whether to perform this action in the future "
+"for other media of type \"%s\"."
+msgstr ""
+"Välj hur \"%s\" ska öppnas och huruvida denna åtgärd ska genomföras i "
+"framtiden för andra media av typen \"%s\"."
 
 #: ../libnautilus-private/nautilus-autorun.c:954
 msgid "_Always perform this action"
@@ -1129,12 +1470,20 @@ msgid "You cannot move the volume \"%s\" to the trash."
 msgstr "Du kan inte flytta volymen \"%s\" till papperskorgen."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:111
-msgid "If you want to eject the volume, please use \"Eject\" in the popup menu of the volume."
-msgstr "Om du vill mata ut volymen bör du använda \"Mata ut\" i högerklicksmenyn för volymen."
+msgid ""
+"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"the volume."
+msgstr ""
+"Om du vill mata ut volymen bör du använda \"Mata ut\" i högerklicksmenyn för "
+"volymen."
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
-msgid "If you want to unmount the volume, please use \"Unmount Volume\" in the popup menu of the volume."
-msgstr "Om du vill avmontera volymen bör du använda \"Avmontera volym\" i högerklicksmenyn för volymen."
+msgid ""
+"If you want to unmount the volume, please use \"Unmount Volume\" in the "
+"popup menu of the volume."
+msgstr ""
+"Om du vill avmontera volymen bör du använda \"Avmontera volym\" i "
+"högerklicksmenyn för volymen."
 
 #: ../libnautilus-private/nautilus-dnd.c:767
 msgid "_Move Here"
@@ -1178,8 +1527,10 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Tyvärr, du måste ange ett icke-tomt nyckelord för det nya emblemet."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "Tyvärr, emblemnyckelord kan bara innehålla bokstäver, blanksteg och siffror."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"Tyvärr, emblemnyckelord kan bara innehålla bokstäver, blanksteg och siffror."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1408,10 +1759,18 @@ msgstr "Är du säker att du vill permanent ta bort \"%B\" från papperskorgen?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1214
 #, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item from the trash?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items from the trash?"
-msgstr[0] "Är du säker på att du vill permanent ta bort det markerade objektet från papperskorgen?"
-msgstr[1] "Är du säker på att du vill permanent ta bort de %'d markerade objekten i papperskorgen?"
+msgid ""
+"Are you sure you want to permanently delete the %'d selected item from the "
+"trash?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items from the "
+"trash?"
+msgstr[0] ""
+"Är du säker på att du vill permanent ta bort det markerade objektet från "
+"papperskorgen?"
+msgstr[1] ""
+"Är du säker på att du vill permanent ta bort de %'d markerade objekten i "
+"papperskorgen?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1224
 #: ../libnautilus-private/nautilus-file-operations.c:1292
@@ -1423,14 +1782,17 @@ msgid "Empty all of the items from the trash?"
 msgstr "Tömma alla objekt i papperskorgen?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1248
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "Om du väljer att tömma papperskorgen kommer alla objekt i den att tas bort permanent. Observera att du även kan ta bort dem separat."
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Om du väljer att tömma papperskorgen kommer alla objekt i den att tas bort "
+"permanent. Observera att du även kan ta bort dem separat."
 
 #. Empty Trash menu item
 #: ../libnautilus-private/nautilus-file-operations.c:1253
 #: ../libnautilus-private/nautilus-file-operations.c:2079
-#: ../src/nautilus-places-sidebar.c:2033
-#: ../src/nautilus-trash-bar.c:125
+#: ../src/nautilus-places-sidebar.c:2033 ../src/nautilus-trash-bar.c:125
 msgid "Empty _Trash"
 msgstr "Töm _papperskorgen"
 
@@ -1441,9 +1803,12 @@ msgstr "Är du säker att du vill permanent ta bort \"%B\"?"
 #: ../libnautilus-private/nautilus-file-operations.c:1283
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Är du säker på att du vill permanent ta bort det markerade objektet?"
-msgstr[1] "Är du säker att du vill permanent ta bort de %'d markerade objekten?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
+msgstr[0] ""
+"Är du säker på att du vill permanent ta bort det markerade objektet?"
+msgstr[1] ""
+"Är du säker att du vill permanent ta bort de %'d markerade objekten?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1326
 msgid "Deleting files"
@@ -1472,14 +1837,21 @@ msgid "Error while deleting."
 msgstr "Fel vid borttagning."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1407
-msgid "Files in the folder \"%B\" cannot be deleted because you do not have permissions to see them."
-msgstr "Filer i mappen \"%B\" kan inte tas bort eftersom du inte har de nödvändiga rättigheterna för att se dem."
+msgid ""
+"Files in the folder \"%B\" cannot be deleted because you do not have "
+"permissions to see them."
+msgstr ""
+"Filer i mappen \"%B\" kan inte tas bort eftersom du inte har de nödvändiga "
+"rättigheterna för att se dem."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1410
 #: ../libnautilus-private/nautilus-file-operations.c:2365
 #: ../libnautilus-private/nautilus-file-operations.c:3323
-msgid "There was an error getting information about the files in the folder \"%B\"."
-msgstr "Det inträffade ett fel vid hämtning av information om filerna i mappen \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
+msgstr ""
+"Det inträffade ett fel vid hämtning av information om filerna i mappen \"%B"
+"\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1419
 #: ../libnautilus-private/nautilus-file-operations.c:3332
@@ -1487,8 +1859,12 @@ msgid "_Skip files"
 msgstr "_Hoppa över filer"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1440
-msgid "The folder \"%B\" cannot be deleted because you do not have permissions to read it."
-msgstr "Mappen \"%B\" kan inte tas bort eftersom du inte har de nödvändiga rättigheterna för att läsa den."
+msgid ""
+"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"read it."
+msgstr ""
+"Mappen \"%B\" kan inte tas bort eftersom du inte har de nödvändiga "
+"rättigheterna för att läsa den."
 
 #: ../libnautilus-private/nautilus-file-operations.c:1443
 #: ../libnautilus-private/nautilus-file-operations.c:2404
@@ -1517,7 +1893,8 @@ msgstr[1] "%'d filer kvar att kasta"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1692
 msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "Kan inte flytta filen till papperskorgen. Vill du ta bort den omedelbart?"
+msgstr ""
+"Kan inte flytta filen till papperskorgen. Vill du ta bort den omedelbart?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1693
 msgid "The file \"%B\" cannot be moved to the trash."
@@ -1536,8 +1913,12 @@ msgid "Do you want to empty the trash before you unmount?"
 msgstr "Vill du tömma papperskorgen innan du avmonterar?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2071
-msgid "In order to regain the free space on this volume the trash must be emptied. All trashed items on the volume will be permanently lost."
-msgstr "För att återfå det lediga utrymmet på den här volymen måste papperskorgen tömmas. Alla kastade objekt på volymen kommer att permanent gå förlorade."
+msgid ""
+"In order to regain the free space on this volume the trash must be emptied. "
+"All trashed items on the volume will be permanently lost."
+msgstr ""
+"För att återfå det lediga utrymmet på den här volymen måste papperskorgen "
+"tömmas. Alla kastade objekt på volymen kommer att permanent gå förlorade."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2077
 msgid "Do _not Empty Trash"
@@ -1594,16 +1975,28 @@ msgid "Error while moving files to trash."
 msgstr "Fel vid flyttning av filer till papperskorgen."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2362
-msgid "Files in the folder \"%B\" cannot be handled because you do not have permissions to see them."
-msgstr "Filer i mappen \"%B\" kan inte hanteras eftersom du inte har de nödvändiga rättigheterna för att se dem."
+msgid ""
+"Files in the folder \"%B\" cannot be handled because you do not have "
+"permissions to see them."
+msgstr ""
+"Filer i mappen \"%B\" kan inte hanteras eftersom du inte har de nödvändiga "
+"rättigheterna för att se dem."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2401
-msgid "The folder \"%B\" cannot be handled because you do not have permissions to read it."
-msgstr "Mappen \"%B\" kan inte hanteras eftersom du inte har de nödvändiga rättigheterna för att läsa den."
+msgid ""
+"The folder \"%B\" cannot be handled because you do not have permissions to "
+"read it."
+msgstr ""
+"Mappen \"%B\" kan inte hanteras eftersom du inte har de nödvändiga "
+"rättigheterna för att läsa den."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
-msgid "The file \"%B\" cannot be handled because you do not have permissions to read it."
-msgstr "Filen \"%B\" kan inte hanteras eftersom du inte har de nödvändiga rättigheterna för att läsa den."
+msgid ""
+"The file \"%B\" cannot be handled because you do not have permissions to "
+"read it."
+msgstr ""
+"Filen \"%B\" kan inte hanteras eftersom du inte har de nödvändiga "
+"rättigheterna för att läsa den."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2481
 msgid "There was an error getting information about \"%B\"."
@@ -1629,8 +2022,12 @@ msgid "The destination is not a folder."
 msgstr "Målet är inte en mapp."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2657
-msgid "There is not enough space on the destination. Try to remove files to make space."
-msgstr "Det finns inte tillräckligt med utrymme på målet. Försök att ta bort några filer för att skapa mer ledigt utrymme."
+msgid ""
+"There is not enough space on the destination. Try to remove files to make "
+"space."
+msgstr ""
+"Det finns inte tillräckligt med utrymme på målet. Försök att ta bort några "
+"filer för att skapa mer ledigt utrymme."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2659
 #, c-format
@@ -1704,20 +2101,32 @@ msgid "%S of %S — %T left (%S/sec)"
 msgstr "%S av %S — %T återstår (%S/s)"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3193
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to create it in the destination."
-msgstr "Mappen \"%B\" kan inte kopieras eftersom du inte har de nödvändiga rättigheterna för att skapa den på målet."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"create it in the destination."
+msgstr ""
+"Mappen \"%B\" kan inte kopieras eftersom du inte har de nödvändiga "
+"rättigheterna för att skapa den på målet."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3196
 msgid "There was an error creating the folder \"%B\"."
 msgstr "Det inträffade ett fel vid skapandet av mappen \"%B\"."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3320
-msgid "Files in the folder \"%B\" cannot be copied because you do not have permissions to see them."
-msgstr "Filer i mappen \"%B\" kan inte kopieras eftersom du inte har de nödvändiga rättigheterna för att se dem."
+msgid ""
+"Files in the folder \"%B\" cannot be copied because you do not have "
+"permissions to see them."
+msgstr ""
+"Filer i mappen \"%B\" kan inte kopieras eftersom du inte har de nödvändiga "
+"rättigheterna för att se dem."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3365
-msgid "The folder \"%B\" cannot be copied because you do not have permissions to read it."
-msgstr "Mappen \"%B\" kan inte kopieras eftersom du inte har de nödvändiga rättigheterna för att läsa den."
+msgid ""
+"The folder \"%B\" cannot be copied because you do not have permissions to "
+"read it."
+msgstr ""
+"Mappen \"%B\" kan inte kopieras eftersom du inte har de nödvändiga "
+"rättigheterna för att läsa den."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3410
 #: ../libnautilus-private/nautilus-file-operations.c:3935
@@ -1764,12 +2173,21 @@ msgstr "Målmappen är inuti källmappen."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3833
 #: ../libnautilus-private/nautilus-file-operations.c:4415
-msgid "A folder named \"%B\" already exists.  Do you want to merge the source folder?"
-msgstr "En mapp med namnet \"%B\" finns redan. Vill du sammanfoga den med källmappen?"
+msgid ""
+"A folder named \"%B\" already exists.  Do you want to merge the source "
+"folder?"
+msgstr ""
+"En mapp med namnet \"%B\" finns redan. Vill du sammanfoga den med källmappen?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3835
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied."
-msgstr "Källmappen finns redan i \"%B\". Sammanfogning kommer att fråga dig om bekräftelse innan några filer ersätts i mappen som är i konflikt med de filer som kopieras."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being copied."
+msgstr ""
+"Källmappen finns redan i \"%B\". Sammanfogning kommer att fråga dig om "
+"bekräftelse innan några filer ersätts i mappen som är i konflikt med de "
+"filer som kopieras."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3840
 #: ../libnautilus-private/nautilus-file-operations.c:4422
@@ -1779,8 +2197,12 @@ msgstr "En mapp med namnet \"%B\" finns redan. Vill du ersätta den?"
 #: ../libnautilus-private/nautilus-file-operations.c:3842
 #: ../libnautilus-private/nautilus-file-operations.c:4424
 #, c-format
-msgid "The folder already exists in \"%F\".  Replacing it will remove all files in the folder."
-msgstr "Mappen finns redan i \"%F\". Att ersätta den innebär att alla filer i mappen tas bort."
+msgid ""
+"The folder already exists in \"%F\".  Replacing it will remove all files in "
+"the folder."
+msgstr ""
+"Mappen finns redan i \"%F\". Att ersätta den innebär att alla filer i mappen "
+"tas bort."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3847
 #: ../libnautilus-private/nautilus-file-operations.c:4429
@@ -1790,8 +2212,11 @@ msgstr "En fil med namnet \"%B\" finns redan. Vill du ersätta den?"
 #: ../libnautilus-private/nautilus-file-operations.c:3849
 #: ../libnautilus-private/nautilus-file-operations.c:4431
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr "Filen finns redan i \"%F\". Att ersätta den innebär att dess innehåll skrivs över."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgstr ""
+"Filen finns redan i \"%F\". Att ersätta den innebär att dess innehåll skrivs "
+"över."
 
 #: ../libnautilus-private/nautilus-file-operations.c:3939
 #, c-format
@@ -1815,8 +2240,14 @@ msgstr[0] "Förbereder att flytta %'d fil"
 msgstr[1] "Förbereder att flytta %'d filer"
 
 #: ../libnautilus-private/nautilus-file-operations.c:4417
-msgid "The source folder already exists in \"%B\".  Merging will ask for confirmation before replacing any files in the folder that conflict with the files being moved."
-msgstr "Källmappen finns redan i \"%B\". Sammanfogning kommer att fråga dig om bekräftelse innan några filer ersätts i mappen som är i konflikt med de filer som flyttas."
+msgid ""
+"The source folder already exists in \"%B\".  Merging will ask for "
+"confirmation before replacing any files in the folder that conflict with the "
+"files being moved."
+msgstr ""
+"Källmappen finns redan i \"%B\". Sammanfogning kommer att fråga dig om "
+"bekräftelse innan några filer ersätts i mappen som är i konflikt med de "
+"filer som flyttas."
 
 #: ../libnautilus-private/nautilus-file-operations.c:4507
 #, c-format
@@ -2353,8 +2784,7 @@ msgid "Computer"
 msgstr "Dator"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:570
-#: ../src/nautilus-places-sidebar.c:481
-#: ../src/nautilus-trash-bar.c:121
+#: ../src/nautilus-places-sidebar.c:481 ../src/nautilus-trash-bar.c:121
 msgid "Trash"
 msgstr "Papperskorg"
 
@@ -2502,6 +2932,7 @@ msgstr "Kunde inte ta bort programmet"
 msgid "No applications selected"
 msgstr "Inga program valda"
 
+# #-#-#-#-#  sv.po (nautilus)  #-#-#-#-#
 # DN. FIXME. Osäker. Bör testas.
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:568
 #: ../libnautilus-private/nautilus-open-with-dialog.c:944
@@ -2526,8 +2957,13 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "Öppna alla filer av typen \"%s\" med:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:146
+#, fuzzy
 msgid "Could not run application"
-msgstr "Kunde inte köra programmet"
+msgstr ""
+"#-#-#-#-#  sv.po (nautilus)  #-#-#-#-#\n"
+"Kunde inte köra programmet\n"
+"#-#-#-#-#  sv.po (eel)  #-#-#-#-#\n"
+"Kunde inte köra program"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:158
 #, c-format
@@ -2535,8 +2971,13 @@ msgid "Could not find '%s'"
 msgstr "Kunde inte hitta \"%s\""
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:161
+#, fuzzy
 msgid "Could not find application"
-msgstr "Kunde inte hitta programmet"
+msgstr ""
+"#-#-#-#-#  sv.po (nautilus)  #-#-#-#-#\n"
+"Kunde inte hitta programmet\n"
+"#-#-#-#-#  sv.po (eel)  #-#-#-#-#\n"
+"Kunde inte hitta program"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
 #, c-format
@@ -2557,17 +2998,28 @@ msgid "Open With"
 msgstr "Öppna med"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:798
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Välj ett program för att visa en beskrivning av det."
+msgstr ""
+"#-#-#-#-#  sv.po (nautilus)  #-#-#-#-#\n"
+"Välj ett program för att visa en beskrivning av det.\n"
+"#-#-#-#-#  sv.po (eel)  #-#-#-#-#\n"
+"Välj ett program för att visa dess beskrivning."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:823
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "A_nvänd ett anpassat kommando"
+msgstr ""
+"#-#-#-#-#  sv.po (nautilus)  #-#-#-#-#\n"
+"A_nvänd ett anpassat kommando\n"
+"#-#-#-#-#  sv.po (eel)  #-#-#-#-#\n"
+"Använd ett _anpassat kommando"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:840
 msgid "_Browse..."
 msgstr "_Bläddra..."
 
+#. #-#-#-#-#  sv.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:869
@@ -2600,8 +3052,12 @@ msgstr "Öppnande misslyckades, vill du välja ett annat program?"
 #: ../libnautilus-private/nautilus-program-choosing.c:81
 #: ../libnautilus-private/nautilus-program-choosing.c:112
 #, c-format
-msgid "\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" locations."
-msgstr "\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s\"-platser."
+msgid ""
+"\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
+"locations."
+msgstr ""
+"\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
+"\"-platser."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:86
 msgid "Open Failed, would you like to choose another action?"
@@ -2610,16 +3066,28 @@ msgstr "Öppnande misslyckades, vill du välja en annan åtgärd?"
 #: ../libnautilus-private/nautilus-program-choosing.c:87
 #: ../libnautilus-private/nautilus-program-choosing.c:119
 #, c-format
-msgid "The default action cannot open \"%s\" because it cannot access files at \"%s\" locations."
-msgstr "Standardåtgärden kan inte öppna \"%s\" eftersom den inte kan komma åt filer på \"%s\"-platser."
+msgid ""
+"The default action cannot open \"%s\" because it cannot access files at \"%s"
+"\" locations."
+msgstr ""
+"Standardåtgärden kan inte öppna \"%s\" eftersom den inte kan komma åt filer "
+"på \"%s\"-platser."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
-msgid "No other applications are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Det finns inga andra tillgängliga program som kan visa denna fil. Om du kopierar denna fil till din dator kan du kanske öppna den."
+msgid ""
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
+msgstr ""
+"Det finns inga andra tillgängliga program som kan visa denna fil. Om du "
+"kopierar denna fil till din dator kan du kanske öppna den."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:121
-msgid "No other actions are available to view this file.  If you copy this file onto your computer, you may be able to open it."
-msgstr "Det finns inga andra tillgängliga program som kan visa denna fil. Om du kopierar denna fil till din dator kan du kanske öppna den."
+msgid ""
+"No other actions are available to view this file.  If you copy this file "
+"onto your computer, you may be able to open it."
+msgstr ""
+"Det finns inga andra tillgängliga program som kan visa denna fil. Om du "
+"kopierar denna fil till din dator kan du kanske öppna den."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:360
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -2640,12 +3108,19 @@ msgid "This drop target only supports local files."
 msgstr "Detta släppmål stöder endast lokala filer."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
-msgstr "För att öppna icke-lokala filer kopierar du dem till en lokal mapp och släpper dem sedan igen."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
+msgstr ""
+"För att öppna icke-lokala filer kopierar du dem till en lokal mapp och "
+"släpper dem sedan igen."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:410
-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened."
-msgstr "För att öppna icke-lokala filer kopierar du dem till en lokal mapp och släpper sedan dem igen. De lokala filerna du släppte har redan öppnats."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them "
+"again. The local files you dropped have already been opened."
+msgstr ""
+"För att öppna icke-lokala filer kopierar du dem till en lokal mapp och "
+"släpper sedan dem igen. De lokala filerna du släppte har redan öppnats."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:439
 msgid "Details: "
@@ -2705,10 +3180,12 @@ msgid "Autorun Prompt"
 msgstr "Automatisk körning"
 
 #. tooltip
-#: ../nautilus-computer.desktop.in.in.h:1
-#: ../src/nautilus-window-menus.c:860
-msgid "Browse all local and remote disks and folders accessible from this computer"
-msgstr "Bläddra bland lokala och fjärrdiskar samt mappar som är åtkomliga från den här datorn"
+#: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:860
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
+msgstr ""
+"Bläddra bland lokala och fjärrdiskar samt mappar som är åtkomliga från den "
+"här datorn"
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
 msgid "Change the behaviour and appearance of file manager windows"
@@ -2718,14 +3195,12 @@ msgstr "Ändra beteendet och utseendet för filhanterarens fönster"
 msgid "File Management"
 msgstr "Filhantering"
 
-#: ../nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1375
+#: ../nautilus-home.desktop.in.in.h:1 ../src/file-manager/fm-tree-view.c:1375
 msgid "Home Folder"
 msgstr "Hemmapp"
 
 #. tooltip
-#: ../nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-window-menus.c:856
+#: ../nautilus-home.desktop.in.in.h:2 ../src/nautilus-window-menus.c:856
 msgid "Open your personal folder"
 msgstr "Öppna din personliga mapp"
 
@@ -2766,8 +3241,11 @@ msgstr "Byt skrivbordsbak_grund"
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:700
-msgid "Show a window that lets you set your desktop background's pattern or color"
-msgstr "Visa ett fönster som låter dig ställa in mönstret eller färgen på din skrivbordsbakgrund"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+"Visa ett fönster som låter dig ställa in mönstret eller färgen på din "
+"skrivbordsbakgrund"
 
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:705
@@ -2945,18 +3423,27 @@ msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "Alla körbara filer i denna mapp kommer att visas i Skript-menyn."
 
 #: ../src/file-manager/fm-directory-view.c:5515
-msgid "Choosing a script from the menu will run that script with any selected items as input."
-msgstr "Genom att välja ett skript från menyn kör du det skriptet med alla markerade objekt som indata."
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+"Genom att välja ett skript från menyn kör du det skriptet med alla markerade "
+"objekt som indata."
 
 #: ../src/file-manager/fm-directory-view.c:5517
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
-"When executed from a local folder, scripts will be passed the selected file names. When executed from a remote folder (e.g. a folder showing web or ftp content), scripts will be passed no parameters.\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
 "\n"
-"In all cases, the following environment variables will be set by Nautilus, which the scripts may use:\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected files (only if local)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
 "\n"
@@ -2964,13 +3451,19 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"Alla körbara filer i denna mapp kommer att visas i Skript-menyn. Genom att välja ett skript i menyn kör du det skriptet.\n"
+"Alla körbara filer i denna mapp kommer att visas i Skript-menyn. Genom att "
+"välja ett skript i menyn kör du det skriptet.\n"
 "\n"
-"När de körs från en lokal mapp kommer skripten att få namnen på de markerade filerna skickade till sig. När de körs från en fjärrmapp (t.ex. en mapp som visar webb- eller ftp-innehåll) får skripten inga parametrar skickade till sig.\n"
+"När de körs från en lokal mapp kommer skripten att få namnen på de markerade "
+"filerna skickade till sig. När de körs från en fjärrmapp (t.ex. en mapp som "
+"visar webb- eller ftp-innehåll) får skripten inga parametrar skickade till "
+"sig.\n"
 "\n"
-"I alla fall kommer Nautilus att ställa in följande systemvariabler, som skripten kan använda:\n"
+"I alla fall kommer Nautilus att ställa in följande systemvariabler, som "
+"skripten kan använda:\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: sökvägarna till de markerade filerna, åtskilda med nyrader (endast om lokalt)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: sökvägarna till de markerade filerna, "
+"åtskilda med nyrader (endast om lokalt)\n"
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: URI för den aktuella platsen\n"
 "\n"
@@ -2991,16 +3484,26 @@ msgstr "\"%s\" kommer att kopieras om du väljer kommandot Klistra in"
 #: ../src/file-manager/fm-directory-view.c:5700
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
-msgstr[0] "Det %'d markerade objektet kommer att flyttas om du väljer kommandot Klistra in"
-msgstr[1] "De %'d markerade objekten kommer att flyttas om du väljer kommandot Klistra in"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
+msgstr[0] ""
+"Det %'d markerade objektet kommer att flyttas om du väljer kommandot Klistra "
+"in"
+msgstr[1] ""
+"De %'d markerade objekten kommer att flyttas om du väljer kommandot Klistra "
+"in"
 
 #: ../src/file-manager/fm-directory-view.c:5707
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "Det %'d markerade objektet kommer att kopieras om du väljer kommandot Klistra in"
-msgstr[1] "De %'d markerade objekten kommer att kopieras om du väljer kommandot Klistra in"
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"Det %'d markerade objektet kommer att kopieras om du väljer kommandot "
+"Klistra in"
+msgstr[1] ""
+"De %'d markerade objekten kommer att kopieras om du väljer kommandot Klistra "
+"in"
 
 #: ../src/file-manager/fm-directory-view.c:5763
 #: ../src/file-manager/fm-tree-view.c:1009
@@ -3178,14 +3681,17 @@ msgstr "Förbered för de markerade filerna att flyttas med kommandot Klistra in
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6636
 msgid "Prepare the selected files to be copied with a Paste command"
-msgstr "Förbered för de markerade filerna att kopieras med kommandot Klistra in"
+msgstr ""
+"Förbered för de markerade filerna att kopieras med kommandot Klistra in"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6640
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut eller Kopiera"
+msgstr ""
+"Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut eller "
+"Kopiera"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
@@ -3199,8 +3705,12 @@ msgstr "Klistra _in i mapp"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6646
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut eller Kopiera till den markerade mappen"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut eller "
+"Kopiera till den markerade mappen"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6650
@@ -3307,7 +3817,9 @@ msgstr "_Återställ vy till standardalternativ"
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6696
 msgid "Reset sorting order and zoom level to match preferences for this view"
-msgstr "Återställ sorteringsordning och zoomnivå för att stämma överens med inställningarna för denna vy"
+msgstr ""
+"Återställ sorteringsordning och zoomnivå för att stämma överens med "
+"inställningarna för denna vy"
 
 #. name, stock id
 #. label, accelerator
@@ -3452,8 +3964,12 @@ msgstr "Förbered för denna mapp att kopieras med kommandot Klistra in"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6772
-msgid "Move or copy files previously selected by a Cut or Copy command into this folder"
-msgstr "Flytta eller kopiera filer som tidigare markerats med kommandot Klipp ut eller Kopiera till denna mapp"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into this "
+"folder"
+msgstr ""
+"Flytta eller kopiera filer som tidigare markerats med kommandot Klipp ut "
+"eller Kopiera till denna mapp"
 
 #. tooltip
 #: ../src/file-manager/fm-directory-view.c:6777
@@ -3680,8 +4196,10 @@ msgstr "Kommando"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
-msgstr "Du har inte de nödvändiga rättigheterna för att se innehållet i \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr ""
+"Du har inte de nödvändiga rättigheterna för att se innehållet i \"%s\"."
 
 #: ../src/file-manager/fm-error-reporting.c:63
 #, c-format
@@ -3699,13 +4217,16 @@ msgstr "Mappinnehållet kunde inte visas."
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Namnet \"%s\" används redan i denna mapp. Välj ett annat namn."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr "\"%s\" finns inte i denna mapp. Den kanske flyttades eller togs bort precis?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+"\"%s\" finns inte i denna mapp. Den kanske flyttades eller togs bort precis?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
 #, c-format
@@ -3714,8 +4235,12 @@ msgstr "Du har inte de nödvändiga rättigheterna för att byta namn på \"%s\"
 
 #: ../src/file-manager/fm-error-reporting.c:118
 #, c-format
-msgid "The name \"%s\" is not valid because it contains the character \"/\". Please use a different name."
-msgstr "Namnet \"%s\" är inte giltigt eftersom det innehåller tecknet \"/\". Var vänlig och välj ett annat namn."
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+"Namnet \"%s\" är inte giltigt eftersom det innehåller tecknet \"/\". Var "
+"vänlig och välj ett annat namn."
 
 #: ../src/file-manager/fm-error-reporting.c:122
 #, c-format
@@ -3734,7 +4259,8 @@ msgstr "Objektets namn kunde inte bytas."
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Du har inte de nödvändiga rättigheterna för att byta grupp på \"%s\"."
 
 #. fall through
@@ -3852,7 +4378,9 @@ msgstr "St_äda upp efter namn"
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1498
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "Positionera om ikonerna så att de passar bättre i fönstret och så att överlappning undviks"
+msgstr ""
+"Positionera om ikonerna så att de passar bättre i fönstret och så att "
+"överlappning undviks"
 
 #. name, stock id
 #. label, accelerator
@@ -3964,8 +4492,7 @@ msgid "(Empty)"
 msgstr "(Tomt)"
 
 #: ../src/file-manager/fm-list-model.c:375
-#: ../src/file-manager/fm-tree-model.c:1264
-#: ../src/nautilus-window-slot.c:191
+#: ../src/file-manager/fm-tree-model.c:1264 ../src/nautilus-window-slot.c:191
 msgid "Loading..."
 msgstr "Läser in..."
 
@@ -4356,8 +4883,12 @@ msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus kunde inte skapa den nödvändiga mappen \"%s\"."
 
 #: ../src/nautilus-application.c:393
-msgid "Before running Nautilus, please create the following folder, or set permissions such that Nautilus can create it."
-msgstr "Innan du kör Nautilus bör du skapa denna mapp, eller ställa in de nödvändiga rättigheterna för att Nautilus ska kunna skapa den."
+msgid ""
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
+msgstr ""
+"Innan du kör Nautilus bör du skapa denna mapp, eller ställa in de nödvändiga "
+"rättigheterna för att Nautilus ska kunna skapa den."
 
 #: ../src/nautilus-application.c:396
 #, c-format
@@ -4365,13 +4896,15 @@ msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus kunde inte skapa följande nödvändiga mappar: %s."
 
 #: ../src/nautilus-application.c:398
-msgid "Before running Nautilus, please create these folders, or set permissions such that Nautilus can create them."
-msgstr "Innan du kör Nautilus bör du skapa dessa mappar, eller ställa in de nödvändiga rättigheterna för att Nautilus ska kunna skapa dem."
+msgid ""
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+"Innan du kör Nautilus bör du skapa dessa mappar, eller ställa in de "
+"nödvändiga rättigheterna för att Nautilus ska kunna skapa dem."
 
-#: ../src/nautilus-application.c:1300
-#: ../src/nautilus-places-sidebar.c:1680
-#: ../src/nautilus-places-sidebar.c:1703
-#: ../src/nautilus-places-sidebar.c:1726
+#: ../src/nautilus-application.c:1300 ../src/nautilus-places-sidebar.c:1680
+#: ../src/nautilus-places-sidebar.c:1703 ../src/nautilus-places-sidebar.c:1726
 #, c-format
 msgid "Unable to eject %s"
 msgstr "Kunde inte mata ut %s"
@@ -4392,24 +4925,29 @@ msgid "<big><b>Error autorunning software</b></big>"
 msgstr "<big><b>Fel vid automatisk start av programvara</b></big>"
 
 #: ../src/nautilus-autorun-software.c:193
-msgid "<big><b>This medium contains software intended to be automatically started. Would you like to run it?</b></big>"
-msgstr "<big><b>Detta media innehåller programvara som är tänkt att startas automatiskt. Vill du köra den?</b></big>"
+msgid ""
+"<big><b>This medium contains software intended to be automatically started. "
+"Would you like to run it?</b></big>"
+msgstr ""
+"<big><b>Detta media innehåller programvara som är tänkt att startas "
+"automatiskt. Vill du köra den?</b></big>"
 
 #: ../src/nautilus-autorun-software.c:195
 #, c-format
 msgid ""
-"The software will run directly from the medium \"%s\". You should never run software that you don't trust.\n"
+"The software will run directly from the medium \"%s\". You should never run "
+"software that you don't trust.\n"
 "\n"
 "If in doubt, press Cancel."
 msgstr ""
-"Programvaran kommer att köras direkt från mediet \"%s\". Du bör aldrig köra programvara som du inte litar på.\n"
+"Programvaran kommer att köras direkt från mediet \"%s\". Du bör aldrig köra "
+"programvara som du inte litar på.\n"
 "\n"
 "Tryck på Avbryt om du är osäker."
 
 #: ../src/nautilus-bookmarks-window.c:158
 #: ../src/nautilus-file-management-properties.c:208
-#: ../src/nautilus-property-browser.c:1583
-#: ../src/nautilus-window-menus.c:617
+#: ../src/nautilus-property-browser.c:1583 ../src/nautilus-window-menus.c:617
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4543,8 +5081,7 @@ msgstr "Lägg till _bokmärke"
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../src/nautilus-desktop-window.c:243
-#: ../src/nautilus-pathbar.c:1244
+#: ../src/nautilus-desktop-window.c:243 ../src/nautilus-pathbar.c:1244
 #: ../src/nautilus-places-sidebar.c:308
 msgid "Desktop"
 msgstr "Skrivbord"
@@ -4554,10 +5091,13 @@ msgstr "Skrivbord"
 msgid "Could not remove emblem with name '%s'."
 msgstr "Kunde inte ta bort emblemet med namnet \"%s\"."
 
-#: ../src/nautilus-emblem-sidebar.c:224
-#: ../src/nautilus-emblem-sidebar.c:258
-msgid "This is probably because the emblem is a permanent one, and not one that you added yourself."
-msgstr "Detta beror troligtvis på att emblemet är permanent och inte något du lade till själv."
+#: ../src/nautilus-emblem-sidebar.c:224 ../src/nautilus-emblem-sidebar.c:258
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr ""
+"Detta beror troligtvis på att emblemet är permanent och inte något du lade "
+"till själv."
 
 #: ../src/nautilus-emblem-sidebar.c:257
 #, c-format
@@ -4581,19 +5121,26 @@ msgid "Add Emblems..."
 msgstr "Lägg till emblem..."
 
 #: ../src/nautilus-emblem-sidebar.c:541
-msgid "Enter a descriptive name next to each emblem.  This name will be used in other places to identify the emblem."
-msgstr "Ange ett beskrivande namn bredvid varje emblem. Detta namn kommer att användas på andra ställen för att identifiera emblemet."
+msgid ""
+"Enter a descriptive name next to each emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Ange ett beskrivande namn bredvid varje emblem. Detta namn kommer att "
+"användas på andra ställen för att identifiera emblemet."
 
 #: ../src/nautilus-emblem-sidebar.c:543
-msgid "Enter a descriptive name next to the emblem.  This name will be used in other places to identify the emblem."
-msgstr "Ange ett beskrivande namn bredvid emblemet. Detta namn kommer att användas på andra ställen för att identifiera emblemet."
+msgid ""
+"Enter a descriptive name next to the emblem.  This name will be used in "
+"other places to identify the emblem."
+msgstr ""
+"Ange ett beskrivande namn bredvid emblemet. Detta namn kommer att användas "
+"på andra ställen för att identifiera emblemet."
 
 #: ../src/nautilus-emblem-sidebar.c:764
 msgid "Some of the files could not be added as emblems."
 msgstr "En del av filerna kunde inte läggas till som emblem."
 
-#: ../src/nautilus-emblem-sidebar.c:764
-#: ../src/nautilus-emblem-sidebar.c:766
+#: ../src/nautilus-emblem-sidebar.c:764 ../src/nautilus-emblem-sidebar.c:766
 msgid "The emblems do not appear to be valid images."
 msgstr "Emblemen verkar inte vara giltiga bilder."
 
@@ -4601,8 +5148,7 @@ msgstr "Emblemen verkar inte vara giltiga bilder."
 msgid "None of the files could be added as emblems."
 msgstr "En del av filerna kunde läggas till som emblem."
 
-#: ../src/nautilus-emblem-sidebar.c:803
-#: ../src/nautilus-emblem-sidebar.c:858
+#: ../src/nautilus-emblem-sidebar.c:803 ../src/nautilus-emblem-sidebar.c:858
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Filen \"%s\" verkar inte vara en giltig bild."
@@ -4611,8 +5157,7 @@ msgstr "Filen \"%s\" verkar inte vara en giltig bild."
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Den dragna filen verkar inte vara en giltig bild."
 
-#: ../src/nautilus-emblem-sidebar.c:808
-#: ../src/nautilus-emblem-sidebar.c:859
+#: ../src/nautilus-emblem-sidebar.c:808 ../src/nautilus-emblem-sidebar.c:859
 msgid "The emblem cannot be added."
 msgstr "Emblemet kan inte läggas till."
 
@@ -4717,16 +5262,22 @@ msgid "CD _Audio:"
 msgstr "Cd-_ljud:"
 
 #: ../src/nautilus-file-management-properties.ui.h:25
-msgid "Choose the order of information to appear beneath icon names. More information will appear when zooming in closer."
-msgstr "Välj i vilken ordning informationen ska visas under ikonnamn. Mer information visas när du zoomar in närmare."
+msgid ""
+"Choose the order of information to appear beneath icon names. More "
+"information will appear when zooming in closer."
+msgstr ""
+"Välj i vilken ordning informationen ska visas under ikonnamn. Mer "
+"information visas när du zoomar in närmare."
 
 #: ../src/nautilus-file-management-properties.ui.h:26
 msgid "Choose the order of information to appear in the list view."
 msgstr "Välj den sortering av information som ska användas i listvyn."
 
 #: ../src/nautilus-file-management-properties.ui.h:27
-msgid "Choose what happens when inserting media or connecting devices to the system"
-msgstr "Välj vad som ska hända när media matas in eller enheter ansluts till systemet"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
+msgstr ""
+"Välj vad som ska hända när media matas in eller enheter ansluts till systemet"
 
 #: ../src/nautilus-file-management-properties.ui.h:28
 msgid "Count _number of items:"
@@ -5038,8 +5589,12 @@ msgid "Only create windows for explicitly specified URIs."
 msgstr "Skapa endast fönster för explicit angivna URI:er."
 
 #: ../src/nautilus-main.c:335
-msgid "Do not manage the desktop (ignore the preference set in the preferences dialog)."
-msgstr "Hantera inte skrivbordet (ignorera inställningen som är angiven i dialogfönstret inställningar)."
+msgid ""
+"Do not manage the desktop (ignore the preference set in the preferences "
+"dialog)."
+msgstr ""
+"Hantera inte skrivbordet (ignorera inställningen som är angiven i "
+"dialogfönstret inställningar)."
 
 #: ../src/nautilus-main.c:337
 msgid "open a browser window."
@@ -5064,8 +5619,7 @@ msgstr ""
 "Bläddra i filsystemet med filhanteraren"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:413
-#: ../src/nautilus-main.c:422
+#: ../src/nautilus-main.c:413 ../src/nautilus-main.c:422
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
 msgstr "nautilus: %s kan inte användas med URI:er.\n"
@@ -5082,7 +5636,8 @@ msgstr "nautilus: --geometry kan inte användas med mer än en URI.\n"
 
 #: ../src/nautilus-navigation-window-menus.c:119
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "Är du säker på att du vill tömma listan över platser som du har besökt?"
+msgstr ""
+"Är du säker på att du vill tömma listan över platser som du har besökt?"
 
 #: ../src/nautilus-navigation-window-menus.c:313
 #: ../src/nautilus-window-bookmarks.c:99
@@ -5184,7 +5739,8 @@ msgstr "R_edigera bokmärken..."
 #: ../src/nautilus-navigation-window-menus.c:792
 #: ../src/nautilus-spatial-window.c:915
 msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr "Visa ett fönster som tillåter redigering av dina bokmärken i denna meny"
+msgstr ""
+"Visa ett fönster som tillåter redigering av dina bokmärken i denna meny"
 
 #. name, stock id, label
 #: ../src/nautilus-navigation-window-menus.c:794
@@ -5323,8 +5879,7 @@ msgstr "%s - Filbläddrare"
 msgid "Close tab"
 msgstr "Stäng flik"
 
-#: ../src/nautilus-notes-viewer.c:385
-#: ../src/nautilus-notes-viewer.c:499
+#: ../src/nautilus-notes-viewer.c:385 ../src/nautilus-notes-viewer.c:499
 msgid "Notes"
 msgstr "Anteckningar"
 
@@ -5332,8 +5887,7 @@ msgstr "Anteckningar"
 msgid "Show Notes"
 msgstr "Visa anteckningar"
 
-#: ../src/nautilus-places-sidebar.c:330
-#: ../src/network-scheme.desktop.in.h:2
+#: ../src/nautilus-places-sidebar.c:330 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
 msgstr "Nätverk"
 
@@ -5388,7 +5942,8 @@ msgstr "Tyvärr, mönstret %s kunde inte tas bort."
 
 #: ../src/nautilus-property-browser.c:932
 msgid "Check that you have permission to delete the pattern."
-msgstr "Kontrollera att du har de rättigheter som krävs för att ta bort mönstret."
+msgstr ""
+"Kontrollera att du har de rättigheter som krävs för att ta bort mönstret."
 
 #: ../src/nautilus-property-browser.c:960
 #, c-format
@@ -5397,7 +5952,8 @@ msgstr "Tyvärr, emblemet %s kunde inte tas bort."
 
 #: ../src/nautilus-property-browser.c:961
 msgid "Check that you have permission to delete the emblem."
-msgstr "Kontrollera att du har de rättigheter som krävs för att ta bort emblemet."
+msgstr ""
+"Kontrollera att du har de rättigheter som krävs för att ta bort emblemet."
 
 #: ../src/nautilus-property-browser.c:1029
 msgid "Select an Image File for the New Emblem"
@@ -5644,8 +6200,7 @@ msgid "Close the side pane"
 msgstr "Stäng sidopanelen"
 
 #. Set initial window title
-#: ../src/nautilus-spatial-window.c:394
-#: ../src/nautilus-window-menus.c:559
+#: ../src/nautilus-spatial-window.c:394 ../src/nautilus-window-menus.c:559
 #: ../src/nautilus-window.c:154
 msgid "Nautilus"
 msgstr "Nautilus"
@@ -5687,7 +6242,9 @@ msgid "provides visual status"
 msgstr "tillhandahåller synlig status"
 
 #: ../src/nautilus-window-bookmarks.c:97
-msgid "Do you want to remove any bookmarks with the non-existing location from your list?"
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "Vill du ta bort alla bokmärken med denna plats från din lista?"
 
 #: ../src/nautilus-window-bookmarks.c:102
@@ -5755,8 +6312,11 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "Kunde inte visa \"%s\" eftersom värden inte kunde hittas."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
-msgstr "Kontrollera att du stavat namnet rätt och att dina proxyserverinställningar stämmer."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+"Kontrollera att du stavat namnet rätt och att dina proxyserverinställningar "
+"stämmer."
 
 #: ../src/nautilus-window-manage-views.c:1947
 #, c-format
@@ -5772,22 +6332,48 @@ msgid "Go to the location specified by this bookmark"
 msgstr "Gå till platsen som detta bokmärke anger"
 
 #: ../src/nautilus-window-menus.c:541
-msgid "Nautilus is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgid ""
+"Nautilus is free software; you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
-"Följande text är en informell översättning som enbart tillhandahålls i informativt syfte. För alla juridiska tolkningar gäller den engelska originaltexten. Nautilus är fri programvara. Du kan distribuera det och/eller\n"
-"modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version."
+"Följande text är en informell översättning som enbart tillhandahålls i "
+"informativt syfte. För alla juridiska tolkningar gäller den engelska "
+"originaltexten. Nautilus är fri programvara. Du kan distribuera det och/"
+"eller\n"
+"modifiera det under villkoren i GNU General Public License, publicerad av "
+"Free Software Foundation, antingen version 2 eller (om du så vill) någon "
+"senare version."
 
 #: ../src/nautilus-window-menus.c:545
-msgid "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "Nautilus distribueras i hopp om att det ska vara användbart, men UTAN NÅGON GARANTI, även utan underförstådd garanti vid SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information."
+msgid ""
+"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Nautilus distribueras i hopp om att det ska vara användbart, men UTAN NÅGON "
+"GARANTI, även utan underförstådd garanti vid SÄLJBARHET eller LÄMPLIGHET FÖR "
+"NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare "
+"information."
 
 #: ../src/nautilus-window-menus.c:549
-msgid "You should have received a copy of the GNU General Public License along with Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
-msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med Nautilus. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgstr ""
+"Du bör ha fått en kopia av GNU General Public License tillsammans med "
+"Nautilus. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
 
 #: ../src/nautilus-window-menus.c:561
-msgid "Nautilus lets you organize files and folders, both on your computer and online."
-msgstr "Nautilus låter dig organisera filer och mappar, både på din dator och nätet."
+msgid ""
+"Nautilus lets you organize files and folders, both on your computer and "
+"online."
+msgstr ""
+"Nautilus låter dig organisera filer och mappar, både på din dator och nätet."
 
 #: ../src/nautilus-window-menus.c:564
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -5848,8 +6434,11 @@ msgid "_Backgrounds and Emblems..."
 msgstr "Bakgrunder och _emblem..."
 
 #: ../src/nautilus-window-menus.c:795
-msgid "Display patterns, colors, and emblems that can be used to customize appearance"
-msgstr "Visa mönster, färger och emblem som kan användas för att ändra utseendet"
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+"Visa mönster, färger och emblem som kan användas för att ändra utseendet"
 
 #: ../src/nautilus-window-menus.c:798
 msgid "Prefere_nces"
@@ -5928,8 +6517,7 @@ msgid "Zoom _In"
 msgstr "Zooma _in"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:828
-#: ../src/nautilus-zoom-control.c:91
+#: ../src/nautilus-window-menus.c:828 ../src/nautilus-zoom-control.c:91
 #: ../src/nautilus-zoom-control.c:345
 msgid "Increase the view size"
 msgstr "Öka vystorleken"
@@ -5941,8 +6529,7 @@ msgid "Zoom _Out"
 msgstr "Zooma _ut"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:840
-#: ../src/nautilus-zoom-control.c:92
+#: ../src/nautilus-window-menus.c:840 ../src/nautilus-zoom-control.c:92
 #: ../src/nautilus-zoom-control.c:294
 msgid "Decrease the view size"
 msgstr "Minska vystorleken"
@@ -5954,8 +6541,7 @@ msgid "Normal Si_ze"
 msgstr "_Normal storlek"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:848
-#: ../src/nautilus-zoom-control.c:93
+#: ../src/nautilus-window-menus.c:848 ../src/nautilus-zoom-control.c:93
 #: ../src/nautilus-zoom-control.c:307
 msgid "Use the normal view size"
 msgstr "Använd normala vystorleken"
@@ -5990,8 +6576,7 @@ msgid "_Network"
 msgstr "_Nätverk"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:864
-#: ../src/network-scheme.desktop.in.h:1
+#: ../src/nautilus-window-menus.c:864 ../src/network-scheme.desktop.in.h:1
 msgid "Browse bookmarked and local network locations"
 msgstr "Bläddra bland bokmärkta och lokala nätverksplatser"
 
@@ -6026,7 +6611,9 @@ msgstr "Cd/_dvd-skapare"
 #. tooltip
 #: ../src/nautilus-window-menus.c:876
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr "Öppna en mapp i vilken du kan dra filer till för att bränna till en cd eller dvd"
+msgstr ""
+"Öppna en mapp i vilken du kan dra filer till för att bränna till en cd eller "
+"dvd"
 
 #. name, stock id
 #. label, accelerator
@@ -6113,24 +6700,174 @@ msgstr "Zooma"
 msgid "Set the zoom level of the current view"
 msgstr "Ställ in zoomnivån på den aktuella vyn"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Bild-/etikettram"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Bredd på ramen runt etiketten och bilden i varningsdialogen"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Varningstyp"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Typen av varningar"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Varningsknappar"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Knapparna som visas i varningsdialogen"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Visa fler _detaljer"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Text"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Texten på etiketten."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Justering"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Justeringen av raderna i texten på etiketten relativt varandra. Detta "
+"påverkar INTE justeringen av etiketten inom dess allokering. Se GtkMisc::"
+"xalign för det."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Radbrytning"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Om detta är satt, radbryt rader om texten blir för bred."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Markörposition"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Den aktuella positionen för infogningsmarkören i tecken."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Markeringsgräns"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"Positionen för den motsatta änden av markeringen från markören i tecken."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Markera allt"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Inmatningsmetoder"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf-fel:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-fel: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Alla ytterligare fel visas endast på terminalen."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Ingen bild markerades."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Du måste klicka på en bild för att markera den."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Du kan stoppa denna åtgärd genom att klicka på avbryt."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (ogiltig Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Öppnar %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Öppnar %d objekt"
+msgstr[1] "Öppnar %d objekt"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Ange lösenord"
+
 #~ msgid "Browse the file system with the file manager"
 #~ msgstr "Bläddra i filsystemet med filhanteraren"
+
 #~ msgid "File Browser"
 #~ msgstr "Filbläddrare"
+
 #~ msgid "Factory for Nautilus shell and file manager"
 #~ msgstr "Fabrik för skalet och filhanteraren Nautilus"
+
 #~ msgid "Nautilus factory"
 #~ msgstr "Nautilus-fabrik"
+
 #~ msgid "Nautilus instance"
 #~ msgstr "Nautilus-instans"
+
 #~ msgid "Nautilus metafile factory"
 #~ msgstr "Fabrik för Nautilus-metafil"
+
 #~ msgid ""
 #~ "Nautilus operations that can be done from subsequent command-line "
 #~ "invocations"
 #~ msgstr "Nautilus-åtgärder som kan utföras genom upprepade kommandoradsanrop"
+
 #~ msgid "Produces metafile objects for accessing Nautilus metadata"
 #~ msgstr "Skapar metafil-objekt för att komma åt Nautilus-metadata"
+
 #~ msgid ""
 #~ "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
 #~ "console may fix the problem. If not, you can try rebooting the computer "
@@ -6139,6 +6876,7 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "Nautilus kan inte användas just nu. Att köra kommandot \"bonobo-slay\" "
 #~ "från konsollen kan lösa problemet. Om inte kan du prova att starta om "
 #~ "datorn eller installera om Nautilus."
+
 #~ msgid ""
 #~ "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
 #~ "console may fix the problem. If not, you can try rebooting the computer "
@@ -6175,14 +6913,17 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "\n"
 #~ "Vi har även sett detta fel när en felaktig version av bonobo-activation "
 #~ "var installerad."
+
 #~ msgid "Nautilus cannot be used now, due to an unexpected error."
 #~ msgstr "Nautilus kan inte användas just nu på grund av ett oväntat fel."
+
 #~ msgid ""
 #~ "Nautilus cannot be used now, due to an unexpected error from Bonobo when "
 #~ "attempting to register the file manager view server."
 #~ msgstr ""
 #~ "Nautilus kan inte användas just nu på grund av ett oväntat fel från "
 #~ "Bonobo när ett försök gjordes att registrera filhanterarens vyserver."
+
 #~ msgid ""
 #~ "Nautilus cannot be used now, due to an unexpected error from Bonobo when "
 #~ "attempting to locate the factory. Killing bonobo-activation-server and "
@@ -6191,6 +6932,7 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "Nautilus kan inte användas just nu på grund av ett oväntat fel från "
 #~ "Bonobo när den skulle hitta fabriken. Om du dödar bonobo-activation-"
 #~ "server och startar om Nautilus kanske problemet löser sig."
+
 #~ msgid ""
 #~ "Nautilus cannot be used now, due to an unexpected error from Bonobo when "
 #~ "attempting to locate the shell object. Killing bonobo-activation-server "
@@ -6199,6 +6941,7 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "Nautilus kan inte användas just nu på grund av ett oväntat fel från "
 #~ "Bonobo när den skulle hitta skalobjektet. Om du dödar bonobo-activation-"
 #~ "server och startar om Nautilus kanske problemet löser sig."
+
 #~ msgid ""
 #~ "100 KB\n"
 #~ "500 KB\n"
@@ -6217,6 +6960,7 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "10 MB\n"
 #~ "100 MB\n"
 #~ "1 GB"
+
 #~ msgid ""
 #~ "33%\n"
 #~ "50%\n"
@@ -6233,6 +6977,7 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "150%\n"
 #~ "200%\n"
 #~ "400%"
+
 #~ msgid ""
 #~ "Always\n"
 #~ "Local Files Only\n"
@@ -6241,6 +6986,7 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "Alltid\n"
 #~ "Endast lokala filer\n"
 #~ "Aldrig"
+
 #~ msgid ""
 #~ "By Name\n"
 #~ "By Size\n"
@@ -6253,6 +6999,7 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "Efter typ\n"
 #~ "Efter ändringsdatum\n"
 #~ "Efter emblem"
+
 #~ msgid ""
 #~ "Icon View\n"
 #~ "List View\n"
@@ -6261,59 +7008,319 @@ msgstr "Ställ in zoomnivån på den aktuella vyn"
 #~ "Ikonvy\n"
 #~ "Listvy\n"
 #~ "Kompakt vy"
+
 #~ msgid "Restart Nautilus."
 #~ msgstr "Starta om Nautilus."
+
 #~ msgid ""
 #~ "Load a saved session from the specified file. Implies \"--no-default-"
 #~ "window\"."
 #~ msgstr ""
 #~ "Läs in en sparad session från den angivna filen. Antyder \"--no-default-"
 #~ "window\"."
+
 #~ msgid "FILENAME"
 #~ msgstr "FILNAMN"
+
 #~ msgid "Sorry, but \"%s\" is not a valid file name."
 #~ msgstr "Tyvärr, \"%s\" är inte ett giltigt filnamn."
+
 #~ msgid "Sorry, but you did not supply a valid file name."
 #~ msgstr "Tyvärr, du angav inte ett giltigt filnamn."
+
 #~ msgid "Please try again."
 #~ msgstr "Försök igen."
+
 #~ msgid ""
 #~ "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 #~ "files and the rest of your system."
 #~ msgstr ""
 #~ "Nautilus är ett grafiskt skal till GNOME som gör det enkelt att hantera "
 #~ "dina filer och resten av ditt system."
+
 #~ msgid "Create Folder"
 #~ msgstr "Skapa mapp"
+
 #~ msgid "Move to Trash"
 #~ msgstr "Flytta till papperskorgen"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "Är du säker på att du vill glömma historien?"
+
 #~ msgid "If you do, you will be doomed to repeat it."
 #~ msgstr "I så fall kommer du att vara dömd att återupprepa den."
+
 #~ msgid ""
 #~ "If you clear the list of locations, they will be permanently deleted."
 #~ msgstr "Om du tömmer listan över platser kommer de att tas bort permanent."
+
 #~ msgid "E_ject"
 #~ msgstr "Mata _ut"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Tom Blu-Ray-skiva"
+
 #~ msgid "Blank CD Disc"
 #~ msgstr "Tom cd-skiva"
+
 #~ msgid "Blank DVD Disc"
 #~ msgstr "Tom dvd-skiva"
+
 #~ msgid "Blank HD DVD Disc"
 #~ msgstr "Tom HD DVD-skiva"
+
 #~ msgid "Blu-Ray Video"
 #~ msgstr "Blu-Ray-video"
+
 #~ msgid "Compact Disc Audio"
 #~ msgstr "Ljudskiva"
+
 #~ msgid "DVD Audio"
 #~ msgstr "DVD Audio"
+
 #~ msgid "DVD Video"
 #~ msgstr "Dvd-video"
+
 #~ msgid "Digital Photos"
 #~ msgstr "Digitalfoton"
+
 #~ msgid "HD DVD Video"
 #~ msgstr "HD DVD-video"
 
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Kunde inte lägga till programmet i programdatabasen"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 "
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/0, 1:00 "
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/ 0,  1:00 "
+
+#~ msgid "<i>No applications selected</i>"
+#~ msgstr "<i>Inga program valda</i>"
+
+#~ msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+#~ msgstr "Välj ett program för att öppna <i>%s</i> och andra av typen \"%s\""
+
+#~ msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+#~ msgstr "Öppna <i>%s</i> och andra filer av typen \"%s\" med:"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf-fel"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Ingen markering gjord"
+
+#~ msgid "Info"
+#~ msgstr "Information"
+
+#~ msgid "Warning"
+#~ msgstr "Varning"
+
+#~ msgid "Error"
+#~ msgstr "Fel"
+
+#~ msgid "Question"
+#~ msgstr "Fråga"
+
+#~ msgid "Open"
+#~ msgstr "Öppna"
+
+#~ msgid "The application '%s' is not a valid executable"
+#~ msgstr "Programmet \"%s\" är inte en giltig körbar fil"
+
+#~ msgid "Could not open application"
+#~ msgstr "Kunde inte öppna program"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid ""
+#~ "Select an application to open <i>%s</i> and other files of type \"%s\""
+#~ msgstr ""
+#~ "Välj ett program för att öppna <i>%s</i> och andra filer av typen \"%s\""
+
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Image border"
+#~ msgstr "Bildram"
+
+#~ msgid "Label border"
+#~ msgstr "Etikettram"
+
+#~ msgid "Details"
+#~ msgstr "Detaljer"
+
+#~ msgid "_Username:"
+#~ msgstr "_Användarnamn:"
+
+#~ msgid "Remember this password"
+#~ msgstr "Kom ihåg detta lösenord"
+
+#~ msgid "Cat_egories:"
+#~ msgstr "Kat_egorier:"
+
+#~ msgid "Pixbuf objects"
+#~ msgstr "Pixbuf-objekt"
+
+#~ msgid "The pixbuf list to render."
+#~ msgstr "Pixbuf-listan att rendera."
+
+#~ msgid "pixbuf"
+#~ msgstr "pixbuf"
+
+#~ msgid "the image"
+#~ msgstr "bilden"
+
+#~ msgid "label"
+#~ msgstr "etikett"
+
+#~ msgid "the label"
+#~ msgstr "etiketten"
+
+#~ msgid "the label position"
+#~ msgstr "etikettpositionen"
+
+#~ msgid "label visible"
+#~ msgstr "synlig etikett"
+
+#~ msgid "image visible"
+#~ msgstr "synlig bild"
+
+#~ msgid "whether to show the image"
+#~ msgstr "huruvida bilden ska visas"
+
+#~ msgid "Spacing"
+#~ msgstr "Mellanrum"
+
+#~ msgid "The amount of space between the items."
+#~ msgstr "Mängden mellanrum mellan objekten."
+
+#~ msgid "X padding"
+#~ msgstr "X-utfyllnad"
+
+#~ msgid "the amount of horizontal padding space."
+#~ msgstr "mängden horisontell utfyllnad."
+
+#~ msgid "Y padding"
+#~ msgstr "Y-utfyllnad"
+
+#~ msgid "the amount of vertical padding space"
+#~ msgstr "mängden vertikal utfyllnad."
+
+#~ msgid "Horizontal alignment"
+#~ msgstr "Horisontell justering"
+
+#~ msgid ""
+#~ "Horizontal position of child in available space. 0.0 is left aligned, 1.0 "
+#~ "is right aligned"
+#~ msgstr ""
+#~ "Horisontell position för barn i tillgängligt utrymme. 0,0 är "
+#~ "vänsterställt, 1,0 är högerställt"
+
+#~ msgid "Vertical alignment"
+#~ msgstr "Vertikal justering"
+
+#~ msgid ""
+#~ "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
+#~ "bottom aligned"
+#~ msgstr ""
+#~ "Vertikal position för barn i tillgängligt utrymme. 0,0 är justerat mot "
+#~ "överkanten, 1,0 är justerat mot nederkanten"
+
+#~ msgid "fill"
+#~ msgstr "fyll"
+
+#~ msgid "expand to fill allocation"
+#~ msgstr "utöka så att allokering fylls"
+
+#~ msgid "horizontal spacing"
+#~ msgstr "horisontellt mellanrum"
+
+#~ msgid "The amount of horizontal spacing."
+#~ msgstr "Mängden horisontellt mellanrum."
+
+#~ msgid "vertical spacing"
+#~ msgstr "vertikalt mellanrum"
+
+#~ msgid "The amount of vertical spacing."
+#~ msgstr "Mängden vertikalt mellanrum."
+
+#~ msgid "horizontal justification"
+#~ msgstr "horisontell justering"
+
+#~ msgid "Left, right, or center justification"
+#~ msgstr "Vänsterställning, högerställning eller centrering"
+
+#~ msgid "Top, bottom, or middle justification"
+#~ msgstr "Överkants-, nederkants- eller mittjustering"
+
+#~ msgid "homogenous"
+#~ msgstr "homogen"
+
+#~ msgid "homogeneous layout"
+#~ msgstr "homogen layout"
+
+#~ msgid "_Move here"
+#~ msgstr "_Flytta hit"
+
+#~ msgid "_Copy here"
+#~ msgstr "_Kopiera hit"
+
+#~ msgid "_Link here"
+#~ msgstr "_Länka hit"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Fet"
+
+#~ msgid "Book"
+#~ msgstr "Bok"
+
+#~ msgid "Demibold"
+#~ msgstr "Halvfet"
+
+#~ msgid "Light"
+#~ msgstr "Tunn"
+
+#~ msgid "Italic"
+#~ msgstr "Kursiv"
+
+#~ msgid "Oblique"
+#~ msgstr "Lutande"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Omvänt kursiv"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Omvänt lutande"
+
+#~ msgid "Other"
+#~ msgstr "Annat"
+
+#~ msgid "Condensed"
+#~ msgstr "Kondenserad"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Halvkondenserad"
+
+#~ msgid "More..."
+#~ msgstr "Mer..."
+
+#~ msgid " -_,;.?/&"
+#~ msgstr " -_,;.?/&"
+
+#~ msgid "Beginner"
+#~ msgstr "Nybörjare"
+
+#~ msgid "Intermediate"
+#~ msgstr "Medel"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancerad"
diff --git a/po/ta.po b/po/ta.po
index 453758c9c..93aa92c9f 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#
 # translation of nautilus.HEAD.ta.po to
 # translation of ta.po to
 # This file is distributed under the same license as the PACKAGE package.
@@ -7,8 +8,22 @@
 # Felix <ifelix@redhat.com>, 2006.
 # Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2008.
 # I. Felix <ifelix@redhat.com>, 2008.
+# #-#-#-#-#  ta.po (ta)  #-#-#-#-#
+# translation of ta.po to 
+# translation of ta.po to Tamil
+# translation of eel.HEAD.ta.po to Tamil
+# Tamil translation of eel2.
+# Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Manjushree Thandu <manjushree_c@yahoo.com>, 2001.
+# Ma SivaKumar <tamil@leatherlink.net>, 2004.
+# Jayaradha N <jaya@pune.redhat.com>, 2004.
+# Jayaradha <njayaradha@yahoo.com>, 2005, 2006.
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus.HEAD.ta\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-15 04:15+0000\n"
@@ -32,6 +47,18 @@ msgstr ""
 "\n"
 "\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"Project-Id-Version: ta\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2007-07-08 15:51+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
+"Language-Team:  <zhakanini@yahoogroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -377,7 +404,8 @@ msgstr ""
 "அது 0 க்கும் குறைவானால் தடை ஏதும் இராது."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-msgid "Color for the default folder background. Only used if background_set is true."
+msgid ""
+"Color for the default folder background. Only used if background_set is true."
 msgstr "முன்னிருப்பு கோப்பு பின்னணிக்கு வண்ணம். பின்னணி உண்மை என்றால் மட்டும் அமை (_s)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
@@ -552,7 +580,8 @@ msgstr ""
 "எல்லா அடைவுகளையும் கோப்புகளையும் காட்டும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid "If set to true, newly opened windows will have the location bar visible."
+msgid ""
+"If set to true, newly opened windows will have the location bar visible."
 msgstr "உண்மை என அமைத்தால் , புதிதாக திறந்த சாளரங்களில் இடப்பட்டி தெரியும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -587,13 +616,15 @@ msgstr ""
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
-msgstr "உண்மை என அமைத்தால், நாடுலஸ் முதலில் அடைவுகளை காட்டிவிட்டு பின் சின்னங்களை காட்டும்."
+msgstr ""
+"உண்மை என அமைத்தால், நாடுலஸ் முதலில் அடைவுகளை காட்டிவிட்டு பின் சின்னங்களை காட்டும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
-msgstr "உண்மை என அமைத்தால், நாடுலஸ் கோப்புகளை குப்பைக்கு அனுப்பும் முன் உறுதிப்படுத்திக்கொள்ளும்."
+msgstr ""
+"உண்மை என அமைத்தால், நாடுலஸ் கோப்புகளை குப்பைக்கு அனுப்பும் முன் உறுதிப்படுத்திக்கொள்ளும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
@@ -631,7 +662,8 @@ msgstr ""
 msgid ""
 "If set to true, then Nautilus will never prompt nor autorun/autostart "
 "programs when a medium is inserted."
-msgstr "உண்மை என அமைத்தால், நாடுலஸ் ஊடகம் உள்ளிட்ட போது தானியங்கியாக துவக்கவா என கேட்காது."
+msgstr ""
+"உண்மை என அமைத்தால், நாடுலஸ் ஊடகம் உள்ளிட்ட போது தானியங்கியாக துவக்கவா என கேட்காது."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
@@ -677,7 +709,8 @@ msgstr " உண்மை என அமைதால் ஒரே உலாவி
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
-msgstr "உண்மை என அமைத்தால், பிணைய சேவையகங்களோடு தொடர்புடைய சின்னம் மேல்மேசையில் வந்து சேரும்."
+msgstr ""
+"உண்மை என அமைத்தால், பிணைய சேவையகங்களோடு தொடர்புடைய சின்னம் மேல்மேசையில் வந்து சேரும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid ""
@@ -695,7 +728,8 @@ msgstr "உண்மை என அமைத்தால், இல்ல அட�
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr "உண்மை என அமைத்தால், குப்பை தொட்டியோடுோடு தொடர்புடைய சின்னங்கள் மேல்மேசையில் வந்து சேரும்."
+msgstr ""
+"உண்மை என அமைத்தால், குப்பை தொட்டியோடுோடு தொடர்புடைய சின்னங்கள் மேல்மேசையில் வந்து சேரும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid ""
@@ -738,7 +772,8 @@ msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "உண்மையெனில் சின்னங்கள் புதிய சாளரத்தில் அருகருகே அடுக்கப்படும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
-msgid "If true, labels will be placed beside icons rather than underneath them."
+msgid ""
+"If true, labels will be placed beside icons rather than underneath them."
 msgstr "உண்மையெனில், பெயர்கள் சின்னங்களுக்கு கீழே இல்லாமல் ஓரத்தில் பொருத்தப்படும்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
@@ -795,7 +830,8 @@ msgid "List of x-content/* types set to \"Open Folder\""
 msgstr "\"அடைவை திற \"  க்கு அமைத்த x-உள்ளடக்க/* வகைகளின் பட்டியல்."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
-msgid "List of x-content/* types where the preferred application will be launched"
+msgid ""
+"List of x-content/* types where the preferred application will be launched"
 msgstr "முன் தேர்வு செய்த நிரல் துவங்க x-உள்ளடக்க/* வகைகளின் பட்டியல்.  "
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
@@ -975,7 +1011,8 @@ msgstr "மேல்மேசையில் உள்ள சின்னங்�
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "கோப்பு தேதியின் வடிவமைப்பு. மதிப்புகள் \"locale\", \"iso\", மற்றும்\"informal\"."
+msgstr ""
+"கோப்பு தேதியின் வடிவமைப்பு. மதிப்புகள் \"locale\", \"iso\", மற்றும்\"informal\"."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
@@ -1437,8 +1474,10 @@ msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "மன்னிக்கவும்.இடைவெளியற்ற விசைவார்த்தையை புதிய சின்னத்திற்கு பயன்படுத்தவும்"
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:215
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr "மன்னிக்கவும், சின்னம் விசைவார்த்தையில் எழுத்து, இடைவெளி மற்றும் எண்கள் மட்டுமே இருக்கவேண்டும்"
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+"மன்னிக்கவும், சின்னம் விசைவார்த்தையில் எழுத்து, இடைவெளி மற்றும் எண்கள் மட்டுமே இருக்கவேண்டும்"
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
@@ -1673,8 +1712,10 @@ msgid ""
 msgid_plural ""
 "Are you sure you want to permanently delete the %'d selected items from the "
 "trash?"
-msgstr[0] "தேர்ந்தெடுத்த %'d உருப்படியை குப்பையிலிருந்து நிச்சயம் நிரந்தரமாக நீக்க வேண்டுமா?"
-msgstr[1] "தேர்ந்தெடுத்த %'d உருப்படிகளை குப்பையிலிருந்து நிச்சயம் நிரந்தரமாக நீக்க வேண்டுமா?"
+msgstr[0] ""
+"தேர்ந்தெடுத்த %'d உருப்படியை குப்பையிலிருந்து நிச்சயம் நிரந்தரமாக நீக்க வேண்டுமா?"
+msgstr[1] ""
+"தேர்ந்தெடுத்த %'d உருப்படிகளை குப்பையிலிருந்து நிச்சயம் நிரந்தரமாக நீக்க வேண்டுமா?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1221
 #: ../libnautilus-private/nautilus-file-operations.c:1289
@@ -1707,7 +1748,8 @@ msgstr "\"%B\" ஐ நிச்சயம் நிரந்தரமாக ந�
 #: ../libnautilus-private/nautilus-file-operations.c:1280
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgid_plural ""
+"Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "தேர்ந்தெடுத்த %'d உருப்படியை நிச்சயம் நிரந்தரமாக நீக்க வேண்டுமா?"
 msgstr[1] "தேர்ந்தெடுத்த %'d உருப்படிகளை நிச்சயம் நிரந்தரமாக நீக்க வேண்டுமா?"
 
@@ -1748,7 +1790,8 @@ msgstr ""
 #: ../libnautilus-private/nautilus-file-operations.c:1407
 #: ../libnautilus-private/nautilus-file-operations.c:2362
 #: ../libnautilus-private/nautilus-file-operations.c:3304
-msgid "There was an error getting information about the files in the folder \"%B\"."
+msgid ""
+"There was an error getting information about the files in the folder \"%B\"."
 msgstr "\"%B\" அடைவில் உள்ள கோப்புகளை குறித்த தகவல் கிடைப்பதில் பிழை"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1416
@@ -1889,7 +1932,8 @@ msgstr ""
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
-msgstr "\"%B\"  கோப்பை கையாள முடியாது. ஏனெனெனில் அதை படிக்க தேவையான அனுமதி உமக்கு இல்லை."
+msgstr ""
+"\"%B\"  கோப்பை கையாள முடியாது. ஏனெனெனில் அதை படிக்க தேவையான அனுமதி உமக்கு இல்லை."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2478
 msgid "There was an error getting information about \"%B\"."
@@ -2101,7 +2145,8 @@ msgstr "\"%B\"  என பெயரிட்ட கோப்பு ஏற்க�
 #: ../libnautilus-private/nautilus-file-operations.c:3823
 #: ../libnautilus-private/nautilus-file-operations.c:4394
 #, c-format
-msgid "The file already exists in \"%F\".  Replacing it will overwrite its content."
+msgid ""
+"The file already exists in \"%F\".  Replacing it will overwrite its content."
 msgstr ""
 "\"%F\" இல் அந்த கோப்பு ஏற்கெனவே உள்ளது. நீங்கள் அதை மாற்றினால் அதில் உள்ள அனைத்தும் "
 "மேலெழுதப்படும்."
@@ -2804,8 +2849,13 @@ msgid "Could not set as default application"
 msgstr "முன்னிருப்பு பயன்பாடு ஆக அமைக்க முடியவில்லை"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "முன்னிருப்பு"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"முன்னிருப்பு\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"இயல்பான"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
 msgid "Icon"
@@ -2816,8 +2866,13 @@ msgid "Could not remove application"
 msgstr "பயன்பாட்டை நீக்க முடியவில்லை"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "பயன்பாடு ஏதும் தேர்ந்தெடுக்கப்பட இல்லை "
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"பயன்பாடு ஏதும் தேர்ந்தெடுக்கப்பட இல்லை \n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"பயன்பாடு எதுவும் தேர்வு செய்யப்படவில்லை"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2831,9 +2886,13 @@ msgid "Unknown"
 msgstr "தெரியாத"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "%s ஐ திறக்கவும் மற்றும் \"%s\" வகை கோப்புகளை திறக்கவும் பயன்பாடை தேர்வு செய்க"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"%s ஐ திறக்கவும் மற்றும் \"%s\" வகை கோப்புகளை திறக்கவும் பயன்பாடை தேர்வு செய்க\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"பயன்பாடு %s மற்றும் \"%s\" வகை கோப்புகளையும் திறப்பதற்காக பயன்பாட்டை தேர்வு செய்யவும் "
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2846,13 +2905,22 @@ msgid "Could not run application"
 msgstr "பயன்பாட்டை இயக்க முடியவில்லை"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "'%s' ஐ காணவில்லை"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"'%s' ஐ காணவில்லை\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"கண்டுபிடிக்க முடியவில்லை '%s'"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#, fuzzy
 msgid "Could not find application"
-msgstr "பயன்பாட்டை ஐ காணவில்லை"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"பயன்பாட்டை ஐ காணவில்லை\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"பயன்பாட்டை கண்டுபிடிக்க முடியவில்லை"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2860,12 +2928,22 @@ msgid "Could not add application to the application database: %s"
 msgstr "பயன்பாடு தரவுத்தளத்தில் பயன்பாட்டை சேர்க்க முடியவில்லை: %s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
+#, fuzzy
 msgid "Could not add application"
-msgstr " பயன்பாட்டை சேர்க்க முடியவில்லை"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+" பயன்பாட்டை சேர்க்க முடியவில்லை\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"பயன்பாட்டை சேர்க்க முடியவில்லை"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "பயன்பாட்டை தேர்வு செய்க"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"பயன்பாட்டை தேர்வு செய்க\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"பயன்பாட்டை தேர்வு செய்"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5104
@@ -2873,17 +2951,33 @@ msgid "Open With"
 msgstr "இதனால் திற"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "செயல்பாட்டின் விவரங்களை பார்க்க அதனை தெரிவு செய்யவும்"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"செயல்பாட்டின் விவரங்களை பார்க்க அதனை தெரிவு செய்யவும்\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"விளக்கத்தை பார்க்க பயன்பாட்டைத் தேர்வு செய்யவும்"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "தனிப்பயன் கட்டளை ஒன்றை பயன்படுத்துக"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"தனிப்பயன் கட்டளை ஒன்றை பயன்படுத்துக\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"(_U) தனிப்பயன் கட்டளையைப் பயன்படுத்தவும்"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
+#, fuzzy
 msgid "_Browse..."
-msgstr "_மேலோடு..."
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"_மேலோடு...\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"(_B)உலாவு..."
 
+#. #-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2895,19 +2989,33 @@ msgid "_Open"
 msgstr "(_O)திற"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "%s ஐ திறக்கவும் மற்றும் \"%s\" வகை கோப்புகளை திறக்கவும் இதை பயன்படுத்துக:"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"%s ஐ திறக்கவும் மற்றும் \"%s\" வகை கோப்புகளை திறக்கவும் இதை பயன்படுத்துக:\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"%s மற்றும் மற்றவகை கோப்புகளையும் \"%s\" ஆல் திற:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#, fuzzy
 msgid "_Add"
-msgstr "_ச சேர்"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"_ச சேர்\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"(_A)சேர்"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "செயலியைச் சேர்"
+msgstr ""
+"#-#-#-#-#  ta.po (nautilus.HEAD.ta)  #-#-#-#-#\n"
+"செயலியைச் சேர்\n"
+"#-#-#-#-#  ta.po (ta)  #-#-#-#-#\n"
+"பயன்பாட்டைச் சேர்"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -2972,7 +3080,8 @@ msgid "This drop target only supports local files."
 msgstr "இந்த இலக்கு உள் கோப்புகளை மட்டுமே ஆதரிக்கும்"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:399
-msgid "To open non-local files copy them to a local folder and then drop them again."
+msgid ""
+"To open non-local files copy them to a local folder and then drop them again."
 msgstr "உள்-இல்லாத கோப்புகளை திறக்க அவைகளை உங்கள் உள் அடைவிற்குள் நகலெடுக்கவும்"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:410
@@ -3042,7 +3151,8 @@ msgstr "தானியங்கி தூண்டி"
 
 #. tooltip
 #: ../nautilus-computer.desktop.in.in.h:1 ../src/nautilus-window-menus.c:862
-msgid "Browse all local and remote disks and folders accessible from this computer"
+msgid ""
+"Browse all local and remote disks and folders accessible from this computer"
 msgstr "இந்த கணினியிலிருந்து எல்லா உள்ளமை/தொலை வட்டுகள் மற்றும் அடைவுகளை அணுக உலாவு."
 
 #: ../nautilus-file-management-properties.desktop.in.in.h:1
@@ -3087,7 +3197,8 @@ msgid "Nautilus metafile factory"
 msgstr "நாடுலஸ் மெட்டா தொழிற்சாலை"
 
 #: ../src/Nautilus_shell.server.in.h:5
-msgid "Nautilus operations that can be done from subsequent command-line invocations"
+msgid ""
+"Nautilus operations that can be done from subsequent command-line invocations"
 msgstr "பின்வரும் கட்டளை வரி தூண்டுதல்களால் இயக்ககூடிய நாடுலஸ் செயல்பாடுகள்"
 
 #: ../src/Nautilus_shell.server.in.h:6
@@ -3127,7 +3238,8 @@ msgstr "(_B)மேல்மேசையின் பின்னனியை ம
 
 #. tooltip
 #: ../src/file-manager/fm-desktop-icon-view.c:701
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "உங்கள் மேல்மேசையின் நிறம் மற்றும் மாதிரியை தேர்வு செய்யும் சாளரத்தை காட்டவும்"
 
 #. label, accelerator
@@ -3309,7 +3421,8 @@ msgstr "இந்த அடைவில் உள்ள அனைத்து �
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
-msgstr "மெனுவிலிருந்து சிறுநிரலை தேர்வு செய்து தேர்வு செய்த உருப்படியை பயன்படுத்தி இயக்கவும்"
+msgstr ""
+"மெனுவிலிருந்து சிறுநிரலை தேர்வு செய்து தேர்வு செய்த உருப்படியை பயன்படுத்தி இயக்கவும்"
 
 #: ../src/file-manager/fm-directory-view.c:5521
 msgid ""
@@ -3366,16 +3479,20 @@ msgstr "ஒட்டு கட்டளையை தேர்வு செய்
 #: ../src/file-manager/fm-directory-view.c:5704
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural "The %'d selected items will be moved if you select the Paste command"
+msgid_plural ""
+"The %'d selected items will be moved if you select the Paste command"
 msgstr[0] "தேர்ந்தெடுக்கப்பட்ட %'d  உருப்படி ஒட்டு கட்டளையை தேர்ந்தெடுத்தால் நகர்த்தப்படும்."
 msgstr[1] "தேர்ந்தெடுக்கப்பட்ட %'d  உருப்படிகள் ஒட்டு கட்டளையை தேர்ந்தெடுத்தால் நகர்த்தப்படும்."
 
 #: ../src/file-manager/fm-directory-view.c:5711
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural "The %'d selected items will be copied if you select the Paste command"
-msgstr[0] "தேர்ந்தெடுக்கப்பட்ட %'d  உருப்படி ஒட்டு கட்டளையை தேர்ந்தெடுத்தால் பிரதி எடுக்கப்படும்."
-msgstr[1] "தேர்ந்தெடுக்கப்பட்ட %'d  உருப்படிகள் ஒட்டு கட்டளையை தேர்ந்தெடுத்தால் பிரதி எடுக்கப்படும்."
+msgid_plural ""
+"The %'d selected items will be copied if you select the Paste command"
+msgstr[0] ""
+"தேர்ந்தெடுக்கப்பட்ட %'d  உருப்படி ஒட்டு கட்டளையை தேர்ந்தெடுத்தால் பிரதி எடுக்கப்படும்."
+msgstr[1] ""
+"தேர்ந்தெடுக்கப்பட்ட %'d  உருப்படிகள் ஒட்டு கட்டளையை தேர்ந்தெடுத்தால் பிரதி எடுக்கப்படும்."
 
 #: ../src/file-manager/fm-directory-view.c:5767
 #: ../src/file-manager/fm-tree-view.c:1013
@@ -4063,7 +4180,8 @@ msgstr "கட்டளை"
 
 #: ../src/file-manager/fm-error-reporting.c:59
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\" இல் உள்ள கோப்புகளை பார்பதற்கு உங்களுக்கு அனுமதி இல்லை"
 
 #: ../src/file-manager/fm-error-reporting.c:63
@@ -4082,12 +4200,14 @@ msgstr "அடைவில் உள்ள கோப்புகளை காட
 
 #: ../src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "\"%s\" இந்த அடைவில் ஏற்கெனவே பயன்பாட்டில் உள்லது. வேறு பெயரை பயன்படுத்தவும்."
 
 #: ../src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "அடைவில் \"%s\" இல்லை. ஒருவேலை நகர்ந்திருக்கலாம் அல்லது நீக்கப்பட்டிருக்கலாம்"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -4119,7 +4239,8 @@ msgstr "இந்த உருப்படியின் பெயரை மா
 
 #: ../src/file-manager/fm-error-reporting.c:167
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\" குழுவில் மாற்றங்கள் செய்ய உங்களுக்கு அனுமதி உண்டா"
 
 #. fall through
@@ -4237,7 +4358,8 @@ msgstr "(_U)பெயர்வாரியாக அடுக்கு"
 #. tooltip
 #: ../src/file-manager/fm-icon-view.c:1495
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "சின்னங்களை சாளரத்தில் பொருந்துமாறு மாற்றி அமைத்து ஒன்றின் மேல் ஒன்றாக அடுக்குவதை தவிர்க"
+msgstr ""
+"சின்னங்களை சாளரத்தில் பொருந்துமாறு மாற்றி அமைத்து ஒன்றின் மேல் ஒன்றாக அடுக்குவதை தவிர்க"
 
 #. name, stock id
 #. label, accelerator
@@ -4408,7 +4530,8 @@ msgstr "நீங்கள் கைவிட்ட கோப்பு உங்
 #: ../src/file-manager/fm-properties-window.c:530
 #: ../src/nautilus-information-panel.c:518
 msgid "You can only use local images as custom icons."
-msgstr "உள் உங்கள் கணினியில் உள்ள சித்திரங்களை மட்டுமே தனிப்பயன் சின்னங்களாக பயன்படுத்த முடியும்."
+msgstr ""
+"உள் உங்கள் கணினியில் உள்ள சித்திரங்களை மட்டுமே தனிப்பயன் சின்னங்களாக பயன்படுத்த முடியும்."
 
 #: ../src/file-manager/fm-properties-window.c:529
 #: ../src/nautilus-information-panel.c:523
@@ -4883,7 +5006,8 @@ msgstr "<big><b>தானியங்கி நிரல் பிழை</b></bi
 msgid ""
 "<big><b>This medium contains software intended to be automatically started. "
 "Would you like to run it?</b></big>"
-msgstr "<big><b> இந்த ஊடகத்தில்  தானியங்கியாக உத்தேசித்த  நிரல் உள்ளது. இயக்கலாமா?</b></big>"
+msgstr ""
+"<big><b> இந்த ஊடகத்தில்  தானியங்கியாக உத்தேசித்த  நிரல் உள்ளது. இயக்கலாமா?</b></big>"
 
 #: ../src/nautilus-autorun-software.c:196
 #, c-format
@@ -5290,7 +5414,8 @@ msgid "Choose the order of information to appear in the list view."
 msgstr "பட்டியல்காட்சியில் தெரியவேண்டிய தகவல்களின் வரிசையை தேர்வு செய்"
 
 #: ../src/nautilus-file-management-properties.glade.h:51
-msgid "Choose what happens when inserting media or connecting devices to the system"
+msgid ""
+"Choose what happens when inserting media or connecting devices to the system"
 msgstr "ஊடகம் அல்லது இணைக்கும் சாதனங்களை உள்ளீடும்போது என்ன செய்ய வேண்டும் என தேர்வு செய்க:"
 
 #: ../src/nautilus-file-management-properties.glade.h:52
@@ -5635,7 +5760,8 @@ msgstr "[URI...]"
 msgid ""
 "Load a saved session from the specified file. Implies \"--no-default-window"
 "\"."
-msgstr "சேமித்த அமர்வை குறித்த கோப்பிலிருந்து ஏற்றுக. இது சொல்வது:\"--no-default-window\"."
+msgstr ""
+"சேமித்த அமர்வை குறித்த கோப்பிலிருந்து ஏற்றுக. இது சொல்வது:\"--no-default-window\"."
 
 #: ../src/nautilus-main.c:407
 msgid "FILENAME"
@@ -5793,7 +5919,8 @@ msgstr "கோப்புகளை தேடுகிறது..."
 #: ../src/nautilus-navigation-window-menus.c:799
 #: ../src/nautilus-spatial-window.c:906
 msgid "Locate documents and folders on this computer by name or content"
-msgstr "இந்த கணினியில் உள்ள ஆவணங்கள் அல்லது அடைவுகளை பெயராலோ உள்ளடக்கத்தாலோ கண்டுபிடிக்கவும்"
+msgstr ""
+"இந்த கணினியில் உள்ள ஆவணங்கள் அல்லது அடைவுகளை பெயராலோ உள்ளடக்கத்தாலோ கண்டுபிடிக்கவும்"
 
 #: ../src/nautilus-navigation-window-menus.c:802
 msgid "_Previous Tab"
@@ -6348,7 +6475,8 @@ msgid "Could not display \"%s\", because the host could not be found."
 msgstr "\"%s\" ஐ காட்ட முடியவில்லை. ஏனெனில் புரவலனை காணமுடியவில்லை."
 
 #: ../src/nautilus-window-manage-views.c:1933
-msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "எழுத்துப்பிழை உள்ளதா என பார்க்கவும் அல்லது உங்கள் ப்ராக்ஸி அமைப்புகள் சரியாக உள்ளதா என "
 "பார்க்கவும்"
@@ -6635,7 +6763,8 @@ msgstr "CD/DVD உருவாக்கி (_D)"
 #. tooltip
 #: ../src/nautilus-window-menus.c:878
 msgid "Open a folder into which you can drag files to burn to a CD or DVD"
-msgstr "ஒரு குறுந்தட்டையோ டிவிடி யையோ உருவாக்க கோப்புகளை இழுத்துவிட ஒரு அடைவை திறங்கள்."
+msgstr ""
+"ஒரு குறுந்தட்டையோ டிவிடி யையோ உருவாக்க கோப்புகளை இழுத்துவிட ஒரு அடைவை திறங்கள்."
 
 #. name, stock id
 #. label, accelerator
@@ -6722,3 +6851,154 @@ msgstr "பெரிதாக்கு"
 msgid "Set the zoom level of the current view"
 msgstr "தற்போதைய காட்சியின் காட்சி மட்டத்தை அமை"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "சித்திரம்/அடையாளப் பட்டி விளிம்பு"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "தகவல் உரையாடலில் அடையாளப்பட்டி  மற்றும் சித்திரத்தைச் சுற்றி உள்ள விளிம்பின் அகலம்"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "தகவல் வகை"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "தகவலின் வகை"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "தகவல் பொத்தான்கள்"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "தகவல் உரையாடலில் காண்பிக்கப்படும் பொத்தான்கள்"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "இன்னும் விவரங்களைக் காட்டவும்"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "உரை"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "பட்டியின் உரை"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "வரி அமைப்பு"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"தலைப்பு பட்டியின் உரையில் வரிகளின் ஒன்றுக்கொன்றான அமைப்பு. இது தலைப்புப் பட்டியின் "
+"அமைப்பை பாதிக்காது. அதற்கு GtkMisc::xalign ஐ பார்க்கவும்."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "வரி மடிப்பு"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "உரை மிக நீளமாக இருந்தால், வரிகளை மடிக்கவும்"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "சுட்டி நிலை"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "உள்ளீடு சுட்டியின் தற்போதைய நிலை (எழுத்துகளில்)"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "தேர்வு எல்லை"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "சுட்டி நிலையிலிருந்து தேர்வின் எதிர் நிலையின் தூரம் (எழுத்துகளில்)"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "அனைத்தையும் தேர்வு செய்"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "உள்ளீடு முறைகள்"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf பிழை:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf பிழை: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "இனி வரும் பிழைகளை முனையத்தில் மட்டுமே காட்டவும்"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "எந்த சித்திரமும் தேர்ந்தெடுக்கப்படவில்லை"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "தேர்வு செய்ய சித்திரத்தின் மேல் க்ளிக் செய்ய வேண்டும்."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "ரத்து செய் என்பதை அழுத்தி இந்த வேலையை நிறுத்திக் கொள்ளலாம்"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(சரியில்லாத யூனிகோடு)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "%s ஐ திறக்கிறது"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d உருப்படியை திறக்கிறது"
+msgstr[1] "%d உருப்படிகளை திறக்கிறது"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "கடவுச்சொல்லை உள்ளிடுக"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "பயன்பாட்டை பயன்பாடு தரவுத்தளத்தில் சேர்க்க முடியவில்லை"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 AM"
diff --git a/po/th.po b/po/th.po
index df4398e3a..b416a1fbb 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#
 # translation of th.po to Thai
 # Thai nautilus translation.
 # Copyright (C) 2003-2008 Free Software Foundation, Inc.
@@ -6,8 +7,18 @@
 # Supranee Thirawatthanasuk <supranee@opentle.org>, 2005.
 # Theppitak Karoonboonyanan <thep@linux.thai.net>, 2005-2008.
 #
+# #-#-#-#-#  th.po (eel)  #-#-#-#-#
+# Thai translation for eel.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the eel package.
+# Paisa Seeluangsawat <paisa@colorado.edu>, 2003.
+# Supranee Thirawatthanasuk <supranee@opentle.org>, 2004.
+# Theppitak Karoonboonyanan <thep@linux.thai.net>, 2004-2008.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus 2.19.91\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-10 21:40+0700\n"
@@ -18,6 +29,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-31 18:17+0700\n"
+"PO-Revision-Date: 2008-01-31 18:18+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
+"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/browser.xml.h:1
 msgid "Apparition"
@@ -1119,8 +1141,7 @@ msgstr "ไม่ต้องทำอะไร"
 msgid "Open Folder"
 msgstr "เปิดโฟลเดอร์"
 
-#: libnautilus-private/nautilus-autorun.c:538
-#: src/nautilus-x-content-bar.c:122
+#: libnautilus-private/nautilus-autorun.c:538 src/nautilus-x-content-bar.c:122
 #, c-format
 msgid "Open %s"
 msgstr "เปิด %s"
@@ -2539,8 +2560,7 @@ msgstr "มุมมองแบบกระชับ"
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
 #: libnautilus-private/nautilus-global-preferences.c:142
-#: src/file-manager/fm-list-view.c:1516
-#: src/file-manager/fm-list-view.c:2932
+#: src/file-manager/fm-list-view.c:1516 src/file-manager/fm-list-view.c:2932
 msgid "List View"
 msgstr "มุมมองแบบรายชื่อ"
 
@@ -2765,8 +2785,13 @@ msgid "Could not remove application"
 msgstr "ไม่สามารถลบโปรแกรม"
 
 #: libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "ไม่ได้เลือกโปรแกรมไว้"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"ไม่ได้เลือกโปรแกรมไว้\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"ไม่มีโปรแกรมเลือกไว้"
 
 #: libnautilus-private/nautilus-mime-application-chooser.c:592
 #: libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2776,13 +2801,22 @@ msgstr "เอกสาร %s"
 
 #: libnautilus-private/nautilus-mime-application-chooser.c:599
 #: libnautilus-private/nautilus-open-with-dialog.c:910
+#, fuzzy
 msgid "Unknown"
-msgstr "ไม่ทราบ"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"ไม่ทราบ\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"ไม่รู้จัก"
 
 #: libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "เลือกโปรแกรมที่จะใช้เปิด %s และแฟ้มชนิด \"%s\" อื่นๆ"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"เลือกโปรแกรมที่จะใช้เปิด %s และแฟ้มชนิด \"%s\" อื่นๆ\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"เลือกโปรแกรมที่จะเปิด %s และแฟ้มอื่นๆ ที่เป็นชนิด \"%s\""
 
 #: libnautilus-private/nautilus-mime-application-chooser.c:700
 #: libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2791,17 +2825,31 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "เปิดแฟ้มชนิด \"%s\" ทั้งหมดด้วย:"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:145
+#, fuzzy
 msgid "Could not run application"
-msgstr "ไม่สามารถเรียกใช้โปรแกรม"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"ไม่สามารถเรียกใช้โปรแกรม\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"ไม่สามารถเรียกใช้งานโปรแกรม"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "ไม่พบ '%s'"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"ไม่พบ '%s'\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"ไม่สามารถหา '%s'"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:160
+#, fuzzy
 msgid "Could not find application"
-msgstr "หาโปรแกรมไม่พบ"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"หาโปรแกรมไม่พบ\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"ไม่สามารถหาโปรแกรมได้"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2818,35 +2866,59 @@ msgstr "เลือกโปรแกรม"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:727
 #: src/file-manager/fm-properties-window.c:5070
+#, fuzzy
 msgid "Open With"
-msgstr "เปิดด้วย"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"เปิดด้วย\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"เปิดด้วยโปรแกรม"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "เลือกโปรแกรมเพื่อดูคำบรรยาย"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"เลือกโปรแกรมเพื่อดูคำบรรยาย\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"เลือกโปรแกรมที่จะใช้เปิดดูเนื้อหาของแฟ้มนี้"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "ใ_ช้คำสั่งที่กำหนดเอง"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"ใ_ช้คำสั่งที่กำหนดเอง\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"ใช้คำสั่ง_กำหนดเอง"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:806
+#, fuzzy
 msgid "_Browse..."
-msgstr "_ท่องดู..."
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"_ท่องดู...\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"เ_รียกดู..."
 
+#. #-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: libnautilus-private/nautilus-open-with-dialog.c:828
 #: src/file-manager/fm-directory-view.c:6599
 #: src/file-manager/fm-directory-view.c:7799
-#: src/file-manager/fm-tree-view.c:1174
-#: src/nautilus-places-sidebar.c:1954
+#: src/file-manager/fm-tree-view.c:1174 src/nautilus-places-sidebar.c:1954
 msgid "_Open"
 msgstr "_เปิด"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "เปิด %s และแฟ้มชนิด \"%s\" อื่นๆ ด้วย:"
+msgstr ""
+"#-#-#-#-#  th.po (nautilus 2.19.91)  #-#-#-#-#\n"
+"เปิด %s และแฟ้มชนิด \"%s\" อื่นๆ ด้วย:\n"
+"#-#-#-#-#  th.po (eel)  #-#-#-#-#\n"
+"เปิด %s และแฟ้มอื่นๆ ที่เป็นชนิด \"%s\" ด้วย:"
 
 #: libnautilus-private/nautilus-open-with-dialog.c:955
 #: libnautilus-private/nautilus-open-with-dialog.c:970
@@ -3082,8 +3154,7 @@ msgstr "เทขยะ"
 
 #. tooltip
 #: src/file-manager/fm-desktop-icon-view.c:708
-#: src/file-manager/fm-directory-view.c:6632
-#: src/nautilus-trash-bar.c:132
+#: src/file-manager/fm-directory-view.c:6632 src/nautilus-trash-bar.c:132
 msgid "Delete all items in the Trash"
 msgstr "ลบรายการทั้งหมดในถังขยะ"
 
@@ -3109,8 +3180,7 @@ msgstr[0] "การเปิดนี้จะเปิดหน้าต่า
 
 #: src/file-manager/fm-directory-view.c:1135
 #: src/file-manager/fm-properties-window.c:5418
-#: src/nautilus-connect-server-dialog.c:343
-#: src/nautilus-location-dialog.c:109
+#: src/nautilus-connect-server-dialog.c:343 src/nautilus-location-dialog.c:109
 msgid "There was an error displaying help."
 msgstr "เกิดข้อผิดพลาดขณะแสดงวิธีใช้"
 
@@ -3430,8 +3500,7 @@ msgstr "เปิดแต่ละรายการที่เลือก �
 #: src/file-manager/fm-directory-view.c:6757
 #: src/file-manager/fm-directory-view.c:7576
 #: src/file-manager/fm-directory-view.c:7850
-#: src/file-manager/fm-tree-view.c:1185
-#: src/nautilus-places-sidebar.c:1962
+#: src/file-manager/fm-tree-view.c:1185 src/nautilus-places-sidebar.c:1962
 msgid "Open in New _Tab"
 msgstr "เปิดในแ_ท็บใหม่"
 
@@ -3860,8 +3929,7 @@ msgstr[0] "ย้ายรายการที่เลือกออกจา
 #. add the "open in new window" menu item
 #: src/file-manager/fm-directory-view.c:7551
 #: src/file-manager/fm-directory-view.c:7810
-#: src/file-manager/fm-tree-view.c:1194
-#: src/nautilus-places-sidebar.c:1969
+#: src/file-manager/fm-tree-view.c:1194 src/nautilus-places-sidebar.c:1969
 msgid "Open in New _Window"
 msgstr "เปิดในห_น้าต่างใหม่"
 
@@ -3963,8 +4031,7 @@ msgstr "ใช้วิธีลากที่ไม่ถูกต้อง"
 msgid "dropped text.txt"
 msgstr "dropped text.txt"
 
-#: src/file-manager/fm-ditem-page.c:317
-#: src/file-manager/fm-ditem-page.c:327
+#: src/file-manager/fm-ditem-page.c:317 src/file-manager/fm-ditem-page.c:327
 msgid "Comment"
 msgstr "หมายเหตุ"
 
@@ -3972,8 +4039,7 @@ msgstr "หมายเหตุ"
 msgid "URL"
 msgstr "URL"
 
-#: src/file-manager/fm-ditem-page.c:323
-#: src/file-manager/fm-ditem-page.c:333
+#: src/file-manager/fm-ditem-page.c:323 src/file-manager/fm-ditem-page.c:333
 #: src/nautilus-image-properties-page.c:310
 msgid "Description"
 msgstr "คำบรรยาย"
@@ -4084,8 +4150,7 @@ msgstr "กำลังเปลี่ยนชื่อ \"%s\" ไปเป็�
 msgid "by _Name"
 msgstr "ตาม_ชื่อ"
 
-#: src/file-manager/fm-icon-view.c:124
-#: src/file-manager/fm-icon-view.c:1524
+#: src/file-manager/fm-icon-view.c:124 src/file-manager/fm-icon-view.c:1524
 msgid "Keep icons sorted by name in rows"
 msgstr "เรียงไอคอนเป็นแถวตามชื่อ"
 
@@ -4093,8 +4158,7 @@ msgstr "เรียงไอคอนเป็นแถวตามชื่อ
 msgid "by _Size"
 msgstr "ตาม_ขนาด"
 
-#: src/file-manager/fm-icon-view.c:131
-#: src/file-manager/fm-icon-view.c:1528
+#: src/file-manager/fm-icon-view.c:131 src/file-manager/fm-icon-view.c:1528
 msgid "Keep icons sorted by size in rows"
 msgstr "เรียงไอคอนเป็นแถวตามขนาด"
 
@@ -4102,8 +4166,7 @@ msgstr "เรียงไอคอนเป็นแถวตามขนาด
 msgid "by _Type"
 msgstr "ตาม_ประเภท"
 
-#: src/file-manager/fm-icon-view.c:138
-#: src/file-manager/fm-icon-view.c:1532
+#: src/file-manager/fm-icon-view.c:138 src/file-manager/fm-icon-view.c:1532
 msgid "Keep icons sorted by type in rows"
 msgstr "เรียงไอคอนเป็นแถวตามประเภท"
 
@@ -4111,8 +4174,7 @@ msgstr "เรียงไอคอนเป็นแถวตามประเ
 msgid "by Modification _Date"
 msgstr "ตาม_วันที่แก้ไข"
 
-#: src/file-manager/fm-icon-view.c:145
-#: src/file-manager/fm-icon-view.c:1536
+#: src/file-manager/fm-icon-view.c:145 src/file-manager/fm-icon-view.c:1536
 msgid "Keep icons sorted by modification date in rows"
 msgstr "เรียงไอคอนเป็นแถวตามวันที่ถูกแก้ไข"
 
@@ -4120,8 +4182,7 @@ msgstr "เรียงไอคอนเป็นแถวตามวันท
 msgid "by _Emblems"
 msgstr "ตาม_ตรา"
 
-#: src/file-manager/fm-icon-view.c:152
-#: src/file-manager/fm-icon-view.c:1540
+#: src/file-manager/fm-icon-view.c:152 src/file-manager/fm-icon-view.c:1540
 msgid "Keep icons sorted by emblems in rows"
 msgstr "เรียงไอคอนเป็นแถวตามตรา"
 
@@ -4143,8 +4204,7 @@ msgstr "ย่อขยายขนาดของไอคอนที่เล
 
 #. name, stock id
 #. label, accelerator
-#: src/file-manager/fm-icon-view.c:1490
-#: src/file-manager/fm-icon-view.c:1660
+#: src/file-manager/fm-icon-view.c:1490 src/file-manager/fm-icon-view.c:1660
 msgid "Restore Icons' Original Si_zes"
 msgstr "กลับไปใช้_ขนาดปกติของไอคอน"
 
@@ -4268,13 +4328,12 @@ msgstr "เกิดข้อผิดพลาดขณะเริ่มต้
 msgid "Display this location with the compact view."
 msgstr "แสดงตำแหน่งนี้ด้วยมุมมองแบบกระชับ"
 
-#: src/file-manager/fm-list-model.c:373
-#: src/file-manager/fm-tree-model.c:1266
+#: src/file-manager/fm-list-model.c:373 src/file-manager/fm-tree-model.c:1266
 msgid "(Empty)"
 msgstr "(ว่าง)"
 
-#: src/file-manager/fm-list-model.c:375
-#: src/file-manager/fm-tree-model.c:1266 src/nautilus-window-slot.c:191
+#: src/file-manager/fm-list-model.c:375 src/file-manager/fm-tree-model.c:1266
+#: src/nautilus-window-slot.c:191
 msgid "Loading..."
 msgstr "กำลังโหลด..."
 
@@ -4435,8 +4494,7 @@ msgstr "จุดหมายจุดเชื่อมโยง:"
 msgid "Size:"
 msgstr "ขนาด:"
 
-#: src/file-manager/fm-properties-window.c:3284
-#: src/nautilus-location-bar.c:57
+#: src/file-manager/fm-properties-window.c:3284 src/nautilus-location-bar.c:57
 msgid "Location:"
 msgstr "ตำแหน่ง:"
 
@@ -4639,8 +4697,7 @@ msgstr "กำลังสร้างหน้าต่างคุณสมบ
 msgid "Select Custom Icon"
 msgstr "เลือกไอคอนกำหนดเอง"
 
-#: src/file-manager/fm-tree-view.c:1345
-#: src/nautilus-places-sidebar.c:322
+#: src/file-manager/fm-tree-view.c:1345 src/nautilus-places-sidebar.c:322
 msgid "File System"
 msgstr "ระบบแฟ้ม"
 
@@ -4783,8 +4840,7 @@ msgstr ""
 msgid "Unable to eject %s"
 msgstr "ไม่สามารถดัน %s ออกได้"
 
-#: src/nautilus-autorun-software.c:144
-#: src/nautilus-autorun-software.c:147
+#: src/nautilus-autorun-software.c:144 src/nautilus-autorun-software.c:147
 #, c-format
 msgid "Error starting autorun program: %s"
 msgstr "เกิดข้อผิดพลาดขณะเรียกโปรแกรมอัตโนมัติ: %s"
@@ -5410,8 +5466,7 @@ msgstr "ระยะโฟกัส"
 msgid "Software"
 msgstr "ซอฟต์แวร์"
 
-#: src/nautilus-image-properties-page.c:309
-#: src/nautilus-query-editor.c:117
+#: src/nautilus-image-properties-page.c:309 src/nautilus-query-editor.c:117
 msgid "Location"
 msgstr "ตำแหน่ง"
 
@@ -5575,8 +5630,7 @@ msgid "Nautilus"
 msgstr "Nautilus"
 
 #. translators: %s is an option (e.g. --check)
-#: src/nautilus-main.c:519 src/nautilus-main.c:528
-#: src/nautilus-main.c:533
+#: src/nautilus-main.c:519 src/nautilus-main.c:528 src/nautilus-main.c:533
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
 msgstr "nautilus: ใช้ %s กับ URI ไม่ได้\n"
@@ -5974,8 +6028,7 @@ msgstr "ติดตั้งลวดลาย %s ไม่สำเร็จ"
 msgid "Select an Image File to Add as a Pattern"
 msgstr "เลือกแฟ้มรูปที่จะใช้เป็นลวดลาย"
 
-#: src/nautilus-property-browser.c:1274
-#: src/nautilus-property-browser.c:1305
+#: src/nautilus-property-browser.c:1274 src/nautilus-property-browser.c:1305
 msgid "The color cannot be installed."
 msgstr "ไม่สามารถติดตั้งสีได้"
 
@@ -5991,14 +6044,12 @@ msgstr "คุณต้องตั้งชื่อสำหรับสีใ
 msgid "Select a Color to Add"
 msgstr "เลือกสีที่จะเพิ่ม"
 
-#: src/nautilus-property-browser.c:1396
-#: src/nautilus-property-browser.c:1413
+#: src/nautilus-property-browser.c:1396 src/nautilus-property-browser.c:1413
 #, c-format
 msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "\"%s\" ไม่ใช่แฟ้มรูปที่ใช้ได้"
 
-#: src/nautilus-property-browser.c:1397
-#: src/nautilus-property-browser.c:1414
+#: src/nautilus-property-browser.c:1397 src/nautilus-property-browser.c:1414
 msgid "The file is not an image."
 msgstr "แฟ้มนี้ไม่ใช่แฟ้มรูป"
 
@@ -6639,6 +6690,145 @@ msgstr "ขยายเข้า/ออก"
 msgid "Set the zoom level of the current view"
 msgstr "ตั้งขนาดย่อขยายสำหรับมุมมองปัจจุบัน"
 
+#: eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "กำลังเปิด %d รายการ"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "ขอบรูปและป้ายข้อความ"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "ความกว้างขอบที่อยู่รอบรูปและป้ายข้อความในหน้าต่างคำเตือน"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "ชนิดของการเตือน"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "ชนิดของรูปแบบการเตือน"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "ปุ่มการเตือน"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "ปุ่มต่างๆ ที่แสดงในหน้าต่างการเตือน"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "แสดง_รายละเอียด"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "ข้อความ"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "ข้อความบนป้ายข้อความ"
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "การจัดชิดขอบ"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"การจัดข้อความชิดขอบข้างในแถบข้อความ ซึ่งจะไม่เกี่ยวกับการเรียงตำแหน่งแถบข้อความ (ซึ่งปรับโดย "
+"GtkMisc::xalign)"
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "ตัดบรรทัด"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "ข้อความที่ยาวจะถูกตัดขึ้นบรรทัดใหม่"
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "ตำแหน่งเคอร์เซอร์"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "ตำแหน่งปัจจุบันของเคอร์เซอร์ วัดเป็นตัวอักษร"
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "ขอบส่วนเลือก"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "ตำแหน่งของขอบส่วนเลือกด้านตรงข้ามกับเคอร์เซอร์ วัดเป็นตัวอักษร"
+
+#: eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "เลือกทั้งหมด"
+
+#: eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Input Methods"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"เกิดข้อผิดพลาดใน GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "เกิดข้อผิดพลาดใน GConf:%s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "ข้อผิดพลาดที่มากไปกว่านี้จะแสดงเฉพาะในเทอร์มินัล"
+
+#: eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "ไม่มีรูปที่เลือกไว้"
+
+#: eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "คุณต้องคลิกรูปที่จะเลือก"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "ถ้าต้องการเลิกปฏิบัติการนี้โปรดคลิกปุ่ม ยกเลิก"
+
+#: eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (ยูนิโค้ดผิดรูปแบบ)"
+
+#: eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "กำลังเปิด %s"
+
+#: eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "ป้อนรหัสผ่าน"
+
 #~ msgid "Are you sure you want to forget history?"
 #~ msgstr "แน่ใจหรือไม่ว่าจะลบประวัติการใช้งาน?"
 
@@ -7009,10 +7199,6 @@ msgstr "ตั้งขนาดย่อขยายสำหรับมุม
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "\"%s\" ไม่ใช่ตำแหน่งที่ถูกต้อง"
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "กำลังเปิด %d รายการ"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "ถ้าคุณเลือกลบแล้ว ข้อมูลจะถูกลบทิ้งโดยถาวร"
 
@@ -7923,3 +8109,33 @@ msgstr "ตั้งขนาดย่อขยายสำหรับมุม
 
 #~ msgid "Nautilus file manager search results list view"
 #~ msgstr "มุมมองแบบรายชื่อของผลการค้นหาตัวจัดการแฟ้มของ Nautilus"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "ไม่สามารถเพิ่มโปรแกรมนี้ในฐานข้อมูลโปรแกรมได้"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 AM"
+
+#~ msgid "GConf Error"
+#~ msgstr "เกิดข้อผิดพลาดใน GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "ยังไม่ได้ทำการเลือก"
+
+#~ msgid "Info"
+#~ msgstr "ข้อมูล"
+
+#~ msgid "Warning"
+#~ msgstr "คำเตือน"
+
+#~ msgid "Error"
+#~ msgstr "ผิดพลาด"
+
+#~ msgid "Question"
+#~ msgstr "คำถาม"
diff --git a/po/tr.po b/po/tr.po
index b0d23cac1..c8fb1a34c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # translation of tr.po to Turkish
 # Turkish translation of Nautilus.
 # Copyright (C) 2000-2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
@@ -7,8 +8,18 @@
 # Görkem Cetin <gorkem@gelecek.com.tr>, 2001, 2002.
 # Arman Aksoy <armish@linux-sevenler.de>, 2003.
 # Baris Cicek <baris@teamforce.name.tr>, 2004, 2005, 2006, 2008.
+# #-#-#-#-#  tr.po (eel)  #-#-#-#-#
+# Turkish translation of eel.
+# Copyright (C) 2000-2003, 2004, 2007 Free Software Foundation, Inc.
+#
+# Fatih Demir <kabalak@gtranslator.org>, 2000.
+# Ömer Fadıl USTA <omer_fad@hotmail.com>, 2001.
+# Arman Aksoy <armish@linux-sevenler.de>, 2003.
+# Baris Cicek <baris@teamforce.name.tr>, 2004, 2007, 2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  tr.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-09 10:59+0300\n"
@@ -20,6 +31,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
+"#-#-#-#-#  tr.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-14 02:32+0300\n"
+"PO-Revision-Date: 2008-09-14 02:32+0300\n"
+"Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
+"Language-Team: Turkish <gnome-turk@gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=1; plural=0;\n"
 
 # data/browser.xml.h:2
 #: ../data/browser.xml.h:1
@@ -1439,6 +1461,7 @@ msgstr "_Aşağı Taşı"
 msgid "Use De_fault"
 msgstr "Öntanımlı _Kullan"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1165
 # src/file-manager/fm-list-view.c:1918
 # src/file-manager/fm-search-list-view.c:334
@@ -3194,11 +3217,13 @@ msgstr "Uygulamalar öntanımlı olarak atanamadı: %s"
 msgid "Could not set as default application"
 msgstr "Öntanımlı uygulama olarak atanamadı"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
 msgid "Default"
 msgstr "Öntanımlı"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/Nautilus_shell.oaf.in.h:2
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
 msgid "Icon"
@@ -3212,13 +3237,19 @@ msgstr "Uygulama silinemedi"
 msgid "No applications selected"
 msgstr "Hiçbir uygulama seçilmedi"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # components/music/mpg123.c:62
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, c-format
+#, fuzzy, c-format
 msgid "%s document"
-msgstr "%s belge"
+msgstr ""
+"#-#-#-#-#  tr.po (nautilus)  #-#-#-#-#\n"
+"%s belge\n"
+"#-#-#-#-#  tr.po (eel)  #-#-#-#-#\n"
+"%s belgesi"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # B# libnautilus-private/nautilus-file.c:3629
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:910
@@ -3226,9 +3257,13 @@ msgid "Unknown"
 msgstr "Bilinmeyen"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "%s ve \"%s\" türündeki diğer dosyaları açmak için bir uygulama seçin"
+msgstr ""
+"#-#-#-#-#  tr.po (nautilus)  #-#-#-#-#\n"
+"%s ve \"%s\" türündeki diğer dosyaları açmak için bir uygulama seçin\n"
+"#-#-#-#-#  tr.po (eel)  #-#-#-#-#\n"
+"%s ve diğer \"%s\" türdeki dosyaları açmak için bi uygulama seçin"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -3240,6 +3275,7 @@ msgstr "\"%s\" türündeki tüm dosyaları birlikte aç:"
 msgid "Could not run application"
 msgstr "Uygulama çalıştırılamadı"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/nautilus-theme-selector.c:397
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
 #, c-format
@@ -3255,16 +3291,24 @@ msgstr "Uygulama bulunamadı"
 msgid "Could not add application to the application database: %s"
 msgstr "Uygulama uygulama veritabanına eklenemedi: %s"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/nautilus-shell-ui.xml.h:31
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
 msgid "Could not add application"
 msgstr "Uygulama eklenemedi"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/nautilus-property-browser.c:2169
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "Bir Uygulama Seç"
+msgstr ""
+"#-#-#-#-#  tr.po (nautilus)  #-#-#-#-#\n"
+"Bir Uygulama Seç\n"
+"#-#-#-#-#  tr.po (eel)  #-#-#-#-#\n"
+"Bir Uygulama Seçin"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/file-manager/nautilus-directory-view-ui.xml.h:18
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5070
@@ -3272,19 +3316,32 @@ msgid "Open With"
 msgstr "Birlikte Aç"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Tanımını görüntülemek için bir uygulama seçin."
+msgstr ""
+"#-#-#-#-#  tr.po (nautilus)  #-#-#-#-#\n"
+"Tanımını görüntülemek için bir uygulama seçin.\n"
+"#-#-#-#-#  tr.po (eel)  #-#-#-#-#\n"
+"Açıklamasını görüntülemek için bir uygulama seçin."
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "Özel _komut kullan"
+msgstr ""
+"#-#-#-#-#  tr.po (nautilus)  #-#-#-#-#\n"
+"Özel _komut kullan\n"
+"#-#-#-#-#  tr.po (eel)  #-#-#-#-#\n"
+"Ö_zel bir komut kullan"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/nautilus-property-browser.c:389
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Göz at..."
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # src/file-manager/nautilus-directory-view-ui.xml.h:40
+#. #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -3296,15 +3353,20 @@ msgid "_Open"
 msgstr "_Aç"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "%s ve \"%s\" türündeki diğer dosyaları birlikte aç:"
+msgstr ""
+"#-#-#-#-#  tr.po (nautilus)  #-#-#-#-#\n"
+"%s ve \"%s\" türündeki diğer dosyaları birlikte aç:\n"
+"#-#-#-#-#  tr.po (eel)  #-#-#-#-#\n"
+"%s ve diğer \"%s\" türdeki dosyaları birlikte aç:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
 msgid "_Add"
 msgstr "_Ekle"
 
+# #-#-#-#-#  tr.po (nautilus)  #-#-#-#-#
 # data/browser.xml.h:2
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
@@ -7700,6 +7762,137 @@ msgstr "Odaklan"
 msgid "Set the zoom level of the current view"
 msgstr "Güncel görünümün yakınlaştırma seviyesini ayarla"
 
+#: ../eel/eel-alert-dialog.c:109
+msgid "Image/label border"
+msgstr "Resim/etiket sınırı"
+
+#: ../eel/eel-alert-dialog.c:110
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Uyarı penceresindeki resim ve etiketlerin sınırlarının genişliği"
+
+#: ../eel/eel-alert-dialog.c:119
+msgid "Alert Type"
+msgstr "Uyarı Türü"
+
+#: ../eel/eel-alert-dialog.c:120
+msgid "The type of alert"
+msgstr "Uyarının türü"
+
+#: ../eel/eel-alert-dialog.c:128
+msgid "Alert Buttons"
+msgstr "Uyarı Düğmeleri"
+
+#: ../eel/eel-alert-dialog.c:129
+msgid "The buttons shown in the alert dialog"
+msgstr "Uyarı penceresinde gösterilen düğmeler"
+
+#: ../eel/eel-alert-dialog.c:193
+msgid "Show more _details"
+msgstr "_Daha fazla ayrıntı göster"
+
+#: ../eel/eel-canvas.c:1219 ../eel/eel-canvas.c:1220
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1226 ../eel/eel-canvas.c:1227
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:353
+msgid "Text"
+msgstr "Metin"
+
+#: ../eel/eel-editable-label.c:354
+msgid "The text of the label."
+msgstr "Etiketin metni."
+
+#: ../eel/eel-editable-label.c:360
+msgid "Justification"
+msgstr "Hizalama"
+
+#: ../eel/eel-editable-label.c:361
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Birbirlerine bağlı olan etiket metinleri satırlarının hizalanması. Bu "
+"etiketlerin kendi içindeki hizalamalarını etkilemeyecektir. Bunun için "
+"GtkMisc::xalign'a bakın."
+
+#: ../eel/eel-editable-label.c:369
+msgid "Line wrap"
+msgstr "Satır bölme"
+
+#: ../eel/eel-editable-label.c:370
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Eğer atanmışsa, satırlar çok geniş olduğunda bölünür."
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:538
+#: ../eel/eel-editable-label.c:377
+msgid "Cursor Position"
+msgstr "İmleç Konumu"
+
+#: ../eel/eel-editable-label.c:378
+msgid "The current position of the insertion cursor in chars."
+msgstr "Ekleme imlecinin karakterlerlerdeki mevcut pozisyonu."
+
+# components/help/converters/gnome-db2html2/sect-elements.c:1027
+#: ../eel/eel-editable-label.c:387
+msgid "Selection Bound"
+msgstr "Seçim Kapsamı"
+
+#: ../eel/eel-editable-label.c:388
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Seçimin karşı ucunun imlece göre karakter olarak konumu."
+
+#: ../eel/eel-editable-label.c:3217
+msgid "Select All"
+msgstr "Tümünü Seç"
+
+#: ../eel/eel-editable-label.c:3228
+msgid "Input Methods"
+msgstr "Giriş Yöntemleri"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf hatası:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf hatası: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Diğer tüm hatalar sadece uçbirimde görüntülenir."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Hiçbir resim seçilmedi."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Bir resmi seçmek için üzerine tıklamalısınız."
+
+#: ../eel/eel-stock-dialogs.c:209
+msgid "You can stop this operation by clicking cancel."
+msgstr "İptal düğmesine tıklayarak bu işlemi durdurabilirsiniz."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (geçersiz Unikod)"
+
+#: ../eel/eel-mount-operation.c:139
+msgid "Enter Password"
+msgstr "Parola Girin"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Boş Blu-Ray Disk"
 
@@ -7877,3 +8070,6 @@ msgstr "Güncel görünümün yakınlaştırma seviyesini ayarla"
 
 #~ msgid "Show in the default detail level"
 #~ msgstr "Öntanımlı ayrıntı seviyesinde göster"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Uygulama, uygulama veritabanına eklenemedi"
diff --git a/po/uk.po b/po/uk.po
index 3c98b6dc5..18c90d3bc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,8 +1,16 @@
+# #-#-#-#-#  uk.po (nautilus)  #-#-#-#-#
 # Copyright (C) 2000-2002 Free Software Foundation, Inc.
 # Yuri Syrota <rasta@renome.rovno.ua>, 2000-2002.
 # Maxim Dzumanenko <dziumanenko@gmail.com>, 2002-2008
+# #-#-#-#-#  uk.po (eel)  #-#-#-#-#
+# Copyright (C) 2001-2004 Free Software Foundation, Inc.
+# Yuri Syrota <rasta@cvs.gnome.org>, 2001-2004.
+# Maxim Dziumanenko <dziumanenko@gmail.com>, 2004-2008
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  uk.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-21 21:38+0000\n"
@@ -14,6 +22,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"#-#-#-#-#  uk.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-27 23:26+0200\n"
+"PO-Revision-Date: 2008-01-27 15:42+0200\n"
+"Last-Translator: Maxim Dziumanenko <dziumanenko@gmail.com>\n"
+"Language-Team: Ukrainian <uk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -6887,6 +6907,148 @@ msgstr "Масштабувати"
 msgid "Set the zoom level of the current view"
 msgstr "Встановити рівень масштабування поточного вікна"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Межа зображення чи позначки"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Ширина межі навколо позначки чи зображення у вікні попередження"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Тип попередження"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Тип попередження"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Кнопки попередження"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Кнопки у вікні попередження"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "_Докладніше"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Текст"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Текст позначки."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Вирівнювання"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Вирівнювання рядків тексту позначки відносно одна однієї. Це не впливає на "
+"вирівнювання самої позначки. Для цього використовуйте властивість GtkMisc::"
+"xalign."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Перенос рядків"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Якщо встановлено, довгі рядки переносяться."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Позиція курсора"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Поточна позиція курсора у символах."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Границі виділення"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Позиція протилежного кінця виділення від курсора в буквах."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Вибрати все"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Методи вводу"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Помилка GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Помилка GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Всі наступні помилки будуть виводитись лише на термінал."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Зображення не виділено."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Потрібно клацнути на зображенні, щоб виділити його."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Ви можете зупинити цю операцію клацнувши на \"Скасувати\"."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "(неправильний Юнікод)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "Відкривається %s"
+
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Відкривається %d елемент"
+msgstr[1] "Відкривається %d елементи"
+msgstr[2] "Відкривається %d елементів"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Введіть пароль"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Порожній диск Blu-Ray"
 
diff --git a/po/vi.po b/po/vi.po
index 574145177..a8a06fdf5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#
 # Vietnamese Translation for Nautilus.
 # Copyright © 2008 Gnome i18n Project for Vietnamese.
 # Hoang Ngoc Tu <hntu@gmx.de>, 2001-2002.
@@ -6,8 +7,17 @@
 # Trinh Minh Thanh <tmthanh@yahoo.com>, 2002-2003, 2005.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2008.
 #
+# #-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#
+# Vietnamese translation for Eel.
+# Copyright © 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Eel package.
+# Nguyễn Thái Ngọc Duy <pclouds@vnlinux.org>, 2002-2004.
+# Phạm Thành Long <lngt@ngonngu.net>, 2007.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2008.
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus 2.23.2 GNOME TRUNK\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-01 10:58+0000\n"
@@ -19,6 +29,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.21.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-01-04 19:17+1030\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -333,7 +355,19 @@ msgid ""
 "not shorten file names for other zoom levels. Available zoom levels: "
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
-msgstr "Một chuỗi xác định phần nào của tên tập tin dài cần được thay bằng dấu ba chấm, tuỳ vào độ phóng to. Mỗi mục trong danh sách tuân theo mẫu \"Mức phóng:Số\". Với mỗi mức phóng, nếu số được cho lớn hơn 0, tên tập tin sẽ không vượt qua số dòng cho phép. Nếu số là 0 hoặc nhỏ hơn, không đặt ra giới hạn ở mức phóng đó. Mục mặc định theo dạng \"Số\" không có mức phóng cũng có thể được dùng để định nghĩa cho mọi mức phóng còn lại. Ví dụ: 0 - luôn luôn hiện tên tập tin quá dài; 3 - cắt tên tập tin nếu vượt quá 3 dòng; smallest:5,smaller:4,0 - cắt tên tập tin nếu vượt quá 5 dòng ở mức phóng \"smallest\", cắt tên tập tin nếu vượt quá 4 dòng ở mức phóng smaller, không cắt ngắn với các mức phóng to còn lại. Các mức phóng có thể dùng là: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%) và largest (400%)."
+msgstr ""
+"Một chuỗi xác định phần nào của tên tập tin dài cần được thay bằng dấu ba "
+"chấm, tuỳ vào độ phóng to. Mỗi mục trong danh sách tuân theo mẫu \"Mức phóng:"
+"Số\". Với mỗi mức phóng, nếu số được cho lớn hơn 0, tên tập tin sẽ không "
+"vượt qua số dòng cho phép. Nếu số là 0 hoặc nhỏ hơn, không đặt ra giới hạn ở "
+"mức phóng đó. Mục mặc định theo dạng \"Số\" không có mức phóng cũng có thể "
+"được dùng để định nghĩa cho mọi mức phóng còn lại. Ví dụ: 0 - luôn luôn hiện "
+"tên tập tin quá dài; 3 - cắt tên tập tin nếu vượt quá 3 dòng; smallest:5,"
+"smaller:4,0 - cắt tên tập tin nếu vượt quá 5 dòng ở mức phóng \"smallest\", "
+"cắt tên tập tin nếu vượt quá 4 dòng ở mức phóng smaller, không cắt ngắn với "
+"các mức phóng to còn lại. Các mức phóng có thể dùng là: smallest (33%), "
+"smaller (50%), small (66%), standard (100%), large (150%), larger (200%) và "
+"largest (400%)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -349,7 +383,10 @@ msgid ""
 "ellipses on the desktop. If the number is larger than 0, the file name will "
 "not exceed the given number of lines. If the number is 0 or smaller, no "
 "limit is imposed on the number of displayed lines."
-msgstr "Số xác định phần nào của tên tập tin quá dài sẽ bị thay thế bằng dấu ba chấm. Nếu số lớn hơn 0, tên tập tin sẽ không được vượt quá số dòng cho phép. Nếu bằng 0 hoặc nhỏ hơn, không có giới hạn về số dòng hiển thị."
+msgstr ""
+"Số xác định phần nào của tên tập tin quá dài sẽ bị thay thế bằng dấu ba "
+"chấm. Nếu số lớn hơn 0, tên tập tin sẽ không được vượt quá số dòng cho phép. "
+"Nếu bằng 0 hoặc nhỏ hơn, không có giới hạn về số dòng hiển thị."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid ""
@@ -518,7 +555,9 @@ msgid ""
 "If set to \"after_current_tab\", then new tabs are inserted after the "
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
 "tab list."
-msgstr "Nếu đặt là \"after_current_tab\", thanh mới sẽ được chèn sau thanh hiện thời. Nếu đặt \"end\", thanh mới sẽ được đặt ở cuối danh sách thanh."
+msgstr ""
+"Nếu đặt là \"after_current_tab\", thanh mới sẽ được chèn sau thanh hiện "
+"thời. Nếu đặt \"end\", thanh mới sẽ được đặt ở cuối danh sách thanh."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
@@ -658,7 +697,9 @@ msgstr ""
 msgid ""
 "If set to true, then multiple views can be opened in one browser window, "
 "each in a separate tab."
-msgstr "Nếu đặt là true (đúng), có thể xem đồng thời nhiều kiểu xem khác nhau trong một cửa sổ duyệt, mỗi kiểu trong một thanh."
+msgstr ""
+"Nếu đặt là true (đúng), có thể xem đồng thời nhiều kiểu xem khác nhau trong "
+"một cửa sổ duyệt, mỗi kiểu trong một thanh."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid ""
@@ -760,21 +801,30 @@ msgid ""
 "List of x-content/* types for which the user have chosen \"Do Nothing\" in "
 "the preference capplet. No prompt will be shown nor will any matching "
 "application be started on insertion of media matching these types."
-msgstr "Danh sách kiểu x-content/* người dùng chọn \"Không làm gì cả\" trong tiểu dùng tuỳ thích. Sẽ không hỏi cũng như không so khớp ứng dụng cần khởi động khi gặp những phương tiện có kiểu này."
+msgstr ""
+"Danh sách kiểu x-content/* người dùng chọn \"Không làm gì cả\" trong tiểu "
+"dùng tuỳ thích. Sẽ không hỏi cũng như không so khớp ứng dụng cần khởi động "
+"khi gặp những phương tiện có kiểu này."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
 "List of x-content/* types for which the user have chosen \"Open Folder\" in "
 "the preferences capplet. A folder window will be opened on insertion of "
 "media matching these types."
-msgstr "Danh sách kiểu x-content/* người dùng chọn \"Mở thư mục\" trong tiểu dụng tuỳ thích. Một cửa sổ thư mục sẽ được mở khi chèn những phương tiện thuộc kiểu này."
+msgstr ""
+"Danh sách kiểu x-content/* người dùng chọn \"Mở thư mục\" trong tiểu dụng "
+"tuỳ thích. Một cửa sổ thư mục sẽ được mở khi chèn những phương tiện thuộc "
+"kiểu này."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "List of x-content/* types for which the user have chosen to start an "
 "application in the preference capplet. The preferred application for the "
 "given type will be started on insertion on media matching these types."
-msgstr "Danh sách kiểu x-content/* người dùng chọn khởi động ứng dụng trong tiểu dụng tuỳ thích. Chương trình được chọn sẽ được khởi động khi chèn những phương tiện có kiểu này."
+msgstr ""
+"Danh sách kiểu x-content/* người dùng chọn khởi động ứng dụng trong tiểu "
+"dụng tuỳ thích. Chương trình được chọn sẽ được khởi động khi chèn những "
+"phương tiện có kiểu này."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -2813,19 +2863,32 @@ msgstr "Chưa chọn ứng dụng"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
-#, c-format
+#, fuzzy, c-format
 msgid "%s document"
-msgstr "Tài liệu %s"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Tài liệu %s\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"%s tài liệu"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:599
 #: ../libnautilus-private/nautilus-open-with-dialog.c:910
+#, fuzzy
 msgid "Unknown"
-msgstr "Không rõ"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Không rõ\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Không biết"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "Hãy chọn ứng dụng để mở %s và các tập tin cũng có kiểu « %s »"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Hãy chọn ứng dụng để mở %s và các tập tin cũng có kiểu « %s »\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Hãy chọn ứng dụng để mở %s và các tập tin khác kiểu « %s »"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2838,9 +2901,13 @@ msgid "Could not run application"
 msgstr "Không thể chạy ứng dụng"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "Không tìm thấy « %s »"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Không tìm thấy « %s »\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Không tìm thấy '%s'"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
 msgid "Could not find application"
@@ -2856,8 +2923,13 @@ msgid "Could not add application"
 msgstr "Không thể thêm ứng dụng"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "Chọn một ứng dụng"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Chọn một ứng dụng\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Hãy chọn ứng dụng"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5070
@@ -2865,17 +2937,28 @@ msgid "Open With"
 msgstr "Mở bằng"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "Hãy chọn một ứng dụng, để xem mô tả."
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Hãy chọn một ứng dụng, để xem mô tả.\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Hãy chọn ứng dụng để xem mô tả của nó"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "Chạ_y lệnh riêng"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Chạ_y lệnh riêng\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Dùng _lệnh tự chọn"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "_Duyệt..."
 
+#. #-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2887,14 +2970,23 @@ msgid "_Open"
 msgstr "_Mở"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "Mở %s và các tập tin cũng có kiểu « %s » bằng:"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Mở %s và các tập tin cũng có kiểu « %s » bằng:\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"Mở %s và các tập tin khác có kiểu \"%s\" bằng:"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#, fuzzy
 msgid "_Add"
-msgstr "Thê_m"
+msgstr ""
+"#-#-#-#-#  vi.po (Nautilus 2.23.2 GNOME TRUNK)  #-#-#-#-#\n"
+"Thê_m\n"
+"#-#-#-#-#  vi.po (eel 2.21.1)  #-#-#-#-#\n"
+"_Thêm"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
@@ -6750,6 +6842,146 @@ msgstr "Thu/Phóng"
 msgid "Set the zoom level of the current view"
 msgstr "Tạo mức phóng của ô xem hiện thời"
 
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Viền ảnh/nhãn"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "Độ rộng đường viền quanh nhãn và ảnh trong hộp thoại báo động"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Kiểu báo động"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Kiểu báo động"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Nút Báo động"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Những nút được hiển thị trong hộp thoại báo động"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Hiện _chi tiết hơn"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Chữ"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Nội dung nhãn."
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Canh hàng"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Canh hàng văn bản trong nhãn so với những hàng khác. Nó KHÔNG tác động lên "
+"canh hàng nhãn trong vùng cấp phát của nó. Xem GtkMisc::xalign để làm điều "
+"đó."
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Ngắt dòng"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Nếu đặt, sẽ ngắt dòng khi văn bản quá dài."
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Vị trí con trỏ"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Vị trí hiện thời của con trỏ chèn, tính theo kí tự."
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Biên vùng chọn"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Vị trí đuôi vùng chọn từ chỗ con trỏ, tính theo kí tự."
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "Chọn tất cả"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "Cách nhập"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Lỗi GConf:\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Lỗi GConf: %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Các lỗi chi tiết hơn chỉ được hiển thị ở thiết bị cuối."
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "Chưa chọn ảnh."
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "Bạn phải nhấn vào một ảnh để chọn nó."
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Bạn có thể dừng thao tác này bằng cách nhấn Thôi."
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (Unicode không hợp lệ)"
+
+#: ../eel/eel-app-launch-context.c:405
+#, c-format
+msgid "Opening %s"
+msgstr "Đang mở %s"
+
+#: ../eel/eel-app-launch-context.c:408
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "Đang mở %d mục"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "Nhập mật khẩu"
+
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Đĩa Blu-Ray trắng"
 
@@ -6833,3 +7065,18 @@ msgstr "Tạo mức phóng của ô xem hiện thời"
 
 #~ msgid "Show in the default detail level"
 #~ msgstr "Hiện trong mức chi tiết mặc định"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "Không thể thêm ứng dụng vào cơ sở dữ liệu ứng dụng"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 AM"
+
+#~ msgid "Select an application to open %s and others of type \"%s\""
+#~ msgstr "Hãy chọn ứng dụng để mở %s và các tập tin có kiểu \"%s\""
diff --git a/po/wa.po b/po/wa.po
index f9719eb2c..979bb4062 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  wa.po (Nautilus 2.2.0.2)  #-#-#-#-#
 # Translation into the walloon language.
 #
 # Si vos voloz donner on côp di spale pol ratournaedje di Gnome (ou des
@@ -9,8 +10,16 @@
 # Lucyin Mahin <lucyin@walon.org>, 2003.
 # Pablo Saratxaga <pablo@walon.org>, 2003.
 #
+# #-#-#-#-#  wa.po (eel)  #-#-#-#-#
+# translation of eel.po to Walon
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Pablo Saratxaga <pablo@mandrakesoft.com>, 2002.
+# Pablo Saratxaga <pablo@walon.org>, 2004.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  wa.po (Nautilus 2.2.0.2)  #-#-#-#-#\n"
 "Project-Id-Version: Nautilus 2.2.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-10 12:02+0100\n"
@@ -20,6 +29,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  wa.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2004-05-04 02:59+0200\n"
+"Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
+"Language-Team: Walloon <linux-wa@walon.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -509,9 +528,13 @@ msgid "Tooltip for the menu item"
 msgstr ""
 
 #: libnautilus-extension/nautilus-menu-item.c:227
+#: eel/eel-mime-application-chooser.c:237
 #, fuzzy
 msgid "Icon"
-msgstr "Imådjetes"
+msgstr ""
+"#-#-#-#-#  wa.po (Nautilus 2.2.0.2)  #-#-#-#-#\n"
+"Imådjetes\n"
+"#-#-#-#-#  wa.po (eel)  #-#-#-#-#\n"
 
 #: libnautilus-extension/nautilus-menu-item.c:228
 msgid "Name of the icon to display in the menu item"
@@ -2652,9 +2675,9 @@ msgid ""
 "file onto your computer, you may be able to open it."
 msgstr ""
 "« %s » èn pout nén drovi « %s » ca « %s » n' pout nén acceder ås fitchîs ki "
-"sont a l' eplaeçmint « %s ». Nouk des ôtes programes k' i gn a n' pout "
-"siervi po håyner ç' fitchî la. Si vos copyîz l' fitchî sol copiutrece da "
-"vosse, vos pôroz motoit l' drovi."
+"sont a l' eplaeçmint « %s ». Nouk des ôtes programes k' i gn a n' pout siervi "
+"po håyner ç' fitchî la. Si vos copyîz l' fitchî sol copiutrece da vosse, vos "
+"pôroz motoit l' drovi."
 
 #: libnautilus-private/nautilus-program-choosing.c:176
 #, c-format
@@ -2670,9 +2693,9 @@ msgid ""
 "onto your computer, you may be able to open it."
 msgstr ""
 "« %s » èn pout nén drovi « %s » ca « %s » n' pout nén acceder ås fitchîs ki "
-"sont a l' eplaeçmint « %s ». Nouk des ôtes programes k' i gn a n' pout "
-"siervi po håyner ç' fitchî la. Si vos copyîz l' fitchî sol copiutrece da "
-"vosse, vos pôroz motoit l' drovi."
+"sont a l' eplaeçmint « %s ». Nouk des ôtes programes k' i gn a n' pout siervi "
+"po håyner ç' fitchî la. Si vos copyîz l' fitchî sol copiutrece da vosse, vos "
+"pôroz motoit l' drovi."
 
 #: libnautilus-private/nautilus-program-choosing.c:492
 #: libnautilus-private/nautilus-program-choosing.c:723
@@ -4324,10 +4347,13 @@ msgstr ""
 msgid "Couldn't Show Help"
 msgstr "Dji n' sai håyner l' aidance"
 
-#: src/file-manager/fm-properties-window.c:3305
+#: src/file-manager/fm-properties-window.c:3305 eel/eel-open-with-dialog.c:793
 #, fuzzy
 msgid "Open With"
-msgstr "Drovi _avou"
+msgstr ""
+"#-#-#-#-#  wa.po (Nautilus 2.2.0.2)  #-#-#-#-#\n"
+"Drovi _avou\n"
+"#-#-#-#-#  wa.po (eel)  #-#-#-#-#\n"
 
 #: src/file-manager/fm-properties-window.c:3643
 msgid "Cancel Showing Properties Window?"
@@ -6029,6 +6055,222 @@ msgstr "Sierveus rantoele"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Vey vos sierveus rantoele dins l' manaedjeu di fitchîs Nautilus"
 
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Tecse"
+
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Boirdeure imådje/etikete"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Lårdjeu des boirdeures åtoû d' l' etikete eyet l' imådje dins on purnea "
+"d' abranle"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Sôre d' abranle"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Li sôre di l' abranle"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Botons d' abranle"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Les botons håynés el purnea d' abranle"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Mostrer pus di _detays"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Li tecse di l' etikete."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Djustifiaedje"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"L' alignmint des royes dins l' tecse di l' etikete, relativmint n' ene "
+"l' ôte. Çouchal n' a NÉN di cosecance po l' alignmint des etiketes å dvins "
+"di leus eplaeçmints. Loukîz a GtkMisc::xalign po çoula."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr ""
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr ""
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Eplaeçmint do cursoe"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "L' eplaeçmint do moumint do cursoe di stitchaedje, e caracteres."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Limite del tchuze di tecse"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr ""
+"L' eplaeçmint di l' ôte costé del tchuze di tecse, a pårti do cursoe, e "
+"caracteres."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Tchoezi totafwait"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Metôdes d' intrêye"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"Aroke di GConf:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "Aroke di GConf: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Totes les arokes shuvantes si håynêyront sol terminå seulmint."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " 1/ 1/ 0,  1:00 AM"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Nole imådje n' a stî tchoezeye."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Vos dvoz clitchî so ene imådje pol tchoezi."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr ""
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr ""
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:855
+msgid "_Use a custom command"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr ""
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr ""
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Vos ploz arester ciste operåcion tot clitchant so «rinoncî»."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (unicôde nén valide)"
+
 #~ msgid "Borland"
 #~ msgstr "Borland"
 
@@ -6174,9 +6416,6 @@ msgstr "Vey vos sierveus rantoele dins l' manaedjeu di fitchîs Nautilus"
 #~ msgid "Nautilus component adapter factory"
 #~ msgstr "Oujhene d' adapteus di componints Nautilus"
 
-#~ msgid "Text"
-#~ msgstr "Tecse"
-
 #~ msgid "Text Viewer"
 #~ msgstr "Håyneu di tecse"
 
@@ -6929,9 +7168,9 @@ msgstr "Vey vos sierveus rantoele dins l' manaedjeu di fitchîs Nautilus"
 #~ "\" locations.  No other actions are available to view this file.  If you "
 #~ "copy this file onto your computer, you may be able to open it."
 #~ msgstr ""
-#~ "Li prémetowe accion èn pout nén drovi « %s » la k' ele ni pout nén "
-#~ "acceder ås fitchîs ki sont a l' eplaeçmint « %s ».  Nole ôte accion k' i "
-#~ "gn a n' pout siervi po håyner ç' fitchî la.  Si vos copyîz l' fitchî sol "
+#~ "Li prémetowe accion èn pout nén drovi « %s » la k' ele ni pout nén acceder "
+#~ "ås fitchîs ki sont a l' eplaeçmint « %s ».  Nole ôte accion k' i gn a "
+#~ "n' pout siervi po håyner ç' fitchî la.  Si vos copyîz l' fitchî sol "
 #~ "copiutrece da vosse, vos pôroz motoit l' drovi."
 
 #~ msgid "Searching Disks"
@@ -7018,3 +7257,21 @@ msgstr "Vey vos sierveus rantoele dins l' manaedjeu di fitchîs Nautilus"
 
 #~ msgid "_Toolbar"
 #~ msgstr "Bår ås _usteyes"
+
+#~ msgid "GConf Error"
+#~ msgstr "Aroke di GConf"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Nole tchuze di fwaite"
+
+#~ msgid "Info"
+#~ msgstr "Informåcion"
+
+#~ msgid "Warning"
+#~ msgstr "Adviertixhmint"
+
+#~ msgid "Error"
+#~ msgstr "Aroke"
+
+#~ msgid "Question"
+#~ msgstr "Kesse"
diff --git a/po/xh.po b/po/xh.po
index 6e4d8e994..a00a033f9 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -1,11 +1,21 @@
+# #-#-#-#-#  xh.po (nautilus)  #-#-#-#-#
 # Xhosa translation of nautilus
 # Copyright (C) 2005 Canonical Ltd.
 # This file is distributed under the same license as the nautilus package.
 # Translation by Canonical Ltd <translations@canonical.com> with thanks to
 # Translation World CC in South Africa, 2005.
 #
+# #-#-#-#-#  xh.po (eel)  #-#-#-#-#
+# Xhosa translation of eel
+# Copyright (C) 2005 Canonical Ltd.
+# This file is distributed under the same license as the eel package.
+# Translation by Canonical Ltd <translations@canonical.com> with thanks to
+# Translation World CC in South Africa, 2005.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  xh.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-03-29 15:10+0200\n"
@@ -16,6 +26,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
+"#-#-#-#-#  xh.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-27 18:27+0100\n"
+"PO-Revision-Date: 2005-03-09 14:33+0200\n"
+"Last-Translator: Canonical Ltd <translations@canonical.com>\n"
+"Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -425,6 +445,7 @@ msgstr ""
 #: ../libnautilus-extension/nautilus-property-page.c:176
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../src/file-manager/fm-list-view.c:1113
+#: eel/eel-mime-application-chooser.c:246
 msgid "Name"
 msgstr "Igama"
 
@@ -485,6 +506,7 @@ msgid "Tooltip for the menu item"
 msgstr "Incam yesixhobo yokhethwa yimenyu"
 
 #: ../libnautilus-extension/nautilus-menu-item.c:227
+#: eel/eel-mime-application-chooser.c:237
 msgid "Icon"
 msgstr "Umfanekiso ongumqondiso"
 
@@ -3519,9 +3541,10 @@ msgstr "Ifayili _Engenanto"
 msgid "Create a new empty file inside this folder"
 msgstr "Dala ifayili entsha engenanto ngaphakathi kwale fayili"
 
+#. #-#-#-#-#  xh.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:5741
-#: ../src/file-manager/fm-directory-view.c:6226
+#: ../src/file-manager/fm-directory-view.c:6226 eel/eel-open-with-dialog.c:894
 msgid "_Open"
 msgstr "_Vula"
 
@@ -4513,6 +4536,7 @@ msgid "Couldn't Show Help"
 msgstr "Ayikwazanga Kubonisa Uncedo"
 
 #: ../src/file-manager/fm-properties-window.c:3317
+#: eel/eel-open-with-dialog.c:793
 msgid "Open With"
 msgstr "Vula Nge"
 
@@ -6234,6 +6258,225 @@ msgstr "Iiseva Zothungelwano"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Khangela iiseva zakho zothungelwano kwifayile yomphathi weNautilus"
 
+#: eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "Umfanekiso/umda welebhile"
+
+#: eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr ""
+"Ububanzi bomda obujikeleze ilebhile nomfanekiso kunxibelelwano lokuphaphamisa"
+
+#: eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "Uhlobo Oluphaphamisayo"
+
+#: eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "Uhlobo lokuphaphamisa"
+
+#: eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "Amaqhosha Okuphaphamisa"
+
+#: eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "Amaqhosha aboniswe kunxibelelwano lokuphaphamisa"
+
+#: eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "Bonisa iinkcu_kacha ezithe kratya"
+
+#: eel/eel-canvas.c:1222 eel/eel-canvas.c:1223
+msgid "X"
+msgstr "u-X"
+
+#: eel/eel-canvas.c:1229 eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "u-Y"
+
+#: eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "Umbhalo"
+
+#: eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "Umbhalo welebhile."
+
+#: eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "Ulungelelaniso"
+
+#: eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"Ulungelelaniso lwemigca kumbhalo welebhile lunxulumelene. Le nto "
+"AYILUchukumisi ulungelelaniso lwelebhile kwindawo eyabelwe lona. Khangela i "
+"Gtk::xalign xa ufuna loo nto."
+
+#: eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "Uqhubekeko-magama lomgca"
+
+#: eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "Ukuba lumisiwe, imigca yoqhubekeko-magama iba banzi kakhulu."
+
+#: eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "Indawo yeKhesa"
+
+#: eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "Indawo yangoku yekhesa yokufakela kwizikwere."
+
+#: eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "Inxulumene noKhetho"
+
+#: eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "Indawo yecala elichasene nokhetho olusuka kwikhesa kwisikwere."
+
+#: eel/eel-editable-label.c:3042
+msgid "Select All"
+msgstr "Khetha Konke"
+
+#: eel/eel-editable-label.c:3053
+msgid "Input Methods"
+msgstr "Iindlela Zolwazi olungenisiweyo"
+
+#: eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"i-GConf error:\n"
+"  %s"
+
+#: eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "i-GConf error: %s"
+
+#: eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "Zonke iimpazamo ngaphezu koku kuphela kwi-terminal."
+
+#. localizers: These strings are part of the strftime
+#. * self-check code and must be changed to match what strtfime
+#. * yields. The first one is "%m/%d/%y, %I:%M %p".
+#.
+#: eel/eel-glib-extensions.c:1259
+msgid "01/01/00, 01:00 AM"
+msgstr "ngo-01/01/00, 01:00 AM"
+
+#. The second one is "%-m/%-d/%-y, %-I:%M %p".
+#: eel/eel-glib-extensions.c:1261
+msgid "1/1/00, 1:00 AM"
+msgstr "ngo-1/1/00, 1:00 AM"
+
+#. The third one is "%_m/%_d/%_y, %_I:%M %p".
+#: eel/eel-glib-extensions.c:1263
+msgid " 1/ 1/00,  1:00 AM"
+msgstr " ngo-1/ 1/00,  1:00 AM"
+
+#: eel/eel-gnome-extensions.c:284
+msgid "No image was selected."
+msgstr "Akukho mfanekiso ukhethiweyo."
+
+#: eel/eel-gnome-extensions.c:285
+msgid "You must click on an image to select it."
+msgstr "Kufuneka ucofe kumfanekiso ukwenzela ukuba uwukhethe."
+
+#: eel/eel-mime-application-chooser.c:229
+msgid "Default"
+msgstr "Ummiselo"
+
+#: eel/eel-mime-application-chooser.c:477
+msgid "<i>No applications selected</i>"
+msgstr "<i>Akukho zinkqubo zikhethiweyo</i>"
+
+#: eel/eel-mime-application-chooser.c:522 eel/eel-open-with-dialog.c:967
+#, c-format
+msgid "%s document"
+msgstr "uxwebhu i %s"
+
+#: eel/eel-mime-application-chooser.c:532 eel/eel-open-with-dialog.c:980
+msgid "Unknown"
+msgstr "Ayaziwa"
+
+#. first %s is filename, second %s is mime-type description
+#: eel/eel-mime-application-chooser.c:539
+#, c-format
+msgid "Select an application to open <i>%s</i> and others of type \"%s\""
+msgstr ""
+"Khetha inkqubo ukwenzela ukuvula i-<i>%s</i> nezinye zohlobo lwe \"%s\""
+
+#: eel/eel-open-with-dialog.c:175 eel/eel-open-with-dialog.c:220
+msgid "Could not run application"
+msgstr "Ayikwazanga kuphumeza inkqubo"
+
+#: eel/eel-open-with-dialog.c:187
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Ayikwazanga kufumana i '%s'"
+
+#: eel/eel-open-with-dialog.c:190
+msgid "Could not find application"
+msgstr "Ayikwazanga kufumana inkqubo"
+
+#: eel/eel-open-with-dialog.c:287
+msgid "Could not add application"
+msgstr "Ayikwazanga kudibanisa inkqubo"
+
+#: eel/eel-open-with-dialog.c:288
+msgid "Could not add application to the application database"
+msgstr "Ayikwazanga kudibanisa inkqubo kwi-database yenkqubo"
+
+#: eel/eel-open-with-dialog.c:401
+msgid "Select an Application"
+msgstr "Khetha Inkqubo"
+
+#: eel/eel-open-with-dialog.c:830
+msgid "Select an application to view its description."
+msgstr "Khetha inkqubo ukwenzela ukubonisa inkcazelo yayo."
+
+#: eel/eel-open-with-dialog.c:855
+#, fuzzy
+msgid "_Use a custom command"
+msgstr "Sebenzisa umyalelo we _yokuzenzela"
+
+#: eel/eel-open-with-dialog.c:872
+msgid "_Browse..."
+msgstr "_Khangela..."
+
+#: eel/eel-open-with-dialog.c:986
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Vula i-<i>%s</i>nezinye iifayili zohlobo lwe \"%s\" nge:"
+
+#: eel/eel-open-with-dialog.c:1017
+msgid "_Add"
+msgstr "_Dibanisa"
+
+#: eel/eel-open-with-dialog.c:1018
+msgid "Add Application"
+msgstr "Dibanisa Inkqubo"
+
+#: eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "Ungawumisa lo msebenzi ngokucofa u-rhoxisa."
+
+#: eel/eel-vfs-extensions.c:650
+msgid " (invalid Unicode)"
+msgstr " (i-Unicode engekho semthethweni)"
+
 #~ msgid "Applications"
 #~ msgstr "Iinkqubo zekhompyutha"
 
@@ -6513,3 +6756,21 @@ msgstr "Khangela iiseva zakho zothungelwano kwifayile yomphathi weNautilus"
 #~ "Amalungelo omqulunqi © 2002-2004 Novell, Inc\n"
 #~ "Amalungelo omqulunqi © 1999-2001 Eazel, Inc.\n"
 #~ "Kunye nabo bonke abanye abaqulunqi"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf Impazamo"
+
+#~ msgid "No Selection Made"
+#~ msgstr "Akukho Lukhetho Lwenziweyo"
+
+#~ msgid "Info"
+#~ msgstr "Inkcazelo"
+
+#~ msgid "Warning"
+#~ msgstr "Isilumkiso"
+
+#~ msgid "Error"
+#~ msgstr "Impazamo"
+
+#~ msgid "Question"
+#~ msgstr "Umbuzo"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2593b704d..4d0d4e69b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,11 +1,21 @@
+# #-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#
 # zh_CN translation for Nautilus.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Wang Jian <lark@linux.net.cn>, 2001
 # Sarah Smith <sarahs@redhat.com>, 2002
 # Funda Wang <fundawang@linux.net.cn>, 2003
 #
+# #-#-#-#-#  zh_CN.po (eel)  #-#-#-#-#
+# Simplified Chinese translation of eel.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Wang Jian <lark@linux.net.cn>, 2001
+# Funda Wang <fundawang@linux.net.cn>, 2003-2005
+# Ming Hua <minghua-guest@users.alioth.debian.org>, 2008
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-03 04:27+0000\n"
@@ -16,6 +26,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"#-#-#-#-#  zh_CN.po (eel)  #-#-#-#-#\n"
+"Project-Id-Version: eel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-06 19:03+0000\n"
+"PO-Revision-Date: 2008-01-19 21:46+0800\n"
+"Last-Translator: Ming Hua <minghua-guest@users.alioth.debian.org>\n"
+"Language-Team: Simplified Chinese <translation-team-zh-cn@lists.sourceforge."
+"net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -729,8 +751,8 @@ msgid ""
 "the preference capplet. No prompt will be shown nor will any matching "
 "application be started on insertion of media matching these types."
 msgstr ""
-"用户在首选项小程序中设置为“不执行操作”的 x-content/* 类型列表。"
-"如果插入的介质与这些类型匹配，则既不会显示提示，也不会启动相应的应用程序。"
+"用户在首选项小程序中设置为“不执行操作”的 x-content/* 类型列表。如果插入的介质"
+"与这些类型匹配，则既不会显示提示，也不会启动相应的应用程序。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
@@ -738,8 +760,8 @@ msgid ""
 "the preferences capplet. A folder window will be opened on insertion of "
 "media matching these types."
 msgstr ""
-"用户在首选项小程序中设置为“打开文件夹”的 x-content/* 类型列表。"
-"如果插入的介质与这些类型匹配，则会打开一个文件夹窗口。"
+"用户在首选项小程序中设置为“打开文件夹”的 x-content/* 类型列表。如果插入的介质"
+"与这些类型匹配，则会打开一个文件夹窗口。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
@@ -747,8 +769,8 @@ msgid ""
 "application in the preference capplet. The preferred application for the "
 "given type will be started on insertion on media matching these types."
 msgstr ""
-"用户在首选项小程序中设置为“启动应用程序”的 x-content/* 类型列表。"
-"如果插入的介质与这些类型匹配，则会启动给定类型的首选应用程序。"
+"用户在首选项小程序中设置为“启动应用程序”的 x-content/* 类型列表。如果插入的介"
+"质与这些类型匹配，则会启动给定类型的首选应用程序。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -2723,8 +2745,13 @@ msgid "Could not remove application"
 msgstr "无法删除应用程序"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "未选择应用程序"
+msgstr ""
+"#-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#\n"
+"未选择应用程序\n"
+"#-#-#-#-#  zh_CN.po (eel)  #-#-#-#-#\n"
+"没有选中应用程序"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2738,9 +2765,13 @@ msgid "Unknown"
 msgstr "未知"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:632
-#, c-format
+#, fuzzy, c-format
 msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "选择一个应用程序用来打开 %s 及“%s”类型的其它文件"
+msgstr ""
+"#-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#\n"
+"选择一个应用程序用来打开 %s 及“%s”类型的其它文件\n"
+"#-#-#-#-#  zh_CN.po (eel)  #-#-#-#-#\n"
+"选择用于打开 %s 和其它类型为“%s”的文件的应用程序"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:700
 #: ../libnautilus-private/nautilus-open-with-dialog.c:922
@@ -2771,8 +2802,13 @@ msgid "Could not add application"
 msgstr "无法添加应用程序"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "选择一个应用程序"
+msgstr ""
+"#-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#\n"
+"选择一个应用程序\n"
+"#-#-#-#-#  zh_CN.po (eel)  #-#-#-#-#\n"
+"选择应用程序"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5070
@@ -2780,8 +2816,13 @@ msgid "Open With"
 msgstr "打开方式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
+#, fuzzy
 msgid "Select an application to view its description."
-msgstr "选择一个应用程序以查看其描述。"
+msgstr ""
+"#-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#\n"
+"选择一个应用程序以查看其描述。\n"
+"#-#-#-#-#  zh_CN.po (eel)  #-#-#-#-#\n"
+"选择一个应用程序，以便查看其描述。"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
 msgid "_Use a custom command"
@@ -2791,6 +2832,7 @@ msgstr "使用自定义命令(_U)"
 msgid "_Browse..."
 msgstr "浏览(_B)..."
 
+#. #-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2802,9 +2844,13 @@ msgid "_Open"
 msgstr "打开(_O)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "用此应用程序打开 %s 及“%s”类型的其它文件："
+msgstr ""
+"#-#-#-#-#  zh_CN.po (nautilus)  #-#-#-#-#\n"
+"用此应用程序打开 %s 及“%s”类型的其它文件：\n"
+"#-#-#-#-#  zh_CN.po (eel)  #-#-#-#-#\n"
+"打开 %s 及类型为“%s”的其它文件的方式："
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
@@ -6584,3 +6630,156 @@ msgstr "缩放"
 #: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "设置当前视图的缩放级别"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "图像/标签边框"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "警告对话框中的图像和标签的边框宽度"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "警告类型"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "警告类型"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "警告按钮"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "显示在警告提示对话框中的按钮"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "显示更多细节(_D)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "文字"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "标签上的文字。"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "调整"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"标签上的文字行之间的对齐方式。此设置并不影响标签自身的对齐。参看 GtkMisc::"
+"xalign 中的说明。"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "自动换行"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "如果设定了此选项，当文本太宽时就自动折行。"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "光标位置"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "插入点光标的当前位置，以字符数计。"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "选择范围"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "选择区另一端的位置，从光标处以字符数计。"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "全选"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "输入法"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf 错误：\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 错误：%s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "以后的错误仅显示在终端中。"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "没有选择图像。"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "您必须点击图片以选择它。"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "你可以点击取消停止这个操作。"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr " (无效的 Unicode)"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "正在打开 %s"
+
+#  The word "item" is translated as "文件" for now, as in most cases it's
+#  opening files.
+#: ../eel/eel-app-launch-context.c:407
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "正在打开 %d 个文件"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "输入密码"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "无法将应用程序添加到应用程序数据库"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00，01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00，1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00，1:00"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 95ceafbfa..0bb233a90 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#
 # Chinese (Hong Kong) translation for nautilus.
 # Copyright (C) 2000-07 Free Software Foundation, Inc.
 # Gong Yi LIAO <granziliao@sinamail.com>, 2000.
@@ -6,8 +7,19 @@
 # Woodman Tuen <wmtuen@gmail.com>, 2004-07.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2008
 #
+# #-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#
+# Chinese(Taiwan) translation of eel.
+# Copyright (C) 2000-06 Free Software Foundation, Inc.
+# Gong Yi LIAO <granziliao@sinamail.com>, 2000.
+# Joe Man <trmetal@yahoo.com.hk>, 2001.
+# Abel Cheung <abel@oaka.org>, 2002-2003.
+# Woodman Tuen <wmtuen@gmail.com>, 2004-2006.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus 2.24.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-18 12:08+0800\n"
@@ -18,6 +30,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.21.91\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-27 20:14+0800\n"
+"PO-Revision-Date: 2008-01-31 20:46+0800\n"
+"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
+"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -309,7 +332,8 @@ msgid ""
 "\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
 "\"mime_type\"."
 msgstr ""
-"這是在圖示顯示模式中，或者在桌面中，圖示下方附帶的一系列標題文字。實際會顯示的標題數目取決於圖示的縮放倍率。可接受的值為：\n"
+"這是在圖示顯示模式中，或者在桌面中，圖示下方附帶的一系列標題文字。實際會顯示"
+"的標題數目取決於圖示的縮放倍率。可接受的值為：\n"
 "“size”、“type”、“date_modified”、“date_changed”、“date_accessed”、“owner”、“group”、“permissions”、“octal_permissions”及“mime_type”。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
@@ -329,7 +353,17 @@ msgid ""
 "not shorten file names for other zoom levels. Available zoom levels: "
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
-msgstr "根據據縮放等級，決定過長的檔案名稱的一部分要以省略符號替換的字串值。每個清單項目的格式為 \"縮放等級:整數值\"。針對每個指定的縮放等級，如果所給的整數值大於 0，則檔案名稱的長度將不會超過該整數值的行數。如果該整數值小於或等於 0，表示對指定的縮放等級不予限制長度。若以 \"整數值\" 的格式不指定縮放等級也可以接受為項目的預設值，它將會定義所有未指定的縮放等級的最大行數。例如： 0 - 永遠完整顥示過長的檔案名稱：3 - 如果超過 3 行則截短檔案名稱：smallest:5,smaller:4,0 - 在縮放等級 \"smallest\" 中超過 5 行就截短檔案名稱；在縮放等級 \"smaller\" 中超過 4 行就截短檔案名稱；其他的縮放等級則不會截短檔案名稱。可用的縮放等級有：smallest (33%)、 smaller (50%)、 small (66%)、 standard (100%)、 large (150%)、 larger (200%)、 largest (400%)"
+msgstr ""
+"根據據縮放等級，決定過長的檔案名稱的一部分要以省略符號替換的字串值。每個清單"
+"項目的格式為 \"縮放等級:整數值\"。針對每個指定的縮放等級，如果所給的整數值大"
+"於 0，則檔案名稱的長度將不會超過該整數值的行數。如果該整數值小於或等於 0，表"
+"示對指定的縮放等級不予限制長度。若以 \"整數值\" 的格式不指定縮放等級也可以接"
+"受為項目的預設值，它將會定義所有未指定的縮放等級的最大行數。例如： 0 - 永遠完"
+"整顥示過長的檔案名稱：3 - 如果超過 3 行則截短檔案名稱：smallest:5,"
+"smaller:4,0 - 在縮放等級 \"smallest\" 中超過 5 行就截短檔案名稱；在縮放等級 "
+"\"smaller\" 中超過 4 行就截短檔案名稱；其他的縮放等級則不會截短檔案名稱。可用"
+"的縮放等級有：smallest (33%)、 smaller (50%)、 small (66%)、 standard "
+"(100%)、 large (150%)、 larger (200%)、 largest (400%)"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "All columns have same width"
@@ -345,12 +379,17 @@ msgid ""
 "ellipses on the desktop. If the number is larger than 0, the file name will "
 "not exceed the given number of lines. If the number is 0 or smaller, no "
 "limit is imposed on the number of displayed lines."
-msgstr "決定桌面上過長的檔案名稱的一部分要以省略符號替換的字串值。如果所給的整數值大於 0，則檔案名稱的長度將不會超過該整數值的行數。如果該整數值小於或等於 0，表示對指定的縮放等級不予限制長度。"
+msgstr ""
+"決定桌面上過長的檔案名稱的一部分要以省略符號替換的字串值。如果所給的整數值大"
+"於 0，則檔案名稱的長度將不會超過該整數值的行數。如果該整數值小於或等於 0，表"
+"示對指定的縮放等級不予限制長度。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid ""
 "Color for the default folder background. Only used if background_set is true."
-msgstr "預設資料夾背景圖案的顏色。只有在“background_set”設定為‘true’的時候，本選項方會生效。"
+msgstr ""
+"預設資料夾背景圖案的顏色。只有在“background_set”設定為‘true’的時候，本選項方"
+"會生效。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Computer icon visible on desktop"
@@ -366,7 +405,10 @@ msgid ""
 "\"search_by_text\", then Nautilus will Search for files by file name only. "
 "If set to \"search_by_text_and_properties\", then Nautilus will search for "
 "files by file name and file properties."
-msgstr "在搜尋列中搜尋符合條件的檔案的方式。如果設定為“search_by_text”，Nautilus 只會根據檔案名稱搜尋。如果設定為“search_by_text_and_properties”，則會同時根據檔案名稱和屬性來搜尋。"
+msgstr ""
+"在搜尋列中搜尋符合條件的檔案的方式。如果設定為“search_by_text”，Nautilus 只會"
+"根據檔案名稱搜尋。如果設定為“search_by_text_and_properties”，則會同時根據檔案"
+"名稱和屬性來搜尋。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Current Nautilus theme (deprecated)"
@@ -476,13 +518,17 @@ msgstr "啟用典型的 Nautilus 運作方式，那麼所有視窗都是瀏覽�
 msgid ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
-msgstr "預設資料夾背景圖案的檔案名稱。只有在“background_set”設定為‘true’的時候，本選項方會生效。"
+msgstr ""
+"預設資料夾背景圖案的檔案名稱。只有在“background_set”設定為‘true’的時候，本選"
+"項方會生效。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
-msgstr "預設側面窗格背景圖案的檔案名稱。只有在“side_pane_background_set”設定為‘true’時，本選項方會生效。"
+msgstr ""
+"預設側面窗格背景圖案的檔案名稱。只有在“side_pane_background_set”設定"
+"為‘true’時，本選項方會生效。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
@@ -490,7 +536,10 @@ msgid ""
 "this is to avoid unintentionally blowing the heap and killing Nautilus on "
 "massive folders. A negative value denotes no limit. The limit is approximate "
 "due to the reading of folders chunk-wise."
-msgstr "如果某些目錄中的檔案/子目錄數目太多，實際上顯示的數目會減少至大約這個數字。這樣做的意義是避免 Nautilus 因載入過大的目錄而不正常地結束。負數表示沒有限制。這個數字只是大約的數字，因為載入目錄時，每次讀取資料都是讀取多個項目的。"
+msgstr ""
+"如果某些目錄中的檔案/子目錄數目太多，實際上顯示的數目會減少至大約這個數字。這"
+"樣做的意義是避免 Nautilus 因載入過大的目錄而不正常地結束。負數表示沒有限制。"
+"這個數字只是大約的數字，因為載入目錄時，每次讀取資料都是讀取多個項目的。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid "Home icon visible on desktop"
@@ -501,13 +550,17 @@ msgid ""
 "If set to \"after_current_tab\", then new tabs are inserted after the "
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
 "tab list."
-msgstr "如果設為「after_current_tab」，則新的分頁會插入到目前分頁之後。如果設為「end」，則新的分頁會加到分頁清單的最後端。"
+msgstr ""
+"如果設為「after_current_tab」，則新的分頁會插入到目前分頁之後。如果設為"
+"「end」，則新的分頁會加到分頁清單的最後端。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
-msgstr "如設定為‘true’，Nautilus 只會在目錄樹側面窗格中顯示目錄，不然會同時顯示目錄和檔案。"
+msgstr ""
+"如設定為‘true’，Nautilus 只會在目錄樹側面窗格中顯示目錄，不然會同時顯示目錄和"
+"檔案。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
@@ -530,19 +583,25 @@ msgstr "如設定為‘true’，新開啟的視窗會顯示工具列。"
 msgid ""
 "If set to true, then Nautilus browser windows will always use a textual "
 "input entry for the location toolbar, instead of the pathbar."
-msgstr "如設定為‘true’，Nautilus 瀏覽器視窗會使用輸入文字項目的位置工具列，而非路徑列。"
+msgstr ""
+"如設定為‘true’，Nautilus 瀏覽器視窗會使用輸入文字項目的位置工具列，而非路徑"
+"列。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid ""
 "If set to true, then Nautilus lets you edit and display file permissions in "
 "a more unix-like way, accessing some more esoteric options."
-msgstr "如設定為‘true’，Nautilus 會讓你以較 unix 相似的形式修改及顯示檔案權限，存取一些較難懂的選項。"
+msgstr ""
+"如設定為‘true’，Nautilus 會讓你以較 unix 相似的形式修改及顯示檔案權限，存取一"
+"些較難懂的選項。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
-msgstr "如設定為‘true’，Nautilus 會在圖示顯示模式及清單顯示模式中先顯示目錄，然後才顯示檔案。"
+msgstr ""
+"如設定為‘true’，Nautilus 會在圖示顯示模式及清單顯示模式中先顯示目錄，然後才顯"
+"示檔案。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid ""
@@ -554,7 +613,9 @@ msgstr "如設定為‘true’，Nautilus 會在你嘗試刪除檔案或清空�
 msgid ""
 "If set to true, then Nautilus will automatically mount media such as user-"
 "visible hard disks and removable media on start-up and media insertion."
-msgstr "如果設為「true」，Nautilus 會在啟動或插入媒體時自動掛載媒體（例如使用者看得到的硬碟和可攜式媒體）。"
+msgstr ""
+"如果設為「true」，Nautilus 會在啟動或插入媒體時自動掛載媒體（例如使用者看得到"
+"的硬碟和可攜式媒體）。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
@@ -562,7 +623,10 @@ msgid ""
 "automounted. This only applies to media where no known x-content/* type was "
 "detected; for media where a known x-content type is detected, the user "
 "configurable action will be taken instead."
-msgstr "如果設為 true，Nautilus 會在自動掛載媒體後自動開啟資料夾。這個選項只有在媒體中尚未偵測到已知的 x-content/* 類型時才會生效；若在媒體中偵測到已知的 x-content 類型，則會用使用者設定的動作來代替。"
+msgstr ""
+"如果設為 true，Nautilus 會在自動掛載媒體後自動開啟資料夾。這個選項只有在媒體"
+"中尚未偵測到已知的 x-content/* 類型時才會生效；若在媒體中偵測到已知的 x-"
+"content 類型，則會用使用者設定的動作來代替。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
@@ -573,39 +637,50 @@ msgid ""
 "If set to true, then Nautilus will have a feature allowing you to delete a "
 "file immediately and in-place, instead of moving it to the trash. This "
 "feature can be dangerous, so use caution."
-msgstr "如設定為‘true’，Nautilus 會提供另一種功能，讓你即時刪除檔案，而不是將檔案丟進回收筒。本功能是比較危險，所以請小心使用。"
+msgstr ""
+"如設定為‘true’，Nautilus 會提供另一種功能，讓你即時刪除檔案，而不是將檔案丟進"
+"回收筒。本功能是比較危險，所以請小心使用。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid ""
 "If set to true, then Nautilus will never prompt nor autorun/autostart "
 "programs when a medium is inserted."
-msgstr "如設定為「true」，當插入媒體時 Nautilus 將不會提示或自動執行/啟動程式。"
+msgstr ""
+"如設定為「true」，當插入媒體時 Nautilus 將不會提示或自動執行/啟動程式。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
 "If set to true, then Nautilus will use the user's home folder as the "
 "desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr "如設定為‘true’，Nautilus 會以使用者的個人資料夾作為桌面，如設定為‘false’，則會使用 ~/Desktop 作為桌面。"
+msgstr ""
+"如設定為‘true’，Nautilus 會以使用者的個人資料夾作為桌面，如設定為‘false’，則"
+"會使用 ~/Desktop 作為桌面。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 msgid ""
 "If set to true, then all Nautilus windows will be browser windows. This is "
 "how Nautilus used to behave before version 2.6, and some people prefer this "
 "behavior."
-msgstr "如設定為‘true’，那麼所有 Nautilus 視窗皆是瀏覽器視窗。這是 Nautilus 在 2.6 版前的運作方式，有些人比較喜歡這種運作方式。"
+msgstr ""
+"如設定為‘true’，那麼所有 Nautilus 視窗皆是瀏覽器視窗。這是 Nautilus 在 2.6 版"
+"前的運作方式，有些人比較喜歡這種運作方式。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid ""
 "If set to true, then backup files such as those created by Emacs are "
 "displayed. Currently, only files ending in a tilde (~) are considered backup "
 "files."
-msgstr "如設定為‘true’，則會顯示如 Emacs 等程式製作出來的備份檔。目前，只有檔案名稱末端為波浪符號 (~) 的才會當作是備份檔來處理。"
+msgstr ""
+"如設定為‘true’，則會顯示如 Emacs 等程式製作出來的備份檔。目前，只有檔案名稱末"
+"端為波浪符號 (~) 的才會當作是備份檔來處理。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
 "files are either dotfiles or are listed in the folder's .hidden file."
-msgstr "如設定為‘true’，所有隱藏檔案都會在檔案總管中顯示出來。所謂隱藏檔案即是任何第一個字符為一點‘.’的檔案，或者在某個資料夾的 .hidden 檔案內容之中。"
+msgstr ""
+"如設定為‘true’，所有隱藏檔案都會在檔案總管中顯示出來。所謂隱藏檔案即是任何第"
+"一個字符為一點‘.’的檔案，或者在某個資料夾的 .hidden 檔案內容之中。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid ""
@@ -647,14 +722,18 @@ msgstr "如設定為‘true’，則桌面上會出現連結到已掛載的檔�
 msgid ""
 "If this preference is set, all columns in the compact view have the same "
 "width. Otherwise, the width of each column is determined seperately."
-msgstr "如果此項偏好設定生效，在精簡檢視中所有欄位都會有相同的闊度。否則每個欄位的闊度都是個別決定的。"
+msgstr ""
+"如果此項偏好設定生效，在精簡檢視中所有欄位都會有相同的闊度。否則每個欄位的闊"
+"度都是個別決定的。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid ""
 "If true, files in new windows will be sorted in reverse order. ie, if sorted "
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
 "sorted from \"z\" to \"a\"."
-msgstr "如設定為‘true’，在新的視窗中檔案會以相反次序排列。譬如說，如果是以檔案名稱來排列，本來從“a”至“z”排列的檔案會改為從“z”至“a”排列。"
+msgstr ""
+"如設定為‘true’，在新的視窗中檔案會以相反次序排列。譬如說，如果是以檔案名稱來"
+"排列，本來從“a”至“z”排列的檔案會改為從“z”至“a”排列。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid ""
@@ -662,7 +741,10 @@ msgid ""
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
 "sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
-msgstr "如設定為‘true’，在新的視窗中檔案會以相反次序排列。譬如說，如果是以檔案名稱來排列，本來從“a”至“z”排列的檔案會改為從“z”至“a”排列；如果是以檔案大小來排列，本來是遞增排列的，現在會變成遞減。"
+msgstr ""
+"如設定為‘true’，在新的視窗中檔案會以相反次序排列。譬如說，如果是以檔案名稱來"
+"排列，本來從“a”至“z”排列的檔案會改為從“z”至“a”排列；如果是以檔案大小來排列，"
+"本來是遞增排列的，現在會變成遞減。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "If true, icons will be laid out tighter by default in new windows."
@@ -682,7 +764,9 @@ msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
-msgstr "不會為超過指定大小（以位元組計算）的圖片產生縮圖。這個設定的目的是避免為太大的圖片產生縮圖，消耗過多的時間或記憶體。"
+msgstr ""
+"不會為超過指定大小（以位元組計算）的圖片產生縮圖。這個設定的目的是避免為太大"
+"的圖片產生縮圖，消耗過多的時間或記憶體。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "List of possible captions on icons"
@@ -693,21 +777,27 @@ msgid ""
 "List of x-content/* types for which the user have chosen \"Do Nothing\" in "
 "the preference capplet. No prompt will be shown nor will any matching "
 "application be started on insertion of media matching these types."
-msgstr "使用者在偏好設定 capplet 中選取「不做任何事」時的 x-content/* 類型清單。在插入符合這些類型的媒體時既不會顯示提示也不會啟動任何對應的應用程式。"
+msgstr ""
+"使用者在偏好設定 capplet 中選取「不做任何事」時的 x-content/* 類型清單。在插"
+"入符合這些類型的媒體時既不會顯示提示也不會啟動任何對應的應用程式。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
 "List of x-content/* types for which the user have chosen \"Open Folder\" in "
 "the preferences capplet. A folder window will be opened on insertion of "
 "media matching these types."
-msgstr "使用者在偏好設定 capplet 中選取「開啟資料夾」時的 x-content/* 類型清單。在插入符合這些類型的媒體時會開啟一個資料夾視窗。"
+msgstr ""
+"使用者在偏好設定 capplet 中選取「開啟資料夾」時的 x-content/* 類型清單。在插"
+"入符合這些類型的媒體時會開啟一個資料夾視窗。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "List of x-content/* types for which the user have chosen to start an "
 "application in the preference capplet. The preferred application for the "
 "given type will be started on insertion on media matching these types."
-msgstr "使用者在偏好設定 capplet 中選取要執行應用程式時的 x-content/* 類型清單。在插入符合這些類型的媒體時會啟動對應該類型的首選應用程式。"
+msgstr ""
+"使用者在偏好設定 capplet 中選取要執行應用程式時的 x-content/* 類型清單。在插"
+"入符合這些類型的媒體時會啟動對應該類型的首選應用程式。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "List of x-content/* types set to \"Do Nothing\""
@@ -734,7 +824,9 @@ msgstr "所產生的縮圖的圖片大小上限"
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
-msgstr "使用的 Nautilus 佈景主題名稱。自 Nautilus 2.2 起這個設定已經不再使用，請改為設定圖示主題。"
+msgstr ""
+"使用的 Nautilus 佈景主題名稱。自 Nautilus 2.2 起這個設定已經不再使用，請改為"
+"設定圖示主題。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "Nautilus handles drawing the desktop"
@@ -823,7 +915,10 @@ msgid ""
 "icon. If set to \"always\" then always plays the sound, even if the file is "
 "on a remote server. If set to \"local_only\" then only plays previews on "
 "local file systems. If set to \"never\" then it never previews sound."
-msgstr "有關游標移至音效檔時是否試聽在速度方面的權衡。如果設定為“always”，即使是遠端檔案仍然必定會播放。如果設定為“local_only”則只會播放本機的音效檔。如果設定為“never”則一定不會播放。"
+msgstr ""
+"有關游標移至音效檔時是否試聽在速度方面的權衡。如果設定為“always”，即使是遠端"
+"檔案仍然必定會播放。如果設定為“local_only”則只會播放本機的音效檔。如果設定"
+"為“never”則一定不會播放。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
 msgid ""
@@ -832,7 +927,10 @@ msgid ""
 "folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local file systems. If set to \"never\" then never bother to "
 "read preview data."
-msgstr "有關檔案的圖示是否顯示文字檔預覽內容在速度方面的權衡。如果設定為“always”，即使是遠端檔案仍然必定會顯示預覽圖示。如果設定為“local_only”則只會顯示本機檔案的預覽圖示。如果設定為“never”則一定不會顯示預覽圖示。"
+msgstr ""
+"有關檔案的圖示是否顯示文字檔預覽內容在速度方面的權衡。如果設定為“always”，即"
+"使是遠端檔案仍然必定會顯示預覽圖示。如果設定為“local_only”則只會顯示本機檔案"
+"的預覽圖示。如果設定為“never”則一定不會顯示預覽圖示。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
 msgid ""
@@ -841,7 +939,10 @@ msgid ""
 "If set to \"local_only\" then only show thumbnails for local file systems. "
 "If set to \"never\" then never bother to thumbnail images, just use a "
 "generic icon."
-msgstr "有關顯示圖片時是否以縮圖來代替在速度方面的權衡如果設定為“always”，即使是遠端檔案仍然一定會顯示縮圖。如果設定為“local_only”則只會顯示本機檔案的縮圖。如果設定為“never”則一定不會顯示縮圖，只會用一般的圖示代替。"
+msgstr ""
+"有關顯示圖片時是否以縮圖來代替在速度方面的權衡如果設定為“always”，即使是遠端"
+"檔案仍然一定會顯示縮圖。如果設定為“local_only”則只會顯示本機檔案的縮圖。如果"
+"設定為“never”則一定不會顯示縮圖，只會用一般的圖示代替。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
 msgid ""
@@ -849,7 +950,10 @@ msgid ""
 "\"always\" then always show item counts, even if the folder is on a remote "
 "server. If set to \"local_only\" then only show counts for local file "
 "systems. If set to \"never\" then never bother to compute item counts."
-msgstr "有關顯示目錄中的檔案數目在速度方面的權衡。如果設定為“always”，即使是遠端目錄仍然必定會顯示數目。如果設定為“local_only”則只會在本機目錄顯示數目。如果設定為“never”則一定不會計算數目。"
+msgstr ""
+"有關顯示目錄中的檔案數目在速度方面的權衡。如果設定為“always”，即使是遠端目錄"
+"仍然必定會顯示數目。如果設定為“local_only”則只會在本機目錄顯示數目。如果設定"
+"為“never”則一定不會計算數目。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid "Text Ellipsis Limit"
@@ -887,7 +991,8 @@ msgstr "桌面圖示所使用的字型。"
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
-msgstr "日期的格式。可接受的值為“locale”（本地）、“iso”及“informal”（非正式）。"
+msgstr ""
+"日期的格式。可接受的值為“locale”（本地）、“iso”及“informal”（非正式）。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid "The side pane view to show in newly opened windows."
@@ -944,7 +1049,8 @@ msgid ""
 "\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
 "text files."
 msgstr ""
-"當按下（按一下或連按兩下）可執行的文字檔時，會以哪一種方式處理。可接受的值為：\n"
+"當按下（按一下或連按兩下）可執行的文字檔時，會以哪一種方式處理。可接受的值"
+"為：\n"
 "“launch”會將它們當作程式來執行，\n"
 "“ask”會顯示對話盒詢問使用者，\n"
 "“display”會以文字檔方式顯示內容。"
@@ -954,7 +1060,9 @@ msgid ""
 "When a folder is visited this viewer is used unless you have selected "
 "another view for that particular folder. Possible values are \"list_view\", "
 "\"icon_view\" and \"compact_view\"."
-msgstr "當開啟資料夾時，除非特地為該資料夾選取了顯示模式，否則預設會使用這個顯示模式。可接受的值為「list_view」、「icon_view」及「compact_view」。"
+msgstr ""
+"當開啟資料夾時，除非特地為該資料夾選取了顯示模式，否則預設會使用這個顯示模"
+"式。可接受的值為「list_view」、「icon_view」及「compact_view」。"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid "When to show number of items in a folder"
@@ -1115,7 +1223,8 @@ msgstr "選擇要執行的應用程式。"
 msgid ""
 "Select how to open \"%s\" and whether to perform this action in the future "
 "for other media of type \"%s\"."
-msgstr "選擇要如何開啟「%s」以及未來其他類型為「%s」的類型是否同樣執行這個動作。"
+msgstr ""
+"選擇要如何開啟「%s」以及未來其他類型為「%s」的類型是否同樣執行這個動作。"
 
 #: ../libnautilus-private/nautilus-autorun.c:954
 msgid "_Always perform this action"
@@ -1287,13 +1396,16 @@ msgstr "不可以將檔案系統“%s”丢進回收筒。"
 msgid ""
 "If you want to eject the volume, please use \"Eject\" in the popup menu of "
 "the volume."
-msgstr "如果想退出檔案系統，請在該檔案系統的圖示上按滑鼠右邊按鈕，然後選「退出」。"
+msgstr ""
+"如果想退出檔案系統，請在該檔案系統的圖示上按滑鼠右邊按鈕，然後選「退出」。"
 
 #: ../libnautilus-private/nautilus-desktop-link-monitor.c:120
 msgid ""
 "If you want to unmount the volume, please use \"Unmount Volume\" in the "
 "popup menu of the volume."
-msgstr "如果想卸載檔案系統，請在該檔案系統的圖示上按滑鼠右邊按鈕，然後選「卸載檔案系統」。"
+msgstr ""
+"如果想卸載檔案系統，請在該檔案系統的圖示上按滑鼠右邊按鈕，然後選「卸載檔案系"
+"統」。"
 
 #: ../libnautilus-private/nautilus-dnd.c:748
 msgid "_Move Here"
@@ -1590,7 +1702,8 @@ msgstr "確定要清理回收筒內的所有東西嗎？"
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
-msgstr "如果要清理回收筒，所有項目將會被永遠地刪除。注意是可以將它們個別地刪除的。"
+msgstr ""
+"如果要清理回收筒，所有項目將會被永遠地刪除。注意是可以將它們個別地刪除的。"
 
 #. Empty Trash menu item
 #: ../libnautilus-private/nautilus-file-operations.c:1250
@@ -1961,7 +2074,9 @@ msgid ""
 "The source folder already exists in \"%B\".  Merging will ask for "
 "confirmation before replacing any files in the folder that conflict with the "
 "files being copied."
-msgstr "來源資料夾已經存在於“%B”中。合併功能會在替換該資料夾中內任何與被複製檔案發生衝突的檔案前先要求確認。"
+msgstr ""
+"來源資料夾已經存在於“%B”中。合併功能會在替換該資料夾中內任何與被複製檔案發生"
+"衝突的檔案前先要求確認。"
 
 #: ../libnautilus-private/nautilus-file-operations.c:3814
 #: ../libnautilus-private/nautilus-file-operations.c:4385
@@ -2014,7 +2129,9 @@ msgid ""
 "The source folder already exists in \"%B\".  Merging will ask for "
 "confirmation before replacing any files in the folder that conflict with the "
 "files being moved."
-msgstr "來源資料夾已經存在於“%B”中。合併功能會在替換該資料夾中內任何與被移動檔案發生衝突的檔案前先要求確認。"
+msgstr ""
+"來源資料夾已經存在於“%B”中。合併功能會在替換該資料夾中內任何與被移動檔案發生"
+"衝突的檔案前先要求確認。"
 
 #: ../libnautilus-private/nautilus-file-operations.c:4470
 #, c-format
@@ -2684,8 +2801,13 @@ msgid "Could not set as default application"
 msgstr "無法設定為預設的應用程式"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "預設值"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"預設值\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"預設"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
 msgid "Icon"
@@ -2696,8 +2818,13 @@ msgid "Could not remove application"
 msgstr "無法移除應用程式"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "尚未選擇應用程式"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"尚未選擇應用程式\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"沒有選取任何程式"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2722,17 +2849,31 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "以此開啟所有類型為「%s」的檔案："
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#, fuzzy
 msgid "Could not run application"
-msgstr "無法執行應用程式"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"無法執行應用程式\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法執行程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "找不到“%s”"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"找不到“%s”\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法找到‘%s’"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#, fuzzy
 msgid "Could not find application"
-msgstr "找不到應用程式"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"找不到應用程式\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法找到程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2740,30 +2881,51 @@ msgid "Could not add application to the application database: %s"
 msgstr "無法將程式加入應用程式資料庫：%s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
+#, fuzzy
 msgid "Could not add application"
-msgstr "無法加入應用程式"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"無法加入應用程式\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法加入程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "選擇一個應用程式"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"選擇一個應用程式\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"選取一個程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5104
+#, fuzzy
 msgid "Open With"
-msgstr "用指定軟件開啟"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"用指定軟件開啟\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"以其它應用程式開啟"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
 msgid "Select an application to view its description."
 msgstr "選取一程式來檢視它的描述。"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "使用自選的指令(_U)"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"使用自選的指令(_U)\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"使用自訂指令(_U)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "瀏覽(_B)..."
 
+#. #-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2775,19 +2937,33 @@ msgid "_Open"
 msgstr "開啟(_O)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "以此開啟 %s 及其他類型為「%s」的檔案："
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"以此開啟 %s 及其他類型為「%s」的檔案：\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"以其它程式開啟 %s 及類型為“%s”的檔案："
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#, fuzzy
 msgid "_Add"
-msgstr "新增(_A)"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"新增(_A)\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"加入(_A)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "加入應用程式"
+msgstr ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"加入應用程式\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"加入程式"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -2811,19 +2987,25 @@ msgstr "無法開啟，是否選擇其它處理方式？"
 msgid ""
 "The default action cannot open \"%s\" because it cannot access files at \"%s"
 "\" locations."
-msgstr "預設的處理方式無法開啟「%s」，因為它無法存取「%s」中的檔案。是否使用其他處理方式？"
+msgstr ""
+"預設的處理方式無法開啟「%s」，因為它無法存取「%s」中的檔案。是否使用其他處理"
+"方式？"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
 msgid ""
 "No other applications are available to view this file.  If you copy this "
 "file onto your computer, you may be able to open it."
-msgstr "目前沒有其它應用程式可以用來顯示該檔案。如果將該檔案複製至電腦中，也許可以開啟該檔案。"
+msgstr ""
+"目前沒有其它應用程式可以用來顯示該檔案。如果將該檔案複製至電腦中，也許可以開"
+"啟該檔案。"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:121
 msgid ""
 "No other actions are available to view this file.  If you copy this file "
 "onto your computer, you may be able to open it."
-msgstr "目前沒有其它處理方式可以用來顯示該檔案。如果將該檔案複製至電腦中，也許可以開啟該檔案。"
+msgstr ""
+"目前沒有其它處理方式可以用來顯示該檔案。如果將該檔案複製至電腦中，也許可以開"
+"啟該檔案。"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:360
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -2852,7 +3034,9 @@ msgstr "如果要開啟遠端的檔案，請先將檔案複製至本地的資料
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
-msgstr "如果要開啟遠端的檔案，請先將檔案複製至本地的資料夾才進行拖曳的動作。目的地已經有一個相同名稱的檔案正在開啟。"
+msgstr ""
+"如果要開啟遠端的檔案，請先將檔案複製至本地的資料夾才進行拖曳的動作。目的地已"
+"經有一個相同名稱的檔案正在開啟。"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:439
 msgid "Details: "
@@ -3183,7 +3367,8 @@ msgstr "所有此資料夾的可執行檔都會在「指令稿」選單中出現
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
-msgstr "在選單中選取其中一個指令稿會以所有已選取的項目作為輸入資料來執行該指令稿。"
+msgstr ""
+"在選單中選取其中一個指令稿會以所有已選取的項目作為輸入資料來執行該指令稿。"
 
 #: ../src/file-manager/fm-directory-view.c:5521
 msgid ""
@@ -3206,13 +3391,16 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"所有此資料夾的可執行檔都會在「指令稿」選單中出現。在選單中選取其中一個指令稿會執行該指令稿。\n"
+"所有此資料夾的可執行檔都會在「指令稿」選單中出現。在選單中選取其中一個指令稿"
+"會執行該指令稿。\n"
 "\n"
-"當在本機的資料夾中執行時，指令稿會以選取的檔案名稱作為參數。當在遠端的資料夾中執行時 (例如顯示網頁或 ftp 內容的資料夾)，執行指令稿時不會使用任何參數。\n"
+"當在本機的資料夾中執行時，指令稿會以選取的檔案名稱作為參數。當在遠端的資料夾"
+"中執行時 (例如顯示網頁或 ftp 內容的資料夾)，執行指令稿時不會使用任何參數。\n"
 "\n"
 "在任何情況下，指令稿都可以使用以下由 Nautilus 設定的環境變數：\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS：所選取的檔案，以 newline 字符分隔 (只適用於本機檔案)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS：所選取的檔案，以 newline 字符分隔 (只適"
+"用於本機檔案)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URIS：表示已選取的檔案的 URI，以 newline 字符分隔\n"
 "\n"
@@ -4611,7 +4799,9 @@ msgstr "Nautilus 無法建立所需的資料夾“%s”。"
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
-msgstr "執行 Nautilus 之前，請自行建立以下資料夾，或是設定正確的權限使 Nautilus 可以建立這些資料夾。"
+msgstr ""
+"執行 Nautilus 之前，請自行建立以下資料夾，或是設定正確的權限使 Nautilus 可以"
+"建立這些資料夾。"
 
 #: ../src/nautilus-application.c:328
 #, c-format
@@ -4622,7 +4812,9 @@ msgstr "Nautilus 無法新增以下的資料夾：%s。"
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
-msgstr "執行 Nautilus 之前，請自行建立這些資料夾，或是設定正確的權限使 Nautilus 可以建立這些資料夾。"
+msgstr ""
+"執行 Nautilus 之前，請自行建立這些資料夾，或是設定正確的權限使 Nautilus 可以"
+"建立這些資料夾。"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -4639,7 +4831,9 @@ msgid ""
 "Nautilus cannot be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
 "installing Nautilus again."
-msgstr "現在無法使用 Nautilus。在主控台下執行「bonobo-slay」或許可以修正問題。否則，請重新啟動電腦或是重新安裝 Nautilus。"
+msgstr ""
+"現在無法使用 Nautilus。在主控台下執行「bonobo-slay」或許可以修正問題。否則，"
+"請重新啟動電腦或是重新安裝 Nautilus。"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
 #: ../src/nautilus-application.c:603
@@ -4662,11 +4856,15 @@ msgid ""
 "We have also seen this error when a faulty version of bonobo-activation was "
 "installed."
 msgstr ""
-"現在無法使用 Nautilus。在主控台下執行「bonobo-slay」或許可以修正問題。否則，請重新啟動電腦或是重新安裝 Nautilus。\n"
+"現在無法使用 Nautilus。在主控台下執行「bonobo-slay」或許可以修正問題。否則，"
+"請重新啟動電腦或是重新安裝 Nautilus。\n"
 "\n"
-"Bonobo 找不到 Nautilus_shell.oaf 這個檔案。其中一個原因可能是因為 LD_LIBRARY_PATH 未包括 bonobo-activation 函式庫所在目錄。另一個可能性是安裝時出現錯誤導致沒有安裝 Nautilus_Shell.oaf 檔案。\n"
+"Bonobo 找不到 Nautilus_shell.oaf 這個檔案。其中一個原因可能是因為 "
+"LD_LIBRARY_PATH 未包括 bonobo-activation 函式庫所在目錄。另一個可能性是安裝時"
+"出現錯誤導致沒有安裝 Nautilus_Shell.oaf 檔案。\n"
 "\n"
-"執行「bonobo-slay」會終止所有的 Bonobo Activation 和 GConf 程序，這些程序有可能是其它應用程式需要使用的。\n"
+"執行「bonobo-slay」會終止所有的 Bonobo Activation 和 GConf 程序，這些程序有可"
+"能是其它應用程式需要使用的。\n"
 "\n"
 "有時終止 bonobo-activation-server 和 gconfd 會解決問題，但仍未找出原因。\n"
 "\n"
@@ -4690,21 +4888,27 @@ msgstr "Nautilus 因為預計之外的錯誤而無法使用。"
 msgid ""
 "Nautilus cannot be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
-msgstr "目前無法使用 Nautilus，因為當嘗試登記檔案總管顯示模式伺服器時，Bonobo 出現預計之外的錯誤。"
+msgstr ""
+"目前無法使用 Nautilus，因為當嘗試登記檔案總管顯示模式伺服器時，Bonobo 出現預"
+"計之外的錯誤。"
 
 #: ../src/nautilus-application.c:652
 msgid ""
 "Nautilus cannot be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the factory. Killing bonobo-activation-server and "
 "restarting Nautilus may help fix the problem."
-msgstr "Nautilus 目前無法使用，因為當 Bonobo 嘗試尋找工廠時出現預計之外的錯誤。強行中止 bonobo-activation-server 及重新啟動 Nautilus 或許可以修正問題。"
+msgstr ""
+"Nautilus 目前無法使用，因為當 Bonobo 嘗試尋找工廠時出現預計之外的錯誤。強行中"
+"止 bonobo-activation-server 及重新啟動 Nautilus 或許可以修正問題。"
 
 #: ../src/nautilus-application.c:659
 msgid ""
 "Nautilus cannot be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the shell object. Killing bonobo-activation-server and "
 "restarting Nautilus may help fix the problem."
-msgstr "Nautilus 目前無法使用，因為當 Bonobo 嘗試尋找系統殼物件時發生預計之外的錯誤。強行中止 bonobo-activation-server 及重新啟動 Nautilus 或許可以修正問題。"
+msgstr ""
+"Nautilus 目前無法使用，因為當 Bonobo 嘗試尋找系統殼物件時發生預計之外的錯誤。"
+"強行中止 bonobo-activation-server 及重新啟動 Nautilus 或許可以修正問題。"
 
 #: ../src/nautilus-application.c:1369 ../src/nautilus-places-sidebar.c:1682
 #: ../src/nautilus-places-sidebar.c:1705 ../src/nautilus-places-sidebar.c:1728
@@ -6234,13 +6438,17 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-1301 USA"
-msgstr "你應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信給：  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgstr ""
+"你應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信給：  "
+"the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
+"MA 02110-1301 USA"
 
 #: ../src/nautilus-window-menus.c:562
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
-msgstr "Nautilus 是一個適用於 GNOME 的圖形指令界面，令管理檔案及管理系統變得輕鬆。"
+msgstr ""
+"Nautilus 是一個適用於 GNOME 的圖形指令界面，令管理檔案及管理系統變得輕鬆。"
 
 #: ../src/nautilus-window-menus.c:566
 msgid "Copyright © 1999-2008 The Nautilus authors"
@@ -6564,6 +6772,152 @@ msgstr "縮放"
 msgid "Set the zoom level of the current view"
 msgstr "設定本顯示模式的縮放倍率"
 
+#: ../eel/eel-app-launch-context.c:407
+#, fuzzy, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"正在開啟 %d 個項目\n"
+"#-#-#-#-#  zh_HK.po (eel 2.21.91)  #-#-#-#-#\n"
+"開啟 %d 個項目"
+msgstr[1] ""
+"#-#-#-#-#  zh_HK.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"正在開啟 %d 個項目"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "圖片/標籤框"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "在警告對話視窗中，包圍標籤及圖片框線的闊度"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "警告類型"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "警告的類型"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "警告按鈕"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "出現在警告對話視窗中的按鈕"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "顯示更多訊息(_D)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "文字"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "標籤中的文字。"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "對齊方式"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"文字在標籤中排列時的對齊方式。它不會影響標籤元件本身在空位內排列的位置。該方"
+"面的資料請參考 GtkMisc::xalign。"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "換行"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "如選用本選項，當字句太長時會自動換行。"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "游標位置"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "游標目前的位置，以字符表示。"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "選擇範圍"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "從游標位置至選擇區域末端之間的字符數目。"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "全部選取"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "輸入法"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf 錯誤：\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 錯誤： %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "所有進一步的錯誤訊息只會在終端機中顯示。"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "沒有選取任何圖片。"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "請按下圖片來選取它。"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "你可以按下取消來停止這次操作。"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "（無效的統一碼）"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "開啟 %s"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "輸入密碼"
+
 #~ msgid "Create Folder"
 #~ msgstr "新增資料夾"
 
@@ -6930,11 +7284,6 @@ msgstr "設定本顯示模式的縮放倍率"
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "“%s”這個位置無效。"
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "正在開啟 %d 個項目"
-#~ msgstr[1] "正在開啟 %d 個項目"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "如果直接刪除本項目，它會無法還原。"
 
@@ -7059,3 +7408,18 @@ msgstr "設定本顯示模式的縮放倍率"
 
 #~ msgid "Nautilus cannot display \"%s\"."
 #~ msgstr "Nautilus 無法顯示“%s”。"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 上午"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 上午"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 上午"
+
+#~ msgid "Select an application to open %s and others of type \"%s\""
+#~ msgstr "選取一程式來開啟 %s 及類型為“%s”的檔案"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "無法將程式加入程式資料庫中"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fcd32ba29..f4ec4631d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#
 # Chinese (Hong Kong) translation for nautilus.
 # Copyright (C) 2000-07 Free Software Foundation, Inc.
 # Gong Yi LIAO <granziliao@sinamail.com>, 2000.
@@ -6,8 +7,19 @@
 # Woodman Tuen <wmtuen@gmail.com>, 2004-07.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2008
 #
+# #-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#
+# Chinese(Taiwan) translation of eel.
+# Copyright (C) 2000-06 Free Software Foundation, Inc.
+# Gong Yi LIAO <granziliao@sinamail.com>, 2000.
+# Joe Man <trmetal@yahoo.com.hk>, 2001.
+# Abel Cheung <abel@oaka.org>, 2002-2003.
+# Woodman Tuen <wmtuen@gmail.com>, 2004-2006.
+#
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
 "Project-Id-Version: nautilus 2.24.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-18 12:08+0800\n"
@@ -18,6 +30,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"Project-Id-Version: eel 2.21.91\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-27 20:14+0800\n"
+"PO-Revision-Date: 2008-01-31 20:42+0800\n"
+"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
+"Language-Team: Chinese(Taiwan) <community@linuxhall.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/browser.xml.h:1
 msgid "Apparition"
@@ -2778,8 +2801,13 @@ msgid "Could not set as default application"
 msgstr "無法設定為預設的應用程式"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:257
+#, fuzzy
 msgid "Default"
-msgstr "預設值"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"預設值\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"預設"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:265
 msgid "Icon"
@@ -2790,8 +2818,13 @@ msgid "Could not remove application"
 msgstr "無法移除應用程式"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:564
+#, fuzzy
 msgid "No applications selected"
-msgstr "尚未選擇應用程式"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"尚未選擇應用程式\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"沒有選取任何程式"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:592
 #: ../libnautilus-private/nautilus-open-with-dialog.c:904
@@ -2816,17 +2849,31 @@ msgid "Open all files of type \"%s\" with:"
 msgstr "以此開啟所有類型為「%s」的檔案："
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:145
+#, fuzzy
 msgid "Could not run application"
-msgstr "無法執行應用程式"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"無法執行應用程式\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法執行程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:157
-#, c-format
+#, fuzzy, c-format
 msgid "Could not find '%s'"
-msgstr "找不到“%s”"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"找不到“%s”\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法找到‘%s’"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:160
+#, fuzzy
 msgid "Could not find application"
-msgstr "找不到應用程式"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"找不到應用程式\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法找到程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:234
 #, c-format
@@ -2834,30 +2881,51 @@ msgid "Could not add application to the application database: %s"
 msgstr "無法將程式加入應用程式資料庫：%s"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:235
+#, fuzzy
 msgid "Could not add application"
-msgstr "無法加入應用程式"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"無法加入應用程式\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"無法加入程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:375
+#, fuzzy
 msgid "Select an Application"
-msgstr "選擇一個應用程式"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"選擇一個應用程式\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"選取一個程式"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:727
 #: ../src/file-manager/fm-properties-window.c:5104
+#, fuzzy
 msgid "Open With"
-msgstr "用指定軟體開啟"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"用指定軟體開啟\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"以其它應用程式開啟"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:764
 msgid "Select an application to view its description."
 msgstr "選取一程式來檢視它的描述。"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:789
+#, fuzzy
 msgid "_Use a custom command"
-msgstr "使用自訂的指令(_U)"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"使用自訂的指令(_U)\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"使用自訂指令(_U)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:806
 msgid "_Browse..."
 msgstr "瀏覽(_B)..."
 
+#. #-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-open-with-dialog.c:828
@@ -2869,19 +2937,33 @@ msgid "_Open"
 msgstr "開啟(_O)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:919
-#, c-format
+#, fuzzy, c-format
 msgid "Open %s and other files of type \"%s\" with:"
-msgstr "以此開啟 %s 及其他類型為「%s」的檔案："
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"以此開啟 %s 及其他類型為「%s」的檔案：\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"以其它程式開啟 %s 及類型為“%s”的檔案："
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:955
 #: ../libnautilus-private/nautilus-open-with-dialog.c:970
+#, fuzzy
 msgid "_Add"
-msgstr "新增(_A)"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"新增(_A)\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"加入(_A)"
 
 #: ../libnautilus-private/nautilus-open-with-dialog.c:956
 #: ../libnautilus-private/nautilus-open-with-dialog.c:971
+#, fuzzy
 msgid "Add Application"
-msgstr "加入應用程式"
+msgstr ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"加入應用程式\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"加入程式"
 
 #: ../libnautilus-private/nautilus-program-choosing.c:80
 msgid "Open Failed, would you like to choose another application?"
@@ -6690,6 +6772,152 @@ msgstr "縮放"
 msgid "Set the zoom level of the current view"
 msgstr "設定本顯示模式的縮放倍率"
 
+#: ../eel/eel-app-launch-context.c:407
+#, fuzzy, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"正在開啟 %d 個項目\n"
+"#-#-#-#-#  zh_TW.po (eel 2.21.91)  #-#-#-#-#\n"
+"開啟 %d 個項目"
+msgstr[1] ""
+"#-#-#-#-#  zh_TW.po (nautilus 2.24.0)  #-#-#-#-#\n"
+"正在開啟 %d 個項目"
+
+#: ../eel/eel-alert-dialog.c:115
+msgid "Image/label border"
+msgstr "圖片/標籤框"
+
+#: ../eel/eel-alert-dialog.c:116
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "在警告對話視窗中，包圍標籤及圖片框線的闊度"
+
+#: ../eel/eel-alert-dialog.c:125
+msgid "Alert Type"
+msgstr "警告類型"
+
+#: ../eel/eel-alert-dialog.c:126
+msgid "The type of alert"
+msgstr "警告的類型"
+
+#: ../eel/eel-alert-dialog.c:134
+msgid "Alert Buttons"
+msgstr "警告按鈕"
+
+#: ../eel/eel-alert-dialog.c:135
+msgid "The buttons shown in the alert dialog"
+msgstr "出現在警告對話視窗中的按鈕"
+
+#: ../eel/eel-alert-dialog.c:199
+msgid "Show more _details"
+msgstr "顯示更多訊息(_D)"
+
+#: ../eel/eel-canvas.c:1222 ../eel/eel-canvas.c:1223
+msgid "X"
+msgstr "X"
+
+#: ../eel/eel-canvas.c:1229 ../eel/eel-canvas.c:1230
+msgid "Y"
+msgstr "Y"
+
+#: ../eel/eel-editable-label.c:366
+msgid "Text"
+msgstr "文字"
+
+#: ../eel/eel-editable-label.c:367
+msgid "The text of the label."
+msgstr "標籤中的文字。"
+
+#: ../eel/eel-editable-label.c:373
+msgid "Justification"
+msgstr "對齊方式"
+
+#: ../eel/eel-editable-label.c:374
+msgid ""
+"The alignment of the lines in the text of the label relative to each other. "
+"This does NOT affect the alignment of the label within its allocation. See "
+"GtkMisc::xalign for that."
+msgstr ""
+"文字在標籤中排列時的對齊方式。它不會影響標籤元件本身在空位內排列的位置。該方"
+"面的資料請參考 GtkMisc::xalign。"
+
+#: ../eel/eel-editable-label.c:382
+msgid "Line wrap"
+msgstr "換行"
+
+#: ../eel/eel-editable-label.c:383
+msgid "If set, wrap lines if the text becomes too wide."
+msgstr "如選用本選項，當字句太長時會自動換行。"
+
+#: ../eel/eel-editable-label.c:390
+msgid "Cursor Position"
+msgstr "游標位置"
+
+#: ../eel/eel-editable-label.c:391
+msgid "The current position of the insertion cursor in chars."
+msgstr "游標目前的位置，以字元表示。"
+
+#: ../eel/eel-editable-label.c:400
+msgid "Selection Bound"
+msgstr "選擇範圍"
+
+#: ../eel/eel-editable-label.c:401
+msgid ""
+"The position of the opposite end of the selection from the cursor in chars."
+msgstr "從游標位置至選擇區域末端之間的字元數目。"
+
+#: ../eel/eel-editable-label.c:3049
+msgid "Select All"
+msgstr "全部選取"
+
+#: ../eel/eel-editable-label.c:3060
+msgid "Input Methods"
+msgstr "輸入法"
+
+#: ../eel/eel-gconf-extensions.c:83
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf 錯誤：\n"
+"  %s"
+
+#: ../eel/eel-gconf-extensions.c:87
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 錯誤： %s"
+
+#: ../eel/eel-gconf-extensions.c:90
+msgid "All further errors shown only on terminal."
+msgstr "所有進一步的錯誤訊息只會在終端機中顯示。"
+
+#: ../eel/eel-gnome-extensions.c:265
+msgid "No image was selected."
+msgstr "沒有選取任何圖片。"
+
+#: ../eel/eel-gnome-extensions.c:266
+msgid "You must click on an image to select it."
+msgstr "請按下圖片來選取它。"
+
+#: ../eel/eel-stock-dialogs.c:214
+msgid "You can stop this operation by clicking cancel."
+msgstr "您可以按下取消來停止這次操作。"
+
+#: ../eel/eel-vfs-extensions.c:92
+msgid " (invalid Unicode)"
+msgstr "（無效的統一碼）"
+
+#: ../eel/eel-app-launch-context.c:404
+#, c-format
+msgid "Opening %s"
+msgstr "開啟 %s"
+
+#: ../eel/eel-mount-operation.c:126
+msgid "Enter Password"
+msgstr "輸入密碼"
+
 #~ msgid "Create Folder"
 #~ msgstr "新增資料夾"
 
@@ -7056,11 +7284,6 @@ msgstr "設定本顯示模式的縮放倍率"
 #~ msgid "\"%s\" is not a valid location."
 #~ msgstr "“%s”這個位置無效。"
 
-#~ msgid "Opening %d Item"
-#~ msgid_plural "Opening %d Items"
-#~ msgstr[0] "正在開啟 %d 個項目"
-#~ msgstr[1] "正在開啟 %d 個項目"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "如果直接刪除本項目，它會無法還原。"
 
@@ -7185,3 +7408,18 @@ msgstr "設定本顯示模式的縮放倍率"
 
 #~ msgid "Nautilus cannot display \"%s\"."
 #~ msgstr "Nautilus 無法顯示“%s”。"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 上午"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 上午"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 上午"
+
+#~ msgid "Select an application to open %s and others of type \"%s\""
+#~ msgstr "選取一程式來開啟 %s 及類型為“%s”的檔案"
+
+#~ msgid "Could not add application to the application database"
+#~ msgstr "無法將程式加入程式資料庫中"