livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Arrehn 2011-06-12 19:55:52 -04:00
parent d122f913f9 580eca55bf
commit 81989a2d9e
10 changed files with 89 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/app_settings/settings.xml
View File

@ -730,13 +730,13 @@
<map>
<key>Comment</key>
<string>Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never).
Valid values are: 0, 120, 300, 600, 1800</string>
Valid values are: 0, 120, 300, 600, 1800, 3600</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<real>300</real>
<real>3600</real>
</map>
<key>AdminMenu</key>
<map>
@ -4633,7 +4633,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC][DEBUG_MODE]</string>
<string>http://wiki.phoenixviewer.com/doku.php?id=firestorm</string>
</map>
<key>HomeSidePanelURL</key>
<map>

2
indra/newview/skins/default/xui/da/strings.xml
View File

@ -1280,7 +1280,7 @@
Ugyldig vedhæftningspunktt
</string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] gammel
[AGEYEARS] [AGEMONTHS]
</string>
<string name="YearsOld">
[AGEYEARS] gammel

2
indra/newview/skins/default/xui/de/strings.xml
View File

@ -1304,7 +1304,7 @@
Ungültige Stelle für Anhang
</string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] alt
[AGEYEARS] [AGEMONTHS]
</string>
<string name="YearsOld">
[AGEYEARS] alt

38
indra/newview/skins/default/xui/en/panel_preferences_general.xml
View File

@ -361,16 +361,16 @@
Log out after being marked away:
</text>
<combo_box
height="23"
layout="topleft"
control_name="AFKTimeout"
left="25"
top_pad="10"
label="Away timeout:"
top_delta="0"
name="afk"
width="120">
<combo_box
height="23"
layout="topleft"
control_name="AFKTimeout"
left="25"
top_pad="10"
label="Away timeout:"
top_delta="0"
name="afk"
width="120">
<combo_box.item
label="2 minutes"
name="item0"
@ -387,6 +387,10 @@
label="30 minutes"
name="item3"
value="1800" />
<combo_box.item
label="60 minutes"
name="item3"
value="3600" />
<combo_box.item
label="never"
name="item4"
@ -394,13 +398,13 @@
</combo_box>
<combo_box
height="23"
layout="topleft"
control_name="QuitAfterSecondsOfAFK"
left_pad="30"
top_delta="0"
name="quitafk"
width="120">
height="23"
layout="topleft"
control_name="QuitAfterSecondsOfAFK"
left_pad="30"
top_delta="0"
name="quitafk"
width="120">
<combo_box.item
label="2 minutes"
name="item0"

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2075,7 +2075,7 @@ Requests name of an avatar. When data is available the dataserver event will be
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- Avatar age computation, see LLDateUtil::ageFromDate -->
<string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string>
<string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS]</string>
<string name="YearsOld">[AGEYEARS] old</string>
<string name="MonthsOld">[AGEMONTHS] old</string>
<string name="WeeksOld">[AGEWEEKS] old</string>

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

@ -1283,7 +1283,7 @@
Punto de colocación no válido
</string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] de edad
[AGEYEARS] [AGEMONTHS]
</string>
<string name="YearsOld">
[AGEYEARS] de edad

2
indra/newview/skins/default/xui/it/strings.xml
View File

@ -1274,7 +1274,7 @@
Punto di collegamento non valido
</string>
<string name="YearsMonthsOld">
Nato da [AGEYEARS] [AGEMONTHS]
[AGEYEARS] [AGEMONTHS]
</string>
<string name="YearsOld">
Nato da [AGEYEARS]

2
indra/newview/skins/default/xui/nl/strings.xml
View File

@ -1060,7 +1060,7 @@
Right Pec
</string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] oud
[AGEYEARS] [AGEMONTHS]
</string>
<string name="YearsOld">
[AGEYEARS] oud

2
indra/newview/skins/default/xui/pt/strings.xml
View File

@ -1283,7 +1283,7 @@
Ponto de encaixe inválido
</string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] de idade
[AGEYEARS] [AGEMONTHS]
</string>
<string name="YearsOld">
[AGEYEARS] de idade

115
indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
View File

@ -67,6 +67,62 @@ KC: I used view_border's around text_editor's due to text render issues with bor
halign="right"
height="16"
left="6"
name="Name:"
width="40"
value="Name:" />
<view_border
left_pad="4"
height="16"
right="-86"
bevel_style="in"
follows="left|top|right"
name="info_border" />
<text_editor
left_delta="3"
bottom_delta="2"
height="16"
right="-86"
h_pad="0"
v_pad="0"
allow_scroll="false"
bg_visible="false"
enabled="false"
follows="left|top|right"
max_length="254"
name="complete_name"
value="(loading...)" />
<button
name="copy_to_clipboard"
layout="topleft"
follows="top|right"
image_overlay="Copy"
top_delta="-5"
left_pad="4"
height="21"
width="21"
tab_stop="false"
tool_tip="Copy to Clipboard"/>
<text
follows="top|right"
halign="center"
height="13"
top_pad="-15"
left_pad="2"
right="-6"
layout="topleft"
name="status"
text_color="LtGray_50"
value="Online" />
<text
top_pad="2"
follows="left|top"
halign="right"
height="16"
left="6"
name="Key:"
width="40"
value="Key:" />
@ -97,70 +153,15 @@ KC: I used view_border's around text_editor's due to text render issues with bor
name="copy_uri"
left_pad="4"
right="-6"
bottom_delta="2"
height="20"
label="Copy URI"
enabled="false"
follows="top|right" />
<text
top_pad="2"
follows="left|top"
halign="right"
height="16"
left="6"
name="Name:"
width="40"
value="Name:" />
<view_border
left_pad="4"
height="16"
width="310"
bevel_style="in"
follows="left|top|right"
name="info_border" />
<text_editor
left_delta="3"
bottom_delta="2"
height="16"
width="310"
h_pad="0"
v_pad="0"
allow_scroll="false"
bg_visible="false"
enabled="false"
follows="left|top|right"
max_length="254"
name="complete_name"
value="(loading...)" />
<button
name="copy_to_clipboard"
layout="topleft"
follows="top|right"
image_overlay="Copy"
top_delta="-3"
left_pad="4"
height="21"
width="21"
tab_stop="false"
tool_tip="Copy to Clipboard"/>
<text
follows="top|right"
halign="right"
height="13"
top_pad="-17"
right="-6"
layout="topleft"
name="status"
text_color="LtGray_50"
value="Online"
width="70" />
<texture_picker
left="6"
top_pad="5"
top_pad="3"
height="180"
width="220"
allow_no_texture="true"