diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 415fb54..db9eee5 100644
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -75,30 +75,30 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -645,11 +645,11 @@
-
+
-
-
+
+
@@ -703,49 +703,49 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -783,9 +783,9 @@
-
-
-
+
+
+
@@ -1369,7 +1369,7 @@
-
+
@@ -1378,7 +1378,7 @@
visible in the "network:///" location.
-
+
merged
@@ -1388,7 +1388,7 @@
-
+
@@ -1400,7 +1400,7 @@
-
+
@@ -1408,14 +1408,14 @@
URL that provides proxy configuration values.
-
+
The port on the machine defined by "/system/proxy/socks_host"
that you proxy through.
-
+
@@ -1423,14 +1423,14 @@
The machine name to proxy socks through.
-
+
The port on the machine defined by "/system/proxy/ftp_host"
that you proxy through.
-
+
@@ -1438,14 +1438,14 @@
The machine name to proxy FTP through.
-
+
The port on the machine defined by "/system/proxy/secure_host"
that you proxy through.
-
+
@@ -1453,7 +1453,7 @@
The machine name to proxy secure HTTP through.
-
+
none
@@ -1464,7 +1464,7 @@
-
+
@@ -1481,7 +1481,7 @@
netmask (something like 192.168.0.0/24).
-
+
@@ -1489,7 +1489,7 @@
Password to pass as authentication when doing HTTP proxying.
-
+
@@ -1497,7 +1497,7 @@
User name to pass as authentication when doing HTTP proxying.
-
+
If true, then connections to the proxy server require
@@ -1506,14 +1506,14 @@
"/system/http_proxy/authentication_password".
-
+
The port on the machine defined by "/system/http_proxy/host"
that you proxy through.
-
+
@@ -1521,7 +1521,7 @@
The machine name to proxy HTTP through.
-
+
Enables the proxy settings when accessing HTTP over the
@@ -3716,7 +3716,7 @@
-
+
nautilus %s
@@ -3726,7 +3726,7 @@
-
+
-x
@@ -3734,7 +3734,7 @@
The exec argument to use for the default terminal application.
-
+
gnome-terminal
@@ -3931,13 +3931,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
gnomemeeting -c %s
@@ -3945,7 +3945,7 @@
The command used to handle "h323" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "h323" URLs.
@@ -3953,13 +3953,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
gnomemeeting -c %s
@@ -3967,7 +3967,7 @@
The command used to handle "callto" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "callto" URLs.
@@ -3975,13 +3975,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
evolution %s
@@ -3989,7 +3989,7 @@
The command used to handle "mailto" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "mailto" URLs.
@@ -3997,13 +3997,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
epiphany %s
@@ -4011,7 +4011,7 @@
The command used to handle "https" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "https" URLs.
@@ -4019,13 +4019,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
epiphany %s
@@ -4033,7 +4033,7 @@
The command used to handle "http" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "http" URLs.
@@ -4041,13 +4041,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
gnome-help "%s"
@@ -4055,7 +4055,7 @@
The command used to handle "man" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "man" URLs.
@@ -4063,13 +4063,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
gnome-help "%s"
@@ -4077,7 +4077,7 @@
The command used to handle "info" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "info" URLs.
@@ -4085,13 +4085,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
gnome-help "%s"
@@ -4099,7 +4099,7 @@
The command used to handle "ghelp" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "ghelp" URLs.
@@ -4107,13 +4107,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
nautilus "%s"
@@ -4121,7 +4121,7 @@
The command used to handle "trash" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "trash" URLs.
@@ -4283,13 +4283,13 @@
-
+
True if the command used to handle this type of URL should be run in a terminal.
-
+
gaim-remote uri "%s"
@@ -4297,7 +4297,7 @@
The command used to handle "aim" URLs, if enabled.
-
+
True if the command specified in the "command" key should handle "aim" URLs.