From 4802a6f572b8b6c6e61465e3c6cf6b563fd163e4 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 1 Mar 2010 19:15:40 +0200
Subject: Implemented major sub-task EXT-5722 (hard-coded: Right click on
 Object > Sit Here and Take are hard-coded)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_object.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 9436b2cd73..2c97112e38 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -44,11 +44,24 @@
      name="Object Sit">
         <menu_item_call.on_click
          function="Object.SitOrStand" />
+        <menu_item_call.on_visible
+         function="Object.SitVisible" />
         <menu_item_call.on_enable
          function="Object.EnableSitOrStand"
-         name="EnableSitOrStand"
-         parameter="Sit Here,Stand Up" />
-    </menu_item_call>
+         name="EnableSitOrStand" />
+   </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Stand Up"
+     name="Object Stand Up">
+        <menu_item_call.on_click
+         function="Object.SitOrStand" />
+        <menu_item_call.on_visible
+         function="Object.StandUpVisible" />
+        <menu_item_call.on_enable
+         function="Object.EnableSitOrStand"
+         name="EnableSitOrStand" />
+   </menu_item_call>
    <menu_item_call
        label="Object Profile"
        name="Object Inspect">
-- 
cgit v1.2.3


From fbfc61f1bb0047f11469c3af548326e558a365f1 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 1 Mar 2010 10:53:00 -0800
Subject: JA linguistic fixes

---
 indra/newview/skins/default/xui/ja/floater_about_land.xml    | 12 ++++++------
 indra/newview/skins/default/xui/ja/floater_report_abuse.xml  |  8 ++++----
 indra/newview/skins/default/xui/ja/floater_world_map.xml     |  6 +++---
 indra/newview/skins/default/xui/ja/notifications.xml         |  8 ++++----
 indra/newview/skins/default/xui/ja/panel_classified_info.xml |  4 ++--
 indra/newview/skins/default/xui/ja/panel_edit_classified.xml |  4 ++--
 indra/newview/skins/default/xui/ja/panel_group_general.xml   |  6 +++---
 indra/newview/skins/default/xui/ja/panel_place_profile.xml   |  2 +-
 .../skins/default/xui/ja/panel_preferences_general.xml       |  6 +++---
 indra/newview/skins/default/xui/ja/panel_region_general.xml  |  8 ++++----
 .../skins/default/xui/ja/panel_region_general_layout.xml     |  8 ++++----
 indra/newview/skins/default/xui/ja/strings.xml               |  8 ++++----
 12 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'indra/newview/skins/default')

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 42f3211ada..a16348529b 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -284,16 +284,16 @@
 				あなたはこの区画の設定編集ができないため、このオプションは無効です。
 			</panel.string>
 			<panel.string name="mature_check_mature">
-				控えめコンテンツ
+				「Moderate」コンテンツ
 			</panel.string>
 			<panel.string name="mature_check_adult">
-				アダルトコンテンツ
+				「Adult」コンテンツ
 			</panel.string>
 			<panel.string name="mature_check_mature_tooltip">
-				あなたの区画情報及びコンテンツは「控えめ」とされています。
+				あなたの区画情報及びコンテンツは「Moderate」とされています。
 			</panel.string>
 			<panel.string name="mature_check_adult_tooltip">
-				あなたの区画情報及びコンテンツは「アダルト」とされています。
+				あなたの区画情報及びコンテンツは「Adult」とされています。
 			</panel.string>
 			<panel.string name="landing_point_none">
 				（なし）
@@ -333,7 +333,7 @@
 			<combo_box name="land category with adult">
 				<combo_box.item label="全カテゴリ" name="item0"/>
 				<combo_box.item label="Linden 所在地" name="item1"/>
-				<combo_box.item label="アダルト" name="item2"/>
+				<combo_box.item label="Adult" name="item2"/>
 				<combo_box.item label="アートとカルチャー" name="item3"/>
 				<combo_box.item label="ビジネス" name="item4"/>
 				<combo_box.item label="教育的" name="item5"/>
@@ -359,7 +359,7 @@
 				<combo_box.item label="ショッピング" name="item11"/>
 				<combo_box.item label="その他" name="item12"/>
 			</combo_box>
-			<check_box label="控えめコンテンツ" name="MatureCheck" tool_tip=""/>
+			<check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip=""/>
 			<text name="Snapshot:">
 				スナップショット：
 			</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 c66f307f23..105e903840 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -49,7 +49,7 @@
 		<combo_box.item label="商取引＞製品またはサービスの提供が行われない" name="Commerce__Failure_to_deliver_product_or_service"/>
 		<combo_box.item label="開示＞リアルワールドの情報" name="Disclosure__Real_world_information"/>
 		<combo_box.item label="開示＞離れたところからチャットをモニターしている" name="Disclosure__Remotely_monitoring chat"/>
-		<combo_box.item label="開示＞Second Lifeの情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs"/>
+		<combo_box.item label="開示＞Second Life の情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs"/>
 		<combo_box.item label="平穏を乱す行為＞地域リソースの使用が不公平" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
 		<combo_box.item label="平穏を乱す行為＞スクリプト・オブジェクトの乱用" name="Disturbing_the_peace__Excessive_scripted_objects"/>
 		<combo_box.item label="平穏を乱す行為＞オブジェクトの捨て置き" name="Disturbing_the_peace__Object_littering"/>
@@ -57,7 +57,7 @@
 		<combo_box.item label="平穏を乱す行為＞不要な広告スパム" name="Disturbing_the_peace__Unwanted_advert_spam"/>
 		<combo_box.item label="詐欺＞ L$" name="Fraud__L$"/>
 		<combo_box.item label="詐欺＞土地" name="Fraud__Land"/>
-		<combo_box.item label="詐欺＞マルチ商法またはチェーン・メール" name="Fraud__Pyramid_scheme_or_chain_letter"/>
+		<combo_box.item label="詐欺＞マルチ商法またはチェーンメール" name="Fraud__Pyramid_scheme_or_chain_letter"/>
 		<combo_box.item label="詐欺＞ US$" name="Fraud__US$"/>
 		<combo_box.item label="嫌がらせ＞広告委託/視覚的なスパム" name="Harassment__Advert_farms___visual_spam"/>
 		<combo_box.item label="嫌がらせ＞個人またはグループの中傷" name="Harassment__Defaming_individuals_or_groups"/>
@@ -68,11 +68,11 @@
 		<combo_box.item label="わいせつ＞著しく不快であると見なされるコンテンツまたは行為" name="Indecency__Broadly_offensive_content_or_conduct"/>
 		<combo_box.item label="わいせつ＞不適切なアバター名" name="Indecency__Inappropriate_avatar_name"/>
 		<combo_box.item label="わいせつ＞PG地域での不適切なコンテンツまたは行為" name="Indecency__Mature_content_in_PG_region"/>
-		<combo_box.item label="わいせつ &gt; 控えめ指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region"/>
+		<combo_box.item label="わいせつ &gt; 「Moderate」指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region"/>
 		<combo_box.item label="知的財産の侵害＞コンテンツの撤去" name="Intellectual_property_infringement_Content_Removal"/>
 		<combo_box.item label="知的財産の侵害＞コピーBot及び権限の悪用" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
 		<combo_box.item label="不寛容" name="Intolerance"/>
-		<combo_box.item label="土地＞サンドボックス・リソースの乱用" name="Land__Abuse_of_sandbox_resources"/>
+		<combo_box.item label="土地＞サンドボックスのリソースの乱用" name="Land__Abuse_of_sandbox_resources"/>
 		<combo_box.item label="土地＞不法侵入＞オブジェクト/テクスチャー" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants"/>
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 c44c6b3fd3..42fedfc075 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -37,15 +37,15 @@
 		</text>
 		<check_box label="PG" name="event_chk"/>
 		<text name="pg_label">
-			一般
+			General
 		</text>
 		<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
 		<text name="mature_label">
-			控えめ
+			Moderate
 		</text>
 		<check_box label="Adult" name="event_adult_chk"/>
 		<text name="adult_label">
-			アダルト
+			Adult
 		</text>
 	</panel>
 	<panel>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index f4c46f82ac..2f877a6aba 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1631,11 +1631,11 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="SetClassifiedMature">
-		この広告に「控えめ」コンテンツは含まれていますか？
+		この広告に「Moderate」コンテンツは含まれていますか？
 		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="SetGroupMature">
-		このグループに「控えめ」コンテンツが含まれていますか？
+		このグループに「Moderate」コンテンツが含まれていますか？
 		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification label="再起動を確認" name="ConfirmRestart">
@@ -1655,7 +1655,7 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 		このリージョン（地域）のレーティング区分がアップデートされました。
 地図に変更が反映されるまで数分かかることがあります。
 
-アダルト専用リージョンに入るには、住人のアカウントが年齢確認か支払方法のいずれかで「確認済み」でなければなりません。
+Adult 専用リージョンに入るには、住人のアカウントが年齢確認か支払方法のいずれかで「確認済み」でなければなりません。
 	</notification>
 	<notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">
 		[APP_NAME] のこのバージョンは、このリージョンにおけるボイスチャットの互換性がありません。 ボイスチャットを正常に行うためには、[APP_NAME] のアップデートが必要です。
@@ -2118,7 +2118,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 		コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。
 	</notification>
 	<notification name="NoContentToSearch">
-		少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（一般、控えめ、アダルト）
+		少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）
 	</notification>
 	<notification name="GroupVote">
 		[NAME] は投票の申請をしています：
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
index 14e04d5691..f3c68c9f59 100644
--- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
 	<panel.string name="type_mature">
-		控えめ
+		Moderate
 	</panel.string>
 	<panel.string name="type_pg">
-		一般コンテンツ
+		「General」コンテンツ
 	</panel.string>
 	<panel.string name="l$_price">
 		L$ [PRICE]
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
index 4cb5884f28..fa46e6d35a 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
@@ -24,10 +24,10 @@
 			<button label="現在地に設定" name="set_to_curr_location_btn"/>
 			<combo_box name="content_type">
 				<combo_item name="mature_ci">
-					控えめコンテンツ
+					「Moderate」コンテンツ
 				</combo_item>
 				<combo_item name="pg_ci">
-					一般コンテンツ
+					「General」コンテンツ
 				</combo_item>
 			</combo_box>
 			<spinner label="L$" name="price_for_listing" tool_tip="掲載価格" value="50"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index a8df9aef80..1b89b1b3cc 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -46,9 +46,9 @@
 		<check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。"/>
 		<check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。"/>
-		<combo_box name="group_mature_check" tool_tip="あなたのグループに「控えめ」にレート設定された情報があるかどうかを設定します">
-			<combo_box.item label="一般コンテンツ" name="pg"/>
-			<combo_box.item label="控えめコンテンツ" name="mature"/>
+		<combo_box name="group_mature_check" tool_tip="あなたのグループに「Moderate」にレート設定された情報があるかどうかを設定します">
+			<combo_box.item label="「General」コンテンツ" name="pg"/>
+			<combo_box.item label="「Moderate」コンテンツ" name="mature"/>
 		</combo_box>
 		<check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます"/>
 	</panel>
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 a6af5f3d3c..1f5031f3de 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -93,7 +93,7 @@
 						<text name="region_type_label" value="種類："/>
 						<text name="region_type" value="Moose"/>
 						<text name="region_rating_label" value="レーティング区分："/>
-						<text name="region_rating" value="アダルト"/>
+						<text name="region_rating" value="Adult"/>
 						<text name="region_owner_label" value="所有者："/>
 						<text name="region_owner" value="moose Van Moose"/>
 						<text name="region_group_label" value="グループ："/>
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 f216c3acbc..6df59ca189 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -24,9 +24,9 @@
 	</text>
 	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item label="一般、控えめ、アダルト" name="Desired_Adult"/>
-		<combo_box.item label="一般と控えめ" name="Desired_Mature"/>
-		<combo_box.item label="一般" name="Desired_PG"/>
+		<combo_box.item label="General、Moderate、Adult" name="Desired_Adult"/>
+		<combo_box.item label="General と Moderate" name="Desired_Mature"/>
+		<combo_box.item label="General" name="Desired_PG"/>
 	</combo_box>
 	<text name="start_location_textbox">
 		ログイン位置：
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 168141ee77..be92c24663 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -39,10 +39,10 @@
 	<text label="成人指定" name="access_text">
 		区分：
 	</text>
-	<combo_box label="控えめ" name="access_combo">
-		<combo_box.item label="アダルト" name="Adult"/>
-		<combo_box.item label="控えめ" name="Mature"/>
-		<combo_box.item label="一般" name="PG"/>
+	<combo_box label="Moderate" name="access_combo">
+		<combo_box.item label="Adult" name="Adult"/>
+		<combo_box.item label="Moderate" name="Mature"/>
+		<combo_box.item label="General" name="PG"/>
 	</combo_box>
 	<button label="?" name="access_help"/>
 	<button label="適用" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
index df7e5d9129..aa8c126423 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml
@@ -30,10 +30,10 @@
 	<text label="レーティング区分" name="access_text">
 		レーティング区分：
 	</text>
-	<combo_box label="控えめ" name="access_combo">
-		<combo_box.item label="アダルト" name="Adult"/>
-		<combo_box.item label="控えめ" name="Mature"/>
-		<combo_box.item label="一般" name="PG"/>
+	<combo_box label="Moderate" name="access_combo">
+		<combo_box.item label="Adult" name="Adult"/>
+		<combo_box.item label="Moderate" name="Mature"/>
+		<combo_box.item label="General" name="PG"/>
 	</combo_box>
 	<button label="適用" name="apply_btn"/>
 	<button label="ユーザー1名をホームにテレポート..." name="kick_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 9b272b2fe8..3e9be493ff 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -636,13 +636,13 @@
 		接続されていません
 	</string>
 	<string name="SIM_ACCESS_PG">
-		一般
+		General
 	</string>
 	<string name="SIM_ACCESS_MATURE">
-		控えめ
+		Moderate
 	</string>
 	<string name="SIM_ACCESS_ADULT">
-		アダルト
+		Adult
 	</string>
 	<string name="SIM_ACCESS_DOWN">
 		オフライン
@@ -1709,7 +1709,7 @@
 		Linden 所在地
 	</string>
 	<string name="Adult">
-		アダルト
+		Adult
 	</string>
 	<string name="Arts&amp;Culture">
 		アートとカルチャー
-- 
cgit v1.2.3


From 00970fbedb35b9f88a2bf3f76911d522eebada66 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 1 Mar 2010 14:44:42 -0500
Subject: VWR-17518 [TRUNCATION] Side bar : "Profile" button at the bottom
 within People >Near, Friends, and Recent

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

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8b33a1f054..540e17e413 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -373,7 +373,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          layout="topleft"
          name="view_profile_btn"
          tool_tip="Show picture, groups, and other Residents information"
-         width="64" />
+         width="70" />
         <button
          follows="bottom|left"
          left_pad="3"
-- 
cgit v1.2.3


From 7564813d608f79e6fc70e1f58a861c640d1b6fa2 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 1 Mar 2010 14:52:46 -0500
Subject: EXT-5757 [INTERNAL TEXT] notifications.xml "MINSPECS"

---
 indra/newview/skins/default/xui/en/notifications.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9d2c7b8bcc..936f4a3fab 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1036,7 +1036,6 @@ Unable to write file [[FILE]]
    type="alertmodal">
 Just so you know, your computer does not meet [APP_NAME]&apos;s minimum system requirements. You may experience poor performance. Unfortunately, the [SUPPORT_SITE] can't provide technical support for unsupported system configurations.
 
-MINSPECS
 Visit [_URL] for more information?
     <url option="0" name="url">
 
-- 
cgit v1.2.3


From 5419c7f2159260f1bcbb35b216093c238d4304dd Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 1 Mar 2010 14:35:56 -0800
Subject: VWR-17488 width fix for all langs

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

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index a7cdd241c5..a8aa54a8f1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -329,7 +329,7 @@
 	   left="80"
 	   top_delta="16"
      name="Listen from"
-     width="80">
+     width="110">
         Listen from:
     </text>
 	<icon
-- 
cgit v1.2.3


From f905a10dbb8d23e233534a134d3d70bc87f576ef Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 1 Mar 2010 17:53:50 -0500
Subject: EXT-5681 Event Details floater needs labels and clean-up?

---
 .../newview/skins/default/xui/en/floater_event.xml | 106 ++++++++++++++-------
 1 file changed, 70 insertions(+), 36 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index c2fab900e3..bcf15d7193 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -48,7 +48,7 @@
     border_size="0">
     <layout_panel
        name="profile_stack"
-       follows="all"
+       follows="top|left"
        layout="topleft"
        top="0"
        left="0"
@@ -88,7 +88,7 @@
        left="10"
        top_pad="7"
        name="event_runby_label"
-       width="310">
+       width="90">
         Run by:
       </text>
       <text
@@ -96,48 +96,79 @@
         height="20"
         initial_value="(retrieving)"
         layout="topleft"
-        left="10"
+        left_pad="0"
         link="true"
         name="event_runby"
-        top_pad="2"
+        top_delta="0"
         use_ellipses="true"
-        width="310" />
+        width="240" />
+      <text
+       type="string"
+       length="1"
+       follows="top|left"
+       layout="topleft"
+       left="10"
+       top_pad="5"
+       name="event_date_label"
+       width="90">
+        Date:
+      </text>
       <text
      type="string"
      length="1"
-     left="10"
+     left_pad="0"
      height="17"
-     font="SansSerifMedium"
-    text_color="EmphasisColor"
-     top_pad="5"
+     top_delta="0"
      follows="top|left"
      layout="topleft"
      name="event_date"
-     width="310">
+     width="240">
         10/10/2010
       </text>
       <text
        type="string"
-       height="14"
        length="1"
+       follows="top|left"
+       layout="topleft"
        left="10"
+       top_pad="5"
+       name="event_duration_label"
+       width="90">
+        Duration:
+      </text>
+      <text
+       type="string"
+       height="14"
+       length="1"
+       left_pad="0"
        follows="top|left"
        layout="topleft"
        name="event_duration"
-       width="310">
+       top_delta="0"
+       width="240">
         1 hour
       </text>
       <text
-       font="SansSerifMedium"
-       text_color="EmphasisColor"
+       type="string"
+       length="1"
+       follows="top|left"
+       layout="topleft"
+       left="10"
+       top_pad="5"
+       name="event_covercharge_label"
+       width="90">
+        Cover charge:
+      </text>
+      <text
         type="string"
         follows="left|top"
         height="16"
         layout="topleft"
-       left="10"
+       left_pad="0"
        name="event_cover"
         visible="true"
-        width="310">
+        width="240"
+        top_delta="0">
         Free
       </text>
       <text
@@ -147,20 +178,22 @@
        layout="topleft"
        left="10"
        top_pad="5"
-       name="event_location_label">
+       name="event_location_label"
+       width="90">
         Location:
       </text>
       <text
        type="string"
        length="1"
        height="20"
-       left="10"
+       left_pad="0"
        follows="top|left"
        layout="topleft"
        name="event_location"
        use_ellipses="true"
+       top_delta="0"
        value="SampleParcel, Name Long (145, 228, 26)"
-       width="310" />
+       width="240" />
       <icon
        follows="top|left"
        height="16"
@@ -195,33 +228,34 @@
        name="rating_label"
        top_delta="3"
        value="Rating:"
-       width="60" />
+       width="58" />
       <text
        follows="left|right|top"
        height="16"
        layout="topleft"
-       left_pad="0"
+       left_pad="2"
        name="rating_value"
        top_delta="0"
        value="unknown"
-       width="200" />
+       width="240" />
       <expandable_text
-               follows="left|top|right"
-               height="106"
-               layout="topleft"
-               left="6"
-               name="event_desc"
-               width="313" />
+       follows="left|top|right"
+       height="65"
+       layout="topleft"
+       left="6"
+       name="event_desc"
+       width="322">
+       Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text>
     </layout_panel>
     <layout_panel
-               follows="left|right"
-               height="24"
-               layout="topleft"
-               mouse_opaque="false"
-               name="button_panel"
-               top="0"
-               left="0"
-               user_resize="false">
+       follows="left|right"
+       height="24"
+       layout="topleft"
+       mouse_opaque="false"
+       name="button_panel"
+       top="0"
+       left="0"
+       user_resize="false">
       <button
        follows="left|top"
            height="18"
-- 
cgit v1.2.3


From 5d5e0c5039daf81a3e84c06a9033af9d3e8567e3 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 1 Mar 2010 16:01:07 -0800
Subject: VWR-17082 fix width for all langs

---
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index a8aa54a8f1..e03ecd8f04 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -51,7 +51,7 @@
      name="mute_when_minimized"
 	   top_delta="3"
      left_pad="5"
-     width="215" />
+     width="235" />
 	<slider
 		control_name="AudioLevelUI"
 		disabled_control="MuteAudio"
@@ -329,7 +329,7 @@
 	   left="80"
 	   top_delta="16"
      name="Listen from"
-     width="110">
+     width="142">
         Listen from:
     </text>
 	<icon
-- 
cgit v1.2.3


From 2db6e2311c28483f4e692f507eb48544e32c5c9c Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 1 Mar 2010 16:02:06 -0800
Subject: FR linguistic fix

---
 indra/newview/skins/default/xui/fr/floater_snapshot.xml | 4 ++--
 indra/newview/skins/default/xui/fr/panel_friends.xml    | 2 +-
 indra/newview/skins/default/xui/fr/panel_notes.xml      | 2 +-
 indra/newview/skins/default/xui/fr/panel_people.xml     | 2 +-
 indra/newview/skins/default/xui/fr/panel_profile.xml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 74738b7e31..f01d865f29 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -62,8 +62,8 @@
 	<check_box label="Interface" name="ui_check"/>
 	<check_box label="HUD" name="hud_check"/>
 	<check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
-	<check_box label="Contraindre les proportions" name="keep_aspect_check"/>
-	<check_box label="Arrêt sur image (plein écran)" name="freeze_frame_check"/>
+	<check_box label="Conserver les proportions" name="keep_aspect_check"/>
+	<check_box label="Figer l'image (plein écran)" name="freeze_frame_check"/>
 	<button label="Rafraîchir" name="new_snapshot_btn"/>
 	<check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
 	<button label="Enregistrer ([AMOUNT] L$)" name="upload_btn" width="118"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_friends.xml b/indra/newview/skins/default/xui/fr/panel_friends.xml
index 10ec952aa3..ad9e3daf3d 100644
--- a/indra/newview/skins/default/xui/fr/panel_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Téléporter" name="offer_teleport_btn" tool_tip="Proposez à cet ami d&apos;être téléporté là où vous êtes"/>
 	<button label="Payer" name="pay_btn" tool_tip="Donnez des L$ à cet ami"/>
 	<button label="Supprimer" name="remove_btn" tool_tip="Supprimez ce résident de votre liste d&apos;amis"/>
-	<button label="Ajouter" name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+	<button label="Ajouter" name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_notes.xml b/indra/newview/skins/default/xui/fr/panel_notes.xml
index ba052a0e07..f4e4f8a4ab 100644
--- a/indra/newview/skins/default/xui/fr/panel_notes.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notes.xml
@@ -13,7 +13,7 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="notes_buttons_panel">
-			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
+			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/>
 			<button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/>
 			<button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index f129f56261..84749806ff 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -26,7 +26,7 @@ Si vous voulez rencontrer d&apos;autres résidents, ouvrez la [secondlife:///app
 			</text>
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="friends_viewsort_btn" tool_tip="Options"/>
-				<button name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
 				<button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis"/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index 364426fed1..c439435d1a 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -41,7 +41,7 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="profile_buttons_panel">
-			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
+			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/>
 			<button label="IM" name="im" tool_tip="Ouvrir une session IM" width="30"/>
 			<button label="Appeler" name="call" tool_tip="Appeler ce résident" width="60"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
-- 
cgit v1.2.3


From bbe2daad55777974f10f98b8a8023c7e25fbd6d2 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 2 Mar 2010 11:34:14 +0200
Subject: Fixed normal bug EXT-5856 - "Auto renew each week" checkbox is
 displayed in the Classified Info from other resident profile. Hide auro_renew
 checkbox for avatar classifieds and showing for agent classifirds.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_classified_info.xml   | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 34c1923582..903a9689f1 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -136,16 +136,6 @@
          top_pad="5"
          v_pad="0"
          value="[category]" />
-        <check_box
-         enabled="false"
-         height="16"
-         label="Auto renew each week"
-         layout="topleft"
-         left="10"
-         name="auto_renew"
-         top_pad="5"
-         v_pad="0"
-         width="290" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -161,6 +151,16 @@
          tool_tip="Price for listing."
          v_pad="0"
          width="105" />
+        <check_box
+         enabled="false"
+         height="16"
+         label="Auto renew each week"
+         layout="topleft"
+         left="10"
+         name="auto_renew"
+         top_pad="5"
+         v_pad="0"
+         width="290" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
-- 
cgit v1.2.3


From 9c8a8f388ab24c404f19602e156a76ad1a03b841 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 2 Mar 2010 12:03:28 +0200
Subject: Fixed normal bug EXT-5654 - 'More' link doesn't show all text in
 pick/classified description. Encreased expandable text box max length to
 match classified description max length.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml | 1 +
 indra/newview/skins/default/xui/en/panel_pick_list_item.xml        | 1 +
 2 files changed, 2 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 1375eb87d9..996e28c575 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 8b25fb5d2a..715dc5f23c 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
-- 
cgit v1.2.3


From bfd1fd9936632bd3ed7724695d5c0ae87a707e3d Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 2 Mar 2010 11:06:06 -0800
Subject: DEV-46346 Cycle5 DE and JA change

---
 .../skins/default/xui/de/floater_avatar_textures.xml   |  2 +-
 .../newview/skins/default/xui/de/floater_customize.xml |  2 +-
 indra/newview/skins/default/xui/de/panel_edit_skin.xml |  2 +-
 .../skins/default/xui/de/panel_region_estate.xml       |  8 ++++----
 indra/newview/skins/default/xui/de/strings.xml         | 18 +++++++++---------
 indra/newview/skins/default/xui/ja/strings.xml         |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index cf1b809aa1..92c0c4a27a 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -16,7 +16,7 @@
 			<texture_picker label="Haare" name="hair_grain"/>
 			<texture_picker label="Alpha: Haare" name="hair_alpha"/>
 			<texture_picker label="Kopf" name="head-baked"/>
-			<texture_picker label="Make-Uup" name="head_bodypaint"/>
+			<texture_picker label="Make-Up" name="head_bodypaint"/>
 			<texture_picker label="Kopf: Alpha" name="head_alpha"/>
 			<texture_picker label="Kopftattoo" name="head_tattoo"/>
 			<texture_picker label="Augen" name="eyes-baked"/>
diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index b1e9ef6f19..1fc6387811 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -50,7 +50,7 @@
 		<panel label="Haut" name="Skin">
 			<button label="Hautfarbe" label_selected="Hautfarbe" left="2" name="Skin Color" width="92"/>
 			<button label="Gesichtsdetails" label_selected="Gesichtsdetails" left="2" name="Face Detail" width="92"/>
-			<button label="Make-Uup" label_selected="Make-Uup" left="2" name="Makeup" width="92"/>
+			<button label="Make-Up" label_selected="Make-Up" left="2" name="Makeup" width="92"/>
 			<button label="Körperdetails" label_selected="Körperdetails" left="2" name="Body Detail" width="92"/>
 			<text name="title">
 				[DESC]
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
index 46bd1d9f4d..90b06a29bc 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
@@ -8,7 +8,7 @@
 	<accordion name="wearable_accordion">
 		<accordion_tab name="skin_color_tab" title="Hautfarbe"/>
 		<accordion_tab name="skin_face_tab" title="Gesichtsdetails"/>
-		<accordion_tab name="skin_makeup_tab" title="Make-Uup"/>
+		<accordion_tab name="skin_makeup_tab" title="Make-Up"/>
 		<accordion_tab name="skin_body_tab" title="Körperdetails"/>
 	</accordion>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index b0c6dce8cf..59a4c148a8 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grundstück" name="Estate">
 	<text name="estate_help_text">
-		Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus.
+		Änderungen wirken sich auf alle Regionen des Grundstücks aus.
 	</text>
 	<text name="estate_text">
 		Grundstück:
@@ -16,7 +16,7 @@
 		(unbekannt)
 	</text>
 	<text name="Only Allow">
-		Zugang auf Einwohner beschränken, die überprüft wurden von:
+		Zugang nur dann, wenn überprüft mit:
 	</text>
 	<check_box label="Zahlungsinformation gespeichert" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen"/>
 	<check_box label="Altersüberprüfung" name="limit_age_verified" tool_tip="Einwohner ohne Altersüberprüfung verbannen. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
@@ -69,6 +69,6 @@
 	<button label="?" name="ban_resident_help"/>
 	<button label="Hinzufügen..." name="add_banned_avatar_btn"/>
 	<button label="Entfernen..." name="remove_banned_avatar_btn"/>
-	<button label="Nachricht an Grundstück senden..." name="message_estate_btn"/>
-	<button label="Benutzer von Grundstück werfen..." name="kick_user_from_estate_btn"/>
+	<button label="Nachricht an Grundstück" name="message_estate_btn"/>
+	<button label="Einwohner hinauswerfen" name="kick_user_from_estate_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index c9307a5d7d..e6b841671f 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -979,7 +979,7 @@
 		Gummi
 	</string>
 	<string name="Light">
-		Licht
+		Hell
 	</string>
 	<string name="KBShift">
 		Umschalt-Taste
@@ -2056,7 +2056,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Kinn-Hals
 	</string>
 	<string name="Clear">
-		Löschen
+		Transparent
 	</string>
 	<string name="Cleft">
 		Spalte
@@ -2359,16 +2359,16 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Farbe Innenseite
 	</string>
 	<string name="In Shdw Opacity">
-		Deckkraft: innerer Lidschatten
+		Deckkraft: innen
 	</string>
 	<string name="Inner Eye Corner">
 		Ecke: Nasenseite
 	</string>
 	<string name="Inner Eye Shadow">
-		Innerer Lidschatten
+		Innenlid
 	</string>
 	<string name="Inner Shadow">
-		Innerer Lidschatten
+		Innenlid
 	</string>
 	<string name="Jacket Length">
 		Jackenlänge
@@ -2761,10 +2761,10 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Aus
 	</string>
 	<string name="Out Shdw Color">
-		Farbe: Oberer Lidschatten
+		Farbe: Oben
 	</string>
 	<string name="Out Shdw Opacity">
-		Deckkraft: Oberer Lidschatten
+		Deckkraft: Oben
 	</string>
 	<string name="Outer Eye Corner">
 		Äußerer Augenwinkel
@@ -2935,7 +2935,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Schuhart
 	</string>
 	<string name="Short">
-		Sandale
+		Klein
 	</string>
 	<string name="Short Arms">
 		Kurze Arme
@@ -3064,7 +3064,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Nach vorne
 	</string>
 	<string name="Tall">
-		Stiefel
+		Groß
 	</string>
 	<string name="Taper Back">
 		Ansatzbreite hinten
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 3e9be493ff..1deb3a9c72 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -2935,7 +2935,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		靴の長さ
 	</string>
 	<string name="Short">
-		短
+		低
 	</string>
 	<string name="Short Arms">
 		短
-- 
cgit v1.2.3


From 8c37837876253033c702e0af08ccef7072e188a9 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 2 Mar 2010 12:55:25 -0800
Subject: VWR-17830 for 'en' xml, resizing; JA linguistic fix

---
 .../skins/default/xui/en/panel_region_estate.xml   |  2 +-
 indra/newview/skins/default/xui/ja/strings.xml     | 26 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 3980eb86d3..d336e18011 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -59,7 +59,7 @@
      left_delta="0"
      name="owner_text"
      top_pad="2"
-     width="80">
+     width="180">
         Estate owner:
     </text>
     <text
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 1deb3a9c72..76b702e581 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1900,7 +1900,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		後ろ髪の毛先
 	</string>
 	<string name="Baggy">
-		たるんでいる
+		たるんだ下まぶた
 	</string>
 	<string name="Bangs">
 		前髪
@@ -1990,7 +1990,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		広
 	</string>
 	<string name="Brow Size">
-		眉毛の大きさ
+		眉毛上の隆起
 	</string>
 	<string name="Bug Eyes">
 		Bug Eyes
@@ -2023,7 +2023,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		膨らみ大
 	</string>
 	<string name="Chaplin">
-		Chaplin
+		チャップリン
 	</string>
 	<string name="Cheek Bones">
 		ほお骨
@@ -2044,7 +2044,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		あごの長さ
 	</string>
 	<string name="Chin Heavy">
-		あごに重点
+		あごを強調
 	</string>
 	<string name="Chin In">
 		ひいたあご
@@ -2236,7 +2236,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		ひたいの角度
 	</string>
 	<string name="Forehead Heavy">
-		ひたいに重点
+		ひたいを強調
 	</string>
 	<string name="Freckles">
 		しみ・そばかす
@@ -2386,7 +2386,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		あごの形
 	</string>
 	<string name="Join">
-		寄せた
+		寄せた胸
 	</string>
 	<string name="Jowls">
 		えら
@@ -2491,7 +2491,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		口紅の色
 	</string>
 	<string name="Long">
-		長
+		ロング
 	</string>
 	<string name="Long Head">
 		前後幅が広い頭
@@ -2887,7 +2887,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		骨張った脚
 	</string>
 	<string name="Separate">
-		離れた
+		離れた胸
 	</string>
 	<string name="Shallow">
 		なだらか
@@ -2935,7 +2935,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		靴の長さ
 	</string>
 	<string name="Short">
-		低
+		ショート
 	</string>
 	<string name="Short Arms">
 		短
@@ -3049,7 +3049,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		縦長
 	</string>
 	<string name="Sunken">
-		こけた
+		こけたほお
 	</string>
 	<string name="Sunken Chest">
 		小
@@ -3064,7 +3064,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		前へ
 	</string>
 	<string name="Tall">
-		高
+		トール
 	</string>
 	<string name="Taper Back">
 		後ろに先細
@@ -3160,7 +3160,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		ウエストの高さ
 	</string>
 	<string name="Well-Fed">
-		つまった
+		つまったほお
 	</string>
 	<string name="White Hair">
 		白髪
@@ -3181,7 +3181,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		ワイルド
 	</string>
 	<string name="Wrinkles">
-		しわあり
+		しわ
 	</string>
 	<string name="LocationCtrlAddLandmarkTooltip">
 		マイ ランドマークに追加
-- 
cgit v1.2.3


From ed481c418beff92c132d7d3bf8a2cc4bdca354ff Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 2 Mar 2010 14:47:09 -0800
Subject: xui resizing fix; FR fix

---
 indra/newview/skins/default/xui/de/floater_customize.xml       | 6 +++---
 indra/newview/skins/default/xui/en/floater_customize.xml       | 6 +++---
 indra/newview/skins/default/xui/fr/panel_preferences_setup.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index 1fc6387811..cf7b208c1a 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -40,12 +40,12 @@
 			<text name="no modify instructions">
 				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
 			</text>
-			<text name="Item Action Label" right="100">
+			<text name="Item Action Label">
 				Form:
 			</text>
 			<button label="Neue Form/Gestalt" label_selected="Neue Form/Gestalt" name="Create New"/>
-			<button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
-			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
+			<button font="SansSerifSmall" label="Speichern" label_selected="Speichern" name="Save"/>
+			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
 		</panel>
 		<panel label="Haut" name="Skin">
 			<button label="Hautfarbe" label_selected="Hautfarbe" left="2" name="Skin Color" width="92"/>
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index b048eeceb6..fd10938539 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -286,7 +286,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90"
              width="100">
                 Shape:
             </text>
@@ -307,7 +307,7 @@
              label_selected="Save"
              layout="topleft"
              name="Save"
-             right="218"
+             right="190"
              top="477"
              width="82" />
             <button
@@ -319,7 +319,7 @@
              name="Save As"
              top="477"
              right="304"
-             width="82" />
+             width="110" />
         </panel>
         <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 3c789574a4..ecea368c54 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -17,8 +17,8 @@
 	<text name="text_box2">
 		kbps
 	</text>
-	<check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
-	<spinner label="Numéro de port :" name="connection_port"/>
+	<check_box label="Port de connexion" name="connection_port_enabled"/>
+	<spinner label="Numéro :" name="connection_port"/>
 	<text name="cache_size_label_l">
 		Taille de la mémoire
 	</text>
-- 
cgit v1.2.3


From 3c443a9287f5827316f96a14316f53e3919c57ac Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 2 Mar 2010 15:01:55 -0800
Subject: VWR-17386

---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 05a3771edf..4be4d6b432 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -171,6 +171,7 @@ Automatic position for:
      height="50"
      layout="topleft"
      left_pad="10"
+     top="190"
      name="background"
      tool_tip="Choose color for bubble chat"
      width="38">
-- 
cgit v1.2.3