diff options
Diffstat (limited to 'indra/newview/skins/default')
6 files changed, 46 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 015a2e91ff..e70a0512d6 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -59,9 +59,9 @@ height="28" layout="topleft" min_height="28" - width="100" + width="105" top_delta="0" - min_width="100" + min_width="54" name="speak_panel" user_resize="false"> <talk_button @@ -73,11 +73,13 @@ left="0" name="talk" top="5" - width="100"> + width="105"> <speak_button + halign="left" name="speak_btn" label="Speak" label_selected="Speak" + pad_left="12" /> <show_button> <show_button.init_callback diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 15517fb805..08ee0306dd 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -183,7 +183,7 @@ <button follows="bottom|left" height="23" - label="Save [WHAT]" + label="Save Pick" layout="topleft" name="save_changes_btn" left="0" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index 7c0ce9e62e..d14712a7fa 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -95,6 +95,7 @@ follows="top|left" font="SansSerif" left="10" + name="nearby_media" width="100"> Nearby Media </text> @@ -105,6 +106,7 @@ font="SansSerif" top_pad="15" left="10" + name="show" width="40"> Show: </text> @@ -130,7 +132,7 @@ <combo_box.item label="On other Avatars" value="4" - ame="OnOthers" /> + name="OnOthers" /> </combo_box> <scroll_list name="media_list" @@ -179,6 +181,7 @@ top_pad="5" height="30" left="10" + name="media_controls_panel" right="-10"> <layout_stack name="media_controls" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 48fa5dd44f..111daec242 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -14,7 +14,14 @@ <!-- starting up --> <string name="StartupDetectingHardware">Detecting hardware...</string> - <string name="StartupLoading">Loading</string> + <string name="StartupLoading">Loading [APP_NAME]...</string> + <string name="StartupClearingCache">Clearing cache...</string> + <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> + <string name="StartupInitializingVFS">Initializing VFS...</string> + + <!-- progress --> + <string name="ProgressRestoring">Restoring...</string> + <string name="ProgressChangingResolution">Changing Resolution...</string> <!-- Legacy strings, almost never used --> <string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown--> @@ -40,11 +47,15 @@ <string name="LoginConnectingToRegion">Connecting to region...</string> <string name="LoginDownloadingClothing">Downloading clothing...</string> <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> + <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> <!-- Disconnection --> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> + <string name="SavingSettings">Saving your settings...</string> + <string name="LoggingOut">Logging out...</string> + <string name="ShuttingDown">Shutting down...</string> <!-- Tooltip, lltooltipview.cpp --> @@ -134,6 +145,7 @@ <string name="AssetErrorUnknownStatus">Unknown status</string> <!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* --> + <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem --> <string name="texture">texture</string> <string name="sound">sound</string> <string name="calling card">calling card</string> @@ -158,6 +170,7 @@ <string name="simstate">simstate</string> <string name="favorite">favorite</string> <string name="symbolic link">link</string> + <string name="symbolic folder link">folder link</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> @@ -3016,6 +3029,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. [SOURCES] have said something new </string>" - <string name="paid_you_ldollars">"paid you L$"</string>" + <!-- Financial operations strings --> + <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string> + <string name="giving">Giving</string> + <string name="uploading_costs">Uploading costs</string> + <string name="this_costs">This costs</string> + <string name="buying_selected_land">Buying selected land</string> + <string name="this_object_costs">This object costs"</string> + + <string name="group_role_everyone">Everyone</string> + <string name="group_role_officers">Officers</string> + <string name="group_role_owners">Owners</string> </strings> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 9c08fbb2c8..a0886b3e00 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -11,7 +11,7 @@ <menu_item_check label="Mi Inventario" name="Inventory"/> <menu_item_check label="Mi Inventario" name="ShowSidetrayInventory"/> <menu_item_check label="Mis gestos" name="Gestures"/> - <menu label="Mi estatus" name="Status"> + <menu label="Mi estado" name="Status"> <menu_item_call label="Ausente" name="Set Away"/> <menu_item_call label="Ocupado" name="Set Busy"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml index 415451b49f..61cdbaef13 100644 --- a/indra/newview/skins/default/xui/pt/panel_login.xml +++ b/indra/newview/skins/default/xui/pt/panel_login.xml @@ -12,12 +12,19 @@ Primeiro nome: </text> <line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <text name="last_name_text"> + Sobrenome: + </text> <line_editor label="Sobrenome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <text name="password_text"> + Senha: + </text> <check_box label="Lembrar senha" name="remember_check"/> <text name="start_location_text"> Começar em: </text> <combo_box name="start_location_combo"> + <combo_box.item label="Última posição" name="MyLastLocation"/> <combo_box.item label="Minha casa" name="MyHome"/> </combo_box> <button label="conectar" name="connect_btn"/> @@ -26,6 +33,9 @@ <text name="create_new_account_text"> Cadastre-se </text> + <text name="forgot_password_text"> + Esqueceu seu nome ou senha? + </text> <text name="login_help"> Precisa de ajuda ao conectar? </text> |