From 36a428c020bae579bc2eccf659f741d1e93d447c Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 3 Mar 2010 14:48:34 +0200
Subject: fixed EXT-5902 [TRANSLATED BUT IN EN] - In the IM window "Pay" needs
 translation (panel_im_control_panel.xml)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/de/panel_im_control_panel.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 2 +-
 indra/newview/skins/default/xui/es/panel_im_control_panel.xml | 2 +-
 indra/newview/skins/default/xui/fr/panel_im_control_panel.xml | 2 +-
 indra/newview/skins/default/xui/ja/panel_im_control_panel.xml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
index 0dca272633..abf8011d9d 100644
--- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Teilen" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Bezahlen" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 28c4adf67c..88566ea037 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -111,7 +111,7 @@
          layout="topleft"
          min_height="25"
          width="100"
-         name="share_btn_panel"
+         name="pay_btn_panel"
          user_resize="false">
            <button
              auto_resize="true"
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
index 09969a796c..f218324d50 100644
--- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
@@ -13,7 +13,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Compartir" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Pagar" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
index 115e25e487..1f2169e22c 100644
--- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Partager" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Payer" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
index be15e92aa1..f2429ac12a 100644
--- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="共有" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="支払う" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
-- 
cgit v1.2.3


From b5df36f81f21cf490695b8f5f47e29b334083925 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Mar 2010 15:02:04 +0200
Subject: Fixed normal bug EXT-5885 ([HARD CODED] - The busy response should be
 localized. hard coded in llviewermessage.cpp).

- It wasn't hardcoded in llviewermessage.cpp, but xml which contains it is not localizable. Added string with default busy message to strings.xml
and used it in LLFloaterPreference::cleanupBadSetting().

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 455b4be264..2510d8b49f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2104,6 +2104,9 @@ Clears (deletes) the media and all params from the given face.
 	<!-- panel contents -->
 	<string name="PanelContentsNewScript">New Script</string>
 
+  <!-- panel preferences general -->
+  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+
 	<!-- Mute -->
 	<string name="MuteByName">(by name)</string>
 	<string name="MuteAgent">(Resident)</string>
-- 
cgit v1.2.3


From a6e2be71c58800979448332fd34b706adc84a674 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 3 Mar 2010 16:14:52 +0200
Subject: fix for major EXT-5839 Creating a new wearable in a localized viewer
 attempts to use non-ascii characters for inventory types in some languages

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index c9307a5d7d..efa23f22e1 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -753,7 +753,7 @@
 		Alpha
 	</string>
 	<string name="tattoo">
-		Tätowierung
+		Taetowierung
 	</string>
 	<string name="invalid">
 		ungültig
-- 
cgit v1.2.3


From c01c2ec86f1918d4830365965010d45ad120d425 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 3 Mar 2010 16:24:25 +0200
Subject: Fixed major sub-task EXT-5931 ( [XUI ATTRIBUTE NOT TRANSLATABLE]
 People > My Groups displays English string when no groups added) -
 implemented workaround: added <strings> name="no_filtered_groups_msg" &
 name="no_groups_msg" in panel_people.xml - also updated value for
 no_filtered_groups_msg. It was "Try fine...", seems should be "Try
 finding..."

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 540e17e413..375f5b6593 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -28,6 +28,16 @@
     <string
      name="groups_filter_label"
      value="Filter Groups" />
+     <!--
+     *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes.
+     They are not defined as translatable in VLT. See EXT-5931
+     -->
+    <string
+     name="no_filtered_groups_msg"
+     value="[secondlife:///app/search/groups Try finding the group in search?]" />
+    <string
+     name="no_groups_msg"
+     value="[secondlife:///app/search/groups Try searching for some groups to join.]" />
     <filter_editor
      text_pad_left="10"
      follows="left|top|right"
@@ -240,13 +250,17 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          name="groups_panel"
          top="0"
          width="313">
+    <!--
+     *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
+     Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
+    -->
             <group_list
              follows="all"
              height="345"
              layout="topleft"
              left="0"
              name="group_list"
-             no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]"
+             no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]"
              no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="313" />
-- 
cgit v1.2.3


From 76587bc1d66491a302236bd6fdf1bbf09b73e68b Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 3 Mar 2010 16:41:05 +0200
Subject: Fixed major bugs: EXT-5889, EXT-5895, EXT-5896. (EXT-5889)
 [TRANSLATED BUT IN EN] Side Bar : Place Profile > "Estate"
 (panel_place_profile.xml) (EXT-5895) [TRANSLATED BUT IN EN] Side Bar : "About
 Land" and "Region/Estate" buttons inside "Place Profile " (EXT-5896)
 [TRANSLATED BUT IN EN] Side Bar : Place Profile > "Region"
 panel_place_profile.xml - Added names for panels which broke localization of
 widgets inside them.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/da/panel_place_profile.xml | 8 ++++----
 indra/newview/skins/default/xui/de/panel_place_profile.xml | 8 ++++----
 indra/newview/skins/default/xui/en/panel_place_profile.xml | 4 ++++
 indra/newview/skins/default/xui/es/panel_place_profile.xml | 8 ++++----
 indra/newview/skins/default/xui/fr/panel_place_profile.xml | 8 ++++----
 indra/newview/skins/default/xui/it/panel_place_profile.xml | 8 ++++----
 indra/newview/skins/default/xui/ja/panel_place_profile.xml | 8 ++++----
 indra/newview/skins/default/xui/pt/panel_place_profile.xml | 8 ++++----
 8 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml
index 24316fea14..74753c64d4 100644
--- a/indra/newview/skins/default/xui/da/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml
@@ -48,7 +48,7 @@
 			<text name="maturity_value" value="ukendt"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parcel">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Rating:"/>
 						<text name="rating_value" value="ukendt"/>
 						<text name="voice_label" value="Stem:"/>
@@ -67,7 +67,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Region">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Region:"/>
 						<text name="region_type_label" value="Type:"/>
 						<text name="region_rating_label" value="Rating:"/>
@@ -77,7 +77,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Estate">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Estate:"/>
 						<text name="estate_rating_label" value="Rating:"/>
 						<text name="estate_owner_label" value="Ejer:"/>
@@ -85,7 +85,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="Til salg">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Pris:"/>
 						<text name="area_label" value="Areal:"/>
 						<text name="traffic_label" value="Trafik:"/>
diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml
index fd4da94edc..3af4ee5a1e 100644
--- a/indra/newview/skins/default/xui/de/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
@@ -68,7 +68,7 @@
 			<text name="maturity_value" value="unbekannt"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parzelle">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Einstufung:"/>
 						<text name="rating_value" value="unbekannt"/>
 						<text name="voice_label" value="Voice:"/>
@@ -87,7 +87,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Region">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Region:"/>
 						<text name="region_name" value="Mooseland"/>
 						<text name="region_type_label" value="Typ:"/>
@@ -104,7 +104,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Grundstück">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Grundstück:"/>
 						<text name="estate_rating_label" value="Einstufung:"/>
 						<text name="estate_owner_label" value="Eigentümer:"/>
@@ -112,7 +112,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="Zum Verkauf">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Preis:"/>
 						<text name="area_label" value="Gebiet:"/>
 						<text name="traffic_label" value="Traffic:"/>
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 44b2508e56..01a27a08c7 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -333,6 +333,7 @@
                      height="160"
                      layout="topleft"
                      left="0"
+                     name="parcel_characteristics_panel"
                      top="0"
                      width="275">
                         <icon
@@ -544,6 +545,7 @@
                      height="125"
                      layout="topleft"
                      left="0"
+                     name="region_information_panel"
                      top="0"
                      width="290">
                         <text
@@ -670,6 +672,7 @@
                      height="189"
                      layout="topleft"
                      left="0"
+                     name="estate_information_panel"
                      top="0"
                      width="290">
                         <text
@@ -758,6 +761,7 @@
                      height="300"
                      layout="topleft"
                      left="0"
+                     name="sales_panel"
                      top="0"
                      width="290">
                         <text
diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml
index 9d4a958e16..2c873ef464 100644
--- a/indra/newview/skins/default/xui/es/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml
@@ -49,7 +49,7 @@
 			<text name="maturity_value" value="desconocido"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parcela">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Calificación:"/>
 						<text name="rating_value" value="desconocida"/>
 						<text name="voice_label" value="Voz:"/>
@@ -68,7 +68,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Región">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Región:"/>
 						<text name="region_type_label" value="Tipo:"/>
 						<text name="region_rating_label" value="Calificación:"/>
@@ -78,7 +78,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Estado">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Estado:"/>
 						<text name="estate_rating_label" value="Calificación:"/>
 						<text name="estate_owner_label" value="Propietario:"/>
@@ -86,7 +86,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="En venta">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Precio:"/>
 						<text name="area_label" value="Área:"/>
 						<text name="traffic_label" value="Tráfico:"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
index d24570b0a1..2cd8744ae5 100644
--- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
@@ -68,7 +68,7 @@
 			<text name="maturity_value" value="(inconnu)"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parcelle">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Catégorie :"/>
 						<text name="rating_value" value="(inconnu)"/>
 						<text name="voice_label" value="Voix :"/>
@@ -87,7 +87,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Région">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Région :"/>
 						<text name="region_name" value="Pays des orignaux"/>
 						<text name="region_type_label" value="Type :"/>
@@ -104,7 +104,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Domaine">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Domaine :"/>
 						<text name="estate_rating_label" value="Catégorie :"/>
 						<text name="estate_owner_label" value="Propriétaire :"/>
@@ -112,7 +112,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="À vendre">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Prix :"/>
 						<text name="area_label" value="Surface :"/>
 						<text name="traffic_label" value="Trafic :"/>
diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml
index 70e1577199..03716ba4c5 100644
--- a/indra/newview/skins/default/xui/it/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml
@@ -48,7 +48,7 @@
 			<text name="maturity_value" value="sconosciuto"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parcel">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Valutazione:"/>
 						<text name="rating_value" value="sconosciuto"/>
 						<text name="voice_label" value="Voice:"/>
@@ -67,7 +67,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Regione">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Regione:"/>
 						<text name="region_type_label" value="Scrivi:"/>
 						<text name="region_rating_label" value="Valutazione:"/>
@@ -77,7 +77,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Proprietà immobiliare">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Proprietà immobiliare:"/>
 						<text name="estate_rating_label" value="Valutazione:"/>
 						<text name="estate_owner_label" value="Proprietà:"/>
@@ -85,7 +85,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="In vendita">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Prezzo:"/>
 						<text name="area_label" value="Area:"/>
 						<text name="traffic_label" value="Traffico:"/>
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 1f5031f3de..132fb95fe7 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -68,7 +68,7 @@
 			<text name="maturity_value" value="不明"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="区画">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="レーティング区分："/>
 						<text name="rating_value" value="不明"/>
 						<text name="voice_label" value="ボイス："/>
@@ -87,7 +87,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="リージョン（地域）     ">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="地域:"/>
 						<text name="region_name" value="Mooseland"/>
 						<text name="region_type_label" value="種類："/>
@@ -104,7 +104,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="エステート（不動産）">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="不動産："/>
 						<text name="estate_rating_label" value="レーティング区分："/>
 						<text name="estate_owner_label" value="所有者："/>
@@ -112,7 +112,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="販売中">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="価格："/>
 						<text name="area_label" value="面積："/>
 						<text name="traffic_label" value="トラフィック："/>
diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
index 371f7bdb1f..210991f984 100644
--- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
@@ -48,7 +48,7 @@
 			<text name="maturity_value" value="(Desconhecido)"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Lote">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Classificação:"/>
 						<text name="rating_value" value="(Desconhecido)"/>
 						<text name="voice_label" value="Voz:"/>
@@ -67,7 +67,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Região">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Região:"/>
 						<text name="region_type_label" value="Tipo:"/>
 						<text name="region_rating_label" value="Classificação:"/>
@@ -77,7 +77,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Propriedade">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Propriedade:"/>
 						<text name="estate_rating_label" value="Classificação:"/>
 						<text name="estate_owner_label" value="Proprietário:"/>
@@ -85,7 +85,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="À venda">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Preço:"/>
 						<text name="area_label" value="Área:"/>
 						<text name="traffic_label" value="Trânsito:"/>
-- 
cgit v1.2.3


From 63678f96adcf195da7f9cf77b592352c79e06c3a Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Mar 2010 16:56:29 +0200
Subject: Fixed normal bug EXT-5838 (Creating a new wearable in a localized
 viewer appends localized wearable name with English word "New")

- Moved hardcoded string to string "New" in strings.xml.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2510d8b49f..358cd62575 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1769,6 +1769,9 @@ Clears (deletes) the media and all params from the given face.
 	<string name="tattoo">Tattoo</string>
 	<string name="invalid">invalid</string>
 
+  <!-- Wearable List-->
+  <string name="New">New</string>
+  
 	<!-- LLGroupNotify -->
 	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
 	<string name="next">Next</string>
-- 
cgit v1.2.3


From e0abec0012cb36ea85d1d967661d29a653fdc3be Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 3 Mar 2010 17:25:43 +0200
Subject: fixed EXT-5887  [NAMELESS STRING] - Menu Einstellungen, Tab Chat:
 Font size and Font Colors need translation ) (panel_preferences_chat.xml)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/de/panel_preferences_chat.xml | 6 ++++++
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 ++
 indra/newview/skins/default/xui/es/panel_preferences_chat.xml | 6 ++++++
 indra/newview/skins/default/xui/fr/panel_preferences_chat.xml | 6 ++++++
 indra/newview/skins/default/xui/ja/panel_preferences_chat.xml | 6 ++++++
 5 files changed, 26 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index f580691c0d..626e35dd0b 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
+	<text name="font_size">
+		Schriftgröße:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="Klein" name="radio" value="0"/>
 		<radio_item label="Mittel" name="radio2" value="1"/>
 		<radio_item label="Groß" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Schriftfarbe:
+	</text>
 	<color_swatch label="Sie" name="user"/>
 	<text name="text_box1">
 		Ich
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 2e81139ef2..3d434361b9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -14,6 +14,7 @@
    layout="topleft"
    left="30"
    height="12"
+   name="font_size"
    width="120"
    top="10">
     Font size:
@@ -60,6 +61,7 @@
       layout="topleft"
       left="30"
       height="12"
+      name="font_colors" 
       top_pad="10" 
       width="120"
       >
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index b8010e0a35..17e3b45beb 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
+	<text name="font_size">
+		Font size:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="Disminuir" name="radio" value="0"/>
 		<radio_item label="Media" name="radio2" value="1"/>
 		<radio_item label="Aumentar" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Font colors:
+	</text>
 	<color_swatch label="Usted" name="user"/>
 	<text name="text_box1">
 		Yo
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 27242ec3de..71f7990073 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
+	<text name="font_size">
+		Font size:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="Moins" name="radio" value="0"/>
 		<radio_item label="Moyenne" name="radio2" value="1"/>
 		<radio_item label="Plus" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Font colors:
+	</text>
 	<color_swatch label="Vous" name="user"/>
 	<text name="text_box1">
 		Moi
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index d6fe54fbd1..b0572804cb 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
+	<text name="font_size">
+		Font size:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="小" name="radio" value="0"/>
 		<radio_item label="中" name="radio2" value="1"/>
 		<radio_item label="大" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Font colors:
+	</text>
 	<color_swatch label="自分" name="user"/>
 	<text name="text_box1">
 		自分
-- 
cgit v1.2.3


From f6b58f10e797717a13a1cf1e857cce8d61ca5f95 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Mar 2010 18:07:10 +0200
Subject: Updated major sub task EXT-5857 - location, content type, category,
 description in the Classified Info panel have no labels. Changed paddings in
 classified info.

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

(limited to 'indra/newview/skins')

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 13333b88b1..55929c6e27 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -86,7 +86,7 @@
          font="SansSerifBig"
          font.style="BOLD"
          left="10"
-         top_pad="10"
+         top_pad="0"
          name="classified_name"
          read_only="true"
          text_color="white"
@@ -101,7 +101,7 @@
          left="10"
          name="classified_location_label"
          text_color="white"
-         top_pad="10"
+         top_pad="5"
          value="Location:"
          width="250" />
         <text_editor
@@ -127,7 +127,7 @@
          left="10"
          name="content_type_label"
          text_color="white"
-         top_pad="10"
+         top_pad="0"
          value="Content Type:"
          width="250" />
         <text_editor
@@ -152,7 +152,7 @@
          left="10"
          name="category_label"
          text_color="white"
-         top_pad="10"
+         top_pad="0"
          value="Category:"
          width="250" />
         <text_editor
@@ -178,7 +178,7 @@
          left="10"
          name="price_for_listing_label"
          text_color="white"
-         top_pad="10"
+         top_pad="0"
          value="Price for listing:"
          width="250" />
         <text_editor
@@ -204,7 +204,7 @@
          follows="top|left"
          orientation="vertical"
          left="10"
-         top_pad="5"
+         top_pad="0"
          width="290"
          height="250">
          <layout_panel
-- 
cgit v1.2.3


From 4827906e34f61727d0f5158436383e8de77f6154 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 3 Mar 2010 18:32:21 +0200
Subject: Fixed major bug (EXT-5755) [TRANSLATION NOT SHOWN]
 sidepanel_task_info.xml - Fixed name attribute for panels in which
 localization was broken.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/da/sidepanel_task_info.xml | 4 ++--
 indra/newview/skins/default/xui/de/sidepanel_task_info.xml | 2 +-
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 1 +
 indra/newview/skins/default/xui/es/sidepanel_task_info.xml | 2 +-
 indra/newview/skins/default/xui/fr/sidepanel_task_info.xml | 2 +-
 indra/newview/skins/default/xui/it/sidepanel_task_info.xml | 4 ++--
 indra/newview/skins/default/xui/ja/sidepanel_task_info.xml | 2 +-
 indra/newview/skins/default/xui/pt/sidepanel_task_info.xml | 4 ++--
 8 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
index 6ade03ce56..666c6936fe 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
@@ -36,7 +36,7 @@
 	<panel.string name="Sale Mixed">
 		Blandet salg
 	</panel.string>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Navn:
 		</text>
@@ -74,7 +74,7 @@
 		</combo_box>
 		<spinner label="Pris: L$" name="Edit Cost"/>
 		<check_box label="Vis i søgning" name="search_check" tool_tip="Lad personer se dette objekt i søgeresultater"/>
-		<panel name="perms_build">
+		<panel name="perms_inv">
 			<text name="perm_modify">
 				Du kan redigere dette objekt
 			</text>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 825acac79d..81f1ebdf91 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -38,7 +38,7 @@
 	</panel.string>
 	<text name="title" value="Objektprofil"/>
 	<text name="where" value="(inworld)"/>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Name:
 		</text>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index d2c9e56bc3..7713f8ef7c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -94,6 +94,7 @@
          layout="topleft"
          left="10"
          help_topic=""
+         name="properties_panel"
          top="45"
          width="313"
    background_visible="true"
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index 6bfdbea2bc..524550fd6e 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -38,7 +38,7 @@
 	</panel.string>
 	<text name="title" value="Perfil del objeto"/>
 	<text name="where" value="(en el mundo)"/>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Nombre:
 		</text>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index e617ae444d..def71d96b4 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -38,7 +38,7 @@
 	</panel.string>
 	<text name="title" value="Profil de l&apos;objet"/>
 	<text name="where" value="(dans Second Life)"/>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Nom :
 		</text>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index e5f27795be..0eecdfb2a2 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -36,7 +36,7 @@
 	<panel.string name="Sale Mixed">
 		Vendita assortita
 	</panel.string>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Nome:
 		</text>
@@ -74,7 +74,7 @@
 		</combo_box>
 		<spinner label="Prezzo: L$" name="Edit Cost"/>
 		<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Mostra questo oggetto nei risultati della ricerca"/>
-		<panel name="perms_build">
+		<panel name="perms_inv">
 			<text name="perm_modify">
 				Puoi modificare questo oggetto
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index ab00953f1a..439891bab1 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -38,7 +38,7 @@
 	</panel.string>
 	<text name="title" value="オブジェクトのプロフィール"/>
 	<text name="where" value="（インワールド）"/>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			名前：
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index 3ae728e69d..7c626d7805 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -36,7 +36,7 @@
 	<panel.string name="Sale Mixed">
 		Venda mista
 	</panel.string>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Nome:
 		</text>
@@ -74,7 +74,7 @@
 		</combo_box>
 		<spinner label="Preço: L$" name="Edit Cost"/>
 		<check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
-		<panel name="perms_build">
+		<panel name="perms_inv">
 			<text name="perm_modify">
 				Você pode modificar este objeto
 			</text>
-- 
cgit v1.2.3


From 9a02fe0a2648428f2167cacc7b1c3abd06189c67 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 3 Mar 2010 18:43:00 +0200
Subject: Fixed major sub-tusk EXT - 5826 ([TRANSLATION NOT SHOWN]
 floater_world_map.xml)

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/da/floater_world_map.xml  | 15 ++++++++++-----
 .../newview/skins/default/xui/de/floater_world_map.xml  | 15 ++++++++++-----
 .../newview/skins/default/xui/en/floater_world_map.xml  | 17 +++++++++++------
 .../newview/skins/default/xui/es/floater_world_map.xml  | 15 ++++++++++-----
 .../newview/skins/default/xui/fr/floater_world_map.xml  | 15 ++++++++++-----
 .../newview/skins/default/xui/it/floater_world_map.xml  | 15 ++++++++++-----
 .../newview/skins/default/xui/ja/floater_world_map.xml  | 15 ++++++++++-----
 .../newview/skins/default/xui/pt/floater_world_map.xml  | 15 ++++++++++-----
 8 files changed, 81 insertions(+), 41 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
index 137e8509a4..b5ec1cb302 100644
--- a/indra/newview/skins/default/xui/da/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
@@ -5,7 +5,8 @@
 			Forklaring
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button label="Vis min position" label_selected="Vis min position" name="Show My Location" tool_tip="Centrér kort om min avatars position"/>
 		<text name="person_label">
 			Mig
@@ -36,12 +37,14 @@
 		</text>
 		<check_box label="Adult" name="event_adult_chk"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Find på kort
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Venner online" name="friend combo" tool_tip="Vis venner på kort">
 			<combo_box.item label="Mine venner online" name="item1"/>
 		</combo_box>
@@ -58,12 +61,14 @@
 		<button label="Kopiér SLurl" name="copy_slurl" tool_tip="Kopierer denne lokation som SLurl der kan bruges på web."/>
 		<button label="Vis selektion" label_selected="Vis destination" name="Show Destination" tool_tip="Centrér kortet på valgte lokation"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index 7d8a634452..5258364656 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -5,7 +5,8 @@
 			Legende
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position meines Avatars zentrieren"/>
 		<text name="me_label">
 			Ich
@@ -48,12 +49,14 @@
 			Adult
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Auf Karte anzeigen
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Online-Freunde" name="friend combo" tool_tip="Freunde auf Karte anzeigen">
 			<combo_box.item label="Meine Freunde: Online" name="item1"/>
 		</combo_box>
@@ -71,12 +74,14 @@
 		<button font="SansSerifSmall" label="SLurl kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLurl zur Verwendung im Web."/>
 		<button label="Auswahl anzeigen" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 86ac7c8e54..291f8f6f51 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -53,7 +53,8 @@
  follows="right|top"
   height="126"
   top_pad="0"
-  width="238">
+  width="238"
+  name="layout_panel_2">
 <button
      follows="right|top"
      height="22"
@@ -374,7 +375,8 @@
   top_pad="0"
   width="238"
   background_visible="true"
-  bg_alpha_color="DkGray2">
+  bg_alpha_color="DkGray2"
+  name="layout_panel_3">
     <text
      text_color="White"
      font="SansSerifLarge"
@@ -396,7 +398,8 @@
      follows="right|top|bottom"
 	 height="310"
 	 top_pad="0"
-	 width="238">
+	 width="238"
+	 name="layout_panel_4">
 	 <icon
       color="0.5 0 0 1"
       follows="top|right"
@@ -638,7 +641,8 @@
   top_pad="0"
   width="238"
   background_visible="true"
-  bg_alpha_color="DkGray2">
+  bg_alpha_color="DkGray2"
+  name="layout_panel_5">
     <text
      text_color="White"
      font="SansSerifLarge"
@@ -660,7 +664,8 @@
   height="30"
   min_height="30"
   top_pad="0"
-  width="238">
+  width="238"
+  name="layout_panel_6">
   <icon
      follows="left|bottom"
      height="16"
@@ -670,7 +675,7 @@
      mouse_opaque="true"
      name="zoom_icon"
      top_pad="7"
-     width="16" />
+     width="16" ></icon>
     <slider
      follows="left|bottom"
      height="16"
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index d5708483e5..24b5ece0aa 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -5,7 +5,8 @@
 			Leyenda
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button label="Mostrar mi posición" label_selected="Mostrar mi posición" name="Show My Location" tool_tip="Centrar el mapa en la posición de mi avatar"/>
 		<text name="me_label">
 			Yo
@@ -48,12 +49,14 @@
 			Adulto
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Encontrar en el mapa
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Amigos conectados" name="friend combo" tool_tip="Ver a los amigos en el mapa">
 			<combo_box.item label="Mis amigos conectados" name="item1"/>
 		</combo_box>
@@ -71,12 +74,14 @@
 		<button label="Copiar la SLurl" name="copy_slurl" tool_tip="Copiar la SLurl de esta posición para usarla en una web."/>
 		<button label="Ver lo elegido" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index 19ea764ae8..09ec46fd59 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -6,7 +6,8 @@
 			Légende
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de mon avatar" width="165"/>
 		<text name="me_label">
 			Moi
@@ -56,12 +57,14 @@
 			Adulte
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Situer sur la carte
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte" width="232">
 			<combo_box.item label="Mes amis connectés" name="item1"/>
 		</combo_box>
@@ -80,12 +83,14 @@
 		<button label="Copier la SLurl" left="-270" name="copy_slurl" tool_tip="Copie l&apos;emplacement actuel sous la forme d&apos;une SLurl à utiliser sur le Web."/>
 		<button label="Afficher la sélection" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoomer
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" left="-270" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml
index a672df0d96..1b47dd7d7e 100644
--- a/indra/newview/skins/default/xui/it/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/it/floater_world_map.xml
@@ -5,7 +5,8 @@
 			Legenda
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button font="SansSerifSmall" label="Mostra la mia posizione" label_selected="Mostra la mia posizione" left_delta="91" name="Show My Location" tool_tip="Centra la mappa sul luogo dove si trova il mio avatar" width="135"/>
 		<text name="person_label">
 			Io
@@ -37,12 +38,14 @@
 		</text>
 		<check_box label="Adult" name="event_adult_chk"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Trova sulla Mappa
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Amici Online" name="friend combo" tool_tip="Mostra amici sulla mappa">
 			<combo_box.item label="Miei Amici Online" name="item1"/>
 		</combo_box>
@@ -59,12 +62,14 @@
 		<button font="SansSerifSmall" label="Copia SLurl" name="copy_slurl" tool_tip="Copia il luogo attuale come SLurl per essere usato nel web."/>
 		<button font="SansSerifSmall" label="Mostra Selezione" label_selected="Mostra destinazione" left_delta="91" name="Show Destination" tool_tip="Centra la mappa sul luogo prescelto" width="135"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
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 42fedfc075..04120b4bea 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -5,7 +5,8 @@
 			表記・記号
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button label="現在地を表示" label_selected="現在地を表示" name="Show My Location" tool_tip="アバターの位置を地図の中心に表示します"/>
 		<text name="me_label">
 			自分
@@ -48,12 +49,14 @@
 			Adult
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			地図上で探す
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="オンラインのフレンド" name="friend combo" tool_tip="フレンドを地図上に表示します">
 			<combo_box.item label="オンラインのフレンド" name="item1"/>
 		</combo_box>
@@ -71,12 +74,14 @@
 		<button label="SLurl をコピー" name="copy_slurl" tool_tip="現在地を SLurl でコピーして Web で使用します。"/>
 		<button label="選択をを表示する" label_selected="目的地を表示" name="Show Destination" tool_tip="選択した場所を地図の中心に表示します"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			ズーム
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="ズーム" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 81f8ce7846..75f9d13ad3 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -5,7 +5,8 @@
 			Legenda
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/>
 		<text name="person_label">
 			Eu
@@ -36,12 +37,14 @@
 		</text>
 		<check_box label="Adult" name="event_adult_chk"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Localizar no mapa
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Amigos Conectados" name="friend combo" tool_tip="Mostrar amigos no mapa">
 			<combo_box.item label="Amigos conectados" name="item1"/>
 		</combo_box>
@@ -54,12 +57,14 @@
 		<button font="SansSerifSmall" label="Copiar SLurl" name="copy_slurl" tool_tip="Copia a localização atual como um SLurl para usar na web."/>
 		<button font="SansSerifSmall" label="Mostrar seleção" label_selected="Mostrar Destino" left_delta="91" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada" width="135"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
-- 
cgit v1.2.3


From 194a8d45b5d8871458b5f0592050e288727c74bc Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Mar 2010 19:00:41 +0200
Subject: Changed fix for normal bug EXT-5838 (Creating a new wearable in a
 localized viewer appends localized wearable name with English word "New") to
 make string more flexible- now position of item name may be changed in xml.

- Now string for localizations is "NewWearable" in strings.xml.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 358cd62575..59c54f0cad 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1770,7 +1770,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="invalid">invalid</string>
 
   <!-- Wearable List-->
-  <string name="New">New</string>
+  <string name="NewWearable">New [WEARABLE_ITEM]</string>
   
 	<!-- LLGroupNotify -->
 	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
-- 
cgit v1.2.3


From 8516ed1dac36c55863062488bac558cd8faec2f2 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 3 Mar 2010 19:49:58 +0200
Subject: WIP on EXT-5687 (Classifieds are missing the clickthrough data). Made
 the classified info panel layout more compact to add more widgets.

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

(limited to 'indra/newview/skins')

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 55929c6e27..e374ee5f71 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -71,10 +71,10 @@
          follows="left|top|right"
          height="197"
          layout="topleft"
-         left="11"
+         left="10"
          name="classified_snapshot"
          top="10"
-         width="286" />
+         width="275" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -129,7 +129,7 @@
          text_color="white"
          top_pad="0"
          value="Content Type:"
-         width="250" />
+         width="140" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -137,11 +137,11 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="content_type"
          read_only="true"
-         width="290"
-         top_pad="5"
+         width="150"
+         top_pad="-10"
          v_pad="0"
          value="[content type]" />
         <text
@@ -154,7 +154,7 @@
          text_color="white"
          top_pad="0"
          value="Category:"
-         width="250" />
+         width="140" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
@@ -163,11 +163,11 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="category"
          read_only="true"
-         width="290"
-         top_pad="5"
+         width="150"
+         top_pad="-10"
          v_pad="0"
          value="[category]" />
         <text
@@ -180,7 +180,7 @@
          text_color="white"
          top_pad="0"
          value="Price for listing:"
-         width="250" />
+         width="140" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -189,14 +189,14 @@
          halign="left"
          height="16"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="price_for_listing"
          read_only="true"
-         top_pad="5"
+         top_pad="-10"
          tool_tip="Price for listing."
          v_pad="0"
          value="[price]"
-         width="105" />
+         width="150" />
         <layout_stack
          animate="false"
          name="descr_stack"
@@ -252,7 +252,7 @@
          width="250" />
         <text_editor
          allow_html="true"
-         allow_scroll="false"
+         allow_scroll="true"
          bg_visible="false"
          follows="left|top|right"
          h_pad="0"
-- 
cgit v1.2.3


From dfe98202c031cd70f469d10f4a34aabc9a366375 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 3 Mar 2010 20:10:27 +0200
Subject: WIP on EXT-5687 (Classifieds are missing the clickthrough data).
 Added clicks info and creation date.

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

(limited to 'indra/newview/skins')

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 e374ee5f71..869a05f27d 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -21,6 +21,14 @@
  <panel.string
   name="l$_price">
     L$[PRICE]
+ </panel.string>
+<panel.string
+  name="click_through_text_fmt">
+    [TELEPORT] teleport, [MAP] map, [MAP] profile
+ </panel.string>
+ <panel.string
+  name="date_fmt">
+    [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
  </panel.string>
     <button
      follows="top|right"
@@ -170,6 +178,33 @@
          top_pad="-10"
          v_pad="0"
          value="[category]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="creation_date_label"
+         text_color="white"
+         top_pad="0"
+         value="Creation date:"
+         width="140" />
+        <text_editor
+         allow_scroll="false"
+         bg_visible="false"
+         follows="left|top"
+         h_pad="0"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left_pad="0"
+         name="creation_date"
+         read_only="true"
+         top_pad="-10"
+         tool_tip="Creation date"
+         v_pad="0"
+         value="[date]"
+         width="150" />
         <text
          follows="left|top"
          font.style="BOLD"
@@ -207,6 +242,44 @@
          top_pad="0"
          width="290"
          height="250">
+         <layout_panel
+          auto_resize="false"
+          name="clickthrough_layout_panel"
+          layout="topleft"
+          follows="top|left"
+          left="0"
+          top="0"
+          width="290"
+          height="26"
+          user_resize="false">
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="click_through_label"
+         text_color="white"
+         top_pad="0"
+         value="Clicks:"
+         width="140" />
+        <text_editor
+         allow_scroll="false"
+         bg_visible="false"
+         follows="left|top"
+         h_pad="0"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left_pad="0"
+         name="click_through_text"
+         read_only="true"
+         top_pad="-10"
+         tool_tip="Click through data"
+         v_pad="0"
+         value="[clicks]"
+         width="150" />
+         </layout_panel>
          <layout_panel
           auto_resize="false"
           name="price_layout_panel"
-- 
cgit v1.2.3