diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
index 0806a87288..744eb2bd7c 100644
--- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
@@ -22,6 +22,7 @@
     height="440"
     width="333">
     <panel
+      name="background_panel"
       follows="all"
       left="10"
       height="440"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 39e9de0980..199b0d82c1 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1676,7 +1676,8 @@
         height="100">
         <text
           layout="topleft"
-          left="3">
+          left="3"
+          name="price_breakdown_title">
           Price Breakdown
         </text>
         <view_border
@@ -1758,7 +1759,8 @@ Lowest:
         height="100">
         <text
           layout="topleft"
-          left="3">
+          left="3"
+          name="physics_breakdown_title">
           Physics Costs
         </text>
         <view_border
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index bf07ae4d68..7a2ec6c36a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -15,6 +15,7 @@
     height="16"
     layout="topleft"
     left="5"
+    name="preset_label"
     top="5"
     width="100">
       Preset in use:
diff --git a/indra/newview/skins/default/xui/en/panel_profile_legacy_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_legacy_secondlife.xml
index 3b89ea50b9..0a79fd4c7e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_legacy_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_legacy_secondlife.xml
@@ -15,7 +15,8 @@
     width="304"
     layout="topleft"
     orientation="vertical"
-    show_drag_handle="false">
+    show_drag_handle="false"
+    name="avatar_secondlife_stack">
     <layout_panel
      name="avatar_info_top"
      follows="top|left|right"
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
index 82b2a4fce8..dade4e2fd8 100644
--- a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater title="マーケットプレイスの出品リスト" name="floater_marketplace_listings">
 	<panel name="marketplace_listings_panel">
-		<panel>
+		<panel name="background_panel">
 			<panel name="marketplace_listings_inventory_placeholder_panel">
 				<text name="marketplace_listings_inventory_placeholder_title">
 					読み込んでいます…
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 376ef18163..2e13da87de 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -317,10 +317,32 @@
 					<button label="分析" name="Decompose"/>
 					<button label="キャンセル" name="decompose_cancel"/>
 				</panel>
+				<panel name="physics analysis vhacd">
+					<text name="method_label">
+						ステップ２：殻への変換（オプション）
+					</text>
+					<text name="analysis_method_label">
+						フィルモード：
+					</text>
+					<text name="quality_label">
+						解像度：
+					</text>
+					<text name="quality_label">
+						殻あたりのメッシュ：
+					</text>
+					<text name="smooth_method_label">
+						殻あたりの頂点：
+					</text>
+					<text name="tolerance_label">
+						許容誤差：
+					</text>
+					<button label="解析" name="Analyze"/>
+					<button label="キャンセル" name="analyze_cancel"/>
+				</panel>
 				<!-- ==== STEP 3: Simplify ==== -->
 				<panel name="physics simplification">
 					<text name="second_step_label">
-						手順３：簡素化
+						ステップ３：簡素化
 					</text>
 					<text name="simp_method_header">
 						方法：
@@ -426,7 +448,7 @@
 			</text>
 			<!-- =========== Cost breakdown ======== -->
 			<panel name="price_breakdown_panel" width="150">
-				<text>
+				<text name="price_breakdown_title">
 					費用の内訳
 				</text>
 				<text name="price_breakdown_labels" width="100">
@@ -457,8 +479,8 @@
 [STR_LOW]
 [STR_LOWEST]</text>-->
 			<panel name="physics_costs_panel">
-				<text>
-					物理効果コスト
+				<text name="physics_breakdown_title">
+					物理効果の費用
 				</text>
 				<text name="physics_breakdown_labels">
 					基準の殻：
@@ -508,7 +530,7 @@
 		<check_box label="ジョイント位置のオーバーライド" name="show_joint_overrides"/>
 		<check_box label="ジョイント数" name="show_joint_positions"/>
 		<text name="physics_explode_label">
-			展開プレビュー：
+			プレビュー：
 		</text>
 	</panel>
 </floater>
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 ccce518cf7..90510cb36a 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="グラフィック" name="Display panel">
-	<text>
+	<text name="preset_label">
 		使用中のプリセット：
 	</text>
 	<text name="preset_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml
index 6a3ee2a5b9..5d75ee8dff 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_legacy_secondlife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="セカンドライフ" name="avatar_secondlife_tab">
-	<layout_stack>
+	<layout_stack name="avatar_secondlife_stack">
 		<layout_panel name="avatar_info_top">
 			<profile_image  name="sl_profile_pic" tool_tip="クリックして画像を選択してください。">
 				<!-- It would be cool if this worked someday!