merge

--HG--
branch : avatar-pipeline

6 files changed, 270 insertions, 270 deletions

diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
index b4d0fa20ef..74b7c7dd72 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Beboer" />
-   <string name="AcctTypeTrial"
-    value="På prøve" />
-   <string name="AcctTypeCharterMember"
-    value="æresmedlem" />
-   <string name="AcctTypeEmployee"
-    value="Linden Lab medarbejder" />
-   <string name="PaymentInfoUsed"
-    value="Betalende medlem" />
-   <string name="PaymentInfoOnFile"
-    value="Registreret betalende" />
-   <string name="NoPaymentInfoOnFile"
-    value="Ingen betalingsinfo" />
-   <string name="AgeVerified"
-    value="Alders-checket" />
-   <string name="NotAgeVerified"
-    value="Ikke alders-checket" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=da
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Optaget autosvar:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Beboer" />

+   <string name="AcctTypeTrial"

+    value="På prøve" />

+   <string name="AcctTypeCharterMember"

+    value="æresmedlem" />

+   <string name="AcctTypeEmployee"

+    value="Linden Lab medarbejder" />

+   <string name="PaymentInfoUsed"

+    value="Betalende medlem" />

+   <string name="PaymentInfoOnFile"

+    value="Registreret betalende" />

+   <string name="NoPaymentInfoOnFile"

+    value="Ingen betalingsinfo" />

+   <string name="AgeVerified"

+    value="Alders-checket" />

+   <string name="NotAgeVerified"

+    value="Ikke alders-checket" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=da

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Optaget autosvar:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
index c12dd8d58c..bcf4128e01 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Residente" />
-   <string name="AcctTypeTrial"
-    value="Prueba" />
-   <string name="AcctTypeCharterMember"
-    value="Miembro fundador" />
-   <string name="AcctTypeEmployee"
-    value="Empleado de Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Ha usado una forma de pago" />
-   <string name="PaymentInfoOnFile"
-    value="Hay infor. de la forma de pago" />
-   <string name="NoPaymentInfoOnFile"
-    value="Sin infor. de la forma de pago" />
-   <string name="AgeVerified"
-    value="Edad verificada" />
-   <string name="NotAgeVerified"
-    value="Edad no verificada" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=es
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Compañero/a:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Mensaje en el estado ocupado:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Residente" />

+   <string name="AcctTypeTrial"

+    value="Prueba" />

+   <string name="AcctTypeCharterMember"

+    value="Miembro fundador" />

+   <string name="AcctTypeEmployee"

+    value="Empleado de Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Ha usado una forma de pago" />

+   <string name="PaymentInfoOnFile"

+    value="Hay infor. de la forma de pago" />

+   <string name="NoPaymentInfoOnFile"

+    value="Sin infor. de la forma de pago" />

+   <string name="AgeVerified"

+    value="Edad verificada" />

+   <string name="NotAgeVerified"

+    value="Edad no verificada" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=es

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Compañero/a:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Mensaje en el estado ocupado:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
index 33f3c367c2..0eba7bf3b6 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Residente" />
-   <string name="AcctTypeTrial"
-    value="Prova" />
-   <string name="AcctTypeCharterMember"
-    value="Membro privilegiato" />
-   <string name="AcctTypeEmployee"
-    value="Impiegato della Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Info. di pagamento usate" />
-   <string name="PaymentInfoOnFile"
-    value="Info. di pagamento in archivio" />
-   <string name="NoPaymentInfoOnFile"
-    value="Nessuna info. di pagamento" />
-   <string name="AgeVerified"
-    value="Età verificata" />
-   <string name="NotAgeVerified"
-    value="Età non verificata" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=it
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Risposta agli IM quando sono in &apos;Occupato&apos;:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Residente" />

+   <string name="AcctTypeTrial"

+    value="Prova" />

+   <string name="AcctTypeCharterMember"

+    value="Membro privilegiato" />

+   <string name="AcctTypeEmployee"

+    value="Impiegato della Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Info. di pagamento usate" />

+   <string name="PaymentInfoOnFile"

+    value="Info. di pagamento in archivio" />

+   <string name="NoPaymentInfoOnFile"

+    value="Nessuna info. di pagamento" />

+   <string name="AgeVerified"

+    value="Età verificata" />

+   <string name="NotAgeVerified"

+    value="Età non verificata" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=it

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Risposta agli IM quando sono in &apos;Occupato&apos;:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/nl/panel_edit_profile.xml b/indra/newview/skins/default/xui/nl/panel_edit_profile.xml
index 172395e20a..00f8c087de 100644
--- a/indra/newview/skins/default/xui/nl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/nl/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Inwoner" />
-   <string name="AcctTypeTrial"
-    value="Proef" />
-   <string name="AcctTypeCharterMember"
-    value="Charter lid" />
-   <string name="AcctTypeEmployee"
-    value="Linden Lab werknemer" />
-   <string name="PaymentInfoUsed"
-    value="Betalingsinformatie gebruikt" />
-   <string name="PaymentInfoOnFile"
-    value="Betalingsinformatie aanwezig" />
-   <string name="NoPaymentInfoOnFile"
-    value="Geen betalingsinfo aanwezig" />
-   <string name="AgeVerified"
-    value="Leeftijd geverifieerd" />
-   <string name="NotAgeVerified"
-    value="Leeftijd niet geverifieerd" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=nl
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Antwoord bij Niet Storen:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Inwoner" />

+   <string name="AcctTypeTrial"

+    value="Proef" />

+   <string name="AcctTypeCharterMember"

+    value="Charter lid" />

+   <string name="AcctTypeEmployee"

+    value="Linden Lab werknemer" />

+   <string name="PaymentInfoUsed"

+    value="Betalingsinformatie gebruikt" />

+   <string name="PaymentInfoOnFile"

+    value="Betalingsinformatie aanwezig" />

+   <string name="NoPaymentInfoOnFile"

+    value="Geen betalingsinfo aanwezig" />

+   <string name="AgeVerified"

+    value="Leeftijd geverifieerd" />

+   <string name="NotAgeVerified"

+    value="Leeftijd niet geverifieerd" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=nl

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Antwoord bij Niet Storen:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
index 97fa3118f8..e449a92d7e 100644
--- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Rezydent" />
-   <string name="AcctTypeTrial"
-    value="Próbne" />
-   <string name="AcctTypeCharterMember"
-    value="Członek-zalożyciel" />
-   <string name="AcctTypeEmployee"
-    value="Pracownik Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Dane Konta Używane" />
-   <string name="PaymentInfoOnFile"
-    value="Dane Konta Dostępne" />
-   <string name="NoPaymentInfoOnFile"
-    value="Brak Danych Konta" />
-   <string name="AgeVerified"
-    value="Wiek Zweryfikowany" />
-   <string name="NotAgeVerified"
-    value="Brak Weryfikacji Wieku" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=pl
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Pracuś Mówi:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Rezydent" />

+   <string name="AcctTypeTrial"

+    value="Próbne" />

+   <string name="AcctTypeCharterMember"

+    value="Członek-zalożyciel" />

+   <string name="AcctTypeEmployee"

+    value="Pracownik Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Dane Konta Używane" />

+   <string name="PaymentInfoOnFile"

+    value="Dane Konta Dostępne" />

+   <string name="NoPaymentInfoOnFile"

+    value="Brak Danych Konta" />

+   <string name="AgeVerified"

+    value="Wiek Zweryfikowany" />

+   <string name="NotAgeVerified"

+    value="Brak Weryfikacji Wieku" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=pl

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Pracuś Mówi:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
index a989cab167..e97e77cfe6 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Residente" />
-   <string name="AcctTypeTrial"
-    value="Teste" />
-   <string name="AcctTypeCharterMember"
-    value="Estatuto do membro" />
-   <string name="AcctTypeEmployee"
-    value="Contratado da Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Infor. de pagamento utilizadas" />
-   <string name="PaymentInfoOnFile"
-    value="Infor. de pagamento no arquivo" />
-   <string name="NoPaymentInfoOnFile"
-    value="Sem infor. de pagamento no arquivo" />
-   <string name="AgeVerified"
-    value="Idade Verificada" />
-   <string name="NotAgeVerified"
-    value="Idade não Verificada" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=pt
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Parceiro:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Resposta no Modo Ocupado:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Residente" />

+   <string name="AcctTypeTrial"

+    value="Teste" />

+   <string name="AcctTypeCharterMember"

+    value="Estatuto do membro" />

+   <string name="AcctTypeEmployee"

+    value="Contratado da Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Infor. de pagamento utilizadas" />

+   <string name="PaymentInfoOnFile"

+    value="Infor. de pagamento no arquivo" />

+   <string name="NoPaymentInfoOnFile"

+    value="Sem infor. de pagamento no arquivo" />

+   <string name="AgeVerified"

+    value="Idade Verificada" />

+   <string name="NotAgeVerified"

+    value="Idade não Verificada" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=pt

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Parceiro:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Resposta no Modo Ocupado:

+      </text>

+    </panel>

+    </panel>

+</panel>