merge

4 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 7091e35a6e..46023bcf19 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -477,7 +477,7 @@
 		<text name="label_area">
 			Gebiet: [AREA] m².
 		</text>
-		<button label="Über Land" label_selected="Über Land" name="button about land"/>
+		<button label="Land-Info" label_selected="Land-Info" name="button about land"/>
 		<check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Die Parzellen farblich nach Eigentümtertyp anzeigen   Grün = Ihr Land  Blau = Das Land Ihrer Gruppe  Rot = Im Eigentum anderer  Geld = Zum Verkauf  Lila = Zur Auktion  Grau = Öffentlich"/>
 		<text name="label_parcel_modify">
 			Parzelle ändern
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 1e7c51259c..9e5ef10d42 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -353,7 +353,7 @@
                          left_pad="12"
                          name="rating_label"
                          value="Rating:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="16"
@@ -380,7 +380,7 @@
                          name="voice_label"
                          top_delta="0"
                          value="Voice:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="18"
@@ -406,7 +406,7 @@
                          left_pad="8"
                          name="fly_label"
                          value="Fly:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="16"
@@ -432,7 +432,7 @@
                          left_pad="8"
                          name="push_label"
                          value="Push:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="14"
@@ -458,7 +458,7 @@
                          left_pad="8"
                          name="build_label"
                          value="Build:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="15"
@@ -484,7 +484,7 @@
                          left_pad="8"
                          name="scripts_label"
                          value="Scripts:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="14"
@@ -510,7 +510,7 @@
                          left_pad="8"
                          name="damage_label"
                          value="Damage:"
-                         width="60" />
+                         width="90" />
                         <text
                          follows="left|right|top"
                          height="14"
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index a670975dda..eae9ac03c3 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -49,7 +49,7 @@
 					<button name="mute_btn" tool_tip="選択したメディアの音をミュート"/>
 				</layout_panel>
 				<layout_panel name="zoom">
-					<button name="zoom_btn" tool_tip="選択したメディアに近づく"/>
+					<button name="zoom_btn" tool_tip="選択したメディアにズーム"/>
 				</layout_panel>
 				<layout_panel name="unzoom">
 					<button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 433ed0ad93..9de04f0d6a 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -69,7 +69,7 @@
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="区画">
 					<panel name="parcel_characteristics_panel">
-						<text name="rating_label" value="レーティング区分："/>
+						<text name="rating_label" value="レーティング："/>
 						<text name="rating_value" value="不明"/>
 						<text name="voice_label" value="ボイス："/>
 						<text name="voice_value" value="オン"/>
@@ -88,11 +88,11 @@
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="リージョン（地域）     ">
 					<panel name="region_information_panel">
-						<text name="region_name_label" value="リージョン（地域）:"/>
+						<text name="region_name_label" value="リージョン:"/>
 						<text name="region_name" value="Mooseland"/>
 						<text name="region_type_label" value="種類："/>
 						<text name="region_type" value="Moose"/>
-						<text name="region_rating_label" value="レーティング区分："/>
+						<text name="region_rating_label" value="レーティング："/>
 						<text name="region_rating" value="Adult"/>
 						<text name="region_owner_label" value="所有者："/>
 						<text name="region_owner" value="moose Van Moose"/>
@@ -105,8 +105,8 @@
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="エステート（不動産）">
 					<panel name="estate_information_panel">
-						<text name="estate_name_label" value="エステート（不動産）："/>
-						<text name="estate_rating_label" value="レーティング区分："/>
+						<text name="estate_name_label" value="エステート："/>
+						<text name="estate_rating_label" value="レーティング："/>
 						<text name="estate_owner_label" value="所有者："/>
 						<text name="covenant_label" value="約款："/>
 					</panel>