changeset 3:c0e337a01cb7

0.8.0

--- a/ChangeLog	Thu Apr 13 12:53:03 2000 +0000
+++ b/ChangeLog	Thu Apr 13 12:55:19 2000 +0000
@@ -1,3 +1,73 @@
+Thu Apr  6 19:03:04 2000  John Ellis  <[e-mail]>
+
+	* README: Release 0.8.0.
+
+Wed Apr  5 11:35:52 2000  John Ellis  <[e-mail]>
+
+	* filelist.c (rebuild_filter): Fix bug that hacked on the wrong string,
+	causing custom_filter to only have one entry max.
+	* utilops.c: Removed unused code, fix rename description.
+
+Wed Apr  5 11:19:31 2000  John Ellis  <[e-mail]>
+
+	* filelist.c, gqview.h, window.c: File list now scrolls to display
+	the first file that matches the path entry box during tab completion.
+	The directory changes to follow the completion too.
+
+Wed Apr  5 10:30:51 2000  John Ellis  <[e-mail]>
+
+	* filelist.c, gqview.h, main.c, menu.c, rcfile.c, slideshow.c: Added:
+	Save thumnbnail mode to rcfile; add command line option for slideshow,
+	rename other long options; make next/prev work properly during
+	slideshow.
+
+Tue Apr  4 15:00:15 2000  John Ellis  <[e-mail]>
+
+	* po/zh_TW.Big5.po, configure.in: Added Traditional Chinese (Big5),
+	translation from Kam Tik <[e-mail]>
+
+Tue Apr  4 13:20:43 2000  John Ellis  <[e-mail]>
+
+	* *.[ch]: Update copyrights to 2000.
+	* configure.in: Bumper version to 0.8.0 ('bout time)
+	* README, TODO: Updates
+
+Tue Apr  4 12:21:27 2000  John Ellis  <[e-mail]>
+
+	* image.c, img-main.c: Fix mem leaks.
+	* utildlg.[ch]: Added confirm_dialog_new_with_image() utility.
+	* utilops.c: Added display of source and dest images to overwrite
+	dialogs (uses above).
+	All this is derived from a patch by Gordon Messmer <[e-mail]>
+
+Tue Apr  4 10:44:22 2000  John Ellis  <[e-mail]>
+
+	* main.c: Added full screen startup option (-f or -full), derived from
+	patch by Rami Lehti <[e-mail]>
+
+Tue Apr  4 10:33:15 2000  John Ellis  <[e-mail]>
+
+	* image.[ch], img-view.c, img-main.c, menu.c, gqview.h: Added ability
+	to set the root window wallpaper. (If zoom is fit to window, image is
+	scaled, otherwise tiled.
+	Derived from patch by ENTERforNone <[e-mail]>
+
+Tue Apr  4 09:45:08 2000  John Ellis  <[e-mail]>
+
+	* img-main.c, menu.c: Changed full screen key to V. Derived from patch
+	by Martial MICHEL <[e-mail]>
+
+Tue Apr  4 09:32:14 2000  John Ellis  <[e-mail]>
+
+	* fileops.c (get_current_dir): Fix problem when there is no read
+	permission for the current dir. Derived from patch by
+	Mathieu Dessus <[e-mail]>
+
+ Apr  4 09:15:16 2000  John Ellis  <[e-mail]>
+
+	* configure.in, po/tr.po: Added Turkish translation from
+	Fatih Demir <[e-mail]> 
+
 Thu Mar 16 17:04:24 2000  John Ellis  <[e-mail]>
 
 	* pathsel.c, tabcomp.c: Fix memory leaks.

--- a/README	Thu Apr 13 12:53:03 2000 +0000
+++ b/README	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 ###################################################################
-##                          GQview 0.7.0      (07/03/99)         ##
-##      This software is Copyright (C) 1999 by John Ellis.       ##
+##                          GQview 0.8.0      (04/06/2000)       ##
+##      This software is Copyright (C) 2000 by John Ellis.       ##
 ##  Use this software at your own risk. I am not responsible for ##
 ##        anything this software may do to your computer.        ##
 ## This software falls under the GNU Public License. Please read ##
@@ -9,12 +9,12 @@
 
 Author: John Ellis
 e-mail: [e-mail]
-homepage: gqview.netpedia.net
-          www.geocities.com/SiliconValley/Haven/5235/ (mirror always up to date)
+homepage: gqview.sourceforge.net
+          gqview.netpedia.net (site just has a link back to above)
 
 ======== Requirements
 
-  GTK+-1.2.0: ftp://ftp.gtk.org/pub/gtk
+  GTK+-1.2.x: ftp://ftp.gtk.org/pub/gtk
   Imlib 1.9: ftp://ftp.labs.redhat.com/pub/imlib
 
 ======== Notes and changes for this release
@@ -24,15 +24,25 @@
     > Now supports i18n, added translations: de ja pt_BR ru
     > Remove 'save settings on exit', they are now always saved.
     > Copy/move dialogs now include drop down history.
+    > Overwrite dialogs now display source and dest images.
+    > Full screen toggle is now 'V'.
+    > New command line options: -f or --fullscreen; -s or --slideshow; renamed
+      long option to use -- instead of -.
+    > New option 'set wallpaper' sets the root window to current image.
+      (Scales in 'fit to window mode', tiles in all others) (edit menus).
+    - Thumbnail mode is now remembered between runs.
+    - During slideshows, next/prev image changes (space/backspace) now follow
+      the slideshow progression.
     - Icons now update when size is configured.
     - When dragging files, and the action was a move, refresh the filelist.
+    - Directory changes, and the filelist scrolls to follow tab completion in
+      the main window.
     * Icons sizes are now properly remembered when the config dialog is opened
       then closed without re-selecting the size.
+    * Less memory leaks :)
 
   Notes:
-   known bug: When starting up with tools floating, then unfloat the tools and
-              attempt to do drag and drop, BOOM! endless loop of errors on
-              GTK+-1.2.3 (hint: could use a little help figuring this out)
+    bt_br.po is corrupt (my fault).
 
 ======== Installation
 
@@ -94,11 +104,14 @@
     R                                  refresh list
     F                                  (Un)float file selection area
     H                                  (Un)hide file selection area
-    [Ctrl] = F                         Toggle full screen
+    V                                  Toggle full screen
     S                                  Toggle slide show
 
 ======== Thanks go to the following for fixes, additions, and patches:
 
+  Fâtih Demir <[e-mail]>
+      for Turkish translation
+
   Oleg Andrjushenko <[e-mail]>
       for Russian translation
 
@@ -114,5 +127,6 @@
   Diederen Damien <[e-mail]>
       for .xvpics thumbnail reading support.
 
+
 ========
 

--- a/TODO	Thu Apr 13 12:53:03 2000 +0000
+++ b/TODO	Thu Apr 13 12:55:19 2000 +0000
@@ -1,39 +1,45 @@
 TODO key: d = done, w = work in progress, ? = possibly fixed, * = wt? - how?
-
-d>try gtk_container_remove instead of reparent, to try to fix dragging hang.
-d>After dragging files, check if they are now gone (moved).
- >Remember previous directory used in move/copy dialogs.
+          PB = can only be done after move to gdk_pixbuf
 
 Major:
 ----------------------------------------------
-d>Fix window resizing to start-up size when window is made smaller, then an
-  image is changed, or widget is 'operated'.
-d>Fix hang (endless gtk loop on drags in GTK+ 1.2.3) bah, in gdb its a pain,
-  breaking it within the error causes a stuck pointer grab :-/
-  HOW TO REPEAT:
-   enable 'save tool state'
-   set the tools to float
-   exit
-   restart
-   unfloat tools
-   try to do drag and drop -> BOOM!
-  UPDATE: I dunno, this still looks like a gtk bug?
+ >fix translation pt_BR.po file (corrupted)
 
 Minor:
 ----------------------------------------------
- >add a read-ahead buffer for next image, note that this will not be threaded.
- >add command line option to invoke full screen and slideshow on startup
+d>save thumbnail on/off setting.
+ >properly restore main window when coming back from full screen.
+   (position / maximized, etc.)
+d>make space/back follow schedule during random slideshow.
+ >add larger thumbnail option.
+ >save history lists for move/copy dialogs, etc.
+ >maybe show image in delete/rename/copy/move dialogs (should be simple now).
+ >add a read-ahead buffer for next image, note that this will not be threaded. (PB)
+  (gdk-pixbuf will allow it to be done in short idle calls, allowing interuption)
+ >generate thumbnails in idle calls, instead of creating a new main loop to seem
+  responsive.
  >make *'s const, where appropriate ()
- >make Escape cancel dialogs.
+ >make Escape key cancel dialogs.
 
- >add progress dialog when moving/copying/deleting multiple files.
+ >progress meter during load, or progressive load. (PB)
+ >add progress dialog when moving/copying/deleting multiple files. (PB)
  >.xbm file format not listed by default? .pnm, more?
 
  >ability to specify view window background color
- >show wait cursor during image load
+ >show wait cursor during image load (after update to PB, may not be as useful)
+
+ >reload should reload the image too. (PB) <-- reason: Imlib caching sometimes misses
+    modification times.
 
 Wishlist?:
 ----------------------------------------------
+ >recursive slide show (careful with implementation ,requires slideshow recode)
+d>scroll to first matching file during tab completion typing in main window.
+ >allow multiple columns when viewing thumbs and tools float. (multi column clist?)
+ >add bookmark type option.
+ >allow to sort files by date and size.
+ >add destination move file preset type locations bound to 1 - 0 keys. (like editors?)
+ >move to gdkpixbuf, when it is ready (1.0)
  >image list, like playlist in sound players
  >add vert drag bar
  >make *.jpg on command line show only jpg files, for ex.

--- a/configure.in	Thu Apr 13 12:53:03 2000 +0000
+++ b/configure.in	Thu Apr 13 12:55:19 2000 +0000
@@ -1,7 +1,7 @@
 AC_INIT(src/main.c)
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(gqview, 0.7.0f)
+AM_INIT_AUTOMAKE(gqview, 0.8.0)
 
 AM_MAINTAINER_MODE
 
@@ -38,7 +38,7 @@
 localedir='${prefix}/share/locale'
 AC_SUBST(localedir)
 
-ALL_LINGUAS="de ja pt_BR ru"
+ALL_LINGUAS="de ja pt_BR ru tr zh_TW.Big5"
 AM_GNU_GETTEXT
 
 AC_SUBST(CFLAGS)

--- a/po/de.po	Thu Apr 13 12:53:03 2000 +0000
+++ b/po/de.po	Thu Apr 13 12:55:19 2000 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gqmpeg-0.6.3a\n"
-"POT-Creation-Date: 1999-08-21 14:22-0400\n"
+"POT-Creation-Date: 2000-04-06 19:03-0400\n"
 "PO-Revision-Date: 1999-08-15 23:47+02:00\n"
 "Last-Translator: Matthias Warkus <[e-mail]>\n"
 "Language-Team: Me and my monkey <[e-mail]>\n"
@@ -25,8 +25,8 @@
 msgid "Apply"
 msgstr ""
 
-#: src/config.c:325 src/utildlg.c:140 src/utilops.c:414 src/utilops.c:722
-#: src/utilops.c:851 src/utilops.c:949
+#: src/config.c:325 src/utildlg.c:145 src/utilops.c:444 src/utilops.c:754
+#: src/utilops.c:885 src/utilops.c:983
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -86,8 +86,8 @@
 msgid "Zoom to original size"
 msgstr "Zu Ausgangsgröße zoomen"
 
-#: src/config.c:440 src/img-view.c:283 src/menu.c:458 src/menu.c:531
-#: src/menu.c:571 src/menu.c:661
+#: src/config.c:440 src/img-view.c:290 src/menu.c:473 src/menu.c:547
+#: src/menu.c:587 src/menu.c:678
 msgid "Fit image to window"
 msgstr "Bild in Fenster einpassen"
 
@@ -103,7 +103,7 @@
 msgid "Limit size when auto-sizing window"
 msgstr "Größe begrenzen bei der automatischen Fenstergrößenanpassung"
 
-#: src/config.c:470 src/menu.c:462
+#: src/config.c:470 src/menu.c:477
 msgid "Thumbnails"
 msgstr "Indexbilder"
 
@@ -163,17 +163,18 @@
 msgid "Command Line"
 msgstr "Kommandozeile"
 
-#: src/config.c:660 src/menu.c:484
+#: src/config.c:660 src/menu.c:500
 msgid "About"
 msgstr "Info"
 
 #: src/config.c:676
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "GQview %s\n"
 "\n"
-"Copyright (c) 1999 by John Ellis\n"
-"http://gqview.netpedia.net\n"
+"Copyright (c) 2000 by John Ellis\n"
+"http://gqview.sorceforge.net\n"
+"or http://gqview.netpedia.net\n"
 "[e-mail]\n"
 "\n"
 "Released under the GNU Public License"
@@ -200,65 +201,65 @@
 msgid "%d files%s"
 msgstr "%d Dateien%s"
 
-#: src/filelist.c:960
+#: src/filelist.c:1025
 msgid "Loading thumbs..."
 msgstr "Lade Indexbilder..."
 
-#: src/image.c:65
+#: src/image.c:66
 #, c-format
 msgid "( ? x ? ) %d bytes"
 msgstr "( ? x ? ) %d Bytes"
 
-#: src/image.c:67
+#: src/image.c:68
 #, c-format
 msgid "( %d x %d ) %d bytes"
 msgstr "( %d x %d ) %d Bytes"
 
-#: src/img-main.c:230
+#: src/img-main.c:231
 msgid "GQview full screen"
 msgstr "GQview Vollbild"
 
-#: src/img-view.c:280 src/menu.c:455 src/menu.c:528 src/menu.c:568
-#: src/menu.c:657
+#: src/img-view.c:287 src/menu.c:470 src/menu.c:544 src/menu.c:584
+#: src/menu.c:674
 msgid "Zoom in"
 msgstr "Einzoomen"
 
-#: src/img-view.c:281 src/menu.c:456 src/menu.c:529 src/menu.c:569
-#: src/menu.c:659
+#: src/img-view.c:288 src/menu.c:471 src/menu.c:545 src/menu.c:585
+#: src/menu.c:676
 msgid "Zoom out"
 msgstr "Wegzoomen"
 
-#: src/img-view.c:282 src/menu.c:457 src/menu.c:530 src/menu.c:570
+#: src/img-view.c:289 src/menu.c:472 src/menu.c:546 src/menu.c:586
 msgid "Zoom 1:1"
 msgstr "Zoom 1:1"
 
 #. edit menu
-#: src/img-view.c:286 src/menu.c:442 src/menu.c:503 src/menu.c:534
-#: src/menu.c:574
+#: src/img-view.c:293 src/menu.c:457 src/menu.c:519 src/menu.c:550
+#: src/menu.c:590
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/img-view.c:291 src/menu.c:431 src/menu.c:510 src/menu.c:541
-#: src/menu.c:579
+#: src/img-view.c:298 src/menu.c:446 src/menu.c:526 src/menu.c:557
+#: src/menu.c:595
 msgid "Copy..."
 msgstr "Kopieren..."
 
-#: src/img-view.c:292 src/menu.c:432 src/menu.c:511 src/menu.c:542
-#: src/menu.c:580
+#: src/img-view.c:299 src/menu.c:447 src/menu.c:527 src/menu.c:558
+#: src/menu.c:596
 msgid "Move..."
 msgstr "Verschieben..."
 
-#: src/img-view.c:293 src/menu.c:433 src/menu.c:512 src/menu.c:543
-#: src/menu.c:581
+#: src/img-view.c:300 src/menu.c:448 src/menu.c:528 src/menu.c:559
+#: src/menu.c:597
 msgid "Rename..."
 msgstr "Umbenennen.."
 
-#: src/img-view.c:294 src/menu.c:434 src/menu.c:513 src/menu.c:544
-#: src/menu.c:582
+#: src/img-view.c:301 src/menu.c:449 src/menu.c:529 src/menu.c:560
+#: src/menu.c:598
 msgid "Delete..."
 msgstr "Löschen..."
 
-#: src/img-view.c:297
+#: src/img-view.c:304
 msgid "Close window"
 msgstr "Fenster schließen"
 
@@ -267,7 +268,7 @@
 msgid "GQview running: %s\n"
 msgstr "GQview läuft: %s\n"
 
-#: src/main.c:316
+#: src/main.c:330
 msgid ""
 "Usage: gqview [options] [path]\n"
 "\n"
@@ -275,31 +276,45 @@
 "Verwendung: gqview [optionen] [pfad]\n"
 "\n"
 
-#: src/main.c:317
+#: src/main.c:331
 msgid "valid options are:\n"
 msgstr "Gültige Optionen sind:\n"
 
-#: src/main.c:318
-msgid "  +t, +tools                 force show of tools\n"
+#: src/main.c:332
+#, fuzzy
+msgid "  +t, --with-tools           force show of tools\n"
 msgstr "  +t, +tools                 Anzeige der Werkzeuge erzwingen\n"
 
-#: src/main.c:319
-msgid "  -t, -tools                 force hide of tools\n"
+#: src/main.c:333
+#, fuzzy
+msgid "  -t, --without-tools        force hide of tools\n"
+msgstr "  -t, -tools                 Verbergen der Werkzeuge erzwingen\n"
+
+#: src/main.c:334
+#, fuzzy
+msgid "  -f, --fullscreen           start in full screen mode\n"
 msgstr "  -t, -tools                 Verbergen der Werkzeuge erzwingen\n"
 
-#: src/main.c:320
-msgid "  -debug                     turn on debug output\n"
+#: src/main.c:335
+#, fuzzy
+msgid "  -s, --slideshow            start in slideshow mode\n"
+msgstr "  -t, -tools                 Verbergen der Werkzeuge erzwingen\n"
+
+#: src/main.c:336
+#, fuzzy
+msgid "  --debug                    turn on debug output\n"
 msgstr "  -debug                     Diagnoseausgabe einschalten\n"
 
-#: src/main.c:321
+#: src/main.c:337
+#, fuzzy
 msgid ""
-"  -help                      this message\n"
+"  -h, --help                 show this message\n"
 "\n"
 msgstr ""
 "  -help                Diese Meldung\n"
 "\n"
 
-#: src/main.c:326
+#: src/main.c:342
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
@@ -308,115 +323,119 @@
 "Ungültig oder ignoriert: %s\n"
 "Benutzen Sie -help für Optionen\n"
 
-#: src/main.c:353
+#: src/main.c:369
 msgid "The Gimp"
 msgstr "The Gimp"
 
-#: src/main.c:356
+#: src/main.c:372
 msgid "Electric Eyes"
 msgstr "Electric Eyes"
 
-#: src/main.c:359
+#: src/main.c:375
 msgid "XV"
 msgstr "XV"
 
-#: src/main.c:362
+#: src/main.c:378
 msgid "Xpaint"
 msgstr "Xpaint"
 
-#: src/menu.c:364
+#: src/menu.c:373
 #, c-format
 msgid "in %s..."
 msgstr "in %s..."
 
-#: src/menu.c:366
+#: src/menu.c:375
 msgid "in (unknown)..."
 msgstr "in (unbekannt)..."
 
-#: src/menu.c:385
+#: src/menu.c:394
 msgid "Options..."
 msgstr "Optionen..."
 
-#: src/menu.c:387
+#: src/menu.c:396
 msgid "Remove old thumbnails"
 msgstr "Alte Indexbilder entfernen"
 
+#: src/menu.c:398 src/menu.c:410 src/menu.c:422
+msgid "Set as wallpaper"
+msgstr ""
+
 #. file menu
-#: src/menu.c:425
+#: src/menu.c:440
 msgid "File"
 msgstr "Datei"
 
-#: src/menu.c:429
+#: src/menu.c:444
 msgid "Create Dir..."
 msgstr "Verzeichnis anlegen..."
 
-#: src/menu.c:436
+#: src/menu.c:451
 msgid "Exit"
 msgstr "Beenden"
 
 #. view menu
-#: src/menu.c:451
+#: src/menu.c:466
 msgid "View"
 msgstr "Ansicht"
 
-#: src/menu.c:461 src/menu.c:547
+#: src/menu.c:476 src/menu.c:563
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/menu.c:469
+#: src/menu.c:485
 msgid "Refresh Lists"
 msgstr "Listen auffrischen"
 
-#: src/menu.c:470
+#: src/menu.c:486
 msgid "(Un)Float file list"
 msgstr "Dateiliste schweben lassen / einfangen"
 
-#: src/menu.c:471 src/menu.c:546
+#: src/menu.c:487 src/menu.c:562
 msgid "(Un)Hide file list"
 msgstr "Dateiliste verbergen / hervorholen"
 
-#: src/menu.c:474
+#: src/menu.c:490
 msgid "Toggle slideshow"
 msgstr "Diavorführung an/aus"
 
 #. help menu
-#: src/menu.c:480
+#: src/menu.c:496
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/menu.c:507 src/menu.c:538
+#: src/menu.c:523 src/menu.c:554
 msgid "View in new window"
 msgstr "In neuem Fenster anzeigen"
 
-#: src/menu.c:515
+#: src/menu.c:531
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: src/menu.c:585
+#: src/menu.c:601
 msgid "Exit full screen"
 msgstr "Vollbild verlassen"
 
-#: src/menu.c:644
+#: src/menu.c:661
 msgid "Create thumbnails"
 msgstr "Indexbilder erzeugen"
 
-#: src/menu.c:653
+#: src/menu.c:670
 msgid "Change to home directory"
 msgstr "Ins Heimverzeichnis wechseln"
 
-#: src/menu.c:655
+#: src/menu.c:672
 msgid "Refresh file list"
 msgstr "Dateiliste auffrischen"
 
-#: src/menu.c:663
+#: src/menu.c:680
 msgid "Set zoom 1:1"
 msgstr "Zoom auf 1:1 setzen"
 
-#: src/menu.c:665
+#: src/menu.c:682
 msgid "Configure options"
 msgstr "Optionen konfigurieren"
 
-#: src/menu.c:667
+#: src/menu.c:684
 msgid "Float Controls"
 msgstr "Kontrollen schweben lassen"
 
@@ -440,11 +459,39 @@
 msgid "failed to delete:%s\n"
 msgstr "Kann nicht löschen: %s\n"
 
-#: src/utildlg.c:67
+#: src/utildlg.c:68
 msgid "     Ok     "
 msgstr "     OK     "
 
-#: src/utilops.c:162
+#: src/utilops.c:166
+msgid "Source to copy matches destination"
+msgstr ""
+
+#: src/utilops.c:167
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file:\n"
+"%s\n"
+"to itself."
+msgstr "Kann Datei nicht löschen:\n"
+
+#: src/utilops.c:171
+msgid "Source to move matches destination"
+msgstr ""
+
+#: src/utilops.c:172
+#, fuzzy, c-format
+msgid ""
+"Unable to move file:\n"
+"%s\n"
+"to itself."
+msgstr "Kann Datei nicht umbenennen:\n"
+
+#: src/utilops.c:175 src/utilops.c:231 src/utilops.c:516
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: src/utilops.c:182
 #, fuzzy, c-format
 msgid ""
 "Overwrite file:\n"
@@ -452,28 +499,28 @@
 " with:\b %s"
 msgstr "Datei überschreiben:\n"
 
-#: src/utilops.c:163 src/utilops.c:262 src/utilops.c:621 src/utilops.c:803
+#: src/utilops.c:183 src/utilops.c:289 src/utilops.c:651 src/utilops.c:835
 msgid "Overwrite file"
 msgstr "Datei überschreiben"
 
-#: src/utilops.c:164
+#: src/utilops.c:186
 msgid "Skip"
 msgstr "Überspringen"
 
-#: src/utilops.c:165
+#: src/utilops.c:187
 msgid "Yes to all"
 msgstr "Ja zu allen"
 
-#: src/utilops.c:166
+#: src/utilops.c:188
 msgid "Yes"
 msgstr "Ja"
 
-#: src/utilops.c:200 src/utilops.c:288
+#: src/utilops.c:222 src/utilops.c:317
 #, fuzzy
 msgid "Error copying file"
 msgstr "Fehler beim Umbenennen von Datei"
 
-#: src/utilops.c:201
+#: src/utilops.c:223
 #, c-format
 msgid ""
 "Unable to copy file:\n"
@@ -482,12 +529,12 @@
 " during multiple file copy."
 msgstr ""
 
-#: src/utilops.c:205 src/utilops.c:293
+#: src/utilops.c:227 src/utilops.c:322
 #, fuzzy
 msgid "Error moving file"
 msgstr "Fehler beim Umbenennen von Datei"
 
-#: src/utilops.c:206
+#: src/utilops.c:228
 #, fuzzy, c-format
 msgid ""
 "Unable to move file:\n"
@@ -498,11 +545,15 @@
 "\n"
 " während Verschieben mehrerer Dateien."
 
-#: src/utilops.c:209 src/utilops.c:486
-msgid "Continue"
-msgstr "Fortsetzen"
+#: src/utilops.c:282
+msgid "Source matches destination"
+msgstr ""
 
-#: src/utilops.c:261
+#: src/utilops.c:283
+msgid "Source and destination are the same, operation cancelled."
+msgstr ""
+
+#: src/utilops.c:288
 #, fuzzy, c-format
 msgid ""
 "Overwrite file:\n"
@@ -511,11 +562,11 @@
 "%s"
 msgstr "Datei überschreiben:\n"
 
-#: src/utilops.c:263 src/utilops.c:622 src/utilops.c:804
+#: src/utilops.c:292 src/utilops.c:654 src/utilops.c:838
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: src/utilops.c:289
+#: src/utilops.c:318
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file:\n"
@@ -524,7 +575,7 @@
 "%s"
 msgstr "Kann Datei nicht löschen:\n"
 
-#: src/utilops.c:294
+#: src/utilops.c:323
 #, fuzzy, c-format
 msgid ""
 "Unable to move file:\n"
@@ -533,11 +584,11 @@
 "%s"
 msgstr "Kann Datei nicht umbenennen:\n"
 
-#: src/utilops.c:337
+#: src/utilops.c:367
 msgid "Invalid destination"
 msgstr "Ungültiges Ziel"
 
-#: src/utilops.c:337
+#: src/utilops.c:367
 msgid ""
 "When operating with multiple files, please select\n"
 " a directory, not file."
@@ -545,23 +596,23 @@
 "Beim Umgang mit mehreren Dateien, bitte ein\n"
 " Verzeichnis, keine Datei wählen."
 
-#: src/utilops.c:339
+#: src/utilops.c:369
 msgid "Invalid directory"
 msgstr "Ungültiges Verzeichnis"
 
-#: src/utilops.c:339
+#: src/utilops.c:369
 msgid "Please select an existing directory"
 msgstr "Bitte wählen Sie ein existierendes Verzeichnis"
 
-#: src/utilops.c:397
+#: src/utilops.c:427
 msgid "GQview - copy"
 msgstr "GQview - Kopieren"
 
-#: src/utilops.c:398
+#: src/utilops.c:428
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/utilops.c:400
+#: src/utilops.c:430
 #, c-format
 msgid ""
 "Copy file:\n"
@@ -569,7 +620,7 @@
 "to:"
 msgstr ""
 
-#: src/utilops.c:402
+#: src/utilops.c:432
 #, fuzzy, c-format
 msgid ""
 "Copy multiple files from:\n"
@@ -577,15 +628,15 @@
 "to:"
 msgstr " mehrere Dateien von:\n"
 
-#: src/utilops.c:406
+#: src/utilops.c:436
 msgid "GQview - move"
 msgstr "GQview - Verschieben"
 
-#: src/utilops.c:407
+#: src/utilops.c:437
 msgid "Move"
 msgstr "Verschieben"
 
-#: src/utilops.c:409
+#: src/utilops.c:439
 #, c-format
 msgid ""
 "Move file:\n"
@@ -593,7 +644,7 @@
 "to:"
 msgstr ""
 
-#: src/utilops.c:411
+#: src/utilops.c:441
 #, fuzzy, c-format
 msgid ""
 "Move multiple files from:\n"
@@ -601,7 +652,7 @@
 "to:"
 msgstr " mehrere Dateien von:\n"
 
-#: src/utilops.c:484
+#: src/utilops.c:514
 #, fuzzy, c-format
 msgid ""
 "Unable to delete file:\n"
@@ -611,45 +662,45 @@
 "\n"
 "Mehrfaches Löschen fortsetzen?"
 
-#: src/utilops.c:485 src/utilops.c:491
+#: src/utilops.c:515 src/utilops.c:521
 msgid "Delete failed"
 msgstr "Löschen fehlgeschlagen"
 
-#: src/utilops.c:490 src/utilops.c:535
+#: src/utilops.c:520 src/utilops.c:565
 #, fuzzy, c-format
 msgid ""
 "Unable to delete file:\n"
 "%s"
 msgstr "Kann Datei nicht löschen:\n"
 
-#: src/utilops.c:520
+#: src/utilops.c:550
 msgid "Delete files"
 msgstr "Dateien löschen"
 
-#: src/utilops.c:520
+#: src/utilops.c:550
 msgid "About to delete multiple files..."
 msgstr "Werde mehrere Dateien löschen..."
 
-#: src/utilops.c:521 src/utilops.c:566
+#: src/utilops.c:551 src/utilops.c:596
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/utilops.c:536
+#: src/utilops.c:566
 msgid "File deletion failed"
 msgstr "Dateilöschen fehlgeschlagen"
 
-#: src/utilops.c:564
+#: src/utilops.c:594
 #, fuzzy, c-format
 msgid ""
 "About to delete the file:\n"
 " %s"
 msgstr "Werde Datei löschen:\n"
 
-#: src/utilops.c:565
+#: src/utilops.c:595
 msgid "Delete file"
 msgstr "Datei löschen"
 
-#: src/utilops.c:620
+#: src/utilops.c:650 src/utilops.c:834
 #, fuzzy, c-format
 msgid ""
 "Overwrite file:\n"
@@ -658,7 +709,7 @@
 "%s"
 msgstr "Datei überschreiben:\n"
 
-#: src/utilops.c:631
+#: src/utilops.c:663
 #, fuzzy, c-format
 msgid ""
 "Unable to rename file:\n"
@@ -667,40 +718,31 @@
 "%s"
 msgstr "Kann Datei nicht umbenennen:\n"
 
-#: src/utilops.c:632 src/utilops.c:813
+#: src/utilops.c:664 src/utilops.c:847
 msgid "Error renaming file"
 msgstr "Fehler beim Umbenennen von Datei"
 
-#: src/utilops.c:722 src/utilops.c:851
+#: src/utilops.c:754 src/utilops.c:885
 msgid "GQview - rename"
 msgstr "GQview - Umbenennen"
 
-#: src/utilops.c:722
+#: src/utilops.c:754
 msgid "Rename multiple files:"
 msgstr "Mehrere Dateien umbenennen:"
 
-#: src/utilops.c:722 src/utilops.c:851
+#: src/utilops.c:754 src/utilops.c:885
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/utilops.c:758
+#: src/utilops.c:790
 msgid "Rename:"
 msgstr "Umbenennen:"
 
-#: src/utilops.c:767
+#: src/utilops.c:799
 msgid "to:"
 msgstr "in:"
 
-#: src/utilops.c:802
-#, fuzzy, c-format
-msgid ""
-"Overwrite file:\n"
-"%s\n"
-"with:\n"
-"%s"
-msgstr "Datei überschreiben:\n"
-
-#: src/utilops.c:812
+#: src/utilops.c:846
 #, fuzzy, c-format
 msgid ""
 "Unable to rename file:\n"
@@ -709,7 +751,7 @@
 "%s"
 msgstr "Kann Datei nicht umbenennen:\n"
 
-#: src/utilops.c:850
+#: src/utilops.c:884
 #, fuzzy, c-format
 msgid ""
 "Rename file:\n"
@@ -717,7 +759,7 @@
 "to:"
 msgstr "Datei umbenennen:\n"
 
-#: src/utilops.c:894
+#: src/utilops.c:928
 #, fuzzy, c-format
 msgid ""
 "The path:\n"
@@ -727,11 +769,11 @@
 "\n"
 " existiert bereits als Datei."
 
-#: src/utilops.c:895
+#: src/utilops.c:929
 msgid "Could not create directory"
 msgstr "Konnte Verzeichnis nicht anlegen"
 
-#: src/utilops.c:900
+#: src/utilops.c:934
 #, fuzzy, c-format
 msgid ""
 "The directory:\n"
@@ -741,22 +783,22 @@
 "\n"
 " existiert bereits"
 
-#: src/utilops.c:901
+#: src/utilops.c:935
 msgid "Directory exists"
 msgstr "Verzeichnis existiert"
 
-#: src/utilops.c:908
+#: src/utilops.c:942
 #, fuzzy, c-format
 msgid ""
 "Unable to create directory:\n"
 "%s"
 msgstr "Kann Verzeichnis nicht anlegen:\n"
 
-#: src/utilops.c:909
+#: src/utilops.c:943
 msgid "Error creating directory"
 msgstr "Fehler beim Anlegen von Verzeichnis"
 
-#: src/utilops.c:948
+#: src/utilops.c:982
 #, fuzzy, c-format
 msgid ""
 "Create directory in:\n"
@@ -764,11 +806,11 @@
 "named:"
 msgstr "Verzeichnis anlegen in:\n"
 
-#: src/utilops.c:949
+#: src/utilops.c:983
 msgid "GQview - new directory"
 msgstr "GQview - Neues Verzeichnis"
 
-#: src/utilops.c:949
+#: src/utilops.c:983
 msgid "Create"
 msgstr "Erzeugen"
 
@@ -776,6 +818,14 @@
 msgid "GQview Tools"
 msgstr "GQview-Werkzeuge"
 
+#, fuzzy
+#~ msgid ""
+#~ "Overwrite file:\n"
+#~ "%s\n"
+#~ "with:\n"
+#~ "%s"
+#~ msgstr "Datei überschreiben:\n"
+
 #~ msgid "Save"
 #~ msgstr "Speichern"
 

--- a/po/ja.po	Thu Apr 13 12:53:03 2000 +0000
+++ b/po/ja.po	Thu Apr 13 12:55:19 2000 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-27 03:05+0900\n"
+"POT-Creation-Date: 2000-04-06 19:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -14,371 +14,255 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: config.c:295
+#: src/config.c:303
 msgid "GQview configuration"
 msgstr "GQview¤ÎÀßÄê"
 
-#: config.c:307
+#: src/config.c:315
 msgid "Ok"
 msgstr "Ok"
 
-#: config.c:312
-msgid "Save"
-msgstr "¥»¡¼¥Ö"
+#: src/config.c:320
+msgid "Apply"
+msgstr ""
 
-#: config.c:317 utildlg.c:140 utilops.c:401 utilops.c:697 utilops.c:923
+#: src/config.c:325 src/utildlg.c:145 src/utilops.c:444 src/utilops.c:754
+#: src/utilops.c:885 src/utilops.c:983
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
-#: config.c:331
+#: src/config.c:339
 msgid "General"
 msgstr "°ìÈÌ"
 
-#: config.c:339
+#: src/config.c:347
 msgid "Initial directory"
 msgstr "½é´ü¥Ç¥£¥ì¥¯¥È¥ê:"
 
-#: config.c:349
+#: src/config.c:357
 msgid "On startup, change to this directory:"
 msgstr "µ¯Æ°»þ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø°ÜÆ°¤¹¤ë"
 
-#: config.c:361
+#: src/config.c:369
 msgid "Use current"
 msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê"
 
-#: config.c:367
+#: src/config.c:375
 msgid "Confirm file delete"
 msgstr "ºï½ü»þ¤Ë³Îǧ"
 
-#: config.c:369
-msgid "Save settings on exit"
-msgstr "½ªÎ»»þ¤ËÀßÄê¤òÊݸ¤¹¤ë"
-
-#: config.c:371
+#: src/config.c:377
 msgid "Remember tool state (float/hidden)"
 msgstr "¥Ä¡¼¥ë¥Ð¡¼¤Î¾õÂÖ¤òÊÝ»ý(float¤äÈóɽ¼¨)"
 
-#: config.c:373
+#: src/config.c:379
 msgid "Remember window positions"
 msgstr "¥¦¥£¥ó¥É¥¦°ÌÃÖ¤òÊÝ»ý"
 
-#: config.c:375
+#: src/config.c:381
 msgid "Slide show"
 msgstr "¥¹¥é¥¤¥É¥·¥ç¥¦:"
 
-#: config.c:388
+#: src/config.c:394
 msgid "Delay before image change (seconds):"
 msgstr "¼¡¤Î¥¤¥á¡¼¥¸¤Þ¤Ç¤ÎÉÿô"
 
-#: config.c:401
+#: src/config.c:407
 msgid "Random"
 msgstr "¥é¥ó¥À¥à"
 
-#: config.c:403
+#: src/config.c:409
 msgid "Repeat"
 msgstr "·«¤êÊÖ¤¹"
 
-#: config.c:410
+#: src/config.c:416
 msgid "Image"
 msgstr "¥¤¥á¡¼¥¸"
 
-#: config.c:418
+#: src/config.c:424
 msgid "When new image is selected:"
 msgstr "¤¢¤¿¤é¤·¤¤¥¤¥á¡¼¥¸¤¬ÁªÂò¤µ¤ì¤¿¤È¤­:"
 
-#: config.c:428
+#: src/config.c:434
 msgid "Zoom to original size"
 msgstr "¥ª¥ê¥¸¥Ê¥ë¤Î¥µ¥¤¥º¤Ø³ÈÂç"
 
-#: config.c:434 img-view.c:283 menu.c:464 menu.c:537 menu.c:578 menu.c:668
+#: src/config.c:440 src/img-view.c:290 src/menu.c:473 src/menu.c:547
+#: src/menu.c:587 src/menu.c:678
 msgid "Fit image to window"
 msgstr "¥¦¥£¥ó¥É¥¦¤Ë¥Õ¥£¥Ã¥È¤µ¤»¤ë"
 
-#: config.c:440
+#: src/config.c:446
 msgid "Leave Zoom at previous setting"
 msgstr "ľÁ°¤Î¥º¡¼¥à¤ÎÀßÄê¤ò˺¤ì¤ë"
 
-#: config.c:447
+#: src/config.c:453
 msgid "Fit window to image when tools are hidden/floating"
 msgstr "¥Ä¡¼¥ë¥Ð¡¼¤Î¾õÂÖÊѹ¹»þ¤Ë¥¤¥á¡¼¥¸¤ò¥¦¥£¥ó¥É¥¦¤Ë¥Õ¥£¥Ã¥È¤µ¤»¤ë"
 
-#: config.c:454
+#: src/config.c:460
 msgid "Limit size when auto-sizing window"
 msgstr "¥¦¥£¥ó¥É¥¦¤Î¼«Æ°Ä´Àá¤Î¸Â³¦"
 
-#: config.c:464 menu.c:468
+#: src/config.c:470 src/menu.c:477
 msgid "Thumbnails"
 msgstr "¥µ¥à¥Í¥¤¥ë:"
 
-#: config.c:480
+#: src/config.c:486
 msgid "Size:"
 msgstr "¥µ¥¤¥º"
 
-#: config.c:484
-msgid "48x48"
-msgstr ""
-
-#: config.c:490
-msgid "64x64"
-msgstr ""
-
-#: config.c:496
-msgid "85x64"
-msgstr ""
-
-#: config.c:502
-msgid "100x100"
-msgstr ""
-
-#: config.c:509
+#: src/config.c:515
 msgid "Cache thumbnails"
 msgstr "¥µ¥à¥Í¥¤¥ë¤ò¥­¥ã¥Ã¥·¥å¤¹¤ë"
 
-#: config.c:511
+#: src/config.c:517
 msgid "Use xvpics thumbnails when found (read only)"
 msgstr "xvpics¤¬¤¢¤ë»þ¤Ë»ÈÍѤ¹¤ë(Æɤ߹þ¤ß¤Î¤ß)"
 
-#: config.c:514
+#: src/config.c:520
 msgid "Progressive keyboard scrolling"
 msgstr "¥­¡¼¥Ü¡¼¥É¤Ë¤è¤ë¥¹¥¯¥í¡¼¥ë"
 
-#: config.c:521
+#: src/config.c:527
 msgid "Filtering"
 msgstr "¥Õ¥£¥ë¥¿¥ê¥ó¥°"
 
-#: config.c:530
+#: src/config.c:536
 msgid "Show entries that begin with a dot"
 msgstr "¥É¥Ã¥È¥Õ¥¡¥¤¥ë¤âɽ¼¨¤¹¤ë"
 
-#: config.c:532
+#: src/config.c:538
 msgid "Disable File Filtering"
 msgstr "¥Õ¥£¥ë¥¿¥ê¥ó¥°¤·¤Ê¤¤"
 
-#: config.c:534
+#: src/config.c:540
 msgid "Include files of type:"
 msgstr "ɽ¼¨¤¹¤ë³ÈÄ¥»Ò:"
 
-#: config.c:552
-msgid "JPG / JPEG"
-msgstr ""
-
-#: config.c:554
-msgid "XPM"
-msgstr ""
-
-#: config.c:556
-msgid "TIF / TIFF"
-msgstr ""
-
-#: config.c:563
-msgid "GIF"
-msgstr ""
-
-#: config.c:565
-msgid "PNG"
-msgstr ""
-
-#: config.c:567
-msgid "PPM"
-msgstr ""
-
-#: config.c:574
-msgid "PGM"
-msgstr ""
-
-#: config.c:576
-msgid "PCX"
-msgstr ""
-
-#: config.c:578
-msgid "BMP"
-msgstr ""
-
-#: config.c:584
+#: src/config.c:590
 msgid "Custom file types:"
 msgstr "¥«¥¹¥¿¥à¥¿¥¤¥×"
 
-#: config.c:597
+#: src/config.c:603
 msgid "format: [.foo;.bar]"
 msgstr "½ñ¼°: [.foo;.bar]"
 
-#: config.c:606
+#: src/config.c:612
 msgid "External Editors"
 msgstr "³°Éô¥¨¥Ç¥£¥¿"
 
-#: config.c:618
+#: src/config.c:624
 msgid "#"
 msgstr ""
 
-#: config.c:621
+#: src/config.c:627
 msgid "Menu name"
 msgstr "ɽ¼¨Ì¾"
 
-#: config.c:624
+#: src/config.c:630
 msgid "Command Line"
 msgstr "¥³¥Þ¥ó¥É"
 
-#: config.c:654 menu.c:490
+#: src/config.c:660 src/menu.c:500
 msgid "About"
 msgstr ""
 
-#: config.c:670
+#: src/config.c:676
 #, c-format
 msgid ""
-"GQview %d.%d.%d\n"
+"GQview %s\n"
 "\n"
-"Copyright (c) 1999 by John Ellis\n"
-"http://gqview.netpedia.net\n"
+"Copyright (c) 2000 by John Ellis\n"
+"http://gqview.sorceforge.net\n"
+"or http://gqview.netpedia.net\n"
 "[e-mail]\n"
 "\n"
 "Released under the GNU Public License"
 msgstr ""
 
-#: dnd.c:130
-#, c-format
-msgid "dropped: %s\n"
-msgstr ""
-
-#: filelist.c:51
+#: src/filelist.c:51
 msgid " Slideshow"
 msgstr "¥¹¥é¥¤¥É¥·¥ç¥¦"
 
-#: filelist.c:55
+#: src/filelist.c:55
 #, c-format
 msgid "%d files (%d)%s"
 msgstr ""
 
-#: filelist.c:57
+#: src/filelist.c:57
 #, c-format
 msgid "%d files%s"
 msgstr ""
 
-#: filelist.c:221
-#, c-format
-msgid "s = %d\n"
-msgstr ""
-
-#: filelist.c:225
-#, c-format
-msgid "files selected = %d\n"
-msgstr ""
-
-#: filelist.c:466
-#, c-format
-msgid "row = %d, closest is %d\n"
-msgstr ""
-
-#: filelist.c:959
+#: src/filelist.c:1025
 msgid "Loading thumbs..."
 msgstr ""
 
-#: image.c:50
-#, c-format
-msgid "%d :%s%d"
-msgstr ""
-
-#: image.c:65
+#: src/image.c:66
 #, c-format
 msgid "( ? x ? ) %d bytes"
 msgstr ""
 
-#: image.c:67
+#: src/image.c:68
 #, c-format
 msgid "( %d x %d ) %d bytes"
 msgstr ""
 
-#: image.c:127
-#, c-format
-msgid "auto sized to %d x %d\n"
-msgstr ""
-
-#: image.c:282
-#, c-format
-msgid "recalc %d x %d @ %f\n"
-msgstr ""
-
-#: image.c:411
-#, c-format
-msgid "redrawn %d x %d\n"
-msgstr ""
-
-#: image.c:417
-msgid "redraw cancelled\n"
-msgstr ""
-
-#: image.c:494
-#, c-format
-msgid "sized %d x %d (%d x %d)\n"
-msgstr ""
-
-#: image.c:700
-msgid "GQview - "
-msgstr ""
-
-#: img-main.c:230
+#: src/img-main.c:231
 msgid "GQview full screen"
 msgstr "GQview ¥Õ¥ë¥¹¥¯¥ê¡¼¥ó"
 
-#: img-view.c:153 window.c:82 window.c:418
-msgid "GQview"
-msgstr ""
-
-#: img-view.c:280 menu.c:461 menu.c:534 menu.c:574 menu.c:664
+#: src/img-view.c:287 src/menu.c:470 src/menu.c:544 src/menu.c:584
+#: src/menu.c:674
 msgid "Zoom in"
 msgstr "³ÈÂç"
 
-#: img-view.c:281 menu.c:462 menu.c:535 menu.c:576 menu.c:666
+#: src/img-view.c:288 src/menu.c:471 src/menu.c:545 src/menu.c:585
+#: src/menu.c:676
 msgid "Zoom out"
 msgstr "½Ì¾®"
 
-#: img-view.c:282 menu.c:463 menu.c:536 menu.c:577
+#: src/img-view.c:289 src/menu.c:472 src/menu.c:546 src/menu.c:586
 msgid "Zoom 1:1"
 msgstr "¸µ¤Î¥µ¥¤¥º"
 
-#: img-view.c:286 menu.c:448 menu.c:509 menu.c:540 menu.c:581
+#. edit menu
+#: src/img-view.c:293 src/menu.c:457 src/menu.c:519 src/menu.c:550
+#: src/menu.c:590
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: img-view.c:291 menu.c:437 menu.c:516 menu.c:547 menu.c:586
+#: src/img-view.c:298 src/menu.c:446 src/menu.c:526 src/menu.c:557
+#: src/menu.c:595
 msgid "Copy..."
 msgstr "¥³¥Ô¡¼..."
 
-#: img-view.c:292 menu.c:438 menu.c:517 menu.c:548 menu.c:587
+#: src/img-view.c:299 src/menu.c:447 src/menu.c:527 src/menu.c:558
+#: src/menu.c:596
 msgid "Move..."
 msgstr "°ÜÆ°..."
 
-#: img-view.c:293 menu.c:439 menu.c:518 menu.c:549 menu.c:588
+#: src/img-view.c:300 src/menu.c:448 src/menu.c:528 src/menu.c:559
+#: src/menu.c:597
 msgid "Rename..."
 msgstr "̾Á°¤ÎÊѹ¹..."
 
-#: img-view.c:294 menu.c:440 menu.c:519 menu.c:550 menu.c:589
+#: src/img-view.c:301 src/menu.c:449 src/menu.c:529 src/menu.c:560
+#: src/menu.c:598
 msgid "Delete..."
 msgstr "ºï½ü..."
 
-#: img-view.c:297
+#: src/img-view.c:304
 msgid "Close window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
 
-#: main.c:89
-#, c-format
-msgid "%s \"%s\" &"
-msgstr ""
-
-#: main.c:90 main.c:119
+#: src/main.c:90 src/main.c:119
 #, c-format
 msgid "GQview running: %s\n"
 msgstr ""
 
-#: main.c:300
-msgid "debugging output enabled\n"
-msgstr ""
-
-#: main.c:315
-#, c-format
-msgid "GQview version %d.%d.%d\n"
-msgstr ""
-
-#: main.c:316
+#: src/main.c:330
 msgid ""
 "Usage: gqview [options] [path]\n"
 "\n"
@@ -386,31 +270,45 @@
 "»È¤¤Êý: gqview [¥ª¥×¥·¥ç¥ó] [¥Ñ¥¹]\n"
 "\n"
 
-#: main.c:317
+#: src/main.c:331
 msgid "valid options are:\n"
 msgstr "¥ª¥×¥·¥ç¥ó:\n"
 
-#: main.c:318
-msgid "  +t, +tools                 force show of tools\n"
+#: src/main.c:332
+#, fuzzy
+msgid "  +t, --with-tools           force show of tools\n"
 msgstr "  +t, +tools                 ¥Ä¡¼¥ë¥Ð¡¼¤òɽ¼¨\n"
 
-#: main.c:319
-msgid "  -t, -tools                 force hide of tools\n"
+#: src/main.c:333
+#, fuzzy
+msgid "  -t, --without-tools        force hide of tools\n"
+msgstr "  -t, -tools                 ¥Ä¡¼¥ë¥Ð¡¼¤òÈóɽ¼¨\n"
+
+#: src/main.c:334
+#, fuzzy
+msgid "  -f, --fullscreen           start in full screen mode\n"
 msgstr "  -t, -tools                 ¥Ä¡¼¥ë¥Ð¡¼¤òÈóɽ¼¨\n"
 
-#: main.c:320
-msgid "  -debug                     turn on debug output\n"
+#: src/main.c:335
+#, fuzzy
+msgid "  -s, --slideshow            start in slideshow mode\n"
+msgstr "  -t, -tools                 ¥Ä¡¼¥ë¥Ð¡¼¤òÈóɽ¼¨\n"
+
+#: src/main.c:336
+#, fuzzy
+msgid "  --debug                    turn on debug output\n"
 msgstr "  -debug                     ¥Ç¥Ð¥Ã¥°ÍѤνÐÎϤòÍ­¸ú¤Ë¤¹¤ë\n"
 
-#: main.c:321
+#: src/main.c:337
+#, fuzzy
 msgid ""
-"  -help                      this message\n"
+"  -h, --help                 show this message\n"
 "\n"
 msgstr ""
 "  -help                      ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨\n"
 "\n"
 
-#: main.c:326
+#: src/main.c:342
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
@@ -419,437 +317,548 @@
 "%s¤ÏÉÔÌÀ¤Ç¤¹¡£\n"
 "¾Ü¤·¤¯¤Ï `gqview -help` ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: main.c:353
+#: src/main.c:369
 msgid "The Gimp"
 msgstr ""
 
-#: main.c:356
+#: src/main.c:372
 msgid "Electric Eyes"
 msgstr ""
 
-#: main.c:359
+#: src/main.c:375
 msgid "XV"
 msgstr ""
 
-#: main.c:362
+#: src/main.c:378
 msgid "Xpaint"
 msgstr ""
 
-#: menu.c:369
+#: src/menu.c:373
 #, c-format
 msgid "in %s..."
 msgstr ""
 
-#: menu.c:371
+#: src/menu.c:375
 msgid "in (unknown)..."
 msgstr ""
 
-#: menu.c:390
+#: src/menu.c:394
 msgid "Options..."
 msgstr "¥ª¥×¥·¥ç¥ó..."
 
-#: menu.c:391
-msgid "Save options"
-msgstr "ÀßÄê¤òÊݸ"
-
-#: menu.c:393
+#: src/menu.c:396
 msgid "Remove old thumbnails"
 msgstr "¸Å¤¤¥µ¥à¥Í¥¤¥ë¤òÇË´þ"
 
-#: menu.c:431
+#: src/menu.c:398 src/menu.c:410 src/menu.c:422
+msgid "Set as wallpaper"
+msgstr ""
+
+#. file menu
+#: src/menu.c:440
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: menu.c:435
+#: src/menu.c:444
 msgid "Create Dir..."
 msgstr "¥Ç¥£¥ì¥¯¥È¥êºîÀ®..."
 
-#: menu.c:442
+#: src/menu.c:451
 msgid "Exit"
 msgstr "½ªÎ»"
 
-#: menu.c:457
+#. view menu
+#: src/menu.c:466
 msgid "View"
 msgstr "¥Ó¥å¡¼"
 
-#: menu.c:467 menu.c:553
+#: src/menu.c:476 src/menu.c:563
 msgid "Full screen"
 msgstr "¥Õ¥ë¥¹¥¯¥ê¡¼¥ó"
 
-#: menu.c:469
-msgid "activate"
-msgstr ""
-
-#: menu.c:475
+#: src/menu.c:485
 msgid "Refresh Lists"
 msgstr "¥ê¥¹¥È¤Î¹¹¿·"
 
-#: menu.c:476
+#: src/menu.c:486
 msgid "(Un)Float file list"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò(Èó)¥Õ¥í¡¼¥È¤Ë¤¹¤ë"
 
-#: menu.c:477 menu.c:552
+#: src/menu.c:487 src/menu.c:562
 msgid "(Un)Hide file list"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò(Èó)ɽ¼¨¤Ë¤¹¤ë"
 
-#: menu.c:480
+#: src/menu.c:490
 msgid "Toggle slideshow"
 msgstr "¥¹¥é¥¤¥É¥·¥ç¥¦"
 
-#: menu.c:486
+#. help menu
+#: src/menu.c:496
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: menu.c:513 menu.c:544
+#: src/menu.c:523 src/menu.c:554
 msgid "View in new window"
 msgstr "¿·¤·¤¤¥¦¥£¥ó¥É¥¦¤Ç¤ß¤ë"
 
-#: menu.c:521
+#: src/menu.c:531
 msgid "Refresh"
 msgstr "¹¹¿·"
 
-#: menu.c:592
+#: src/menu.c:601
 msgid "Exit full screen"
 msgstr "¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¤ò¤ä¤á¤ë"
 
-#: menu.c:651
+#: src/menu.c:661
 msgid "Create thumbnails"
 msgstr "¥µ¥à¥Í¥¤¥ëºîÀ®"
 
-#: menu.c:660
+#: src/menu.c:670
 msgid "Change to home directory"
 msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ø°ÜÆ°"
 
-#: menu.c:662
+#: src/menu.c:672
 msgid "Refresh file list"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Î¹¹¿·"
 
-#: menu.c:670
+#: src/menu.c:680
 msgid "Set zoom 1:1"
 msgstr "¸µ¤Î¥µ¥¤¥º¤Ë¤¹¤ë"
 
-#: menu.c:672
+#: src/menu.c:682
 msgid "Configure options"
 msgstr "¥ª¥×¥·¥ç¥óÀßÄê"
 
-#: menu.c:674
+#: src/menu.c:684
 msgid "Float Controls"
 msgstr "¥³¥ó¥È¥í¡¼¥ë¤ò¥Õ¥í¡¼¥È¾õÂ֤ˤ¹¤ë"
 
-#: tabcomp.c:388
-msgid "Tab completion error: entry != NULL\n"
+#: src/rcfile.c:132
+#, c-format
+msgid "error saving config file: %s\n"
 msgstr ""
 
-#: thumb.c:32
-#, c-format
-msgid "Gen thumbnail:%s\n"
-msgstr "¥µ¥à¥Í¥¤¥ëºîÀ®:%s\n"
-
-#: thumb.c:40
-msgid "XV thumbnail found, loaded\n"
-msgstr "XV¤Î¥µ¥à¥Í¥¤¥ë¤ò¸«¤Ä¤±¤¿¤Î¤Ç¡¢Æɤ߹þ¤ß¤Þ¤·¤¿\n"
-
-#: thumb.c:54
-#, c-format
-msgid "Found in cache:%s\n"
-msgstr "¥­¥ã¥Ã¥·¥å¤ò¸«¤Ä¤±¤Þ¤·¤¿:%s\n"
-
-#: thumb.c:116
-#, c-format
-msgid "creating thumbnail dir:%s\n"
-msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥à¥Í¥¤¥ë¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£\n"
-
-#: thumb.c:118 thumb.c:142
+#: src/thumb.c:127 src/thumb.c:151
 #, c-format
 msgid "create dir failed: %s\n"
 msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Ç¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: thumb.c:140
-#, c-format
-msgid "creating sub dir:%s\n"
-msgstr "¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê%s¤Î¥µ¥à¥Í¥¤¥ë¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£\n"
-
-#: thumb.c:151
-#, c-format
-msgid "Saving thumb: %s\n"
-msgstr "¥µ¥à¥Í¥¤¥ë%s¤òÊݸ¤·¤Þ¤·¤¿¡£\n"
-
-#: thumb.c:186
-#, c-format
-msgid "maintainance check: %s\n"
-msgstr "%s¤ò¥á¥ó¥Æ¥Ê¥ó¥¹¤Î¤¿¤á¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤Þ¤¹¡£\n"
-
-#: thumb.c:222
-#, c-format
-msgid "Deleting thumb dir: %s\n"
-msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥à¥Í¥¤¥ë¤òºï½ü¤·¤Æ¤¤¤Þ¤¹¡£\n"
-
-#: thumb.c:224
+#: src/thumb.c:233
 #, c-format
 msgid "Unable to delete dir: %s\n"
 msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Çºï½ü¤Ë¼ºÇÔ¡£\n"
 
-#: thumb.c:238
-#, c-format
-msgid "Deleting thumb: %s\n"
-msgstr "¥µ¥à¥Í¥¤¥ë%s¤òºï½ü¤·¤Æ¤¤¤Þ¤¹¡£\n"
-
-#: thumb.c:240
+#: src/thumb.c:249
 #, c-format
 msgid "failed to delete:%s\n"
 msgstr "%s¤Îºï½ü¤Ë¼ºÇÔ\n"
 
-#: utildlg.c:67
+#: src/utildlg.c:68
 msgid "     Ok     "
 msgstr ""
 
-#: utilops.c:112 utilops.c:231
-msgid "copy"
-msgstr "¥³¥Ô¡¼"
+#: src/utilops.c:166
+msgid "Source to copy matches destination"
+msgstr ""
+
+#: src/utilops.c:167
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file:\n"
+"%s\n"
+"to itself."
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/utilops.c:171
+msgid "Source to move matches destination"
+msgstr ""
 
-#: utilops.c:114 utilops.c:233
-msgid "move"
-msgstr "°ÜÆ°"
+#: src/utilops.c:172
+#, fuzzy, c-format
+msgid ""
+"Unable to move file:\n"
+"%s\n"
+"to itself."
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: utilops.c:168 utilops.c:262 utilops.c:595 utilops.c:776
-msgid "Overwrite file:\n"
+#: src/utilops.c:175 src/utilops.c:231 src/utilops.c:516
+msgid "Continue"
+msgstr ""
+
+#: src/utilops.c:182
+#, fuzzy, c-format
+msgid ""
+"Overwrite file:\n"
+" %s\n"
+" with:\b %s"
 msgstr "¥Õ¥¡¥¤¥ë¤Î¾å½ñ¤­:\n"
 
-#: utilops.c:168 utilops.c:262 utilops.c:776
-msgid ""
-"\n"
-" with:\n"
-msgstr ""
-"\n"
-"¤ò...\n"
-
-#: utilops.c:169 utilops.c:263 utilops.c:596 utilops.c:777
+#: src/utilops.c:183 src/utilops.c:289 src/utilops.c:651 src/utilops.c:835
 msgid "Overwrite file"
 msgstr "¥Õ¥¡¥¤¥ë¤Î¾å½ñ¤­"
 
-#: utilops.c:170
+#: src/utilops.c:186
 msgid "Skip"
 msgstr "¥¹¥­¥Ã¥×"
 
-#: utilops.c:171
+#: src/utilops.c:187
 msgid "Yes to all"
 msgstr "¤¹¤Ù¤Æ¤Ï¤¤"
 
-#: utilops.c:172
+#: src/utilops.c:188
 msgid "Yes"
 msgstr "¤Ï¤¤"
 
-#: utilops.c:202 utilops.c:285
-msgid "Error "
-msgstr "¥¨¥é¡¼"
-
-#: utilops.c:202
-msgid "ing file"
-msgstr ""
-
-#: utilops.c:203 utilops.c:286
-msgid "Unable to "
+#: src/utilops.c:222 src/utilops.c:317
+msgid "Error copying file"
 msgstr ""
 
-#: utilops.c:203 utilops.c:286 utilops.c:397
-msgid " file:\n"
+#: src/utilops.c:223
+#, c-format
+msgid ""
+"Unable to copy file:\n"
+"%sto:\n"
+"%s\n"
+" during multiple file copy."
 msgstr ""
 
-#: utilops.c:203 utilops.c:286 utilops.c:606 utilops.c:786
-msgid ""
-"\n"
-" to:\n"
+#: src/utilops.c:227 src/utilops.c:322
+msgid "Error moving file"
 msgstr ""
 
-#: utilops.c:203
+#: src/utilops.c:228
+#, c-format
 msgid ""
-"\n"
+"Unable to move file:\n"
+"%sto:\n"
+"%s\n"
 " during multiple file move."
 msgstr ""
 
-#: utilops.c:205 utilops.c:461
-msgid "Continue"
+#: src/utilops.c:282
+msgid "Source matches destination"
+msgstr ""
+
+#: src/utilops.c:283
+msgid "Source and destination are the same, operation cancelled."
 msgstr ""
 
-#: utilops.c:264 utilops.c:597 utilops.c:778
+#: src/utilops.c:288
+#, fuzzy, c-format
+msgid ""
+"Overwrite file:\n"
+"%s\n"
+" with:\n"
+"%s"
+msgstr "¥Õ¥¡¥¤¥ë¤Î¾å½ñ¤­:\n"
+
+#: src/utilops.c:292 src/utilops.c:654 src/utilops.c:838
 msgid "Overwrite"
 msgstr ""
 
-#: utilops.c:328
+#: src/utilops.c:318
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file:\n"
+"%s\n"
+"to:\n"
+"%s"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/utilops.c:323
+#, fuzzy, c-format
+msgid ""
+"Unable to move file:\n"
+"%s\n"
+"to:\n"
+"%s"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/utilops.c:367
 msgid "Invalid destination"
 msgstr ""
 
-#: utilops.c:328
+#: src/utilops.c:367
 msgid ""
 "When operating with multiple files, please select\n"
 " a directory, not file."
 msgstr ""
 
-#: utilops.c:330
+#: src/utilops.c:369
 msgid "Invalid directory"
 msgstr ""
 
-#: utilops.c:330
+#: src/utilops.c:369
 msgid "Please select an existing directory"
 msgstr ""
 
-#: utilops.c:387
+#: src/utilops.c:427
 msgid "GQview - copy"
 msgstr ""
 
-#: utilops.c:388
+#: src/utilops.c:428
 msgid "Copy"
 msgstr ""
 
-#: utilops.c:392
+#: src/utilops.c:430
+#, c-format
+msgid ""
+"Copy file:\n"
+"%s\n"
+"to:"
+msgstr ""
+
+#: src/utilops.c:432
+#, c-format
+msgid ""
+"Copy multiple files from:\n"
+"%s\n"
+"to:"
+msgstr ""
+
+#: src/utilops.c:436
 msgid "GQview - move"
 msgstr ""
 
-#: utilops.c:393
+#: src/utilops.c:437
 msgid "Move"
 msgstr ""
 
-#: utilops.c:397 utilops.c:399
+#: src/utilops.c:439
+#, c-format
 msgid ""
-"\n"
+"Move file:\n"
+"%s\n"
 "to:"
 msgstr ""
 
-#: utilops.c:399
-msgid " multiple files from:\n"
-msgstr ""
-
-#: utilops.c:459 utilops.c:465 utilops.c:510
-msgid "Unable to delete file:\n"
+#: src/utilops.c:441
+#, c-format
+msgid ""
+"Move multiple files from:\n"
+"%s\n"
+"to:"
 msgstr ""
 
-#: utilops.c:459
+#: src/utilops.c:514
+#, c-format
 msgid ""
-"\n"
-"Continue multiple delete operation?"
+"Unable to delete file:\n"
+" %s\n"
+" Continue multiple delete operation?"
 msgstr ""
 
-#: utilops.c:460 utilops.c:466
+#: src/utilops.c:515 src/utilops.c:521
 msgid "Delete failed"
 msgstr ""
 
-#: utilops.c:495
+#: src/utilops.c:520 src/utilops.c:565
+#, fuzzy, c-format
+msgid ""
+"Unable to delete file:\n"
+"%s"
+msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Çºï½ü¤Ë¼ºÇÔ¡£\n"
+
+#: src/utilops.c:550
 msgid "Delete files"
 msgstr ""
 
-#: utilops.c:495
+#: src/utilops.c:550
 msgid "About to delete multiple files..."
 msgstr ""
 
-#: utilops.c:496 utilops.c:541
+#: src/utilops.c:551 src/utilops.c:596
 msgid "Delete"
 msgstr ""
 
-#: utilops.c:511
+#: src/utilops.c:566
 msgid "File deletion failed"
 msgstr ""
 
-#: utilops.c:539
-msgid "About to delete the file:\n"
-msgstr ""
+#: src/utilops.c:594
+#, fuzzy, c-format
+msgid ""
+"About to delete the file:\n"
+" %s"
+msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Çºï½ü¤Ë¼ºÇÔ¡£\n"
 
-#: utilops.c:540
+#: src/utilops.c:595
 msgid "Delete file"
 msgstr ""
 
-#: utilops.c:595
+#: src/utilops.c:650 src/utilops.c:834
+#, fuzzy, c-format
 msgid ""
-"\n"
-" by renaming:\n"
-msgstr ""
+"Overwrite file:\n"
+"%s\n"
+"by renaming:\n"
+"%s"
+msgstr "¥Õ¥¡¥¤¥ë¤Î¾å½ñ¤­:\n"
 
-#: utilops.c:606 utilops.c:786
-msgid "Unable to rename file:\n"
-msgstr ""
+#: src/utilops.c:663
+#, fuzzy, c-format
+msgid ""
+"Unable to rename file:\n"
+"%s\n"
+" to:\n"
+"%s"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: utilops.c:607 utilops.c:787
+#: src/utilops.c:664 src/utilops.c:847
 msgid "Error renaming file"
 msgstr ""
 
-#: utilops.c:624
-#, c-format
-msgid "r=%d n=%d\n"
-msgstr ""
-
-#: utilops.c:640
-#, c-format
-msgid "closed by #%d\n"
-msgstr ""
-
-#: utilops.c:697 utilops.c:825
+#: src/utilops.c:754 src/utilops.c:885
 msgid "GQview - rename"
 msgstr ""
 
-#: utilops.c:697
+#: src/utilops.c:754
 msgid "Rename multiple files:"
 msgstr ""
 
-#: utilops.c:697
+#: src/utilops.c:754 src/utilops.c:885
 msgid "Rename"
 msgstr ""
 
-#: utilops.c:732
+#: src/utilops.c:790
 msgid "Rename:"
 msgstr ""
 
-#: utilops.c:741
+#: src/utilops.c:799
 msgid "to:"
 msgstr ""
 
-#: utilops.c:824
-msgid "Rename file:\n"
+#: src/utilops.c:846
+#, fuzzy, c-format
+msgid ""
+"Unable to rename file:\n"
+"%s\n"
+"to:\n"
+"%s"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/utilops.c:884
+#, c-format
+msgid ""
+"Rename file:\n"
+"%s\n"
+"to:"
 msgstr ""
 
-#: utilops.c:824
+#: src/utilops.c:928
+#, c-format
 msgid ""
-"\n"
-" to:"
-msgstr ""
-
-#: utilops.c:868
-msgid "The path:\n"
-msgstr ""
-
-#: utilops.c:868
-msgid ""
-"\n"
-" already exists as a file."
+"The path:\n"
+"%s\n"
+"already exists as a file."
 msgstr ""
 
-#: utilops.c:874
-msgid "The directory:\n"
+#: src/utilops.c:929
+#, fuzzy
+msgid "Could not create directory"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/utilops.c:934
+#, c-format
+msgid ""
+"The directory:\n"
+"%s\n"
+"already exists."
 msgstr ""
 
-#: utilops.c:874
-msgid ""
-"\n"
-" already exists."
+#: src/utilops.c:935
+msgid "Directory exists"
 msgstr ""
 
-#: utilops.c:882
-msgid "Unable to create directory:\n"
+#: src/utilops.c:942
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory:\n"
+"%s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: utilops.c:922
-msgid "Create directory in:\n"
+#: src/utilops.c:943
+#, fuzzy
+msgid "Error creating directory"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/utilops.c:982
+#, fuzzy, c-format
+msgid ""
+"Create directory in:\n"
+"%s\n"
+"named:"
 msgstr "¥Ç¥£¥ì¥¯¥È¥êºîÀ®\n"
 
-#: utilops.c:922
-msgid ""
-"\n"
-" named:"
-msgstr ""
-
-#: utilops.c:923
+#: src/utilops.c:983
 msgid "GQview - new directory"
 msgstr "GQview - ¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê"
 
-#: utilops.c:923
+#: src/utilops.c:983
 msgid "Create"
 msgstr "ºîÀ®"
 
+#: src/window.c:151
+#, fuzzy
+msgid "GQview Tools"
+msgstr "GQview ¥Õ¥ë¥¹¥¯¥ê¡¼¥ó"
+
+#, fuzzy
+#~ msgid ""
+#~ "Overwrite file:\n"
+#~ "%s\n"
+#~ "with:\n"
+#~ "%s"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤Î¾å½ñ¤­:\n"
+
+#~ msgid "Save"
+#~ msgstr "¥»¡¼¥Ö"
+
+#~ msgid "Save settings on exit"
+#~ msgstr "½ªÎ»»þ¤ËÀßÄê¤òÊݸ¤¹¤ë"
+
+#~ msgid "Save options"
+#~ msgstr "ÀßÄê¤òÊݸ"
+
+#~ msgid "Gen thumbnail:%s\n"
+#~ msgstr "¥µ¥à¥Í¥¤¥ëºîÀ®:%s\n"
+
+#~ msgid "XV thumbnail found, loaded\n"
+#~ msgstr "XV¤Î¥µ¥à¥Í¥¤¥ë¤ò¸«¤Ä¤±¤¿¤Î¤Ç¡¢Æɤ߹þ¤ß¤Þ¤·¤¿\n"
+
+#~ msgid "Found in cache:%s\n"
+#~ msgstr "¥­¥ã¥Ã¥·¥å¤ò¸«¤Ä¤±¤Þ¤·¤¿:%s\n"
+
+#~ msgid "creating thumbnail dir:%s\n"
+#~ msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥à¥Í¥¤¥ë¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£\n"
+
+#~ msgid "creating sub dir:%s\n"
+#~ msgstr "¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê%s¤Î¥µ¥à¥Í¥¤¥ë¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£\n"
+
+#~ msgid "Saving thumb: %s\n"
+#~ msgstr "¥µ¥à¥Í¥¤¥ë%s¤òÊݸ¤·¤Þ¤·¤¿¡£\n"
+
+#~ msgid "maintainance check: %s\n"
+#~ msgstr "%s¤ò¥á¥ó¥Æ¥Ê¥ó¥¹¤Î¤¿¤á¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤Þ¤¹¡£\n"
+
+#~ msgid "Deleting thumb dir: %s\n"
+#~ msgstr "%s¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥à¥Í¥¤¥ë¤òºï½ü¤·¤Æ¤¤¤Þ¤¹¡£\n"
+
+#~ msgid "Deleting thumb: %s\n"
+#~ msgstr "¥µ¥à¥Í¥¤¥ë%s¤òºï½ü¤·¤Æ¤¤¤Þ¤¹¡£\n"
+
+#~ msgid "copy"
+#~ msgstr "¥³¥Ô¡¼"
+
+#~ msgid "move"
+#~ msgstr "°ÜÆ°"
+
+#~ msgid ""
+#~ "\n"
+#~ " with:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "¤ò...\n"
+
+#~ msgid "Error "
+#~ msgstr "¥¨¥é¡¼"

--- a/po/pt_BR.po	Thu Apr 13 12:53:03 2000 +0000
+++ b/po/pt_BR.po	Thu Apr 13 12:55:19 2000 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gqview-0.7.0c\n"
-"POT-Creation-Date: 1999-09-15 15:22-0300\n"
+"POT-Creation-Date: 2000-04-06 19:03-0400\n"
 "PO-Revision-Date: 1999-09-15 16:47-0300\n"
 "Last-Translator: Vitor Fernandes <[e-mail]>\n"
 "Language-Team: Vitor Fernandes <[e-mail]>\n"
@@ -13,7 +13,6 @@
 "Content-Type: text/plain; charset=3Diso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-
 #: src/config.c:303
 msgid "GQview configuration"
 msgstr "Configura=E7=E3o do GQview"
@@ -26,8 +25,8 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/config.c:325 src/utildlg.c:140 src/utilops.c:414 src/utilops.c:722
-#: src/utilops.c:851 src/utilops.c:949
+#: src/config.c:325 src/utildlg.c:145 src/utilops.c:444 src/utilops.c:754
+#: src/utilops.c:885 src/utilops.c:983
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -87,8 +86,8 @@
 msgid "Zoom to original size"
 msgstr "Zoom para o tamanho original"
 
-#: src/config.c:440 src/img-view.c:283 src/menu.c:458 src/menu.c:531
-#: src/menu.c:571 src/menu.c:661
+#: src/config.c:440 src/img-view.c:290 src/menu.c:473 src/menu.c:547
+#: src/menu.c:587 src/menu.c:678
 msgid "Fit image to window"
 msgstr "Ajustar imagem =E0 janela"
 
@@ -98,13 +97,15 @@
 
 #: src/config.c:453
 msgid "Fit window to image when tools are hidden/floating"
-msgstr "Ajustar janela =E0 imagem quando as ferramentas estiverem escondidas/flutuando"
+msgstr ""
+"Ajustar janela =E0 imagem quando as ferramentas estiverem "
+"escondidas/flutuando"
 
 #: src/config.c:460
 msgid "Limit size when auto-sizing window"
 msgstr "Limitar tamanho quando auto-dimensionando janela"
 
-#: src/config.c:470 src/menu.c:462
+#: src/config.c:470 src/menu.c:477
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
@@ -164,16 +165,18 @@
 msgid "Command Line"
 msgstr "Linha do comando"
 
-#: src/config.c:660 src/menu.c:484
+#: src/config.c:660 src/menu.c:500
 msgid "About"
 msgstr "Sobre"
 
 #: src/config.c:676
+#, fuzzy, c-format
 msgid ""
 "GQview %s\n"
 "\n"
-"Copyright (c) 1999 by John Ellis\n"
-"http://gqview.netpedia.net\n"
+"Copyright (c) 2000 by John Ellis\n"
+"http://gqview.sorceforge.net\n"
+"or http://gqview.netpedia.net\n"
 "[e-mail]\n"
 "\n"
 "Released under the GNU Public License"
@@ -191,72 +194,83 @@
 msgstr "Show de Slides"
 
 #: src/filelist.c:55
+#, c-format
 msgid "%d files (%d)%s"
 msgstr "%d arquivos (%d)%s"
 
 #: src/filelist.c:57
+#, c-format
 msgid "%d files%s"
 msgstr "%d arquivos%s"
 
-#: src/filelist.c:960
+#: src/filelist.c:1025
 msgid "Loading thumbs..."
 msgstr "Carregando mini..."
 
-#: src/image.c:65
+#: src/image.c:66
+#, c-format
 msgid "( ? x ? ) %d bytes"
 msgstr ""
 
-#: src/image.c:67
+#: src/image.c:68
+#, c-format
 msgid "( %d x %d ) %d bytes"
 msgstr ""
 
-#: src/img-main.c:230
+#: src/img-main.c:231
 msgid "GQview full screen"
 msgstr "GQview tela cheia"
 
-#: src/img-view.c:280 src/menu.c:455 src/menu.c:528 src/menu.c:568
-#: src/menu.c:657
+#: src/img-view.c:287 src/menu.c:470 src/menu.c:544 src/menu.c:584
+#: src/menu.c:674
 msgid "Zoom in"
 msgstr "Mais Zoom"
 
-#: src/img-view.c:281 src/menu.c:456 src/menu.c:529 src/menu.c:569 src/menu.c:659
+#: src/img-view.c:288 src/menu.c:471 src/menu.c:545 src/menu.c:585
+#: src/menu.c:676
 msgid "Zoom out"
 msgstr "Menos Zoom"
 
-#: src/img-view.c:282 src/menu.c:457 src/menu.c:530 src/menu.c:570
+#: src/img-view.c:289 src/menu.c:472 src/menu.c:546 src/menu.c:586
 msgid "Zoom 1:1"
 msgstr ""
 
 #. edit menu
-#: src/img-view.c:286 src/menu.c:442 src/menu.c:503 src/menu.c:534 src/menu.c:574
+#: src/img-view.c:293 src/menu.c:457 src/menu.c:519 src/menu.c:550
+#: src/menu.c:590
 msgid "Edit"
 msgstr "Editar"
 
-#: src/img-view.c:291 src/menu.c:431 src/menu.c:510 src/menu.c:541 src/menu.c:579
+#: src/img-view.c:298 src/menu.c:446 src/menu.c:526 src/menu.c:557
+#: src/menu.c:595
 msgid "Copy..."
 msgstr "Copiar..."
 
-#: src/img-view.c:292 src/menu.c:432 src/menu.c:511 src/menu.c:542 src/menu.c:580
+#: src/img-view.c:299 src/menu.c:447 src/menu.c:527 src/menu.c:558
+#: src/menu.c:596
 msgid "Move..."
 msgstr "Mover..."
 
-#: src/img-view.c:293 src/menu.c:433 src/menu.c:512 src/menu.c:543 src/menu.c:581
+#: src/img-view.c:300 src/menu.c:448 src/menu.c:528 src/menu.c:559
+#: src/menu.c:597
 msgid "Rename..."
 msgstr "Renomear..."
 
-#: src/img-view.c:294 src/menu.c:434 src/menu.c:513 src/menu.c:544 src/menu.c:582
+#: src/img-view.c:301 src/menu.c:449 src/menu.c:529 src/menu.c:560
+#: src/menu.c:598
 msgid "Delete..."
 msgstr "Excluir..."
 
-#: src/img-view.c:297
+#: src/img-view.c:304
 msgid "Close window"
 msgstr "Fechar janela"
 
 #: src/main.c:90 src/main.c:119
+#, c-format
 msgid "GQview running: %s\n"
 msgstr "GQview rodando: %s\n"
 
-#: src/main.c:316
+#: src/main.c:330
 msgid ""
 "Usage: gqview [options] [path]\n"
 "\n"
@@ -264,167 +278,231 @@
 "Uso: gqview [op=E7=F5es] [caminho]\n"
 "\n"
 
-#: src/main.c:317
+#: src/main.c:331
 msgid "valid options are:\n"
 msgstr "op=E7=F5es v=E1lidas s=E3o:\n"
 
-#: src/main.c:318
-msgid "  +t, +tools                 force show of tools\n"
-msgstr "  +t, +tools			for=E7a a exibir as ferramentas\n"
+#: src/main.c:332
+#, fuzzy
+msgid "  +t, --with-tools           force show of tools\n"
+msgstr "  +t, +tools\t\t\tfor=E7a a exibir as ferramentas\n"
 
-#: src/main.c:319
-msgid "  -t, -tools                 force hide of tools\n"
-msgstr "  -t, -tools			for=E7a a olcultar as ferramentas\n"
+#: src/main.c:333
+#, fuzzy
+msgid "  -t, --without-tools        force hide of tools\n"
+msgstr "  -t, -tools\t\t\tfor=E7a a olcultar as ferramentas\n"
+
+#: src/main.c:334
+#, fuzzy
+msgid "  -f, --fullscreen           start in full screen mode\n"
+msgstr "  -t, -tools\t\t\tfor=E7a a olcultar as ferramentas\n"
 
-#: src/main.c:320
-msgid "  -debug                     turn on debug output\n"
-msgstr "  -debug			ativa sa=EDda de debug\n"
+#: src/main.c:335
+#, fuzzy
+msgid "  -s, --slideshow            start in slideshow mode\n"
+msgstr "  -t, -tools\t\t\tfor=E7a a olcultar as ferramentas\n"
 
-#: src/main.c:321
+#: src/main.c:336
+#, fuzzy
+msgid "  --debug                    turn on debug output\n"
+msgstr "  -debug\t\t\tativa sa=EDda de debug\n"
+
+#: src/main.c:337
+#, fuzzy
 msgid ""
-"  -help                      this message\n"
+"  -h, --help                 show this message\n"
 "\n"
 msgstr ""
-"  -help                      		essa mensagem\n"
+"  -help                      \t\tessa mensagem\n"
 "\n"
-#: src/main.c:326
+
+#: src/main.c:342
+#, c-format
 msgid ""
 "invalid or ignored: %s\n"
 "Use -help for options\n"
 msgstr ""
 "inv=E1lido ou ignorado: %s\n"
 "Use -help para op=E7=F5es\n"
-#: src/main.c:353
+
+#: src/main.c:369
 msgid "The Gimp"
 msgstr ""
 
-#: src/main.c:356
+#: src/main.c:372
 msgid "Electric Eyes"
 msgstr ""
 
-#: src/main.c:359
+#: src/main.c:375
 msgid "XV"
 msgstr ""
 
-#: src/main.c:362
+#: src/main.c:378
 msgid "Xpaint"
 msgstr ""
 
-#: src/menu.c:364
+#: src/menu.c:373
+#, c-format
 msgid "in %s..."
 msgstr "em %s..."
 
-#: src/menu.c:366
+#: src/menu.c:375
 msgid "in (unknown)..."
 msgstr "em (desconhecido)..."
 
-#: src/menu.c:385
+#: src/menu.c:394
 msgid "Options..."
 msgstr "Op=E7=F5es..."
 
-#: src/menu.c:387
+#: src/menu.c:396
 msgid "Remove old thumbnails"
 msgstr "Remover miniaturas velhas"
 
+#: src/menu.c:398 src/menu.c:410 src/menu.c:422
+msgid "Set as wallpaper"
+msgstr ""
+
 #. file menu
-#: src/menu.c:425
+#: src/menu.c:440
 msgid "File"
 msgstr "Arquivo"
 
-#: src/menu.c:429
+#: src/menu.c:444
 msgid "Create Dir..."
 msgstr "Criar diret=F3rio..."
 
-#: src/menu.c:436
+#: src/menu.c:451
 msgid "Exit"
 msgstr "Sair"
 
 #. view menu
-#: src/menu.c:451
+#: src/menu.c:466
 msgid "View"
 msgstr "Ver"
 
-#: src/menu.c:461 src/menu.c:547
+#: src/menu.c:476 src/menu.c:563
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/menu.c:469
+#: src/menu.c:485
 msgid "Refresh Lists"
 msgstr "Atualizar Listas"
 
-#: src/menu.c:470
+#: src/menu.c:486
 msgid "(Un)Float file list"
 msgstr "(Des)Flutuar lista de arquivos"
 
-#: src/menu.c:471 src/menu.c:546
+#: src/menu.c:487 src/menu.c:562
 msgid "(Un)Hide file list"
 msgstr "(Des)Esconder lista de arquivos"
 
-#: src/menu.c:474
+#: src/menu.c:490
 msgid "Toggle slideshow"
 msgstr "Alternar show de slides"
 
-#: src/menu.c:480
+#. help menu
+#: src/menu.c:496
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/menu.c:507 src/menu.c:538
+#: src/menu.c:523 src/menu.c:554
 msgid "View in new window"
 msgstr "Ver em nova janela"
 
-#: src/menu.c:515
+#: src/menu.c:531
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/menu.c:585
+#: src/menu.c:601
 msgid "Exit full screen"
 msgstr "Sair da tela cheia"
 
-#: src/menu.c:644
+#: src/menu.c:661
 msgid "Create thumbnails"
 msgstr "Criar miniaturas"
 
-#: src/menu.c:653
+#: src/menu.c:670
 msgid "Change to home directory"
 msgstr "Mudar para diret=F3rio pessoal"
 
-#: src/menu.c:655
+#: src/menu.c:672
 msgid "Refresh file list"
 msgstr "Atualizar lista de arquivos"
 
-#: src/menu.c:663
+#: src/menu.c:680
 msgid "Set zoom 1:1"
 msgstr "Deixar zoom em 1:1"
 
-#: src/menu.c:665
+#: src/menu.c:682
 msgid "Configure options"
 msgstr "Configurar op=E7=F5es"
 
-#: src/menu.c:667
+#: src/menu.c:684
 msgid "Float Controls"
 msgstr "Controles Flutuantes"
 
 #: src/rcfile.c:132
+#, c-format
 msgid "error saving config file: %s\n"
 msgstr "erro salvando arquivo de configura=E7=E3o: %s\n"
 
 #: src/thumb.c:127 src/thumb.c:151
+#, c-format
 msgid "create dir failed: %s\n"
 msgstr "falha ao criar diret=F3rio: %s\n"
 
 #: src/thumb.c:233
+#, c-format
 msgid "Unable to delete dir: %s\n"
 msgstr "Incapaz de excluir diret=F3rio: %s\n"
 
 #: src/thumb.c:249
+#, c-format
 msgid "failed to delete:%s\n"
 msgstr "falha ao excluir: %s\n"
 
-#: src/utildlg.c:67
+#: src/utildlg.c:68
 msgid "     Ok     "
 msgstr "     OK     "
 
-#: src/utilops.c:162
+#: src/utilops.c:166
+msgid "Source to copy matches destination"
+msgstr ""
+
+#: src/utilops.c:167
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file:\n"
+"%s\n"
+"to itself."
+msgstr ""
+"Incapaz de copiar arquivo:\n"
+"%s\n"
+"para:\n"
+"%s"
+
+#: src/utilops.c:171
+msgid "Source to move matches destination"
+msgstr ""
+
+#: src/utilops.c:172
+#, fuzzy, c-format
+msgid ""
+"Unable to move file:\n"
+"%s\n"
+"to itself."
+msgstr ""
+"Incapaz de mover arquivo:\n"
+"%s\n"
+"para:\n"
+"%s"
+
+#: src/utilops.c:175 src/utilops.c:231 src/utilops.c:516
+msgid "Continue"
+msgstr "Continuar"
+
+#: src/utilops.c:182
+#, c-format
 msgid ""
 "Overwrite file:\n"
 " %s\n"
@@ -434,27 +512,28 @@
 " %s\n"
 " com:\b %s"
 
-#: src/utilops.c:163 src/utilops.c:262 src/utilops.c:621 src/utilops.c:803
+#: src/utilops.c:183 src/utilops.c:289 src/utilops.c:651 src/utilops.c:835
 msgid "Overwrite file"
 msgstr "Sobescrever arquivo"
 
-#: src/utilops.c:164
+#: src/utilops.c:186
 msgid "Skip"
 msgstr "Saltar"
 
-#: src/utilops.c:165
+#: src/utilops.c:187
 msgid "Yes to all"
 msgstr "Sim para todos"
 
-#: src/utilops.c:166
+#: src/utilops.c:188
 msgid "Yes"
 msgstr "Sim"
 
-#: src/utilops.c:200 src/utilops.c:288
+#: src/utilops.c:222 src/utilops.c:317
 msgid "Error copying file"
 msgstr "Erro copiando arquivo"
 
-#: src/utilops.c:201
+#: src/utilops.c:223
+#, c-format
 msgid ""
 "Unable to copy file:\n"
 "%sto:\n"
@@ -466,11 +545,12 @@
 "%s\n"
 " durante c=F3pia m=FAltipla de arquivos."
 
-#: src/utilops.c:205 src/utilops.c:293
+#: src/utilops.c:227 src/utilops.c:322
 msgid "Error moving file"
 msgstr "Erro movendo arquivo"
 
-#: src/utilops.c:206
+#: src/utilops.c:228
+#, c-format
 msgid ""
 "Unable to move file:\n"
 "%sto:\n"
@@ -482,11 +562,16 @@
 "%s\n"
 " durante movimento m=FAltiplo de arquivos."
 
-#: src/utilops.c:209 src/utilops.c:486
-msgid "Continue"
-msgstr "Continuar"
+#: src/utilops.c:282
+msgid "Source matches destination"
+msgstr ""
 
-#: src/utilops.c:261
+#: src/utilops.c:283
+msgid "Source and destination are the same, operation cancelled."
+msgstr ""
+
+#: src/utilops.c:288
+#, c-format
 msgid ""
 "Overwrite file:\n"
 "%s\n"
@@ -498,11 +583,12 @@
 " com:\n"
 "%s"
 
-#: src/utilops.c:263 src/utilops.c:622 src/utilops.c:804
+#: src/utilops.c:292 src/utilops.c:654 src/utilops.c:838
 msgid "Overwrite"
 msgstr "Sobescrever"
 
-#: src/utilops.c:289
+#: src/utilops.c:318
+#, c-format
 msgid ""
 "Unable to copy file:\n"
 "%s\n"
@@ -514,7 +600,8 @@
 "para:\n"
 "%s"
 
-#: src/utilops.c:294
+#: src/utilops.c:323
+#, c-format
 msgid ""
 "Unable to move file:\n"
 "%s\n"
@@ -526,11 +613,11 @@
 "para:\n"
 "%s"
 
-#: src/utilops.c:337
+#: src/utilops.c:367
 msgid "Invalid destination"
 msgstr "Destino inv=E1lido"
 
-#: src/utilops.c:337
+#: src/utilops.c:367
 msgid ""
 "When operating with multiple files, please select\n"
 " a directory, not file."
@@ -538,23 +625,24 @@
 "Quando operando com v=E1rios arquivos, por favor selecione\n"
 " um diret=F3rio, n=E3o arquivo."
 
-#: src/utilops.c:339
+#: src/utilops.c:369
 msgid "Invalid directory"
 msgstr "Diret=F3rio inv=E1lido"
 
-#: src/utilops.c:339
+#: src/utilops.c:369
 msgid "Please select an existing directory"
 msgstr "Por favor selecione um diret=F3rio existente"
 
-#: src/utilops.c:397
+#: src/utilops.c:427
 msgid "GQview - copy"
 msgstr "GQview - copiar"
 
-#: src/utilops.c:398
+#: src/utilops.c:428
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/utilops.c:400
+#: src/utilops.c:430
+#, c-format
 msgid ""
 "Copy file:\n"
 "%s\n"
@@ -564,7 +652,8 @@
 "%s\n"
 "para:"
 
-#: src/utilops.c:402
+#: src/utilops.c:432
+#, c-format
 msgid ""
 "Copy multiple files from:\n"
 "%s\n"
@@ -574,15 +663,16 @@
 "%s\n"
 "para:"
 
-#: src/utilops.c:406
+#: src/utilops.c:436
 msgid "GQview - move"
 msgstr "GQview - mover"
 
-#: src/utilops.c:407
+#: src/utilops.c:437
 msgid "Move"
 msgstr "Mover"
 
-#: src/utilops.c:409
+#: src/utilops.c:439
+#, c-format
 msgid ""
 "Move file:\n"
 "%s\n"
@@ -592,7 +682,8 @@
 "%s\n"
 "para:"
 
-#: src/utilops.c:411
+#: src/utilops.c:441
+#, c-format
 msgid ""
 "Move multiple files from:\n"
 "%s\n"
@@ -602,7 +693,8 @@
 "%s\n"
 "para:"
 
-#: src/utilops.c:484
+#: src/utilops.c:514
+#, c-format
 msgid ""
 "Unable to delete file:\n"
 " %s\n"
@@ -612,11 +704,12 @@
 " %s\n"
 " Continuar opera=E7=E3o de exclus=E3o multipla ?"
 
-#: src/utilops.c:485 src/utilops.c:491
+#: src/utilops.c:515 src/utilops.c:521
 msgid "Delete failed"
 msgstr "Falha ao excluir"
 
-#: src/utilops.c:490 src/utilops.c:535
+#: src/utilops.c:520 src/utilops.c:565
+#, c-format
 msgid ""
 "Unable to delete file:\n"
 "%s"
@@ -624,23 +717,24 @@
 "Incapaz de excluir arquivo:\n"
 "%s"
 
-#: src/utilops.c:520
+#: src/utilops.c:550
 msgid "Delete files"
 msgstr "Excluir arquivos"
 
-#: src/utilops.c:520
+#: src/utilops.c:550
 msgid "About to delete multiple files..."
 msgstr "Prestes a excluir m=FAltiplos arquivos..."
 
-#: src/utilops.c:521 src/utilops.c:566
+#: src/utilops.c:551 src/utilops.c:596
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/utilops.c:536
+#: src/utilops.c:566
 msgid "File deletion failed"
 msgstr "Exclus=E3o de arquivos falhou"
 
-#: src/utilops.c:564
+#: src/utilops.c:594
+#, c-format
 msgid ""
 "About to delete the file:\n"
 " %s"
@@ -648,11 +742,12 @@
 "Prestes a excluir o arquivo:\n"
 " %s"
 
-#: src/utilops.c:565
+#: src/utilops.c:595
 msgid "Delete file"
 msgstr "Excluir arquivo"
 
-#: src/utilops.c:620
+#: src/utilops.c:650 src/utilops.c:834
+#, c-format
 msgid ""
 "Overwrite file:\n"
 "%s\n"
@@ -664,7 +759,8 @@
 "renomeando:\n"
 "%s"
 
-#: src/utilops.c:631
+#: src/utilops.c:663
+#, c-format
 msgid ""
 "Unable to rename file:\n"
 "%s\n"
@@ -676,43 +772,32 @@
 " para:\n"
 "%s"
 
-#: src/utilops.c:632 src/utilops.c:813
+#: src/utilops.c:664 src/utilops.c:847
 msgid "Error renaming file"
 msgstr "Erro renomeando arquivo"
 
-#: src/utilops.c:722 src/utilops.c:851
+#: src/utilops.c:754 src/utilops.c:885
 msgid "GQview - rename"
 msgstr "GQview - renomear"
 
-#: src/utilops.c:722
+#: src/utilops.c:754
 msgid "Rename multiple files:"
 msgstr "Renomear m=FAltiplos arquivos:"
 
-#: src/utilops.c:722 src/utilops.c:851
+#: src/utilops.c:754 src/utilops.c:885
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/utilops.c:758
+#: src/utilops.c:790
 msgid "Rename:"
 msgstr "Renomear:"
 
-#: src/utilops.c:767
+#: src/utilops.c:799
 msgid "to:"
 msgstr "para:"
 
-#: src/utilops.c:802
-msgid ""
-"Overwrite file:\n"
-"%s\n"
-"with:\n"
-"%s"
-msgstr ""
-"Sobescrever arquivo:\n"
-"%s\n"
-"com:\n"
-"%s"
-
-#: src/utilops.c:812
+#: src/utilops.c:846
+#, c-format
 msgid ""
 "Unable to rename file:\n"
 "%s\n"
@@ -724,7 +809,8 @@
 "para:\n"
 "%s"
 
-#: src/utilops.c:850
+#: src/utilops.c:884
+#, c-format
 msgid ""
 "Rename file:\n"
 "%s\n"
@@ -734,7 +820,8 @@
 "%s\n"
 "para:"
 
-#: src/utilops.c:894
+#: src/utilops.c:928
+#, c-format
 msgid ""
 "The path:\n"
 "%s\n"
@@ -744,11 +831,12 @@
 "%s\n"
 "j=E1 existe como um arquivo."
 
-#: src/utilops.c:895
+#: src/utilops.c:929
 msgid "Could not create directory"
 msgstr "N=E3o pude criar diret=F3rio"
 
-#: src/utilops.c:900
+#: src/utilops.c:934
+#, c-format
 msgid ""
 "The directory:\n"
 "%s\n"
@@ -758,11 +846,12 @@
 "%s\n"
 "j=E1 existe."
 
-#: src/utilops.c:901
+#: src/utilops.c:935
 msgid "Directory exists"
 msgstr "Diret=F3rio existe"
 
-#: src/utilops.c:908
+#: src/utilops.c:942
+#, c-format
 msgid ""
 "Unable to create directory:\n"
 "%s"
@@ -770,11 +859,12 @@
 "Incapaz de criar diret=F3rio:\n"
 "%s"
 
-#: src/utilops.c:909
+#: src/utilops.c:943
 msgid "Error creating directory"
 msgstr "Erro criando diret=F3rio"
 
-#: src/utilops.c:948
+#: src/utilops.c:982
+#, c-format
 msgid ""
 "Create directory in:\n"
 "%s\n"
@@ -784,11 +874,11 @@
 "%s\n"
 "chamado:"
 
-#: src/utilops.c:949
+#: src/utilops.c:983
 msgid "GQview - new directory"
 msgstr "GQview - novo diret=F3rio"
 
-#: src/utilops.c:949
+#: src/utilops.c:983
 msgid "Create"
 msgstr "Criar"
 
@@ -796,3 +886,13 @@
 msgid "GQview Tools"
 msgstr "GQview Ferramentas"
 
+#~ msgid ""
+#~ "Overwrite file:\n"
+#~ "%s\n"
+#~ "with:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Sobescrever arquivo:\n"
+#~ "%s\n"
+#~ "com:\n"
+#~ "%s"

--- a/po/ru.po	Thu Apr 13 12:53:03 2000 +0000
+++ b/po/ru.po	Thu Apr 13 12:55:19 2000 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gqview-0.7.0d\n"
-"POT-Creation-Date: 1999-09-09 09:09+0300\n"
+"POT-Creation-Date: 2000-04-06 19:03-0400\n"
 "PO-Revision-Date: 1999-09-09 09:09+0300\n"
 "Last-Translator: Oleg Andrjushenko <[e-mail]>\n"
 "Language-Team: It`s me <[e-mail]>\n"
@@ -25,8 +25,8 @@
 msgid "Apply"
 msgstr "ðÒÉÍÅÎÉÔØ"
 
-#: src/config.c:325 src/utildlg.c:140 src/utilops.c:414 src/utilops.c:722
-#: src/utilops.c:851 src/utilops.c:949
+#: src/config.c:325 src/utildlg.c:145 src/utilops.c:444 src/utilops.c:754
+#: src/utilops.c:885 src/utilops.c:983
 msgid "Cancel"
 msgstr "ïÔÍÅÎÁ"
 
@@ -86,8 +86,8 @@
 msgid "Zoom to original size"
 msgstr "íÁÛÔÁÂÉÒÏ×ÁÔØ Ë ÒÁÚÍÅÒÕ ÏÒÉÇÉÎÁÌÁ"
 
-#: src/config.c:440 src/img-view.c:283 src/menu.c:458 src/menu.c:531
-#: src/menu.c:571 src/menu.c:661
+#: src/config.c:440 src/img-view.c:290 src/menu.c:473 src/menu.c:547
+#: src/menu.c:587 src/menu.c:678
 msgid "Fit image to window"
 msgstr "ë ÒÁÚÍÅÒÕ ÏËÎÁ"
 
@@ -105,7 +105,7 @@
 msgid "Limit size when auto-sizing window"
 msgstr "ïÇÒÁÎÉÞÉÔØ ÒÁÚÍÅÒ auto-ÒÁÚÍÅÒÎÏÇÏ ÏËÎÁ"
 
-#: src/config.c:470 src/menu.c:462
+#: src/config.c:470 src/menu.c:477
 msgid "Thumbnails"
 msgstr "üËÓËÉÚÙ"
 
@@ -165,7 +165,7 @@
 msgid "Command Line"
 msgstr "ëÏÍÍÁÎÄÎÁÑ ÓÔÒÏËÁ"
 
-#: src/config.c:660 src/menu.c:484
+#: src/config.c:660 src/menu.c:500
 msgid "About"
 msgstr "ï ÐÒÏÇÒÁÍÍÅ..."
 
@@ -174,8 +174,9 @@
 msgid ""
 "GQview %s\n"
 "\n"
-"Copyright (c) 1999 by John Ellis\n"
-"http://gqview.netpedia.net\n"
+"Copyright (c) 2000 by John Ellis\n"
+"http://gqview.sorceforge.net\n"
+"or http://gqview.netpedia.net\n"
 "[e-mail]\n"
 "\n"
 "Released under the GNU Public License"
@@ -195,16 +196,16 @@
 msgid "%d files%s"
 msgstr "%d ÆÁÊÌÏ×%s"
 
-#: src/filelist.c:960
+#: src/filelist.c:1025
 msgid "Loading thumbs..."
 msgstr "úÁÇÒÕÚËÁ ÜËÓËÉÚÏ×"
 
-#: src/image.c:65
+#: src/image.c:66
 #, c-format
 msgid "( ? x ? ) %d bytes"
 msgstr "( ? x ? ) %d ÂÁÊÔ"
 
-#: src/image.c:67
+#: src/image.c:68
 #, c-format
 msgid "( %d x %d ) %d bytes"
 msgstr "( %d x %d ) %d ÂÁÊÔ"
@@ -213,47 +214,47 @@
 msgid "GQview full screen"
 msgstr "GQview ÎÁ ×ÅÓØ ÜËÒÁÎ"
 
-#: src/img-view.c:280 src/menu.c:455 src/menu.c:528 src/menu.c:568
-#: src/menu.c:657
+#: src/img-view.c:287 src/menu.c:470 src/menu.c:544 src/menu.c:584
+#: src/menu.c:674
 msgid "Zoom in"
 msgstr "íÁÓÛÔÁ +"
 
-#: src/img-view.c:281 src/menu.c:456 src/menu.c:529 src/menu.c:569
-#: src/menu.c:659
+#: src/img-view.c:288 src/menu.c:471 src/menu.c:545 src/menu.c:585
+#: src/menu.c:676
 msgid "Zoom out"
 msgstr "íÁÓÛÔÁ -"
 
-#: src/img-view.c:282 src/menu.c:457 src/menu.c:530 src/menu.c:570
+#: src/img-view.c:289 src/menu.c:472 src/menu.c:546 src/menu.c:586
 msgid "Zoom 1:1"
 msgstr "íÁÓÛÔÁ 1:1"
 
 #. edit menu
-#: src/img-view.c:286 src/menu.c:442 src/menu.c:503 src/menu.c:534
-#: src/menu.c:574
+#: src/img-view.c:293 src/menu.c:457 src/menu.c:519 src/menu.c:550
+#: src/menu.c:590
 msgid "Edit"
 msgstr "ðÒÁ×ËÁ"
 
-#: src/img-view.c:291 src/menu.c:431 src/menu.c:510 src/menu.c:541
-#: src/menu.c:579
+#: src/img-view.c:298 src/menu.c:446 src/menu.c:526 src/menu.c:557
+#: src/menu.c:595
 msgid "Copy..."
 msgstr "ëÏÐÉÒÏ×ÁÔØ..."
 
-#: src/img-view.c:292 src/menu.c:432 src/menu.c:511 src/menu.c:542
-#: src/menu.c:580
+#: src/img-view.c:299 src/menu.c:447 src/menu.c:527 src/menu.c:558
+#: src/menu.c:596
 msgid "Move..."
 msgstr "ðÅÒÅÍÅÓÔÉÔØ..."
 
-#: src/img-view.c:293 src/menu.c:433 src/menu.c:512 src/menu.c:543
-#: src/menu.c:581
+#: src/img-view.c:300 src/menu.c:448 src/menu.c:528 src/menu.c:559
+#: src/menu.c:597
 msgid "Rename..."
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ..."
 
-#: src/img-view.c:294 src/menu.c:434 src/menu.c:513 src/menu.c:544
-#: src/menu.c:582
+#: src/img-view.c:301 src/menu.c:449 src/menu.c:529 src/menu.c:560
+#: src/menu.c:598
 msgid "Delete..."
 msgstr "õÄÁÌÉÔØ..."
 
-#: src/img-view.c:297
+#: src/img-view.c:304
 msgid "Close window"
 msgstr "úÁËÒÙÔØ ÏËÎÏ"
 
@@ -262,7 +263,7 @@
 msgid "GQview running: %s\n"
 msgstr "GQview ×ÙÐÏÌÎÑÅÔ: %s\n"
 
-#: src/main.c:316
+#: src/main.c:330
 msgid ""
 "Usage: gqview [options] [path]\n"
 "\n"
@@ -270,31 +271,45 @@
 "éÓÐÏÌØÚÏ×ÁÎÉÅ: gqview [ÐÁÒÁÍÅÔÒÙ] [ÐÕÔØ]\n"
 "\n"
 
-#: src/main.c:317
+#: src/main.c:331
 msgid "valid options are:\n"
 msgstr "ÄÏÐÕÓÔÉÍÙÅ ÐÁÒÁÍÅÔÒÙ:\n"
 
-#: src/main.c:318
-msgid "  +t, +tools                 force show of tools\n"
+#: src/main.c:332
+#, fuzzy
+msgid "  +t, --with-tools           force show of tools\n"
 msgstr "  +t, +tools                 ÐÏËÁÚÙ×ÁÔØ ÏËÎÏ ÉÎÓÔÒÕÍÅÎÔÏ×\n"
 
-#: src/main.c:319
-msgid "  -t, -tools                 force hide of tools\n"
+#: src/main.c:333
+#, fuzzy
+msgid "  -t, --without-tools        force hide of tools\n"
+msgstr "  -t, -tools                 ÓÐÒÑÔÁÔØ ÏËÎÏ ÉÎÓÔÒÕÍÅÎÔÏ×\n"
+
+#: src/main.c:334
+#, fuzzy
+msgid "  -f, --fullscreen           start in full screen mode\n"
 msgstr "  -t, -tools                 ÓÐÒÑÔÁÔØ ÏËÎÏ ÉÎÓÔÒÕÍÅÎÔÏ×\n"
 
-#: src/main.c:320
-msgid "  -debug                     turn on debug output\n"
+#: src/main.c:335
+#, fuzzy
+msgid "  -s, --slideshow            start in slideshow mode\n"
+msgstr "  -t, -tools                 ÓÐÒÑÔÁÔØ ÏËÎÏ ÉÎÓÔÒÕÍÅÎÔÏ×\n"
+
+#: src/main.c:336
+#, fuzzy
+msgid "  --debug                    turn on debug output\n"
 msgstr "  -debug                     ×Ù×ÏÄÉÔØ ÏÔÌÁÄÏÞÎÕÀ ÉÎÆÏÒÍÁÃÉÀ\n"
 
-#: src/main.c:321
+#: src/main.c:337
+#, fuzzy
 msgid ""
-"  -help                      this message\n"
+"  -h, --help                 show this message\n"
 "\n"
 msgstr ""
 "  -help                      ÐÏËÁÚÁÔØ üôï ÓÏÏÂÝÅÎÉÅ\n"
 "\n"
 
-#: src/main.c:326
+#: src/main.c:342
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
@@ -303,115 +318,119 @@
 "ÎÅ×ÅÒÎÙÊ ÐÁÒÁÍÅÔÒ: %s\n"
 "îÁÂÅÒÉÔÅ gqview -help ÄÌÑ ÓÐÒÁ×ËÉ.\n"
 
-#: src/main.c:353
+#: src/main.c:369
 msgid "The Gimp"
 msgstr ""
 
-#: src/main.c:356
+#: src/main.c:372
 msgid "Electric Eyes"
 msgstr ""
 
-#: src/main.c:359
+#: src/main.c:375
 msgid "XV"
 msgstr ""
 
-#: src/main.c:362
+#: src/main.c:378
 msgid "Xpaint"
 msgstr ""
 
-#: src/menu.c:364
+#: src/menu.c:373
 #, c-format
 msgid "in %s..."
 msgstr "× %s..."
 
-#: src/menu.c:366
+#: src/menu.c:375
 msgid "in (unknown)..."
 msgstr "× (ÎÅÉÚ×ÅÓÔÎÏ)..."
 
-#: src/menu.c:385
+#: src/menu.c:394
 msgid "Options..."
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ..."
 
-#: src/menu.c:387
+#: src/menu.c:396
 msgid "Remove old thumbnails"
 msgstr "õÄÁÌÉÔØ ÓÔÁÒÙÅ ÜËÓËÉÚÙ"
 
+#: src/menu.c:398 src/menu.c:410 src/menu.c:422
+msgid "Set as wallpaper"
+msgstr ""
+
 #. file menu
-#: src/menu.c:425
+#: src/menu.c:440
 msgid "File"
 msgstr "æÁÊÌ"
 
-#: src/menu.c:429
+#: src/menu.c:444
 msgid "Create Dir..."
 msgstr "óÏÚÄÁÔØ ËÁÔÁÌÏÇ..."
 
-#: src/menu.c:436
+#: src/menu.c:451
 msgid "Exit"
 msgstr "÷ÙÈÏÄ"
 
 #. view menu
-#: src/menu.c:451
+#: src/menu.c:466
 msgid "View"
 msgstr "ðÒÏÓÍÏÔÒ"
 
-#: src/menu.c:461 src/menu.c:547
+#: src/menu.c:476 src/menu.c:563
 msgid "Full screen"
 msgstr "îÁ ×ÅÓØ ÜËÒÁÎ"
 
-#: src/menu.c:469
+#: src/menu.c:485
 msgid "Refresh Lists"
 msgstr "ïÂÎÏ×ÉÔØ ÓÐÉÓÏË ÆÁÊÌÏ×"
 
-#: src/menu.c:470
+#: src/menu.c:486
 msgid "(Un)Float file list"
 msgstr "(îÅ)ïÓ×ÏÂÏÄÉÔØ ÉÎÓÔÒÕÍÅÎÔÙ"
 
-#: src/menu.c:471 src/menu.c:546
+#: src/menu.c:487 src/menu.c:562
 msgid "(Un)Hide file list"
 msgstr "îÅÔ/äÁ ÉÎÓÔÒÕÍÅÎÔÁÍ"
 
-#: src/menu.c:474
+#: src/menu.c:490
 msgid "Toggle slideshow"
 msgstr "÷ËÌ/÷ÙËÌ. ÐÒÏÓÍÏÔÒ ÓÌÁÊÄÏ×"
 
 #. help menu
-#: src/menu.c:480
+#: src/menu.c:496
 msgid "Help"
 msgstr "ðÏÍÏÝØ"
 
-#: src/menu.c:507 src/menu.c:538
+#: src/menu.c:523 src/menu.c:554
 msgid "View in new window"
 msgstr "ðÒÏÓÍÏÔÒ × ÎÏ×ÏÍ ÏËÎÅ"
 
-#: src/menu.c:515
+#: src/menu.c:531
 msgid "Refresh"
 msgstr "ïÂÎÏ×ÉÔØ"
 
-#: src/menu.c:585
+#: src/menu.c:601
 msgid "Exit full screen"
 msgstr "÷ÙÊÔÉ ÉÚ ÐÏÌÎÏÇÏ ÜËÒÁÎÁ"
 
-#: src/menu.c:644
+#: src/menu.c:661
 msgid "Create thumbnails"
 msgstr "óÏÚÄÁÔØ ÜËÓËÉÚÙ"
 
-#: src/menu.c:653
+#: src/menu.c:670
 msgid "Change to home directory"
 msgstr "ðÅÒÅÊÔÉ × ÄÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ"
 
-#: src/menu.c:655
+#: src/menu.c:672
 msgid "Refresh file list"
 msgstr "ïÂÎÏ×ÉÔØ ÓÐÉÓÏË ÆÁÊÌÏ×"
 
-#: src/menu.c:663
+#: src/menu.c:680
 msgid "Set zoom 1:1"
 msgstr "íÁÓÛÔÁ 1:1"
 
-#: src/menu.c:665
+#: src/menu.c:682
 msgid "Configure options"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ"
 
-#: src/menu.c:667
+#: src/menu.c:684
 msgid "Float Controls"
 msgstr "ÐÒÉËÒÅÐÉÔØ/Ó×ÏÂÏÄÉÔØ ÉÎÓÔÒÕÍÅÎÔÙ"
 
@@ -435,11 +454,47 @@
 msgid "failed to delete:%s\n"
 msgstr "ÎÅÕÄÁÌÏÓØ ÕÄÁÌÉÔØ:%s\n"
 
-#: src/utildlg.c:67
+#: src/utildlg.c:68
 msgid "     Ok     "
 msgstr "     Ok     "
 
-#: src/utilops.c:162
+#: src/utilops.c:166
+msgid "Source to copy matches destination"
+msgstr ""
+
+#: src/utilops.c:167
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file:\n"
+"%s\n"
+"to itself."
+msgstr ""
+"îÅÍÏÇÕ ÓËÏÐÉÒÏ×ÁÔØ ÆÁÊÌ:\n"
+"%s\n"
+"×:\n"
+"%s"
+
+#: src/utilops.c:171
+msgid "Source to move matches destination"
+msgstr ""
+
+#: src/utilops.c:172
+#, fuzzy, c-format
+msgid ""
+"Unable to move file:\n"
+"%s\n"
+"to itself."
+msgstr ""
+"îÅÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌ:\n"
+"%s\n"
+"×:\n"
+"%s"
+
+#: src/utilops.c:175 src/utilops.c:231 src/utilops.c:516
+msgid "Continue"
+msgstr "ðÒÏÄÏÌÖÉÔØ"
+
+#: src/utilops.c:182
 #, c-format
 msgid ""
 "Overwrite file:\n"
@@ -451,27 +506,27 @@
 " %s\n"
 " ÆÁÊÌÏÍ:\b %s"
 
-#: src/utilops.c:163 src/utilops.c:262 src/utilops.c:621 src/utilops.c:803
+#: src/utilops.c:183 src/utilops.c:289 src/utilops.c:651 src/utilops.c:835
 msgid "Overwrite file"
 msgstr "ðÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ"
 
-#: src/utilops.c:164
+#: src/utilops.c:186
 msgid "Skip"
 msgstr "ðÒÏÐÕÓÔÉÔØ"
 
-#: src/utilops.c:165
+#: src/utilops.c:187
 msgid "Yes to all"
 msgstr "äÁ ÄÌÑ ×ÓÅÈ"
 
-#: src/utilops.c:166
+#: src/utilops.c:188
 msgid "Yes"
 msgstr "äÁ"
 
-#: src/utilops.c:200 src/utilops.c:288
+#: src/utilops.c:222 src/utilops.c:317
 msgid "Error copying file"
 msgstr "ïÛÉÂËÁ ËÏÐÉÒÏ×ÁÎÉÑ ÆÁÊÌÁ"
 
-#: src/utilops.c:201
+#: src/utilops.c:223
 #, c-format
 msgid ""
 "Unable to copy file:\n"
@@ -484,11 +539,11 @@
 "%s\n"
 " during multiple file copy."
 
-#: src/utilops.c:205 src/utilops.c:293
+#: src/utilops.c:227 src/utilops.c:322
 msgid "Error moving file"
 msgstr "ïÛÉÂËÁ ÐÅÒÅÍÅÝÅÎÉÑ ÆÁÊÌÁ"
 
-#: src/utilops.c:206
+#: src/utilops.c:228
 #, c-format
 msgid ""
 "Unable to move file:\n"
@@ -501,11 +556,15 @@
 "%s\n"
 " during multiple file move."
 
-#: src/utilops.c:209 src/utilops.c:486
-msgid "Continue"
-msgstr "ðÒÏÄÏÌÖÉÔØ"
+#: src/utilops.c:282
+msgid "Source matches destination"
+msgstr ""
 
-#: src/utilops.c:261
+#: src/utilops.c:283
+msgid "Source and destination are the same, operation cancelled."
+msgstr ""
+
+#: src/utilops.c:288
 #, c-format
 msgid ""
 "Overwrite file:\n"
@@ -519,11 +578,11 @@
 " ÆÁÊÌÏÍ:\n"
 "%s"
 
-#: src/utilops.c:263 src/utilops.c:622 src/utilops.c:804
+#: src/utilops.c:292 src/utilops.c:654 src/utilops.c:838
 msgid "Overwrite"
 msgstr "ðÅÒÅÐÉÓÁÔØ"
 
-#: src/utilops.c:289
+#: src/utilops.c:318
 #, c-format
 msgid ""
 "Unable to copy file:\n"
@@ -536,7 +595,7 @@
 "×:\n"
 "%s"
 
-#: src/utilops.c:294
+#: src/utilops.c:323
 #, c-format
 msgid ""
 "Unable to move file:\n"
@@ -549,11 +608,11 @@
 "×:\n"
 "%s"
 
-#: src/utilops.c:337
+#: src/utilops.c:367
 msgid "Invalid destination"
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÎÁÚÎÁÞÅÎÉÅ"
 
-#: src/utilops.c:337
+#: src/utilops.c:367
 msgid ""
 "When operating with multiple files, please select\n"
 " a directory, not file."
@@ -561,23 +620,23 @@
 "ëÏÇÄÁ ÏÐÅÒÁÃÉÑ ÐÒÏÉÚ×ÏÄÉÔÓÑ ÎÁÄ ÎÅÓËÏÌØËÉÍÉ ÆÁÊÌÁÍÉ,\n"
 " ÐÏÖÁÌÕÊÓÔÁ ÚÁÄÁÊÔÅ ËÁÔÁÌÏÇ, ÎÅ ÆÁÊÌ."
 
-#: src/utilops.c:339
+#: src/utilops.c:369
 msgid "Invalid directory"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ËÁÔÁÌÏÇ"
 
-#: src/utilops.c:339
+#: src/utilops.c:369
 msgid "Please select an existing directory"
 msgstr "ðÏÖÁÌÕÊÓÔÁ ×ÙÂÅÒÉÔÅ ÓÕÝÅÓÔ×ÕÀÝÉÊ ËÁÔÁÌÏÇ"
 
-#: src/utilops.c:397
+#: src/utilops.c:427
 msgid "GQview - copy"
 msgstr "GQview - ËÏÐÉÒÏ×ÁÎÉÅ"
 
-#: src/utilops.c:398
+#: src/utilops.c:428
 msgid "Copy"
 msgstr "ëÏÐÉÒÏ×ÁÔØ"
 
-#: src/utilops.c:400
+#: src/utilops.c:430
 #, c-format
 msgid ""
 "Copy file:\n"
@@ -588,7 +647,7 @@
 "%s\n"
 "×:"
 
-#: src/utilops.c:402
+#: src/utilops.c:432
 #, c-format
 msgid ""
 "Copy multiple files from:\n"
@@ -599,15 +658,15 @@
 "%s\n"
 "×:"
 
-#: src/utilops.c:406
+#: src/utilops.c:436
 msgid "GQview - move"
 msgstr "GQview - ÐÅÒÅÍÅÓÔÉÔØ"
 
-#: src/utilops.c:407
+#: src/utilops.c:437
 msgid "Move"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ"
 
-#: src/utilops.c:409
+#: src/utilops.c:439
 #, c-format
 msgid ""
 "Move file:\n"
@@ -618,7 +677,7 @@
 "%s\n"
 "×:"
 
-#: src/utilops.c:411
+#: src/utilops.c:441
 #, c-format
 msgid ""
 "Move multiple files from:\n"
@@ -629,7 +688,7 @@
 "%s\n"
 "×:"
 
-#: src/utilops.c:484
+#: src/utilops.c:514
 #, c-format
 msgid ""
 "Unable to delete file:\n"
@@ -640,11 +699,11 @@
 " %s\n"
 " ðÒÏÄÏÌÖÁÔØ ÏÐÅÒÁÃÉÀ ÕÄÁÌÅÎÉÑ ÄÌÑ ÏÓÔÁ×ÛÉÈÓÑ ÆÁÊÌÏ× ?"
 
-#: src/utilops.c:485 src/utilops.c:491
+#: src/utilops.c:515 src/utilops.c:521
 msgid "Delete failed"
 msgstr "õÄÁÌÉÔØ ÎÅÕÄÁÌÏÓØ"
 
-#: src/utilops.c:490 src/utilops.c:535
+#: src/utilops.c:520 src/utilops.c:565
 #, c-format
 msgid ""
 "Unable to delete file:\n"
@@ -653,23 +712,23 @@
 "îÅÍÏÇÕ ÕÄÁÌÉÔØ ÆÁÊÌ:\n"
 "%s"
 
-#: src/utilops.c:520
+#: src/utilops.c:550
 msgid "Delete files"
 msgstr "õÄÁÌÉÔØ ÆÁÊÌÙ"
 
-#: src/utilops.c:520
+#: src/utilops.c:550
 msgid "About to delete multiple files..."
 msgstr "÷Ù ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÏÔÍÅÞÅÎÎÙÅ ÆÁÊÌÙ ?"
 
-#: src/utilops.c:521 src/utilops.c:566
+#: src/utilops.c:551 src/utilops.c:596
 msgid "Delete"
 msgstr "õÄÁÌÉÔØ"
 
-#: src/utilops.c:536
+#: src/utilops.c:566
 msgid "File deletion failed"
 msgstr "õÄÁÌÅÎÉÅ ÆÁÊÌÁ ÎÅÕÄÁÌÏÓØ"
 
-#: src/utilops.c:564
+#: src/utilops.c:594
 #, c-format
 msgid ""
 "About to delete the file:\n"
@@ -678,11 +737,11 @@
 "èÏÔÉÔÅ ÕÄÁÌÉÔØ ÆÁÊÌ ?:\n"
 " %s"
 
-#: src/utilops.c:565
+#: src/utilops.c:595
 msgid "Delete file"
 msgstr "õÄÁÌÉÔØ ÆÁÊÌ"
 
-#: src/utilops.c:620
+#: src/utilops.c:650 src/utilops.c:834
 #, c-format
 msgid ""
 "Overwrite file:\n"
@@ -695,7 +754,7 @@
 "ÐÅÒÅÉÍÅÎÏ×Á×:\n"
 "%s"
 
-#: src/utilops.c:631
+#: src/utilops.c:663
 #, c-format
 msgid ""
 "Unable to rename file:\n"
@@ -708,45 +767,31 @@
 " ×:\n"
 "%s"
 
-#: src/utilops.c:632 src/utilops.c:813
+#: src/utilops.c:664 src/utilops.c:847
 msgid "Error renaming file"
 msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ ÆÁÊÌÁ"
 
-#: src/utilops.c:722 src/utilops.c:851
+#: src/utilops.c:754 src/utilops.c:885
 msgid "GQview - rename"
 msgstr "GQview - ÐÅÒÅÉÍÅÎÏ×ÁÔØ"
 
-#: src/utilops.c:722
+#: src/utilops.c:754
 msgid "Rename multiple files:"
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ×ÙÄÅÌÅÎÎÙÅ ÆÁÊÌÙ:"
 
-#: src/utilops.c:722 src/utilops.c:851
+#: src/utilops.c:754 src/utilops.c:885
 msgid "Rename"
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ"
 
-#: src/utilops.c:758
+#: src/utilops.c:790
 msgid "Rename:"
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ:"
 
-#: src/utilops.c:767
+#: src/utilops.c:799
 msgid "to:"
 msgstr "×:"
 
-#: src/utilops.c:802
-#, c-format
-msgid ""
-"Overwrite file:\n"
-"%s\n"
-"with:\n"
-"%s"
-msgstr ""
-"æÁÊÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ !\n"
-"ðÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ ?:\n"
-"%s\n"
-"ÆÁÊÌÏÍ:\n"
-"%s"
-
-#: src/utilops.c:812
+#: src/utilops.c:846
 #, c-format
 msgid ""
 "Unable to rename file:\n"
@@ -759,7 +804,7 @@
 " ×:\n"
 "%s"
 
-#: src/utilops.c:850
+#: src/utilops.c:884
 #, c-format
 msgid ""
 "Rename file:\n"
@@ -770,7 +815,7 @@
 "%s\n"
 "×:"
 
-#: src/utilops.c:894
+#: src/utilops.c:928
 #, c-format
 msgid ""
 "The path:\n"
@@ -781,11 +826,11 @@
 "%s\n"
 "ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ ËÁË ÆÁÊÌ."
 
-#: src/utilops.c:895
+#: src/utilops.c:929
 msgid "Could not create directory"
 msgstr "îÅÍÏÇÕ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ"
 
-#: src/utilops.c:900
+#: src/utilops.c:934
 #, c-format
 msgid ""
 "The directory:\n"
@@ -796,11 +841,11 @@
 "%s\n"
 "ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ."
 
-#: src/utilops.c:901
+#: src/utilops.c:935
 msgid "Directory exists"
 msgstr "ëÁÔÁÌÏÇ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: src/utilops.c:908
+#: src/utilops.c:942
 #, c-format
 msgid ""
 "Unable to create directory:\n"
@@ -809,11 +854,11 @@
 "îÅÍÏÇÕ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ:\n"
 "%s"
 
-#: src/utilops.c:909
+#: src/utilops.c:943
 msgid "Error creating directory"
 msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ"
 
-#: src/utilops.c:948
+#: src/utilops.c:982
 #, c-format
 msgid ""
 "Create directory in:\n"
@@ -824,14 +869,26 @@
 "%s\n"
 "Ó ÉÍÅÎÅÍ:"
 
-#: src/utilops.c:949
+#: src/utilops.c:983
 msgid "GQview - new directory"
 msgstr "GQview - ÎÏ×ÙÊ ËÁÔÁÌÏÇ"
 
-#: src/utilops.c:949
+#: src/utilops.c:983
 msgid "Create"
 msgstr "óÏÚÄÁÔØ"
 
 #: src/window.c:151
 msgid "GQview Tools"
 msgstr "GQview éÎÓÔÒÕÍÅÎÔÙ"
+
+#~ msgid ""
+#~ "Overwrite file:\n"
+#~ "%s\n"
+#~ "with:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "æÁÊÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ !\n"
+#~ "ðÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ ?:\n"
+#~ "%s\n"
+#~ "ÆÁÊÌÏÍ:\n"
+#~ "%s"

--- a/src/config.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/config.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -673,7 +673,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 0);
 	gtk_widget_show (button);
 
-	sprintf(buf, _("GQview %s\n\nCopyright (c) 1999 by John Ellis\nhttp://gqview.netpedia.net\[e-mail]\n\nReleased under the GNU Public License"), VERSION);
+	sprintf(buf, _("GQview %s\n\nCopyright (c) 2000 by John Ellis\nhttp://gqview.sorceforge.net\nor http://gqview.netpedia.net\[e-mail]\n\nReleased under the GNU Public License"), VERSION);
 	label = gtk_label_new(buf);
 	gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
 	gtk_widget_show (label);

--- a/src/dnd.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/dnd.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *

--- a/src/filelist.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/filelist.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -124,7 +124,7 @@
 		{
 		gchar *buf = g_strdup(custom_filter);
 		gchar *pos_ptr_b;
-		gchar *pos_ptr_e = custom_filter;
+		gchar *pos_ptr_e = buf;
 		while(pos_ptr_e[0] != '\0')
 			{
 			pos_ptr_b = pos_ptr_e;
@@ -336,8 +336,17 @@
 
 void file_next_image()
 {
-	gint current = find_file_in_list(image_get_path());
-	gint total = file_count();
+	gint current;
+	gint total;
+
+	if (slideshow_is_running())
+		{
+		slideshow_next();
+		return;
+		}
+
+	current = find_file_in_list(image_get_path());
+	total = file_count();
 
 	if (current >= 0)
 		{
@@ -354,7 +363,15 @@
 
 void file_prev_image()
 {
-	gint current = find_file_in_list(image_get_path());
+	gint current;
+
+	if (slideshow_is_running())
+		{
+		slideshow_prev();
+		return;
+		}
+
+	current = find_file_in_list(image_get_path());
 
 	if (current >= 0)
 		{
@@ -705,6 +722,54 @@
  *-----------------------------------------------------------------------------
  */
 
+void path_entry_tab_cb(gchar *newdir, gpointer data)
+{
+	gchar *new_path;
+	gchar *buf;
+	gint found = FALSE;
+
+	new_path = g_strdup(newdir);
+	parse_out_relatives(new_path);
+	buf = remove_level_from_path(new_path);
+
+	if (buf && current_path && strcmp(buf, current_path) == 0)
+		{
+		GList *work;
+		gchar *part;
+
+		part = filename_from_path(new_path);
+		work = file_list;
+
+		while(part && work)
+			{
+			gchar *name = work->data;
+			work = work->next;
+
+			if (strncmp(part, name, strlen(part)) == 0)
+				{
+				gint row = g_list_index(file_list, name);
+				if (!gtk_clist_row_is_visible(GTK_CLIST(file_clist), row) != GTK_VISIBILITY_FULL)
+					{
+					gtk_clist_moveto(GTK_CLIST(file_clist), row, -1, 0.5, 0.0);
+					}
+				found = TRUE;
+				break;
+				}
+			}
+		}
+
+	if (!found && new_path && current_path &&
+	    strcmp(new_path, current_path) != 0 && isdir(new_path))
+		{
+		filelist_change_to(new_path);
+		/* we are doing tab completion, add '/' back */
+		gtk_entry_append_text(GTK_ENTRY(path_entry), "/");
+		}
+
+	g_free(buf);
+	g_free(new_path);
+}
+
 void path_entry_cb(gchar *newdir, gpointer data)
 {
 	gchar *new_path = g_strdup(newdir);

--- a/src/fileops.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/fileops.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -126,7 +126,21 @@
 gchar *get_current_dir()
 {
 	char buf[512];
-	getcwd(buf, 510);
+	if (getcwd(buf, 510) == NULL)
+		{
+#ifdef __USE_GNU
+		char *dbuf;
+		gchar *ret;
+		dbuf = get_current_dir_name();
+		if (buf)
+			{
+			ret = g_strdup(dbuf);	/* don't mix free w/ g_free */
+			free(dbuf);
+			return (ret);
+			}
+#endif
+		return (g_strdup("."));		/* well, return something! broken? */
+		}
 	return g_strdup(buf);
 }
 

--- a/src/globals.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/globals.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *

--- a/src/gqview.h	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/gqview.h	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -251,6 +251,7 @@
 void image_change_to(gchar *path);
 void image_set_labels(GtkWidget *info, GtkWidget *zoom);
 GtkWidget *image_create();
+void image_to_root();
 
 /* filelist.c */
 void update_status_label(gchar *text);
@@ -281,6 +282,7 @@
 		   GdkEvent *event, gpointer data);
 void file_clist_highlight_set();
 void file_clist_highlight_unset();
+void path_entry_tab_cb(gchar *newpath, gpointer data);
 void path_entry_cb(gchar *newdir, gpointer data);
 void interrupt_thumbs();
 void filelist_populate_clist();
@@ -342,12 +344,15 @@
 /* slideshow.c */
 void slideshow_start();
 void slideshow_stop();
+void slideshow_next();
+void slideshow_prev();
 void slideshow_toggle();
 gint slideshow_is_running();
 
 /* img-view.c */
 void view_window_new(gchar *path);
 void view_window_active_edit(gint n);
+void view_window_active_to_root(gint n);
 void create_menu_view_popup();
 
 

--- a/src/image.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/image.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -9,6 +9,7 @@
 #include "gqview.h"
 #include "image.h"
 #include "icons/img_unknown.xpm"
+#include <gdk/gdkx.h>
 
 static gchar *zoom_as_text(gint zoom, gfloat scale);
 static void set_zoom_label(GtkWidget *label, gint zoom, gfloat scale);
@@ -737,6 +738,7 @@
 void image_area_free(ImageWindow *imd)
 {
 	g_free(imd->image_path);
+	g_free(imd->title);
 
 	if (imd->image_pixmap) gdk_imlib_free_pixmap(imd->image_pixmap);
 	if (imd->image_data) gdk_imlib_destroy_image(imd->image_data);
@@ -771,3 +773,40 @@
 	return zoom;
 }
 
+/*
+ *-----------------------------------------------------------------------------
+ * image widget misc utils
+ *-----------------------------------------------------------------------------
+ */ 
+
+void image_area_to_root(ImageWindow *imd, gint scaled)
+{                                                                               
+	GdkVisual *gdkvisual;
+	GdkWindow *rootwindow;
+	GdkPixmap *pixmap;
+
+	if (!imd || !imd->image_data) return;
+
+
+	rootwindow = (GdkWindow *) &gdk_root_parent;	/* hmm, don't know, correct? */
+	gdkvisual = gdk_window_get_visual(rootwindow);
+	if (gdkvisual != gdk_imlib_get_visual()) return;
+
+	if (scaled)
+		{
+		gdk_imlib_render(imd->image_data, gdk_screen_width(), gdk_screen_height());
+		}
+	else
+		{
+		gdk_imlib_render(imd->image_data, imd->width, imd->height);
+		}
+
+	pixmap = gdk_imlib_move_image(imd->image_data);
+	gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE);
+	gdk_window_clear(rootwindow);
+	gdk_imlib_free_pixmap(pixmap);
+
+	gdk_flush();
+}
+
+

--- a/src/image.h	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/image.h	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -38,3 +38,7 @@
 /* get the default zoom for an image */
 gint get_default_zoom(ImageWindow *imd);
 
+/* set the root window to the current image */
+void image_area_to_root(ImageWindow *imd, gint scaled);
+
+

--- a/src/img-main.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/img-main.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -89,6 +89,9 @@
 		case 'S': case 's':
 			slideshow_toggle();
 			break;
+		case 'V': case 'v':
+			full_screen_stop();
+			break;
 		}
 
 	if (event->state & GDK_CONTROL_MASK)
@@ -120,9 +123,6 @@
 			case '8':
 				n = 7;
 				break;
-			case 'F': case 'f':
-				full_screen_stop();
-				break;
 			case 'C': case 'c':
 				full_screen_stop();
 				file_util_copy(image_area_get_path(imd), NULL, current_path);
@@ -285,6 +285,9 @@
 	gtk_widget_destroy(full_screen_window);
 	full_screen_window = NULL;
 
+	image_area_free(full_screen_image);
+	full_screen_image = NULL;
+
 	gtk_widget_show(mainwindow);
 }
 
@@ -359,3 +362,8 @@
 	return main_image->eventbox;
 }
 
+void image_to_root()
+{
+	image_area_to_root(main_image, (image_area_get_zoom(main_image) == 0));
+}
+

--- a/src/img-view.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/img-view.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -211,6 +211,13 @@
 	start_editor_from_file(n, image_area_get_path(imd));
 }
 
+void view_window_active_to_root(gint n)
+{
+	ImageWindow *imd = view_window_get_active();
+	if (!imd) return;
+	image_area_to_root(imd, (image_area_get_zoom(imd) == 0));
+}
+
 static void view_zoom_in_cb(GtkWidget *widget, gpointer data)
 {
 	ImageWindow *imd = view_window_get_active();

--- a/src/main.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/main.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -258,10 +258,13 @@
 
 /*
  *-----------------------------------------------------------------------------
- * command line parser (private)
+ * command line parser (private) hehe, who needs popt anyway?
  *-----------------------------------------------------------------------------
  */ 
 
+static gint startup_full_screen = FALSE;
+static gint startup_in_slideshow = FALSE;
+
 static void parse_command_line(int argc, char *argv[], gchar **path, gchar **file)
 {
 	if (argc > 1)
@@ -294,31 +297,44 @@
 				*path = remove_level_from_path(cmd_all);
 				*file = g_strdup(cmd_all);
 				}
-			else if (strcmp(cmd_line, "-debug") == 0)
+			else if (strcmp(cmd_line, "--debug") == 0)
 				{
 				debug = TRUE;
 				printf("debugging output enabled\n");
 				}
 			else if (strcmp(cmd_line, "+t") == 0 ||
-				 strcmp(cmd_line, "+tools") == 0)
+				 strcmp(cmd_line, "--with-tools") == 0)
 				{
 				tools_float = FALSE;
 				tools_hidden = FALSE;
 				}
 			else if (strcmp(cmd_line, "-t") == 0 ||
-				 strcmp(cmd_line, "-tools") == 0)
+				 strcmp(cmd_line, "--without-tools") == 0)
 				{
 				tools_hidden = TRUE;
 				}
-			else if (strcmp(cmd_line, "-help") == 0)
+			else if (strcmp(cmd_line, "-f") == 0 ||
+				 strcmp(cmd_line, "--fullscreen") == 0)
+				{
+				startup_full_screen = TRUE;
+				}
+			else if (strcmp(cmd_line, "-s") == 0 ||
+				 strcmp(cmd_line, "--slideshow") == 0)
+				{
+				startup_in_slideshow = TRUE;
+				}
+			else if (strcmp(cmd_line, "-h") == 0 ||
+				 strcmp(cmd_line, "--help") == 0)
 				{
 				printf("GQview version %s\n", VERSION);
 				printf(_("Usage: gqview [options] [path]\n\n"));
 				printf(_("valid options are:\n"));
-				printf(_("  +t, +tools                 force show of tools\n"));
-				printf(_("  -t, -tools                 force hide of tools\n"));
-				printf(_("  -debug                     turn on debug output\n"));
-				printf(_("  -help                      this message\n\n"));
+				printf(_("  +t, --with-tools           force show of tools\n"));
+				printf(_("  -t, --without-tools        force hide of tools\n"));
+				printf(_("  -f, --fullscreen           start in full screen mode\n"));
+				printf(_("  -s, --slideshow            start in slideshow mode\n"));
+				printf(_("  --debug                    turn on debug output\n"));
+				printf(_("  -h, --help                 show this message\n\n"));
 				exit (0);
 				}
 			else 
@@ -429,6 +445,9 @@
 	g_free(cmd_path);
 	g_free(cmd_file);
 
+	if (startup_full_screen) full_screen_toggle();
+	if (startup_in_slideshow) slideshow_start();
+
 	gtk_main ();
 	return 0;
 }

--- a/src/menu.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/menu.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -18,7 +18,6 @@
 #include "icons/icon_config.xpm"
 #include "icons/icon_float.xpm"
 
-static void set_thumbnails(gint mode);
 
 static void add_menu_item(GtkWidget *menu, gchar *label, GtkAccelGroup *accel_group,
 				guint accel_key, guint accel_mods, GtkSignalFunc func, gpointer data);
@@ -132,6 +131,10 @@
 	full_screen_toggle();
 }
 
+static void wallpaper_image_cb(GtkWidget *widget, gpointer data)
+{
+	image_to_root();
+}
 
 /*
  *-----------------------------------------------------------------------------
@@ -276,6 +279,12 @@
 	view_window_active_edit(n);
 }
 
+static void wallpaper_view_cb(GtkWidget *widget, gpointer data)
+{
+	gint n = GPOINTER_TO_INT(data);
+	view_window_active_to_root(n);
+}
+
 static void popup_edit_list_cb(GtkWidget *widget, gpointer data)
 {
 	gint n = GPOINTER_TO_INT(data);
@@ -385,6 +394,8 @@
 	add_menu_item(menu, _("Options..."), accel_grp, 'O', GDK_CONTROL_MASK, config_cb, NULL);
 	add_menu_divider(menu);
 	add_menu_item(menu, _("Remove old thumbnails"), accel_grp, 'T', GDK_CONTROL_MASK, remove_thumb_cb, NULL);
+	add_menu_divider(menu);
+	add_menu_item(menu, _("Set as wallpaper"), accel_grp, 'W', GDK_CONTROL_MASK, wallpaper_image_cb, NULL);
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_edit), menu);
 
 	/* file edit popup */
@@ -395,6 +406,8 @@
 	/* image edit popup */
 	menu = gtk_menu_new();
 	add_edit_items(menu, edit_image_cb, NULL);
+	add_menu_divider(menu);
+	add_menu_popup_item(menu, _("Set as wallpaper"), wallpaper_image_cb, NULL);
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_image_edit), menu);
 
 	/* full screen edit popup */
@@ -405,6 +418,8 @@
 	/* view edit popup */
 	menu = gtk_menu_new();
 	add_edit_items(menu, edit_view_cb, NULL);
+	add_menu_divider(menu);
+	add_menu_popup_item(menu, _("Set as wallpaper"), wallpaper_view_cb, NULL);
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_window_view_edit), menu);
 }
 
@@ -458,8 +473,9 @@
 	add_menu_item(menu, _("Fit image to window"), accel_grp, 'X', FALSE, zoom_fit_cb, NULL);
 	add_menu_divider(menu);
 
-	add_menu_item(menu, _("Full screen"), accel_grp, 'F', GDK_CONTROL_MASK, full_screen_cb, NULL);
+	add_menu_item(menu, _("Full screen"), accel_grp, 'V', FALSE, full_screen_cb, NULL);
 	thumb_menu_item = gtk_check_menu_item_new_with_label(_("Thumbnails"));
+	gtk_check_menu_item_set_state(GTK_CHECK_MENU_ITEM(thumb_menu_item), thumbnails_enabled);
 	gtk_widget_add_accelerator (thumb_menu_item, "activate", accel_grp, 'T', FALSE, GTK_ACCEL_VISIBLE);
 	gtk_signal_connect (GTK_OBJECT (thumb_menu_item), "activate",(GtkSignalFunc) thumb_menu_cb, thumb_menu_item);
 	gtk_menu_append(GTK_MENU(menu), thumb_menu_item);
@@ -638,6 +654,7 @@
 	hbox = gtk_hbox_new(FALSE, 0);
 
 	thumb_button = gtk_toggle_button_new ();
+	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thumb_button), thumbnails_enabled);
 	gtk_signal_connect (GTK_OBJECT (thumb_button), "clicked",(GtkSignalFunc) thumb_button_cb, thumb_button);
 	gtk_box_pack_start (GTK_BOX (hbox), thumb_button, FALSE, FALSE, 0);
 	gtk_widget_show (thumb_button);

--- a/src/pathsel.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/pathsel.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *

--- a/src/rcfile.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/rcfile.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -162,6 +162,7 @@
 	write_bool_option(f, "progressive_keyboard_scrolling", progressive_key_scrolling);
 	fprintf(f,"\n");
 
+	write_bool_option(f, "enable_thumbnails", thumbnails_enabled);
 	write_int_option(f, "thumbnail_width", thumb_max_width);
 	write_int_option(f, "thumbnail_height", thumb_max_height);
 	write_bool_option(f, "cache_thumbnails", enable_thumb_caching);
@@ -301,6 +302,8 @@
 		progressive_key_scrolling = read_bool_option(f, option,
 			"progressive_keyboard_scrolling", value, progressive_key_scrolling);
 
+		thumbnails_enabled = read_bool_option(f, option,
+			"enable_thumbnails", value, thumbnails_enabled);
 		thumb_max_width = read_int_option(f, option,
 			"thumbnail_width", value, thumb_max_width);
 		thumb_max_height = read_int_option(f, option,

--- a/src/slideshow.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/slideshow.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -9,6 +9,7 @@
 #include "gqview.h"
 
 static GList *slide_list = NULL;
+static GList *past_slide_list = NULL;
 static gchar *slide_img = NULL;
 static gchar *slide_path = NULL;
 static gint slide_count = 0;
@@ -23,6 +24,9 @@
 	g_list_free(slide_list);
 	slide_list = NULL;
 
+	g_list_free(past_slide_list);
+	past_slide_list = NULL;
+
 	g_free(slide_path);
 	slide_path = NULL;
 
@@ -88,6 +92,12 @@
 		g_list_free(slide_list);
 		}
 
+	if (past_slide_list)
+		{
+		g_list_free(past_slide_list);
+		past_slide_list = NULL;
+		}
+
 	if (slideshow_random)
 		{
 		slide_list = generate_random_list();
@@ -98,6 +108,26 @@
 		}
 }
 
+static void slideshow_move_list(gint forward)
+{
+	if (forward)
+		{
+		if (slide_list)
+			{
+			past_slide_list = g_list_prepend (past_slide_list, slide_list->data);
+			slide_list = g_list_remove(slide_list, slide_list->data);
+			}
+		}
+	else
+		{
+		if (past_slide_list)
+			{
+			slide_list = g_list_prepend(slide_list, past_slide_list->data);
+			past_slide_list = g_list_remove(past_slide_list, past_slide_list->data);
+			}
+		}
+}
+
 static gint slideshow_should_continue()
 {
 	if (!slide_active || !slide_list || !slide_path ||
@@ -112,11 +142,52 @@
 	return TRUE;
 }
 
-static gint slideshow_loop_cb(gpointer data)
+static gint real_slideshow_prev()
 {
 	gint row;
 	gchar *buf;
 
+	if (!slide_active) return FALSE;
+	if (!past_slide_list || !past_slide_list->next) return TRUE;
+
+	if (!slideshow_should_continue())
+		{
+		slideshow_free_all();
+		slide_timeout_id = -1;
+		return FALSE;
+		}
+
+	slideshow_move_list(FALSE);
+
+	row = GPOINTER_TO_INT(past_slide_list->data);
+
+	g_free(slide_img);
+	slide_img = NULL;
+	buf = file_get_path(row);
+
+	if (slide_sel_list)
+		{
+		image_change_to(buf);
+		update_status_label(NULL);
+		}
+	else
+		{
+		file_image_change_to(row);
+		}
+
+	slide_img = buf;
+
+	return TRUE;
+}
+
+/* the return is TRUE if slideshow should continue */
+static gint real_slideshow_next()
+{
+	gint row;
+	gchar *buf;
+
+	if (!slide_active) return FALSE;
+
 	if (!slideshow_should_continue())
 		{
 		slideshow_free_all();
@@ -129,7 +200,7 @@
 	g_free(slide_img);
 	slide_img = NULL;
 	buf = file_get_path(row);
-	slide_list = g_list_remove(slide_list, slide_list->data);
+	slideshow_move_list(TRUE);
 
 	if (!slide_list && slideshow_repeat)
 		{
@@ -158,6 +229,11 @@
 	return TRUE;
 }
 
+static gint slideshow_loop_cb(gpointer data)
+{
+	return real_slideshow_next();
+}
+
 void slideshow_start()
 {
 	gint row;
@@ -178,7 +254,7 @@
 	g_free(slide_img);
 	slide_img = NULL;
 	buf = file_get_path(row);
-	slide_list = g_list_remove(slide_list, slide_list->data);
+	slideshow_move_list(TRUE);
 
 	if (slide_sel_list)
 		{
@@ -208,6 +284,35 @@
 	update_status_label(NULL);
 }
 
+static void slideshow_reset_timeout(gint reset)
+{
+	if (reset)
+		{
+		if (slide_timeout_id != -1) gtk_timeout_remove(slide_timeout_id);
+		slide_timeout_id = gtk_timeout_add(slideshow_delay * 1000, slideshow_loop_cb, NULL);
+		}
+	else
+		{
+		if (slide_timeout_id != -1)
+			{
+			gtk_timeout_remove(slide_timeout_id);
+			slide_timeout_id = -1;
+			}
+		}
+}
+
+void slideshow_next()
+{
+	if (!slide_active) return;
+	slideshow_reset_timeout(real_slideshow_next());
+}
+
+void slideshow_prev()
+{
+	if (!slide_active) return;
+	slideshow_reset_timeout(real_slideshow_prev());
+}
+
 void slideshow_toggle()
 {
 	if (!slide_active)

--- a/src/tabcomp.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/tabcomp.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *

--- a/src/thumb.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/thumb.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *

--- a/src/utildlg.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/utildlg.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,12 +1,13 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
  */
 
 #include "gqview.h"
+#include "image.h"
 
 static void warning_dialog_close(GtkWidget *w, gpointer data);
 static void warning_dialog_destroy(GtkWidget *w, GdkEvent *event, gpointer data);
@@ -127,12 +128,16 @@
 	gtk_box_pack_start(GTK_BOX(vbox),label,FALSE,FALSE,0);
 	gtk_widget_show(label);
 
+	cd->util_hbox = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), cd->util_hbox, TRUE, TRUE, 0);
+	gtk_widget_show(cd->util_hbox);
+
 	label = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(vbox),label,FALSE,FALSE,0);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
 	cd->hbox = gtk_hbox_new(TRUE, 15);
-	gtk_container_add(GTK_CONTAINER(vbox),cd->hbox);
+	gtk_box_pack_start(GTK_BOX(vbox), cd->hbox, FALSE, FALSE, 0);
 	gtk_widget_show(cd->hbox);
 
 	gtk_widget_show(cd->dialog);
@@ -142,6 +147,62 @@
 	return cd;
 }
 
+ConfirmDialog *confirm_dialog_new_with_image(gchar *title, gchar *message,
+					     gchar *img_path1, gchar *img_path2,
+					     void (*cancel_cb)(GtkWidget *, gpointer), gpointer data)
+{
+	ConfirmDialog *cd;
+	GtkWidget *vbox;
+	GtkWidget *label;
+	ImageWindow *image1;
+	ImageWindow *image2;
+
+	cd = confirm_dialog_new(title, message, cancel_cb, data);
+
+	gtk_widget_set_usize (cd->dialog, 600, 450);
+	gtk_window_set_policy (GTK_WINDOW(cd->dialog), FALSE, TRUE, FALSE);
+
+	gtk_box_set_homogeneous(GTK_BOX(cd->util_hbox), TRUE);
+
+	if (img_path1)
+		{
+		vbox = gtk_vbox_new(FALSE, 5);
+		gtk_box_pack_start(GTK_BOX(cd->util_hbox), vbox, TRUE, TRUE, 0);
+		gtk_widget_show(vbox);
+
+		image1 = image_area_new(NULL);
+		gtk_box_pack_start(GTK_BOX(vbox), image1->eventbox, TRUE, TRUE, 0);
+		image_area_set_image (image1, img_path1, ZOOM_RESET_ORIGINAL);
+		gtk_widget_show_all(image1->eventbox);
+		gtk_object_set_data_full(GTK_OBJECT(image1->eventbox), "image1", image1,
+					 (GtkDestroyNotify)image_area_free);
+
+		label = gtk_label_new(img_path1);
+		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+		gtk_widget_show(label);
+		}
+
+	if (img_path2)
+		{
+		vbox = gtk_vbox_new(FALSE, 5);
+		gtk_box_pack_start(GTK_BOX(cd->util_hbox), vbox, TRUE, TRUE, 0);
+		gtk_widget_show(vbox);
+
+		image2 = image_area_new(NULL);
+		gtk_box_pack_start(GTK_BOX(vbox), image2->eventbox, TRUE, TRUE, 0);
+		image_area_set_image (image2, img_path2, ZOOM_RESET_ORIGINAL);
+		gtk_widget_show_all(image2->eventbox);
+		gtk_object_set_data_full(GTK_OBJECT(image2->eventbox), "image2", image2,
+					 (GtkDestroyNotify)image_area_free);
+
+		label = gtk_label_new(img_path2);
+		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+		gtk_widget_show(label);
+		}
+
+	return cd;
+}
+
 /*
  *-----------------------------------------------------------------------------
  * generic file ops dialog routines

--- a/src/utildlg.h	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/utildlg.h	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -26,7 +26,8 @@
 struct _ConfirmDialog
 {
 	GtkWidget *dialog;
-	GtkWidget *hbox;
+	GtkWidget *util_hbox;	/* place anything you want here */
+	GtkWidget *hbox;	/* buttons */
 	void (*cancel_cb)(GtkWidget *, gpointer);
 	gpointer data;
 };
@@ -35,6 +36,10 @@
 void warning_dialog(gchar *title, gchar *message);
 
 ConfirmDialog *confirm_dialog_new(gchar *title, gchar *message, void (*cancel_cb)(GtkWidget *, gpointer), gpointer data);
+ConfirmDialog *confirm_dialog_new_with_image(gchar *title, gchar *message,
+					     gchar *img_path1, gchar *img_path2,
+					     void (*cancel_cb)(GtkWidget *, gpointer), gpointer data);
+
 void confirm_dialog_add(ConfirmDialog *cd, gchar *text, void (*func_cb)(GtkWidget *, gpointer));
 
 FileDialog *generic_dialog_new(gchar *title, gchar *text, gchar *btn1, gchar *btn2,

--- a/src/utilops.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/utilops.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -156,11 +156,33 @@
 			fdm->source_next = work->next;
 			}
 
-		if (isfile(fdm->dest) && !fdm->confirmed && !fdm->confirm_all && !fdm->skip)
+		if (fdm->dest && fdm->source && strcmp(fdm->dest, fdm->source) == 0)
+			{
+			ConfirmDialog *cd;
+			gchar *title;
+			gchar *text;
+			if (fdm->copy)
+				{
+				title = _("Source to copy matches destination");
+				text = g_strdup_printf(_("Unable to copy file:\n%s\nto itself."), fdm->dest);
+				}
+			else
+				{
+				title = _("Source to move matches destination");
+				text = g_strdup_printf(_("Unable to move file:\n%s\nto itself."), fdm->dest);
+				}
+			cd = confirm_dialog_new(title, text, file_util_move_multiple_cancel_cb, fdm);
+			confirm_dialog_add(cd, _("Continue"), file_util_move_multiple_skip_cb);
+			g_free(text);
+			return;
+			}
+		else if (isfile(fdm->dest) && !fdm->confirmed && !fdm->confirm_all && !fdm->skip)
 			{
 			ConfirmDialog *cd;
 			gchar *text = g_strdup_printf(_("Overwrite file:\n %s\n with:\b %s"), fdm->dest, fdm->source);
-			cd = confirm_dialog_new(_("Overwrite file"), text, file_util_move_multiple_cancel_cb, fdm);
+			cd = confirm_dialog_new_with_image(_("Overwrite file"), text,
+						fdm->dest, fdm->source,
+						file_util_move_multiple_cancel_cb, fdm);
 			confirm_dialog_add(cd, _("Skip"), file_util_move_multiple_skip_cb);
 			confirm_dialog_add(cd, _("Yes to all"), file_util_move_multiple_all_cb);
 			confirm_dialog_add(cd, _("Yes"), file_util_move_multiple_ok_cb);
@@ -255,11 +277,18 @@
 
 static void file_util_move_single(FileDataSingle *fds)
 {
-	if (isfile(fds->dest) && !fds->confirmed)
+	if (fds->dest && fds->source && strcmp(fds->dest, fds->source) == 0)
+		{
+		warning_dialog(_("Source matches destination"),
+			       _("Source and destination are the same, operation cancelled."));
+		}
+	else if (isfile(fds->dest) && !fds->confirmed)
 		{
 		ConfirmDialog *cd;
 		gchar *text = g_strdup_printf(_("Overwrite file:\n%s\n with:\n%s"), fds->dest, fds->source);
-		cd = confirm_dialog_new(_("Overwrite file"), text, file_util_move_single_cancel_cb, fds);
+		cd = confirm_dialog_new_with_image(_("Overwrite file"), text,
+						   fds->dest, fds->source,
+						   file_util_move_single_cancel_cb, fds);
 		confirm_dialog_add(cd, _("Overwrite"), file_util_move_single_ok_cb);
 		g_free(text);
 		return;
@@ -296,8 +325,9 @@
 			warning_dialog(title, text);
 			g_free(text);
 			}
-		file_data_single_free(fds);
 		}
+
+	file_data_single_free(fds);
 }
 
 /*
@@ -618,7 +648,9 @@
 		{
 		ConfirmDialog *cd;
 		gchar *text = g_strdup_printf(_("Overwrite file:\n%s\nby renaming:\n%s"), fd->dest_path, fd->source_path);
-		cd = confirm_dialog_new(_("Overwrite file"), text, file_util_rename_multiple_cancel_cb, fd);
+		cd = confirm_dialog_new_with_image(_("Overwrite file"), text,
+						   fd->dest_path, fd->source_path,
+						   file_util_rename_multiple_cancel_cb, fd);
 		confirm_dialog_add(cd, _("Overwrite"), file_util_rename_multiple_ok_cb);
 		g_free(text);
 		gtk_widget_hide(fd->dialog);
@@ -799,8 +831,10 @@
 	if (isfile(fds->dest) && !fds->confirmed)
 		{
 		ConfirmDialog *cd;
-		gchar *text = g_strdup_printf(_("Overwrite file:\n%s\nwith:\n%s"), fds->dest,fds->source);
-		cd = confirm_dialog_new(_("Overwrite file"), text, file_util_rename_single_cancel_cb, fds);
+		gchar *text = g_strdup_printf(_("Overwrite file:\n%s\nby renaming:\n%s"), fds->dest,fds->source);
+		cd = confirm_dialog_new_with_image(_("Overwrite file"), text,
+						   fds->dest, fds->source,
+						   file_util_rename_single_cancel_cb, fds);
 		confirm_dialog_add(cd, _("Overwrite"), file_util_rename_single_ok_cb);
 		g_free(text);
 		return;

--- a/src/window.c	Thu Apr 13 12:53:03 2000 +0000
+++ b/src/window.c	Thu Apr 13 12:55:19 2000 +0000
@@ -1,6 +1,6 @@
 /*
  * GQview image viewer
- * (C)1999 John Ellis
+ * (C)2000 John Ellis
  *
  * Author: John Ellis
  *
@@ -354,6 +354,7 @@
 
 	/* path entry */
 	tabcomp = tab_completion_new(&path_entry, mainwindow, NULL, path_entry_cb, NULL);
+	tab_completion_add_tab_func(path_entry, path_entry_tab_cb, NULL);
 	gtk_box_pack_start (GTK_BOX (tool_vbox), tabcomp, FALSE, FALSE, 0);
 	gtk_widget_show (tabcomp);