From 65d90e0e8b6a3702f799910eee11a9421e269d3a Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 8 May 2009 07:49:43 +0000
Subject: Replaced combo_item with combo_box.item and converted contents labels
 into label attributes for all translations.

---
 .../skins/default/xui/da/floater_about_land.xml    |  68 ++----
 .../default/xui/da/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/da/floater_buy_land.xml      |  12 +-
 .../default/xui/da/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/da/floater_image_preview.xml |  40 +---
 .../skins/default/xui/da/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/da/floater_sell_land.xml     |  12 +-
 .../default/xui/da/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/da/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/da/floater_tools.xml | 244 ++++++---------------
 .../skins/default/xui/da/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/da/panel_login.xml |  12 +-
 .../default/xui/da/panel_preferences_general.xml   |  72 ++----
 .../default/xui/da/panel_preferences_graphics1.xml |  36 +--
 .../skins/default/xui/de/floater_about_land.xml    |  68 ++----
 .../default/xui/de/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/de/floater_buy_land.xml      |  12 +-
 .../skins/default/xui/de/floater_god_tools.xml     |  24 +-
 .../default/xui/de/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/de/floater_image_preview.xml |  40 +---
 .../skins/default/xui/de/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/de/floater_sell_land.xml     |  12 +-
 .../default/xui/de/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/de/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/de/floater_tools.xml | 244 ++++++---------------
 .../skins/default/xui/de/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/de/panel_login.xml |  12 +-
 .../default/xui/de/panel_preferences_graphics1.xml |  36 +--
 .../skins/default/xui/es/floater_about_land.xml    |  68 ++----
 .../default/xui/es/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/es/floater_buy_land.xml      |  12 +-
 .../skins/default/xui/es/floater_god_tools.xml     |  24 +-
 .../default/xui/es/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/es/floater_image_preview.xml |  40 +---
 .../skins/default/xui/es/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/es/floater_sell_land.xml     |  12 +-
 .../default/xui/es/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/es/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/es/floater_tools.xml | 244 ++++++---------------
 .../skins/default/xui/es/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/es/panel_login.xml |  12 +-
 .../default/xui/es/panel_preferences_general.xml   |  72 ++----
 .../default/xui/es/panel_preferences_graphics1.xml |  36 +--
 .../skins/default/xui/fr/floater_about_land.xml    |  68 ++----
 .../default/xui/fr/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/fr/floater_auction.xml       |   8 +-
 .../skins/default/xui/fr/floater_buy_land.xml      |  12 +-
 .../skins/default/xui/fr/floater_god_tools.xml     |  24 +-
 .../default/xui/fr/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/fr/floater_image_preview.xml |  40 +---
 .../skins/default/xui/fr/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/fr/floater_sell_land.xml     |  12 +-
 .../default/xui/fr/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/fr/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/fr/floater_tools.xml | 232 +++++---------------
 .../skins/default/xui/fr/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/fr/panel_login.xml |  16 +-
 .../default/xui/fr/panel_preferences_general.xml   |  80 ++-----
 .../default/xui/fr/panel_preferences_graphics1.xml |  36 +--
 .../skins/default/xui/it/floater_about_land.xml    |  68 ++----
 .../default/xui/it/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/it/floater_buy_land.xml      |  12 +-
 .../default/xui/it/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/it/floater_image_preview.xml |  40 +---
 .../skins/default/xui/it/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/it/floater_sell_land.xml     |  12 +-
 .../default/xui/it/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/it/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/it/floater_tools.xml | 244 ++++++---------------
 .../skins/default/xui/it/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/it/panel_login.xml |  12 +-
 .../default/xui/it/panel_preferences_general.xml   |  72 ++----
 .../default/xui/it/panel_preferences_graphics1.xml |  36 +--
 .../skins/default/xui/ja/floater_about_land.xml    |  68 ++----
 .../default/xui/ja/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/ja/floater_buy_land.xml      |  12 +-
 .../skins/default/xui/ja/floater_god_tools.xml     |  24 +-
 .../default/xui/ja/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/ja/floater_image_preview.xml |  40 +---
 .../skins/default/xui/ja/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/ja/floater_sell_land.xml     |  12 +-
 .../default/xui/ja/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/ja/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/ja/floater_tools.xml | 232 +++++---------------
 .../skins/default/xui/ja/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/ja/panel_login.xml |  12 +-
 .../default/xui/ja/panel_preferences_general.xml   |  80 ++-----
 .../default/xui/ja/panel_preferences_graphics1.xml |  36 +--
 .../skins/default/xui/nl/floater_about_land.xml    |  68 ++----
 .../skins/default/xui/nl/floater_buy_land.xml      |  12 +-
 .../skins/default/xui/nl/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/nl/floater_sell_land.xml     |  12 +-
 .../skins/default/xui/nl/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/nl/floater_tools.xml | 244 ++++++---------------
 .../skins/default/xui/nl/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/nl/panel_login.xml |  12 +-
 .../skins/default/xui/pl/floater_about_land.xml    |  68 ++----
 .../default/xui/pl/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/pl/floater_buy_land.xml      |  12 +-
 .../skins/default/xui/pl/floater_god_tools.xml     |  24 +-
 .../default/xui/pl/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/pl/floater_image_preview.xml |  40 +---
 .../skins/default/xui/pl/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/pl/floater_sell_land.xml     |  12 +-
 .../default/xui/pl/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/pl/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/pl/floater_tools.xml | 244 ++++++---------------
 .../skins/default/xui/pl/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/pl/panel_login.xml |  12 +-
 .../default/xui/pl/panel_preferences_graphics1.xml |  36 +--
 .../skins/default/xui/pt/floater_about_land.xml    |  68 ++----
 .../default/xui/pt/floater_animation_preview.xml   | 148 ++++---------
 .../skins/default/xui/pt/floater_buy_land.xml      |  12 +-
 .../skins/default/xui/pt/floater_god_tools.xml     |  24 +-
 .../default/xui/pt/floater_hardware_settings.xml   |  20 +-
 .../skins/default/xui/pt/floater_image_preview.xml |  40 +---
 .../skins/default/xui/pt/floater_report_abuse.xml  | 144 +++---------
 .../skins/default/xui/pt/floater_sell_land.xml     |  12 +-
 .../default/xui/pt/floater_settings_debug.xml      |   8 +-
 .../skins/default/xui/pt/floater_snapshot.xml      |  96 ++------
 .../newview/skins/default/xui/pt/floater_tools.xml | 244 ++++++---------------
 .../skins/default/xui/pt/floater_world_map.xml     |   8 +-
 indra/newview/skins/default/xui/pt/panel_login.xml |  12 +-
 .../default/xui/pt/panel_preferences_general.xml   |  72 ++----
 .../default/xui/pt/panel_preferences_graphics1.xml |  36 +--
 125 files changed, 1990 insertions(+), 5970 deletions(-)

diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 70f7690d42..355e8a1d75 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -271,42 +271,18 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			<check_box label="Vis sted i søgning (L$30/uge) i kategorien:" name="ShowDirectoryCheck"
 			     tool_tip="Lad dit parcel blive vist i søge resultaterne" />
 			<combo_box name="land category">
-				<combo_box.item name="AnyCategory">
-					Alle kategorier
-				</combo_box.item>
-				<combo_box.item name="LindenLocation">
-					Linden Location
-				</combo_box.item>
-				<combo_box.item name="Arts&amp;Culture">
-					Kunst &amp; kultur
-				</combo_box.item>
-				<combo_box.item name="Business">
-					Business
-				</combo_box.item>
-				<combo_box.item name="Educational">
-					Uddannelse
-				</combo_box.item>
-				<combo_box.item name="Gaming">
-					Spil
-				</combo_box.item>
-				<combo_box.item name="Hangout">
-					Afslapning
-				</combo_box.item>
-				<combo_box.item name="NewcomerFriendly">
-					Nybegynder venligt
-				</combo_box.item>
-				<combo_box.item name="Parks&amp;Nature">
-					Parker &amp; natur
-				</combo_box.item>
-				<combo_box.item name="Residential">
-					Beboelse
-				</combo_box.item>
-				<combo_box.item name="Shopping">
-					Indkøb
-				</combo_box.item>
-				<combo_box.item name="Other">
-					Andet
-				</combo_box.item>
+				<combo_box.item name="AnyCategory" label="Alle kategorier" />
+				<combo_box.item name="LindenLocation" label="Linden Location" />
+				<combo_box.item name="Arts&amp;Culture" label="Kunst &amp; kultur" />
+				<combo_box.item name="Business" label="Business" />
+				<combo_box.item name="Educational" label="Uddannelse" />
+				<combo_box.item name="Gaming" label="Spil" />
+				<combo_box.item name="Hangout" label="Afslapning" />
+				<combo_box.item name="NewcomerFriendly" label="Nybegynder venligt" />
+				<combo_box.item name="Parks&amp;Nature" label="Parker &amp; natur" />
+				<combo_box.item name="Residential" label="Beboelse" />
+				<combo_box.item name="Shopping" label="Indkøb" />
+				<combo_box.item name="Other" label="Andet" />
 			</combo_box>
 			<button label="?" label_selected="?" name="?" />
 			<check_box name="MatureCheck" />
@@ -328,15 +304,9 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 				Teleport valg:
 			</text>
 			<combo_box name="landing type" tool_tip="Vælg hvordan du vil håndtere teleporteringer til dit land.">
-				<combo_box.item length="1" name="Blocked" type="string">
-					Blokeret
-				</combo_box.item>
-				<combo_box.item length="1" name="LandingPoint" type="string">
-					Landingspunkt
-				</combo_box.item>
-				<combo_box.item length="1" name="Anywhere" type="string">
-					Hvor som helst
-				</combo_box.item>
+				<combo_box.item length="1" name="Blocked" type="string" label="Blokeret" />
+				<combo_box.item length="1" name="LandingPoint" type="string" label="Landingspunkt" />
+				<combo_box.item length="1" name="Anywhere" type="string" label="Hvor som helst" />
 			</combo_box>
 			<string name="push_restrict_text">
 				Skub forbudt
@@ -432,12 +402,8 @@ web-siden, efter du klikker på play knappen.)
 			<check_box label="Sælg adgang til:" name="PassCheck"
 			     tool_tip="Tillader midlertidig adgang til denne parcel" />
 			<combo_box name="pass_combo">
-				<combo_box.item name="Anyone">
-					Alle
-				</combo_box.item>
-				<combo_box.item name="Group">
-					Gruppe
-				</combo_box.item>
+				<combo_box.item name="Anyone" label="Alle" />
+				<combo_box.item name="Group" label="Gruppe" />
 			</combo_box>
 			<spinner label="Pris i L$:" name="PriceSpin" />
 			<spinner label="Timers adgang:" name="HoursSpin" />
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
index 45fa6ca78f..e60292636d 100644
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
@@ -18,129 +18,55 @@
 	</text>
 	<combo_box label="" name="hand_pose_combo"
 	     tool_tip="Kontrollerer hvad hænderne går i løbet af animationen.">
-		<combo_box.item name="Spread">
-			Spredt
-		</combo_box.item>
-		<combo_box.item name="Relaxed">
-			Afslappet
-		</combo_box.item>
-		<combo_box.item name="PointBoth">
-			Peg begge
-		</combo_box.item>
-		<combo_box.item name="Fist">
-			Knytnæver
-		</combo_box.item>
-		<combo_box.item name="RelaxedLeft">
-			Afslappet venstre
-		</combo_box.item>
-		<combo_box.item name="PointLeft">
-			Peg venstre
-		</combo_box.item>
-		<combo_box.item name="FistLeft">
-			Knytnæve venstre
-		</combo_box.item>
-		<combo_box.item name="RelaxedRight">
-			Afslappet højre
-		</combo_box.item>
-		<combo_box.item name="PointRight">
-			Peg højre
-		</combo_box.item>
-		<combo_box.item name="FistRight">
-			Knytnæve højre
-		</combo_box.item>
-		<combo_box.item name="SaluteRight">
-			Honnør højre
-		</combo_box.item>
-		<combo_box.item name="Typing">
-			Skriver
-		</combo_box.item>
-		<combo_box.item name="PeaceRight">
-			Fredstegn højre
-		</combo_box.item>
+		<combo_box.item name="Spread" label="Spredt" />
+		<combo_box.item name="Relaxed" label="Afslappet" />
+		<combo_box.item name="PointBoth" label="Peg begge" />
+		<combo_box.item name="Fist" label="Knytnæver" />
+		<combo_box.item name="RelaxedLeft" label="Afslappet venstre" />
+		<combo_box.item name="PointLeft" label="Peg venstre" />
+		<combo_box.item name="FistLeft" label="Knytnæve venstre" />
+		<combo_box.item name="RelaxedRight" label="Afslappet højre" />
+		<combo_box.item name="PointRight" label="Peg højre" />
+		<combo_box.item name="FistRight" label="Knytnæve højre" />
+		<combo_box.item name="SaluteRight" label="Honnør højre" />
+		<combo_box.item name="Typing" label="Skriver" />
+		<combo_box.item name="PeaceRight" label="Fredstegn højre" />
 	</combo_box>
 	<text name="emote_label">
 		Ansigtsudtryk
 	</text>
 	<combo_box label="" name="emote_combo"
 	     tool_tip="Angiver hvad ansigtet gør under animationen">
-		<combo_box.item name="[None]">
-			[Intet]
-		</combo_box.item>
-		<combo_box.item name="Aaaaah">
-			Aaaaah
-		</combo_box.item>
-		<combo_box.item name="Afraid">
-			Bange
-		</combo_box.item>
-		<combo_box.item name="Angry">
-			Vred
-		</combo_box.item>
-		<combo_box.item name="BigSmile">
-			Stort smil
-		</combo_box.item>
-		<combo_box.item name="Bored">
-			Keder sig
-		</combo_box.item>
-		<combo_box.item name="Cry">
-			Græder
-		</combo_box.item>
-		<combo_box.item name="Disdain">
-			Forarget
-		</combo_box.item>
-		<combo_box.item name="Embarrassed">
-			Flov
-		</combo_box.item>
-		<combo_box.item name="Frown">
-			Skuler
-		</combo_box.item>
-		<combo_box.item name="Kiss">
-			Kysser
-		</combo_box.item>
-		<combo_box.item name="Laugh">
-			Griner
-		</combo_box.item>
-		<combo_box.item name="Plllppt">
-			Plllppt
-		</combo_box.item>
-		<combo_box.item name="Repulsed">
-			Frastødt
-		</combo_box.item>
-		<combo_box.item name="Sad">
-			Ked af det
-		</combo_box.item>
-		<combo_box.item name="Shrug">
-			Skuldertræk
-		</combo_box.item>
-		<combo_box.item name="Smile">
-			Smiler
-		</combo_box.item>
-		<combo_box.item name="Surprise">
-			Overrasket
-		</combo_box.item>
-		<combo_box.item name="Wink">
-			Blinker
-		</combo_box.item>
-		<combo_box.item name="Worry">
-			Bekymret
-		</combo_box.item>
+		<combo_box.item name="[None]" label="Intet]" />
+		<combo_box.item name="Aaaaah" label="Aaaaah" />
+		<combo_box.item name="Afraid" label="Bange" />
+		<combo_box.item name="Angry" label="Vred" />
+		<combo_box.item name="BigSmile" label="Stort smil" />
+		<combo_box.item name="Bored" label="Keder sig" />
+		<combo_box.item name="Cry" label="Græder" />
+		<combo_box.item name="Disdain" label="Forarget" />
+		<combo_box.item name="Embarrassed" label="Flov" />
+		<combo_box.item name="Frown" label="Skuler" />
+		<combo_box.item name="Kiss" label="Kysser" />
+		<combo_box.item name="Laugh" label="Griner" />
+		<combo_box.item name="Plllppt" label="Plllppt" />
+		<combo_box.item name="Repulsed" label="Frastødt" />
+		<combo_box.item name="Sad" label="Ked af det" />
+		<combo_box.item name="Shrug" label="Skuldertræk" />
+		<combo_box.item name="Smile" label="Smiler" />
+		<combo_box.item name="Surprise" label="Overrasket" />
+		<combo_box.item name="Wink" label="Blinker" />
+		<combo_box.item name="Worry" label="Bekymret" />
 	</combo_box>
 	<text name="preview_label">
 		Vis mens
 	</text>
 	<combo_box label="" name="preview_base_anim"
 	     tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer.">
-		<combo_box.item name="Standing">
-			Står
-		</combo_box.item>
-		<combo_box.item name="Walking">
-			Går
-		</combo_box.item>
-		<combo_box.item name="Sitting">
-			Sidder
-		</combo_box.item>
-		<combo_box.item name="Flying">
-			Flyver
-		</combo_box.item>
+		<combo_box.item name="Standing" label="Står" />
+		<combo_box.item name="Walking" label="Går" />
+		<combo_box.item name="Sitting" label="Sidder" />
+		<combo_box.item name="Flying" label="Flyver" />
 	</combo_box>
 	<spinner label="start (sec)" name="ease_in_time"
 	     tool_tip="Tid i sekunder animationen bruger på at komme i gang." />
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index 6eef76023f..2c5411e26b 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -66,15 +66,9 @@
 		Kun premium medlemmer kan eje land.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly">
-			US$9.95/md, månedlig afregning
-		</combo_box.item>
-		<combo_box.item name="US$7.50/month,billedquarterly">
-			US$7.50/md, kvartalsvis afregning
-		</combo_box.item>
-		<combo_box.item name="US$6.00/month,billedannually">
-			US$6.00/md, årlig afregning
-		</combo_box.item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="US$9.95/md, månedlig afregning" />
+		<combo_box.item name="US$7.50/month,billedquarterly" label="US$7.50/md, kvartalsvis afregning" />
+		<combo_box.item name="US$6.00/month,billedannually" label="US$6.00/md, årlig afregning" />
 	</combo_box>
 	<text name="land_use_action">
 		Forøg dine månedlige arealanvendelse gebyrer til US $ 40/måned.
diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
index c25321d32d..41688ec4f9 100644
--- a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
@@ -8,21 +8,11 @@
 		Antialiasing:
 	</text>
 	<combo_box label="Antialiasing" name="fsaa">
-		<combo_item name="FSAADisabled">
-			Slået fra
-		</combo_item>
-		<combo_item name="2x">
-			2x
-		</combo_item>
-		<combo_item name="4x">
-			4x
-		</combo_item>
-		<combo_item name="8x">
-			8x
-		</combo_item>
-		<combo_item name="16x">
-			16x
-		</combo_item>
+		<combo_box.item name="FSAADisabled" label="Slået fra"/>
+		<combo_box.item name="2x" label="2x"/>
+		<combo_box.item name="4x" label="4x"/>
+		<combo_box.item name="8x" label="8x"/>
+		<combo_box.item name="16x" label="16x"/>
 	</combo_box>
 	<spinner label="Gamma:" name="gamma" />
 	<text type="string" length="1" name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/da/floater_image_preview.xml b/indra/newview/skins/default/xui/da/floater_image_preview.xml
index eea9e67685..23218052fc 100644
--- a/indra/newview/skins/default/xui/da/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		Se billede som:
 	</text>
 	<combo_box label="Tøj type" name="clothing_type_combo">
-		<combo_item name="Image">
-			Billede
-		</combo_item>
-		<combo_item name="Hair">
-			Hår
-		</combo_item>
-		<combo_item name="FemaleHead">
-			Kvinde - hoved
-		</combo_item>
-		<combo_item name="FemaleUpperBody">
-			Kvinde - overkrop
-		</combo_item>
-		<combo_item name="FemaleLowerBody">
-			Kvinde - underkrop
-		</combo_item>
-		<combo_item name="MaleHead">
-			Mand - hoved
-		</combo_item>
-		<combo_item name="MaleUpperBody">
-			Mand - overkrop
-		</combo_item>
-		<combo_item name="MaleLowerBody">
-			Mand - underkrop
-		</combo_item>
-		<combo_item name="Skirt">
-			Nederdel
-		</combo_item>
-		<combo_item name="SculptedPrim">
-			Sculpted prim
-		</combo_item>
+		<combo_box.item name="Image" label="Billede"/>
+		<combo_box.item name="Hair" label="Hår"/>
+		<combo_box.item name="FemaleHead" label="Kvinde - hoved"/>
+		<combo_box.item name="FemaleUpperBody" label="Kvinde - overkrop"/>
+		<combo_box.item name="FemaleLowerBody" label="Kvinde - underkrop"/>
+		<combo_box.item name="MaleHead" label="Mand - hoved"/>
+		<combo_box.item name="MaleUpperBody" label="Mand - overkrop"/>
+		<combo_box.item name="MaleLowerBody" label="Mand - underkrop"/>
+		<combo_box.item name="Skirt" label="Nederdel"/>
+		<combo_box.item name="SculptedPrim" label="Sculpted prim"/>
 	</combo_box>
 	<text name="bad_image_text">
 		Kunne ikke læse billede.
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
index 64e39da8fe..688aa8adc5 100644
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -39,123 +39,51 @@
 	</text>
 	<combo_box name="category_combo"
 	     tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
-		<combo_item name="Select_category">
-			Vælg kategori
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Alder &gt; Falsk alder
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Alder &gt; Voksen beboer på Teen Second Life
-		</combo_item>
+		<combo_box.item name="Select_category" label="Vælg kategori"/>
+		<combo_box.item name="Age__Age_play" label="Alder &gt; Falsk alder"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Alder &gt; Voksen beboer på Teen Second Life"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Overfald &gt; Kamp sandkasse / Usikkert område
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Overfald &gt; Sikkert område
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Overfald &gt; Sandkasse til våbentest
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Handel &gt; Vare eller ydelse ikke leveret
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Offentliggørelse &gt; Om oplysninger i den virkelige verden
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Offentliggørelse &gt; Fjernaflytning af chat
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Offentliggørelse &gt; Information/chat/IM fra Second Life
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Forstyrrelse af fred &gt; Unfair brug af region ressourcer
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Forstyrrelse af fred &gt; Overdreven brug af objekter med script
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Forstyrrelse af fred &gt; Object affald
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Forstyrring af fred &gt; Gentagen spam
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Forstyrrelse af fred &gt; Uønsket reklame spam
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Bedrageri &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Bedrageri &gt; Land
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Bedrageri &gt; Pyramide spil eller kædebreve
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Bedrageri &gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Chikane &gt; reklame farm / billedeligt spam
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Chikane &gt; Injurier/bagvask enkeltpersoner eller grupper
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Chikane &gt; Hindre bevægelse
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Chikane &gt; Sex chikane
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Chikane &gt; Opfordrer/kræver at andre overtræder licensbetingelser
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Chikane &gt; Verbalt chikane
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Uanstændighed &gt; Meget stødende indhold eller adfærd
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Overfald &gt; Kamp sandkasse / Usikkert område"/>
+		<combo_box.item name="Assault__Safe_area" label="Overfald &gt; Sikkert område"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Overfald &gt; Sandkasse til våbentest"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Handel &gt; Vare eller ydelse ikke leveret"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Offentliggørelse &gt; Om oplysninger i den virkelige verden"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Offentliggørelse &gt; Fjernaflytning af chat"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Offentliggørelse &gt; Information/chat/IM fra Second Life"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Forstyrrelse af fred &gt; Unfair brug af region ressourcer"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Forstyrrelse af fred &gt; Overdreven brug af objekter med script"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Forstyrrelse af fred &gt; Object affald"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Forstyrring af fred &gt; Gentagen spam"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Forstyrrelse af fred &gt; Uønsket reklame spam"/>
+		<combo_box.item name="Fraud__L$" label="Bedrageri &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Bedrageri &gt; Land"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Bedrageri &gt; Pyramide spil eller kædebreve"/>
+		<combo_box.item name="Fraud__US$" label="Bedrageri &gt; US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Chikane &gt; reklame farm / billedeligt spam"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Chikane &gt; Injurier/bagvask enkeltpersoner eller grupper"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Chikane &gt; Hindre bevægelse"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Chikane &gt; Sex chikane"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Chikane &gt; Opfordrer/kræver at andre overtræder licensbetingelser"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Chikane &gt; Verbalt chikane"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Uanstændighed &gt; Meget stødende indhold eller adfærd"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Uanstændighed &gt; Upassende avatar navn
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Uanstændighed &gt; Upassende avatar navn"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Krænkelse af intellektuelle ejendomsrettigheder &gt; CopyBot eller omgåelse af rettighedsbeskyttelse
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intolerance
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Land &gt; Misbrug af sandkasse resourcer
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Land &gt; Overgreb &gt; Objekter/teksturer
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Land &gt; Overgreb &gt; Partikler
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Land &gt; Overgreb &gt; Træer/planter
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Væddemål/gambling
-		</combo_item>
-		<combo_item name="Other">
-			Andet
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Krænkelse af intellektuelle ejendomsrettigheder &gt; CopyBot eller omgåelse af rettighedsbeskyttelse"/>
+		<combo_box.item name="Intolerance" label="Intolerance"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Land &gt; Misbrug af sandkasse resourcer"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Land &gt; Overgreb &gt; Objekter/teksturer"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Land &gt; Overgreb &gt; Partikler"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Land &gt; Overgreb &gt; Træer/planter"/>
+		<combo_box.item name="Wagering_gambling" label="Væddemål/gambling"/>
+		<combo_box.item name="Other" label="Andet"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Udøvers navn:
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml
index cd3b36cf93..6793af0d2a 100644
--- a/indra/newview/skins/default/xui/da/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml
@@ -34,15 +34,9 @@
 		Vælg om du vil sælge til hvem som helst eller en specifik køber.
 	</text>
 	<combo_box name="sell_to">
-		<combo_box.item name="--selectone--">
-			-- Vælg --
-		</combo_box.item>
-		<combo_box.item name="Anyone">
-			Alle
-		</combo_box.item>
-		<combo_box.item name="Specificuser:">
-			Specifik bruger:
-		</combo_box.item>
+		<combo_box.item name="--selectone--" label="Vælg --" />
+		<combo_box.item name="Anyone" label="Alle" />
+		<combo_box.item name="Specificuser:" label="Specifik bruger:" />
 	</combo_box>
 	<button label="Vælg..." name="sell_to_select_agent" />
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
index 8fa351c108..60f99deae2 100644
--- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="settings_debug" title="Tekniske indstillinger">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE">
-			TRUE (Valgt)
-		</combo_box.item>
-		<combo_box.item name="FALSE">
-			FALSE (Fravalgt)
-		</combo_box.item>
+		<combo_box.item name="TRUE" label="TRUE (Valgt)" />
+		<combo_box.item name="FALSE" label="FALSE (Fravalgt)" />
 	</combo_box>
 	<color_swatch label="Farve" name="color_swatch" />
 	<spinner label="x" name="val_spinner_1" />
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 8fc98220db..df1a124a9f 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -31,75 +31,33 @@
 		Format
 	</text>
 	<combo_box label="Opløsning" name="postcard_size_combo">
-		<combo_item name="CurrentWindow">
-			Aktuelle vindue
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="Custom">
-			Manuel
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Aktuelle vindue"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="Custom" label="Manuel"/>
 	</combo_box>
 	<combo_box label="Opløsning" name="texture_size_combo">
-		<combo_item name="CurrentWindow">
-			Aktuelle vindue
-		</combo_item>
-		<combo_item name="Small(128x128)">
-			Lille (128x128)
-		</combo_item>
-		<combo_item name="Medium(256x256)">
-			Medium (256x256)
-		</combo_item>
-		<combo_item name="Large(512x512)">
-			Stor (512x512)
-		</combo_item>
-		<combo_item name="Custom">
-			Manuel
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Aktuelle vindue"/>
+		<combo_box.item name="Small(128x128)" label="Lille (128x128)"/>
+		<combo_box.item name="Medium(256x256)" label="Medium (256x256)"/>
+		<combo_box.item name="Large(512x512)" label="Stor (512x512)"/>
+		<combo_box.item name="Custom" label="Manuel"/>
 	</combo_box>
 	<combo_box label="Opløsning" name="local_size_combo">
-		<combo_item name="CurrentWindow">
-			Aktuelle vindue
-		</combo_item>
-		<combo_item name="320x240">
-			320x240
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="1280x1024">
-			1280x1024
-		</combo_item>
-		<combo_item name="1600x1200">
-			1600x1200
-		</combo_item>
-		<combo_item name="Custom">
-			Manuelt
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Aktuelle vindue"/>
+		<combo_box.item name="320x240" label="320x240"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="1280x1024" label="1280x1024"/>
+		<combo_box.item name="1600x1200" label="1600x1200"/>
+		<combo_box.item name="Custom" label="Manuelt"/>
 	</combo_box>
 	<combo_box label="Fil-format" name="local_format_combo">
-		<combo_item name="PNG">
-			PNG
-		</combo_item>
-		<combo_item name="JPEG">
-			JPEG
-		</combo_item>
-		<combo_item name="BMP">
-			BMP
-		</combo_item>
+		<combo_box.item name="PNG" label="PNG"/>
+		<combo_box.item name="JPEG" label="JPEG"/>
+		<combo_box.item name="BMP" label="BMP"/>
 	</combo_box>
 	<spinner label="Bredde" name="snapshot_width" />
 	<spinner label="Højde" name="snapshot_height" />
@@ -109,15 +67,9 @@
 		Benyt:
 	</text>
 	<combo_box label="Billedlag" name="layer_types">
-		<combo_item name="Colors">
-			Farver
-		</combo_item>
-		<combo_item name="Depth">
-			Dybde
-		</combo_item>
-		<combo_item name="ObjectMattes">
-			Materinger
-		</combo_item>
+		<combo_box.item name="Colors" label="Farver"/>
+		<combo_box.item name="Depth" label="Dybde"/>
+		<combo_box.item name="ObjectMattes" label="Materinger"/>
 	</combo_box>
 	<check_box label="Vis brugerflade på foto" name="ui_check" />
 	<check_box label="Vis HUD objekter på foto" name="hud_check" />
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index bc15db0e25..918999eedd 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -20,15 +20,9 @@
 		Lineal:
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_item name="World">
-			Verden
-		</combo_item>
-		<combo_item name="Local">
-			Lokal
-		</combo_item>
-		<combo_item name="Reference">
-			Reference
-		</combo_item>
+		<combo_box.item name="World" label="Verden"/>
+		<combo_box.item name="Local" label="Lokal"/>
+		<combo_box.item name="Reference" label="Reference"/>
 	</combo_box>
 	<check_box label="Stræk begge sider" name="checkbox uniform" />
 	<check_box label="Stræk teksturer" name="checkbox stretch textures" />
@@ -64,15 +58,9 @@
 	<check_box label="Gør land ujævnt" name="radio noise" />
 	<check_box label="Tilbagefør" name="radio revert" />
 	<combo_box name="combobox brush size">
-		<combo_item name="Small">
-			Lille
-		</combo_item>
-		<combo_item name="Medium">
-			Mellem
-		</combo_item>
-		<combo_item name="Large">
-			Stor
-		</combo_item>
+		<combo_box.item name="Small" label="Lille"/>
+		<combo_box.item name="Medium" label="Mellem"/>
+		<combo_box.item name="Large" label="Stor"/>
 	</combo_box>
 	<text type="string" length="1" name="Strength:">
 		Styrke:
@@ -159,27 +147,13 @@
 				Når der venstreklikkes:
 			</text>
 			<combo_box name="clickaction">
-				<combo_item name="Touch/grab(default)">
-					Rør/tag (standard)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					Sid på objekt
-				</combo_item>
-				<combo_item name="Buyobject">
-					Køb objekt
-				</combo_item>
-				<combo_item name="Payobject">
-					Betal objekt
-				</combo_item>
-				<combo_item name="Open">
-					Åben
-				</combo_item>
-				<combo_item name="Play">
-					Afspil medie på parcel
-				</combo_item>
-				<combo_item name="Opemmedia">
-					Åben media på parcel
-				</combo_item>
+				<combo_box.item name="Touch/grab(default)" label="Rør/tag (standard)"/>
+				<combo_box.item name="Sitonobject" label="Sid på objekt"/>
+				<combo_box.item name="Buyobject" label="Køb objekt"/>
+				<combo_box.item name="Payobject" label="Betal objekt"/>
+				<combo_box.item name="Open" label="Åben"/>
+				<combo_box.item name="Play" label="Afspil medie på parcel"/>
+				<combo_box.item name="Opemmedia" label="Åben media på parcel"/>
 			</combo_box>
 			<text name="B:">
 				B:
@@ -237,56 +211,26 @@
 				Materiale
 			</text>
 			<combo_box name="material">
-				<combo_item name="Stone">
-					Sten
-				</combo_item>
-				<combo_item name="Metal">
-					Metal
-				</combo_item>
-				<combo_item name="Glass">
-					Glas
-				</combo_item>
-				<combo_item name="Wood">
-					Træ
-				</combo_item>
-				<combo_item name="Flesh">
-					Kød
-				</combo_item>
-				<combo_item name="Plastic">
-					Plastik
-				</combo_item>
-				<combo_item name="Rubber">
-					Gummi
-				</combo_item>
+				<combo_box.item name="Stone" label="Sten"/>
+				<combo_box.item name="Metal" label="Metal"/>
+				<combo_box.item name="Glass" label="Glas"/>
+				<combo_box.item name="Wood" label="Træ"/>
+				<combo_box.item name="Flesh" label="Kød"/>
+				<combo_box.item name="Plastic" label="Plastik"/>
+				<combo_box.item name="Rubber" label="Gummi"/>
 			</combo_box>
 			<text name="label basetype">
 				Byggegeometrisk figur
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					Terning
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cylinder
-				</combo_item>
-				<combo_item name="Prism">
-					Prisme
-				</combo_item>
-				<combo_item name="Sphere">
-					Spfære
-				</combo_item>
-				<combo_item name="Torus">
-					Kuglering
-				</combo_item>
-				<combo_item name="Tube">
-					Rør
-				</combo_item>
-				<combo_item name="Ring">
-					Ring
-				</combo_item>
-				<combo_item name="Sculpted">
-					Sculpted
-				</combo_item>
+				<combo_box.item name="Box" label="Terning"/>
+				<combo_box.item name="Cylinder" label="Cylinder"/>
+				<combo_box.item name="Prism" label="Prisme"/>
+				<combo_box.item name="Sphere" label="Spfære"/>
+				<combo_box.item name="Torus" label="Kuglering"/>
+				<combo_box.item name="Tube" label="Rør"/>
+				<combo_box.item name="Ring" label="Ring"/>
+				<combo_box.item name="Sculpted" label="Sculpted"/>
 			</combo_box>
 			<text name="text cut">
 				Snit begynd og slut
@@ -303,18 +247,10 @@
 				Form på hul
 			</text>
 			<combo_box name="hole">
-				<combo_item name="Default">
-					Standard
-				</combo_item>
-				<combo_item name="Circle">
-					Cirkel
-				</combo_item>
-				<combo_item name="Square">
-					Firkant
-				</combo_item>
-				<combo_item name="Triangle">
-					Trekant
-				</combo_item>
+				<combo_box.item name="Default" label="Standard"/>
+				<combo_box.item name="Circle" label="Cirkel"/>
+				<combo_box.item name="Square" label="Firkant"/>
+				<combo_box.item name="Triangle" label="Trekant"/>
 			</combo_box>
 			<text name="text twist">
 				Vrid - start og slut
@@ -363,21 +299,11 @@
 				Sting type
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					(ingen)
-				</combo_item>
-				<combo_item name="Sphere">
-					Sfære
-				</combo_item>
-				<combo_item name="Torus">
-					Kuglering
-				</combo_item>
-				<combo_item name="Plane">
-					Plan
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cylinder
-				</combo_item>
+				<combo_box.item name="None" label="ingen)"/>
+				<combo_box.item name="Sphere" label="Sfære"/>
+				<combo_box.item name="Torus" label="Kuglering"/>
+				<combo_box.item name="Plane" label="Plan"/>
+				<combo_box.item name="Cylinder" label="Cylinder"/>
 			</combo_box>
 		</panel>
 		<panel label="Features" name="Features">
@@ -421,88 +347,40 @@
 				Afbildning
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					Standard
-				</combo_item>
-				<combo_item name="Planar">
-					Plan
-				</combo_item>
+				<combo_box.item name="Default" label="Standard"/>
+				<combo_box.item name="Planar" label="Plan"/>
 			</combo_box>
 			<text name="label shininess">
 				Blankhed
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					Ingen
-				</combo_item>
-				<combo_item name="Low">
-					Lav
-				</combo_item>
-				<combo_item name="Medium">
-					Mellem
-				</combo_item>
-				<combo_item name="High">
-					Høj
-				</combo_item>
+				<combo_box.item name="None" label="Ingen"/>
+				<combo_box.item name="Low" label="Lav"/>
+				<combo_box.item name="Medium" label="Mellem"/>
+				<combo_box.item name="High" label="Høj"/>
 			</combo_box>
 			<text name="label bumpiness">
 				Struktur
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					Ingen
-				</combo_item>
-				<combo_item name="Brightness">
-					Lysintensitet
-				</combo_item>
-				<combo_item name="Darkness">
-					Mørke
-				</combo_item>
-				<combo_item name="woodgrain">
-					træårer
-				</combo_item>
-				<combo_item name="bark">
-					bark
-				</combo_item>
-				<combo_item name="bricks">
-					mursten
-				</combo_item>
-				<combo_item name="checker">
-					tern
-				</combo_item>
-				<combo_item name="concrete">
-					beton
-				</combo_item>
-				<combo_item name="crustytile">
-					rustik flise
-				</combo_item>
-				<combo_item name="cutstone">
-					Skåret sten
-				</combo_item>
-				<combo_item name="discs">
-					plader
-				</combo_item>
-				<combo_item name="gravel">
-					grus
-				</combo_item>
-				<combo_item name="petridish">
-					petriskål
-				</combo_item>
-				<combo_item name="siding">
-					udvendig beklædning
-				</combo_item>
-				<combo_item name="stonetile">
-					stenflise
-				</combo_item>
-				<combo_item name="stucco">
-					puds
-				</combo_item>
-				<combo_item name="suction">
-					rør
-				</combo_item>
-				<combo_item name="weave">
-					væv
-				</combo_item>
+				<combo_box.item name="None" label="Ingen"/>
+				<combo_box.item name="Brightness" label="Lysintensitet"/>
+				<combo_box.item name="Darkness" label="Mørke"/>
+				<combo_box.item name="woodgrain" label="træårer"/>
+				<combo_box.item name="bark" label="bark"/>
+				<combo_box.item name="bricks" label="mursten"/>
+				<combo_box.item name="checker" label="tern"/>
+				<combo_box.item name="concrete" label="beton"/>
+				<combo_box.item name="crustytile" label="rustik flise"/>
+				<combo_box.item name="cutstone" label="Skåret sten"/>
+				<combo_box.item name="discs" label="plader"/>
+				<combo_box.item name="gravel" label="grus"/>
+				<combo_box.item name="petridish" label="petriskål"/>
+				<combo_box.item name="siding" label="udvendig beklædning"/>
+				<combo_box.item name="stonetile" label="stenflise"/>
+				<combo_box.item name="stucco" label="puds"/>
+				<combo_box.item name="suction" label="rør"/>
+				<combo_box.item name="weave" label="væv"/>
 			</combo_box>
 			<text name="tex scale">
 				Gentagelser pr. overflade
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
index 9d1c799471..c35fd9b2e6 100644
--- a/indra/newview/skins/default/xui/da/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
@@ -42,15 +42,11 @@
 	<check_box label="" name="event_mature_chk" />
 	<combo_box label="Venner online" name="friend combo"
 	     tool_tip="Ven der skal vises på kortet">
-		<combo_box.item name="none_selected">
-			Venner online
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Venner online" />
 	</combo_box>
 	<combo_box label="Landemærker" name="landmark combo"
 	     tool_tip="Landemærke der skal vises på kortet">
-		<combo_box.item name="none_selected">
-			Landemærker
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Landemærker" />
 	</combo_box>
 	<line_editor label="Søg på region navn" name="location"
 	     tool_tip="Skriv navnet på en region" />
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index 308db3d299..6f02778264 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -19,15 +19,9 @@
 		Start lokation:
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome">
-			Hjem
-		</combo_box.item>
-		<combo_box.item name="MyLastLocation">
-			Min sidste lokation
-		</combo_box.item>
-		<combo_box.item name="Typeregionname">
-			&lt;Skriv navn på region&gt;
-		</combo_box.item>
+		<combo_box.item name="MyHome" label="Hjem" />
+		<combo_box.item name="MyLastLocation" label="Min sidste lokation" />
+		<combo_box.item name="Typeregionname" label="lt;Skriv navn på region&gt;" />
 	</combo_box>
 	<check_box label="Husk password" name="remember_check" />
 	<button label="Log ind" label_selected="Log ind" name="connect_btn" />
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index 74a1ab1d7a..a800002448 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
@@ -10,15 +10,9 @@
 	</radio_group>
 	<check_box label="Vis start lokation på login billedet" name="show_location_checkbox" />
 	<combo_box name="fade_out_combobox">
-		<combo_item name="Never">
-			Aldrig
-		</combo_item>
-		<combo_item name="Show Temporarily">
-			Vis midlertidigt
-		</combo_item>
-		<combo_item name="Always">
-			Altid
-		</combo_item>
+		<combo_box.item name="Never" label="Aldrig"/>
+		<combo_box.item name="Show Temporarily" label="Vis midlertidigt"/>
+		<combo_box.item name="Always" label="Altid"/>
 	</combo_box>
 	<check_box label="Små avatar navne" name="small_avatar_names_checkbox" />
 	<check_box label="Skjul mit navn på min skærm" name="show_my_name_checkbox" />
@@ -65,53 +59,23 @@
 		&lt;Skriv regions navn&gt;
 	</string>
 	<combo_box name="crash_behavior_combobox">
-		<combo_item type="string" length="1" name="Askbeforesending">
-			Bed om bekræftigelse
-		</combo_item>
-		<combo_item type="string" length="1" name="Alwayssend">
-			Send altid
-		</combo_item>
-		<combo_item type="string" length="1" name="Neversend">
-			Send aldrig
-		</combo_item>
+		<combo_box.item type="string" length="1" name="Askbeforesending" label="Bed om bekræftigelse"/>
+		<combo_box.item type="string" length="1" name="Alwayssend" label="Send altid"/>
+		<combo_box.item type="string" length="1" name="Neversend" label="Send aldrig"/>
 	</combo_box>
 	<combo_box name="language_combobox">
-		<combo_item type="string" length="1" name="System Default Language">
-			System standard
-		</combo_item>
-		<combo_item type="string" length="1" name="English">
-			English (Engelsk)
-		</combo_item>
-		<combo_item type="string" length="1" name="Danish">
-			Dansk - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="Deutsch(German)">
-			Deutsch (Tysk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="Spanish">
-			Español (Spansk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="French">
-			Français (Fransk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="Hungarian">
-			Magyar (Ungarsk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="Polish">
-			Polski (Polsk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="Portugese">
-			Portugués (Portugisisk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="Chinese">
-			中文 (简体) (Kinesisk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="(Japanese)">
-			日本語 (Japansk) - Beta
-		</combo_item>
-		<combo_item type="string" length="1" name="(Korean)">
-			한국어 (Koreansk) - Beta
-		</combo_item>
+		<combo_box.item type="string" length="1" name="System Default Language" label="System standard"/>
+		<combo_box.item type="string" length="1" name="English" label="English (Engelsk)"/>
+		<combo_box.item type="string" length="1" name="Danish" label="Dansk - Beta"/>
+		<combo_box.item type="string" length="1" name="Deutsch(German)" label="Deutsch (Tysk) - Beta"/>
+		<combo_box.item type="string" length="1" name="Spanish" label="Español (Spansk) - Beta"/>
+		<combo_box.item type="string" length="1" name="French" label="Français (Fransk) - Beta"/>
+		<combo_box.item type="string" length="1" name="Hungarian" label="Magyar (Ungarsk) - Beta"/>
+		<combo_box.item type="string" length="1" name="Polish" label="Polski (Polsk) - Beta"/>
+		<combo_box.item type="string" length="1" name="Portugese" label="Portugués (Portugisisk) - Beta"/>
+		<combo_box.item type="string" length="1" name="Chinese" label="中文 (简体) (Kinesisk) - Beta"/>
+		<combo_box.item type="string" length="1" name="(Japanese)" label="日本語 (Japansk) - Beta"/>
+		<combo_box.item type="string" length="1" name="(Korean)" label="한국어 (Koreansk) - Beta"/>
 	</combo_box>
 	<check_box label="Del sprog med objekter" name="language_is_public"
 	     tool_tip="Dette lader objekter i verden vide hvad dit foretrukne sprog er." />
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index 8add1304ae..669513d120 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -9,21 +9,11 @@
 		Opløsning:
 	</text>
 	<combo_box name="windowsize combo">
-		<combo_box.item type="string" length="1" name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="720x480">
-			720x480 (NTSC)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="768x576">
-			768x576 (PAL)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="1024x768">
-			1024x768
-		</combo_box.item>
+		<combo_box.item type="string" length="1" name="640x480" label="640x480" />
+		<combo_box.item type="string" length="1" name="800x600" label="800x600" />
+		<combo_box.item type="string" length="1" name="720x480" label="720x480 (NTSC)" />
+		<combo_box.item type="string" length="1" name="768x576" label="768x576 (PAL)" />
+		<combo_box.item type="string" length="1" name="1024x768" label="1024x768" />
 	</combo_box>
 	<text type="string" length="1" name="DisplayResLabel">
 		Skærm opløsning:
@@ -32,18 +22,10 @@
 		Format:
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="bredde/ højde">
-		<combo_box.item type="string" length="1" name="4:3(StandardCRT)">
-			4:3 (Standard CRT)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
-			5:4 (1280x1024 LCD)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="8:5(Widescreen)">
-			8:5 (Widescreen)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="16:9(Widescreen)">
-			16:9 (Widescreen)
-		</combo_box.item>
+		<combo_box.item type="string" length="1" name="4:3(StandardCRT)" label="4:3 (Standard CRT)" />
+		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)" />
+		<combo_box.item type="string" length="1" name="8:5(Widescreen)" label="8:5 (Widescreen)" />
+		<combo_box.item type="string" length="1" name="16:9(Widescreen)" label="16:9 (Widescreen)" />
 	</combo_box>
 	<check_box label="Auto-detect format" name="aspect_auto_detect" />
 	<text type="string" length="1" name="HigherText">
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index c2b22caa20..eec6a76e57 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -254,43 +254,19 @@
 			<check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Skripte am Stoßen. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
 			<check_box label="Ort in Suche anzeigen (30 L$/Woche) unter" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
 			<combo_box name="land category" left="266" width="130">
-				<combo_item name="AnyCategory">
-					Alle Kategorien
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Lindenort
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="Alle Kategorien"/>
+				<combo_box.item name="LindenLocation" label="Lindenort"/>
 
-				<combo_item name="Arts&amp;Culture">
-					Kunst und Kultur
-				</combo_item>
-				<combo_item name="Business">
-					Business
-				</combo_item>
-				<combo_item name="Educational">
-					Bildung
-				</combo_item>
-				<combo_item name="Gaming">
-					Spielen
-				</combo_item>
-				<combo_item name="Hangout">
-					Treffpunkt
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Anfängergerecht
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parks und Natur
-				</combo_item>
-				<combo_item name="Residential">
-					Wohngebiet
-				</combo_item>
-				<combo_item name="Shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other">
-					Sonstige
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="Kunst und Kultur"/>
+				<combo_box.item name="Business" label="Business"/>
+				<combo_box.item name="Educational" label="Bildung"/>
+				<combo_box.item name="Gaming" label="Spielen"/>
+				<combo_box.item name="Hangout" label="Treffpunkt"/>
+				<combo_box.item name="NewcomerFriendly" label="Anfängergerecht"/>
+				<combo_box.item name="Parks&amp;Nature" label="Parks und Natur"/>
+				<combo_box.item name="Residential" label="Wohngebiet"/>
+				<combo_box.item name="Shopping" label="Shopping"/>
+				<combo_box.item name="Other" label="Sonstige"/>
 			</combo_box>
 			<button label="?" label_selected="?" name="?"/>
 			<check_box name="MatureCheck" />
@@ -310,15 +286,9 @@
 				Teleport-Route:
 			</text>
 			<combo_box name="landing type" tool_tip="Teleport-Route -- festlegen, wie Teleports auf Ihrem Land gehandhabt werden sollen." >
-				<combo_item name="Blocked">
-					Blockiert
-				</combo_item>
-				<combo_item name="LandingPoint">
-					Landepunkt
-				</combo_item>
-				<combo_item name="Anywhere">
-					Überall
-				</combo_item>
+				<combo_box.item name="Blocked" label="Blockiert"/>
+				<combo_box.item name="LandingPoint" label="Landepunkt"/>
+				<combo_box.item name="Anywhere" label="Überall"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				Kein Stoßen
@@ -403,12 +373,8 @@ Optionen:
 			<check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
 			<check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					Jeden
-				</combo_item>
-				<combo_item name="Group">
-					Gruppe
-				</combo_item>
+				<combo_box.item name="Anyone" label="Jeden"/>
+				<combo_box.item name="Group" label="Gruppe"/>
 			</combo_box>
 			<spinner label="Preis in L$:" name="PriceSpin"/>
 			<spinner label="Online-Zeit:" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index 48df5fd917..fbd03ab3d7 100644
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -15,127 +15,53 @@
 		Handhaltung
 	</text>
 	<combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände.">
-		<combo_box.item name="Spread">
-			Dehnen
-		</combo_box.item>
-		<combo_box.item name="Relaxed">
-			Entspannt
-		</combo_box.item>
-		<combo_box.item name="PointBoth">
-			Beide zeigen
-		</combo_box.item>
-		<combo_box.item name="Fist">
-			Faust
-		</combo_box.item>
-		<combo_box.item name="RelaxedLeft">
-			Links entspannt
-		</combo_box.item>
-		<combo_box.item name="PointLeft">
-			Nach links zeigen
-		</combo_box.item>
-		<combo_box.item name="FistLeft">
-			Linke Faust
-		</combo_box.item>
-		<combo_box.item name="RelaxedRight">
-			Rechts entspannt
-		</combo_box.item>
-		<combo_box.item name="PointRight">
-			Nach rechts zeigen
-		</combo_box.item>
-		<combo_box.item name="FistRight">
-			Rechte Faust
-		</combo_box.item>
-		<combo_box.item name="SaluteRight">
-			Rechts salutieren
-		</combo_box.item>
-		<combo_box.item name="Typing">
-			Tippt
-		</combo_box.item>
-		<combo_box.item name="PeaceRight">
-			Friedensrecht
-		</combo_box.item>
+		<combo_box.item name="Spread" label="Dehnen" />
+		<combo_box.item name="Relaxed" label="Entspannt" />
+		<combo_box.item name="PointBoth" label="Beide zeigen" />
+		<combo_box.item name="Fist" label="Faust" />
+		<combo_box.item name="RelaxedLeft" label="Links entspannt" />
+		<combo_box.item name="PointLeft" label="Nach links zeigen" />
+		<combo_box.item name="FistLeft" label="Linke Faust" />
+		<combo_box.item name="RelaxedRight" label="Rechts entspannt" />
+		<combo_box.item name="PointRight" label="Nach rechts zeigen" />
+		<combo_box.item name="FistRight" label="Rechte Faust" />
+		<combo_box.item name="SaluteRight" label="Rechts salutieren" />
+		<combo_box.item name="Typing" label="Tippt" />
+		<combo_box.item name="PeaceRight" label="Friedensrecht" />
 	</combo_box>
 	<text name="emote_label">
 		Ausdruck
 	</text>
 	<combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation.">
-		<combo_box.item name="[None]">
-			[Keine]
-		</combo_box.item>
-		<combo_box.item name="Aaaaah">
-			Aaaaah
-		</combo_box.item>
-		<combo_box.item name="Afraid">
-			Ängstlich
-		</combo_box.item>
-		<combo_box.item name="Angry">
-			Verärgert
-		</combo_box.item>
-		<combo_box.item name="BigSmile">
-			Grinst
-		</combo_box.item>
-		<combo_box.item name="Bored">
-			Gelangweilt
-		</combo_box.item>
-		<combo_box.item name="Cry">
-			Weinen
-		</combo_box.item>
-		<combo_box.item name="Disdain">
-			Verachten
-		</combo_box.item>
-		<combo_box.item name="Embarrassed">
-			Verlegen
-		</combo_box.item>
-		<combo_box.item name="Frown">
-			Stirnrunzeln
-		</combo_box.item>
-		<combo_box.item name="Kiss">
-			Küssen
-		</combo_box.item>
-		<combo_box.item name="Laugh">
-			Lachen
-		</combo_box.item>
-		<combo_box.item name="Plllppt">
-			Bäääh
-		</combo_box.item>
-		<combo_box.item name="Repulsed">
-			Zurückgestoßen
-		</combo_box.item>
-		<combo_box.item name="Sad">
-			Traurig
-		</combo_box.item>
-		<combo_box.item name="Shrug">
-			Schulterzucken
-		</combo_box.item>
-		<combo_box.item name="Smile">
-			Lächeln
-		</combo_box.item>
-		<combo_box.item name="Surprise">
-			Überraschung
-		</combo_box.item>
-		<combo_box.item name="Wink">
-			Zwinkern
-		</combo_box.item>
-		<combo_box.item name="Worry">
-			Sorgenvoll
-		</combo_box.item>
+		<combo_box.item name="[None]" label="Keine]" />
+		<combo_box.item name="Aaaaah" label="Aaaaah" />
+		<combo_box.item name="Afraid" label="Ängstlich" />
+		<combo_box.item name="Angry" label="Verärgert" />
+		<combo_box.item name="BigSmile" label="Grinst" />
+		<combo_box.item name="Bored" label="Gelangweilt" />
+		<combo_box.item name="Cry" label="Weinen" />
+		<combo_box.item name="Disdain" label="Verachten" />
+		<combo_box.item name="Embarrassed" label="Verlegen" />
+		<combo_box.item name="Frown" label="Stirnrunzeln" />
+		<combo_box.item name="Kiss" label="Küssen" />
+		<combo_box.item name="Laugh" label="Lachen" />
+		<combo_box.item name="Plllppt" label="Bäääh" />
+		<combo_box.item name="Repulsed" label="Zurückgestoßen" />
+		<combo_box.item name="Sad" label="Traurig" />
+		<combo_box.item name="Shrug" label="Schulterzucken" />
+		<combo_box.item name="Smile" label="Lächeln" />
+		<combo_box.item name="Surprise" label="Überraschung" />
+		<combo_box.item name="Wink" label="Zwinkern" />
+		<combo_box.item name="Worry" label="Sorgenvoll" />
 	</combo_box>
 	<text name="preview_label" width="97">
 		Vorschau während:
 	</text>
 	<combo_box label="" left_delta="107" name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
-		<combo_box.item name="Standing">
-			Stehend
-		</combo_box.item>
-		<combo_box.item name="Walking">
-			Geht
-		</combo_box.item>
-		<combo_box.item name="Sitting">
-			Sitzt
-		</combo_box.item>
-		<combo_box.item name="Flying">
-			Fliegend
-		</combo_box.item>
+		<combo_box.item name="Standing" label="Stehend" />
+		<combo_box.item name="Walking" label="Geht" />
+		<combo_box.item name="Sitting" label="Sitzt" />
+		<combo_box.item name="Flying" label="Fliegend" />
 	</combo_box>
 	<spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
 	<spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index 0b2f86ed8f..57d573e6fd 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -66,15 +66,9 @@
 		Landbesitz ist Premium-Mitgliedern vorbehalten.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly">
-			9,95 US$/Monat, monatliche Abrechnung
-		</combo_box.item>
-		<combo_box.item name="US$7.50/month,billedquarterly">
-			7,50 US$/Monat, vierteljährliche Abrechnung
-		</combo_box.item>
-		<combo_box.item name="US$6.00/month,billedannually">
-			6,00 US$/Monat, jährliche Abrechnung
-		</combo_box.item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="9,95 US$/Monat, monatliche Abrechnung" />
+		<combo_box.item name="US$7.50/month,billedquarterly" label="7,50 US$/Monat, vierteljährliche Abrechnung" />
+		<combo_box.item name="US$6.00/month,billedannually" label="6,00 US$/Monat, jährliche Abrechnung" />
 	</combo_box>
 	<text name="land_use_action">
 		Erhöhen Sie Ihre monatlichen Landnutzungsgebühren auf 40 US$/month.
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
index 15143f59d3..39c064b265 100644
--- a/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -115,29 +115,17 @@
 				Ziel:
 			</text>
 			<combo_box name="destination">
-				<combo_box.item name="Selection">
-					Auswahl
-				</combo_box.item>
-				<combo_box.item name="AgentRegion">
-					Avatar-Region
-				</combo_box.item>
+				<combo_box.item name="Selection" label="Auswahl" />
+				<combo_box.item name="AgentRegion" label="Avatar-Region" />
 			</combo_box>
 			<text name="Request:">
 				Anfrage:
 			</text>
 			<combo_box name="request">
-				<combo_box.item name="colliders&lt;steps&gt;">
-					Kollisionsobjekte &lt;Schritte&gt;
-				</combo_box.item>
-				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-					Skripts &lt;Zähler&gt;,&lt;Optionales Muster&gt;
-				</combo_box.item>
-				<combo_box.item name="objects&lt;pattern&gt;">
-					Objekte &lt;Muster&gt;
-				</combo_box.item>
-				<combo_box.item name="rez&lt;asset_id&gt;">
-					&lt;asset_id&gt; erstellen
-				</combo_box.item>
+				<combo_box.item name="colliders&lt;steps&gt;" label="Kollisionsobjekte &lt;Schritte&gt;" />
+				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="Skripts &lt;Zähler&gt;,&lt;Optionales Muster&gt;" />
+				<combo_box.item name="objects&lt;pattern&gt;" label="Objekte &lt;Muster&gt;" />
+				<combo_box.item name="rez&lt;asset_id&gt;" label="lt;asset_id&gt; erstellen" />
 			</combo_box>
 			<text name="Parameter:">
 				Parameter:
diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
index 6642de7e6a..4051776b0d 100644
--- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
@@ -8,21 +8,11 @@
 		Antialiasing:
 	</text>
 	<combo_box label="Antialiasing" name="fsaa">
-		<combo_box.item name="FSAADisabled">
-			Deaktiviert
-		</combo_box.item>
-		<combo_box.item name="2x">
-			2x
-		</combo_box.item>
-		<combo_box.item name="4x">
-			4x
-		</combo_box.item>
-		<combo_box.item name="8x">
-			8x
-		</combo_box.item>
-		<combo_box.item name="16x">
-			16x
-		</combo_box.item>
+		<combo_box.item name="FSAADisabled" label="Deaktiviert" />
+		<combo_box.item name="2x" label="2x" />
+		<combo_box.item name="4x" label="4x" />
+		<combo_box.item name="8x" label="8x" />
+		<combo_box.item name="16x" label="16x" />
 	</combo_box>
 	<spinner label="Gamma:" name="gamma" />
 	<text name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml
index db0930f657..724da83495 100644
--- a/indra/newview/skins/default/xui/de/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		Bildvorschau als:
 	</text>
 	<combo_box label="Kleidungstyp" name="clothing_type_combo">
-		<combo_box.item name="Image">
-			Bild
-		</combo_box.item>
-		<combo_box.item name="Hair">
-			Haar
-		</combo_box.item>
-		<combo_box.item name="FemaleHead">
-			Kopf (Frau)
-		</combo_box.item>
-		<combo_box.item name="FemaleUpperBody">
-			Oberkörper (Frau)
-		</combo_box.item>
-		<combo_box.item name="FemaleLowerBody">
-			Unterkörper (Frau)
-		</combo_box.item>
-		<combo_box.item name="MaleHead">
-			Kopf (Mann)
-		</combo_box.item>
-		<combo_box.item name="MaleUpperBody">
-			Oberkörper (Mann)
-		</combo_box.item>
-		<combo_box.item name="MaleLowerBody">
-			Unterkörper (Mann)
-		</combo_box.item>
-		<combo_box.item name="Skirt">
-			Rock
-		</combo_box.item>
-		<combo_box.item name="SculptedPrim">
-			Geformtes Primitiv
-		</combo_box.item>
+		<combo_box.item name="Image" label="Bild" />
+		<combo_box.item name="Hair" label="Haar" />
+		<combo_box.item name="FemaleHead" label="Kopf (Frau)" />
+		<combo_box.item name="FemaleUpperBody" label="Oberkörper (Frau)" />
+		<combo_box.item name="FemaleLowerBody" label="Unterkörper (Frau)" />
+		<combo_box.item name="MaleHead" label="Kopf (Mann)" />
+		<combo_box.item name="MaleUpperBody" label="Oberkörper (Mann)" />
+		<combo_box.item name="MaleLowerBody" label="Unterkörper (Mann)" />
+		<combo_box.item name="Skirt" label="Rock" />
+		<combo_box.item name="SculptedPrim" label="Geformtes Primitiv" />
 	</combo_box>
 	<text name="bad_image_text">
 		Bild kann nicht gelesen werden.
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index c51a77426c..ca573083fa 100644
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -38,123 +38,51 @@ dann auf das Objekt:
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft">
-		<combo_item name="Select_category">
-			Kategorie auswählen
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Alter&gt; Age-Play
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Alter&gt; Erwachsener Einwohner in Teen Second Life
-		</combo_item>
+		<combo_box.item name="Select_category" label="Kategorie auswählen"/>
+		<combo_box.item name="Age__Age_play" label="Alter&gt; Age-Play"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Alter&gt; Erwachsener Einwohner in Teen Second Life"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Angriff&gt; Kampf-Sandbox / unsichere Region
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Angriff&gt; Sichere Region
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Angriff &gt; Sandbox für Waffentest
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Handel &gt; Produkt nicht geliefert oder Dienstleistung nicht erbracht
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Offenlegung &gt; Informationen aus realer Welt
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Offenlegung &gt; Abhören eines Chats aus der Ferne
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Offenlegung &gt; Second Life-Informationen/Chat/IMs
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Ruhestörung &gt; Unfaire Nutzung von Regionsressourcen
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Ruhestörung &gt; Exzessive Nutzung geskripteter Objekte
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Ruhestörung &gt; Wildes Erzeugen von Objekten
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Ruhestörung &gt; Ständige Spam-Wiederholung
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Ruhestörung &gt; Unerwünschte Spam-Werbung
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Betrug &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Betrug&gt; Land
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Betrug &gt; Schneeballsystem oder Kettenbrief
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Betrug &gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Belästigung &gt; Werbefarmen / visueller Spam
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Belästigung &gt; Diffamieren von Einzelpersonen/Gruppen
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Belästigung &gt; Bewegungseinschränkung
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Belästigung &gt; Sexuelle Belästigung
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Belästigung &gt; Anstiften Dritter zur Missachtung der Nutzungsbedingungen
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Belästigung &gt; Beschimpfung
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Unanständigkeit &gt; Anstößige Inhalte oder Handlungen in der Öffentlichkeit
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Angriff&gt; Kampf-Sandbox / unsichere Region"/>
+		<combo_box.item name="Assault__Safe_area" label="Angriff&gt; Sichere Region"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Angriff &gt; Sandbox für Waffentest"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Handel &gt; Produkt nicht geliefert oder Dienstleistung nicht erbracht"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Offenlegung &gt; Informationen aus realer Welt"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Offenlegung &gt; Abhören eines Chats aus der Ferne"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Offenlegung &gt; Second Life-Informationen/Chat/IMs"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Ruhestörung &gt; Unfaire Nutzung von Regionsressourcen"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Ruhestörung &gt; Exzessive Nutzung geskripteter Objekte"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Ruhestörung &gt; Wildes Erzeugen von Objekten"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Ruhestörung &gt; Ständige Spam-Wiederholung"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Ruhestörung &gt; Unerwünschte Spam-Werbung"/>
+		<combo_box.item name="Fraud__L$" label="Betrug &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Betrug&gt; Land"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Betrug &gt; Schneeballsystem oder Kettenbrief"/>
+		<combo_box.item name="Fraud__US$" label="Betrug &gt; US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Belästigung &gt; Werbefarmen / visueller Spam"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Belästigung &gt; Diffamieren von Einzelpersonen/Gruppen"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Belästigung &gt; Bewegungseinschränkung"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Belästigung &gt; Sexuelle Belästigung"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Belästigung &gt; Anstiften Dritter zur Missachtung der Nutzungsbedingungen"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Belästigung &gt; Beschimpfung"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Unanständigkeit &gt; Anstößige Inhalte oder Handlungen in der Öffentlichkeit"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Unanständigkeit &gt; Anstößiger Avatarname
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Unanständigkeit &gt; Anstößiger Avatarname"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Urheberrechtsverletzung &gt; Entfernen von Inhalten
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Urheberrechtsverletzung &gt; CopyBot oder Berechtigungs-Exploit
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intoleranz
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Land &gt; Missbrauch der Sandbox-Ressourcen
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Land &gt; Unbefugte Nutzung &gt; Objekte/Texturen
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Land &gt; Unbefugte Nutzung &gt; Partikel
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Land &gt; Unbefugte Nutzung &gt; Bäume/Pflanzen
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Wetten/Glücksspiel
-		</combo_item>
-		<combo_item name="Other">
-			Sonstige
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Urheberrechtsverletzung &gt; Entfernen von Inhalten"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Urheberrechtsverletzung &gt; CopyBot oder Berechtigungs-Exploit"/>
+		<combo_box.item name="Intolerance" label="Intoleranz"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Land &gt; Missbrauch der Sandbox-Ressourcen"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Land &gt; Unbefugte Nutzung &gt; Objekte/Texturen"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Land &gt; Unbefugte Nutzung &gt; Partikel"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Land &gt; Unbefugte Nutzung &gt; Bäume/Pflanzen"/>
+		<combo_box.item name="Wagering_gambling" label="Wetten/Glücksspiel"/>
+		<combo_box.item name="Other" label="Sonstige"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Name des Beschuldigten:
diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml
index e16a44f920..4bbcbe3df9 100644
--- a/indra/newview/skins/default/xui/de/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml
@@ -44,15 +44,9 @@ dieser Parzelle:
 beschränkt ist.
 	</text>
 	<combo_box follows="top|right" height="16" left="72" name="sell_to" bottom_delta="-32" width="140">
-		<combo_box.item name="--selectone--">
-			-- select one --
-		</combo_box.item>
-		<combo_box.item name="Anyone">
-			Jeder
-		</combo_box.item>
-		<combo_box.item name="Specificuser:">
-			Bestimmter Benutzer:
-		</combo_box.item>
+		<combo_box.item name="--selectone--" label="select one --" />
+		<combo_box.item name="Anyone" label="Jeder" />
+		<combo_box.item name="Specificuser:" label="Bestimmter Benutzer:" />
 	</combo_box>
 	<button label="Auswählen..." name="sell_to_select_agent" />
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
index f34fa8a5be..034cfca017 100644
--- a/indra/newview/skins/default/xui/de/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="settings_debug" title="Debug-Einstellungen">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE">
-			WAHR
-		</combo_box.item>
-		<combo_box.item name="FALSE">
-			FALSCH
-		</combo_box.item>
+		<combo_box.item name="TRUE" label="WAHR" />
+		<combo_box.item name="FALSE" label="FALSCH" />
 	</combo_box>
 	<color_swatch label="Farbe" name="color_swatch" />
 	<spinner label="x" name="val_spinner_1" />
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 9b3dd1fc01..ffd59af64a 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -38,75 +38,33 @@
 		Format
 	</text>
 	<combo_box label="Auflösung" name="postcard_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Aktuelles Fenster
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Benutzerdefiniert
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Aktuelles Fenster" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="Custom" label="Benutzerdefiniert" />
 	</combo_box>
 	<combo_box label="Auflösung" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Aktuelles Fenster
-		</combo_box.item>
-		<combo_box.item name="Small(128x128)">
-			Klein (128x128)
-		</combo_box.item>
-		<combo_box.item name="Medium(256x256)">
-			Mittel (256x256)
-		</combo_box.item>
-		<combo_box.item name="Large(512x512)">
-			Groß (512x512)
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Benutzerdefiniert
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Aktuelles Fenster" />
+		<combo_box.item name="Small(128x128)" label="Klein (128x128)" />
+		<combo_box.item name="Medium(256x256)" label="Mittel (256x256)" />
+		<combo_box.item name="Large(512x512)" label="Groß (512x512)" />
+		<combo_box.item name="Custom" label="Benutzerdefiniert" />
 	</combo_box>
 	<combo_box label="Auflösung" name="local_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Aktuelles Fenster
-		</combo_box.item>
-		<combo_box.item name="320x240">
-			320x240
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="1280x1024">
-			1280x1024
-		</combo_box.item>
-		<combo_box.item name="1600x1200">
-			1600x1200
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Benutzerdefiniert
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Aktuelles Fenster" />
+		<combo_box.item name="320x240" label="320x240" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="1280x1024" label="1280x1024" />
+		<combo_box.item name="1600x1200" label="1600x1200" />
+		<combo_box.item name="Custom" label="Benutzerdefiniert" />
 	</combo_box>
 	<combo_box label="Format" name="local_format_combo">
-		<combo_box.item name="PNG">
-			PNG
-		</combo_box.item>
-		<combo_box.item name="JPEG">
-			JPEG
-		</combo_box.item>
-		<combo_box.item name="BMP">
-			BMP
-		</combo_box.item>
+		<combo_box.item name="PNG" label="PNG" />
+		<combo_box.item name="JPEG" label="JPEG" />
+		<combo_box.item name="BMP" label="BMP" />
 	</combo_box>
 	<spinner label="Breite" name="snapshot_width"/>
 	<spinner label="Höhe" name="snapshot_height"/>
@@ -116,15 +74,9 @@
 		Aufnehmen:
 	</text>
 	<combo_box label="Bildlayer" name="layer_types" width="132" left="73">
-		<combo_box.item name="Colors">
-			Farben
-		</combo_box.item>
-		<combo_box.item name="Depth">
-			Tiefe
-		</combo_box.item>
-		<combo_box.item name="ObjectMattes">
-			Objektmasken
-		</combo_box.item>
+		<combo_box.item name="Colors" label="Farben" />
+		<combo_box.item name="Depth" label="Tiefe" />
+		<combo_box.item name="ObjectMattes" label="Objektmasken" />
 	</combo_box>
 	<check_box label="Interface auf Foto anzeigen" name="ui_check"/>
 	<check_box label="HUD-Objekte auf Foto anzeigen" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index f83d57dc6f..483b8c454b 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -38,15 +38,9 @@
 		Zum Verschieben ziehen, zum Kopieren Umschalttaste-Ziehen
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_box.item name="World">
-			Welt
-		</combo_box.item>
-		<combo_box.item name="Local">
-			Lokal
-		</combo_box.item>
-		<combo_box.item name="Reference">
-			Referenz
-		</combo_box.item>
+		<combo_box.item name="World" label="Welt" />
+		<combo_box.item name="Local" label="Lokal" />
+		<combo_box.item name="Reference" label="Referenz" />
 	</combo_box>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Würfel" />
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma" />
@@ -78,15 +72,9 @@
     <radio_item label="Land zurückführen" name="radio revert" />
   </radio_group>
 	<combo_box name="combobox brush size">
-		<combo_box.item name="Small">
-			Klein
-		</combo_box.item>
-		<combo_box.item name="Medium">
-			Mittel
-		</combo_box.item>
-		<combo_box.item name="Large">
-			Groß
-		</combo_box.item>
+		<combo_box.item name="Small" label="Klein" />
+		<combo_box.item name="Medium" label="Mittel" />
+		<combo_box.item name="Large" label="Groß" />
 	</combo_box>
 	<text name="Strength:">
 		Stärke:
@@ -178,27 +166,13 @@
 				Bei Linksklicken:
 			</text>
 			<combo_box name="clickaction" width="178">
-				<combo_box.item name="Touch/grab(default)">
-					Berühren/Greifen (Standard)
-				</combo_box.item>
-				<combo_box.item name="Sitonobject">
-					Auf Objekt sitzen
-				</combo_box.item>
-				<combo_box.item name="Buyobject">
-					Objekt kaufen
-				</combo_box.item>
-				<combo_box.item name="Payobject">
-					Objekt bezahlen
-				</combo_box.item>
-				<combo_box.item name="Open">
-					Öffnen
-				</combo_box.item>
-				<combo_box.item name="Play">
-					Parzellenmedien wiedergeben
-				</combo_box.item>
-				<combo_box.item name="Opemmedia">
-					Parzellenmedien öffnen
-				</combo_box.item>
+				<combo_box.item name="Touch/grab(default)" label="Berühren/Greifen (Standard)" />
+				<combo_box.item name="Sitonobject" label="Auf Objekt sitzen" />
+				<combo_box.item name="Buyobject" label="Objekt kaufen" />
+				<combo_box.item name="Payobject" label="Objekt bezahlen" />
+				<combo_box.item name="Open" label="Öffnen" />
+				<combo_box.item name="Play" label="Parzellenmedien wiedergeben" />
+				<combo_box.item name="Opemmedia" label="Parzellenmedien öffnen" />
 			</combo_box>
 			<text name="B:">
 				B:
@@ -286,56 +260,26 @@
 				Material
 			</text>
 			<combo_box name="material">
-				<combo_box.item name="Stone">
-					Stein
-				</combo_box.item>
-				<combo_box.item name="Metal">
-					Metall
-				</combo_box.item>
-				<combo_box.item name="Glass">
-					Glas
-				</combo_box.item>
-				<combo_box.item name="Wood">
-					Holz
-				</combo_box.item>
-				<combo_box.item name="Flesh">
-					Fleisch
-				</combo_box.item>
-				<combo_box.item name="Plastic">
-					Kunststoff
-				</combo_box.item>
-				<combo_box.item name="Rubber">
-					Gummi
-				</combo_box.item>
+				<combo_box.item name="Stone" label="Stein" />
+				<combo_box.item name="Metal" label="Metall" />
+				<combo_box.item name="Glass" label="Glas" />
+				<combo_box.item name="Wood" label="Holz" />
+				<combo_box.item name="Flesh" label="Fleisch" />
+				<combo_box.item name="Plastic" label="Kunststoff" />
+				<combo_box.item name="Rubber" label="Gummi" />
 			</combo_box>
 			<text left="115" name="label basetype">
 				Bausteintyp
 			</text>
 			<combo_box left="115" name="comboBaseType">
-				<combo_box.item name="Box">
-					Quader
-				</combo_box.item>
-				<combo_box.item name="Cylinder">
-					Zylinder
-				</combo_box.item>
-				<combo_box.item name="Prism">
-					Prisma
-				</combo_box.item>
-				<combo_box.item name="Sphere">
-					Kugel
-				</combo_box.item>
-				<combo_box.item name="Torus">
-					Torus
-				</combo_box.item>
-				<combo_box.item name="Tube">
-					Rohr
-				</combo_box.item>
-				<combo_box.item name="Ring">
-					Ring
-				</combo_box.item>
-				<combo_box.item name="Sculpted">
-					Geformt
-				</combo_box.item>
+				<combo_box.item name="Box" label="Quader" />
+				<combo_box.item name="Cylinder" label="Zylinder" />
+				<combo_box.item name="Prism" label="Prisma" />
+				<combo_box.item name="Sphere" label="Kugel" />
+				<combo_box.item name="Torus" label="Torus" />
+				<combo_box.item name="Tube" label="Rohr" />
+				<combo_box.item name="Ring" label="Ring" />
+				<combo_box.item name="Sculpted" label="Geformt" />
 			</combo_box>
 			<text left="115" name="text cut" width="146">
 				Pfadschnitt Beginn und Ende
@@ -354,18 +298,10 @@
 				Hohlform
 			</text>
 			<combo_box left="115" name="hole">
-				<combo_box.item name="Default">
-					Standard
-				</combo_box.item>
-				<combo_box.item name="Circle">
-					Kreis
-				</combo_box.item>
-				<combo_box.item name="Square">
-					Quadrat
-				</combo_box.item>
-				<combo_box.item name="Triangle">
-					Dreieck
-				</combo_box.item>
+				<combo_box.item name="Default" label="Standard" />
+				<combo_box.item name="Circle" label="Kreis" />
+				<combo_box.item name="Square" label="Quadrat" />
+				<combo_box.item name="Triangle" label="Dreieck" />
 			</combo_box>
 			<text left="115" name="text twist">
 				Torsion
@@ -415,21 +351,11 @@
 				Naht
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_box.item name="None">
-					(keiner)
-				</combo_box.item>
-				<combo_box.item name="Sphere">
-					Kugel
-				</combo_box.item>
-				<combo_box.item name="Torus">
-					Torus
-				</combo_box.item>
-				<combo_box.item name="Plane">
-					Fläche
-				</combo_box.item>
-				<combo_box.item name="Cylinder">
-					Zylinder
-				</combo_box.item>
+				<combo_box.item name="None" label="keiner)" />
+				<combo_box.item name="Sphere" label="Kugel" />
+				<combo_box.item name="Torus" label="Torus" />
+				<combo_box.item name="Plane" label="Fläche" />
+				<combo_box.item name="Cylinder" label="Zylinder" />
 			</combo_box>
 		</panel>
 		<panel label="Eigenschaften" name="Features">
@@ -474,88 +400,40 @@
 				Zuordnung
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_box.item name="Default">
-					Standard
-				</combo_box.item>
-				<combo_box.item name="Planar">
-					Eben
-				</combo_box.item>
+				<combo_box.item name="Default" label="Standard" />
+				<combo_box.item name="Planar" label="Eben" />
 			</combo_box>
 			<text name="label shininess">
 				Glanz
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_box.item name="None">
-					Kein
-				</combo_box.item>
-				<combo_box.item name="Low">
-					Niedrig
-				</combo_box.item>
-				<combo_box.item name="Medium">
-					Mittel
-				</combo_box.item>
-				<combo_box.item name="High">
-					Hoch
-				</combo_box.item>
+				<combo_box.item name="None" label="Kein" />
+				<combo_box.item name="Low" label="Niedrig" />
+				<combo_box.item name="Medium" label="Mittel" />
+				<combo_box.item name="High" label="Hoch" />
 			</combo_box>
 			<text name="label bumpiness">
 				Holprigkeit
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_box.item name="None">
-					Keine
-				</combo_box.item>
-				<combo_box.item name="Brightness">
-					Helligkeit
-				</combo_box.item>
-				<combo_box.item name="Darkness">
-					Dunkelheit
-				</combo_box.item>
-				<combo_box.item name="woodgrain">
-					Holzmaserung
-				</combo_box.item>
-				<combo_box.item name="bark">
-					Rinde
-				</combo_box.item>
-				<combo_box.item name="bricks">
-					Ziegel
-				</combo_box.item>
-				<combo_box.item name="checker">
-					Karo
-				</combo_box.item>
-				<combo_box.item name="concrete">
-					Beton
-				</combo_box.item>
-				<combo_box.item name="crustytile">
-					verkrustete Fliesen
-				</combo_box.item>
-				<combo_box.item name="cutstone">
-					Steinplatten
-				</combo_box.item>
-				<combo_box.item name="discs">
-					Scheiben
-				</combo_box.item>
-				<combo_box.item name="gravel">
-					Kies
-				</combo_box.item>
-				<combo_box.item name="petridish">
-					Petrischale
-				</combo_box.item>
-				<combo_box.item name="siding">
-					Verkleidung
-				</combo_box.item>
-				<combo_box.item name="stonetile">
-					Steinfliesen
-				</combo_box.item>
-				<combo_box.item name="stucco">
-					Stuck
-				</combo_box.item>
-				<combo_box.item name="suction">
-					Saugen
-				</combo_box.item>
-				<combo_box.item name="weave">
-					gewoben
-				</combo_box.item>
+				<combo_box.item name="None" label="Keine" />
+				<combo_box.item name="Brightness" label="Helligkeit" />
+				<combo_box.item name="Darkness" label="Dunkelheit" />
+				<combo_box.item name="woodgrain" label="Holzmaserung" />
+				<combo_box.item name="bark" label="Rinde" />
+				<combo_box.item name="bricks" label="Ziegel" />
+				<combo_box.item name="checker" label="Karo" />
+				<combo_box.item name="concrete" label="Beton" />
+				<combo_box.item name="crustytile" label="verkrustete Fliesen" />
+				<combo_box.item name="cutstone" label="Steinplatten" />
+				<combo_box.item name="discs" label="Scheiben" />
+				<combo_box.item name="gravel" label="Kies" />
+				<combo_box.item name="petridish" label="Petrischale" />
+				<combo_box.item name="siding" label="Verkleidung" />
+				<combo_box.item name="stonetile" label="Steinfliesen" />
+				<combo_box.item name="stucco" label="Stuck" />
+				<combo_box.item name="suction" label="Saugen" />
+				<combo_box.item name="weave" label="gewoben" />
 			</combo_box>
 			<text name="tex scale">
 				Wiederholungen
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index b937fdda01..52f87fc32b 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -42,14 +42,10 @@
 
 	<check_box label=" " name="event_mature_chk"/>
 	<combo_box label="Online-Freunde" name="friend combo" tool_tip="Freund, der auf Karte angezeigt werden soll">
-		<combo_box.item name="none_selected">
-			Online-Freunde
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Online-Freunde" />
 	</combo_box>
 	<combo_box label="Landmarken" name="landmark combo" tool_tip="Landmarke, die auf Karte angezeigt werden soll">
-		<combo_box.item name="none_selected">
-			Landmarken
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Landmarken" />
 	</combo_box>
 	<line_editor label="Nach Regionsname suchen" name="location" tool_tip="Geben Sie den Namen einer Region ein"/>
 	<button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 5b5a6d8c77..3f459050b1 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -13,15 +13,9 @@
 		Startposition:
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome">
-			Mein Heimatort
-		</combo_box.item>
-		<combo_box.item name="MyLastLocation">
-			Mein letzter Standort
-		</combo_box.item>
-		<combo_box.item name="Typeregionname">
-			&lt;Region eingeben&gt;
-		</combo_box.item>
+		<combo_box.item name="MyHome" label="Mein Heimatort" />
+		<combo_box.item name="MyLastLocation" label="Mein letzter Standort" />
+		<combo_box.item name="Typeregionname" label="lt;Region eingeben&gt;" />
 	</combo_box>
 	<check_box label="Kennwort merken" name="remember_check"/>
 	<text name="full_screen_text">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 2276fd8a9d..4717f21a0b 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -21,21 +21,11 @@
 		Fenstergröße:
 	</text>
 	<combo_box left="115" name="windowsize combo">
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="720x480">
-			720x480 (NTSC)
-		</combo_box.item>
-		<combo_box.item name="768x576">
-			768x576 (PAL)
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="720x480" label="720x480 (NTSC)" />
+		<combo_box.item name="768x576" label="768x576 (PAL)" />
+		<combo_box.item name="1024x768" label="1024x768" />
 	</combo_box>
 	<text name="DisplayResLabel" width="100">
 		Anzeigeauflösung:
@@ -45,18 +35,10 @@
 		Aspektverhältnis:
 	</text>
 	<combo_box left="115" name="aspect_ratio" tool_tip="Breite/Höhe">
-		<combo_box.item type="string" length="1" name="4:3(StandardCRT)">
-			4:3 (Standard-CRT)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
-			5:4 (1280x1024 LCD)
-		</combo_box.item>
-		<combo_box.item name="8:5(Widescreen)">
-			8:5 (Widescreen)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="16:9(Widescreen)">
-			16:9 (Widescreen)
-		</combo_box.item>
+		<combo_box.item type="string" length="1" name="4:3(StandardCRT)" label="4:3 (Standard-CRT)" />
+		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)" />
+		<combo_box.item name="8:5(Widescreen)" label="8:5 (Widescreen)" />
+		<combo_box.item type="string" length="1" name="16:9(Widescreen)" label="16:9 (Widescreen)" />
 	</combo_box>
 	<check_box label="Verhältnis automatisch erkennen" left="275" name="aspect_auto_detect" />
 	<text type="string" length="1" name="UI Size:">
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 526327d28b..93a463e5a6 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -253,43 +253,19 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<check_box label="Sin &apos;empujones&apos;" name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción prevendrá que en su terreno haya comportamientos destructivos."/>
 			<check_box label="Mostrar la parcela en Buscar (30 L$/semana) en" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
 			<combo_box name="land category">
-				<combo_item name="AnyCategory">
-					Cualquier categoría
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Localización Linden
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="Cualquier categoría"/>
+				<combo_box.item name="LindenLocation" label="Localización Linden"/>
 
-				<combo_item name="Arts&amp;Culture">
-					Arte y Cultura
-				</combo_item>
-				<combo_item name="Business">
-					Negocios
-				</combo_item>
-				<combo_item name="Educational">
-					Educativo
-				</combo_item>
-				<combo_item name="Gaming">
-					Juegos de azar
-				</combo_item>
-				<combo_item name="Hangout">
-					Entretenimiento
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Para recién llegados
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parques y Naturaleza
-				</combo_item>
-				<combo_item name="Residential">
-					Residencial
-				</combo_item>
-				<combo_item name="Shopping">
-					Compras
-				</combo_item>
-				<combo_item name="Other">
-					Otra
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="Arte y Cultura"/>
+				<combo_box.item name="Business" label="Negocios"/>
+				<combo_box.item name="Educational" label="Educativo"/>
+				<combo_box.item name="Gaming" label="Juegos de azar"/>
+				<combo_box.item name="Hangout" label="Entretenimiento"/>
+				<combo_box.item name="NewcomerFriendly" label="Para recién llegados"/>
+				<combo_box.item name="Parks&amp;Nature" label="Parques y Naturaleza"/>
+				<combo_box.item name="Residential" label="Residencial"/>
+				<combo_box.item name="Shopping" label="Compras"/>
+				<combo_box.item name="Other" label="Otra"/>
 			</combo_box>
 			<button label="?" label_selected="?" name="?"/>
 			<check_box name="MatureCheck" />
@@ -309,15 +285,9 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 				Punto de teleporte:
 			</text>
 			<combo_box name="landing type" tool_tip="Punto de teleporte: defina cómo manejar en su terreno los teleportes.">
-				<combo_item length="1" name="Blocked" type="string">
-					Bloqueado
-				</combo_item>
-				<combo_item length="1" name="LandingPoint" type="string">
-					Punto de llegada
-				</combo_item>
-				<combo_item length="1" name="Anywhere" type="string">
-					Cualquiera
-				</combo_item>
+				<combo_box.item length="1" name="Blocked" type="string" label="Bloqueado"/>
+				<combo_box.item length="1" name="LandingPoint" type="string" label="Punto de llegada"/>
+				<combo_box.item length="1" name="Anywhere" type="string" label="Cualquiera"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				Sin &apos;empujones&apos;
@@ -402,12 +372,8 @@ los media:
 			<check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
 			<check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					Cualquiera
-				</combo_item>
-				<combo_item name="Group">
-					Grupo
-				</combo_item>
+				<combo_box.item name="Anyone" label="Cualquiera"/>
+				<combo_box.item name="Group" label="Grupo"/>
 			</combo_box>
 			<spinner label="Precio en L$:" name="PriceSpin"/>
 			<spinner label="Horas de acceso:" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
index a5b9847c4f..73ed06d1f7 100644
--- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
@@ -14,127 +14,53 @@
 		Posición de las manos
 	</text>
 	<combo_box label="" name="hand_pose_combo" tool_tip="Control de lo que hacen las manos durante la animación.">
-		<combo_item name="Spread">
-			Extendidas
-		</combo_item>
-		<combo_item name="Relaxed">
-			Relajadas
-		</combo_item>
-		<combo_item name="PointBoth">
-			Ambas señalan
-		</combo_item>
-		<combo_item name="Fist">
-			Puño
-		</combo_item>
-		<combo_item name="RelaxedLeft">
-			La izquierda relajada
-		</combo_item>
-		<combo_item name="PointLeft">
-			La izquierda señala
-		</combo_item>
-		<combo_item name="FistLeft">
-			Puño en la izquierda
-		</combo_item>
-		<combo_item name="RelaxedRight">
-			La derecha relajada
-		</combo_item>
-		<combo_item name="PointRight">
-			La derecha señala
-		</combo_item>
-		<combo_item name="FistRight">
-			Puño en la derecha
-		</combo_item>
-		<combo_item name="SaluteRight">
-			La derecha saluda
-		</combo_item>
-		<combo_item name="Typing">
-			Escribiendo
-		</combo_item>
-		<combo_item name="PeaceRight">
-			Paz en la derecha
-		</combo_item>
+		<combo_box.item name="Spread" label="Extendidas"/>
+		<combo_box.item name="Relaxed" label="Relajadas"/>
+		<combo_box.item name="PointBoth" label="Ambas señalan"/>
+		<combo_box.item name="Fist" label="Puño"/>
+		<combo_box.item name="RelaxedLeft" label="La izquierda relajada"/>
+		<combo_box.item name="PointLeft" label="La izquierda señala"/>
+		<combo_box.item name="FistLeft" label="Puño en la izquierda"/>
+		<combo_box.item name="RelaxedRight" label="La derecha relajada"/>
+		<combo_box.item name="PointRight" label="La derecha señala"/>
+		<combo_box.item name="FistRight" label="Puño en la derecha"/>
+		<combo_box.item name="SaluteRight" label="La derecha saluda"/>
+		<combo_box.item name="Typing" label="Escribiendo"/>
+		<combo_box.item name="PeaceRight" label="Paz en la derecha"/>
 	</combo_box>
 	<text name="emote_label">
 		Expresión
 	</text>
 	<combo_box label="" name="emote_combo" tool_tip="Controle qué hace la cara durante la animación.">
-		<combo_item name="[None]">
-			[Nada]
-		</combo_item>
-		<combo_item name="Aaaaah">
-			Aaaaah
-		</combo_item>
-		<combo_item name="Afraid">
-			Con miedo
-		</combo_item>
-		<combo_item name="Angry">
-			Enfadada
-		</combo_item>
-		<combo_item name="BigSmile">
-			Gran sonrisa
-		</combo_item>
-		<combo_item name="Bored">
-			Aburrida
-		</combo_item>
-		<combo_item name="Cry">
-			Llorar
-		</combo_item>
-		<combo_item name="Disdain">
-			Desdén
-		</combo_item>
-		<combo_item name="Embarrassed">
-			Avergonzada
-		</combo_item>
-		<combo_item name="Frown">
-			Fruncir el ceño
-		</combo_item>
-		<combo_item name="Kiss">
-			Besar
-		</combo_item>
-		<combo_item name="Laugh">
-			Reír
-		</combo_item>
-		<combo_item name="Plllppt">
-			Sacar la lengua
-		</combo_item>
-		<combo_item name="Repulsed">
-			Rechazo
-		</combo_item>
-		<combo_item name="Sad">
-			Triste
-		</combo_item>
-		<combo_item name="Shrug">
-			Encogerse de hombros
-		</combo_item>
-		<combo_item name="Smile">
-			Sonrisa
-		</combo_item>
-		<combo_item name="Surprise">
-			Sorpresa
-		</combo_item>
-		<combo_item name="Wink">
-			Guiño
-		</combo_item>
-		<combo_item name="Worry">
-			Preocupación
-		</combo_item>
+		<combo_box.item name="[None]" label="Nada]"/>
+		<combo_box.item name="Aaaaah" label="Aaaaah"/>
+		<combo_box.item name="Afraid" label="Con miedo"/>
+		<combo_box.item name="Angry" label="Enfadada"/>
+		<combo_box.item name="BigSmile" label="Gran sonrisa"/>
+		<combo_box.item name="Bored" label="Aburrida"/>
+		<combo_box.item name="Cry" label="Llorar"/>
+		<combo_box.item name="Disdain" label="Desdén"/>
+		<combo_box.item name="Embarrassed" label="Avergonzada"/>
+		<combo_box.item name="Frown" label="Fruncir el ceño"/>
+		<combo_box.item name="Kiss" label="Besar"/>
+		<combo_box.item name="Laugh" label="Reír"/>
+		<combo_box.item name="Plllppt" label="Sacar la lengua"/>
+		<combo_box.item name="Repulsed" label="Rechazo"/>
+		<combo_box.item name="Sad" label="Triste"/>
+		<combo_box.item name="Shrug" label="Encogerse de hombros"/>
+		<combo_box.item name="Smile" label="Sonrisa"/>
+		<combo_box.item name="Surprise" label="Sorpresa"/>
+		<combo_box.item name="Wink" label="Guiño"/>
+		<combo_box.item name="Worry" label="Preocupación"/>
 	</combo_box>
 	<text name="preview_label">
 		Vista previa mientras
 	</text>
 	<combo_box label="" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
-		<combo_item name="Standing">
-			Estar de pie
-		</combo_item>
-		<combo_item name="Walking">
-			Caminar
-		</combo_item>
-		<combo_item name="Sitting">
-			Estar sentado
-		</combo_item>
-		<combo_item name="Flying">
-			Volar
-		</combo_item>
+		<combo_box.item name="Standing" label="Estar de pie"/>
+		<combo_box.item name="Walking" label="Caminar"/>
+		<combo_box.item name="Sitting" label="Estar sentado"/>
+		<combo_box.item name="Flying" label="Volar"/>
 	</combo_box>
 	<spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones."/>
 	<spinner label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones."/>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index c5286b1d14..4203bc850c 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -66,15 +66,9 @@
 		Sólo pueden ser propietarios de terreno los miembros premium.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly">
-			9.95 US$/mes, facturados mensualmente
-		</combo_box.item>
-		<combo_box.item name="US$7.50/month,billedquarterly">
-			7.50 US$/mes, facturados cuatrimestralmente
-		</combo_box.item>
-		<combo_box.item name="US$6.00/month,billedannually">
-			6.00 US$/mes, facturados anualmente
-		</combo_box.item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="9.95 US$/mes, facturados mensualmente" />
+		<combo_box.item name="US$7.50/month,billedquarterly" label="7.50 US$/mes, facturados cuatrimestralmente" />
+		<combo_box.item name="US$6.00/month,billedannually" label="6.00 US$/mes, facturados anualmente" />
 	</combo_box>
 	<text name="land_use_action">
 		Aumenta su cuota mensual por uso de terreno a 40 US$/mes.
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
index b429d1ccaf..1ba0b685c6 100644
--- a/indra/newview/skins/default/xui/es/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml
@@ -114,29 +114,17 @@
 				Destino:
 			</text>
 			<combo_box name="destination">
-				<combo_box.item name="Selection">
-					Selección
-				</combo_box.item>
-				<combo_box.item name="AgentRegion">
-					Agente de región
-				</combo_box.item>
+				<combo_box.item name="Selection" label="Selección" />
+				<combo_box.item name="AgentRegion" label="Agente de región" />
 			</combo_box>
 			<text name="Request:">
 				Exigencia:
 			</text>
 			<combo_box name="request">
-				<combo_box.item name="colliders&lt;steps&gt;">
-					colisionadores &lt;pasos&gt;
-				</combo_box.item>
-				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-					scripts &lt;contar&gt;,&lt;patrón opcional&gt;
-				</combo_box.item>
-				<combo_box.item name="objects&lt;pattern&gt;">
-					objetos &lt;patrón&gt;
-				</combo_box.item>
-				<combo_box.item name="rez&lt;asset_id&gt;">
-					rez &lt;asset_id&gt;
-				</combo_box.item>
+				<combo_box.item name="colliders&lt;steps&gt;" label="colisionadores &lt;pasos&gt;" />
+				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="scripts &lt;contar&gt;,&lt;patrón opcional&gt;" />
+				<combo_box.item name="objects&lt;pattern&gt;" label="objetos &lt;patrón&gt;" />
+				<combo_box.item name="rez&lt;asset_id&gt;" label="rez &lt;asset_id&gt;" />
 			</combo_box>
 			<text name="Parameter:">
 				Parámetro:
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
index 986c2f117b..197b3a8f39 100644
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
@@ -8,21 +8,11 @@
 		Antialiasing:
 	</text>
 	<combo_box label="Antialiasing" name="fsaa">
-		<combo_item name="FSAADisabled">
-			Desactivado
-		</combo_item>
-		<combo_item name="2x">
-			2x
-		</combo_item>
-		<combo_item name="4x">
-			4x
-		</combo_item>
-		<combo_item name="8x">
-			8x
-		</combo_item>
-		<combo_item name="16x">
-			16x
-		</combo_item>
+		<combo_box.item name="FSAADisabled" label="Desactivado"/>
+		<combo_box.item name="2x" label="2x"/>
+		<combo_box.item name="4x" label="4x"/>
+		<combo_box.item name="8x" label="8x"/>
+		<combo_box.item name="16x" label="16x"/>
 	</combo_box>
 	<spinner label="Gamma:" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
index 8e242d848d..cd036fc050 100644
--- a/indra/newview/skins/default/xui/es/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		Previsualizar la imagen como:
 	</text>
 	<combo_box label="Tipo de ropa" name="clothing_type_combo">
-		<combo_box.item name="Image">
-			Imagen
-		</combo_box.item>
-		<combo_box.item name="Hair">
-			Pelo
-		</combo_box.item>
-		<combo_box.item name="FemaleHead">
-			Cabeza de mujer
-		</combo_box.item>
-		<combo_box.item name="FemaleUpperBody">
-			Mujer: parte superior del cuerpo
-		</combo_box.item>
-		<combo_box.item name="FemaleLowerBody">
-			Mujer: parte inferior del cuerpo
-		</combo_box.item>
-		<combo_box.item name="MaleHead">
-			Cabeza de varón
-		</combo_box.item>
-		<combo_box.item name="MaleUpperBody">
-			Varón: parte superior del cuerpo
-		</combo_box.item>
-		<combo_box.item name="MaleLowerBody">
-			Varón: parte inferior del cuerpo
-		</combo_box.item>
-		<combo_box.item name="Skirt">
-			Falda
-		</combo_box.item>
-		<combo_item name="SculptedPrim">
-			Prim sculpted
-		</combo_item>
+		<combo_box.item name="Image" label="Imagen" />
+		<combo_box.item name="Hair" label="Pelo" />
+		<combo_box.item name="FemaleHead" label="Cabeza de mujer" />
+		<combo_box.item name="FemaleUpperBody" label="Mujer: parte superior del cuerpo" />
+		<combo_box.item name="FemaleLowerBody" label="Mujer: parte inferior del cuerpo" />
+		<combo_box.item name="MaleHead" label="Cabeza de varón" />
+		<combo_box.item name="MaleUpperBody" label="Varón: parte superior del cuerpo" />
+		<combo_box.item name="MaleLowerBody" label="Varón: parte inferior del cuerpo" />
+		<combo_box.item name="Skirt" label="Falda" />
+		<combo_box.item name="SculptedPrim" label="Prim sculpted"/>
 	</combo_box>
 	<text name="bad_image_text">
 		Imposible leer la imagen.
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index 4e1782995c..1d3244524f 100644
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -37,123 +37,51 @@
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="Categoría -- Elija la categoría que describa mejor esta denuncia">
-		<combo_item name="Select_category">
-			Elegir la categoría
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Edad &gt; Jugar a ser niño
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Edad &gt; Residente adulto en Teen Second Life
-		</combo_item>
+		<combo_box.item name="Select_category" label="Elegir la categoría"/>
+		<combo_box.item name="Age__Age_play" label="Edad &gt; Jugar a ser niño"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Edad &gt; Residente adulto en Teen Second Life"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Ataque &gt; Sandbox de combate / Zona no segura
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Ataque &gt; Zona segura
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Ataque &gt; Sandbox de prueba de armas
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Comercio &gt; Error en la entrega de productos o servicios
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Indiscreción &gt; Información del mundo real
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Indiscreción &gt; Monitorizar a distancia el chat
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Indiscreción &gt; Información Se Second Life, el chat o los MI
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Perturbando la paz &gt; Abuso de los recursos de la región
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Perturbando la paz &gt; Excesivos objetos con script
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Perturbando la paz &gt; Objeto basura
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Perturbando la paz &gt; Spam (mensajes no pedidos) repetitivo
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Perturbando la paz &gt; Publicidad no deseada
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Fraude &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Fraude &gt; Terreno
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Fraude &gt; Esquemas piramidales o cadenas de cartas
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Fraude &gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Acoso &gt; Anuncios múltiples / Spam visual
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Acoso &gt; Difamación de individuos o grupos
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Acoso &gt; Impedir el movimiento
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Acoso &gt; Acoso sexual
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Acoso &gt; Incitar a, o pedir, que otros violen las Condiciones del Servicio
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Acoso &gt; Abuso verbal
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Indecencia &gt; En general, contenido o conducta ofensivos
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Ataque &gt; Sandbox de combate / Zona no segura"/>
+		<combo_box.item name="Assault__Safe_area" label="Ataque &gt; Zona segura"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Ataque &gt; Sandbox de prueba de armas"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Comercio &gt; Error en la entrega de productos o servicios"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Indiscreción &gt; Información del mundo real"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Indiscreción &gt; Monitorizar a distancia el chat"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Indiscreción &gt; Información Se Second Life, el chat o los MI"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Perturbando la paz &gt; Abuso de los recursos de la región"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Perturbando la paz &gt; Excesivos objetos con script"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Perturbando la paz &gt; Objeto basura"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Perturbando la paz &gt; Spam (mensajes no pedidos) repetitivo"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Perturbando la paz &gt; Publicidad no deseada"/>
+		<combo_box.item name="Fraud__L$" label="Fraude &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Fraude &gt; Terreno"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Fraude &gt; Esquemas piramidales o cadenas de cartas"/>
+		<combo_box.item name="Fraud__US$" label="Fraude &gt; US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Acoso &gt; Anuncios múltiples / Spam visual"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Acoso &gt; Difamación de individuos o grupos"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Acoso &gt; Impedir el movimiento"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Acoso &gt; Acoso sexual"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Acoso &gt; Incitar a, o pedir, que otros violen las Condiciones del Servicio"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Acoso &gt; Abuso verbal"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Indecencia &gt; En general, contenido o conducta ofensivos"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Indecencia &gt; Nombre inapropiado del avatar
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Indecencia &gt; Nombre inapropiado del avatar"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Infracción de la propiedad intelectual &gt; Eliminación de contenidos
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Infracción de la propiedad intelectual &gt; CopyBot o Exploit (programa malicioso) de permisos
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intolerancia
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Terreno &gt; Abuso de los recursos de un sandbox
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Terreno &gt; Invasión &gt; Objetos/Texturas
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Terreno &gt; Invasión &gt; Partículas
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Terreno &gt; Invasión &gt; Árboles/Plantas
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Apuestas/Juego
-		</combo_item>
-		<combo_item name="Other">
-			Otra
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Infracción de la propiedad intelectual &gt; Eliminación de contenidos"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Infracción de la propiedad intelectual &gt; CopyBot o Exploit (programa malicioso) de permisos"/>
+		<combo_box.item name="Intolerance" label="Intolerancia"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Terreno &gt; Abuso de los recursos de un sandbox"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Terreno &gt; Invasión &gt; Objetos/Texturas"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Terreno &gt; Invasión &gt; Partículas"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Terreno &gt; Invasión &gt; Árboles/Plantas"/>
+		<combo_box.item name="Wagering_gambling" label="Apuestas/Juego"/>
+		<combo_box.item name="Other" label="Otra"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Nombre del infractor:
diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml
index 8d47bad6dc..4127fafc98 100644
--- a/indra/newview/skins/default/xui/es/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml
@@ -34,15 +34,9 @@
 		Elija si venderlo a cualquiera o a un comprador concreto.
 	</text>
 	<combo_box name="sell_to">
-		<combo_box.item name="--selectone--">
-			-- seleccione --
-		</combo_box.item>
-		<combo_box.item name="Anyone">
-			Cualquiera
-		</combo_box.item>
-		<combo_box.item name="Specificuser:">
-			Un usuario concreto:
-		</combo_box.item>
+		<combo_box.item name="--selectone--" label="seleccione --" />
+		<combo_box.item name="Anyone" label="Cualquiera" />
+		<combo_box.item name="Specificuser:" label="Un usuario concreto:" />
 	</combo_box>
 	<button label="Seleccionar..." name="sell_to_select_agent"/>
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
index 28fb1478d3..b87ee1bffc 100644
--- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="Configuración del depurador">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE">
-			TRUE
-		</combo_box.item>
-		<combo_box.item name="FALSE">
-			FALSE
-		</combo_box.item>
+		<combo_box.item name="TRUE" label="TRUE" />
+		<combo_box.item name="FALSE" label="FALSE" />
 	</combo_box>
 	<color_swatch label="Color" name="color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index 0461f996f6..9d60b84688 100644
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -34,75 +34,33 @@
 		Formato
 	</text>
 	<combo_box label="Resolución" name="postcard_size_combo">
-		<combo_item name="CurrentWindow">
-			Ventana actual
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="Custom">
-			Personalizar
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Ventana actual"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="Custom" label="Personalizar"/>
 	</combo_box>
 	<combo_box label="Resolución" name="texture_size_combo">
-		<combo_item name="CurrentWindow">
-			Ventana actual
-		</combo_item>
-		<combo_item name="Small(128x128)">
-			Pequeño (128x128)
-		</combo_item>
-		<combo_item name="Medium(256x256)">
-			Medio (256x256)
-		</combo_item>
-		<combo_item name="Large(512x512)">
-			Grande (512x512)
-		</combo_item>
-		<combo_item name="Custom">
-			Personalizar
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Ventana actual"/>
+		<combo_box.item name="Small(128x128)" label="Pequeño (128x128)"/>
+		<combo_box.item name="Medium(256x256)" label="Medio (256x256)"/>
+		<combo_box.item name="Large(512x512)" label="Grande (512x512)"/>
+		<combo_box.item name="Custom" label="Personalizar"/>
 	</combo_box>
 	<combo_box label="Resolución" name="local_size_combo">
-		<combo_item name="CurrentWindow">
-			Ventana actual
-		</combo_item>
-		<combo_item name="320x240">
-			320x240
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="1280x1024">
-			1280x1024
-		</combo_item>
-		<combo_item name="1600x1200">
-			1600x1200
-		</combo_item>
-		<combo_item name="Custom">
-			Personalizar
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Ventana actual"/>
+		<combo_box.item name="320x240" label="320x240"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="1280x1024" label="1280x1024"/>
+		<combo_box.item name="1600x1200" label="1600x1200"/>
+		<combo_box.item name="Custom" label="Personalizar"/>
 	</combo_box>
 	<combo_box label="Formato" name="local_format_combo">
-		<combo_item name="PNG">
-			PNG
-		</combo_item>
-		<combo_item name="JPEG">
-			JPEG
-		</combo_item>
-		<combo_item name="BMP">
-			BMP
-		</combo_item>
+		<combo_box.item name="PNG" label="PNG"/>
+		<combo_box.item name="JPEG" label="JPEG"/>
+		<combo_box.item name="BMP" label="BMP"/>
 	</combo_box>
 	<spinner label="Ancho" name="snapshot_width"/>
 	<spinner label="Alto" name="snapshot_height"/>
@@ -112,15 +70,9 @@
 		Captura:
 	</text>
 	<combo_box label="Capas de la imagen" name="layer_types">
-		<combo_item name="Colors">
-			Colores
-		</combo_item>
-		<combo_item name="Depth">
-			Profundidad
-		</combo_item>
-		<combo_item name="ObjectMattes">
-			Bandas negras
-		</combo_item>
+		<combo_box.item name="Colors" label="Colores"/>
+		<combo_box.item name="Depth" label="Profundidad"/>
+		<combo_box.item name="ObjectMattes" label="Bandas negras"/>
 	</combo_box>
 	<check_box label="Incluir la interfaz en la foto" name="ui_check"/>
 	<check_box label="Incluir los HUD en la foto" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 0f3a3fd217..3b6bf732be 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -20,15 +20,9 @@
 		Modo de ajuste:
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_item name="World">
-			Mundo
-		</combo_item>
-		<combo_item name="Local">
-			Local
-		</combo_item>
-		<combo_item name="Reference">
-			Referencia
-		</combo_item>
+		<combo_box.item name="World" label="Mundo"/>
+		<combo_box.item name="Local" label="Local"/>
+		<combo_box.item name="Reference" label="Referencia"/>
 	</combo_box>
 	<check_box label="Estirar ambos lados" name="checkbox uniform"/>
 	<check_box label="Estirar las texturas" name="checkbox stretch textures"/>
@@ -64,15 +58,9 @@
 	<check_box label="Escarpar el terreno" name="radio noise"/>
 	<check_box label="Restablecer el terreno" name="radio revert"/>
 	<combo_box name="combobox brush size">
-		<combo_item name="Small">
-			Pequeño
-		</combo_item>
-		<combo_item name="Medium">
-			Medio
-		</combo_item>
-		<combo_item name="Large">
-			Grande
-		</combo_item>
+		<combo_box.item name="Small" label="Pequeño"/>
+		<combo_box.item name="Medium" label="Medio"/>
+		<combo_box.item name="Large" label="Grande"/>
 	</combo_box>
 	<text name="Strength:">
 		Fuerza:
@@ -155,27 +143,13 @@
 				Al pulsarlo con el botón izquierdo:
 			</text>
 			<combo_box name="clickaction">
-				<combo_item name="Touch/grab(default)">
-					Tocar/Agarrar (por defecto)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					Sentarse en el objeto
-				</combo_item>
-				<combo_item name="Buyobject">
-					Comprar el objeto
-				</combo_item>
-				<combo_item name="Payobject">
-					Pagar al objeto
-				</combo_item>
-				<combo_item name="Open">
-					Abrirlo
-				</combo_item>
-				<combo_item name="Play">
-					Ejecutar los media de la parcela
-				</combo_item>
-				<combo_item name="Opemmedia">
-					Abrir los media de la parcela
-				</combo_item>
+				<combo_box.item name="Touch/grab(default)" label="Tocar/Agarrar (por defecto)"/>
+				<combo_box.item name="Sitonobject" label="Sentarse en el objeto"/>
+				<combo_box.item name="Buyobject" label="Comprar el objeto"/>
+				<combo_box.item name="Payobject" label="Pagar al objeto"/>
+				<combo_box.item name="Open" label="Abrirlo"/>
+				<combo_box.item name="Play" label="Ejecutar los media de la parcela"/>
+				<combo_box.item name="Opemmedia" label="Abrir los media de la parcela"/>
 			</combo_box>
 			<text name="B:">
 				B:
@@ -259,56 +233,26 @@
 				Material
 			</text>
 			<combo_box name="material">
-				<combo_item name="Stone">
-					Piedra
-				</combo_item>
-				<combo_item name="Metal">
-					Metal
-				</combo_item>
-				<combo_item name="Glass">
-					Vidrio
-				</combo_item>
-				<combo_item name="Wood">
-					Madera
-				</combo_item>
-				<combo_item name="Flesh">
-					Carne
-				</combo_item>
-				<combo_item name="Plastic">
-					Plástico
-				</combo_item>
-				<combo_item name="Rubber">
-					Goma
-				</combo_item>
+				<combo_box.item name="Stone" label="Piedra"/>
+				<combo_box.item name="Metal" label="Metal"/>
+				<combo_box.item name="Glass" label="Vidrio"/>
+				<combo_box.item name="Wood" label="Madera"/>
+				<combo_box.item name="Flesh" label="Carne"/>
+				<combo_box.item name="Plastic" label="Plástico"/>
+				<combo_box.item name="Rubber" label="Goma"/>
 			</combo_box>
 			<text name="label basetype">
 				Tipo de objeto para construir
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					Caja
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilindro
-				</combo_item>
-				<combo_item name="Prism">
-					Prisma
-				</combo_item>
-				<combo_item name="Sphere">
-					Esfera
-				</combo_item>
-				<combo_item name="Torus">
-					Toroide
-				</combo_item>
-				<combo_item name="Tube">
-					Tubo
-				</combo_item>
-				<combo_item name="Ring">
-					Cono truncado
-				</combo_item>
-				<combo_item name="Sculpted">
-					Sculpted
-				</combo_item>
+				<combo_box.item name="Box" label="Caja"/>
+				<combo_box.item name="Cylinder" label="Cilindro"/>
+				<combo_box.item name="Prism" label="Prisma"/>
+				<combo_box.item name="Sphere" label="Esfera"/>
+				<combo_box.item name="Torus" label="Toroide"/>
+				<combo_box.item name="Tube" label="Tubo"/>
+				<combo_box.item name="Ring" label="Cono truncado"/>
+				<combo_box.item name="Sculpted" label="Sculpted"/>
 			</combo_box>
 			<text name="text cut">
 				Inicio y Fin del corte
@@ -325,18 +269,10 @@
 				Forma del hueco
 			</text>
 			<combo_box name="hole">
-				<combo_item name="Default">
-					Por defecto
-				</combo_item>
-				<combo_item name="Circle">
-					Círculo
-				</combo_item>
-				<combo_item name="Square">
-					Cuadrado
-				</combo_item>
-				<combo_item name="Triangle">
-					Triángulo
-				</combo_item>
+				<combo_box.item name="Default" label="Por defecto"/>
+				<combo_box.item name="Circle" label="Círculo"/>
+				<combo_box.item name="Square" label="Cuadrado"/>
+				<combo_box.item name="Triangle" label="Triángulo"/>
 			</combo_box>
 			<text name="text twist">
 				Inicio y Fin de la torsión
@@ -382,21 +318,11 @@
 				Tipo de unión
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					(ninguna)
-				</combo_item>
-				<combo_item name="Sphere">
-					Esfera
-				</combo_item>
-				<combo_item name="Torus">
-					Toroide
-				</combo_item>
-				<combo_item name="Plane">
-					Plano
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilindro
-				</combo_item>
+				<combo_box.item name="None" label="ninguna)"/>
+				<combo_box.item name="Sphere" label="Esfera"/>
+				<combo_box.item name="Torus" label="Toroide"/>
+				<combo_box.item name="Plane" label="Plano"/>
+				<combo_box.item name="Cylinder" label="Cilindro"/>
 			</combo_box>
 		</panel>
 		<panel label="Características" name="Features">
@@ -438,88 +364,40 @@
 				Detallado
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					Por defecto
-				</combo_item>
-				<combo_item name="Planar">
-					Plano
-				</combo_item>
+				<combo_box.item name="Default" label="Por defecto"/>
+				<combo_box.item name="Planar" label="Plano"/>
 			</combo_box>
 			<text name="label shininess">
 				Brillantez
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					Ninguna
-				</combo_item>
-				<combo_item name="Low">
-					Baja
-				</combo_item>
-				<combo_item name="Medium">
-					Media
-				</combo_item>
-				<combo_item name="High">
-					Alta
-				</combo_item>
+				<combo_box.item name="None" label="Ninguna"/>
+				<combo_box.item name="Low" label="Baja"/>
+				<combo_box.item name="Medium" label="Media"/>
+				<combo_box.item name="High" label="Alta"/>
 			</combo_box>
 			<text name="label bumpiness">
 				Relieve
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					Ninguno
-				</combo_item>
-				<combo_item name="Brightness">
-					Brillo
-				</combo_item>
-				<combo_item name="Darkness">
-					Oscuro
-				</combo_item>
-				<combo_item name="woodgrain">
-					grano de madera
-				</combo_item>
-				<combo_item name="bark">
-					corteza
-				</combo_item>
-				<combo_item name="bricks">
-					ladrillos
-				</combo_item>
-				<combo_item name="checker">
-					cajero
-				</combo_item>
-				<combo_item name="concrete">
-					cemento
-				</combo_item>
-				<combo_item name="crustytile">
-					azulejería
-				</combo_item>
-				<combo_item name="cutstone">
-					piedra cortada
-				</combo_item>
-				<combo_item name="discs">
-					discos
-				</combo_item>
-				<combo_item name="gravel">
-					grava
-				</combo_item>
-				<combo_item name="petridish">
-					placa de Petri
-				</combo_item>
-				<combo_item name="siding">
-					revestimiento
-				</combo_item>
-				<combo_item name="stonetile">
-					baldosa de piedra
-				</combo_item>
-				<combo_item name="stucco">
-					estuco
-				</combo_item>
-				<combo_item name="suction">
-					succión
-				</combo_item>
-				<combo_item name="weave">
-					tejido
-				</combo_item>
+				<combo_box.item name="None" label="Ninguno"/>
+				<combo_box.item name="Brightness" label="Brillo"/>
+				<combo_box.item name="Darkness" label="Oscuro"/>
+				<combo_box.item name="woodgrain" label="grano de madera"/>
+				<combo_box.item name="bark" label="corteza"/>
+				<combo_box.item name="bricks" label="ladrillos"/>
+				<combo_box.item name="checker" label="cajero"/>
+				<combo_box.item name="concrete" label="cemento"/>
+				<combo_box.item name="crustytile" label="azulejería"/>
+				<combo_box.item name="cutstone" label="piedra cortada"/>
+				<combo_box.item name="discs" label="discos"/>
+				<combo_box.item name="gravel" label="grava"/>
+				<combo_box.item name="petridish" label="placa de Petri"/>
+				<combo_box.item name="siding" label="revestimiento"/>
+				<combo_box.item name="stonetile" label="baldosa de piedra"/>
+				<combo_box.item name="stucco" label="estuco"/>
+				<combo_box.item name="suction" label="succión"/>
+				<combo_box.item name="weave" label="tejido"/>
 			</combo_box>
 			<text name="tex scale">
 				Repeticiones por cara
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index cf1af23479..9893bcfba9 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -41,14 +41,10 @@
 
 	<check_box name="event_mature_chk"/>
 	<combo_box label="Amigos conectados" name="friend combo" tool_tip="Amigo a mostrar en el mapa">
-		<combo_box.item name="none_selected">
-			Amigos conectados
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Amigos conectados" />
 	</combo_box>
 	<combo_box label="Hitos" name="landmark combo" tool_tip="Hito a mostrar en el mapa">
-		<combo_box.item name="none_selected">
-			Hitos
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Hitos" />
 	</combo_box>
 	<line_editor label="Buscar por el nombre de la región" name="location" tool_tip="Escriba el nombre de una región"/>
 	<button label="Buscar" name="DoSearch" tool_tip="Buscar una región"/>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 04edcc4faa..8c3d7ae575 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -19,15 +19,9 @@
 		Posición inicial:
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_item name="MyHome">
-			Mi Base
-		</combo_item>
-		<combo_item name="MyLastLocation">
-			Mi última posición
-		</combo_item>
-		<combo_item name="Typeregionname">
-			&lt;Escriba el nombre de la Región&gt;
-		</combo_item>
+		<combo_box.item name="MyHome" label="Mi Base"/>
+		<combo_box.item name="MyLastLocation" label="Mi última posición"/>
+		<combo_box.item name="Typeregionname" label="lt;Escriba el nombre de la Región&gt;"/>
 	</combo_box>
 	<check_box label="Recordar la contraseña" name="remember_check"/>
 	<button label="Iniciar sesión" label_selected="Iniciar sesión" name="connect_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 173da17f98..62a2959e13 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -10,15 +10,9 @@
 	</radio_group>
 	<check_box label="Ver mi posición inicial en la pantalla de inicio de sesión" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox" width="166">
-		<combo_item name="Never">
-			Nunca
-		</combo_item>
-		<combo_item name="Show Temporarily">
-			Mostrarlos temporalmente
-		</combo_item>
-		<combo_item name="Always">
-			Siempre
-		</combo_item>
+		<combo_box.item name="Never" label="Nunca"/>
+		<combo_box.item name="Show Temporarily" label="Mostrarlos temporalmente"/>
+		<combo_box.item name="Always" label="Siempre"/>
 	</combo_box>
 	<check_box label="Nombres de avatar en pequeño" name="small_avatar_names_checkbox"/>
 	<check_box label="No ver mi nombre en mi pantalla" name="show_my_name_checkbox"/>
@@ -62,53 +56,23 @@
 		&lt;escriba el nombre de la región&gt;
 	</string>
 	<combo_box name="crash_behavior_combobox" width="166">
-		<combo_item length="1" name="Askbeforesending" type="string">
-			Preguntar antes de enviar
-		</combo_item>
-		<combo_item length="1" name="Alwayssend" type="string">
-			Enviar siempre
-		</combo_item>
-		<combo_item length="1" name="Neversend" type="string">
-			No enviar nunca
-		</combo_item>
+		<combo_box.item length="1" name="Askbeforesending" type="string" label="Preguntar antes de enviar"/>
+		<combo_box.item length="1" name="Alwayssend" type="string" label="Enviar siempre"/>
+		<combo_box.item length="1" name="Neversend" type="string" label="No enviar nunca"/>
 	</combo_box>
 	<combo_box name="language_combobox" width="166">
-		<combo_item name="System Default Language">
-			Predeterminado del sistema
-		</combo_item>
-		<combo_item length="1" name="English" type="string">
-			English (Inglés)
-		</combo_item>
-		<combo_item name="Danish">
-			Dansk (Danés) - Beta
-		</combo_item>
-		<combo_item length="1" name="Deutsch(German)" type="string">
-			Deutsch (Alemán) - Beta
-		</combo_item>
-		<combo_item name="Spanish" type="string">
-			Español - Beta
-		</combo_item>
-		<combo_item length="1" name="French" type="string">
-			Français (Francés) - Beta
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (Húngaro) - Beta
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (Polaco) - Beta
-		</combo_item>
-		<combo_item name="Portugese">
-			Portugués (Portugués) - Beta
-		</combo_item>
-		<combo_item length="1" name="Chinese" type="string">
-			中文 (简体) (Chino) - Beta
-		</combo_item>
-		<combo_item length="1" name="(Japanese)" type="string">
-			日本語 (Japonés) - Beta
-		</combo_item>
-		<combo_item length="1" name="(Korean)" type="string">
-			한국어 (Coreano) - Beta
-		</combo_item>
+		<combo_box.item name="System Default Language" label="Predeterminado del sistema"/>
+		<combo_box.item length="1" name="English" type="string" label="English (Inglés)"/>
+		<combo_box.item name="Danish" label="Dansk (Danés) - Beta"/>
+		<combo_box.item length="1" name="Deutsch(German)" type="string" label="Deutsch (Alemán) - Beta"/>
+		<combo_box.item name="Spanish" type="string" label="Español - Beta"/>
+		<combo_box.item length="1" name="French" type="string" label="Français (Francés) - Beta"/>
+		<combo_box.item name="Hungarian" label="Magyar (Húngaro) - Beta"/>
+		<combo_box.item name="Polish" label="Polski (Polaco) - Beta"/>
+		<combo_box.item name="Portugese" label="Portugués (Portugués) - Beta"/>
+		<combo_box.item length="1" name="Chinese" type="string" label="中文 (简体) (Chino) - Beta"/>
+		<combo_box.item length="1" name="(Japanese)" type="string" label="日本語 (Japonés) - Beta"/>
+		<combo_box.item length="1" name="(Korean)" type="string" label="한국어 (Coreano) - Beta"/>
 	</combo_box>
 	<check_box label="Compartir el idioma con los objetos" name="language_is_public" tool_tip="Hace que los objetos con script del mundo sepan su idioma preferido."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 03eb802117..3965df3697 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -9,21 +9,11 @@
 		Tamaño de la ventana:
 	</text>
 	<combo_box name="windowsize combo">
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="720x480">
-			720x480 (NTSC)
-		</combo_item>
-		<combo_item name="768x576">
-			768x576 (PAL)
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="720x480" label="720x480 (NTSC)"/>
+		<combo_box.item name="768x576" label="768x576 (PAL)"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
 	</combo_box>
 	<text name="DisplayResLabel">
 		Resolución:
@@ -32,18 +22,10 @@
 		Proporción:
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="ancho / alto">
-		<combo_item length="1" name="4:3(StandardCRT)" type="string">
-			4:3 (Standard CRT)
-		</combo_item>
-		<combo_item length="1" name="5:4(1280x1024LCD)" type="string">
-			5:4 (1280x1024 LCD)
-		</combo_item>
-		<combo_item name="8:5(Widescreen)">
-			8:5 (Widescreen)
-		</combo_item>
-		<combo_item length="1" name="16:9(Widescreen)" type="string">
-			16:9 (Widescreen)
-		</combo_item>
+		<combo_box.item length="1" name="4:3(StandardCRT)" type="string" label="4:3 (Standard CRT)"/>
+		<combo_box.item length="1" name="5:4(1280x1024LCD)" type="string" label="5:4 (1280x1024 LCD)"/>
+		<combo_box.item name="8:5(Widescreen)" label="8:5 (Widescreen)"/>
+		<combo_box.item length="1" name="16:9(Widescreen)" type="string" label="16:9 (Widescreen)"/>
 	</combo_box>
 	<check_box label="Detectar automáticamente la proporción" name="aspect_auto_detect"/>
 	<text name="HigherText">
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 8212db046f..d48a4ae22a 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -260,44 +260,20 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 				name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
 			<check_box label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche" bottom="-160"/>
 			<combo_box name="land category" left="286" width="146" bottom="-160">
-				<combo_item name="AnyCategory">
-					Toutes catégories
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Appartenant aux Lindens
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="Toutes catégories"/>
+				<combo_box.item name="LindenLocation" label="Appartenant aux Lindens"/>
 
 
-				<combo_item name="Arts&amp;Culture">
-					Art et Culture
-				</combo_item>
-				<combo_item name="Business">
-					Affaires
-				</combo_item>
-				<combo_item name="Educational">
-					Éducation
-				</combo_item>
-				<combo_item name="Gaming">
-					Jeux
-				</combo_item>
-				<combo_item name="Hangout">
-					Favoris
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Accueil pour les nouveaux
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parcs et Nature
-				</combo_item>
-				<combo_item name="Residential">
-					Résidentiel
-				</combo_item>
-				<combo_item name="Shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other">
-					Autre
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="Art et Culture"/>
+				<combo_box.item name="Business" label="Affaires"/>
+				<combo_box.item name="Educational" label="Éducation"/>
+				<combo_box.item name="Gaming" label="Jeux"/>
+				<combo_box.item name="Hangout" label="Favoris"/>
+				<combo_box.item name="NewcomerFriendly" label="Accueil pour les nouveaux"/>
+				<combo_box.item name="Parks&amp;Nature" label="Parcs et Nature"/>
+				<combo_box.item name="Residential" label="Résidentiel"/>
+				<combo_box.item name="Shopping" label="Shopping"/>
+				<combo_box.item name="Other" label="Autre"/>
 			</combo_box>
 			<button label="?" label_selected="?" name="?" left="436" bottom="-160"/>
 			<check_box name="MatureCheck" bottom="-180"/>
@@ -317,15 +293,9 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 				Règles de téléportation :
 			</text>
 			<combo_box name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain." left="140" width="140" bottom="-343">
-				<combo_item length="1" name="Blocked" type="string">
-					Bloqué
-				</combo_item>
-				<combo_item length="1" name="LandingPoint" type="string">
-					Lieu d&apos;arrivée fixe
-				</combo_item>
-				<combo_item length="1" name="Anywhere" type="string">
-					Lieu d&apos;arrivée libre
-				</combo_item>
+				<combo_box.item length="1" name="Blocked" type="string" label="Bloqué"/>
+				<combo_box.item length="1" name="LandingPoint" type="string" label="Lieu d&apos;arrivée fixe"/>
+				<combo_box.item length="1" name="Anywhere" type="string" label="Lieu d&apos;arrivée libre"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				Pas de bousculades
@@ -414,12 +384,8 @@ musique :
 			<check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
 			<check_box label="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					Tout le monde
-				</combo_item>
-				<combo_item name="Group">
-					Groupe
-				</combo_item>
+				<combo_box.item name="Anyone" label="Tout le monde"/>
+				<combo_box.item name="Group" label="Groupe"/>
 			</combo_box>
 			<spinner label="Prix en L$ :" name="PriceSpin"/>
 			<spinner label="Durée en heures :" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index a1c3ef35b3..af6cb41ba8 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -11,18 +11,10 @@
 		Prévisualiser pendant
 	</text>
 	<combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales." left_delta="116" width="124">
-		<combo_box.item name="Standing">
-			Debout
-		</combo_box.item>
-		<combo_box.item name="Walking">
-			En train de marcher
-		</combo_box.item>
-		<combo_box.item name="Sitting">
-			Assis
-		</combo_box.item>
-		<combo_box.item name="Flying">
-			En train de voler
-		</combo_box.item>
+		<combo_box.item name="Standing" label="Debout" />
+		<combo_box.item name="Walking" label="En train de marcher" />
+		<combo_box.item name="Sitting" label="Assis" />
+		<combo_box.item name="Flying" label="En train de voler" />
 	</combo_box>
 	<check_box  left="6" label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle."/>
 	<spinner left="76" label_width="55" width="105" label="Début (%)" name="loop_in_point" tool_tip="Définit le moment de l&apos;animation où la boucle repart."/>
@@ -31,110 +23,44 @@
 		Mouvement de main
 	</text>
 	<combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l&apos;animation" left_delta="116" width="124">
-		<combo_box.item name="Spread">
-			Doigts écartés
-		</combo_box.item>
-		<combo_box.item name="Relaxed">
-			Détendues
-		</combo_box.item>
-		<combo_box.item name="PointBoth">
-			Pointer (les deux)
-		</combo_box.item>
-		<combo_box.item name="Fist">
-			Poing
-		</combo_box.item>
-		<combo_box.item name="RelaxedLeft">
-			Détendue (gauche)
-		</combo_box.item>
-		<combo_box.item name="PointLeft">
-			Pointer (gauche)
-		</combo_box.item>
-		<combo_box.item name="FistLeft">
-			Poing (gauche)
-		</combo_box.item>
-		<combo_box.item name="RelaxedRight">
-			Détendue (droite)
-		</combo_box.item>
-		<combo_box.item name="PointRight">
-			Pointer (droite)
-		</combo_box.item>
-		<combo_box.item name="FistRight">
-			Poing (droite)
-		</combo_box.item>
-		<combo_box.item name="SaluteRight">
-			Saluer (droite)
-		</combo_box.item>
-		<combo_box.item name="Typing">
-			Taper
-		</combo_box.item>
-		<combo_box.item name="PeaceRight">
-			Paix (main droite)
-		</combo_box.item>
+		<combo_box.item name="Spread" label="Doigts écartés" />
+		<combo_box.item name="Relaxed" label="Détendues" />
+		<combo_box.item name="PointBoth" label="Pointer (les deux)" />
+		<combo_box.item name="Fist" label="Poing" />
+		<combo_box.item name="RelaxedLeft" label="Détendue (gauche)" />
+		<combo_box.item name="PointLeft" label="Pointer (gauche)" />
+		<combo_box.item name="FistLeft" label="Poing (gauche)" />
+		<combo_box.item name="RelaxedRight" label="Détendue (droite)" />
+		<combo_box.item name="PointRight" label="Pointer (droite)" />
+		<combo_box.item name="FistRight" label="Poing (droite)" />
+		<combo_box.item name="SaluteRight" label="Saluer (droite)" />
+		<combo_box.item name="Typing" label="Taper" />
+		<combo_box.item name="PeaceRight" label="Paix (main droite)" />
 	</combo_box>
 	<text name="emote_label">
 		Expression
 	</text>
 	<combo_box label="" name="emote_combo" tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation." left_delta="116" width="124">
-		<combo_box.item name="[None]">
-			[None]
-		</combo_box.item>
-		<combo_box.item name="Aaaaah">
-			Aaaaah
-		</combo_box.item>
-		<combo_box.item name="Afraid">
-			Effrayé
-		</combo_box.item>
-		<combo_box.item name="Angry">
-			En colère
-		</combo_box.item>
-		<combo_box.item name="BigSmile">
-			Grand sourire
-		</combo_box.item>
-		<combo_box.item name="Bored">
-			Ennui
-		</combo_box.item>
-		<combo_box.item name="Cry">
-			Pleurer
-		</combo_box.item>
-		<combo_box.item name="Disdain">
-			Mépris
-		</combo_box.item>
-		<combo_box.item name="Embarrassed">
-			Gêne
-		</combo_box.item>
-		<combo_box.item name="Frown">
-			Froncer les sourcils
-		</combo_box.item>
-		<combo_box.item name="Kiss">
-			Embrasser
-		</combo_box.item>
-		<combo_box.item name="Laugh">
-			Rire
-		</combo_box.item>
-		<combo_box.item name="Plllppt">
-			Plllppt
-		</combo_box.item>
-		<combo_box.item name="Repulsed">
-			Dégoût
-		</combo_box.item>
-		<combo_box.item name="Sad">
-			Triste
-		</combo_box.item>
-		<combo_box.item name="Shrug">
-			Hausser les épaules
-		</combo_box.item>
-		<combo_box.item name="Smile">
-			Sourire
-		</combo_box.item>
-		<combo_box.item name="Surprise">
-			Surprise
-		</combo_box.item>
-		<combo_box.item name="Wink">
-			Clin d&apos;œil
-		</combo_box.item>
-		<combo_box.item name="Worry">
-			Soucis
-		</combo_box.item>
+		<combo_box.item name="[None]" label="None]" />
+		<combo_box.item name="Aaaaah" label="Aaaaah" />
+		<combo_box.item name="Afraid" label="Effrayé" />
+		<combo_box.item name="Angry" label="En colère" />
+		<combo_box.item name="BigSmile" label="Grand sourire" />
+		<combo_box.item name="Bored" label="Ennui" />
+		<combo_box.item name="Cry" label="Pleurer" />
+		<combo_box.item name="Disdain" label="Mépris" />
+		<combo_box.item name="Embarrassed" label="Gêne" />
+		<combo_box.item name="Frown" label="Froncer les sourcils" />
+		<combo_box.item name="Kiss" label="Embrasser" />
+		<combo_box.item name="Laugh" label="Rire" />
+		<combo_box.item name="Plllppt" label="Plllppt" />
+		<combo_box.item name="Repulsed" label="Dégoût" />
+		<combo_box.item name="Sad" label="Triste" />
+		<combo_box.item name="Shrug" label="Hausser les épaules" />
+		<combo_box.item name="Smile" label="Sourire" />
+		<combo_box.item name="Surprise" label="Surprise" />
+		<combo_box.item name="Wink" label="Clin d&apos;œil" />
+		<combo_box.item name="Worry" label="Soucis" />
 	</combo_box>
 	<spinner label_width="65" label="Transition &#10;début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement."/>
 	<spinner label_width="65" left="160" width="125" label="Transition &#10;fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement."/>
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
index 90e70c6094..4bdf9df1be 100644
--- a/indra/newview/skins/default/xui/fr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/fr/floater_auction.xml
@@ -2,12 +2,8 @@
 <floater name="floater_auction" title="Commencer la vente de terrain Linden">
 	<check_box label="Inclure le marquage de sélection jaune" name="fence_check" />
 	<combo_box name="saletype_combo">
-		<combo_box.item name="Auction">
-			Enchères
-		</combo_box.item>
-		<combo_box.item name="FirstLand">
-			Premier terrain
-		</combo_box.item>
+		<combo_box.item name="Auction" label="Enchères" />
+		<combo_box.item name="FirstLand" label="Premier terrain" />
 	</combo_box>
 	<button label="Capture d&apos;écran" label_selected="Capture d&apos;écran"
 	     name="snapshot_btn" width="110" />
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 935df46f14..4741fadc62 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -68,15 +68,9 @@
 		Seuls les membres Premium peuvent posséder du terrain.
 	</text>
 	<combo_box name="account_level">
-		<combo_item name="US$9.95/month,billedmonthly">
-			9,95 US$/mois, facturation mensuelle
-		</combo_item>
-		<combo_item name="US$7.50/month,billedquarterly">
-			7,50 US$/mois, facturation trimestrielle
-		</combo_item>
-		<combo_item name="US$6.00/month,billedannually">
-			6,00 US$/mois, facturation annuelle
-		</combo_item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="9,95 US$/mois, facturation mensuelle"/>
+		<combo_box.item name="US$7.50/month,billedquarterly" label="7,50 US$/mois, facturation trimestrielle"/>
+		<combo_box.item name="US$6.00/month,billedannually" label="6,00 US$/mois, facturation annuelle"/>
 	</combo_box>
 	<text name="land_use_action" right="430" width="210">
 		Augmentez vos frais d&apos;occupation de terrain à 40 US$/mois.
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index ab8b061cd3..5799e1a757 100644
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -78,29 +78,17 @@
 				Destination :
 			</text>
 			<combo_box name="destination">
-				<combo_box.item name="Selection">
-					Sélection
-				</combo_box.item>
-				<combo_box.item name="AgentRegion">
-					Région de l&apos;avatar
-				</combo_box.item>
+				<combo_box.item name="Selection" label="Sélection" />
+				<combo_box.item name="AgentRegion" label="Région de l&apos;avatar" />
 			</combo_box>
 			<text name="Request:">
 				Requête :
 			</text>
 			<combo_box name="request">
-				<combo_box.item name="colliders&lt;steps&gt;">
-					Objets responsables de collisions : étapes
-				</combo_box.item>
-				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-					Nombre de scripts et schéma optionnel
-				</combo_box.item>
-				<combo_box.item name="objects&lt;pattern&gt;">
-					Schéma des objets
-				</combo_box.item>
-				<combo_box.item name="rez&lt;asset_id&gt;">
-					rezzer &lt;asset_id&gt;
-				</combo_box.item>
+				<combo_box.item name="colliders&lt;steps&gt;" label="Objets responsables de collisions : étapes" />
+				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="Nombre de scripts et schéma optionnel" />
+				<combo_box.item name="objects&lt;pattern&gt;" label="Schéma des objets" />
+				<combo_box.item name="rez&lt;asset_id&gt;" label="rezzer &lt;asset_id&gt;" />
 			</combo_box>
 			<text name="Parameter:">
 				Paramètre :
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index eb632bc9a8..11d7fc28e9 100644
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -8,21 +8,11 @@
 		Anti-aliasing :
 	</text>
 	<combo_box label="Anti-aliasing" name="fsaa" width="84">
-		<combo_box.item name="FSAADisabled">
-			Désactivé
-		</combo_box.item>
-		<combo_box.item name="2x">
-			2x
-		</combo_box.item>
-		<combo_box.item name="4x">
-			4x
-		</combo_box.item>
-		<combo_box.item name="8x">
-			8x
-		</combo_box.item>
-		<combo_box.item name="16x">
-			16x
-		</combo_box.item>
+		<combo_box.item name="FSAADisabled" label="Désactivé" />
+		<combo_box.item name="2x" label="2x" />
+		<combo_box.item name="4x" label="4x" />
+		<combo_box.item name="8x" label="8x" />
+		<combo_box.item name="16x" label="16x" />
 	</combo_box>
 	<spinner label="Gamma :" name="gamma"/>
 	<text left="217" name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index 3af7dc9113..f12c1fee44 100644
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		Prévisualiser comme :
 	</text>
 	<combo_box label="Habits" name="clothing_type_combo" left="126" >
-		<combo_box.item name="Image">
-			Image
-		</combo_box.item>
-		<combo_box.item name="Hair">
-			Cheveux
-		</combo_box.item>
-		<combo_box.item name="FemaleHead">
-			Tête de femme
-		</combo_box.item>
-		<combo_box.item name="FemaleUpperBody">
-			Corps de femme (haut)
-		</combo_box.item>
-		<combo_box.item name="FemaleLowerBody">
-			Corps de femme (bas)
-		</combo_box.item>
-		<combo_box.item name="MaleHead">
-			Tête d&apos;homme
-		</combo_box.item>
-		<combo_box.item name="MaleUpperBody">
-			Corps d&apos;homme (haut)
-		</combo_box.item>
-		<combo_box.item name="MaleLowerBody">
-			Corps d&apos;homme (bas)
-		</combo_box.item>
-		<combo_box.item name="Skirt">
-			Jupe
-		</combo_box.item>
-		<combo_box.item name="SculptedPrim">
-			Sculptie
-		</combo_box.item>
+		<combo_box.item name="Image" label="Image" />
+		<combo_box.item name="Hair" label="Cheveux" />
+		<combo_box.item name="FemaleHead" label="Tête de femme" />
+		<combo_box.item name="FemaleUpperBody" label="Corps de femme (haut)" />
+		<combo_box.item name="FemaleLowerBody" label="Corps de femme (bas)" />
+		<combo_box.item name="MaleHead" label="Tête d&apos;homme" />
+		<combo_box.item name="MaleUpperBody" label="Corps d&apos;homme (haut)" />
+		<combo_box.item name="MaleLowerBody" label="Corps d&apos;homme (bas)" />
+		<combo_box.item name="Skirt" label="Jupe" />
+		<combo_box.item name="SculptedPrim" label="Sculptie" />
 	</combo_box>
 	<text name="bad_image_text">
 		Impossible de lire l&apos;image.
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 3946219458..0fce7a15cc 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -37,123 +37,51 @@
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
-		<combo_item name="Select_category">
-			Sélectionnez une catégorie
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Âge &gt; « Age play »
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Âge &gt; Résident adulte sur Second Life pour adolescents
-		</combo_item>
+		<combo_box.item name="Select_category" label="Sélectionnez une catégorie"/>
+		<combo_box.item name="Age__Age_play" label="Âge &gt; « Age play »"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Âge &gt; Résident adulte sur Second Life pour adolescents"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Assaut &gt; Bac à sable utilisé pour des combats/zone non sécurisée
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Assaut &gt; Zone sécurisée
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Assaut &gt; Bac à sable pour tests d&apos;armes à feu
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Commerce &gt; Incapacité à fournir un produit ou service
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Divulgation &gt; Informations sur la vie réelle
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Divulgation &gt; Écoute d&apos;un chat à distance
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Divulgation &gt; Informations sur Second Life/chat/IM
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Trouble de la paix &gt; Utilisation inadéquate des ressources de la région
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Trouble de la paix &gt; Nombre d&apos;objets scriptés excessif
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Trouble de la paix &gt; Abandon d&apos;objets
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Trouble de la paix &gt; Spam à répétition
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Trouble de la paix &gt; Spam à caractère commercial
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Fraude &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Fraude &gt; Terrain
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Fraude &gt; Vente pyramidale ou lettre-chaîne
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Fraude &gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Harcèlement &gt; Spam visuel
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Harcèlement &gt; Diffamation envers des individus ou des groupes
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Harcèlement &gt; Immobilisation
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Harcèlement &gt;  Harcèlement sexuel
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Harcèlement &gt; Incitation à enfreindre les Conditions d&apos;utilisation
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Harcèlement &gt; Abus verbal
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Indécence &gt; Contenu ou comportement offensifs
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Assaut &gt; Bac à sable utilisé pour des combats/zone non sécurisée"/>
+		<combo_box.item name="Assault__Safe_area" label="Assaut &gt; Zone sécurisée"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Assaut &gt; Bac à sable pour tests d&apos;armes à feu"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Commerce &gt; Incapacité à fournir un produit ou service"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Divulgation &gt; Informations sur la vie réelle"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Divulgation &gt; Écoute d&apos;un chat à distance"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Divulgation &gt; Informations sur Second Life/chat/IM"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Trouble de la paix &gt; Utilisation inadéquate des ressources de la région"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Trouble de la paix &gt; Nombre d&apos;objets scriptés excessif"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Trouble de la paix &gt; Abandon d&apos;objets"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Trouble de la paix &gt; Spam à répétition"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Trouble de la paix &gt; Spam à caractère commercial"/>
+		<combo_box.item name="Fraud__L$" label="Fraude &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Fraude &gt; Terrain"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Fraude &gt; Vente pyramidale ou lettre-chaîne"/>
+		<combo_box.item name="Fraud__US$" label="Fraude &gt; US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Harcèlement &gt; Spam visuel"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Harcèlement &gt; Diffamation envers des individus ou des groupes"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Harcèlement &gt; Immobilisation"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Harcèlement &gt;  Harcèlement sexuel"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Harcèlement &gt; Incitation à enfreindre les Conditions d&apos;utilisation"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Harcèlement &gt; Abus verbal"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Indécence &gt; Contenu ou comportement offensifs"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Indécence &gt; Nom d&apos;avatar inapproprié
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Indécence &gt; Nom d&apos;avatar inapproprié"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Violation de droits de propriété intellectuelle &gt; Suppression de contenu
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Violation de droits de propriété intellectuelle &gt; CopyBot ou exploitation abusive des permissions
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intolérance
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Terrain &gt; Utilisation abusive des ressources du bac à sable
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Terrain &gt; Empiètement &gt; Objets/textures
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Terrain &gt; Empiètement &gt; Particules
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Terrain &gt; Empiètement &gt; Arbres/plantes
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Paris/jeux d&apos;argent
-		</combo_item>
-		<combo_item name="Other">
-			Autre
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Violation de droits de propriété intellectuelle &gt; Suppression de contenu"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Violation de droits de propriété intellectuelle &gt; CopyBot ou exploitation abusive des permissions"/>
+		<combo_box.item name="Intolerance" label="Intolérance"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Terrain &gt; Utilisation abusive des ressources du bac à sable"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Terrain &gt; Empiètement &gt; Objets/textures"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Terrain &gt; Empiètement &gt; Particules"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Terrain &gt; Empiètement &gt; Arbres/plantes"/>
+		<combo_box.item name="Wagering_gambling" label="Paris/jeux d&apos;argent"/>
+		<combo_box.item name="Other" label="Autre"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Nom du contrevenant :
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index 6c5044da5a..186a278671 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -37,15 +37,9 @@ parcelle :
 spécifique.
 	</text>
 	<combo_box name="sell_to" bottom_delta="-32">
-		<combo_box.item name="--selectone--">
-			-- Sélectionnez --
-		</combo_box.item>
-		<combo_box.item name="Anyone">
-			N&apos;importe qui
-		</combo_box.item>
-		<combo_box.item name="Specificuser:">
-			Acheteur spécifique :
-		</combo_box.item>
+		<combo_box.item name="--selectone--" label="Sélectionnez --" />
+		<combo_box.item name="Anyone" label="N&apos;importe qui" />
+		<combo_box.item name="Specificuser:" label="Acheteur spécifique :" />
 	</combo_box>
 	<button label="Sélectionner..." name="sell_to_select_agent" width="100"/>
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index 18cf2d7e55..e67b8e2f79 100644
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="settings_debug" title="Paramétrages du mode Debug">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE">
-			TRUE
-		</combo_box.item>
-		<combo_box.item name="FALSE">
-			FALSE
-		</combo_box.item>
+		<combo_box.item name="TRUE" label="TRUE" />
+		<combo_box.item name="FALSE" label="FALSE" />
 	</combo_box>
 	<color_swatch label="Couleur" name="color_swatch" width="43" />
 	<spinner label="x" name="val_spinner_1" />
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 63ed77c8b5..e6f9c27e97 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -23,75 +23,33 @@
 		Format
 	</text>
 	<combo_box label="Résolution" name="postcard_size_combo">
-		<combo_box.item name="640x480">
-			640 x 480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800 x 600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024 x 768
-		</combo_box.item>
-		<combo_box.item name="CurrentWindow">
-			Fenêtre actuelle
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Personnaliser
-		</combo_box.item>
+		<combo_box.item name="640x480" label="640 x 480" />
+		<combo_box.item name="800x600" label="800 x 600" />
+		<combo_box.item name="1024x768" label="1024 x 768" />
+		<combo_box.item name="CurrentWindow" label="Fenêtre actuelle" />
+		<combo_box.item name="Custom" label="Personnaliser" />
 	</combo_box>
 	<combo_box label="Résolution" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Fenêtre actuelle
-		</combo_box.item>
-		<combo_box.item name="Small(128x128)">
-			Petite (128 x 128)
-		</combo_box.item>
-		<combo_box.item name="Medium(256x256)">
-			Moyenne (256 x 256)
-		</combo_box.item>
-		<combo_box.item name="Large(512x512)">
-			Grande (512 x 512)
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Personnaliser
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Fenêtre actuelle" />
+		<combo_box.item name="Small(128x128)" label="Petite (128 x 128)" />
+		<combo_box.item name="Medium(256x256)" label="Moyenne (256 x 256)" />
+		<combo_box.item name="Large(512x512)" label="Grande (512 x 512)" />
+		<combo_box.item name="Custom" label="Personnaliser" />
 	</combo_box>
 	<combo_box label="Résolution" name="local_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Fenêtre actuelle
-		</combo_box.item>
-		<combo_box.item name="320x240">
-			320 x 240
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640 x 480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800 x 600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024 x 768
-		</combo_box.item>
-		<combo_box.item name="1280x1024">
-			1280 x 1024
-		</combo_box.item>
-		<combo_box.item name="1600x1200">
-			1600 x 1200
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Personnaliser
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Fenêtre actuelle" />
+		<combo_box.item name="320x240" label="320 x 240" />
+		<combo_box.item name="640x480" label="640 x 480" />
+		<combo_box.item name="800x600" label="800 x 600" />
+		<combo_box.item name="1024x768" label="1024 x 768" />
+		<combo_box.item name="1280x1024" label="1280 x 1024" />
+		<combo_box.item name="1600x1200" label="1600 x 1200" />
+		<combo_box.item name="Custom" label="Personnaliser" />
 	</combo_box>
 	<combo_box label="Format" name="local_format_combo">
-		<combo_box.item name="PNG">
-			PNG
-		</combo_box.item>
-		<combo_box.item name="JPEG">
-			JPEG
-		</combo_box.item>
-		<combo_box.item name="BMP">
-			BMP
-		</combo_box.item>
+		<combo_box.item name="PNG" label="PNG" />
+		<combo_box.item name="JPEG" label="JPEG" />
+		<combo_box.item name="BMP" label="BMP" />
 	</combo_box>
 	<spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
 	<spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
@@ -100,15 +58,9 @@
 		Capturer :
 	</text>
 	<combo_box label="Couches de l&apos;image" name="layer_types">
-		<combo_box.item name="Colors">
-			Couleurs
-		</combo_box.item>
-		<combo_box.item name="Depth">
-			Profondeur
-		</combo_box.item>
-		<combo_box.item name="ObjectMattes">
-			Matte des objets
-		</combo_box.item>
+		<combo_box.item name="Colors" label="Couleurs" />
+		<combo_box.item name="Depth" label="Profondeur" />
+		<combo_box.item name="ObjectMattes" label="Matte des objets" />
 	</combo_box>
 	<text name="file_size_label">
 		Taille du fichier : [SIZE] Ko
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index fed4a789ce..a9b7e79ba6 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -20,15 +20,9 @@
 		Axe :
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_item name="World">
-			Monde
-		</combo_item>
-		<combo_item name="Local">
-			Local
-		</combo_item>
-		<combo_item name="Reference">
-			Référence
-		</combo_item>
+		<combo_box.item name="World" label="Monde"/>
+		<combo_box.item name="Local" label="Local"/>
+		<combo_box.item name="Reference" label="Référence"/>
 	</combo_box>
 	<check_box label="Étirer les deux côtés" name="checkbox uniform"/>
 	<check_box label="Étirer les textures" name="checkbox stretch textures"/>
@@ -151,27 +145,13 @@
 				Action du clic-gauche :
 			</text>
 			<combo_box name="clickaction" width="178">
-				<combo_item name="Touch/grab(default)">
-					Toucher/attraper (défaut)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					S&apos;asseoir sur l&apos;objet
-				</combo_item>
-				<combo_item name="Buyobject">
-					Acheter l&apos;objet
-				</combo_item>
-				<combo_item name="Payobject">
-					Payer l&apos;objet
-				</combo_item>
-				<combo_item name="Open">
-					Ouvrir
-				</combo_item>
-				<combo_item name="Play">
-					Jouer le média de la parcelle
-				</combo_item>
-				<combo_item name="Opemmedia">
-					Ouvrir le média de la parcelle
-				</combo_item>
+				<combo_box.item name="Touch/grab(default)" label="Toucher/attraper (défaut)"/>
+				<combo_box.item name="Sitonobject" label="S&apos;asseoir sur l&apos;objet"/>
+				<combo_box.item name="Buyobject" label="Acheter l&apos;objet"/>
+				<combo_box.item name="Payobject" label="Payer l&apos;objet"/>
+				<combo_box.item name="Open" label="Ouvrir"/>
+				<combo_box.item name="Play" label="Jouer le média de la parcelle"/>
+				<combo_box.item name="Opemmedia" label="Ouvrir le média de la parcelle"/>
 			</combo_box>
 			<text name="B:">
 				B :
@@ -255,56 +235,26 @@
 				Matériau
 			</text>
 			<combo_box name="material">
-				<combo_item name="Stone">
-					Pierre
-				</combo_item>
-				<combo_item name="Metal">
-					Métal
-				</combo_item>
-				<combo_item name="Glass">
-					Verre
-				</combo_item>
-				<combo_item name="Wood">
-					Bois
-				</combo_item>
-				<combo_item name="Flesh">
-					Chair
-				</combo_item>
-				<combo_item name="Plastic">
-					Plastique
-				</combo_item>
-				<combo_item name="Rubber">
-					Caoutchouc
-				</combo_item>
+				<combo_box.item name="Stone" label="Pierre"/>
+				<combo_box.item name="Metal" label="Métal"/>
+				<combo_box.item name="Glass" label="Verre"/>
+				<combo_box.item name="Wood" label="Bois"/>
+				<combo_box.item name="Flesh" label="Chair"/>
+				<combo_box.item name="Plastic" label="Plastique"/>
+				<combo_box.item name="Rubber" label="Caoutchouc"/>
 			</combo_box>
 			<text name="label basetype">
 				Type de construction
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					Boîte
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cylindre
-				</combo_item>
-				<combo_item name="Prism">
-					Prisme
-				</combo_item>
-				<combo_item name="Sphere">
-					Sphère
-				</combo_item>
-				<combo_item name="Torus">
-					Tore
-				</combo_item>
-				<combo_item name="Tube">
-					Tube
-				</combo_item>
-				<combo_item name="Ring">
-					Anneau
-				</combo_item>
-				<combo_item name="Sculpted">
-					Sculptie
-				</combo_item>
+				<combo_box.item name="Box" label="Boîte"/>
+				<combo_box.item name="Cylinder" label="Cylindre"/>
+				<combo_box.item name="Prism" label="Prisme"/>
+				<combo_box.item name="Sphere" label="Sphère"/>
+				<combo_box.item name="Torus" label="Tore"/>
+				<combo_box.item name="Tube" label="Tube"/>
+				<combo_box.item name="Ring" label="Anneau"/>
+				<combo_box.item name="Sculpted" label="Sculptie"/>
 			</combo_box>
 			<text name="text cut">
 				Début et fin de découpe du tracé
@@ -321,18 +271,10 @@
 				Forme du creux
 			</text>
 			<combo_box name="hole">
-				<combo_item name="Default">
-					Défaut
-				</combo_item>
-				<combo_item name="Circle">
-					Cercle
-				</combo_item>
-				<combo_item name="Square">
-					Carré
-				</combo_item>
-				<combo_item name="Triangle">
-					Triangle
-				</combo_item>
+				<combo_box.item name="Default" label="Défaut"/>
+				<combo_box.item name="Circle" label="Cercle"/>
+				<combo_box.item name="Square" label="Carré"/>
+				<combo_box.item name="Triangle" label="Triangle"/>
 			</combo_box>
 			<text name="text twist">
 				Début et fin de vrille
@@ -381,21 +323,11 @@
 				Type de raccord
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					(aucun)
-				</combo_item>
-				<combo_item name="Sphere">
-					Sphère
-				</combo_item>
-				<combo_item name="Torus">
-					Tore
-				</combo_item>
-				<combo_item name="Plane">
-					Plan
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cylindre
-				</combo_item>
+				<combo_box.item name="None" label="aucun)"/>
+				<combo_box.item name="Sphere" label="Sphère"/>
+				<combo_box.item name="Torus" label="Tore"/>
+				<combo_box.item name="Plane" label="Plan"/>
+				<combo_box.item name="Cylinder" label="Cylindre"/>
 			</combo_box>
 		</panel>
 		<panel label="Attributs" name="Features">
@@ -437,88 +369,40 @@
 				Application
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					Défaut
-				</combo_item>
-				<combo_item name="Planar">
-					Planar
-				</combo_item>
+				<combo_box.item name="Default" label="Défaut"/>
+				<combo_box.item name="Planar" label="Planar"/>
 			</combo_box>
 			<text name="label shininess">
 				Brillance
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					Aucune
-				</combo_item>
-				<combo_item name="Low">
-					Faible
-				</combo_item>
-				<combo_item name="Medium">
-					Moyenne
-				</combo_item>
-				<combo_item name="High">
-					Élevée
-				</combo_item>
+				<combo_box.item name="None" label="Aucune"/>
+				<combo_box.item name="Low" label="Faible"/>
+				<combo_box.item name="Medium" label="Moyenne"/>
+				<combo_box.item name="High" label="Élevée"/>
 			</combo_box>
 			<text name="label bumpiness">
 				Relief
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					Aucun
-				</combo_item>
-				<combo_item name="Brightness">
-					Luminosité
-				</combo_item>
-				<combo_item name="Darkness">
-					Obscurité
-				</combo_item>
-				<combo_item name="woodgrain">
-					Aggloméré
-				</combo_item>
-				<combo_item name="bark">
-					Écorce
-				</combo_item>
-				<combo_item name="bricks">
-					Briques
-				</combo_item>
-				<combo_item name="checker">
-					Damier
-				</combo_item>
-				<combo_item name="concrete">
-					Béton
-				</combo_item>
-				<combo_item name="crustytile">
-					Carrelage
-				</combo_item>
-				<combo_item name="cutstone">
-					Pierre de taille
-				</combo_item>
-				<combo_item name="discs">
-					Disques
-				</combo_item>
-				<combo_item name="gravel">
-					Gravier
-				</combo_item>
-				<combo_item name="petridish">
-					Boîte de Petri
-				</combo_item>
-				<combo_item name="siding">
-					Lattes
-				</combo_item>
-				<combo_item name="stonetile">
-					Carreaux
-				</combo_item>
-				<combo_item name="stucco">
-					Stuc
-				</combo_item>
-				<combo_item name="suction">
-					Ventouses
-				</combo_item>
-				<combo_item name="weave">
-					Tissage
-				</combo_item>
+				<combo_box.item name="None" label="Aucun"/>
+				<combo_box.item name="Brightness" label="Luminosité"/>
+				<combo_box.item name="Darkness" label="Obscurité"/>
+				<combo_box.item name="woodgrain" label="Aggloméré"/>
+				<combo_box.item name="bark" label="Écorce"/>
+				<combo_box.item name="bricks" label="Briques"/>
+				<combo_box.item name="checker" label="Damier"/>
+				<combo_box.item name="concrete" label="Béton"/>
+				<combo_box.item name="crustytile" label="Carrelage"/>
+				<combo_box.item name="cutstone" label="Pierre de taille"/>
+				<combo_box.item name="discs" label="Disques"/>
+				<combo_box.item name="gravel" label="Gravier"/>
+				<combo_box.item name="petridish" label="Boîte de Petri"/>
+				<combo_box.item name="siding" label="Lattes"/>
+				<combo_box.item name="stonetile" label="Carreaux"/>
+				<combo_box.item name="stucco" label="Stuc"/>
+				<combo_box.item name="suction" label="Ventouses"/>
+				<combo_box.item name="weave" label="Tissage"/>
 			</combo_box>
 			<text name="tex scale">
 				Répétitions par face
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index b04390bc13..642a258a6f 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -54,15 +54,11 @@
 	<check_box name="event_mature_chk"/>
 	<icon left="973" name="avatar_icon"/>
 	<combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
-		<combo_box.item name="none_selected">
-			Amis connectés
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Amis connectés" />
 	</combo_box>
 	<icon left="973" name="landmark_icon"/>
 	<combo_box label="Repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
-		<combo_box.item name="none_selected">
-			Repères
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Repères" />
 	</combo_box>
 	<icon left="973" name="location_icon"/>
 	<line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d&apos;une région" width="155"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index 821aec65b2..74bbe9c5b6 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -16,18 +16,10 @@
 		Lieu de départ :
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome">
-			Domicile
-		</combo_box.item>
-		<combo_box.item name="MyLastLocation">
-			Dernier emplacement
-		</combo_box.item>
-		<combo_box.item name="&lt;Typeregionname&gt;">
-			&lt;Choisir région&gt;
-		</combo_box.item>
-		<combo_box.item name="Typeregionname">
-			&lt;Nom de la région&gt;
-		</combo_box.item>
+		<combo_box.item name="MyHome" label="Domicile" />
+		<combo_box.item name="MyLastLocation" label="Dernier emplacement" />
+		<combo_box.item name="&lt;Typeregionname&gt;" label="lt;Choisir région&gt;" />
+		<combo_box.item name="Typeregionname" label="lt;Nom de la région&gt;" />
 	</combo_box>
 	<check_box label="Mémoriser" name="remember_check"/>
 	<text name="full_screen_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index dbb471093e..9ab01b3189 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -10,15 +10,9 @@
 	</radio_group>
 	<check_box label="Afficher le lieu de départ sur l&apos;écran de connexion" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox" width="166">
-		<combo_item name="Never">
-			Jamais
-		</combo_item>
-		<combo_item name="Show Temporarily">
-			Afficher temporairement
-		</combo_item>
-		<combo_item name="Always">
-			Toujours
-		</combo_item>
+		<combo_box.item name="Never" label="Jamais"/>
+		<combo_box.item name="Show Temporarily" label="Afficher temporairement"/>
+		<combo_box.item name="Always" label="Toujours"/>
 	</combo_box>
 	<check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
 	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
@@ -61,59 +55,25 @@ de sélection :
 		&lt;Saisissez le nom de la région&gt;
 	</string>
 	<combo_box name="crash_behavior_combobox" width="166">
-		<combo_item length="1" name="Askbeforesending" type="string">
-			Demander avant d&apos;envoyer
-		</combo_item>
-		<combo_item length="1" name="Alwayssend" type="string">
-			Toujours envoyer
-		</combo_item>
-		<combo_item length="1" name="Neversend" type="string">
-			Ne jamais envoyer
-		</combo_item>
+		<combo_box.item length="1" name="Askbeforesending" type="string" label="Demander avant d&apos;envoyer"/>
+		<combo_box.item length="1" name="Alwayssend" type="string" label="Toujours envoyer"/>
+		<combo_box.item length="1" name="Neversend" type="string" label="Ne jamais envoyer"/>
 	</combo_box>
 	<combo_box name="language_combobox" width="166">
-		<combo_item name="System Default Language">
-			Choix par défaut
-		</combo_item>
-		<combo_item length="1" name="English" type="string">
-			English (Anglais)
-		</combo_item>
-		<combo_item length="1" name="Danish" type="string">
-			Dansk (Danois) - Bêta
-		</combo_item>
-		<combo_item length="1" name="Deutsch(German)" type="string">
-			Deutsch (Allemand) - Bêta
-		</combo_item>
-		<combo_item name="Spanish">
-			Español (Espagnol) - Bêta
-		</combo_item>
-		<combo_item name="French">
-			Français - Bêta
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (Hongrois) - Bêta
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (Polonais) - Bêta
-		</combo_item>
-		<combo_item name="Portugese">
-			Portugués (Portugais) - Bêta
-		</combo_item>
-		<combo_item name="Russian">
-			Русский (Russe) - Bêta
-		</combo_item>
-		<combo_item name="Ukrainian">
-			Українська (Ukrainien) - Bêta
-		</combo_item>
-		<combo_item length="1" name="Chinese" type="string">
-			中文 (简体) (Chinois) - Bêta
-		</combo_item>
-		<combo_item length="1" name="(Japanese)" type="string">
-			日本語 (Japonais) - Bêta
-		</combo_item>
-		<combo_item length="1" name="(Korean)" type="string">
-			한국어 (Coréen) - Bêta
-		</combo_item>
+		<combo_box.item name="System Default Language" label="Choix par défaut"/>
+		<combo_box.item length="1" name="English" type="string" label="English (Anglais)"/>
+		<combo_box.item length="1" name="Danish" type="string" label="Dansk (Danois) - Bêta"/>
+		<combo_box.item length="1" name="Deutsch(German)" type="string" label="Deutsch (Allemand) - Bêta"/>
+		<combo_box.item name="Spanish" label="Español (Espagnol) - Bêta"/>
+		<combo_box.item name="French" label="Français - Bêta"/>
+		<combo_box.item name="Hungarian" label="Magyar (Hongrois) - Bêta"/>
+		<combo_box.item name="Polish" label="Polski (Polonais) - Bêta"/>
+		<combo_box.item name="Portugese" label="Portugués (Portugais) - Bêta"/>
+		<combo_box.item name="Russian" label="Русский (Russe) - Bêta"/>
+		<combo_box.item name="Ukrainian" label="Українська (Ukrainien) - Bêta"/>
+		<combo_box.item length="1" name="Chinese" type="string" label="中文 (简体) (Chinois) - Bêta"/>
+		<combo_box.item length="1" name="(Japanese)" type="string" label="日本語 (Japonais) - Bêta"/>
+		<combo_box.item length="1" name="(Korean)" type="string" label="한국어 (Coréen) - Bêta"/>
 	</combo_box>
 	<check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index aaf6591f2e..bf75fb58a3 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -8,21 +8,11 @@
 		Taille de la fenêtre :
 	</text>
 	<combo_box name="windowsize combo">
-		<combo_box.item name="640x480">
-			640 x 480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800 x 600
-		</combo_box.item>
-		<combo_box.item name="720x480">
-			720 x 480 (NTSC)
-		</combo_box.item>
-		<combo_box.item name="768x576">
-			768 x 576 (PAL)
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024 x 768
-		</combo_box.item>
+		<combo_box.item name="640x480" label="640 x 480" />
+		<combo_box.item name="800x600" label="800 x 600" />
+		<combo_box.item name="720x480" label="720 x 480 (NTSC)" />
+		<combo_box.item name="768x576" label="768 x 576 (PAL)" />
+		<combo_box.item name="1024x768" label="1024 x 768" />
 	</combo_box>
 	<text name="DisplayResLabel" width="165">
 		Résolution de l&apos;affichage :
@@ -31,18 +21,10 @@
 		Rapport hauteur/largeur :
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
-		<combo_box.item length="1" name="4:3(StandardCRT)" type="string">
-			4:3 (Standard CRT)
-		</combo_box.item>
-		<combo_box.item length="1" name="5:4(1280x1024LCD)" type="string">
-			5:4 (1280 x 1024 LCD)
-		</combo_box.item>
-		<combo_box.item name="8:5(Widescreen)">
-			8:5 (écran large)
-		</combo_box.item>
-		<combo_box.item length="1" name="16:9(Widescreen)" type="string">
-			16:9 (plein écran)
-		</combo_box.item>
+		<combo_box.item length="1" name="4:3(StandardCRT)" type="string" label="4:3 (Standard CRT)" />
+		<combo_box.item length="1" name="5:4(1280x1024LCD)" type="string" label="5:4 (1280 x 1024 LCD)" />
+		<combo_box.item name="8:5(Widescreen)" label="8:5 (écran large)" />
+		<combo_box.item length="1" name="16:9(Widescreen)" type="string" label="16:9 (plein écran)" />
 	</combo_box>
 	<text length="1" name="text" type="string">
 		Résolution d&apos;affichage :
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index 237b2264ec..e266aa2164 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -253,43 +253,19 @@ Vai al menu Mondo &gt; Informazioni sul terreno oppure seleziona un altro appezz
 			<check_box label="Nessuna spinta" name="PushRestrictCheck" tool_tip="Previeni i colpi. Selezionare questa opzione può essere utile per prevenire comportamenti dannosi sul tuo terreno."/>
 			<check_box label="Mostra il luogo nella ricerca (30 L$/week) sotto" name="ShowDirectoryCheck" tool_tip="Lascia che questa terra sia vista dagli altri nei risultati di ricerca"/>
 			<combo_box name="land category">
-				<combo_item name="AnyCategory">
-					Tutte le categorie
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Luogo dei Linden
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="Tutte le categorie"/>
+				<combo_box.item name="LindenLocation" label="Luogo dei Linden"/>
 
-				<combo_item name="Arts&amp;Culture">
-					Arte &amp; Cultura
-				</combo_item>
-				<combo_item name="Business">
-					Affari
-				</combo_item>
-				<combo_item name="Educational">
-					Educazione
-				</combo_item>
-				<combo_item name="Gaming">
-					Gioco
-				</combo_item>
-				<combo_item name="Hangout">
-					Divertimento
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Accoglienza nuovi residenti
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parchi &amp; Natura
-				</combo_item>
-				<combo_item name="Residential">
-					Residenziale
-				</combo_item>
-				<combo_item name="Shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other">
-					Altro
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="Arte &amp; Cultura"/>
+				<combo_box.item name="Business" label="Affari"/>
+				<combo_box.item name="Educational" label="Educazione"/>
+				<combo_box.item name="Gaming" label="Gioco"/>
+				<combo_box.item name="Hangout" label="Divertimento"/>
+				<combo_box.item name="NewcomerFriendly" label="Accoglienza nuovi residenti"/>
+				<combo_box.item name="Parks&amp;Nature" label="Parchi &amp; Natura"/>
+				<combo_box.item name="Residential" label="Residenziale"/>
+				<combo_box.item name="Shopping" label="Shopping"/>
+				<combo_box.item name="Other" label="Altro"/>
 			</combo_box>
 			<button label="?" label_selected="?" name="?"/>
 			<check_box name="MatureCheck" />
@@ -309,15 +285,9 @@ Vai al menu Mondo &gt; Informazioni sul terreno oppure seleziona un altro appezz
 				Rotte dei teleport:
 			</text>
 			<combo_box name="landing type" tool_tip="Rotte dei teleport -- seleziona come vuoi organizzare i teleport nella tua terra.">
-				<combo_item name="Blocked">
-					Bloccati
-				</combo_item>
-				<combo_item name="LandingPoint">
-					Punto di atterraggio
-				</combo_item>
-				<combo_item name="Anywhere">
-					Ovunque
-				</combo_item>
+				<combo_box.item name="Blocked" label="Bloccati"/>
+				<combo_box.item name="LandingPoint" label="Punto di atterraggio"/>
+				<combo_box.item name="Anywhere" label="Ovunque"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				Nessuna spinta
@@ -402,12 +372,8 @@ Media:
 			<check_box label="Permetti accesso al gruppo: [Gruppo]" name="GroupCheck" tool_tip="Imposta il gruppo nel pannello generale."/>
 			<check_box label="Vendi pass a:" name="PassCheck" tool_tip="Permetti in questo terreno l&apos;accesso temporaneo"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					Chiunque
-				</combo_item>
-				<combo_item name="Group">
-					Gruppo
-				</combo_item>
+				<combo_box.item name="Anyone" label="Chiunque"/>
+				<combo_box.item name="Group" label="Gruppo"/>
 			</combo_box>
 			<spinner label="Prezzo in L$:" name="PriceSpin"/>
 			<spinner label="Ore di accesso:" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
index c00e04b18f..e72dd4aa20 100644
--- a/indra/newview/skins/default/xui/it/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
@@ -14,127 +14,53 @@
 		Postura della mano
 	</text>
 	<combo_box label="" name="hand_pose_combo" tool_tip="Controlla cosa fanno le mani durante l&apos;animazione.">
-		<combo_item name="Spread">
-			Aperte
-		</combo_item>
-		<combo_item name="Relaxed">
-			Rilassate
-		</combo_item>
-		<combo_item name="PointBoth">
-			Entrambe indicano
-		</combo_item>
-		<combo_item name="Fist">
-			Pugno
-		</combo_item>
-		<combo_item name="RelaxedLeft">
-			Sinistra Rilassata
-		</combo_item>
-		<combo_item name="PointLeft">
-			Sinistra Indica
-		</combo_item>
-		<combo_item name="FistLeft">
-			Sinistra a pugno
-		</combo_item>
-		<combo_item name="RelaxedRight">
-			Destra rilassata
-		</combo_item>
-		<combo_item name="PointRight">
-			Destra Indica
-		</combo_item>
-		<combo_item name="FistRight">
-			Destra a Pugno
-		</combo_item>
-		<combo_item name="SaluteRight">
-			Destra Saluta
-		</combo_item>
-		<combo_item name="Typing">
-			Digitano
-		</combo_item>
-		<combo_item name="PeaceRight">
-			Destra &apos;segno di pace&apos;
-		</combo_item>
+		<combo_box.item name="Spread" label="Aperte"/>
+		<combo_box.item name="Relaxed" label="Rilassate"/>
+		<combo_box.item name="PointBoth" label="Entrambe indicano"/>
+		<combo_box.item name="Fist" label="Pugno"/>
+		<combo_box.item name="RelaxedLeft" label="Sinistra Rilassata"/>
+		<combo_box.item name="PointLeft" label="Sinistra Indica"/>
+		<combo_box.item name="FistLeft" label="Sinistra a pugno"/>
+		<combo_box.item name="RelaxedRight" label="Destra rilassata"/>
+		<combo_box.item name="PointRight" label="Destra Indica"/>
+		<combo_box.item name="FistRight" label="Destra a Pugno"/>
+		<combo_box.item name="SaluteRight" label="Destra Saluta"/>
+		<combo_box.item name="Typing" label="Digitano"/>
+		<combo_box.item name="PeaceRight" label="Destra &apos;segno di pace&apos;"/>
 	</combo_box>
 	<text name="emote_label">
 		Espressione
 	</text>
 	<combo_box label="" name="emote_combo" tool_tip="Controlla l&apos;espressione del viso durante l&apos;animazione.">
-		<combo_item name="[None]">
-			[None]
-		</combo_item>
-		<combo_item name="Aaaaah">
-			Aaaaah
-		</combo_item>
-		<combo_item name="Afraid">
-			Paura
-		</combo_item>
-		<combo_item name="Angry">
-			Rabbia
-		</combo_item>
-		<combo_item name="BigSmile">
-			Sorriso Aperto
-		</combo_item>
-		<combo_item name="Bored">
-			Noia
-		</combo_item>
-		<combo_item name="Cry">
-			Pianto
-		</combo_item>
-		<combo_item name="Disdain">
-			Sdegno
-		</combo_item>
-		<combo_item name="Embarrassed">
-			Imbarazzo
-		</combo_item>
-		<combo_item name="Frown">
-			Accigliato
-		</combo_item>
-		<combo_item name="Kiss">
-			Bacio
-		</combo_item>
-		<combo_item name="Laugh">
-			Risata
-		</combo_item>
-		<combo_item name="Plllppt">
-			Linguaccia
-		</combo_item>
-		<combo_item name="Repulsed">
-			Repulsione
-		</combo_item>
-		<combo_item name="Sad">
-			Tristezza
-		</combo_item>
-		<combo_item name="Shrug">
-			Spallucce
-		</combo_item>
-		<combo_item name="Smile">
-			Sorriso
-		</combo_item>
-		<combo_item name="Surprise">
-			Sorpresa
-		</combo_item>
-		<combo_item name="Wink">
-			Ammiccamento
-		</combo_item>
-		<combo_item name="Worry">
-			Preoccupazione
-		</combo_item>
+		<combo_box.item name="[None]" label="None]"/>
+		<combo_box.item name="Aaaaah" label="Aaaaah"/>
+		<combo_box.item name="Afraid" label="Paura"/>
+		<combo_box.item name="Angry" label="Rabbia"/>
+		<combo_box.item name="BigSmile" label="Sorriso Aperto"/>
+		<combo_box.item name="Bored" label="Noia"/>
+		<combo_box.item name="Cry" label="Pianto"/>
+		<combo_box.item name="Disdain" label="Sdegno"/>
+		<combo_box.item name="Embarrassed" label="Imbarazzo"/>
+		<combo_box.item name="Frown" label="Accigliato"/>
+		<combo_box.item name="Kiss" label="Bacio"/>
+		<combo_box.item name="Laugh" label="Risata"/>
+		<combo_box.item name="Plllppt" label="Linguaccia"/>
+		<combo_box.item name="Repulsed" label="Repulsione"/>
+		<combo_box.item name="Sad" label="Tristezza"/>
+		<combo_box.item name="Shrug" label="Spallucce"/>
+		<combo_box.item name="Smile" label="Sorriso"/>
+		<combo_box.item name="Surprise" label="Sorpresa"/>
+		<combo_box.item name="Wink" label="Ammiccamento"/>
+		<combo_box.item name="Worry" label="Preoccupazione"/>
 	</combo_box>
 	<text name="preview_label">
 		Vedi anteprima mentre
 	</text>
 	<combo_box label="" name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell&apos;animazione mentre l&apos;avatar svolge azioni abituali.">
-		<combo_item name="Standing">
-			In piedi
-		</combo_item>
-		<combo_item name="Walking">
-			Passeggia
-		</combo_item>
-		<combo_item name="Sitting">
-			Siede
-		</combo_item>
-		<combo_item name="Flying">
-			Vola
-		</combo_item>
+		<combo_box.item name="Standing" label="In piedi"/>
+		<combo_box.item name="Walking" label="Passeggia"/>
+		<combo_box.item name="Sitting" label="Siede"/>
+		<combo_box.item name="Flying" label="Vola"/>
 	</combo_box>
 	<spinner label="Avvio lento (sec)" name="ease_in_time" tool_tip="Tempo (in secondi) in cui le animazioni iniziano a sfumare."/>
 	<spinner label="Arresto lento (sec)" name="ease_out_time" tool_tip="Tempo (in secondi) in cui le animazioni iniziano a sfumare."/>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
index d5bda5ecc6..b85a776238 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml
@@ -66,15 +66,9 @@
 		Solo i membri premium possono possedere terra.
 	</text>
 	<combo_box name="account_level">
-		<combo_item name="US$9.95/month,billedmonthly">
-			9.95 US$/mese, addebitati mensilmente
-		</combo_item>
-		<combo_item name="US$7.50/month,billedquarterly">
-			7.50 US$/mese, addebitati ogni quadrimestre
-		</combo_item>
-		<combo_item name="US$6.00/month,billedannually">
-			6.00 US$/mese, addebitati annualmente
-		</combo_item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="9.95 US$/mese, addebitati mensilmente"/>
+		<combo_box.item name="US$7.50/month,billedquarterly" label="7.50 US$/mese, addebitati ogni quadrimestre"/>
+		<combo_box.item name="US$6.00/month,billedannually" label="6.00 US$/mese, addebitati annualmente"/>
 	</combo_box>
 	<text name="land_use_action">
 		Aumenta il tasso di pagamento mensile delle tasse d&apos;uso della terra a 40 US$/mese.
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
index b7b47a1fb8..699a6e80ef 100644
--- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
@@ -8,21 +8,11 @@
 		Antialiasing:
 	</text>
 	<combo_box label="Antialiasing" name="fsaa">
-		<combo_item name="FSAADisabled">
-			Disattivato
-		</combo_item>
-		<combo_item name="2x">
-			2x
-		</combo_item>
-		<combo_item name="4x">
-			4x
-		</combo_item>
-		<combo_item name="8x">
-			8x
-		</combo_item>
-		<combo_item name="16x">
-			16x
-		</combo_item>
+		<combo_box.item name="FSAADisabled" label="Disattivato"/>
+		<combo_box.item name="2x" label="2x"/>
+		<combo_box.item name="4x" label="4x"/>
+		<combo_box.item name="8x" label="8x"/>
+		<combo_box.item name="16x" label="16x"/>
 	</combo_box>
 	<spinner label="Gamma:" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml
index dfd4d4356b..a4bacba91f 100644
--- a/indra/newview/skins/default/xui/it/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		Anteprima dell&apos;immagine come:
 	</text>
 	<combo_box label="Tipo d&apos;abito" name="clothing_type_combo">
-		<combo_item name="Image">
-			Immagine
-		</combo_item>
-		<combo_item name="Hair">
-			Capelli
-		</combo_item>
-		<combo_item name="FemaleHead">
-			Testa femminile
-		</combo_item>
-		<combo_item name="FemaleUpperBody">
-			Corpo femminile superiore
-		</combo_item>
-		<combo_item name="FemaleLowerBody">
-			Corpo femminile inferiore
-		</combo_item>
-		<combo_item name="MaleHead">
-			Testa maschile
-		</combo_item>
-		<combo_item name="MaleUpperBody">
-			Corpo maschile superiore
-		</combo_item>
-		<combo_item name="MaleLowerBody">
-			Corpo maschile inferiore
-		</combo_item>
-		<combo_item name="Skirt">
-			Gonna
-		</combo_item>
-		<combo_item name="SculptedPrim">
-			Oggetto sculpt
-		</combo_item>
+		<combo_box.item name="Image" label="Immagine"/>
+		<combo_box.item name="Hair" label="Capelli"/>
+		<combo_box.item name="FemaleHead" label="Testa femminile"/>
+		<combo_box.item name="FemaleUpperBody" label="Corpo femminile superiore"/>
+		<combo_box.item name="FemaleLowerBody" label="Corpo femminile inferiore"/>
+		<combo_box.item name="MaleHead" label="Testa maschile"/>
+		<combo_box.item name="MaleUpperBody" label="Corpo maschile superiore"/>
+		<combo_box.item name="MaleLowerBody" label="Corpo maschile inferiore"/>
+		<combo_box.item name="Skirt" label="Gonna"/>
+		<combo_box.item name="SculptedPrim" label="Oggetto sculpt"/>
 	</combo_box>
 	<text name="bad_image_text">
 		Non è stato possibile leggere l&apos;immagine.
diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
index addf01667a..74d07d4d4c 100644
--- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
@@ -36,123 +36,51 @@
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="Categoria -- scegli la categoria che descrive meglio questa segnalazione">
-		<combo_item name="Select_category">
-			Scegli la categoria
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Età &gt; Far finta di essere minore
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Età &gt; Residente adulto nella Teen Second Life
-		</combo_item>
+		<combo_box.item name="Select_category" label="Scegli la categoria"/>
+		<combo_box.item name="Age__Age_play" label="Età &gt; Far finta di essere minore"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Età &gt; Residente adulto nella Teen Second Life"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Assalto &gt; sandbox da combattimento / area pericolosa
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Assalto &gt; Area sicura
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Assalto &gt; Test di armi in sandbox
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Commercio &gt; Problema nella consegna di un prodotto o servizio
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Divulgazione &gt; Informazioni del mondo reale
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Divulgazione &gt; Monitoraggio remoto di chat
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Divulgazione &gt; Informazione/chat/IMs di Second Life
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Disturbo della quiete &gt; Uso sleale delle risorse di una regione
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Disturbo della quiete &gt; Numero eccessivo di oggetti scriptati
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Disturbo della quiete &gt; Oggetti messi a soqquadro
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Disturbo della quiete &gt; Spam continuato
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Disturbo della quiete &gt; Spam pubblicitario non richiesto
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Truffa &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Truffa &gt; Terreno
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Truffa &gt; Multilivello o catena di Sant&apos;Antonio
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Truffa &gt; Dollari US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Molestie &gt; Territori adibiti a pubblicità / spam visivo
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Molestie &gt; Diffamazione di individui o gruppi
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Molestie &gt; Impedimento di movimenti
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Molestie &gt; Molestie sessuali
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Molestie &gt; Sollecitare/incitare altri a violare i Termini di Servizio
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Molestie &gt; Abusi verbali
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Indecenza &gt; Condotta o contenuti largamente offensivi
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Assalto &gt; sandbox da combattimento / area pericolosa"/>
+		<combo_box.item name="Assault__Safe_area" label="Assalto &gt; Area sicura"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Assalto &gt; Test di armi in sandbox"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Commercio &gt; Problema nella consegna di un prodotto o servizio"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Divulgazione &gt; Informazioni del mondo reale"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Divulgazione &gt; Monitoraggio remoto di chat"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Divulgazione &gt; Informazione/chat/IMs di Second Life"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Disturbo della quiete &gt; Uso sleale delle risorse di una regione"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Disturbo della quiete &gt; Numero eccessivo di oggetti scriptati"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Disturbo della quiete &gt; Oggetti messi a soqquadro"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Disturbo della quiete &gt; Spam continuato"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Disturbo della quiete &gt; Spam pubblicitario non richiesto"/>
+		<combo_box.item name="Fraud__L$" label="Truffa &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Truffa &gt; Terreno"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Truffa &gt; Multilivello o catena di Sant&apos;Antonio"/>
+		<combo_box.item name="Fraud__US$" label="Truffa &gt; Dollari US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Molestie &gt; Territori adibiti a pubblicità / spam visivo"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Molestie &gt; Diffamazione di individui o gruppi"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Molestie &gt; Impedimento di movimenti"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Molestie &gt; Molestie sessuali"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Molestie &gt; Sollecitare/incitare altri a violare i Termini di Servizio"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Molestie &gt; Abusi verbali"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Indecenza &gt; Condotta o contenuti largamente offensivi"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Indecenza &gt; Nome di un avatar inappropriato
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Indecenza &gt; Nome di un avatar inappropriato"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Violazione della proprietà intellettuale &gt; Rimozione contenuti
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Violazione della proprietà intellettuale &gt; CopyBot o sblocco di permessi
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intolleranza
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Terreno &gt; Abuso delle risorse di una sandbox
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Terreno &gt; Invasione &gt; Oggetti/textures
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Terreno &gt; Invasione &gt; Particelle
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Terreno &gt; Invasione &gt; Alberi/piante
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Chiedere l&apos;elemosina/gioco d&apos;azzardo
-		</combo_item>
-		<combo_item name="Other">
-			Altro
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Violazione della proprietà intellettuale &gt; Rimozione contenuti"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Violazione della proprietà intellettuale &gt; CopyBot o sblocco di permessi"/>
+		<combo_box.item name="Intolerance" label="Intolleranza"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Terreno &gt; Abuso delle risorse di una sandbox"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Terreno &gt; Invasione &gt; Oggetti/textures"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Terreno &gt; Invasione &gt; Particelle"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Terreno &gt; Invasione &gt; Alberi/piante"/>
+		<combo_box.item name="Wagering_gambling" label="Chiedere l&apos;elemosina/gioco d&apos;azzardo"/>
+		<combo_box.item name="Other" label="Altro"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Nome di chi ha commesso l&apos;abuso:
diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml
index d57d88f6f4..01c7fca0e6 100644
--- a/indra/newview/skins/default/xui/it/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml
@@ -34,15 +34,9 @@
 		Scegli se vendere a tutti o ad un compratore in particolare.
 	</text>
 	<combo_box name="sell_to">
-		<combo_item name="--selectone--">
-			-- selezionane uno --
-		</combo_item>
-		<combo_item name="Anyone">
-			Chiunque
-		</combo_item>
-		<combo_item name="Specificuser:">
-			Utente specifico:
-		</combo_item>
+		<combo_box.item name="--selectone--" label="selezionane uno --"/>
+		<combo_box.item name="Anyone" label="Chiunque"/>
+		<combo_box.item name="Specificuser:" label="Utente specifico:"/>
 	</combo_box>
 	<button label="Seleziona..." name="sell_to_select_agent"/>
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
index 869da40b8d..0f101d8b81 100644
--- a/indra/newview/skins/default/xui/it/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="Configurazioni per il debug">
 	<combo_box name="boolean_combo">
-		<combo_item name="TRUE">
-			VERO
-		</combo_item>
-		<combo_item name="FALSE">
-			FALSO
-		</combo_item>
+		<combo_box.item name="TRUE" label="VERO"/>
+		<combo_box.item name="FALSE" label="FALSO"/>
 	</combo_box>
 	<color_swatch label="Colore" name="color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index 7729d84fa6..1c24b53cd8 100644
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -34,75 +34,33 @@
 		Formato
 	</text>
 	<combo_box label="Risoluzione" name="postcard_size_combo">
-		<combo_item name="CurrentWindow">
-			Finestra corrente
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="Custom">
-			Personalizzata
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Finestra corrente"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="Custom" label="Personalizzata"/>
 	</combo_box>
 	<combo_box label="Risoluzione" name="texture_size_combo">
-		<combo_item name="CurrentWindow">
-			Finestra corrente
-		</combo_item>
-		<combo_item name="Small(128x128)">
-			Piccola (128x128)
-		</combo_item>
-		<combo_item name="Medium(256x256)">
-			Media (256x256)
-		</combo_item>
-		<combo_item name="Large(512x512)">
-			Larga (512x512)
-		</combo_item>
-		<combo_item name="Custom">
-			Personalizzata
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Finestra corrente"/>
+		<combo_box.item name="Small(128x128)" label="Piccola (128x128)"/>
+		<combo_box.item name="Medium(256x256)" label="Media (256x256)"/>
+		<combo_box.item name="Large(512x512)" label="Larga (512x512)"/>
+		<combo_box.item name="Custom" label="Personalizzata"/>
 	</combo_box>
 	<combo_box label="Risoluzione" name="local_size_combo">
-		<combo_item name="CurrentWindow">
-			Finestra corrente
-		</combo_item>
-		<combo_item name="320x240">
-			320x240
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="1280x1024">
-			1280x1024
-		</combo_item>
-		<combo_item name="1600x1200">
-			1600x1200
-		</combo_item>
-		<combo_item name="Custom">
-			Personalizzata
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Finestra corrente"/>
+		<combo_box.item name="320x240" label="320x240"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="1280x1024" label="1280x1024"/>
+		<combo_box.item name="1600x1200" label="1600x1200"/>
+		<combo_box.item name="Custom" label="Personalizzata"/>
 	</combo_box>
 	<combo_box label="Formato" name="local_format_combo">
-		<combo_item name="PNG">
-			PNG
-		</combo_item>
-		<combo_item name="JPEG">
-			JPEG
-		</combo_item>
-		<combo_item name="BMP">
-			BMP
-		</combo_item>
+		<combo_box.item name="PNG" label="PNG"/>
+		<combo_box.item name="JPEG" label="JPEG"/>
+		<combo_box.item name="BMP" label="BMP"/>
 	</combo_box>
 	<spinner label="Larghezza" name="snapshot_width"/>
 	<spinner label="Altezza" name="snapshot_height"/>
@@ -112,15 +70,9 @@
 		Fotografa:
 	</text>
 	<combo_box label="Layer dell&apos;immagine" name="layer_types">
-		<combo_item name="Colors">
-			Colori
-		</combo_item>
-		<combo_item name="Depth">
-			Profondità
-		</combo_item>
-		<combo_item name="ObjectMattes">
-			Colori primari degli oggetti
-		</combo_item>
+		<combo_box.item name="Colors" label="Colori"/>
+		<combo_box.item name="Depth" label="Profondità"/>
+		<combo_box.item name="ObjectMattes" label="Colori primari degli oggetti"/>
 	</combo_box>
 	<check_box label="Mostra l&apos;interfaccia nella fotografia" name="ui_check"/>
 	<check_box label="Mostra i dispositivi indossati nella fotografia" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index 9044dd057d..8bc9e511b5 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -20,15 +20,9 @@
 		Modalità  regolo di precisione:
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_item name="World">
-			Globale
-		</combo_item>
-		<combo_item name="Local">
-			Locale
-		</combo_item>
-		<combo_item name="Reference">
-			Riferito a
-		</combo_item>
+		<combo_box.item name="World" label="Globale"/>
+		<combo_box.item name="Local" label="Locale"/>
+		<combo_box.item name="Reference" label="Riferito a"/>
 	</combo_box>
 	<check_box label="Ridimensiona simmetricamente" name="checkbox uniform"/>
 	<check_box label="Ridimensiona le Texture" name="checkbox stretch textures"/>
@@ -64,15 +58,9 @@
 	<check_box label="Corruga il terreno" name="radio noise"/>
 	<check_box label="Ripristina il terreno" name="radio revert"/>
 	<combo_box name="combobox brush size">
-		<combo_item name="Small">
-			Piccolo
-		</combo_item>
-		<combo_item name="Medium">
-			Medio
-		</combo_item>
-		<combo_item name="Large">
-			Grande
-		</combo_item>
+		<combo_box.item name="Small" label="Piccolo"/>
+		<combo_box.item name="Medium" label="Medio"/>
+		<combo_box.item name="Large" label="Grande"/>
 	</combo_box>
 	<text name="Strength:">
 		Pressione:
@@ -155,27 +143,13 @@
 				Se cliccato con il tasto sinistro del mouse
 			</text>
 			<combo_box name="clickaction">
-				<combo_item name="Touch/grab(default)">
-					Tocca/Afferra (default)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					Siediti sull&apos;oggetto
-				</combo_item>
-				<combo_item name="Buyobject">
-					Compra l&apos;oggetto
-				</combo_item>
-				<combo_item name="Payobject">
-					Paga l&apos;oggetto
-				</combo_item>
-				<combo_item name="Open">
-					Apri
-				</combo_item>
-				<combo_item name="Play">
-					Attiva i multimedia del terreno
-				</combo_item>
-				<combo_item name="Opemmedia">
-					Apri i multimedia del terreno
-				</combo_item>
+				<combo_box.item name="Touch/grab(default)" label="Tocca/Afferra (default)"/>
+				<combo_box.item name="Sitonobject" label="Siediti sull&apos;oggetto"/>
+				<combo_box.item name="Buyobject" label="Compra l&apos;oggetto"/>
+				<combo_box.item name="Payobject" label="Paga l&apos;oggetto"/>
+				<combo_box.item name="Open" label="Apri"/>
+				<combo_box.item name="Play" label="Attiva i multimedia del terreno"/>
+				<combo_box.item name="Opemmedia" label="Apri i multimedia del terreno"/>
 			</combo_box>
 			<text name="B:">
 				B:
@@ -259,56 +233,26 @@
 				Materiale
 			</text>
 			<combo_box name="material">
-				<combo_item name="Stone">
-					Pietra
-				</combo_item>
-				<combo_item name="Metal">
-					Metallo
-				</combo_item>
-				<combo_item name="Glass">
-					Vetro
-				</combo_item>
-				<combo_item name="Wood">
-					Legno
-				</combo_item>
-				<combo_item name="Flesh">
-					Carne
-				</combo_item>
-				<combo_item name="Plastic">
-					Plastica
-				</combo_item>
-				<combo_item name="Rubber">
-					Gomma
-				</combo_item>
+				<combo_box.item name="Stone" label="Pietra"/>
+				<combo_box.item name="Metal" label="Metallo"/>
+				<combo_box.item name="Glass" label="Vetro"/>
+				<combo_box.item name="Wood" label="Legno"/>
+				<combo_box.item name="Flesh" label="Carne"/>
+				<combo_box.item name="Plastic" label="Plastica"/>
+				<combo_box.item name="Rubber" label="Gomma"/>
 			</combo_box>
 			<text name="label basetype">
 				Forma di costruzione
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					Cubo
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilindro
-				</combo_item>
-				<combo_item name="Prism">
-					Prisma
-				</combo_item>
-				<combo_item name="Sphere">
-					Sfera
-				</combo_item>
-				<combo_item name="Torus">
-					Toro
-				</combo_item>
-				<combo_item name="Tube">
-					Tubo
-				</combo_item>
-				<combo_item name="Ring">
-					Anello
-				</combo_item>
-				<combo_item name="Sculpted">
-					Sculpted
-				</combo_item>
+				<combo_box.item name="Box" label="Cubo"/>
+				<combo_box.item name="Cylinder" label="Cilindro"/>
+				<combo_box.item name="Prism" label="Prisma"/>
+				<combo_box.item name="Sphere" label="Sfera"/>
+				<combo_box.item name="Torus" label="Toro"/>
+				<combo_box.item name="Tube" label="Tubo"/>
+				<combo_box.item name="Ring" label="Anello"/>
+				<combo_box.item name="Sculpted" label="Sculpted"/>
 			</combo_box>
 			<text name="text cut">
 				Linea di taglio Inizio e Fine
@@ -325,18 +269,10 @@
 				Forma del foro
 			</text>
 			<combo_box name="hole">
-				<combo_item name="Default">
-					Default
-				</combo_item>
-				<combo_item name="Circle">
-					Rotondo
-				</combo_item>
-				<combo_item name="Square">
-					Quadrato
-				</combo_item>
-				<combo_item name="Triangle">
-					Triangolare
-				</combo_item>
+				<combo_box.item name="Default" label="Default"/>
+				<combo_box.item name="Circle" label="Rotondo"/>
+				<combo_box.item name="Square" label="Quadrato"/>
+				<combo_box.item name="Triangle" label="Triangolare"/>
 			</combo_box>
 			<text name="text twist">
 				Torsione Inizio e Fine
@@ -382,21 +318,11 @@
 				Tipo di congiunzione
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					(nessuna)
-				</combo_item>
-				<combo_item name="Sphere">
-					Sferica
-				</combo_item>
-				<combo_item name="Torus">
-					Toroidale
-				</combo_item>
-				<combo_item name="Plane">
-					Piana
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilindrica
-				</combo_item>
+				<combo_box.item name="None" label="nessuna)"/>
+				<combo_box.item name="Sphere" label="Sferica"/>
+				<combo_box.item name="Torus" label="Toroidale"/>
+				<combo_box.item name="Plane" label="Piana"/>
+				<combo_box.item name="Cylinder" label="Cilindrica"/>
 			</combo_box>
 		</panel>
 		<panel label="Caratteristiche" name="Features">
@@ -438,88 +364,40 @@
 				Applicazione della texture
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					Default
-				</combo_item>
-				<combo_item name="Planar">
-					Planare
-				</combo_item>
+				<combo_box.item name="Default" label="Default"/>
+				<combo_box.item name="Planar" label="Planare"/>
 			</combo_box>
 			<text name="label shininess">
 				Brillantezza
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					Nessuna
-				</combo_item>
-				<combo_item name="Low">
-					Bassa
-				</combo_item>
-				<combo_item name="Medium">
-					Media
-				</combo_item>
-				<combo_item name="High">
-					Alta
-				</combo_item>
+				<combo_box.item name="None" label="Nessuna"/>
+				<combo_box.item name="Low" label="Bassa"/>
+				<combo_box.item name="Medium" label="Media"/>
+				<combo_box.item name="High" label="Alta"/>
 			</combo_box>
 			<text name="label bumpiness">
 				Rilievo
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					Nessuna
-				</combo_item>
-				<combo_item name="Brightness">
-					Luminoso
-				</combo_item>
-				<combo_item name="Darkness">
-					Scuro
-				</combo_item>
-				<combo_item name="woodgrain">
-					Venature del legno
-				</combo_item>
-				<combo_item name="bark">
-					Corteccia
-				</combo_item>
-				<combo_item name="bricks">
-					Mattoni
-				</combo_item>
-				<combo_item name="checker">
-					Scacchi
-				</combo_item>
-				<combo_item name="concrete">
-					Cemento
-				</combo_item>
-				<combo_item name="crustytile">
-					Mattonella incrostata
-				</combo_item>
-				<combo_item name="cutstone">
-					Mosaico in pietra
-				</combo_item>
-				<combo_item name="discs">
-					Dischi
-				</combo_item>
-				<combo_item name="gravel">
-					Ghiaia
-				</combo_item>
-				<combo_item name="petridish">
-					Sassi
-				</combo_item>
-				<combo_item name="siding">
-					Listoni
-				</combo_item>
-				<combo_item name="stonetile">
-					Mattonelle in pietra
-				</combo_item>
-				<combo_item name="stucco">
-					Stucco
-				</combo_item>
-				<combo_item name="suction">
-					Cerchi rialzati
-				</combo_item>
-				<combo_item name="weave">
-					Trama
-				</combo_item>
+				<combo_box.item name="None" label="Nessuna"/>
+				<combo_box.item name="Brightness" label="Luminoso"/>
+				<combo_box.item name="Darkness" label="Scuro"/>
+				<combo_box.item name="woodgrain" label="Venature del legno"/>
+				<combo_box.item name="bark" label="Corteccia"/>
+				<combo_box.item name="bricks" label="Mattoni"/>
+				<combo_box.item name="checker" label="Scacchi"/>
+				<combo_box.item name="concrete" label="Cemento"/>
+				<combo_box.item name="crustytile" label="Mattonella incrostata"/>
+				<combo_box.item name="cutstone" label="Mosaico in pietra"/>
+				<combo_box.item name="discs" label="Dischi"/>
+				<combo_box.item name="gravel" label="Ghiaia"/>
+				<combo_box.item name="petridish" label="Sassi"/>
+				<combo_box.item name="siding" label="Listoni"/>
+				<combo_box.item name="stonetile" label="Mattonelle in pietra"/>
+				<combo_box.item name="stucco" label="Stucco"/>
+				<combo_box.item name="suction" label="Cerchi rialzati"/>
+				<combo_box.item name="weave" label="Trama"/>
 			</combo_box>
 			<text name="tex scale">
 				Ripetizioni per faccia
diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml
index 461b7c264f..f1074b16b5 100644
--- a/indra/newview/skins/default/xui/it/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/it/floater_world_map.xml
@@ -34,14 +34,10 @@
 	</text>
 
 	<combo_box label="Amici Online" name="friend combo" tool_tip="Amici da mostrare sulla mappa">
-		<combo_item name="none_selected">
-			Amici Online
-		</combo_item>
+		<combo_box.item name="none_selected" label="Amici Online"/>
 	</combo_box>
 	<combo_box label="Landmark" name="landmark combo" tool_tip="Landmarks da mostrare sulla mappa">
-		<combo_item name="none_selected">
-			Landmark
-		</combo_item>
+		<combo_box.item name="none_selected" label="Landmark"/>
 	</combo_box>
 	<line_editor label="Cerca per nome di regione" name="location" tool_tip="Scrivi il nome di una regione"/>
 	<button label="Cerca" name="DoSearch" tool_tip="Cerca regione"/>
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index a289e32b47..58d1c09a4b 100644
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -19,15 +19,9 @@
 		Luogo di partenza:
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_item name="MyHome">
-			Casa Mia
-		</combo_item>
-		<combo_item name="MyLastLocation">
-			Ultimo luogo dove sono stato
-		</combo_item>
-		<combo_item name="Typeregionname">
-			&lt;Scrivi la regione di partenza&gt;
-		</combo_item>
+		<combo_box.item name="MyHome" label="Casa Mia"/>
+		<combo_box.item name="MyLastLocation" label="Ultimo luogo dove sono stato"/>
+		<combo_box.item name="Typeregionname" label="lt;Scrivi la regione di partenza&gt;"/>
 	</combo_box>
 	<check_box label="Ricorda password" name="remember_check"/>
 	<button label="Log In" label_selected="Log In" name="connect_btn"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 3b29b5e60a..74f846095d 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -10,15 +10,9 @@
 	</radio_group>
 	<check_box label="Mostra il posto di partenza sulla schermata d&apos;inizio" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox" width="166">
-		<combo_item name="Never">
-			Mai
-		</combo_item>
-		<combo_item name="Show Temporarily">
-			Mostra temporanemente
-		</combo_item>
-		<combo_item name="Always">
-			Sempre
-		</combo_item>
+		<combo_box.item name="Never" label="Mai"/>
+		<combo_box.item name="Show Temporarily" label="Mostra temporanemente"/>
+		<combo_box.item name="Always" label="Sempre"/>
 	</combo_box>
 	<check_box label="Nomi avatar in piccolo" name="small_avatar_names_checkbox"/>
 	<check_box label="Nascondi il mio nome sul mio schermo" name="show_my_name_checkbox"/>
@@ -62,53 +56,23 @@
 		&lt;Scrivi il nome della regione&gt;
 	</string>
 	<combo_box name="crash_behavior_combobox" width="166">
-		<combo_item name="Askbeforesending">
-			Chiedi prima di inviare
-		</combo_item>
-		<combo_item name="Alwayssend">
-			Invia sempre
-		</combo_item>
-		<combo_item name="Neversend">
-			Non inviare mai
-		</combo_item>
+		<combo_box.item name="Askbeforesending" label="Chiedi prima di inviare"/>
+		<combo_box.item name="Alwayssend" label="Invia sempre"/>
+		<combo_box.item name="Neversend" label="Non inviare mai"/>
 	</combo_box>
 	<combo_box name="language_combobox" width="166">
-		<combo_item name="System Default Language">
-			Default di sistema
-		</combo_item>
-		<combo_item name="English">
-			English
-		</combo_item>
-		<combo_item name="Danish">
-			Dansk (Danese) - Beta
-		</combo_item>
-		<combo_item name="Deutsch(German)">
-			Deutsch (Tedesco) - Beta
-		</combo_item>
-		<combo_item name="Spanish">
-			Español (Spagnolo) - Beta
-		</combo_item>
-		<combo_item name="French">
-			Français (Francese) - Beta
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (Ungherese) - Beta
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (Polacco) - Beta
-		</combo_item>
-		<combo_item name="Portugese">
-			Portugués (Portoghese) - Beta
-		</combo_item>
-		<combo_item name="Chinese">
-			中文 (简体) (Cinese) - Beta
-		</combo_item>
-		<combo_item name="(Japanese)">
-			日本語 (Giapponese) - Beta
-		</combo_item>
-		<combo_item name="(Korean)">
-			한국어 (Coreano) - Beta
-		</combo_item>
+		<combo_box.item name="System Default Language" label="Default di sistema"/>
+		<combo_box.item name="English" label="English"/>
+		<combo_box.item name="Danish" label="Dansk (Danese) - Beta"/>
+		<combo_box.item name="Deutsch(German)" label="Deutsch (Tedesco) - Beta"/>
+		<combo_box.item name="Spanish" label="Español (Spagnolo) - Beta"/>
+		<combo_box.item name="French" label="Français (Francese) - Beta"/>
+		<combo_box.item name="Hungarian" label="Magyar (Ungherese) - Beta"/>
+		<combo_box.item name="Polish" label="Polski (Polacco) - Beta"/>
+		<combo_box.item name="Portugese" label="Portugués (Portoghese) - Beta"/>
+		<combo_box.item name="Chinese" label="中文 (简体) (Cinese) - Beta"/>
+		<combo_box.item name="(Japanese)" label="日本語 (Giapponese) - Beta"/>
+		<combo_box.item name="(Korean)" label="한국어 (Coreano) - Beta"/>
 	</combo_box>
 	<check_box label="Condividi la tua lingua con gli oggetti" name="language_is_public" tool_tip="Questo fa in modo che gli oggetti inworld riconoscano la tua lingua."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 4826aafc6a..267a57202f 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -9,21 +9,11 @@
 		Dimensione della finestra:
 	</text>
 	<combo_box name="windowsize combo">
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="720x480">
-			720x480 (NTSC)
-		</combo_item>
-		<combo_item name="768x576">
-			768x576 (PAL)
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="720x480" label="720x480 (NTSC)"/>
+		<combo_box.item name="768x576" label="768x576 (PAL)"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
 	</combo_box>
 	<text name="DisplayResLabel">
 		Risoluzione del monitor:
@@ -32,18 +22,10 @@
 		Rapporto di visualizzazione:
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="larghezza/altezza">
-		<combo_item name="4:3(StandardCRT)">
-			4:3 (Monitor Standard)
-		</combo_item>
-		<combo_item name="5:4(1280x1024LCD)">
-			5:4 (1280x1024 LCD)
-		</combo_item>
-		<combo_item name="8:5(Widescreen)">
-			8:5 (Widescreen)
-		</combo_item>
-		<combo_item name="16:9(Widescreen)">
-			16:9 (Widescreen)
-		</combo_item>
+		<combo_box.item name="4:3(StandardCRT)" label="4:3 (Monitor Standard)"/>
+		<combo_box.item name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)"/>
+		<combo_box.item name="8:5(Widescreen)" label="8:5 (Widescreen)"/>
+		<combo_box.item name="16:9(Widescreen)" label="16:9 (Widescreen)"/>
 	</combo_box>
 	<check_box label="Autoconfigurazione" name="aspect_auto_detect"/>
 	<text name="HigherText">
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index d958c35b4b..8cc28cb01f 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -256,43 +256,19 @@
 			<check_box label="プッシングを制限" name="PushRestrictCheck" tool_tip="スクリプトによるプッシングを制限します。 このオプションを選択することにより、あなたの土地での破壊的行動を妨げることができます。"/>
 			<check_box label="検索に表示＞（週L$30）以下の場所" name="ShowDirectoryCheck" tool_tip="検索結果でこの区画を表示させる"/>
 			<combo_box name="land category">
-				<combo_item name="AnyCategory">
-					全カテゴリー
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Linden所在地
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="全カテゴリー"/>
+				<combo_box.item name="LindenLocation" label="Linden所在地"/>
 
-				<combo_item name="Arts&amp;Culture">
-					アート&amp;カルチャー
-				</combo_item>
-				<combo_item name="Business">
-					ビジネス
-				</combo_item>
-				<combo_item name="Educational">
-					教育的
-				</combo_item>
-				<combo_item name="Gaming">
-					ゲーム
-				</combo_item>
-				<combo_item name="Hangout">
-					たまり場
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					新住人に好意的
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					公園と自然
-				</combo_item>
-				<combo_item name="Residential">
-					住宅用
-				</combo_item>
-				<combo_item name="Shopping">
-					ショッピング
-				</combo_item>
-				<combo_item name="Other">
-					その他
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="アート&amp;カルチャー"/>
+				<combo_box.item name="Business" label="ビジネス"/>
+				<combo_box.item name="Educational" label="教育的"/>
+				<combo_box.item name="Gaming" label="ゲーム"/>
+				<combo_box.item name="Hangout" label="たまり場"/>
+				<combo_box.item name="NewcomerFriendly" label="新住人に好意的"/>
+				<combo_box.item name="Parks&amp;Nature" label="公園と自然"/>
+				<combo_box.item name="Residential" label="住宅用"/>
+				<combo_box.item name="Shopping" label="ショッピング"/>
+				<combo_box.item name="Other" label="その他"/>
 			</combo_box>
 			<button label="?" label_selected="?" name="?"/>
 			<check_box name="MatureCheck" />
@@ -312,15 +288,9 @@
 				テレポート制限：
 			</text>
 			<combo_box name="landing type" tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
-				<combo_item length="1" name="Blocked" type="string">
-					不可
-				</combo_item>
-				<combo_item length="1" name="LandingPoint" type="string">
-					着地点
-				</combo_item>
-				<combo_item length="1" name="Anywhere" type="string">
-					どこでも
-				</combo_item>
+				<combo_box.item length="1" name="Blocked" type="string" label="不可"/>
+				<combo_box.item length="1" name="LandingPoint" type="string" label="着地点"/>
+				<combo_box.item length="1" name="Anywhere" type="string" label="どこでも"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				プッシングを制限
@@ -405,12 +375,8 @@
 			<check_box label="グループ・アクセスを許可：[GROUP]" name="GroupCheck" tool_tip="[一般]タブで、グループを選択してください。"/>
 			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					誰でも
-				</combo_item>
-				<combo_item name="Group">
-					グループ
-				</combo_item>
+				<combo_box.item name="Anyone" label="誰でも"/>
+				<combo_box.item name="Group" label="グループ"/>
 			</combo_box>
 			<spinner label="価格（L$）：" name="PriceSpin"/>
 			<spinner label="アクセス時間：" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
index 4673f908c4..b61007d86e 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
@@ -13,18 +13,10 @@
 	</text>
 	<combo_box label="" name="preview_base_anim"
 	     tool_tip="アバターが普通の行動をするときのアニメーションの動きをテストするためにこれを使います。">
-		<combo_box.item name="Standing">
-			立つ
-		</combo_box.item>
-		<combo_box.item name="Walking">
-			歩く
-		</combo_box.item>
-		<combo_box.item name="Sitting">
-			座る
-		</combo_box.item>
-		<combo_box.item name="Flying">
-			飛行
-		</combo_box.item>
+		<combo_box.item name="Standing" label="立つ" />
+		<combo_box.item name="Walking" label="歩く" />
+		<combo_box.item name="Sitting" label="座る" />
+		<combo_box.item name="Flying" label="飛行" />
 	</combo_box>
 	<pad height="7" />
 	<check_box label="ループ" name="loop_check"
@@ -38,111 +30,45 @@
 	</text>
 	<combo_box label="" name="hand_pose_combo"
 	     tool_tip="アニメーションの手の動きをコントロールします。">
-		<combo_box.item name="Spread">
-			広がる
-		</combo_box.item>
-		<combo_box.item name="Relaxed">
-			リラックス
-		</combo_box.item>
-		<combo_box.item name="PointBoth">
-			両方を指す
-		</combo_box.item>
-		<combo_box.item name="Fist">
-			拳
-		</combo_box.item>
-		<combo_box.item name="RelaxedLeft">
-			リラックス左
-		</combo_box.item>
-		<combo_box.item name="PointLeft">
-			左を指す
-		</combo_box.item>
-		<combo_box.item name="FistLeft">
-			拳左
-		</combo_box.item>
-		<combo_box.item name="RelaxedRight">
-			リラックス右
-		</combo_box.item>
-		<combo_box.item name="PointRight">
-			右を指す
-		</combo_box.item>
-		<combo_box.item name="FistRight">
-			拳右
-		</combo_box.item>
-		<combo_box.item name="SaluteRight">
-			敬礼右
-		</combo_box.item>
-		<combo_box.item name="Typing">
-			入力する
-		</combo_box.item>
-		<combo_box.item name="PeaceRight">
-			ピース・サイン右
-		</combo_box.item>
+		<combo_box.item name="Spread" label="広がる" />
+		<combo_box.item name="Relaxed" label="リラックス" />
+		<combo_box.item name="PointBoth" label="両方を指す" />
+		<combo_box.item name="Fist" label="拳" />
+		<combo_box.item name="RelaxedLeft" label="リラックス左" />
+		<combo_box.item name="PointLeft" label="左を指す" />
+		<combo_box.item name="FistLeft" label="拳左" />
+		<combo_box.item name="RelaxedRight" label="リラックス右" />
+		<combo_box.item name="PointRight" label="右を指す" />
+		<combo_box.item name="FistRight" label="拳右" />
+		<combo_box.item name="SaluteRight" label="敬礼右" />
+		<combo_box.item name="Typing" label="入力する" />
+		<combo_box.item name="PeaceRight" label="ピース・サイン右" />
 	</combo_box>
 	<text name="emote_label">
 		表現
 	</text>
 	<combo_box label="" name="emote_combo"
 	     tool_tip="アニメーションの顔を表情をコントロールします。">
-		<combo_box.item name="[None]">
-			[None]
-		</combo_box.item>
-		<combo_box.item name="Aaaaah">
-			アーーーーー
-		</combo_box.item>
-		<combo_box.item name="Afraid">
-			怖れ
-		</combo_box.item>
-		<combo_box.item name="Angry">
-			怒り
-		</combo_box.item>
-		<combo_box.item name="BigSmile">
-			満面の笑み
-		</combo_box.item>
-		<combo_box.item name="Bored">
-			退屈
-		</combo_box.item>
-		<combo_box.item name="Cry">
-			泣く
-		</combo_box.item>
-		<combo_box.item name="Disdain">
-			侮蔑
-		</combo_box.item>
-		<combo_box.item name="Embarrassed">
-			困惑
-		</combo_box.item>
-		<combo_box.item name="Frown">
-			しかめっ面
-		</combo_box.item>
-		<combo_box.item name="Kiss">
-			キス
-		</combo_box.item>
-		<combo_box.item name="Laugh">
-			笑う
-		</combo_box.item>
-		<combo_box.item name="Plllppt">
-			Plllppt
-		</combo_box.item>
-		<combo_box.item name="Repulsed">
-			嫌悪感
-		</combo_box.item>
-		<combo_box.item name="Sad">
-			悲しい
-		</combo_box.item>
-		<combo_box.item name="Shrug">
-			肩をすくめる
-		</combo_box.item>
-		<combo_box.item name="Smile">
-			笑み
-		</combo_box.item>
-		<combo_box.item name="Surprise">
-			驚き
-		</combo_box.item>
-		<combo_box.item name="Wink">
-			ウィンク
-		</combo_box.item>
-		<combo_box.item name="Worry">
-			心配
-		</combo_box.item>
+		<combo_box.item name="[None]" label="None]" />
+		<combo_box.item name="Aaaaah" label="アーーーーー" />
+		<combo_box.item name="Afraid" label="怖れ" />
+		<combo_box.item name="Angry" label="怒り" />
+		<combo_box.item name="BigSmile" label="満面の笑み" />
+		<combo_box.item name="Bored" label="退屈" />
+		<combo_box.item name="Cry" label="泣く" />
+		<combo_box.item name="Disdain" label="侮蔑" />
+		<combo_box.item name="Embarrassed" label="困惑" />
+		<combo_box.item name="Frown" label="しかめっ面" />
+		<combo_box.item name="Kiss" label="キス" />
+		<combo_box.item name="Laugh" label="笑う" />
+		<combo_box.item name="Plllppt" label="Plllppt" />
+		<combo_box.item name="Repulsed" label="嫌悪感" />
+		<combo_box.item name="Sad" label="悲しい" />
+		<combo_box.item name="Shrug" label="肩をすくめる" />
+		<combo_box.item name="Smile" label="笑み" />
+		<combo_box.item name="Surprise" label="驚き" />
+		<combo_box.item name="Wink" label="ウィンク" />
+		<combo_box.item name="Worry" label="心配" />
 	</combo_box>
 	<spinner label="ﾌｪｰｽﾞｲﾝ(秒)" name="ease_in_time"
 	     tool_tip="アニメーションのブレンド・イン時間（秒）" />
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 4c3637d6a1..b046b48caa 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -68,15 +68,9 @@
 		土地を保有できるのはプレミアム・メンバーだけです
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly">
-			月額9.95米ドル、月払い
-		</combo_box.item>
-		<combo_box.item name="US$7.50/month,billedquarterly">
-			月額7.50米ドル、年4回払い
-		</combo_box.item>
-		<combo_box.item name="US$6.00/month,billedannually">
-			月額6.00米ドル、年払い
-		</combo_box.item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="月額9.95米ドル、月払い" />
+		<combo_box.item name="US$7.50/month,billedquarterly" label="月額7.50米ドル、年4回払い" />
+		<combo_box.item name="US$6.00/month,billedannually" label="月額6.00米ドル、年払い" />
 	</combo_box>
 	<text name="land_use_action">
 		毎月の土地使用料をUS$40に引き上げます
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 8d77542dc0..d822bd4203 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -122,29 +122,17 @@
 				目的地：
 			</text>
 			<combo_box name="destination">
-				<combo_box.item name="Selection">
-					選択
-				</combo_box.item>
-				<combo_box.item name="AgentRegion">
-					エージェント地域
-				</combo_box.item>
+				<combo_box.item name="Selection" label="選択" />
+				<combo_box.item name="AgentRegion" label="エージェント地域" />
 			</combo_box>
 			<text name="Request:">
 				要求：
 			</text>
 			<combo_box name="request">
-				<combo_box.item name="colliders&lt;steps&gt;">
-					コライダー＜ステップ＞
-				</combo_box.item>
-				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-					スクリプト＜回数＞、＜オプション・パターン＞
-				</combo_box.item>
-				<combo_box.item name="objects&lt;pattern&gt;">
-					オブジェクト＜パターン＞
-				</combo_box.item>
-				<combo_box.item name="rez&lt;asset_id&gt;">
-					rez &lt;asset_id&gt;
-				</combo_box.item>
+				<combo_box.item name="colliders&lt;steps&gt;" label="コライダー＜ステップ＞" />
+				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="スクリプト＜回数＞、＜オプション・パターン＞" />
+				<combo_box.item name="objects&lt;pattern&gt;" label="オブジェクト＜パターン＞" />
+				<combo_box.item name="rez&lt;asset_id&gt;" label="rez &lt;asset_id&gt;" />
 			</combo_box>
 			<text name="Parameter:">
 				パラメーター：
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index f2ff28d5f1..67d105c2a4 100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -10,21 +10,11 @@
 		アンチエイリアシング:
 	</text>
 	<combo_box label="アンチエイリアシング" name="fsaa">
-		<combo_box.item name="FSAADisabled">
-			無効
-		</combo_box.item>
-		<combo_box.item name="2x">
-			2x
-		</combo_box.item>
-		<combo_box.item name="4x">
-			4x
-		</combo_box.item>
-		<combo_box.item name="8x">
-			8x
-		</combo_box.item>
-		<combo_box.item name="16x">
-			16x
-		</combo_box.item>
+		<combo_box.item name="FSAADisabled" label="無効" />
+		<combo_box.item name="2x" label="2x" />
+		<combo_box.item name="4x" label="4x" />
+		<combo_box.item name="8x" label="8x" />
+		<combo_box.item name="16x" label="16x" />
 	</combo_box>
 	<spinner label="ガンマ：" name="gamma" />
 	<text name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index 3244a2f395..fae9c87da4 100644
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		ｲﾒｰｼﾞのﾌﾟﾚﾋﾞｭｰ：
 	</text>
 	<combo_box label="服の種類" name="clothing_type_combo">
-		<combo_box.item name="Image">
-			画像
-		</combo_box.item>
-		<combo_box.item name="Hair">
-			髪
-		</combo_box.item>
-		<combo_box.item name="FemaleHead">
-			女性の頭
-		</combo_box.item>
-		<combo_box.item name="FemaleUpperBody">
-			女性の上半身
-		</combo_box.item>
-		<combo_box.item name="FemaleLowerBody">
-			女性の下半身
-		</combo_box.item>
-		<combo_box.item name="MaleHead">
-			男性の頭
-		</combo_box.item>
-		<combo_box.item name="MaleUpperBody">
-			男性の上半身
-		</combo_box.item>
-		<combo_box.item name="MaleLowerBody">
-			男性の下半身
-		</combo_box.item>
-		<combo_box.item name="Skirt">
-			スカート
-		</combo_box.item>
-		<combo_box.item name="SculptedPrim">
-			変形されたプリム
-		</combo_box.item>
+		<combo_box.item name="Image" label="画像" />
+		<combo_box.item name="Hair" label="髪" />
+		<combo_box.item name="FemaleHead" label="女性の頭" />
+		<combo_box.item name="FemaleUpperBody" label="女性の上半身" />
+		<combo_box.item name="FemaleLowerBody" label="女性の下半身" />
+		<combo_box.item name="MaleHead" label="男性の頭" />
+		<combo_box.item name="MaleUpperBody" label="男性の上半身" />
+		<combo_box.item name="MaleLowerBody" label="男性の下半身" />
+		<combo_box.item name="Skirt" label="スカート" />
+		<combo_box.item name="SculptedPrim" label="変形されたプリム" />
 	</combo_box>
 	<text name="bad_image_text">
 		イメージを読み取れません。
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index f2269e429f..885a841127 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -37,123 +37,51 @@
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="カテゴリー -- この報告に最も適したカテゴリーを選択してください">
-		<combo_item name="Select_category">
-			カテゴリーを選択
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			年齢&gt;年齢偽証
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			年齢&gt;成人の住人がTeen Second Life上にいる
-		</combo_item>
+		<combo_box.item name="Select_category" label="カテゴリーを選択"/>
+		<combo_box.item name="Age__Age_play" label="年齢&gt;年齢偽証"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="年齢&gt;成人の住人がTeen Second Life上にいる"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			攻撃&gt;コンバット・サンドボックス/危険なエリア
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			攻撃&gt;安全なエリア
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			攻撃&gt;武器テスト用サンドボックス
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			商取引&gt;製品またはサービスの提供が行われない
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			開示 &gt; リアルワールドの情報
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			開示&gt;離れたところからチャットをモニターしている
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			開示&gt;Second Lifeの情報/チャット/IM
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			平穏を乱す行為&gt;地域リソースの使用が不公平
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			平穏を乱す行為&gt;スクリプト・オブジェクトの乱用
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			平穏を乱す行為&gt;オブジェクトの捨て置き
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			平穏を乱す行為&gt;繰り返しスパム
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			平穏を乱す行為&gt;不要な広告スパム
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			詐欺&gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			詐欺&gt;土地
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			詐欺&gt;マルチ商法またはチェーン・メール
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			詐欺&gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			嫌がらせ&gt;広告委託/視覚的なスパム
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			嫌がらせ&gt;個人またはグループの中傷
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			嫌がらせ&gt;移動の妨害
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			嫌がらせ&gt;性的な嫌がらせ
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			嫌がらせ&gt;利用規約（ToS）に違反する行為を行うよう他者を勧誘/扇動
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			嫌がらせ&gt;暴言
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			わいせつ&gt;著しく不快であると見なされるコンテンツまたは行為
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="攻撃&gt;コンバット・サンドボックス/危険なエリア"/>
+		<combo_box.item name="Assault__Safe_area" label="攻撃&gt;安全なエリア"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="攻撃&gt;武器テスト用サンドボックス"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="商取引&gt;製品またはサービスの提供が行われない"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="開示 &gt; リアルワールドの情報"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="開示&gt;離れたところからチャットをモニターしている"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="開示&gt;Second Lifeの情報/チャット/IM"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="平穏を乱す行為&gt;地域リソースの使用が不公平"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="平穏を乱す行為&gt;スクリプト・オブジェクトの乱用"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="平穏を乱す行為&gt;オブジェクトの捨て置き"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="平穏を乱す行為&gt;繰り返しスパム"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="平穏を乱す行為&gt;不要な広告スパム"/>
+		<combo_box.item name="Fraud__L$" label="詐欺&gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="詐欺&gt;土地"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="詐欺&gt;マルチ商法またはチェーン・メール"/>
+		<combo_box.item name="Fraud__US$" label="詐欺&gt; US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="嫌がらせ&gt;広告委託/視覚的なスパム"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="嫌がらせ&gt;個人またはグループの中傷"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="嫌がらせ&gt;移動の妨害"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="嫌がらせ&gt;性的な嫌がらせ"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="嫌がらせ&gt;利用規約（ToS）に違反する行為を行うよう他者を勧誘/扇動"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="嫌がらせ&gt;暴言"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="わいせつ&gt;著しく不快であると見なされるコンテンツまたは行為"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			わいせつ&gt;不適切なアバター名
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="わいせつ&gt;不適切なアバター名"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			知的財産の侵害 &gt; コンテンツの撤去
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			知的財産の侵害 &gt; コピーBot及び権限の悪用
-		</combo_item>
-		<combo_item name="Intolerance">
-			不寛容
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			土地&gt;サンドボックス・リソースの乱用
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			土地&gt;不法侵入&gt;オブジェクト/テクスチャー
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			土地&gt;不法侵入&gt;パーティクル
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			土地&gt;不法侵入&gt;樹木/植物
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			賭け/ギャンブル
-		</combo_item>
-		<combo_item name="Other">
-			その他
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="知的財産の侵害 &gt; コンテンツの撤去"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="知的財産の侵害 &gt; コピーBot及び権限の悪用"/>
+		<combo_box.item name="Intolerance" label="不寛容"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="土地&gt;サンドボックス・リソースの乱用"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="土地&gt;不法侵入&gt;オブジェクト/テクスチャー"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="土地&gt;不法侵入&gt;パーティクル"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="土地&gt;不法侵入&gt;樹木/植物"/>
+		<combo_box.item name="Wagering_gambling" label="賭け/ギャンブル"/>
+		<combo_box.item name="Other" label="その他"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		迷惑ユーザーの名前：
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index 3ca55621ac..47fb2e2f9b 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -34,15 +34,9 @@
 		誰にでも販売するか、特定の人にのみ販売するかを選択してください
 	</text>
 	<combo_box name="sell_to">
-		<combo_box.item name="--selectone--">
-			－－1つ選択－－
-		</combo_box.item>
-		<combo_box.item name="Anyone">
-			誰でも
-		</combo_box.item>
-		<combo_box.item name="Specificuser:">
-			特定ユーザー：
-		</combo_box.item>
+		<combo_box.item name="--selectone--" label="1つ選択－－" />
+		<combo_box.item name="Anyone" label="誰でも" />
+		<combo_box.item name="Specificuser:" label="特定ユーザー：" />
 	</combo_box>
 	<button label="選択..." name="sell_to_select_agent" />
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index 46d949ad81..133a8ce2cd 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="settings_debug" title="デバッグ設定">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE">
-			正
-		</combo_box.item>
-		<combo_box.item name="FALSE">
-			誤
-		</combo_box.item>
+		<combo_box.item name="TRUE" label="正" />
+		<combo_box.item name="FALSE" label="誤" />
 	</combo_box>
 	<color_swatch label="色" name="color_swatch" />
 	<spinner label="x" name="val_spinner_1" />
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 91bc489d3b..e389e7304f 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -38,75 +38,33 @@
 		形式
 	</text>
 	<combo_box label="解像度" name="postcard_size_combo">
-		<combo_box.item name="CurrentWindow">
-			現在のｳｨﾝﾄﾞｳ
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			カスタム
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="現在のｳｨﾝﾄﾞｳ" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="Custom" label="カスタム" />
 	</combo_box>
 	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow">
-			現在のｳｨﾝﾄﾞｳ
-		</combo_box.item>
-		<combo_box.item name="Small(128x128)">
-			小（128x128）
-		</combo_box.item>
-		<combo_box.item name="Medium(256x256)">
-			中（256x256）
-		</combo_box.item>
-		<combo_box.item name="Large(512x512)">
-			大（512x512）
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			カスタム
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="現在のｳｨﾝﾄﾞｳ" />
+		<combo_box.item name="Small(128x128)" label="小（128x128）" />
+		<combo_box.item name="Medium(256x256)" label="中（256x256）" />
+		<combo_box.item name="Large(512x512)" label="大（512x512）" />
+		<combo_box.item name="Custom" label="カスタム" />
 	</combo_box>
 	<combo_box label="解像度" name="local_size_combo">
-		<combo_box.item name="CurrentWindow">
-			現在のｳｨﾝﾄﾞｳ
-		</combo_box.item>
-		<combo_box.item name="320x240">
-			320x240
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="1280x1024">
-			1280x1024
-		</combo_box.item>
-		<combo_box.item name="1600x1200">
-			1600x1200
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			カスタム
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="現在のｳｨﾝﾄﾞｳ" />
+		<combo_box.item name="320x240" label="320x240" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="1280x1024" label="1280x1024" />
+		<combo_box.item name="1600x1200" label="1600x1200" />
+		<combo_box.item name="Custom" label="カスタム" />
 	</combo_box>
 	<combo_box label="形式" name="local_format_combo">
-		<combo_box.item name="PNG">
-			PNG
-		</combo_box.item>
-		<combo_box.item name="JPEG">
-			JPEG
-		</combo_box.item>
-		<combo_box.item name="BMP">
-			BMP
-		</combo_box.item>
+		<combo_box.item name="PNG" label="PNG" />
+		<combo_box.item name="JPEG" label="JPEG" />
+		<combo_box.item name="BMP" label="BMP" />
 	</combo_box>
 	<spinner label="幅" name="snapshot_width" label_width="25" width="90"/>
 	<spinner label="高さ" name="snapshot_height" label_width="30" left="115" width="90"/>
@@ -116,15 +74,9 @@
 		ｷｬﾌﾟﾁｬ：
 	</text>
 	<combo_box label="画像レイヤー" name="layer_types">
-		<combo_box.item name="Colors">
-			色
-		</combo_box.item>
-		<combo_box.item name="Depth">
-			深さ
-		</combo_box.item>
-		<combo_box.item name="ObjectMattes">
-			オグジェクトのつや消し
-		</combo_box.item>
+		<combo_box.item name="Colors" label="色" />
+		<combo_box.item name="Depth" label="深さ" />
+		<combo_box.item name="ObjectMattes" label="オグジェクトのつや消し" />
 	</combo_box>
 	<check_box label="インタフェースを表示" name="ui_check"/>
 	<check_box label="HUD オブジェクトを表示" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 44e585b7b3..a3d01362a3 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -20,15 +20,9 @@
 		ルーラー：
 	</text>
 	<combo_box left_delta="110" name="combobox grid mode" width="60">
-		<combo_item name="World">
-			世界
-		</combo_item>
-		<combo_item name="Local">
-			ローカル
-		</combo_item>
-		<combo_item name="Reference">
-			リファレンス
-		</combo_item>
+		<combo_box.item name="World" label="世界"/>
+		<combo_box.item name="Local" label="ローカル"/>
+		<combo_box.item name="Reference" label="リファレンス"/>
 	</combo_box>
 	<check_box label="両側を引伸ばす" left="116" name="checkbox uniform"/>
 	<check_box label="テクスチャーを引伸ばす" name="checkbox stretch textures"/>
@@ -150,27 +144,13 @@
 				左クリックすると：
 			</text>
 			<combo_box name="clickaction">
-				<combo_item name="Touch/grab(default)">
-					触る／つかむ (デフォルト)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					オブジェクトに座る
-				</combo_item>
-				<combo_item name="Buyobject">
-					オブジェクトを購入
-				</combo_item>
-				<combo_item name="Payobject">
-					オブジェクトへの支払い
-				</combo_item>
-				<combo_item name="Open">
-					開く
-				</combo_item>
-				<combo_item name="Play">
-					区画メディアを再生
-				</combo_item>
-				<combo_item name="Opemmedia">
-					区画メディアを開く
-				</combo_item>
+				<combo_box.item name="Touch/grab(default)" label="触る／つかむ (デフォルト)"/>
+				<combo_box.item name="Sitonobject" label="オブジェクトに座る"/>
+				<combo_box.item name="Buyobject" label="オブジェクトを購入"/>
+				<combo_box.item name="Payobject" label="オブジェクトへの支払い"/>
+				<combo_box.item name="Open" label="開く"/>
+				<combo_box.item name="Play" label="区画メディアを再生"/>
+				<combo_box.item name="Opemmedia" label="区画メディアを開く"/>
 			</combo_box>
 			<text name="B:">
 				B:
@@ -254,56 +234,26 @@
 				素材
 			</text>
 			<combo_box name="material">
-				<combo_item name="Stone">
-					石材
-				</combo_item>
-				<combo_item name="Metal">
-					金属
-				</combo_item>
-				<combo_item name="Glass">
-					ガラス
-				</combo_item>
-				<combo_item name="Wood">
-					木材
-				</combo_item>
-				<combo_item name="Flesh">
-					肌
-				</combo_item>
-				<combo_item name="Plastic">
-					プラスチック
-				</combo_item>
-				<combo_item name="Rubber">
-					ゴム
-				</combo_item>
+				<combo_box.item name="Stone" label="石材"/>
+				<combo_box.item name="Metal" label="金属"/>
+				<combo_box.item name="Glass" label="ガラス"/>
+				<combo_box.item name="Wood" label="木材"/>
+				<combo_box.item name="Flesh" label="肌"/>
+				<combo_box.item name="Plastic" label="プラスチック"/>
+				<combo_box.item name="Rubber" label="ゴム"/>
 			</combo_box>
 			<text name="label basetype">
 				建造物ブロック・タイプ
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					ボックス
-				</combo_item>
-				<combo_item name="Cylinder">
-					シリンダー
-				</combo_item>
-				<combo_item name="Prism">
-					プリズム
-				</combo_item>
-				<combo_item name="Sphere">
-					球形
-				</combo_item>
-				<combo_item name="Torus">
-					トーラス
-				</combo_item>
-				<combo_item name="Tube">
-					チューブ
-				</combo_item>
-				<combo_item name="Ring">
-					リング
-				</combo_item>
-				<combo_item name="Sculpted">
-					スカルプト
-				</combo_item>
+				<combo_box.item name="Box" label="ボックス"/>
+				<combo_box.item name="Cylinder" label="シリンダー"/>
+				<combo_box.item name="Prism" label="プリズム"/>
+				<combo_box.item name="Sphere" label="球形"/>
+				<combo_box.item name="Torus" label="トーラス"/>
+				<combo_box.item name="Tube" label="チューブ"/>
+				<combo_box.item name="Ring" label="リング"/>
+				<combo_box.item name="Sculpted" label="スカルプト"/>
 			</combo_box>
 			<text name="text cut">
 				ﾊﾟｽ･ｶｯﾄの始点と終点
@@ -320,18 +270,10 @@
 				中空（空洞）の形
 			</text>
 			<combo_box name="hole">
-				<combo_item name="Default">
-					デフォルト
-				</combo_item>
-				<combo_item name="Circle">
-					サークル
-				</combo_item>
-				<combo_item name="Square">
-					正方形
-				</combo_item>
-				<combo_item name="Triangle">
-					三角形
-				</combo_item>
+				<combo_box.item name="Default" label="デフォルト"/>
+				<combo_box.item name="Circle" label="サークル"/>
+				<combo_box.item name="Square" label="正方形"/>
+				<combo_box.item name="Triangle" label="三角形"/>
 			</combo_box>
 			<text name="text twist">
 				ひねりの始まりと終わり
@@ -380,21 +322,11 @@
 				縫い目のタイプ
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					（なし）
-				</combo_item>
-				<combo_item name="Sphere">
-					球形
-				</combo_item>
-				<combo_item name="Torus">
-					トーラス
-				</combo_item>
-				<combo_item name="Plane">
-					平面
-				</combo_item>
-				<combo_item name="Cylinder">
-					シリンダー
-				</combo_item>
+				<combo_box.item name="None" label="なし）"/>
+				<combo_box.item name="Sphere" label="球形"/>
+				<combo_box.item name="Torus" label="トーラス"/>
+				<combo_box.item name="Plane" label="平面"/>
+				<combo_box.item name="Cylinder" label="シリンダー"/>
 			</combo_box>
 		</panel>
 		<panel label="特徴" name="Features">
@@ -436,88 +368,40 @@
 				マッピング
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					デフォルト
-				</combo_item>
-				<combo_item name="Planar">
-					平面
-				</combo_item>
+				<combo_box.item name="Default" label="デフォルト"/>
+				<combo_box.item name="Planar" label="平面"/>
 			</combo_box>
 			<text name="label shininess">
 				輝き
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					なし
-				</combo_item>
-				<combo_item name="Low">
-					低
-				</combo_item>
-				<combo_item name="Medium">
-					中
-				</combo_item>
-				<combo_item name="High">
-					高
-				</combo_item>
+				<combo_box.item name="None" label="なし"/>
+				<combo_box.item name="Low" label="低"/>
+				<combo_box.item name="Medium" label="中"/>
+				<combo_box.item name="High" label="高"/>
 			</combo_box>
 			<text name="label bumpiness">
 				凹凸
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					なし
-				</combo_item>
-				<combo_item name="Brightness">
-					明るさ
-				</combo_item>
-				<combo_item name="Darkness">
-					暗さ
-				</combo_item>
-				<combo_item name="woodgrain">
-					木目調
-				</combo_item>
-				<combo_item name="bark">
-					木の皮
-				</combo_item>
-				<combo_item name="bricks">
-					レンガ
-				</combo_item>
-				<combo_item name="checker">
-					チェッカー
-				</combo_item>
-				<combo_item name="concrete">
-					コンクリート
-				</combo_item>
-				<combo_item name="crustytile">
-					クラスティ・タイル
-				</combo_item>
-				<combo_item name="cutstone">
-					カットストーン
-				</combo_item>
-				<combo_item name="discs">
-					ディスク
-				</combo_item>
-				<combo_item name="gravel">
-					砂利
-				</combo_item>
-				<combo_item name="petridish">
-					ペトリ
-				</combo_item>
-				<combo_item name="siding">
-					羽目板
-				</combo_item>
-				<combo_item name="stonetile">
-					ストーン・タイル
-				</combo_item>
-				<combo_item name="stucco">
-					しっくい
-				</combo_item>
-				<combo_item name="suction">
-					吸い込み
-				</combo_item>
-				<combo_item name="weave">
-					織目
-				</combo_item>
+				<combo_box.item name="None" label="なし"/>
+				<combo_box.item name="Brightness" label="明るさ"/>
+				<combo_box.item name="Darkness" label="暗さ"/>
+				<combo_box.item name="woodgrain" label="木目調"/>
+				<combo_box.item name="bark" label="木の皮"/>
+				<combo_box.item name="bricks" label="レンガ"/>
+				<combo_box.item name="checker" label="チェッカー"/>
+				<combo_box.item name="concrete" label="コンクリート"/>
+				<combo_box.item name="crustytile" label="クラスティ・タイル"/>
+				<combo_box.item name="cutstone" label="カットストーン"/>
+				<combo_box.item name="discs" label="ディスク"/>
+				<combo_box.item name="gravel" label="砂利"/>
+				<combo_box.item name="petridish" label="ペトリ"/>
+				<combo_box.item name="siding" label="羽目板"/>
+				<combo_box.item name="stonetile" label="ストーン・タイル"/>
+				<combo_box.item name="stucco" label="しっくい"/>
+				<combo_box.item name="suction" label="吸い込み"/>
+				<combo_box.item name="weave" label="織目"/>
 			</combo_box>
 			<text name="tex scale">
 				面ごとに繰り返す
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index 0038f995b4..bc60bda694 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -50,15 +50,11 @@
 	<check_box label="" name="event_mature_chk" />
 	<combo_box label="オンラインのフレンド" name="friend combo"
 	     tool_tip="Friend to Show on Map">
-		<combo_box.item name="none_selected">
-			オンラインのフレンド
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="オンラインのフレンド" />
 	</combo_box>
 	<combo_box label="ランドマーク" name="landmark combo"
 	     tool_tip="Landmark to Show on Map">
-		<combo_box.item name="none_selected">
-			ランドマーク
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="ランドマーク" />
 	</combo_box>
 	<line_editor label="地域名で検索" name="location"
 	     tool_tip="地域名を入力してください。" />
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index d42d0ddbdf..4f2762de31 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -15,15 +15,9 @@
 		ログイン位置：
 	</text>
 	<combo_box name="start_location_combo" left_delta="92" width="172">
-		<combo_box.item name="MyHome">
-			自宅（ホーム）
-		</combo_box.item>
-		<combo_box.item name="MyLastLocation">
-			最後にログアウトした場所
-		</combo_box.item>
-		<combo_box.item name="Typeregionname">
-			&lt; 地域の名前入力 &gt;
-		</combo_box.item>
+		<combo_box.item name="MyHome" label="自宅（ホーム）" />
+		<combo_box.item name="MyLastLocation" label="最後にログアウトした場所" />
+		<combo_box.item name="Typeregionname" label="lt; 地域の名前入力 &gt;" />
 	</combo_box>
 	<check_box label="パスワードを記憶" name="remember_check" left_delta="180"/>
 	<text name="full_screen_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 923e998e55..d7b14608cd 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -10,15 +10,9 @@
 	</radio_group>
 	<check_box label="ログイン画面にログイン位置を表示" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox">
-		<combo_item name="Never">
-			なし
-		</combo_item>
-		<combo_item name="Show Temporarily">
-			一時的に表示
-		</combo_item>
-		<combo_item name="Always">
-			いつも
-		</combo_item>
+		<combo_box.item name="Never" label="なし"/>
+		<combo_box.item name="Show Temporarily" label="一時的に表示"/>
+		<combo_box.item name="Always" label="いつも"/>
 	</combo_box>
 	<check_box label="小さなアバター名" name="small_avatar_names_checkbox"/>
 	<check_box label="画面上で自分の名前を隠す" name="show_my_name_checkbox"/>
@@ -59,59 +53,25 @@
 		&lt;地域の名前入力&gt;
 	</string>
 	<combo_box name="crash_behavior_combobox">
-		<combo_item length="1" name="Askbeforesending" type="string">
-			送る前に確認する
-		</combo_item>
-		<combo_item length="1" name="Alwayssend" type="string">
-			常に送信
-		</combo_item>
-		<combo_item length="1" name="Neversend" type="string">
-			送信しない
-		</combo_item>
+		<combo_box.item length="1" name="Askbeforesending" type="string" label="送る前に確認する"/>
+		<combo_box.item length="1" name="Alwayssend" type="string" label="常に送信"/>
+		<combo_box.item length="1" name="Neversend" type="string" label="送信しない"/>
 	</combo_box>
 	<combo_box name="language_combobox">
-		<combo_item length="1" name="System Default Language" type="string">
-			システム・デフォルト
-		</combo_item>
-		<combo_item length="1" name="English" type="string">
-			English (英語)
-		</combo_item>
-		<combo_item length="1" name="Danish" type="string">
-			Dansk (デンマーク語) – ベータ
-		</combo_item>
-		<combo_item length="1" name="Deutsch(German)" type="string">
-			Deutsch (ドイツ語) – ベータ
-		</combo_item>
-		<combo_item length="1" name="Spanish" type="string">
-			Español (スペイン語) – ベータ
-		</combo_item>
-		<combo_item length="1" name="French" type="string">
-			Français (フランス語) – ベータ
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (ハンガリー語) - ベータ
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (ポーランド語) - ベータ
-		</combo_item>
-		<combo_item length="1" name="Portugese" type="string">
-			Português (ポルトガル語) – ベータ
-		</combo_item>
-		<combo_item name="Russian">
-			Русский (ロシア語) - ベータ
-		</combo_item>
-		<combo_item name="Ukrainian">
-			Українська (ウクライナ語) - ベータ
-		</combo_item>
-		<combo_item length="1" name="Chinese" type="string">
-			中文 (简体) (中国語) - ベータ
-		</combo_item>
-		<combo_item length="1" name="(Japanese)" type="string">
-			日本語 – ベータ
-		</combo_item>
-		<combo_item length="1" name="(Korean)" type="string">
-			한국어 (韓国語) – ベータ
-		</combo_item>
+		<combo_box.item length="1" name="System Default Language" type="string" label="システム・デフォルト"/>
+		<combo_box.item length="1" name="English" type="string" label="English (英語)"/>
+		<combo_box.item length="1" name="Danish" type="string" label="Dansk (デンマーク語) – ベータ"/>
+		<combo_box.item length="1" name="Deutsch(German)" type="string" label="Deutsch (ドイツ語) – ベータ"/>
+		<combo_box.item length="1" name="Spanish" type="string" label="Español (スペイン語) – ベータ"/>
+		<combo_box.item length="1" name="French" type="string" label="Français (フランス語) – ベータ"/>
+		<combo_box.item name="Hungarian" label="Magyar (ハンガリー語) - ベータ"/>
+		<combo_box.item name="Polish" label="Polski (ポーランド語) - ベータ"/>
+		<combo_box.item length="1" name="Portugese" type="string" label="Português (ポルトガル語) – ベータ"/>
+		<combo_box.item name="Russian" label="Русский (ロシア語) - ベータ"/>
+		<combo_box.item name="Ukrainian" label="Українська (ウクライナ語) - ベータ"/>
+		<combo_box.item length="1" name="Chinese" type="string" label="中文 (简体) (中国語) - ベータ"/>
+		<combo_box.item length="1" name="(Japanese)" type="string" label="日本語 – ベータ"/>
+		<combo_box.item length="1" name="(Korean)" type="string" label="한국어 (韓国語) – ベータ"/>
 	</combo_box>
 	<check_box label="言語をオブジェクトと共有" name="language_is_public" tool_tip="優先言語をインワールドのオブジェクトが認識する"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 7a7cf8cb3a..60be45a064 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -21,21 +21,11 @@
 		ウィンドウ・サイズ：
 	</text>
 	<combo_box name="windowsize combo">
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="720x480">
-			720x480 (NTSC)
-		</combo_box.item>
-		<combo_box.item name="768x576">
-			768x576 (PAL)
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="720x480" label="720x480 (NTSC)" />
+		<combo_box.item name="768x576" label="768x576 (PAL)" />
+		<combo_box.item name="1024x768" label="1024x768" />
 	</combo_box>
 	<text name="DisplayResLabel">
 		表示解像度：
@@ -44,18 +34,10 @@
 		縦横比：
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="（幅/高さ）">
-		<combo_box.item type="string" length="1" name="4:3(StandardCRT)">
-			4：3（標準CRT）
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
-			5：4（1280x1024 LCD）
-		</combo_box.item>
-		<combo_box.item name="8:5(Widescreen)">
-			8：5（ワイドスクリ－ン）
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="16:9(Widescreen)">
-			16：9（ワイドスクリ－ン）
-		</combo_box.item>
+		<combo_box.item type="string" length="1" name="4:3(StandardCRT)" label="4：3（標準CRT）" />
+		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)" label="5：4（1280x1024 LCD）" />
+		<combo_box.item name="8:5(Widescreen)" label="8：5（ワイドスクリ－ン）" />
+		<combo_box.item type="string" length="1" name="16:9(Widescreen)" label="16：9（ワイドスクリ－ン）" />
 	</combo_box>
 	<check_box label="自動検出率" name="aspect_auto_detect" />
 	<text type="string" length="1" name="UI Size:">
diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml
index 796418da4b..6a11d4e853 100644
--- a/indra/newview/skins/default/xui/nl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml
@@ -252,43 +252,19 @@
 			<check_box label="Niet duwen" name="PushRestrictCheck" tool_tip="Weerhoudt scripts van duwen. Het aanvinken van deze optie kan handig zijn om storend gedrag op uw land te voorkomen."/>
 			<check_box label="Toon plaats in Zoeken (L$30/week) onder" name="ShowDirectoryCheck" tool_tip="Laat mensen dit perceel zien in zoekresultaten."/>
 			<combo_box name="land category">
-				<combo_item name="AnyCategory">
-					Alle categorieën
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Linden Locatie
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="Alle categorieën"/>
+				<combo_box.item name="LindenLocation" label="Linden Locatie"/>
 
-				<combo_item name="Arts&amp;Culture">
-					Kunst &amp; Cultuur
-				</combo_item>
-				<combo_item name="Business">
-					Zakelijk
-				</combo_item>
-				<combo_item name="Educational">
-					Educatief
-				</combo_item>
-				<combo_item name="Gaming">
-					Spelen
-				</combo_item>
-				<combo_item name="Hangout">
-					Ontmoetingsplaats
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Nieuwkomervriendelijk
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parken &amp; Natuur
-				</combo_item>
-				<combo_item name="Residential">
-					Woongebied
-				</combo_item>
-				<combo_item name="Shopping">
-					Winkelen
-				</combo_item>
-				<combo_item name="Other">
-					Anders
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="Kunst &amp; Cultuur"/>
+				<combo_box.item name="Business" label="Zakelijk"/>
+				<combo_box.item name="Educational" label="Educatief"/>
+				<combo_box.item name="Gaming" label="Spelen"/>
+				<combo_box.item name="Hangout" label="Ontmoetingsplaats"/>
+				<combo_box.item name="NewcomerFriendly" label="Nieuwkomervriendelijk"/>
+				<combo_box.item name="Parks&amp;Nature" label="Parken &amp; Natuur"/>
+				<combo_box.item name="Residential" label="Woongebied"/>
+				<combo_box.item name="Shopping" label="Winkelen"/>
+				<combo_box.item name="Other" label="Anders"/>
 			</combo_box>
 			<button label="?" label_selected="?" name="?"/>
 			<check_box name="MatureCheck" />
@@ -308,15 +284,9 @@
 				Teleport routering:
 			</text>
 			<combo_box name="landing type" tool_tip="Teleport routering -- selecteer hoe teleports naar uw land moeten worden afgehandeld.">
-				<combo_item name="Blocked">
-					Geblokkeerd
-				</combo_item>
-				<combo_item name="LandingPoint">
-					Landingsplaats
-				</combo_item>
-				<combo_item name="Anywhere">
-					Overal
-				</combo_item>
+				<combo_box.item name="Blocked" label="Geblokkeerd"/>
+				<combo_box.item name="LandingPoint" label="Landingsplaats"/>
+				<combo_box.item name="Anywhere" label="Overal"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				Niet duwen
@@ -398,12 +368,8 @@
 			<check_box label="Groepstoegang toestaan: [GROUP]" name="GroupCheck" tool_tip="Stel de groep in op het tabblad Algemeen"/>
 			<check_box label="Verkoop toegangspassen aan:" name="PassCheck" tool_tip="Tijdelijke toegang tot dit perceel toestaan"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					Iedereen
-				</combo_item>
-				<combo_item name="Group">
-					Groep
-				</combo_item>
+				<combo_box.item name="Anyone" label="Iedereen"/>
+				<combo_box.item name="Group" label="Groep"/>
 			</combo_box>
 			<spinner label="Prijs in L$:" name="PriceSpin"/>
 			<spinner label="Toegangsuren" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_buy_land.xml b/indra/newview/skins/default/xui/nl/floater_buy_land.xml
index b3bf48c4f4..228d05d6e9 100644
--- a/indra/newview/skins/default/xui/nl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_buy_land.xml
@@ -66,15 +66,9 @@
 		Alleen premiumleden kunnen land bezitten.
 	</text>
 	<combo_box name="account_level">
-		<combo_item name="US$9.95/month,billedmonthly">
-			US$9.95/maand, gefactureerd per maand
-		</combo_item>
-		<combo_item name="US$7.50/month,billedquarterly">
-			US$7.50/maand, gefactureerd per kwartaal
-		</combo_item>
-		<combo_item name="US$6.00/month,billedannually">
-			US$6.00/maand, gefactureerd per jaar
-		</combo_item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="US$9.95/maand, gefactureerd per maand"/>
+		<combo_box.item name="US$7.50/month,billedquarterly" label="US$7.50/maand, gefactureerd per kwartaal"/>
+		<combo_box.item name="US$6.00/month,billedannually" label="US$6.00/maand, gefactureerd per jaar"/>
 	</combo_box>
 	<text name="land_use_action">
 		Verhoog uw maandelijkse landgebruikskosten tot US$ 40/maand
diff --git a/indra/newview/skins/default/xui/nl/floater_report_abuse.xml b/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
index 5985bf830b..eefbc6797b 100644
--- a/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
@@ -36,123 +36,51 @@
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="Categorie -- selecteer de categorie die dit rapport het best beschrijft">
-		<combo_item name="Select_category">
-			Selecteer categorie
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Leeftijd &gt; Leeftijd spelen
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Leeftijd &gt; Volwassen inwoner in Teen Second Life
-		</combo_item>
+		<combo_box.item name="Select_category" label="Selecteer categorie"/>
+		<combo_box.item name="Age__Age_play" label="Leeftijd &gt; Leeftijd spelen"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Leeftijd &gt; Volwassen inwoner in Teen Second Life"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Aanval &gt; Gevechtszandbak / onveilig gebied
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Aanval &gt; Veilig gebied
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Aanval &gt; Zandbak voor het testen van wapens
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Handel &gt; Product of dienst is niet geleverd
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Openbaring &gt; Echte wereld informatie
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Openbaring &gt; Op afstand chat afluisteren
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Openbaring &gt; Second Life informatie/chat/IMs
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Vredebreuk &gt; Oneerlijk gebruik van regiomiddelen
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Vredebreuk &gt; Excessieve gescripte objecten
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Vredebreuk &gt; Objecten laten rondslingeren
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Vredebreuk &gt; Herhaalde spam
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Vredebreuk &gt; Ongewenste reclame-spam
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Fraude &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Fraude &gt; Land
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Fraude &gt; Piramideschema of kettingbrief
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Fraude &gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Intimidatie &gt; Reclameverzamelingen / visuele spam
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Intimidatie &gt; Individuen of groepen in diskrediet brengen
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Intimidatie &gt; Beweging verhinderen
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Intimidatie &gt; Seksuele intimidatie
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Intimidatie &gt; Anderen uitnodigen/aanzetten tot het schenden van de ToS
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Intimidatie &gt; Verbaal misbruik
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Onfatsoenlijkheid &gt; Globaal beledigende inhoud of gedrag
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Aanval &gt; Gevechtszandbak / onveilig gebied"/>
+		<combo_box.item name="Assault__Safe_area" label="Aanval &gt; Veilig gebied"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Aanval &gt; Zandbak voor het testen van wapens"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Handel &gt; Product of dienst is niet geleverd"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Openbaring &gt; Echte wereld informatie"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Openbaring &gt; Op afstand chat afluisteren"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Openbaring &gt; Second Life informatie/chat/IMs"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Vredebreuk &gt; Oneerlijk gebruik van regiomiddelen"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Vredebreuk &gt; Excessieve gescripte objecten"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Vredebreuk &gt; Objecten laten rondslingeren"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Vredebreuk &gt; Herhaalde spam"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Vredebreuk &gt; Ongewenste reclame-spam"/>
+		<combo_box.item name="Fraud__L$" label="Fraude &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Fraude &gt; Land"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Fraude &gt; Piramideschema of kettingbrief"/>
+		<combo_box.item name="Fraud__US$" label="Fraude &gt; US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Intimidatie &gt; Reclameverzamelingen / visuele spam"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Intimidatie &gt; Individuen of groepen in diskrediet brengen"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Intimidatie &gt; Beweging verhinderen"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Intimidatie &gt; Seksuele intimidatie"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Intimidatie &gt; Anderen uitnodigen/aanzetten tot het schenden van de ToS"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Intimidatie &gt; Verbaal misbruik"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Onfatsoenlijkheid &gt; Globaal beledigende inhoud of gedrag"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Onfatsoenlijkheid &gt; Ongepaste avatar naam
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Onfatsoenlijkheid &gt; Ongepaste avatar naam"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Inbreuk op intellectueel eigendom &gt; Verwijderen van inhoud
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Inbreuk op intellectueel eigendom &gt; CopyBot of misbruik van permissies
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intolerantie
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Land &gt; Misbruik van zandbakmiddelen
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Land &gt; Indringing &gt; Objecten/texturen
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Land &gt; Indringing &gt; Particles
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Land &gt; Indringing &gt; Bomen/planten
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Weddenschappen/gokken
-		</combo_item>
-		<combo_item name="Other">
-			Anders
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Inbreuk op intellectueel eigendom &gt; Verwijderen van inhoud"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Inbreuk op intellectueel eigendom &gt; CopyBot of misbruik van permissies"/>
+		<combo_box.item name="Intolerance" label="Intolerantie"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Land &gt; Misbruik van zandbakmiddelen"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Land &gt; Indringing &gt; Objecten/texturen"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Land &gt; Indringing &gt; Particles"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Land &gt; Indringing &gt; Bomen/planten"/>
+		<combo_box.item name="Wagering_gambling" label="Weddenschappen/gokken"/>
+		<combo_box.item name="Other" label="Anders"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Misbruikernaam:
diff --git a/indra/newview/skins/default/xui/nl/floater_sell_land.xml b/indra/newview/skins/default/xui/nl/floater_sell_land.xml
index b90869d7e0..e8a65d0845 100644
--- a/indra/newview/skins/default/xui/nl/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_sell_land.xml
@@ -34,15 +34,9 @@
 		Kies of u aan iedereen wil verkopen of een specifieke koper.
 	</text>
 	<combo_box name="sell_to">
-		<combo_item name="--selectone--">
-			-- selecteer een --
-		</combo_item>
-		<combo_item name="Anyone">
-			Iedereen
-		</combo_item>
-		<combo_item name="Specificuser:">
-			Specifieke gebruiker:
-		</combo_item>
+		<combo_box.item name="--selectone--" label="selecteer een --"/>
+		<combo_box.item name="Anyone" label="Iedereen"/>
+		<combo_box.item name="Specificuser:" label="Specifieke gebruiker:"/>
 	</combo_box>
 	<button label="Selecteren..." name="sell_to_select_agent"/>
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/nl/floater_snapshot.xml b/indra/newview/skins/default/xui/nl/floater_snapshot.xml
index e4279bffc4..6e3c71509e 100644
--- a/indra/newview/skins/default/xui/nl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/nl/floater_snapshot.xml
@@ -34,75 +34,33 @@
 		Formaat
 	</text>
 	<combo_box label="Resolutie" name="postcard_size_combo">
-		<combo_item name="CurrentWindow">
-			Huidig venster
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="Custom">
-			Aangepast
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Huidig venster"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="Custom" label="Aangepast"/>
 	</combo_box>
 	<combo_box label="Resolutie" name="texture_size_combo">
-		<combo_item name="CurrentWindow">
-			Huidig venster
-		</combo_item>
-		<combo_item name="Small(128x128)">
-			Klein (128x128)
-		</combo_item>
-		<combo_item name="Medium(256x256)">
-			Middel (256x256)
-		</combo_item>
-		<combo_item name="Large(512x512)">
-			Groot (512x512)
-		</combo_item>
-		<combo_item name="Custom">
-			Aangepast
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Huidig venster"/>
+		<combo_box.item name="Small(128x128)" label="Klein (128x128)"/>
+		<combo_box.item name="Medium(256x256)" label="Middel (256x256)"/>
+		<combo_box.item name="Large(512x512)" label="Groot (512x512)"/>
+		<combo_box.item name="Custom" label="Aangepast"/>
 	</combo_box>
 	<combo_box label="Resolutie" name="local_size_combo">
-		<combo_item name="CurrentWindow">
-			Huidig venster
-		</combo_item>
-		<combo_item name="320x240">
-			320x240
-		</combo_item>
-		<combo_item name="640x480">
-			640x480
-		</combo_item>
-		<combo_item name="800x600">
-			800x600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024x768
-		</combo_item>
-		<combo_item name="1280x1024">
-			1280x1024
-		</combo_item>
-		<combo_item name="1600x1200">
-			1600x1200
-		</combo_item>
-		<combo_item name="Custom">
-			Aangepast
-		</combo_item>
+		<combo_box.item name="CurrentWindow" label="Huidig venster"/>
+		<combo_box.item name="320x240" label="320x240"/>
+		<combo_box.item name="640x480" label="640x480"/>
+		<combo_box.item name="800x600" label="800x600"/>
+		<combo_box.item name="1024x768" label="1024x768"/>
+		<combo_box.item name="1280x1024" label="1280x1024"/>
+		<combo_box.item name="1600x1200" label="1600x1200"/>
+		<combo_box.item name="Custom" label="Aangepast"/>
 	</combo_box>
 	<combo_box label="Formaat" name="local_format_combo">
-		<combo_item name="PNG">
-			PNG
-		</combo_item>
-		<combo_item name="JPEG">
-			JPEG
-		</combo_item>
-		<combo_item name="BMP">
-			BMP
-		</combo_item>
+		<combo_box.item name="PNG" label="PNG"/>
+		<combo_box.item name="JPEG" label="JPEG"/>
+		<combo_box.item name="BMP" label="BMP"/>
 	</combo_box>
 	<spinner label="Breedte" name="snapshot_width"/>
 	<spinner label="Hoogte" name="snapshot_height"/>
@@ -112,15 +70,9 @@
 		Vastleggen:
 	</text>
 	<combo_box label="Afbeeldingslagen" name="layer_types">
-		<combo_item name="Colors">
-			Kleuren
-		</combo_item>
-		<combo_item name="Depth">
-			Diepte
-		</combo_item>
-		<combo_item name="ObjectMattes">
-			Object matheid
-		</combo_item>
+		<combo_box.item name="Colors" label="Kleuren"/>
+		<combo_box.item name="Depth" label="Diepte"/>
+		<combo_box.item name="ObjectMattes" label="Object matheid"/>
 	</combo_box>
 	<check_box label="Toon interface in foto" name="ui_check"/>
 	<check_box label="Toon HUD objecten in foto" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml
index e9acab9dd0..9e542799f0 100644
--- a/indra/newview/skins/default/xui/nl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tools.xml
@@ -20,15 +20,9 @@
 		Liniaal modus
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_item name="World">
-			Wereld
-		</combo_item>
-		<combo_item name="Local">
-			Lokaal
-		</combo_item>
-		<combo_item name="Reference">
-			Referentie
-		</combo_item>
+		<combo_box.item name="World" label="Wereld"/>
+		<combo_box.item name="Local" label="Lokaal"/>
+		<combo_box.item name="Reference" label="Referentie"/>
 	</combo_box>
 	<check_box label="Beide zijden uitrekken" name="checkbox uniform"/>
 	<check_box label="Texturen uitrekken" name="checkbox stretch textures"/>
@@ -64,15 +58,9 @@
 	<check_box label="Land opruwen" name="radio noise"/>
 	<check_box label="Herstel land" name="radio revert"/>
 	<combo_box name="combobox brush size">
-		<combo_item name="Small">
-			Klein
-		</combo_item>
-		<combo_item name="Medium">
-			Medium
-		</combo_item>
-		<combo_item name="Large">
-			Groot
-		</combo_item>
+		<combo_box.item name="Small" label="Klein"/>
+		<combo_box.item name="Medium" label="Medium"/>
+		<combo_box.item name="Large" label="Groot"/>
 	</combo_box>
 	<text name="Strength:">
 		Sterkte:
@@ -155,27 +143,13 @@
 				Wanneer links-geklikt:
 			</text>
 			<combo_box name="clickaction">
-				<combo_item name="Touch/grab(default)">
-					Aanraken/pakken (standaard)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					Zit op object
-				</combo_item>
-				<combo_item name="Buyobject">
-					Koop object
-				</combo_item>
-				<combo_item name="Payobject">
-					Betaal object
-				</combo_item>
-				<combo_item name="Open">
-					Open
-				</combo_item>
-				<combo_item name="Play">
-					Perceelmedia afspelen
-				</combo_item>
-				<combo_item name="Opemmedia">
-					Perceelmedia openen
-				</combo_item>
+				<combo_box.item name="Touch/grab(default)" label="Aanraken/pakken (standaard)"/>
+				<combo_box.item name="Sitonobject" label="Zit op object"/>
+				<combo_box.item name="Buyobject" label="Koop object"/>
+				<combo_box.item name="Payobject" label="Betaal object"/>
+				<combo_box.item name="Open" label="Open"/>
+				<combo_box.item name="Play" label="Perceelmedia afspelen"/>
+				<combo_box.item name="Opemmedia" label="Perceelmedia openen"/>
 			</combo_box>
 			<text name="B:">
 				B:
@@ -259,56 +233,26 @@
 				Materiaal
 			</text>
 			<combo_box name="material">
-				<combo_item name="Stone">
-					Steen
-				</combo_item>
-				<combo_item name="Metal">
-					Metaal
-				</combo_item>
-				<combo_item name="Glass">
-					Glas
-				</combo_item>
-				<combo_item name="Wood">
-					Hout
-				</combo_item>
-				<combo_item name="Flesh">
-					Vlees
-				</combo_item>
-				<combo_item name="Plastic">
-					Plastic
-				</combo_item>
-				<combo_item name="Rubber">
-					Rubber
-				</combo_item>
+				<combo_box.item name="Stone" label="Steen"/>
+				<combo_box.item name="Metal" label="Metaal"/>
+				<combo_box.item name="Glass" label="Glas"/>
+				<combo_box.item name="Wood" label="Hout"/>
+				<combo_box.item name="Flesh" label="Vlees"/>
+				<combo_box.item name="Plastic" label="Plastic"/>
+				<combo_box.item name="Rubber" label="Rubber"/>
 			</combo_box>
 			<text name="label basetype">
 				Bouwbloktype
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					Kubus
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilinder
-				</combo_item>
-				<combo_item name="Prism">
-					Prisma
-				</combo_item>
-				<combo_item name="Sphere">
-					Bol
-				</combo_item>
-				<combo_item name="Torus">
-					Torus
-				</combo_item>
-				<combo_item name="Tube">
-					Buis
-				</combo_item>
-				<combo_item name="Ring">
-					Ring
-				</combo_item>
-				<combo_item name="Sculpted">
-					Sculpted
-				</combo_item>
+				<combo_box.item name="Box" label="Kubus"/>
+				<combo_box.item name="Cylinder" label="Cilinder"/>
+				<combo_box.item name="Prism" label="Prisma"/>
+				<combo_box.item name="Sphere" label="Bol"/>
+				<combo_box.item name="Torus" label="Torus"/>
+				<combo_box.item name="Tube" label="Buis"/>
+				<combo_box.item name="Ring" label="Ring"/>
+				<combo_box.item name="Sculpted" label="Sculpted"/>
 			</combo_box>
 			<text name="text cut">
 				Uitsnede begin en einde
@@ -325,18 +269,10 @@
 				Holtevorm
 			</text>
 			<combo_box name="hole">
-				<combo_item name="Default">
-					Standaard
-				</combo_item>
-				<combo_item name="Circle">
-					Cirkel
-				</combo_item>
-				<combo_item name="Square">
-					Vierkant
-				</combo_item>
-				<combo_item name="Triangle">
-					Driehoek
-				</combo_item>
+				<combo_box.item name="Default" label="Standaard"/>
+				<combo_box.item name="Circle" label="Cirkel"/>
+				<combo_box.item name="Square" label="Vierkant"/>
+				<combo_box.item name="Triangle" label="Driehoek"/>
 			</combo_box>
 			<text name="text twist">
 				Verdraai begin en einde
@@ -382,21 +318,11 @@
 				Hechtingstype
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					(none)
-				</combo_item>
-				<combo_item name="Sphere">
-					Bol
-				</combo_item>
-				<combo_item name="Torus">
-					Torus
-				</combo_item>
-				<combo_item name="Plane">
-					Vlak
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilinder
-				</combo_item>
+				<combo_box.item name="None" label="none)"/>
+				<combo_box.item name="Sphere" label="Bol"/>
+				<combo_box.item name="Torus" label="Torus"/>
+				<combo_box.item name="Plane" label="Vlak"/>
+				<combo_box.item name="Cylinder" label="Cilinder"/>
 			</combo_box>
 		</panel>
 		<panel label="Kenmerken" name="Features">
@@ -438,88 +364,40 @@
 				Mapping
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					Standaard
-				</combo_item>
-				<combo_item name="Planar">
-					Vlak
-				</combo_item>
+				<combo_box.item name="Default" label="Standaard"/>
+				<combo_box.item name="Planar" label="Vlak"/>
 			</combo_box>
 			<text name="label shininess">
 				Glans
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					Geen
-				</combo_item>
-				<combo_item name="Low">
-					Laag
-				</combo_item>
-				<combo_item name="Medium">
-					Middel
-				</combo_item>
-				<combo_item name="High">
-					Hoog
-				</combo_item>
+				<combo_box.item name="None" label="Geen"/>
+				<combo_box.item name="Low" label="Laag"/>
+				<combo_box.item name="Medium" label="Middel"/>
+				<combo_box.item name="High" label="Hoog"/>
 			</combo_box>
 			<text name="label bumpiness">
 				Bumpiness
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					Geen
-				</combo_item>
-				<combo_item name="Brightness">
-					Helderheid
-				</combo_item>
-				<combo_item name="Darkness">
-					Donkerheid
-				</combo_item>
-				<combo_item name="woodgrain">
-					Houtnerf
-				</combo_item>
-				<combo_item name="bark">
-					Schors
-				</combo_item>
-				<combo_item name="bricks">
-					Stenen
-				</combo_item>
-				<combo_item name="checker">
-					Dambord
-				</combo_item>
-				<combo_item name="concrete">
-					Beton
-				</combo_item>
-				<combo_item name="crustytile">
-					gebarsten tegels
-				</combo_item>
-				<combo_item name="cutstone">
-					natuursteen
-				</combo_item>
-				<combo_item name="discs">
-					schijven
-				</combo_item>
-				<combo_item name="gravel">
-					grind
-				</combo_item>
-				<combo_item name="petridish">
-					petrischaal
-				</combo_item>
-				<combo_item name="siding">
-					wandpaneel
-				</combo_item>
-				<combo_item name="stonetile">
-					plavuizen
-				</combo_item>
-				<combo_item name="stucco">
-					stucwerk
-				</combo_item>
-				<combo_item name="suction">
-					zuignappen
-				</combo_item>
-				<combo_item name="weave">
-					weven
-				</combo_item>
+				<combo_box.item name="None" label="Geen"/>
+				<combo_box.item name="Brightness" label="Helderheid"/>
+				<combo_box.item name="Darkness" label="Donkerheid"/>
+				<combo_box.item name="woodgrain" label="Houtnerf"/>
+				<combo_box.item name="bark" label="Schors"/>
+				<combo_box.item name="bricks" label="Stenen"/>
+				<combo_box.item name="checker" label="Dambord"/>
+				<combo_box.item name="concrete" label="Beton"/>
+				<combo_box.item name="crustytile" label="gebarsten tegels"/>
+				<combo_box.item name="cutstone" label="natuursteen"/>
+				<combo_box.item name="discs" label="schijven"/>
+				<combo_box.item name="gravel" label="grind"/>
+				<combo_box.item name="petridish" label="petrischaal"/>
+				<combo_box.item name="siding" label="wandpaneel"/>
+				<combo_box.item name="stonetile" label="plavuizen"/>
+				<combo_box.item name="stucco" label="stucwerk"/>
+				<combo_box.item name="suction" label="zuignappen"/>
+				<combo_box.item name="weave" label="weven"/>
 			</combo_box>
 			<text name="tex scale">
 				Herhalingen per zijde
diff --git a/indra/newview/skins/default/xui/nl/floater_world_map.xml b/indra/newview/skins/default/xui/nl/floater_world_map.xml
index 9ee7cbdf4d..cb2b3277f8 100644
--- a/indra/newview/skins/default/xui/nl/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/nl/floater_world_map.xml
@@ -34,14 +34,10 @@
 	</text>
 
 	<combo_box label="Online vrienden" name="friend combo" tool_tip="Vriend die op kaart getoond wordt">
-		<combo_item name="none_selected">
-			Online vrienden
-		</combo_item>
+		<combo_box.item name="none_selected" label="Online vrienden"/>
 	</combo_box>
 	<combo_box label="Landmarkeringen" name="landmark combo" tool_tip="Landmarkering die op kaart getoond wordt">
-		<combo_item name="none_selected">
-			Landmarkeringen
-		</combo_item>
+		<combo_box.item name="none_selected" label="Landmarkeringen"/>
 	</combo_box>
 	<line_editor label="Zoek op regionaam" name="location" tool_tip="Type de naam van een regio"/>
 	<button label="Zoeken" name="DoSearch" tool_tip="Zoek naar regio"/>
diff --git a/indra/newview/skins/default/xui/nl/panel_login.xml b/indra/newview/skins/default/xui/nl/panel_login.xml
index fef92ca43b..ad56a9c348 100644
--- a/indra/newview/skins/default/xui/nl/panel_login.xml
+++ b/indra/newview/skins/default/xui/nl/panel_login.xml
@@ -19,15 +19,9 @@
 		Start Locatie:
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_item name="MyHome">
-			Mijn Thuis
-		</combo_item>
-		<combo_item name="MyLastLocation">
-			Mijn Laatste Locatie
-		</combo_item>
-		<combo_item name="Typeregionname">
-			&lt; Type regio naam &gt;
-		</combo_item>
+		<combo_box.item name="MyHome" label="Mijn Thuis"/>
+		<combo_box.item name="MyLastLocation" label="Mijn Laatste Locatie"/>
+		<combo_box.item name="Typeregionname" label="lt; Type regio naam &gt;"/>
 	</combo_box>
 	<check_box label="Onthoud wachtwoord" name="remember_check"/>
 	<button label="Inloggen" label_selected="Inloggen" name="connect_btn"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
index 0592df1108..c0e053094a 100755
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -253,43 +253,19 @@ Idź do Świat &gt; O Posiadłości albo wybierz inną posiadłość żeby pokaz
 			<check_box label="Popychanie niedozwolone" name="PushRestrictCheck" tool_tip="Nie pozwalaj skryptom na popychanie. Wybranie tej opcji może być przydatne do ograniczenia zakłóceń spokoju w Twojej posiadłości."/>
 			<check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy posiadłości w wyszukiwarce"/>
 			<combo_box name="land category">
-				<combo_item name="AnyCategory">
-					Każda
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Linden Lokacja
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="Każda"/>
+				<combo_box.item name="LindenLocation" label="Linden Lokacja"/>
 
-				<combo_item name="Arts&amp;Culture">
-					Sztuka i Kultura
-				</combo_item>
-				<combo_item name="Business">
-					Biznes
-				</combo_item>
-				<combo_item name="Educational">
-					Edukacyjna
-				</combo_item>
-				<combo_item name="Gaming">
-					Gra
-				</combo_item>
-				<combo_item name="Hangout">
-					Poznawanie ludzi
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Przyjazna dla nowych
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parki i Natura
-				</combo_item>
-				<combo_item name="Residential">
-					Mieszkalna
-				</combo_item>
-				<combo_item name="Shopping">
-					Komercja/Sklepy
-				</combo_item>
-				<combo_item name="Other">
-					Inna
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="Sztuka i Kultura"/>
+				<combo_box.item name="Business" label="Biznes"/>
+				<combo_box.item name="Educational" label="Edukacyjna"/>
+				<combo_box.item name="Gaming" label="Gra"/>
+				<combo_box.item name="Hangout" label="Poznawanie ludzi"/>
+				<combo_box.item name="NewcomerFriendly" label="Przyjazna dla nowych"/>
+				<combo_box.item name="Parks&amp;Nature" label="Parki i Natura"/>
+				<combo_box.item name="Residential" label="Mieszkalna"/>
+				<combo_box.item name="Shopping" label="Komercja/Sklepy"/>
+				<combo_box.item name="Other" label="Inna"/>
 			</combo_box>
 			<button label="?" label_selected="?" name="?"/>
 			<check_box name="MatureCheck" />
@@ -309,15 +285,9 @@ Idź do Świat &gt; O Posiadłości albo wybierz inną posiadłość żeby pokaz
 				Trasa Teleportacji:
 			</text>
 			<combo_box name="landing type" tool_tip="Trasa Teleportacj-ustaw w jaki sposób będzie sę odbywać proces telportacji w posiadłości.">
-				<combo_item length="1" name="Blocked" type="string">
-					Zablokowana
-				</combo_item>
-				<combo_item length="1" name="LandingPoint" type="string">
-					Punkt Lądowania
-				</combo_item>
-				<combo_item length="1" name="Anywhere" type="string">
-					Gdziekolwiek
-				</combo_item>
+				<combo_box.item length="1" name="Blocked" type="string" label="Zablokowana"/>
+				<combo_box.item length="1" name="LandingPoint" type="string" label="Punkt Lądowania"/>
+				<combo_box.item length="1" name="Anywhere" type="string" label="Gdziekolwiek"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				Popychanie niedozwolone
@@ -403,12 +373,8 @@ Mediów:
 			<check_box label="Udostępnij wejście grupie: [GROUP]" name="GroupCheck" tool_tip="Ustaw grupę w głównej zakładce"/>
 			<check_box label="Sprzedaj wejściówki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej posiadłości"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					Każdemu
-				</combo_item>
-				<combo_item name="Group">
-					Grupie
-				</combo_item>
+				<combo_box.item name="Anyone" label="Każdemu"/>
+				<combo_box.item name="Group" label="Grupie"/>
 			</combo_box>
 			<spinner label="Cena w L$:" name="PriceSpin"/>
 			<spinner label="Ilość godzin dostępu:" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
index 7151f67203..f430651b79 100755
--- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
@@ -18,129 +18,55 @@
 	</text>
 	<combo_box label="" name="hand_pose_combo"
 	     tool_tip="Kontroluje co robi ręka podczas animacji">
-		<combo_box.item name="Spread">
-			Rozciągaj
-		</combo_box.item>
-		<combo_box.item name="Relaxed">
-			Odpocznij
-		</combo_box.item>
-		<combo_box.item name="PointBoth">
-			Wskazuj
-		</combo_box.item>
-		<combo_box.item name="Fist">
-			Pięść
-		</combo_box.item>
-		<combo_box.item name="RelaxedLeft">
-			Lewa-Odpocznij
-		</combo_box.item>
-		<combo_box.item name="PointLeft">
-			Wskazuj Lewą
-		</combo_box.item>
-		<combo_box.item name="FistLeft">
-			Zaciśnij Lewą
-		</combo_box.item>
-		<combo_box.item name="RelaxedRight">
-			Prawa-Odpocznj
-		</combo_box.item>
-		<combo_box.item name="PointRight">
-			Wskazuj Prawą
-		</combo_box.item>
-		<combo_box.item name="FistRight">
-			Zaciśnij Prawą
-		</combo_box.item>
-		<combo_box.item name="SaluteRight">
-			Salutuj Prawą
-		</combo_box.item>
-		<combo_box.item name="Typing">
-			Pisz
-		</combo_box.item>
-		<combo_box.item name="PeaceRight">
-			Prawa-Pokój
-		</combo_box.item>
+		<combo_box.item name="Spread" label="Rozciągaj" />
+		<combo_box.item name="Relaxed" label="Odpocznij" />
+		<combo_box.item name="PointBoth" label="Wskazuj" />
+		<combo_box.item name="Fist" label="Pięść" />
+		<combo_box.item name="RelaxedLeft" label="Lewa-Odpocznij" />
+		<combo_box.item name="PointLeft" label="Wskazuj Lewą" />
+		<combo_box.item name="FistLeft" label="Zaciśnij Lewą" />
+		<combo_box.item name="RelaxedRight" label="Prawa-Odpocznj" />
+		<combo_box.item name="PointRight" label="Wskazuj Prawą" />
+		<combo_box.item name="FistRight" label="Zaciśnij Prawą" />
+		<combo_box.item name="SaluteRight" label="Salutuj Prawą" />
+		<combo_box.item name="Typing" label="Pisz" />
+		<combo_box.item name="PeaceRight" label="Prawa-Pokój" />
 	</combo_box>
 	<text name="emote_label">
 		Ekspresja
 	</text>
 	<combo_box label="" name="emote_combo"
 	     tool_tip="Kontroluj co wykonuje twarz w czasie animacji">
-		<combo_box.item name="[None]">
-			[Żadne]
-		</combo_box.item>
-		<combo_box.item name="Aaaaah">
-			Aaaaah
-		</combo_box.item>
-		<combo_box.item name="Afraid">
-			Obawa
-		</combo_box.item>
-		<combo_box.item name="Angry">
-			Zlość
-		</combo_box.item>
-		<combo_box.item name="BigSmile">
-			Duży Uśmiech
-		</combo_box.item>
-		<combo_box.item name="Bored">
-			Znudzenie
-		</combo_box.item>
-		<combo_box.item name="Cry">
-			Placz
-		</combo_box.item>
-		<combo_box.item name="Disdain">
-			Wzgarda
-		</combo_box.item>
-		<combo_box.item name="Embarrassed">
-			Zakłopotanie
-		</combo_box.item>
-		<combo_box.item name="Frown">
-			Marszczenie Brwi
-		</combo_box.item>
-		<combo_box.item name="Kiss">
-			Pocałunek
-		</combo_box.item>
-		<combo_box.item name="Laugh">
-			Śmiech
-		</combo_box.item>
-		<combo_box.item name="Plllppt">
-			Plllppt
-		</combo_box.item>
-		<combo_box.item name="Repulsed">
-			Odrzucenie
-		</combo_box.item>
-		<combo_box.item name="Sad">
-			Smutek
-		</combo_box.item>
-		<combo_box.item name="Shrug">
-			Wzruszanie Ramionami
-		</combo_box.item>
-		<combo_box.item name="Smile">
-			Uśmiech
-		</combo_box.item>
-		<combo_box.item name="Surprise">
-			Niespodzianka
-		</combo_box.item>
-		<combo_box.item name="Wink">
-			Mrugnięcie
-		</combo_box.item>
-		<combo_box.item name="Worry">
-			Zmartwienie
-		</combo_box.item>
+		<combo_box.item name="[None]" label="Żadne]" />
+		<combo_box.item name="Aaaaah" label="Aaaaah" />
+		<combo_box.item name="Afraid" label="Obawa" />
+		<combo_box.item name="Angry" label="Zlość" />
+		<combo_box.item name="BigSmile" label="Duży Uśmiech" />
+		<combo_box.item name="Bored" label="Znudzenie" />
+		<combo_box.item name="Cry" label="Placz" />
+		<combo_box.item name="Disdain" label="Wzgarda" />
+		<combo_box.item name="Embarrassed" label="Zakłopotanie" />
+		<combo_box.item name="Frown" label="Marszczenie Brwi" />
+		<combo_box.item name="Kiss" label="Pocałunek" />
+		<combo_box.item name="Laugh" label="Śmiech" />
+		<combo_box.item name="Plllppt" label="Plllppt" />
+		<combo_box.item name="Repulsed" label="Odrzucenie" />
+		<combo_box.item name="Sad" label="Smutek" />
+		<combo_box.item name="Shrug" label="Wzruszanie Ramionami" />
+		<combo_box.item name="Smile" label="Uśmiech" />
+		<combo_box.item name="Surprise" label="Niespodzianka" />
+		<combo_box.item name="Wink" label="Mrugnięcie" />
+		<combo_box.item name="Worry" label="Zmartwienie" />
 	</combo_box>
 	<text name="preview_label">
 		Przeglądaj kiedy
 	</text>
 	<combo_box label="" name="preview_base_anim"
 	     tool_tip="Przetestuj zachowanie animacji kiedy awatar wykonuje normalne czynności">
-		<combo_box.item name="Standing">
-			Stanie
-		</combo_box.item>
-		<combo_box.item name="Walking">
-			Chodzenie
-		</combo_box.item>
-		<combo_box.item name="Sitting">
-			Siedzenie
-		</combo_box.item>
-		<combo_box.item name="Flying">
-			Latanie
-		</combo_box.item>
+		<combo_box.item name="Standing" label="Stanie" />
+		<combo_box.item name="Walking" label="Chodzenie" />
+		<combo_box.item name="Sitting" label="Siedzenie" />
+		<combo_box.item name="Flying" label="Latanie" />
 	</combo_box>
 	<spinner label="Złagodzić w (sekund)" name="ease_in_time"
 	     tool_tip="Ilość Czasu (w sekundach), w których animacje mieszają się" />
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
index 0225c4bca5..282732cb5b 100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
@@ -66,15 +66,9 @@
 		Tylko członkowie z kontem Premium mogą mieć Posiadłosci.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly">
-			9.95US$/miesiąc, płatne miesięcznie
-		</combo_box.item>
-		<combo_box.item name="US$7.50/month,billedquarterly">
-			7.50US$/miesiąc, płatne kwartalnie
-		</combo_box.item>
-		<combo_box.item name="US$6.00/month,billedannually">
-			6.00US$/miesiąc, płatne rocznie
-		</combo_box.item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="9.95US$/miesiąc, płatne miesięcznie" />
+		<combo_box.item name="US$7.50/month,billedquarterly" label="7.50US$/miesiąc, płatne kwartalnie" />
+		<combo_box.item name="US$6.00/month,billedannually" label="6.00US$/miesiąc, płatne rocznie" />
 	</combo_box>
 	<text name="land_use_action">
 		Zwiększ opłatę za używanie Posiadłości do 40US$/miesiąc.
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
index ff997c72cc..64213cbca1 100755
--- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
@@ -79,29 +79,17 @@
 				Cel:
 			</text>
 			<combo_box name="destination">
-				<combo_box.item name="Selection">
-					Selekcja
-				</combo_box.item>
-				<combo_box.item name="AgentRegion">
-					Agent Regionu
-				</combo_box.item>
+				<combo_box.item name="Selection" label="Selekcja" />
+				<combo_box.item name="AgentRegion" label="Agent Regionu" />
 			</combo_box>
 			<text name="Request:">
 				Rządanie:
 			</text>
 			<combo_box name="request">
-				<combo_box.item name="colliders&lt;steps&gt;">
-					kolidery &lt;kroki&gt;
-				</combo_box.item>
-				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-					skrypty &lt;policz&gt;,&lt;opcjonalnie powtórzenie&gt;
-				</combo_box.item>
-				<combo_box.item name="objects&lt;pattern&gt;">
-					obiekty &lt;powtórzenia&gt;
-				</combo_box.item>
-				<combo_box.item name="rez&lt;asset_id&gt;">
-					rez &lt;asset_id&gt;
-				</combo_box.item>
+				<combo_box.item name="colliders&lt;steps&gt;" label="kolidery &lt;kroki&gt;" />
+				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="skrypty &lt;policz&gt;,&lt;opcjonalnie powtórzenie&gt;" />
+				<combo_box.item name="objects&lt;pattern&gt;" label="obiekty &lt;powtórzenia&gt;" />
+				<combo_box.item name="rez&lt;asset_id&gt;" label="rez &lt;asset_id&gt;" />
 			</combo_box>
 			<text name="Parameter:">
 				Parameter:
diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
index e76ad56660..051e9b510d 100755
--- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
@@ -8,21 +8,11 @@
 		Antialiasing:
 	</text>
 	<combo_box label="Antialiasing" name="fsaa" width="84">
-		<combo_box.item name="FSAADisabled">
-			Wyłączone
-		</combo_box.item>
-		<combo_box.item name="2x">
-			2x
-		</combo_box.item>
-		<combo_box.item name="4x">
-			4x
-		</combo_box.item>
-		<combo_box.item name="8x">
-			8x
-		</combo_box.item>
-		<combo_box.item name="16x">
-			16x
-		</combo_box.item>
+		<combo_box.item name="FSAADisabled" label="Wyłączone" />
+		<combo_box.item name="2x" label="2x" />
+		<combo_box.item name="4x" label="4x" />
+		<combo_box.item name="8x" label="8x" />
+		<combo_box.item name="16x" label="16x" />
 	</combo_box>
 	<spinner label="Gamma:" name="gamma" />
 	<text type="string" length="1" name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
index b0fe49deef..27f898a66b 100755
--- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		Wyświetl obraz jako:
 	</text>
 	<combo_box label="Rodzaj Ubrania" name="clothing_type_combo">
-		<combo_box.item name="Image">
-			Obraz
-		</combo_box.item>
-		<combo_box.item name="Hair">
-			Włosy
-		</combo_box.item>
-		<combo_box.item name="FemaleHead">
-			Damska Głowa
-		</combo_box.item>
-		<combo_box.item name="FemaleUpperBody">
-			Damska Górna Część Ciała
-		</combo_box.item>
-		<combo_box.item name="FemaleLowerBody">
-			Damska Górna Część Ciała
-		</combo_box.item>
-		<combo_box.item name="MaleHead">
-			Męska Głowa
-		</combo_box.item>
-		<combo_box.item name="MaleUpperBody">
-			Męska Górna Część Ciała
-		</combo_box.item>
-		<combo_box.item name="MaleLowerBody">
-			Męska Dolna Część Ciała
-		</combo_box.item>
-		<combo_box.item name="Skirt">
-			Spódnica
-		</combo_box.item>
-		<combo_box.item name="SculptedPrim">
-			Sculpt
-		</combo_box.item>
+		<combo_box.item name="Image" label="Obraz" />
+		<combo_box.item name="Hair" label="Włosy" />
+		<combo_box.item name="FemaleHead" label="Damska Głowa" />
+		<combo_box.item name="FemaleUpperBody" label="Damska Górna Część Ciała" />
+		<combo_box.item name="FemaleLowerBody" label="Damska Górna Część Ciała" />
+		<combo_box.item name="MaleHead" label="Męska Głowa" />
+		<combo_box.item name="MaleUpperBody" label="Męska Górna Część Ciała" />
+		<combo_box.item name="MaleLowerBody" label="Męska Dolna Część Ciała" />
+		<combo_box.item name="Skirt" label="Spódnica" />
+		<combo_box.item name="SculptedPrim" label="Sculpt" />
 	</combo_box>
 	<text name="bad_image_text">
 		Nie można wczytać obrazu.
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
index 5da5ce0dc0..f24eb02886 100755
--- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
@@ -37,123 +37,51 @@
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="Wybór kategorii - wybierz kategorię, której dotyczy raport">
-		<combo_item name="Select_category">
-			Wybierz Kategorię:
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Wiek &gt; Udawanie Nieletniej Osoby
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Wiek &gt; Dorosły Rezydent w Teen Second Life
-		</combo_item>
+		<combo_box.item name="Select_category" label="Wybierz Kategorię:"/>
+		<combo_box.item name="Age__Age_play" label="Wiek &gt; Udawanie Nieletniej Osoby"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Wiek &gt; Dorosły Rezydent w Teen Second Life"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Napaść &gt; Strefa Militarna / Niebezpieczny Obszar
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Napaść &gt; Bezpieczny Obszar
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Napaść &gt; Obszar do Testowania Broni
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Handel &gt; Niedostarczenie Produktu lub Usługi
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Naruszenie Prywatności &gt; Dane Osobiste
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Ujawnienie &gt; Monitorowanie Czatu
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Ujawnienie &gt; Dane z Second Life / Czatu / IM
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Zakłócanie Spokoju &gt; Nieuczciwe Używanie Zasobów Regionu
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Zakłócanie Spokoju &gt; Przesadnie Skryptowane Obiekty
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Zakłócanie Spokoju &gt; Śmiecenie Obiektami
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Zakłócanie Spokoju &gt; Ciągły Spam
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Zakłócanie Spokoju &gt; Nieporządany Spam Reklamowy
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Oszustwo &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Oszustwo &gt; Posiadłości
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Oszustwo &gt; Piramidy albo Listy Łańcuchowe
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Oszustwo &gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Prześladowanie &gt; Farmy Reklamowe / Wizualny Spam
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Prześladowanie &gt; Zniesławianie Jedostek lub Grup
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Prześladowanie &gt; Ograniczanie Ruchu
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Prześladowanie &gt; Molestowanie Seksualne
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Prześladowanie &gt; Namawianie/Zachęcanie Innych do Łamania Warunków Umowy (ToS)
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Prześladowanie &gt; Znieważanie Słowne
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Nieprzyzwoitość &gt; Obraźliwa Treść lub Postępowanie
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Napaść &gt; Strefa Militarna / Niebezpieczny Obszar"/>
+		<combo_box.item name="Assault__Safe_area" label="Napaść &gt; Bezpieczny Obszar"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Napaść &gt; Obszar do Testowania Broni"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Handel &gt; Niedostarczenie Produktu lub Usługi"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Naruszenie Prywatności &gt; Dane Osobiste"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Ujawnienie &gt; Monitorowanie Czatu"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Ujawnienie &gt; Dane z Second Life / Czatu / IM"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Zakłócanie Spokoju &gt; Nieuczciwe Używanie Zasobów Regionu"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Zakłócanie Spokoju &gt; Przesadnie Skryptowane Obiekty"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Zakłócanie Spokoju &gt; Śmiecenie Obiektami"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Zakłócanie Spokoju &gt; Ciągły Spam"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Zakłócanie Spokoju &gt; Nieporządany Spam Reklamowy"/>
+		<combo_box.item name="Fraud__L$" label="Oszustwo &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Oszustwo &gt; Posiadłości"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Oszustwo &gt; Piramidy albo Listy Łańcuchowe"/>
+		<combo_box.item name="Fraud__US$" label="Oszustwo &gt; US$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Prześladowanie &gt; Farmy Reklamowe / Wizualny Spam"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Prześladowanie &gt; Zniesławianie Jedostek lub Grup"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Prześladowanie &gt; Ograniczanie Ruchu"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Prześladowanie &gt; Molestowanie Seksualne"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Prześladowanie &gt; Namawianie/Zachęcanie Innych do Łamania Warunków Umowy (ToS)"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Prześladowanie &gt; Znieważanie Słowne"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Nieprzyzwoitość &gt; Obraźliwa Treść lub Postępowanie"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Nieprzyzwoitość &gt; Niestosowne Imię Awatara
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Nieprzyzwoitość &gt; Niestosowne Imię Awatara"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Naruszenie Własności Intelektualnej &gt; Usunięcie Treści
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Naruszenie Własności Intelektualnej &gt; CopyBot albo Nadużycie Przywilejów
-		</combo_item>
-		<combo_item name="Intolerance">
-			Nietolerancja
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Posiadłości &gt; Nadużywanie Piaskownicy
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Posiadłości &gt; Naruszenie &gt; Obiekty/Tekstury
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Posiadłości &gt; Naruszenie &gt; Cząsteczki
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Posiadłości &gt; Naruszenie &gt; Drzewa/Rośliny
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Zakłady/Hazard
-		</combo_item>
-		<combo_item name="Other">
-			Inne
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Naruszenie Własności Intelektualnej &gt; Usunięcie Treści"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Naruszenie Własności Intelektualnej &gt; CopyBot albo Nadużycie Przywilejów"/>
+		<combo_box.item name="Intolerance" label="Nietolerancja"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Posiadłości &gt; Nadużywanie Piaskownicy"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Posiadłości &gt; Naruszenie &gt; Obiekty/Tekstury"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Posiadłości &gt; Naruszenie &gt; Cząsteczki"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Posiadłości &gt; Naruszenie &gt; Drzewa/Rośliny"/>
+		<combo_box.item name="Wagering_gambling" label="Zakłady/Hazard"/>
+		<combo_box.item name="Other" label="Inne"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Dane osobowe:
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
index 2d42ac3368..89a6be2f6c 100755
--- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
@@ -34,15 +34,9 @@
 		Wybierz sprzedaż dla kogokolwiek albo dla wybranego kupca.
 	</text>
 	<combo_box name="sell_to">
-		<combo_box.item name="--selectone--">
-			-- wybierz --
-		</combo_box.item>
-		<combo_box.item name="Anyone">
-			Ktokolwiek
-		</combo_box.item>
-		<combo_box.item name="Specificuser:">
-			Wybrany kupiec:
-		</combo_box.item>
+		<combo_box.item name="--selectone--" label="wybierz --" />
+		<combo_box.item name="Anyone" label="Ktokolwiek" />
+		<combo_box.item name="Specificuser:" label="Wybrany kupiec:" />
 	</combo_box>
 	<button label="Wybierz..." name="sell_to_select_agent" />
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
index 8c3f9cc056..99fa444a1b 100755
--- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="Ustawienia Usuwania Błędów">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE">
-			PRAWDA
-		</combo_box.item>
-		<combo_box.item name="FALSE">
-			NIEPRAWDA
-		</combo_box.item>
+		<combo_box.item name="TRUE" label="PRAWDA" />
+		<combo_box.item name="FALSE" label="NIEPRAWDA" />
 	</combo_box>
 	<color_swatch label="Kolor" name="color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
index e707bc797a..b280213575 100755
--- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
@@ -38,75 +38,33 @@
 		Format
 	</text>
 	<combo_box label="Rozdzielczość" name="postcard_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Obecne Okno
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Wybierz
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Obecne Okno" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="Custom" label="Wybierz" />
 	</combo_box>
 	<combo_box label="Rozdzielczość" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Obecne Okno
-		</combo_box.item>
-		<combo_box.item name="Small(128x128)">
-			Mały (128x128)
-		</combo_box.item>
-		<combo_box.item name="Medium(256x256)">
-			Średni (256x256)
-		</combo_box.item>
-		<combo_box.item name="Large(512x512)">
-			Duży (512x512)
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Wybierz
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Obecne Okno" />
+		<combo_box.item name="Small(128x128)" label="Mały (128x128)" />
+		<combo_box.item name="Medium(256x256)" label="Średni (256x256)" />
+		<combo_box.item name="Large(512x512)" label="Duży (512x512)" />
+		<combo_box.item name="Custom" label="Wybierz" />
 	</combo_box>
 	<combo_box label="Rozdzielczość" name="local_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Obecne Okno
-		</combo_box.item>
-		<combo_box.item name="320x240">
-			320x240
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="1280x1024">
-			1280x1024
-		</combo_box.item>
-		<combo_box.item name="1600x1200">
-			1600x1200
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Wybierz
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Obecne Okno" />
+		<combo_box.item name="320x240" label="320x240" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="1280x1024" label="1280x1024" />
+		<combo_box.item name="1600x1200" label="1600x1200" />
+		<combo_box.item name="Custom" label="Wybierz" />
 	</combo_box>
 	<combo_box label="Format" name="local_format_combo">
-		<combo_box.item name="PNG">
-			PNG
-		</combo_box.item>
-		<combo_box.item name="JPEG">
-			JPEG
-		</combo_box.item>
-		<combo_box.item name="BMP">
-			BMP
-		</combo_box.item>
+		<combo_box.item name="PNG" label="PNG" />
+		<combo_box.item name="JPEG" label="JPEG" />
+		<combo_box.item name="BMP" label="BMP" />
 	</combo_box>
 	<spinner label="Szer." name="snapshot_width"/>
 	<spinner label="Wys." name="snapshot_height"/>
@@ -116,15 +74,9 @@
 		Zapisz:
 	</text>
 	<combo_box label="Warstwy Obrazu" name="layer_types">
-		<combo_box.item name="Colors">
-			Kolory
-		</combo_box.item>
-		<combo_box.item name="Depth">
-			Głębokość
-		</combo_box.item>
-		<combo_box.item name="ObjectMattes">
-			Obiekty Ślepe
-		</combo_box.item>
+		<combo_box.item name="Colors" label="Kolory" />
+		<combo_box.item name="Depth" label="Głębokość" />
+		<combo_box.item name="ObjectMattes" label="Obiekty Ślepe" />
 	</combo_box>
 	<check_box label="Pokaż interfejs na zdjęciu" name="ui_check"/>
 	<check_box label="Pokaż obiekty HUD na zdjęciu" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 2555186a12..25e1797605 100755
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -31,15 +31,9 @@
 		Linijka:
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_box.item name="World">
-			Świat
-		</combo_box.item>
-		<combo_box.item name="Local">
-			Lokalna
-		</combo_box.item>
-		<combo_box.item name="Reference">
-			Względna
-		</combo_box.item>
+		<combo_box.item name="World" label="Świat" />
+		<combo_box.item name="Local" label="Lokalna" />
+		<combo_box.item name="Reference" label="Względna" />
 	</combo_box>
 	<check_box label="Rozciągnij 2 Strony" name="checkbox uniform"/>
 	<check_box label="Rozciągnij Teksturę" name="checkbox stretch textures"/>
@@ -80,15 +74,9 @@
     <radio_item label="Cofnięcie modyfikacji" name="radio revert"/>
   </radio_group>
 	<combo_box name="combobox brush size">
-		<combo_box.item name="Small">
-			Małe
-		</combo_box.item>
-		<combo_box.item name="Medium">
-			Średnie
-		</combo_box.item>
-		<combo_box.item name="Large">
-			Duże
-		</combo_box.item>
+		<combo_box.item name="Small" label="Małe" />
+		<combo_box.item name="Medium" label="Średnie" />
+		<combo_box.item name="Large" label="Duże" />
 	</combo_box>
 	<volume_slider name="slider force"/>
 	<text length="1" name="Strength:" type="string">
@@ -176,27 +164,13 @@
 				Lewe Kliknięcie:
 			</text>
 			<combo_box name="clickaction">
-				<combo_box.item name="Touch/grab(default)">
-					Dotknij (domyślne)
-				</combo_box.item>
-				<combo_box.item name="Sitonobject">
-					Usiądź na Obiekcie
-				</combo_box.item>
-				<combo_box.item name="Buyobject">
-					Kup Obiekt
-				</combo_box.item>
-				<combo_box.item name="Payobject">
-					Zapłać Obiektowi
-				</combo_box.item>
-				<combo_box.item name="Open">
-					Otwórz
-				</combo_box.item>
-				<combo_box.item name="Play">
-					Odtwarzaj Media
-				</combo_box.item>
-				<combo_box.item name="Opemmedia">
-					Otwrórz Media
-				</combo_box.item>
+				<combo_box.item name="Touch/grab(default)" label="Dotknij (domyślne)" />
+				<combo_box.item name="Sitonobject" label="Usiądź na Obiekcie" />
+				<combo_box.item name="Buyobject" label="Kup Obiekt" />
+				<combo_box.item name="Payobject" label="Zapłać Obiektowi" />
+				<combo_box.item name="Open" label="Otwórz" />
+				<combo_box.item name="Play" label="Odtwarzaj Media" />
+				<combo_box.item name="Opemmedia" label="Otwrórz Media" />
 			</combo_box>
 			<text name="B:">
 				B:
@@ -281,56 +255,26 @@
 				Materiał
 			</text>
 			<combo_box name="material">
-				<combo_box.item name="Stone">
-					Kamień
-				</combo_box.item>
-				<combo_box.item name="Metal">
-					Metal
-				</combo_box.item>
-				<combo_box.item name="Glass">
-					Szkło
-				</combo_box.item>
-				<combo_box.item name="Wood">
-					Drewno
-				</combo_box.item>
-				<combo_box.item name="Flesh">
-					Ciało
-				</combo_box.item>
-				<combo_box.item name="Plastic">
-					Plastik
-				</combo_box.item>
-				<combo_box.item name="Rubber">
-					Guma
-				</combo_box.item>
+				<combo_box.item name="Stone" label="Kamień" />
+				<combo_box.item name="Metal" label="Metal" />
+				<combo_box.item name="Glass" label="Szkło" />
+				<combo_box.item name="Wood" label="Drewno" />
+				<combo_box.item name="Flesh" label="Ciało" />
+				<combo_box.item name="Plastic" label="Plastik" />
+				<combo_box.item name="Rubber" label="Guma" />
 			</combo_box>
 			<text name="label basetype">
 				Rodzaj Bloku Budowalnego
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_box.item name="Box">
-					Klocek
-				</combo_box.item>
-				<combo_box.item name="Cylinder">
-					Walec
-				</combo_box.item>
-				<combo_box.item name="Prism">
-					Graniastosłup
-				</combo_box.item>
-				<combo_box.item name="Sphere">
-					Kula
-				</combo_box.item>
-				<combo_box.item name="Torus">
-					Torus
-				</combo_box.item>
-				<combo_box.item name="Tube">
-					Rura
-				</combo_box.item>
-				<combo_box.item name="Ring">
-					Pierścień
-				</combo_box.item>
-				<combo_box.item name="Sculpted">
-					Skulpty
-				</combo_box.item>
+				<combo_box.item name="Box" label="Klocek" />
+				<combo_box.item name="Cylinder" label="Walec" />
+				<combo_box.item name="Prism" label="Graniastosłup" />
+				<combo_box.item name="Sphere" label="Kula" />
+				<combo_box.item name="Torus" label="Torus" />
+				<combo_box.item name="Tube" label="Rura" />
+				<combo_box.item name="Ring" label="Pierścień" />
+				<combo_box.item name="Sculpted" label="Skulpty" />
 			</combo_box>
 			<text name="text cut">
 				Wykrój
@@ -349,18 +293,10 @@
 				Kształt Wydrążenia
 			</text>
 			<combo_box name="hole">
-				<combo_box.item name="Default">
-					Domyślny
-				</combo_box.item>
-				<combo_box.item name="Circle">
-					Koło
-				</combo_box.item>
-				<combo_box.item name="Square">
-					Kwadrat
-				</combo_box.item>
-				<combo_box.item name="Triangle">
-					Trójkąt
-				</combo_box.item>
+				<combo_box.item name="Default" label="Domyślny" />
+				<combo_box.item name="Circle" label="Koło" />
+				<combo_box.item name="Square" label="Kwadrat" />
+				<combo_box.item name="Triangle" label="Trójkąt" />
 			</combo_box>
 			<text name="text twist">
 				Skręcenie
@@ -408,21 +344,11 @@
 				Typ Ścięgna
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_box.item name="None">
-					(żadne)
-				</combo_box.item>
-				<combo_box.item name="Sphere">
-					Kula
-				</combo_box.item>
-				<combo_box.item name="Torus">
-					Torus
-				</combo_box.item>
-				<combo_box.item name="Plane">
-					Płaczyzna
-				</combo_box.item>
-				<combo_box.item name="Cylinder">
-					Walec
-				</combo_box.item>
+				<combo_box.item name="None" label="żadne)" />
+				<combo_box.item name="Sphere" label="Kula" />
+				<combo_box.item name="Torus" label="Torus" />
+				<combo_box.item name="Plane" label="Płaczyzna" />
+				<combo_box.item name="Cylinder" label="Walec" />
 			</combo_box>
 		</panel>
 		<!-- Features sub-tab -->
@@ -468,88 +394,40 @@
 				Mapowanie
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_box.item name="Default">
-					Domyślne
-				</combo_box.item>
-				<combo_box.item name="Planar">
-					Planarne
-				</combo_box.item>
+				<combo_box.item name="Default" label="Domyślne" />
+				<combo_box.item name="Planar" label="Planarne" />
 			</combo_box>
 			<text name="label shininess">
 				Połysk
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_box.item name="None">
-					Żadny
-				</combo_box.item>
-				<combo_box.item name="Low">
-					Niski
-				</combo_box.item>
-				<combo_box.item name="Medium">
-					Średni
-				</combo_box.item>
-				<combo_box.item name="High">
-					Wysoki
-				</combo_box.item>
+				<combo_box.item name="None" label="Żadny" />
+				<combo_box.item name="Low" label="Niski" />
+				<combo_box.item name="Medium" label="Średni" />
+				<combo_box.item name="High" label="Wysoki" />
 			</combo_box>
 			<text name="label bumpiness">
 				Powierzchnia
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_box.item name="None">
-					Żadna
-				</combo_box.item>
-				<combo_box.item name="Brightness">
-					Najjaśniejsza
-				</combo_box.item>
-				<combo_box.item name="Darkness">
-					Najciemniejsza
-				</combo_box.item>
-				<combo_box.item name="woodgrain">
-					Drewniano-ziarnista
-				</combo_box.item>
-				<combo_box.item name="bark">
-					Kory Drzewa
-				</combo_box.item>
-				<combo_box.item name="bricks">
-					Cegieł
-				</combo_box.item>
-				<combo_box.item name="checker">
-					Planszy Szachowej
-				</combo_box.item>
-				<combo_box.item name="concrete">
-					Betonu
-				</combo_box.item>
-				<combo_box.item name="crustytile">
-					Płytki/Kafelki
-				</combo_box.item>
-				<combo_box.item name="cutstone">
-					Kamienia
-				</combo_box.item>
-				<combo_box.item name="discs">
-					Dysku CD
-				</combo_box.item>
-				<combo_box.item name="gravel">
-					Żwiru
-				</combo_box.item>
-				<combo_box.item name="petridish">
-					Skamieliny
-				</combo_box.item>
-				<combo_box.item name="siding">
-					Sidingu
-				</combo_box.item>
-				<combo_box.item name="stonetile">
-					Płytki Kamiennej
-				</combo_box.item>
-				<combo_box.item name="stucco">
-					Stucco
-				</combo_box.item>
-				<combo_box.item name="suction">
-					Suction
-				</combo_box.item>
-				<combo_box.item name="weave">
-					Fali
-				</combo_box.item>
+				<combo_box.item name="None" label="Żadna" />
+				<combo_box.item name="Brightness" label="Najjaśniejsza" />
+				<combo_box.item name="Darkness" label="Najciemniejsza" />
+				<combo_box.item name="woodgrain" label="Drewniano-ziarnista" />
+				<combo_box.item name="bark" label="Kory Drzewa" />
+				<combo_box.item name="bricks" label="Cegieł" />
+				<combo_box.item name="checker" label="Planszy Szachowej" />
+				<combo_box.item name="concrete" label="Betonu" />
+				<combo_box.item name="crustytile" label="Płytki/Kafelki" />
+				<combo_box.item name="cutstone" label="Kamienia" />
+				<combo_box.item name="discs" label="Dysku CD" />
+				<combo_box.item name="gravel" label="Żwiru" />
+				<combo_box.item name="petridish" label="Skamieliny" />
+				<combo_box.item name="siding" label="Sidingu" />
+				<combo_box.item name="stonetile" label="Płytki Kamiennej" />
+				<combo_box.item name="stucco" label="Stucco" />
+				<combo_box.item name="suction" label="Suction" />
+				<combo_box.item name="weave" label="Fali" />
 			</combo_box>
 			<text name="tex scale">
 				Ilość powtórzeń
diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml
index f4f5792494..59235e68f3 100755
--- a/indra/newview/skins/default/xui/pl/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml
@@ -41,15 +41,11 @@
 
 	<check_box label="" name="event_mature_chk" />
 	<combo_box label="Dostępni Znajomi" name="friend combo" tool_tip="Znajomi na mapie">
-		<combo_box.item name="none_selected">
-			Dostępni Znajomi
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Dostępni Znajomi" />
 	</combo_box>
 	<combo_box label="Zapisane Miejsca" name="landmark combo"
 	     tool_tip="Zapisane miejsca na mapie">
-		<combo_box.item name="none_selected">
-			Zapisane Miejsca
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Zapisane Miejsca" />
 	</combo_box>
 	<line_editor label="Szukaj po nazwie regionu" name="location"
 	     tool_tip="Wpisz nazwę regionu" />
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
index 13fcaa25ab..63659cf429 100755
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -19,15 +19,9 @@
 		Miejsce Startu:
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome">
-			Mój Start
-		</combo_box.item>
-		<combo_box.item name="MyLastLocation">
-			Ostatnie Miejsce
-		</combo_box.item>
-		<combo_box.item name="Typeregionname">
-			&lt;Wpisz Region&gt;
-		</combo_box.item>
+		<combo_box.item name="MyHome" label="Mój Start" />
+		<combo_box.item name="MyLastLocation" label="Ostatnie Miejsce" />
+		<combo_box.item name="Typeregionname" label="lt;Wpisz Region&gt;" />
   </combo_box>
   <check_box label="Zapamiętaj Hasło" name="remember_check" />
   <button label="Połącz" label_selected="Połącz" name="connect_btn" />
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
index ee63a12bd1..c14d14f2ab 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -9,21 +9,11 @@
 		Wymiary Okna:
 	</text>
 	<combo_box name="windowsize combo">
-		<combo_box.item type="string" length="1" name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="720x480">
-			720x480 (NTSC)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="768x576">
-			768x576 (PAL)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="1024x768">
-			1024x768
-		</combo_box.item>
+		<combo_box.item type="string" length="1" name="640x480" label="640x480" />
+		<combo_box.item type="string" length="1" name="800x600" label="800x600" />
+		<combo_box.item type="string" length="1" name="720x480" label="720x480 (NTSC)" />
+		<combo_box.item type="string" length="1" name="768x576" label="768x576 (PAL)" />
+		<combo_box.item type="string" length="1" name="1024x768" label="1024x768" />
 	</combo_box>
 	<text type="string" length="1" name="DisplayResLabel">
 		Rozdzielczość:
@@ -32,18 +22,10 @@
 		Proporcje:
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="width / height">
-		<combo_box.item type="string" length="1" name="4:3(StandardCRT)">
-			4:3 (Standardowy CRT)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
-			5:4 (1280x1024 LCD)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="8:5(Widescreen)">
-			8:5 (Panoramiczny)
-		</combo_box.item>
-		<combo_box.item type="string" length="1" name="16:9(Widescreen)">
-			16:9 (Panoramiczny)
-		</combo_box.item>
+		<combo_box.item type="string" length="1" name="4:3(StandardCRT)" label="4:3 (Standardowy CRT)" />
+		<combo_box.item type="string" length="1" name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)" />
+		<combo_box.item type="string" length="1" name="8:5(Widescreen)" label="8:5 (Panoramiczny)" />
+		<combo_box.item type="string" length="1" name="16:9(Widescreen)" label="16:9 (Panoramiczny)" />
 	</combo_box>
 	<check_box label="Detekcja proporcji" name="aspect_auto_detect" />
 	<text type="string" length="1" name="HigherText">
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 3a715aa01f..2cc75432ee 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -254,43 +254,19 @@ Vá para o menu Mundo &gt; Sobre a Terra ou selecione outro lote para mostrar se
 			<check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/>
 			<check_box label="Mostra o Lugar na Busca (L$30/semana) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
 			<combo_box left="276" name="land category" width="146">
-				<combo_item name="AnyCategory">
-					Qualquer Categoria
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Locação Linden
-				</combo_item>
+				<combo_box.item name="AnyCategory" label="Qualquer Categoria"/>
+				<combo_box.item name="LindenLocation" label="Locação Linden"/>
 
-				<combo_item name="Arts&amp;Culture">
-					Artes e Cultura
-				</combo_item>
-				<combo_item name="Business">
-					Negócios
-				</combo_item>
-				<combo_item name="Educational">
-					Educacional
-				</combo_item>
-				<combo_item name="Gaming">
-					Jogo
-				</combo_item>
-				<combo_item name="Hangout">
-					Lazer
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Amigável para novatos
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parques e Natureza
-				</combo_item>
-				<combo_item name="Residential">
-					Residencial
-				</combo_item>
-				<combo_item name="Shopping">
-					Compras
-				</combo_item>
-				<combo_item name="Other">
-					Outros
-				</combo_item>
+				<combo_box.item name="Arts&amp;Culture" label="Artes e Cultura"/>
+				<combo_box.item name="Business" label="Negócios"/>
+				<combo_box.item name="Educational" label="Educacional"/>
+				<combo_box.item name="Gaming" label="Jogo"/>
+				<combo_box.item name="Hangout" label="Lazer"/>
+				<combo_box.item name="NewcomerFriendly" label="Amigável para novatos"/>
+				<combo_box.item name="Parks&amp;Nature" label="Parques e Natureza"/>
+				<combo_box.item name="Residential" label="Residencial"/>
+				<combo_box.item name="Shopping" label="Compras"/>
+				<combo_box.item name="Other" label="Outros"/>
 			</combo_box>
 			<button label="?" label_selected="?" left="426" name="?"/>
 			<check_box name="MatureCheck" />
@@ -310,15 +286,9 @@ Vá para o menu Mundo &gt; Sobre a Terra ou selecione outro lote para mostrar se
 				Rota de Tele-transporte:
 			</text>
 			<combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." width="140">
-				<combo_item length="1" name="Blocked" type="string">
-					Bloqueado
-				</combo_item>
-				<combo_item length="1" name="LandingPoint" type="string">
-					Ponto de Aterrissagem
-				</combo_item>
-				<combo_item length="1" name="Anywhere" type="string">
-					Qualquer lugar
-				</combo_item>
+				<combo_box.item length="1" name="Blocked" type="string" label="Bloqueado"/>
+				<combo_box.item length="1" name="LandingPoint" type="string" label="Ponto de Aterrissagem"/>
+				<combo_box.item length="1" name="Anywhere" type="string" label="Qualquer lugar"/>
 			</combo_box>
 			<string name="push_restrict_text">
 				Sem Empurrar
@@ -406,12 +376,8 @@ Mídia:
 			<check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
 			<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
 			<combo_box name="pass_combo">
-				<combo_item name="Anyone">
-					Qualquer um
-				</combo_item>
-				<combo_item name="Group">
-					Grupo
-				</combo_item>
+				<combo_box.item name="Anyone" label="Qualquer um"/>
+				<combo_box.item name="Group" label="Grupo"/>
 			</combo_box>
 			<spinner label="Preço em L$:" name="PriceSpin"/>
 			<spinner label="Horas de Acesso:" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index 405a6f28a4..f6bc034665 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -14,127 +14,53 @@
 		Pose de Mão
 	</text>
 	<combo_box label="" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
-		<combo_box.item name="Spread">
-			Espreguiçar
-		</combo_box.item>
-		<combo_box.item name="Relaxed">
-			Relaxado
-		</combo_box.item>
-		<combo_box.item name="PointBoth">
-			Apontar Ambos
-		</combo_box.item>
-		<combo_box.item name="Fist">
-			Punho
-		</combo_box.item>
-		<combo_box.item name="RelaxedLeft">
-			Relaxado para Esquerda
-		</combo_box.item>
-		<combo_box.item name="PointLeft">
-			Apontar à Esquerda
-		</combo_box.item>
-		<combo_box.item name="FistLeft">
-			Punho Esquerdo
-		</combo_box.item>
-		<combo_box.item name="RelaxedRight">
-			Relaxado para Direita
-		</combo_box.item>
-		<combo_box.item name="PointRight">
-			Apontar à Direita
-		</combo_box.item>
-		<combo_box.item name="FistRight">
-			Punho Direito
-		</combo_box.item>
-		<combo_box.item name="SaluteRight">
-			Saudar à Direita
-		</combo_box.item>
-		<combo_box.item name="Typing">
-			Digitando
-		</combo_box.item>
-		<combo_box.item name="PeaceRight">
-			Pacífico à Direita
-		</combo_box.item>
+		<combo_box.item name="Spread" label="Espreguiçar" />
+		<combo_box.item name="Relaxed" label="Relaxado" />
+		<combo_box.item name="PointBoth" label="Apontar Ambos" />
+		<combo_box.item name="Fist" label="Punho" />
+		<combo_box.item name="RelaxedLeft" label="Relaxado para Esquerda" />
+		<combo_box.item name="PointLeft" label="Apontar à Esquerda" />
+		<combo_box.item name="FistLeft" label="Punho Esquerdo" />
+		<combo_box.item name="RelaxedRight" label="Relaxado para Direita" />
+		<combo_box.item name="PointRight" label="Apontar à Direita" />
+		<combo_box.item name="FistRight" label="Punho Direito" />
+		<combo_box.item name="SaluteRight" label="Saudar à Direita" />
+		<combo_box.item name="Typing" label="Digitando" />
+		<combo_box.item name="PeaceRight" label="Pacífico à Direita" />
 	</combo_box>
 	<text name="emote_label">
 		Expressão
 	</text>
 	<combo_box label="" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
-		<combo_box.item name="[None]">
-			[None]
-		</combo_box.item>
-		<combo_box.item name="Aaaaah">
-			Aaaaah
-		</combo_box.item>
-		<combo_box.item name="Afraid">
-			Temeroso
-		</combo_box.item>
-		<combo_box.item name="Angry">
-			Raivoso
-		</combo_box.item>
-		<combo_box.item name="BigSmile">
-			Sorrisão
-		</combo_box.item>
-		<combo_box.item name="Bored">
-			Entediado
-		</combo_box.item>
-		<combo_box.item name="Cry">
-			Chorar
-		</combo_box.item>
-		<combo_box.item name="Disdain">
-			Desprezar
-		</combo_box.item>
-		<combo_box.item name="Embarrassed">
-			Envergonhado
-		</combo_box.item>
-		<combo_box.item name="Frown">
-			Franzir a testa
-		</combo_box.item>
-		<combo_box.item name="Kiss">
-			Beijar
-		</combo_box.item>
-		<combo_box.item name="Laugh">
-			Rir
-		</combo_box.item>
-		<combo_box.item name="Plllppt">
-			Plllppt
-		</combo_box.item>
-		<combo_box.item name="Repulsed">
-			Enojado
-		</combo_box.item>
-		<combo_box.item name="Sad">
-			Triste
-		</combo_box.item>
-		<combo_box.item name="Shrug">
-			Indiferença
-		</combo_box.item>
-		<combo_box.item name="Smile">
-			Sorriso
-		</combo_box.item>
-		<combo_box.item name="Surprise">
-			Surpreso
-		</combo_box.item>
-		<combo_box.item name="Wink">
-			Piscar
-		</combo_box.item>
-		<combo_box.item name="Worry">
-			Preocupado
-		</combo_box.item>
+		<combo_box.item name="[None]" label="None]" />
+		<combo_box.item name="Aaaaah" label="Aaaaah" />
+		<combo_box.item name="Afraid" label="Temeroso" />
+		<combo_box.item name="Angry" label="Raivoso" />
+		<combo_box.item name="BigSmile" label="Sorrisão" />
+		<combo_box.item name="Bored" label="Entediado" />
+		<combo_box.item name="Cry" label="Chorar" />
+		<combo_box.item name="Disdain" label="Desprezar" />
+		<combo_box.item name="Embarrassed" label="Envergonhado" />
+		<combo_box.item name="Frown" label="Franzir a testa" />
+		<combo_box.item name="Kiss" label="Beijar" />
+		<combo_box.item name="Laugh" label="Rir" />
+		<combo_box.item name="Plllppt" label="Plllppt" />
+		<combo_box.item name="Repulsed" label="Enojado" />
+		<combo_box.item name="Sad" label="Triste" />
+		<combo_box.item name="Shrug" label="Indiferença" />
+		<combo_box.item name="Smile" label="Sorriso" />
+		<combo_box.item name="Surprise" label="Surpreso" />
+		<combo_box.item name="Wink" label="Piscar" />
+		<combo_box.item name="Worry" label="Preocupado" />
 	</combo_box>
 	<text name="preview_label">
 		Prever enquanto
 	</text>
 	<combo_box label="" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
-		<combo_box.item name="Standing">
-			Parado
-		</combo_box.item>
-		<combo_box.item name="Walking">
-			Andando
-		</combo_box.item>
-		<combo_box.item name="Sitting">
-			Sentando
-		</combo_box.item>
-		<combo_box.item name="Flying">
-			Voando
-		</combo_box.item>
+		<combo_box.item name="Standing" label="Parado" />
+		<combo_box.item name="Walking" label="Andando" />
+		<combo_box.item name="Sitting" label="Sentando" />
+		<combo_box.item name="Flying" label="Voando" />
 	</combo_box>
 	<spinner label="Facilitar a entrada (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
 	<spinner label="Facilitar a saída (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index e9711dc364..396996edb0 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -66,15 +66,9 @@
 		Somente membros Premium podem possuir terra.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly">
-			US$9.95/mês, debitado mensalmente
-		</combo_box.item>
-		<combo_box.item name="US$7.50/month,billedquarterly">
-			US$7.50/mês, debitado trimestralmente
-		</combo_box.item>
-		<combo_box.item name="US$6.00/month,billedannually">
-			US$6.00/mês, debitado anualmente
-		</combo_box.item>
+		<combo_box.item name="US$9.95/month,billedmonthly" label="US$9.95/mês, debitado mensalmente" />
+		<combo_box.item name="US$7.50/month,billedquarterly" label="US$7.50/mês, debitado trimestralmente" />
+		<combo_box.item name="US$6.00/month,billedannually" label="US$6.00/mês, debitado anualmente" />
 	</combo_box>
 	<text name="land_use_action">
 		Aumente sua taxa de locação de terra para US$ 40/mês.
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
index 27dad15215..6b88db1d9c 100644
--- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
@@ -73,29 +73,17 @@
 				Destino:
 			</text>
 			<combo_box name="destination">
-				<combo_box.item name="Selection">
-					Seleção
-				</combo_box.item>
-				<combo_box.item name="AgentRegion">
-					Região do Agente
-				</combo_box.item>
+				<combo_box.item name="Selection" label="Seleção" />
+				<combo_box.item name="AgentRegion" label="Região do Agente" />
 			</combo_box>
 			<text name="Request:">
 				Requisição:
 			</text>
 			<combo_box name="request">
-				<combo_box.item name="colliders&lt;steps&gt;">
-					Passos de Colisão
-				</combo_box.item>
-				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-					Contagem de scripts, padrão opcional
-				</combo_box.item>
-				<combo_box.item name="objects&lt;pattern&gt;">
-					Padrão de Objetos
-				</combo_box.item>
-				<combo_box.item name="rez&lt;asset_id&gt;">
-					rez &lt;asset_id&gt;
-				</combo_box.item>
+				<combo_box.item name="colliders&lt;steps&gt;" label="Passos de Colisão" />
+				<combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="Contagem de scripts, padrão opcional" />
+				<combo_box.item name="objects&lt;pattern&gt;" label="Padrão de Objetos" />
+				<combo_box.item name="rez&lt;asset_id&gt;" label="rez &lt;asset_id&gt;" />
 			</combo_box>
 			<text name="Parameter:">
 				Parametro:
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
index 10ed0339a3..0f9c1fd487 100644
--- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
@@ -8,21 +8,11 @@
 		Suavização:
 	</text>
 	<combo_box label="Suavização" name="fsaa" width="94">
-		<combo_item name="FSAADisabled">
-			Desabilitado
-		</combo_item>
-		<combo_item name="2x">
-			2x
-		</combo_item>
-		<combo_item name="4x">
-			4x
-		</combo_item>
-		<combo_item name="8x">
-			8x
-		</combo_item>
-		<combo_item name="16x">
-			16x
-		</combo_item>
+		<combo_box.item name="FSAADisabled" label="Desabilitado"/>
+		<combo_box.item name="2x" label="2x"/>
+		<combo_box.item name="4x" label="4x"/>
+		<combo_box.item name="8x" label="8x"/>
+		<combo_box.item name="16x" label="16x"/>
 	</combo_box>
 	<spinner label="Gama:" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index f1192e860b..b32f153147 100644
--- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
@@ -10,36 +10,16 @@
 		Prévia da Imagem como:
 	</text>
 	<combo_box label="Tipo de Roupas" name="clothing_type_combo">
-		<combo_box.item name="Image">
-			Imagem
-		</combo_box.item>
-		<combo_box.item name="Hair">
-			Cabelo
-		</combo_box.item>
-		<combo_box.item name="FemaleHead">
-			Cabeça Feminina
-		</combo_box.item>
-		<combo_box.item name="FemaleUpperBody">
-			Parte Superior do Corpo Feminino
-		</combo_box.item>
-		<combo_box.item name="FemaleLowerBody">
-			Parte Inferior do Corpo Feminino
-		</combo_box.item>
-		<combo_box.item name="MaleHead">
-			Cabeça Masculina
-		</combo_box.item>
-		<combo_box.item name="MaleUpperBody">
-			Parte Superior do Corpo Masculino
-		</combo_box.item>
-		<combo_box.item name="MaleLowerBody">
-			Parte Inferiro do Corpo Masculino
-		</combo_box.item>
-		<combo_box.item name="Skirt">
-			Saia
-		</combo_box.item>
-		<combo_box.item name="SculptedPrim">
-			Primitiva Esculpida
-		</combo_box.item>
+		<combo_box.item name="Image" label="Imagem" />
+		<combo_box.item name="Hair" label="Cabelo" />
+		<combo_box.item name="FemaleHead" label="Cabeça Feminina" />
+		<combo_box.item name="FemaleUpperBody" label="Parte Superior do Corpo Feminino" />
+		<combo_box.item name="FemaleLowerBody" label="Parte Inferior do Corpo Feminino" />
+		<combo_box.item name="MaleHead" label="Cabeça Masculina" />
+		<combo_box.item name="MaleUpperBody" label="Parte Superior do Corpo Masculino" />
+		<combo_box.item name="MaleLowerBody" label="Parte Inferiro do Corpo Masculino" />
+		<combo_box.item name="Skirt" label="Saia" />
+		<combo_box.item name="SculptedPrim" label="Primitiva Esculpida" />
 	</combo_box>
 	<text name="bad_image_text">
 		Incapaz de ler a imagem.
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 9fc694fb6a..f7a9c19d92 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -36,123 +36,51 @@
 		Hendrerit Vulputate
 	</text>
 	<combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
-		<combo_item name="Select_category">
-			Selecionar categoria
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Idade &gt; Idade no jogo
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Idade &gt; Residente adulto no Second Life Jovem
-		</combo_item>
+		<combo_box.item name="Select_category" label="Selecionar categoria"/>
+		<combo_box.item name="Age__Age_play" label="Idade &gt; Idade no jogo"/>
+		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Idade &gt; Residente adulto no Second Life Jovem"/>
 		
 		
 		
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Assalto &gt; Sandbox de combate / área não segura
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Assalto &gt; Área segura
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Assalto &gt; Testando armas em sandbox
-		</combo_item>
-		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Comércio &gt; Falha em enviar produto ou serviço
-		</combo_item>
-		<combo_item name="Disclosure__Real_world_information">
-			Revelar &gt; Informação do mundo real
-		</combo_item>
-		<combo_item name="Disclosure__Remotely_monitoring chat">
-			Revelar &gt; Conversa monitorada remotamente
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Revelar &gt; Informação do Second Life/conversa/MIs
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Distúrbio da paz &gt; Uso injusto dos recursos da região
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Distúrbio da paz  &gt; Objetos com excesso de scripts
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Distúrbio da paz  &gt; Objeto despejando lixo
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Distúrbio da paz &gt; Spam repetitivo
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Distúrbio da paz &gt; Spam de anúncio indesejado
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Fraude &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Fraude &gt; Terra
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Fraude &gt; Esquema de pirâmide ou cartas encadeadas
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Fraude &gt; R$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Perturbação &gt; Fazendas de Anúncios / spam visual
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Perturbação &gt; Difamação de indivíduos ou grupos
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Perturbação &gt; Impedindo movimentos
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Perturbação &gt; Perturbação sexual
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Perturbação &gt; Solicitando/incitando outros a violarem o ToS
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Perturbação &gt; Abuso verbal
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Indecência &gt; Conteúdo ou conduta amplamente ofensivos
-		</combo_item>
+		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Assalto &gt; Sandbox de combate / área não segura"/>
+		<combo_box.item name="Assault__Safe_area" label="Assalto &gt; Área segura"/>
+		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Assalto &gt; Testando armas em sandbox"/>
+		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Comércio &gt; Falha em enviar produto ou serviço"/>
+		<combo_box.item name="Disclosure__Real_world_information" label="Revelar &gt; Informação do mundo real"/>
+		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Revelar &gt; Conversa monitorada remotamente"/>
+		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Revelar &gt; Informação do Second Life/conversa/MIs"/>
+		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Distúrbio da paz &gt; Uso injusto dos recursos da região"/>
+		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Distúrbio da paz  &gt; Objetos com excesso de scripts"/>
+		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Distúrbio da paz  &gt; Objeto despejando lixo"/>
+		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Distúrbio da paz &gt; Spam repetitivo"/>
+		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Distúrbio da paz &gt; Spam de anúncio indesejado"/>
+		<combo_box.item name="Fraud__L$" label="Fraude &gt; L$"/>
+		<combo_box.item name="Fraud__Land" label="Fraude &gt; Terra"/>
+		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Fraude &gt; Esquema de pirâmide ou cartas encadeadas"/>
+		<combo_box.item name="Fraud__US$" label="Fraude &gt; R$"/>
+		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Perturbação &gt; Fazendas de Anúncios / spam visual"/>
+		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Perturbação &gt; Difamação de indivíduos ou grupos"/>
+		<combo_box.item name="Harassment__Impeding_movement" label="Perturbação &gt; Impedindo movimentos"/>
+		<combo_box.item name="Harassment__Sexual_harassment" label="Perturbação &gt; Perturbação sexual"/>
+		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Perturbação &gt; Solicitando/incitando outros a violarem o ToS"/>
+		<combo_box.item name="Harassment__Verbal_abuse" label="Perturbação &gt; Abuso verbal"/>
+		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Indecência &gt; Conteúdo ou conduta amplamente ofensivos"/>
 		
 		
 		
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Indecência &gt; Nome de avatar inapropriado
-		</combo_item>
+		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Indecência &gt; Nome de avatar inapropriado"/>
 		
 		
 		
-		<combo_item name="Intellectual_property_infringement_Content_Removal">
-			Violação de propriedade intelectual &gt; Remoção de Conteúdo
-		</combo_item>
-		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
-			Violação de Propriedade intelectual  &gt; Cópia Ilegal ou  Aproveitar-se de Permissões
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intolerância
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Terra &gt; Abuso dos recursos da sandbox
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Terra &gt; Invasão &gt; Objetos/texturas
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Terra &gt; Invasão &gt; Partículas
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Terra &gt; Violação &gt; Árvores/plantas
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Apostas/jogos de azar
-		</combo_item>
-		<combo_item name="Other">
-			Outro
-		</combo_item>
+		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Violação de propriedade intelectual &gt; Remoção de Conteúdo"/>
+		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Violação de Propriedade intelectual  &gt; Cópia Ilegal ou  Aproveitar-se de Permissões"/>
+		<combo_box.item name="Intolerance" label="Intolerância"/>
+		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Terra &gt; Abuso dos recursos da sandbox"/>
+		<combo_box.item name="Land__Encroachment__Objects_textures" label="Terra &gt; Invasão &gt; Objetos/texturas"/>
+		<combo_box.item name="Land__Encroachment__Particles" label="Terra &gt; Invasão &gt; Partículas"/>
+		<combo_box.item name="Land__Encroachment__Trees_plants" label="Terra &gt; Violação &gt; Árvores/plantas"/>
+		<combo_box.item name="Wagering_gambling" label="Apostas/jogos de azar"/>
+		<combo_box.item name="Other" label="Outro"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Nome do Denunciado:
diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
index c3461b7d52..221145079b 100644
--- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
@@ -34,15 +34,9 @@
 		Escolha se venderá para qualquer um ou para um comprador em particular.
 	</text>
 	<combo_box name="sell_to">
-		<combo_box.item name="--selectone--">
-			-- Selecione um --
-		</combo_box.item>
-		<combo_box.item name="Anyone">
-			Qualquer um
-		</combo_box.item>
-		<combo_box.item name="Specificuser:">
-			Usuário Específico:
-		</combo_box.item>
+		<combo_box.item name="--selectone--" label="Selecione um --" />
+		<combo_box.item name="Anyone" label="Qualquer um" />
+		<combo_box.item name="Specificuser:" label="Usuário Específico:" />
 	</combo_box>
 	<button label="Selecione..." name="sell_to_select_agent"/>
 	<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
index e0c189568a..f7b468bb22 100644
--- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="Configurações de Debug">
 	<combo_box name="boolean_combo">
-		<combo_box.item name="TRUE">
-			VERDADEIRO
-		</combo_box.item>
-		<combo_box.item name="FALSE">
-			FALSO
-		</combo_box.item>
+		<combo_box.item name="TRUE" label="VERDADEIRO" />
+		<combo_box.item name="FALSE" label="FALSO" />
 	</combo_box>
 	<color_swatch label="Cor" name="color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 067a4a71f3..641ee332fc 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -38,75 +38,33 @@
 		Formato
 	</text>
 	<combo_box label="Resolução" name="postcard_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Janela Atual
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Customizado
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Janela Atual" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="Custom" label="Customizado" />
 	</combo_box>
 	<combo_box label="Resolução" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Janela Atual
-		</combo_box.item>
-		<combo_box.item name="Small(128x128)">
-			Pequeno (128x128)
-		</combo_box.item>
-		<combo_box.item name="Medium(256x256)">
-			Médio (256x256)
-		</combo_box.item>
-		<combo_box.item name="Large(512x512)">
-			Grande (512x512)
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Customizado
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Janela Atual" />
+		<combo_box.item name="Small(128x128)" label="Pequeno (128x128)" />
+		<combo_box.item name="Medium(256x256)" label="Médio (256x256)" />
+		<combo_box.item name="Large(512x512)" label="Grande (512x512)" />
+		<combo_box.item name="Custom" label="Customizado" />
 	</combo_box>
 	<combo_box label="Resolução" name="local_size_combo">
-		<combo_box.item name="CurrentWindow">
-			Janela Atual
-		</combo_box.item>
-		<combo_box.item name="320x240">
-			320x240
-		</combo_box.item>
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
-		<combo_box.item name="1280x1024">
-			1280x1024
-		</combo_box.item>
-		<combo_box.item name="1600x1200">
-			1600x1200
-		</combo_box.item>
-		<combo_box.item name="Custom">
-			Customizado
-		</combo_box.item>
+		<combo_box.item name="CurrentWindow" label="Janela Atual" />
+		<combo_box.item name="320x240" label="320x240" />
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="1024x768" label="1024x768" />
+		<combo_box.item name="1280x1024" label="1280x1024" />
+		<combo_box.item name="1600x1200" label="1600x1200" />
+		<combo_box.item name="Custom" label="Customizado" />
 	</combo_box>
 	<combo_box label="Formato" name="local_format_combo">
-		<combo_box.item name="PNG">
-			PNG
-		</combo_box.item>
-		<combo_box.item name="JPEG">
-			JPEG
-		</combo_box.item>
-		<combo_box.item name="BMP">
-			BMP
-		</combo_box.item>
+		<combo_box.item name="PNG" label="PNG" />
+		<combo_box.item name="JPEG" label="JPEG" />
+		<combo_box.item name="BMP" label="BMP" />
 	</combo_box>
 	<spinner label="Largura" name="snapshot_width"/>
 	<spinner label="Altura" name="snapshot_height"/>
@@ -116,15 +74,9 @@
 		Capturar:
 	</text>
 	<combo_box label="Camadas da Imagem" name="layer_types">
-		<combo_box.item name="Colors">
-			Cores
-		</combo_box.item>
-		<combo_box.item name="Depth">
-			Formato
-		</combo_box.item>
-		<combo_box.item name="ObjectMattes">
-			Decoração do Objeto
-		</combo_box.item>
+		<combo_box.item name="Colors" label="Cores" />
+		<combo_box.item name="Depth" label="Formato" />
+		<combo_box.item name="ObjectMattes" label="Decoração do Objeto" />
 	</combo_box>
 	<check_box label="Mostrar interface na Foto" name="ui_check"/>
 	<check_box label="Mostrar Objetos HUD na Foto" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 838c7965ea..d9b1e342d9 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -20,15 +20,9 @@
 		Modo da régua:
 	</text>
 	<combo_box name="combobox grid mode">
-		<combo_item name="World">
-			Mundo
-		</combo_item>
-		<combo_item name="Local">
-			Local
-		</combo_item>
-		<combo_item name="Reference">
-			Referência
-		</combo_item>
+		<combo_box.item name="World" label="Mundo"/>
+		<combo_box.item name="Local" label="Local"/>
+		<combo_box.item name="Reference" label="Referência"/>
 	</combo_box>
 	<check_box label="Esticar ambos os lados" name="checkbox uniform"/>
 	<check_box label="Esticar Texturas" name="checkbox stretch textures"/>
@@ -64,15 +58,9 @@
 	<check_box label="Terreno Rígido" name="radio noise"/>
 	<check_box label="Reverter Terra" name="radio revert"/>
 	<combo_box name="combobox brush size">
-		<combo_item name="Small">
-			Pequeno
-		</combo_item>
-		<combo_item name="Medium">
-			Médio
-		</combo_item>
-		<combo_item name="Large">
-			Grande
-		</combo_item>
+		<combo_box.item name="Small" label="Pequeno"/>
+		<combo_box.item name="Medium" label="Médio"/>
+		<combo_box.item name="Large" label="Grande"/>
 	</combo_box>
 	<text name="Strength:">
 		Força:
@@ -155,27 +143,13 @@
 				Quando clicado com o botão esquerdo:
 			</text>
 			<combo_box name="clickaction">
-				<combo_item name="Touch/grab(default)">
-					Tocar/Pegar (padrão)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					Sentar no objeto
-				</combo_item>
-				<combo_item name="Buyobject">
-					Comprar objeto
-				</combo_item>
-				<combo_item name="Payobject">
-					Pagar Objeto
-				</combo_item>
-				<combo_item name="Open">
-					Abrir
-				</combo_item>
-				<combo_item name="Play">
-					Executar a mídia do lote
-				</combo_item>
-				<combo_item name="Opemmedia">
-					Abrir a mídia do lote
-				</combo_item>
+				<combo_box.item name="Touch/grab(default)" label="Tocar/Pegar (padrão)"/>
+				<combo_box.item name="Sitonobject" label="Sentar no objeto"/>
+				<combo_box.item name="Buyobject" label="Comprar objeto"/>
+				<combo_box.item name="Payobject" label="Pagar Objeto"/>
+				<combo_box.item name="Open" label="Abrir"/>
+				<combo_box.item name="Play" label="Executar a mídia do lote"/>
+				<combo_box.item name="Opemmedia" label="Abrir a mídia do lote"/>
 			</combo_box>
 			<text name="B:">
 				B:
@@ -259,56 +233,26 @@
 				Material
 			</text>
 			<combo_box name="material">
-				<combo_item name="Stone">
-					Pedra
-				</combo_item>
-				<combo_item name="Metal">
-					Metal
-				</combo_item>
-				<combo_item name="Glass">
-					Vidro
-				</combo_item>
-				<combo_item name="Wood">
-					Madeira
-				</combo_item>
-				<combo_item name="Flesh">
-					Carne
-				</combo_item>
-				<combo_item name="Plastic">
-					Plástico
-				</combo_item>
-				<combo_item name="Rubber">
-					Couro
-				</combo_item>
+				<combo_box.item name="Stone" label="Pedra"/>
+				<combo_box.item name="Metal" label="Metal"/>
+				<combo_box.item name="Glass" label="Vidro"/>
+				<combo_box.item name="Wood" label="Madeira"/>
+				<combo_box.item name="Flesh" label="Carne"/>
+				<combo_box.item name="Plastic" label="Plástico"/>
+				<combo_box.item name="Rubber" label="Couro"/>
 			</combo_box>
 			<text name="label basetype">
 				Forma básica
 			</text>
 			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					Caixa
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilindro
-				</combo_item>
-				<combo_item name="Prism">
-					Prisma
-				</combo_item>
-				<combo_item name="Sphere">
-					Esfera
-				</combo_item>
-				<combo_item name="Torus">
-					Toróide
-				</combo_item>
-				<combo_item name="Tube">
-					Tubo
-				</combo_item>
-				<combo_item name="Ring">
-					Anel
-				</combo_item>
-				<combo_item name="Sculpted">
-					Esculpida
-				</combo_item>
+				<combo_box.item name="Box" label="Caixa"/>
+				<combo_box.item name="Cylinder" label="Cilindro"/>
+				<combo_box.item name="Prism" label="Prisma"/>
+				<combo_box.item name="Sphere" label="Esfera"/>
+				<combo_box.item name="Torus" label="Toróide"/>
+				<combo_box.item name="Tube" label="Tubo"/>
+				<combo_box.item name="Ring" label="Anel"/>
+				<combo_box.item name="Sculpted" label="Esculpida"/>
 			</combo_box>
 			<text name="text cut">
 				Recorte inicial e final
@@ -325,18 +269,10 @@
 				Forma Vazia
 			</text>
 			<combo_box name="hole">
-				<combo_item name="Default">
-					Padrão
-				</combo_item>
-				<combo_item name="Circle">
-					Circulo
-				</combo_item>
-				<combo_item name="Square">
-					Quadrado
-				</combo_item>
-				<combo_item name="Triangle">
-					Triâgulo
-				</combo_item>
+				<combo_box.item name="Default" label="Padrão"/>
+				<combo_box.item name="Circle" label="Circulo"/>
+				<combo_box.item name="Square" label="Quadrado"/>
+				<combo_box.item name="Triangle" label="Triâgulo"/>
 			</combo_box>
 			<text name="text twist">
 				Torcer no Início e final
@@ -382,21 +318,11 @@
 				Tipo costura
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					(nenhum)
-				</combo_item>
-				<combo_item name="Sphere">
-					Esfera
-				</combo_item>
-				<combo_item name="Torus">
-					Toróide
-				</combo_item>
-				<combo_item name="Plane">
-					Plano
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cilindro
-				</combo_item>
+				<combo_box.item name="None" label="nenhum)"/>
+				<combo_box.item name="Sphere" label="Esfera"/>
+				<combo_box.item name="Torus" label="Toróide"/>
+				<combo_box.item name="Plane" label="Plano"/>
+				<combo_box.item name="Cylinder" label="Cilindro"/>
 			</combo_box>
 		</panel>
 		<panel label="Recursos" name="Features">
@@ -438,88 +364,40 @@
 				Mapeamento
 			</text>
 			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					Padrão
-				</combo_item>
-				<combo_item name="Planar">
-					Planar
-				</combo_item>
+				<combo_box.item name="Default" label="Padrão"/>
+				<combo_box.item name="Planar" label="Planar"/>
 			</combo_box>
 			<text name="label shininess">
 				Brilho
 			</text>
 			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					Nenhum
-				</combo_item>
-				<combo_item name="Low">
-					Baixo
-				</combo_item>
-				<combo_item name="Medium">
-					Médio
-				</combo_item>
-				<combo_item name="High">
-					Alto
-				</combo_item>
+				<combo_box.item name="None" label="Nenhum"/>
+				<combo_box.item name="Low" label="Baixo"/>
+				<combo_box.item name="Medium" label="Médio"/>
+				<combo_box.item name="High" label="Alto"/>
 			</combo_box>
 			<text name="label bumpiness">
 				Ondulação
 			</text>
 			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					Nenhum
-				</combo_item>
-				<combo_item name="Brightness">
-					Claridade
-				</combo_item>
-				<combo_item name="Darkness">
-					Escuridão
-				</combo_item>
-				<combo_item name="woodgrain">
-					Granulação
-				</combo_item>
-				<combo_item name="bark">
-					casca
-				</combo_item>
-				<combo_item name="bricks">
-					Tijolos
-				</combo_item>
-				<combo_item name="checker">
-					Caixa
-				</combo_item>
-				<combo_item name="concrete">
-					Concreto
-				</combo_item>
-				<combo_item name="crustytile">
-					Encaroçado
-				</combo_item>
-				<combo_item name="cutstone">
-					Pedra Cortante
-				</combo_item>
-				<combo_item name="discs">
-					Discos
-				</combo_item>
-				<combo_item name="gravel">
-					Cascalho
-				</combo_item>
-				<combo_item name="petridish">
-					Pedrisco
-				</combo_item>
-				<combo_item name="siding">
-					Revestimento
-				</combo_item>
-				<combo_item name="stonetile">
-					empedrado
-				</combo_item>
-				<combo_item name="stucco">
-					Grafiato
-				</combo_item>
-				<combo_item name="suction">
-					Sulcos
-				</combo_item>
-				<combo_item name="weave">
-					weave
-				</combo_item>
+				<combo_box.item name="None" label="Nenhum"/>
+				<combo_box.item name="Brightness" label="Claridade"/>
+				<combo_box.item name="Darkness" label="Escuridão"/>
+				<combo_box.item name="woodgrain" label="Granulação"/>
+				<combo_box.item name="bark" label="casca"/>
+				<combo_box.item name="bricks" label="Tijolos"/>
+				<combo_box.item name="checker" label="Caixa"/>
+				<combo_box.item name="concrete" label="Concreto"/>
+				<combo_box.item name="crustytile" label="Encaroçado"/>
+				<combo_box.item name="cutstone" label="Pedra Cortante"/>
+				<combo_box.item name="discs" label="Discos"/>
+				<combo_box.item name="gravel" label="Cascalho"/>
+				<combo_box.item name="petridish" label="Pedrisco"/>
+				<combo_box.item name="siding" label="Revestimento"/>
+				<combo_box.item name="stonetile" label="empedrado"/>
+				<combo_box.item name="stucco" label="Grafiato"/>
+				<combo_box.item name="suction" label="Sulcos"/>
+				<combo_box.item name="weave" label="weave"/>
 			</combo_box>
 			<text name="tex scale">
 				Repetir por Face
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 24de146387..54ebdf2bb2 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -34,14 +34,10 @@
 	</text>
 
 	<combo_box label="Amigos Conectados" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
-		<combo_box.item name="none_selected">
-			Amigos Conectados
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Amigos Conectados" />
 	</combo_box>
 	<combo_box label="Landmarks" name="landmark combo" tool_tip="Landmark para mostrar no Mapa">
-		<combo_box.item name="none_selected">
-			Landmarks
-		</combo_box.item>
+		<combo_box.item name="none_selected" label="Landmarks" />
 	</combo_box>
 	<line_editor label="Procurar por nome de região" name="location" tool_tip="Digite o nome de uma Região"/>
 	<button label="Procurar" name="DoSearch" tool_tip="Procurar por região"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index 5446875654..1612974716 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -13,15 +13,9 @@
 		Localização inicial:
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome">
-			Minha casa
-		</combo_box.item>
-		<combo_box.item name="MyLastLocation">
-			Minha última localização
-		</combo_box.item>
-		<combo_box.item name="Typeregionname">
-			&lt; Digite o nome da região;
-		</combo_box.item>
+		<combo_box.item name="MyHome" label="Minha casa" />
+		<combo_box.item name="MyLastLocation" label="Minha última localização" />
+		<combo_box.item name="Typeregionname" label="lt; Digite o nome da região;" />
 	</combo_box>
 	<check_box label="Lembrar senha" name="remember_check"/>
 	<button label="Entrar" label_selected="Entrar" name="connect_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index 28361d8ddf..4ad795ffc8 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -10,15 +10,9 @@
 	</radio_group>
 	<check_box label="Mostrar Posição Inicial na Tela de Login" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox" width="166">
-		<combo_item name="Never">
-			Nunca
-		</combo_item>
-		<combo_item name="Show Temporarily">
-			Mostrar Temporariamente
-		</combo_item>
-		<combo_item name="Always">
-			Sempre
-		</combo_item>
+		<combo_box.item name="Never" label="Nunca"/>
+		<combo_box.item name="Show Temporarily" label="Mostrar Temporariamente"/>
+		<combo_box.item name="Always" label="Sempre"/>
 	</combo_box>
 	<check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox"/>
 	<check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox"/>
@@ -62,53 +56,23 @@
 		Digite o nome da Região
 	</string>
 	<combo_box name="crash_behavior_combobox" width="166">
-		<combo_item length="1" name="Askbeforesending" type="string">
-			Perguntar antes de enviar
-		</combo_item>
-		<combo_item length="1" name="Alwayssend" type="string">
-			Sempre enviar
-		</combo_item>
-		<combo_item length="1" name="Neversend" type="string">
-			Nunca Enviar
-		</combo_item>
+		<combo_box.item length="1" name="Askbeforesending" type="string" label="Perguntar antes de enviar"/>
+		<combo_box.item length="1" name="Alwayssend" type="string" label="Sempre enviar"/>
+		<combo_box.item length="1" name="Neversend" type="string" label="Nunca Enviar"/>
 	</combo_box>
 	<combo_box name="language_combobox" width="166">
-		<combo_item name="System Default Language">
-			Padrão do Sistema
-		</combo_item>
-		<combo_item name="English">
-			English (Inglês)
-		</combo_item>
-		<combo_item name="Danish">
-			Dansk (Dinamarquês) - Beta
-		</combo_item>
-		<combo_item name="Deutsch(German)">
-			Deutsch (Alemão) - Beta
-		</combo_item>
-		<combo_item name="Spanish">
-			Español (Espanhol) - Beta
-		</combo_item>
-		<combo_item name="French">
-			Français (Francês) - Beta
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (Húngaro) - Beta
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (Polonês) - Beta
-		</combo_item>
-		<combo_item name="Portugese">
-			Português - Beta
-		</combo_item>
-		<combo_item name="Chinese">
-			中文 (简体) (Chinês) - Beta
-		</combo_item>
-		<combo_item name="(Japanese)">
-			日本語 (Japonês) - Beta
-		</combo_item>
-		<combo_item name="(Korean)">
-			한국어 (Coreano) - Beta
-		</combo_item>
+		<combo_box.item name="System Default Language" label="Padrão do Sistema"/>
+		<combo_box.item name="English" label="English (Inglês)"/>
+		<combo_box.item name="Danish" label="Dansk (Dinamarquês) - Beta"/>
+		<combo_box.item name="Deutsch(German)" label="Deutsch (Alemão) - Beta"/>
+		<combo_box.item name="Spanish" label="Español (Espanhol) - Beta"/>
+		<combo_box.item name="French" label="Français (Francês) - Beta"/>
+		<combo_box.item name="Hungarian" label="Magyar (Húngaro) - Beta"/>
+		<combo_box.item name="Polish" label="Polski (Polonês) - Beta"/>
+		<combo_box.item name="Portugese" label="Português - Beta"/>
+		<combo_box.item name="Chinese" label="中文 (简体) (Chinês) - Beta"/>
+		<combo_box.item name="(Japanese)" label="日本語 (Japonês) - Beta"/>
+		<combo_box.item name="(Korean)" label="한국어 (Coreano) - Beta"/>
 	</combo_box>
 	<check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 5833956986..a14ad6d4de 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -9,21 +9,11 @@
 		Tamanho da Janela:
 	</text>
 	<combo_box name="windowsize combo">
-		<combo_box.item name="640x480">
-			640x480
-		</combo_box.item>
-		<combo_box.item name="800x600">
-			800x600
-		</combo_box.item>
-		<combo_box.item name="720x480">
-			720x480 (NTSC)
-		</combo_box.item>
-		<combo_box.item name="768x576">
-			768x576 (PAL)
-		</combo_box.item>
-		<combo_box.item name="1024x768">
-			1024x768
-		</combo_box.item>
+		<combo_box.item name="640x480" label="640x480" />
+		<combo_box.item name="800x600" label="800x600" />
+		<combo_box.item name="720x480" label="720x480 (NTSC)" />
+		<combo_box.item name="768x576" label="768x576 (PAL)" />
+		<combo_box.item name="1024x768" label="1024x768" />
 	</combo_box>
 	<text name="DisplayResLabel">
 		Resolução de Display:
@@ -32,18 +22,10 @@
 		Relação de Aspecto:
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largura / altura">
-		<combo_box.item length="1" name="4:3(StandardCRT)" type="string">
-			4:3 (CRT Padrão)
-		</combo_box.item>
-		<combo_box.item length="1" name="5:4(1280x1024LCD)" type="string">
-			5:4 (1280x1024 LCD)
-		</combo_box.item>
-		<combo_box.item name="8:5(Widescreen)">
-			8:5 (tela ampla)
-		</combo_box.item>
-		<combo_box.item length="1" name="16:9(Widescreen)" type="string">
-			16:9 (tela ampla)
-		</combo_box.item>
+		<combo_box.item length="1" name="4:3(StandardCRT)" type="string" label="4:3 (CRT Padrão)" />
+		<combo_box.item length="1" name="5:4(1280x1024LCD)" type="string" label="5:4 (1280x1024 LCD)" />
+		<combo_box.item name="8:5(Widescreen)" label="8:5 (tela ampla)" />
+		<combo_box.item length="1" name="16:9(Widescreen)" type="string" label="16:9 (tela ampla)" />
 	</combo_box>
 	<check_box label="Auto-detectar a relação" name="aspect_auto_detect"/>
 	<text name="HigherText">
-- 
cgit v1.2.3