From 0d9e84415c2ee9c0deabbde5075a50bb92be3528 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 27 Oct 2011 01:43:08 +0200
Subject: [PATCH] Backed out changeset b4e0bae8c021

---
 .../newview/skins/default/xui/de/panel_my_profile.xml |  4 ++++
 indra/newview/skins/default/xui/de/panel_profile.xml  |  4 ++++
 .../newview/skins/default/xui/en/panel_my_profile.xml | 11 ++---------
 indra/newview/skins/default/xui/en/panel_profile.xml  | 11 ++---------
 indra/newview/skins/default/xui/es/panel_profile.xml  |  4 ++++
 .../newview/skins/default/xui/fr/panel_my_profile.xml |  4 ++++
 indra/newview/skins/default/xui/fr/panel_profile.xml  |  4 ++++
 indra/newview/skins/default/xui/it/panel_profile.xml  |  4 ++++
 .../newview/skins/default/xui/ja/panel_my_profile.xml |  4 ++++
 indra/newview/skins/default/xui/ja/panel_profile.xml  |  4 ++++
 indra/newview/skins/default/xui/pt/panel_profile.xml  |  4 ++++
 .../newview/skins/default/xui/ru/panel_my_profile.xml |  5 +++++
 indra/newview/skins/default/xui/ru/panel_profile.xml  |  5 +++++
 .../skins/default/xui/ru/panel_profile_secondlife.xml |  6 ++++++
 .../newview/skins/default/xui/zh/panel_my_profile.xml |  4 ++++
 indra/newview/skins/default/xui/zh/panel_profile.xml  |  4 ++++
 .../skins/firestorm/xui/en/panel_my_profile.xml       |  5 +++++
 .../firestormsidetabs/xui/en/panel_my_profile.xml     |  5 +++++
 .../firestormsidetabs/xui/ru/panel_my_profile.xml     |  5 +++++
 .../skins/metaharper/xui/en/panel_my_profile.xml      |  5 +++++
 .../metaharper/xui/en/panel_profile_secondlife.xml    |  6 ++++++
 .../xui/en/panel_profile_secondlife.xml               |  6 ++++++
 .../skins/starlight/xui/en/panel_my_profile.xml       |  5 +++++
 .../newview/skins/starlight/xui/en/panel_profile.xml  |  5 +++++
 24 files changed, 106 insertions(+), 18 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_my_profile.xml b/indra/newview/skins/default/xui/de/panel_my_profile.xml
index e4e6ce8e41..89a4dfdaba 100644
--- a/indra/newview/skins/default/xui/de/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_my_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Profil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=de-DE
 	</string>
diff --git a/indra/newview/skins/default/xui/de/panel_profile.xml b/indra/newview/skins/default/xui/de/panel_profile.xml
index 73b49bdcb5..c956aa929d 100644
--- a/indra/newview/skins/default/xui/de/panel_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Profil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=de-DE
 	</string>
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 6c26aed1df..ffc7af838e 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -13,9 +13,8 @@
  width="313">
     <string
      name="CaptionTextAcctInfo">
-[ACCTTYPE]
-[PAYMENTINFO]
-[FIRESTORM][FSDEV][FSSUPP]
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
     </string>
     <string
      name="payment_update_link_url">
@@ -46,12 +45,6 @@
       name="display_name_text_args">
       [DISPLAY_NAME]
     </string>
-  <string
-    name="FSDev"
-    value=" Developer" />
-  <string
-    name="FSSupp"
-    value=" Support" />
     <tab_container
      left="0"
      top="4"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 7b117750d2..5bf98f16cd 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -10,9 +10,8 @@
  width="317">
     <string
      name="CaptionTextAcctInfo">
-[ACCTTYPE]
-[PAYMENTINFO]
-[FIRESTORM][FSDEV][FSSUPP]
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
     </string>
     <string
      name="payment_update_link_url">
@@ -43,12 +42,6 @@
     name="display_name_text_args">
     [DISPLAY_NAME]
   </string>
-  <string
-    name="FSDev"
-    value=" Developer" />
-  <string
-    name="FSSupp"
-    value=" Support" />
 
 <!--
     <layout_stack
diff --git a/indra/newview/skins/default/xui/es/panel_profile.xml b/indra/newview/skins/default/xui/es/panel_profile.xml
index 2a299defdb..01043d1c97 100644
--- a/indra/newview/skins/default/xui/es/panel_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Perfil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=es-ES
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/panel_my_profile.xml b/indra/newview/skins/default/xui/fr/panel_my_profile.xml
index b3d7d50319..5207c5a28e 100644
--- a/indra/newview/skins/default/xui/fr/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_my_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Profil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=en
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index ff36b39bd2..ddaf80fe5b 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Profil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=fr-FR
 	</string>
diff --git a/indra/newview/skins/default/xui/it/panel_profile.xml b/indra/newview/skins/default/xui/it/panel_profile.xml
index efaed353aa..e5b143a74c 100644
--- a/indra/newview/skins/default/xui/it/panel_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Profilo" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=it-IT
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/panel_my_profile.xml b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
index f06d5023fb..a0d99ba5a8 100644
--- a/indra/newview/skins/default/xui/ja/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="プロフィール" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=ja
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile.xml b/indra/newview/skins/default/xui/ja/panel_profile.xml
index 2bfc446491..cefe1ac404 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="プロフィール" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=ja-JP
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile.xml b/indra/newview/skins/default/xui/pt/panel_profile.xml
index c2d32ed004..80c7c6d770 100644
--- a/indra/newview/skins/default/xui/pt/panel_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Perfil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=pt-BR
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/panel_my_profile.xml b/indra/newview/skins/default/xui/ru/panel_my_profile.xml
index 85bee59e7b..ffc7af838e 100644
--- a/indra/newview/skins/default/xui/ru/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/ru/panel_my_profile.xml
@@ -11,6 +11,11 @@
  name="panel_profile"
  top="0"
  width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/default/xui/ru/panel_profile.xml b/indra/newview/skins/default/xui/ru/panel_profile.xml
index 75940d2e42..d63e0127d7 100644
--- a/indra/newview/skins/default/xui/ru/panel_profile.xml
+++ b/indra/newview/skins/default/xui/ru/panel_profile.xml
@@ -8,6 +8,11 @@
  name="panel_profile"
  top="0"
  width="317">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
index 1714e2ccc1..9fde95b688 100644
--- a/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
@@ -8,6 +8,12 @@
  name="panel_profile"
  top="0"
  width="430">
+    <string
+     name="CaptionTextAcctInfo">
+[ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/default/xui/zh/panel_my_profile.xml b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
index 56cb1ceb01..e26ccdef73 100644
--- a/indra/newview/skins/default/xui/zh/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="檔案" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=en
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile.xml b/indra/newview/skins/default/xui/zh/panel_profile.xml
index 1a5370117b..7b037eb0bb 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="檔案" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
 	<string name="payment_update_link_url">
 		http://www.secondlife.com/account/billing.php?lang=en
 	</string>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_my_profile.xml b/indra/newview/skins/firestorm/xui/en/panel_my_profile.xml
index 2afd5c5b60..2fc6f800c6 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_my_profile.xml
@@ -11,6 +11,11 @@
  name="panel_profile"
  top="0"
  width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_my_profile.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_my_profile.xml
index 2afd5c5b60..2fc6f800c6 100644
--- a/indra/newview/skins/firestormsidetabs/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/firestormsidetabs/xui/en/panel_my_profile.xml
@@ -11,6 +11,11 @@
  name="panel_profile"
  top="0"
  width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/firestormsidetabs/xui/ru/panel_my_profile.xml b/indra/newview/skins/firestormsidetabs/xui/ru/panel_my_profile.xml
index 69fd8ecd5b..ee2660c6db 100644
--- a/indra/newview/skins/firestormsidetabs/xui/ru/panel_my_profile.xml
+++ b/indra/newview/skins/firestormsidetabs/xui/ru/panel_my_profile.xml
@@ -11,6 +11,11 @@
  name="panel_profile"
  top="0"
  width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml b/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml
index a51bdb3852..56a6ccaf83 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml
@@ -11,6 +11,11 @@
  name="panel_profile"
  top="0"
  width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
index 9048efd3bb..0140a373ac 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
@@ -8,6 +8,12 @@
  name="panel_profile"
  top="0"
  width="430">
+    <string
+     name="CaptionTextAcctInfo">
+[ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/metaharper_sidetabs/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/metaharper_sidetabs/xui/en/panel_profile_secondlife.xml
index 2e9a330156..29d55aeb8a 100644
--- a/indra/newview/skins/metaharper_sidetabs/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/metaharper_sidetabs/xui/en/panel_profile_secondlife.xml
@@ -8,6 +8,12 @@
  name="panel_profile"
  top="0"
  width="430">
+    <string
+     name="CaptionTextAcctInfo">
+[ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/starlight/xui/en/panel_my_profile.xml b/indra/newview/skins/starlight/xui/en/panel_my_profile.xml
index f7889c9bb3..209e2bffc6 100644
--- a/indra/newview/skins/starlight/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_my_profile.xml
@@ -8,6 +8,11 @@
  name="panel_profile"
  top="0"
  width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/starlight/xui/en/panel_profile.xml b/indra/newview/skins/starlight/xui/en/panel_profile.xml
index dc43dc01dc..0f1c5b6a46 100644
--- a/indra/newview/skins/starlight/xui/en/panel_profile.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_profile.xml
@@ -8,6 +8,11 @@
  name="panel_profile"
  top="0"
  width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en