diff options
Diffstat (limited to 'indra/newview/skins')
125 files changed, 4339 insertions, 1481 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 5ba1fc9b21..b489294f38 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -86,6 +86,9 @@ <color name="LtOrange" value="1 .85 .73 1" /> + <color + name="MdBlue" + value=".07 .38 .51 1" /> <!-- This color name makes potentially unused colors show up bright purple. Leave this here until all Unused? are removed below, otherwise @@ -749,4 +752,7 @@ <color name="ChatTimestampColor" reference="White" /> + <color + name="MenuBarProjectBgColor" + reference="MdBlue" /> </colors> diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png Binary files differindex de8a39fc8a..75833eccf3 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png +++ b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png diff --git a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png Binary files differindex 65b0ce8b67..532288b430 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png +++ b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Invalid.png b/indra/newview/skins/default/textures/icons/Inv_Invalid.png Binary files differnew file mode 100644 index 0000000000..328be104ee --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Invalid.png diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png Binary files differnew file mode 100644 index 0000000000..50c01062a5 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png Binary files differnew file mode 100644 index 0000000000..bf2065cd37 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png Binary files differnew file mode 100644 index 0000000000..8b48258142 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png Binary files differnew file mode 100644 index 0000000000..09efe779fe --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 7c8574609c..0ad5b0c2e3 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -229,6 +229,7 @@ with the same filename but different name <texture name="Inv_Underpants" file_name="icons/Inv_Underpants.png" preload="false" /> <texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" /> <texture name="Inv_Link" file_name="icons/Inv_Link.png" preload="false" /> + <texture name="Inv_Invalid" file_name="icons/Inv_Invalid.png" preload="false" /> <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/> <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/> @@ -358,11 +359,16 @@ with the same filename but different name <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" /> <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" /> <texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" /> + + <texture name="Permission_Visible_Online" file_name="ff_visible_online_button.tga" preload="false" /> + <texture name="Permission_Visible_Map" file_name="ff_visible_map_button.tga" preload="false" /> + <texture name="Permission_Edit_Objects_Mine" file_name="ff_edit_mine_button.tga" preload="false" /> + <texture name="Permission_Edit_Objects_Theirs" file_name="ff_edit_theirs_button.tga" preload="false" /> + <texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" /> <texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" /> <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" /> - <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" /> <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" /> @@ -428,6 +434,12 @@ with the same filename but different name <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="Shirt_Large" file_name="icons/Shirt_Large.png" preload="false" /> + + <texture name="Sidebar_Icon_Dock_Foreground" file_name="taskpanel/Sidebar_Icon_Dock_Foreground.png" preload="false" /> + <texture name="Sidebar_Icon_Dock_Press" file_name="taskpanel/Sidebar_Icon_Dock_Press.png" preload="false" /> + <texture name="Sidebar_Icon_Undock_Foreground" file_name="taskpanel/Sidebar_Icon_Undock_Foreground.png" preload="false" /> + <texture name="Sidebar_Icon_Undock_Press" file_name="taskpanel/Sidebar_Icon_Undock_Press.png" preload="false" /> + <texture name="Shop" file_name="icons/Shop.png" preload="false" /> <texture name="SkipBackward_Off" file_name="icons/SkipBackward_Off.png" preload="false" /> @@ -645,7 +657,7 @@ with the same filename but different name <texture name="buy_off" file_name="widgets/buy_off.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/> <texture name="buy_over" file_name="widgets/buy_over.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/> <texture name="buy_press" file_name="widgets/buy_press.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/> - + <texture name="hint_background" file_name="windows/hint_background.png" preload="false" scale.left="8" scale.top="70" scale.right="195" scale.bottom="11"/> <texture name="hint_arrow_left" file_name="windows/hint_arrow_left.png" preload="false"/> <texture name="hint_arrow_right" file_name="windows/hint_arrow_right.png" preload="false"/> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index 20a376f152..bea106bf28 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="Separate vinduer" name="radio" value="0"/> <radio_item label="Faner" name="radio2" value="1"/> </radio_group> + <check_box label="Oversæt Chat" name="translate_chat_checkbox" /> + <text name="translate_language_text" width="110"> + Chat Sprog: + </text> + <combo_box name="translate_language_combobox" width="146"> + <combo_box.item label="System standard" name="System Default Language"/> + <combo_box.item label="English (Engelsk)" name="English"/> + <combo_box.item label="Dansk" name="Danish"/> + <combo_box.item label="Deutsch (Tysk)" name="German"/> + <combo_box.item label="Español (Spansk)" name="Spanish"/> + <combo_box.item label="Français (Fransk)" name="French"/> + <combo_box.item label="Italiano (Italiensk)" name="Italian" /> + <combo_box.item label="Magyar (Ungarsk)" name="Hungarian" /> + <combo_box.item label="Nederlands (Hollandsk)" name="Dutch" /> + <combo_box.item label="Polski (Polsk)" name="Polish" /> + <combo_box.item label="Português (Portugisisk)" name="Portugese" /> + <combo_box.item label="Русский (Russisk)" name="Russian" /> + <combo_box.item label="Türkçe (Tyrkisk)" name="Turkish" /> + <combo_box.item label="Українська (Ukrainsk)" name="Ukrainian" /> + <combo_box.item label="中文 (简体) (Kinesisk)" name="Chinese" /> + <combo_box.item label="日本語 (Japansk)" name="Japanese" /> + <combo_box.item label="한국어 (Koreansk)" name="Korean" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index e70cb48262..6a85cf4aae 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml @@ -11,7 +11,7 @@ <combo_box.item label="Español (Spansk) - Beta" name="Spanish"/> <combo_box.item label="Français (Fransk) - Beta" name="French"/> <combo_box.item label="Polski (Polsk) - Beta" name="Polish"/> - <combo_box.item label="Portugués (Portugisisk) - Beta" name="Portugese"/> + <combo_box.item label="Português (Portugisisk) - Beta" name="Portugese"/> <combo_box.item label="日本語 (Japansk) - Beta" name="(Japanese)"/> </combo_box> <text name="language_textbox2"> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 3152661fd4..712f6f8b50 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -1117,6 +1117,9 @@ <string name="InvFolder Favorite"> Favoritter </string> + <string name="InvFolder favorite"> + Favoritter + </string> <string name="InvFolder Current Outfit"> Nuværende sæt </string> diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index 5f00fc4f77..f9169ed748 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -259,18 +259,18 @@ werden. <text left="204" name="other_objects_text" width="48"> [COUNT] </text> - <button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135" width="60"/> - <button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOther..." right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben." width="119"/> - <text left="14" name="Selected / sat upon:" width="140"> + <button label="Anzeigen" label_selected="Anzeigen" name="ShowOther"/> + <button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOther..." tool_tip="Objekte an ihre Eigentümer zurückgeben."/> + <text name="Selected / sat upon:"> Ausgewählt/gesessen auf: </text> - <text left="204" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Objekte anderer Einwohner automatisch zurückgeben (Minuten, 0 für aus): </text> - <line_editor name="clean other time" right="-10" width="56"/> + <line_editor name="clean other time"/> <text name="Object Owners:"> Objekteigentümer: </text> @@ -279,7 +279,7 @@ werden. <name_list name="owner list"> <name_list.columns label="Typ" name="type"/> <name_list.columns label="Name" name="name"/> - <name_list.columns label="Anzahl" name="count" width="80"/> + <name_list.columns label="Anzahl" name="count"/> <name_list.columns label="Aktuellstes" name="mostrecent"/> </name_list> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index 0f02de866b..b373be4382 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -20,7 +20,7 @@ <text name="start_location_text"> Hier anfangen: </text> - <combo_box name="start_location_combo" width="150"> + <combo_box name="start_location_combo"> <combo_box.item label="Mein letzter Standort" name="MyLastLocation"/> <combo_box.item label="Mein Zuhause" name="MyHome"/> <combo_box.item label="<Region eingeben>" name="Typeregionname"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index 5c91b34a21..064eb3895b 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="Getrennte Fenster" name="radio" value="0"/> <radio_item label="Registerkarten" name="radio2" value="1"/> </radio_group> + <check_box label="Ãbersetzen Chat" name="translate_chat_checkbox" /> + <text name="translate_language_text"> + Chat-Sprache: + </text> + <combo_box name="translate_language_combobox" width="200"> + <combo_box.item name="System Default Language" label="Betriebssystem-Einstellung" /> + <combo_box.item name="English" label="English (Englisch)" /> + <combo_box.item name="Danish" label="Danks (Dänisch)" /> + <combo_box.item name="German" label="Deutsch" /> + <combo_box.item name="Spanish" label="Español (Spanisch)" /> + <combo_box.item name="French" label="Français (Französisch)" /> + <combo_box.item name="Italian" label="Italiano (Italienisch)" /> + <combo_box.item name="Hungarian" label="Magyar (Ungarisch)" /> + <combo_box.item name="Dutch" label="Nederlands (Niederländisch)" /> + <combo_box.item name="Polish" label="Polski (Polnisch)" /> + <combo_box.item name="Portugese" label="Português (Portugiesisch)" /> + <combo_box.item name="Russian" label="Русский (Russian)" /> + <combo_box.item name="Turkish" label="Türkçe (Türkisch)" /> + <combo_box.item name="Ukrainian" label="Українська (Ukrainisch)" /> + <combo_box.item name="Chinese" label="中文 (简体) (Chinesisch)" /> + <combo_box.item name="Japanese" label="日本語 (Japanisch)" /> + <combo_box.item name="Korean" label="한국어 (Koreanisch)" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index bf7d2ef3b3..1adc4e3db1 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -1147,6 +1147,9 @@ <string name="InvFolder Favorite"> Favoriten </string> + <string name="InvFolder favorite"> + Favoriten + </string> <string name="InvFolder Current Outfit"> Aktuelles Outfit </string> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 99bf3e6bc1..e6f11cac60 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1044,7 +1044,7 @@ Leyla Linden </text> left="28" name="Selected / sat upon:" top_pad="5" - width="176"> + width="230"> Selected / sat upon: </text> <text @@ -1053,7 +1053,7 @@ Leyla Linden </text> follows="left|top" height="23" layout="topleft" - left_delta="172" + left_delta="220" name="selected_objects_text" top_delta="0" width="48"> @@ -1143,11 +1143,11 @@ Leyla Linden </text> <name_list.columns label="Count" name="count" - width="60" /> + width="67" /> <name_list.columns label="Most Recent" name="mostrecent" - width="170" /> + width="163" /> </name_list> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml index 42a9ff551e..65e2462ef8 100644 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml @@ -359,9 +359,9 @@ increment="1" initial_value="0" label="Hour" - label_width="30" + label_width="35" layout="topleft" - left_delta="25" + left_delta="20" max_val="100" name="WLCurKeyHour" top_pad="4" @@ -374,13 +374,13 @@ increment="5" initial_value="0" label="Min" - label_width="20" + label_width="45" layout="topleft" left_pad="5" max_val="55" name="WLCurKeyMin" top_delta="0" - width="60" /> + width="85" /> <text type="string" length="1" @@ -456,9 +456,9 @@ increment="1" initial_value="0" label="Hour" - label_width="30" + label_width="33" layout="topleft" - left_delta="0" + left_delta="-3" max_val="100" name="WLLengthOfDayHour" top_pad="4" @@ -471,13 +471,13 @@ increment="1" initial_value="0" label="Min" - label_width="20" + label_width="25" layout="topleft" - left_pad="5" + left_pad="2" max_val="59" name="WLLengthOfDayMin" top_delta="0" - width="60" /> + width="65" /> <spinner control_name="WLLengthOfDaySec" decimal_digits="0" @@ -486,13 +486,13 @@ increment="1" initial_value="24" label="Sec" - label_width="20" + label_width="25" layout="topleft" - left_pad="5" + left_pad="2" max_val="59" name="WLLengthOfDaySec" top_delta="0" - width="60"/> + width="65"/> <text type="string" halign="right" diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index efd96624ab..6370ff9243 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -7,8 +7,8 @@ follows="top|right" height="174" layout="topleft" - min_height="174" - min_width="174" + min_height="128" + min_width="128" name="Map" title="" help_topic="map" @@ -19,40 +19,8 @@ top="0" width="200"> <floater.string - name="mini_map_north"> - N - </floater.string> - <floater.string - name="mini_map_east"> - E - </floater.string> - <floater.string - name="mini_map_west"> - W - </floater.string> - <floater.string - name="mini_map_south"> - S - </floater.string> - <floater.string - name="mini_map_southeast"> - SE - </floater.string> - <floater.string - name="mini_map_northeast"> - NE - </floater.string> - <floater.string - name="mini_map_southwest"> - SW - </floater.string> - <floater.string - name="mini_map_northwest"> - NW - </floater.string> - <floater.string name="ToolTipMsg"> - [AGENT][REGION](Double-click to open Map) + [REGION](Double-click to open Map, shift-drag to pan) </floater.string> <floater.string name="mini_map_caption"> MINIMAP diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 3b26c2ab59..4c5113aa55 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -14,7 +14,7 @@ can_dock="true" bevel_style="in" height="300" - min_width="150" + min_width="235" layout="topleft" name="nearby_chat" help_topic="nearby_chat" @@ -24,15 +24,25 @@ save_visibility="true" single_instance="true" width="320"> + <check_box + bottom_delta="36" + control_name="TranslateChat" + enabled="true" + height="16" + label="Translate chat (powered by Google)" + layout="topleft" + left="5" + name="translate_chat_checkbox" + width="230" /> <chat_history parse_urls="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="all" left="5" - top="20" + top_delta="17" layout="topleft" - height="275" + height="260" name="chat_history" parse_highlights="true" text_color="ChatHistoryTextColor" diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml new file mode 100644 index 0000000000..9f14e9ae0a --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<floater + can_close="false" + can_resize="true" + min_width="333" + min_height="440" + save_rect="true" + save_visibility="true" + > +</floater> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 9fac296e26..4f982cc8e9 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -64,8 +64,8 @@ parameter="UseDebugMenus" /> </menu_item_check> <menu - visible="false" create_jump_keys="true" + visible="false" label="Debug" name="Debug" tear_off="true"> @@ -102,6 +102,7 @@ </menu_item_call> --> <menu + create_jump_keys="true" label="UI Tests" name="UI Tests" tear_off="true"> diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml index f5ea3e735b..8fe89d3934 100644 --- a/indra/newview/skins/default/xui/en/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml @@ -29,6 +29,7 @@ function="Minimap.Zoom" parameter="far" /> </menu_item_call> + <menu_item_separator /> <menu_item_check label="Rotate Map" name="Rotate Map"> @@ -38,6 +39,15 @@ function="ToggleControl" parameter="MiniMapRotate" /> </menu_item_check> + <menu_item_check + label="Auto Center" + name="Auto Center"> + <menu_item_check.on_check + control="MiniMapAutoCenter" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MiniMapAutoCenter" /> + </menu_item_check> <menu_item_separator /> <menu_item_call label="Stop Tracking" diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index 92752a0fee..22796f7b68 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -31,6 +31,14 @@ function="CheckControl" parameter="FriendsListShowIcons" /> </menu_item_check> + <menu_item_check name="view_permissions" label="View Permissions Granted"> + <menu_item_check.on_click + function="People.Friends.ViewSort.Action" + parameter="view_permissions" /> + <menu_item_check.on_check + function="CheckControl" + parameter="FriendsListShowPermissions" /> + </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" /> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml index 588342595e..5d58a9d289 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml @@ -57,4 +57,13 @@ <on_click function="Avatar.Pay" /> </menu_item_call> + <menu_item_call + label="Offer Teleport" + name="teleport"> + <menu_item_call.on_click + function="Avatar.OfferTeleport"/> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_offer_teleport"/> + </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index dbd24b6d59..ed79f1246a 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -4,6 +4,7 @@ follows="left|top|right" name="Main Menu"> <menu + create_jump_keys="true" label="Me" name="Me" tear_off="true"> @@ -94,6 +95,7 @@ parameter="voice_effect" /> </menu_item_check> <menu + create_jump_keys="true" label="My Status" name="Status" tear_off="true"> @@ -138,6 +140,7 @@ </menu_item_call> </menu> <menu + create_jump_keys="true" label="Communicate" name="Communicate" tear_off="true"> @@ -188,6 +191,7 @@ </menu_item_call> </menu> <menu + create_jump_keys="true" label="World" name="World" tear_off="true"> @@ -901,6 +905,7 @@ </menu> </menu> <menu + create_jump_keys="true" label="Help" name="Help" tear_off="true"> @@ -955,6 +960,7 @@ </menu_item_check> </menu> <menu + create_jump_keys="true" label="Advanced" name="Advanced" tear_off="true" @@ -1459,6 +1465,7 @@ <menu_item_separator/> <menu + create_jump_keys="true" label="Shortcuts" name="Shortcuts" tear_off="true" @@ -1670,8 +1677,8 @@ </menu_item_call> <menu_item_separator visible="false"/> - <!-- Made invisible to avoid a dissonance: menu item toggle menu where it is located. EXT-8069. - Can't be removed to keep sortcut workable. + <!-- Made invisible to avoid a dissonance: menu item toggles the menu where it is located. EXT-8069. + Can't be removed, to keep shortcut workable. --> <menu_item_check label="Show Advanced Menu" @@ -2639,6 +2646,16 @@ function="ToggleControl" parameter="DoubleClickAutoPilot" /> </menu_item_check> + <menu_item_check + label="Double-Click Teleport" + name="DoubleClick Teleport"> + <menu_item_check.on_check + function="CheckControl" + parameter="DoubleClickTeleport" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DoubleClickTeleport" /> + </menu_item_check> <menu_item_separator /> diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml index 747352cb29..84ab16c709 100644 --- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml @@ -10,4 +10,14 @@ <on_click function="Gear.Edit" /> </menu_item_call> + <menu_item_call + label="Take Off" + layout="topleft" + name="takeoff"> + <on_click + function="Gear.TakeOff" /> + <on_enable + function="Gear.OnEnable" + parameter="take_off" /> + </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index 876ff9961b..b385654010 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -65,11 +65,55 @@ height="15" layout="topleft" left_pad="5" - right="-72" + right="-164" name="last_interaction" text_color="LtGray_50" value="0s" width="35" /> + <icon + height="20" + follows="right" + image_name="Permission_Visible_Online" + layout="topleft" + left_pad="3" + right="-141" + name="permission_online_icon" + tool_tip="This friend can see when you're online" + top="2" + width="20" /> + <icon + height="20" + follows="right" + image_name="Permission_Visible_Map" + layout="topleft" + left_pad="3" + tool_tip="This friend can locate you on the map" + right="-118" + name="permission_map_icon" + top_delta="0" + width="20" /> + <icon + height="20" + follows="right" + image_name="Permission_Edit_Objects_Mine" + layout="topleft" + left_pad="3" + right="-95" + name="permission_edit_mine_icon" + tool_tip="This friend can edit, delete or take your objects" + top_delta="0" + width="20" /> + <icon + height="20" + follows="right" + image_name="Permission_Edit_Objects_Theirs" + layout="topleft" + left_pad="3" + right="-72" + name="permission_edit_theirs_icon" + tool_tip="You can edit this friend's objects" + top_delta="0" + width="20" /> <button follows="right" height="16" @@ -79,7 +123,8 @@ left_pad="3" right="-53" name="info_btn" - top_delta="-2" + tab_stop="false" + top_delta="2" width="16" /> <button follows="right" @@ -89,6 +134,7 @@ left_pad="5" right="-28" name="profile_btn" + tab_stop="false" tool_tip="View profile" top_delta="-2" width="20" /> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index b06a72f584..63068a069f 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -12,6 +12,9 @@ top="28" width="1310"> <string + name="DragIndicationImageName" + value="Accordion_ArrowOpened_Off" /> + <string name="SpeakBtnToolTip" value="Turns microphone on/off" /> <string @@ -45,7 +48,7 @@ user_resize="true" width="308" > <panel - name="chat_bar" + name="chat_bar" filename="panel_nearby_chat_bar.xml" left="0" height="28" @@ -136,7 +139,7 @@ name="movement_panel" user_resize="false" width="83"> - <button + <bottomtray_button follows="left|right" height="23" image_pressed="PushButton_Press" @@ -153,7 +156,8 @@ <init_callback function="Button.SetDockableFloaterToggle" parameter="moveview" /> - </button> + </bottomtray_button> + </layout_panel> <layout_panel auto_resize="false" @@ -166,7 +170,7 @@ name="cam_panel" user_resize="false" width="83"> - <button + <bottomtray_button follows="left|right" height="23" image_pressed="PushButton_Press" @@ -184,7 +188,7 @@ <init_callback function="Button.SetDockableFloaterToggle" parameter="camera" /> - </button> + </bottomtray_button> </layout_panel> <layout_panel auto_resize="false" @@ -196,7 +200,7 @@ name="snapshot_panel" user_resize="false" width="39"> - <button + <bottomtray_button follows="left|right" height="23" image_overlay="Snapshot_Off" @@ -213,7 +217,7 @@ <init_callback function="Button.SetFloaterToggle" parameter="snapshot" /> - </button> + </bottomtray_button> </layout_panel> <layout_panel auto_resize="false" @@ -229,7 +233,7 @@ <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon. Disabled for now. --> - <button + <bottomtray_button follows="left|right" height="23" image_pressed="PushButton_Press" @@ -247,7 +251,7 @@ Disabled for now. <commit_callback function="Build.Toggle" parameter="build" /> - </button> + </bottomtray_button> </layout_panel> <layout_panel auto_resize="false" @@ -260,7 +264,7 @@ Disabled for now. name="search_btn_panel" user_resize="false" width="83"> - <button + <bottomtray_button follows="left|right" height="23" image_pressed="PushButton_Press" @@ -278,7 +282,7 @@ Disabled for now. <init_callback function="Button.SetFloaterToggle" parameter="search" /> - </button> + </bottomtray_button> </layout_panel> <layout_panel auto_resize="false" @@ -291,7 +295,7 @@ Disabled for now. name="world_map_btn_panel" user_resize="false" width="83"> - <button + <bottomtray_button follows="left|right" height="23" image_pressed="PushButton_Press" @@ -309,7 +313,7 @@ Disabled for now. <init_callback function="Button.SetFloaterToggle" parameter="world_map" /> - </button> + </bottomtray_button> </layout_panel> <layout_panel auto_resize="false" @@ -322,7 +326,7 @@ Disabled for now. name="mini_map_btn_panel" user_resize="false" width="83"> - <button + <bottomtray_button follows="left|right" height="23" image_pressed="PushButton_Press" @@ -340,7 +344,7 @@ Disabled for now. <init_callback function="Button.SetFloaterToggle" parameter="mini_map" /> - </button> + </bottomtray_button> </layout_panel> <layout_panel follows="left|right" diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml deleted file mode 100644 index e96dbd527c..0000000000 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="bottom|left" - height="490" - label="Classified" - layout="topleft" - left="330" - name="Classified" - top="490" - width="450"> - <panel.string - name="ad_placed_paid"> - Ad placed: [DATE], Paid L$[AMT] for listing. - </panel.string> - <panel.string - name="update_txt"> - Update - </panel.string> - <panel.string - name="publish_txt"> - Publish... - </panel.string> - <panel.string - name="dateStr"> - [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] - </panel.string> - <texture_picker - fallback_image="default_land_picture.j2c" - follows="left|top" - height="300" - layout="topleft" - left="20" - name="snapshot_ctrl" - top="15" - width="400" /> - <line_editor - enabled="false" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="0" - name="given_name_editor" - tool_tip="Name must begin with a letter or number, not punctuation" - top_delta="288" - width="400" /> - <text_editor - enabled="false" - follows="left|top" - height="90" - layout="topleft" - left="20" - max_length="1023" - name="desc_editor" - width="400" - word_wrap="true" /> - <line_editor - enabled="false" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="20" - name="location_editor" - tool_tip="Set the location for this classified to your current position" - width="400" /> - <button - follows="left|top" - height="20" - label="Set" - layout="topleft" - left_delta="360" - name="set_location_btn" - top_delta="0" - width="60" /> - <button - follows="left|top" - height="20" - label="Teleport" - layout="topleft" - left="20" - name="classified_teleport_btn" - top="449" - width="100" /> - <button - follows="left|top" - height="20" - label="Map" - layout="topleft" - left_pad="5" - name="classified_map_btn" - top_delta="0" - width="100" /> - <button - follows="left|top" - height="20" - label="Profile" - layout="topleft" - left_pad="5" - name="classified_profile_btn" - top_delta="0" - width="100" /> - <combo_box - height="20" - layout="topleft" - left="30" - name="classified_mature_check" - top="48" - width="130"> - <combo_box.item - label="- Select one -" - name="select_mature" - value="Select" /> - <combo_box.item - label="Moderate Content" - name="mature" - value="Mature" /> - <combo_box.item - label="General Content" - name="pg" - value="PG" /> - </combo_box> - <combo_box - bottom="45" - height="18" - layout="topleft" - left="20" - name="classified_category_combo" - right="150" /> - <button - follows="left|top" - height="20" - label="Update" - layout="topleft" - left="30" - name="classified_update_btn" - top="70" - width="70" /> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index 268cb4e5f9..0fb7691ee7 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -39,7 +39,7 @@ Disabled </panel.string> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" @@ -398,30 +398,74 @@ top_pad="5" left="9" name="buttons"> - <button - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - left="0" - name="teleport_btn" - top="0" - width="101" /> - <button - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - left_pad="3" - name="show_on_map_btn" - width="100" /> - <button - follows="bottom|left" - height="23" - label="Edit" - layout="topleft" - name="edit_btn" - left_pad="3" - width="101" /> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="layout_stack1" + left="0" + orientation="horizontal" + top_pad="0" + width="309"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + left="0" + name="teleport_btn" + top="0" + width="101" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="100"> + <button + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + top="0" + width="100" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="edit_btn_lp" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Edit" + layout="topleft" + name="edit_btn" + top="0" + width="101" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index a5c74b08e7..5934956559 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -23,7 +23,7 @@ Save </string> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" @@ -119,7 +119,7 @@ layout="topleft" left="10" top_pad="2" - max_length="63" + max_length="30" name="classified_name" prevalidate_callback="ascii" text_color="black" @@ -147,7 +147,7 @@ layout="topleft" left="10" top_pad="2" - max_length="1023" + max_length="64" name="classified_desc" text_color="black" word_wrap="true" /> @@ -301,22 +301,56 @@ name="bottom_panel" top_pad="5" width="303"> - <button - follows="bottom|left" - height="23" - label="[LABEL]" - layout="topleft" - name="save_changes_btn" - left="0" - top="0" - width="152" /> - <button - follows="bottom|left" - height="23" - label="Cancel" - layout="topleft" - name="cancel_btn" - left_pad="3" - width="153" /> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_panel_ls" + left="1" + orientation="horizontal" + top_pad="0" + width="309"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="save_changes_btn_lp" + user_resize="false" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="[LABEL]" + layout="topleft" + name="save_changes_btn" + left="1" + top="0" + width="155" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="157"> + <button + follows="bottom|left|right" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + left="1" + top="0" + width="156" /> + </layout_panel> + </layout_stack> </panel> </panel> 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 f50e182313..c4b831b71c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -17,7 +17,7 @@ (will update after save) </panel.string> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" @@ -183,22 +183,57 @@ name="bottom_panel" top_pad="5" width="303"> - <button - follows="bottom|left" - height="23" - label="Save Pick" - layout="topleft" - name="save_changes_btn" - left="0" - top="0" - width="152" /> - <button - follows="bottom|left" - height="23" - label="Cancel" - layout="topleft" - name="cancel_btn" - left_pad="3" - width="153" /> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="layout_stack1" + left="2" + orientation="horizontal" + top_pad="0" + width="303"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="topleft" + left="0" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="150"> + <button + follows="bottom|left|right" + height="23" + label="Save Pick" + layout="topleft" + name="save_changes_btn" + top="0" + left="1" + width="149" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="topleft" + left_pad="4" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="150"> + <button + follows="bottom|left|right" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + top="0" + left="1" + width="149" /> + </layout_panel> + </layout_stack> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 48bd9ace21..6781a76120 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -320,33 +320,68 @@ left="10" name="partner_edit_link" value="[[URL] Edit]" - width="50" /> + width="70" /> </panel> </panel> </scroll_container> <panel - follows="bottom|left" + follows="bottom|left|right" height="28" left="0" name="profile_me_buttons_panel" top_pad="0" width="313"> + + <layout_stack + follows="bottom|left|right" + height="28" + layout="topleft" + name="bottom_panel_ls" + left="7" + orientation="horizontal" + top_pad="0" + width="295"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + name="save_changes_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="153"> <button - follows="bottom|left" + follows="bottom|left|right" height="23" label="Save Changes" layout="topleft" - left="8" + left="1" name="save_btn" - top="5" + top="0" width="152" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="154"> <button - follows="bottom|left" + follows="bottom|left|right" height="23" label="Cancel" layout="topleft" - left_pad="3" + left="1" name="cancel_btn" + top="0" width="153" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 9fb777e0e7..95c1c822b8 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -187,7 +187,7 @@ width="150" /> <radio_group control_name="AvatarSex" - follows="left|top|right" + follows="top|right" height="20" layout="topleft" left="210" @@ -217,6 +217,7 @@ </radio_group> <!-- graphical labels for the radio buttons above --> <icon + follows="top|right" height="16" image_name="icons/Male.png" layout="topleft" @@ -226,6 +227,7 @@ top="7" width="16" /> <icon + follows="top|right" height="16" image_name="icons/Female.png" layout="topleft" @@ -416,22 +418,55 @@ name="button_panel" top_pad="6" width="333"> - <button - follows="bottomleft" + <layout_stack + follows="bottom|left|right" height="23" - label="Save As" layout="topleft" - left="8" - name="save_as_button" + mouse_opaque="false" + name="button_panel_ls" + left="0" + orientation="horizontal" top="0" - width="153" /> - <button - follows="bottomleft" - height="23" - label="Undo Changes" - layout="topleft" - left_pad="7" - name="revert_button" - width="152" /> + width="333"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_as_btn_lp" + user_resize="false" + auto_resize="true" + width="154"> + <button + follows="bottom|left|right" + height="23" + label="Save As" + layout="topleft" + left="1" + name="save_as_button" + top="0" + width="153" /> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="revert_btn_lp" + user_resize="false" + auto_resize="true" + width="152"> + <button + follows="bottom|left|right" + height="23" + label="Undo Changes" + layout="topleft" + left_pad="7" + name="revert_button" + width="152" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 4998322d62..2a3add161a 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -84,7 +84,7 @@ background_visible="true" follows="all" left="8" top_pad="0" - height="536" + height="506" width="292" border_size="0"> <layout_panel @@ -176,58 +176,140 @@ background_visible="true" </accordion_tab> </accordion> </layout_panel> - <layout_panel + </layout_stack> + + <layout_stack + name="layout" + orientation="horizontal" + follows="bottom|left|right" + left="8" + top_pad="0" + height="30" + width="292" + border_size="0"> + + <layout_panel height="30" layout="topleft" auto_resize="false" left="0" top_pad="0" - name="button_row" - follows="bottom|left" - width="313"> - <button - follows="bottom|left" - height="23" - image_overlay="Refresh_Off" - layout="topleft" - left="0" - top="5" - name="btn_refresh" - width="23" /> - <button - follows="bottom|left" - label="Chat" - name="btn_chat" - left_pad="3" - height="23" - width="82" /> - <button - follows="bottom|left" - left_pad="3" - height="23" - name="btn_call" - label="Group Call" - layout="topleft" - tool_tip="Call this group" - width="112" /> - <button - follows="bottom|left" - height="23" - label="Save" - label_selected="Save" - name="btn_apply" - left_pad="3" - width="82" /> - <button - follows="bottom|left" - height="23" - layout="topleft" - left="0" - label="Create Group" - name="btn_create" - visible="true" - tool_tip="Create a new Group" - width="103" /> + name="button_row" + follows="bottom|left|right" + width="313"> + + <layout_stack + follows="bottom|left|right" + height="25" + layout="topleft" + name="button_row_ls" + left="2" + orientation="horizontal" + top_pad="5" + width="309"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="btn_refresh_lp" + user_resize="false" + auto_resize="true" + width="24"> + <button + follows="bottom|left|right" + height="23" + image_overlay="Refresh_Off" + layout="topleft" + left="1" + top="0" + name="btn_refresh" + width="23" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="btn_chat_lp" + user_resize="false" + auto_resize="true" + width="83"> + <button + follows="bottom|left|right" + label="Chat" + name="btn_chat" + left="1" + height="23" + top="0" + width="82" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="call_btn_lp" + user_resize="false" + auto_resize="true" + width="113"> + <button + follows="bottom|left|right" + left="1" + height="23" + name="btn_call" + label="Group Call" + layout="topleft" + tool_tip="Call this group" + top="0" + width="112" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="btn_apply_lp" + user_resize="false" + auto_resize="true" + width="83"> + <button + follows="bottom|left|right" + height="23" + label="Save" + label_selected="Save" + name="btn_apply" + left="1" + top="0" + width="82" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="btn_create_lp" + user_resize="false" + auto_resize="true" + width="104"> + <button + follows="bottom|left|right" + height="23" + layout="topleft" + left="1" + top="0" + label="Create Group" + name="btn_create" + visible="true" + tool_tip="Create a new Group" + width="103" /> + </layout_panel> + </layout_stack> <!--<button left_pad="3" height="23" @@ -237,5 +319,7 @@ background_visible="true" visible="false" width="65" />--> </layout_panel> - </layout_stack> + + </layout_stack> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml index ab34cbf20e..0b84ac03c5 100644 --- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -55,6 +55,7 @@ left_pad="3" right="-31" name="info_btn" + tab_stop="false" top_delta="-2" width="16" /> <!--*TODO: Should only appear on rollover--> @@ -66,6 +67,7 @@ left_pad="5" right="-3" name="profile_btn" + tab_stop="false" tool_tip="View profile" top_delta="-2" width="20" /> diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index c5d6aced7a..f8ae238148 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -57,7 +57,7 @@ translate="false" value="Parcel_R_Dark" /> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index a7e87f2a1e..7e415f45a4 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -97,51 +97,94 @@ left="3" name="bottom_panel" width="313"> - <button - follows="bottom|left" - tool_tip="Show additional options" - height="25" - image_hover_unselected="Toolbar_Left_Over" - image_overlay="OptionsMenu_Off" - image_selected="Toolbar_Left_Selected" - image_unselected="Toolbar_Left_Off" - layout="topleft" - left="0" - name="options_gear_btn" - top="1" - width="31" /> - <button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="AddItem_Off" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="add_btn" - tool_tip="Add new landmark" - width="31" /> - <icon - follows="bottom|left" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="dummy_icon" - width="209" - /> - <dnd_button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Right_Over" - image_overlay="TrashItem_Off" - image_selected="Toolbar_Right_Selected" - image_unselected="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="trash_btn" - tool_tip="Remove selected landmark" - width="31" /> - </panel> + + <layout_stack + animate="false" + border_size="0" + follows="left|right|bottom" + height="25" + layout="topleft" + orientation="horizontal" + top_pad="1" + left="0" + name="bottom_panel" + width="307"> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="options_gear_btn_panel" + width="32"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="options_gear_btn" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="add_btn_panel" + width="32"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left="0" + name="add_btn" + tool_tip="Add new landmark" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="true" + height="25" + layout="topleft" + name="dummy_panel" + width="212"> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left="0" + top="0" + name="dummy_icon" + width="211" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="trash_btn_panel" + width="31"> + <dnd_button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left="0" + layout="topleft" + name="trash_btn" + tool_tip="Remove selected landmark" + top="0" + width="31"/> + </layout_panel> + </layout_stack> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 0499873fb0..6b136495d2 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -130,7 +130,7 @@ control_name="LoginLocation" max_chars="128" top_pad="0" name="start_location_combo" - width="135"> + width="170"> <combo_box.item label="My last location" name="MyLastLocation" diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml index 63c522ac69..84b5d11ba7 100644 --- a/indra/newview/skins/default/xui/en/panel_me.xml +++ b/indra/newview/skins/default/xui/en/panel_me.xml @@ -26,7 +26,7 @@ </text> --> <tab_container follows="all" - height="575" + height="555" halign="center" layout="topleft" left="5" diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 4629bb9cfe..37a1ed3048 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -41,7 +41,7 @@ layout="topleft" left="0" top="0" - height="522" + height="510" width="315" border_size="0"> <layout_panel @@ -324,82 +324,25 @@ </panel> </scroll_container> </layout_panel> - <!-- <layout_panel - follows="bottom|left" + </layout_stack> + <panel + follows="bottom|left|right" + height="23" layout="topleft" left="0" - name="profile_buttons_panel" - height="28" - width="313"> - <button - follows="bottom|left" - height="23" - label="Add Friend" - layout="topleft" - left="0" - mouse_opaque="false" - name="add_friend" - tool_tip="Offer friendship to the Resident" - top="5" - width="80" /> - <button - follows="bottom|left" - height="23" - label="IM" - layout="topleft" - name="im" - top="5" - left_pad="3" - width="45" /> - <button - follows="bottom|left" - height="23" - label="Call" - layout="topleft" - name="call" - left_pad="3" - top="5" - width="45" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - name="show_on_map_btn" - top="5" - left_pad="3" - width="45" /> - <button - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - name="teleport" - left_pad="3" - top="5" - width="85" /> - </panel>--> - <layout_panel - follows="bottom|left" - layout="topleft" - left="0" - top_pad="0" + top_pad="1" name="profile_me_buttons_panel" visible="false" - user_resize="false" - auto_resize="false" - height="28" width="315"> <button - follows="bottom|right" + follows="bottom" height="23" left="6" - top="1" + top="1" label="Edit Profile" name="edit_profile_btn" tool_tip="Edit your personal information" width="152" /> - </layout_panel> -</layout_stack> + </panel> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index cff7b51ce8..124b1cfc6b 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="533" + height="515" label="Notes & Privacy" layout="topleft" left="0" @@ -112,58 +112,125 @@ name="notes_buttons_panel" auto_resize="false" width="313"> - <button - follows="bottom|left" - height="23" - label="Add Friend" - layout="topleft" - left="2" - mouse_opaque="false" - name="add_friend" - tool_tip="Offer friendship to the Resident" - top="5" - width="80" /> - <button - follows="bottom|left" - height="23" - label="IM" - layout="topleft" - name="im" - tool_tip="Open instant message session" - top="5" - left_pad="3" - width="45" /> - <button - follows="bottom|left" - height="23" - label="Call" - layout="topleft" - name="call" - tool_tip="Call this Resident" - left_pad="3" - top="5" - width="46" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - name="show_on_map_btn" - tool_tip="Show the Resident on the map" - top="5" - left_pad="3" - width="45" /> - <button - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - name="teleport" - tool_tip="Offer teleport" - left_pad="3" - top="5" - width="80" /> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_bar_ls" + left="2" + orientation="horizontal" + top_pad="5" + width="309"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="add_friend_btn_lp" + user_resize="false" + auto_resize="true" + width="118"> + <button + follows="bottom|left|right" + height="23" + label="Add Friend" + layout="topleft" + left="1" + mouse_opaque="false" + name="add_friend" + tool_tip="Offer friendship to the Resident" + top="0" + width="117" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="im_btn_lp" + user_resize="false" + auto_resize="true" + width="22"> + <button + follows="bottom|left|right" + height="23" + label="IM" + layout="topleft" + name="im" + tool_tip="Open instant message session" + top="0" + left="1" + width="21" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="call_btn_lp" + user_resize="false" + auto_resize="true" + width="52"> + <button + follows="bottom|left|right" + height="23" + label="Call" + layout="topleft" + name="call" + tool_tip="Call this Resident" + left="1" + top="0" + use_ellipses="true" + width="51" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="46"> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + tool_tip="Show the Resident on the map" + top="0" + left="1" + width="45" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="teleport_btn_lp" + user_resize="false" + auto_resize="true" + width="81"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport" + tool_tip="Offer teleport" + left="1" + top="0" + width="80" /> + </layout_panel> + </layout_stack> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index f5df177b68..e0426c75b4 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -71,7 +71,7 @@ top="1" width="30" /> <text - follows="top|right" + follows="top|left|right" font="SansSerifHugeBold" height="26" layout="topleft" @@ -108,7 +108,7 @@ width="31" /> <panel bevel_style="none" - follows="top|right" + follows="top|left|right" height="37" layout="topleft" left_pad="5" @@ -296,7 +296,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap auto_resize="true" default_tab_group="3" height="450" - min_height="53" + min_height="80" name="add_wearables_panel" width="313" tab_group="2" @@ -495,17 +495,37 @@ It is calculated as border_size + 2*UIResizeBarOverlap top_pad="2" name="save_revert_button_bar" width="300"> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="button_bar_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_btn_lp" + user_resize="false" + auto_resize="true" + width="156"> <button - follows="bottom|left" + follows="bottom|left|right" height="23" label="Save" - left="0" + left="1" layout="topleft" name="save_btn" top="0" width="155" /> <button - follows="bottom|left" + follows="bottom|right" height="23" name="save_flyout_btn" label="" @@ -519,15 +539,28 @@ It is calculated as border_size + 2*UIResizeBarOverlap image_pressed_selected="SegmentedBtn_Right_Selected_Press" image_overlay="Arrow_Small_Up" width="20"/> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="revert_btn_lp" + user_resize="false" + auto_resize="true" + width="147"> <button follows="bottom|left|right" height="23" - left_pad="12" + left="0" label="Undo Changes" layout="topleft" name="revert_btn" top="0" tool_tip="Revert to last saved version" width="147" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 82b69ba8dc..88c82313dd 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -67,36 +67,70 @@ visible="true" name="bottom_panel" width="310"> - <button - follows="bottom|left" - height="23" - label="Save As" - left="0" - layout="topleft" - name="save_btn" - top_pad="0" - width="155" /> - <button - follows="bottom|left" - height="23" - name="save_flyout_btn" - label="" - layout="topleft" - left_pad="-20" - tab_stop="false" - image_selected="SegmentedBtn_Right_Selected_Press" - image_unselected="SegmentedBtn_Right_Off" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Selected_Press" - image_overlay="Arrow_Small_Up" - width="20"/> - <button - follows="bottom|left|right" - height="23" - label="Wear" - layout="topleft" - name="wear_btn" - left_pad="3" - width="152" /> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_panel_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_btn_lp" + user_resize="false" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="Save As" + left="1" + layout="topleft" + name="save_btn" + top="0" + width="155" /> + <button + follows="bottom|right" + height="23" + name="save_flyout_btn" + label="" + layout="topleft" + left_pad="-20" + tab_stop="false" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="wear_btn_lp" + user_resize="false" + auto_resize="true" + width="152"> + <button + follows="bottom|left|right" + height="23" + label="Wear" + layout="topleft" + name="wear_btn" + left="0" + top="0" + width="152" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 7cd0d5b5f0..ab8930c967 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -143,7 +143,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M function="People.addFriend" /> </button> <icon - follows="bottom|left" + follows="bottom|left|right" height="25" image_name="Toolbar_Right_Off" layout="topleft" @@ -192,6 +192,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M left="0" multi_select="true" name="avatars_online" + show_permissions_granted="true" top="0" width="307" /> </accordion_tab> @@ -208,6 +209,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M left="0" multi_select="true" name="avatars_all" + show_permissions_granted="true" top="0" width="307" /> </accordion_tab> @@ -222,6 +224,96 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M name="bottom_panel" top_pad="0" width="313"> + + <layout_stack + animate="false" + border_size="0" + follows="left|right|bottom" + height="25" + layout="topleft" + orientation="horizontal" + top_pad="1" + left="0" + name="bottom_panel" + width="305"> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="options_gear_btn_panel" + width="32"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="friends_viewsort_btn" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="add_btn_panel" + width="32"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left="0" + name="add_btn" + tool_tip="Offer friendship to a Resident" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="true" + height="25" + layout="topleft" + name="dummy_panel" + width="212"> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left="0" + top="0" + name="dummy_icon" + width="211" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="trash_btn_panel" + width="31"> + <dnd_button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left="0" + layout="topleft" + name="trash_btn" + tool_tip="Remove selected person from your Friends list" + top="0" + width="31"/> + </layout_panel> + </layout_stack><!-- + <button follows="bottom|left" tool_tip="Options" @@ -248,7 +340,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M tool_tip="Offer friendship to a Resident" width="31" /> <icon - follows="bottom|left" + follows="bottom|left|right" height="25" image_name="Toolbar_Middle_Off" layout="topleft" @@ -268,7 +360,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M name="del_btn" tool_tip="Remove selected person from your Friends list" width="31" /> - </panel> + --></panel> <text follows="all" height="450" @@ -353,7 +445,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M tool_tip="Activate selected group" width="31" /> <icon - follows="bottom|left" + follows="bottom|left|right" height="25" image_name="Toolbar_Right_Off" layout="topleft" @@ -427,7 +519,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M function="People.addFriend" /> </button> <icon - follows="bottom|left" + follows="bottom|left|right" height="25" image_name="Toolbar_Right_Off" layout="topleft" @@ -439,85 +531,210 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M </panel> </tab_container> <panel - follows="bottom|left" + follows="bottom|left|right" height="23" layout="topleft" left="8" top_pad="4" name="button_bar" width="313"> - <button - follows="bottom|left" - height="23" - label="Profile" - layout="topleft" - name="view_profile_btn" - tool_tip="Show picture, groups, and other Residents information" - top="0" - width="67" /> - <button - follows="bottom|left" - left_pad="3" - height="23" - label="IM" - layout="topleft" - name="im_btn" - tool_tip="Open instant message session" - width="40" /> - <button - follows="bottom|left" - left_pad="3" - height="23" - label="Call" - layout="topleft" - name="call_btn" - tool_tip="Call this Resident" - width="51" /> - <button - follows="bottom|left" - left_pad="3" - height="23" - label="Share" - layout="topleft" - name="share_btn" - tool_tip="Share an inventory item" - width="65" /> - <button - follows="bottom|left" - left_pad="3" - height="23" - label="Teleport" - layout="topleft" - name="teleport_btn" - tool_tip="Offer teleport" - width="76" /> - <button - follows="bottom|left" - left="0" - top_delta="0" - height="23" - label="Group Profile" - layout="topleft" - name="group_info_btn" - tool_tip="Show group information" - width="107" /> - <button - follows="bottom|left" - left_pad="3" - height="23" - label="Group Chat" - layout="topleft" - name="chat_btn" - tool_tip="Open chat session" - width="100" /> - <button - follows="bottom|left" - left_pad="3" - height="23" - label="Group Call" - layout="topleft" - name="group_call_btn" - tool_tip="Call this group" - width="95" /> + +<!--********************************Profile; IM; Call, Share, Teleport********************************--> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_bar_ls" + left="0" + orientation="horizontal" + top_pad="0" + width="313"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="view_profile_btn_lp" + user_resize="false" + auto_resize="true" + width="68"> + <button + follows="bottom|left|right" + height="23" + label="Profile" + layout="topleft" + left="1" + name="view_profile_btn" + tool_tip="Show picture, groups, and other Residents information" + top="0" + width="67" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="41"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="IM" + layout="topleft" + name="im_btn" + tool_tip="Open instant message session" + top="0" + width="40" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="52"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Call" + layout="topleft" + name="call_btn" + tool_tip="Call this Resident" + top="0" + width="51" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="66"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Share" + layout="topleft" + name="share_btn" + tool_tip="Share an inventory item" + top="0" + width="65" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="77"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Teleport" + layout="topleft" + name="teleport_btn" + tool_tip="Offer teleport" + top="0" + width="76" /> + </layout_panel> + </layout_stack> + +<!--********************************Group Profile; Group Chat; Group Call buttons************************--> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls1" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="group_info_btn_lp" + user_resize="false" + auto_resize="true" + width="108"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Group Profile" + layout="topleft" + mouse_opaque="false" + name="group_info_btn" + tool_tip="Show group information" + top="0" + width="107" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Group Chat" + layout="topleft" + mouse_opaque="false" + name="chat_btn" + tool_tip="Open chat session" + top="0" + width="100" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="group_call_btn_lp" + user_resize="false" + auto_resize="true" + width="96"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Group Call" + layout="topleft" + mouse_opaque="false" + name="group_call_btn" + tool_tip="Call this group" + top="0" + width="95" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 95c8cb301d..0496c86215 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -11,7 +11,7 @@ top="0" width="333"> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" @@ -121,30 +121,73 @@ top_pad="5" left="8" name="buttons"> - <button - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - left="0" - name="teleport_btn" - top="0" - width="101" /> - <button - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - left_pad="3" - name="show_on_map_btn" - width="100" /> - <button - follows="bottom|left" - height="23" - label="Edit" - layout="topleft" - name="edit_btn" - left_pad="3" - width="101" /> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="layout_stack1" + left="0" + orientation="horizontal" + top_pad="0" + width="312"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport_btn" + top="0" + width="101" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="100"> + <button + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + top_pad="0" + width="100" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="edit_btn_lp" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Edit" + layout="topleft" + name="edit_btn" + top_pad="0" + width="101" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index a815cdf7f0..4f7c4fa9b2 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -30,7 +30,7 @@ bg_opaque_color="DkGray2" <accordion fit_parent="true" follows="all" - height="470" + height="485" layout="topleft" left="0" name="accordion" @@ -78,93 +78,166 @@ bg_opaque_color="DkGray2" bevel_style="none" enabled="false" auto_resize="false" - follows="bottom" + follows="bottom|left|right" left="1" height="27" label="bottom_panel" - layout="topleft" + layout="bottom" name="edit_panel" top_pad="-2" width="313"> - <button - enabled="false" - follows="bottom|left" - height="18" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - image_disabled="OptionsMenu_Disabled" - layout="topleft" - left="10" - name="gear_menu_btn" - top="9" - width="18" /> - <button - follows="bottom|left" - height="18" - image_disabled="AddItem_Disabled" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - layout="topleft" - left_pad="15" - name="new_btn" - tool_tip="Create a new pick or classified at the current location" - top="9" - width="18" /> - <button - follows="bottom|right" - height="18" - image_disabled="TrashItem_Disabled" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - name="trash_btn" - right="-10" - top="9" - width="18" /> - </panel> - <panel + + <layout_stack + follows="bottom|left|right" + height="23" + layout="bottomleft" + name="edit_panel_ls" + left="10" + orientation="horizontal" + top_pad="0" + width="293"> + + <layout_panel + follows="bottom|left" + height="18" + layout="bottomleft" + left="0" + name="gear_menu_btn" + user_resize="false" + auto_resize="true" + width="51"> + <button + enabled="false" + follows="bottom|left" + height="18" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + image_disabled="OptionsMenu_Disabled" + layout="topleft" + left="0" + name="gear_menu_btn" + top_pad="0" + width="18" /> + <button + follows="bottom|left" + height="18" + image_disabled="AddItem_Disabled" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + layout="topleft" + left_pad="15" + name="new_btn" + tool_tip="Create a new pick or classified at the current location" + width="18" /> + </layout_panel> + + <layout_panel + follows="bottom|right" + height="18" + layout="bottomleft" + name="trash_btn_lp" + user_resize="false" + auto_resize="true" + width="18"> + <button + follows="bottom|right" + height="18" + image_disabled="TrashItem_Disabled" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + name="trash_btn" + top="0" + width="18" /> + </layout_panel> + + </layout_stack> + </panel> + + <panel bg_opaque_color="DkGray" background_visible="true" background_opaque="true" + follows="bottom|left|right" layout="topleft" left="0" height="40" - top="502" name="buttons_cucks" width="313"> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Info" - layout="topleft" - left="2" - name="info_btn" - tab_stop="false" - tool_tip="Show pick information" - top="5" - width="95" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - left_pad="3" - name="teleport_btn" - tab_stop="false" - tool_tip="Teleport to the corresponding area" - width="117" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - left_pad="3" - name="show_on_map_btn" - tab_stop="false" - tool_tip="Show the corresponding area on the World Map" - width="90" /> - </panel> + + <layout_stack + follows="bottom|left|right" + height="28" + layout="topleft" + left="2" + name="buttons_cucks_ls" + orientation="horizontal" + top="0" + width="313"> + + <layout_panel + follows="bottom|left|right" + height="28" + layout="topleft" + left="0" + name="info_btn_lp" + user_resize="false" + auto_resize="true" + top="0" + width="95"> + <button + enabled="false" + follows="top|left|right" + height="23" + label="Info" + layout="topleft" + name="info_btn" + tab_stop="false" + tool_tip="Show pick information" + width="95" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="28" + layout="bottomleft" + left_pad="2" + name="teleport_btn_lp" + user_resize="false" + auto_resize="true" + width="117"> + <button + enabled="false" + follows="top|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport_btn" + tab_stop="false" + tool_tip="Teleport to the corresponding area" + width="117" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="28" + layout="bottomleft" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + left_pad="2" + width="90"> + <button + enabled="false" + follows="top|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + tab_stop="false" + tool_tip="Show the corresponding area on the World Map" + width="88" /> + </layout_panel> + </layout_stack> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index c6e93af50a..01d1e48ba1 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -154,7 +154,7 @@ translate="false" value="Parcel_DamageNo_Dark" /> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 638e190e8f..21314703b0 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -68,83 +68,297 @@ background_visible="true" visible="false" width="315" /> <panel + follows="bottom|left|right" height="23" layout="topleft" left="4" name="button_panel" width="315"> - <button - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - left="5" - name="teleport_btn" - tool_tip="Teleport to the selected area" - top="1" - width="108" /> - <button - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - left_pad="3" - name="map_btn" - tool_tip="Show the corresponding area on the World Map" - width="85" /> - <button - follows="bottom|left" - height="23" - label="Edit" - layout="topleft" - left_pad="3" - name="edit_btn" - tool_tip="Edit landmark information" - width="83" /> - <button - follows="bottom|right" - height="23" - label="▼" - layout="topleft" - name="overflow_btn" - tool_tip="Show additional options" - left_pad="3" - width="23" /> - <button - follows="bottom|left" - height="23" - label="Save" - layout="topleft" - name="save_btn" - left="5" - top_pad="-23" - width="152" /> - <button - follows="bottom|right" - height="23" - label="Cancel" - layout="topleft" - name="cancel_btn" - left_pad="3" - width="153" /> - <button - follows="bottom|right" - height="23" - label="Close" - layout="topleft" - name="close_btn" - right="-10" - top="1" - width="60" /> - <button - follows="bottom|left" - height="23" - label="Profile" - layout="topleft" - name="profile_btn" - right="-1" - tool_tip="Show place profile" - top="1" - width="111" /> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls0" + left="4" + orientation="horizontal" + top="0" + width="315"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="lp1" + user_resize="false" + auto_resize="true" + width="193"> + + <!--*********************** Teleport, Map buttons ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls1" + left="0" + orientation="horizontal" + top="0" + width="193"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="teleport_btn_lp" + user_resize="false" + auto_resize="true" + width="109"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + left="1" + name="teleport_btn" + tool_tip="Teleport to the selected area" + top="0" + width="108" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="86"> + <button + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + left="1" + name="map_btn" + tool_tip="Show the corresponding area on the World Map" + top="0" + width="85" /> + </layout_panel> + </layout_stack> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="0" + mouse_opaque="false" + name="lp2" + user_resize="false" + auto_resize="true" + width="116"> + + <!--*********************** Edit, Options buttons ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls3" + left="0" + orientation="horizontal" + top="0" + width="120"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="0" + mouse_opaque="false" + name="edit_btn_lp" + user_resize="false" + auto_resize="true" + width="84"> + <button + follows="bottom|left|right" + height="23" + label="Edit" + layout="topleft" + left="1" + mouse_opaque="false" + name="edit_btn" + tool_tip="Edit landmark information" + top="0" + width="83" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="0" + mouse_opaque="false" + name="overflow_btn_lp" + user_resize="false" + auto_resize="true" + width="24"> + <button + follows="bottom|left|right" + height="23" + label="▼" + layout="topleft" + mouse_opaque="false" + name="overflow_btn" + tool_tip="Show additional options" + top="0" + left="1" + width="23" /> + </layout_panel> + </layout_stack> + + <!--*********************** Profile button ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls3" + left="0" + orientation="horizontal" + top="0" + width="120"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="profile_btn_lp" + user_resize="false" + auto_resize="true" + width="112"> + <button + follows="bottom|left|right" + height="23" + label="Profile" + layout="topleft" + mouse_opaque="false" + name="profile_btn" + left="1" + tool_tip="Show place profile" + top="0" + width="111" /> + </layout_panel> + </layout_stack> + + <!--*********************** Close button ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_close_ls3" + left="0" + orientation="horizontal" + top="0" + width="120"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="close_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="61"> + <button + follows="bottom|left|right" + height="23" + label="Close" + layout="topleft" + mouse_opaque="false" + name="close_btn" + left="1" + top="0" + width="60" /> + </layout_panel> + </layout_stack> + + + </layout_panel> + </layout_stack> + +<!--*********************** Save, Cancel buttons ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls2" + left="4" + orientation="horizontal" + top="0" + width="313"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="save_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="153"> + <button + follows="bottom|left|right" + height="23" + label="Save" + layout="topleft" + mouse_opaque="false" + name="save_btn" + left="1" + top_pad="0" + width="152"/> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="cancel_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="154"> + <button + follows="bottom|left|right" + height="23" + label="Cancel" + layout="topleft" + mouse_opaque="false" + name="cancel_btn" + left="1" + top="0" + width="153" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index ba967d3e2c..31e160ec33 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -104,7 +104,7 @@ layout="topleft" left="190" name="agent" - top_pad="-17" + top_pad="-15" width="44" > <color_swatch.init_callback function="Pref.getUIColor" @@ -135,7 +135,7 @@ layout="topleft" left="360" name="im" - top_pad="-17" + top_pad="-15" width="44"> <color_swatch.init_callback function="Pref.getUIColor" @@ -166,7 +166,7 @@ layout="topleft" left="40" name="system" - top_pad="40" + top_pad="22" width="44" > <color_swatch.init_callback function="Pref.getUIColor" @@ -196,7 +196,7 @@ layout="topleft" left="190" name="script_error" - top_pad="-17" + top_pad="-15" width="44"> <color_swatch.init_callback function="Pref.getUIColor" @@ -226,7 +226,7 @@ layout="topleft" left="360" name="objects" - top_pad="-17" + top_pad="-15" width="44" > <color_swatch.init_callback function="Pref.getUIColor" @@ -256,7 +256,7 @@ layout="topleft" left="40" name="owner" - top_pad="40" + top_pad="22" width="44" > <color_swatch.init_callback function="Pref.getUIColor" @@ -286,7 +286,7 @@ layout="topleft" left="190" name="links" - top_pad="-17" + top_pad="-15" width="44" > <color_swatch.init_callback function="Pref.getUIColor" @@ -316,7 +316,7 @@ layout="topleft" left="30" name="play_typing_animation" - top_pad="40" + top_pad="32" width="400" /> <check_box enabled="false" @@ -343,7 +343,7 @@ left="30" height="20" width="170" - top_pad="20"> + top_pad="14"> Show IMs in: </text> <text @@ -386,4 +386,106 @@ top_pad="5" width="150" /> </radio_group> + <check_box + control_name="TranslateChat" + enabled="true" + height="16" + label="Use machine translation while chatting (powered by Google)" + layout="topleft" + left="30" + name="translate_chat_checkbox" + bottom_delta="40" + width="400" /> + <text + bottom_delta="30" + name="translate_language_text" + follows="left|top" + layout="topleft" + left_delta="20" + height="20" + width="110"> + Translate chat into: + </text> + <combo_box + allow_text_entry="true" + bottom_delta="3" + control_name="TranslateLanguage" + enabled="true" + follows="left|top" + height="23" + left_delta="110" + max_chars="135" + mouse_opaque="true" + name="translate_language_combobox" + width="146"> + <combo_box.item + label="System Default" + name="System Default Language" + value="default" /> + <combo_box.item + label="English" + name="English" + value="en" /> + <!-- After "System Default" and "English", please keep the rest of these combo_box.items in alphabetical order by the first character in the string. --> + <combo_box.item + label="Dansk (Danish)" + name="Danish" + value="da" /> + <combo_box.item + label="Deutsch (German)" + name="German" + value="de" /> + <combo_box.item + label="Español (Spanish)" + name="Spanish" + value="es" /> + <combo_box.item + label="Français (French)" + name="French" + value="fr" /> + <combo_box.item + label="Italiano (Italian)" + name="Italian" + value="it" /> + <combo_box.item + label="Magyar (Hungarian)" + name="Hungarian" + value="hu" /> + <combo_box.item + label="Nederlands (Dutch)" + name="Dutch" + value="nl" /> + <combo_box.item + label="Polski (Polish)" + name="Polish" + value="pl" /> + <combo_box.item + label="Português (Portuguese)" + name="Portugese" + value="pt" /> + <combo_box.item + label="Русский (Russian)" + name="Russian" + value="ru" /> + <combo_box.item + label="Türkçe (Turkish)" + name="Turkish" + value="tr" /> + <combo_box.item + label="Українська (Ukrainian)" + name="Ukrainian" + value="uk" /> + <combo_box.item + label="中文 (简体) (Chinese)" + name="Chinese" + value="zh" /> + <combo_box.item + label="日本語 (Japanese)" + name="Japanese" + value="ja" /> + <combo_box.item + label="한국어 (Korean)" + name="Korean" + value="ko" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index a69e8d29b0..17eebffa02 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -77,7 +77,7 @@ value="pl" /> <combo_box.item enabled="true" - label="Portugués (Portuguese) - Beta" + label="Português (Portuguese) - Beta" name="Portugese" value="pt" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index e41b80baf2..e2cd27c419 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="540" + height="430" label="Profile" layout="topleft" left="0" @@ -41,7 +41,7 @@ layout="topleft" left="0" top="0" - height="524" + height="400" width="317" border_size="0"> <layout_panel @@ -50,7 +50,7 @@ layout="topleft" top="0" left="0" - height="524" + height="400" width="317"> <scroll_container color="DkGray2" @@ -304,74 +304,147 @@ </panel> </scroll_container> </layout_panel> - <layout_panel - follows="bottom|left" + +</layout_stack> + + <layout_stack + name="layout_verb_buttons" + orientation="horizontal" + follows="bottom|left|right" + layout="topleft" + left="2" + top_pad="1" + height="30" + width="315" + border_size="0"> + <layout_panel + follows="bottom|left" height="30" layout="topleft" name="profile_buttons_panel" + top="0" auto_resize="false" width="317"> - <button - follows="bottom|left" - height="23" - label="Add Friend" - layout="topleft" - left="2" - mouse_opaque="false" - name="add_friend" - pad_left="1" - pad_right="1" - tool_tip="Offer friendship to the Resident" - top="5" - use_ellipses="true" - width="117" /> - <button - follows="bottom|left" - height="23" - label="IM" - layout="topleft" - name="im" - tool_tip="Open instant message session" - top="5" - left_pad="1" - width="21" /> - <button - follows="bottom|left" - height="23" - label="Call" - layout="topleft" - name="call" - tool_tip="Call this Resident" - left_pad="1" - pad_left="1" - pad_right="1" - top="5" - use_ellipses="true" - width="51" /> - <button - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - name="teleport" - tool_tip="Offer teleport" - left_pad="1" - pad_left="1" - pad_right="1" - top="5" - use_ellipses="true" - width="92" /> - <button - follows="bottom|right" - height="23" - label="▼" - layout="topleft" - name="overflow_btn" - tool_tip="Pay money to or share inventory with the Resident" - right="-1" - top="5" - width="23" /> - </layout_panel> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_bar_ls" + left="0" + orientation="horizontal" + top_pad="5" + width="317"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="add_friend_btn_lp" + user_resize="false" + auto_resize="true" + width="118"> + <button + follows="bottom|left|right" + height="23" + label="Add Friend" + layout="topleft" + left="1" + mouse_opaque="false" + name="add_friend" + tool_tip="Offer friendship to the Resident" + top="0" + width="117" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="im_btn_lp" + user_resize="false" + auto_resize="true" + width="22"> + <button + follows="bottom|left|right" + height="23" + label="IM" + layout="topleft" + name="im" + tool_tip="Open instant message session" + top="0" + left="1" + width="21" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="call_btn_lp" + user_resize="false" + auto_resize="true" + width="52"> + <button + follows="bottom|left|right" + height="23" + label="Call" + layout="topleft" + name="call" + tool_tip="Call this Resident" + left="1" + top="0" + use_ellipses="true" + width="51" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="93"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport" + tool_tip="Offer teleport" + left="1" + top="0" + use_ellipses="true" + width="92" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="overflow_btn_lp" + user_resize="false" + auto_resize="true" + width="27"> + <button + follows="bottom|left|right" + height="23" + label="▼" + layout="topleft" + name="overflow_btn" + tool_tip="Pay money to or share inventory with the Resident" + left="1" + top="0" + width="23" /> + </layout_panel> + </layout_stack> + </layout_panel> <layout_panel follows="bottom|left" height="30" @@ -389,6 +462,6 @@ tool_tip="Edit your personal information" width="130" /> </layout_panel> + </layout_stack> -</layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index d9030fc0d6..3b4d6ae58d 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -17,7 +17,7 @@ Offline </string> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" @@ -56,7 +56,7 @@ width="150" /> <tab_container follows="all" - height="538" + height="515" halign="center" layout="topleft" left="5" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index 0a9c70303e..557b04d281 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml @@ -9,7 +9,7 @@ left="0" name="sidetray_tab_panel"> <text - follows="left|top" + follows="left|top|right" font="SansSerifHuge" height="16" layout="topleft" @@ -20,7 +20,32 @@ value="Side Panel" width="255" /> <button - follows="left|right|top" + follows="right|top" + height="16" + image_selected="Sidebar_Icon_Undock_Press" + image_unselected="Sidebar_Icon_Undock_Foreground" + image_disabled="Sidebar_Icon_Undock_Press" + layout="topleft" + name="undock" + top="10" + right="-28" + width="16" + tool_tip="Undock" /> + <button + follows="right|top" + height="16" + image_selected="Sidebar_Icon_Dock_Press" + image_unselected="Sidebar_Icon_Dock_Foreground" + image_disabled="Sidebar_Icon_Dock_Press" + layout="topleft" + name="dock" + top="10" + right="-28" + width="16" + tool_tip="Dock" + visible="false" /> + <button + follows="right|top" height="16" image_selected="Icon_Help_Press" image_unselected="Icon_Help_Foreground" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index b48c5d1f8a..bf09836e87 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -171,7 +171,7 @@ top="1" width="31" /> <icon - follows="bottom|left" + follows="bottom|left|right" height="25" image_name="Toolbar_Right_Off" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index d38ad8c5f8..c89e1dc215 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -56,6 +56,7 @@ left_pad="5" right="-3" name="profile_btn" + tab_stop="false" tool_tip="Show item info" top="1" visible="false" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 02ab0ffee5..c1c0f07304 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -65,7 +65,7 @@ width="333"> text_color="EmphasisColor" width="300" height="10" - follows="top|left" + follows="top|left|right" layout="topleft" left="35" top="3" @@ -81,14 +81,14 @@ width="333"> top="15" use_ellipses="true" width="230" - follows="top|left" + follows="top|left|right" word_wrap="false" mouse_opaque="false" name="currentlook_name"> MyOutfit With a really Long Name like MOOSE </text> <button - follows="left|top" + follows="top|right" height="28" image_overlay="Edit_Wrench" label="" @@ -99,7 +99,7 @@ width="333"> top="3" width="28" /> <loading_indicator - follows="left|top" + follows="top|right" height="24" layout="topleft" left="268" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 6c9acae35e..f3c6895cee 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -31,77 +31,122 @@ height="545" width="330" /> <panel + follows="bottom|left|right" height="25" layout="topleft" name="button_panel" left="9" top_pad="-2" width="313"> - <button - enabled="true" - follows="bottom|left" - height="23" - label="Profile" - layout="topleft" - left="0" - name="info_btn" - tool_tip="Show object profile" - top="0" - width="102" /> - <button - enabled="true" - follows="bottom|left" - height="23" - label="Share" - layout="topleft" - left="105" - name="share_btn" - tool_tip="Share an inventory item" - top="0" - width="102" /> - <button - enabled="true" - follows="bottom|left" - height="23" - label="Shop" - layout="topleft" - left="210" - name="shop_btn" - tool_tip="Open Marketplace webpage" - top="0" - width="102" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Wear" - layout="topleft" - left="210" - name="wear_btn" - tool_tip="Wear seleceted outfit" - top="0" - width="102" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Play" - layout="topleft" - name="play_btn" - left="210" - top="0" - width="102" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Teleport" - layout="topleft" - left="210" - name="teleport_btn" - tool_tip="Teleport to the selected area" - top="0" - width="102" /> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="button_panel_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="info_btn_lp" + user_resize="false" + auto_resize="true" + width="103"> + <button + enabled="true" + follows="bottom|left|right" + height="23" + label="Profile" + layout="topleft" + left="1" + name="info_btn" + tool_tip="Show object profile" + top="0" + width="102" /> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="share_btn_lp" + user_resize="false" + auto_resize="true" + width="102"> + <button + enabled="true" + follows="bottom|left|right" + height="23" + label="Share" + layout="topleft" + left="0" + name="share_btn" + tool_tip="Share an inventory item" + top="0" + width="102" /> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="shop_btn_lp" + user_resize="false" + auto_resize="true" + width="102"> + <button + enabled="true" + follows="bottom|left|right" + height="23" + label="Shop" + layout="topleft" + left="0" + name="shop_btn" + tool_tip="Open Marketplace webpage" + top="0" + width="102" /> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Wear" + layout="topleft" + left="0" + name="wear_btn" + tool_tip="Wear seleceted outfit" + top="0" + width="102" /> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Play" + layout="topleft" + name="play_btn" + left="0" + top="0" + width="102" /> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + left="0" + name="teleport_btn" + tool_tip="Teleport to the selected area" + top="0" + width="102" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 49b252174c..182bc29e27 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel + follows="all" height="570" layout="topleft" name="item properties" @@ -45,7 +46,7 @@ top="8" width="18" /> <button - follows="top|right" + follows="top|left" height="24" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" @@ -69,341 +70,351 @@ value="Item Profile" width="275" /> <text - follows="top|left" + follows="top|left|right" height="13" layout="topleft" left="45" name="origin" text_color="LtGray_50" + use_ellipses="true" value="(Inventory)" - width="150" /> - <panel - follows="all" - height="493" - help_topic="" - label="" - layout="topleft" - left="9" - name="item_profile" - top="45" - width="313" - background_visible="true" - bg_alpha_color="DkGray2"> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="5" - name="LabelItemNameTitle" - top="10" - width="78"> - Name: - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - height="20" - layout="topleft" - left_delta="78" - max_length="63" - name="LabelItemName" - top_delta="0" - width="225" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="5" - name="LabelItemDescTitle" - top_pad="10" - width="78"> - Description: - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - height="23" - layout="topleft" - left_delta="78" - max_length="127" - name="LabelItemDesc" - top_delta="-5" - width="225" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="5" - name="LabelCreatorTitle" - top_pad="10" - width="78"> - Creator: - </text> - <avatar_icon - follows="top|left" - height="20" - default_icon_name="Generic_Person" - layout="topleft" - left_pad="0" - top_delta="-6" - mouse_opaque="true" - width="20" /> - <text - type="string" - follows="left|right|top" - font="SansSerifSmall" - height="15" + width="275" /> + <scroll_container + color="DkGray2" + follows="all" layout="topleft" - left_pad="5" - name="LabelCreatorName" - top_delta="6" - width="140"> - </text> - <button - follows="top|right" - height="16" - image_selected="Inspector_I" - image_unselected="Inspector_I" - layout="topleft" - right="-5" - name="BtnCreator" - top_delta="-6" - width="16" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="5" - name="LabelOwnerTitle" - top_pad="10" - width="78"> - Owner: - </text> - <avatar_icon - follows="top|left" - height="20" - default_icon_name="Generic_Person" - layout="topleft" - left_pad="0" - top_delta="-6" - mouse_opaque="true" - width="20" /> - <text - type="string" - follows="left|right|top" - font="SansSerifSmall" - height="15" - layout="topleft" - left_pad="5" - name="LabelOwnerName" - top_delta="6" - width="140"> - </text> - <button - follows="top|right" - height="16" - image_selected="Inspector_I" - image_unselected="Inspector_I" - layout="topleft" - right="-5" - name="BtnOwner" - top_delta="-3" - width="16" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="5" - name="LabelAcquiredTitle" -top_pad="10" - width="78"> - Acquired: - </text> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left_delta="78" - name="LabelAcquiredDate" - top_delta="0" - width="222"> - </text> - <panel - border="false" - follows="left|top" + left="9" + name="item_profile_scroll" + opaque="true" + height="493" + width="313" + top="45"> + <panel + follows="left|top|right" + height="390" + help_topic="" + label="" + layout="topleft" + left="0" + name="item_profile" + top="0" + width="295"> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="LabelItemNameTitle" + top="10" + width="78"> + Name: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="20" + layout="topleft" + left_delta="78" + max_length="63" + name="LabelItemName" + top_delta="0" + width="210" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="LabelItemDescTitle" + top_pad="10" + width="78"> + Description: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="23" + layout="topleft" + left_delta="78" + max_length="127" + name="LabelItemDesc" + top_delta="-5" + width="210" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="LabelCreatorTitle" + top_pad="10" + width="78"> + Creator: + </text> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left_pad="0" + top_delta="-6" + mouse_opaque="true" + width="20" /> + <text + type="string" + follows="left|right|top" + font="SansSerifSmall" + height="15" layout="topleft" - mouse_opaque="false" - name="perms_inv" - left="0" - top_pad="25" - height="155" - width="313"> - <text - type="string" - length="1" - left="10" - top_pad="13" - text_color="EmphasisColor" - height="15" + left_pad="5" + name="LabelCreatorName" + top_delta="6" + width="140"> + </text> + <button + follows="top|right" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" + layout="topleft" + right="-5" + name="BtnCreator" + top_delta="-6" + width="16" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="LabelOwnerTitle" + top_pad="10" + width="78"> + Owner: + </text> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left_pad="0" + top_delta="-6" + mouse_opaque="true" + width="20" /> + <text + type="string" + follows="left|right|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="LabelOwnerName" + top_delta="6" + width="140"> + </text> + <button + follows="top|right" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" + layout="topleft" + right="-5" + name="BtnOwner" + top_delta="-3" + width="16" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="LabelAcquiredTitle" + top_pad="10" + width="78"> + Acquired: + </text> + <text + type="string" + length="1" + follows="left|top|right" + height="23" + layout="topleft" + left_delta="78" + name="LabelAcquiredDate" + top_delta="0" + width="210"> + </text> + <panel + border="false" follows="left|top|right" layout="topleft" - name="perm_modify" - width="200"> - You can: + mouse_opaque="false" + name="perms_inv" + left="0" + top_pad="25" + height="155" + width="313"> + <text + type="string" + length="1" + left="10" + top_pad="13" + text_color="EmphasisColor" + height="15" + follows="left|top|right" + layout="topleft" + name="perm_modify" + width="200"> + You can: + </text> + <check_box + height="18" + label="Modify" + layout="topleft" + left="20" + name="CheckOwnerModify" + top_pad="0" + width="90" /> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="CheckOwnerCopy" + width="90" /> + <check_box + height="18" + label="Transfer" + layout="topleft" + left_pad="0" + name="CheckOwnerTransfer" + width="106" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="AnyoneLabel" + top_pad="8" + width="100"> + Anyone: </text> - <check_box - height="18" - label="Modify" - layout="topleft" - left="20" - name="CheckOwnerModify" - top_pad="0" - width="90" /> - <check_box - height="18" - label="Copy" - layout="topleft" - left_pad="0" - name="CheckOwnerCopy" - width="90" /> - <check_box - height="18" - label="Transfer" - layout="topleft" - left_pad="0" - name="CheckOwnerTransfer" - width="106" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="AnyoneLabel" - top_pad="8" - width="100"> - Anyone: - </text> - <check_box - height="18" - label="Copy" - layout="topleft" - left_pad="0" - name="CheckEveryoneCopy" - top_delta="-2" - width="150" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="GroupLabel" - top_pad="8" - width="100"> - Group: - </text> - <check_box - height="18" - label="Share" - layout="topleft" - left_pad="0" - top_delta="-2" - name="CheckShareWithGroup" - tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." - width="150" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="NextOwnerLabel" - top_pad="8" - width="200" - word_wrap="true"> - Next owner: - </text> - <check_box - height="18" - label="Modify" - layout="topleft" - left="20" - top_pad="0" - name="CheckNextOwnerModify" - width="90" /> - <check_box - height="18" - label="Copy" - layout="topleft" - left_pad="0" - name="CheckNextOwnerCopy" - width="90" /> - <check_box - height="18" - label="Transfer" - layout="topleft" - left_pad="0" - name="CheckNextOwnerTransfer" - tool_tip="Next owner can give away or resell this object" - width="106" /> - </panel> - <check_box - height="18" - label="For Sale" - layout="topleft" - left="20" - name="CheckPurchase" - top_pad="20" - width="100" /> - <combo_box - height="23" - left_pad="0" - layout="topleft" - follows="left|top" - name="combobox sale copy" - width="170"> - <combo_box.item - label="Copy" - name="Copy" - value="Copy" /> - <combo_box.item - label="Original" - name="Original" - value="Original" /> - </combo_box> - <spinner - follows="left|top" - decimal_digits="0" - increment="1" - control_name="Edit Cost" - name="Edit Cost" - label="Price: L$" - label_width="75" - left="120" - width="170" - min_val="0" - height="23" - max_val="999999999" - top_pad="10"/> - </panel> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="CheckEveryoneCopy" + top_delta="-2" + width="150" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="GroupLabel" + top_pad="8" + width="100"> + Group: + </text> + <check_box + height="18" + label="Share" + layout="topleft" + left_pad="0" + top_delta="-2" + name="CheckShareWithGroup" + tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." + width="150" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="NextOwnerLabel" + top_pad="8" + width="200" + word_wrap="true"> + Next owner: + </text> + <check_box + height="18" + label="Modify" + layout="topleft" + left="20" + top_pad="0" + name="CheckNextOwnerModify" + width="90" /> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="CheckNextOwnerCopy" + width="90" /> + <check_box + height="18" + label="Transfer" + layout="topleft" + left_pad="0" + name="CheckNextOwnerTransfer" + tool_tip="Next owner can give away or resell this object" + width="106" /> + </panel> + <check_box + height="18" + label="For Sale" + layout="topleft" + left="20" + name="CheckPurchase" + top_pad="20" + width="100" /> + <combo_box + height="23" + left_pad="0" + layout="topleft" + follows="left|top" + name="combobox sale copy" + width="170"> + <combo_box.item + label="Copy" + name="Copy" + value="Copy" /> + <combo_box.item + label="Original" + name="Original" + value="Original" /> + </combo_box> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + control_name="Edit Cost" + name="Edit Cost" + label="Price: L$" + label_width="75" + left="120" + width="170" + min_val="0" + height="23" + max_val="999999999" + top_pad="10"/> + </panel> + </scroll_container> <panel height="30" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 676bef2d0b..3fa5c7afec 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2019,6 +2019,7 @@ Clears (deletes) the media and all params from the given face. <string name="Stomach">Stomach</string> <string name="Left Pec">Left Pec</string> <string name="Right Pec">Right Pec</string> + <string name="Invalid Attachment">Invalid Attachment Point</string> <!-- Avatar age computation, see LLDateUtil::ageFromDate --> <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string> @@ -2182,7 +2183,6 @@ Clears (deletes) the media and all params from the given face. <string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string> <string name="ATTACH_HUD_BOTTOM">HUD Bottom</string> <string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string> - <string name="Bad attachment point">Invalid Attachment Point</string> <!-- script editor --> <string name="CursorPos">Line [LINE], Column [COLUMN]</string> @@ -2225,7 +2225,7 @@ Clears (deletes) the media and all params from the given face. <!-- panel picks --> <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string> - <string name="NoAvatarPicksClassifiedsText">User has no picks or classfields</string> + <string name="NoAvatarPicksClassifiedsText">User has no picks or classifieds</string> <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> @@ -3005,6 +3005,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_default_text_label">Click here to instant message.</string> <string name="IM_to_label">To</string> <string name="IM_moderator_label">(Moderator)</string> + <string name="Saved_message">(Saved [LONG_TIMESTAMP])</string> <!-- voice calls --> <string name="answered_call">Your call has been answered</string> diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index c672f68c5c..92831cc21c 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -221,60 +221,60 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="Simulator primitive usage:"> Uso de primitivas: </text> - <text left="204" name="objects_available" width="250"> + <text name="objects_available"> [COUNT] de un máx. de [MAX] ([AVAILABLE] disponibles) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Prims que admite la parcela: </text> - <text left="204" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Prims en la parcela: </text> - <text left="204" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Del propietario de la parcela: </text> - <text left="204" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/> - <button label="Devolver" name="ReturnOwner..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOwner"/> + <button label="Devolver" name="ReturnOwner..." tool_tip="Devolver los objetos a sus propietarios."/> + <text name="Set to group:"> Del grupo: </text> - <text left="204" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> - <button label="Devolver" name="ReturnGroup..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> - <text left="14" name="Owned by others:" width="128"> + <button label="Mostrar" label_selected="Mostrar" name="ShowGroup"/> + <button label="Devolver" name="ReturnGroup..." tool_tip="Devolver los objetos a sus propietarios."/> + <text name="Owned by others:"> Propiedad de otros: </text> - <text left="204" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/> - <button label="Devolver" name="ReturnOther..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> - <text left="14" name="Selected / sat upon:" width="193"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOther"/> + <button label="Devolver" name="ReturnOther..." tool_tip="Devolver los objetos a sus propietarios."/> + <text name="Selected / sat upon:"> Seleccionados / con gente sentada: </text> - <text left="204" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Devolución automát. de objetos de otros (en min., 0 la desactiva): </text> - <line_editor name="clean other time" right="-20"/> - <text name="Object Owners:" width="150"> + <line_editor name="clean other time"/> + <text name="Object Owners:"> Propietarios de los objetos: </text> - <button label="Actualizar la lista" label_selected="Actualizar la lista" left="158" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Devolver los objetos" left="270" name="Return objects..." width="164"/> + <button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Devolver los objetos" name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> <name_list.columns label="Nombre" name="name"/> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml index fc8c908788..22f967afe6 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="Varias ventanas" name="radio" value="0"/> <radio_item label="Pestañas" name="radio2" value="1"/> </radio_group> + <check_box label="Traducir Chat" name="translate_chat_checkbox" /> + <text name="translate_language_text"> + Idioma de chat: + </text> + <combo_box name="translate_language_combobox"> + <combo_box.item name="System Default Language" label="Predeterminado del sistema" /> + <combo_box.item name="English" label="English (Inglés)" /> + <combo_box.item name="Danish" label="Dansk (Danés)" /> + <combo_box.item name="German" label="Deutsch (Alemán)" /> + <combo_box.item name="Spanish" label="Español" /> + <combo_box.item name="French" label="Français (Francés)" /> + <combo_box.item name="Italian" label="Italiano" /> + <combo_box.item name="Hungarian" label="Magyar (Húngaro)" /> + <combo_box.item name="Dutch" label="Nederlands (Neerlandés)" /> + <combo_box.item name="Polish" label="Polski (Polaco)" /> + <combo_box.item name="Portugese" label="Português (Portugués)" /> + <combo_box.item name="Russian" label="Русский (Ruso)" /> + <combo_box.item name="Turkish" label="Türkçe (Turco)" /> + <combo_box.item name="Ukrainian" label="Українська (Ucraniano)" /> + <combo_box.item name="Chinese" label="中文 (简体) (Chino)" /> + <combo_box.item name="Japanese" label="日本語 (Japonés)" /> + <combo_box.item name="Korean" label="한국어 (Coreano)" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index ca157314aa..20109cf2c5 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -13,7 +13,7 @@ <combo_box.item label="Italiano - Beta" name="Italian"/> <combo_box.item label="Nederlands (Neerlandés) - Beta" name="Dutch"/> <combo_box.item label="Polski (Polaco) - Beta" name="Polish"/> - <combo_box.item label="Portugués (Portugués) - Beta" name="Portugese"/> + <combo_box.item label="Português (Portugués) - Beta" name="Portugese"/> <combo_box.item label="日本語 (Japonés) - Beta" name="(Japanese)"/> </combo_box> <text name="language_textbox2"> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 9f5f1f99e7..a6404bf14c 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -1120,6 +1120,9 @@ <string name="InvFolder Favorite"> Favoritos </string> + <string name="InvFolder favorite"> + Favoritos + </string> <string name="InvFolder Current Outfit"> Vestuario actual </string> @@ -1657,7 +1660,7 @@ Script nuevo </string> <string name="BusyModeResponseDefault"> - El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI. + El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI. </string> <string name="NoOutfits"> Todavía no tienes vestuario. Intenta con [secondlife:///app/search/all/ Buscar] @@ -3799,7 +3802,7 @@ Denuncia de infracción PM </string> <string name="LocalEstimateUSD"> - [AMOUNT] dólares estadounidenses + [AMOUNT] US$ </string> <string name="Membership"> Membresía diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index 5263de4532..b0ef1cf8df 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -225,55 +225,55 @@ ou divisé. <text name="Simulator primitive usage:"> Utilisation des primitives : </text> - <text left="214" name="objects_available" width="230"> + <text name="objects_available"> [COUNT] sur [MAX] ([AVAILABLE] disponibles) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Prims max. sur la parcelle : </text> - <text left="214" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Prims sur la parcelle : </text> - <text left="214" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Appartenant au propriétaire : </text> - <text left="214" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/> - <button label="Retour" label_selected="Renvoyer..." name="ReturnOwner..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Afficher" label_selected="Afficher" name="ShowOwner"/> + <button label="Retour" label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires."/> + <text name="Set to group:"> Données au groupe : </text> - <text left="214" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Afficher" label_selected="Afficher" name="ShowGroup" right="-135" width="60"/> - <button label="Retour" label_selected="Renvoyer..." name="ReturnGroup..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/> - <text left="14" name="Owned by others:" width="128"> + <button label="Afficher" label_selected="Afficher" name="ShowGroup" /> + <button label="Retour" label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires."/> + <text name="Owned by others:"> Appartenant à d'autres : </text> - <text left="214" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/> - <button label="Retour" label_selected="Renvoyer..." name="ReturnOther..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/> - <text left="14" name="Selected / sat upon:" width="220"> + <button label="Afficher" label_selected="Afficher" name="ShowOther"/> + <button label="Retour" label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires."/> + <text name="Selected / sat upon:"> Sélectionnées/où quelqu'un est assis : </text> - <text left_delta="214" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Renvoi automatique des objets d'autres résidents (minutes, 0 pour désactiver) : </text> - <line_editor name="clean other time" right="-6" width="36"/> + <line_editor name="clean other time"/> <text name="Object Owners:"> Propriétaires : </text> @@ -281,10 +281,9 @@ ou divisé. <button label="Renvoi des objets" label_selected="Renvoyer les objets..." name="Return objects..."/> <name_list label="Plus récents" name="owner list"> <name_list.columns label="Type" name="type"/> - <name_list.columns name="online_status"/> - <name_list.columns label="Nom" name="name" width="100"/> - <name_list.columns label="Nombre" name="count" width="100"/> - <name_list.columns label="Plus récents" name="mostrecent" width="120"/> + <name_list.columns label="Nom" name="name"/> + <name_list.columns label="Nombre" name="count"/> + <name_list.columns label="Plus récents" name="mostrecent"/> </name_list> </panel> <panel label="OPTIONS" name="land_options_panel"> @@ -343,9 +342,9 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. Options du terrain : </text> <check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/> - <check_box bottom="-140" label="Pas de bousculades" left="14" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/> - <check_box bottom="-160" label="Afficher le lieu dans la recherche (30 L$/semaine)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/> - <combo_box bottom="-160" left="286" name="land category with adult" width="146"> + <check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/> + <check_box label="Afficher le lieu dans la recherche (30 L$/semaine)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/> + <combo_box name="land category with adult"> <combo_box.item label="Toutes catégories" name="item0"/> <combo_box.item label="Appartenant aux Lindens" name="item1"/> <combo_box.item label="Adult" name="item2"/> @@ -360,7 +359,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. <combo_box.item label="Shopping" name="item11"/> <combo_box.item label="Autre" name="item12"/> </combo_box> - <combo_box bottom="-160" left="286" name="land category" width="146"> + <combo_box name="land category"> <combo_box.item label="Toutes catégories" name="item0"/> <combo_box.item label="Appartenant aux Lindens" name="item1"/> <combo_box.item label="Art et Culture" name="item3"/> @@ -374,20 +373,20 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. <combo_box.item label="Shopping" name="item11"/> <combo_box.item label="Autre" name="item12"/> </combo_box> - <check_box bottom="-180" label="Contenu Modéré" name="MatureCheck" tool_tip=""/> - <text bottom="-200" name="Snapshot:"> + <check_box label="Contenu Modéré" name="MatureCheck" tool_tip=""/> + <text name="Snapshot:"> Photo : </text> - <texture_picker bottom="-319" label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/> <text name="landing_point"> Lieu d'arrivée : [LANDING] </text> <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain."/> <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Effacer le lieu d'arrivée"/> - <text bottom="-343" name="Teleport Routing: "> + <text name="Teleport Routing: "> Règles de téléportation : </text> - <combo_box bottom="-343" left="140" name="landing type" tool_tip="Règles de téléportation - Choisissez les règles de téléportation sur votre terrain" width="140"> + <combo_box name="landing type" tool_tip="Règles de téléportation - Choisissez les règles de téléportation sur votre terrain" width="140"> <combo_box.item label="Bloqué" name="Blocked"/> <combo_box.item label="Lieu d'arrivée fixe" name="LandingPoint"/> <combo_box.item label="Lieu d'arrivée libre" name="Anywhere"/> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml index de8d25a494..7828d2df97 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml @@ -19,7 +19,7 @@ Prévisualiser </floater.string> <floater.string name="none_text"> - -Aucun choix- + - Choisir - </floater.string> <floater.string name="Title"> Geste : [NAME] diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 6492a83e06..257c44795f 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Toucher" name="Object Touch"/> - <menu_item_call label="Éditer" name="Edit..."/> + <menu_item_call label="Toucher" name="Object Touch"> + <on_enable parameter="Toucher" name="EnableTouch"/> + </menu_item_call> + <menu_item_call label="Modifier" name="Edit..."/> <menu_item_call label="Construire" name="Build"/> <menu_item_call label="Ouvrir" name="Open"/> <menu_item_call label="M'asseoir ici" name="Object Sit"/> diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml index 1b3e1c1c90..b3ab2f4f90 100644 --- a/indra/newview/skins/default/xui/fr/panel_login.xml +++ b/indra/newview/skins/default/xui/fr/panel_login.xml @@ -20,7 +20,7 @@ <text name="start_location_text"> Lieu de départ : </text> - <combo_box name="start_location_combo" width="152"> + <combo_box name="start_location_combo"> <combo_box.item label="Dernier emplacement" name="MyLastLocation"/> <combo_box.item label="Domicile" name="MyHome"/> <combo_box.item label="<Saisir le nom de la région>" name="Typeregionname"/> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 76f3319525..ed1107f5e6 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="Plusieurs fenêtres" name="radio" value="0"/> <radio_item label="Onglets" name="radio2" value="1"/> </radio_group> + <check_box label="Traduire Chat" name="translate_chat_checkbox" /> + <text name="translate_language_text"> + Langue de chat : + </text> + <combo_box name="translate_language_combobox"> + <combo_box.item name="System Default Language" label="Choix par défaut" /> + <combo_box.item name="English" label="English (Anglais)" /> + <combo_box.item name="Danish" label="Dansk (Danois)" /> + <combo_box.item name="German" label="Deutsch (Allemand)" /> + <combo_box.item name="Spanish" label="Español (Espagnol)" /> + <combo_box.item name="French" label="Français" /> + <combo_box.item name="Italian" label="Italiano (Italien)" /> + <combo_box.item name="Hungarian" label="Magyar (Hongrois)" /> + <combo_box.item name="Dutch" label="Nederlands (Néerlandais)" /> + <combo_box.item name="Polish" label="Polski (Polonais)" /> + <combo_box.item name="Portugese" label="Português (Portugais)" /> + <combo_box.item name="Russian" label="Русский (Russe)" /> + <combo_box.item name="Turkish" label="Türkçe (Turc)" /> + <combo_box.item name="Ukrainian" label="Українська (Ukrainien)" /> + <combo_box.item name="Chinese" label="中文 (简体) (Chinois)" /> + <combo_box.item name="Japanese" label="日本語 (Japonais)" /> + <combo_box.item name="Korean" label="한국어 (Coréen)" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index 3245132972..20d5f754ce 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -13,7 +13,7 @@ <combo_box.item label="Italiano (Italien) - Bêta" name="Italian"/> <combo_box.item label="Nederlands (Néerlandais) - Bêta" name="Dutch"/> <combo_box.item label="Polski (Polonais) - Bêta" name="Polish"/> - <combo_box.item label="Portugués (Portugais) - Bêta" name="Portugese"/> + <combo_box.item label="Português (Portugais) - Bêta" name="Portugese"/> <combo_box.item label="日本語 (Japonais) - Bêta" name="(Japanese)"/> </combo_box> <text name="language_textbox2"> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 1204d3325a..159281f97f 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1062,9 +1062,9 @@ <string name="Sound" value=" Son :"/> <string name="Wait" value=" --- Attendre :"/> <string name="AnimFlagStop" value=" Arrêter l'animation :"/> - <string name="AnimFlagStart" value=" Démarrer l'animation :"/> + <string name="AnimFlagStart" value=" Lancer l'animation :"/> <string name="Wave" value=" Faire signe"/> - <string name="GestureActionNone" value="Aucune"/> + <string name="GestureActionNone" value="À choisir"/> <string name="HelloAvatar" value=" Bonjour, avatar !"/> <string name="ViewAllGestures" value=" Tout afficher >>"/> <string name="GetMoreGestures" value="Plus >>"/> @@ -1147,6 +1147,9 @@ <string name="InvFolder Favorite"> Favoris </string> + <string name="InvFolder favorite"> + Favoris + </string> <string name="InvFolder Current Outfit"> Tenue actuelle </string> diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml index af83a38746..d6834fa70a 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -224,60 +224,60 @@ o suddivisa. <text name="Simulator primitive usage:"> Uso delle primitive: </text> - <text left="214" name="objects_available" width="230"> + <text name="objects_available"> [COUNT] dei [MAX] ([AVAILABLE] dsponibili) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Oggetti che il terreno supporta: </text> - <text left="214" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Oggetti sul terreno: </text> - <text left="214" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Posseduti dal proprietario: </text> - <text left="214" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Mostra" label_selected="Mostra" name="ShowOwner" right="-135" width="60"/> - <button label="Restituisci" name="ReturnOwner..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Mostra" label_selected="Mostra" name="ShowOwner"/> + <button label="Restituisci" name="ReturnOwner..." tool_tip="Restituisci gli oggetti ai loro proprietari."/> + <text name="Set to group:"> Imposta al gruppo: </text> - <text left="214" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Mostra" label_selected="Mostra" name="ShowGroup" right="-135" width="60"/> - <button label="Restituisci" name="ReturnGroup..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> - <text left="14" name="Owned by others:" width="180"> + <button label="Mostra" label_selected="Mostra" name="ShowGroup"/> + <button label="Restituisci" name="ReturnGroup..." tool_tip="Restituisci gli oggetti ai loro proprietari."/> + <text name="Owned by others:"> Posseduti da altri: </text> - <text left="214" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Mostra" label_selected="Mostra" name="ShowOther" right="-135" width="60"/> - <button label="Restituisci" name="ReturnOther..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> - <text left="14" name="Selected / sat upon:" width="193"> + <button label="Mostra" label_selected="Mostra" name="ShowOther"/> + <button label="Restituisci" name="ReturnOther..." tool_tip="Restituisci gli oggetti ai loro proprietari."/> + <text name="Selected / sat upon:"> Selezionati / sui quali sei sopra: </text> - <text left="214" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Restituzione automatica degli oggetti di altri residenti (minuti, 0 per disattivarla): </text> - <line_editor name="clean other time" right="-20"/> - <text name="Object Owners:" width="150"> + <line_editor name="clean other time"/> + <text name="Object Owners:"> Proprietari degli oggetti: </text> - <button label="Aggiorna Elenco" label_selected="Aggiorna Elenco" left="158" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Restituisci oggetti..." label_selected="Restituisci oggetti..." left="270" name="Return objects..." width="164"/> + <button label="Aggiorna Elenco" label_selected="Aggiorna Elenco" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Restituisci oggetti..." label_selected="Restituisci oggetti..." name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> <name_list.columns label="Nome" name="name"/> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml index fb8ddf607d..d28ed41698 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="Finestre separate" name="radio" value="0"/> <radio_item label="Schede" name="radio2" value="1"/> </radio_group> + <check_box label="Traduci Chat" name="translate_chat_checkbox" /> + <text name="translate_language_text" width="110"> + Chat Lingua: + </text> + <combo_box name="translate_language_combobox" width="146"> + <combo_box.item name="System Default Language" label="Default di sistema" /> + <combo_box.item name="English" label="English" /> + <combo_box.item name="Danish" label="Dansk (Danese)" /> + <combo_box.item name="German" label="Deutsch (Tedesco)" /> + <combo_box.item name="Spanish" label="Español (Spagnolo)" /> + <combo_box.item name="French" label="Français (Francese)" /> + <combo_box.item name="Italian" label="Italiano" /> + <combo_box.item name="Hungarian" label="Magyar (Ungherese)" /> + <combo_box.item name="Dutch" label="Nederlands (Olandese)" /> + <combo_box.item name="Polish" label="Polski (Polacco)" /> + <combo_box.item name="Portugese" label="Português (Portoghese)" /> + <combo_box.item name="Russian" label="Русский (Russo)" /> + <combo_box.item name="Turkish" label="Türkçe (Turco)" /> + <combo_box.item name="Ukrainian" label="Українська (Ukraino)" /> + <combo_box.item name="Chinese" label="中文 (简体) (Cinese)" /> + <combo_box.item name="Japanese" label="日本語 (Giapponese)" /> + <combo_box.item name="Korean" label="한국어 (Coreano)" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index e8c826609c..60c4ed5211 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -13,7 +13,7 @@ <combo_box.item label="Italiano - Beta" name="Italian"/> <combo_box.item label="Nederlands (Olandese) - Beta" name="Dutch"/> <combo_box.item label="Polski (Polacco) - Beta" name="Polish"/> - <combo_box.item label="Portugués (Portoghese) - Beta" name="Portugese"/> + <combo_box.item label="Português (Portoghese) - Beta" name="Portugese"/> <combo_box.item label="日本語 (Giapponese) - Beta" name="(Japanese)"/> </combo_box> <text name="language_textbox2"> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index fb479b4653..fa465ee9c2 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -1126,6 +1126,9 @@ <string name="InvFolder Favorite"> Preferiti </string> + <string name="InvFolder favorite"> + Preferiti + </string> <string name="InvFolder Current Outfit"> Abbigliamento attuale </string> diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml index 2f5065c05f..2de9e781d4 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -109,7 +109,7 @@ <text name="For Sale: Price L$[PRICE]."> 価格： L$ [PRICE] （L$ [PRICE_PER_SQM] / 平方メートル） </text> - <button label="土地を売る" label_selected="土地を販売..." name="Sell Land..." width="100"/> + <button label="土地を売る" label_selected="土地を販売..." name="Sell Land..."/> <text name="For sale to"> 販売先：[BUYER] </text> @@ -119,7 +119,7 @@ <text name="Selling with no objects in parcel."> オブジェクトは販売しない </text> - <button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale" width="100"/> + <button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"/> <text name="Claimed:"> 取得日時： </text> @@ -210,72 +210,72 @@ </text> </panel> <panel label="オブジェクト" name="land_objects_panel"> - <panel.string left="200" name="objects_available_text"> + <panel.string name="objects_available_text"> [MAX] の内 [COUNT]（[AVAILABLE] 利用可能） </panel.string> - <panel.string left="200" name="objects_deleted_text"> + <panel.string name="objects_deleted_text"> [MAX] の内 [COUNT]（[DELETED] を削除） </panel.string> <text name="parcel_object_bonus"> オブジェクトボーナス: [BONUS] </text> - <text name="Simulator primitive usage:" width="500"> + <text name="Simulator primitive usage:"> プリム使用状況： </text> - <text left="200" name="objects_available"> + <text name="objects_available"> [MAX] の内 [COUNT] （[AVAILABLE] 利用可能） </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> 区画でサポートされるプリム数： </text> - <text left="200" name="object_contrib_text"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> 区画上のプリム数： </text> - <text left="200" name="total_objects_text"> + <text name="total_objects_text"> [COUNT] </text> - <text name="Owned by parcel owner:" width="300"> + <text name="Owned by parcel owner:"> 区画所有者の所有物： </text> - <text left="200" name="owner_objects_text"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="表示" label_selected="表示" name="ShowOwner" right="-145"/> - <button label="返却" label_selected="返却..." name="ReturnOwner..." right="-15" tool_tip="オブジェクトを所有者に返却します"/> + <button label="表示" label_selected="表示" name="ShowOwner"/> + <button label="返却" label_selected="返却..." name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します"/> <text name="Set to group:"> グループに設定： </text> - <text left="200" name="group_objects_text"> + <text name="group_objects_text"> [COUNT] </text> - <button label="表示" label_selected="表示" name="ShowGroup" right="-145"/> - <button label="返却" label_selected="返却..." name="ReturnGroup..." right="-15" tool_tip="オブジェクトを所有者に返却します"/> + <button label="表示" label_selected="表示" name="ShowGroup"/> + <button label="返却" label_selected="返却..." name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します"/> <text name="Owned by others:"> 他人の所有物： </text> - <text left="200" name="other_objects_text"> + <text name="other_objects_text"> [COUNT] </text> - <button label="表示" label_selected="表示" name="ShowOther" right="-145"/> - <button label="返却" label_selected="返却..." name="ReturnOther..." right="-15" tool_tip="オブジェクトを所有者に返却します"/> + <button label="表示" label_selected="表示" name="ShowOther"/> + <button label="返却" label_selected="返却..." name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します"/> <text name="Selected / sat upon:"> 選択済み・決定済み： </text> - <text left="200" name="selected_objects_text"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> 他人のオブジェクトを自動返却（分単位、0 で自動返却なし）： </text> - <line_editor left_delta="5" name="clean other time" right="-80"/> - <text name="Object Owners:" width="150"> + <line_editor left_delta="5" name="clean other time"/> + <text name="Object Owners:"> オブジェクトの所有者： </text> - <button label="リスト更新" label_selected="リスト更新" left="146" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/> - <button label="オブジェクトを返却する" label_selected="オブジェクトの返却..." left="256" name="Return objects..."/> + <button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/> + <button label="オブジェクトを返却する" label_selected="オブジェクトの返却..." name="Return objects..."/> <name_list label="カウント" name="owner list"> <name_list.columns label="タイプ" name="type"/> <name_list.columns name="online_status"/> diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml index 47d7a88b4c..808f19a16d 100644 --- a/indra/newview/skins/default/xui/ja/panel_login.xml +++ b/indra/newview/skins/default/xui/ja/panel_login.xml @@ -20,7 +20,7 @@ <text name="start_location_text"> 開始地点： </text> - <combo_box name="start_location_combo" width="160"> + <combo_box name="start_location_combo"> <combo_box.item label="最後にログアウトした場所" name="MyLastLocation"/> <combo_box.item label="ホーム" name="MyHome"/> <combo_box.item label="＜地域名を入力＞" name="Typeregionname"/> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index 86f880de09..4082f71a76 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="別々のウィンドウ" name="radio" value="0"/> <radio_item label="タブ" name="radio2" value="1"/> </radio_group> + <check_box label="翻訳チャット" name="translate_chat_checkbox" /> + <text name="translate_language_text"> + チャット言語: + </text> + <combo_box name="translate_language_combobox"> + <combo_box.item name="System Default Language" label="システム・デフォルト" /> + <combo_box.item name="English" label="English (英語)" /> + <combo_box.item name="Danish" label="Dansk (デンマーク語)" /> + <combo_box.item name="German" label="Deutsch (ドイツ語)" /> + <combo_box.item name="Spanish" label="Español (スペイン語)" /> + <combo_box.item name="French" label="Français (フランス語)" /> + <combo_box.item name="Italian" label="Italiano （イタリア語）" /> + <combo_box.item name="Hungarian" label="Magyar (ハンガリー語)" /> + <combo_box.item name="Dutch" label="Nederlands （オランダ語）" /> + <combo_box.item name="Polish" label="Polski (ポーランド語)" /> + <combo_box.item name="Portugese" label="Português (ポルトガル語)" /> + <combo_box.item name="Russian" label="Русский (ロシア語)" /> + <combo_box.item name="Turkish" label="Türkçe （トルコ語）" /> + <combo_box.item name="Ukrainian" label="Українська (ウクライナ語)" /> + <combo_box.item name="Chinese" label="中文 (简体) (中国語)" /> + <combo_box.item name="Japanese" label="日本語" /> + <combo_box.item name="Korean" label="한국어 (韓国語)" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index b68b68a4f8..dd59065a9d 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1147,6 +1147,9 @@ <string name="InvFolder Favorite"> お気に入り </string> + <string name="InvFolder favorite"> + お気に入り + </string> <string name="InvFolder Current Outfit"> 着用中のアウトフィット </string> diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml index 7b8f1b42ab..4271ad5b82 100644 --- a/indra/newview/skins/default/xui/nl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml @@ -147,31 +147,31 @@ <text name="region_name_lbl"> Naam: </text> - <text name="region_name_text" left="114"> + <text name="region_name_text"> leyla </text> <text name="region_landtype_lbl"> Type: </text> - <text name="region_landtype_text" left="114"> + <text name="region_landtype_text"> Mainland / Homestead </text> <text name="region_maturity_lbl"> Inhoudscategorie: </text> - <text name="region_maturity_text" left="114"> + <text name="region_maturity_text"> Adult </text> <text name="resellable_lbl"> Doorverkopen: </text> - <text name="resellable_clause" left="114"> + <text name="resellable_clause"> Land in deze regio mag niet worden doorverkocht. </text> <text name="changeable_lbl"> Opsplitsen: </text> - <text name="changeable_clause" left="114" width="340"> + <text name="changeable_clause"> Land in deze regio mag niet worden samengevoegd/opgesplitst. </text> <panel.string name="can_resell"> @@ -196,7 +196,7 @@ of opgedeeld. <text name="Simulator primitive usage:"> Simulator primitieven gebruik: </text> - <text name="objects_available" left="214" width="230"> + <text name="objects_available"> [COUNT] van [MAX] ([AVAILABLE] beschikbaar) </text> <panel.string name="objects_available_text"> @@ -205,59 +205,59 @@ of opgedeeld. <panel.string name="objects_deleted_text"> [COUNT] van [MAX] ([DELETED] zullen worden verwijderd) </panel.string> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Primitieven ondersteund door perceel: </text> - <text name="object_contrib_text" left="214" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Primitieven op perceel: </text> - <text name="total_objects_text" left="214" width="48"> + <text name="total_objects_text" > [COUNT] </text> - <text name="Owned by parcel owner:" left="14" width="180" > + <text name="Owned by parcel owner:" > Eigendom van perceeleigenaar: </text> - <text name="owner_objects_text" left="214" width="48"> + <text name="owner_objects_text" > [COUNT] </text> - <button label="Toon" label_selected="Toon" name="ShowOwner" right="-135" width="60"/> - <button label="Retourneren" name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> - <text name="Set to group:" left="14" width="180"> + <button label="Toon" label_selected="Toon" name="ShowOwner"/> + <button label="Retourneren" name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren."/> + <text name="Set to group:" > Groep toewijzen: </text> - <text name="group_objects_text" left="214" width="48"> + <text name="group_objects_text" > [COUNT] </text> - <button label="Toon" label_selected="Toon" name="ShowGroup" right="-135" width="60"/> - <button label="Retourneren" name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> - <text name="Owned by others:" left="14" width="128"> + <button label="Toon" label_selected="Toon" name="ShowGroup"/> + <button label="Retourneren" name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren."/> + <text name="Owned by others:"> Eigendom van anderen: </text> - <text name="other_objects_text" left="214" width="48"> + <text name="other_objects_text" > [COUNT] </text> - <button label="Toon" label_selected="Toon" name="ShowOther" right="-135" width="60"/> - <button label="Retourneren" name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> - <text name="Selected / sat upon:" left="14" width="193"> + <button label="Toon" label_selected="Toon" name="ShowOther"/> + <button label="Retourneren" name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren."/> + <text name="Selected / sat upon:"> Geselecteerd/Er op gezeten </text> - <text name="selected_objects_text" left="214" width="48"> + <text name="selected_objects_text" > [COUNT] </text> - <text name="Autoreturn" left="4" width="412" height="32" bottom="-196"> + <text name="Autoreturn"> Objecten van andere inwoners automatisch retourneren (minuten): (0 om uit te schakelen) </text> - <line_editor name="clean other time" right="-50" bottom="-179"/> - <text name="Object Owners:" bottom="-213"> + <line_editor name="clean other time"/> + <text name="Object Owners:"> Objecteigenaren: </text> - <button label="Ververs lijst" label_selected="Ververs lijst" name="Refresh List" bottom="-213"/> - <button label="Retourneer objecten" name="Return objects..." width="164" bottom="-213"/> - <name_list name="owner list" height="104"> + <button label="Ververs lijst" label_selected="Ververs lijst" name="Refresh List"/> + <button label="Retourneer objecten" name="Return objects..."/> + <name_list name="owner list"> <column label="Type" name="type"/> <column label="Naam" name="name"/> <column label="Aantal" name="count"/> @@ -271,20 +271,20 @@ of opgedeeld. <check_box label="Terrein bewerken" name="edit land check" tool_tip="Indien aangevinkt, kan iedereen uw terrein bewerken. Het is het beste om dit uit te laten staan, omdat u zelf altijd uw eigen land kunt bewerken."/> <check_box label="Maak landmarkering" name="check landmark"/> <check_box label="Vliegen" name="check fly" tool_tip="Indien aangevinkt, kunnen inwoners op uw land vliegen. Indien niet aangevinkt, kunnen ze alleen het land binnenvliegen of eroverheen vliegen."/> - <text name="allow_label2" left="162"> + <text name="allow_label2"> Maak objecten: </text> - <check_box label="Alle inwoners" name="edit objects check" left="275"/> + <check_box label="Alle inwoners" name="edit objects check"/> <check_box label="Groep" name="edit group objects check"/> - <text name="allow_label3" left="162"> + <text name="allow_label3"> Objecten binnenlaten: </text> - <check_box label="Alle inwoners" name="all object entry check" left="275"/> + <check_box label="Alle inwoners" name="all object entry check"/> <check_box label="Groep" name="group object entry check"/> - <text name="allow_label4" left="162"> + <text name="allow_label4"> Scripts uitvoeren: </text> - <check_box label="Alle inwoners" name="check other scripts" left="275"/> + <check_box label="Alle inwoners" name="check other scripts"/> <check_box label="Groep" name="check group scripts"/> <text name="land_options_label"> Landopties: @@ -379,8 +379,8 @@ of opgedeeld. <panel.string name="landing_point_none"> (none) </panel.string> - <button width="70" label="Instellen" label_selected="Instellen" name="Set" tool_tip="Stelt het landingspunt in waar bezoekers arriveren. Wordt ingesteld op uw avatar's positie binnen dit perceel."/> - <button width="80" left="311" label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/> + <button label="Instellen" label_selected="Instellen" name="Set" tool_tip="Stelt het landingspunt in waar bezoekers arriveren. Wordt ingesteld op uw avatar's positie binnen dit perceel."/> + <button label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/> <text name="Teleport Routing: "> Teleport routering: </text> @@ -473,8 +473,8 @@ hebt geklikt.) <combo_box.item name="Group" label="Groep" /> </combo_box> - <spinner label="Prijs in L$:" name="PriceSpin" label_width="168" width="228" /> - <spinner label="Toegangsuren" name="HoursSpin" label_width="168" width="228" /> + <spinner label="Prijs in L$:" name="PriceSpin" label_width="168" /> + <spinner label="Toegangsuren" name="HoursSpin" label_width="168" /> <text label="Altijd toestaan" name="AllowedText"> Toegestane inwoners </text> diff --git a/indra/newview/skins/default/xui/nl/floater_animation_preview.xml b/indra/newview/skins/default/xui/nl/floater_animation_preview.xml new file mode 100644 index 0000000000..f4e9908150 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_animation_preview.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview" title=""> + <text name="name_label"> + Naam: + </text> + <text name="description_label"> + Omschrijving: + </text> + <spinner label="Prioriteit" name="priority" tool_tip="Bepaalt welke andere animaties kunnen worden overschaduwd door deze animatie."/> + <check_box label="Herhalen" name="loop_check" tool_tip="Laat deze animatie herhalen."/> + <spinner label="In(%)" name="loop_in_point" tool_tip="Instellen punt in de animatie waar de herhaling begint."/> + <spinner label="Uit(%)" name="loop_out_point" tool_tip="Instellen punt in in de animatie waar de herhaling eindigt."/> + <text name="hand_label"> + Houding van Hand + </text> + <combo_box label="" left_delta="100" width="176" name="hand_pose_combo" tool_tip="Bepaalt wat handen doen tijdens een animatie." left="300"> + <combo_box.item name="Spread" label="Gespreid"/> + <combo_box.item name="Relaxed" label="Ontspannen"/> + <combo_box.item name="PointBoth" label="Wijzen Beide"/> + <combo_box.item name="Fist" label="Vuist"/> + <combo_box.item name="RelaxedLeft" label="Ontspannen Links"/> + <combo_box.item name="PointLeft" label="Wijzen Links"/> + <combo_box.item name="FistLeft" label="Vuist Links"/> + <combo_box.item name="RelaxedRight" label="Ontspannen Rechts"/> + <combo_box.item name="PointRight" label="Wijzen Rechts"/> + <combo_box.item name="FistRight" label="Vuist Rechts"/> + <combo_box.item name="SaluteRight" label="Salueren Rechts"/> + <combo_box.item name="Typing" label="Typen"/> + <combo_box.item name="PeaceRight" label="Peace Rechts"/> + </combo_box> + <text name="emote_label"> + Expressie + </text> + <combo_box label="" left_delta="100" width="176" name="emote_combo" tool_tip="Bepaalt wat het gezicht doet tijdens de animatie."> + <combo_box.item name="[None]" label="Geen]"/> + <combo_box.item name="Aaaaah" label="Aaaaah"/> + <combo_box.item name="Afraid" label="Bang"/> + <combo_box.item name="Angry" label="Boos"/> + <combo_box.item name="BigSmile" label="Brede Lach"/> + <combo_box.item name="Bored" label="Verveeld"/> + <combo_box.item name="Cry" label="Huilen"/> + <combo_box.item name="Disdain" label="Minachting"/> + <combo_box.item name="Embarrassed" label="Beschaamd"/> + <combo_box.item name="Frown" label="Frons"/> + <combo_box.item name="Kiss" label="Kus"/> + <combo_box.item name="Laugh" label="Lachen"/> + <combo_box.item name="Plllppt" label="Plllppt"/> + <combo_box.item name="Repulsed" label="Afkeer"/> + <combo_box.item name="Sad" label="Verdrietig"/> + <combo_box.item name="Shrug" label="Onverschillig"/> + <combo_box.item name="Smile" label="Glimlach"/> + <combo_box.item name="Surprise" label="Verrassing"/> + <combo_box.item name="Wink" label="Knipoog"/> + <combo_box.item name="Worry" label="Bezorgd"/> + </combo_box> + <text name="preview_label"> + Voorvertoning + </text> + <combo_box label="" left_delta="100" width="176" name="preview_base_anim" tool_tip="Gebruik dit om het gedrag van uw animatie te testen terwijl uw avatar veelvoorkomende acties uitvoert."> + <combo_box.item name="Standing" label="Staand"/> + <combo_box.item name="Walking" label="Lopend"/> + <combo_box.item name="Sitting" label="Zittend"/> + <combo_box.item name="Flying" label="Vliegend"/> + </combo_box> + <spinner label="Invloeitijd (sec)" label_width="125" name="ease_in_time" tool_tip="Hoeveelheid tijd (in seconden) waarover animaties invloeien." width="192"/> + <spinner bottom_delta="-20" label="Uitvloeitijd (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Hoeveelheid tijd (in seconden) waarover animaties uitvloeien." width="192"/> + <button bottom_delta="-32" label="" name="play_btn" tool_tip="Start/pauzeer uw animatie."/> + <button label="" name="stop_btn" tool_tip="Stop het afspelen van Uw animatie"/> + <text name="bad_animation_text"> + Niet in staat om het animatiebestand te lezen. Wij +raden u aan bestanden te gebruiken die vanuit +Poser 4 zijn geëxporteerd. + </text> + <button label="Annuleren" name="cancel_btn"/> + <button label="Upload (L$[AMOUNT])" name="ok_btn" width="140" left_delta="-155"/> + <string name="failed_to_initialize"> + Het initialiseren van de beweging is mislukt. + </string> + <string name="anim_too_long"> + het animatiebestand heeft een lengte van [LENGTH] seconden. De maximale lengte van een animatie is [MAX_LENGTH] seconden. + </string> + <string name="failed_file_read"> + Kan animatiebestand niet lezen. [STATUS] + </string> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/nl/floater_avatar_picker.xml new file mode 100644 index 0000000000..260cc8e98f --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_avatar_picker.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="avatarpicker" title="KIES INWONER"> + <tab_container name="ResidentChooserTabs"> + <panel label="Zoeken" name="SearchPanel"> + <text name="InstructSearchResidentName"> + Type een deel van de naam van de inwoner: + </text> + <button label="Zoek" label_selected="Zoek" name="Find"/> + </panel> + <panel label="Visitekaartjes" name="CallingCardsPanel"> + <text name="InstructSelectCallingCard"> + Selecteer een visitekaartje: + </text> + </panel> + <panel label="In mijn buurt" name="NearMePanel"> + <text name="InstructSelectResident"> + Selecteer een inwoner +in de buurt: + </text> + <button label="Vernieuw lijst" label_selected="Ververs lijst" name="Refresh"/> + <slider label="Afstand" name="near_me_range" bottom_delta="-36"/> + <text name="meters"> + Meters + </text> + <scroll_list bottom_delta="-169" height="159" name="NearMe" /> + </panel> + </tab_container> + <button label="Selecteer" label_selected="Selecteer" name="Select"/> + <button label="Annuleren" label_selected="Annuleren" name="Cancel"/> + <string name="not_found"> + '[TEXT]' niet gevonden + </string> + <string name="no_one_near"> + Niemand in de buurt + </string> + <string name="no_results"> + Geen resultaten + </string> + <string name="searching"> + Zoeken... + </string> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/nl/floater_avatar_textures.xml new file mode 100644 index 0000000000..a44db95b5b --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_avatar_textures.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="avatar_texture_debug" title="AVATAR TEXTUREN"> + <text name="baked_label"> + Baked texturen + </text> + <text name="composite_label"> + Samengestelde texturen + </text> + <texture_picker label="Hoofd" name="baked_head"/> + <texture_picker label="Make-up" name="head_bodypaint"/> + <texture_picker label="Haar" name="hair"/> + <button label="Dump" label_selected="Dump" name="Dump"/> + <texture_picker label="Ogen" name="baked_eyes"/> + <texture_picker label="Oog" name="eye_texture"/> + <texture_picker label="Bovenlichaam" name="baked_upper_body"/> + <texture_picker label="Bovenlichaam tatoeage" name="upper_bodypaint"/> + <texture_picker label="Onderhemd" name="undershirt"/> + <texture_picker label="Handschoenen" name="gloves"/> + <texture_picker label="Hemd" name="shirt"/> + <texture_picker label="Bovenkant jas" name="upper_jacket"/> + <texture_picker label="Onderlichaam" name="baked_lower_body"/> + <texture_picker label="Onderlichaam tatoeage" name="lower_bodypaint"/> + <texture_picker label="Onderbroek" name="underpants"/> + <texture_picker label="Sokken" name="socks"/> + <texture_picker label="Schoenen" name="shoes"/> + <texture_picker label="Broek" name="pants"/> + <texture_picker label="Jas" name="jacket"/> + <texture_picker label="Rok" name="baked_skirt"/> + <texture_picker label="Rok" name="skirt_texture"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_build_options.xml b/indra/newview/skins/default/xui/nl/floater_build_options.xml new file mode 100644 index 0000000000..53b60167bb --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_build_options.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="build options floater" title="GRID OPTIES"> + <spinner label="Grid eenheid (meters)" name="GridResolution" width="180" label_width="122"/> + <spinner label="Grid extensies (meters)" name="GridDrawSize" width="180" label_width="122"/> + <check_box label="Sub-eenheid snap Inschakelen" name="GridSubUnit"/> + <check_box label="Toon dwarsdoorsnede" name="GridCrossSection"/> + <slider label="Grid opaakheid" name="GridOpacity"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml new file mode 100644 index 0000000000..1f3e045a75 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Day Cycle Floater" title="DAGCYCLUS EDITOR"> + <tab_container name="Day Cycle Tabs"> + <panel label="Dagcyclus" name="Day Cycle"> + <button label="?" name="WLDayCycleHelp"/> + <text name="WL12am"> + 0:00 + </text> + <text name="WL3am"> + 3:00 + </text> + <text name="WL6am"> + 6:00 + </text> + <text name="WL9amHash"> + 9:00 + </text> + <text name="WL12pmHash"> + 12:00 + </text> + <text name="WL3pm"> + 15:00 + </text> + <text name="WL6pm"> + 18:00 + </text> + <text name="WL9pm"> + 21:00 + </text> + <text name="WL12am2"> + 0:00 + </text> + <text name="WL12amHash"> + | + </text> + <text name="WL3amHash"> + I + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL9amHash2"> + I + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL3pmHash"> + I + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL9pmHash"> + I + </text> + <text name="WL12amHash2"> + | + </text> + <button label="Key toevoegen" label_selected="Key toevoegen" name="WLAddKey"/> + <button label="Key verwijderen" label_selected="Key verwijderen" name="WLDeleteKey"/> + <text name="WLCurKeyFrameText"> + Gemarkeerde frame instelling: + </text> + <text name="WLCurKeyTimeText"> + Markering tijd: + </text> + <spinner label="Uur" name="WLCurKeyHour"/> + <spinner label="Min" name="WLCurKeyMin"/> + <text name="WLCurKeyTimeText2"> + Markering voorinstelling: + </text> + <combo_box label="Voorinstelling" name="WLKeyPresets"/> + <text name="DayCycleText"> + Snap: + </text> + <combo_box label="5 min" name="WLSnapOptions"/> + <text name="DayCycleText2"> + Lengte van cyclus: + </text> + <spinner label="Uur" name="WLLengthOfDayHour"/> + <spinner label="Min" name="WLLengthOfDayMin"/> + <spinner label="Sec" name="WLLengthOfDaySec"/> + <text name="DayCycleText3"> + Voorbeeld: + </text> + <button label="Afspelen" label_selected="Afspelen" name="WLAnimSky"/> + <button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/> + <button label="Gebruik estatetijd" label_selected="Ga naar Estate tijd" name="WLUseLindenTime"/> + <button label="Opslaan testdag" label_selected="Opslaan testdag" name="WLSaveDayCycle"/> + <button label="Laad testdag" label_selected="Laad testdag" name="WLLoadDayCycle"/> + </panel> + </tab_container> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/nl/floater_hardware_settings.xml new file mode 100644 index 0000000000..b27a96f15c --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_hardware_settings.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Hardware Settings Floater" title="HARDWARE INSTELLINGEN"> + <text name="Filtering:"> + Filtering: + </text> + <check_box label="Anisotropische filtering (langzamer indien ingeschakeld)" name="ani" left="100"/> + <text name="Antialiasing:"> + Anti-alias: + </text> + <combo_box label="Anti-alias" name="fsaa" width="120" left="100"> + <combo_box.item name="FSAADisabled" label="Uitgeschakeld"/> + <combo_box.item name="2x" label="2x"/> + <combo_box.item name="4x" label="4x"/> + <combo_box.item name="8x" label="8x"/> + <combo_box.item name="16x" label="16x"/> + </combo_box> + <spinner label="Gamma:" name="gamma" label_width="88" width="170"/> + <text name="(brightness, lower is brighter)" left="182"> + (helderheid, lager is helderder, 0=gebruik standaardwaarde) + </text> + <text name="Enable VBO:"> + VBO inschakelen: + </text> + <check_box label="OpenGL Vertex Buffer Objects inschakelen" name="vbo" tool_tip="Dit inschakelen op moderne hardware geeft een prestatiewinst. Oudere hardware heeft echter vaak een slechte implementatie van VBO's en u kunt crashes ondervinden wanneer dit is ingeschakeld."/> + <slider label="Textuurgeheugen (MB):" name="GrapicsCardTextureMemory" tool_tip="Hoeveelheid geheugen dat voor texturen toegewezen wordt. Standaard wordt de hoeveelheid geheugen van de videokaart gebruikt. Het verminderen van deze waarde kan de prestaties verbeteren, maar kan ook texturen wazig maken."/> + <spinner label="Mistafstandsratio:" name="fog"/> + <button label="OK" label_selected="OK" name="OK"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_image_preview.xml b/indra/newview/skins/default/xui/nl/floater_image_preview.xml new file mode 100644 index 0000000000..06596c20aa --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_image_preview.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Image Preview" title=""> + <text name="name_label"> + Naam: + </text> + <text name="description_label"> + Omschrijving: + </text> + <text name="preview_label"> + Toon voorbeeld van +afbeelding als: + </text> + <combo_box label="Kledingtype" name="clothing_type_combo"> + <combo_box.item name="Image" label="Afbeelding"/> + <combo_box.item name="Hair" label="Haar"/> + <combo_box.item name="FemaleHead" label="Vrouwelijk hoofd"/> + <combo_box.item name="FemaleUpperBody" label="Vrouwelijk bovenlichaam"/> + <combo_box.item name="FemaleLowerBody" label="Vrouwelijk onderlichaam"/> + <combo_box.item name="MaleHead" label="Mannelijk hoofd"/> + <combo_box.item name="MaleUpperBody" label="Mannelijk onderlichaam"/> + <combo_box.item name="MaleLowerBody" label="Mannelijk bovenlichaam"/> + <combo_box.item name="Skirt" label="Rok"/> + <combo_box.item name="SculptedPrim" label="Sculpted prim"/> + </combo_box> + <text name="bad_image_text"> + Kan afbeelding niet lezen. + +Probeer het op te slaan als een 24 bit Targa (.tga). + </text> + <check_box label="Gebruik verliesloze compressie" name="lossless_check"/> + <button label="Annuleren" name="cancel_btn"/> + <button label="Upload (L$[AMOUNT])" name="ok_btn" width="140"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml new file mode 100644 index 0000000000..63cfafab81 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="item properties" title="INVENTARISITEM EIGENSCHAPPEN"> + <text name="LabelItemNameTitle"> + Naam: + </text> + <text name="LabelItemDescTitle"> + Omschrijving: + </text> + <text name="LabelCreatorTitle"> + Maker: + </text> + <text name="LabelCreatorName"> + Nicole Linden + </text> + <button label="Profiel..." label_selected="" name="BtnCreator"/> + <text name="LabelOwnerTitle"> + Eigenaar + </text> + <text name="LabelOwnerName"> + Thrax Linden + </text> + <button label="Profiel..." label_selected="" name="BtnOwner"/> + <text name="LabelAcquiredTitle"> + Verworven: + </text> + <text name="LabelAcquiredDate"> + Wed May 24 12:50:46 2006 + </text> + <text name="OwnerLabel"> + U kunt: + </text> + <check_box label="Wijzigen" name="CheckOwnerModify"/> + <check_box label="Kopiëren" name="CheckOwnerCopy"/> + <check_box label="Doorverkopen/weggeven" name="CheckOwnerTransfer"/> + <text name="BaseMaskDebug"> + B: + </text> + <text name="OwnerMaskDebug"> + E: + </text> + <text name="GroupMaskDebug"> + G: + </text> + <text name="EveryoneMaskDebug"> + I: + </text> + <text name="NextMaskDebug"> + V: + </text> + <check_box label="Delen met groep" name="CheckShareWithGroup"/> + <check_box label="Iedereen mag kopiëren" name="CheckEveryoneCopy"/> + <text name="NextOwnerLabel" width="130"> + Volgende eigenaar kan: + </text> + <check_box label="Wijzigen" name="CheckNextOwnerModify"/> + <check_box label="Kopiëren" name="CheckNextOwnerCopy"/> + <check_box label="Doorverkopen/weggeven" name="CheckNextOwnerTransfer"/> + <text name="SaleLabel"> + Markeer item: + </text> + <check_box label="Te koop" name="CheckPurchase"/> + <radio_group name="RadioSaleType"> + <radio_item name="radio" label="Origineel" /> + <radio_item name="radio2" label="Kopiëren" /> + </radio_group> + <text name="TextPrice"> + Prijs: L$ + </text> + <string name="unknown"> + (onbekend) + </string> + <string name="public"> + (public) + </string> + <string name="you_can"> + U kunt: + </string> + <string name="owner_can"> + Eigenaar kan: + </string> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/nl/floater_inventory_view_finder.xml new file mode 100644 index 0000000000..097ebda8b7 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_inventory_view_finder.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Inventory Finder" title="INVENTORY_RECENT_ITEMS"> + <check_box label="Animatie" name="check_animation"/> + <check_box label="Visitekaartjes" name="check_calling_card"/> + <check_box label="Kleding" name="check_clothing"/> + <check_box label="Gebaren" name="check_gesture"/> + <check_box label="Landmarkeringen" name="check_landmark"/> + <check_box label="Notitiekaarten" name="check_notecard"/> + <check_box label="Objecten" name="check_object"/> + <check_box label="Scripts" name="check_script"/> + <check_box label="Geluiden" name="check_sound"/> + <check_box label="Texturen" name="check_texture"/> + <check_box label="Foto's" name="check_snapshot"/> + <button label="Alles" label_selected="Alles" name="All"/> + <button label="Geen" label_selected="Geen" name="None"/> + <check_box label="Altijd mappen tonen" name="check_show_empty"/> + <check_box label="Sinds logoff" name="check_since_logoff"/> + <text name="- OR -"> + - OF - + </text> + <spinner label="Uren geleden" name="spin_hours_ago" width="144" label_width="80"/> + <spinner label="Dagen geleden" name="spin_days_ago" width="144" label_width="80"/> + <button label="Sluiten" label_selected="Sluiten" name="Close"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_land_holdings.xml b/indra/newview/skins/default/xui/nl/floater_land_holdings.xml new file mode 100644 index 0000000000..5cf66ed0c4 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_land_holdings.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="land holdings floater" title="MIJN LAND"> + <scroll_list name="parcel list"> + <column label="Perceelnaam" name="name"/> + <column label="Regio" name="location"/> + <column label="Type" name="type"/> + <column label="Gebied" name="area"/> + </scroll_list> + <button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleport naar het centrum van dit land."/> + <button label="Toon op kaart" label_selected="Toon op kaart" name="Show on Map" tool_tip="Toon dit land op de wereldkaart"/> + <text name="contrib_label"> + Bijdragen aan uw groepen: + </text> + <scroll_list name="grant list"> + <column label="Groep" name="group"/> + <column label="Gebied" name="area"/> + </scroll_list> + <text name="allowed_label"> + Toegestane landbezittingen in het huidige betaalschema: + </text> + <text name="allowed_text"> + [AREA] m² + </text> + <text name="current_label"> + Huidige landbezittingen: + </text> + <text name="current_text"> + [AREA] m² + </text> + <text name="available_label"> + Beschikbaar voor landaankopen: + </text> + <text name="available_text"> + [AREA] m² + </text> + <string name="area_string"> + [AREA] m² + </string> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/nl/floater_live_lsleditor.xml new file mode 100644 index 0000000000..98a0362ce1 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_live_lsleditor.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="script ed float" title="SCRIPT: NIEUW SCRIPT"> + <button label="Herstarten" label_selected="Herstarten" name="Reset"/> + <check_box label="Uitvoeren" name="running" left="4"/> + <check_box label="Mono" name="mono"/> + <string name="not_allowed"> + U bent niet bevoegd om dit script in te zien + </string> + <string name="script_running"> + Uitvoeren + </string> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_media_browser.xml b/indra/newview/skins/default/xui/nl/floater_media_browser.xml new file mode 100644 index 0000000000..12f693bf33 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_media_browser.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_about" title="MEDIA VERKENNER"> + <layout_stack name="stack1"> + <layout_panel name="nav_controls"> + <button label="Terug" name="back"/> + <button label="Vooruit" name="forward"/> + <button label="Herladen" name="reload"/> + <button label="Ga" name="go"/> + </layout_panel> + <layout_panel name="parcel_owner_controls"> + <button label="Stuur huidige URL naar perceel" name="assign"/> + </layout_panel> + <layout_panel name="external_controls"> + <button label="Open in mijn webbrowser" name="open_browser"/> + <check_box label="Altijd in mijn webbrowser openen" name="open_always"/> + <button label="Sluiten" name="close"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_preview_animation.xml b/indra/newview/skins/default/xui/nl/floater_preview_animation.xml new file mode 100644 index 0000000000..0634452d96 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_preview_animation.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_anim"> + <text name="desc txt"> + Omschrijving: + </text> + <button label="Afspelen in wereld" label_selected="Stop" name="Anim play btn" tool_tip="Speel deze animatie af, zodat anderen hem kunnen zien." width="120"/> + <button label="Lokaal afspelen" label_selected="Stop" name="Anim audition btn" tool_tip="Speel deze animatie af, zodat alleen u hem kunt zien." width="110"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/nl/floater_preview_gesture.xml new file mode 100644 index 0000000000..7dd85460a2 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_preview_gesture.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="gesture_preview"> + <string name="stop_txt"> + Stop + </string> + <string name="preview_txt"> + Voorbeeld + </string> + <string name="none_text"> + -- Geen -- + </string> + <text name="desc_label"> + Omschrijving: + </text> + <text name="trigger_label"> + Trigger: + </text> + <text name="replace_text" tool_tip="Vervang de startseinwoorden door deze woorden. Bijvoorbeeld, startsein 'hallo' vervang door 'hoi' zal de chat 'Ik wilde hallo zeggen' veranderen in 'Ik wilde hoi zeggen', waarbij tevens het gebaar afgespeeld zal worden!" left="208"> + Vervangen door: + </text> + <line_editor name="replace_editor" tool_tip="Vervang de startseinwoorden door deze woorden. Bijvoorbeeld, startsein 'hallo' vervang door 'hoi' zal de chat 'Ik wilde hallo zeggen' veranderen in 'Ik wilde hoi zeggen', waarbij tevens het gebaar afgespeeld zal worden."/> + <text name="key_label"> + Snelkoppeling toets: + </text> + <combo_box label="Geen" name="modifier_combo" left="136" width="56"/> + <combo_box label="Geen" name="key_combo" width="56"/> + <text name="library_label"> + Bibliotheek: + </text> + <text name="steps_label"> + Stappen: + </text> + <scroll_list name="library_list" width="94"> + Animatie +Geluid +Chat +Wacht + </scroll_list> + <button label="Toevoegen >>" name="add_btn" left="124" width="87"/> + <button label="Beweeg omhoog" name="up_btn" width="106" left_delta="-9"/> + <button label="Beweeg omlaag" name="down_btn" width="106"/> + <button label="Verwijderen" name="delete_btn" width="84" left_delta="9"/> + <scroll_list left="226" name="step_list" width="205" /> + <text name="help_label"> + Alle stappen gebeuren tegelijkertijd, +tenzij u wachtstappen toevoegt. + </text> + <text left="230" name="options_text" width="200" /> + <radio_group name="animation_trigger_type"> + <radio_item name="start" label="Start" /> + <radio_item name="stop" label="Stop" /> + </radio_group> + <check_box label="tot alle animaties zijn afgelopen" name="wait_anim_check"/> + <check_box label="tijd in seconden" name="wait_time_check"/> + <check_box label="Actief" name="active_check" tool_tip="Actieve gebaren kunnen worden gestart door het zeggen van hun startseinwoorden of door het indrukken van hun sneltoetsen. Gebaren worden gewoonlijk inactief wanneer er een conflict is in de koppeling van de sneltoetsen"/> + <button label="Voorbeeld" name="preview_btn"/> + <button label="Opslaan" name="save_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/nl/floater_preview_notecard.xml new file mode 100644 index 0000000000..f97d1fe6ba --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_preview_notecard.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview notecard" title="NEUS"> + <button label="Opslaan" label_selected="Opslaan" name="Save"/> + <text name="desc txt"> + Omschrijving: + </text> + <text_editor name="Notecard Editor"> + Laden… + </text_editor> + <string name="no_object"> + Kan object dat deze notitie bevat niet vinden. + </string> + <string name="not_allowed"> + U heeft geen toestemming om deze notitie te bekijken + </string> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_preview_sound.xml b/indra/newview/skins/default/xui/nl/floater_preview_sound.xml new file mode 100644 index 0000000000..f168f3ed32 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_preview_sound.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_sound"> + <text name="desc txt"> + Omschrijving: + </text> + <button label="Lokaal afspelen" label_selected="Lokaal afspelen" name="Sound audition btn" tool_tip="Speel dit geluid of zodat alleen u het kunt horen."/> + <button label="In wereld afspelen" label_selected="In wereld afspelen" name="Sound play btn" tool_tip="Speel dit geluid of zodat anderen het kunnen horen."/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_preview_texture.xml b/indra/newview/skins/default/xui/nl/floater_preview_texture.xml new file mode 100644 index 0000000000..c4a06b7b6f --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_preview_texture.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_texture"> + <text name="desc txt"> + Omschrijving: + </text> + <text name="dimensions"> + Afmetingen: [WIDTH] x [HEIGHT] + </text> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_script_preview.xml b/indra/newview/skins/default/xui/nl/floater_script_preview.xml new file mode 100644 index 0000000000..bd57e27b77 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_script_preview.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview lsl text" title="SCRIPT: ROTATIESCRIPT"> + <text name="desc txt"> + Omschrijving: + </text> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_script_search.xml b/indra/newview/skins/default/xui/nl/floater_script_search.xml new file mode 100644 index 0000000000..cf502c6f4d --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_script_search.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="script search" title="SCRIPT ZOEKEN"> + <check_box label="Niet hoofdlettergevoelig" name="case_text"/> + <button label="Zoeken" label_selected="Zoeken" name="search_btn" left="4"/> + <button label="Vervangen" label_selected="Vervangen" name="replace_btn" left="100"/> + <button label="Alles vervangen" label_selected="Alles vervangen" name="replace_all_btn" width="100" left="196"/> + <text name="txt"> + Zoeken + </text> + <text name="txt2" width="130"> + Vervangen + </text> + <line_editor left="65" name="search_text" width="230" /> + <line_editor left="65" name="replace_text" width="230" /> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_settings_debug.xml b/indra/newview/skins/default/xui/nl/floater_settings_debug.xml new file mode 100644 index 0000000000..4d95f0a828 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_settings_debug.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings_debug" title="DEBUG INSTELLINGEN"> + <combo_box name="boolean_combo"> + <combo_box.item name="TRUE" label="TRUE"/> + <combo_box.item name="FALSE" label="FALSE"/> + </combo_box> + <color_swatch label="Kleur" name="color_swatch"/> + <spinner label="x" name="val_spinner_1"/> + <spinner label="x" name="val_spinner_2"/> + <spinner label="x" name="val_spinner_3"/> + <spinner label="x" name="val_spinner_4"/> + <button label="Opnieuw instellen naar standaard" name="default_btn" width="210"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_sound_preview.xml b/indra/newview/skins/default/xui/nl/floater_sound_preview.xml new file mode 100644 index 0000000000..13cb832d57 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_sound_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Sound Preview" title="SOUND.WAV"> + <text name="name_label"> + Naam: + </text> + <text name="description_label"> + Omschrijving: + </text> + <button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/> + <button label="Upload (L$[AMOUNT])" label_selected="Upload (L$[AMOUNT])" name="ok_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml new file mode 100644 index 0000000000..d97c9679a9 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml @@ -0,0 +1,192 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="WindLight floater" title="GEAVANCEERDE LUCHT EDITOR"> + <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18" + left_delta="116" max_chars="20" mouse_opaque="true" name="WLPresetsCombo" + width="150" /> + <text name="KeyFramePresetsText"> + Lucht voorinstellingen + </text> + <button label="Nieuw" label_selected="Nieuw" name="WLNewPreset"/> + <button label="Opslaan" label_selected="Opslaan" name="WLSavePreset"/> + <button label="Verwijderen" label_selected="Verwijderen" name="WLDeletePreset" width="80"/> + <button label="Dag cyclus editor" label_selected="Dag cyclus editor" name="WLDayCycleMenuButton"/> + <tab_container name="WindLight Tabs"> + <panel label="Atmosfeer" name="Atmosphere"> + <text name="BHText"> + Blauw Horizon + </text> + <button label="?" name="WLBlueHorizonHelp"/> + <text name="BHText2"> + R + </text> + <text name="BHText3"> + G + </text> + <text name="BHText4"> + B + </text> + <text name="BHText5"> + I + </text> + <text name="BDensText"> + Nevel horizon + </text> + <button label="?" name="WLHazeHorizonHelp"/> + <text name="BDensText2"> + Blauw dichtheid + </text> + <button label="?" name="WLBlueDensityHelp"/> + <text name="BHText6"> + R + </text> + <text name="BHText7"> + G + </text> + <text name="BHText8"> + B + </text> + <text name="BHText9"> + I + </text> + <text name="HDText"> + Nevel dichtheid + </text> + <button label="?" name="WLHazeDensityHelp"/> + <text name="DensMultText"> + Dichtheidsfactor + </text> + <button label="?" name="WLDensityMultHelp"/> + <text name="WLDistanceMultText"> + Afstandsfactor + </text> + <button label="?" name="WLDistanceMultHelp"/> + <text name="MaxAltText"> + Max hoogte + </text> + <button label="?" name="WLMaxAltitudeHelp"/> + </panel> + <panel label="Licht" name="Lighting"> + <text name="SLCText"> + Zon/maan kleur + </text> + <button label="?" name="WLSunlightColorHelp"/> + <text name="BHText"> + R + </text> + <text name="BHText2"> + G + </text> + <text name="BHText3"> + B + </text> + <text name="BHText4"> + I + </text> + <text name="TODText"> + Zon/maan positie + </text> + <button label="?" name="WLTimeOfDayHelp"/> + <text name="WLAmbientText"> + Omgeving + </text> + <button label="?" name="WLAmbientHelp"/> + <text name="BHText5"> + R + </text> + <text name="BHText6"> + G + </text> + <text name="BHText7"> + B + </text> + <text name="BHText8"> + I + </text> + <text name="WLEastAngleText"> + Oosthoek + </text> + <button label="?" name="WLEastAngleHelp"/> + <text name="SunGlowText"> + Zonnegloed + </text> + <button label="?" name="WLSunGlowHelp"/> + <slider label="Focus " name="WLGlowB"/> + <slider label="Grootte" name="WLGlowR"/> + <text name="SceneGammaText"> + Scenegamma + </text> + <button label="?" name="WLSceneGammaHelp"/> + <text name="WLStarText"> + Ster helderheid + </text> + <button label="?" name="WLStarBrightnessHelp"/> + </panel> + <panel label="Wolken" name="Clouds"> + <text name="WLCloudColorText"> + Wolkenkleur + </text> + <button label="?" name="WLCloudColorHelp"/> + <text name="BHText"> + R + </text> + <text name="BHText2"> + G + </text> + <text name="BHText3"> + B + </text> + <text name="BHText4"> + I + </text> + <text name="WLCloudColorText2"> + Wolken (XY/Dichtheid) + </text> + <button label="?" name="WLCloudDensityHelp"/> + <text name="BHText5"> + X + </text> + <text name="BHText6"> + Y + </text> + <text name="BHText7"> + D + </text> + <text name="WLCloudCoverageText"> + Wolkenbedekking + </text> + <button label="?" name="WLCloudCoverageHelp"/> + <text name="WLCloudScaleText"> + Wolkenschaal + </text> + <button label="?" name="WLCloudScaleHelp"/> + <text name="WLCloudDetailText"> + Wolkendetail (XY/Dichtheid) + </text> + <button label="?" name="WLCloudDetailHelp" left="404"/> + <text name="BHText8"> + X + </text> + <text name="BHText9"> + Y + </text> + <text name="BHText10"> + D + </text> + <text name="WLCloudScrollXText"> + Wolk verplaatsing X + </text> + <button label="?" name="WLCloudScrollXHelp" left="600"/> + <check_box label="Vastzetten" name="WLCloudLockX" left="622"/> + <text name="WLCloudScrollYText"> + Wolk verplaatsing Y + </text> + <button label="?" name="WLCloudScrollYHelp" left="600"/> + <check_box label="Vastzetten" name="WLCloudLockY" left="622"/> + <check_box label="Teken klassieke wolken" name="DrawClassicClouds"/> + <button label="?" name="WLClassicCloudsHelp" left="620"/> + </panel> + </tab_container> + <string name="WLDefaultSkyNames"> + A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality + </string> +</floater> diff --git a/indra/newview/skins/default/xui/nl/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/nl/menu_places_gear_landmark.xml new file mode 100644 index 0000000000..dab5a388d7 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/menu_places_gear_landmark.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_ladmark_gear"> + <menu_item_call label="Teleport" name="teleport"/> + <menu_item_call label="Meer Informatie" name="more_info"/> + <menu_item_call label="Toon op Kaart" name="show_on_map"/> + <menu_item_call label="Voeg Landmark Toe" name="add_landmark"/> + <menu_item_call label="Voeg Map Toe" name="add_folder"/> + <menu_item_call label="Knippen" name="cut"/> + <menu_item_call label="Kopieër Landmark" name="copy_landmark"/> + <menu_item_call label="Kopieër SLurl" name="copy_slurl"/> + <menu_item_call label="Plakken" name="paste"/> + <menu_item_call label="Hernoemen" name="rename"/> + <menu_item_call label="Verweideren" name="delete"/> + <menu_item_call label="Alle mappen uitvouwen" name="expand_all"/> + <menu_item_call label="Alle mappen samenvouwen" name="collapse_all"/> + <menu_item_check label="Sorteer bij Datum" name="sort_by_date"/> + <menu_item_call label="Maak Favoriet" name="create_pick"/> +</menu> diff --git a/indra/newview/skins/default/xui/nl/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/nl/panel_block_list_sidetray.xml new file mode 100644 index 0000000000..38018a3626 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_block_list_sidetray.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="block_list_panel"> + <text name="title_text"> + Blokkeer Lijst + </text> + <scroll_list name="blocked" tool_tip="Lijst van momenteel geblokkeerde bewoners"/> + <button label="Blokkeer Bewoner..." label_selected="Blokkeer Bewoner..." name="Block resident..." tool_tip="Kies een bewoner om te blokkeren"/> + <button label="Blokkeer object bij naam..." label_selected="Blokkeer object bij naam..." name="Block object by name..."/> + <button label="Deblokkeren" label_selected="Deblokkeren" name="Unblock" tool_tip="Verweider bewoner of object uit blokkeer lijst"/> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_group_land_money.xml b/indra/newview/skins/default/xui/nl/panel_group_land_money.xml new file mode 100644 index 0000000000..43babafdf8 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_group_land_money.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Land & L$" name="land_money_tab"> + <string name="help_text"> + Percelen in groepseigendom worden getoond, samen met bijdragedetails. Een waarschuwing verschijnt totdat Totaal Land In Gebruik minder dan of gelijk aan de totale bijdrage is. De Planning, Details en Verkopen tabbladen verschaffen meer informatie over de financiën van de groep. + </string> + <button label="?" name="help_button"/> + <string name="cant_view_group_land_text"> + U heeft geen permissie om land te bekijken dat eigendom van de groep is. + </string> + <string name="cant_view_group_accounting_text"> + U heeft geen permissie om accounting informatie van de groep te bekijken. + </string> + <string name="loading_txt"> + Laden... + </string> + <text name="group_land_heading" width="260"> + Land in eigendom van groep + </text> + <scroll_list name="group_parcel_list"> + <column label="Perceelnaam" name="name"/> + <column label="Regio" name="location"/> + <column label="Type" name="type"/> + <column label="Gebied" name="area"/> + </scroll_list> + <button label="Toon op kaart" label_selected="Toon op kaart" name="map_button"/> + <text name="total_contributed_land_label"> + Totale bijdrage: + </text> + <text name="total_contributed_land_value" width="200"> + [AREA] m² + </text> + <text name="total_land_in_use_label"> + Totaal land in gebruik: + </text> + <text name="total_land_in_use_value"> + [AREA] m² + </text> + <text name="land_available_label"> + Land beschikbaar: + </text> + <text name="land_available_value"> + [AREA] m² + </text> + <text name="your_contribution_label"> + Uw bijdrage: + </text> + <string name="land_contrib_error"> + Niet in staat uw landbijdrage in te stellen. + </string> + <text name="your_contribution_units"> + ( m² ) + </text> + <text name="your_contribution_max_value"> + ([AMOUNT] max) + </text> + <text name="group_over_limit_text"> + Groepsleden moeten landcredits bijdragen om het gebruikte land +te ondersteunen. + </text> + <text name="group_money_heading"> + Groep L$ + </text> + <tab_container name="group_money_tab_container"> + <panel label="Planning" name="group_money_planning_tab"> + <text_editor name="group_money_planning_text"> + Berekenen... + </text_editor> + </panel> + <panel label="Details" name="group_money_details_tab"> + <text_editor name="group_money_details_text"> + Berekenen... + </text_editor> + <button label="< Eerder" label_selected="< Eerder" name="earlier_details_button" tool_tip="Ga terug in de tijd"/> + <button label="Later >" label_selected="Later >" name="later_details_button" tool_tip="Ga vooruit in de tijd"/> + </panel> + <panel label="Verkopen" name="group_money_sales_tab"> + <text_editor name="group_money_sales_text"> + Berekenen... + </text_editor> + <button label="< Eerder" label_selected="< Eerder" name="earlier_sales_button" tool_tip="Ga terug in de tijd"/> + <button label="Later >" label_selected="Later >" name="later_sales_button" tool_tip="Ga vooruit in de tijd"/> + </panel> + </tab_container> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/nl/panel_preferences_advanced.xml new file mode 100644 index 0000000000..6626c57472 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_advanced.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <panel.string name="resolution_format"> + [RES_X] x [RES_Y] + </panel.string> + <panel.string name="aspect_ratio_text"> + [NUM]:[DEN] + </panel.string> + <check_box label="Bubble chat" name="bubble_text_chat"/> + <color_swatch name="background" tool_tip="Kies kleur voor bubble chat"/> + <slider label="Opaciteit" name="bubble_chat_opacity"/> + <text name="AspectRatioLabel1" tool_tip="breedte / hoogte"> + Beeldverhouding + </text> + <combo_box name="aspect_ratio" tool_tip="breedte / hoogte"> + <combo_box.item label="4:3 (Standaard beeldbuis)" name="item1"/> + <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (Breedbeeld)" name="item3"/> + <combo_box.item label="16:9 (Breedbeeld)" name="item4"/> + </combo_box> + <check_box label="Automatisch detecteren" name="aspect_auto_detect"/> + <text name="heading1"> + Camera: + </text> + <slider label="Kijkhoek" name="camera_fov"/> + <slider label="Afstand" name="camera_offset_scale"/> + <text name="heading2"> + Automatisch positionering voor: + </text> + <check_box label="Maken/Bewerken" name="edit_camera_movement" tool_tip="Gebruik automatische camera positionering bij ingaan en verlaten van Bewerk modus."/> + <check_box label="Uiterlijk" name="appearance_camera_movement" tool_tip="Gebruik automatische camera positionering wanneer in bewerk modus"/> + <text name="heading3"> + Avatars: + </text> + <check_box label="Toon mij in Muis Modus" name="first_person_avatar_visible"/> + <check_box label="Pijltjestoetsen bewegen mij altijd" name="arrow_keys_move_avatar_check"/> + <check_box label="Tik-tik-vasthouden om te rennen" name="tap_tap_hold_to_run"/> + <check_box label="Beweeg avatar lippen tijdens het praten" name="enable_lip_sync"/> + <check_box label="Toon script fouten" name="show_script_errors"/> + <radio_group name="show_location"> + <radio_item label="In chat" name="0"/> + <radio_item label="In een venster" name="1"/> + </radio_group> + <check_box label="Toggle modus voor microfoon wanneer ik de spreek toets indruk:" name="push_to_talk_toggle_check" tool_tip="Wanneer in toggle mode, drukt u éénmaal op de ontspanner toets om de microfoon in-of uitschakelen. Wanneer niet in toggle mode, kan de microfoon uitzendingen uw stem alleen tijdens de ontspanner wordt ingedrukt."/> + <line_editor label="Push-to-Speak trigger" name="modifier_combo"/> + <button label="Plaats Toets" name="set_voice_hotkey_button"/> + <button label="Middelste Muis Knop" name="set_voice_middlemouse_button"/> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/nl/panel_preferences_alerts.xml new file mode 100644 index 0000000000..d3174a703d --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_alerts.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Pop-ups" name="popups" title="Pop-ups"> + <text name="tell_me_label"> + Vertel mij: + </text> + <check_box label="Wanneer ik L$ spendeer of krijg" name="notify_money_change_checkbox"/> + <check_box label="Wanneer mijn vrienden in- of uit-loggen" name="friends_online_notify_checkbox"/> + <text name="show_label"> + Toon altijd deze waarschuwingen: + </text> + <text name="dont_show_label"> + Toon nooit deze waarschuwingen: + </text> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/nl/panel_preferences_chat.xml new file mode 100644 index 0000000000..84f385c86b --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_chat.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Tekst chat" name="chat"> + <radio_group name="chat_font_size"> + <radio_item label="Klein" name="radio"/> + <radio_item label="Middel" name="radio2"/> + <radio_item label="Groot" name="radio3"/> + </radio_group> + <color_swatch label="U" name="user"/> + <text name="text_box1"> + U + </text> + <color_swatch label="Anderen" name="agent"/> + <text name="text_box2"> + Anderen + </text> + <color_swatch label="IM" name="im"/> + <text name="text_box3"> + IM + </text> + <color_swatch label="Systeem" name="system"/> + <text name="text_box4"> + Systeem + </text> + <color_swatch label="Fouten" name="script_error"/> + <text name="text_box5"> + Fouten + </text> + <color_swatch label="Objecten" name="objects"/> + <text name="text_box6"> + Objecten + </text> + <color_swatch label="Eigenaar" name="owner"/> + <text name="text_box7"> + Eigenaar + </text> + <color_swatch label="URL's" name="links"/> + <text name="text_box9"> + URL's + </text> + <check_box initial_value="true" label="Speel typeanimatie tijdens chat" name="play_typing_animation"/> + <check_box label="Email mij IMs wanneer ik offline ben" name="send_im_to_email"/> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_general.xml b/indra/newview/skins/default/xui/nl/panel_preferences_general.xml new file mode 100644 index 0000000000..7be570b27f --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_general.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Algemeen" name="general_panel"> + <combo_box name="start_location_combo"> + <combo_box.item name="MyHome" tool_tip="Log standaard in op mijn thuislocatie." label="Mijn thuis"/> + <combo_box.item name="MyLastLocation" tool_tip="Log standaard in op mijn laatste locatie." label="Mijn laatste locatie"/> + </combo_box> + <check_box label="Toon startlocatie op loginscherm" name="show_location_checkbox"/> + <combo_box name="fade_out_combobox"> + <combo_box.item name="Never" label="Nooit"/> + <combo_box.item name="Show Temporarily" label="Toon tijdelijk"/> + <combo_box.item name="Always" label="Altijd"/> + </combo_box> + <check_box label="Kleine avatarnamen" name="small_avatar_names_checkbox"/> + <check_box label="Verberg mijn naam op mijn scherm" name="show_my_name_checkbox"/> + <text name="group_titles_textbox"> + Groepstitels: + </text> + <check_box label="Verberg alle groepstitels" name="show_all_title_checkbox"/> + <check_box label="Verberg mijn groepstitel" name="show_my_title_checkbox"/> + <color_swatch label="" name="effect_color_swatch" tool_tip="Klik om de kleurkiezer te openen"/> + <text name="UI Size:"> + UI grootte: + </text> + <check_box label="Gebruik resolutie onafhankelijke schaal" name="ui_auto_scale"/> + <spinner label="Afwezigheidtijdsduur:" name="afk_timeout_spinner"/> + <check_box label="Waarschuwen wanneer L$ worden uitgegeven of ontvangen" name="notify_money_change_checkbox"/> + <text name="maturity_desired_label"> + Inhoudscategorie: + </text> + <text name="maturity_desired_prompt"> + Ik wil toegang tot inhoud die is beoordeeld als: + </text> + <combo_box name="maturity_desired_combobox"> + <combo_box.item name="Desired_Adult" label="PG, Mature en Adult"/> + <combo_box.item name="Desired_Mature" label="PG en Mature"/> + <combo_box.item name="Desired_PG" label="PG"/> + </combo_box> + <text name="maturity_desired_textbox"> + PG + </text> + <text name="start_location_textbox"> + Startlocatie: + </text> + <text name="show_names_textbox"> + Toon namen: + </text> + <text name="effects_color_textbox"> + Kleur voor mijn effecten: + </text> + <text name="seconds_textbox"> + seconden + </text> + <text name="crash_report_textbox"> + Crash rapporten: + </text> + <text name="language_textbox"> + Taal: + </text> + <text name="language_textbox2"> + (Vereist herstart) + </text> + <string name="region_name_prompt"> + < Type regionaam > + </string> + <combo_box name="crash_behavior_combobox"> + <combo_box.item name="Askbeforesending" label="Vraag voor verzenden"/> + <combo_box.item name="Alwayssend" label="Altijd verzenden"/> + <combo_box.item name="Neversend" label="Nooit verzenden"/> + </combo_box> + <combo_box name="language_combobox"> + <combo_box.item name="System Default Language" label="Systeemstandaard"/> + <combo_box.item name="English" label="Engels (English)"/> + <combo_box.item name="Danish" label="Dansk (Deens) - Bèta"/> + <combo_box.item name="Deutsch(German)" label="Deutsch (Duits) - Bèta"/> + <combo_box.item name="Spanish" label="Español (Spaans) - Bèta"/> + <combo_box.item name="French" label="Français (Frans) - Bèta"/> + <combo_box.item name="Italian" label="Italiano (Italiaans) - Bèta"/> + <combo_box.item name="Hungarian" label="Magyar (Hongaars) - Bèta"/> + <combo_box.item name="Dutch" label="Nederlands - Bèta"/> + <combo_box.item name="Polish" label="Polski (Pools) - Bèta"/> + <combo_box.item name="Portugese" label="Português (Portugees) - Bèta"/> + <combo_box.item name="Russian" label="Русский (Russisch) - Bèta"/> + <combo_box.item name="Turkish" label="Türkçe (Turks) - Bèta"/> + <combo_box.item name="Ukrainian" label="Українська (Oekraïens) - Bèta"/> + <combo_box.item name="Chinese" label="中文 (简体) (Chinees) - Bèta"/> + <combo_box.item name="(Japanese)" label="日本語 (Japans) - Bèta"/> + <combo_box.item name="(Korean)" label="한국어 (Koreaans) - Bèta"/> + </combo_box> + <check_box label="Deel taal met objecten" name="language_is_public" tool_tip="Dit laat in-wereld objecten uw voorkeurstaal weten."/> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/nl/panel_preferences_graphics1.xml new file mode 100644 index 0000000000..8f4244e222 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_graphics1.xml @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Grafisch" name="Display panel"> + <button label="?" name="GraphicsPreferencesHelpButton"/> + <check_box label="Voer Second Life uit in een venster" name="windowed mode"/> + <text_editor name="FullScreenInfo" bottom="-56" height="40" width="480"> + Wanneer niet aangevinkt, zal de viewer in volledig-scherm modus getoond worden wanneer u inlogt. + </text_editor> + <text name="WindowSizeLabel"> + Venstergrootte: + </text> + <combo_box name="windowsize combo" left="115" > + <combo_box.item name="640x480" label="640x480"/> + <combo_box.item name="800x600" label="800x600"/> + <combo_box.item name="720x480" label="720x480 (NTSC)"/> + <combo_box.item name="768x576" label="768x576 (PAL)"/> + <combo_box.item name="1024x768" label="1024x768"/> + </combo_box> + <text name="DisplayResLabel" width="100"> + Weergaveresolutie: + </text> + <combo_box left="115" name="fullscreen combo" /> + <text name="AspectRatioLabel1" tool_tip="breedte / hoogte" width="100"> + Beeldverhouding: + </text> + <combo_box name="aspect_ratio" tool_tip="breedte / hoogte" left="115" > + <combo_box.item name="4:3(StandardCRT)" label="4:3 (Standaard beeldbuis)"/> + <combo_box.item name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)"/> + <combo_box.item name="8:5(Widescreen)" label="8:5 (Breedbeeld)"/> + <combo_box.item name="16:9(Widescreen)" label="16:9 (Breedbeeld)"/> + </combo_box> + <check_box label="Verhouding automatisch detecteren" name="aspect_auto_detect" left="275" /> + <text name="HigherText"> + Kwaliteit en + </text> + <text name="QualityText"> + Prestatie: + </text> + <text name="FasterText"> + Sneller + </text> + <text name="ShadersPrefText"> + Laag + </text> + <text name="ShadersPrefText2"> + Middel + </text> + <text name="ShadersPrefText3"> + Hoog + </text> + <text name="ShadersPrefText4"> + Ultra + </text> + <text name="HigherText2"> + Hogere + </text> + <text name="QualityText2"> + Kwaliteit + </text> + <check_box label="Aangepast" name="CustomSettings"/> + <panel name="CustomGraphics Panel"> + <text name="ShadersText"> + Shaders: + </text> + <check_box label="Bump mapping en glans" name="BumpShiny"/> + <check_box label="Basis shaders" name="BasicShaders" tool_tip="Het uitschakelen van deze optie kan voorkomen dat sommige drivers voor grafische kaarten crashen."/> + <check_box label="Atmosferische shaders" name="WindLightUseAtmosShaders"/> + <check_box label="Waterreflecties" name="Reflections"/> + <text name="ReflectionDetailText"> + Reflectiedetail: + </text> + <radio_group name="ReflectionDetailRadio"> + <radio_item name="0" label="Terrein en bomen" /> + <radio_item name="1" label="Alle statische objecten" /> + <radio_item name="2" label="Alle avatars en objecten" /> + <radio_item name="3" label="Alles" /> + </radio_group> + <text name="AvatarRenderingText"> + Avatarweergave: + </text> + <check_box label="Avatar schimmen" name="AvatarImpostors"/> + <check_box label="Hardware Skinning" name="AvatarVertexProgram"/> + <check_box label="Avatar kleding" name="AvatarCloth"/> + <text name="DrawDistanceMeterText1"> + m + </text> + <text name="DrawDistanceMeterText2"> + m + </text> + <slider label="Zichtbereik:" name="DrawDistance"/> + <slider label="Max. aantal particles:" name="MaxParticleCount"/> + <slider label="Nabewerkingskwaliteit:" name="RenderPostProcess"/> + <text name="MeshDetailText"> + Maasdetail: + </text> + <slider label=" Objecten:" name="ObjectMeshDetail"/> + <slider label=" Flexibele prims:" name="FlexibleMeshDetail"/> + <slider label=" Bomen:" name="TreeMeshDetail"/> + <slider label=" Avatars:" name="AvatarMeshDetail"/> + <slider label=" Terrein:" name="TerrainMeshDetail"/> + <slider label=" Lucht:" name="SkyMeshDetail"/> + <text name="PostProcessText"> + Laag + </text> + <text name="ObjectMeshDetailText"> + Laag + </text> + <text name="FlexibleMeshDetailText"> + Laag + </text> + <text name="TreeMeshDetailText"> + Laag + </text> + <text name="AvatarMeshDetailText"> + Laag + </text> + <text name="TerrainMeshDetailText"> + Laag + </text> + <text name="SkyMeshDetailText"> + Laag + </text> + <text name="LightingDetailText"> + Lichtdetail: + </text> + <radio_group name="LightingDetailRadio"> + <radio_item name="SunMoon" label="Alleen zon en maan" /> + <radio_item name="LocalLights" label="Lokale lichten in de buurt" /> + </radio_group> + <text name="TerrainDetailText"> + Terreindetail: + </text> + <radio_group name="TerrainDetailRadio"> + <radio_item name="0" label="Laag" /> + <radio_item name="2" label="Hoog" /> + </radio_group> + </panel> + <button label="Aanbevolen instellingen" name="Defaults"/> + <button label="Hardware opties" label_selected="Hardware opties" name="GraphicsHardwareButton"/> + <panel.string name="resolution_format"> + [RES_X] x [RES_Y] + </panel.string> + <panel.string name="aspect_ratio_text"> + [NUM]:[DEN] + </panel.string> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/nl/panel_preferences_privacy.xml new file mode 100644 index 0000000000..c2014bf0cb --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_privacy.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Communicatie" name="im"> + <text name="text_box"> + Mijn online status: + </text> + <check_box left="140" label="Allen mijn vrienden en groepen kunnen zien wanneer ik online ben" name="online_visibility"/> + <text name="text_box2"> + IM opties: + </text> + <string name="log_in_to_change"> + log in om te wijzigen + </string> + <check_box left="140" label="Stuur IM naar Email ([EMAIL])" name="send_im_to_email"/> + <check_box left="140" label="Voeg IM toe in chatconsole" name="include_im_in_chat_console"/> + <check_box left="140" label="Toon tijdstempels in IM" name="show_timestamps_check"/> + <check_box left="140" label="Toon melding bij vriend online" name="friends_online_notify_checkbox"/> + <text name="text_box3"> + Antwoord bij +Niet Storen: + </text> + <text name="text_box4"> + Log opties: + </text> + <check_box label="Bewaar een log van IM op mijn computer" name="log_instant_messages"/> + <check_box label="Toon tijdstempels in IM-log" name="log_instant_messages_timestamp"/> + <check_box label="Toon het einde van de laatste IM conversatie" name="log_show_history"/> + <check_box label="Bewaar een log van lokale chat op mijn computer" name="log_chat"/> + <check_box label="Toon tijdstempels in lokale chatlog" name="log_chat_timestamp"/> + <check_box label="Toon binnenkomende IM in lokale chatlog" name="log_chat_IM"/> + <check_box label="Voeg datum toe aan tijdstempels" name="log_date_timestamp"/> + <button label="Wijzig pad" label_selected="Wijzig pad" name="log_path_button"/> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/nl/panel_preferences_setup.xml new file mode 100644 index 0000000000..f9f58befe8 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_setup.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Invoer & Camera" name="Input panel"> + <text name=" Mouselook Options:"> + Mouselook opties: + </text> + <text name=" Mouse Sensitivity:"> + Muis gevoeligheid: + </text> + <check_box label="Muisbeweging omkeren" name="invert_mouse"/> + <text name=" Auto Fly Options:"> + Automatisch vliegen +opties: + </text> + <check_box label="Vlieg/Land bij indrukken Page Up/Page Down" name="automatic_fly"/> + <text name=" Camera Options:"> + Camera opties: + </text> + <text name="camera_fov_label"> + Camera Zichthoek + </text> + <text name="Camera Follow Distance:"> + Camera volgafstand: + </text> + <check_box label="Automatische camerabeweging bij bewerken" name="edit_camera_movement" tool_tip="Gebruik automatische camerapositionering bij het betreden en verlaten van de bewerken modus"/> + <check_box label="Automatische camerabeweging bij uiterlijk bewerken" name="appearance_camera_movement" tool_tip="Gebruik automatische camerapositionering in de bewerken modus"/> + <text name="text2"> + Avatar weergave opties: + </text> + <check_box label="Toon avatar in mouselook" name="first_person_avatar_visible"/> + <button label="Joystick instellingen" name="joystick_setup_button"/> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/nl/panel_preferences_sound.xml new file mode 100644 index 0000000000..2b709bde40 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_preferences_sound.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Geluid" name="Preference Media panel"> + <slider label="Hoofd volume" name="System Volume"/> + <check_box initial_value="true" label="Dempen indien geminimaliseerd" name="mute_when_minimized"/> + <slider label="Omliggend" name="Wind Volume"/> + <slider label="Knoppen" name="UI Volume"/> + <slider label="Media" name="Media Volume"/> + <slider label="Geluids effecten" name="SFX Volume"/> + <slider label="Streamen van muziek" name="Music Volume"/> + <check_box label="Voice" name="enable_voice_check"/> + <slider label="Voice" name="Voice Volume"/> + <text name="Listen from"> + Luisteren vanuit: + </text> + <radio_group name="ear_location"> + <radio_item label="Camera positie" name="0"/> + <radio_item label="Avatar positie" name="1"/> + </radio_group> + <button label="Input/Output Apparaten" name="device_settings_btn"/> + <panel label="Apparaat Instellingen" name="device_settings_panel"> + <panel.string name="default_text"> + Standaard + </panel.string> + <text name="Input"> + Input + </text> + <text name="My volume label"> + Mijn volume: + </text> + <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Verander de volume door gebruik te nemen van deze schuifknop"/> + <text name="wait_text"> + Even geduld + </text> + <text name="Output"> + Output + </text> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_region_covenant.xml b/indra/newview/skins/default/xui/nl/panel_region_covenant.xml new file mode 100644 index 0000000000..adfc62dd22 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_region_covenant.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Convenant" name="Covenant"> + <text name="estate_section_lbl"> + Estate: + </text> + <text name="estate_name_lbl"> + Naam: + </text> + <text name="estate_name_text"> + mainland + </text> + <text name="estate_owner_lbl"> + Eigenaar: + </text> + <text name="estate_owner_text"> + (geen) + </text> + <text name="estate_cov_lbl"> + Convenant: + </text> + <text name="covenant_timestamp_text"> + Laatst gewijzigd Wed Dec 31 16:00:00 1969 + </text> + <button label="?" name="covenant_help"/> + <text_editor name="covenant_editor" bottom="-247" height="162"> + Er is geen convenant voor deze estate. + </text_editor> + <button label="Opnieuw instellen" name="reset_covenant" right="460" width="110"/> + <text name="covenant_help_text" bottom="-25"> + Wijzigingen in het convenant zullen in alle percelen van het estate + zichtbaar zijn. + </text> + <text name="covenant_instructions" bottom_delta="-36" > + Sleep en deponeer een notitiekaart om het convenant voor deze + estate te wijzigen. + </text> + <text name="region_section_lbl" bottom_delta="-36" > + Regio: + </text> + <text name="region_name_lbl"> + Naam: + </text> + <text name="region_name_text"> + leyla + </text> + <text name="region_landtype_lbl"> + Type: + </text> + <text name="region_landtype_text"> + Mainland / Homestead + </text> + <text name="region_maturity_lbl"> + Inhoudscategorie: + </text> + <text name="region_maturity_text"> + Adult + </text> + <text name="resellable_lbl"> + Doorverkopen: + </text> + <text name="resellable_clause"> + Land in deze regio mag niet worden doorverkocht. + </text> + <text name="changeable_lbl"> + Opsplitsen: + </text> + <text name="changeable_clause"> + Land in deze regio mag niet worden samengevoegd/opgesplitst. + </text> + <string name="can_resell"> + Aangekocht land in deze regio mag worden doorverkocht. + </string> + <string name="can_not_resell"> + Aangekocht land in deze regio mag niet worden doorverkocht. + </string> + <string name="can_change"> + Aangekocht land in deze regio mag worden gecombineerd of +opgedeeld. + </string> + <string name="can_not_change"> + Aangekocht land in deze regio mag niet worden gecombineerd +of opgedeeld. + </string> +</panel> diff --git a/indra/newview/skins/default/xui/nl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/nl/panel_scrolling_param.xml new file mode 100644 index 0000000000..8487ff999a --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_scrolling_param.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="LLScrollingPanelParam"> + <text name="Loading..."> + Laden... + </text> + <text name="Loading...2"> + Laden... + </text> + <slider label="[DESC]" name="param slider"/> +</panel> diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml index 25071b5460..1ee26c3f24 100644 --- a/indra/newview/skins/default/xui/nl/strings.xml +++ b/indra/newview/skins/default/xui/nl/strings.xml @@ -912,6 +912,9 @@ <string name="InvFolder Favorite"> Favoriten </string> + <string name="InvFolder favorite"> + Favoriten + </string> <string name="InvFolder Current Outfit"> Huidige Uitrusting </string> diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml index c68e1c72ce..0974518a1f 100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -223,7 +223,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz <text name="Simulator primitive usage:"> Ilość używanych primów: </text> - <text name="objects_available" width="230"> + <text name="objects_available"> [COUNT] z [MAX] ([AVAILABLE] jest dostępne) </text> <text name="Primitives parcel supports:"> @@ -271,11 +271,11 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz <text name="Autoreturn"> Zwracaj obiekty innych Rezydentów (minut, 0 = wyłącz): </text> - <text name="Object Owners:" width="108"> + <text name="Object Owners:"> Właściciel obiektów: </text> - <button label="Odśwież listę" label_selected="Odśwież listę" left="112" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Zwróć obiekty..." label_selected="Zwróć obiekty..." left="224" name="Return objects..."/> + <button label="Odśwież listę" label_selected="Odśwież listę" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Zwróć obiekty..." label_selected="Zwróć obiekty..." name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Typ" name="type"/> <name_list.columns name="online_status"/> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml index 5805df402c..e980d71ce4 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="Osobne okna" name="radio" value="0"/> <radio_item label="Etykiety" name="radio2" value="1"/> </radio_group> + <check_box label="Przetłumacz Czat" name="translate_chat_checkbox" /> + <text name="translate_language_text"> + Czat Język: + </text> + <combo_box name="translate_language_combobox"> + <combo_box.item name="System Default Language" label="Domyślny" /> + <combo_box.item name="English" label="English (Angielski)" /> + <combo_box.item name="Danish" label="Dansk (Duński)" /> + <combo_box.item name="German" label="Deutsch (Niemiecki)" /> + <combo_box.item name="Spanish" label="Español (Hiszpański)" /> + <combo_box.item name="French" label="Français (Francuski)" /> + <combo_box.item name="Italian" label="Italiano (Włoski)" /> + <combo_box.item name="Hungarian" label="Magyar (Węgierski)" /> + <combo_box.item name="Dutch" label="Nederlands (Niderlandzki)" /> + <combo_box.item name="Polish" label="Polski" /> + <combo_box.item name="Portugese" label="Português (Portugalski)" /> + <combo_box.item name="Russian" label="Русский (Rosyjski)" /> + <combo_box.item name="Turkish" label="Türkçe (Turecki)" /> + <combo_box.item name="Ukrainian" label="Українська (Ukraiński)" /> + <combo_box.item name="Chinese" label="中文 (简体) (Chiński)" /> + <combo_box.item name="Japanese" label="日本語 (Japoński)" /> + <combo_box.item name="Korean" label="한국어 (Koreański)" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml index 69686bcdbc..65ea349aec 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml @@ -13,7 +13,7 @@ <combo_box.item label="Italiano (Włoski) - Beta" name="Italian"/> <combo_box.item label="Nederlands (Niderlandzki) - Beta" name="Dutch"/> <combo_box.item label="Polski - Beta" name="Polish"/> - <combo_box.item label="Portugués (Portugalski) - Beta" name="Portugese"/> + <combo_box.item label="Português (Portugalski) - Beta" name="Portugese"/> <combo_box.item label="日本語 (Japoński) - Beta" name="(Japanese)"/> </combo_box> <text name="language_textbox2"> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index e2689720bf..f90e357373 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -1114,6 +1114,12 @@ <string name="InvFolder Gestures"> Gesturki </string> + <string name="InvFolder Favorite"> + Ulubione + </string> + <string name="InvFolder favorite"> + Ulubione + </string> <string name="InvFolder Current Outfit"> Obecny strój </string> diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index 1767a31496..a6b255d432 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -221,60 +221,60 @@ Vá para o menu Mundo > Sobre o terreno ou selecione outro lote para mostrar <text name="Simulator primitive usage:"> Uso de prims: </text> - <text left="214" name="objects_available" width="230"> + <text name="objects_available"> [COUNT] de [MAX] ([AVAILABLE] disponíveis) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Prims suportados pelo lote: </text> - <text left="214" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Prims no lote: </text> - <text left="214" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Pertencentes ao dono do lote: </text> - <text left="214" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/> - <button label="Devolver" name="ReturnOwner..." right="-10" tool_tip="Devolver objetos a seus donos." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOwner"/> + <button label="Devolver" name="ReturnOwner..." tool_tip="Devolver objetos a seus donos."/> + <text name="Set to group:"> Reservado para o grupo: </text> - <text left="214" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> - <button label="Devolver" name="ReturnGroup..." right="-10" tool_tip="Devolver objetos a seus donos." width="119"/> - <text left="14" name="Owned by others:" width="128"> + <button label="Mostrar" label_selected="Mostrar" name="ShowGroup"/> + <button label="Devolver" name="ReturnGroup..." tool_tip="Devolver objetos a seus donos."/> + <text name="Owned by others:"> Propriedade de outros: </text> - <text left="214" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/> - <button label="Devolver" name="ReturnOther..." right="-10" tool_tip="Devolver objetos a seus donos." width="119"/> - <text left="14" name="Selected / sat upon:" width="193"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOther"/> + <button label="Devolver" name="ReturnOther..." tool_tip="Devolver objetos a seus donos."/> + <text name="Selected / sat upon:"> Selecionado/Sentado: </text> - <text left="214" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Devolver objetos de outros residentes (p/ desligar tecle 0) </text> - <line_editor name="clean other time" right="-10"/> + <line_editor name="clean other time"/> <text name="Object Owners:"> Donos dos objetos: </text> - <button label="Atualizar lista" label_selected="Atualizar lista" left="118" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Devolver objetos..." label_selected="Devolver objetos..." left="230" name="Return objects..."/> + <button label="Atualizar lista" label_selected="Atualizar lista" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Devolver objetos..." label_selected="Devolver objetos..." name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> <name_list.columns label="Nome" name="name"/> @@ -340,7 +340,7 @@ Apenas lotes maiores podem ser listados na busca. <check_box label="Seguro (sem danos)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, impedindo lutas com danos. Se não ativado, lutas com danos é habilitado."/> <check_box label="Proibido empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. Ativar essa opção ajuda a prevenir comportamentos desordeiros no seu terreno."/> <check_box label="Mostrar terreno nos resultados de busca (L$30/semana)" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/> - <combo_box left="265" name="land category with adult" width="155"> + <combo_box name="land category with adult"> <combo_box.item label="Qualquer categoria" name="item0"/> <combo_box.item label="Locação Linden" name="item1"/> <combo_box.item label="Adulto" name="item2"/> @@ -355,7 +355,7 @@ Apenas lotes maiores podem ser listados na busca. <combo_box.item label="Compras" name="item11"/> <combo_box.item label="Outros" name="item12"/> </combo_box> - <combo_box left="265" name="land category" width="155"> + <combo_box name="land category"> <combo_box.item label="Qualquer categoria" name="item0"/> <combo_box.item label="Locação Linden" name="item1"/> <combo_box.item label="Artes e cultura" name="item3"/> @@ -382,7 +382,7 @@ Apenas lotes maiores podem ser listados na busca. <text name="Teleport Routing: "> Rota de teletransporte: </text> - <combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os teletransportes no seu lote." width="160"> + <combo_box name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os teletransportes no seu lote." width="160"> <combo_box.item label="Bloqueado" name="Blocked"/> <combo_box.item label="Ponto de aterrissagem" name="LandingPoint"/> <combo_box.item label="Qualquer lugar" name="Anywhere"/> diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml index 306487939e..9560a3b418 100644 --- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml @@ -52,8 +52,8 @@ Duração do Ciclo: </text> <spinner label="Hora" name="WLLengthOfDayHour"/> - <spinner label="Minuto" name="WLLengthOfDayMin"/> - <spinner label="Segundo" name="WLLengthOfDaySec"/> + <spinner label="Min." name="WLLengthOfDayMin"/> + <spinner label="Seg." name="WLLengthOfDaySec"/> <text name="DayCycleText3"> Visualizar </text> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml index 02b0ef35fe..1ec674e2e2 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml @@ -56,4 +56,27 @@ <radio_item label="Janelas separadas" name="radio" value="0"/> <radio_item label="Guias" name="radio2" value="1"/> </radio_group> + <check_box label="Traduzir Chat" name="translate_chat_checkbox" /> + <text name="translate_language_text"> + Chat Língua: + </text> + <combo_box name="translate_language_combobox"> + <combo_box.item name="System Default Language" label="Padrão do Sistema" /> + <combo_box.item name="English" label="English (Inglês)" /> + <combo_box.item name="Danish" label="Dansk (Dinamarquês)" /> + <combo_box.item name="German" label="Deutsch (Alemão)" /> + <combo_box.item name="Spanish" label="Español (Espanhol)" /> + <combo_box.item name="French" label="Français (Francês)" /> + <combo_box.item name="Italian" label="Italiano" /> + <combo_box.item name="Hungarian" label="Magyar (Húngaro)" /> + <combo_box.item name="Dutch" label="Nederlands (Holandês)" /> + <combo_box.item name="Polish" label="Polski (Polonês)" /> + <combo_box.item name="Portugese" label="Português" /> + <combo_box.item name="Russian" label="Русский (Russo)" /> + <combo_box.item name="Turkish" label="Türkçe (Turco)" /> + <combo_box.item name="Ukrainian" label="Українська (Ucraniano)" /> + <combo_box.item name="Chinese" label="中文 (简体) (Chinês)" /> + <combo_box.item name="Japanese" label="日本語 (Japonês)" /> + <combo_box.item name="Korean" label="한국어 (Coreano)" /> + </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 4bf2bda248..b6ecc9347b 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -1120,6 +1120,9 @@ <string name="InvFolder Favorite"> Favoritos </string> + <string name="InvFolder favorite"> + Favoritos + </string> <string name="InvFolder Current Outfit"> Look atual </string> |
