Another attempt at fixing auto-sizing; it seems to work now. Maybe

2000-08-18  Federico Mena Quintero  <federico@helixcode.com>

	Another attempt at fixing auto-sizing; it seems to work now.
	Maybe GtkScrollFrame is not *that* broken...

	* window.c (window_construct): Do not set the default size of the
	window.
	(window_init): Set the window policy to allow_shrink.
	(auto_size): Set the usize of the image view to our preferred size.
	(window_open_image_dialog): Add a grab on the dialog so that the
	user cannot invoke commands on the window!
	(hide_cb): Remove the grab when the dialog is hidden.
	(window_open_image_dialog): Sigh.  Add an accel group so that
	pressing Escape can close the open dialog.

	* gtkscrollframe.c (gtk_scroll_frame_size_request): Do pay
	attention to the child's requisition; this restores the code to
	its original state.
	(gtk_scroll_frame_size_allocate): Make sure the the
	child_allocation is nonnegative (bugfix merge from Evolution).

	* image-view.c (image_view_size_request): Request a size of zero.

32 files changed, 2625 insertions, 1231 deletions

diff --git a/NEWS b/NEWS
index 7d4aa506..c81a5a8f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,19 +1,20 @@
 Version 0.4
 -----------
 
-* Requires libglade and GConf.
+* Requires libglade stable and GConf 0.8.
+
+* Greatly enhanced the scrolling engine.  Now it is fast and nice.  It
+  also supports a two-pass scrolling mode which is useful for slow
+  machines when scrolling zoomed images (Federico).
 
 * New full screen viewing mode.  Look at your images on the big
   screen! (Federico)
 
-* Greatly enhanced the scrolling engine.  Now it is fast and nice
-  (Federico).
-
-* Added a two-pass scrolling mode.  This is useful for slow machines
-  when scrolling zoomed images (Federico).
-
 * We support wheel mice; you can use the wheel for zooming (Federico).
 
+* Windows can adjust their size and zoom factor automatically when
+  opening new images (Federico).
+
 * New preferences dialog and a slew of options to tinker
   with (Arik, Federico).
 
@@ -21,8 +22,11 @@ Version 0.4
 
 * Plenty of Bonobo work (Michael, Iain, Maciej).
 
+* Miscellaneous UI polishing (Federico).
+
 * New and updated translations (Fatih, Pablo, Rasta, Kjartan, Jesús,
-  Zbigniew, Yukihiro, Christopher, Andreas, Jarkko, Valek).
+  Zbigniew, Yukihiro, Christopher, Andreas, Jarkko, Valek, Gergo,
+  Ville, Yuri, Kusano, Kenny, Kai, George, Matthias, Federico).
 
 Version 0.3
 -----------
diff --git a/TODO b/TODO
index b49dea65..1d3c8749 100644
--- a/TODO
+++ b/TODO
@@ -3,9 +3,13 @@ Federico Mena-Quintero (federico@gnu.org).
 
 * Bugs:
 
-	- When a window is created with a new image (i.e. by running
-	  the program from the command line or by turning on "open
-	  images in a new window", auto-sizing does not work.
+	- Turn on window auto-sizing and create a new window with an
+          image in it (i.e. by turning on the "open images in a new
+          window" option or by specifying an image filename in the
+          command line).  The image view comes up a little bit larger
+          than the right auto-fit size.  This is GtkScrollFrame's
+          fault; for some reason it is including the (un-needed)
+          scrollbars' requisitions in its own space.
 
 * Finish the ImageView widget:
 
diff --git a/libeog/gtkscrollframe.c b/libeog/gtkscrollframe.c
index a607bb51..10870679 100644
--- a/libeog/gtkscrollframe.c
+++ b/libeog/gtkscrollframe.c
@@ -512,8 +512,8 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	GtkScrollFrame *sf;
 	ScrollFramePrivate *priv;
 	GtkBin *bin;
-	gint extra_width;
-	gint extra_height;
+	int extra_width;
+	int extra_height;
 	GtkRequisition hsb_requisition;
 	GtkRequisition vsb_requisition;
 	GtkRequisition child_requisition;
@@ -548,12 +548,9 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition)
 
 		gtk_widget_size_request (bin->child, &child_requisition);
 
-#if 0
 		if (priv->hsb_policy == GTK_POLICY_NEVER)
 			requisition->width += child_requisition.width;
-		else
-#endif
-		{
+		else {
 			GtkWidgetAuxInfo *aux_info;
 
 			aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child),
@@ -565,12 +562,9 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition)
 				requisition->width += vsb_requisition.width;
 		}
 
-#if 0
 		if (priv->vsb_policy == GTK_POLICY_NEVER)
 			requisition->height += child_requisition.height;
-		else
-#endif
-		{
+		else {
 			GtkWidgetAuxInfo *aux_info;
 
 			aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child),
@@ -615,8 +609,8 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
 
 	allocation->x = GTK_CONTAINER (widget)->border_width;
 	allocation->y = GTK_CONTAINER (widget)->border_width;
-	allocation->width = MAX (1, (gint) widget->allocation.width - allocation->x * 2);
-	allocation->height = MAX (1, (gint) widget->allocation.height - allocation->y * 2);
+	allocation->width = MAX (1, (int) widget->allocation.width - (int) allocation->x * 2);
+	allocation->height = MAX (1, (int) widget->allocation.height - (int) allocation->y * 2);
 
 	if (priv->vsb_visible) {
 		GtkRequisition vsb_requisition;
@@ -627,8 +621,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
 		    || priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
 			allocation->x += vsb_requisition.width + priv->sb_spacing;
 
-		allocation->width = MAX (1, ((gint) allocation->width
-					     - ((gint) vsb_requisition.width + priv->sb_spacing)));
+		allocation->width = MAX (1,
+					 ((int) allocation->width
+					  - (int) (vsb_requisition.width + priv->sb_spacing)));
 	}
 
 	if (priv->hsb_visible) {
@@ -640,8 +635,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
 		    || priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
 			allocation->y += hsb_requisition.height + priv->sb_spacing;
 
-		allocation->height = MAX (1, ((gint) allocation->height
-					      - ((gint) hsb_requisition.height + priv->sb_spacing)));
+		allocation->height = MAX (1,
+					  ((int) allocation->height
+					   - (int) (hsb_requisition.height + priv->sb_spacing)));
 	}
 }
 
@@ -654,7 +650,7 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	GtkBin *bin;
 	GtkAllocation relative_allocation;
 	GtkAllocation child_allocation;
-	gint xthickness, ythickness;
+	int xthickness, ythickness;
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_SCROLL_FRAME (widget));
@@ -699,8 +695,8 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 
 			child_allocation.x = priv->frame_x + xthickness;
 			child_allocation.y = priv->frame_y + ythickness;
-			child_allocation.width = priv->frame_w - 2 * xthickness;
-			child_allocation.height = priv->frame_h - 2 * ythickness;
+			child_allocation.width = MAX ((int) priv->frame_w - 2 * xthickness, 0);
+			child_allocation.height = MAX ((int) priv->frame_h - 2 * ythickness, 0);
 
 			previous_hvis = priv->hsb_visible;
 			previous_vvis = priv->vsb_visible;
diff --git a/libeog/image-view.c b/libeog/image-view.c
index cf365582..fa215b23 100644
--- a/libeog/image-view.c
+++ b/libeog/image-view.c
@@ -1059,7 +1059,6 @@ image_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
 {
 	ImageView *view;
 	ImageViewPrivate *priv;
-	int scaled_width, scaled_height;
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (IS_IMAGE_VIEW (widget));
@@ -1068,10 +1067,7 @@ image_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	view = IMAGE_VIEW (widget);
 	priv = view->priv;
 
-	compute_scaled_size (view, priv->zoom, &scaled_width, &scaled_height);
-
-	requisition->width = scaled_width ? scaled_width : 1;
-	requisition->height = scaled_height ? scaled_height : 1;
+	requisition->width = requisition->height = 0;
 }
 
 /* Sets the zoom anchor point with respect to the specified window position */
diff --git a/po/ChangeLog b/po/ChangeLog
index 81cb171d..e2fbc9f4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-18  Federico Mena Quintero  <federico@helixcode.com>
+
+	* es.po: Updated Spanish translation.
+
 2000-08-17  Kai Lahmann <kl@linuxfaqs.de>
 
 	* de.po: Updated German translation
diff --git a/po/ca.po b/po/ca.po
index 534875e3..67794125 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.2\n"
-"POT-Creation-Date: 2000-06-01 04:03+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-05-31 23:00+0200\n"
 "Last-Translator: Quico Llach <quico@softcatala.org>\n"
 "Language-Team: \n"
@@ -14,11 +14,132 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Ajusta la imatge per encabir-la a la finestra"
+
+#: src/preferences-dialog.glade.h:39
+#, fuzzy
+msgid "Full Screen"
+msgstr "Pantalla _Completa"
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "_Factor del zoom"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Obre"
 
-#: src/tb-image.c:33 src/window.c:364
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Obre un fitxer gràfic"
 
@@ -26,7 +147,7 @@ msgstr "Obre un fitxer gràfic"
 msgid "Close"
 msgstr "Tanca"
 
-#: src/tb-image.c:35 src/window.c:369
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Tanca la finestra actual"
 
@@ -46,159 +167,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Ajusta"
 
-#: src/window.c:132
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "Voleu desar el grup d'imatges '%s'?"
-
-#: src/window.c:136
-msgid "Save"
-msgstr "Desa"
-
-#: src/window.c:137
-msgid "Don't save"
-msgstr "No desis"
-
-#: src/window.c:138
-msgid "Don't exit"
-msgstr "No surtis"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:343 src/window.c:605 src/window.c:779
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:345
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:347
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "El programa GNOME per visualitzar i catalogar imatges"
 
-#: src/window.c:364
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Obre la imatge..."
 
-#: src/window.c:369
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Tanca aquesta finestra"
 
-#: src/window.c:380
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:381
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:382
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:383
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:384
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:385
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:386
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:387
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:388
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:390
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:391
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:392
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:393
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:394
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:395
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:396
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:397
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:398
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:404
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Amplia el zoom"
 
-#: src/window.c:404
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Augmenta el zoom en un 5%%"
 
-#: src/window.c:408
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Redueix el zoom"
 
-#: src/window.c:408
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Redueix el zoom en un 5%%"
 
-#: src/window.c:412
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zoom _1:1"
 
-#: src/window.c:412
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Mostra la imatge a escala 1:1"
 
-#: src/window.c:416
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Factor del zoom"
 
-#: src/window.c:418
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Ajusta a la finestra"
 
-#: src/window.c:418
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Ajusta la imatge per encabir-la a la finestra"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Pantalla _Completa"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Utilitza tota la pantalla per a la visualització"
 
-#: src/window.c:710
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Obre la imatge"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Voleu desar el grup d'imatges '%s'?"
+
+#~ msgid "Save"
+#~ msgstr "Desa"
+
+#~ msgid "Don't save"
+#~ msgstr "No desis"
+
+#~ msgid "Don't exit"
+#~ msgstr "No surtis"
diff --git a/po/cs.po b/po/cs.po
index 44d9811e..3bfcef16 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-16 13:55-0700\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator:  George Lebl <jirka@5z.com>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "Nelze inicializovat Bonobo"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Konfigurace"
 
@@ -139,7 +139,7 @@ msgstr "Prohlí¾eèe"
 msgid "Open"
 msgstr "Otevøít"
 
-#: src/tb-image.c:33 src/window.c:174
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Otevøít soubor obrázku"
 
@@ -147,7 +147,7 @@ msgstr "Otevøít soubor obrázku"
 msgid "Close"
 msgstr "Zavøít"
 
-#: src/tb-image.c:35 src/window.c:179
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Zavøít toto okno"
 
@@ -172,143 +172,144 @@ msgstr "Vejít"
 msgid "Could not open `%s'"
 msgstr "Nelze otevøít `%s'"
 
-#: src/window.c:155 src/window.c:490 src/window.c:711
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:157
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 Free Software Foundation"
 
-#: src/window.c:159
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Prohlí¾eè obrázku pro Gnome"
 
-#: src/window.c:174
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Otevøít obrázek..."
 
-#: src/window.c:179
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Zavøít toto okno"
 
-#: src/window.c:190
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:191
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:192
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:193
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:194
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:195
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:196
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:197
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:198
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:200
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:201
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:202
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:203
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:204
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:205
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:206
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:207
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:208
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:214
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Zvìt¹it"
 
-#: src/window.c:214
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Zvý¹it faktor zùmu o 5%%"
 
-#: src/window.c:218
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Zmen¹it"
 
-#: src/window.c:218
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Sní¾it faktor zùmu o 5%%"
 
-#: src/window.c:222
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zoom na _1:1"
 
-#: src/window.c:222
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Ukázat obrázek ve velikosti 1:1"
 
-#: src/window.c:226
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "Faktor _zùmu"
 
-#: src/window.c:228
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Vejít do okna"
 
-#: src/window.c:228
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Nastav obrázek aby se pøesnì ve¹el do okna"
 
-#: src/window.c:232
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Celá _Obrazovka"
 
-#: src/window.c:232
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Pou¾ít celou obrazovku na zobrzení"
 
-#: src/window.c:591
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Otevøít obrázek"
 
diff --git a/po/da.po b/po/da.po
index 2a89b667..d2663a4e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"POT-Creation-Date: 2000-05-16 00:23+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-06-29 02:10+02:00\n"
 "Last-Translator: Kenneth Christiansen <kenneth@ripen.dk>\n"
 "Language-Team: Dansk/Danish <dansk@klid.dk>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: bonobo/bonobo-image-generic.c:620
+#: bonobo/bonobo-image-generic.c:681
 msgid "I could not initialize Bonobo"
 msgstr "Jeg kunne ikke initialisere Bonobo"
 
-#: src/preferences.c:177
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Præferencer"
 
@@ -153,7 +153,7 @@ msgstr "Fremvisere"
 msgid "Open"
 msgstr "Åbn"
 
-#: src/tb-image.c:33 src/window.c:374
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Åbn en billedfil"
 
@@ -161,7 +161,7 @@ msgstr "Åbn en billedfil"
 msgid "Close"
 msgstr "Luk"
 
-#: src/tb-image.c:35 src/window.c:379
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Luk den aktuelle vindue"
 
@@ -186,159 +186,155 @@ msgstr "Fyldud"
 msgid "Could not open `%s'"
 msgstr "Kunne ikke åbne '%s'"
 
-#: src/window.c:133
-#, c-format
-msgid "Save image collection `%s'?"
-msgstr "Gem billedsamling '%s'?"
-
-#: src/window.c:137
-msgid "Save"
-msgstr "Gem"
-
-#: src/window.c:138
-msgid "Don't save"
-msgstr "Gem ikke"
-
-#: src/window.c:139
-msgid "Don't exit"
-msgstr "Afslut ikke"
-
-#: src/window.c:353 src/window.c:621 src/window.c:795
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Gnomes øje"
 
-#: src/window.c:355
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Ophavsret (C) 1999 Free Software Foundation"
 
-#: src/window.c:357
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Gnome billedviser og katalogiseringsprogram"
 
-#: src/window.c:374
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "Å_bn billede..."
 
-#: src/window.c:379
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Luk dette vindue"
 
-#: src/window.c:390
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:391
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:392
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:393
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:394
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:395
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:396
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:397
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:398
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:400
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:401
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:402
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:403
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:404
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:405
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:406
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:407
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:408
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:414
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Zoom ind"
 
-#: src/window.c:414
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Øg zoomfaktoren med 5%%"
 
-#: src/window.c:418
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Zoom ud"
 
-#: src/window.c:418
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Mindsk zoomfaktoren med 5%%"
 
-#: src/window.c:422
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zoom _1:1"
 
-#: src/window.c:422
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Vis billedet i 1:1 skala"
 
-#: src/window.c:426
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Zoomfaktor"
 
-#: src/window.c:428
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Udfyld vindue"
 
-#: src/window.c:428
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Zoom så billedet udfylder vinduet"
 
-#: src/window.c:432
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Fuld _skærm"
 
-#: src/window.c:432
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Brug hele skærmen til visning"
 
-#: src/window.c:726
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Åbn billede"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Gem billedsamling '%s'?"
+
+#~ msgid "Save"
+#~ msgstr "Gem"
+
+#~ msgid "Don't save"
+#~ msgstr "Gem ikke"
+
+#~ msgid "Don't exit"
+#~ msgstr "Afslut ikke"
diff --git a/po/el.po b/po/el.po
index 47257f63..5a958cf3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.2\n"
-"POT-Creation-Date: 2000-06-01 04:03+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-05-04 12:05+0000\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -13,13 +13,136 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "ÌåãÝèõíóç ôçò åéêüíáò ãéá íá ðñïóáñìïóôåß óôï ðáñÜèõñï"
+
+#: src/preferences-dialog.glade.h:39
+#, fuzzy
+msgid "Full Screen"
+msgstr "ÐëÞñçò _Ïèüíç"
+
+#
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "ÓõíôåëåóôÞò _ÌåãÝèõíóçò"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "¶íïéãìá"
 
 #
-#: src/tb-image.c:33 src/window.c:364
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "¶íïéãìá áñ÷åßïõ åéêüíáò"
 
@@ -29,7 +152,7 @@ msgid "Close"
 msgstr "Êëåßóéìï"
 
 #
-#: src/tb-image.c:35 src/window.c:369
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Êëåßóéìï ôïõ ôñÝ÷ïíôïò ðáñáèýñïõ"
 
@@ -53,196 +176,197 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Ôáßñéáóìá"
 
-#
-#: src/window.c:132
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "ÁðïèÞêåõóç óõëëïãÞò åéêüíùí `%s';"
-
-#
-#: src/window.c:136
-msgid "Save"
-msgstr "ÁðïèÞêåõóç"
-
-#
-#: src/window.c:137
-msgid "Don't save"
-msgstr "Íá ìçí áðïèçêåõèåß"
-
-#
-#: src/window.c:138
-msgid "Don't exit"
-msgstr "Íá ìçí ôåñìáôéóôåß"
+msgid "Could not open `%s'"
+msgstr ""
 
 #
-#: src/window.c:343 src/window.c:605 src/window.c:779
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "ÌÜôé ôïõ Gnome"
 
 #
-#: src/window.c:345
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "ÐíåõìáôéêÜ Äéêáéþìáôá (C) 1999 The Free Software Foundation"
 
 #
-#: src/window.c:347
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Ç åöáñìïãÞ åìöÜíéóçò êáé êáôáëïãïðïßçóçò åéêüíùí ôïõ GNOME"
 
 #
-#: src/window.c:364
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_¶íïéãìá Åéêüíáò..."
 
 #
-#: src/window.c:369
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Êëåßóéìï Áõôïý Ôïõ Ðáñáèýñïõ"
 
 #
-#: src/window.c:380
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
 #
-#: src/window.c:381
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
 #
-#: src/window.c:382
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
 #
-#: src/window.c:383
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
 #
-#: src/window.c:384
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
 #
-#: src/window.c:385
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
 #
-#: src/window.c:386
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
 #
-#: src/window.c:387
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
 #
-#: src/window.c:388
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
 #
-#: src/window.c:390
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
 #
-#: src/window.c:391
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
 #
-#: src/window.c:392
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
 #
-#: src/window.c:393
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
 #
-#: src/window.c:394
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
 #
-#: src/window.c:395
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
 #
-#: src/window.c:396
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
 #
-#: src/window.c:397
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
 #
-#: src/window.c:398
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
 #
-#: src/window.c:404
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "ÌåãÝèõíóç"
 
 #
-#: src/window.c:404
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Áýîçóç óõíôåëåóôÞ ìåãÝèõíóçò êáôÜ 5%%"
 
 #
-#: src/window.c:408
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Óìßêñõíóç"
 
 #
-#: src/window.c:408
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "ÅëëÜôùóç óõíôåëåóôÞ ìåãÝèõíóçò êáôÜ 5%%"
 
 #
-#: src/window.c:412
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "ÌåãÝèõíóç _1:1"
 
 #
-#: src/window.c:412
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "ÅìöÜíéóç ôçò åéêüíáò óå äéáóôÜóåéò 1:1"
 
 #
-#: src/window.c:416
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "ÓõíôåëåóôÞò _ÌåãÝèõíóçò"
 
 #
-#: src/window.c:418
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_ÐñïóáñìïãÞ óôï ÐáñÜèõñï"
 
 #
-#: src/window.c:418
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "ÌåãÝèõíóç ôçò åéêüíáò ãéá íá ðñïóáñìïóôåß óôï ðáñÜèõñï"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "ÐëÞñçò _Ïèüíç"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "×ñÞóç ïëüêëçñçò ôçò ïèüíçò ãéá ôçí åìöÜíéóç"
 
 #
-#: src/window.c:710
+#: src/window.c:618
 msgid "Open Image"
 msgstr "¶íïéãìá Åéêüíáò"
+
+#
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "ÁðïèÞêåõóç óõëëïãÞò åéêüíùí `%s';"
+
+#
+#~ msgid "Save"
+#~ msgstr "ÁðïèÞêåõóç"
+
+#
+#~ msgid "Don't save"
+#~ msgstr "Íá ìçí áðïèçêåõèåß"
+
+#
+#~ msgid "Don't exit"
+#~ msgstr "Íá ìçí ôåñìáôéóôåß"
diff --git a/po/es.po b/po/es.po
index 26e3df9b..e6b05599 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,23 +1,158 @@
 # Spanish translation of the Eye of Gnome
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 2000 Free Software Foundation, Inc.
 # Federico Mena-Quintero <federico@gimp.org>, 1999.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: eog 0.1\n"
-"POT-Creation-Date: 2000-04-20 01:13-0500\n"
-"PO-Revision-Date: 1999-11-21 14:41-05:00\n"
-"Last-Translator: Federico Mena-Quintero <federico@gimp.org>\n"
+"Project-Id-Version: eog 0.4\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
+"PO-Revision-Date: 2000-08-18 16:09-04:00\n"
+"Last-Translator: Federico Mena-Quintero <federico@gnu.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr "No se pudo inicializar Bonobo"
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr "Preferencias"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr "Interpolación"
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr "Transparencia"
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr "Tamaño del ajedrezado"
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+"Ajedrezado oscuro\n"
+"Ajedrezado medio\n"
+"Ajedrezdo claro\n"
+"Negro\n"
+"Gris\n"
+"Blanco\n"
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+"Pequeño\n"
+"Mediano\n"
+"Grande\n"
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+"Ninguna\n"
+"Bilinear\n"
+"Hiperbólica\n"
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr "Desplazamiento en dos etapas"
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr "Difusión"
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+"Ninguna\n"
+"Normal (pseudocolor)\n"
+"Máxima (high color)\n"
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr "Despliegue"
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr "Ventanas de Imagen"
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr "Mostrar barras de desplazamiento"
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+"Nunca\n"
+"Sólo si la imagen no cabe\n"
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr "Ajustar el tamaño de la ventana y de la imagen automáticamente"
+
+#: src/preferences-dialog.glade.h:38
+msgid "Open images in a new window"
+msgstr "Abrir imágenes en una ventana nueva"
+
+#: src/preferences-dialog.glade.h:39
+msgid "Full Screen"
+msgstr "Pantalla Completa"
+
+#: src/preferences-dialog.glade.h:44
+msgid "Use 1:1 zoom factor"
+msgstr "Usar escala 1:1"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr "Usar la misma escala que la ventana de la imagen"
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr "Ajustar la escala al tamaño de la pantalla"
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr "Ajustar la escala de imágenes con tamaño estándar"
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr "Mostrar un borde en la orilla de la pantalla"
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr "Visores"
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Abrir"
 
-#: src/tb-image.c:33 src/window.c:356
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Abrir una imagen"
 
@@ -25,7 +160,7 @@ msgstr "Abrir una imagen"
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/tb-image.c:35 src/window.c:361
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Cerrar la ventana actual"
 
@@ -45,153 +180,147 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Ajustar"
 
-#: src/window.c:130
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "¿Guardar la colección `%s'?"
-
-#: src/window.c:134
-msgid "Save"
-msgstr "Guardar"
-
-#: src/window.c:135
-msgid "Don't save"
-msgstr "No guardar"
+msgid "Could not open `%s'"
+msgstr "No se pudo abrir `%s'"
 
-#: src/window.c:136
-msgid "Don't exit"
-msgstr "No salir"
-
-#: src/window.c:335 src/window.c:563 src/window.c:735
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:337
-msgid "Copyright (C) 1999 The Free Software Foundation"
-msgstr "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+msgid "Copyright (C) 2000 The Free Software Foundation"
+msgstr "Copyright (C) 2000 The Free Software Foundation"
 
-#: src/window.c:339
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "El programa de GNOME para ver y catalogar imágenes"
 
-#: src/window.c:356
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Abrir Imagen..."
 
-#: src/window.c:361
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Cerrar Esta Ventana"
 
-#: src/window.c:370
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:371
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:372
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:373
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:374
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:375
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:376
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:377
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:378
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:380
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:381
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:382
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:383
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:384
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:385
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:386
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:387
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:388
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:394
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Acercar la Imagen"
 
-#: src/window.c:394
-#, c-format
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Aumentar la imagen por 5%%"
 
-#: src/window.c:398
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Alejar la Imagen"
 
-#: src/window.c:398
-#, c-format
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Disminuir la imagen por 5%%"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Aumento _1:1"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Mostrar la imagen a una escala 1:1"
 
-#: src/window.c:406
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Escala"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Ajustar a la Ventana"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Ajustar la escala de la imagen al tamaño de la ventana"
 
-#: src/window.c:668
+#: src/window.c:229
+msgid "Full _Screen"
+msgstr "_Pantalla Completa"
+
+#: src/window.c:229
+msgid "Use the whole screen for display"
+msgstr "Utilizar la pantalla completa para ver la imagen"
+
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Abrir Imagen"
diff --git a/po/et.po b/po/et.po
index 30e58b57..b8e159f7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.2\n"
-"POT-Creation-Date: 2000-04-20 01:13-0500\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-02-16 21:15+0200\n"
 "Last-Translator: Lauris Kaplinski <lauris@ariman.ee>\n"
 "Language-Team: Estonian <linux-vestlus@eenet.ee>\n"
@@ -13,11 +13,131 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Mahutab pildi aktiivsesse aknasse"
+
+#: src/preferences-dialog.glade.h:39
+msgid "Full Screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "S_uurendus"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Ava"
 
-#: src/tb-image.c:33 src/window.c:356
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Avab pildifaili"
 
@@ -25,7 +145,7 @@ msgstr "Avab pildifaili"
 msgid "Close"
 msgstr "Sulge"
 
-#: src/tb-image.c:35 src/window.c:361
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Sulgeb aktiivse akna"
 
@@ -45,153 +165,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Sobita"
 
-#: src/window.c:130
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "Kas salvestada pildikollektsioon '%s'?"
-
-#: src/window.c:134
-msgid "Save"
-msgstr "Salvesta"
-
-#: src/window.c:135
-msgid "Don't save"
-msgstr "Ära salvesta"
-
-#: src/window.c:136
-msgid "Don't exit"
-msgstr "Ära lahku"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:335 src/window.c:563 src/window.c:735
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "GNOME silm"
 
-#: src/window.c:337
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:339
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME pildiesitus ja kataloogimisprogramm"
 
-#: src/window.c:356
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Ava pilt..."
 
-#: src/window.c:361
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Sulge see aken"
 
-#: src/window.c:370
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:371
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:372
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:373
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:374
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:375
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:376
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:377
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:378
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:380
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:381
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:382
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:383
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:384
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:385
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:386
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:387
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:388
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:394
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Suurenda"
 
-#: src/window.c:394
-#, c-format
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Tõstab suurendust 5%% võrra"
 
-#: src/window.c:398
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Vähenda"
 
-#: src/window.c:398
-#, c-format
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Vähendab suurendust 5%% võrra"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Suurendus _1:1"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Näitab pilti 1:1 suuruses"
 
-#: src/window.c:406
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "S_uurendus"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Mahuta aknasse"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Mahutab pildi aktiivsesse aknasse"
 
-#: src/window.c:668
+#: src/window.c:229
+msgid "Full _Screen"
+msgstr ""
+
+#: src/window.c:229
+msgid "Use the whole screen for display"
+msgstr ""
+
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Ava pilt"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Kas salvestada pildikollektsioon '%s'?"
+
+#~ msgid "Save"
+#~ msgstr "Salvesta"
+
+#~ msgid "Don't save"
+#~ msgstr "Ära salvesta"
+
+#~ msgid "Don't exit"
+#~ msgstr "Ära lahku"
diff --git a/po/fi.po b/po/fi.po
index 35306fb9..bd3f8c3a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"POT-Creation-Date: 2000-07-24 14:04+0300\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-04-15 20:00+0200\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "En voinut alustaa Bonoboa"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -153,7 +153,7 @@ msgstr "Katselut"
 msgid "Open"
 msgstr "Avaa"
 
-#: src/tb-image.c:33 src/window.c:170
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Avaa kuvatiedosto"
 
@@ -161,7 +161,7 @@ msgstr "Avaa kuvatiedosto"
 msgid "Close"
 msgstr "Sulje"
 
-#: src/tb-image.c:35 src/window.c:175
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Sulje nykyinen ikkuna"
 
@@ -186,143 +186,144 @@ msgstr "Sovita"
 msgid "Could not open `%s'"
 msgstr "Ei voinut avata '%s'"
 
-#: src/window.c:151 src/window.c:477 src/window.c:696
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:153
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:155
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Gnomen kuvankatselu- ja luettelointiohjelma"
 
-#: src/window.c:170
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Avaa kuva..."
 
-#: src/window.c:175
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Sulje tämä ikkuna"
 
-#: src/window.c:186
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:187
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:188
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:189
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:190
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:191
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:192
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:193
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:194
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:196
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:197
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:198
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:199
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:200
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:201
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:202
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:203
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:204
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Suurenna"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Suurenna 5%:lla"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Pienennä"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Pienennä 5%:lla"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Suurennos _1:1"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Näytä kuva 1:1 mittakaavassa"
 
-#: src/window.c:222
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Suurennoskerroin"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "Sovita _Ikkunaan"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Sovita kuvan koko ikkunan mukaan"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Koko _Ruutu"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Käytä koko ruutua näyttönä"
 
-#: src/window.c:576
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Avaa kuva"
 
diff --git a/po/fr.po b/po/fr.po
index c2dd3fe3..6ea9cfae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog VERSION\n"
-"POT-Creation-Date: 2000-04-20 01:13-0500\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-02-01 12:58+0100\n"
 "Last-Translator: Vincent Renardias <vincent@debian.org\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -13,11 +13,131 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Zoomer l'image pour s'ajuster à la fenètre"
+
+#: src/preferences-dialog.glade.h:39
+msgid "Full Screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "Facteur de _zoom"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/tb-image.c:33 src/window.c:356
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Ouvrir un fichier image"
 
@@ -25,7 +145,7 @@ msgstr "Ouvrir un fichier image"
 msgid "Close"
 msgstr "Fermer"
 
-#: src/tb-image.c:35 src/window.c:361
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Fermer la fenêtre courante"
 
@@ -45,153 +165,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Ajuster"
 
-#: src/window.c:130
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "Enregistrer la collection d'images `%s' ?"
-
-#: src/window.c:134
-msgid "Save"
-msgstr "Enregistrer"
-
-#: src/window.c:135
-msgid "Don't save"
-msgstr "Ne pas enregistrer"
-
-#: src/window.c:136
-msgid "Don't exit"
-msgstr "Ne pas quitter"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:335 src/window.c:563 src/window.c:735
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of GNOME"
 
-#: src/window.c:337
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:339
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Le programme GNOME pour voir et cataloguer les images"
 
-#: src/window.c:356
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Ouvrir image..."
 
-#: src/window.c:361
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Fermer cette fenêtre"
 
-#: src/window.c:370
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:371
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:372
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:373
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:374
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:375
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:376
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:377
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:378
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:380
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:381
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:382
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:383
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:384
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:385
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:386
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:387
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:388
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:394
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#: src/window.c:394
-#, c-format
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Augmenter le facteur du zoom de 5%%"
 
-#: src/window.c:398
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Zoom arrière"
 
-#: src/window.c:398
-#, c-format
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Diminuer le facteur du zoom de 5%%"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zoom _1:1"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Afficher l'image à l'échelle 1:1"
 
-#: src/window.c:406
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "Facteur de _zoom"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "Ajuster à la _fenêtre"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Zoomer l'image pour s'ajuster à la fenètre"
 
-#: src/window.c:668
+#: src/window.c:229
+msgid "Full _Screen"
+msgstr ""
+
+#: src/window.c:229
+msgid "Use the whole screen for display"
+msgstr ""
+
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Ouvrir image"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Enregistrer la collection d'images `%s' ?"
+
+#~ msgid "Save"
+#~ msgstr "Enregistrer"
+
+#~ msgid "Don't save"
+#~ msgstr "Ne pas enregistrer"
+
+#~ msgid "Don't exit"
+#~ msgstr "Ne pas quitter"
diff --git a/po/ga.po b/po/ga.po
index 2e912b19..ddd072a3 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog CVS\n"
-"POT-Creation-Date: 2000-04-20 01:13-0500\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-03-10 23:03+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,11 +13,129 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+msgid "Open images in a new window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:39
+msgid "Full Screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:44
+msgid "Use 1:1 zoom factor"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Oscail"
 
-#: src/tb-image.c:33 src/window.c:356
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Oscail an comhad íomha"
 
@@ -25,7 +143,7 @@ msgstr "Oscail an comhad íomha"
 msgid "Close"
 msgstr "Dún"
 
-#: src/tb-image.c:35 src/window.c:361
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Dûn an fhuinneog seo"
 
@@ -45,153 +163,157 @@ msgstr "1:1"
 msgid "Fit"
 msgstr ""
 
-#: src/window.c:130
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
+msgid "Could not open `%s'"
 msgstr ""
 
-#: src/window.c:134
-msgid "Save"
-msgstr "Sábháil"
-
-#: src/window.c:135
-msgid "Don't save"
-msgstr "Ní Shábháil"
-
-#: src/window.c:136
-msgid "Don't exit"
-msgstr "Níor eirigh as"
-
-#: src/window.c:335 src/window.c:563 src/window.c:735
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Súil do Gnome"
 
-#: src/window.c:337
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Cóipcheart (C) 1999 The Free Software Foundation"
 
-#: src/window.c:339
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr ""
 
-#: src/window.c:356
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Oscail Íomha..."
 
-#: src/window.c:361
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Dún an fhuinneog seo"
 
-#: src/window.c:370
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:371
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:372
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:373
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:374
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:375
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:376
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:377
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:378
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:380
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:381
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:382
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:383
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:384
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:385
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:386
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:387
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:388
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:394
+#: src/window.c:211
 msgid "Zoom In"
 msgstr ""
 
-#: src/window.c:394
-#, c-format
-msgid "Increase zoom factor by 5%"
+#: src/window.c:211
+msgid "Increase zoom factor by 5%%"
 msgstr ""
 
-#: src/window.c:398
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr ""
 
-#: src/window.c:398
-#, c-format
-msgid "Decrease zoom factor by 5%"
+#: src/window.c:215
+msgid "Decrease zoom factor by 5%%"
 msgstr ""
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr ""
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr ""
 
-#: src/window.c:406
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr ""
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr ""
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr ""
 
-#: src/window.c:668
+#: src/window.c:229
+msgid "Full _Screen"
+msgstr ""
+
+#: src/window.c:229
+msgid "Use the whole screen for display"
+msgstr ""
+
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Oscail Íomha"
+
+#~ msgid "Save"
+#~ msgstr "Sábháil"
+
+#~ msgid "Don't save"
+#~ msgstr "Ní Shábháil"
+
+#~ msgid "Don't exit"
+#~ msgstr "Níor eirigh as"
diff --git a/po/gl.po b/po/gl.po
index 2146c834..e1d37fb4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.3\n"
-"POT-Creation-Date: 2000-06-01 04:03+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-04-29 02:46+0200\n"
 "Last-Translator: Jesus Bravo Alvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -18,11 +18,132 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Encaixa-la escala da imaxe ó tamaño da fiestra"
+
+#: src/preferences-dialog.glade.h:39
+#, fuzzy
+msgid "Full Screen"
+msgstr "Pantalla _Completa"
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "Factor de _Escala"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Abrir"
 
-#: src/tb-image.c:33 src/window.c:364
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Abrir un ficheiro de imaxe"
 
@@ -30,7 +151,7 @@ msgstr "Abrir un ficheiro de imaxe"
 msgid "Close"
 msgstr "Pechar"
 
-#: src/tb-image.c:35 src/window.c:369
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Pecha-la fiestra actual"
 
@@ -50,159 +171,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Encaixar"
 
-#: src/window.c:132
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "¿Garda-la colección de imaxes `%s'?"
-
-#: src/window.c:136
-msgid "Save"
-msgstr "Gardar"
-
-#: src/window.c:137
-msgid "Don't save"
-msgstr "Non gardar"
-
-#: src/window.c:138
-msgid "Don't exit"
-msgstr "Non saír"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:343 src/window.c:605 src/window.c:779
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Ollo de Gnome"
 
-#: src/window.c:345
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:347
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "O programa para ver e catalogar imaxes de GNOME"
 
-#: src/window.c:364
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Abrir Imaxe..."
 
-#: src/window.c:369
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Pechar Esta Fiestra"
 
-#: src/window.c:380
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:381
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:382
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:383
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:384
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:385
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:386
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:387
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:388
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:390
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:391
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:392
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:393
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:394
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:395
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:396
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:397
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:398
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:404
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Achegar"
 
-#: src/window.c:404
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Aumenta-la imaxe nun 5%%"
 
-#: src/window.c:408
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Alonxar"
 
-#: src/window.c:408
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Disminui-la imaxe nun 5%%"
 
-#: src/window.c:412
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Escala _1:1"
 
-#: src/window.c:412
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Amosa-la imaxe nunha escala 1:1"
 
-#: src/window.c:416
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "Factor de _Escala"
 
-#: src/window.c:418
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "Encai_xar na Fiestra"
 
-#: src/window.c:418
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Encaixa-la escala da imaxe ó tamaño da fiestra"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Pantalla _Completa"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Usar toda a pantalla para a imaxe"
 
-#: src/window.c:710
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Abrir Imaxe"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "¿Garda-la colección de imaxes `%s'?"
+
+#~ msgid "Save"
+#~ msgstr "Gardar"
+
+#~ msgid "Don't save"
+#~ msgstr "Non gardar"
+
+#~ msgid "Don't exit"
+#~ msgstr "Non saír"
diff --git a/po/hu.po b/po/hu.po
index baec1526..167f3cd5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"POT-Creation-Date: 2000-04-20 01:13-0500\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Gergõ Érdi <cactus@cactus.rulez.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -13,11 +13,132 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Átméretezi a képet, hogy pont elférjen az ablakban"
+
+#: src/preferences-dialog.glade.h:39
+#, fuzzy
+msgid "Full Screen"
+msgstr "Teljes _képernyõ"
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "_Nagyítás mértéke"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Megnyit"
 
-#: src/tb-image.c:33 src/window.c:356
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Megnyit egy képet"
 
@@ -25,7 +146,7 @@ msgstr "Megnyit egy képet"
 msgid "Close"
 msgstr "Bezár"
 
-#: src/tb-image.c:35 src/window.c:361
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Aktuális ablak bezárása"
 
@@ -45,157 +166,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Igazít"
 
-#: src/window.c:130
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "Elmentsem a `%s' képkollekciót?"
-
-#: src/window.c:134
-msgid "Save"
-msgstr "Mentsd el"
-
-#: src/window.c:135
-msgid "Don't save"
-msgstr "Ne mentsd el"
-
-#: src/window.c:136
-msgid "Don't exit"
-msgstr "Ne lépj ki"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:335 src/window.c:563 src/window.c:735
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:337
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:339
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME képnézõ és katalogizáló program"
 
-#: src/window.c:356
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "Kép _megnyitása"
 
-#: src/window.c:361
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "Ablak _bezárása"
 
-#: src/window.c:370
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:371
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:372
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:373
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:374
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:375
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:376
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:377
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:378
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:380
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:381
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:382
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:383
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:384
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:385
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:6"
 
-#: src/window.c:386
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:387
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:388
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:394
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Nagyítás"
 
-#: src/window.c:394
-#, c-format
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "A nagyítás mértékét 5%%-kal növeli"
 
-#: src/window.c:398
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Kicsinyítés"
 
-#: src/window.c:398
-#, c-format
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "A nagyítás mértékét 5%%-kal csökkenti"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Eredeti _méret"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr ""
 
-#: src/window.c:406
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Nagyítás mértéke"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "Ablakhoz _igazít"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Átméretezi a képet, hogy pont elférjen az ablakban"
 
-#: src/window.c:668
+#: src/window.c:229
+msgid "Full _Screen"
+msgstr "Teljes _képernyõ"
+
+#: src/window.c:229
+msgid "Use the whole screen for display"
+msgstr ""
+
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Kép megnyitása"
 
-#: src/window.c:422
-msgid "Full _Screen"
-msgstr "Teljes _képernyõ"
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Elmentsem a `%s' képkollekciót?"
+
+#~ msgid "Save"
+#~ msgstr "Mentsd el"
+
+#~ msgid "Don't save"
+#~ msgstr "Ne mentsd el"
+
+#~ msgid "Don't exit"
+#~ msgstr "Ne lépj ki"
diff --git a/po/ja.po b/po/ja.po
index d037e7f7..a3cf28bb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.3\n"
-"POT-Creation-Date: 2000-07-24 23:45+0900\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-07-24 23:47+09:00\n"
 "Last-Translator: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "ÀßÄê"
 
@@ -140,7 +140,7 @@ msgstr "¥Ó¥å¡¼¥ï"
 msgid "Open"
 msgstr "³«¤¯"
 
-#: src/tb-image.c:33 src/window.c:170
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "²èÁü¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
@@ -148,7 +148,7 @@ msgstr "²èÁü¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: src/tb-image.c:35 src/window.c:175
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "¤³¤Î¥¦¥¤¥ó¥É¥¦¤òÊĤ¸¤ë"
 
@@ -173,143 +173,144 @@ msgstr "¼«Æ°"
 msgid "Could not open `%s'"
 msgstr "`%s'¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/window.c:151 src/window.c:477 src/window.c:696
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:153
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:155
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME ²èÁüɽ¼¨¤ª¤è¤Ó¥«¥¿¥í¥°ºîÀ®¥×¥í¥°¥é¥à"
 
-#: src/window.c:170
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "²èÁü¤ò³«¤¯(_O)"
 
-#: src/window.c:175
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "¤³¤Î¥¦¥¤¥ó¥É¥¦¤òÊĤ¸¤ë(_C)"
 
-#: src/window.c:186
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:187
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:188
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:189
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:190
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:191
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:192
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:193
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:194
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:196
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:197
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:198
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:199
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:200
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:201
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:202
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:203
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:204
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "³ÈÂç"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "³ÈÂçΨ¤ò5%Áý¤ä¤¹"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "½Ì¾®"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "³ÈÂçΨ¤ò5%¸º¤é¤¹"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "1:1¤Çɽ¼¨(_1)"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "1:1¥¹¥±¡¼¥ë¤Ç²èÁü¤òɽ¼¨"
 
-#: src/window.c:222
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "³ÈÂçΨ(_Z)"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "¥¦¥¤¥ó¥É¥¦¤ÎÂ礭¤µ¤Ë¹ç¤ï¤»¤ë(_F)"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "¥¦¥¤¥ó¥É¥¦¤ÎÂ礭¤µ¤Ë¹ç¤¦¤è¤¦¤Ë²èÁü¤ò³ÈÂ礹¤ë"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "¥Õ¥ë¥¹¥¯¥ê¡¼¥ó(_S)"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "²èÌÌÁ´ÂΤòɽ¼¨¤Ë»È¤¦"
 
-#: src/window.c:576
+#: src/window.c:618
 msgid "Open Image"
 msgstr "²èÁü¤ò³«¤¯"
 
diff --git a/po/ko.po b/po/ko.po
index 4b8837aa..c24a42b7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.1\n"
-"POT-Creation-Date: 2000-06-23 12:44+0900\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-06-23 04:15:57+0900\n"
 "Last-Translator: Young-Ho Cha <ganadist@dacome.co.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -144,7 +152,7 @@ msgstr "º¸±â"
 msgid "Open"
 msgstr "¿­±â"
 
-#: src/tb-image.c:33 src/window.c:374
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "À̹ÌÁö ÆÄÀÏ ¿­±â"
 
@@ -152,7 +160,7 @@ msgstr "À̹ÌÁö ÆÄÀÏ ¿­±â"
 msgid "Close"
 msgstr "´Ý±â"
 
-#: src/tb-image.c:35 src/window.c:379
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "ÇöÀç ⠴ݱâ"
 
@@ -172,159 +180,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "¸ÂÃã"
 
-#: src/window.c:133
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "À̹ÌÁö ÄÝ·º¼Ç `%s'¸¦ ÀúÀåÇÒ±î¿ä?"
-
-#: src/window.c:137
-msgid "Save"
-msgstr "ÀúÀå"
-
-#: src/window.c:138
-msgid "Don't save"
-msgstr "ÀúÀå¾ÊÇÔ"
-
-#: src/window.c:139
-msgid "Don't exit"
-msgstr "Á¾·á¾ÊÇÔ"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:353 src/window.c:621 src/window.c:795
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "±×³ðÀÇ ´«"
 
-#: src/window.c:355
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:357
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "±×³ð À̹ÌÁö º¸±â¿Í īŸ·Î±× ÇÁ·Î±×·¥"
 
-#: src/window.c:374
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "À̹ÌÁö ¿­±â(_O)..."
 
-#: src/window.c:379
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "ÀÌ Ã¢ ´Ý±â(_C)"
 
-#: src/window.c:390
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:391
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:392
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:393
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:394
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:395
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:396
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:397
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:398
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:400
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:401
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:402
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:403
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:404
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:405
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:406
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:407
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:408
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:414
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "È®´ë"
 
-#: src/window.c:414
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "È®´ëÀ²À» 5%% Áõ°¡"
 
-#: src/window.c:418
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Ãà¼Ò"
 
-#: src/window.c:418
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "È®´ëÀ²À» 5%% °¨¼Ò"
 
-#: src/window.c:422
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "È®´ë 1:1(_1)"
 
-#: src/window.c:422
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "À̹ÌÁö¸¦ 1:1 ¹èÀ²·Î Ç¥½Ã"
 
-#: src/window.c:426
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "È®´ëÀ²(_Z)"
 
-#: src/window.c:428
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "â¿¡ ¸ÂÃã(_F)"
 
-#: src/window.c:428
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "À̹ÌÁö¸¦ â¿¡ ¸Âµµ·Ï È®´ë"
 
-#: src/window.c:432
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Àüü È­¸é(_S)"
 
-#: src/window.c:432
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Ç¥½ÃÇϴµ¥ Àüüȭ¸éÀ» »ç¿ëÇÕ´Ï´Ù"
 
-#: src/window.c:726
+#: src/window.c:618
 msgid "Open Image"
 msgstr "À̹ÌÁö ¿­±â"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "À̹ÌÁö ÄÝ·º¼Ç `%s'¸¦ ÀúÀåÇÒ±î¿ä?"
+
+#~ msgid "Save"
+#~ msgstr "ÀúÀå"
+
+#~ msgid "Don't save"
+#~ msgstr "ÀúÀå¾ÊÇÔ"
+
+#~ msgid "Don't exit"
+#~ msgstr "Á¾·á¾ÊÇÔ"
diff --git a/po/lt.po b/po/lt.po
index 3d8faf3e..7789c98e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.3\n"
-"POT-Creation-Date: 2000-06-01 04:03+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-05-02 18:53+0100\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -13,11 +13,132 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Pritraukti paveikslëlá, kad tilptø lange"
+
+#: src/preferences-dialog.glade.h:39
+#, fuzzy
+msgid "Full Screen"
+msgstr "_Visame ekrane"
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "_Didinimo daugiklis"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Atidaryti"
 
-#: src/tb-image.c:33 src/window.c:364
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Atidaryti paveikslëlio bylà"
 
@@ -25,7 +146,7 @@ msgstr "Atidaryti paveikslëlio bylà"
 msgid "Close"
 msgstr "Uþdaryti"
 
-#: src/tb-image.c:35 src/window.c:369
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Uþdaryti ðá langà"
 
@@ -45,159 +166,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Tilpti"
 
-#: src/window.c:132
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "Iðsaugoti paveikslëlá á kolekcijà ¥%s´?"
-
-#: src/window.c:136
-msgid "Save"
-msgstr "Iðsaugoti"
-
-#: src/window.c:137
-msgid "Don't save"
-msgstr "Nesaugoti"
-
-#: src/window.c:138
-msgid "Don't exit"
-msgstr "Neiðeiti"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:343 src/window.c:605 src/window.c:779
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Gnome Akis"
 
-#: src/window.c:345
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:347
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME paveikslëliø þiûrëjimo ir kolekcionavimo programa"
 
-#: src/window.c:364
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Atidaryti paveikslëlá..."
 
-#: src/window.c:369
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Uþdaryti ðá langà"
 
-#: src/window.c:380
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:381
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:382
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:383
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:384
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:385
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:386
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:387
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:388
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:390
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:391
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:392
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:393
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:394
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:395
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:396
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:397
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:398
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:404
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Pritraukti"
 
-#: src/window.c:404
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Pritraukti paveikslëlá artyn 5%%"
 
-#: src/window.c:408
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Atitraukti"
 
-#: src/window.c:408
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Atitraukti paveikslëlá tolyn 5%%"
 
-#: src/window.c:412
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Tikrasis _1:1"
 
-#: src/window.c:412
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Vaizduoti paveikslëlá tikruoju dydþiu 1:1"
 
-#: src/window.c:416
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Didinimo daugiklis"
 
-#: src/window.c:418
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Tilpti á langà"
 
-#: src/window.c:418
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Pritraukti paveikslëlá, kad tilptø lange"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "_Visame ekrane"
 
-#: src/window.c:422
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Naudoti visà ekranà vaizdavimui"
 
-#: src/window.c:710
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Atidaryti paveikslëlá"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Iðsaugoti paveikslëlá á kolekcijà ¥%s´?"
+
+#~ msgid "Save"
+#~ msgstr "Iðsaugoti"
+
+#~ msgid "Don't save"
+#~ msgstr "Nesaugoti"
+
+#~ msgid "Don't exit"
+#~ msgstr "Neiðeiti"
diff --git a/po/nl.po b/po/nl.po
index 4dc2bafc..fde9f062 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog \n"
-"POT-Creation-Date: 2000-07-12 20:18+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-04-12 14:25-05:00\n"
 "Last-Translator: Dennis Smit <synap@area101.penguin.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "Kan Bonobo niet laden"
 
-#: src/preferences.c:210
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Configuratie"
 
@@ -54,7 +54,6 @@ msgstr ""
 "Alleen grijs\n"
 "Alleen wit\n"
 
-
 #: src/preferences-dialog.glade.h:17
 msgid ""
 "Small\n"
@@ -93,7 +92,6 @@ msgstr ""
 "Normaal (pseudokleuren)\n"
 "Maximaal (hoge kleuren)\n"
 
-
 #: src/preferences-dialog.glade.h:31
 msgid "Display"
 msgstr "Display"
@@ -154,7 +152,7 @@ msgstr "Viewers"
 msgid "Open"
 msgstr "Openen"
 
-#: src/tb-image.c:33 src/window.c:181
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Open een image bestand"
 
@@ -162,7 +160,7 @@ msgstr "Open een image bestand"
 msgid "Close"
 msgstr "Sluit"
 
-#: src/tb-image.c:35 src/window.c:186
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Sluit het actieve window"
 
@@ -187,143 +185,144 @@ msgstr "Passend"
 msgid "Could not open `%s'"
 msgstr "Kan `%s' niet openen"
 
-#: src/window.c:160 src/window.c:439 src/window.c:663
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:162
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:164
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Het GNOME image view en catalogus programma"
 
-#: src/window.c:181
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Open Image..."
 
-#: src/window.c:186
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Sluit dit window"
 
-#: src/window.c:197
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:198
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:199
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:200
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:201
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:202
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:203
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:204
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:205
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:207
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:208
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:209
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:210
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:211
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:212
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:213
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:214
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:215
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:221
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "In Zoomen"
 
-#: src/window.c:221
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Vergroot zoom factor met 5%%"
 
-#: src/window.c:225
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Uit Zoomen"
 
-#: src/window.c:225
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Verlaag zoom factor met 5%%"
 
-#: src/window.c:229
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zoom _1:1"
 
-#: src/window.c:229
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Laat image zien met 1:1 schaal"
 
-#: src/window.c:233
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Zoom factor"
 
-#: src/window.c:235
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Maak passend naar window"
 
-#: src/window.c:235
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Zoom image om passend te maken in window"
 
-#: src/window.c:239
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Volledig _Scherm"
 
-#: src/window.c:239
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Gebruik het hele scherm voor displayen"
 
-#: src/window.c:541
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Open Image"
 
diff --git a/po/no.po b/po/no.po
index fe34fa08..b092903f 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.3\n"
-"POT-Creation-Date: 2000-08-15 22:32+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-06-27 23:58+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -152,7 +152,7 @@ msgstr "Visere"
 msgid "Open"
 msgstr "Åpne"
 
-#: src/tb-image.c:33 src/window.c:170
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Åpne en bildefil"
 
@@ -160,7 +160,7 @@ msgstr "Åpne en bildefil"
 msgid "Close"
 msgstr "Lukk"
 
-#: src/tb-image.c:35 src/window.c:175
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Lukk aktivt vindu"
 
@@ -185,143 +185,144 @@ msgstr "Tilpass"
 msgid "Could not open `%s'"
 msgstr "Kunne ikke åpne `%s'"
 
-#: src/window.c:151 src/window.c:477 src/window.c:731
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:153
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:155
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Gnome bildevisning og katalogisering"
 
-#: src/window.c:170
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Åpne bilde..."
 
-#: src/window.c:175
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Lukk dette vinduet"
 
-#: src/window.c:186
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:187
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:188
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:189
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:190
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:191
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:192
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:193
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:194
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:196
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:197
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:198
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:199
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:200
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:201
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:202
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:203
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:204
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Zoom inn"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Øk zoom-faktoren med 5%%"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Zoom ut"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Minsk zoom-faktoren med 5%%"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zoom _1:1"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Vis bildet i 1:1 skala"
 
-#: src/window.c:222
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Zoom faktor"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Tilpass til vinduet"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Zoom bildet til det passer i vinduet"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Full _skjerm"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Bruk hele skjermen for visning"
 
-#: src/window.c:611
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Åpne bilde"
 
diff --git a/po/pl.po b/po/pl.po
index 6e188658..5dec599d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"POT-Creation-Date: 2000-04-30 16:37+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-04-30 16:37+0200\n"
 "Last-Translator: GNOME PL Team <gnomepl@pandora.info.bielsko.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -9,193 +9,313 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/tb-image.c:1
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Przeskalowuje obraz, aby dopasowaæ go do okna"
+
+#: src/preferences-dialog.glade.h:39
+#, fuzzy
+msgid "Full Screen"
+msgstr "Pe³ny _ekran"
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "_Wspó³czynnik powiêkszenia"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
+#: src/tb-image.c:33
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/tb-image.c:1 src/window.c:1
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Otwiera plik z obrazem"
 
-#: src/tb-image.c:1
+#: src/tb-image.c:35
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/tb-image.c:1 src/window.c:1
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Zamyka bie¿±ce okno"
 
-#: src/tb-image.c:1
+#: src/tb-image.c:43
 msgid "In"
 msgstr "Powiêksz"
 
-#: src/tb-image.c:1
+#: src/tb-image.c:44
 msgid "Out"
 msgstr "Pomniejsz"
 
-#: src/tb-image.c:1
+#: src/tb-image.c:45
 msgid "1:1"
 msgstr "1:1"
 
-#: src/tb-image.c:1
+#: src/tb-image.c:46
 msgid "Fit"
 msgstr "Dopasuj"
 
-#: src/window.c:1
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "Zapisaæ kolekcjê obrazów '%s'?"
-
-#: src/window.c:1
-msgid "Save"
-msgstr "Zapisz"
-
-#: src/window.c:1
-msgid "Don't save"
-msgstr "Nie zapisuj"
-
-#: src/window.c:1
-msgid "Don't exit"
-msgstr "Kontynuuj"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:1 src/window.c:1 src/window.c:1
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Oko Gnoma"
 
-#: src/window.c:1
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:1
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Program do wy¶wietlania i katalogowania obrazów"
 
-#: src/window.c:1
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Otwórz obraz..."
 
-#: src/window.c:1
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Zamknij okno"
 
-#: src/window.c:1
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:1
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:1
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:1
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:1
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:1
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:1
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:1
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:1
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:1
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:1
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:1
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:1
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:1
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:1
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:1
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:1
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:1
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:1
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Powiêksz"
 
-#: src/window.c:1
-#, c-format
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Powiêksza wspó³czynnik powiêkszenia o 5%%"
 
-#: src/window.c:1
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Pomniejsz"
 
-#: src/window.c:1
-#, c-format
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Zmniejsza wspó³czynnik powiêkszenia o 5%%"
 
-#: src/window.c:1
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Powiêkszenie _1:1"
 
-#: src/window.c:1
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Wy¶wietla obraz w skali 1:1"
 
-#: src/window.c:1
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Wspó³czynnik powiêkszenia"
 
-#: src/window.c:1
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Dopasuj do okna"
 
-#: src/window.c:1
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Przeskalowuje obraz, aby dopasowaæ go do okna"
 
-#: src/window.c:1
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Pe³ny _ekran"
 
-#: src/window.c:1
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Wykorzystuje ca³± przestrzeñ ekranu"
 
-#: src/window.c:1
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Otwiera obraz"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Zapisaæ kolekcjê obrazów '%s'?"
+
+#~ msgid "Save"
+#~ msgstr "Zapisz"
+
+#~ msgid "Don't save"
+#~ msgstr "Nie zapisuj"
+
+#~ msgid "Don't exit"
+#~ msgstr "Kontynuuj"
diff --git a/po/ro.po b/po/ro.po
index 1a396122..3d4aed7b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.2\n"
-"POT-Creation-Date: 2000-04-20 01:13-0500\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-04-05 21:51+0300\n"
 "Last-Translator: Dan Damian <dand@dnttm.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,11 +13,131 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bonobo/bonobo-image-generic.c:681
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: src/preferences.c:219
+msgid "Preferences"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: src/preferences-dialog.glade.h:7
+msgid "Interpolation type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:8
+msgid "Transparency type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:9
+msgid "Check size"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:10
+msgid ""
+"Dark checks\n"
+"Midtone checks\n"
+"Light checks\n"
+"Black only\n"
+"Gray only\n"
+"White only\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:17
+msgid ""
+"Small\n"
+"Medium\n"
+"Large\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:21
+msgid ""
+"Nearest neighbor\n"
+"Bilinear\n"
+"Hyperbolic\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:25
+msgid "Two-pass scrolling"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:26
+msgid "Dither type"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:27
+msgid ""
+"None\n"
+"Normal (pseudocolor)\n"
+"Maximum (high color)\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:31
+msgid "Display"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:32
+msgid "Image Windows"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:33 src/preferences-dialog.glade.h:40
+msgid "Use scrollbars"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:34 src/preferences-dialog.glade.h:41
+msgid ""
+"Never\n"
+"Only if image does not fit\n"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:37
+msgid "Pick window size and zoom factor automatically"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:38
+#, fuzzy
+msgid "Open images in a new window"
+msgstr "Scaleazã imaginea la dimensiunea ferestrei"
+
+#: src/preferences-dialog.glade.h:39
+msgid "Full Screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:44
+#, fuzzy
+msgid "Use 1:1 zoom factor"
+msgstr "Factor _zoom"
+
+#: src/preferences-dialog.glade.h:45
+msgid "Use same zoom factor as image window"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:46
+msgid "Fit all images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:47
+msgid "Fit standard-sized images to screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:48
+msgid "Put a bevel around the edge of the screen"
+msgstr ""
+
+#: src/preferences-dialog.glade.h:49
+msgid "Viewers"
+msgstr ""
+
 #: src/tb-image.c:33
 msgid "Open"
 msgstr "Deschide"
 
-#: src/tb-image.c:33 src/window.c:356
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Deschide un fiºier cu imagine"
 
@@ -25,7 +145,7 @@ msgstr "Deschide un fiºier cu imagine"
 msgid "Close"
 msgstr "Închide"
 
-#: src/tb-image.c:35 src/window.c:361
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Închide fereastra curentã"
 
@@ -45,153 +165,160 @@ msgstr "1:1"
 msgid "Fit"
 msgstr "Potriveºte"
 
-#: src/window.c:130
+#: src/util.c:47
 #, c-format
-msgid "Save image collection `%s'?"
-msgstr "Salvez colecþia de imagini '%s'?"
-
-#: src/window.c:134
-msgid "Save"
-msgstr "Salveazã"
-
-#: src/window.c:135
-msgid "Don't save"
-msgstr "Nu salva"
-
-#: src/window.c:136
-msgid "Don't exit"
-msgstr "Nu ieºi"
+msgid "Could not open `%s'"
+msgstr ""
 
-#: src/window.c:335 src/window.c:563 src/window.c:735
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:337
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:339
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "Programul GNOME de vizualizare ºi catalogare a imaginilor"
 
-#: src/window.c:356
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Deschide imagine..."
 
-#: src/window.c:361
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "În_chide aceastã fereastrã"
 
-#: src/window.c:370
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:371
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:372
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:373
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:374
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:375
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:376
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:377
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:378
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:380
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:381
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:382
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:383
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:384
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:385
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:386
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:387
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:388
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:394
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Apropie"
 
-#: src/window.c:394
-#, c-format
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Mãreºte factorul de zoom cu 5%%"
 
-#: src/window.c:398
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Depãrteazã"
 
-#: src/window.c:398
-#, c-format
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Micºoreazã factorul de zoom cu 5%%"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zoom _1:1"
 
-#: src/window.c:402
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Afiºeazã imaginea la scalã 1:1"
 
-#: src/window.c:406
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "Factor _zoom"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Potriveºte în fereastrã"
 
-#: src/window.c:408
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Scaleazã imaginea la dimensiunea ferestrei"
 
-#: src/window.c:668
+#: src/window.c:229
+msgid "Full _Screen"
+msgstr ""
+
+#: src/window.c:229
+msgid "Use the whole screen for display"
+msgstr ""
+
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Deschide imagine"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "Salvez colecþia de imagini '%s'?"
+
+#~ msgid "Save"
+#~ msgstr "Salveazã"
+
+#~ msgid "Don't save"
+#~ msgstr "Nu salva"
+
+#~ msgid "Don't exit"
+#~ msgstr "Nu ieºi"
diff --git a/po/sl.po b/po/sl.po
index ad188baa..9859385d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.4\n"
-"POT-Creation-Date: 2000-07-17 01:07+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-06-13 02:25+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Nastavitve"
 
@@ -152,7 +152,7 @@ msgstr "Pregledovalniki"
 msgid "Open"
 msgstr "Odpri"
 
-#: src/tb-image.c:33 src/window.c:174
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Odpri slikovno datoteko"
 
@@ -160,7 +160,7 @@ msgstr "Odpri slikovno datoteko"
 msgid "Close"
 msgstr "Zapri"
 
-#: src/tb-image.c:35 src/window.c:179
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Zapri trenutno okno"
 
@@ -185,143 +185,144 @@ msgstr "Prilagodi"
 msgid "Could not open `%s'"
 msgstr "Ne morem odpreti `%s'"
 
-#: src/window.c:155 src/window.c:490 src/window.c:711
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Gnomovo Oko"
 
-#: src/window.c:157
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Avtorske pravice pridr¾ane (C) 1999 Fundacija za prosto programje"
 
-#: src/window.c:159
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME program za gledanje in katalogizacijo slik"
 
-#: src/window.c:174
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "Odpri Sliko..."
 
-#: src/window.c:179
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Zapri to Okno"
 
-#: src/window.c:190
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:191
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:192
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:193
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:194
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:195
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:196
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:197
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:198
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:200
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:201
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:202
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:203
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:204
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:205
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:206
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:207
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:208
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:214
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Poveèaj"
 
-#: src/window.c:214
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Poveèaj faktor poveèave za 5%"
 
-#: src/window.c:218
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Pomanj¹aj"
 
-#: src/window.c:218
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Pomanj¹aj faktor poveèave za 5%"
 
-#: src/window.c:222
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Poveèaj _1:1"
 
-#: src/window.c:222
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Ka¾i sliko brez poveèave"
 
-#: src/window.c:226
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Faktor poveèave"
 
-#: src/window.c:228
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Prilagodi v Okno"
 
-#: src/window.c:228
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Prilagodi velikost slike, da bo ¹la v okno "
 
-#: src/window.c:232
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Èez Cel Zaslon"
 
-#: src/window.c:232
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Za prikaz uporabi celoten zaslon"
 
-#: src/window.c:591
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Odpri Sliko"
 
diff --git a/po/sv.po b/po/sv.po
index 986c2c1f..9eb271a2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"POT-Creation-Date: 2000-07-16 23:18+0000\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 1999-12-13 23:57+01:00\n"
 "Last-Translator: Andreas Hyden <a.hyden@cyberpoint.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "Jag kunde inte initialisera Bonobo"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -141,7 +141,7 @@ msgstr "Visare"
 msgid "Open"
 msgstr "Öppna"
 
-#: src/tb-image.c:33 src/window.c:174
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Öppna en bildfil"
 
@@ -149,7 +149,7 @@ msgstr "Öppna en bildfil"
 msgid "Close"
 msgstr "Stäng"
 
-#: src/tb-image.c:35 src/window.c:179
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Stäng det aktiva fönstret"
 
@@ -174,143 +174,144 @@ msgstr "Anpassa"
 msgid "Could not open `%s'"
 msgstr "Kunde inte öppna '%s'"
 
-#: src/window.c:155 src/window.c:490 src/window.c:711
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:157
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:159
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME bildvisning och -katalogisering"
 
-#: src/window.c:174
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "_Öppna bild..."
 
-#: src/window.c:179
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Stänga detta fönster"
 
-#: src/window.c:190
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:191
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:192
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:193
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:194
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:195
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:196
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:197
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:198
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:200
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:201
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:202
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:203
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:204
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:205
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:206
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:207
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:208
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:214
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: src/window.c:214
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "Öka zoomfaktorn med 5%%"
 
-#: src/window.c:218
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Zooma ut"
 
-#: src/window.c:218
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "Minska zoomfaktorn med 5%%"
 
-#: src/window.c:222
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "Zooma _1:1"
 
-#: src/window.c:222
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Visa bilden i skala 1:1"
 
-#: src/window.c:226
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "_Zoomfaktor"
 
-#: src/window.c:228
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "_Anpassa till fönstret"
 
-#: src/window.c:228
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Zooma bilden så att den passar i fönstret"
 
-#: src/window.c:232
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "Full_skärm"
 
-#: src/window.c:232
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Använd hela skärmen för visning"
 
-#: src/window.c:591
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Öppna bild"
 
diff --git a/po/tr.po b/po/tr.po
index abc41bf1..b60bfb49 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.4\n"
-"POT-Creation-Date: 2000-07-24 11:42+0200\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-07-24 11:42+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo'yu baplatamadým"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "Ayarlar"
 
@@ -152,7 +152,7 @@ msgstr "Göstericiler"
 msgid "Open"
 msgstr "Aç"
 
-#: src/tb-image.c:33 src/window.c:170
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "Bir resmi aç"
 
@@ -160,7 +160,7 @@ msgstr "Bir resmi aç"
 msgid "Close"
 msgstr "Kapat"
 
-#: src/tb-image.c:35 src/window.c:175
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Geçerli pencereyi kapat"
 
@@ -185,142 +185,143 @@ msgstr "Ayarla"
 msgid "Could not open `%s'"
 msgstr "`%s''i açamadým"
 
-#: src/window.c:151 src/window.c:477 src/window.c:696
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Gnome'un gözü"
 
-#: src/window.c:153
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Tel'if hakký (C) 1999 free Software Foundation"
 
-#: src/window.c:155
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME resim gösterme ve deðiþtirme uygulamasý"
 
-#: src/window.c:170
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "Resmi aç ..."
 
-#: src/window.c:175
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "_Bu pen_cereyi kapat"
 
-#: src/window.c:186
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:187
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:188
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:189
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:190
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:191
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:192
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:193
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:194
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:196
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:197
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:198
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:199
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:200
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:201
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:202
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:203
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:204
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "Büyüt"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "%%5 daha fazla büyüt"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "Küçült"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "%%5 küçült"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "_1:1 büyüt"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "Resmi 1:1 göster"
 
-#: src/window.c:222
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "Büyütme faktörü"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "Pencereye göre ayarla"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "Resmi pencereye uyana kadarsýna büyüt"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "_Tam ekran"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "Resimleri göstermek için yekin ekraný göster"
 
-#: src/window.c:576
+#: src/window.c:618
 msgid "Open Image"
 msgstr "Resmi aç"
diff --git a/po/uk.po b/po/uk.po
index 6c40657d..4c6a1c79 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 0.3\n"
-"POT-Creation-Date: 2000-08-09 14:19+0300\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 1999-12-27 11:23+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "I could not initialize Bonobo"
 msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ Bonobo"
 
-#: src/preferences.c:218
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "îÁÌÁÛÔÕ×ÁÎÎÑ"
 
@@ -152,7 +152,7 @@ msgstr "÷¦ËÎÁ"
 msgid "Open"
 msgstr "÷¦ÄËÒÉÔÉ"
 
-#: src/tb-image.c:33 src/window.c:170
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "÷¦ÄËÒÉÔÉ ÆÁÊÌ ÚÏÂÒÁÖÅÎÎÑ"
 
@@ -160,7 +160,7 @@ msgstr "÷¦ÄËÒÉÔÉ ÆÁÊÌ ÚÏÂÒÁÖÅÎÎÑ"
 msgid "Close"
 msgstr "úÁËÒÉÔÉ"
 
-#: src/tb-image.c:35 src/window.c:175
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "úÁËÒÉÔÉ ÐÏÔÏÞΊצËÎÏ"
 
@@ -185,142 +185,143 @@ msgstr "ð¦Ä¦ÇÎÁÔÉ"
 msgid "Could not open `%s'"
 msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ \"%s\""
 
-#: src/window.c:151 src/window.c:477 src/window.c:731
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eye of Gnome"
 
-#: src/window.c:153
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright ¿ 1999 The Free Software Foundation"
 
-#: src/window.c:155
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "ðÒÏÇÒÁÍÁ ÐÅÒÅÇÌÑÄÕ ÔÁ ËÁÔÁÌÏǦÚÁæ§ ÄÌÑ GNOME"
 
-#: src/window.c:170
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "÷¦ÄËÒÉÔÉ ÚÏÂÒÁÖÅÎÎÑ..."
 
-#: src/window.c:175
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "úÁËÒÉÔÉ ÃŠצËÎÏ"
 
-#: src/window.c:186
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:187
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:188
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:189
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:190
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:191
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:192
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:193
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:194
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:196
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:197
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:198
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:199
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:200
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:201
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:202
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:203
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:204
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "ú¦ÌØÛÉÔÉ"
 
-#: src/window.c:210
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "ú¦ÌØÛÉÔÉ ËÏƦæ¤ÎÔ Ú¦ÌØÛÅÎÎÑ ÎÁ 5%%"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "úÍÅÎÛÉÔÉ"
 
-#: src/window.c:214
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "úÍÅÎÛÉÔÉ ËÏƦæ¤ÎÔ Ú¦ÌØÛÅÎÎÑ ÎÁ 5%%"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "ú¦ÌØÛÅÎÎÑ 1:1"
 
-#: src/window.c:218
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "ðÏËÁÚÁÔÉ ÚÏÂÒÁÖÅÎÎÑ × ÍÁÓÛÔÁ¦ 1:1"
 
-#: src/window.c:222
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "ëÏƦæ¤ÎÔ Ú¦ÌØÛÅÎÎÑ"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "úÁ ÒÏÚͦÒÏÍ ×¦ËÎÁ"
 
-#: src/window.c:224
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "ð¦Ä¦ÇÎÁÔÉ ÒÏÚÍ¦Ò ÚÏÂÒÁÖÅÎÎÑ Ð¦Ä ÒÏÚÍ¦Ò ×¦ËÎÁ"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "îÁ ×ÅÓØ ÅËÒÁÎ"
 
-#: src/window.c:228
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ×ÅÓØ ÅËÒÁÎ ÄÌÑ ÐÏËÁÚÕ"
 
-#: src/window.c:611
+#: src/window.c:618
 msgid "Open Image"
 msgstr "÷¦ÄËÒÉÔÉ ÚÏÂÒÁÖÅÎÎÑ"
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 064ff8b1..6d57216e 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog 1.4\n"
-"POT-Creation-Date: 2000-07-02 01:10+0800\n"
+"POT-Creation-Date: 2000-08-18 15:36-0400\n"
 "PO-Revision-Date: 2000-07-03 20:00+0800\n"
 "Last-Translator: Jing-Jong SHYUE <shyue@sonoma.com.tw>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bonobo/bonobo-image-generic.c:620
+#: bonobo/bonobo-image-generic.c:681
 msgid "I could not initialize Bonobo"
 msgstr "µLªkªì©l¤Æ Bonobo"
 
-#: src/preferences.c:177
+#: src/preferences.c:219
 msgid "Preferences"
 msgstr "°¾¦n³]©w"
 
@@ -151,7 +151,7 @@ msgstr "À˵ø¾¹"
 msgid "Open"
 msgstr "¶}±Ò"
 
-#: src/tb-image.c:33 src/window.c:374
+#: src/tb-image.c:33 src/window.c:171
 msgid "Open an image file"
 msgstr "¶}±Ò¼v¹³ÀÉ"
 
@@ -159,7 +159,7 @@ msgstr "¶}±Ò¼v¹³ÀÉ"
 msgid "Close"
 msgstr "Ãö³¬"
 
-#: src/tb-image.c:35 src/window.c:379
+#: src/tb-image.c:35 src/window.c:176
 msgid "Close the current window"
 msgstr "Ãö³¬¥Ø«eµøµ¡"
 
@@ -184,159 +184,155 @@ msgstr "²Å¦X¤j¤p"
 msgid "Could not open `%s'"
 msgstr "µLªk¶}±Ò '%s'"
 
-#: src/window.c:133
-#, c-format
-msgid "Save image collection `%s'?"
-msgstr "­nÀx¦s¼v¹³¶° '%s' ¶Ü?"
-
-#: src/window.c:137
-msgid "Save"
-msgstr "Àx¦s"
-
-#: src/window.c:138
-msgid "Don't save"
-msgstr "¤£­nÀx¦s"
-
-#: src/window.c:139
-msgid "Don't exit"
-msgstr "¤£­nÂ÷¶}"
-
-#: src/window.c:353 src/window.c:621 src/window.c:795
+#: src/window.c:152 src/window.c:476 src/window.c:729
 msgid "Eye of Gnome"
 msgstr "Eyes of Gnome"
 
-#: src/window.c:355
-msgid "Copyright (C) 1999 The Free Software Foundation"
+#: src/window.c:154
+#, fuzzy
+msgid "Copyright (C) 2000 The Free Software Foundation"
 msgstr "Copyright (C) 1999 The Free Software Foundation"
 
-#: src/window.c:357
+#: src/window.c:156
 msgid "The GNOME image viewing and cataloging program"
 msgstr "GNOME ¼v¹³ÂsÄý¹w¾ã²zµ{¦¡"
 
-#: src/window.c:374
+#: src/window.c:171
 msgid "_Open Image..."
 msgstr "¶}±Ò¼v¹³ (_O)"
 
-#: src/window.c:379
+#: src/window.c:176
 msgid "_Close This Window"
 msgstr "Ãö³¬³o­Óµøµ¡ (_C)"
 
-#: src/window.c:390
+#: src/window.c:187
 msgid "2:1"
 msgstr "2:1"
 
-#: src/window.c:391
+#: src/window.c:188
 msgid "3:1"
 msgstr "3:1"
 
-#: src/window.c:392
+#: src/window.c:189
 msgid "4:1"
 msgstr "4:1"
 
-#: src/window.c:393
+#: src/window.c:190
 msgid "5:1"
 msgstr "5:1"
 
-#: src/window.c:394
+#: src/window.c:191
 msgid "6:1"
 msgstr "6:1"
 
-#: src/window.c:395
+#: src/window.c:192
 msgid "7:1"
 msgstr "7:1"
 
-#: src/window.c:396
+#: src/window.c:193
 msgid "8:1"
 msgstr "8:1"
 
-#: src/window.c:397
+#: src/window.c:194
 msgid "9:1"
 msgstr "9:1"
 
-#: src/window.c:398
+#: src/window.c:195
 msgid "10:1"
 msgstr "10:1"
 
-#: src/window.c:400
+#: src/window.c:197
 msgid "1:2"
 msgstr "1:2"
 
-#: src/window.c:401
+#: src/window.c:198
 msgid "1:3"
 msgstr "1:3"
 
-#: src/window.c:402
+#: src/window.c:199
 msgid "1:4"
 msgstr "1:4"
 
-#: src/window.c:403
+#: src/window.c:200
 msgid "1:5"
 msgstr "1:5"
 
-#: src/window.c:404
+#: src/window.c:201
 msgid "1:6"
 msgstr "1:6"
 
-#: src/window.c:405
+#: src/window.c:202
 msgid "1:7"
 msgstr "1:7"
 
-#: src/window.c:406
+#: src/window.c:203
 msgid "1:8"
 msgstr "1:8"
 
-#: src/window.c:407
+#: src/window.c:204
 msgid "1:9"
 msgstr "1:9"
 
-#: src/window.c:408
+#: src/window.c:205
 msgid "1:10"
 msgstr "1:10"
 
-#: src/window.c:414
+#: src/window.c:211
 msgid "Zoom In"
 msgstr "¾aªñ"
 
-#: src/window.c:414
+#: src/window.c:211
 msgid "Increase zoom factor by 5%%"
 msgstr "¼W¥[ 5%% ÁY©ñ­¿²v"
 
-#: src/window.c:418
+#: src/window.c:215
 msgid "Zoom Out"
 msgstr "©Ô»·"
 
-#: src/window.c:418
+#: src/window.c:215
 msgid "Decrease zoom factor by 5%%"
 msgstr "´î¤Ö 5%% ÁY©ñ­¿²v"
 
-#: src/window.c:422
+#: src/window.c:219
 msgid "Zoom _1:1"
 msgstr "µ¥¤ñ¨Ò"
 
-#: src/window.c:422
+#: src/window.c:219
 msgid "Display the image at 1:1 scale"
 msgstr "±N¼v¹³¥Hµ¥¤ñ¨ÒÅã¥Ü"
 
-#: src/window.c:426
+#: src/window.c:223
 msgid "_Zoom factor"
 msgstr "ÁY©ñ­¿²v (_Z)"
 
-#: src/window.c:428
+#: src/window.c:225
 msgid "_Fit to Window"
 msgstr "²Å¦Xµøµ¡¤j¤p (_F)"
 
-#: src/window.c:428
+#: src/window.c:225
 msgid "Zoom the image to fit in the window"
 msgstr "±N¼v¹³½Õ¾ã¦¨»Pµøµ¡¦P¤j"
 
-#: src/window.c:432
+#: src/window.c:229
 msgid "Full _Screen"
 msgstr "¥þ¿Ã¹õ (_S)"
 
-#: src/window.c:432
+#: src/window.c:229
 msgid "Use the whole screen for display"
 msgstr "¨Ï¾Ö¥þ¿Ã¹õ¥Î¥HÅã¥Ü"
 
-#: src/window.c:726
+#: src/window.c:618
 msgid "Open Image"
 msgstr "¶}±Ò¼v¹³"
+
+#~ msgid "Save image collection `%s'?"
+#~ msgstr "­nÀx¦s¼v¹³¶° '%s' ¶Ü?"
+
+#~ msgid "Save"
+#~ msgstr "Àx¦s"
+
+#~ msgid "Don't save"
+#~ msgstr "¤£­nÀx¦s"
+
+#~ msgid "Don't exit"
+#~ msgstr "¤£­nÂ÷¶}"
diff --git a/src/ChangeLog b/src/ChangeLog
index 48a09bb7..57b73937 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2000-08-18  Federico Mena Quintero  <federico@helixcode.com>
+
+	Another attempt at fixing auto-sizing; it seems to work now.
+	Maybe GtkScrollFrame is not *that* broken...
+
+	* window.c (window_construct): Do not set the default size of the
+	window.
+	(window_init): Set the window policy to allow_shrink.
+	(auto_size): Set the usize of the image view to our preferred size.
+	(window_open_image_dialog): Add a grab on the dialog so that the
+	user cannot invoke commands on the window!
+	(hide_cb): Remove the grab when the dialog is hidden.
+	(window_open_image_dialog): Sigh.  Add an accel group so that
+	pressing Escape can close the open dialog.
+
+	* gtkscrollframe.c (gtk_scroll_frame_size_request): Do pay
+	attention to the child's requisition; this restores the code to
+	its original state.
+	(gtk_scroll_frame_size_allocate): Make sure the the
+	child_allocation is nonnegative (bugfix merge from Evolution).
+
+	* image-view.c (image_view_size_request): Request a size of zero.
+
 2000-08-18  arik devens  <arik@helixcode.com>
 
 	* full-screen.c (full_screen_finalize): see below.
diff --git a/src/gtkscrollframe.c b/src/gtkscrollframe.c
index a607bb51..10870679 100644
--- a/src/gtkscrollframe.c
+++ b/src/gtkscrollframe.c
@@ -512,8 +512,8 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	GtkScrollFrame *sf;
 	ScrollFramePrivate *priv;
 	GtkBin *bin;
-	gint extra_width;
-	gint extra_height;
+	int extra_width;
+	int extra_height;
 	GtkRequisition hsb_requisition;
 	GtkRequisition vsb_requisition;
 	GtkRequisition child_requisition;
@@ -548,12 +548,9 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition)
 
 		gtk_widget_size_request (bin->child, &child_requisition);
 
-#if 0
 		if (priv->hsb_policy == GTK_POLICY_NEVER)
 			requisition->width += child_requisition.width;
-		else
-#endif
-		{
+		else {
 			GtkWidgetAuxInfo *aux_info;
 
 			aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child),
@@ -565,12 +562,9 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition)
 				requisition->width += vsb_requisition.width;
 		}
 
-#if 0
 		if (priv->vsb_policy == GTK_POLICY_NEVER)
 			requisition->height += child_requisition.height;
-		else
-#endif
-		{
+		else {
 			GtkWidgetAuxInfo *aux_info;
 
 			aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child),
@@ -615,8 +609,8 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
 
 	allocation->x = GTK_CONTAINER (widget)->border_width;
 	allocation->y = GTK_CONTAINER (widget)->border_width;
-	allocation->width = MAX (1, (gint) widget->allocation.width - allocation->x * 2);
-	allocation->height = MAX (1, (gint) widget->allocation.height - allocation->y * 2);
+	allocation->width = MAX (1, (int) widget->allocation.width - (int) allocation->x * 2);
+	allocation->height = MAX (1, (int) widget->allocation.height - (int) allocation->y * 2);
 
 	if (priv->vsb_visible) {
 		GtkRequisition vsb_requisition;
@@ -627,8 +621,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
 		    || priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
 			allocation->x += vsb_requisition.width + priv->sb_spacing;
 
-		allocation->width = MAX (1, ((gint) allocation->width
-					     - ((gint) vsb_requisition.width + priv->sb_spacing)));
+		allocation->width = MAX (1,
+					 ((int) allocation->width
+					  - (int) (vsb_requisition.width + priv->sb_spacing)));
 	}
 
 	if (priv->hsb_visible) {
@@ -640,8 +635,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
 		    || priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
 			allocation->y += hsb_requisition.height + priv->sb_spacing;
 
-		allocation->height = MAX (1, ((gint) allocation->height
-					      - ((gint) hsb_requisition.height + priv->sb_spacing)));
+		allocation->height = MAX (1,
+					  ((int) allocation->height
+					   - (int) (hsb_requisition.height + priv->sb_spacing)));
 	}
 }
 
@@ -654,7 +650,7 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	GtkBin *bin;
 	GtkAllocation relative_allocation;
 	GtkAllocation child_allocation;
-	gint xthickness, ythickness;
+	int xthickness, ythickness;
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_SCROLL_FRAME (widget));
@@ -699,8 +695,8 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 
 			child_allocation.x = priv->frame_x + xthickness;
 			child_allocation.y = priv->frame_y + ythickness;
-			child_allocation.width = priv->frame_w - 2 * xthickness;
-			child_allocation.height = priv->frame_h - 2 * ythickness;
+			child_allocation.width = MAX ((int) priv->frame_w - 2 * xthickness, 0);
+			child_allocation.height = MAX ((int) priv->frame_h - 2 * ythickness, 0);
 
 			previous_hvis = priv->hsb_visible;
 			previous_vvis = priv->vsb_visible;
diff --git a/src/image-view.c b/src/image-view.c
index cf365582..fa215b23 100644
--- a/src/image-view.c
+++ b/src/image-view.c
@@ -1059,7 +1059,6 @@ image_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
 {
 	ImageView *view;
 	ImageViewPrivate *priv;
-	int scaled_width, scaled_height;
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (IS_IMAGE_VIEW (widget));
@@ -1068,10 +1067,7 @@ image_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	view = IMAGE_VIEW (widget);
 	priv = view->priv;
 
-	compute_scaled_size (view, priv->zoom, &scaled_width, &scaled_height);
-
-	requisition->width = scaled_width ? scaled_width : 1;
-	requisition->height = scaled_height ? scaled_height : 1;
+	requisition->width = requisition->height = 0;
 }
 
 /* Sets the zoom anchor point with respect to the specified window position */
diff --git a/src/window.c b/src/window.c
index 09d7df1f..1f19c54c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -341,6 +341,8 @@ window_init (Window *window)
 		NULL);
 
 	window_list = g_list_prepend (window_list, window);
+
+	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
 }
 
 /* Destroy handler for windows */
@@ -479,9 +481,6 @@ window_construct (Window *window)
 	tb = tb_image_new (window, &priv->zoom_tb_items);
 	gnome_app_set_toolbar (GNOME_APP (window), GTK_TOOLBAR (tb));
 
-	gtk_window_set_default_size (GTK_WINDOW (window),
-				     DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT);
-
 	priv->ui = ui_image_new ();
 	gnome_app_set_contents (GNOME_APP (window), priv->ui);
 	gtk_scroll_frame_set_policy (GTK_SCROLL_FRAME (priv->ui), priv->sb_policy, priv->sb_policy);
@@ -588,6 +587,15 @@ open_delete_event (GtkWidget *widget, gpointer data)
 	return TRUE;
 }
 
+/* Hide handler for the open file selection dialog; removes the GTK+ grab we
+ * keep on it.
+ */
+static void
+hide_cb (GtkWidget *widget, gpointer data)
+{
+	gtk_grab_remove (widget);
+}
+
 /**
  * window_open_image_dialog:
  * @window: A window.
@@ -605,6 +613,8 @@ window_open_image_dialog (Window *window)
 	priv = window->priv;
 
 	if (!priv->file_sel) {
+		GtkAccelGroup *accel_group;
+
 		priv->file_sel = gtk_file_selection_new (_("Open Image"));
 		gtk_window_set_transient_for (GTK_WINDOW (priv->file_sel), GTK_WINDOW (window));
 		gtk_object_set_data (GTK_OBJECT (priv->file_sel), "window", window);
@@ -620,10 +630,22 @@ window_open_image_dialog (Window *window)
 		gtk_signal_connect (GTK_OBJECT (priv->file_sel), "delete_event",
 				    GTK_SIGNAL_FUNC (open_delete_event),
 				    window);
+		gtk_signal_connect (GTK_OBJECT (priv->file_sel), "hide",
+				    GTK_SIGNAL_FUNC (hide_cb),
+				    window);
+
+		accel_group = gtk_accel_group_new ();
+		gtk_window_add_accel_group (GTK_WINDOW (priv->file_sel), accel_group);
+		gtk_widget_add_accelerator (GTK_FILE_SELECTION (priv->file_sel)->cancel_button,
+					    "clicked",
+					    accel_group,
+					    GDK_Escape,
+					    0, 0);
 	}
 
 	gtk_widget_show_now (priv->file_sel);
 	raise_and_focus (priv->file_sel);
+	gtk_grab_add (priv->file_sel);
 }
 
 /* Picks a reasonable size for the window and zoom factor based on the image size */
@@ -637,9 +659,6 @@ auto_size (Window *window)
 	int swidth, sheight;
 	int zwidth, zheight;
 	double zoom;
-	int window_width, window_height;
-	int view_width, view_height;
-	GtkAllocation allocation;
 
 	priv = window->priv;
 
@@ -661,25 +680,7 @@ auto_size (Window *window)
 	zwidth = floor (iwidth * zoom + 0.5);
 	zheight = floor (iheight * zoom + 0.5);
 
-	window_width = GTK_WIDGET (window)->allocation.width;
-	window_height = GTK_WIDGET (window)->allocation.height;
-
-	view_width = view->allocation.width;
-	view_height = view->allocation.height;
-
-	window_width = zwidth + (window_width - view_width);
-	window_height = zheight + (window_height - view_height);
-
-	allocation.x = GTK_WIDGET (window)->allocation.x;
-	allocation.y = GTK_WIDGET (window)->allocation.y;
-	allocation.width = window_width;
-	allocation.height = window_height;
-
-	if (!GTK_WIDGET_REALIZED (window))
-		gtk_widget_realize (GTK_WIDGET (window));
-
-	gtk_widget_size_allocate (GTK_WIDGET (window), &allocation);
-	gdk_window_resize (GTK_WIDGET (window)->window, allocation.width, allocation.height);
+	gtk_widget_set_usize (view, zwidth, zheight);
 }
 
 /**