fixed bugs 5189, 5190 and 5046, pattern and emblem names not translated,

	fixed bugs 5189, 5190 and 5046, pattern and emblem names
	not translated, and upper-casing emblem names is bad for
	translation, by introducing a translatable display name
	specified in the browser xml file.

	* libnautilus-extensions/nautilus-customization-data.c:
	(nautilus_customization_data_new),
	(nautilus_customization_data_get_next_element_for_display),
	(nautilus_customization_data_destroy), (format_name_for_display),
	(load_name_map_hash_table):
	made it load a display name mapping from the browser xml file into
	a hash table when a nautilus customization is created; use the mapping
	to return a label with a translated name.

	* src/file-manager/fm-properties-window.c: (create_emblems_page):
	rewrote the emblem code in the properties window to use
	nautilus_customization instead of ad hoc code, so it will use
	the translated names.

	* src/nautilus-property-browser.c: (get_color_category):
	replaced custom xml code with a standard routine from xml_extensions.

	* src/nautilus-search-bar-criterion.c: (make_emblem_value_menu):
	fixed a memory leak and tweaked the code a bit for translated names.

	* data/browser.xml:
	added display name mappings for patterns and emblems

1 files changed, 59 insertions, 2 deletions

diff --git a/data/browser.xml b/data/browser.xml
index 28328a0aa..701f78112 100644
--- a/data/browser.xml
+++ b/data/browser.xml
@@ -1,6 +1,45 @@
 <?xml version="1.0"?>
 <categories>
-  <category name="patterns" _display_name="Patterns" image="backgrounds.png" columns="5" mode="directory" path="nautilus/patterns" type="property/bgimage" _description="Drag a pattern tile to an object to change it"/>
+  <category name="patterns" _display_name="Patterns" image="backgrounds.png" columns="5" mode="directory" path="nautilus/patterns" type="property/bgimage" _description="Drag a pattern tile to an object to change it">
+  	<pattern _display_name="50s" filename="50s"/>
+  	<pattern _display_name="Beige Tile" filename="beige_tile"/>
+  	<pattern _display_name="Blue Gray Rough" filename="blue_gray_rough"/>
+  	<pattern _display_name="Blue Sky" filename="blue_sky"/>
+  	<pattern _display_name="Bricks" filename="bricks"/>
+  	<pattern _display_name="Brown Bag" filename="brown_bag"/>
+  	<pattern _display_name="Bubbles" filename="bubbles"/>
+  	<pattern _display_name="Buffed Wood" filename="buffedwood"/>
+  	<pattern _display_name="Burlap" filename="burlap"/> 
+  	<pattern _display_name="Camouflage" filename="camouflage"/>
+  	<pattern _display_name="Chalk" filename="chalk"/>
+  	<pattern _display_name="Clouds" filename="clouds"/>
+  	<pattern _display_name="Cork" filename="cork"/>
+  	<pattern _display_name="Dark GNOME" filename="dark-gnome"/>
+  	<pattern _display_name="Fleur De Lis" filename="fleur_de_lis"/>
+  	<pattern _display_name="Frost" filename="frost"/>
+  	<pattern _display_name="GNOME" filename="gnome"/>
+  	<pattern _display_name="Gold" filename="gold"/>
+   	<pattern _display_name="Ice" filename="ice"/>	
+ 	<pattern _display_name="Irish Spring" filename="irish_spring"/>
+  	<pattern _display_name="Leaves" filename="leaves"/>
+  	<pattern _display_name="Manila Paper" filename="manila_paper"/>
+  	<pattern _display_name="Numbers" filename="numbers"/>
+  	<pattern _display_name="Pale Blue Stripe" filename="pale_blue_stripe"/>
+  	<pattern _display_name="Pale Blue Wavy" filename="pale_blue_wavy"/>
+  	<pattern _display_name="Pale Coins" filename="pale_coins"/>
+  	<pattern _display_name="Pink Fabric" filename="pink_fabric"/>
+  	<pattern _display_name="Puzzle" filename="puzzle"/>
+   	<pattern _display_name="Ridged Paper" filename="ridged_paper"/>
+ 	<pattern _display_name="Rough Paper" filename="rough_paper"/>
+  	<pattern _display_name="Satin" filename="satin"/>
+  	<pattern _display_name="Stucco" filename="stucco"/>
+  	<pattern _display_name="Wavy White" filename="wavy_white"/>
+  	<pattern _display_name="White Marble" filename="white_marble"/>
+  	<pattern _display_name="White Paper" filename="white_paper"/>
+  	<pattern _display_name="White Ribs" filename="white_ribs"/>
+  	<pattern _display_name="Yellow Paper" filename="yellow_paper"/>
+  </category>
+ 
   <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>
@@ -33,5 +72,23 @@
     <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">
+  	<emblem _display_name="Certified" filename="certified"/>
+  	<emblem _display_name="Cool" filename="cool"/>
+  	<emblem _display_name="Distinguished" filename="distinguished"/>
+  	<emblem _display_name="Draft" filename="draft"/>
+ 	<emblem _display_name="Favorite" filename="favorite"/>
+ 	<emblem _display_name="Important" filename="important"/>
+ 	<emblem _display_name="New" filename="new"/>
+ 	<emblem _display_name="Oh No" filename="ohno"/>
+ 	<emblem _display_name="OK" filename="OK"/>
+ 	<emblem _display_name="Personal" filename="personal"/>
+ 	<emblem _display_name="Secret" filename="secret"/>
+ 	<emblem _display_name="Special" filename="special"/>
+ 	<emblem _display_name="Shared" filename="shared"/>
+ 	<emblem _display_name="Urgent" filename="urgent"/>
+ 	<emblem _display_name="Danger" filename="danger"/>
+ 	<emblem _display_name="Erase" filename="erase"/>
+ </category>
 </categories>