From 89910faffe41dcd57cbda888c8a8cb96b87eee3a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 20 Oct 2015 10:13:01 +0200
Subject: [PATCH] Fix XML syntax errors

---
 .../default/xui/de/floater_im_container.xml   |   2 +-
 .../skins/default/xui/es/floater_about.xml    |   3 +-
 .../default/xui/es/floater_im_session.xml     |   5 +-
 .../xui/fr/panel_preferences_firestorm.xml    |   4 +-
 .../xui/fr/panel_preferences_sound.xml        |   8 --
 .../xui/ja/floater_fs_teleporthistory.xml     |  13 +-
 .../xui/ja/floater_whitelist_entry.xml        |   2 +-
 .../default/xui/ja/menu_conversation.xml      |  11 +-
 .../default/xui/ja/menu_participant_view.xml  |   4 -
 .../xui/ja/menu_pie_attachment_other.xml      |   1 -
 .../skins/default/xui/ja/panel_places.xml     | 120 +++++++++---------
 .../default/xui/ru/floater_rlv_behaviours.xml |   2 +-
 .../default/xui/ru/panel_tools_texture.xml    |   2 +-
 .../default/xui/tr/panel_group_roles.xml      |  13 +-
 .../default/xui/zh/panel_group_roles.xml      |  13 +-
 15 files changed, 90 insertions(+), 113 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
index 8eedc5ec53..4845f2e848 100755
--- a/indra/newview/skins/default/xui/de/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="Gespräche"/>
+<multi_floater name="floater_im_box" title="Gespräche">
 	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
 	<string name="expand_icon" value="Conv_toolbar_expand"/>
 	<layout_stack name="conversations_stack">
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 3e5cbc7c08..62082d0276 100755
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -115,6 +115,7 @@ Este software contiene código fuente proporcionado por NVIDIA Corporation.
 Todos los derechos reservados. Ver licenses.txt para más detalles.
 
 Codificación de audio del chat de voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-		</text_editor>
+			</text_editor>
+		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 999ccced85..e6dddf42e1 100755
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -25,9 +25,8 @@
 						<layout_stack name="translate_and_chat_stack">
 							<layout_panel name="translate_chat_checkbox_lp">
 								<check_box label="Traducir chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</layout_panel>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
index b18d57f43e..df54048c51 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
@@ -420,7 +420,7 @@
         </text>
 		<slider name="FSNameTagZOffsetCorrection"
 			label="Compensation en Z"
-			tool_tip="Modifie la distance entre l'avatar et le label. [Défaut&nbsp;:&nbsp;0]" />
+			tool_tip="Modifie la distance entre l'avatar et le label. [Défaut 0]" />
 	</panel>
 </tab_container>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index 844c35a545..7b229d114e 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -46,11 +46,3 @@
 		</panel>
 	</tab_container>
 </panel>
-
-
-
-
-
-
-
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_fs_teleporthistory.xml b/indra/newview/skins/default/xui/ja/floater_fs_teleporthistory.xml
index fe6142e2db..39a35c5f68 100644
--- a/indra/newview/skins/default/xui/ja/floater_fs_teleporthistory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fs_teleporthistory.xml
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_tphistory" title="Teleport History">
 	<filter_editor label="土地をフィルター" name="Filter" />
-
 	<panel name="history_placeholder" />
- 
 	<panel name="button_panel">
-		<layout_stack name="bottom_bar_ls0" orientation="horizontal">
-
-			<layout_panelname="show_lm_panel">
-
-				<layout_stack
-				 follows="bottom|left|right" name="bottom_bar_ls1" orientation="horizontal">
+		<layout_stack name="bottom_bar_ls0">
+			<layout_panel name="show_lm_panel">
+				<layout_stack name="bottom_bar_ls1">
 					<layout_panel name="teleport_btn_lp">
 						<button label="テレポート" name="teleport_btn" tool_tip="選択した地域にテレポートします。" />
 					</layout_panel>
-
 					<layout_panel name="chat_btn_lp">
 						<button label="地図" name="map_btn" tool_tip="該当する地域を世界地図上に表示します。"/>
 					</layout_panel>
-
 					<layout_panel name="chat_btn_lp">
 						<button label="プロフィールを表示" name="profile_btn" tool_tip="この場所のプロフィールを表示します。" />
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
index 68314b078a..128ad96329 100755
--- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
@@ -5,5 +5,5 @@
 	</text>
 	<line_editor name="whitelist_entry" tool_tip="URL か URL パターンをホワイトリストに入力します"/>
 	<button label="OK" name="ok_btn"/>
-	<button label="取り消し name="cancel_btn"/>
+	<button label="取り消し" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
index 66403aebf2..6a2e230cfa 100755
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -2,20 +2,17 @@
 <toggleable_menu name="menu_conversation_participant">
 	<menu_item_call label="会話を終了" name="close_conversation" />
 	<menu_item_call label="ボイス会話を開始" />
-	<menu_item_call label="ボイスを切断" name="disconnect_from_voice" />	
-	<menu_item_separator name="separator_disconnect_from_voice" />	
+	<menu_item_call label="ボイスを切断" name="disconnect_from_voice" />
 	<menu_item_call label="選択した項目を閉じる" name="close_selected_conversations"/>
 	<menu_item_call label="プロフィールの表示" name="view_profile" />
 	<menu_item_call label="IM" name="im" />
 	<menu_item_call label="テレポートを送る" name="offer_teleport" />
 	<menu_item_call label="コール" name="voice_call" />
 	<menu_item_call label="チャット履歴..." name="chat_history" />
-	<menu_item_separator name="separator_chat_history"/>	
-	<menu_item_calllabel="フレンド登録" name="add_friend" />
+	<menu_item_call label="フレンド登録" name="add_friend" />
 	<menu_item_call label="フレンドを削除" name="remove_friend" />
 	<menu_item_call label="複数のフにレンドを削除" name="remove_friends" />
 	<menu_item_call label="グループ招待..." name="invite_to_group" />
-	<menu_item_separator name="separator_invite_to_group"/>
 	<menu_item_call label="ズームイン" name="zoom_in" />
 	<menu_item_call label="世界地図" name="map" />
 	<menu_item_call label="共有" name="share" />
@@ -23,12 +20,10 @@
 	<menu_item_check label="ボイスをブロック" name="block_unblock" />
 	<menu_item_check label="テキストをブロック" name="MuteText" />
 	<menu_item_call label="グループのプロフィール" name="group_profile" />
-	<menu_item_call label="グループをアクティブにする" name="activate_group" />		
+	<menu_item_call label="グループをアクティブにする" name="activate_group" />
 	<menu_item_call label="グループを脱退する" name="leave_group" />
-	<menu_item_separator name="Moderator Options Separator"/>
 	<context_menu label="主宰者のオプション" name="Moderator Options">
 		<menu_item_check label="テキストチャットを許可" name="AllowTextChat" />
-		<menu_item_separator name="moderate_voice_separator" />
 		<menu_item_call label="この参加者を無視" name="ModerateVoiceMuteSelected" />
 		<menu_item_call label="この参加者の無視を解除" name="ModerateVoiceUnMuteSelected" />
 		<menu_item_call label="全員を無視" name="ModerateVoiceMute" />
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
index 1bea59083f..2d39dad4fd 100755
--- a/indra/newview/skins/default/xui/ja/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -3,15 +3,11 @@
     <menu_item_check label="会話を種類で並べ替え" name="sort_sessions_by_type" />
     <menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name" />
     <menu_item_check label="会話を最近のものから並べ替え" name="sort_sessions_by_recent" />
-    <menu_item_separator />
     <menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name" />
     <menu_item_check label="参加者を最近会話した人から並べ替え" name="sort_participants_by_recent" />
-    <menu_item_separator />
     <menu_item_call label="チャットの環境設定..." name="chat_preferences" />
     <menu_item_call label="プライバシーの環境設定..." name="privacy_preferences" />
     <menu_item_check label="会話ログ..." name="Conversation" />
-    <menu_item_separator />
     <menu_item_check name="Translate_chat" label="周辺チャットを翻訳" />
-    </menu_item_check>
     <menu_item_check name="Translation_settings" label="翻訳設定..." />
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_pie_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_pie_attachment_other.xml
index dac362ccdd..7d956a1203 100644
--- a/indra/newview/skins/default/xui/ja/menu_pie_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_pie_attachment_other.xml
@@ -16,7 +16,6 @@
             label="パーティクル"
             name="Mute Particle" />
     </pie_menu>
-    <pie_slice
     <pie_slice
         label="会いに行く"
         name="Go to"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index 61745ad27d..7884a6a575 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -4,67 +4,67 @@
 	<string name="teleport_history_tab_title" value="テレポートの履歴"/>
 	<filter_editor label="場所をフィルター" name="Filter"/>
 	
-	<tab_container name="Places Tabs" />
-	<panel name="panel_place_profile" />
-	<panel name="panel_landmark_info" />
-	<panel name="button_panel">
-	<panel name="button_panel">
-		<layout_stack name="bottom_bar_ls0">
-			<layout_panel name="lp1">
-				
-			<!-- Teleport, Map buttons -->
-				
-				<layout_stack name="bottom_bar_ls1">
-					<layout_panel name="teleport_btn_lp">
-						<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/>
-					</layout_panel>
-					<layout_panel name="chat_btn_lp">
-						<button label="地図" name="map_btn" tool_tip="世界地図に該当するエリアを表示"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-				
-			<layout_panel name="lp2">
-				
-			<!-- Edit, Options buttons -->
-				
-				<layout_stack name="bottom_bar_ls3">
-					<layout_panel name="edit_btn_lp">
-						<button label="編集" name="edit_btn" tool_tip="ランドマークの情報を編集します"/>
-					</layout_panel>
-					<layout_panel name="overflow_btn_lp">
-						<menu_button label="▼" name="overflow_btn" tool_tip="オプションを表示します"/>
-					</layout_panel>
-				</layout_stack>
-							
-				<!-- Profile button -->
+	<tab_container name="Places Tabs">
+		<panel name="panel_place_profile" />
+		<panel name="panel_landmark_info" />
+		<panel name="button_panel">
+			<layout_stack name="bottom_bar_ls0">
+				<layout_panel name="lp1">
 					
-				<layout_stack name="bottom_bar_profile_ls">
-					<layout_panel name="profile_btn_lp">
-						<button label="プロフィール" name="profile_btn" tool_tip="場所のプロフィールを表示"/>
-					</layout_panel>
-				</layout_stack>
-		
-				<!-- Close button -->
+				<!-- Teleport, Map buttons -->
 					
-				<layout_stack name="bottom_bar_close_ls3">
-					<layout_panel name="close_btn_lp">
-						<button label="閉じる" name="close_btn"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-
-		<!-- Save, Cancel buttons -->
+					<layout_stack name="bottom_bar_ls1">
+						<layout_panel name="teleport_btn_lp">
+							<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/>
+						</layout_panel>
+						<layout_panel name="chat_btn_lp">
+							<button label="地図" name="map_btn" tool_tip="世界地図に該当するエリアを表示"/>
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+					
+				<layout_panel name="lp2">
+					
+				<!-- Edit, Options buttons -->
+					
+					<layout_stack name="bottom_bar_ls3">
+						<layout_panel name="edit_btn_lp">
+							<button label="編集" name="edit_btn" tool_tip="ランドマークの情報を編集します"/>
+						</layout_panel>
+						<layout_panel name="overflow_btn_lp">
+							<menu_button label="▼" name="overflow_btn" tool_tip="オプションを表示します"/>
+						</layout_panel>
+					</layout_stack>
+								
+					<!-- Profile button -->
+						
+					<layout_stack name="bottom_bar_profile_ls">
+						<layout_panel name="profile_btn_lp">
+							<button label="プロフィール" name="profile_btn" tool_tip="場所のプロフィールを表示"/>
+						</layout_panel>
+					</layout_stack>
 			
-		<layout_stack name="bottom_bar_ls2">
-			<layout_panel name="save_btn_lp">
-				<button label="保存" name="save_btn"/>
-			</layout_panel>
-			<layout_panel name="cancel_btn_lp">
-				<button label="取り消し" name="cancel_btn"/>
-			</layout_panel>
-		</layout_stack>
-		
-	</panel>
+					<!-- Close button -->
+						
+					<layout_stack name="bottom_bar_close_ls3">
+						<layout_panel name="close_btn_lp">
+							<button label="閉じる" name="close_btn"/>
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+
+			<!-- Save, Cancel buttons -->
+				
+			<layout_stack name="bottom_bar_ls2">
+				<layout_panel name="save_btn_lp">
+					<button label="保存" name="save_btn"/>
+				</layout_panel>
+				<layout_panel name="cancel_btn_lp">
+					<button label="取り消し" name="cancel_btn"/>
+				</layout_panel>
+			</layout_stack>
+
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_rlv_behaviours.xml b/indra/newview/skins/default/xui/ru/floater_rlv_behaviours.xml
index 845126bbbe..75db65a300 100644
--- a/indra/newview/skins/default/xui/ru/floater_rlv_behaviours.xml
+++ b/indra/newview/skins/default/xui/ru/floater_rlv_behaviours.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="rlv_behaviours" title="Активные ограничения RLV">
   <tab_container name="behaviour_tab">
-    <panellabel="Ограничения" name="behaviour_panel">
+    <panel label="Ограничения" name="behaviour_panel">
       <scroll_list name="behaviour_list">
         <scroll_list.columns label="Ограничения" name="behaviour" />
         <scroll_list.columns label="Имя объекта" name="issuer"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
index 8888979d36..dba9d49cf3 100644
--- a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
@@ -115,5 +115,5 @@
 	<check_box initial_value="false" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных гранях по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/>
 	<check_box label="Синхронизировать материалы" name="checkbox maps sync" tool_tip="Синхронизация параметров карты текстур" />
 	<button label="Копировать" name="copytextures" />
-	<button label="Вставить"name="pastetextures" />
+	<button label="Вставить" name="pastetextures" />
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_roles.xml b/indra/newview/skins/default/xui/tr/panel_group_roles.xml
index 42fd751bce..80012031f6 100755
--- a/indra/newview/skins/default/xui/tr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_roles.xml
@@ -101,11 +101,12 @@ Ctrl tuşuna basıp adlarına tıklayarak birden fazla Üye seçebilirsiniz.
 			<text_editor name="action_description">
 				Bu Yetenek &apos;Bu Gruptan Üye Çıkarma&apos;dır. Bir Sahibi sadece başka bir Sahip çıkartabilir.
 			</text_editor>
-		<text name="action_roles_label">
-			Bu yeteneğe sahip Roller
-		</text>
-		<text name="action_members_label">
-			Bu yeteneğe sahip Üyeler
-		</text>
+			<text name="action_roles_label">
+				Bu yeteneğe sahip Roller
+			</text>
+			<text name="action_members_label">
+				Bu yeteneğe sahip Üyeler
+			</text>
+		</panel>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index c8203061af..4f899226ef 100755
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -103,11 +103,12 @@
 			<text_editor name="action_description">
 				這個能力可「將會員自本群組踢出」。 必須是所有人才可踢出另一位所有人。
 			</text_editor>
-		<text name="action_roles_label">
-			有此能力的角色
-		</text>
-		<text name="action_members_label">
-			有此能力的成員
-		</text>
+			<text name="action_roles_label">
+				有此能力的角色
+			</text>
+			<text name="action_members_label">
+				有此能力的成員
+			</text>
+		</panel>
 	</panel>
 </panel>