From b586e6a9c2ab8b2efb48039738751ffeb3e85dee Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Wed, 31 May 2023 07:05:03 +0900
Subject: Merged DRTVWR-577 Japanese Translation.

---
 .../default/xui/ja/floater_my_environments.xml     | 53 ++++++++++++----------
 1 file changed, 29 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui/ja/floater_my_environments.xml')

diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
index d697a9f321..ea78425211 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="my_environments" title="私の環境">
-	<layout_stack>
-		<layout_panel label="フィルター" name="filter_panel">
-			<check_box label="日間" name="chk_days"/>
-			<check_box label="空" name="chk_skies"/>
-			<check_box label="水" name="chk_water"/>
-			<filter_editor label="環境の絞り込み" name="flt_search"/>
-		</layout_panel>
-		<layout_panel label="環境" name="list_panel">
-			<panel label="pnl_inv_wrap" name="pnl_inv_wrap"/>
-		</layout_panel>
-		<layout_panel>
-			<check_box initial_value="false" label="すべてのフォルダを表示" name="chk_showfolders"/>
-		</layout_panel>
-		<layout_panel name="pnl_control">
-			<panel label="bottom_panel" name="pnl_bottom">
-				<menu_button name="btn_gear" tool_tip="その他のオプションを表示"/>
-				<menu_button name="btn_newsettings" tool_tip="新規設定を作成"/>
-				<button name="btn_del" tool_tip="選択したアイテムを削除"/>
-			</panel>
-		</layout_panel>
-	</layout_stack>
-</floater>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="my_environments" title="私の環境">
+  <layout_stack name="main_layout">
+    <layout_panel name="filter_panel" label="フィルタ">
+      <icon name="icon_settingsdays" />
+      <check_box label="日間" name="chk_days" />
+      <icon name="icon_settingsskies" />
+      <check_box label="空" name="chk_skies" />
+      <icon name="icon_settingswater" />
+      <check_box label="水" name="chk_water" />
+      <filter_editor label="環境の絞り込み" name="flt_search" />
+    </layout_panel>
+    <layout_panel name="list_panel" label="環境">
+      <panel name="pnl_inv_wrap" label="pnl_inv_wrap">
+        <asset_filtered_inv_panel name="pnl_settings" />
+      </panel>
+    </layout_panel>
+    <layout_panel name="lp_showfolders">
+      <check_box label="全てのフォルダを開く" name="chk_showfolders" />
+    </layout_panel>
+    <layout_panel name="pnl_control">
+      <panel label="ボトムパネル" name="pnl_bottom">
+        <menu_button name="btn_gear" tool_tip="その他のオプションを表示" />
+        <menu_button name="btn_newsettings" tool_tip="新しい設定を作成" />
+        <button name="btn_del" tool_tip="選択した項目を削除" />
+      </panel>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
-- 
cgit v1.2.3


From 6f58bc78fe2c8667e1f5ac40a309620fd98a5f36 Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Fri, 2 Jun 2023 01:09:21 +0900
Subject: =?UTF-8?q?Revert=20Call=20translation=20to=20'=E3=82=B3=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB'.=20Chang=20'water'=20translation=20'=E6=B0=B4'=20to?=
 =?UTF-8?q?=20'=E6=B0=B4=E9=9D=A2'.=20Unify=20the=20ground=20translation?=
 =?UTF-8?q?=20with=E3=80=80'=E5=9C=B0=E9=9D=A2'=20expect=20land=20floater.?=
 =?UTF-8?q?=20Fixed=20mistranslation=20of=20widget.=20Re-translate=20panel?=
 =?UTF-8?q?=5Fsettings=5Fsky=5Fdensity.xml.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/skins/default/xui/ja/floater_my_environments.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/ja/floater_my_environments.xml')

diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
index ea78425211..8ca0cf4242 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
@@ -7,7 +7,7 @@
       <icon name="icon_settingsskies" />
       <check_box label="空" name="chk_skies" />
       <icon name="icon_settingswater" />
-      <check_box label="水" name="chk_water" />
+      <check_box label="水面" name="chk_water" />
       <filter_editor label="環境の絞り込み" name="flt_search" />
     </layout_panel>
     <layout_panel name="list_panel" label="環境">
-- 
cgit v1.2.3


From d30d865f87cbebb6bec3ce8157957fb1e817ba68 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sun, 4 Jun 2023 05:03:27 +0300
Subject: SL-19669 Restored XML formatting for the Japanese translations

---
 .../default/xui/ja/floater_my_environments.xml     | 56 +++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'indra/newview/skins/default/xui/ja/floater_my_environments.xml')

diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
index 8ca0cf4242..b316222919 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="my_environments" title="私の環境">
-  <layout_stack name="main_layout">
-    <layout_panel name="filter_panel" label="フィルタ">
-      <icon name="icon_settingsdays" />
-      <check_box label="日間" name="chk_days" />
-      <icon name="icon_settingsskies" />
-      <check_box label="空" name="chk_skies" />
-      <icon name="icon_settingswater" />
-      <check_box label="水面" name="chk_water" />
-      <filter_editor label="環境の絞り込み" name="flt_search" />
-    </layout_panel>
-    <layout_panel name="list_panel" label="環境">
-      <panel name="pnl_inv_wrap" label="pnl_inv_wrap">
-        <asset_filtered_inv_panel name="pnl_settings" />
-      </panel>
-    </layout_panel>
-    <layout_panel name="lp_showfolders">
-      <check_box label="全てのフォルダを開く" name="chk_showfolders" />
-    </layout_panel>
-    <layout_panel name="pnl_control">
-      <panel label="ボトムパネル" name="pnl_bottom">
-        <menu_button name="btn_gear" tool_tip="その他のオプションを表示" />
-        <menu_button name="btn_newsettings" tool_tip="新しい設定を作成" />
-        <button name="btn_del" tool_tip="選択した項目を削除" />
-      </panel>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<layout_stack name="main_layout">
+		<layout_panel name="filter_panel" label="フィルタ">
+			<icon name="icon_settingsdays"/>
+			<check_box label="日間" name="chk_days"/>
+			<icon name="icon_settingsskies"/>
+			<check_box label="空" name="chk_skies"/>
+			<icon name="icon_settingswater"/>
+			<check_box label="水面" name="chk_water"/>
+			<filter_editor label="環境の絞り込み" name="flt_search"/>
+		</layout_panel>
+		<layout_panel name="list_panel" label="環境">
+			<panel name="pnl_inv_wrap" label="pnl_inv_wrap">
+				<asset_filtered_inv_panel name="pnl_settings"/>
+			</panel>
+		</layout_panel>
+		<layout_panel name="lp_showfolders">
+			<check_box label="全てのフォルダを開く" name="chk_showfolders"/>
+		</layout_panel>
+		<layout_panel name="pnl_control">
+			<panel label="ボトムパネル" name="pnl_bottom">
+				<menu_button name="btn_gear" tool_tip="その他のオプションを表示"/>
+				<menu_button name="btn_newsettings" tool_tip="新しい設定を作成"/>
+				<button name="btn_del" tool_tip="選択した項目を削除"/>
+			</panel>
+		</layout_panel>
+	</layout_stack>
+</floater>
-- 
cgit v1.2.3