Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/60_object_dictionary/%gconf.xml

@@ -19,7 +19,7 @@
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
 	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
-		<stringvalue>gnome-dictionary.desktop</stringvalue>
+		<stringvalue>stardict.desktop</stringvalue>
 	</entry>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>

client-profiles/50-default-CLDG/.gconf/desktop/gnome/applications/browser/%gconf.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="exec" type="string">
+		<stringvalue>firefox</stringvalue>
+	</entry>
+	<entry name="nremote" type="bool" value="true"/>
+</gconf>

client-profiles/50-default-CLDG/.gconf/desktop/gnome/applications/media/%gconf.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="exec" type="string">
+		<stringvalue>rhythmbox</stringvalue>
+	</entry>
+</gconf>

client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.6.desktop

@@ -1,4 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.6.desktop mirror
-
-[Desktop Entry]
-Icon=/usr/share/icons/gnome/scalable/apps/web-browser.svg