Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Liru/master'

Browse Source
This commit is contained in:
Damian Zhaoying
2013-09-17 23:43:37 -03:00
parent 652e498cc5 a4c0cab6a0
commit fb88ad737f
12 changed files with 128 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/skins/default/xui/de/panel_avatar.xml
View File

@@ -5,15 +5,6 @@
<string name="CaptionTextAcctInfo">[ACCTTYPE]
[PAYMENTINFO]
[AGEVERIFICATION]</string>
<string name="AcctTypeResident">Einwohner</string>
<string name="AcctTypeTrial">Test</string>
<string name="AcctTypeCharterMember">Charta-Mitglied</string>
<string name="AcctTypeEmployee">Linden Lab-Mitarbeiter</string>
<string name="PaymentInfoUsed">Zahlungsinfo verwendet</string>
<string name="PaymentInfoOnFile">Zahlungsinfo archiviert</string>
<string name="NoPaymentInfoOnFile">Keine Zahlungsinfo archiviert</string>
<string name="AgeVerified">Altersgeprüft</string>
<string name="NotAgeVerified">Nicht altersgeprüft</string>
<button label="Kopiere Schlüssel" tool_tip="Schlüssel in die Zwischenablage kopieren" name="copy_key"/>
<button name="web_profile" label="Web Profil"/>

4
indra/newview/skins/default/xui/en-us/floater_dae_export.xml
View File

@@ -2,11 +2,11 @@
<floater name="Collada Export" title="Collada Export" width="600" height="260" can_close="true" can_minimize="true">
<string name="texture_progress">Collada Export: Saving textures ([COUNT] remaining)</string>
<text name="file name" follows="bottom|left" left="10" bottom="-48" height="20">File Name:</text>
<line_editor name="file name editor" follows="bottom|left" left_delta="60" bottom_delta="4" width="360" height="20" enabled="false"/>
<line_editor name="file name editor" follows="bottom|left" left_delta="60" bottom_delta="4" width="360" height="20"/>
<button name="browse button" label="Browse" follows="bottom|left" left_delta="363" bottom_delta="0" width="80" height="20">
<button.commit_callback function="ColladaExport.FilePicker"/>
</button>
<button name="export button" label="Export" follows="bottom|left" left_delta="83" bottom_delta="0" width="80" height="20" enabled="false">
<button name="export button" label="Export" follows="bottom|left" left_delta="83" bottom_delta="0" width="80" height="20">
<button.commit_callback function="ColladaExport.Export"/>
</button>
<panel border="true" left="10" bottom_delta="-88" height="80" width="200" follows="bottom|left" name="object info panel">

27
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -9,33 +9,6 @@
[PAYMENTINFO]
[AGEVERIFICATION]
</string>
<string name="AcctTypeResident">
Resident
</string>
<string name="AcctTypeTrial">
Trial
</string>
<string name="AcctTypeCharterMember">
Charter Member
</string>
<string name="AcctTypeEmployee">
Linden Lab Employee
</string>
<string name="PaymentInfoUsed">
Payment Info Used
</string>
<string name="PaymentInfoOnFile">
Payment Info On File
</string>
<string name="NoPaymentInfoOnFile">
No Payment Info On File
</string>
<string name="AgeVerified">
Age-verified
</string>
<string name="NotAgeVerified">
Not Age-verified
</string>
<button bottom="-24" follows="left|top" halign="right" height="16" label="Copy Key:" left="4" font="SansSerifSmall" tool_tip="Copy key to clipboard" name="copy_key" width="70"/>
<name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom="-24" enabled="false" follows="left|top"

17
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -3205,10 +3205,21 @@ The
<string name="Stomach">Stomach</string>
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->
<string name="AcctTypeResident">Resident</string>
<string name="AcctTypeTrial">Trial</string>
<string name="AcctTypeCharterMember">Charter Member</string>
<string name="AcctTypeEmployee">Linden Lab Employee</string>
<string name="PaymentInfoUsed">Payment Info Used</string>
<string name="PaymentInfoOnFile">Payment Info On File</string>
<string name="NoPaymentInfoOnFile">No Payment Info On File</string>
<string name="AgeVerified">Age-verified</string>
<string name="NotAgeVerified">Not Age-verified</string>
<!-- HUD Position -->
<string name="Center 2">Center 2</string>
<string name="Top Right">Top Right</string>

27
indra/newview/skins/default/xui/es/panel_avatar.xml
View File

@@ -7,33 +7,6 @@
[PAYMENTINFO]
[AGEVERIFICATION]
</string>
<string name="AcctTypeResident">
Residente
</string>
<string name="AcctTypeTrial">
Prueba
</string>
<string name="AcctTypeCharterMember">
Miembro Fundador
</string>
<string name="AcctTypeEmployee">
Empleado de Linden Lab
</string>
<string name="PaymentInfoUsed">
Información de Pago utilizada
</string>
<string name="PaymentInfoOnFile">
Información de Pago en Archivo
</string>
<string name="NoPaymentInfoOnFile">
Sin Información de Pago
</string>
<string name="AgeVerified">
Edad Verificada
</string>
<string name="NotAgeVerified">
Edad No Verificada
</string>
<button label="Copiar Key:" tool_tip="Copyiar key al portapapeles" name="copy_key"/>
<name_editor name="avatar_key"/>
<button name="web_profile" label="Perfil Web"/>

13
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -3745,7 +3745,18 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Right Pec">Pectoral Derecho</string>
<string name="Neck">Cuello</string>
<string name="Root">Base</string>
<string name="Invalid Attachment">Punto de anexión inválido</string>
<string name="Invalid Attachment">Punto de anexión inválido</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->
<string name="AcctTypeResident">Resident</string>
<string name="AcctTypeTrial">Trial</string>
<string name="AcctTypeCharterMember">Charter Member</string>
<string name="AcctTypeEmployee">Linden Lab Employee</string>
<string name="PaymentInfoUsed">Payment Info Used</string>
<string name="PaymentInfoOnFile">Payment Info On File</string>
<string name="NoPaymentInfoOnFile">No Payment Info On File</string>
<string name="AgeVerified">Age-verified</string>
<string name="NotAgeVerified">Not Age-verified</string>
<!-- HUD Position -->
<string name="Center 2">Centro 2</string>

30
indra/newview/skins/default/xui/fr/panel_avatar.xml
View File

@@ -7,36 +7,6 @@
[PAYMENTINFO]
[AGEVERIFICATION]
</string>
<string name="AcctTypeResident">
Résident
</string>
<string name="AcctTypeTrial">
Essai
</string>
<string name="AcctTypeCharterMember">
Membre originaire
</string>
<string name="AcctTypeEmployee">
Employé(e) de Linden Lab
</string>
<string name="PaymentInfoUsed">
Infos de paiement utilisées
</string>
<string name="PaymentInfoOnFile">
Infos de paiement enregistrées
</string>
<string name="NoPaymentInfoOnFile">
Aucune info de paiement
</string>
<string name="AgeVerified">
Âge vérifié
</string>
<string name="NotAgeVerified">
Âge non vérifié
</string>
<text name="Name:">
Nom:
</text>
<text name="online_yes" width="151">
Actuellement connecté(e)
</text>

30
indra/newview/skins/default/xui/pt/panel_avatar.xml
View File

@@ -2,36 +2,6 @@
<panel name="Panel Avatar" width="495">
<tab_container name="tab" width="484">
<panel label="2nd Life" name="2nd Life" width="483">
<string name="AcctTypeResident">
Residente
</string>
<string name="AcctTypeTrial">
Teste
</string>
<string name="AcctTypeCharterMember">
Estatuto do membro
</string>
<string name="AcctTypeEmployee">
Contratado da Linden Lab.
</string>
<string name="PaymentInfoUsed">
Infor. de pagamento utilizadas
</string>
<string name="PaymentInfoOnFile">
Infor. de pagamento no arquivo.
</string>
<string name="NoPaymentInfoOnFile">
Sem infor. de pagamento no arquivo
</string>
<string name="AgeVerified">
Idade Verificada
</string>
<string name="NotAgeVerified">
Idade não Verificada
</string>
<text name="Name:">
Nome:
</text>
<text name="online_yes" width="176">
Atualmente Online
</text>