diff options
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preview_texture.xml | 126 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 12 |
2 files changed, 69 insertions, 69 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index 5ee136c422..e477b6ddb8 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -45,22 +45,22 @@ <button follows="left|bottom" height="22" - label="Delete" + label="OK" layout="topleft" left="80" - name="Discard" - top="283" + name="Keep" + top="302" width="100" /> <button follows="left|bottom" height="22" - label="Save" + label="Cancel" layout="topleft" left_pad="5" - name="Keep" + name="Discard" top_delta="0" width="100" /> - <text + <text type="string" length="1" follows="left|bottom" @@ -72,62 +72,62 @@ width="303"> [WIDTH]px x [HEIGHT]px </text> - <text - type="string" - length="1" - bg_visible="false" - border_drop_shadow_visible="false" - border_visible="false" - top="309" - drop_shadow_visible="true" - enabled="true" - follows="right|bottom" - font="SansSerifSmall" - h_pad="0" - halign="right" - height="14" - left="54" - mouse_opaque="true" - name="aspect_ratio" - v_pad="0" - width="110"> - Preview Aspect Ratio - </text> - <combo_box - allow_text_entry="true" - top="306" - follows="right|bottom" - height="20" - left="176" - max_chars="20" - mouse_opaque="true" - enabled="true" - width="108" - name="combo_aspect_ratio" - tool_tip="Preview at a fixed aspect ratio"> - <combo_item name="Unconstrained" value="Unconstrained"> - Unconstrained - </combo_item> - <combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile"> - 1:1 - </combo_item> - <combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile"> - 4:3 - </combo_item> - <combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks"> - 10:7 - </combo_item> - <combo_item name="3:2" value="3:2" tool_tip="About land"> - 3:2 - </combo_item> - <combo_item name="16:10" value="16:10"> - 16:10 - </combo_item> - <combo_item name="16:9" value="16:9" tool_tip="Profile Picks"> - 16:9 - </combo_item> - <combo_item name="2:1" value="2:1"> - 2:1 - </combo_item> + <text + type="string" + length="1" + bg_visible="false" + border_drop_shadow_visible="false" + border_visible="false" + top="309" + drop_shadow_visible="true" + enabled="true" + follows="right|bottom" + font="SansSerifSmall" + h_pad="0" + halign="right" + height="14" + left="54" + mouse_opaque="true" + name="aspect_ratio" + v_pad="0" + width="110"> + Preview Aspect Ratio + </text> + <combo_box + allow_text_entry="true" + top="306" + follows="right|bottom" + height="20" + left="176" + max_chars="20" + mouse_opaque="true" + enabled="true" + width="108" + name="combo_aspect_ratio" + tool_tip="Preview at a fixed aspect ratio"> + <combo_item name="Unconstrained" value="Unconstrained"> + Unconstrained + </combo_item> + <combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile"> + 1:1 + </combo_item> + <combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile"> + 4:3 + </combo_item> + <combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks"> + 10:7 + </combo_item> + <combo_item name="3:2" value="3:2" tool_tip="About land"> + 3:2 + </combo_item> + <combo_item name="16:10" value="16:10"> + 16:10 + </combo_item> + <combo_item name="16:9" value="16:9" tool_tip="Profile Picks"> + 16:9 + </combo_item> + <combo_item name="2:1" value="2:1"> + 2:1 + </combo_item> </combo_box> </floater> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 28c4f0766e..95dd8677b4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5767,11 +5767,11 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT <button index="0" name="Keep" - text="Keep"/> + text="OK"/> <button index="1" name="Discard" - text="Discard"/> + text="Cancel"/> <button index="2" name="Mute" @@ -5788,11 +5788,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a <button index="0" name="Keep" - text="Keep"/> + text="OK"/> <button index="1" name="Discard" - text="Discard"/> + text="Cancel"/> <button index="2" name="Mute" @@ -5809,11 +5809,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a <button index="0" name="Keep" - text="Keep"/> + text="OK"/> <button index="1" name="Discard" - text="Discard"/> + text="Cancel"/> <button index="2" name="Mute" |