reviewed by: John Sullivan <sullivan@eazel.com>

	* src/file-manager/fm-directory-view.c:
	(display_selection_info_idle_callback),
	(update_menus_idle_callback), (display_pending_idle_callback): Add
	code to ref the BonoboControl around all three of these idle
	functions to eliminate the problem where the directory view would
	get destroyed in the middle of an idle.

	* data/browser.xml:
	* data/linksets/apps.xml:
	* data/linksets/desktop.xml:
	* data/linksets/portals.xml:
	* data/linksets/search_engines.xml:
	* data/static_bookmarks.xml:
	Used "_" prefix on all localizable fields of XML files.

	* po/POTFILES.in: Add all these XML files that need translation.

	* libnautilus-extensions/nautilus-link-set.c:
	(nautilus_link_set_install), (nautilus_link_set_is_installed),
	(nautilus_link_set_remove): Fix storage leaks, also use
	nautilus_xml_get_property_translated to get the property for the
	"name" property so it can be translated if desired.

	* libnautilus-extensions/nautilus-xml-extensions.h:
	* libnautilus-extensions/nautilus-xml-extensions.c:
	(nautilus_xml_get_property_translated): Add a version of
	xmlGetProp that looks for an untranslated version of the property
	and runs it through gettext if there is not a pre-translated
	version present.  For strings downloaded from the service, for
	example, we'll probably use a pre-translated string, but for
	things in the Nautilus source tree we can use an untranslated
	string.

	* src/nautilus-bookmark-parsing.c:
	(nautilus_bookmark_new_from_node): Use
	nautilus_xml_get_property_translated to get the bookmark name so
	that static bookmarks can have names translated with gettext. New
	versions of the static bookmarks downloaded from the service can
	use either kind of name. And user-created bookmarks are not run
	through the gettext mechanism.

	* src/nautilus-window-menus.c: (create_menu_item_from_node): Use
	nautilus_xml_get_property_translated to get the folder names
	translated just as the bookmarks themselves.

	* src/nautilus-link-set-window.c: (get_link_set_names): Added a
	FIXME. The link set names should come from inside the XML, not
	from the file names.

	* src/nautilus-property-browser.c: (get_xml_path),
	(read_browser_xml), (write_browser_xml), (get_color_category):
	(remove_color), (add_color_to_file): Factor out some shared code.
	(add_reset_property): Make hard-wired font size with FIXME.
	(make_properties_from_xml_node): Fix storage leaks and get the
	name of the color using nautilus_xml_get_property_translated so
	the names can be translated.
	(set_up_category_width): Fix storage leaks
	(nautilus_property_browser_update_contents): Fix storage leaks and
	get the display name and description with
	nautilus_xml_get_property_translated so they can be translated.

	* check-THANKS.pl: Got rid of extra blank line at end.

	* libnautilus-extensions/nautilus-customization-data.c:
	(format_name_for_display): Add FIXME to bad-for-localization
	function that turns "_" into " " and capitalizes the first letter
	after each " ".

1 files changed, 33 insertions, 33 deletions

diff --git a/data/browser.xml b/data/browser.xml
index e2dc5c297..fe451bb5f 100644
--- a/data/browser.xml
+++ b/data/browser.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0"?>
 <categories>
-  <category name="backgrounds" display_name="Backgrounds" image="backgrounds.png" columns="5" mode="directory" path="nautilus/backgrounds" type="property/bgimage" description="Drag a background tile to an object to change it"/>
-  <category name="colors" display_name="Colors" image="colors.png" columns="5" mode="inline" type="application/x-color" description="Drag a color to an object to change it to that color">
-    <color name="Mango">rgb:E0E0/D6D6/5656</color>
-    <color name="Orange">rgb:D2D2/ABAB/5050</color>
-    <color name="Tangerine">rgb:C6C6/8686/4B4B</color>
-    <color name="Grapefruit">rgb:BBBB/6262/4747</color>
-    <color name="Ruby">rgb:ADAD/3838/4141</color>
-    <color name="Pale Blue">rgb:5B5B/A7A7/CFCF</color>
-    <color name="Sky">rgb:3939/7878/A7A7</color>
-    <color name="Danube">rgb:1818/4A4A/7FF</color>
-    <color name="Indigo">rgb:3E3E/4949/8585</color>
-    <color name="Violet">rgb:6565/4949/8C8C</color>   
-    <color name="Sea Foam">rgb:CCCC/FFFF/CCCC</color>
-    <color name="Leaf">rgb:6666/CCCC/6666</color>
-    <color name="Deep Teal">rgb:4545/7272/6363</color>
-    <color name="Dark Cork">rgb:6363/6565/4A4A</color>
-    <color name="Mud">rgb:8080/5959/3232</color>
-    <color name="Fire Engine">rgb:E5E5/3B3B/1A1A</color>
-    <color name="Envy">rgb:2C2C/8282/1E1E</color>
-    <color name="Azul">rgb:1818/2222/CACA</color>
-    <color name="Lemon">rgb:F6F6/E1E1/1818</color>
-    <color name="Bubble Gum">rgb:D0D0/5050/A4A4</color>   
-    <color name="White">rgb:FFFF/FFFF/FFFF</color>
-    <color name="Apparition">rgb:E5E5/E5E5/E5E5</color>
-    <color name="Silver">rgb:C9C9/C9C9/C9C9</color>
-    <color name="Concrete">rgb:AFAF/AFAF/AFAF</color>
-    <color name="Shale">rgb:7474/7474/7474</color>
-    <color name="Granite">rgb:6F6F/6F6F/6F6F</color>
-    <color name="Eclipse">rgb:5252/5252/5252</color>
-    <color name="Charcoal">rgb:3232/3232/3232</color>
-    <color name="Onyx">rgb:2222/2222/2222</color>
-    <color name="Black">rgb:0000/0000/0000</color>   
+  <category name="backgrounds" _display_name="Backgrounds" image="backgrounds.png" columns="5" mode="directory" path="nautilus/backgrounds" type="property/bgimage" _description="Drag a background tile to an object to change it"/>
+  <category name="colors" _display_name="Colors" image="colors.png" columns="5" mode="inline" type="application/x-color" _description="Drag a color to an object to change it to that color">
+    <color _name="Mango">rgb:E0E0/D6D6/5656</color>
+    <color _name="Orange">rgb:D2D2/ABAB/5050</color>
+    <color _name="Tangerine">rgb:C6C6/8686/4B4B</color>
+    <color _name="Grapefruit">rgb:BBBB/6262/4747</color>
+    <color _name="Ruby">rgb:ADAD/3838/4141</color>
+    <color _name="Pale Blue">rgb:5B5B/A7A7/CFCF</color>
+    <color _name="Sky">rgb:3939/7878/A7A7</color>
+    <color _name="Danube">rgb:1818/4A4A/7FF</color>
+    <color _name="Indigo">rgb:3E3E/4949/8585</color>
+    <color _name="Violet">rgb:6565/4949/8C8C</color>   
+    <color _name="Sea Foam">rgb:CCCC/FFFF/CCCC</color>
+    <color _name="Leaf">rgb:6666/CCCC/6666</color>
+    <color _name="Deep Teal">rgb:4545/7272/6363</color>
+    <color _name="Dark Cork">rgb:6363/6565/4A4A</color>
+    <color _name="Mud">rgb:8080/5959/3232</color>
+    <color _name="Fire Engine">rgb:E5E5/3B3B/1A1A</color>
+    <color _name="Envy">rgb:2C2C/8282/1E1E</color>
+    <color _name="Azul">rgb:1818/2222/CACA</color>
+    <color _name="Lemon">rgb:F6F6/E1E1/1818</color>
+    <color _name="Bubble Gum">rgb:D0D0/5050/A4A4</color>   
+    <color _name="White">rgb:FFFF/FFFF/FFFF</color>
+    <color _name="Apparition">rgb:E5E5/E5E5/E5E5</color>
+    <color _name="Silver">rgb:C9C9/C9C9/C9C9</color>
+    <color _name="Concrete">rgb:AFAF/AFAF/AFAF</color>
+    <color _name="Shale">rgb:7474/7474/7474</color>
+    <color _name="Granite">rgb:6F6F/6F6F/6F6F</color>
+    <color _name="Eclipse">rgb:5252/5252/5252</color>
+    <color _name="Charcoal">rgb:3232/3232/3232</color>
+    <color _name="Onyx">rgb:2222/2222/2222</color>
+    <color _name="Black">rgb:0000/0000/0000</color>   
   </category>
- <category name="emblems" display_name="Emblems" image="emblems.png" columns="6" mode="directory" path="nautilus/emblems" type="property/keyword"  description="Drag an emblem to an object to add it to the object"/>
+ <category name="emblems" _display_name="Emblems" image="emblems.png" columns="6" mode="directory" path="nautilus/emblems" type="property/keyword" _description="Drag an emblem to an object to add it to the object"/>
 </categories>