WHEEEEE! 0.6.0 is almost here.. man, i should update cvs more often, instead of letting my code sit on my harddrive un commited.. like, anything could happen.. anyway, fixed buffer, tided up search stuff, prefernces propblems fixed, bug fixes, etc, etc..GEDIT-0-6-0

45 files changed, 2550 insertions, 2505 deletions

diff --git a/ChangeLog b/ChangeLog
index ea5880c90..58206fd48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+Wed Nov 17 16:36:35 GMT 1999  Alex Roberts  <bse@gedit.pn.org>
+
+	* gedit.spec.in: Added FAQ and the new TODO file to the docs
+	  list.. no wonder ppl keep emailing me with questions answered
+	  in the FAQ. =]
+
+Wed Nov 17 16:17:04 GMT 1999  Alex Roberts  <bse@gedit.pn.org>
+
+	* makeconfig.pl: 0.6.0pre -> 0.6.0 .... we're almost there!
+	
+	* README: Finally, we're at 0.6.0 =]
+	
+	* NEWS: Added 0.6.0 ANNOUNCE message
+
+Tue Nov 16 16:32:46 GMT 1999  Alex Roberts  <bse@gedit.pn.org>
+
+	* TODO-road_to_1.0.0: Marked off "Remove legacy code" as done.
+	  I thnk we're almost there for 0.6.0
+	
+	* FAQ: Removed cruft from this file, and semi-answered the first
+	  question
+	
+	* makeconfig.pl: added gl to ALL_LINGUAS
+
+Tue Nov 16 16:07:10 GMT 1999  Alex Roberts  <bse@gedit.pn.org>
+
+	* Makefile.am: Added TODO-road_to_1.0.0 to the extra dist.
+	
+	* commands.c: Removed all scrollbar setting code.. automatic 
+	  scrollbar is always used now
+	
+	* menus.c: Removed scrollbar submenu form settings menu
+	  (gE_set_menu_toggle_states), ({add,remove}_callback_data)
+	   Removed now unused, legacy, functions.
+	  (gE_menus_init) Tidied it up a bit
+	
+	* gE_prefs.c: Remvoed scrollbar settings (they didnt save anyway,
+	  probably due to the fact the setting isnt an integer, its an 
+	  enum).
+
+Tue Nov 16 15:12:58 GMT 1999  Alex Roberts  <bse@gedit.pn.org>
+
+	* ChangeLog: Fixed some of the earlier entries, the names seem to
+	  have vanished. On another note of interest, i just did a grep
+	  of this file and there are currently 370 entries.. eeek!
+
+Tue Nov 16 14:54:40 GMT 1999  Alex Roberts  <bse@gedit.pn.org>
+
+	* src/gE_prefs.h: Added a word_wrap flag to the preferences struct.
+	
+	* src/gE_prefs.c: (gE_save_settings) (gE_get_settings) Save and load
+	  word_wrap setting.
+	
+	* src/gE_prefs_box.c: (gE_apply) Store the word_wrap setting
+	  (gE_window_refresh) Refresh the word_wrap setting by calling te
+	  gE_view set_word_wrap function.
+	  (get_prefs) Get the word_wrap toggle state
+	
+	* src/gE_view.c: (gE_view_set_word_wrap) Set both the main text pane
+	  and hte split screen
+	  (gE_view_init) Make the signal connection for the split screen
+	  auto indent a regular signal conenction.
+	
+	* KNOWNBUGS: Added note about auto indent and multiple views.
+
 Sat Nov 13 14:17:38 GMT 1999  Alex Roberts  <bse@gedit.pn.org>
 
 	* makeconfig.pl: Upped version number to 0.6.0pre
@@ -3384,12 +3449,12 @@ Thu Aug 20 20:25:57 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* main.h: #included <stdio.h> to get declaration of size_t.
 
-1998-05-28   <bse@dial.pipex.com>
+1998-05-28  Alex Roberts  <bse@dial.pipex.com>
 
 	* Thanx to Eli Miller (spooge, his IRC nick) gEdit will now
 	  re-size smaller than its startup size :)
 
-1998-05-26   <evan@worldpath.net>
+1998-05-26  Evan Lawrence  <evan@worldpath.net>
 
 	* Fixed >2 New file bug
 
@@ -3400,7 +3465,7 @@ Thu Aug 20 20:25:57 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* Synced the Options menu between the GNOME and non-GNOME versions
 
-1998-05-26   <bse@dial.pipex.com>
+1998-05-26  Alex Roberts  <bse@dial.pipex.com>
 
 	* Released 0.4.0 (Non-GNOME)
 
@@ -3408,11 +3473,11 @@ Thu Aug 20 20:25:57 1998  Owen Taylor  <otaylor@redhat.com>
 	  Currently, it will keep the Tab Position, and if the Statusbar is
 	  visible or not...
 
-1998-05-15   <bse@dial.pipex.com>
+1998-05-15  Alex Roberts  <bse@dial.pipex.com>
 
 	* Print partially implemented...
 
-1998-05-13   <bse@dial.pipex.com>
+1998-05-13  Alex Roberts  <bse@dial.pipex.com>
 
 	* Removed a piece of annoying debugging code...
 
@@ -3420,25 +3485,25 @@ Thu Aug 20 20:25:57 1998  Owen Taylor  <otaylor@redhat.com>
 	
 	* Fixed some errors in man page...
 
-1998-05-12   <bse@dial.pipex.com>
+1998-05-12  Alex Roberts  <bse@dial.pipex.com>
 
 	* Updated the README/AUTHORS files to my new email address
 	  (bse@dial.pipex.com)
 
 	* Upped version number to 0.4, ready for next release
 
-1998-05-10   <evan@worldpath.net>
+1998-05-10  Evan Lawrence  <evan@worldpath.net>
 
 	* Fixed the bug with gEdit not asking if you want to save modified files when you quit...
 	  It's a bit of a hack, but I didn't feel like rewriting a lot of the code from the close routine..
 
-1998-05-09  <bse@dial.pipex.com>
+1998-05-09  Alex Roberts  <bse@dial.pipex.com>
 
 	* Added GNOME version number to the title, it looks better with a version number i feel...
 	
 	* Fixed segfault on startup when using GTK+ 1.1. Hopefully, the bug has gone...
 
-1998-05-03  <bse@dial.pipex.com>
+1998-05-03  Alex Roberts  <bse@dial.pipex.com>
 
 	* Fixed the sigsegv when loading a file from the cmd line.
 	   This does break the (already broken because of the .gnome/gtkrc) font settings
@@ -3447,7 +3512,7 @@ Sun May 03 03:17:13  Kjartan Maraas  <kmaraas@fib.hl.no>
 
 	* .cvsignore: New file. Added some files to it as well.
 	
-1998-05-02   <bse@dial.pipex.com>
+1998-05-02  Alex Roberts  <bse@dial.pipex.com>
 
 	* Improved the description of gEdit in the About Box...
 
@@ -3459,12 +3524,12 @@ Sun May 03 03:17:13  Kjartan Maraas  <kmaraas@fib.hl.no>
 
 	* robo@earthling.net -> bse@dial.pipex.com     (robo doesn't work anymore)
 
-1998-04-29   <evan@worldpath.net>
+1998-04-29  Evan Lawrence  <evan@worldpath.net>
 
 	* Several changes in the past few days - you can toggle autoindent,
 	  wordwrap, the document tabs, and the statusbar now.. Other misc stuff...
 
-1998-04-20   <evan@worldpath.net>
+1998-04-20  Evan Lawrence  <evan@worldpath.net>
 
 	* Made some more changes to the statusbar
 	
@@ -3473,12 +3538,12 @@ Sun Apr 19 17:03:15 1998  Havoc Pennington  <hp@pobox.com>
 	* Makefile.in, configure, aclocal.m4: Removed automatically
 	generated files. Hope this is OK.
 
-1998-04-19   <robo@earthling.net>
+1998-04-19  Alex Roberts  <robo@earthling.net>
 
 	* Changed application class to gEdit.gedit (from gedit.Gedit), to help with
 	  window managers (e.g WindowMaker)
 
-1998-04-19   <robo@earthling.net>
+1998-04-19  Alex Roberts  <robo@earthling.net>
 
 	* Fixed the configure.in script to include the GTK+ include directories,
 	  (/usr/local/include/glib, etc), and YES we _are_ using gtk-config to
@@ -3490,7 +3555,7 @@ Sun Apr 19 17:03:15 1998  Havoc Pennington  <hp@pobox.com>
        -* Flickering of the Line/Column fixed (evan@worldpath.net)
        -* If file from command line doesn't exist, gEdit creates it (evan)
 
-1998-04-16   <robo@earthling.net>
+1998-04-16  Alex Roberts  <robo@earthling.net>
 
 	* Implemented Line/Column display, buggy though, and the Line counter only counts up to the
           height of the text box, so, it doesn't really work(probably to do with the Text Widget,
@@ -3503,7 +3568,7 @@ Sun Apr 19 17:03:15 1998  Havoc Pennington  <hp@pobox.com>
 
 	* Added gEdit.desktop for GNOME Panel, for a little GNOMEification of gEdit
 
-1998-04-15   <robo@earthling.net>
+1998-04-15  Alex Roberts  <robo@earthling.net>
 
 	* Added keyboard shortcuts to the search and the 
 	  search and replace commands...
@@ -3511,7 +3576,7 @@ Sun Apr 19 17:03:15 1998  Havoc Pennington  <hp@pobox.com>
 	* Improved the About box: added homepage, and GTK Version
 	  labels, and added gEdit icon...
 
-1998-04-13   <robo@earthling.net>
+1998-04-13  Alex Roberts  <robo@earthling.net>
 
 	* Changed File Close shortcut to Alt-W...
 
@@ -3519,11 +3584,11 @@ Sun Apr 19 17:03:15 1998  Havoc Pennington  <hp@pobox.com>
 	  (Which also fixes the Sigsegv when closing files from the command
 	   line)...
 
-1998-04-06   <robo@earthling.net>
+1998-04-06  Alex Roberts  <robo@earthling.net>
 
 	* Added statusbar code
 
-1998-04-04   <robo@earthling.net>
+1998-04-04  Alex Roberts  <robo@earthling.net>
 
 	* Released 0.3.2
 
@@ -3532,11 +3597,11 @@ Sun Apr 19 17:03:15 1998  Havoc Pennington  <hp@pobox.com>
 	* Added 2 icons to distribution, one by me, and one by joatman
 	  (joatman@base.org)
 
-1998-04-01   <robo@earthling.net>
+1998-04-01  Alex Roberts  <robo@earthling.net>
 
 	* Added man page to distribution
 
-1998-03-28   <robo@earthling.net>
+1998-03-28  Alex Roberts  <robo@earthling.net>
 
 	* Released 0.3.1
 
@@ -3552,61 +3617,61 @@ Sun Apr 19 17:03:15 1998  Havoc Pennington  <hp@pobox.com>
 	  open a file using a command like 'gedit
 	  /etc/resolv.conf' that's fixed...
 
-1998-03-26   <robo@earthling.net>
+1998-03-26  Alex Roberts  <robo@earthling.net>
 
 	* A file opened from the commandline, the tab no longer shows the
 	  './' before the filename...
 
-1998-03-25   <robo@earthling.net>
+1998-03-25  Alex Roberts  <robo@earthling.net>
 	* Released 0.3
 
 	* Fixed the command line opening bug, now it inserts a './' so when
 	  it saves, all it erases from the tab is the './', instead of the
 	  whole filename.
 
-1998-03-24   <evan@worldpath.net>
+1998-03-24  Evan Lawrence  <evan@worldpath.net>
 
 	* It no longer dies a horrible death when you try to save empty
 	  files (thanks to Taneli) and behaves quite normally when you open
 	  a binary file...
 
-1998-03-23   <evan@worldpath.net>
+1998-03-23  Evan Lawrence  <evan@worldpath.net>
 
 	* OK, I think I'm done with search and replace, it now
 	  has the option to ask before replacing. Next up: fix the binary
 	  file bug and apply the patch from Taneli...
 
-1998-03-22   <evan@worldpath.net>
+1998-03-22  Evan Lawrence  <evan@worldpath.net>
 
 	* Just about done with search and replace, just a few niceties to
 	  add..
 
-1998-03-15    <evan@worldpath.net>
+1998-03-15  Evan Lawrence  <evan@worldpath.net>
 
 	* Close will now ask if you want to save
 	  before closing a modified file...
 
-1998-03-15    <robo@earthling.net>
+1998-03-15  Alex Roberts  <robo@earthling.net>
 
 	* Woohoo! preferences work!! Now it will read and write ~/.gedit!! :)
  	  You can change the font of the text box (still need to restart
 	  gEdit tho,and when you put the text font dialog box up, it puts
 	  it back to the default!)
 
-1998-03-13    <evan@worldpath.net>
+1998-03-13  Evan Lawrence  <evan@worldpath.net>
 
 	* Fixed the save bug... document->filename
 	  was going out of scope...
 
-1998-03-10    <evan@worldpath.net>
+1998-03-10  Evan Lawrence  <evan@worldpath.net>
 
 	* Fixed those incredibly annoying close bugs
 
-1998-03-07    <robo@earthling.net>
+1998-03-07  Alex Roberts  <robo@earthling.net>
 
 	* Command line options added
 
-1998-03-05    <robo@earthling.net>
+1998-03-05  Alex Roberts  <robo@earthling.net>
 
 	* 0.2 -> 0.2.1
 
diff --git a/FAQ b/FAQ
index 9861b58d2..0b18bc2bd 100644
--- a/FAQ
+++ b/FAQ
@@ -1,11 +1,12 @@
-gEdit 0.5.x FAQ
+gEdit 0.6.x FAQ
 
 Add stuff to this, it's not complete.. 
 
 1) Q. I get a 'Broken Pipe' on startup, nothing happens.
    
-   A. <Needs answering..>
-
+   A. This seems to be related to using gnome-session, compelte gnome-session
+      integration is on the TODO list.
+   
 2) Q. I want syntax highlighting.. when will it be included?
 
    A. Currently, the Gtk+ Text widget isn't suitable for this feature to be
@@ -25,5 +26,3 @@ Add stuff to this, it's not complete..
 5) Q. Are you really the 16 year old son of Janet Roberts?
 
    A. YES!! I am!.. I am not a University student (yet.. hehe)		(Alex)
-
-6) <More Questions..>   
\ No newline at end of file
diff --git a/KNOWNBUGS b/KNOWNBUGS
index 7b2c8402e..8e0eec541 100644
--- a/KNOWNBUGS
+++ b/KNOWNBUGS
@@ -9,4 +9,4 @@ Known bugs in the current version of gEdit:
 	* Deleting a line will sometimes make the next line down dissappear,
 	  until you highlight it.
 
-	* The Line counter has a problem with the first 2 lines of a docuemnt.
\ No newline at end of file
+	* There are issues with auto indent and multiple views of a document
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 30e07d97f..048c4a8d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = macros po intl src editor-plugins help
 
 EXTRA_DIST = KNOWNBUGS FAQ ChangeLog README README.plugins			\
 	INSTALL gedit.1 gE-icon-1.xpm gE-icon-2.xpm gedit.desktop	\
-	ABOUT-NLS TODO gedit.spec.in gedit.keys
+	ABOUT-NLS TODO TODO-road_to_1.0.0 gedit.spec.in gedit.keys
 
 man_MANS = gedit.1
 
diff --git a/NEWS b/NEWS
index f67d96909..f16d60f14 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+ANNOUNCE 0.6.0 (Demanufacture)  (1999-11-17)
+------------------------------
+gEdit 0.6.0 "Demanufacture" Is now Available.
+And so begins the long awaited 0.6.x stable series.
+
+0.5.5 had some major bugs, that have now been fixed and we're working on making
+this series as stable as possible (as well as beginnign work on the 0.9 series,
+otherwise known as "The Road To 1.0.0"). 0.6 will continue on as the main stable
+platform of gEdit, until the 0.9 series has been completed and 1.0.0 is launched.
+
+Changes
+=======
+	* Minor overhaul of the buffer system, made it more reliable and
+	  stable.
+	
+	* Small code overhaul, removing now obsolete and un-used code.
+	
+	* Updated plugins (Wordcount now sports a nice GTK+ based interface).
+	
+	* Stability improving bug fixes for your pleasure
+
+
+Downloads are available at http://gedit.pn.org
+
+I hope you enjoy using thsi software, comments, suggestions and bug fixes are 
+appreciated. Informtaion on the mailing list is available at the above URL.
+
+Thank you
+	- Alex Roberts <bse@gedit.pn.org>
+
+
 ANNOUNCE 0.5.5 (Undead)  (1999-10-20)
 -----------------------
 gEdit 0.5.5 "Undead" is now Available. Codenamed Undead because, well, i wanted
diff --git a/README b/README
index 2d5ca8153..d8ce74635 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-gEdit 0.5.5
+gEdit 0.6.0
 Alex Roberts and Evan Lawrence, 1998, 1999
 
 INTRODUCTION
diff --git a/TODO-road_to_1.0.0 b/TODO-road_to_1.0.0
index e2513bb49..93538d3c9 100644
--- a/TODO-road_to_1.0.0
+++ b/TODO-road_to_1.0.0
@@ -7,9 +7,9 @@ Road to 1.0.0
 (DONE)	  - Redo the buffer system, ie, only update it when it
 	    is required (eg, adding views, saving, etc)
 	  
-	  - Remove old, legacy, code; as far as possible
+(DONE)	  - Remove old, legacy, code; as far as possible
 	  
-	  - fix bugs! no really, i;m seeing it like this, if a
+(DONE)	  - fix bugs! no really, i;m seeing it like this, if a
 	    bug is there, and it can be fixed then we fix it; if
 	    its either a non critical feature or something that
 	    is a btich to fix - then we remove it entirely.
diff --git a/gedit.spec.in b/gedit.spec.in
index f6415199c..97d76fcad 100644
--- a/gedit.spec.in
+++ b/gedit.spec.in
@@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 
-%doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL THANKS
+%doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL THANKS TODO-road_to_1.0.0 FAQ
 %{prefix}/bin/gedit
 %{prefix}/share/*
 #%{prefix}/share/locale/*/*/*
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/*
 
 %changelog
+* Wed Nov 17 16:35:29 GMT 1999 Alex Roberts <bse@gedit.pn.org>
+- Updated doc's to be included in RPM
+
 * Sat Feb 06 1999 Michael Johnson <johnsonm@redhat.com>
 - Cleaned up a bit for Red Hat use
 
diff --git a/gedit/commands.c b/gedit/commands.c
index 027940a52..d15a8457c 100644
--- a/gedit/commands.c
+++ b/gedit/commands.c
@@ -184,73 +184,6 @@ tab_toggle_cb(GtkWidget *widget, gpointer cbwindow)
 }
 */
 
-/* Scrollbar Options */
-void
-scrollbar_none_cb (GtkWidget *widget, gpointer cbdata)
-{
-	int c, w;
-
-	for (c = 0; c < g_list_length (mdi->children); c++) {
-	
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_NEVER);
-
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_NEVER);
-        
-        }
-         
-        settings->scrollbar = GTK_POLICY_NEVER;
-        
-}
-
-void
-scrollbar_always_cb (GtkWidget *widget, gpointer cbdata)
-{
-	int c, w;
-
-	for (c = 0; c < g_list_length (mdi->children); c++) {
-	
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_ALWAYS);
-
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_ALWAYS);
-        }
-        
-        settings->scrollbar = GTK_POLICY_ALWAYS;
-
-}
-
-void
-scrollbar_auto_cb (GtkWidget *widget, gpointer cbdata)
-{
-	int c, w;
-
-	for (c = 0; c < g_list_length (mdi->children); c++) {
-	
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_AUTOMATIC);
-
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_AUTOMATIC);
-        }
-        
-        settings->scrollbar = GTK_POLICY_NEVER;
-        
-}
 
 /* ---- Auto-indent Callback(s) --- */
 
diff --git a/gedit/gE_prefs.c b/gedit/gE_prefs.c
index 83cec2fbb..093ed24a1 100644
--- a/gedit/gE_prefs.c
+++ b/gedit/gE_prefs.c
@@ -36,6 +36,7 @@ gE_save_settings()
 
 	gnome_config_set_int ("tab pos", (gint) mdi->tab_pos);
 	gnome_config_set_int ("auto indent", (gboolean) settings->auto_indent);
+	gnome_config_set_int ("word wrap", (gboolean) settings->word_wrap);
 	gnome_config_set_int ("show statusbar", (gboolean) settings->show_status);
 	gnome_config_set_int ("toolbar", (gint) settings->have_toolbar);
 	gnome_config_set_int ("tb text", (gint) settings->have_tb_text);
@@ -44,7 +45,6 @@ gE_save_settings()
 	gnome_config_set_int ("splitscreen", (gint) settings->splitscreen);
 	gnome_config_set_int ("close doc", (gint) settings->close_doc);
 	gnome_config_set_int ("mdi mode", mdiMode);
-	gnome_config_set_int ("scrollbar", settings->scrollbar);
 	gnome_config_set_string ("font", settings->font);
 	gnome_config_set_int ("width", (gint) settings->width);
 	gnome_config_set_int ("height", (gint) settings->height);
@@ -69,6 +69,8 @@ void gE_get_settings()
 	gnome_config_push_prefix ("/gEdit/Global/");
 	 
 	mdi->tab_pos = gnome_config_get_int ("tab pos");
+	settings->auto_indent = gnome_config_get_int ("auto indent");
+	settings->word_wrap = gnome_config_get_int ("word wrap");
 	settings->run = gnome_config_get_int ("run");
 	settings->show_status = gnome_config_get_int ("show statusbar");
 	settings->have_toolbar = gnome_config_get_int ("toolbar");
@@ -81,10 +83,6 @@ void gE_get_settings()
 	if (!mdiMode)
 	  mdiMode = mdi_type[GNOME_MDI_NOTEBOOK];
 	   
-	settings->scrollbar = gnome_config_get_int ("scrollbar");
-	if (!settings->scrollbar)
-	  settings->scrollbar = GTK_POLICY_AUTOMATIC;
-	 
 	settings->width = gnome_config_get_int ("width");
 	if (!settings->width)
 	  settings->width = 630;
diff --git a/gedit/gE_prefs.h b/gedit/gE_prefs.h
index a301733c6..7454ed6c0 100644
--- a/gedit/gE_prefs.h
+++ b/gedit/gE_prefs.h
@@ -26,6 +26,7 @@ extern void gE_rc_parse(void);
 typedef struct _gE_preference {
 
 	guint auto_indent;
+	gint word_wrap;
 	gint show_tabs;
 	gint tab_pos;
 	guint show_status;
@@ -40,7 +41,6 @@ typedef struct _gE_preference {
 	gint num_recent; /* Number of recently accessed documents in the 
 	                   Recent Documents menu */
 	gint mdi_mode;
-	gint scrollbar;
 	
 	gint width, height;
 	
diff --git a/gedit/gE_prefs_box.c b/gedit/gE_prefs_box.c
index fa61f0fc1..c3882bc56 100644
--- a/gedit/gE_prefs_box.c
+++ b/gedit/gE_prefs_box.c
@@ -163,6 +163,7 @@ void gE_window_refresh(gE_window *w)
 	    nth_view = g_list_nth_data (doc->views, j);
 
   	    gE_view_set_font (nth_view, settings->font);
+  	    gE_view_set_word_wrap (nth_view, settings->word_wrap);
   	    
   	  }
 
@@ -182,6 +183,7 @@ void gE_apply(GnomePropertyBox *pbox, gint page, gE_data *data)
 	settings->auto_indent = (GTK_TOGGLE_BUTTON (prefs->autoindent)->active);
 	settings->show_status = (GTK_TOGGLE_BUTTON (prefs->status)->active);  
 	GE_VIEW (mdi->active_view)->splitscreen = (GTK_TOGGLE_BUTTON (prefs->split)->active);
+	settings->word_wrap = (GTK_TOGGLE_BUTTON (prefs->wordwrap)->active);
 
 	/* Print Settings */
 	settings->print_cmd = g_strdup (gtk_entry_get_text (GTK_ENTRY(prefs->pcmd)));
@@ -244,6 +246,8 @@ void get_prefs(gE_data *data)
 							 settings->show_status);
 	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (prefs->split),
 							 GE_VIEW (mdi->active_view)->splitscreen);
+	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (prefs->wordwrap),
+							 settings->word_wrap);
   					   
 	
 	if (!settings->close_doc)
diff --git a/gedit/gE_view.c b/gedit/gE_view.c
index 1de8c305b..68047d54b 100644
--- a/gedit/gE_view.c
+++ b/gedit/gE_view.c
@@ -665,7 +665,7 @@ static void gE_view_init (gE_view *view)
 
 	view->text = gtk_text_new(NULL, NULL);
 	gtk_text_set_editable(GTK_TEXT(view->text), !view->read_only);
-	gtk_text_set_word_wrap(GTK_TEXT(view->text), view->word_wrap);
+	gtk_text_set_word_wrap(GTK_TEXT(view->text), settings->word_wrap);
 	gtk_text_set_line_wrap(GTK_TEXT(view->text), view->line_wrap);
 
 	
@@ -679,8 +679,8 @@ static void gE_view_init (gE_view *view)
 
 
 	/* Handle Auto Indent */
-	gtk_signal_connect_after (GTK_OBJECT(view->text), "insert_text",
-		GTK_SIGNAL_FUNC(auto_indent_cb), view);
+	view->indent = gtk_signal_connect_after (GTK_OBJECT(view->text), "insert_text",
+										 GTK_SIGNAL_FUNC(auto_indent_cb), view);
 
 	/*	
 	I'm not even sure why these are here.. i'm sure there are much easier ways
@@ -727,7 +727,7 @@ static void gE_view_init (gE_view *view)
 
 	view->split_screen = gtk_text_new(NULL, NULL);
 	gtk_text_set_editable(GTK_TEXT(view->split_screen), !view->read_only);
-	gtk_text_set_word_wrap(GTK_TEXT(view->split_screen), view->word_wrap);
+	gtk_text_set_word_wrap(GTK_TEXT(view->split_screen), settings->word_wrap);
 	gtk_text_set_line_wrap(GTK_TEXT(view->split_screen), view->line_wrap);
 
 	
@@ -748,8 +748,9 @@ static void gE_view_init (gE_view *view)
 				                     GTK_SIGNAL_FUNC(doc_delete_text_cb),
 				                     (gpointer) view);
 
-	gtk_signal_connect_after(GTK_OBJECT(view->split_screen),
-		"insert_text", GTK_SIGNAL_FUNC(auto_indent_cb), view);
+	view->s_indent = gtk_signal_connect (GTK_OBJECT(view->split_screen), "insert_text",
+	                                    GTK_SIGNAL_FUNC(auto_indent_cb),
+	                                    (gpointer) view);
 				
 	gtk_container_add (GTK_CONTAINER (view->scrwindow[1]), view->split_screen);
 
@@ -908,7 +909,8 @@ void gE_view_set_word_wrap (gE_view *view, gint word_wrap)
 
 	view->word_wrap = word_wrap;
 
-	gtk_text_set_word_wrap (GTK_TEXT (view->text), view->word_wrap);
+	gtk_text_set_word_wrap (GTK_TEXT (view->text), word_wrap);
+	gtk_text_set_word_wrap (GTK_TEXT (view->split_screen), word_wrap);
 
 }
 
@@ -973,7 +975,6 @@ void gE_view_set_font (gE_view *view, gchar *font)
 
 }
 
-
 void gE_view_set_position (gE_view *view, gint pos)
 {
 
diff --git a/gedit/menus.c b/gedit/menus.c
index 6e577bf1e..6b28bf5d6 100644
--- a/gedit/menus.c
+++ b/gedit/menus.c
@@ -145,24 +145,6 @@ GnomeUIInfo gedit_tab_menu []= {
 
 };
 
-GnomeUIInfo gedit_scrbar_menu []= {
-
-	{ GNOME_APP_UI_ITEM, N_("_None"),
-	  N_("Don't have a scrollbar"),
-	  scrollbar_none_cb, NULL },
-
-	{ GNOME_APP_UI_ITEM, N_("A_lways"),
-	  N_("Always have the scrollbar"),
-	  scrollbar_always_cb, NULL },
-
-	{ GNOME_APP_UI_ITEM, N_("_Automatic"),
-	  N_("Only have scrollbar when it's needed"),
-	  scrollbar_auto_cb, NULL },
-
-	GNOMEUIINFO_END
-
-};
-
 
 GnomeUIInfo gedit_settings_menu []= {
 /* -- These settings are in the Preferences Box, and only need to be
@@ -203,9 +185,6 @@ GnomeUIInfo gedit_settings_menu []= {
 	{ GNOME_APP_UI_SUBTREE, N_("_Document Tabs"),
 	  N_("Change the placement of the document tabs"), &gedit_tab_menu },
 	  
-	{ GNOME_APP_UI_SUBTREE, N_("_Scrollbar"),
-	  N_("Change visibility options of the scrollbar"), &gedit_scrbar_menu },
-
 	GNOMEUIINFO_SEPARATOR,
 
 	{ GNOME_APP_UI_ITEM, N_("Sa_ve Settings"),
@@ -277,128 +256,8 @@ GnomeUIInfo gedit_menu [] = {
 
 GnomeUIInfo * gE_menus_init (gE_window *window, gE_data *data)
 {
-/*	add_callback_data (gedit_file_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_edit_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_tab_menu, window, data);
-	add_callback_data (gedit_settings_menu,GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_window_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_docs_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_help_menu, GNOME_APP (mdi->active_window), data);
-*/
+
 	gnome_app_create_menus (GNOME_APP (mdi->active_window), gedit_menu);
 
-/*	remove_callback_data (gedit_file_menu, GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_edit_menu, GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_tab_menu, GNOME_APP (mdi->active_window),data);
-       remove_callback_data (gedit_settings_menu,GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_window_menu,GNOME_APP (mdi->active_window),data);
-	remove_callback_data (gedit_docs_menu, GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_help_menu, GNOME_APP (mdi->active_window), data);
-*/
 	return (GnomeUIInfo *) gedit_menu;
 }
-
-/*
- * This function initializes the toggle menu items to the proper states.
- * It is called from gE_window_nwe after the settings have been loaded.
- */
-void
-gE_set_menu_toggle_states()
-{
-
-	gE_document *doc;
-	gE_view *view;
-	int i;
-
-#define GE_SET_TOGGLE_STATE(item, l, boolean)                            \
-  if (!strcmp(item.label, l))                                            \
-    GTK_CHECK_MENU_ITEM (item.widget)->active = boolean
-
-  /*
-   * Initialize the states of the document tabs menu...
-   * FIXME: This is borked right now.. does GnomeMDI need this? 
-   *  	    An addition to the prefs box would be better..
-   */
-/*  for (i = 0; gedit_tab_menu[i].type != GNOME_APP_UI_ENDOFINFO; i++)
-    {
-      if (gedit_tab_menu[i].label)
-	{
-	  GE_SET_TOGGLE_STATE(gedit_tab_menu[i], GE_TOGGLE_LABEL_SHOWTABS,
-			      settings->show_tabs);
-	  
-	}
-    }*/
-
-
-  /*
-   * The settings menu...
-   */
-	for (i = 0; gedit_settings_menu[i].type != GNOME_APP_UI_ENDOFINFO; i++) {
-
-	  if (gedit_settings_menu[i].label) {
-
-	    GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_AUTOINDENT),
-						settings->auto_indent);
-
-	    GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_STATUSBAR),
-						settings->show_status);
-
-            if ((doc = gE_document_current ())) {
-
-	      view = GE_VIEW (mdi->active_view);
-          
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_WORDWRAP),
-						view->word_wrap);
-
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_LINEWRAP),
-						view->line_wrap);
-
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_READONLY),
-						view->read_only);
-
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_SPLITSCREEN),
-						view->splitscreen);
-
-	    }
-
-	}
-
-    }
-
-}
-
-void add_callback_data (GnomeUIInfo *menu, gE_window *window, gE_data *data)
-{
-
-	int i = 0;
-
-	while (menu[i].type != GNOME_APP_UI_ENDOFINFO) {
-
-		if (menu[i].user_data == (gpointer)GE_DATA)
-		  menu[i].user_data = data;
-		if (menu[i].user_data == (gpointer)GE_WINDOW)
-		  menu[i].user_data = window;
-
-		i++;
-
-	}
-
-}
-
-void remove_callback_data (GnomeUIInfo *menu, gE_window *window, gE_data *data)
-{
-
-	int i = 0;
-
-	while (menu[i].type != GNOME_APP_UI_ENDOFINFO) {
-
-		if (menu[i].user_data == data)
-			menu[i].user_data = (gpointer) GE_DATA;
-		if (menu[i].user_data == window)
-			menu[i].user_data = (gpointer) GE_WINDOW;
-
-		i++;
-
-	}
-
-}
diff --git a/gedit/menus.h b/gedit/menus.h
index 83eb38865..e61c6c781 100644
--- a/gedit/menus.h
+++ b/gedit/menus.h
@@ -26,7 +26,6 @@ extern "C" {
 extern GnomeUIInfo gedit_menu [];
 
 extern GnomeUIInfo * gE_menus_init(gE_window *window, gE_data *data);
-void gE_set_menu_toggle_states();
    
 #ifdef __cplusplus
 }
diff --git a/gedit/search.c b/gedit/search.c
index c83820883..f73eb2cb5 100644
--- a/gedit/search.c
+++ b/gedit/search.c
@@ -537,8 +537,10 @@ find_in_file_search
 	    		get_start_index_of_line (view, i)
 	    	);
 	    counter++;
+	    
 	  }	 
 	  g_free (buffer);
+	  
 	}
 	return counter;	
 }
diff --git a/makeconfig.pl b/makeconfig.pl
index 4eef49226..21b908888 100755
--- a/makeconfig.pl
+++ b/makeconfig.pl
@@ -12,7 +12,7 @@ print MAKEFILE << 'EOF';
 dnl This is a generated file.  Please see makeconfig.pl.
 AC_INIT(src/gedit.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gedit, 0.6.0pre)
+AM_INIT_AUTOMAKE(gedit, 0.6.0)
 
 AM_MAINTAINER_MODE
 AM_ACLOCAL_INCLUDE(macros)
@@ -73,7 +73,7 @@ dnl AC_CHECK_LIB(zvt, zvt_term_new, have_libzvt=yes, have_libzvt=no, $GNOMEUI_LI
 AM_CONDITIONAL(HAVE_LIBZVT, test x$have_libzvt = xyes)
 
 
-ALL_LINGUAS="cs da de es fr ga it ja ko nl no pt pt_BR ru sv uk wa zh_TW.Big5 pl"
+ALL_LINGUAS="cs da de es fr ga it ja ko nl no pt pt_BR ru sv uk wa zh_TW.Big5 pl gl"
 AM_GNU_GETTEXT
 
 
diff --git a/po/cs.po b/po/cs.po
index 4c8786ee9..faab4da2e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-08-09 20:17+0100\n"
 "Last-Translator: Unknown :-(\n"
 "Language-Team: \n"
@@ -23,49 +23,49 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr ""
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr ""
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr ""
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, c-format
 msgid "Save %s As..."
 msgstr ""
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, c-format
 msgid "Save %s As ..."
 msgstr ""
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr ""
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr ""
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr ""
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "Soubor"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 #, fuzzy
 msgid "_File"
 msgstr "Soubor"
@@ -114,16 +114,16 @@ msgstr ""
 msgid "Remove view of the document"
 msgstr ""
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr ""
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr ""
 
@@ -143,130 +143,130 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr ""
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr ""
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr ""
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr ""
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr ""
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr ""
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr ""
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr ""
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr ""
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr ""
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr ""
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr ""
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr ""
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr ""
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr ""
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr ""
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr ""
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr ""
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr ""
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr ""
 
@@ -416,60 +416,27 @@ msgstr ""
 msgid "Put the document tabs on the right"
 msgstr ""
 
-#: src/menus.c:150
-#, fuzzy
-msgid "_None"
-msgstr "Nový"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr ""
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr ""
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr ""
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr ""
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr ""
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr ""
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr ""
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr ""
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr ""
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr ""
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr ""
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr ""
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr ""
 
@@ -477,15 +444,15 @@ msgstr ""
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr ""
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr ""
 
-#: src/search.c:766
+#: src/search.c:768
 #, c-format
 msgid ""
 "Filename: %s\n"
@@ -494,51 +461,51 @@ msgid ""
 "Current Line: %i"
 msgstr ""
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr ""
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr ""
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr ""
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr ""
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr ""
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr ""
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr ""
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr ""
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr ""
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr ""
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr ""
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr ""
 
@@ -554,6 +521,10 @@ msgstr "Zavøít"
 msgid "Open (swap) .c/.h file"
 msgstr ""
 
+#, fuzzy
+#~ msgid "_None"
+#~ msgstr "Nový"
+
 #~ msgid "New"
 #~ msgstr "Nový"
 
diff --git a/po/da.po b/po/da.po
index e69de29bb..0be49f8b9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -0,0 +1,521 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: editor-plugins/email.c:89
+msgid "The gEdit Email Plugin"
+msgstr ""
+
+#: editor-plugins/browse.c:119
+msgid "The gEdit Web Browse Plugin"
+msgstr ""
+
+#: src/commands.c:93
+msgid "Could not save file!"
+msgstr ""
+
+#: src/commands.c:359
+msgid "Open File..."
+msgstr ""
+
+#: src/commands.c:413 src/commands.c:461
+msgid "Read only file!"
+msgstr ""
+
+#: src/commands.c:500 src/commands.c:570
+msgid "Error saving file!"
+msgstr ""
+
+#: src/commands.c:530
+#, c-format
+msgid "Save %s As..."
+msgstr ""
+
+#: src/commands.c:603
+#, c-format
+msgid "Save %s As ..."
+msgstr ""
+
+#: src/commands.c:689
+#, c-format
+msgid ""
+"Are you sure you wish to revert all changes?\n"
+"(%s)"
+msgstr ""
+
+#: src/commands.c:737
+msgid "Document Unchanged..."
+msgstr ""
+
+#: src/commands.c:741
+msgid "Document Unsaved..."
+msgstr ""
+
+#: src/commands.c:924
+msgid "_File/"
+msgstr ""
+
+#: src/commands.c:933 src/commands.c:934
+msgid "_File"
+msgstr ""
+
+#: src/gE_about.c:36
+msgid "With special thanks to:"
+msgstr ""
+
+#: src/gE_about.c:47
+msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence"
+msgstr ""
+
+#: src/gE_about.c:49
+msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+"
+msgstr ""
+
+#: src/gE_mdi.c:76
+msgid "Find _Line..."
+msgstr ""
+
+#: src/gE_mdi.c:77
+msgid "Search for a line"
+msgstr ""
+
+#: src/gE_mdi.c:82
+msgid "Find _In Files..."
+msgstr ""
+
+#: src/gE_mdi.c:83
+msgid "Find text in all open files"
+msgstr ""
+
+#: src/gE_mdi.c:98
+msgid "_Add View"
+msgstr ""
+
+#: src/gE_mdi.c:99
+msgid "Add a new view of the document"
+msgstr ""
+
+#: src/gE_mdi.c:100
+msgid "_Remove View"
+msgstr ""
+
+#: src/gE_mdi.c:101
+msgid "Remove view of the document"
+msgstr ""
+
+#: src/gE_mdi.c:472
+#, c-format
+msgid " '%s' has been modified. Do you wish to save it?"
+msgstr ""
+
+#. FIXME: Needs to actually unload the plugin itself..
+#. Try removing plugin from Gnome Menu..
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
+msgid "_Plugins"
+msgstr ""
+
+#: src/gE_prefs_box.c:102
+msgid "Default"
+msgstr ""
+
+#: src/gE_prefs_box.c:103
+msgid "Notebook"
+msgstr ""
+
+#: src/gE_prefs_box.c:104
+msgid "Toplevel"
+msgstr ""
+
+#: src/gE_prefs_box.c:105
+msgid "Modal"
+msgstr ""
+
+#: src/gE_prefs_box.c:285
+msgid "Appearance"
+msgstr ""
+
+#: src/gE_prefs_box.c:298
+msgid "Show Statusbar"
+msgstr ""
+
+#: src/gE_prefs_box.c:307
+msgid "Show Splitscreen"
+msgstr ""
+
+#: src/gE_prefs_box.c:316
+msgid "Editor Behavior"
+msgstr ""
+
+#: src/gE_prefs_box.c:329
+msgid "Enable Autoindent"
+msgstr ""
+
+#: src/gE_prefs_box.c:338
+msgid "Enable Wordwrap"
+msgstr ""
+
+#. Document Closing stuffs
+#: src/gE_prefs_box.c:401
+msgid "Document Settings"
+msgstr ""
+
+#: src/gE_prefs_box.c:415
+msgid "New Document After Closing Last"
+msgstr ""
+
+#: src/gE_prefs_box.c:421
+msgid "Close Window After Closing Last"
+msgstr ""
+
+#. End of docyment closing stuffs
+#. Font Settings (within Document Settings frame)
+#: src/gE_prefs_box.c:430
+msgid "Current Font"
+msgstr ""
+
+#: src/gE_prefs_box.c:447
+msgid "Select..."
+msgstr ""
+
+#. End of Font Setttings
+#. Print COmmand
+#: src/gE_prefs_box.c:463
+msgid "Print Command"
+msgstr ""
+
+#: src/gE_prefs_box.c:515
+msgid "Plugin Selector"
+msgstr ""
+
+#: src/gE_prefs_box.c:630
+msgid "Name"
+msgstr ""
+
+#: src/gE_prefs_box.c:630
+msgid "Location"
+msgstr ""
+
+#. Plugins Settings
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
+msgid "Plugins"
+msgstr ""
+
+#: src/gE_prefs_box.c:650
+msgid "Use Plugins"
+msgstr ""
+
+#: src/gE_prefs_box.c:716
+msgid "Add"
+msgstr ""
+
+#: src/gE_prefs_box.c:721
+msgid "Remove"
+msgstr ""
+
+#. Window Size Settings
+#: src/gE_prefs_box.c:764
+msgid "Window Size"
+msgstr ""
+
+#: src/gE_prefs_box.c:777
+msgid "Current Width:"
+msgstr ""
+
+#: src/gE_prefs_box.c:797
+msgid "Startup Width:"
+msgstr ""
+
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
+msgid "Use Current"
+msgstr ""
+
+#: src/gE_prefs_box.c:817
+msgid "Current Height:"
+msgstr ""
+
+#: src/gE_prefs_box.c:837
+msgid "Startup Height:"
+msgstr ""
+
+#. MDI Mode settnigs
+#: src/gE_prefs_box.c:853
+msgid "MDI Mode"
+msgstr ""
+
+#. General Settings
+#: src/gE_prefs_box.c:921
+msgid "General"
+msgstr ""
+
+#. Window Settings
+#: src/gE_prefs_box.c:926
+msgid "Window"
+msgstr ""
+
+#. Docuemnt Settings
+#: src/gE_prefs_box.c:931
+msgid "Document"
+msgstr ""
+
+#: src/gE_print.c:73 src/gE_view.c:48
+msgid "Print"
+msgstr ""
+
+#: src/gE_print.c:86
+#, c-format
+msgid ""
+"Enter print command below\n"
+"Remember to include '%s'"
+msgstr ""
+
+#: src/gE_print.c:94
+msgid "Print Command:"
+msgstr ""
+
+#: src/gE_print.c:235
+msgid "Print anyway"
+msgstr ""
+
+#: src/gE_print.c:235
+msgid " Save, then print "
+msgstr ""
+
+#: src/gE_print.c:235
+msgid "Cancel"
+msgstr ""
+
+#: src/gedit.c:116
+msgid "Launch a plugin at startup"
+msgstr ""
+
+#: src/gedit.c:116
+msgid "PLUGIN-NAME"
+msgstr ""
+
+#: src/menus.c:66
+msgid "_Autoindent"
+msgstr ""
+
+#: src/menus.c:67
+msgid "Status_bar"
+msgstr ""
+
+#: src/menus.c:68
+msgid "_Wordwrap"
+msgstr ""
+
+#: src/menus.c:69
+msgid "_Linewrap"
+msgstr ""
+
+#: src/menus.c:70
+msgid "_Readonly"
+msgstr ""
+
+#: src/menus.c:71
+msgid "_Splitscreen"
+msgstr ""
+
+#: src/menus.c:72
+msgid "_Show tabs"
+msgstr ""
+
+#: src/menus.c:73
+msgid "Toolbar _relief"
+msgstr ""
+
+#: src/menus.c:74
+msgid "_Show tooltips"
+msgstr ""
+
+#: src/menus.c:75
+msgid "Show toolbar _text"
+msgstr ""
+
+#: src/menus.c:76
+msgid "Show toolbar _icons"
+msgstr ""
+
+#. and this one is the default file name
+#: src/menus.c:78
+msgid "Untitled"
+msgstr ""
+
+#: src/menus.c:87
+msgid "_New"
+msgstr ""
+
+#: src/menus.c:87
+msgid "Create a new document"
+msgstr ""
+
+#: src/menus.c:94
+msgid "Save All"
+msgstr ""
+
+#: src/menus.c:94
+msgid "Save All Open Files"
+msgstr ""
+
+#: src/menus.c:99
+msgid "Revert"
+msgstr ""
+
+#: src/menus.c:109
+msgid "Close All"
+msgstr ""
+
+#: src/menus.c:109
+msgid "Close All Open Files"
+msgstr ""
+
+#: src/menus.c:122
+msgid "_Top"
+msgstr ""
+
+#: src/menus.c:123
+msgid "Put the document tabs at the top"
+msgstr ""
+
+#: src/menus.c:126
+msgid "_Bottom"
+msgstr ""
+
+#: src/menus.c:127
+msgid "Put the document tabs at the bottom"
+msgstr ""
+
+#: src/menus.c:130
+msgid "_Left"
+msgstr ""
+
+#: src/menus.c:131
+msgid "Put the document tabs on the left"
+msgstr ""
+
+#: src/menus.c:134
+msgid "_Right"
+msgstr ""
+
+#: src/menus.c:135
+msgid "Put the document tabs on the right"
+msgstr ""
+
+#: src/menus.c:174
+msgid "Toggle Readonly"
+msgstr ""
+
+#: src/menus.c:179
+msgid "Toggle Split Screen"
+msgstr ""
+
+#: src/menus.c:185
+msgid "_Document Tabs"
+msgstr ""
+
+#: src/menus.c:186
+msgid "Change the placement of the document tabs"
+msgstr ""
+
+#: src/menus.c:190
+msgid "Sa_ve Settings"
+msgstr ""
+
+#: src/menus.c:191
+msgid "Save the current settings for future sessions"
+msgstr ""
+
+#: src/search.c:412
+msgid "Find In Files"
+msgstr ""
+
+#: src/search.c:413 src/search.c:862
+msgid "Search"
+msgstr ""
+
+#: src/search.c:417 src/search.c:867 src/search.c:895
+msgid "Search for:"
+msgstr ""
+
+#: src/search.c:768
+#, c-format
+msgid ""
+"Filename: %s\n"
+"\n"
+"Total Lines: %i\n"
+"Current Line: %i"
+msgstr ""
+
+#: src/search.c:790
+msgid "Go to line"
+msgstr ""
+
+#: src/search.c:800
+msgid "Line number"
+msgstr ""
+
+#: src/search.c:823
+msgid "Search from cursor"
+msgstr ""
+
+#: src/search.c:830
+msgid "Search from beginning of document"
+msgstr ""
+
+#: src/search.c:837
+msgid "Search from end of document"
+msgstr ""
+
+#: src/search.c:844
+msgid "Case sensitive"
+msgstr ""
+
+#: src/search.c:850
+msgid "Reverse search"
+msgstr ""
+
+#: src/search.c:889 src/search.c:890
+msgid "Replace"
+msgstr ""
+
+#: src/search.c:891
+msgid "Replace all"
+msgstr ""
+
+#: src/search.c:905
+msgid "Replace with:"
+msgstr ""
+
+#: src/search.c:916
+msgid "Ask before replacing"
+msgstr ""
+
+#: src/search.c:1115
+msgid "Replace?"
+msgstr ""
+
+#: src/gE_view.c:46
+msgid "Save"
+msgstr ""
+
+#: src/gE_view.c:47
+msgid "Close"
+msgstr ""
+
+#: src/gE_view.c:51
+msgid "Open (swap) .c/.h file"
+msgstr ""
diff --git a/po/de.po b/po/de.po
index da49d535c..3b3ff95c8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-08-09 16:15+02:00\n"
 "Last-Translator: Matthias Warkus <mawa@iname.com>\n"
 "Language-Team: Matthias Warkus <mawa@iname.com>\n"
@@ -25,29 +25,29 @@ msgstr "Das gEdit-Web-Browser-Plugin"
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Datei öffnen..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Schreibgeschützte datei!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "Fehler beim Speichern der Datei!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Speichern unter..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Speichern unter..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
@@ -56,19 +56,19 @@ msgstr ""
 "Sind Sie sicher, daß Sie alle Änderungen verwerfen wollen?\n"
 "(%s)"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Dokument ungesichert..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Dokument ungesichert..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Datei/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Datei"
 
@@ -117,16 +117,16 @@ msgstr "Ansicht entfernen"
 msgid "Remove view of the document"
 msgstr "Ansicht auf das Dokument entfernen"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " `%s' wurde geändert. Wollen Sie es speichern?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "Plugins"
 
@@ -146,130 +146,130 @@ msgstr "Eigenes Fenster"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Aussehen"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Statuszeile an/aus"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Bildschirm teilen an/aus"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Editorverhalten"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Automatisches Einrücken an/aus"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Automatischer Wortumbruch an/aus"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "Dokumenteinstellungen"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr "Neues Dokument nach Schließen des letzten"
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr "Fenster schließen nach Schließen des letzten"
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Aktuelle Schriftart"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Auswählen..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Druckbefehl"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "Pluginwähler"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Name"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Ort"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Plugins benutzen"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "Fenstergröße"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "Aktuelle Breite:"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "Breite beim Start:"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "Aktuelle benutzen"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "Aktuelle Höhe:"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "Höhe beim Start:"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "MDI-Modus"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Allgemein"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Fenster"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "Dokument"
 
@@ -423,59 +423,27 @@ msgstr "Rechts"
 msgid "Put the document tabs on the right"
 msgstr "Dokumentreiter rechts anbringen"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "Keine"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Kein Rollbalken"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "Immer"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Immer ein Rollbalken"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Automatisch"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Nur ein Rollbalken, wenn er gebraucht wird"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Schreibschutz an/aus"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Bildschirm teilen an/aus"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_Dokumentreiter"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Anbringung der Dokumentreiter ändern"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "Rollbalken"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Einstellen, wann ein Rollbalken angezeigt wird"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "Einstellungen speichern"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Aktuelle Einstellungen für spätere Sitzungen speichern"
 
@@ -483,15 +451,15 @@ msgstr "Aktuelle Einstellungen für spätere Sitzungen speichern"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Suchen"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Suchen nach:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -502,51 +470,51 @@ msgstr ""
 "Zeilenanzahl: %i\n"
 "Aktuelle Zeile: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Gehe zu Zeile"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Zeilennummer"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Vom Cursor an suchen"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Vom Dokumentanfang an suchen"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Vom Dokumentende her suchen"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Suche rückwärts"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "Alle ersetzen"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Ersetzen durch:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Nachfragen vor dem Ersetzen"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Ersetzen?"
 
@@ -562,6 +530,30 @@ msgstr "Schließen"
 msgid "Open (swap) .c/.h file"
 msgstr ".c/.h-Datei öffnen (austauschen)"
 
+#~ msgid "_None"
+#~ msgstr "Keine"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Kein Rollbalken"
+
+#~ msgid "A_lways"
+#~ msgstr "Immer"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Immer ein Rollbalken"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Automatisch"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Nur ein Rollbalken, wenn er gebraucht wird"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "Rollbalken"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Einstellen, wann ein Rollbalken angezeigt wird"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "Dokument-ID ist %ld.\n"
 
diff --git a/po/es.po b/po/es.po
index 1b04d1365..fa94ecef2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-01-13 12:44+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
@@ -27,29 +27,29 @@ msgstr "La extensión de navegador Web de gEdit"
 msgid "Could not save file!"
 msgstr "¡No pude guardar el archivo!"
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Abrir un Archivo..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "¡Archivo en solo lectura!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "¡Error al guardar el archivo!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, c-format
 msgid "Save %s As..."
 msgstr "Guardar %s como..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, c-format
 msgid "Save %s As ..."
 msgstr "Guardar %d como..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
@@ -58,19 +58,19 @@ msgstr ""
 "¿Está seguro que desea deshacer todos los cambios?\n"
 "(%s)"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Documento no modificado..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Documento no guardado..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Archivo/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Archivo"
 
@@ -118,16 +118,16 @@ msgstr "_Quitar vista"
 msgid "Remove view of the document"
 msgstr "Quitar una vista del documento"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s' fué modificado. ¿Desea guardarlo?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "E_xtensiones"
 
@@ -147,130 +147,130 @@ msgstr "Primer plano"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Ver barra de estado"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "División de pantalla"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Comportamiento del Editor"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Auto-indentación"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Wordwrap"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "Configuración del documento"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr "Nuevo documento al cerrar el último"
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr "Cerrar la ventana al cerrar el último"
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Fuente Actual"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Seleccionar..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Comando de Impresión"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "Selector de extensiones"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Posición"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Extensiones"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Usar Extensiones"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Borrar"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "Tamaño de la ventana"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "Ancho actual:"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "Ancho de inicio:"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "Usar actual"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "Alto actual"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "Alto de incio:"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "Modo MDI"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "General"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Ventana"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "Documento"
 
@@ -420,59 +420,27 @@ msgstr "_Derecha"
 msgid "Put the document tabs on the right"
 msgstr "Poner las tabulaciones a la derecha"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "_Ninguna"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Sin barra de desfile"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_Siempre"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Con una barra de desfile siempre"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Automática"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Con una barra de desfile sólo cuando es necesario"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Activar/Desactivar solo lectura"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Activar/Desactivar división de pantalla"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_Tabulaciones del documento"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Cambiar de sitio las tabulaciones del documento"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "Barra de _Desfile"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Cambiar las opciones de visibilidad de la barra de desfile"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "_Guardar la configuración"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Guardar la configuración actual para futuras sesiones"
 
@@ -480,15 +448,15 @@ msgstr "Guardar la configuración actual para futuras sesiones"
 msgid "Find In Files"
 msgstr "Buscar en archivos"
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Búsqueda"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Buscar:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -499,51 +467,51 @@ msgstr ""
 "Total de Líneas: %i\n"
 "Línea Actual: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Ir a la línea"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Número de línea"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Buscar a partir del cursor"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Buscar a partir del principio del documento"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Buscar a partir del final del documento"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Distingir mayúsculas y minúsculas"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Revertir la búsqueda"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Remplazar"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "Remplazar todo"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Remplazar con:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Preguntar antes de remplazar"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "¿Remplazar?"
 
@@ -559,6 +527,30 @@ msgstr "Cerrar"
 msgid "Open (swap) .c/.h file"
 msgstr "Abrir (alternar) archivo .c/.h"
 
+#~ msgid "_None"
+#~ msgstr "_Ninguna"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Sin barra de desfile"
+
+#~ msgid "A_lways"
+#~ msgstr "_Siempre"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Con una barra de desfile siempre"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Automática"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Con una barra de desfile sólo cuando es necesario"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "Barra de _Desfile"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Cambiar las opciones de visibilidad de la barra de desfile"
+
 #~ msgid "Font"
 #~ msgstr "Fuente"
 
diff --git a/po/fr.po b/po/fr.po
index 153caf25f..e0c03429e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1998-02-28 19:57+0100\n"
 "Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
 "Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
@@ -25,29 +25,29 @@ msgstr "Le plugin Web de gEdit"
 msgid "Could not save file!"
 msgstr "Impossible d'enregistrer le fichier!"
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Ouvrir Fichier..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Fichier en lecture seule!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "Erreur lors de la sauvegarde du fichier!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, c-format
 msgid "Save %s As..."
 msgstr "Enregistrer %s sous..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, c-format
 msgid "Save %s As ..."
 msgstr "Enregistrer %s sous..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
@@ -56,19 +56,19 @@ msgstr ""
 "Voulez-vous vraiment annuler tous les changements?\n"
 "(%s)"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Document non changé..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Document non sauvé..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Fichier/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Fichier"
 
@@ -117,16 +117,16 @@ msgstr "Enleve_r vue"
 msgid "Remove view of the document"
 msgstr "Enlever la vue du document"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s' a été modifié. Voulez-vous l'enregistrer?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "_Plugins"
 
@@ -146,130 +146,130 @@ msgstr "1er Niveau"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Apparence"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Afficher la barre d'état"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Afficher DoubleVue"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Comportement de l'éditeur"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Activer l'auto-indentation"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Activer le retour à la ligne automatique"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "Paramétres des documents"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr "Ouvrir une fenêtre vierge après fermeture de la dernière fenêtre"
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr "Arrét de gEdit après fermeture de la dernière fenêtre"
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Police courante"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Sélectionner..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Commande d'impression"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "Sélecteur de Plugin"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Nom"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Emplacement"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Utiliser Plugins"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Enlever"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "Taille Fenêtre"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "Largeur actuelle :"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "Largeur au démarrage :"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "Utiliser la valeur actuelle"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "Hauteur actuelle :"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "Hauteur de départ :"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "Mode MDI"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Général"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Fenêtre"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "Document"
 
@@ -419,59 +419,27 @@ msgstr "_Droite"
 msgid "Put the document tabs on the right"
 msgstr "Mettre les tabulations du document à droite"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "_Aucun"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Pas de barre de défilement"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_Toujours"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Toujours afficher la barre de défilement"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Automatique"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Afficher la barre de défilement seulement si nécessaire"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "(Dés)activer le mode 'lecture seule'"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "(Dés)activer DoubleVue"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "Tabulations du _document"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Change le placement des tabulations du document"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "_Barre de défilement"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Change les options de visibilité de la barre de défilement"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "Enregis_trer la configuration"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Enregistre les paramétres actuels pour une utilisation ultérieure"
 
@@ -479,15 +447,15 @@ msgstr "Enregistre les paramétres actuels pour une utilisation ultérieure"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Rechercher:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -498,51 +466,51 @@ msgstr ""
 "Nombre de lignes: %i\n"
 "Ligne courante: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Aller à la ligne"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Numéro de ligne"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Rechercher à partir du curseur"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Rechercher à partir du début du document"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Rechercher à partir de la fin du document"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Sensible à la case"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Recherche inverse"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Remplacer"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "Tout Remplacer"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Remplacer par:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Demander confirmation avant le remplacement"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Remplacer?"
 
@@ -558,6 +526,30 @@ msgstr "Fermer"
 msgid "Open (swap) .c/.h file"
 msgstr "Ouvrir (échanger) fichier .c/.h"
 
+#~ msgid "_None"
+#~ msgstr "_Aucun"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Pas de barre de défilement"
+
+#~ msgid "A_lways"
+#~ msgstr "_Toujours"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Toujours afficher la barre de défilement"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Automatique"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Afficher la barre de défilement seulement si nécessaire"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "_Barre de défilement"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Change les options de visibilité de la barre de défilement"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "Docid est %ld!\n"
 
diff --git a/po/ga.po b/po/ga.po
index 98af6cd92..d1f6e4c84 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-08-09 20:17+0100\n"
 "Last-Translator: Unknown :-(\n"
 "Language-Team: \n"
@@ -22,49 +22,49 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr ""
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr ""
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr ""
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Sabhail"
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Sabhail"
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr ""
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr ""
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr ""
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "Comhad"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 #, fuzzy
 msgid "_File"
 msgstr "Comhad"
@@ -113,16 +113,16 @@ msgstr ""
 msgid "Remove view of the document"
 msgstr ""
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr ""
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr ""
 
@@ -142,130 +142,130 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr ""
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr ""
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr ""
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr ""
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr ""
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr ""
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr ""
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr ""
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr ""
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr ""
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr ""
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr ""
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr ""
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr ""
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr ""
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr ""
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr ""
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr ""
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr ""
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr ""
 
@@ -416,59 +416,27 @@ msgstr ""
 msgid "Put the document tabs on the right"
 msgstr ""
 
-#: src/menus.c:150
-msgid "_None"
-msgstr ""
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr ""
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr ""
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr ""
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr ""
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr ""
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr ""
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr ""
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr ""
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr ""
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr ""
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr ""
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr ""
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr ""
 
@@ -476,15 +444,15 @@ msgstr ""
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr ""
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr ""
 
-#: src/search.c:766
+#: src/search.c:768
 #, c-format
 msgid ""
 "Filename: %s\n"
@@ -493,51 +461,51 @@ msgid ""
 "Current Line: %i"
 msgstr ""
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr ""
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr ""
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr ""
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr ""
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr ""
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr ""
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr ""
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr ""
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr ""
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr ""
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr ""
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index b9bdb7b12..7960a7d16 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,11 +2,10 @@
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Ruben Lopez Gomez <ryu@mundivia.es>, 1999.
 #
-
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit 0.5.2\n"
-"POT-Creation-Date: 1999-08-20 18:32+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-08-20 18:33+0100\n"
 "Last-Translator: Ruben Lopez Gomez <ryu@mundivia.es>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -14,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: editor-plugins/email.c:86
+#: editor-plugins/email.c:89
 msgid "The gEdit Email Plugin"
 msgstr "Plugin de correo de gEdit"
 
@@ -22,198 +21,272 @@ msgstr "Plugin de correo de gEdit"
 msgid "The gEdit Web Browse Plugin"
 msgstr "Plugin navegador de gEdit"
 
-#: gmodule-plugins/launcher/main.c:57
-#, c-format
-msgid "Docid is %ld.\n"
-msgstr "Id do doc. e %ld.\n"
-
-#: gmodule-plugins/shell/main.c:63
-msgid "Shell"
+#: src/commands.c:93
+msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:517
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
-#: src/commands.c:588
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Ficheiro de so lectura!"
 
-#: src/commands.c:602
-msgid "Save As..."
-msgstr "Gardar coma..."
+#: src/commands.c:500 src/commands.c:570
+msgid "Error saving file!"
+msgstr ""
 
-#: src/commands.c:1050 src/commands.c:1051
-msgid "_File"
-msgstr "_Ficheiro"
+#: src/commands.c:530
+#, fuzzy, c-format
+msgid "Save %s As..."
+msgstr "Gardar coma..."
 
-#: src/gE_about.c:29
-msgid "Alex Roberts"
-msgstr ""
+#: src/commands.c:603
+#, fuzzy, c-format
+msgid "Save %s As ..."
+msgstr "Gardar coma..."
 
-#: src/gE_about.c:30
-msgid "Evan Lawrence"
+#: src/commands.c:689
+#, c-format
+msgid ""
+"Are you sure you wish to revert all changes?\n"
+"(%s)"
 msgstr ""
 
-#: src/gE_about.c:31
-msgid "http://gedit.pn.org"
+#: src/commands.c:737
+msgid "Document Unchanged..."
 msgstr ""
 
-#: src/gE_about.c:33
-msgid "With special thanks to:"
-msgstr "Con especial agradecemento a:"
+#: src/commands.c:741
+#, fuzzy
+msgid "Document Unsaved..."
+msgstr "Pestanas do _Documento"
 
-#: src/gE_about.c:34
-msgid "       Will LaShell"
-msgstr ""
+#: src/commands.c:924
+#, fuzzy
+msgid "_File/"
+msgstr "_Ficheiro"
 
-#: src/gE_about.c:35
-msgid "       Chris Lahey"
-msgstr ""
+#: src/commands.c:933 src/commands.c:934
+msgid "_File"
+msgstr "_Ficheiro"
 
 #: src/gE_about.c:36
-msgid "       Andy Kahn"
-msgstr ""
-
-#: src/gE_about.c:37
-msgid "       Miguel de Icaza"
-msgstr ""
-
-#: src/gE_about.c:38
-msgid "       Martin Baulig"
-msgstr ""
+msgid "With special thanks to:"
+msgstr "Con especial agradecemento a:"
 
-#: src/gE_about.c:50
+#: src/gE_about.c:47
 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence"
 msgstr ""
 
-#: src/gE_about.c:52
+#: src/gE_about.c:49
 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+"
 msgstr "gEdit e un pequeno e lixeiro editor de textos para GNOME/Gtk+"
 
-#: src/gE_document.c:61 src/toolbar.c:51
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/gE_document.c:62 src/toolbar.c:53
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/gE_document.c:63 src/toolbar.c:55
-msgid "Paste"
-msgstr "Pegar"
+#: src/gE_mdi.c:76
+msgid "Find _Line..."
+msgstr "Atopar _Liña"
 
-#: src/gE_document.c:65
-msgid "Open in new window"
-msgstr "Abrir noutra fiestra"
+#: src/gE_mdi.c:77
+msgid "Search for a line"
+msgstr "Buscar unha liña"
 
-#: src/gE_document.c:66 src/toolbar.c:42
-msgid "Save"
-msgstr "Gardar"
+#: src/gE_mdi.c:82
+#, fuzzy
+msgid "Find _In Files..."
+msgstr "Atopar _Liña"
 
-#: src/gE_document.c:67 src/toolbar.c:44
-msgid "Close"
-msgstr "Pechar"
+#: src/gE_mdi.c:83
+#, fuzzy
+msgid "Find text in all open files"
+msgstr "Pechar todos os ficheiros abertos"
 
-#. Print Settings
-#: src/gE_document.c:68 src/gE_prefs_box.c:675 src/gE_print.c:69
-#: src/toolbar.c:46
-msgid "Print"
-msgstr "Imprimir"
+#: src/gE_mdi.c:98
+msgid "_Add View"
+msgstr ""
 
-#: src/gE_document.c:70
-msgid "Open (swap) .c/.h file"
-msgstr "Abrir (intercambiar) ficheiro .c/.h"
+#: src/gE_mdi.c:99
+msgid "Add a new view of the document"
+msgstr ""
 
-#. line and column indicators
-#: src/gE_document.c:148
-msgid "Column:"
-msgstr "Columna:"
+#: src/gE_mdi.c:100
+#, fuzzy
+msgid "_Remove View"
+msgstr "Eliminar"
 
-#: src/gE_document.c:157
-msgid "Line"
-msgstr "Liña"
+#: src/gE_mdi.c:101
+msgid "Remove view of the document"
+msgstr ""
 
-#: src/gE_files.c:305
-msgid "Currently Open Files"
-msgstr "Ficheiros Abertos"
+#: src/gE_mdi.c:472
+#, c-format
+msgid " '%s' has been modified. Do you wish to save it?"
+msgstr ""
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:117 src/gE_plugin_api.c:118 src/gE_prefs_box.c:430
-#: src/gE_prefs_box.c:431 src/gE_prefs_box.c:481 src/gE_prefs_box.c:482
-#: src/menus.c:256
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: src/gE_prefs_box.c:179
+#: src/gE_prefs_box.c:102
+msgid "Default"
+msgstr ""
+
+#: src/gE_prefs_box.c:103
+msgid "Notebook"
+msgstr ""
+
+#: src/gE_prefs_box.c:104
+msgid "Toplevel"
+msgstr ""
+
+#: src/gE_prefs_box.c:105
+msgid "Modal"
+msgstr ""
+
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: src/gE_prefs_box.c:192
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Barra de estado"
 
-#: src/gE_prefs_box.c:201
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Pantalla dobre"
 
-#: src/gE_prefs_box.c:210
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Comportamento do editor"
 
-#: src/gE_prefs_box.c:223
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Activar indentado aut."
 
-#: src/gE_prefs_box.c:232
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Activar envoltura de palabra"
 
-#: src/gE_prefs_box.c:252
-msgid "Print Command"
-msgstr "Imprimir comando"
+#. Document Closing stuffs
+#: src/gE_prefs_box.c:401
+#, fuzzy
+msgid "Document Settings"
+msgstr "Lista de _Documentos"
+
+#: src/gE_prefs_box.c:415
+msgid "New Document After Closing Last"
+msgstr ""
+
+#: src/gE_prefs_box.c:421
+msgid "Close Window After Closing Last"
+msgstr ""
 
-#: src/gE_prefs_box.c:342
+#. End of docyment closing stuffs
+#. Font Settings (within Document Settings frame)
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Tipo de letra"
 
-#: src/gE_prefs_box.c:359
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Elixir..."
 
-#: src/gE_prefs_box.c:525
+#. End of Font Setttings
+#. Print COmmand
+#: src/gE_prefs_box.c:463
+msgid "Print Command"
+msgstr "Imprimir comando"
+
+#: src/gE_prefs_box.c:515
+msgid "Plugin Selector"
+msgstr ""
+
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Nome"
 
-#: src/gE_prefs_box.c:525
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Localización"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:532 src/gE_prefs_box.c:685
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gE_prefs_box.c:613
+#: src/gE_prefs_box.c:650
+#, fuzzy
+msgid "Use Plugins"
+msgstr "Plugins"
+
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Engadir"
 
-#: src/gE_prefs_box.c:618
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Eliminar"
 
+#. Window Size Settings
+#: src/gE_prefs_box.c:764
+msgid "Window Size"
+msgstr ""
+
+#: src/gE_prefs_box.c:777
+#, fuzzy
+msgid "Current Width:"
+msgstr "Tipo de letra"
+
+#: src/gE_prefs_box.c:797
+msgid "Startup Width:"
+msgstr ""
+
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
+#, fuzzy
+msgid "Use Current"
+msgstr "Tipo de letra"
+
+#: src/gE_prefs_box.c:817
+#, fuzzy
+msgid "Current Height:"
+msgstr "Tipo de letra"
+
+#: src/gE_prefs_box.c:837
+msgid "Startup Height:"
+msgstr ""
+
+#. MDI Mode settnigs
+#: src/gE_prefs_box.c:853
+msgid "MDI Mode"
+msgstr ""
+
 #. General Settings
-#: src/gE_prefs_box.c:670
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Xeral"
 
-#. Font Settings
-#: src/gE_prefs_box.c:680
-msgid "Font"
-msgstr "Tipo de letra"
+#. Window Settings
+#: src/gE_prefs_box.c:926
+#, fuzzy
+msgid "Window"
+msgstr "Atopar"
+
+#. Docuemnt Settings
+#: src/gE_prefs_box.c:931
+#, fuzzy
+msgid "Document"
+msgstr "Pestanas do _Documento"
+
+#: src/gE_print.c:73 src/gE_view.c:48
+msgid "Print"
+msgstr "Imprimir"
 
-#: src/gE_print.c:82
+#: src/gE_print.c:86
 #, c-format
 msgid ""
 "Enter print command below\n"
@@ -222,300 +295,352 @@ msgstr ""
 "Introduce un comando de impresión debaixo\n"
 "Recorda incluir '%s'"
 
-#: src/gE_print.c:90
+#: src/gE_print.c:94
 msgid "Print Command:"
 msgstr "Comando de impresión:"
 
-#: src/gE_print.c:216
+#: src/gE_print.c:235
 msgid "Print anyway"
 msgstr "Imprimir de calqueira maneira"
 
-#: src/gE_print.c:216
+#: src/gE_print.c:235
 msgid " Save, then print "
 msgstr " Gardar, logo imprimir"
 
-#: src/gedit.c:118
+#: src/gE_print.c:235
+msgid "Cancel"
+msgstr ""
+
+#: src/gedit.c:116
 msgid "Launch a plugin at startup"
 msgstr "Lanzar un plugin ó comezo"
 
-#: src/gedit.c:118
+#: src/gedit.c:116
 msgid "PLUGIN-NAME"
 msgstr "NOME-DO-PLUGIN"
 
-#: src/menus.c:65
+#: src/menus.c:66
 msgid "_Autoindent"
 msgstr "_Auto-indentación"
 
-#: src/menus.c:66
+#: src/menus.c:67
 msgid "Status_bar"
 msgstr "Barra_de_estado"
 
-#: src/menus.c:67
+#: src/menus.c:68
 msgid "_Wordwrap"
 msgstr "A_xustar palabras"
 
-#: src/menus.c:68
+#: src/menus.c:69
 msgid "_Linewrap"
 msgstr "Axustar _Liñas"
 
-#: src/menus.c:69
+#: src/menus.c:70
 msgid "_Readonly"
 msgstr "_So lecutra"
 
-#: src/menus.c:70
+#: src/menus.c:71
 msgid "_Splitscreen"
 msgstr "_Dividir pantalla"
 
-#: src/menus.c:71
+#: src/menus.c:72
 msgid "_Show tabs"
 msgstr "A_mosar pestanas"
 
-#: src/menus.c:72
+#: src/menus.c:73
 msgid "Toolbar _relief"
 msgstr "Ax_uda da barra de ferramentas"
 
-#: src/menus.c:73
+#: src/menus.c:74
 msgid "_Show tooltips"
 msgstr "Amosa_r axudas contextuais"
 
-#: src/menus.c:74
+#: src/menus.c:75
 msgid "Show toolbar _text"
 msgstr "Amosat _texto da barra de ferramentas"
 
-#: src/menus.c:75
+#: src/menus.c:76
 msgid "Show toolbar _icons"
 msgstr "Amosar _iconos da barra de ferramentas"
 
 #. and this one is the default file name
-#: src/menus.c:77
+#: src/menus.c:78
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/menus.c:85
+#: src/menus.c:87
 msgid "_New"
 msgstr "_Novo"
 
-#: src/menus.c:85 src/toolbar.c:38
+#: src/menus.c:87
 msgid "Create a new document"
 msgstr "Crea un novo documento"
 
-#: src/menus.c:102
+#: src/menus.c:94
+#, fuzzy
+msgid "Save All"
+msgstr " Gardar "
+
+#: src/menus.c:94
+#, fuzzy
+msgid "Save All Open Files"
+msgstr "Ficheiros Abertos"
+
+#: src/menus.c:99
+#, fuzzy
+msgid "Revert"
+msgstr "Eliminar"
+
+#: src/menus.c:109
 msgid "Close All"
 msgstr "Pechar todos"
 
-#: src/menus.c:102
-msgid "Close all open files"
+#: src/menus.c:109
+#, fuzzy
+msgid "Close All Open Files"
 msgstr "Pechar todos os ficheiros abertos"
 
-#: src/menus.c:124
-msgid "Find _Line..."
-msgstr "Atopar _Liña"
-
-#: src/menus.c:125
-msgid "Search for a line"
-msgstr "Buscar unha liña"
-
-#: src/menus.c:139
+#: src/menus.c:122
 msgid "_Top"
 msgstr "_Arriba"
 
-#: src/menus.c:140
+#: src/menus.c:123
 msgid "Put the document tabs at the top"
 msgstr "Por as pestanas do documento arriba"
 
-#: src/menus.c:143
+#: src/menus.c:126
 msgid "_Bottom"
 msgstr "A_baixo"
 
-#: src/menus.c:144
+#: src/menus.c:127
 msgid "Put the document tabs at the bottom"
 msgstr "Por as pestanas do documento abaixo"
 
-#: src/menus.c:147
+#: src/menus.c:130
 msgid "_Left"
 msgstr "_Esquerda"
 
-#: src/menus.c:148
+#: src/menus.c:131
 msgid "Put the document tabs on the left"
 msgstr "Por as pestanas do documento á esquerda"
 
-#: src/menus.c:151
+#: src/menus.c:134
 msgid "_Right"
 msgstr "_Dereita"
 
-#: src/menus.c:152
+#: src/menus.c:135
 msgid "Put the document tabs on the right"
 msgstr "Por as pestanas do documento á dereita"
 
-#: src/menus.c:158
-msgid "Toggle the presence of the document tabs"
-msgstr "Activar/Desactivar Pestanas"
-
-#: src/menus.c:169
-msgid "Toggle autoindent"
-msgstr "Activar/Desactivar Auto-indentación"
-
 #: src/menus.c:174
-msgid "Toggle statusbar"
-msgstr "Activar/Desactivar barra de estado"
-
-#: src/menus.c:179
-msgid "Toggle Wordwrap"
-msgstr "Activar/Desactivar Axuste de palabra"
-
-#: src/menus.c:184
-msgid "Toggle Linewrap"
-msgstr "Activar/Desactivar Axuste de liña"
-
-#: src/menus.c:189
 msgid "Toggle Readonly"
 msgstr "Activar/Desactivar So-lectura"
 
-#: src/menus.c:194
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Activar/Desactivar Pantalla dividida"
 
-#: src/menus.c:200
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "Pestanas do _Documento"
 
-#: src/menus.c:201
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Cambiar a posición das pestanas"
 
-#: src/menus.c:205
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "_Gardar Axustes"
 
-#: src/menus.c:206
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Gardar os axustes para sesións futuras"
 
-#: src/menus.c:224
-msgid "_Document List"
-msgstr "Lista de _Documentos"
+#: src/search.c:412
+msgid "Find In Files"
+msgstr ""
 
-#: src/menus.c:225
-msgid "Display the document list"
-msgstr "Amosa a lista de documentos"
+#: src/search.c:413 src/search.c:862
+msgid "Search"
+msgstr "Buscar"
 
-#: src/search.c:149
-#, c-format
+#: src/search.c:417 src/search.c:867 src/search.c:895
+#, fuzzy
+msgid "Search for:"
+msgstr "Buscar Por:"
+
+#: src/search.c:768
+#, fuzzy, c-format
 msgid ""
+"Filename: %s\n"
+"\n"
 "Total Lines: %i\n"
 "Current Line: %i"
 msgstr ""
 "Total de Liñas: %i\n"
 "Liña actual: %i"
 
-#: src/search.c:363 src/search.c:581
-msgid "Search and Replace"
-msgstr "Buscar e reeprazar"
-
-#: src/search.c:363 src/search.c:581
-msgid "Search"
-msgstr "Buscar"
-
-#: src/search.c:366
-msgid "Search For:"
-msgstr "Buscar Por:"
-
-#: src/search.c:370
-msgid "Text"
-msgstr "Texto"
+#: src/search.c:790
+msgid "Go to line"
+msgstr ""
 
-#: src/search.c:377
-msgid "Line Number"
+#: src/search.c:800
+#, fuzzy
+msgid "Line number"
 msgstr "Número de liña"
 
-#: src/search.c:396
-msgid "Search:"
-msgstr "Buscar:"
+#: src/search.c:823
+#, fuzzy
+msgid "Search from cursor"
+msgstr "Buscar un texto"
 
-#: src/search.c:399
-msgid "Start searching at cursor position"
-msgstr "Comezar a busqueda na posición do cursor"
+#: src/search.c:830
+#, fuzzy
+msgid "Search from beginning of document"
+msgstr "Comezar a búsqueda ó comezo do documento"
 
-#: src/search.c:404
-msgid "Start searching at beginning of the document"
+#: src/search.c:837
+#, fuzzy
+msgid "Search from end of document"
 msgstr "Comezar a búsqueda ó comezo do documento"
 
-#: src/search.c:406
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Sensible a Mays./Minus."
 
-#: src/search.c:410
-msgid "Replace:"
+#: src/search.c:850
+msgid "Reverse search"
+msgstr ""
+
+#: src/search.c:889 src/search.c:890
+#, fuzzy
+msgid "Replace"
+msgstr "Reemplazar::"
+
+#: src/search.c:891
+#, fuzzy
+msgid "Replace all"
 msgstr "Reemplazar::"
 
-#: src/search.c:413
-msgid "Prompt before replacing"
+#: src/search.c:905
+#, fuzzy
+msgid "Replace with:"
+msgstr "Reemplazar::"
+
+#: src/search.c:916
+#, fuzzy
+msgid "Ask before replacing"
 msgstr "Preguntar antes de reemplazar"
 
-#: src/toolbar.c:38
-msgid "New"
-msgstr "Novo"
+#: src/search.c:1115
+#, fuzzy
+msgid "Replace?"
+msgstr "Reemplazar::"
+
+#: src/gE_view.c:46
+msgid "Save"
+msgstr "Gardar"
+
+#: src/gE_view.c:47
+msgid "Close"
+msgstr "Pechar"
+
+#: src/gE_view.c:51
+msgid "Open (swap) .c/.h file"
+msgstr "Abrir (intercambiar) ficheiro .c/.h"
 
-#: src/toolbar.c:40
-msgid "Open"
-msgstr "Abrir"
+#~ msgid "Docid is %ld.\n"
+#~ msgstr "Id do doc. e %ld.\n"
 
-#: src/toolbar.c:40
-msgid "Open a file"
-msgstr "Abrir ficheiro"
+#~ msgid "Cut"
+#~ msgstr "Cortar"
 
-#: src/toolbar.c:42
-msgid "Save the current file"
-msgstr "Gardar o ficheiro"
+#~ msgid "Copy"
+#~ msgstr "Copiar"
 
-#: src/toolbar.c:44
-msgid "Close the current file"
-msgstr "Pechar o ficheiro"
+#~ msgid "Paste"
+#~ msgstr "Pegar"
 
-#: src/toolbar.c:46
-msgid "Print the current file"
-msgstr "Imprimir o ficheiro"
+#~ msgid "Open in new window"
+#~ msgstr "Abrir noutra fiestra"
 
-#: src/toolbar.c:51
-msgid "Cut the selection"
-msgstr "Cortar a selección"
+#~ msgid "Column:"
+#~ msgstr "Columna:"
 
-#: src/toolbar.c:53
-msgid "Copy the selection"
-msgstr "Copiar a selección"
+#~ msgid "Line"
+#~ msgstr "Liña"
 
-#: src/toolbar.c:55
-msgid "Paste the clipboard"
-msgstr "Pegar no portapapeis"
+#~ msgid "Font"
+#~ msgstr "Tipo de letra"
 
-#: src/toolbar.c:57
-msgid "Find"
-msgstr "Atopar"
+#~ msgid "Toggle the presence of the document tabs"
+#~ msgstr "Activar/Desactivar Pestanas"
 
-#: src/toolbar.c:57
-msgid "Search for a string"
-msgstr "Buscar un texto"
+#~ msgid "Toggle autoindent"
+#~ msgstr "Activar/Desactivar Auto-indentación"
 
-#: src/toolbar.c:62
-msgid "Exit"
-msgstr "Sair"
+#~ msgid "Toggle statusbar"
+#~ msgstr "Activar/Desactivar barra de estado"
 
-#: src/toolbar.c:62
-msgid "Exit the program"
-msgstr "Sair do programa"
+#~ msgid "Toggle Wordwrap"
+#~ msgstr "Activar/Desactivar Axuste de palabra"
 
-#: src/toolbar.c:70
-msgid " Save "
-msgstr " Gardar "
+#~ msgid "Toggle Linewrap"
+#~ msgstr "Activar/Desactivar Axuste de liña"
+
+#~ msgid "Display the document list"
+#~ msgstr "Amosa a lista de documentos"
+
+#~ msgid "Search and Replace"
+#~ msgstr "Buscar e reeprazar"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Search:"
+#~ msgstr "Buscar:"
+
+#~ msgid "Start searching at cursor position"
+#~ msgstr "Comezar a busqueda na posición do cursor"
+
+#~ msgid "New"
+#~ msgstr "Novo"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#~ msgid "Open a file"
+#~ msgstr "Abrir ficheiro"
+
+#~ msgid "Save the current file"
+#~ msgstr "Gardar o ficheiro"
+
+#~ msgid "Close the current file"
+#~ msgstr "Pechar o ficheiro"
+
+#~ msgid "Print the current file"
+#~ msgstr "Imprimir o ficheiro"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Cortar a selección"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Copiar a selección"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Pegar no portapapeis"
+
+#~ msgid "Exit"
+#~ msgstr "Sair"
+
+#~ msgid "Exit the program"
+#~ msgstr "Sair do programa"
 
-#: src/toolbar.c:72
-msgid " Close "
-msgstr " Pechar "
+#~ msgid " Close "
+#~ msgstr " Pechar "
 
-#: src/toolbar.c:74
-msgid " Print "
-msgstr " Imprimir "
+#~ msgid " Print "
+#~ msgstr " Imprimir "
 
-#: src/toolbar.c:77
-msgid " OK "
-msgstr " Aceptar "
+#~ msgid " OK "
+#~ msgstr " Aceptar "
diff --git a/po/it.po b/po/it.po
index 7caed7f08..e2d766fa4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-08-09 20:17+0100\n"
 "Last-Translator: Unknown :-(\n"
 "Language-Team: \n"
@@ -23,49 +23,49 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr ""
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr ""
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr ""
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Salva"
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Salva"
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr ""
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr ""
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr ""
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "Archivio"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 #, fuzzy
 msgid "_File"
 msgstr "Archivio"
@@ -114,16 +114,16 @@ msgstr ""
 msgid "Remove view of the document"
 msgstr ""
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr ""
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr ""
 
@@ -143,130 +143,130 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr ""
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr ""
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr ""
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr ""
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr ""
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr ""
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr ""
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr ""
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr ""
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr ""
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr ""
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr ""
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr ""
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr ""
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr ""
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr ""
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr ""
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr ""
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr ""
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr ""
 
@@ -417,59 +417,27 @@ msgstr ""
 msgid "Put the document tabs on the right"
 msgstr ""
 
-#: src/menus.c:150
-msgid "_None"
-msgstr ""
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr ""
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr ""
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr ""
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr ""
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr ""
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr ""
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr ""
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr ""
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr ""
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr ""
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr ""
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr ""
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr ""
 
@@ -477,15 +445,15 @@ msgstr ""
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr ""
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr ""
 
-#: src/search.c:766
+#: src/search.c:768
 #, c-format
 msgid ""
 "Filename: %s\n"
@@ -494,51 +462,51 @@ msgid ""
 "Current Line: %i"
 msgstr ""
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr ""
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr ""
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr ""
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr ""
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr ""
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr ""
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr ""
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr ""
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr ""
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr ""
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr ""
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index b541dc01d..21efde10a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-06-05 12:08+0900\n"
 "Last-Translator: Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>\n"
 "Language-Team: Japanese <LL@li.org>\n"
@@ -25,48 +25,48 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "³«¤¯¥Õ¥¡¥¤¥ë̾..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Æɤ߹þ¤ßÀìÍѤΥե¡¥¤¥ë¤Ç¤¹¡ª"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "ÊݸÃæ¤Ë¥¨¥é¡¼¤¬µ¯¤­¤Þ¤·¤¿¡ª"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë̾.."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë̾.."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, fuzzy, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr "Êѹ¹¤òÁ´¤Æ¼è¤ê¾Ã¤·¤Æ¤¤¤¤¤Ç¤¹¤«¡©"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "¤³¤Îʸ½ñ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "¤³¤Îʸ½ñ¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "¥Õ¥¡¥¤¥ë(_F)/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "¥Õ¥¡¥¤¥ë(_F)"
 
@@ -115,16 +115,16 @@ msgstr "¥Ó¥å¡¼¤òºï½ü"
 msgid "Remove view of the document"
 msgstr "ʸ½ñ¤Î¥Ó¥å¡¼¤òºï½ü¤¹¤ë"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr "'%s' ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Êݸ¤·¤Þ¤¹¤«¡©"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "¥×¥é¥°¥¤¥ó(_P)"
 
@@ -144,134 +144,134 @@ msgstr "¥È¥Ã¥×¥ì¥Ù¥ë"
 msgid "Modal"
 msgstr "¥â¡¼¥À¥ë"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "³°¸«"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤òɽ¼¨"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "ʬ³äɽ¼¨"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "¥¨¥Ç¥£¥¿¤ÎÆ°ºî"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "¼«Æ°»ú²¼¤²"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "ñ¸ì¤Î¼¡¹ÔÁ÷¤ê"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 #, fuzzy
 msgid "Document Settings"
 msgstr "¤Ä¤Þ¤ß¤Î°ÌÃÖ(_D)"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "ÁªÂò..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "°õºþ¥³¥Þ¥ó¥É"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "¥×¥é¥°¥¤¥ó¤ÎÁªÂò"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "̾Á°"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "°ÌÃÖ"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "¥×¥é¥°¥¤¥ó"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ¹¤ë"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "ÄɲÃ"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "ºï½ü"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "¥¦¥¤¥ó¥É¥¦¤ÎÂ礭¤µ"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 #, fuzzy
 msgid "Current Width:"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 #, fuzzy
 msgid "Use Current"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 #, fuzzy
 msgid "Current Height:"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "MDI¥â¡¼¥É"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "°ìÈÌ"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "¥¦¥¤¥ó¥É¥¦"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 #, fuzzy
 msgid "Document"
 msgstr "¤Ä¤Þ¤ß¤Î°ÌÃÖ(_D)"
@@ -426,59 +426,27 @@ msgstr "±¦(_R)"
 msgid "Put the document tabs on the right"
 msgstr "¤Ä¤Þ¤ß¤ò¥¦¥¤¥ó¥É¥¦¤Î±¦¤Ø"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "̵¤·(_N)"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤òɽ¼¨¤·¤Ê¤¤"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "¾ï»þ(_L)"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "¾ï¤Ë¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤òɽ¼¨"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "¼«Æ°(_A)"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "ɬÍפʤȤ­¤À¤±¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤òɽ¼¨"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "ÆɽФ·ÀìÍÑ(¥È¥°¥ë)"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "ʬ³äɽ¼¨(¥È¥°¥ë)"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "¤Ä¤Þ¤ß¤Î°ÌÃÖ(_D)"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "¤Ä¤Þ¤ß¤òɽ¼¨¤¹¤ë°ÌÃÖ¤òÊѹ¹"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼(_S)"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Îɽ¼¨¤òÀ©¸æ¤¹¤ë"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "ÀßÄê¤òÊݸ(_V)"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "ÀßÄê¤ò¼¡²ó¤«¤é¤âÍ­¸ú¤Ë¤¹¤ë"
 
@@ -486,15 +454,15 @@ msgstr "ÀßÄê¤ò¼¡²ó¤«¤é¤âÍ­¸ú¤Ë¤¹¤ë"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "¸¡º÷"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "¸¡º÷ÂоÝ:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -505,52 +473,52 @@ msgstr ""
 "¹ç·×: %i ¹Ô\n"
 "¸½ºß: %i ¹Ô"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "»ØÄê¹Ô¤Ø°ÜÆ°"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "¹ÔÈÖ¹æ"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¸¡º÷"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "ʸ½ñ¤ÎºÇ½é¤«¤é¸¡º÷"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "ʸ½ñ¤ÎºÇ¸å¤«¤é¸¡º÷"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Âçʸ»ú¾®Ê¸»ú¤Î¶èÊÌ"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "¸å¸þ¤­¸¡º÷"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "ÃÖ´¹"
 
-#: src/search.c:889
+#: src/search.c:891
 #, fuzzy
 msgid "Replace all"
 msgstr "ÃÖ´¹"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "ÃÖ´¹ÂоÝ:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "ÃÖ´¹Á°¤Ë³Îǧ"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "ÃÖ´¹¤·¤Þ¤¹¤«¡©"
 
@@ -566,6 +534,30 @@ msgstr "ÊĤ¸¤ë"
 msgid "Open (swap) .c/.h file"
 msgstr "Âбþ¤¹¤ë .c/.h ¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
+#~ msgid "_None"
+#~ msgstr "̵¤·(_N)"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤òɽ¼¨¤·¤Ê¤¤"
+
+#~ msgid "A_lways"
+#~ msgstr "¾ï»þ(_L)"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "¾ï¤Ë¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤òɽ¼¨"
+
+#~ msgid "_Automatic"
+#~ msgstr "¼«Æ°(_A)"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "ɬÍפʤȤ­¤À¤±¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤òɽ¼¨"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼(_S)"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Îɽ¼¨¤òÀ©¸æ¤¹¤ë"
+
 #~ msgid "Cut"
 #~ msgstr "ÀÚ¤ê¼è¤ê"
 
diff --git a/po/ko.po b/po/ko.po
index 743c9a9d1..b0a847311 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-06-09 13:27:10+0900\n"
 "Last-Translator: Sung-Hyun Nam <namsh@lgic.co.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -25,49 +25,49 @@ msgstr "gEdit À¥ ºê¶ó¿ìÁî Ç÷¯±×ÀÎ"
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "ÆÄÀÏ ¿­±â..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Àбâ Àü¿ë ÆÄÀÏ!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "ÆÄÀÏ ÀúÀå ¿¡·¯!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, fuzzy, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr "Á¤¸»·Î ¸ðµç ¼öÁ¤À» Ãë¼ÒÇÏ°í ½ÍÀ¸¼¼¿ä?"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "¹®¼­°¡ ¹Ù²îÁö ¾ÊÀ½..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "¹®¼­°¡ ÀúÀåµÇÁö ¾ÊÀ½..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "ÆÄÀÏ(_F)"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "ÆÄÀÏ(_F)"
 
@@ -116,16 +116,16 @@ msgstr "º¸±ââ »èÁ¦(_R)"
 msgid "Remove view of the document"
 msgstr "¹®¼­ÀÇ º¸±ââ »èÁ¦"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s'°¡ ¹Ù²î¾ú½À´Ï´Ù. ÀúÀåÇÒ±î¿ä?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "Ç÷¯±×ÀÎ(_P)"
 
@@ -145,134 +145,134 @@ msgstr "ÃÖ»óÀ§·¹º§"
 msgid "Modal"
 msgstr "ÇüÅÂ"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Çü»ó"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "»óŸ·´ë º¸À̱â"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "È­¸é ºÐÇÒ º¸À̱â"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "ÆíÁý±â µ¿ÀÛ"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Autoindent »ç¿ë"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Wordwrap »ç¿ë"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 #, fuzzy
 msgid "Document Settings"
 msgstr "¹®¼­ ÅÇ(_D)"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "ÇöÀç ±Û²Ã"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "¼±ÅÃ..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Àμ⠸í·É"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "Ç÷¯±×ÀÎ ¼±Åñâ"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "À̸§"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "À§Ä¡"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Ç÷¯±×ÀÎ"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Ç÷¯±×ÀÎ »ç¿ë"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Ãß°¡"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "»èÁ¦"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "â Å©±â"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 #, fuzzy
 msgid "Current Width:"
 msgstr "ÇöÀç ±Û²Ã"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 #, fuzzy
 msgid "Use Current"
 msgstr "ÇöÀç ±Û²Ã"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 #, fuzzy
 msgid "Current Height:"
 msgstr "ÇöÀç ±Û²Ã"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "MDI ¸ðµå"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "ÀϹÝ"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "â"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 #, fuzzy
 msgid "Document"
 msgstr "¹®¼­ ÅÇ(_D)"
@@ -427,59 +427,27 @@ msgstr "¿À¸¥ÂÊ(_R)"
 msgid "Put the document tabs on the right"
 msgstr "¹®¼­ ÅÇÀ» ¿À¸¥ÂÊ¿¡ À§Ä¡"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "¾øÀ½(_N)"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "½ºÅ©·Ñ¹Ù¸¦ °¡ÁöÁö ¾ÊÀ½"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "Ç×»ó(_L)"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Ç×»ó ½ºÅ©·Ñ¹Ù¸¦ °¡Áü"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "ÀÚµ¿(_A)"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "ÇÊ¿äÇÒ ¶§¸¸ ½ºÅ©·Ñ¹Ù¸¦ °¡Áü"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "ÀбâÀü¿ë Åä±Û"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "È­¸é ºÐÇÒ Åä±Û"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "¹®¼­ ÅÇ(_D)"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "¹®¼­ ÅÇÀÇ À§Ä¡¸¦ ¹Ù²Þ"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "½ºÅ©·Ñ¹Ù(_S)"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "½ºÅ©·Ñ¹ÙÀÇ »ç¿ë ¿É¼Ç ¹Ù²Þ"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "¼³Á¤ ÀúÀå(_v)"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "³»ÀÏÀ» À§ÇØ ÇöÀç ¼³Á¤À» ÀúÀå"
 
@@ -487,15 +455,15 @@ msgstr "³»ÀÏÀ» À§ÇØ ÇöÀç ¼³Á¤À» ÀúÀå"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "ã±â"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "ã±â:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -506,52 +474,52 @@ msgstr ""
 "ÃÑ ¶óÀÎ: %i\n"
 "ÇöÀç ¶óÀÎ: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "¶óÀΠã¾Æ°¡±â"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "¶óÀÎ ¹øÈ£"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Ä¿¼­ À§Ä¡ºÎÅÍ Ã£±â"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "¹®¼­ÀÇ Ã³À½ºÎÅÍ Ã£±â"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "¹®¼­ÀÇ ¸¶Áö¸·ºÎÅÍ Ã£±â"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "´ë¼Ò¹®ÀÚ ±¸º°"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "µÚ·Î ã±â"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "¹Ù²Ù±â"
 
-#: src/search.c:889
+#: src/search.c:891
 #, fuzzy
 msgid "Replace all"
 msgstr "¹Ù²Ù±â"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "¹Ù²Ù±â:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "¹Ù²Ù±â Àü¿¡ ¹¯±â"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "¹Ù²Ü±î¿ä?"
 
@@ -567,6 +535,30 @@ msgstr "´Ý±â"
 msgid "Open (swap) .c/.h file"
 msgstr ".c/.h ÆÄÀÏ (½º¿Ò) ¿­±â"
 
+#~ msgid "_None"
+#~ msgstr "¾øÀ½(_N)"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "½ºÅ©·Ñ¹Ù¸¦ °¡ÁöÁö ¾ÊÀ½"
+
+#~ msgid "A_lways"
+#~ msgstr "Ç×»ó(_L)"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Ç×»ó ½ºÅ©·Ñ¹Ù¸¦ °¡Áü"
+
+#~ msgid "_Automatic"
+#~ msgstr "ÀÚµ¿(_A)"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "ÇÊ¿äÇÒ ¶§¸¸ ½ºÅ©·Ñ¹Ù¸¦ °¡Áü"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "½ºÅ©·Ñ¹Ù(_S)"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "½ºÅ©·Ñ¹ÙÀÇ »ç¿ë ¿É¼Ç ¹Ù²Þ"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "Docid´Â %ldÀÔ´Ï´Ù.\n"
 
diff --git a/po/nl.po b/po/nl.po
index a21b207cb..e2658d872 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-08-09 20:17+0100\n"
 "Last-Translator: Unknown :-(\n"
 "Language-Team: \n"
@@ -23,50 +23,50 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr ""
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr ""
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr ""
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Bewaren als.."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Bewaren als.."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr ""
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr ""
 
-#: src/commands.c:808
+#: src/commands.c:741
 #, fuzzy
 msgid "Document Unsaved..."
 msgstr "Document Tabs"
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "Bestand"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "Bestand"
 
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Remove view of the document"
 msgstr ""
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr ""
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "Plugins"
 
@@ -144,141 +144,141 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr ""
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 #, fuzzy
 msgid "Show Statusbar"
 msgstr "Statusbalk"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 #, fuzzy
 msgid "Show Splitscreen"
 msgstr "Gespleten Scherm"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr ""
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 #, fuzzy
 msgid "Enable Autoindent"
 msgstr "Automatisch inspringen"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 #, fuzzy
 msgid "Enable Wordwrap"
 msgstr "Woord wrap"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 #, fuzzy
 msgid "Document Settings"
 msgstr "Documentlijst"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr ""
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 #, fuzzy
 msgid "Select..."
 msgstr "Selecteer Alles"
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr ""
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 #, fuzzy
 msgid "Plugin Selector"
 msgstr "Plugin naam"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr ""
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 #, fuzzy
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 #, fuzzy
 msgid "Use Plugins"
 msgstr "Plugins"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr ""
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr ""
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 #, fuzzy
 msgid "Window Size"
 msgstr "Venster"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr ""
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr ""
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr ""
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr ""
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 #, fuzzy
 msgid "Window"
 msgstr "Venster"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 #, fuzzy
 msgid "Document"
 msgstr "Document Tabs"
@@ -446,62 +446,29 @@ msgstr "Rechts"
 msgid "Put the document tabs on the right"
 msgstr ""
 
-#: src/menus.c:150
-#, fuzzy
-msgid "_None"
-msgstr "Nieuw"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr ""
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr ""
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr ""
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr ""
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr ""
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Alleen Lezen"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Gespleten Scherm"
 
-#: src/menus.c:203
+#: src/menus.c:185
 #, fuzzy
 msgid "_Document Tabs"
 msgstr "Document Tabs"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr ""
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr ""
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr ""
-
-#: src/menus.c:211
+#: src/menus.c:190
 #, fuzzy
 msgid "Sa_ve Settings"
 msgstr "Instellingen bewaren"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr ""
 
@@ -509,17 +476,17 @@ msgstr ""
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 #, fuzzy
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 #, fuzzy
 msgid "Search for:"
 msgstr "Zoeken"
 
-#: src/search.c:766
+#: src/search.c:768
 #, c-format
 msgid ""
 "Filename: %s\n"
@@ -528,52 +495,52 @@ msgid ""
 "Current Line: %i"
 msgstr ""
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr ""
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr ""
 
-#: src/search.c:821
+#: src/search.c:823
 #, fuzzy
 msgid "Search from cursor"
 msgstr "Opnieuw Zoeken..."
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr ""
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr ""
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr ""
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr ""
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr ""
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr ""
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr ""
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr ""
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr ""
 
@@ -589,6 +556,10 @@ msgstr "Sluiten"
 msgid "Open (swap) .c/.h file"
 msgstr ""
 
+#, fuzzy
+#~ msgid "_None"
+#~ msgstr "Nieuw"
+
 #~ msgid "Cut"
 #~ msgstr "Knippen"
 
diff --git a/po/no.po b/po/no.po
index 53bdd6c1a..b6f8b52cf 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-10-07 11:21+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -25,29 +25,29 @@ msgstr "gEdit web-leser tillegg"
 msgid "Could not save file!"
 msgstr "Kunne ikke lagre filen!"
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Åpne Fil..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Skrivebeskyttet fil!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "Feil under lagring av fil!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, c-format
 msgid "Save %s As..."
 msgstr "Lagre %s som..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, c-format
 msgid "Save %s As ..."
 msgstr "Lagre %s som ..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
@@ -56,19 +56,19 @@ msgstr ""
 "Er du sikker på at du ønsker å forkaste alle endringer?\n"
 "(%s)"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Dokumentet er uendret..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Dokumentet er ikke lagret..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Fil/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Fil"
 
@@ -116,16 +116,16 @@ msgstr "Fje_rn visning"
 msgid "Remove view of the document"
 msgstr "Fjern visning for dokumentet"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s' er endret. Vil du lagre det?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "_Tillegg"
 
@@ -145,130 +145,130 @@ msgstr "Toppnivå"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Utseende"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Vis statuslinje"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Vis splittet skjerm"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Editorens oppførsel"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Slå på autoindentering"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Slå på ordbryting"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "_Dokumentinstillinger"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr "Nytt dokument etter lukking av forrige"
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr "Lukk vindu etter lukking av forrige"
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Aktiv skrifttype"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Marker..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Utskriftskommando"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "Valg av tillegg"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Navn"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Plassering"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Tillegg"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Bruk tillegg"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Legg til"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Fjern"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "Vindustørrelse"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "Aktiv bredde:"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "Bredde ved oppstart:"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "Bruk nåværende"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "Aktiv høyde:"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "Høyde ved oppstart:"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "MDI-modus"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Generelt"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Vindu"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "Dokument"
 
@@ -418,59 +418,27 @@ msgstr "Høy_re"
 msgid "Put the document tabs on the right"
 msgstr "Plasser dokumenttabulatorene til høyre"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "I_ngen"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Har ikke rullefelt"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "A_lltid"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Alltid bruk rullefelt"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Automatisk"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Bare bruk rullefelt når det er nødvendig"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Slå av/på skrivebeskyttelse"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Slå av/på splittet skjerm"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_Dokumenttabulatorer"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Endre plasseringen av dokumenttabulatorene"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "_Rullefelt"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Endre alternativer for visning av rullefelt"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "La_gre instillinger"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Lagre nåværende innstillinger for fremtidige sesjoner"
 
@@ -478,15 +446,15 @@ msgstr "Lagre nåværende innstillinger for fremtidige sesjoner"
 msgid "Find In Files"
 msgstr "Finn i filer"
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Søk"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Søk etter:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -497,51 +465,51 @@ msgstr ""
 "Totalt antall linjer: %i\n"
 "Nåværende linje: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Gå til linje"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Linjenummer"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Søk fra markør"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Søk fra begynnelsen av dokumentet"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Søk fra slutten av dokumentet"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Skill mellome store/små bokstaver"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Baklengs søk"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Erstatt"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "Erstatt alle"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Erstatt med:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Spør før du erstatter"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Erstatt?"
 
@@ -556,3 +524,27 @@ msgstr "Lukk"
 #: src/gE_view.c:51
 msgid "Open (swap) .c/.h file"
 msgstr "Åpne (bytt) .c/.h fil"
+
+#~ msgid "_None"
+#~ msgstr "I_ngen"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Har ikke rullefelt"
+
+#~ msgid "A_lways"
+#~ msgstr "A_lltid"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Alltid bruk rullefelt"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Automatisk"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Bare bruk rullefelt når det er nødvendig"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "_Rullefelt"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Endre alternativer for visning av rullefelt"
diff --git a/po/pl.po b/po/pl.po
index f1a5b6d46..28f48c46c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gEdit\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-07-20 09:45+CET\n"
 "Last-Translator: GNOME PL Team\n"
 "Language-Team: Polish <gnomepl@pandora.info.bielsko.pl>\n"
@@ -21,29 +21,29 @@ msgstr "Wtyczka Przegl±daj Sieæ do programu gedit"
 msgid "Could not save file!"
 msgstr "Nie mo¿na zapisaæ pliku!"
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Otwórz plik..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Plik tylko do odczytu!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "B³±d przy zapisie pliku!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, c-format
 msgid "Save %s As..."
 msgstr "Zapisz %s jako..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, c-format
 msgid "Save %s As ..."
 msgstr "Zapisz %s jako..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
@@ -52,19 +52,19 @@ msgstr ""
 "Na pewno chcesz wycofaæ wszystkie zmiany?\n"
 "(%s)"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Dokument nie zosta³ zmieniony..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Dokument nie zosta³ zapisany..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Plik/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Plik"
 
@@ -112,16 +112,16 @@ msgstr "Usuñ widok"
 msgid "Remove view of the document"
 msgstr "Usuñ widok dokumentu"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s' zosta³ zmieniony. Czy chcesz go zapisaæ?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "W_tyczki"
 
@@ -141,130 +141,130 @@ msgstr "Okna nadrzêdne"
 msgid "Modal"
 msgstr "Modalne"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Wygl±d"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Wy¶wietlanie paska stanu"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Wy¶wietlanie podzia³u ekranu"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Zachowanie edytora"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Automatyczne wciêcia"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Zawijanie wierszy"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "Ustawienia dokumentów"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr "Nowy dokument po zamkniêciu ostatniego"
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr "Zamkniêcie okna po zamkniêciu ostatniego"
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Aktualna czcionka"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Wybierz..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Polecenie wydruku"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "Wybór wtyczki"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Po³o¿enie"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Wykorzystywanie wtyczek"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Usuñ"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "Rozmiar okna"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "Aktualna szeroko¶æ"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "Szeroko¶æ pocz±tkowa"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "U¿yj aktualnej"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "Aktualna wysoko¶æ"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "Wysoko¶æ pocz±tkowa"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "Tryb MDI"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Ogólne"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Okno"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "Dokument"
 
@@ -414,59 +414,27 @@ msgstr "_Prawa"
 msgid "Put the document tabs on the right"
 msgstr "Umieszcza zak³adki dokumentów po prawej"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "_Brak"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Brak paska przewijania"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_Zawsze"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Zawsze widoczny pasek przewijania"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Automatycznie"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Pasek przewijania tylko wtedy, kiedy jest potrzebny"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Prze³±cznik trybu tylko do odczytu"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Prze³±cznik podzia³u ekranu"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "Za_k³adki dokumentów"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Zmienia umiejscowienie zak³adek dokumentów"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "_Pasek przewijania"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Zmienia opcje widoczno¶ci paska przewijania"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "Zapi_sz ustawienia"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Zapisuje aktualne ustawienia dla przysz³ych sesji"
 
@@ -474,15 +442,15 @@ msgstr "Zapisuje aktualne ustawienia dla przysz³ych sesji"
 msgid "Find In Files"
 msgstr "Znajd¼ w plikach"
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Znajd¼"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Znajd¼ tekst:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -493,51 +461,51 @@ msgstr ""
 "Liczba wierszy: %i\n"
 "Bie¿±cy wiersz: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Przejd¼ do wiersza"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Numer wiersza"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Szukaj od kursora"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Szukaj od pocz±tku dokumentu"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Szukaj od koñca dokumentu"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Uwzglêdniaj wielko¶æ liter"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Przeszukiwanie wstecz"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Zast±p"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "Zast±p wszystkie"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Zast±p na:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Potwierd¼ przed zast±pieniem"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Zast±piæ?"
 
@@ -553,6 +521,30 @@ msgstr "Zamknij"
 msgid "Open (swap) .c/.h file"
 msgstr "Otwórz (zamieñ) plik .c/.h"
 
+#~ msgid "_None"
+#~ msgstr "_Brak"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Brak paska przewijania"
+
+#~ msgid "A_lways"
+#~ msgstr "_Zawsze"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Zawsze widoczny pasek przewijania"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Automatycznie"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Pasek przewijania tylko wtedy, kiedy jest potrzebny"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "_Pasek przewijania"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Zmienia opcje widoczno¶ci paska przewijania"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "Id dokumentu: %ld.\n"
 
diff --git a/po/pt.po b/po/pt.po
index 887a3c9a1..6ef814729 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-08-09 20:17+0100\n"
 "Last-Translator: Unknown :-(\n"
 "Language-Team: \n"
@@ -26,48 +26,48 @@ msgstr "O Plugin de Folhear na Web do gEdit"
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Abrir Arquivo..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Arquivo somente para leitura!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "Erro salvando arquivo!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Gravar como"
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Gravar como"
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, fuzzy, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr "Você tem certeza que quer voltar atrás em todas as mudanças?"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Documento não foi modifico..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Documento não foi salvo..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Ficheiro/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -116,16 +116,16 @@ msgstr "_Remover Visão"
 msgid "Remove view of the document"
 msgstr "Remover visão do documento"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr "'%s' foi modificado. Você desejá salvá-lo?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "_Plugins"
 
@@ -145,138 +145,138 @@ msgstr "Primeiro plano"
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Aparência"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 #, fuzzy
 msgid "Show Statusbar"
 msgstr "Mostrar Barra de Ferramentas"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 #, fuzzy
 msgid "Show Splitscreen"
 msgstr "Mostrar Barra de Ferramentas"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Comportamento do Editor"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Habilitar Autoindent"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Habilitar retorno de linha automático"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 #, fuzzy
 msgid "Document Settings"
 msgstr "_Gravar Preferências"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Seleccionar..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Comando para Imprimir"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Nome"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Posição"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 #, fuzzy
 msgid "Use Plugins"
 msgstr "Plugins"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Remover"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 #, fuzzy
 msgid "Window Size"
 msgstr "Janela"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 #, fuzzy
 msgid "Current Width:"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 #, fuzzy
 msgid "Use Current"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 #, fuzzy
 msgid "Current Height:"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "Modo MDI"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Geral"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Janela"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 #, fuzzy
 msgid "Document"
 msgstr "_Abas dos Documentos"
@@ -433,60 +433,27 @@ msgstr "_Direita"
 msgid "Put the document tabs on the right"
 msgstr "Pôr as abas dos documentos à esquerda"
 
-#: src/menus.c:150
-#, fuzzy
-msgid "_None"
-msgstr "_Novo"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Não ter uma barra de rolagem"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_Sempre"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Sempre ter uma barra de rolagem"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Automático"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Ter uma barra de rolagem somente quando for preciso"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Ativar/Desativar modo somente para leitura"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Ativar/Desativar divisão de tela"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_Abas dos Documentos"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Mudar a localização das abas dos documentos"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "Barra de rolagem"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Mudar opções de visibilidade da barra de rolagem"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "_Gravar Preferências"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Salvar a configuração atual para futuras sessões"
 
@@ -494,16 +461,16 @@ msgstr "Salvar a configuração atual para futuras sessões"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Procurar"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 #, fuzzy
 msgid "Search for:"
 msgstr "Procurar"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -514,52 +481,52 @@ msgstr ""
 "Total de Linhas: %i\n"
 "Linha Atual: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Ir para a linha"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Linha número"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Procurar a partir do cursor"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Procurar a partir do começo do documento"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Procurar a partir do fim do documento"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Case sensitiva"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Inverter procura"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Substituir"
 
-#: src/search.c:889
+#: src/search.c:891
 #, fuzzy
 msgid "Replace all"
 msgstr "Substituir"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Substituir com:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Perguntar antes de substituir"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Substituir?"
 
@@ -575,6 +542,31 @@ msgstr "Fechar"
 msgid "Open (swap) .c/.h file"
 msgstr "Abrir (alternar) arquivo .c/.h"
 
+#, fuzzy
+#~ msgid "_None"
+#~ msgstr "_Novo"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Não ter uma barra de rolagem"
+
+#~ msgid "A_lways"
+#~ msgstr "_Sempre"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Sempre ter uma barra de rolagem"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Automático"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Ter uma barra de rolagem somente quando for preciso"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "Barra de rolagem"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Mudar opções de visibilidade da barra de rolagem"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "Docid é %ld.\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6feb0c2b8..0805fe139 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-05-18 20:00-0300\n"
 "Last-Translator: Frederic L.W.Meunier <linux@urbi.com.br>\n"
 "Language-Team: pt_BR <pt_BR@li.org>\n"
@@ -25,49 +25,49 @@ msgstr "O Plugin de Folhear na Web do gEdit"
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Abrir Arquivo..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Arquivo somente para leitura!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "Erro salvando arquivo!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Salvar como..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Salvar como..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, fuzzy, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr "Você tem certeza que quer voltar atrás em todas as mudanças?"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Documento não foi modifico..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Documento não foi salvo..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "_Arquivo"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -116,16 +116,16 @@ msgstr "_Remover Visão"
 msgid "Remove view of the document"
 msgstr "Remover visão do documento"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr "'%s' foi modificado. Você desejá salvá-lo?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr ""
 
@@ -145,135 +145,135 @@ msgstr "Primeiro plano"
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Aparência"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Mostrar barra de estado"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Mostrar divisão de tela"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Comportamento do Editor"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Habilitar Autoindent"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Habilitar retorno de linha automático"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 #, fuzzy
 msgid "Document Settings"
 msgstr "_Abas dos Documentos"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Selecionar..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Comando para Imprimir"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Nome"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Posição"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Usar Plugins"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Remover"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr ""
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 #, fuzzy
 msgid "Current Width:"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 #, fuzzy
 msgid "Use Current"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 #, fuzzy
 msgid "Current Height:"
 msgstr "Fonte Atual"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "Modo MDI"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Geral"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 #, fuzzy
 msgid "Window"
 msgstr "Achar"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 #, fuzzy
 msgid "Document"
 msgstr "_Abas dos Documentos"
@@ -428,59 +428,27 @@ msgstr "_Esquerda"
 msgid "Put the document tabs on the right"
 msgstr "Pôr as abas dos documentos à esquerda"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "_Nenhuma"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Não ter uma barra de rolagem"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_Sempre"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Sempre ter uma barra de rolagem"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Automático"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Ter uma barra de rolagem somente quando for preciso"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Ativar/Desativar modo somente para leitura"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Ativar/Desativar divisão de tela"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_Abas dos Documentos"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Mudar a localização das abas dos documentos"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "Barra de rolagem"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Mudar opções de visibilidade da barra de rolagem"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "Sa_lvar configuração"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Salvar a configuração atual para futuras sessões"
 
@@ -488,15 +456,15 @@ msgstr "Salvar a configuração atual para futuras sessões"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Procurar de novo"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Procurar por:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -507,52 +475,52 @@ msgstr ""
 "Total de Linhas: %i\n"
 "Linha Atual: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Ir para a linha"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Linha número"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Procurar a partir do cursor"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Procurar a partir do começo do documento"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Procurar a partir do fim do documento"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Case sensitiva"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Inverter procura"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Substituir"
 
-#: src/search.c:889
+#: src/search.c:891
 #, fuzzy
 msgid "Replace all"
 msgstr "Substituir"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Substituir com:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Perguntar antes de substituir"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Substituir?"
 
@@ -568,6 +536,30 @@ msgstr "Fechar"
 msgid "Open (swap) .c/.h file"
 msgstr "Abrir (alternar) arquivo .c/.h"
 
+#~ msgid "_None"
+#~ msgstr "_Nenhuma"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Não ter uma barra de rolagem"
+
+#~ msgid "A_lways"
+#~ msgstr "_Sempre"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Sempre ter uma barra de rolagem"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Automático"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Ter uma barra de rolagem somente quando for preciso"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "Barra de rolagem"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Mudar opções de visibilidade da barra de rolagem"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "Docid é %ld.\n"
 
diff --git a/po/ru.po b/po/ru.po
index 3470364bb..2b7e3be9f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1998-11-18 14:49:47+0100\n"
 "Last-Translator: Martin Baulig,,,, <norwegen@voyager.uni-trier.de>\n"
 "Language-Team: \n"
@@ -23,50 +23,50 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr ""
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr ""
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr ""
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "óÏÈÒÁÎÉÔØ ËÁË"
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "óÏÈÒÁÎÉÔØ ËÁË"
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr ""
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr ""
 
-#: src/commands.c:808
+#: src/commands.c:741
 #, fuzzy
 msgid "Document Unsaved..."
 msgstr "òÕÞËÉ äÏËÕÍÅÎÔÏ×"
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "æÁÊÌ"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 #, fuzzy
 msgid "_File"
 msgstr "æÁÊÌ"
@@ -116,16 +116,16 @@ msgstr ""
 msgid "Remove view of the document"
 msgstr ""
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr ""
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 #, fuzzy
 msgid "_Plugins"
 msgstr "íÏÄÕÌÉ"
@@ -146,141 +146,141 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr ""
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 #, fuzzy
 msgid "Show Statusbar"
 msgstr "ðÅÒÅËÌÀÞÉÔØ óÔÁÔÕÔ"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 #, fuzzy
 msgid "Show Splitscreen"
 msgstr "ðÅÒÅËÌÀÞÉÔØ òÁÚÄÅÌÅÎÉÅ üËÒÁÎÁ"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr ""
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 #, fuzzy
 msgid "Enable Autoindent"
 msgstr "ðÅÒÅËÌÀÞÉÔØ á×ÔÏ×ÙÒÁ×ÎÉ×ÁÎÉÅ"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 #, fuzzy
 msgid "Enable Wordwrap"
 msgstr "ðÅÒÅËÌÀÞÉÔØ úÁ×ÏÒÁÞÉ×ÁÎÉÅ óÌÏ×"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 #, fuzzy
 msgid "Document Settings"
 msgstr "óÐÉÓÏË äÏËÕÍÅÎÔÏ×"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr ""
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 #, fuzzy
 msgid "Select..."
 msgstr "÷ÙÄÅÌÉÔØ ÷ÓÅ"
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr ""
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 #, fuzzy
 msgid "Plugin Selector"
 msgstr "éÍÑ íÏÄÕÌÑ"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr ""
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 #, fuzzy
 msgid "Plugins"
 msgstr "íÏÄÕÌÉ"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 #, fuzzy
 msgid "Use Plugins"
 msgstr "íÏÄÕÌÉ"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr ""
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr ""
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 #, fuzzy
 msgid "Window Size"
 msgstr "ïËÎÏ"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr ""
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr ""
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr ""
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr ""
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 #, fuzzy
 msgid "Window"
 msgstr "ïËÎÏ"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 #, fuzzy
 msgid "Document"
 msgstr "òÕÞËÉ äÏËÕÍÅÎÔÏ×"
@@ -446,62 +446,29 @@ msgstr "óÐÒÁ×Á"
 msgid "Put the document tabs on the right"
 msgstr ""
 
-#: src/menus.c:150
-#, fuzzy
-msgid "_None"
-msgstr "îÏ×ÙÊ"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr ""
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr ""
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr ""
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr ""
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr ""
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr ""
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "ðÅÒÅËÌÀÞÉÔØ òÁÚÄÅÌÅÎÉÅ üËÒÁÎÁ"
 
-#: src/menus.c:203
+#: src/menus.c:185
 #, fuzzy
 msgid "_Document Tabs"
 msgstr "òÕÞËÉ äÏËÕÍÅÎÔÏ×"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr ""
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr ""
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr ""
-
-#: src/menus.c:211
+#: src/menus.c:190
 #, fuzzy
 msgid "Sa_ve Settings"
 msgstr "óÏÈÒÁÎÉÔØ îÁÓÔÒÏÊËÉ"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr ""
 
@@ -509,17 +476,17 @@ msgstr ""
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 #, fuzzy
 msgid "Search"
 msgstr "îÁÊÔÉ"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 #, fuzzy
 msgid "Search for:"
 msgstr "îÁÊÔÉ"
 
-#: src/search.c:766
+#: src/search.c:768
 #, c-format
 msgid ""
 "Filename: %s\n"
@@ -528,52 +495,52 @@ msgid ""
 "Current Line: %i"
 msgstr ""
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr ""
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr ""
 
-#: src/search.c:821
+#: src/search.c:823
 #, fuzzy
 msgid "Search from cursor"
 msgstr "éÓËÁÔØ ÷ÎÏ×Ø"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr ""
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr ""
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr ""
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr ""
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr ""
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr ""
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr ""
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr ""
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr ""
 
@@ -589,6 +556,10 @@ msgstr "úÁËÒÙÔØ"
 msgid "Open (swap) .c/.h file"
 msgstr ""
 
+#, fuzzy
+#~ msgid "_None"
+#~ msgstr "îÏ×ÙÊ"
+
 #~ msgid "Cut"
 #~ msgstr "÷ÙÒÅÚÁÔØ"
 
diff --git a/po/sv.po b/po/sv.po
index fc51ba66d..b37139ab2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-09-07 04:20+0200\n"
 "Last-Translator: Martin Wahlen <mva@sslug.dk>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -25,29 +25,29 @@ msgstr "gEdits webläsar-tillägg"
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Öppna fil..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "Skrivskyddad fil!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "Fel vid sparning av fil!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr "Spara som..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr "Spara som..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
@@ -56,19 +56,19 @@ msgstr ""
 "Är du säker att du vill ångra alla förändringar?\n"
 "(%s)"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Dokument oförändrat..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Dokument ej sparat..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Arkiv/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -117,16 +117,16 @@ msgstr "_Ta bort vy"
 msgid "Remove view of the document"
 msgstr "Tar bort en vy av dokumentet"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s' har ändrats. Vill du spara den?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "_Insticksprogram"
 
@@ -146,130 +146,130 @@ msgstr "Toppnivå"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Utseende"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Visa statusrad"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Visa skärmdelning"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "Editor-uppförande"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "Använd autoindrag"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "Använd ordbryting"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "Dokumentinställningar"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr "Nytt dokument efter sista stängs"
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr "Stäng fönstret efter sista stängs"
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Nuvarande typsnitt"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Välj..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Utskriftskommando"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "Insticksnamn-namn"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "Namn"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Placering"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "Insticksprogram"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "Använd insticksprogram"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Ta bort"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "Fönsterstorlek"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "Nuvarande bredd:"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "Start-bredd:"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "Använd nuvarande"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "Nuvarande höjd:"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "Start-höjd:"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "MDI-läge"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Generellt"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Fönster"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "Dokument"
 
@@ -423,59 +423,27 @@ msgstr "_Höger"
 msgid "Put the document tabs on the right"
 msgstr "Placera dokument-flikarna till höger"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "_Ingen"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "Använd inte rullningslist"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_Alltid"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "Använd alltid rullningslist"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "A_utomatiskt"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "Använd rullningslist om det behövs"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "Sätt på/av skrivskydd"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "Sätt på/av skärmdelning"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_Dokumentflikar"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Ändra placeringen av dokument-flikarna"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "_Rullningslist"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "Ändrar synlighetsinställningarna för rullningslisten"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "Sp_ara inställningar"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Spara nuvarande inställningar för framtida sessioner"
 
@@ -483,15 +451,15 @@ msgstr "Spara nuvarande inställningar för framtida sessioner"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Sök"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Sök efter:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -502,51 +470,51 @@ msgstr ""
 "Totalt antal rader: %i\n"
 "Nuvarande rad: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "Gå till rad"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Radnummer"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Sök från markören"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Sök från början av dokumentet"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Sök från slutet av dokumentet"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Matcha gemener/versaler"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "Omvänd sökning"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Byt ut"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "Byt ut alla"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "Byt ut mot:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Fråga före ersättning"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Ersätt?"
 
@@ -562,6 +530,30 @@ msgstr "Stäng"
 msgid "Open (swap) .c/.h file"
 msgstr "Öppna (byt) .c/.h filen"
 
+#~ msgid "_None"
+#~ msgstr "_Ingen"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "Använd inte rullningslist"
+
+#~ msgid "A_lways"
+#~ msgstr "_Alltid"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "Använd alltid rullningslist"
+
+#~ msgid "_Automatic"
+#~ msgstr "A_utomatiskt"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "Använd rullningslist om det behövs"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "_Rullningslist"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "Ändrar synlighetsinställningarna för rullningslisten"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "Dokid't är %ld.\n"
 
diff --git a/po/uk.po b/po/uk.po
index 4e961a3a7..a3952bc72 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version:  gEdit 0.5.4\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-09-20 17:36+0300\n"
 "Last-Translator: Yuri Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukraine <uk@li.org>\n"
@@ -25,29 +25,29 @@ msgstr "äÏÐÏ×ÎÅÎÑ gEdit - ÎÁצÇÁÔÏÒ Web"
 msgid "Could not save file!"
 msgstr "îÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÆÁÊÌ!"
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "÷¦ÄËÒÉÔÉ ÆÁÊÌ..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr "æÁÊÌ ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ!"
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr "ðÏÍÉÌËÁ ÐÒÉ ÚÂÅÒÅÖÅÎΦ ÆÁÊÌÁ!"
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, c-format
 msgid "Save %s As..."
 msgstr "úÁÐÉÓÁÔÉ %s ÑË..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, c-format
 msgid "Save %s As ..."
 msgstr "úÁÐÉÓÁÔÉ %s ÑË..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
@@ -56,19 +56,19 @@ msgstr ""
 "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔŠצÄͦÎÉÔÉ ÕÓ¦ ÚͦÎÉ?\n"
 "(%s)"
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "äÏËÕÍÅÎÔ ÎÅ ÚͦÎÅÎÏ..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "äÏËÕÍÅÎÔ ÎÅ ÚÂÅÒÅÖÅÎÏ..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_æÁÊÌ/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_æÁÊÌ"
 
@@ -116,16 +116,16 @@ msgstr "_÷ÉÄÁÌÉÔÉ ×ÉÇÌÑÄ"
 msgid "Remove view of the document"
 msgstr "÷ÉÄÁÌÅÎÎÑ ×ÉÇÌÑÄÕ ÄÏËÕÍÅÎÔÁ"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s' ÂÕÌÏ ÍÏÄÉƦËÏ×ÁÎÏ. úÂÅÒÅÇÔÉ ÊÏÇÏ?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "äÏ_ÐÏ×ÎÅÎÑ"
 
@@ -145,130 +145,130 @@ msgstr "ú×ÅÒÈÕ"
 msgid "Modal"
 msgstr "íÏÄÁÌØÎÏ"
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "÷ÉÇÌÑÄ"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "òÑÄÏË ÓÔÁÔÕÓÕ"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "òÏÚĦÌÅÎÉÊ ÅËÒÁÎ"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "òÅÖÉÍ ÒÏÂÏÔÉ ÒÅÄÁËÔÏÒÁ"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "á×ÔÏÍÁÔÉÞÎÉÊ ×¦ÄÓÔÕÐ"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "ðÅÒÅÎÏÓ Ó̦×"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "îÁÓÔÒÏÊËÉ ÄÏËÕÍÅÎÔ¦×"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr "îÏ×ÉÊ ÄÏËÕÍÅÎÔ Ð¦ÓÌÑ ÚÁËÒÉÔÔÑ ÏÓÔÁÎÎØÏÇÏ"
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr "úÁËÒÉ×ÁÔÉ ×¦ËÎÏ Ð¦ÓÌÑ ÚÁËÒÉÔÔÑ ÏÓÔÁÎÎØÏÇÏ"
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "ðÏÔÏÞÎÉÊ ÛÒÉÆÔ"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "÷ÉÂÒÁÔÉ..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "ëÏÍÁÎÄÁ ÄÒÕËÕ"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr "÷ÉÂ¦Ò ÄÏÐÏ×ÎÅÎÑ"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "îÁÚ×Á"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "òÏÚͦÝÅÎÑ"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr "äÏÐÏ×ÎÅÎÑ"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÄÏÐÏ×ÎÅÎÑ"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "äÏÄÁÔÉ"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "÷ÉÄÁÌÉÔÉ"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "òÏÚÍ¦Ò ×¦ËÎÁ"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "ðÏÔÏÞÎÁ ÛÉÒÉÎÁ:"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "ðÏÞÁÔËÏ×Á ÛÉÒÉÎÁ:"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÏÔÏÞÎÕ"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "ðÏÔÏÞÎÁ ×ÉÓÏÔÁ"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "ðÏÞÁÔËÏ×Á ×ÉÓÏÔÁ:"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "òÅÖÉÍ MDI"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "úÁÇÁÌØÎÅ"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "÷¦ËÎÏ"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "äÏËÕÍÅÎÔ"
 
@@ -418,59 +418,27 @@ msgstr "ú_ÐÒÁ×Á"
 msgid "Put the document tabs on the right"
 msgstr "òÏÚͦÝÅÎÎÑ ÚÁËÌÁÄÏË ÚÐÒÁ×Á"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "_îÅÍÁ¤"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr "âÅÚ ÐÁÎÅ̦ ÐÒÏËÒÕÔËÉ"
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_úÁ×ÖÄÉ"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr "úÁ×ÖÄÉ ÐÏËÁÚÕ×ÁÔÉ Ä¦ÁÇÒÁÍÕ ÐÒÏËÒÕÔËÉ"
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_á×ÔÏÍÁÔÉÞÎÏ"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr "ðÏËÁÚÕ×ÁÔÉ Ä¦ÁÇÒÁÍÕ ÐÒÏËÒÕÔËÉ Ì¦ÛÅ ÔÏĦ, ËÏÌÉ ÃÅ ÎÅÏÂȦÄÎÏ"
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "áÔÉ×Õ×ÁÔÉ/äÅÚÁËÔÉ×Õ×ÁÔÉ ÌÉÛÅ ÞÉÔÁÎÎÑ"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "áÔÉ×Õ×ÁÔÉ/äÅÚÁËÔÉ×Õ×ÁÔÉ ÒÏÚĦÌÅÎÎÑ ÅËÒÁÎÕ"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_úÁËÌÁÄËÉ ÄÏËÕÍÅÎÔ¦×"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "úͦÎÁ ÒÏÚͦÝÅÎÎÑ ÚÁËÌÁÄÏË ÄÏËÕÍÅÎÔ¦×"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr "_ä¦ÁÇÒÁÍÁ ÐÒÏËÒÕÔËÉ"
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr "úͦÎÁ ×ÌÁÓÔÉ×ÏÓÔÅÊ ×ÉÄÉÍÏÓÔ¦ ÐÁÎÅ̦ ÐÒÏËÒÕÔËÉ"
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "úÂÅÒÅÇÔÉ _ËÏÎƦÇÕÒÁæÀ"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "úÂÅÒÅÖÅÎÎÑ ÐÏÔÏÞÎϧ ËÏÎƦÇÕÒÁæ§ ÄÌÑ ÎÁÓÔÕÐÎÉÈ ÓÅÓ¦Ê"
 
@@ -478,15 +446,15 @@ msgstr "úÂÅÒÅÖÅÎÎÑ ÐÏÔÏÞÎϧ ËÏÎƦÇÕÒÁæ§ ÄÌÑ ÎÁÓÔÕÐÎÉÈ ÓÅÓ¦Ê"
 msgid "Find In Files"
 msgstr "úÎÁÊÔÉ Õ ÆÁÊÌÁÈ"
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "ðÏÛÕË"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "ûÕËÁÔÉ:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -497,51 +465,51 @@ msgstr ""
 "÷ÓØÏÇÏ ÒÑÄ˦×: %i\n"
 "ðÏÔÏÞÎÉÊ ÒÑÄÏË: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÒÑÄÏË"
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "îÏÍÅÒ ÒÑÄËÁ"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "ûÕËÁÔÉ Ú ÐÏÚÉÃɧ ËÕÒÓÏÒÕ"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "ûÕËÁÔÉ Ú ÐÏÞÁÔËÕ ÄÏËÕÍÅÎÔÁ"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "ûÕËÁÔÉ Ú Ë¦ÎÃÑ ÄÏËÕÍÅÎÔÁ"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "þÕÔÌÉצÓÔØ ÄÏ ÒÅǦÓÔÒÕ"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË"
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "úÁͦÎÉÔÉ"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "úÁͦÎÉÔÉ ×ÓÅ"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr "úͦÎÉÔÉ ÎÁ:"
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "ðÉÔÁÔÉ ÐÅÒÅÄ ÚÁͦÎÏÀ"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "úÁͦÎÉÔÉ?"
 
@@ -557,6 +525,30 @@ msgstr "úÁËÒÉÔÉ"
 msgid "Open (swap) .c/.h file"
 msgstr "÷¦ÄËÒÉÔÉ (ÏÂͦÎÑÔÉ) .c/.h ÆÁÊÌ"
 
+#~ msgid "_None"
+#~ msgstr "_îÅÍÁ¤"
+
+#~ msgid "Don't have a scrollbar"
+#~ msgstr "âÅÚ ÐÁÎÅ̦ ÐÒÏËÒÕÔËÉ"
+
+#~ msgid "A_lways"
+#~ msgstr "_úÁ×ÖÄÉ"
+
+#~ msgid "Always have the scrollbar"
+#~ msgstr "úÁ×ÖÄÉ ÐÏËÁÚÕ×ÁÔÉ Ä¦ÁÇÒÁÍÕ ÐÒÏËÒÕÔËÉ"
+
+#~ msgid "_Automatic"
+#~ msgstr "_á×ÔÏÍÁÔÉÞÎÏ"
+
+#~ msgid "Only have scrollbar when it's needed"
+#~ msgstr "ðÏËÁÚÕ×ÁÔÉ Ä¦ÁÇÒÁÍÕ ÐÒÏËÒÕÔËÉ Ì¦ÛÅ ÔÏĦ, ËÏÌÉ ÃÅ ÎÅÏÂȦÄÎÏ"
+
+#~ msgid "_Scrollbar"
+#~ msgstr "_ä¦ÁÇÒÁÍÁ ÐÒÏËÒÕÔËÉ"
+
+#~ msgid "Change visibility options of the scrollbar"
+#~ msgstr "úͦÎÁ ×ÌÁÓÔÉ×ÏÓÔÅÊ ×ÉÄÉÍÏÓÔ¦ ÐÁÎÅ̦ ÐÒÏËÒÕÔËÉ"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "¶ÄÅÎÔÉƦËÁÔÏÒ ÄÏËÕÍÅÎÔÁ - %ld.\n"
 
diff --git a/po/wa.po b/po/wa.po
index 4275b2a9d..a769c6ea5 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit 0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -30,48 +30,48 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 msgid "Open File..."
 msgstr "Drovî on fitchî..."
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr ""
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr ""
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, c-format
 msgid "Save %s As..."
 msgstr "Schaper èt rlomer %s..."
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, c-format
 msgid "Save %s As ..."
 msgstr "Schaper èt rlomer %s..."
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr ""
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr "Documint nén candji..."
 
-#: src/commands.c:808
+#: src/commands.c:741
 msgid "Document Unsaved..."
 msgstr "Documint nén schapé..."
 
-#: src/commands.c:991
+#: src/commands.c:924
 msgid "_File/"
 msgstr "_Fitchî/"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "_Fitchî"
 
@@ -119,16 +119,16 @@ msgstr "_Bodjî vuwe"
 msgid "Remove view of the document"
 msgstr "Bodjî ene vuwe foû do documint"
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr " '%s' a sti candji. Voloz-ve li schaper ?"
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr ""
 
@@ -148,130 +148,130 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr "Rivnance"
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Mostrer bår ås messaedjes"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr ""
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr ""
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr ""
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr ""
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 msgid "Document Settings"
 msgstr "Apontiaedje do documint"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "Fonte a eployî"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "Tchwezi..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "Comande po rexhe"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr "No"
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr "Eplaeçmint"
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 msgid "Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 msgid "Use Plugins"
 msgstr ""
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr "Radjouter"
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr "Bodjî"
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr "Grandeu do purnea"
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 msgid "Current Width:"
 msgstr "Lårdjeu do moumint:"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr "Lårdjeu d' enondaedje:"
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 msgid "Use Current"
 msgstr "Eployi li ci do moumint"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 msgid "Current Height:"
 msgstr "Hôteu do moumint:"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr "Hôteu d' enondaedje:"
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr "Môde MDI"
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "Djenerå"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 msgid "Window"
 msgstr "Purnea"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 msgid "Document"
 msgstr "Documint"
 
@@ -421,59 +421,27 @@ msgstr "_Droete"
 msgid "Put the document tabs on the right"
 msgstr "Mete les etiketes a droete"
 
-#: src/menus.c:150
-msgid "_None"
-msgstr "_Nole"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr ""
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr "_Todi"
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr ""
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr "_Åtomatike"
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr ""
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr ""
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr ""
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "_Etiketes des documints"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "Candjî l' eplaeçmint des etiketes des documints"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr ""
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr ""
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "_Schaper les tchûzes"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Schaper les apontiaedjes do mounmint po ene session a vni"
 
@@ -481,15 +449,15 @@ msgstr "Schaper les apontiaedjes do mounmint po ene session a vni"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "Cwerî"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 msgid "Search for:"
 msgstr "Cwerî on:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -500,51 +468,51 @@ msgstr ""
 "Royes å totå: %i\n"
 "Ci roye chal: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr ""
 
-#: src/search.c:798
+#: src/search.c:800
 msgid "Line number"
 msgstr "Limerô di roye"
 
-#: src/search.c:821
+#: src/search.c:823
 msgid "Search from cursor"
 msgstr "Cmincer a cwerî d' èl plaece do curseu"
 
-#: src/search.c:828
+#: src/search.c:830
 msgid "Search from beginning of document"
 msgstr "Cmincer a cwerî al copete do documint"
 
-#: src/search.c:835
+#: src/search.c:837
 msgid "Search from end of document"
 msgstr "Cmincer a cwerî al valeye do documint"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "Grandès <> ptitès letes"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr ""
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 msgid "Replace"
 msgstr "Mete el plaece"
 
-#: src/search.c:889
+#: src/search.c:891
 msgid "Replace all"
 msgstr "Mete el plaece di tot"
 
-#: src/search.c:903
+#: src/search.c:905
 msgid "Replace with:"
 msgstr ""
 
-#: src/search.c:914
+#: src/search.c:916
 msgid "Ask before replacing"
 msgstr "Dimander divant di mete èl plaece"
 
-#: src/search.c:1113
+#: src/search.c:1115
 msgid "Replace?"
 msgstr "Mete el plaece?"
 
@@ -560,6 +528,15 @@ msgstr "Cloyu"
 msgid "Open (swap) .c/.h file"
 msgstr "Drovî (swap) fitchî .c/.h"
 
+#~ msgid "_None"
+#~ msgstr "_Nole"
+
+#~ msgid "A_lways"
+#~ msgstr "_Todi"
+
+#~ msgid "_Automatic"
+#~ msgstr "_Åtomatike"
+
 #~ msgid "Font"
 #~ msgstr "Fonte"
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 5869dbf1f..05b4e9e8b 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit-0.5.5\n"
-"POT-Creation-Date: 1999-10-20 22:41+0100\n"
+"POT-Creation-Date: 1999-11-16 16:42+0000\n"
 "PO-Revision-Date: 1999-02-12 20:21+0800\n"
 "Last-Translator: Cd Chen <cdchen@mail.about.net.tw>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -24,51 +24,51 @@ msgstr ""
 msgid "Could not save file!"
 msgstr ""
 
-#: src/commands.c:426
+#: src/commands.c:359
 #, fuzzy
 msgid "Open File..."
 msgstr "¶}±Ò¤@­ÓÀÉ®×"
 
-#: src/commands.c:480 src/commands.c:528
+#: src/commands.c:413 src/commands.c:461
 msgid "Read only file!"
 msgstr ""
 
-#: src/commands.c:567 src/commands.c:637
+#: src/commands.c:500 src/commands.c:570
 msgid "Error saving file!"
 msgstr ""
 
-#: src/commands.c:597
+#: src/commands.c:530
 #, fuzzy, c-format
 msgid "Save %s As..."
 msgstr " Àx¦s "
 
-#: src/commands.c:670
+#: src/commands.c:603
 #, fuzzy, c-format
 msgid "Save %s As ..."
 msgstr " Àx¦s "
 
-#: src/commands.c:756
+#: src/commands.c:689
 #, c-format
 msgid ""
 "Are you sure you wish to revert all changes?\n"
 "(%s)"
 msgstr ""
 
-#: src/commands.c:804
+#: src/commands.c:737
 msgid "Document Unchanged..."
 msgstr ""
 
-#: src/commands.c:808
+#: src/commands.c:741
 #, fuzzy
 msgid "Document Unsaved..."
 msgstr "¤å¥ó©w¦ì(_D)"
 
-#: src/commands.c:991
+#: src/commands.c:924
 #, fuzzy
 msgid "_File/"
 msgstr "ÀÉ®×(_F)"
 
-#: src/commands.c:1000 src/commands.c:1001
+#: src/commands.c:933 src/commands.c:934
 msgid "_File"
 msgstr "ÀÉ®×(_F)"
 
@@ -117,16 +117,16 @@ msgstr ""
 msgid "Remove view of the document"
 msgstr ""
 
-#: src/gE_mdi.c:482
+#: src/gE_mdi.c:472
 #, c-format
 msgid " '%s' has been modified. Do you wish to save it?"
 msgstr ""
 
 #. FIXME: Needs to actually unload the plugin itself..
 #. Try removing plugin from Gnome Menu..
-#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:539
-#: src/gE_prefs_box.c:540 src/gE_prefs_box.c:595 src/gE_prefs_box.c:596
-#: src/menus.c:266
+#: src/gE_plugin_api.c:99 src/gE_plugin_api.c:100 src/gE_prefs_box.c:543
+#: src/gE_prefs_box.c:544 src/gE_prefs_box.c:599 src/gE_prefs_box.c:600
+#: src/menus.c:245
 msgid "_Plugins"
 msgstr "Plugins(_P)"
 
@@ -146,137 +146,137 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/gE_prefs_box.c:281
+#: src/gE_prefs_box.c:285
 msgid "Appearance"
 msgstr ""
 
-#: src/gE_prefs_box.c:294
+#: src/gE_prefs_box.c:298
 msgid "Show Statusbar"
 msgstr "Åã¥Üª¬ºAÄæ"
 
-#: src/gE_prefs_box.c:303
+#: src/gE_prefs_box.c:307
 msgid "Show Splitscreen"
 msgstr "Åã¥Ü¤À³Îµøµ¡"
 
-#: src/gE_prefs_box.c:312
+#: src/gE_prefs_box.c:316
 msgid "Editor Behavior"
 msgstr "½s¿è¾¹¯S©Ê"
 
-#: src/gE_prefs_box.c:325
+#: src/gE_prefs_box.c:329
 msgid "Enable Autoindent"
 msgstr "±Ò¥Î¦Û°Ê½s±Æ"
 
-#: src/gE_prefs_box.c:334
+#: src/gE_prefs_box.c:338
 msgid "Enable Wordwrap"
 msgstr "±Ò¥Î¤å¦r´«¦æ"
 
 #. Document Closing stuffs
-#: src/gE_prefs_box.c:397
+#: src/gE_prefs_box.c:401
 #, fuzzy
 msgid "Document Settings"
 msgstr "¤å¥ó¦Cªí(_D)"
 
-#: src/gE_prefs_box.c:411
+#: src/gE_prefs_box.c:415
 msgid "New Document After Closing Last"
 msgstr ""
 
-#: src/gE_prefs_box.c:417
+#: src/gE_prefs_box.c:421
 msgid "Close Window After Closing Last"
 msgstr ""
 
 #. End of docyment closing stuffs
 #. Font Settings (within Document Settings frame)
-#: src/gE_prefs_box.c:426
+#: src/gE_prefs_box.c:430
 msgid "Current Font"
 msgstr "¥¿¦b¨Ï¥Îªº¦rÅé"
 
-#: src/gE_prefs_box.c:443
+#: src/gE_prefs_box.c:447
 msgid "Select..."
 msgstr "½Ð¿ï¾Ü..."
 
 #. End of Font Setttings
 #. Print COmmand
-#: src/gE_prefs_box.c:459
+#: src/gE_prefs_box.c:463
 msgid "Print Command"
 msgstr "¦C¦L©R¥O"
 
-#: src/gE_prefs_box.c:511
+#: src/gE_prefs_box.c:515
 msgid "Plugin Selector"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Name"
 msgstr ""
 
-#: src/gE_prefs_box.c:626
+#: src/gE_prefs_box.c:630
 msgid "Location"
 msgstr ""
 
 #. Plugins Settings
-#: src/gE_prefs_box.c:633 src/gE_prefs_box.c:932
+#: src/gE_prefs_box.c:637 src/gE_prefs_box.c:936
 #, fuzzy
 msgid "Plugins"
 msgstr "Plugins(_P)"
 
-#: src/gE_prefs_box.c:646
+#: src/gE_prefs_box.c:650
 #, fuzzy
 msgid "Use Plugins"
 msgstr "Plugins(_P)"
 
-#: src/gE_prefs_box.c:712
+#: src/gE_prefs_box.c:716
 msgid "Add"
 msgstr ""
 
-#: src/gE_prefs_box.c:717
+#: src/gE_prefs_box.c:721
 msgid "Remove"
 msgstr ""
 
 #. Window Size Settings
-#: src/gE_prefs_box.c:760
+#: src/gE_prefs_box.c:764
 msgid "Window Size"
 msgstr ""
 
-#: src/gE_prefs_box.c:773
+#: src/gE_prefs_box.c:777
 #, fuzzy
 msgid "Current Width:"
 msgstr "¥¿¦b¨Ï¥Îªº¦rÅé"
 
-#: src/gE_prefs_box.c:793
+#: src/gE_prefs_box.c:797
 msgid "Startup Width:"
 msgstr ""
 
-#: src/gE_prefs_box.c:801 src/gE_prefs_box.c:841
+#: src/gE_prefs_box.c:805 src/gE_prefs_box.c:845
 #, fuzzy
 msgid "Use Current"
 msgstr "¥¿¦b¨Ï¥Îªº¦rÅé"
 
-#: src/gE_prefs_box.c:813
+#: src/gE_prefs_box.c:817
 #, fuzzy
 msgid "Current Height:"
 msgstr "¥¿¦b¨Ï¥Îªº¦rÅé"
 
-#: src/gE_prefs_box.c:833
+#: src/gE_prefs_box.c:837
 msgid "Startup Height:"
 msgstr ""
 
 #. MDI Mode settnigs
-#: src/gE_prefs_box.c:849
+#: src/gE_prefs_box.c:853
 msgid "MDI Mode"
 msgstr ""
 
 #. General Settings
-#: src/gE_prefs_box.c:917
+#: src/gE_prefs_box.c:921
 msgid "General"
 msgstr "¤@¯ëªº"
 
 #. Window Settings
-#: src/gE_prefs_box.c:922
+#: src/gE_prefs_box.c:926
 #, fuzzy
 msgid "Window"
 msgstr "·j´M"
 
 #. Docuemnt Settings
-#: src/gE_prefs_box.c:927
+#: src/gE_prefs_box.c:931
 #, fuzzy
 msgid "Document"
 msgstr "¤å¥ó©w¦ì(_D)"
@@ -435,60 +435,27 @@ msgstr "»ô¥k(_R)"
 msgid "Put the document tabs on the right"
 msgstr "±N¤å¥ó©w¦ì¬°»ô¥k"
 
-#: src/menus.c:150
-#, fuzzy
-msgid "_None"
-msgstr "·s«Ø(_N)"
-
-#: src/menus.c:151
-msgid "Don't have a scrollbar"
-msgstr ""
-
-#: src/menus.c:154
-msgid "A_lways"
-msgstr ""
-
-#: src/menus.c:155
-msgid "Always have the scrollbar"
-msgstr ""
-
-#: src/menus.c:158
-msgid "_Automatic"
-msgstr ""
-
-#: src/menus.c:159
-msgid "Only have scrollbar when it's needed"
-msgstr ""
-
-#: src/menus.c:192
+#: src/menus.c:174
 msgid "Toggle Readonly"
 msgstr "¤Á´«°ß¿Wª¬ºA"
 
-#: src/menus.c:197
+#: src/menus.c:179
 msgid "Toggle Split Screen"
 msgstr "¤Á´«¤À³Îµøµ¡"
 
-#: src/menus.c:203
+#: src/menus.c:185
 msgid "_Document Tabs"
 msgstr "¤å¥ó©w¦ì(_D)"
 
-#: src/menus.c:204
+#: src/menus.c:186
 msgid "Change the placement of the document tabs"
 msgstr "§ïÅܤå¥ó©w¦ìªº¦ì¸m"
 
-#: src/menus.c:206
-msgid "_Scrollbar"
-msgstr ""
-
-#: src/menus.c:207
-msgid "Change visibility options of the scrollbar"
-msgstr ""
-
-#: src/menus.c:211
+#: src/menus.c:190
 msgid "Sa_ve Settings"
 msgstr "Àx¦s³]©w(_v)"
 
-#: src/menus.c:212
+#: src/menus.c:191
 msgid "Save the current settings for future sessions"
 msgstr "Àx¦s²{¦bªº³]©w­È¡A¥H¨Ñ¥¼¨Ó¨Ï¥Î"
 
@@ -496,16 +463,16 @@ msgstr "Àx¦s²{¦bªº³]©w­È¡A¥H¨Ñ¥¼¨Ó¨Ï¥Î"
 msgid "Find In Files"
 msgstr ""
 
-#: src/search.c:413 src/search.c:860
+#: src/search.c:413 src/search.c:862
 msgid "Search"
 msgstr "·j´M"
 
-#: src/search.c:417 src/search.c:865 src/search.c:893
+#: src/search.c:417 src/search.c:867 src/search.c:895
 #, fuzzy
 msgid "Search for:"
 msgstr "·j´M:"
 
-#: src/search.c:766
+#: src/search.c:768
 #, fuzzy, c-format
 msgid ""
 "Filename: %s\n"
@@ -516,59 +483,59 @@ msgstr ""
 "Á`¦æ¼Æ: %i\n"
 "²{¦bªº¦æ¼Æ: %i"
 
-#: src/search.c:788
+#: src/search.c:790
 msgid "Go to line"
 msgstr ""
 
-#: src/search.c:798
+#: src/search.c:800
 #, fuzzy
 msgid "Line number"
 msgstr "¦æ¸¹"
 
-#: src/search.c:821
+#: src/search.c:823
 #, fuzzy
 msgid "Search from cursor"
 msgstr "´M§ä¤@­Ó¦r¦ê"
 
-#: src/search.c:828
+#: src/search.c:830
 #, fuzzy
 msgid "Search from beginning of document"
 msgstr "¥Ñ¤å¥óªº¶}ÀY¶}©l·j´M"
 
-#: src/search.c:835
+#: src/search.c:837
 #, fuzzy
 msgid "Search from end of document"
 msgstr "¥Ñ¤å¥óªº¶}ÀY¶}©l·j´M"
 
-#: src/search.c:842
+#: src/search.c:844
 msgid "Case sensitive"
 msgstr "§PÂ_¤j¤p¼g"
 
-#: src/search.c:848
+#: src/search.c:850
 msgid "Reverse search"
 msgstr ""
 
-#: src/search.c:887 src/search.c:888
+#: src/search.c:889 src/search.c:890
 #, fuzzy
 msgid "Replace"
 msgstr "¨ú¥N:"
 
-#: src/search.c:889
+#: src/search.c:891
 #, fuzzy
 msgid "Replace all"
 msgstr "¨ú¥N:"
 
-#: src/search.c:903
+#: src/search.c:905
 #, fuzzy
 msgid "Replace with:"
 msgstr "¨ú¥N:"
 
-#: src/search.c:914
+#: src/search.c:916
 #, fuzzy
 msgid "Ask before replacing"
 msgstr "¨ú¥N«e¸ß°Ý"
 
-#: src/search.c:1113
+#: src/search.c:1115
 #, fuzzy
 msgid "Replace?"
 msgstr "¨ú¥N:"
@@ -585,6 +552,10 @@ msgstr "Ãö³¬"
 msgid "Open (swap) .c/.h file"
 msgstr "¶}±Ò (¤Á´«) .c/.h ÀÉ®×"
 
+#, fuzzy
+#~ msgid "_None"
+#~ msgstr "·s«Ø(_N)"
+
 #~ msgid "Docid is %ld.\n"
 #~ msgstr "¤å¥ó§Ç¸¹ %ld.\n"
 
diff --git a/src/commands.c b/src/commands.c
index 027940a52..d15a8457c 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -184,73 +184,6 @@ tab_toggle_cb(GtkWidget *widget, gpointer cbwindow)
 }
 */
 
-/* Scrollbar Options */
-void
-scrollbar_none_cb (GtkWidget *widget, gpointer cbdata)
-{
-	int c, w;
-
-	for (c = 0; c < g_list_length (mdi->children); c++) {
-	
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_NEVER);
-
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_NEVER);
-        
-        }
-         
-        settings->scrollbar = GTK_POLICY_NEVER;
-        
-}
-
-void
-scrollbar_always_cb (GtkWidget *widget, gpointer cbdata)
-{
-	int c, w;
-
-	for (c = 0; c < g_list_length (mdi->children); c++) {
-	
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_ALWAYS);
-
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_ALWAYS);
-        }
-        
-        settings->scrollbar = GTK_POLICY_ALWAYS;
-
-}
-
-void
-scrollbar_auto_cb (GtkWidget *widget, gpointer cbdata)
-{
-	int c, w;
-
-	for (c = 0; c < g_list_length (mdi->children); c++) {
-	
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_AUTOMATIC);
-
-	     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
-	        ((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
-				      GTK_POLICY_NEVER,
-				      GTK_POLICY_AUTOMATIC);
-        }
-        
-        settings->scrollbar = GTK_POLICY_NEVER;
-        
-}
 
 /* ---- Auto-indent Callback(s) --- */
 
diff --git a/src/gE_prefs.c b/src/gE_prefs.c
index 83cec2fbb..093ed24a1 100644
--- a/src/gE_prefs.c
+++ b/src/gE_prefs.c
@@ -36,6 +36,7 @@ gE_save_settings()
 
 	gnome_config_set_int ("tab pos", (gint) mdi->tab_pos);
 	gnome_config_set_int ("auto indent", (gboolean) settings->auto_indent);
+	gnome_config_set_int ("word wrap", (gboolean) settings->word_wrap);
 	gnome_config_set_int ("show statusbar", (gboolean) settings->show_status);
 	gnome_config_set_int ("toolbar", (gint) settings->have_toolbar);
 	gnome_config_set_int ("tb text", (gint) settings->have_tb_text);
@@ -44,7 +45,6 @@ gE_save_settings()
 	gnome_config_set_int ("splitscreen", (gint) settings->splitscreen);
 	gnome_config_set_int ("close doc", (gint) settings->close_doc);
 	gnome_config_set_int ("mdi mode", mdiMode);
-	gnome_config_set_int ("scrollbar", settings->scrollbar);
 	gnome_config_set_string ("font", settings->font);
 	gnome_config_set_int ("width", (gint) settings->width);
 	gnome_config_set_int ("height", (gint) settings->height);
@@ -69,6 +69,8 @@ void gE_get_settings()
 	gnome_config_push_prefix ("/gEdit/Global/");
 	 
 	mdi->tab_pos = gnome_config_get_int ("tab pos");
+	settings->auto_indent = gnome_config_get_int ("auto indent");
+	settings->word_wrap = gnome_config_get_int ("word wrap");
 	settings->run = gnome_config_get_int ("run");
 	settings->show_status = gnome_config_get_int ("show statusbar");
 	settings->have_toolbar = gnome_config_get_int ("toolbar");
@@ -81,10 +83,6 @@ void gE_get_settings()
 	if (!mdiMode)
 	  mdiMode = mdi_type[GNOME_MDI_NOTEBOOK];
 	   
-	settings->scrollbar = gnome_config_get_int ("scrollbar");
-	if (!settings->scrollbar)
-	  settings->scrollbar = GTK_POLICY_AUTOMATIC;
-	 
 	settings->width = gnome_config_get_int ("width");
 	if (!settings->width)
 	  settings->width = 630;
diff --git a/src/gE_prefs.h b/src/gE_prefs.h
index a301733c6..7454ed6c0 100644
--- a/src/gE_prefs.h
+++ b/src/gE_prefs.h
@@ -26,6 +26,7 @@ extern void gE_rc_parse(void);
 typedef struct _gE_preference {
 
 	guint auto_indent;
+	gint word_wrap;
 	gint show_tabs;
 	gint tab_pos;
 	guint show_status;
@@ -40,7 +41,6 @@ typedef struct _gE_preference {
 	gint num_recent; /* Number of recently accessed documents in the 
 	                   Recent Documents menu */
 	gint mdi_mode;
-	gint scrollbar;
 	
 	gint width, height;
 	
diff --git a/src/gE_prefs_box.c b/src/gE_prefs_box.c
index fa61f0fc1..c3882bc56 100644
--- a/src/gE_prefs_box.c
+++ b/src/gE_prefs_box.c
@@ -163,6 +163,7 @@ void gE_window_refresh(gE_window *w)
 	    nth_view = g_list_nth_data (doc->views, j);
 
   	    gE_view_set_font (nth_view, settings->font);
+  	    gE_view_set_word_wrap (nth_view, settings->word_wrap);
   	    
   	  }
 
@@ -182,6 +183,7 @@ void gE_apply(GnomePropertyBox *pbox, gint page, gE_data *data)
 	settings->auto_indent = (GTK_TOGGLE_BUTTON (prefs->autoindent)->active);
 	settings->show_status = (GTK_TOGGLE_BUTTON (prefs->status)->active);  
 	GE_VIEW (mdi->active_view)->splitscreen = (GTK_TOGGLE_BUTTON (prefs->split)->active);
+	settings->word_wrap = (GTK_TOGGLE_BUTTON (prefs->wordwrap)->active);
 
 	/* Print Settings */
 	settings->print_cmd = g_strdup (gtk_entry_get_text (GTK_ENTRY(prefs->pcmd)));
@@ -244,6 +246,8 @@ void get_prefs(gE_data *data)
 							 settings->show_status);
 	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (prefs->split),
 							 GE_VIEW (mdi->active_view)->splitscreen);
+	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (prefs->wordwrap),
+							 settings->word_wrap);
   					   
 	
 	if (!settings->close_doc)
diff --git a/src/gE_view.c b/src/gE_view.c
index 1de8c305b..68047d54b 100644
--- a/src/gE_view.c
+++ b/src/gE_view.c
@@ -665,7 +665,7 @@ static void gE_view_init (gE_view *view)
 
 	view->text = gtk_text_new(NULL, NULL);
 	gtk_text_set_editable(GTK_TEXT(view->text), !view->read_only);
-	gtk_text_set_word_wrap(GTK_TEXT(view->text), view->word_wrap);
+	gtk_text_set_word_wrap(GTK_TEXT(view->text), settings->word_wrap);
 	gtk_text_set_line_wrap(GTK_TEXT(view->text), view->line_wrap);
 
 	
@@ -679,8 +679,8 @@ static void gE_view_init (gE_view *view)
 
 
 	/* Handle Auto Indent */
-	gtk_signal_connect_after (GTK_OBJECT(view->text), "insert_text",
-		GTK_SIGNAL_FUNC(auto_indent_cb), view);
+	view->indent = gtk_signal_connect_after (GTK_OBJECT(view->text), "insert_text",
+										 GTK_SIGNAL_FUNC(auto_indent_cb), view);
 
 	/*	
 	I'm not even sure why these are here.. i'm sure there are much easier ways
@@ -727,7 +727,7 @@ static void gE_view_init (gE_view *view)
 
 	view->split_screen = gtk_text_new(NULL, NULL);
 	gtk_text_set_editable(GTK_TEXT(view->split_screen), !view->read_only);
-	gtk_text_set_word_wrap(GTK_TEXT(view->split_screen), view->word_wrap);
+	gtk_text_set_word_wrap(GTK_TEXT(view->split_screen), settings->word_wrap);
 	gtk_text_set_line_wrap(GTK_TEXT(view->split_screen), view->line_wrap);
 
 	
@@ -748,8 +748,9 @@ static void gE_view_init (gE_view *view)
 				                     GTK_SIGNAL_FUNC(doc_delete_text_cb),
 				                     (gpointer) view);
 
-	gtk_signal_connect_after(GTK_OBJECT(view->split_screen),
-		"insert_text", GTK_SIGNAL_FUNC(auto_indent_cb), view);
+	view->s_indent = gtk_signal_connect (GTK_OBJECT(view->split_screen), "insert_text",
+	                                    GTK_SIGNAL_FUNC(auto_indent_cb),
+	                                    (gpointer) view);
 				
 	gtk_container_add (GTK_CONTAINER (view->scrwindow[1]), view->split_screen);
 
@@ -908,7 +909,8 @@ void gE_view_set_word_wrap (gE_view *view, gint word_wrap)
 
 	view->word_wrap = word_wrap;
 
-	gtk_text_set_word_wrap (GTK_TEXT (view->text), view->word_wrap);
+	gtk_text_set_word_wrap (GTK_TEXT (view->text), word_wrap);
+	gtk_text_set_word_wrap (GTK_TEXT (view->split_screen), word_wrap);
 
 }
 
@@ -973,7 +975,6 @@ void gE_view_set_font (gE_view *view, gchar *font)
 
 }
 
-
 void gE_view_set_position (gE_view *view, gint pos)
 {
 
diff --git a/src/menus.c b/src/menus.c
index 6e577bf1e..6b28bf5d6 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -145,24 +145,6 @@ GnomeUIInfo gedit_tab_menu []= {
 
 };
 
-GnomeUIInfo gedit_scrbar_menu []= {
-
-	{ GNOME_APP_UI_ITEM, N_("_None"),
-	  N_("Don't have a scrollbar"),
-	  scrollbar_none_cb, NULL },
-
-	{ GNOME_APP_UI_ITEM, N_("A_lways"),
-	  N_("Always have the scrollbar"),
-	  scrollbar_always_cb, NULL },
-
-	{ GNOME_APP_UI_ITEM, N_("_Automatic"),
-	  N_("Only have scrollbar when it's needed"),
-	  scrollbar_auto_cb, NULL },
-
-	GNOMEUIINFO_END
-
-};
-
 
 GnomeUIInfo gedit_settings_menu []= {
 /* -- These settings are in the Preferences Box, and only need to be
@@ -203,9 +185,6 @@ GnomeUIInfo gedit_settings_menu []= {
 	{ GNOME_APP_UI_SUBTREE, N_("_Document Tabs"),
 	  N_("Change the placement of the document tabs"), &gedit_tab_menu },
 	  
-	{ GNOME_APP_UI_SUBTREE, N_("_Scrollbar"),
-	  N_("Change visibility options of the scrollbar"), &gedit_scrbar_menu },
-
 	GNOMEUIINFO_SEPARATOR,
 
 	{ GNOME_APP_UI_ITEM, N_("Sa_ve Settings"),
@@ -277,128 +256,8 @@ GnomeUIInfo gedit_menu [] = {
 
 GnomeUIInfo * gE_menus_init (gE_window *window, gE_data *data)
 {
-/*	add_callback_data (gedit_file_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_edit_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_tab_menu, window, data);
-	add_callback_data (gedit_settings_menu,GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_window_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_docs_menu, GNOME_APP (mdi->active_window), data);
-	add_callback_data (gedit_help_menu, GNOME_APP (mdi->active_window), data);
-*/
+
 	gnome_app_create_menus (GNOME_APP (mdi->active_window), gedit_menu);
 
-/*	remove_callback_data (gedit_file_menu, GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_edit_menu, GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_tab_menu, GNOME_APP (mdi->active_window),data);
-       remove_callback_data (gedit_settings_menu,GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_window_menu,GNOME_APP (mdi->active_window),data);
-	remove_callback_data (gedit_docs_menu, GNOME_APP (mdi->active_window), data);
-	remove_callback_data (gedit_help_menu, GNOME_APP (mdi->active_window), data);
-*/
 	return (GnomeUIInfo *) gedit_menu;
 }
-
-/*
- * This function initializes the toggle menu items to the proper states.
- * It is called from gE_window_nwe after the settings have been loaded.
- */
-void
-gE_set_menu_toggle_states()
-{
-
-	gE_document *doc;
-	gE_view *view;
-	int i;
-
-#define GE_SET_TOGGLE_STATE(item, l, boolean)                            \
-  if (!strcmp(item.label, l))                                            \
-    GTK_CHECK_MENU_ITEM (item.widget)->active = boolean
-
-  /*
-   * Initialize the states of the document tabs menu...
-   * FIXME: This is borked right now.. does GnomeMDI need this? 
-   *  	    An addition to the prefs box would be better..
-   */
-/*  for (i = 0; gedit_tab_menu[i].type != GNOME_APP_UI_ENDOFINFO; i++)
-    {
-      if (gedit_tab_menu[i].label)
-	{
-	  GE_SET_TOGGLE_STATE(gedit_tab_menu[i], GE_TOGGLE_LABEL_SHOWTABS,
-			      settings->show_tabs);
-	  
-	}
-    }*/
-
-
-  /*
-   * The settings menu...
-   */
-	for (i = 0; gedit_settings_menu[i].type != GNOME_APP_UI_ENDOFINFO; i++) {
-
-	  if (gedit_settings_menu[i].label) {
-
-	    GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_AUTOINDENT),
-						settings->auto_indent);
-
-	    GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_STATUSBAR),
-						settings->show_status);
-
-            if ((doc = gE_document_current ())) {
-
-	      view = GE_VIEW (mdi->active_view);
-          
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_WORDWRAP),
-						view->word_wrap);
-
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_LINEWRAP),
-						view->line_wrap);
-
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_READONLY),
-						view->read_only);
-
-	      GE_SET_TOGGLE_STATE(gedit_settings_menu[i], _(GE_TOGGLE_LABEL_SPLITSCREEN),
-						view->splitscreen);
-
-	    }
-
-	}
-
-    }
-
-}
-
-void add_callback_data (GnomeUIInfo *menu, gE_window *window, gE_data *data)
-{
-
-	int i = 0;
-
-	while (menu[i].type != GNOME_APP_UI_ENDOFINFO) {
-
-		if (menu[i].user_data == (gpointer)GE_DATA)
-		  menu[i].user_data = data;
-		if (menu[i].user_data == (gpointer)GE_WINDOW)
-		  menu[i].user_data = window;
-
-		i++;
-
-	}
-
-}
-
-void remove_callback_data (GnomeUIInfo *menu, gE_window *window, gE_data *data)
-{
-
-	int i = 0;
-
-	while (menu[i].type != GNOME_APP_UI_ENDOFINFO) {
-
-		if (menu[i].user_data == data)
-			menu[i].user_data = (gpointer) GE_DATA;
-		if (menu[i].user_data == window)
-			menu[i].user_data = (gpointer) GE_WINDOW;
-
-		i++;
-
-	}
-
-}
diff --git a/src/menus.h b/src/menus.h
index 83eb38865..e61c6c781 100644
--- a/src/menus.h
+++ b/src/menus.h
@@ -26,7 +26,6 @@ extern "C" {
 extern GnomeUIInfo gedit_menu [];
 
 extern GnomeUIInfo * gE_menus_init(gE_window *window, gE_data *data);
-void gE_set_menu_toggle_states();
    
 #ifdef __cplusplus
 }
diff --git a/src/search.c b/src/search.c
index c83820883..f73eb2cb5 100644
--- a/src/search.c
+++ b/src/search.c
@@ -537,8 +537,10 @@ find_in_file_search
 	    		get_start_index_of_line (view, i)
 	    	);
 	    counter++;
+	    
 	  }	 
 	  g_free (buffer);
+	  
 	}
 	return counter;	
 }